@endo/module-source 1.1.2 → 1.3.0

package/README.md

@@ -74,6 +74,15 @@ the hook returns a promise, it will be dropped and rejections will go uncaught.
 If the hook must do async work, these should be queued up as a job that the
 caller can later await.
 
+## XS Specific Variant
+
+With the `xs` condition, `@endo/module-source` will not entrain Babel and will
+just adapt the native `ModuleSource` to the older interface presented by this
+package.
+That is, the XS native `bindings` will be translated to `imports`, `exports`,
+and `reexports` getters.
+This form of `ModuleSource` ignores all options.
+
 ## Bug Disclosure
 
 Please help us practice coordinated security bug disclosure, by using the

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@endo/module-source",
-  "version": "1.1.2",
+  "version": "1.3.0",
   "description": "Ponyfill for the SES ModuleSource and module-to-program transformer",
   "keywords": [
     "ses",
@@ -22,7 +22,10 @@
   "type": "module",
   "main": "./index.js",
   "exports": {
-    ".": "./index.js",
+    ".": {
+      "xs": "./src-xs/index.js",
+      "default": "./index.js"
+    },
     "./shim.js": "./shim.js",
     "./package.json": "./package.json"
   },
@@ -35,14 +38,15 @@
     "lint:types": "tsc",
     "lint:eslint": "eslint .",
     "lint-fix": "eslint --fix .",
-    "test": "ava"
+    "test": "ava",
+    "test:xs": "node scripts/generate-test-xs.js && xst tmp/test-xs.js"
   },
   "dependencies": {
-    "@agoric/babel-generator": "^7.17.6",
-    "@babel/parser": "^7.23.6",
-    "@babel/traverse": "^7.23.6",
-    "@babel/types": "^7.24.0",
-    "ses": "^1.10.0"
+    "@babel/generator": "^7.26.3",
+    "@babel/parser": "~7.26.2",
+    "@babel/traverse": "~7.25.9",
+    "@babel/types": "~7.26.0",
+    "ses": "^1.12.0"
   },
   "devDependencies": {
     "ava": "^6.1.3",
@@ -85,5 +89,5 @@
   "typeCoverage": {
     "atLeast": 40.33
   },
-  "gitHead": "5486ed1f238104716b6a8321b977fbc508ef80e1"
+  "gitHead": "9b6784831d37db948cdd61f6da1f3489e8f97906"
 }

package/shim.js

@@ -1,6 +1,10 @@
 /* global globalThis */
 
-import { ModuleSource } from './index.js';
+// We are using a reflexive import to make sure we pass through the conditional
+// export in package.json.
+// Eslint does not yet seem to have a carve-out for package-reflexive imports.
+// eslint-disable-next-line import/no-extraneous-dependencies
+import { ModuleSource } from '@endo/module-source';
 
 Object.defineProperty(globalThis, 'ModuleSource', {
   value: ModuleSource,

package/src/{babelPlugin.d.ts → babel-plugin.d.ts}

@@ -53,4 +53,4 @@ declare function makeModulePlugins(options: any): {
         };
     };
 };
-//# sourceMappingURL=babelPlugin.d.ts.map
+//# sourceMappingURL=babel-plugin.d.ts.map

package/src/babel-plugin.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"babel-plugin.d.ts","sourceRoot":"","sources":["babel-plugin.js"],"names":[],"mappings":";AAwCA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+kBC"}

package/src/{babelPlugin.js → babel-plugin.js}

