marko 5.37.43 → 5.37.44

package/dist/core-tags/core/await/renderer.js

@@ -1,6 +1,7 @@
 "use strict";
 // eslint-disable-next-line no-constant-binary-expression
 
+var getRenderId = require("../../../runtime/html/get-render-id");
 var AsyncValue = require("./AsyncValue");
 
 function safeRenderBody(renderBody, targetOut, data) {
@@ -124,7 +125,7 @@ module.exports = function awaitTag(input, out) {
 
     var id = awaitInfo.id =
     input.name ||
-    (out.global.componentIdPrefix || 0) + clientReorderContext.nextId++;
+    (getRenderId(out.global) || 0) + clientReorderContext.nextId++;
     var placeholderIdAttrValue = reorderFunctionId + "ph" + id;
 
     if (placeholderRenderer) {

package/dist/node_modules/@internal/components-entry/index.js

@@ -3,6 +3,7 @@ require("../../../runtime/html/marko-namespace");
 
 var warp10 = require("warp10");
 var w10ToJSON = require("../../../runtime/helpers/serialize-noop").V_;
+var getRenderId = require("../../../runtime/html/get-render-id");
 var safeJSONRegExp = /<\/|\u2028|\u2029/g;
 var IGNORE_GLOBAL_TYPES = new Set(["undefined", "function", "symbol"]);
 var DEFAULT_RUNTIME_ID = "M";
@@ -187,7 +188,7 @@ function getInitComponentsData(out, componentDefs) {
   const $global = out.global;
   const isLast = $global.d_;
   const didSerializeComponents = $global._e_;
-  const prefix = $global.componentIdPrefix || $global.widgetIdPrefix;
+  const prefix = getRenderId($global);
 
   if (len === 0) {
     if (isLast && didSerializeComponents) {

package/dist/node_modules/@internal/components-registry/index-browser.js

@@ -476,6 +476,7 @@ function initServerRendered(renderedComponents, host) {
 
   if (!meta._B_) {
     meta._B_ = Object.assign({
+      renderId: prefix,
       runtimeId: runtimeId,
       componentIdPrefix: prefix
     }, renderedComponents.g);

package/dist/node_modules/@internal/components-util/index.js

@@ -1,20 +1,12 @@
-"use strict";var FLAG_WILL_RERENDER_IN_BROWSER = 1;
+"use strict";var getRenderId = require("../../../runtime/html/get-render-id");
+
+var FLAG_WILL_RERENDER_IN_BROWSER = 1;
 // var FLAG_HAS_RENDER_BODY = 2;
 
 function nextComponentIdProvider(out) {
-  var prefix = out.global.componentIdPrefix || out.global.widgetIdPrefix || "s"; // "s" is for server (we use "b" for the browser)
+  var prefix = getRenderId(out.global) || "s"; // "s" is for server (we use "b" for the browser)
   var nextId = 0;
 
-  // eslint-disable-next-line no-constant-condition
-
-
-
-
-
-
-
-
-
   return function nextComponentId() {
     return prefix + nextId++;
   };

package/dist/runtime/helpers/tags-compat/runtime-html.js

@@ -78,7 +78,7 @@ exports.p = function (htmlCompat) {
       htmlCompat.registerRenderBody(renderBody5);
     }
     return (input, ...args) => {
-      const out = defaultCreateOut();
+      const out = defaultCreateOut(htmlCompat.$global());
       let customEvents;
 
       if (renderer5) {

package/dist/runtime/html/get-render-id.js

@@ -0,0 +1,20 @@
+"use strict";module.exports = function getRenderId($global) {
+  if (!("renderId" in $global)) {
+    $global.renderId =
+    $global.componentIdPrefix || $global.widgetIdPrefix || "s";
+
+    // eslint-disable-next-line no-constant-condition
+
+
+
+
+
+
+
+
+  }
+
+  if ($global.renderId !== "s") {
+    return $global.renderId;
+  }
+};

package/index.d.ts

@@ -13,15 +13,21 @@ declare global {
   namespace Marko {
     /** A mutable global object for the current render. */
     export interface Global {
-      /** A list of globals that should be serialized to the browser. */
-      serializedGlobals?: Record<string, boolean>;
+      [x: PropertyKey]: unknown;
+      /** An AbortSignal instance that, when aborted, stops further streamed content. */
+      signal?: AbortSignal;
       /** A CSP Nonce to add to each script output from Marko. */
       cspNonce?: string;
+      /** Used for rendering multiple Marko templates in a single hydrated page. */
+      renderId?: string;
       /** Used to uniquely identify a instance of a Marko runtime. */
       runtimeId?: string;
-      /** Used for rendering multiple Marko templates in a single hydrated page. */
+      /** A list of globals that should be serialized to the browser. */
+      serializedGlobals?: Record<string, boolean>;
+      /** @deprecated prefer `renderId` */
+      widgetIdPrefix?: string;
+      /** @deprecated prefer `renderId` */
       componentIdPrefix?: string;
-      [attr: PropertyKey]: unknown;
     }
 
     export type TemplateInput<Input> = Input & {
@@ -29,9 +35,9 @@ declare global {
     };
 
     /** The result of calling `template.render`. */
-    export type RenderedTemplate<
-      Component extends Marko.Component = Marko.Component,
-    > = Promise<RenderResult<Component>> &
+    export type RenderedTemplate<Component = unknown> = Promise<
+      Component extends Marko.Component ? RenderResult<Component> : string
+    > &
       AsyncIterable<string> & {
         toReadable(): ReadableStream<Uint8Array<ArrayBufferLike>>;
         pipe(stream: {
@@ -44,11 +50,17 @@ declare global {
 
     /** The result of calling `template.mount`. */
     export type MountedTemplate<Input = unknown, Return = unknown> = {
+      get value(): Return extends { value: infer Value } ? Value : void;
+      set value(
+        next: Return extends { valueChange?(next: infer Next): any }
+          ? Next
+          : never,
+      ): void;
       update(input: Marko.TemplateInput<Input>): void;
       destroy(): void;
     };
 
-    export interface Out<Component extends Marko.Component = Marko.Component>
+    export interface Out<Component = unknown>
       extends Marko.RenderedTemplate<Component> {
       /** The underlying ReadableStream Marko is writing into. */
       stream: unknown;
@@ -102,7 +114,10 @@ declare global {
 
     /** Valid data types which can be passed in as a <${dynamic}/> tag name. */
     export type Renderable =
-      | { renderBody: Body<any, any> | Template | string }
+      | {
+          content?: Body<any, any> | Template | string;
+          renderBody?: Body<any, any> | Template | string;
+        }
       | Body<any, any>
       | Template
       | string;
@@ -337,11 +352,6 @@ declare global {
       [Symbol.iterator](): Iterator<T>;
     };
 
-    /**
-     * @deprecated Prefer to use AttrTag
-     */
-    export type RepeatableAttrTag<T> = AttrTag<T>;
-
     export interface NativeTag<
       Input extends Record<string, any>,
       Return extends Element,
@@ -388,6 +398,9 @@ declare global {
           ? Return
           : never;
 
+    /** @deprecated @see {@link Marko.AttrTag} */
+    export type RepeatableAttrTag<T> = AttrTag<T>;
+
     /** @deprecated @see {@link Marko.Input} */
     export type NativeTagInput<Name extends keyof NativeTags> =
       NativeTags[Name]["input"];

package/package.json

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

package/src/core-tags/core/await/renderer.js

@@ -1,6 +1,7 @@
 "use strict";
 // eslint-disable-next-line no-constant-binary-expression
 var complain = "MARKO_DEBUG" && require("complain");
+var getRenderId = require("../../../runtime/html/get-render-id");
 var AsyncValue = require("./AsyncValue");
 
 function safeRenderBody(renderBody, targetOut, data) {
@@ -124,7 +125,7 @@ module.exports = function awaitTag(input, out) {
 
     var id = (awaitInfo.id =
       input.name ||
-      (out.global.componentIdPrefix || 0) + clientReorderContext.nextId++);
+      (getRenderId(out.global) || 0) + clientReorderContext.nextId++);
     var placeholderIdAttrValue = reorderFunctionId + "ph" + id;
 
     if (placeholderRenderer) {

package/src/node_modules/@internal/components-entry/index.js

@@ -3,6 +3,7 @@ require("../../../runtime/html/marko-namespace");
 
 var warp10 = require("warp10");
 var w10ToJSON = require("../../../runtime/helpers/serialize-noop").___toJSON;
+var getRenderId = require("../../../runtime/html/get-render-id");
 var safeJSONRegExp = /<\/|\u2028|\u2029/g;
 var IGNORE_GLOBAL_TYPES = new Set(["undefined", "function", "symbol"]);
 var DEFAULT_RUNTIME_ID = "M";
@@ -187,7 +188,7 @@ function getInitComponentsData(out, componentDefs) {
   const $global = out.global;
   const isLast = $global.___isLastFlush;
   const didSerializeComponents = $global.___didSerializeComponents;
-  const prefix = $global.componentIdPrefix || $global.widgetIdPrefix;
+  const prefix = getRenderId($global);
 
   if (len === 0) {
     if (isLast && didSerializeComponents) {

package/src/node_modules/@internal/components-registry/index-browser.js

@@ -476,6 +476,7 @@ function initServerRendered(renderedComponents, host) {
 
   if (!meta.___globals) {
     meta.___globals = Object.assign({
+      renderId: prefix,
       runtimeId: runtimeId,
       componentIdPrefix: prefix,
     }, renderedComponents.g);

package/src/node_modules/@internal/components-util/index.js

@@ -1,20 +1,12 @@
+var getRenderId = require("../../../runtime/html/get-render-id");
+
 var FLAG_WILL_RERENDER_IN_BROWSER = 1;
 // var FLAG_HAS_RENDER_BODY = 2;
 
 function nextComponentIdProvider(out) {
-  var prefix = out.global.componentIdPrefix || out.global.widgetIdPrefix || "s"; // "s" is for server (we use "b" for the browser)
+  var prefix = getRenderId(out.global) || "s"; // "s" is for server (we use "b" for the browser)
   var nextId = 0;
 
-  // eslint-disable-next-line no-constant-condition
-  if ("MARKO_DEBUG") {
-    if (out.global.widgetIdPrefix) {
-      require("complain")(
-        "$global.widgetIdPrefix is deprecated. use $global.componentIdPrefix instead.",
-        { location: false }
-      );
-    }
-  }
-
   return function nextComponentId() {
     return prefix + nextId++;
   };

package/src/runtime/helpers/tags-compat/runtime-html.js

@@ -78,7 +78,7 @@ exports.p = function (htmlCompat) {
       htmlCompat.registerRenderBody(renderBody5);
     }
     return (input, ...args) => {
-      const out = defaultCreateOut();
+      const out = defaultCreateOut(htmlCompat.$global());
       let customEvents;
 
       if (renderer5) {

package/src/runtime/html/get-render-id.js

@@ -0,0 +1,20 @@
+module.exports = function getRenderId($global) {
+  if (!("renderId" in $global)) {
+    $global.renderId =
+      $global.componentIdPrefix || $global.widgetIdPrefix || "s";
+
+    // eslint-disable-next-line no-constant-condition
+    if ("MARKO_DEBUG") {
+      if ($global.renderId !== "s") {
+        require("complain")(
+          "$global.componentIdPrefix and $global.widgetIdPrefix are deprecated. Use $global.renderId instead.",
+          { location: false },
+        );
+      }
+    }
+  }
+
+  if ($global.renderId !== "s") {
+    return $global.renderId;
+  }
+};

package/tags-html.d.ts

@@ -2571,6 +2571,12 @@ declare global {
        */
       renderBody?: Marko.Body<[], void>;
 
+      /**
+       * Provide body content for the tag as a Marko.Body.
+       * @see Marko.Body
+       */
+      content?: Marko.Body<[], void>;
+
       /**
        * Fired when resource was not fully loaded, but not as the result of an error.
        * @see https://html.spec.whatwg.org/multipage/media.html#event-media-abort