Merge pull request #2169 from IBMa/mjs-js-ext

bug(node): ESM packages need .js extension for modules
IBMa · Feb 4, 2025 · a7e92a1 · a7e92a1
2 parents 1b7339c + b6fa206
commit a7e92a1
Show file tree

Hide file tree

Showing 12 changed files with 70 additions and 68 deletions.
diff --git a/accessibility-checker/src-ts/index.ts b/accessibility-checker/src-ts/index.ts
@@ -14,17 +14,15 @@
     limitations under the License.
   *****************************************************************************/
 
-import { ACBrowserManager } from "./lib/ACBrowserManager";
-import { ACEngineManager } from "./lib/ACEngineManager";
-import { getComplianceHelper } from "./lib/ACHelper";
-import { eAssertResult, ICheckerReport, ICheckerResult, ReportResult } from "./lib/api/IChecker";
-import { ACConfigManager } from "./lib/common/config/ACConfigManager";
-import { IConfig, IConfigInternal } from "./lib/common/config/IConfig";
-import { Checkpoint } from "./lib/common/engine/IGuideline";
-import { IBaselineReport } from "./lib/common/engine/IReport";
-import { Issue } from "./lib/common/engine/IRule";
-import { BaselineManager } from "./lib/common/report/BaselineManager";
-import { ReporterManager } from "./lib/common/report/ReporterManager";
+import { ACBrowserManager } from "./lib/ACBrowserManager.js";
+import { ACEngineManager } from "./lib/ACEngineManager.js";
+import { getComplianceHelper } from "./lib/ACHelper.js";
+import { eAssertResult, ICheckerReport, ICheckerResult, ReportResult } from "./lib/api/IChecker.js";
+import { ACConfigManager } from "./lib/common/config/ACConfigManager.js";
+import { IConfig, IConfigInternal } from "./lib/common/config/IConfig.js";
+import { IBaselineReport } from "./lib/common/engine/IReport.js";
+import { BaselineManager } from "./lib/common/report/BaselineManager.js";
+import { ReporterManager } from "./lib/common/report/ReporterManager.js";
 
 /**
  * This function is responsible performing a scan based on the context that is provided, following are

diff --git a/accessibility-checker/src-ts/lib/ACBrowserManager.ts b/accessibility-checker/src-ts/lib/ACBrowserManager.ts
@@ -1,6 +1,6 @@
 import * as puppeteer from "puppeteer";
-import { ACConfigManager } from "./common/config/ACConfigManager";
-import { IConfigInternal } from "./common/config/IConfig";
+import { ACConfigManager } from "./common/config/ACConfigManager.js";
+import { IConfigInternal } from "./common/config/IConfig.js";
 
 
 export class ACBrowserManager {

diff --git a/accessibility-checker/src-ts/lib/ACEngineManager.ts b/accessibility-checker/src-ts/lib/ACEngineManager.ts
@@ -1,8 +1,8 @@
 import * as path from "path";
 import * as fs from "fs";
-import { ACConfigManager } from "./common/config/ACConfigManager";
-import { fetch_get_text } from "./common/api-ext/Fetch";
-import { IChecker } from "./common/engine/IChecker";
+import { ACConfigManager } from "./common/config/ACConfigManager.js";
+import { fetch_get_text } from "./common/api-ext/Fetch.js";
+import { IChecker } from "./common/engine/IChecker.js";
 
 let ace;
 
@@ -26,6 +26,7 @@ export class ACEngineManager {
             config.DEBUG && console.log("[INFO] aChecker.loadEngine detected Puppeteer/Playwright");
             let page = content;
             if (ENGINE_LOAD_MODE === "REMOTE") {
+                config.DEBUG && console.log("[INFO] engineMode REMOTE");
                 await page.evaluate((scriptUrl) => {
                     try {
                         var ace_backup_in_ibma;
@@ -61,19 +62,21 @@ export class ACEngineManager {
                     }
                 }, `${config.rulePack}/ace.js`);
             } else if (ENGINE_LOAD_MODE === "INJECT") {
-                await page.evaluate((engineContent) => {
+                config.DEBUG && console.log("[INFO] engineMode INJECT");
+                let aceAlreadyExists = await page.evaluate(() => { try { return 'undefined' !== typeof(ace) } catch (e) { return false; } });
+                await page.evaluate(({ engineContent, aceAlreadyExists }) => {
                     try {
                         var ace_backup_in_ibma;
-                        if ('undefined' !== typeof(ace)) {
+                        if (aceAlreadyExists) {
                             if (!ace || !ace.Checker)
                                 ace_backup_in_ibma = ace;
                             ace = null;
                         }
-                        if ('undefined' === typeof (ace) || ace === null) {
+                        if (!aceAlreadyExists || ace === null) {
                             return new Promise<void>((resolve, reject) => {
                                 eval(engineContent);
                                 globalThis.ace_ibma = ace;
-                                if ('undefined' !== typeof(ace)) {
+                                if (aceAlreadyExists) {
                                     ace = ace_backup_in_ibma;
                                 }
                                 resolve();
@@ -82,7 +85,8 @@ export class ACEngineManager {
                     } catch (e) {
                         return Promise.reject(e);
                     }
-                }, ACEngineManager.engineContent);
+                }, { 
+                    engineContent: ACEngineManager.engineContent, aceAlreadyExists });
             }
             return ACEngineManager.loadEngineLocal();
         } else if (ACEngineManager.isSelenium(content)) {

diff --git a/accessibility-checker/src-ts/lib/ACHelper.ts b/accessibility-checker/src-ts/lib/ACHelper.ts
@@ -1,14 +1,14 @@
-import { ICheckerReport, ICheckerResult } from "./api/IChecker";
-import { ACBrowserManager } from "./ACBrowserManager";
-import { ACEngineManager } from "./ACEngineManager";
-import { ACConfigManager } from "./common/config/ACConfigManager";
-import { IConfigInternal } from "./common/config/IConfig";
-import { ReporterManager } from "./common/report/ReporterManager";
 import { existsSync, mkdirSync, writeFileSync } from "fs";
-import { IAbstractAPI } from "./common/api-ext/IAbstractAPI";
-import { EngineSummaryCounts, IBaselineReport, IEngineReport } from "./common/engine/IReport";
 import { dirname, join, resolve as pathResolve } from "path";
-import { BaselineManager, RefactorMap } from "./common/report/BaselineManager";
+import { ICheckerReport, ICheckerResult } from "./api/IChecker.js";
+import { ACBrowserManager } from "./ACBrowserManager.js";
+import { ACEngineManager } from "./ACEngineManager.js";
+import { ACConfigManager } from "./common/config/ACConfigManager.js";
+import { IConfigInternal } from "./common/config/IConfig.js";
+import { ReporterManager } from "./common/report/ReporterManager.js";
+import { IAbstractAPI } from "./common/api-ext/IAbstractAPI.js";
+import { EngineSummaryCounts, IBaselineReport, IEngineReport } from "./common/engine/IReport.js";
+import { BaselineManager, RefactorMap } from "./common/report/BaselineManager.js";
 
 declare var after;
 

diff --git a/accessibility-checker/src-ts/lib/api/IChecker.ts b/accessibility-checker/src-ts/lib/api/IChecker.ts
@@ -1,5 +1,5 @@
-import { eRuleLevel } from "../common/config/IConfig";
-import { IBaselineReport } from "../common/engine/IReport";
+import { eRuleLevel } from "../common/config/IConfig.js";
+import { IBaselineReport } from "../common/engine/IReport.js";
 
 export enum eAssertResult {
     ERROR = -1,

diff --git a/common/module/src/report/ACReporterCSV.ts b/common/module/src/report/ACReporterCSV.ts
@@ -14,10 +14,10 @@
     limitations under the License.
   *****************************************************************************/
 
