@endo/module-source 1.2.0 → 1.3.1

package/LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2024 Endo Contributors
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

package/SECURITY.md

@@ -8,9 +8,9 @@ be made for the most recent branch only.
 
 ## Coordinated Vulnerability Disclosure of Security Bugs
 
-SES stands for fearless cooperation, and strong security requires strong collaboration with security researchers. If you believe that you have found a security sensitive bug that should not be disclosed until a fix has been made available, we encourage you to report it. To report a bug in HardenedJS, you have several options that include: 
+SES stands for fearless cooperation, and strong security requires strong collaboration with security researchers. If you believe that you have found a security sensitive bug that should not be disclosed until a fix has been made available, we encourage you to report it. To report a bug in HardenedJS, you have several options that include:
 
-* Reporting the issue to the [Agoric HackerOne vulnerability rewards program](https://hackerone.com/agoric). 
+* Reporting the issue to the [Agoric HackerOne vulnerability rewards program](https://hackerone.com/agoric).
 
 * Sending an email to security at (@) agoric.com., encrypted or unencrypted. To encrypt, please use  @Warner’s personal GPG key  [A476E2E6 11880C98 5B3C3A39 0386E81B 11CAA07A](http://www.lothar.com/warner-gpg.html)  .
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@endo/module-source",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "description": "Ponyfill for the SES ModuleSource and module-to-program transformer",
   "keywords": [
     "ses",
@@ -42,24 +42,24 @@
     "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.11.0"
+    "@babel/generator": "^7.26.3",
+    "@babel/parser": "~7.26.2",
+    "@babel/traverse": "~7.25.9",
+    "@babel/types": "~7.26.0",
+    "ses": "^1.13.0"
   },
   "devDependencies": {
     "ava": "^6.1.3",
     "babel-eslint": "^10.1.0",
     "benchmark": "^2.1.4",
     "c8": "^7.14.0",
-    "eslint": "^8.57.0",
+    "eslint": "^8.57.1",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^9.1.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
-    "eslint-plugin-import": "^2.29.1",
-    "prettier": "^3.3.3",
-    "typescript": "~5.6.3"
+    "eslint-plugin-import": "^2.31.0",
+    "prettier": "^3.5.3",
+    "typescript": "~5.8.3"
   },
   "files": [
     "./*.d.ts",
@@ -89,5 +89,5 @@
   "typeCoverage": {
     "atLeast": 40.33
   },
-  "gitHead": "e0683e0bfdbfc84351af332c9e78813d7b67ef89"
+  "gitHead": "571b7803cf10df7cb4fa9d70e4d53a0b53767fa8"
 }

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":";AA0CA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+kBC"}

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

@@ -31,6 +31,8 @@ const collectPatternIdentifiers = (path, pattern) => {
         // Non-elided pattern.
         return collectPatternIdentifiers(path, pat);
       });
+    case 'AssignmentPattern':
+      return collectPatternIdentifiers(path, pattern.left);
     default:
       throw path.buildCodeFrameError(
         `Pattern type ${pattern.type} is not recognized`,

package/src/hidden.d.ts

@@ -1,5 +1,5 @@
-export const HIDDEN_PREFIX: "$h͏_";
-export const HIDDEN_CONST_VAR_PREFIX: "$c͏_";
+export const HIDDEN_PREFIX: "$h\u034F_";
+export const HIDDEN_CONST_VAR_PREFIX: "$c\u034F_";
 export const HIDDEN_A: "$h͏_a";
 export const HIDDEN_IMPORT: "$h͏_import";
 export const HIDDEN_IMPORT_SELF: "$h͏_importSelf";

package/src/hidden.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hidden.d.ts","sourceRoot":"","sources":["hidden.js"],"names":[],"mappings":"AAAA,mCAAyC;AACzC,6CAAmD;AACnD,+BAA4C;AAC5C,yCAAsD;AACtD,kDAA+D;AAC/D,2CAAwD;AACxD,qCAAkD;AAGlD,wCAAqD;AACrD,qCAAkD;AAClD,0CAQE"}
+{"version":3,"file":"hidden.d.ts","sourceRoot":"","sources":["hidden.js"],"names":[],"mappings":"AAAA,4BAA6B,WAAW,CAAC;AACzC,sCAAuC,WAAW,CAAC;AACnD,+BAA4C;AAC5C,yCAAsD;AACtD,kDAA+D;AAC/D,2CAAwD;AACxD,qCAAkD;AAGlD,wCAAqD;AACrD,qCAAkD;AAClD,0CAQE"}

package/src/module-source.d.ts

@@ -25,7 +25,7 @@
  * @param {string} source
  * @param {string | Options} [opts]
  */
-export function ModuleSource(source: string, opts?: string | Options | undefined): void;
+export function ModuleSource(source: string, opts?: string | Options): void;
 export class ModuleSource {
     /**
      * @typedef {object} SourceMapHookDetails
@@ -54,7 +54,7 @@ export class ModuleSource {
      * @param {string} source
      * @param {string | Options} [opts]
      */
-    constructor(source: string, opts?: string | Options | undefined);
+    constructor(source: string, opts?: string | Options);
     imports: string[];
     exports: any[];
     reexports: never[];

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,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"}
+{"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,SACN,MAAM,GAAG,OAAO,QAqC1B;;IApED;;;;;;OAMG;IAEH;;;;OAIG;IAEH;;;;;;OAMG;IAKH;;;;;;;OAOG;IACH,oBAHW,MAAM,SACN,MAAM,GAAG,OAAO,EAqC1B;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/transform-analyze.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transform-analyze.d.ts","sourceRoot":"","sources":["transform-analyze.js"],"names":[],"mappings":"AAkIO,+DArHM,MAAM,0DACN,OAAO;;;;;;;;;GAuHnB;AAEM;;EA6DN;6BA5L0B,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';
 
@@ -72,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(',')}]);`;
@@ -81,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 || ''});`;
@@ -100,15 +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}, \
-  import: ${h.HIDDEN_IMPORT}, \
-  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}
 })()
 `;
 

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;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA+kBC"}

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"}