@@ -49,6 +49,7 @@ function makeModulePlugins(options) {
     reexportMap,
     liveExportMap,
     importMeta,
+    dynamicImport,
   } = options;
 
   if (sourceType !== 'module') {
@@ -286,6 +287,7 @@ function makeModulePlugins(options) {
         CallExpression(path) {
           // import(FOO) -> $h_import(FOO)
           if (path.node.callee.type === 'Import') {
+            dynamicImport.present = true;
             path.node.callee = hiddenIdentifier(h.HIDDEN_IMPORT);
           }
         },

package/src/module-source.d.ts

@@ -62,6 +62,7 @@ export class ModuleSource {
     __liveExportMap__: any;
     __reexportMap__: any;
     __fixedExportMap__: any;
+    __needsImport__: boolean;
     __needsImportMeta__: boolean;
 }
 export type SourceMapHookDetails = {

package/src/module-source.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"module-source.d.ts","sourceRoot":"","sources":["module-source.js"],"names":[],"mappings":"AAmCA;;;;;;GAMG;AAEH;;;;GAIG;AAEH;;;;;;GAMG;AAKH;;;;;;;GAOG;AACH,qCAHW,MAAM,6CAoChB;;IAlED;;;;;;OAMG;IAEH;;;;OAIG;IAEH;;;;;;OAMG;IAKH;;;;;;;OAOG;IACH,oBAHW,MAAM,uCAoChB;IAfC,kBAAyC;IACzC,eAMC;IACD,mBAA+C;IAC/C,8BAA0C;IAC1C,uBAAsC;IACtC,qBAAkC;IAClC,wBAAwC;IACxC,6BAA0C;;;iBA9D9B,MAAM;YACN,MAAM;cACN,MAAM;YACN,MAAM;;wCAKT,MAAM,WACN,oBAAoB"}
+{"version":3,"file":"module-source.d.ts","sourceRoot":"","sources":["module-source.js"],"names":[],"mappings":"AAmCA;;;;;;GAMG;AAEH;;;;GAIG;AAEH;;;;;;GAMG;AAKH;;;;;;;GAOG;AACH,qCAHW,MAAM,6CAsChB;;IApED;;;;;;OAMG;IAEH;;;;OAIG;IAEH;;;;;;OAMG;IAKH;;;;;;;OAOG;IACH,oBAHW,MAAM,uCAsChB;IAhBC,kBAAyC;IACzC,eAMC;IACD,mBAA+C;IAC/C,8BAA0C;IAC1C,uBAAsC;IACtC,qBAAkC;IAClC,wBAAwC;IACxC,yBAAkC;IAClC,6BAA0C;;;iBAhE9B,MAAM;YACN,MAAM;cACN,MAAM;YACN,MAAM;;wCAKT,MAAM,WACN,oBAAoB"}

package/src/module-source.js

@@ -82,6 +82,7 @@ export function ModuleSource(source, opts = {}) {
     reexportMap,
     fixedExportMap,
     exportAlls,
+    needsImport,
     needsImportMeta,
   } = analyzeModule(source, opts);
   this.imports = freeze([...keys(imports)]);
@@ -97,6 +98,7 @@ export function ModuleSource(source, opts = {}) {
   this.__liveExportMap__ = liveExportMap;
   this.__reexportMap__ = reexportMap;
   this.__fixedExportMap__ = fixedExportMap;
+  this.__needsImport__ = needsImport;
   this.__needsImportMeta__ = needsImportMeta;
   freeze(this);
 }

package/src/transform-analyze.d.ts

@@ -4,6 +4,7 @@ export function makeModuleAnalyzer(babel: any): (moduleSource: string, { sourceU
     liveExportMap: any;
     fixedExportMap: any;
     reexportMap: any;
+    needsImport: boolean;
     needsImportMeta: boolean;
     functorSource: string;
 }>;

package/src/transform-analyze.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform-analyze.d.ts","sourceRoot":"","sources":["transform-analyze.js"],"names":[],"mappings":"AA+HO,+DAlHM,MAAM,0DACN,OAAO;;;;;;;;GAoHnB;AAEM;;EA6DN;6BAzL0B,oBAAoB"}
+{"version":3,"file":"transform-analyze.d.ts","sourceRoot":"","sources":["transform-analyze.js"],"names":[],"mappings":"AA0HO,+DA7GM,MAAM,0DACN,OAAO;;;;;;;;;GA+GnB;AAEM;;EA6DN;6BApL0B,oBAAoB"}

package/src/transform-analyze.js

@@ -1,6 +1,6 @@
 // @ts-nocheck XXX Babel types
-import { makeTransformSource } from './transformSource.js';
-import makeModulePlugins from './babelPlugin.js';
+import { makeTransformSource } from './transform-source.js';
+import makeModulePlugins from './babel-plugin.js';
 
 import * as h from './hidden.js';
 
@@ -41,6 +41,7 @@ const makeCreateStaticRecord = transformSource =>
       hoistedDecls: [],
       importSources: Object.create(null),
       importDecls: [],
+      dynamicImport: { present: false },
       // enables passing import.meta usage hints up.
       importMeta: { present: false },
     };
@@ -71,7 +72,7 @@ const makeCreateStaticRecord = transformSource =>
       .map(
         src =>
           `[${js(src)}, [${Object.entries(isrc[src])
-            .map(([exp, upds]) => `[${js(exp)}, [${upds.join(',')}]]`)
+            .map(([exp, upds]) => `[${js(exp)},[${upds.join(',')}]]`)
             .join(',')}]]`,
       )
       .join(',')}]);`;
@@ -80,9 +81,7 @@ const makeCreateStaticRecord = transformSource =>
         let src = '';
         if (cvname) {
           // It's a function assigned to, so set its name property.
-          src = `Object.defineProperty(${cvname}, 'name', {value: ${js(
-            vname,
-          )}});`;
+          src = `Object.defineProperty(${cvname},'name',{value:${js(vname)}});`;
         }
         const hDeclId = isOnce ? h.HIDDEN_ONCE : h.HIDDEN_LIVE;
         src += `${hDeclId}.${vname}(${cvname || ''});`;
@@ -99,14 +98,9 @@ const makeCreateStaticRecord = transformSource =>
     // well.
     // Relies on the evaluator to ensure these functions are strict.
     let functorSource = `\
