marko 5.39.3 → 5.39.5

package/dist/runtime/helpers/load-tag.js

@@ -6,14 +6,12 @@ var FLAG_WILL_RERENDER_IN_BROWSER = 1;
 var kAssets = Symbol();
 var kBlockIndex = Symbol();
 var kDeferIndex = Symbol();
-var kOriginal = Symbol();
 var assetFlush;
 
 exports.withPageAssets = function withPageAssets(typeId, template, runtime) {
   assetFlush = runtime;
-  var render = template[kOriginal] || (template[kOriginal] = template._);
   var flushBeforeInput = { renderBody: flush };
-  template._ = function (input, out) {
+  return createFacade(template, function (input, out) {
     var hasAssets = !!out.global[kAssets];
     var key = out.ad_;
     var def = out.ac_;
@@ -32,15 +30,12 @@ exports.withPageAssets = function withPageAssets(typeId, template, runtime) {
       flushHereAndAfter(flushBeforeInput, out);
     }
 
-    render(input, out);
-  };
-  return template;
+    template._(input, out);
+  });
 };
 
 exports.withLoadAssets = function withLoadAssets(typeId, template, triggers) {
-  if (template[kOriginal]) return template;
-  var render = template[kOriginal] = template._;
-  template._ = function (input, out) {
+  return createFacade(template, function (input, out) {
     var key = out.ad_;
     var def = out.ac_;
     addAsset(out.global, typeId, triggers);
@@ -50,16 +45,23 @@ exports.withLoadAssets = function withLoadAssets(typeId, template, triggers) {
       flush(out);
       out.ef();
       out.bf(key, def.s_, true);
-      render(input, out);
+      template._(input, out);
       out.ef();
     } else {
       flush(out);
-      render(input, out);
+      template._(input, out);
     }
-  };
-  return template;
+  });
 };
 
