@marko/compiler 5.39.34 → 5.39.36

package/dist/babel-plugin/index.js

@@ -1,4 +1,5 @@
-"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = void 0;var _traverse = _interopRequireDefault(require("@babel/traverse"));
+"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = void 0;var _pluginTransformTypescript = _interopRequireDefault(require("@babel/plugin-transform-typescript"));
+var _traverse = _interopRequireDefault(require("@babel/traverse"));
 var _path = _interopRequireDefault(require("path"));
 
 var t = _interopRequireWildcard(require("../babel-types"));
@@ -17,7 +18,8 @@ var _parser = require("./parser");
 var _migrate = require("./plugins/migrate");
 var _transform = require("./plugins/transform");function _interopRequireWildcard(e, t) {if ("function" == typeof WeakMap) var r = new WeakMap(),n = new WeakMap();return (_interopRequireWildcard = function (e, t) {if (!t && e && e.__esModule) return e;var o,i,f = { __proto__: null, default: e };if (null === e || "object" != typeof e && "function" != typeof e) return f;if (o = t ? n : r) {if (o.has(e)) return o.get(e);o.set(e, f);}for (const t in e) "default" !== t && {}.hasOwnProperty.call(e, t) && ((i = (o = Object.defineProperty) && Object.getOwnPropertyDescriptor(e, t)) && (i.get || i.set) ? o(f, t, i) : f[t] = e[t]);return f;})(e, t);}
 
-const SOURCE_FILES = new WeakMap();var _default =
+const SOURCE_FILES = new WeakMap();
+let stripTypesVisitor;var _default =
 
 (api, markoOpts) => {
   api.assertVersion(7);
@@ -46,6 +48,17 @@ const SOURCE_FILES = new WeakMap();var _default =
     );
   }
 
+  if (markoOpts.stripTypes) {
+    stripTypesVisitor ||= (0, _pluginTransformTypescript.default)(api, {
+      isTSX: false,
+      allowNamespaces: true,
+      allowDeclareFields: true,
+      optimizeConstEnums: true,
+      onlyRemoveTypeImports: true,
+      disallowAmbiguousJSXLike: false
+    }).visitor;
+  }
+
   let curOpts;
 
   return {
@@ -60,6 +73,14 @@ const SOURCE_FILES = new WeakMap();var _default =
       opts.parserOpts.allowUndeclaredExports =
       opts.parserOpts.allowNewTargetOutsideFunction =
       true;
+
+      opts.parserOpts.plugins.push("objectRestSpread", "classProperties", [
+      "typescript",
+      {
+        disallowAmbiguousJSXLike: false,
+        dts: false
+      }]
+      );
       curOpts = opts;
     },
     parserOverride(code) {
@@ -120,29 +141,7 @@ const SOURCE_FILES = new WeakMap();var _default =
         file.___getMarkoFile =
         undefined;
       }
-    },
-    visitor:
-    markoOpts.stripTypes && isMarkoOutput(markoOpts.output) ?
-    {
-      MarkoClass(path) {
-        // We replace the MarkoClass with a regular class declaration so babel can strip it's types.
-        path.replaceWith(
-          t.classDeclaration(t.identifier(""), null, path.node.body)
-        );
-      },
-      ExportNamedDeclaration: {
-        exit(path) {
-          const { node } = path;
-          // 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.
-          if (!(node.declaration || node.specifiers.length))
-          path.remove();
-        }
-      }
-    } :
-    undefined
+    }
   };
 };exports.default = _default;
 
@@ -275,6 +274,49 @@ function getMarkoFile(code, fileOpts, markoOpts) {
       return file;
     }
 
