@marko/runtime-tags 0.1.11 → 0.1.13

package/dist/debug/dom.js

@@ -804,7 +804,7 @@ function walkInternal(walkCodes, scope, currentWalkIndex) {
     } else if (value2 >= 97 /* Over */) {
       value2 = 10 /* Over */ * currentMultiplier + value2 - 97 /* Over */;
       while (value2--) {
-        !walker.nextSibling() && !walker.nextNode();
+        walker.nextSibling();
       }
     } else if (value2 >= 67 /* Next */) {
       value2 = 20 /* Next */ * currentMultiplier + value2 - 67 /* Next */;
@@ -884,7 +884,7 @@ function initRenderer(renderer, scope) {
 }
 function dynamicTagAttrs(nodeAccessor, renderBody, inputIsArgs) {
   return (scope, attrsOrOp) => {
-    const renderer = scope[nodeAccessor + "(" /* ConditionalRenderer */];
+    let renderer = scope[nodeAccessor + "(" /* ConditionalRenderer */];
     if (!renderer || renderer === renderBody || attrsOrOp === DIRTY) {
       return;
     }
@@ -900,17 +900,20 @@ function dynamicTagAttrs(nodeAccessor, renderBody, inputIsArgs) {
         elementAccessor,
         renderBody && bindRenderer(scope, renderBody)
       );
-    } else if (renderer.___args) {
-      const attributes = attrsOrOp();
-      renderer.___args(
-        childScope,
-        inputIsArgs ? attributes : [
-          renderBody ? {
-            ...attributes,
-            renderBody: bindRenderer(scope, renderBody)
-          } : attributes
-        ]
-      );
+    } else {
+      renderer = renderer.default ? renderer.default._ : renderer._ || renderer;
+      if (renderer.___args) {
+        const attributes = attrsOrOp();
+        renderer.___args(
+          childScope,
+          inputIsArgs ? attributes : [
+            renderBody ? {
+              ...attributes,
+              renderBody: bindRenderer(scope, renderBody)
+            } : attributes
+          ]
+        );
+      }
     }
   };
 }

package/dist/debug/dom.mjs

@@ -728,7 +728,7 @@ function walkInternal(walkCodes, scope, currentWalkIndex) {
     } else if (value2 >= 97 /* Over */) {
       value2 = 10 /* Over */ * currentMultiplier + value2 - 97 /* Over */;
       while (value2--) {
-        !walker.nextSibling() && !walker.nextNode();
+        walker.nextSibling();
       }
     } else if (value2 >= 67 /* Next */) {
       value2 = 20 /* Next */ * currentMultiplier + value2 - 67 /* Next */;
@@ -808,7 +808,7 @@ function initRenderer(renderer, scope) {
 }
 function dynamicTagAttrs(nodeAccessor, renderBody, inputIsArgs) {
   return (scope, attrsOrOp) => {
-    const renderer = scope[nodeAccessor + "(" /* ConditionalRenderer */];
+    let renderer = scope[nodeAccessor + "(" /* ConditionalRenderer */];
     if (!renderer || renderer === renderBody || attrsOrOp === DIRTY) {
       return;
     }
@@ -824,17 +824,20 @@ function dynamicTagAttrs(nodeAccessor, renderBody, inputIsArgs) {
         elementAccessor,
         renderBody && bindRenderer(scope, renderBody)
       );
-    } else if (renderer.___args) {
-      const attributes = attrsOrOp();
-      renderer.___args(
-        childScope,
-        inputIsArgs ? attributes : [
-          renderBody ? {
-            ...attributes,
-            renderBody: bindRenderer(scope, renderBody)
-          } : attributes
-        ]
-      );
+    } else {
+      renderer = renderer.default ? renderer.default._ : renderer._ || renderer;
+      if (renderer.___args) {
+        const attributes = attrsOrOp();
+        renderer.___args(
+          childScope,
+          inputIsArgs ? attributes : [
+            renderBody ? {
+              ...attributes,
+              renderBody: bindRenderer(scope, renderBody)
+            } : attributes
+          ]
+        );
+      }
     }
   };
 }

package/dist/debug/html.js

