@marko/compiler 5.39.35 → 5.39.37

package/dist/babel-plugin/index.js

@@ -276,18 +276,57 @@ function getMarkoFile(code, fileOpts, markoOpts) {
 
     file.___compileStage = "transform";
     if (markoOpts.stripTypes) {
+      const importScriptlets = new Map();
+      for (const path of file.path.get("body")) {
+        if (path.type === "MarkoScriptlet" && path.node.static) {
+          for (const stmt of path.get("body")) {
+            if (stmt.isImportDeclaration()) {
+              // Hoist import declarations from scriptlets
+              // temporarily so that they will be processed by
+              // babel typescript transform.
+              const importNode = stmt.node;
+              importScriptlets.set(importNode, path.node);
+              stmt.remove();
+              path.insertBefore(importNode);
+            }
+          }
+        }
+      }
+
       traverseAll(file, stripTypesVisitor);
 
       for (const path of file.path.get("body")) {
-        if (
-        path.type === "ExportNamedDeclaration" &&
-        !(path.node.declaration || path.node.specifiers.length))
-        {
-          // The babel typescript plugin will add an empty export declaration
-          // if there are no other imports/exports in the file.
-          // This is not needed for Marko file outputs since there is always
-          // a default export.
-          path.remove();
+        if (path.type === "ExportNamedDeclaration") {
+          if (!(path.node.declaration || path.node.specifiers.length)) {
+            // The babel typescript plugin will add an empty export declaration
+            // if there are no other imports/exports in the file.
+            // This is not needed for Marko file outputs since there is always
+            // a default export.
+            path.remove();
+          }
+        } else if (path.isImportDeclaration()) {
+          const importNode = path.node;
+          const scriptlet = importScriptlets.get(importNode);
+          if (scriptlet) {
+            let hasTypes = false;
+            for (const specifier of path.get("specifiers")) {
+              if (
+              specifier.node.type === "ImportSpecifier" &&
+              specifier.node.importKind === "type")
+              {
+                hasTypes = true;
+                specifier.remove();
+              }
+            }
+
+            path.remove();
+
+            // Add back imports from scriptlets that were
+            // hoisted for the babel typescript transform.
+            if (!hasTypes || importNode.specifiers.length) {
+              scriptlet.body.unshift(importNode);
+            }
+          }
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/compiler",
-  "version": "5.39.35",
+  "version": "5.39.37",
   "description": "Marko template to JS compiler.",
   "keywords": [
     "babel",
@@ -87,7 +87,7 @@
     "source-map-support": "^0.5.21"
   },
   "devDependencies": {
-    "marko": "^5.37.55"
+    "marko": "^5.37.57"
   },
   "engines": {
     "node": "18 || 20 || >=22"