requirejs-esm 0.0.1 → 1.0.2

package/README.md

@@ -4,13 +4,13 @@
  ![Dependency status](https://img.shields.io/librariesio/release/npm/requirejs-esm)
 ](https://www.npmjs.com/package/requirejs-esm)
 
-A [RequireJS] plugin converting JavaScript modules from ESM to AMD. It takes care only of the module format; it does not transpile the language and that is why it is a lot faster than plugins using [Babel]. If you need to transpile the code to an earlier ECMAScript version, have a look at [requirejs-babel7].
+A [RequireJS] plugin converting JavaScript modules from ESM to AMD. It takes care only of the module format; it does not transpile the language and that is why it is [a lot faster] than plugins using [Babel]. If you need to transpile the code to an earlier ECMAScript version, have a look at [requirejs-babel7].
 
 The official [RequireJS optimizer] (`r.js`) does not wire up source maps from the original (not transpiled) sources to the source map of the output bundle. It makes this or similar plugins unfeasible for serious work. If you want the proper support for source maps, replace the official optimizer package ([`requirejs`]) with the forked [`@prantlf/requirejs`], which is fixed.
 
 ## Installation
 
-This module can be installed in your project using [NPM], [PNPM] or [Yarn]. Make sure, that you use [Node.js] version 6 or newer.
+This module can be installed in your project using [NPM], [PNPM] or [Yarn]. Make sure, that you use [Node.js] version 14 or newer.
 
 ```sh
 npm i -D requirejs-esm
@@ -48,11 +48,20 @@ pragmasOnSave: {
 }
 ```
 
-See also a [demo] project:
+See also a [demo-local] project, which includes sources only from the local `src` directory:
 
 ```sh
 npm start
-open http://localhost:8967/demo/normal.html
+open http://localhost:8967/demo-local/normal.html
+open http://localhost:8967/demo-local/optimized.html
+```
+
+See also a [demo-extern] project, which includes sources from the local `src` directory and from `node_modules` outside of it:
+
+```sh
+npm run start
+open http://localhost:8967/demo-extern/normal.html
+open http://localhost:8967/demo-extern/optimized.html
 ```
 
 ## Advanced
@@ -111,11 +120,54 @@ The `esm` plugin supports configuration with the following defaults:
     // Enforce transpiling even if a optimized module has been loaded.
     mixedAmdAndEsm: false,
     // Suppress transpiling even if an optimized module has not been loaded yet.
-    onlyAmd: false
+    onlyAmd: false,
+    // Enable source maps, can be an object with booleans { inline, content }.
+    // If set to true, the object will be set to { inline: true, content: true }.
+    sourceMap: false,
+    // Enable console logging.
+    verbose: false,
+    // Save a copy of the transformed modules to a directory for debugging purposes.
+    debugDir: ''
   }
 }
 ```
 
+## API
+
+The transformation applied by the plugin can be performed programmatically too.
+
+```js
+const { transform } = require('requirejs-esm/dist/api')
+const { code }  = transform('import a from "a"', 'test', { sourceMap: true })
+```
+
+The `transform` method supports a subset of plugin options:
+
+```js
+{
+  // Update paths of module dependencies.
+  resolvePath: func,
+  // Allow using a different plugin alias than `esm` in the source code.
+  pluginName: 'esm',
+  // Enable source maps, can be an object with booleans { inline, content }.
+  // If set to true, the object will be set to { inline: true, content: true }.
+  sourceMap: false
+}
+```
+
+The returned object:
+
+```js
+{
+  // The transpiled module code.
+  code: '...',
+  // The source map if sourceMap.inline from the options above is false.
+  map: undefined | { ... },
+  // If the transpilation modified the original source text.
+  updated: false | true
+}
+```
+
 ## Contributing
 
 In lieu of a formal styleguide, take care to maintain the existing coding style. Lint and test your code.
@@ -136,6 +188,8 @@ Licensed under the MIT license.
 [NPM]: https://www.npmjs.com/
 [PNPM]: https://pnpm.io/
 [Yarn]: https://yarnpkg.com/
-[demo]: https://github.com/prantlf/requirejs-esm/tree/master/demo
-[default module name resolution]: https://github.com/prantlf/requirejs-esm/blob/master/esm.js#L38
+[demo-local]: https://github.com/prantlf/requirejs-esm/tree/master/demo-local
+[demo-extern]: https://github.com/prantlf/requirejs-esm/tree/master/demo-extern
+[default module name resolution]: https://github.com/prantlf/requirejs-esm/blob/master/src/resolve-path.js#L48
 [resolvePath]: https://github.com/tleunen/babel-plugin-module-resolver/blob/master/DOCS.md#resolvepath
+[a lot faster]: ./perf/README.md#readme

package/bin/esm2requirejs.js

@@ -14,9 +14,8 @@ commander.description('Transforms an ESM module to AMD or adapts an AMD module f
   .option('-p, --plugin <name>', 'change the plugin name from "esm" to other name')
   .option('-o, --output <file>', 'write the adapted module source to a file')
   .option('-r, --rewrite', 'rewrite the input files with the adapted output')
-  // .option('-m, --minify', 'minify the generated output')
   .option('-s, --source-map', 'write inline source maps to the adapted output')
-  .option('-v, --verbose', 'print call stack in case of error')
+  .option('-v, --verbose', 'print progress and call stack in case of error')
   .on('--help', function () {
     console.log()
     console.log('You can use one or more file names or one or more glob patterns to specify one')
@@ -31,9 +30,14 @@ commander.description('Transforms an ESM module to AMD or adapts an AMD module f
   .parse(process.argv)
 
 const {
-  /*ecma: ecmaVersion,*/ plugin: pluginName, /*minify,*/ sourceMap, output: outputFile, rewrite, verbose
+  /*ecma: ecmaVersion,*/
+  plugin: pluginName,
+  sourceMap,
+  output: outputFile,
+  rewrite,
+  verbose
 } = commander.opts()
-const { args } = commander;
+const { args } = commander
 if (!args.length) {
   commander.help()
 }
@@ -47,7 +51,12 @@ if (!args.length) {
     }
     for (const file of files) {
       const text = await readFile(file, 'utf8')
-      const code = transform(text, file, { /*ecmaVersion,*/ pluginName, /*minify,*/ sourceMap })
+      const code = transform(text, file, {
+        /*ecmaVersion,*/
+        pluginName,
+        sourceMap,
+        verbose
+      })
       if (outputFile) {
         await writeFile(outputFile, code)
       } else if (rewrite) {
@@ -60,4 +69,4 @@ if (!args.length) {
     console.error((!verbose && error.message) || error)
     process.exitCode = 1
   }
-}());
+}())

package/dist/api.js

@@ -4,6 +4,8 @@
   (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global.requirejsEsmAPI = {}));
 })(this, (function (exports) { 'use strict';
 
+  // Returns the child file name by cutting the directoris before the last slash,
+
   // Returns the parent directory by cutting the file name after the last slash,
   // leaving the slash in the result. If there is no slash in the path - the path
   // is just a file name, it will return `undefined`.
@@ -942,9 +944,9 @@
                   mask |= 8;
                   break;
               case 115:
-                  if (mask & 12)
+                  if (mask & 32)
                       report(parser, 34, 's');
-                  mask |= 12;
+                  mask |= 32;
                   break;
               default:
                   report(parser, 33);
@@ -1857,7 +1859,7 @@
                           }
                           else if (ch === 61) {
                               advanceChar(parser);
-                              return 8456000;
+                              return 8456256;
                           }
                           if (ch === 33) {
                               const index = parser.index + 1;
@@ -2040,7 +2042,7 @@
                       const ch = parser.currentChar;
                       if (ch === 61) {
                           advanceChar(parser);
-                          return 8456001;
+                          return 8456257;
                       }
                       if (ch !== 62)
                           return 8456259;
@@ -5032,7 +5034,7 @@
       nextToken(parser, context | 32768);
       const argument = parser.flags & 1 || parser.token & 1048576
           ? null
-          : parseExpressions(parser, context, 0, 1, parser.tokenPos, parser.line, parser.column);
+          : parseExpressions(parser, context, 0, 1, parser.tokenPos, parser.linePos, parser.colPos);
       matchOrInsertSemicolon(parser, context | 32768);
       return finishNode(parser, context, start, line, column, {
           type: 'ReturnStatement',
@@ -6148,7 +6150,7 @@
               if ((context & 524288) < 1)
                   report(parser, 26);
               if (context & 16384)
-                  report(parser, 143);
+                  report(parser, 27);
               parser.assignable = 2;
               break;
           }
@@ -6157,7 +6159,7 @@
               if ((context & 262144) < 1)
                   report(parser, 27);
               if (context & 16384)
-                  report(parser, 143);
+                  report(parser, 27);
               parser.assignable = 1;
               break;
           }
@@ -6188,10 +6190,10 @@
           expr = parseUpdateExpression(parser, context, expr, start, line, column);
       }
       else if ((parser.token & 67108864) === 67108864) {
-          context = (context | 134217728 | 8192) ^ (134217728 | 8192);
+          context = (context | 134217728) ^ 134217728;
           switch (parser.token) {
               case 67108877: {
-                  nextToken(parser, context | 1073741824);
+                  nextToken(parser, (context | 1073741824 | 8192) ^ 8192);
                   parser.assignable = 1;
                   const property = parsePropertyOrPrivatePropertyName(parser, context);
                   expr = finishNode(parser, context, start, line, column, {
@@ -6247,7 +6249,7 @@
                   break;
               }
               case 67108991: {
-                  nextToken(parser, context);
+                  nextToken(parser, (context | 1073741824 | 8192) ^ 8192);
                   parser.flags |= 2048;
                   parser.assignable = 2;
                   expr = parseOptionalChain(parser, context, expr, start, line, column);
@@ -8411,12 +8413,10 @@
       }
       else if (context & 1 && parser.token === 131) {
           kind |= 4096;
-          key = parsePrivateIdentifier(parser, context, tokenPos, linePos, colPos);
-          context = context | 16384;
+          key = parsePrivateIdentifier(parser, context | 16384, tokenPos, linePos, colPos);
       }
       else if (context & 1 && (parser.token & 1073741824) === 1073741824) {
           kind |= 128;
-          context = context | 16384;
       }
       else if (token === 122) {
           key = parseIdentifier(parser, context, 0);
@@ -8782,7 +8782,7 @@
       });
   }
   function parseJSXExpressionContainer(parser, context, inJSXChild, isAttr, start, line, column) {
-      nextToken(parser, context);
+      nextToken(parser, context | 32768);
       const { tokenPos, linePos, colPos } = parser;
       if (parser.token === 14)
           return parseJSXSpreadChild(parser, context, tokenPos, linePos, colPos);
@@ -81684,6 +81684,9 @@
       });
 
       obj[impl][utils$1.wrapperSymbol] = obj;
+      if (Impl.init) {
+        Impl.init(obj[impl], privateData);
+      }
       return obj;
     },
     interface: URLSearchParams,
@@ -82235,6 +82238,9 @@
       });
 
       obj[impl][utils$1.wrapperSymbol] = obj;
+      if (Impl.init) {
+        Impl.init(obj[impl], privateData);
+      }
       return obj;
     },
     interface: URL,
@@ -85190,17 +85196,18 @@
     const { elements } = deps;
     if (!elements.length) return
 
+    let updated;
     for (const element of elements) {
       if (element.type === 'Literal') {
         const moduleName = element.value;
         const newModuleName = resolvePath(moduleName, parentName, options);
         if (newModuleName && newModuleName !== moduleName) {
           replaceLiteral(element, newModuleName);
+          updated = true;
         }
       }
     }
-
-    return true
+    return updated
   }
 
   function _generateUid(name, i) {
@@ -85609,7 +85616,6 @@
     // name with `esm!`, above all.
     resolvePath: resolvePath$1 = resolvePath,
     // ecmaVersion = 2020,
-    // minify,
     sourceMap
   } = {}) {
     // const ast = parse(text, { ecmaVersion, sourceType: 'module', locations: true })
@@ -85618,48 +85624,29 @@
     const options = { sourceFileName: file, pluginName, resolvePath: resolvePath$1, originalResolvePath: resolvePath };
     transformModules(ast, options);
 
-    let code;
-    if (options.updated) {
-      // if (minify) {
-      //   const optimized = optimize(ast)
-      //   ast = mangle(optimized)
-      // }
-      // if (minify) {
-      //   ({ code, map: sourceMap } = generateMinified(ast, {
-      //     format: FORMAT_MINIFY,
-      //     sourceMap: sourceMap ? file : undefined,
-      //     sourceMapWithCode: true,
-      //     sourceContent: text,
-      //     file
-      //   }))
-      //   if (sourceMap) {
-      //     code += convert.fromJSON(sourceMap).toComment()
-      //   }
-      // }
-      // if (minify) {
-      //   ({ code } = await generateMinified(ast, {
-      //     // ecma: ecmaVersion,
-      //     module: true,
-      //     parse: { spidermonkey: true },
-      //     format: { ecma: 2015 },
-      //     sourceMap: sourceMap ? {
-      //       filename: file,
-      //       url: 'inline'
-      //       // content: map
-      //     } : undefined
-      //   }))
-      // } else {
-      sourceMap = sourceMap && new SourceMapGenerator({ file });
-      code = generate(ast, { sourceMap });
+    const { updated } = options;
+    let code, map;
+    if (updated) {
+      if (sourceMap === true) {
+        sourceMap = { inline: true, content: true };
+      }
+      const mapGenerator = sourceMap ? new SourceMapGenerator({ file }) : undefined;
+      code = generate(ast, { sourceMap: mapGenerator });
       if (sourceMap) {
-        code += convertSourceMap.fromJSON(sourceMap).toComment();
+        if (sourceMap.content) {
+          mapGenerator.setSourceContent(file, text);
+        }
+        if (sourceMap.inline) {
+          code += convertSourceMap.fromObject(mapGenerator.toJSON()).toComment();
+        } else {
+          map = mapGenerator.toJSON();
+        }
       }
-      // }
     } else {
       code = text;
     }
 
-    return code
+    return { code, map, updated }
   }
 
   exports.resolvePath = resolvePath;