requirejs-esm 4.1.0 → 4.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "requirejs-esm",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "description": "A RequireJS plugin converting JavaScript modules from ESM to AMD.",
   "author": "Ferdinand Prantl <prantlf@gmail.com>",
   "license": "MIT",

package/src/transformer/amd.js

@@ -153,17 +153,25 @@ export function detectDefinesOrRequires(program) {
 
 // Updates dependency paths to be prefixed by `esm!` or otherwise updated.
 export function updateAmdDeps(amd, options) {
-  options.onBeforeUpdate?.(amd)
+  let updated = options.onBeforeUpdate?.({
+    ...options,
+    amd
+  })
 
   const { deps } = amd
-  if (!deps) return
+  if (!deps) {
+    afterUpdate()
+    return updated
+  }
 
   const { sourceFileName: parentName } = options
   const { elements } = deps
-  if (!elements.length) return
+  if (!elements.length) {
+    afterUpdate()
+    return updated
+  }
 
   const { resolvePath } = options
-  let updated
   for (const element of elements) {
     if (element.type === 'Literal') {
       const moduleName = element.value
@@ -175,7 +183,25 @@ export function updateAmdDeps(amd, options) {
     }
   }
 
-  updated ||= options.onAfterUpdate?.(amd)
+  afterUpdate()
 
   return updated
+
+  function afterUpdate() {
+    const updatedNow = options.onAfterUpdate?.({
+      ...options,
+      amd
+    })
+    updated ||= updatedNow
+  }
+}
+
+export function callAmdUpdateHooks(amd, options) {
+  options = {
+    ...options,
+    amd
+  }
+  const updatedBefore = options.onBeforeUpdate?.(options)
+  const updatedAfter = options.onAfterUpdate?.(options)
+  return updatedBefore || updatedAfter
 }

package/src/transformer/index.js

@@ -1,4 +1,4 @@
-import { detectDefinesOrRequires, updateAmdDeps } from './amd'
+import { detectDefinesOrRequires, updateAmdDeps, callAmdUpdateHooks } from './amd'
 import { detectImportsAndExports, transformEsmToAmd } from './esm'
 
 export function transformAst(program, options = {}) {
@@ -7,10 +7,11 @@ export function transformAst(program, options = {}) {
   const result = {}
   if (length) {
     result.amd = true
-    if (options.resolvePath) {
-      for (const amd of amds) {
-        result.updated ||= updateAmdDeps(amd, options)
-      }
+    for (const amd of amds) {
+      const updated = options.resolvePath
+        ? updateAmdDeps(amd, options)
+        : callAmdUpdateHooks(amd, options)
+      result.updated ||= updated
     }
   } else {
     transformEsmToAmd(program, options)