+    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") {
+          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) {
+            path.remove();
+            // Add back imports from scriptlets that were
+            // hoisted for the babel typescript transform.
+            scriptlet.body.unshift(importNode);
+          }
+        }
+      }
+    }
+
     const rootTransformers = [];
     for (const id in taglibLookup.taglibsById) {
       for (const transformer of taglibLookup.taglibsById[id].transformers) {
@@ -286,7 +328,6 @@ function getMarkoFile(code, fileOpts, markoOpts) {
     if (translator.transform) {
       rootTransformers.push(translator.transform);
     }
-    file.___compileStage = "transform";
     traverseAll(file, rootTransformers);
 
     for (const taglibId in taglibLookup.taglibsById) {
@@ -378,7 +419,7 @@ function traverseAll(file, visitors) {
     program.node,
     mergeVisitors(visitors),
     program.scope,
-    program.state = {},
+    program.state = { file },
     program,
     true
   );

package/dist/babel-types/types/definitions.js

@@ -94,7 +94,7 @@ const MarkoDefinitions = {
   },
 
   MarkoClass: {
-    aliases: ["Marko", "Statement"],
+    aliases: ["Marko", "Statement", "Class"],
     builder: ["body"],
     visitor: ["body"],
     fields: {

package/dist/index.js

@@ -1,8 +1,6 @@
 "use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports._clearDefaults = _clearDefaults;exports.compile = compile;exports.compileFile = compileFile;exports.compileFileSync = compileFileSync;exports.compileSync = compileSync;exports.configure = configure;exports.getRuntimeEntryFiles = getRuntimeEntryFiles;exports.types = exports.taglib = exports.globalConfig = void 0;var _types = _interopRequireWildcard(require("./babel-types"));exports.types = _types;
 var babel = _interopRequireWildcard(require("@babel/core"));
-var _pluginSyntaxTypescript = _interopRequireDefault(require("@babel/plugin-syntax-typescript"));
 var _pluginTransformModulesCommonjs = _interopRequireDefault(require("@babel/plugin-transform-modules-commonjs"));
-var _pluginTransformTypescript = _interopRequireDefault(require("@babel/plugin-transform-typescript"));
 var _babelUtils = require("@marko/compiler/babel-utils");
 var _modules = _interopRequireDefault(require("@marko/compiler/modules"));
 var _path = _interopRequireDefault(require("path"));
@@ -87,20 +85,7 @@ function loadBabelConfigSync(filename, config) {
 
 function getBaseBabelConfig(filename, { babelConfig, ...markoConfig }) {
   const isTranslated = isTranslatedOutput(markoConfig.output);
-  const requiredPlugins = [
-  [_babelPlugin.default, markoConfig],
-  [
-  markoConfig.stripTypes ? _pluginTransformTypescript.default : _pluginSyntaxTypescript.default,
-  {
-    isTSX: false,
-    allowNamespaces: true,
-    allowDeclareFields: true,
-    optimizeConstEnums: true,
-    onlyRemoveTypeImports: true,
-    disallowAmbiguousJSXLike: false
-  }]];
-
-
+  const requiredPlugins = [[_babelPlugin.default, markoConfig]];
   const baseBabelConfig = {
     filenameRelative: filename ?
     _path.default.relative(_modules.default.cwd, filename) :

package/dist/types.d.ts

@@ -1826,7 +1826,7 @@ export type ObjectMember = ObjectMethod | ObjectProperty;
 export type Property = ObjectProperty | ClassProperty | ClassAccessorProperty | ClassPrivateProperty;
 export type UnaryLike = UnaryExpression | SpreadElement;
 export type Pattern = AssignmentPattern | ArrayPattern | ObjectPattern | VoidPattern;
-export type Class = ClassExpression | ClassDeclaration;
+export type Class = ClassExpression | ClassDeclaration | MarkoClass;
 export type ImportOrExportDeclaration = ExportAllDeclaration | ExportDefaultDeclaration | ExportNamedDeclaration | ImportDeclaration;
 export type ExportDeclaration = ExportAllDeclaration | ExportDefaultDeclaration | ExportNamedDeclaration;
 export type ModuleSpecifier = ExportSpecifier | ImportDefaultSpecifier | ImportNamespaceSpecifier | ImportSpecifier | ExportNamespaceSpecifier | ExportDefaultSpecifier;

package/package.json

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