@marko/translator-default 5.32.5 → 5.32.7

package/dist/index.js

@@ -1,4 +1,4 @@
-"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.analyze = void 0;exports.getRuntimeEntryFiles = getRuntimeEntryFiles;exports.translate = exports.taglibs = void 0;var _path = require("path");
+"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.analyze = void 0;exports.getRuntimeEntryFiles = getRuntimeEntryFiles;exports.translate = exports.taglibs = exports.internalEntryBuilder = void 0;var _path = require("path");
 var _babelUtils = require("@marko/babel-utils");
 
 
@@ -25,12 +25,13 @@ var _placeholder = _interopRequireDefault(require("./placeholder"));
 var _scriptlet = _interopRequireDefault(require("./scriptlet"));
 var _tag = _interopRequireDefault(require("./tag"));
 var _text = _interopRequireDefault(require("./text"));
-var _addDependencies = _interopRequireDefault(require("./util/add-dependencies"));
+var _addDependencies = _interopRequireWildcard(require("./util/add-dependencies"));exports.internalEntryBuilder = _addDependencies.entryBuilder;
 var _getComponentFiles = _interopRequireDefault(require("./util/get-component-files"));
 var _optimizeHtmlWrites = require("./util/optimize-html-writes");
 var _optimizeVdomCreate = require("./util/optimize-vdom-create");
 