+function createFacade(template, render) {
+  // Under hot reload the template's `_` is an accessor, which a normal
+  // assignment through the facade's prototype chain would invoke (storing
+  // the wrapped render as the template's own render fn), so the facade's
+  // render is defined as an own property instead.
+  return Object.create(template, { _: { value: render } });
+}
+
 exports.flushHead = function flushHead(out) {
   if (out.global[kAssets]) {
     flush(out);

package/dist/translator/util/load-import.js

@@ -9,6 +9,8 @@ const triggerRegExp = /\s*([\w-]+)\s*([^?|]+?)?\s*(?:\?([^|]*?))?\s*(?:\||$)/g;
 const loadTagsByFile = new WeakMap();
 
 function analyzeLoadImport(importDecl, tagEntry) {
+  if (!importDecl.node.attributes?.length) return;
+
   const loadAttrValuePath = importDecl.
   get("attributes").
   find(

package/dist/translator.js

@@ -1,8 +1,9 @@
-"use strict";exports.__esModule = true;exports.translate = exports.transform = exports.taglibs = exports.tagDiscoveryDirs = exports.preferAPI = exports.getRuntimeEntryFiles = exports.analyze = void 0;var tagsAPI = _interopRequireWildcard(require("@marko/runtime-tags/translator"));
+"use strict";exports.__esModule = true;exports.version = exports.translate = exports.transform = exports.taglibs = exports.tagDiscoveryDirs = exports.preferAPI = exports.getRuntimeEntryFiles = exports.analyze = void 0;var tagsAPI = _interopRequireWildcard(require("@marko/runtime-tags/translator"));
 
 var classAPI = _interopRequireWildcard(require("./translator/index"));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 {
+  version,
   preferAPI,
   tagDiscoveryDirs,
   transform,
@@ -10,4 +11,4 @@ const {
   translate,
   taglibs,
   getRuntimeEntryFiles
-} = tagsAPI.createInteropTranslator(classAPI);exports.getRuntimeEntryFiles = getRuntimeEntryFiles;exports.taglibs = taglibs;exports.translate = translate;exports.analyze = analyze;exports.transform = transform;exports.tagDiscoveryDirs = tagDiscoveryDirs;exports.preferAPI = preferAPI;
+} = tagsAPI.createInteropTranslator(classAPI);exports.getRuntimeEntryFiles = getRuntimeEntryFiles;exports.taglibs = taglibs;exports.translate = translate;exports.analyze = analyze;exports.transform = transform;exports.tagDiscoveryDirs = tagDiscoveryDirs;exports.preferAPI = preferAPI;exports.version = version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "5.39.3",
+  "version": "5.39.5",
   "description": "UI Components + streaming, async, high performance, HTML templating for Node.js and the browser.",
   "keywords": [
     "front-end",
@@ -70,7 +70,7 @@
   },
   "dependencies": {
     "@marko/compiler": "^5.39.64",
-    "@marko/runtime-tags": "^6.1.4",
+    "@marko/runtime-tags": "^6.1.5",
     "app-module-path": "^2.2.0",
     "argly": "^1.2.0",
     "browser-refresh-client": "1.1.4",

package/src/runtime/helpers/load-tag.js

@@ -6,14 +6,12 @@ var FLAG_WILL_RERENDER_IN_BROWSER = 1;
 var kAssets = Symbol();
 var kBlockIndex = Symbol();
 var kDeferIndex = Symbol();
-var kOriginal = Symbol();
 var assetFlush;
 
 exports.withPageAssets = function withPageAssets(typeId, template, runtime) {
   assetFlush = runtime;
-  var render = template[kOriginal] || (template[kOriginal] = template._);
   var flushBeforeInput = { renderBody: flush };
-  template._ = function (input, out) {
+  return createFacade(template, function (input, out) {
     var hasAssets = !!out.global[kAssets];
     var key = out.___assignedKey;
     var def = out.___assignedComponentDef;
@@ -32,15 +30,12 @@ exports.withPageAssets = function withPageAssets(typeId, template, runtime) {
       flushHereAndAfter(flushBeforeInput, out);
     }
 
-    render(input, out);
-  };
-  return template;
+    template._(input, out);
+  });
 };
 
 exports.withLoadAssets = function withLoadAssets(typeId, template, triggers) {
-  if (template[kOriginal]) return template;
-  var render = (template[kOriginal] = template._);
-  template._ = function (input, out) {
+  return createFacade(template, function (input, out) {
     var key = out.___assignedKey;
     var def = out.___assignedComponentDef;
     addAsset(out.global, typeId, triggers);
@@ -50,16 +45,23 @@ exports.withLoadAssets = function withLoadAssets(typeId, template, triggers) {
       flush(out);
       out.ef();
       out.bf(key, def.___component, true);
-      render(input, out);
+      template._(input, out);
       out.ef();
     } else {
       flush(out);
-      render(input, out);
+      template._(input, out);
     }
-  };
-  return template;
+  });
 };
 
+function createFacade(template, render) {
+  // Under hot reload the template's `_` is an accessor, which a normal
+  // assignment through the facade's prototype chain would invoke (storing
+  // the wrapped render as the template's own render fn), so the facade's
+  // render is defined as an own property instead.
+  return Object.create(template, { _: { value: render } });
+}
+
 exports.flushHead = function flushHead(out) {
   if (out.global[kAssets]) {
     flush(out);

package/src/translator/util/load-import.js

@@ -9,6 +9,8 @@ const triggerRegExp = /\s*([\w-]+)\s*([^?|]+?)?\s*(?:\?([^|]*?))?\s*(?:\||$)/g;
 const loadTagsByFile = new WeakMap();
 
 export function analyzeLoadImport(importDecl, tagEntry) {
+  if (!importDecl.node.attributes?.length) return;
+
   const loadAttrValuePath = importDecl
     .get("attributes")
     .find(

package/src/translator.js

@@ -3,6 +3,7 @@ import * as tagsAPI from "@marko/runtime-tags/translator";
 import * as classAPI from "./translator/index";
 
 export const {
+  version,
   preferAPI,
   tagDiscoveryDirs,
   transform,