@@ -1968,15 +1968,13 @@ var DEFAULT_RENDER_ID = "_";
 
 // src/html/dynamic-tag.ts
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/;
-function dynamicTagInput(tag, input, renderBody) {
+function dynamicTagInput(scope, tag, input, renderBody, tagVar) {
   if (!tag && !renderBody) return void 0;
-  const futureScopeId = peekNextScopeId();
-  const futureScope = peekNextScope();
-  write(`${markResumeScopeStart(futureScopeId)}`);
-  writeScope(futureScopeId, futureScope);
+  const scopeId = getScopeId(scope);
+  write(`${markResumeScopeStart(scopeId)}`);
+  writeScope(scopeId, scope);
   if (!tag) {
-    renderBody();
-    return futureScope;
+    return renderBody();
   }
   if (typeof tag === "string") {
     nextScopeId();
@@ -1989,7 +1987,7 @@ function dynamicTagInput(tag, input, renderBody) {
         `A renderBody was provided for a "${tag}" tag, which cannot have children.`
       );
     }
-    return futureScope;
+    return null;
   }
   const renderer = getDynamicRenderer(tag);
   if (true) {
@@ -1997,22 +1995,20 @@ function dynamicTagInput(tag, input, renderBody) {
       throw new Error(`Invalid renderer passed for dynamic tag: ${tag}`);
     }
   }
-  renderer(renderBody ? { ...input, renderBody } : input);
-  return futureScope;
+  return renderer(renderBody ? { ...input, renderBody } : input, tagVar);
 }