-var _taglib = _interopRequireDefault(require("./taglib"));exports.taglibs = _taglib.default;
+var _taglib = _interopRequireDefault(require("./taglib"));exports.taglibs = _taglib.default;function _getRequireWildcardCache(e) {if ("function" != typeof WeakMap) return null;var r = new WeakMap(),t = new WeakMap();return (_getRequireWildcardCache = function (e) {return e ? t : r;})(e);}function _interopRequireWildcard(e, r) {if (!r && e && e.__esModule) return e;if (null === e || "object" != typeof e && "function" != typeof e) return { default: e };var t = _getRequireWildcardCache(r);if (t && t.has(e)) return t.get(e);var n = { __proto__: null },a = Object.defineProperty && Object.getOwnPropertyDescriptor;for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) {var i = a ? Object.getOwnPropertyDescriptor(e, u) : null;i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u];}return n.default = e, t && t.set(e, n), n;}
+
 
 const analyze = exports.analyze = {
   Program: {

package/dist/util/add-dependencies.js

@@ -1,4 +1,4 @@
-"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.default = void 0;var _path = _interopRequireDefault(require("path"));
+"use strict";var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");exports.__esModule = true;exports.entryBuilder = exports.default = void 0;var _path = _interopRequireDefault(require("path"));
 var _babelUtils = require("@marko/babel-utils");
 
 
@@ -6,121 +6,155 @@ var _babelUtils = require("@marko/babel-utils");
 
 var _compiler = require("@marko/compiler");
 var _magicString = _interopRequireDefault(require("magic-string"));
-var _resolveFrom = _interopRequireDefault(require("resolve-from"));var _default =
+var _resolveFrom = _interopRequireDefault(require("resolve-from"));
+const kEntryState = Symbol();var _default =
 
 (entryFile, isHydrate) => {
-  const { resolveVirtualDependency, hydrateIncludeImports, hydrateInit } =
-  entryFile.markoOpts;
   const program = entryFile.path;
-  const shouldIncludeImport = toTestFn(hydrateIncludeImports);
-  const resolvedDeps = new Set();
-  const body = [];
+  const programNode = program.node;
 
   if (!isHydrate) {
-    scanBrowserDeps(entryFile);
+    const imports = new Set();
+    const body = [];
+    addBrowserImports(imports, body, entryFile, entryFile);
     if (body.length) {
-      program.node.body = body.concat(program.node.body);
+      programNode.body = body.concat(programNode.body);
     }
     return;
   }
 
-  const hydratedTemplates = new Set();
-  const watchFiles = new Set();
-  let hasComponents = false;
-  let splitComponentIndex = 0;
-
-  scanHydrateDeps(entryFile);
-
-  if (hasComponents) {
-    const initId = _compiler.types.identifier("init");
-    const markoComponentsImport = importPath(
-      resolvePath(entryFile, "marko/src/runtime/components/index.js")
-    );
-    if (splitComponentIndex) {
-      markoComponentsImport.specifiers.push(
-        _compiler.types.importSpecifier(_compiler.types.identifier("register"), _compiler.types.identifier("register"))
-      );
-    }
-
-    body.unshift(markoComponentsImport);
-
-    if (hydrateInit) {
-      markoComponentsImport.specifiers.push(_compiler.types.importSpecifier(initId, initId));
-      body.push(
-        _compiler.types.expressionStatement(
-          _compiler.types.callExpression(
-            initId,
-            entryFile.markoOpts.runtimeId ?
-            [_compiler.types.stringLiteral(entryFile.markoOpts.runtimeId)] :
-            []
+  const visitedFiles = new Set([
+  (0, _babelUtils.resolveRelativePath)(entryFile, entryFile.opts.filename)]
+  );
+  entryBuilder.visit(entryFile, entryFile, function visitChild(resolved) {
+    if (!visitedFiles.has(resolved)) {
+      visitedFiles.add(resolved);
+      const file = (0, _babelUtils.loadFileForImport)(entryFile, resolved);
+      if (file) {
+        entryBuilder.visit(file, entryFile, (id) =>
+        visitChild(
+          (0, _babelUtils.resolveRelativePath)(
+            entryFile,
+            _path.default.join(file.opts.filename, "..", id)
           )
         )
-      );
+        );
+      }
     }
-  }
+  });
 
-  entryFile.metadata.marko.watchFiles = Array.from(watchFiles);
-  program.node.body = body;
+  programNode.body = entryBuilder.build(entryFile);
   program.skip();
+};exports.default = _default;
 
-  function scanHydrateDeps(file) {
-    const meta = file.metadata.marko;
-    const resolved = (0, _babelUtils.resolveRelativePath)(entryFile, file.opts.filename);
-    if (hydratedTemplates.has(resolved)) return;
-
-    hydratedTemplates.add(resolved);
+const entryBuilder = exports.entryBuilder = {
+  build(entryFile) {
+    const state = entryFile[kEntryState];
+    if (!state) {
+      throw entryFile.path.buildCodeFrameError(
+        "Unable to build hydrate code, no files were visited before finalizing the build"
+      );
+    }
+    const { markoOpts } = entryFile;
+    const entryMarkoMeta = entryFile.metadata.marko;
+    const { body } = state;
+    entryMarkoMeta.watchFiles = Array.from(state.watchFiles);
+
+    if (state.hasComponents) {
+      const initId = _compiler.types.identifier("init");
+      const markoComponentsImport = importPath(
+        (0, _babelUtils.resolveRelativePath)(entryFile, "marko/src/runtime/components/index.js")
+      );
+      if (state.splitComponentIndex) {
+        markoComponentsImport.specifiers.push(
+          _compiler.types.importSpecifier(_compiler.types.identifier("register"), _compiler.types.identifier("register"))
+        );
+      }
 
-    if (meta.component) {
-      hasComponents = true;
+      body.unshift(markoComponentsImport);
+
+      if (markoOpts.hydrateInit) {
+        markoComponentsImport.specifiers.push(
+          _compiler.types.importSpecifier(initId, initId)
+        );
+        body.push(
+          _compiler.types.expressionStatement(
+            _compiler.types.callExpression(
+              initId,
+              markoOpts.runtimeId ? [_compiler.types.stringLiteral(markoOpts.runtimeId)] : []
+            )
+          )
+        );
+      }
+    }
 
-      if (_path.default.basename(meta.component) === _path.default.basename(file.opts.filename)) {
+    return body;
+  },
+  visit(file, entryFile, visitChild) {
+    const fileMeta = file.metadata.marko;
+    const fileName = file.opts.filename;
+    const state = entryFile[kEntryState] ||= {
+      shouldIncludeImport: toTestFn(file.markoOpts.hydrateIncludeImports),
+      watchFiles: new Set(),
+      imports: new Set(),
+      hasComponents: false,
+      splitComponentIndex: 0,
+      body: []
+    };
+
+    const { watchFiles, imports, body } = state;
+
+    if (fileMeta.component) {
+      state.hasComponents = true;
+
+      if (_path.default.basename(fileMeta.component) === _path.default.basename(fileName)) {
         // Stateful component.
-        addDep(resolved);
+        addImport(imports, body, (0, _babelUtils.resolveRelativePath)(entryFile, fileName));
         return;
       }
     }
 
-    watchFiles.add(file.opts.filename);
+    watchFiles.add(fileName);
 
-    for (const watchFile of meta.watchFiles) {
+    for (const watchFile of fileMeta.watchFiles) {
       watchFiles.add(watchFile);
     }
 
-    scanBrowserDeps(file);
+    addBrowserImports(imports, body, file, entryFile);
 
     for (const child of file.path.node.body) {
       if (_compiler.types.isImportDeclaration(child)) {
         const { value } = child.source;
-        if (shouldIncludeImport(value)) {
-          addDep(resolvePath(file, value));
+        if (state.shouldIncludeImport(value)) {
+          addImport(
+            imports,
+            body,
+            resolveRelativeToEntry(entryFile, file, value)
+          );
         }
       }
     }
 
-    for (const tag of meta.tags) {
+    for (const tag of fileMeta.tags) {
       if (tag.endsWith(".marko")) {
-        if (!hydratedTemplates.has(resolvePath(file, tag))) {
-          scanHydrateDeps((0, _babelUtils.loadFileForImport)(file, tag));
-        }
+        visitChild(tag);
       } else {
         const importedTemplates = tryGetTemplateImports(file, tag);
         if (importedTemplates) {
           for (const templateFile of importedTemplates) {
-            if (!hydratedTemplates.has(resolvePath(file, templateFile))) {
-              scanHydrateDeps((0, _babelUtils.loadFileForImport)(file, templateFile));
-            }
+            visitChild(templateFile);
           }
         }
       }
     }
 
-    if (meta.component) {
+    if (fileMeta.component) {
       // Split component
       const splitComponentId = _compiler.types.identifier(
-        `component_${splitComponentIndex++}`
+        `component_${state.splitComponentIndex++}`
       );
       const splitComponentImport = importPath(
-        resolvePath(file, meta.component)
+        resolveRelativeToEntry(entryFile, file, fileMeta.component)
       );
       splitComponentImport.specifiers.push(
         _compiler.types.importDefaultSpecifier(splitComponentId)
@@ -129,78 +163,75 @@ var _resolveFrom = _interopRequireDefault(require("resolve-from"));var _default
         splitComponentImport,
         _compiler.types.expressionStatement(
           _compiler.types.callExpression(_compiler.types.identifier("register"), [
-          _compiler.types.stringLiteral(meta.id),
+          _compiler.types.stringLiteral(fileMeta.id),
           splitComponentId]
           )
         )
       );
     }
   }
+};
+
+function addBrowserImports(seenImports, body, file, entryFile) {
+  const { filename, sourceMaps } = file.opts;
+  let s;
+
+  for (let dep of file.metadata.marko.deps) {
+    if (typeof dep !== "string") {
+      const { virtualPath } = dep;
+      let { code } = dep;
+      let map;
+
+      if (sourceMaps && dep.startPos !== undefined) {
+        s = s || new _magicString.default(file.code, { source: filename });
+        map = s.snip(dep.startPos, dep.endPos).generateMap({
+          source: filename,
+          includeContent: true
+        });
 
-  function scanBrowserDeps(file) {
-    const { filename, sourceMaps } = file.opts;
-    let s;
-
-    for (let dep of file.metadata.marko.deps) {
-      if (typeof dep !== "string") {
-        const { virtualPath } = dep;
-        let { code } = dep;
-        let map;
-
-        if (sourceMaps && dep.startPos !== undefined) {
-          s = s || new _magicString.default(file.code, { source: filename });
-          map = s.snip(dep.startPos, dep.endPos).generateMap({
-            source: filename,
-            includeContent: true
-          });
-
-          if (sourceMaps === "inline" || sourceMaps === "both") {
-            code += dep.style ?
-            `\n/*# sourceMappingURL=${map.toUrl()}*/` :
-            `\n//# sourceMappingURL=${map.toUrl()}`;
-
-            if (sourceMaps === "inline") {
-              map = undefined;
-            }
+        if (sourceMaps === "inline" || sourceMaps === "both") {
+          code += dep.style ?
+          `\n/*# sourceMappingURL=${map.toUrl()}*/` :
+          `\n//# sourceMappingURL=${map.toUrl()}`;
+
+          if (sourceMaps === "inline") {
+            map = undefined;
           }
         }
+      }
 
-        dep = resolveVirtualDependency(filename, {
-          map,
-          code,
-          virtualPath
-        });
+      dep = file.markoOpts.resolveVirtualDependency(filename, {
+        map,
+        code,
+        virtualPath
+      });
 
-        if (!dep) {
-          continue;
-        }
-      } else if (dep.startsWith("package:")) {
+      if (!dep) {
         continue;
       }
-
-      addDep(resolvePath(file, dep));
+    } else if (dep.startsWith("package:")) {
+      continue;
     }
-  }
 
-  function addDep(resolved) {
-    if (resolvedDeps.has(resolved)) return;
-    resolvedDeps.add(resolved);
-    body.push(importPath(resolved));
+    addImport(seenImports, body, resolveRelativeToEntry(entryFile, file, dep));
   }
+}
 
-  function resolvePath(file, req) {
-    return file === entryFile ?
-    (0, _babelUtils.resolveRelativePath)(file, req) :
-    (0, _babelUtils.resolveRelativePath)(
-      entryFile,
-      _path.default.join(file.opts.filename, "..", req)
-    );
-  }
+function addImport(seenImports, body, resolved) {
+  if (seenImports.has(resolved)) return;
+  seenImports.add(resolved);
+  body.push(importPath(resolved));
+}
 
-  function importPath(path) {
-    return _compiler.types.importDeclaration([], _compiler.types.stringLiteral(path));
-  }
-};exports.default = _default;
+function resolveRelativeToEntry(entryFile, file, req) {
+  return file === entryFile ?
+  (0, _babelUtils.resolveRelativePath)(file, req) :
+  (0, _babelUtils.resolveRelativePath)(entryFile, _path.default.join(file.opts.filename, "..", req));
+}
+
+function importPath(path) {
+  return _compiler.types.importDeclaration([], _compiler.types.stringLiteral(path));
+}
 
 function tryGetTemplateImports(file, rendererRelativePath) {
   const resolvedRendererPath = _path.default.join(
@@ -216,7 +247,7 @@ function tryGetTemplateImports(file, rendererRelativePath) {
       file.markoOpts.fileSystem.readFileSync(resolvedRendererPath, "utf-8")
     )) {
       if (statement.type === "ImportDeclaration") {
-        addImport(statement.source.value);
+        addTemplateImport(statement.source.value);
       } else {
         _compiler.types.traverseFast(statement, (node) => {
           if (
@@ -230,7 +261,7 @@ function tryGetTemplateImports(file, rendererRelativePath) {
           node.arguments.length === 1 &&
           node.arguments[0].type === "StringLiteral")
           {
-            addImport(node.arguments[0].value);
+            addTemplateImport(node.arguments[0].value);
           }
         });
       }
@@ -241,7 +272,7 @@ function tryGetTemplateImports(file, rendererRelativePath) {
   }
   return templateImports;
 
-  function addImport(request) {
+  function addTemplateImport(request) {
     if (request.endsWith(".marko")) {
       const resolvedTemplatePath =
       request[0] === "." ?

package/index.d.ts

@@ -2,3 +2,4 @@ export const taglibs: any;
 export const analyze: any;
 export const translate: any;
 export const getRuntimeEntryFiles: any;
+export const internalEntryBuilder: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/translator-default",
-  "version": "5.32.5",
+  "version": "5.32.7",
   "description": "Translates Marko templates to the default Marko runtime.",
   "keywords": [
     "babel",
@@ -29,13 +29,13 @@
   },
   "dependencies": {
     "@babel/runtime": "^7.24.0",
-    "@marko/babel-utils": "^6.4.1",
+    "@marko/babel-utils": "^6.4.2",
     "magic-string": "^0.30.8",
     "self-closing-tags": "^1.0.1"
   },
   "devDependencies": {
-    "@marko/compiler": "^5.35.4",
-    "marko": "^5.33.6"
+    "@marko/compiler": "^5.35.6",
+    "marko": "^5.33.7"
   },
   "peerDependencies": {
     "@marko/compiler": "^5.16.1",