requirejs-esm 2.2.0 → 2.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "requirejs-esm",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "A RequireJS plugin converting JavaScript modules from ESM to AMD.",
   "author": "Ferdinand Prantl <prantlf@gmail.com>",
   "license": "MIT",
@@ -94,15 +94,15 @@
   },
   "devDependencies": {
     "@prantlf/requirejs": "^3.0.0",
-    "@rollup/plugin-commonjs": "^22.0.0",
+    "@rollup/plugin-commonjs": "^22.0.1",
     "@rollup/plugin-json": "^4.1.0",
     "@rollup/plugin-node-resolve": "^13.3.0",
     "@semantic-release/changelog": "^6.0.1",
     "@semantic-release/git": "^10.0.1",
     "c8": "^7.11.3",
-    "eslint": "^8.17.0",
+    "eslint": "^8.19.0",
     "lit-html": "^1",
-    "rollup": "^2.75.6",
+    "rollup": "^2.76.0",
     "tehanu": "^1.0.1",
     "tehanu-repo-coco": "^1.0.0",
     "tehanu-teru": "^1.0.0",

package/src/api.d.ts

@@ -20,6 +20,9 @@ declare function detectDefinesOrRequires(ast: object): {
   func: object
   name?: object
   deps?: object[]
+  factory?: object
+  output?: object
+  body?: object
 }[]
 
 declare function detectImportsAndExports(ast: object): {

package/src/transformer/amd.js

@@ -37,16 +37,21 @@ function detectDefineOrRequireCall(expr) {
       if (length <= ++index) return false
       arg = args[index]
     }
-    return (arg.type === 'FunctionExpression' ||
-      arg.type === 'ArrowFunctionExpression' ||
-      arg.type === 'ObjectExpression') && { namespace, func, name, deps }
+    if (arg.type === 'FunctionExpression' || arg.type === 'ArrowFunctionExpression') {
+      return { namespace, func, name, deps, factory: arg }
+    }
+    return arg.type === 'ObjectExpression' && { namespace, func, name, deps, output: arg }
   }
 
   // require([deps], success, error)
   if (func.name === 'require') {
     const deps = args[0]
-    return deps.type === 'ArrayExpression' && length >= 2 &&
-      args[1].type === 'FunctionExpression' && { func, deps }
+    if (deps.type === 'ArrayExpression' && length >= 2) {
+      const body = args[1]
+      if (body.type === 'FunctionExpression' || body.type === 'ArrowFunctionExpression') {
+        return { func, deps, body }
+      }
+    }
   }
 }