-import { IConfigInternal } from "../config/IConfig";
-import { Guideline } from "../engine/IGuideline";
-import { CompressedReport } from "../engine/IReport";
-import { GenSummReturn, IReporter, ReporterManager } from "./ReporterManager";
+import { IConfigInternal } from "../config/IConfig.js";
+import { Guideline } from "../engine/IGuideline.js";
+import { CompressedReport } from "../engine/IReport.js";
+import { GenSummReturn, IReporter, ReporterManager } from "./ReporterManager.js";
 
 export class ACReporterCSV implements IReporter {
     public name(): string {

diff --git a/common/module/src/report/ACReporterHTML.ts b/common/module/src/report/ACReporterHTML.ts
@@ -14,11 +14,11 @@
     limitations under the License.
   *****************************************************************************/
 
-import { IConfigInternal } from "../config/IConfig";
-import { Guideline } from "../engine/IGuideline";
-import { CompressedReport, IBaselineReport } from "../engine/IReport";
-import { GenSummReturn, IReporter, IReporterStored, ReporterManager } from "./ReporterManager";
-import { genReport } from "./genReport";
+import { IConfigInternal } from "../config/IConfig.js";
+import { Guideline } from "../engine/IGuideline.js";
+import { CompressedReport, IBaselineReport } from "../engine/IReport.js";
+import { GenSummReturn, IReporter, IReporterStored, ReporterManager } from "./ReporterManager.js";
+import { genReport } from "./genReport.js";
 
 export class ACReporterHTML implements IReporter {
     public name(): string {

diff --git a/common/module/src/report/ACReporterJSON.ts b/common/module/src/report/ACReporterJSON.ts
@@ -14,10 +14,10 @@
     limitations under the License.
   *****************************************************************************/
 
-import { IConfigInternal } from "../config/IConfig";
-import { Guideline } from "../engine/IGuideline";
-import { CompressedReport, IBaselineReport, IEngineReport } from "../engine/IReport";
-import { GenSummReturn, IReporter, IReporterStored, ReporterManager } from "./ReporterManager";
+import { IConfigInternal } from "../config/IConfig.js";
+import { Guideline } from "../engine/IGuideline.js";
+import { CompressedReport, IBaselineReport, IEngineReport } from "../engine/IReport.js";
+import { GenSummReturn, IReporter, IReporterStored, ReporterManager } from "./ReporterManager.js";
 
 export class ACReporterJSON implements IReporter {
     public name(): string {

diff --git a/common/module/src/report/ACReporterMetrics.ts b/common/module/src/report/ACReporterMetrics.ts
@@ -14,11 +14,11 @@
     limitations under the License.
  *****************************************************************************/
 
-import { fetch_get } from "../api-ext/Fetch";
-import { IConfigInternal } from "../config/IConfig";
-import { Guideline } from "../engine/IGuideline";
-import { CompressedReport } from "../engine/IReport";
-import { GenSummReturn, IReporter, IReporterStored } from "./ReporterManager";
+import { fetch_get } from "../api-ext/Fetch.js";
+import { IConfigInternal } from "../config/IConfig.js";
+import { Guideline } from "../engine/IGuideline.js";
+import { CompressedReport } from "../engine/IReport.js";
+import { GenSummReturn, IReporter, IReporterStored } from "./ReporterManager.js";
 
 /*******************************************************************************
  * NAME: ACMetricsLogger.js

diff --git a/common/module/src/report/ACReporterXLSX.ts b/common/module/src/report/ACReporterXLSX.ts
@@ -14,11 +14,11 @@
     limitations under the License.
   *****************************************************************************/
 
-import { IConfigInternal, eRuleLevel } from "../config/IConfig";
-import { Checkpoint, Guideline, eToolkitLevel } from "../engine/IGuideline";
-import { CompressedReport } from "../engine/IReport";
-import { eRuleConfidence } from "../engine/IRule";
-import { GenSummReturn, IReporter, ReporterManager } from "./ReporterManager";
+import { IConfigInternal, eRuleLevel } from "../config/IConfig.js";
+import { Checkpoint, Guideline, eToolkitLevel } from "../engine/IGuideline.js";
+import { CompressedReport } from "../engine/IReport.js";
+import { eRuleConfidence } from "../engine/IRule.js";
+import { GenSummReturn, IReporter, ReporterManager } from "./ReporterManager.js";
 import * as ExcelJS from "exceljs";
 
 type PolicyInfo = {

diff --git a/common/module/src/report/BaselineManager.ts b/common/module/src/report/BaselineManager.ts
@@ -14,9 +14,9 @@
     limitations under the License.
 *****************************************************************************/
 
-import { IAbstractAPI } from "../api-ext/IAbstractAPI";
-import { IConfigInternal, eAssertResult } from "../config/IConfig";
-import { IBaselineReport } from "../engine/IReport";
+import { IAbstractAPI } from "../api-ext/IAbstractAPI.js";
+import { IConfigInternal, eAssertResult } from "../config/IConfig.js";
+import { IBaselineReport } from "../engine/IReport.js";
 import * as DeepDiff from "deep-diff";
 
 export type RefactorMap = {

diff --git a/common/module/src/report/ReporterManager.ts b/common/module/src/report/ReporterManager.ts
@@ -14,16 +14,16 @@
     limitations under the License.
   *****************************************************************************/
 
-import { IAbstractAPI } from "../api-ext/IAbstractAPI";
-import { IConfigInternal, eRuleLevel } from "../config/IConfig";
-import { CompressedIssue, CompressedReport, IBaselineReport, IBaselineResult, IEngineReport } from "../engine/IReport";
-import { ACReporterMetrics } from "./ACReporterMetrics";
-import { ACReporterCSV } from "./ACReporterCSV";
-import { ACReporterHTML } from "./ACReporterHTML";
-import { ACReporterJSON } from "./ACReporterJSON";
-import { ACReporterXLSX } from "./ACReporterXLSX";
-import { Guideline } from "../engine/IGuideline";
-import { eRuleConfidence, eRulePolicy } from "../engine/IRule";
+import { IAbstractAPI } from "../api-ext/IAbstractAPI.js";
+import { IConfigInternal, eRuleLevel } from "../config/IConfig.js";
+import { CompressedIssue, CompressedReport, IBaselineReport, IBaselineResult, IEngineReport } from "../engine/IReport.js";
+import { ACReporterCSV } from "./ACReporterCSV.js";
+import { ACReporterHTML } from "./ACReporterHTML.js";
+import { ACReporterJSON } from "./ACReporterJSON.js";
+import { ACReporterXLSX } from "./ACReporterXLSX.js";
+import { Guideline } from "../engine/IGuideline.js";
+import { eRuleConfidence, eRulePolicy } from "../engine/IRule.js";
+import { ACReporterMetrics } from "./ACReporterMetrics.js";
 
 export interface IReporterStored {
     startScan: number,