-({ \
-  imports: ${h.HIDDEN_IMPORTS}, \
-  liveVar: ${h.HIDDEN_LIVE}, \
-  onceVar: ${h.HIDDEN_ONCE}, \
-  importMeta: ${h.HIDDEN_META}, \
-}) => (function () { 'use strict'; \
-  ${preamble} \
-  ${scriptSource}
+({imports:${h.HIDDEN_IMPORTS},liveVar:${h.HIDDEN_LIVE},onceVar:${h.HIDDEN_ONCE},import:${h.HIDDEN_IMPORT},importMeta:${h.HIDDEN_META}})=>(function(){'use strict';\
+${preamble}\
+${scriptSource}
 })()
 `;
 
@@ -119,6 +113,7 @@ const makeCreateStaticRecord = transformSource =>
       liveExportMap: freeze(sourceOptions.liveExportMap),
       fixedExportMap: freeze(sourceOptions.fixedExportMap),
       reexportMap: freeze(sourceOptions.reexportMap),
+      needsImport: sourceOptions.dynamicImport.present,
       needsImportMeta: sourceOptions.importMeta.present,
       functorSource,
     });

package/src/transform-source.d.ts

@@ -0,0 +1,2 @@
+export function makeTransformSource(makeModulePlugins: any, babel?: null): (source: any, sourceOptions?: {}) => string;
+//# sourceMappingURL=transform-source.d.ts.map

package/src/transform-source.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"transform-source.d.ts","sourceRoot":"","sources":["transform-source.js"],"names":[],"mappings":"AAeO,uHAmDN"}

package/src/{transformSource.js → transform-source.js}

@@ -1,6 +1,6 @@
 // @ts-nocheck XXX Babel types
 import * as babelParser from '@babel/parser';
-import babelGenerate from '@agoric/babel-generator';
+import babelGenerate from '@babel/generator';
 import babelTraverse from '@babel/traverse';
 import * as babelTypes from '@babel/types';
 
@@ -26,7 +26,11 @@ export const makeTransformSource = (makeModulePlugins, babel = null) => {
     const { sourceUrl, sourceMapUrl, sourceType, sourceMap, sourceMapHook } =
       sourceOptions;
 
-    const ast = parseBabel(source, { sourceType });
+    const ast = parseBabel(source, {
+      sourceType,
+      tokens: true,
+      createParenthesizedExpressions: true,
+    });
 
     traverseBabel(ast, visitorFromPlugin(analyzePlugin));
     traverseBabel(ast, visitorFromPlugin(transformPlugin));
@@ -34,14 +38,19 @@ export const makeTransformSource = (makeModulePlugins, babel = null) => {
     const sourceMaps = sourceOptions.sourceMapHook !== undefined;
 
     const { code: transformedSource, map: transformedSourceMap } =
-      generateBabel(ast, {
-        sourceFileName: sourceMapUrl,
-        sourceMaps,
-        inputSourceMap: sourceMap,
-        retainLines: true,
-        compact: true,
-        verbatim: true,
-      });
+      generateBabel(
+        ast,
+        {
+          sourceFileName: sourceMapUrl,
+          sourceMaps,
+          inputSourceMap: sourceMap,
+          experimental_preserveFormat: true,
+          preserveFormat: true,
+          retainLines: true,
+          verbatim: true,
+        },
+        source,
+      );
 
     if (sourceMaps) {
       sourceMapHook(transformedSourceMap, {

package/src/babelPlugin.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"babelPlugin.d.ts","sourceRoot":"","sources":["babelPlugin.js"],"names":[],"mappings":";AAwCA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA6kBC"}

package/src/transformSource.d.ts

@@ -1,2 +0,0 @@
-export function makeTransformSource(makeModulePlugins: any, babel?: null): (source: any, sourceOptions?: {}) => any;
-//# sourceMappingURL=transformSource.d.ts.map

package/src/transformSource.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"transformSource.d.ts","sourceRoot":"","sources":["transformSource.js"],"names":[],"mappings":"AAeO,oHA0CN"}