-function dynamicTagArgs(tag, args) {
+function dynamicTagArgs(scope, tag, args) {
   if (!tag) return void 0;
-  const futureScopeId = peekNextScopeId();
-  const futureScope = peekNextScope();
-  write(`${markResumeScopeStart(futureScopeId)}`);
-  writeScope(futureScopeId, futureScope);
+  const scopeId = getScopeId(scope);
+  write(`${markResumeScopeStart(scopeId)}`);
+  writeScope(scopeId, scope);
   if (typeof tag === "string") {
     nextScopeId();
     write(`<${tag}${attrs(args[0])}>`);
     if (!voidElementsReg.test(tag)) {
       write(`</${tag}>`);
     }
-    return futureScope;
+    return void 0;
   }
   const renderer = getDynamicRenderer(tag);
   if (true) {
@@ -2020,8 +2016,7 @@ function dynamicTagArgs(tag, args) {
       throw new Error(`Invalid renderer passed for dynamic tag: ${tag}`);
     }
   }
-  renderer(...args);
-  return futureScope;
+  return renderer(...args);
 }
 var getDynamicRenderer = (tag) => tag._ || tag.renderBody || tag;
 var createRenderer = (fn) => fn;

package/dist/debug/html.mjs

@@ -1913,15 +1913,13 @@ var DEFAULT_RENDER_ID = "_";
 
 // src/html/dynamic-tag.ts
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/;
-function dynamicTagInput(tag, input, renderBody) {
+function dynamicTagInput(scope, tag, input, renderBody, tagVar) {
   if (!tag && !renderBody) return void 0;
-  const futureScopeId = peekNextScopeId();
-  const futureScope = peekNextScope();
-  write(`${markResumeScopeStart(futureScopeId)}`);
-  writeScope(futureScopeId, futureScope);
+  const scopeId = getScopeId(scope);
+  write(`${markResumeScopeStart(scopeId)}`);
+  writeScope(scopeId, scope);
   if (!tag) {
-    renderBody();
-    return futureScope;
+    return renderBody();
   }
   if (typeof tag === "string") {
     nextScopeId();
@@ -1934,7 +1932,7 @@ function dynamicTagInput(tag, input, renderBody) {
         `A renderBody was provided for a "${tag}" tag, which cannot have children.`
       );
     }
-    return futureScope;
+    return null;
   }
   const renderer = getDynamicRenderer(tag);
   if (true) {
@@ -1942,22 +1940,20 @@ function dynamicTagInput(tag, input, renderBody) {
       throw new Error(`Invalid renderer passed for dynamic tag: ${tag}`);
     }
   }
-  renderer(renderBody ? { ...input, renderBody } : input);
-  return futureScope;
+  return renderer(renderBody ? { ...input, renderBody } : input, tagVar);
 }
-function dynamicTagArgs(tag, args) {
+function dynamicTagArgs(scope, tag, args) {
   if (!tag) return void 0;
-  const futureScopeId = peekNextScopeId();
-  const futureScope = peekNextScope();
-  write(`${markResumeScopeStart(futureScopeId)}`);
-  writeScope(futureScopeId, futureScope);
+  const scopeId = getScopeId(scope);
+  write(`${markResumeScopeStart(scopeId)}`);
+  writeScope(scopeId, scope);
   if (typeof tag === "string") {
     nextScopeId();
     write(`<${tag}${attrs(args[0])}>`);
     if (!voidElementsReg.test(tag)) {
       write(`</${tag}>`);
     }
-    return futureScope;
+    return void 0;
   }
   const renderer = getDynamicRenderer(tag);
   if (true) {
@@ -1965,8 +1961,7 @@ function dynamicTagArgs(tag, args) {
       throw new Error(`Invalid renderer passed for dynamic tag: ${tag}`);
     }
   }
-  renderer(...args);
-  return futureScope;
+  return renderer(...args);
 }
 var getDynamicRenderer = (tag) => tag._ || tag.renderBody || tag;
 var createRenderer = (fn) => fn;

package/dist/dom.js

@@ -528,7 +528,7 @@ function walkInternal(walkCodes, scope, currentWalkIndex) {
       walker.nextSibling();
     } else if (value2 >= 97 /* Over */)
       for (value2 = 10 /* Over */ * currentMultiplier + value2 - 97 /* Over */; value2--; )
-        !walker.nextSibling() && walker.nextNode();
+        walker.nextSibling();
     else if (value2 >= 67 /* Next */)
       for (value2 = 20 /* Next */ * currentMultiplier + value2 - 67 /* Next */; value2--; )
         walker.nextNode();
@@ -581,7 +581,7 @@ function dynamicTagAttrs(nodeAccessor, renderBody, inputIsArgs) {
         0,
         renderBody && bindRenderer(scope, renderBody)
       );
-    else if (renderer.d) {
+    else if (renderer = renderer.default ? renderer.default._ : renderer._ || renderer, renderer.d) {
       let attributes = attrsOrOp();
       renderer.d(
         childScope,

package/dist/dom.mjs

@@ -455,7 +455,7 @@ function walkInternal(walkCodes, scope, currentWalkIndex) {
       walker.nextSibling();
     } else if (value2 >= 97 /* Over */)
       for (value2 = 10 /* Over */ * currentMultiplier + value2 - 97 /* Over */; value2--; )
-        !walker.nextSibling() && walker.nextNode();
+        walker.nextSibling();
     else if (value2 >= 67 /* Next */)
       for (value2 = 20 /* Next */ * currentMultiplier + value2 - 67 /* Next */; value2--; )
         walker.nextNode();
@@ -508,7 +508,7 @@ function dynamicTagAttrs(nodeAccessor, renderBody, inputIsArgs) {
         0,
         renderBody && bindRenderer(scope, renderBody)
       );
-    else if (renderer.d) {
+    else if (renderer = renderer.default ? renderer.default._ : renderer._ || renderer, renderer.d) {
       let attributes = attrsOrOp();
       renderer.d(
         childScope,

package/dist/html/dynamic-tag.d.ts

@@ -1,17 +1,12 @@
 import type { Renderer } from "../common/types";
 import type { ServerTemplate as Template } from "./template";
+import { type PartialScope } from "./writer";
 interface RenderBodyObject {
     [x: PropertyKey]: unknown;
     renderBody: Renderer;
 }
-export declare function dynamicTagInput(tag: unknown | string | Renderer | RenderBodyObject | Template, input: Record<string, unknown>, renderBody?: () => void): {
-    [x: string]: unknown;
-    [x: number]: unknown;
-} | undefined;
-export declare function dynamicTagArgs(tag: unknown | string | Renderer | RenderBodyObject | Template, args: unknown[]): {
-    [x: string]: unknown;
-    [x: number]: unknown;
-} | undefined;
+export declare function dynamicTagInput(scope: PartialScope, tag: unknown | string | Renderer | RenderBodyObject | Template, input: Record<string, unknown>, renderBody?: () => void, tagVar?: unknown): unknown;
+export declare function dynamicTagArgs(scope: PartialScope, tag: unknown | string | Renderer | RenderBodyObject | Template, args: unknown[]): unknown;
 declare let getDynamicRenderer: (tag: unknown | string | Renderer | RenderBodyObject | Template) => Renderer;
 export declare let createRenderer: (fn: Renderer) => Renderer;
 export declare function patchDynamicTag(newGetDynamicRenderer: typeof getDynamicRenderer, newCreateRenderer: typeof createRenderer): void;

package/dist/html/writer.d.ts

@@ -1,6 +1,6 @@
 import type { Accessor } from "../common/types";
 import { Serializer } from "./serializer";
-type PartialScope = Record<Accessor, unknown>;
+export type PartialScope = Record<Accessor, unknown>;
 declare enum Mark {
     Placeholder = "!^",
     PlaceholderEnd = "!",

package/dist/html.js

@@ -1283,15 +1283,19 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 
 // src/html/dynamic-tag.ts
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/;
-function dynamicTagInput(tag, input, renderBody) {
+function dynamicTagInput(scope, tag, input, renderBody, tagVar) {
   if (!tag && !renderBody) return;
-  let futureScopeId = peekNextScopeId(), futureScope = peekNextScope();
-  return write(`${markResumeScopeStart(futureScopeId)}`), writeScope(futureScopeId, futureScope), tag ? typeof tag == "string" ? (nextScopeId(), write(`<${tag}${attrs(input)}>`), voidElementsReg.test(tag) || (renderBody?.(), write(`</${tag}>`)), futureScope) : (getDynamicRenderer(tag)(renderBody ? { ...input, renderBody } : input), futureScope) : (renderBody(), futureScope);
+  let scopeId = getScopeId(scope);
+  return write(`${markResumeScopeStart(scopeId)}`), writeScope(scopeId, scope), tag ? typeof tag == "string" ? (nextScopeId(), write(`<${tag}${attrs(input)}>`), voidElementsReg.test(tag) || (renderBody?.(), write(`</${tag}>`)), null) : getDynamicRenderer(tag)(renderBody ? { ...input, renderBody } : input, tagVar) : renderBody();
 }
-function dynamicTagArgs(tag, args) {
+function dynamicTagArgs(scope, tag, args) {
   if (!tag) return;
-  let futureScopeId = peekNextScopeId(), futureScope = peekNextScope();
-  return write(`${markResumeScopeStart(futureScopeId)}`), writeScope(futureScopeId, futureScope), typeof tag == "string" ? (nextScopeId(), write(`<${tag}${attrs(args[0])}>`), voidElementsReg.test(tag) || write(`</${tag}>`), futureScope) : (getDynamicRenderer(tag)(...args), futureScope);
+  let scopeId = getScopeId(scope);
+  if (write(`${markResumeScopeStart(scopeId)}`), writeScope(scopeId, scope), typeof tag == "string") {
+    nextScopeId(), write(`<${tag}${attrs(args[0])}>`), voidElementsReg.test(tag) || write(`</${tag}>`);
+    return;
+  }
+  return getDynamicRenderer(tag)(...args);
 }
 var getDynamicRenderer = (tag) => tag._ || tag.renderBody || tag, createRenderer = (fn) => fn;
 function patchDynamicTag(newGetDynamicRenderer, newCreateRenderer) {

package/dist/html.mjs

@@ -1231,15 +1231,19 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 
 // src/html/dynamic-tag.ts
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/;
-function dynamicTagInput(tag, input, renderBody) {
+function dynamicTagInput(scope, tag, input, renderBody, tagVar) {
   if (!tag && !renderBody) return;
-  let futureScopeId = peekNextScopeId(), futureScope = peekNextScope();
-  return write(`${markResumeScopeStart(futureScopeId)}`), writeScope(futureScopeId, futureScope), tag ? typeof tag == "string" ? (nextScopeId(), write(`<${tag}${attrs(input)}>`), voidElementsReg.test(tag) || (renderBody?.(), write(`</${tag}>`)), futureScope) : (getDynamicRenderer(tag)(renderBody ? { ...input, renderBody } : input), futureScope) : (renderBody(), futureScope);
+  let scopeId = getScopeId(scope);
+  return write(`${markResumeScopeStart(scopeId)}`), writeScope(scopeId, scope), tag ? typeof tag == "string" ? (nextScopeId(), write(`<${tag}${attrs(input)}>`), voidElementsReg.test(tag) || (renderBody?.(), write(`</${tag}>`)), null) : getDynamicRenderer(tag)(renderBody ? { ...input, renderBody } : input, tagVar) : renderBody();
 }
-function dynamicTagArgs(tag, args) {
+function dynamicTagArgs(scope, tag, args) {
   if (!tag) return;
-  let futureScopeId = peekNextScopeId(), futureScope = peekNextScope();
-  return write(`${markResumeScopeStart(futureScopeId)}`), writeScope(futureScopeId, futureScope), typeof tag == "string" ? (nextScopeId(), write(`<${tag}${attrs(args[0])}>`), voidElementsReg.test(tag) || write(`</${tag}>`), futureScope) : (getDynamicRenderer(tag)(...args), futureScope);
+  let scopeId = getScopeId(scope);
+  if (write(`${markResumeScopeStart(scopeId)}`), writeScope(scopeId, scope), typeof tag == "string") {
+    nextScopeId(), write(`<${tag}${attrs(args[0])}>`), voidElementsReg.test(tag) || write(`</${tag}>`);
+    return;
+  }
+  return getDynamicRenderer(tag)(...args);
 }
 var getDynamicRenderer = (tag) => tag._ || tag.renderBody || tag, createRenderer = (fn) => fn;
 function patchDynamicTag(newGetDynamicRenderer, newCreateRenderer) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/runtime-tags",
-  "version": "0.1.11",
+  "version": "0.1.13",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",