npm - @embroider/compat - Versions diffs - 2.1.0 → 2.1.1-unstable.00ec2e7 - Mend

@embroider/compat 2.1.0 → 2.1.1-unstable.00ec2e7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (39) hide show

package/package.json +5 -4
package/src/addon-dependency-rules/ember-data.js +1 -0
package/src/addon-dependency-rules/ember-data.js.map +1 -1
package/src/audit/babel-visitor.d.ts +1 -0
package/src/audit/babel-visitor.js +2 -2
package/src/audit/babel-visitor.js.map +1 -1
package/src/audit/build.js +48 -46
package/src/audit/build.js.map +1 -1
package/src/audit/options.d.ts +3 -2
package/src/audit/options.js.map +1 -1
package/src/audit-cli.js +0 -0
package/src/audit.d.ts +25 -1
package/src/audit.js +55 -33
package/src/audit.js.map +1 -1
package/src/babel-plugin-adjust-imports.d.ts +16 -0
package/src/babel-plugin-adjust-imports.js +198 -0
package/src/babel-plugin-adjust-imports.js.map +1 -0
package/src/compat-adapters/ember-data.d.ts +1 -0
package/src/compat-adapters/ember-data.js +4 -0
package/src/compat-adapters/ember-data.js.map +1 -1
package/src/compat-app.js +41 -77
package/src/compat-app.js.map +1 -1
package/src/dependency-rules.d.ts +12 -9
package/src/dependency-rules.js +21 -37
package/src/dependency-rules.js.map +1 -1
package/src/resolver-transform.d.ts +11 -4
package/src/resolver-transform.js +717 -320
package/src/resolver-transform.js.map +1 -1
package/src/v1-app.js +18 -4
package/src/v1-app.js.map +1 -1
package/src/audit/capture.d.ts +0 -8
package/src/audit/capture.js +0 -45
package/src/audit/capture.js.map +0 -1
package/src/resolver.d.ts +0 -128
package/src/resolver.js +0 -677
package/src/resolver.js.map +0 -1
package/src/template-compiler-broccoli-plugin.d.ts +0 -10
package/src/template-compiler-broccoli-plugin.js +0 -28
package/src/template-compiler-broccoli-plugin.js.map +0 -1

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/compat",
-  "version": "2.1.0",
+  "version": "2.1.1-unstable.00ec2e7",
   "private": false,
   "description": "Backward compatibility layer for the Embroider build system.",
   "repository": {
@@ -28,10 +28,11 @@
     "@babel/plugin-syntax-dynamic-import": "^7.8.3",
     "@babel/preset-env": "^7.14.5",
     "@babel/traverse": "^7.14.5",
-    "@embroider/macros": "1.10.0",
+    "@embroider/macros": "1.10.0-unstable.00ec2e7",
     "@types/babel__code-frame": "^7.0.2",
     "@types/yargs": "^17.0.3",
     "assert-never": "^1.1.0",
+    "babel-import-util": "^1.1.0",
     "babel-plugin-ember-template-compilation": "^2.0.0",
     "babel-plugin-syntax-dynamic-import": "^6.18.0",
     "babylon": "^6.18.0",
@@ -76,13 +77,13 @@
     "@types/node": "^15.12.2",
     "@types/resolve": "^1.20.0",
     "@types/semver": "^7.3.6",
-    "code-equality-assertions": "^0.7.0",
+    "code-equality-assertions": "^0.9.0",
     "ember-engines": "^0.8.19",
     "scenario-tester": "^2.0.1",
     "typescript": "*"
   },
   "peerDependencies": {
-    "@embroider/core": "^2.0.0"
+    "@embroider/core": "2.1.1-unstable.00ec2e7"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"

package/src/addon-dependency-rules/ember-data.js CHANGED Viewed

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 let rules = [
     {
         package: '@ember-data/store',
+        semverRange: '<=4.11.0',
         addonModules: {
             '-private.js': {
                 dependsOnModules: ['@ember-data/record-data/-private'],

package/src/addon-dependency-rules/ember-data.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ember-data.js","sourceRoot":"","sources":["ember-data.ts"],"names":[],"mappings":";;AAEA,IAAI,KAAK,GAAmB;IAC1B;QACE,OAAO,EAAE,mBAAmB;QAC5B,YAAY,EAAE;YACZ,aAAa,EAAE;gBACb,gBAAgB,EAAE,CAAC,kCAAkC,CAAC;aACvD;YACD,+BAA+B,EAAE;gBAC/B,gBAAgB,EAAE,CAAC,kCAAkC,CAAC;aACvD;YACD,yCAAyC,EAAE;gBACzC,gBAAgB,EAAE,CAAC,4BAA4B,CAAC;aACjD;SACF;KACF;CACF,CAAC;AAEF,kBAAe,KAAK,CAAC","sourcesContent":["import { PackageRules } from '..';\n\nlet rules: PackageRules[] = [\n {\n package: '@ember-data/store',\n addonModules: {\n '-private.js': {\n dependsOnModules: ['@ember-data/record-data/-private'],\n },\n '-private/system/core-store.js': {\n dependsOnModules: ['@ember-data/record-data/-private'],\n },\n '-private/system/model/internal-model.js': {\n dependsOnModules: ['@ember-data/model/-private'],\n },\n },\n },\n];\n\nexport default rules;\n"]}
1	+ {"version":3,"file":"ember-data.js","sourceRoot":"","sources":["ember-data.ts"],"names":[],"mappings":";;AAEA,IAAI,KAAK,GAAmB;IAC1B;QACE,OAAO,EAAE,mBAAmB;QAC5B,WAAW,EAAE,UAAU;QACvB,YAAY,EAAE;YACZ,aAAa,EAAE;gBACb,gBAAgB,EAAE,CAAC,kCAAkC,CAAC;aACvD;YACD,+BAA+B,EAAE;gBAC/B,gBAAgB,EAAE,CAAC,kCAAkC,CAAC;aACvD;YACD,yCAAyC,EAAE;gBACzC,gBAAgB,EAAE,CAAC,4BAA4B,CAAC;aACjD;SACF;KACF;CACF,CAAC;AAEF,kBAAe,KAAK,CAAC","sourcesContent":["import { PackageRules } from '..';\n\nlet rules: PackageRules[] = [\n {\n package: '@ember-data/store',\n semverRange: '<=4.11.0',\n addonModules: {\n '-private.js': {\n dependsOnModules: ['@ember-data/record-data/-private'],\n },\n '-private/system/core-store.js': {\n dependsOnModules: ['@ember-data/record-data/-private'],\n },\n '-private/system/model/internal-model.js': {\n dependsOnModules: ['@ember-data/model/-private'],\n },\n },\n },\n];\n\nexport default rules;\n"]}

package/src/audit/babel-visitor.d.ts CHANGED Viewed

@@ -28,6 +28,7 @@ export declare function auditJS(rawSource: string, filename: string, babelConfig
         detail: string;
         codeFrameIndex: number | undefined;
     }[];
+    transpiledContent: string;
 };
 export declare class CodeFrameStorage {
     private codeFrames;

package/src/audit/babel-visitor.js CHANGED Viewed

@@ -27,7 +27,7 @@ function auditJS(rawSource, filename, babelConfig, frames) {
     let sawExports = false;
     let sawDefine = false;
     /* eslint-enable @typescript-eslint/no-inferrable-types */
-    let ast = (0, core_1.transformSync)(rawSource, Object.assign({ filename: filename }, babelConfig)).ast;
+    let { ast, code } = (0, core_1.transformSync)(rawSource, Object.assign({ filename: filename }, babelConfig));
     let saveCodeFrame = frames.forSource(rawSource);
     (0, traverse_1.default)(ast, {
         Identifier(path) {
@@ -141,7 +141,7 @@ function auditJS(rawSource, filename, babelConfig, frames) {
     });
     let isCJS = imports.length === 0 && exports.size === 0 && (sawModule || sawExports);
     let isAMD = imports.length === 0 && exports.size === 0 && sawDefine;
-    return { imports, exports, isCJS, isAMD, problems };
+    return { imports, exports, isCJS, isAMD, problems, transpiledContent: code };
 }
 exports.auditJS = auditJS;
 class CodeFrameStorage {

package/src/audit/babel-visitor.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"babel-visitor.js","sourceRoot":"","sources":["babel-visitor.ts"],"names":[],"mappings":";;;;;;AAAA,+DAA2D;AAC3D,sCAA0E;AAC1E,kDAAqE;AAErE,MAAa,YAAY;CAAG;AAA5B,oCAA4B;AAgB5B,SAAgB,iBAAiB,CAAC,KAA+B;IAC/D,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC;AACnC,CAAC;AAFD,8CAEC;AAMD,yCAAyC;AACzC,SAAgB,OAAO,CAAC,SAAiB,EAAE,QAAgB,EAAE,WAA6B,EAAE,MAAwB;IAClH,IAAI,OAAO,GAAG,EAAsB,CAAC;IACrC,IAAI,OAAO,GAAG,IAAI,GAAG,EAAsB,CAAC;IAC5C,IAAI,QAAQ,GAAG,EAA+E,CAAC;IAE/F,2DAA2D;IAC3D,4EAA4E;IAC5E,uEAAuE;IACvE,gBAAgB;IAChB,IAAI,SAAS,GAAY,KAAK,CAAC;IAC/B,IAAI,UAAU,GAAY,KAAK,CAAC;IAChC,IAAI,SAAS,GAAY,KAAK,CAAC;IAC/B,0DAA0D;IAE1D,IAAI,GAAG,GAAG,IAAA,oBAAa,EAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,WAAW,CAAC,CAAE,CAAC,GAAI,CAAC;IAC7F,IAAI,aAAa,GAAG,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAEhD,IAAA,kBAAQ,EAAC,GAAG,EAAE;QACZ,UAAU,CAAC,IAA4B;YACrC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE;gBACvD,SAAS,GAAG,IAAI,CAAC;aAClB;iBAAM,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE;gBAC/D,UAAU,GAAG,IAAI,CAAC;aACnB;iBAAM,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE;gBAC9D,SAAS,GAAG,IAAI,CAAC;aAClB;YACD,IAAI,0BAA0B,CAAC,IAAI,CAAC,EAAE;gBACpC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC7B;QACH,CAAC;QACD,cAAc,CAAC,IAAgC;YAC7C,IAAI,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAChC,IAAI,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,YAAY,CAAC,IAAI,YAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;gBACpF,IAAI,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;gBACjC,IAAI,GAAG,CAAC,IAAI,KAAK,eAAe,EAAE;oBAChC,OAAO,CAAC,IAAI,CAAC;wBACX,MAAM,EAAE,GAAG,CAAC,KAAK;wBACjB,cAAc,EAAE,aAAa,CAAC,GAAG,CAAC;wBAClC,UAAU,EAAE,EAAE;qBACf,CAAC,CAAC;iBACJ;qBAAM;oBACL,QAAQ,CAAC,IAAI,CAAC;wBACZ,OAAO,EAAE,oDAAoD,YAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,EAAE;wBAC3G,MAAM,EAAE,GAAG,CAAC,IAAI;wBAChB,cAAc,EAAE,aAAa,CAAC,GAAG,CAAC;qBACnC,CAAC,CAAC;iBACJ;aACF;QACH,CAAC;QACD,iBAAiB,CAAC,IAAmC;YACnD,OAAO,CAAC,IAAI,CAAC;gBACX,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK;gBAC9B,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;gBAC/C,UAAU,EAAE,EAAE;aACf,CAAC,CAAC;QACL,CAAC;QACD,sBAAsB,CAAC,IAAwC;YAC7D,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;gBAC1C,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI;gBAC3B,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;aACzC,CAAC,CAAC;QACL,CAAC;QACD,wBAAwB,CAAC,IAA0C;YACjE,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;gBAC1C,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;gBAC3B,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI;gBAC3B,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;aACzC,CAAC,CAAC;QACL,CAAC;QACD,eAAe,CAAC,IAAiC;YAC/C,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;gBAC1C,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;gBAC9B,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI;gBAC3B,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;aACzC,CAAC,CAAC;QACL,CAAC;QACD,wBAAwB,CAAC,KAA2C;YAClE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACzB,CAAC;QACD,eAAe,CAAC,IAAiC;YAC/C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YACtC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,wBAAwB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBACvE,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;oBAC1C,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;oBAC3B,KAAK,EAAE,IAAI;oBACX,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;iBACzC,CAAC,CAAC;aACJ;QACH,CAAC;QACD,wBAAwB,CAAC,IAA0C;YACjE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YACtC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,wBAAwB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBACvE,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;oBAC1C,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;oBAC3B,KAAK,EAAE,IAAI;oBACX,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;iBACzC,CAAC,CAAC;aACJ;QACH,CAAC;QACD,oBAAoB,CAAC,IAAsC;YACzD,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;YAC7C,OAAO,CAAC,IAAI,CAAC;gBACX,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK;gBAC9B,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;gBAC/C,UAAU,EAAE;oBACV;wBACE,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;wBAC3B,KAAK,EAAE,IAAI;wBACX,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;qBACzC;iBACF;aACF,CAAC,CAAC;QACL,CAAC;QACD,sBAAsB,CAAC,IAAwC;YAC7D,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gBACpB,OAAO,CAAC,IAAI,CAAC;oBACX,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK;oBAC9B,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;oBAC/C,UAAU,EAAE,EAAE;iBACf,CAAC,CAAC;aACJ;QACH,CAAC;KACF,CAAC,CAAC;IAEH,IAAI,KAAK,GAAG,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,IAAI,UAAU,CAAC,CAAC;IACpF,IAAI,KAAK,GAAG,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,KAAK,CAAC,IAAI,SAAS,CAAC;IACpE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;AACtD,CAAC;AAhID,0BAgIC;AAED,MAAa,gBAAgB;IAA7B;QACU,eAAU,GAAG,EAAuD,CAAC;QACrE,eAAU,GAAG,EAAc,CAAC;IA4BtC,CAAC;IA1BC,SAAS,CAAC,SAAiB;QACzB,IAAI,cAAkC,CAAC;QACvC,OAAO,CAAC,IAAiD,EAAE,EAAE;YAC3D,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;YACnB,IAAI,CAAC,GAAG,EAAE;gBACR,OAAO;aACR;YACD,IAAI,cAAc,IAAI,IAAI,EAAE;gBAC1B,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;gBACxC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aACjC;YACD,IAAI,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;YAC5C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;gBACnB,cAAc;gBACd,GAAG;aACJ,CAAC,CAAC;YACH,OAAO,cAAc,CAAC;QACxB,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,cAAkC;QACvC,IAAI,cAAc,IAAI,IAAI,EAAE;YAC1B,IAAI,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;YAC9D,OAAO,IAAA,6BAAgB,EAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;SACxF;IACH,CAAC;CACF;AA9BD,4CA8BC;AAED,SAAS,IAAI,CAAC,IAAoC;IAChD,IAAI,YAAC,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;QAC3B,OAAO,IAAI,CAAC,KAAK,CAAC;KACnB;SAAM;QACL,OAAO,IAAI,CAAC,IAAI,CAAC;KAClB;AACH,CAAC;AAED,SAAS,cAAc,CAAC,IAA4B;IAClD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,YAAY,GAA2B,IAAI,OAAO,EAAE,CAAC;AAE3D,SAAS,0BAA0B,CAAC,IAAc;IAChD,IAAI,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC/B,OAAO,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAE,CAAC;KACrC;SAAM;QACL,IAAI,MAAM,GAAG,2BAA2B,CAAC,IAAI,CAAC,CAAC;QAC/C,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACpC,OAAO,MAAM,CAAC;KACf;AACH,CAAC;AAED,SAAS,2BAA2B,CAAC,IAAc;IACjD,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IACzB,QAAQ,MAAM,CAAC,IAAI,EAAE;QACnB,KAAK,wBAAwB;YAC3B,OAAO,MAAM,CAAC,WAAW,KAAK,IAAI,CAAC,IAAI,CAAC;QAC1C,KAAK,qBAAqB,CAAC;QAC3B,KAAK,eAAe,CAAC;QACrB,KAAK,cAAc,CAAC;QACpB,KAAK,aAAa;YAChB,OAAO,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACrD,KAAK,oBAAoB;YACvB,OAAO,MAAM,CAAC,EAAE,KAAK,IAAI,CAAC,IAAI,IAAI,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAChF,KAAK,gBAAgB;YACnB,OAAO,MAAM,CAAC,KAAK,KAAK,IAAI,CAAC,IAAI,IAAI,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACnF,KAAK,mBAAmB;YACtB,OAAO,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,IAAI,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAClF,KAAK,qBAAqB,CAAC;QAC3B,KAAK,kBAAkB;YACrB,OAAO,MAAM,CAAC,EAAE,KAAK,IAAI,CAAC,IAAI,IAAI,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAChF;YACE,OAAO,KAAK,CAAC;KAChB;AACH,CAAC","sourcesContent":["import traverse, { NodePath, Node } from '@babel/traverse';\nimport { TransformOptions, transformSync, types as t } from '@babel/core';\nimport { codeFrameColumns, SourceLocation } from '@babel/code-frame';\n\nexport class VisitorState {}\n\nexport interface InternalImport {\n source: string;\n codeFrameIndex: number \| undefined;\n specifiers: {\n name: string \| NamespaceMarker;\n local: string \| null; // can be null when re-exporting, because in that case we import `name` from `source` but don't create any local binding for it\n codeFrameIndex: number \| undefined;\n }[];\n}\n\nexport interface NamespaceMarker {\n isNamespace: true;\n}\n\nexport function isNamespaceMarker(value: string \| NamespaceMarker): value is NamespaceMarker {\n return typeof value !== 'string';\n}\n\nexport interface ExportAll {\n all: string;\n}\n\n// babelConfig must include { ast: true }\nexport function auditJS(rawSource: string, filename: string, babelConfig: TransformOptions, frames: CodeFrameStorage) {\n let imports = [] as InternalImport[];\n let exports = new Set<string \| ExportAll>();\n let problems = [] as { message: string; detail: string; codeFrameIndex: number \| undefined }[];\n\n /* eslint-disable @typescript-eslint/no-inferrable-types /\n // These are not really inferrable. Without explicit declarations, TS thinks\n // they're always false because it doesn't know the handler methods run\n // synchronously\n let sawModule: boolean = false;\n let sawExports: boolean = false;\n let sawDefine: boolean = false;\n / eslint-enable @typescript-eslint/no-inferrable-types */\n\n let ast = transformSync(rawSource, Object.assign({ filename: filename }, babelConfig))!.ast!;\n let saveCodeFrame = frames.forSource(rawSource);\n\n traverse(ast, {\n Identifier(path: NodePath<t.Identifier>) {\n if (path.node.name === 'module' && isFreeVariable(path)) {\n sawModule = true;\n } else if (path.node.name === 'exports' && isFreeVariable(path)) {\n sawExports = true;\n } else if (path.node.name === 'define' && isFreeVariable(path)) {\n sawDefine = true;\n }\n if (inExportDeclarationContext(path)) {\n exports.add(path.node.name);\n }\n },\n CallExpression(path: NodePath<t.CallExpression>) {\n let callee = path.get('callee');\n if (callee.referencesImport('@embroider/macros', 'importSync') \|\| t.isImport(callee)) {\n let arg = path.node.arguments[0];\n if (arg.type === 'StringLiteral') {\n imports.push({\n source: arg.value,\n codeFrameIndex: saveCodeFrame(arg),\n specifiers: [],\n });\n } else {\n problems.push({\n message: `audit tool is unable to understand this usage of ${t.isImport(callee) ? 'import' : 'importSync'}`,\n detail: arg.type,\n codeFrameIndex: saveCodeFrame(arg),\n });\n }\n }\n },\n ImportDeclaration(path: NodePath<t.ImportDeclaration>) {\n imports.push({\n source: path.node.source.value,\n codeFrameIndex: saveCodeFrame(path.node.source),\n specifiers: [],\n });\n },\n ImportDefaultSpecifier(path: NodePath<t.ImportDefaultSpecifier>) {\n imports[imports.length - 1].specifiers.push({\n name: 'default',\n local: path.node.local.name,\n codeFrameIndex: saveCodeFrame(path.node),\n });\n },\n ImportNamespaceSpecifier(path: NodePath<t.ImportNamespaceSpecifier>) {\n imports[imports.length - 1].specifiers.push({\n name: { isNamespace: true },\n local: path.node.local.name,\n codeFrameIndex: saveCodeFrame(path.node),\n });\n },\n ImportSpecifier(path: NodePath<t.ImportSpecifier>) {\n imports[imports.length - 1].specifiers.push({\n name: name(path.node.imported),\n local: path.node.local.name,\n codeFrameIndex: saveCodeFrame(path.node),\n });\n },\n ExportDefaultDeclaration(_path: NodePath<t.ExportDefaultDeclaration>) {\n exports.add('default');\n },\n ExportSpecifier(path: NodePath<t.ExportSpecifier>) {\n exports.add(name(path.node.exported));\n if (path.parent.type === 'ExportNamedDeclaration' && path.parent.source) {\n imports[imports.length - 1].specifiers.push({\n name: name(path.node.local),\n local: null, // re-exports don't create local bindings\n codeFrameIndex: saveCodeFrame(path.node),\n });\n }\n },\n ExportNamespaceSpecifier(path: NodePath<t.ExportNamespaceSpecifier>) {\n exports.add(name(path.node.exported));\n if (path.parent.type === 'ExportNamedDeclaration' && path.parent.source) {\n imports[imports.length - 1].specifiers.push({\n name: { isNamespace: true },\n local: null, // re-exports don't create local bindings\n codeFrameIndex: saveCodeFrame(path.node),\n });\n }\n },\n ExportAllDeclaration(path: NodePath<t.ExportAllDeclaration>) {\n exports.add({ all: path.node.source.value });\n imports.push({\n source: path.node.source.value,\n codeFrameIndex: saveCodeFrame(path.node.source),\n specifiers: [\n {\n name: { isNamespace: true },\n local: null,\n codeFrameIndex: saveCodeFrame(path.node),\n },\n ],\n });\n },\n ExportNamedDeclaration(path: NodePath<t.ExportNamedDeclaration>) {\n if (path.node.source) {\n imports.push({\n source: path.node.source.value,\n codeFrameIndex: saveCodeFrame(path.node.source),\n specifiers: [],\n });\n }\n },\n });\n\n let isCJS = imports.length === 0 && exports.size === 0 && (sawModule \|\| sawExports);\n let isAMD = imports.length === 0 && exports.size === 0 && sawDefine;\n return { imports, exports, isCJS, isAMD, problems };\n}\n\nexport class CodeFrameStorage {\n private codeFrames = [] as { rawSourceIndex: number; loc: SourceLocation }[];\n private rawSources = [] as string[];\n\n forSource(rawSource: string): (node: { loc?: SourceLocation \| null }) => number \| undefined {\n let rawSourceIndex: number \| undefined;\n return (node: { loc?: SourceLocation \| null \| undefined }) => {\n let loc = node.loc;\n if (!loc) {\n return;\n }\n if (rawSourceIndex == null) {\n rawSourceIndex = this.rawSources.length;\n this.rawSources.push(rawSource);\n }\n let codeFrameIndex = this.codeFrames.length;\n this.codeFrames.push({\n rawSourceIndex,\n loc,\n });\n return codeFrameIndex;\n };\n }\n\n render(codeFrameIndex: number \| undefined): string \| undefined {\n if (codeFrameIndex != null) {\n let { loc, rawSourceIndex } = this.codeFrames[codeFrameIndex];\n return codeFrameColumns(this.rawSources[rawSourceIndex], loc, { highlightCode: true });\n }\n }\n}\n\nfunction name(node: t.StringLiteral \| t.Identifier): string {\n if (t.isStringLiteral(node)) {\n return node.value;\n } else {\n return node.name;\n }\n}\n\nfunction isFreeVariable(path: NodePath<t.Identifier>) {\n return !path.scope.hasBinding(path.node.name);\n}\n\nconst contextCache: WeakMap<Node, boolean> = new WeakMap();\n\nfunction inExportDeclarationContext(path: NodePath): boolean {\n if (contextCache.has(path.node)) {\n return contextCache.get(path.node)!;\n } else {\n let answer = _inExportDeclarationContext(path);\n contextCache.set(path.node, answer);\n return answer;\n }\n}\n\nfunction _inExportDeclarationContext(path: NodePath): boolean {\n let parent = path.parent;\n switch (parent.type) {\n case 'ExportNamedDeclaration':\n return parent.declaration === path.node;\n case 'VariableDeclaration':\n case 'ObjectPattern':\n case 'ArrayPattern':\n case 'RestElement':\n return inExportDeclarationContext(path.parentPath);\n case 'VariableDeclarator':\n return parent.id === path.node && inExportDeclarationContext(path.parentPath);\n case 'ObjectProperty':\n return parent.value === path.node && inExportDeclarationContext(path.parentPath);\n case 'AssignmentPattern':\n return parent.left === path.node && inExportDeclarationContext(path.parentPath);\n case 'FunctionDeclaration':\n case 'ClassDeclaration':\n return parent.id === path.node && inExportDeclarationContext(path.parentPath);\n default:\n return false;\n }\n}\n"]}
1	+ {"version":3,"file":"babel-visitor.js","sourceRoot":"","sources":["babel-visitor.ts"],"names":[],"mappings":";;;;;;AAAA,+DAA2D;AAC3D,sCAA0E;AAC1E,kDAAqE;AAErE,MAAa,YAAY;CAAG;AAA5B,oCAA4B;AAgB5B,SAAgB,iBAAiB,CAAC,KAA+B;IAC/D,OAAO,OAAO,KAAK,KAAK,QAAQ,CAAC;AACnC,CAAC;AAFD,8CAEC;AAMD,yCAAyC;AACzC,SAAgB,OAAO,CAAC,SAAiB,EAAE,QAAgB,EAAE,WAA6B,EAAE,MAAwB;IAClH,IAAI,OAAO,GAAG,EAAsB,CAAC;IACrC,IAAI,OAAO,GAAG,IAAI,GAAG,EAAsB,CAAC;IAC5C,IAAI,QAAQ,GAAG,EAA+E,CAAC;IAE/F,2DAA2D;IAC3D,4EAA4E;IAC5E,uEAAuE;IACvE,gBAAgB;IAChB,IAAI,SAAS,GAAY,KAAK,CAAC;IAC/B,IAAI,UAAU,GAAY,KAAK,CAAC;IAChC,IAAI,SAAS,GAAY,KAAK,CAAC;IAC/B,0DAA0D;IAE1D,IAAI,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,IAAA,oBAAa,EAAC,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,WAAW,CAAC,CAAE,CAAC;IAClG,IAAI,aAAa,GAAG,MAAM,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC;IAEhD,IAAA,kBAAQ,EAAC,GAAI,EAAE;QACb,UAAU,CAAC,IAA4B;YACrC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE;gBACvD,SAAS,GAAG,IAAI,CAAC;aAClB;iBAAM,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE;gBAC/D,UAAU,GAAG,IAAI,CAAC;aACnB;iBAAM,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,IAAI,cAAc,CAAC,IAAI,CAAC,EAAE;gBAC9D,SAAS,GAAG,IAAI,CAAC;aAClB;YACD,IAAI,0BAA0B,CAAC,IAAI,CAAC,EAAE;gBACpC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aAC7B;QACH,CAAC;QACD,cAAc,CAAC,IAAgC;YAC7C,IAAI,MAAM,GAAG,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAChC,IAAI,MAAM,CAAC,gBAAgB,CAAC,mBAAmB,EAAE,YAAY,CAAC,IAAI,YAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;gBACpF,IAAI,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;gBACjC,IAAI,GAAG,CAAC,IAAI,KAAK,eAAe,EAAE;oBAChC,OAAO,CAAC,IAAI,CAAC;wBACX,MAAM,EAAE,GAAG,CAAC,KAAK;wBACjB,cAAc,EAAE,aAAa,CAAC,GAAG,CAAC;wBAClC,UAAU,EAAE,EAAE;qBACf,CAAC,CAAC;iBACJ;qBAAM;oBACL,QAAQ,CAAC,IAAI,CAAC;wBACZ,OAAO,EAAE,oDAAoD,YAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,EAAE;wBAC3G,MAAM,EAAE,GAAG,CAAC,IAAI;wBAChB,cAAc,EAAE,aAAa,CAAC,GAAG,CAAC;qBACnC,CAAC,CAAC;iBACJ;aACF;QACH,CAAC;QACD,iBAAiB,CAAC,IAAmC;YACnD,OAAO,CAAC,IAAI,CAAC;gBACX,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK;gBAC9B,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;gBAC/C,UAAU,EAAE,EAAE;aACf,CAAC,CAAC;QACL,CAAC;QACD,sBAAsB,CAAC,IAAwC;YAC7D,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;gBAC1C,IAAI,EAAE,SAAS;gBACf,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI;gBAC3B,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;aACzC,CAAC,CAAC;QACL,CAAC;QACD,wBAAwB,CAAC,IAA0C;YACjE,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;gBAC1C,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;gBAC3B,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI;gBAC3B,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;aACzC,CAAC,CAAC;QACL,CAAC;QACD,eAAe,CAAC,IAAiC;YAC/C,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;gBAC1C,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC;gBAC9B,KAAK,EAAE,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI;gBAC3B,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;aACzC,CAAC,CAAC;QACL,CAAC;QACD,wBAAwB,CAAC,KAA2C;YAClE,OAAO,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QACzB,CAAC;QACD,eAAe,CAAC,IAAiC;YAC/C,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YACtC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,wBAAwB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBACvE,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;oBAC1C,IAAI,EAAE,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC;oBAC3B,KAAK,EAAE,IAAI;oBACX,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;iBACzC,CAAC,CAAC;aACJ;QACH,CAAC;QACD,wBAAwB,CAAC,IAA0C;YACjE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC;YACtC,IAAI,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,wBAAwB,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;gBACvE,OAAO,CAAC,OAAO,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;oBAC1C,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;oBAC3B,KAAK,EAAE,IAAI;oBACX,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;iBACzC,CAAC,CAAC;aACJ;QACH,CAAC;QACD,oBAAoB,CAAC,IAAsC;YACzD,OAAO,CAAC,GAAG,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC;YAC7C,OAAO,CAAC,IAAI,CAAC;gBACX,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK;gBAC9B,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;gBAC/C,UAAU,EAAE;oBACV;wBACE,IAAI,EAAE,EAAE,WAAW,EAAE,IAAI,EAAE;wBAC3B,KAAK,EAAE,IAAI;wBACX,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC;qBACzC;iBACF;aACF,CAAC,CAAC;QACL,CAAC;QACD,sBAAsB,CAAC,IAAwC;YAC7D,IAAI,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;gBACpB,OAAO,CAAC,IAAI,CAAC;oBACX,MAAM,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK;oBAC9B,cAAc,EAAE,aAAa,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;oBAC/C,UAAU,EAAE,EAAE;iBACf,CAAC,CAAC;aACJ;QACH,CAAC;KACF,CAAC,CAAC;IAEH,IAAI,KAAK,GAAG,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,IAAI,UAAU,CAAC,CAAC;IACpF,IAAI,KAAK,GAAG,OAAO,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,IAAI,KAAK,CAAC,IAAI,SAAS,CAAC;IACpE,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,iBAAiB,EAAE,IAAK,EAAE,CAAC;AAChF,CAAC;AAhID,0BAgIC;AAED,MAAa,gBAAgB;IAA7B;QACU,eAAU,GAAG,EAAuD,CAAC;QACrE,eAAU,GAAG,EAAc,CAAC;IA4BtC,CAAC;IA1BC,SAAS,CAAC,SAAiB;QACzB,IAAI,cAAkC,CAAC;QACvC,OAAO,CAAC,IAAiD,EAAE,EAAE;YAC3D,IAAI,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC;YACnB,IAAI,CAAC,GAAG,EAAE;gBACR,OAAO;aACR;YACD,IAAI,cAAc,IAAI,IAAI,EAAE;gBAC1B,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;gBACxC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;aACjC;YACD,IAAI,cAAc,GAAG,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC;YAC5C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;gBACnB,cAAc;gBACd,GAAG;aACJ,CAAC,CAAC;YACH,OAAO,cAAc,CAAC;QACxB,CAAC,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,cAAkC;QACvC,IAAI,cAAc,IAAI,IAAI,EAAE;YAC1B,IAAI,EAAE,GAAG,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;YAC9D,OAAO,IAAA,6BAAgB,EAAC,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,EAAE,GAAG,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;SACxF;IACH,CAAC;CACF;AA9BD,4CA8BC;AAED,SAAS,IAAI,CAAC,IAAoC;IAChD,IAAI,YAAC,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE;QAC3B,OAAO,IAAI,CAAC,KAAK,CAAC;KACnB;SAAM;QACL,OAAO,IAAI,CAAC,IAAI,CAAC;KAClB;AACH,CAAC;AAED,SAAS,cAAc,CAAC,IAA4B;IAClD,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAChD,CAAC;AAED,MAAM,YAAY,GAA2B,IAAI,OAAO,EAAE,CAAC;AAE3D,SAAS,0BAA0B,CAAC,IAAc;IAChD,IAAI,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC/B,OAAO,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,CAAE,CAAC;KACrC;SAAM;QACL,IAAI,MAAM,GAAG,2BAA2B,CAAC,IAAI,CAAC,CAAC;QAC/C,YAAY,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QACpC,OAAO,MAAM,CAAC;KACf;AACH,CAAC;AAED,SAAS,2BAA2B,CAAC,IAAc;IACjD,IAAI,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;IACzB,QAAQ,MAAM,CAAC,IAAI,EAAE;QACnB,KAAK,wBAAwB;YAC3B,OAAO,MAAM,CAAC,WAAW,KAAK,IAAI,CAAC,IAAI,CAAC;QAC1C,KAAK,qBAAqB,CAAC;QAC3B,KAAK,eAAe,CAAC;QACrB,KAAK,cAAc,CAAC;QACpB,KAAK,aAAa;YAChB,OAAO,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACrD,KAAK,oBAAoB;YACvB,OAAO,MAAM,CAAC,EAAE,KAAK,IAAI,CAAC,IAAI,IAAI,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAChF,KAAK,gBAAgB;YACnB,OAAO,MAAM,CAAC,KAAK,KAAK,IAAI,CAAC,IAAI,IAAI,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QACnF,KAAK,mBAAmB;YACtB,OAAO,MAAM,CAAC,IAAI,KAAK,IAAI,CAAC,IAAI,IAAI,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAClF,KAAK,qBAAqB,CAAC;QAC3B,KAAK,kBAAkB;YACrB,OAAO,MAAM,CAAC,EAAE,KAAK,IAAI,CAAC,IAAI,IAAI,0BAA0B,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAChF;YACE,OAAO,KAAK,CAAC;KAChB;AACH,CAAC","sourcesContent":["import traverse, { NodePath, Node } from '@babel/traverse';\nimport { TransformOptions, transformSync, types as t } from '@babel/core';\nimport { codeFrameColumns, SourceLocation } from '@babel/code-frame';\n\nexport class VisitorState {}\n\nexport interface InternalImport {\n source: string;\n codeFrameIndex: number \| undefined;\n specifiers: {\n name: string \| NamespaceMarker;\n local: string \| null; // can be null when re-exporting, because in that case we import `name` from `source` but don't create any local binding for it\n codeFrameIndex: number \| undefined;\n }[];\n}\n\nexport interface NamespaceMarker {\n isNamespace: true;\n}\n\nexport function isNamespaceMarker(value: string \| NamespaceMarker): value is NamespaceMarker {\n return typeof value !== 'string';\n}\n\nexport interface ExportAll {\n all: string;\n}\n\n// babelConfig must include { ast: true }\nexport function auditJS(rawSource: string, filename: string, babelConfig: TransformOptions, frames: CodeFrameStorage) {\n let imports = [] as InternalImport[];\n let exports = new Set<string \| ExportAll>();\n let problems = [] as { message: string; detail: string; codeFrameIndex: number \| undefined }[];\n\n /* eslint-disable @typescript-eslint/no-inferrable-types /\n // These are not really inferrable. Without explicit declarations, TS thinks\n // they're always false because it doesn't know the handler methods run\n // synchronously\n let sawModule: boolean = false;\n let sawExports: boolean = false;\n let sawDefine: boolean = false;\n / eslint-enable @typescript-eslint/no-inferrable-types */\n\n let { ast, code } = transformSync(rawSource, Object.assign({ filename: filename }, babelConfig))!;\n let saveCodeFrame = frames.forSource(rawSource);\n\n traverse(ast!, {\n Identifier(path: NodePath<t.Identifier>) {\n if (path.node.name === 'module' && isFreeVariable(path)) {\n sawModule = true;\n } else if (path.node.name === 'exports' && isFreeVariable(path)) {\n sawExports = true;\n } else if (path.node.name === 'define' && isFreeVariable(path)) {\n sawDefine = true;\n }\n if (inExportDeclarationContext(path)) {\n exports.add(path.node.name);\n }\n },\n CallExpression(path: NodePath<t.CallExpression>) {\n let callee = path.get('callee');\n if (callee.referencesImport('@embroider/macros', 'importSync') \|\| t.isImport(callee)) {\n let arg = path.node.arguments[0];\n if (arg.type === 'StringLiteral') {\n imports.push({\n source: arg.value,\n codeFrameIndex: saveCodeFrame(arg),\n specifiers: [],\n });\n } else {\n problems.push({\n message: `audit tool is unable to understand this usage of ${t.isImport(callee) ? 'import' : 'importSync'}`,\n detail: arg.type,\n codeFrameIndex: saveCodeFrame(arg),\n });\n }\n }\n },\n ImportDeclaration(path: NodePath<t.ImportDeclaration>) {\n imports.push({\n source: path.node.source.value,\n codeFrameIndex: saveCodeFrame(path.node.source),\n specifiers: [],\n });\n },\n ImportDefaultSpecifier(path: NodePath<t.ImportDefaultSpecifier>) {\n imports[imports.length - 1].specifiers.push({\n name: 'default',\n local: path.node.local.name,\n codeFrameIndex: saveCodeFrame(path.node),\n });\n },\n ImportNamespaceSpecifier(path: NodePath<t.ImportNamespaceSpecifier>) {\n imports[imports.length - 1].specifiers.push({\n name: { isNamespace: true },\n local: path.node.local.name,\n codeFrameIndex: saveCodeFrame(path.node),\n });\n },\n ImportSpecifier(path: NodePath<t.ImportSpecifier>) {\n imports[imports.length - 1].specifiers.push({\n name: name(path.node.imported),\n local: path.node.local.name,\n codeFrameIndex: saveCodeFrame(path.node),\n });\n },\n ExportDefaultDeclaration(_path: NodePath<t.ExportDefaultDeclaration>) {\n exports.add('default');\n },\n ExportSpecifier(path: NodePath<t.ExportSpecifier>) {\n exports.add(name(path.node.exported));\n if (path.parent.type === 'ExportNamedDeclaration' && path.parent.source) {\n imports[imports.length - 1].specifiers.push({\n name: name(path.node.local),\n local: null, // re-exports don't create local bindings\n codeFrameIndex: saveCodeFrame(path.node),\n });\n }\n },\n ExportNamespaceSpecifier(path: NodePath<t.ExportNamespaceSpecifier>) {\n exports.add(name(path.node.exported));\n if (path.parent.type === 'ExportNamedDeclaration' && path.parent.source) {\n imports[imports.length - 1].specifiers.push({\n name: { isNamespace: true },\n local: null, // re-exports don't create local bindings\n codeFrameIndex: saveCodeFrame(path.node),\n });\n }\n },\n ExportAllDeclaration(path: NodePath<t.ExportAllDeclaration>) {\n exports.add({ all: path.node.source.value });\n imports.push({\n source: path.node.source.value,\n codeFrameIndex: saveCodeFrame(path.node.source),\n specifiers: [\n {\n name: { isNamespace: true },\n local: null,\n codeFrameIndex: saveCodeFrame(path.node),\n },\n ],\n });\n },\n ExportNamedDeclaration(path: NodePath<t.ExportNamedDeclaration>) {\n if (path.node.source) {\n imports.push({\n source: path.node.source.value,\n codeFrameIndex: saveCodeFrame(path.node.source),\n specifiers: [],\n });\n }\n },\n });\n\n let isCJS = imports.length === 0 && exports.size === 0 && (sawModule \|\| sawExports);\n let isAMD = imports.length === 0 && exports.size === 0 && sawDefine;\n return { imports, exports, isCJS, isAMD, problems, transpiledContent: code! };\n}\n\nexport class CodeFrameStorage {\n private codeFrames = [] as { rawSourceIndex: number; loc: SourceLocation }[];\n private rawSources = [] as string[];\n\n forSource(rawSource: string): (node: { loc?: SourceLocation \| null }) => number \| undefined {\n let rawSourceIndex: number \| undefined;\n return (node: { loc?: SourceLocation \| null \| undefined }) => {\n let loc = node.loc;\n if (!loc) {\n return;\n }\n if (rawSourceIndex == null) {\n rawSourceIndex = this.rawSources.length;\n this.rawSources.push(rawSource);\n }\n let codeFrameIndex = this.codeFrames.length;\n this.codeFrames.push({\n rawSourceIndex,\n loc,\n });\n return codeFrameIndex;\n };\n }\n\n render(codeFrameIndex: number \| undefined): string \| undefined {\n if (codeFrameIndex != null) {\n let { loc, rawSourceIndex } = this.codeFrames[codeFrameIndex];\n return codeFrameColumns(this.rawSources[rawSourceIndex], loc, { highlightCode: true });\n }\n }\n}\n\nfunction name(node: t.StringLiteral \| t.Identifier): string {\n if (t.isStringLiteral(node)) {\n return node.value;\n } else {\n return node.name;\n }\n}\n\nfunction isFreeVariable(path: NodePath<t.Identifier>) {\n return !path.scope.hasBinding(path.node.name);\n}\n\nconst contextCache: WeakMap<Node, boolean> = new WeakMap();\n\nfunction inExportDeclarationContext(path: NodePath): boolean {\n if (contextCache.has(path.node)) {\n return contextCache.get(path.node)!;\n } else {\n let answer = _inExportDeclarationContext(path);\n contextCache.set(path.node, answer);\n return answer;\n }\n}\n\nfunction _inExportDeclarationContext(path: NodePath): boolean {\n let parent = path.parent;\n switch (parent.type) {\n case 'ExportNamedDeclaration':\n return parent.declaration === path.node;\n case 'VariableDeclaration':\n case 'ObjectPattern':\n case 'ArrayPattern':\n case 'RestElement':\n return inExportDeclarationContext(path.parentPath);\n case 'VariableDeclarator':\n return parent.id === path.node && inExportDeclarationContext(path.parentPath);\n case 'ObjectProperty':\n return parent.value === path.node && inExportDeclarationContext(path.parentPath);\n case 'AssignmentPattern':\n return parent.left === path.node && inExportDeclarationContext(path.parentPath);\n case 'FunctionDeclaration':\n case 'ClassDeclaration':\n return parent.id === path.node && inExportDeclarationContext(path.parentPath);\n default:\n return false;\n }\n}\n"]}

package/src/audit/build.js CHANGED Viewed

@@ -1,57 +1,20 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isBuildError = exports.BuildError = exports.buildApp = void 0;
 const chalk_1 = __importDefault(require("chalk"));
-const resolve_1 = __importDefault(require("resolve"));
-const capture_1 = require("./capture");
+const child_process_1 = require("child_process");
 async function buildApp(options) {
-    let { default: cli } = await Promise.resolve().then(() => __importStar(require(resolve_1.default.sync('ember-cli', { basedir: options.app }))));
-    process.env.STAGE2_ONLY = 'true';
-    let capture = new capture_1.CaptureStream();
-    let orig = { cwd: process.cwd(), log: console.log, error: console.error, warn: console.warn };
-    process.chdir(options.app);
-    // this is icky, but too many things in the build don't respect the
-    // `outputStream`, etc, options we pass below.
-    console.log = console.warn = console.error = capture.log;
-    try {
-        let result = await cli({
-            cliArgs: ['build'],
-            outputStream: capture,
-            errorStream: capture,
-        });
-        let exitCode = typeof result === 'object' ? result.exitCode : result;
-        // an undefined exit code means success, because of course it does.
-        if (exitCode != null && exitCode !== 0) {
-            throw new BuildError(`${chalk_1.default.yellow('Unable to begin audit')} because the build failed. Build output follows:\n${capture.output}`);
-        }
-    }
-    finally {
-        process.chdir(orig.cwd);
-        console.log = orig.log;
-        console.warn = orig.warn;
-        console.error = orig.error;
+    let result = await execute(`node node_modules/ember-cli/bin/ember build`, {
+        pwd: options.app,
+        env: {
+            STAGE2_ONLY: 'true',
+        },
+    });
+    if (result.exitCode !== 0) {
+        throw new BuildError(`${chalk_1.default.yellow('Unable to begin audit')} because the build failed. Build output follows:\n${result.output}`);
     }
 }
 exports.buildApp = buildApp;
@@ -66,4 +29,43 @@ function isBuildError(err) {
     return err === null || err === void 0 ? void 0 : err.isBuildError;
 }
 exports.isBuildError = isBuildError;
+async function execute(shellCommand, opts) {
+    let env;
+    if (opts === null || opts === void 0 ? void 0 : opts.env) {
+        env = { ...process.env, ...opts.env };
+    }
+    let child = (0, child_process_1.spawn)(shellCommand, {
+        stdio: ['inherit', 'pipe', 'pipe'],
+        cwd: opts === null || opts === void 0 ? void 0 : opts.pwd,
+        shell: true,
+        env,
+    });
+    let stderrBuffer = [];
+    let stdoutBuffer = [];
+    let combinedBuffer = [];
+    child.stderr.on('data', data => {
+        stderrBuffer.push(data);
+        combinedBuffer.push(data);
+    });
+    child.stdout.on('data', data => {
+        stdoutBuffer.push(data);
+        combinedBuffer.push(data);
+    });
+    return new Promise(resolve => {
+        child.on('close', (exitCode) => {
+            resolve({
+                exitCode,
+                get stdout() {
+                    return stdoutBuffer.join('');
+                },
+                get stderr() {
+                    return stderrBuffer.join('');
+                },
+                get output() {
+                    return combinedBuffer.join('');
+                },
+            });
+        });
+    });
+}
 //# sourceMappingURL=build.js.map

package/src/audit/build.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"build.js","sourceRoot":"","sources":["build.ts"],"names":[],"mappings":"~~;;;;;;;;;;;;;;;;;;;;;;;;;~~AAAA,kDAA0B;~~AAC1B~~,~~sDAAoC~~;~~AAEpC~~,~~uCAA0C;AAEnC,~~KAAK,UAAU,QAAQ,CAAC,OAA0B;IACvD,IAAI,~~EAAE~~,OAAO,EAAE,GAAG,EAAE,GAAG,~~wDAAa~~,~~iBAAa~~,CAAC,IAAI,CAAC,~~WAAW~~,~~EAAE~~,EAAE,~~OAAO~~,~~EAAE~~,~~OAAO~~,~~CAAC~~,GAAG,~~EAAE~~,CAAC,~~GAAC~~,CAAC~~;IAC/F~~,~~OAAO~~,CAAC,~~GAAG~~,CAAC,~~WAAW~~,~~GAAG~~,~~MAAM~~,CAAC;~~IACjC~~,~~IAAI~~,~~OAAO~~,~~GAAG~~,~~IAAI~~,~~uBAAa~~,~~EAAE~~,~~CAAC~~;~~IAClC~~,~~IAAI~~,~~IAAI~~,~~GAAG~~,~~EAAE~~,GAAG,~~EAAE~~,~~OAAO~~,CAAC,~~GAAG~~,~~EAAE~~,~~EAAE~~,~~GAAG~~,~~EAAE~~,OAAO,~~CAAC~~,GAAG,~~EAAE~~,~~KAAK~~,~~EAAE~~,~~OAAO~~,CAAC,~~KAAK~~,~~EAAE~~,~~IAAI~~,~~EAAE~~,OAAO,~~CAAC~~,~~IAAI~~,~~EAAE~~,~~CAAC~~;~~IAC9F~~,~~OAAO~~,CAAC,~~KAAK~~,~~CAAC~~,~~OAAO~~,~~CAAC~~,~~GAAG~~,~~CAAC~~,~~CAAC;IAC3B~~,~~mEAAmE;IACnE~~,~~8CAA8C~~;~~IAC9C~~,~~OAAO~~,~~CAAC,~~GAAG,GAAG,OAAO,CAAC,~~IAAI,~~GAAG,~~OAAO~~,~~CAAC,KAAK,~~GAAG,~~OAAO~~,CAAC,GAAG,CAAC;~~IACzD,IAAI~~;~~QACF~~,IAAI,~~MAAM~~,GAAG,~~MAAM~~,~~GAAG~~,~~CAAC~~;~~YACrB~~,~~OAAO~~,EAAE,CAAC,~~OAAO~~,CAAC;~~YAClB~~,~~YAAY~~,EAAE,~~OAAO~~;~~YACrB~~,~~WAAW~~,EAAE,~~OAAO~~;~~SACrB~~,CAAC,CAAC;~~QACH~~,IAAI,~~QAAQ~~,~~GAAG~~,~~OAAO~~,~~MAAM~~,~~KAAK~~,~~QAAQ~~,~~CAAC~~,~~CAAC~~,CAAC,~~MAAM~~,CAAC,~~QAAQ~~,CAAC,CAAC,CAAC,MAAM,CAAC~~;QACrE~~,~~mEAAmE~~;~~QACnE~~,~~IAAI~~,~~QAAQ~~,IAAI,~~IAAI~~,IAAI,~~QAAQ~~,~~KAAK~~,CAAC,~~EAAE;YACtC~~,~~MAAM~~,IAAI,~~UAAU~~,~~CAClB~~,~~GAAG~~,~~eAAK~~,CAAC,~~MAAM~~,CAAC,~~uBAAuB~~,CAAC,~~qDAAqD~~,~~OAAO,~~CAAC,MAAM,EAAE,~~CAC9G~~,CAAC;~~SACH;KACF;YAAS;QACR~~,~~OAAO~~,CAAC,~~KAAK~~,CAAC,IAAI,CAAC,~~GAAG,~~CAAC~~,CAAC~~;QACxB,~~OAAO~~,CAAC,~~GAAG~~,~~GAAG~~,IAAI,CAAC,~~GAAG,~~CAAC;~~QACvB~~,~~OAAO~~,CAAC,~~IAAI~~,~~GAAG~~,IAAI,CAAC,~~IAAI~~,CAAC;~~QACzB~~,~~OAAO~~,CAAC,~~KAAK~~,~~GAAG~~,~~IAAI~~,CAAC,~~KAAK~~,~~CAAC~~;~~KAC5B;AACH~~,CAAC;~~AA5BD~~,~~4BA4BC~~;~~AAED~~,~~MAAa~~,~~UAAW~~,~~SAAQ~~,~~KAAK;IAEnC,~~YAAY,~~WAAmB;QAC7B~~,~~KAAK~~,CAAC,~~WAAW~~,CAAC,CAAC;~~QAFrB~~,~~iBAAY~~,~~GAAG~~,IAAI,CAAC;~~IAGpB~~,CAAC;~~CACF;AALD~~,~~gCAKC~~;~~AAED~~,~~SAAgB~~,~~YAAY~~,CAAC,~~GAAQ;IACnC~~,~~OAAO~~,~~GAAG~~,~~aAAH~~,~~GAAG~~,~~uBAAH~~,~~GAAG~~,~~CAAE~~,~~YAAY~~,CAAC;~~AAC3B~~,CAAC;~~AAFD~~,~~oCAEC~~","sourcesContent":["import chalk from 'chalk';\nimport ~~resolveModule from 'resolve';\nimport~~ { AuditBuildOptions } from '../audit';\nimport { ~~CaptureStream~~ } from '~~./capture~~';\n\nexport async function buildApp(options: AuditBuildOptions): Promise<void> {\n let { ~~default: cli }~~ = await ~~import~~(~~resolveModule.sync('~~ember-cli', { ~~basedir~~: options.app ~~}));\~~n ~~process.env.~~STAGE2_ONLY = 'true';\n ~~let~~ ~~capture~~ = new ~~CaptureStream~~();\n ~~let~~ ~~orig~~ = { ~~cwd~~: ~~process.cwd~~(), ~~log~~: ~~console.log, error~~: ~~console.error,~~ ~~warn:~~ ~~console.warn~~ ~~};\~~n ~~process.chdir(options.app)~~;\n // ~~this~~ is ~~icky~~, ~~but~~ ~~too~~ ~~many~~ ~~things~~ in ~~the~~ ~~build~~ ~~don't~~ ~~respect~~ ~~the~~\n // ~~`outputStream`,~~ ~~etc~~, ~~options~~ we ~~pass~~ ~~below.\~~n ~~console.log~~ = ~~console.warn~~ = ~~console~~.~~error~~ = ~~capture.log~~;\n ~~try {~~\n let ~~result~~ = ~~await~~ ~~cli(~~{\n ~~cliArgs~~: ['~~build~~'],\n ~~outputStream~~: ~~capture~~,\n ~~errorStream~~: ~~capture~~,\n });\n let ~~exitCode~~ = ~~typeof~~ ~~result~~ ~~===~~ ~~'object'~~ ~~? result.exitCode : result~~;\n // an ~~undefined~~ ~~exit~~ ~~code means success, because of course it does.\~~n if (~~exitCode~~ != ~~null~~ ~~&& exitCode !== 0)~~ {\n ~~throw new BuildError~~(\n ~~`${chalk~~.~~yellow~~(~~'Unable to begin audit'~~)~~} because the build failed. Build output follows:\\~~n~~${capture.output~~}~~`\n~~ );\n ~~}\n~~ } ~~finally~~ {\n ~~process~~.~~chdir~~(~~orig.cwd~~);\n ~~console~~.~~log = orig.log~~;\n ~~console.warn~~ = ~~orig.warn;\~~n ~~console~~.~~error~~ = ~~orig.error;\n }~~\n}\n~~\nexport~~ ~~class~~ ~~BuildError extends Error~~ {\n ~~isBuildError~~ ~~= true~~;\n ~~constructor~~(~~buildOutput: string~~) {\n ~~super~~(~~buildOutput~~);\n }\n~~}\n\nexport~~ ~~function isBuildError~~(~~err: any~~): ~~err is BuildError~~ {\n return ~~err?.isBuildError~~;\n}\n"]}
1	+ {"version":3,"file":"build.js","sourceRoot":"","sources":["build.ts"],"names":[],"mappings":";;;;;;AAAA,kDAA0B;AAE1B,iDAAsC;AAE/B,KAAK,UAAU,QAAQ,CAAC,OAA0B;IACvD,IAAI,MAAM,GAAG,MAAM,OAAO,CAAC,6CAA6C,EAAE;QACxE,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,GAAG,EAAE;YACH,WAAW,EAAE,MAAM;SACpB;KACF,CAAC,CAAC;IAEH,IAAI,MAAM,CAAC,QAAQ,KAAK,CAAC,EAAE;QACzB,MAAM,IAAI,UAAU,CAClB,GAAG,eAAK,CAAC,MAAM,CAAC,uBAAuB,CAAC,qDAAqD,MAAM,CAAC,MAAM,EAAE,CAC7G,CAAC;KACH;AACH,CAAC;AAbD,4BAaC;AAED,MAAa,UAAW,SAAQ,KAAK;IAEnC,YAAY,WAAmB;QAC7B,KAAK,CAAC,WAAW,CAAC,CAAC;QAFrB,iBAAY,GAAG,IAAI,CAAC;IAGpB,CAAC;CACF;AALD,gCAKC;AAED,SAAgB,YAAY,CAAC,GAAQ;IACnC,OAAO,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,YAAY,CAAC;AAC3B,CAAC;AAFD,oCAEC;AAED,KAAK,UAAU,OAAO,CACpB,YAAoB,EACpB,IAAqD;IAOrD,IAAI,GAAmD,CAAC;IACxD,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,GAAG,EAAE;QACb,GAAG,GAAG,EAAE,GAAG,OAAO,CAAC,GAAG,EAAE,GAAG,IAAI,CAAC,GAAG,EAAE,CAAC;KACvC;IACD,IAAI,KAAK,GAAG,IAAA,qBAAK,EAAC,YAAY,EAAE;QAC9B,KAAK,EAAE,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC;QAClC,GAAG,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,GAAG;QACd,KAAK,EAAE,IAAI;QACX,GAAG;KACJ,CAAC,CAAC;IACH,IAAI,YAAY,GAAa,EAAE,CAAC;IAChC,IAAI,YAAY,GAAa,EAAE,CAAC;IAChC,IAAI,cAAc,GAAa,EAAE,CAAC;IAClC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE;QAC7B,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxB,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC,MAAM,EAAE,IAAI,CAAC,EAAE;QAC7B,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACxB,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5B,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE;QAC3B,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,QAAgB,EAAE,EAAE;YACrC,OAAO,CAAC;gBACN,QAAQ;gBACR,IAAI,MAAM;oBACR,OAAO,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAC/B,CAAC;gBACD,IAAI,MAAM;oBACR,OAAO,YAAY,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBAC/B,CAAC;gBACD,IAAI,MAAM;oBACR,OAAO,cAAc,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;gBACjC,CAAC;aACF,CAAC,CAAC;QACL,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["import chalk from 'chalk';\nimport { AuditBuildOptions } from '../audit';\nimport { spawn } from 'child_process';\n\nexport async function buildApp(options: AuditBuildOptions): Promise<void> {\n let result = await execute(`node node_modules/ember-cli/bin/ember build`, {\n pwd: options.app,\n env: {\n STAGE2_ONLY: 'true',\n },\n });\n\n if (result.exitCode !== 0) {\n throw new BuildError(\n `${chalk.yellow('Unable to begin audit')} because the build failed. Build output follows:\\n${result.output}`\n );\n }\n}\n\nexport class BuildError extends Error {\n isBuildError = true;\n constructor(buildOutput: string) {\n super(buildOutput);\n }\n}\n\nexport function isBuildError(err: any): err is BuildError {\n return err?.isBuildError;\n}\n\nasync function execute(\n shellCommand: string,\n opts?: { env?: Record<string, string>; pwd?: string }\n): Promise<{\n exitCode: number;\n stderr: string;\n stdout: string;\n output: string;\n}> {\n let env: Record<string, string \| undefined> \| undefined;\n if (opts?.env) {\n env = { ...process.env, ...opts.env };\n }\n let child = spawn(shellCommand, {\n stdio: ['inherit', 'pipe', 'pipe'],\n cwd: opts?.pwd,\n shell: true,\n env,\n });\n let stderrBuffer: string[] = [];\n let stdoutBuffer: string[] = [];\n let combinedBuffer: string[] = [];\n child.stderr.on('data', data => {\n stderrBuffer.push(data);\n combinedBuffer.push(data);\n });\n child.stdout.on('data', data => {\n stdoutBuffer.push(data);\n combinedBuffer.push(data);\n });\n return new Promise(resolve => {\n child.on('close', (exitCode: number) => {\n resolve({\n exitCode,\n get stdout() {\n return stdoutBuffer.join('');\n },\n get stderr() {\n return stderrBuffer.join('');\n },\n get output() {\n return combinedBuffer.join('');\n },\n });\n });\n });\n}\n"]}

package/src/audit/options.d.ts CHANGED Viewed

@@ -2,6 +2,7 @@ export interface AuditOptions {
     debug?: boolean;
 }
 export interface AuditBuildOptions extends AuditOptions {
-    'reuse-build': boolean;
-    app: string;
+    'reuse-build'?: boolean;
+    app?: string;
+    outputDir?: string;
 }

package/src/audit/options.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":"","sourcesContent":["export interface AuditOptions {\n debug?: boolean;\n}\n\nexport interface AuditBuildOptions extends AuditOptions {\n 'reuse-build': boolean;\n app: string;\n}\n"]}
1	+ {"version":3,"file":"options.js","sourceRoot":"","sources":["options.ts"],"names":[],"mappings":"","sourcesContent":["export interface AuditOptions {\n debug?: boolean;\n}\n\nexport interface AuditBuildOptions extends AuditOptions {\n 'reuse-build'?: boolean;\n app?: string;\n outputDir?: string;\n}\n"]}

package/src/audit-cli.js CHANGED Viewed

File without changes

package/src/audit.d.ts CHANGED Viewed

@@ -1,6 +1,24 @@
+/// <reference types="node" />
 import { ExportAll, InternalImport, NamespaceMarker } from './audit/babel-visitor';
 import { AuditBuildOptions, AuditOptions } from './audit/options';
 import { BuildError, isBuildError } from './audit/build';
+export interface AuditMessage {
+    message: string;
+    detail: string;
+    loc: Loc;
+    source: string;
+    filename: string;
+}
+export interface Loc {
+    start: {
+        line: number;
+        column: number;
+    };
+    end: {
+        line: number;
+        column: number;
+    };
+}
 export { AuditOptions, AuditBuildOptions, BuildError, isBuildError };
 export interface Finding {
     message: string;
@@ -9,12 +27,14 @@ export interface Finding {
     codeFrame?: string;
 }
 export interface Module {
+    appRelativePath: string;
     consumedFrom: (string | RootMarker)[];
     imports: Import[];
     exports: string[];
     resolutions: {
         [source: string]: string | null;
     };
+    content: string;
 }
 interface ResolutionFailure {
     isResolutionFailure: true;
@@ -27,6 +47,7 @@ interface InternalModule {
         isCJS: boolean;
         isAMD: boolean;
         dependencies: string[];
+        transpiledContent: string | Buffer;
     };
     resolved?: Map<string, string | ResolutionFailure>;
     linked?: {
@@ -53,6 +74,7 @@ export declare class Audit {
     private appDir;
     private options;
     private modules;
+    private virtualModules;
     private moduleQueue;
     private findings;
     private frames;
@@ -62,6 +84,8 @@ export declare class Audit {
     private get pkg();
     private get meta();
     private get babelConfig();
+    private get resolverParams();
+    private resolver;
     private debug;
     private visitorFor;
     private drainQueue;
@@ -76,7 +100,7 @@ export declare class Audit {
     private visitJS;
     private visitHBS;
     private visitJSON;
-    private resolve;
+    private resolveDeps;
     private pushFinding;
     private scheduleVisit;
 }

package/src/audit.js CHANGED Viewed

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.isRootMarker = exports.Audit = exports.AuditResults = exports.isBuildError = exports.BuildError = void 0;
 const fs_extra_1 = require("fs-extra");
 const path_1 = require("path");
-const resolve_1 = __importDefault(require("resolve"));
 const core_1 = require("@embroider/core");
 const typescript_memoize_1 = require("typescript-memoize");
 const chalk_1 = __importDefault(require("chalk"));
@@ -39,10 +38,11 @@ class AuditResults {
         this.findings = [];
     }
     static create(baseDir, findings, modules) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         let results = new this();
         for (let [filename, module] of modules) {
             let publicModule = {
+                appRelativePath: (0, core_1.explicitRelative)(baseDir, filename),
                 consumedFrom: module.consumedFrom.map(entry => {
                     if (isRootMarker(entry)) {
                         return entry;
@@ -67,6 +67,9 @@ class AuditResults {
                     }))
                     : [],
                 exports: ((_b = module.linked) === null || _b === void 0 ? void 0 : _b.exports) ? [...module.linked.exports] : [],
+                content: ((_c = module.parsed) === null || _c === void 0 ? void 0 : _c.transpiledContent)
+                    ? (_d = module.parsed) === null || _d === void 0 ? void 0 : _d.transpiledContent.toString()
+                    : 'module failed to transpile',
             };
             results.modules[(0, core_1.explicitRelative)(baseDir, filename)] = publicModule;
         }
@@ -130,15 +133,23 @@ class Audit {
         this.appDir = appDir;
         this.options = options;
         this.modules = new Map();
+        this.virtualModules = new Map();
         this.moduleQueue = new Set();
         this.findings = [];
         this.frames = new babel_visitor_1.CodeFrameStorage();
+        this.resolver = new core_1.Resolver(this.resolverParams);
     }
     static async run(options) {
-        if (!options['reuse-build']) {
-            await (0, build_1.buildApp)(options);
+        let dir;
+        if (options.outputDir) {
+            dir = options.outputDir;
+        }
+        else {
+            if (!options['reuse-build']) {
+                await (0, build_1.buildApp)(options);
+            }
+            dir = await this.findStage2Output(options);
         }
-        let dir = await this.findStage2Output(options);
         let audit = new this(dir, options);
         if (options['reuse-build']) {
             if (!audit.meta.babel.isParallelSafe) {
@@ -149,6 +160,9 @@ class Audit {
     }
     static async findStage2Output(options) {
         try {
+            if (!options.app) {
+                throw new Error(`AuditBuildOptions needs "app" directory`);
+            }
             return (0, fs_extra_1.readFileSync)((0, path_1.join)(options.app, 'dist/.stage2-output'), 'utf8');
         }
         catch (err) {
@@ -172,6 +186,9 @@ class Audit {
         config.ast = true;
         return config;
     }
+    get resolverParams() {
+        return (0, fs_extra_1.readJSONSync)((0, path_1.join)(this.appDir, '.embroider', 'resolver.json'));
+    }
     debug(message, ...args) {
         if (this.options.debug) {
             console.log(message, ...args);
@@ -197,7 +214,13 @@ class Audit {
             this.moduleQueue.delete(filename);
             this.debug('visit', filename);
             let visitor = this.visitorFor(filename);
-            let content = (0, fs_extra_1.readFileSync)(filename);
+            let content;
+            if (this.virtualModules.has(filename)) {
+                content = this.virtualModules.get(filename);
+            }
+            else {
+                content = (0, fs_extra_1.readFileSync)(filename);
+            }
             // cast is safe because the only way to get into the queue is to go
             // through scheduleVisit, and scheduleVisit creates the entry in
             // this.modules.
@@ -212,17 +235,7 @@ class Audit {
             }
             else {
                 module.parsed = visitResult;
-                let resolved = new Map();
-                for (let dep of visitResult.dependencies) {
-                    let depFilename = await this.resolve(dep, filename);
-                    if (depFilename) {
-                        resolved.set(dep, depFilename);
-                        if (!isResolutionFailure(depFilename)) {
-                            this.scheduleVisit(depFilename, filename);
-                        }
-                    }
-                }
-                module.resolved = resolved;
+                module.resolved = await this.resolveDeps(visitResult.dependencies, filename);
             }
         }
     }
@@ -364,6 +377,7 @@ class Audit {
             isCJS: false,
             isAMD: false,
             dependencies,
+            transpiledContent: content,
         };
     }
     async visitJS(filename, content) {
@@ -384,6 +398,7 @@ class Audit {
                 isCJS: result.isCJS,
                 isAMD: result.isAMD,
                 dependencies: result.imports.map(i => i.source),
+                transpiledContent: result.transpiledContent,
             };
         }
         catch (err) {
@@ -423,24 +438,31 @@ class Audit {
         }
         return this.visitJS(filename, js);
     }
-    async resolve(specifier, fromPath) {
-        if (['@embroider/macros', '@ember/template-factory'].includes(specifier)) {
-            return;
-        }
-        try {
-            return resolve_1.default.sync(specifier, {
-                basedir: (0, path_1.dirname)(fromPath),
-                extensions: this.meta['resolvable-extensions'],
-            });
-        }
-        catch (err) {
-            if (err.code === 'MODULE_NOT_FOUND') {
-                return { isResolutionFailure: true };
-            }
-            else {
-                throw err;
+    async resolveDeps(deps, fromFile) {
+        let resolved = new Map();
+        for (let dep of deps) {
+            let resolution = await this.resolver.nodeResolve(dep, fromFile);
+            switch (resolution.type) {
+                case 'virtual':
+                    this.virtualModules.set(resolution.filename, resolution.content);
+                    resolved.set(dep, resolution.filename);
+                    this.scheduleVisit(resolution.filename, fromFile);
+                    break;
+                case 'not_found':
+                    if (['@embroider/macros', '@ember/template-factory'].includes(dep)) {
+                        // the audit process deliberately removes the @embroider/macros babel
+                        // plugins, so the imports are still present and should be left alone.
+                        continue;
+                    }
+                    resolved.set(dep, { isResolutionFailure: true });
+                    break;
+                case 'real':
+                    resolved.set(dep, resolution.filename);
+                    this.scheduleVisit(resolution.filename, fromFile);
+                    break;
             }
         }
+        return resolved;
     }
     pushFinding(finding) {
         this.findings.push(finding);