diff --git a/.changeset/funny-eyes-rescue.md b/.changeset/funny-eyes-rescue.md
new file mode 100644
index 0000000000..5fe80d5ade
--- /dev/null
+++ b/.changeset/funny-eyes-rescue.md
@@ -0,0 +1,6 @@
+---
+"@marko/translator-interop-class-tags": patch
+"marko": patch
+---
+
+Update tags api compat layer.
diff --git a/.changeset/thick-parents-vanish.md b/.changeset/thick-parents-vanish.md
new file mode 100644
index 0000000000..1896931cf1
--- /dev/null
+++ b/.changeset/thick-parents-vanish.md
@@ -0,0 +1,5 @@
+---
+"@marko/runtime-tags": patch
+---
+
+Support namespaced tags (svg/math).
diff --git a/.sizes.json b/.sizes.json
index bea2028700..cfb21259b7 100644
--- a/.sizes.json
+++ b/.sizes.json
@@ -7,8 +7,8 @@
{
"name": "*",
"total": {
- "min": 18085,
- "brotli": 6624
+ "min": 18364,
+ "brotli": 6749
}
},
{
@@ -18,12 +18,12 @@
"brotli": 144
},
"runtime": {
- "min": 4178,
- "brotli": 1803
+ "min": 4409,
+ "brotli": 1898
},
"total": {
- "min": 4367,
- "brotli": 1947
+ "min": 4598,
+ "brotli": 2042
}
},
{
@@ -34,11 +34,11 @@
},
"runtime": {
"min": 3688,
- "brotli": 1661
+ "brotli": 1656
},
"total": {
"min": 3799,
- "brotli": 1761
+ "brotli": 1756
}
},
{
@@ -48,12 +48,12 @@
"brotli": 541
},
"runtime": {
- "min": 7879,
- "brotli": 3253
+ "min": 8145,
+ "brotli": 3363
},
"total": {
- "min": 9019,
- "brotli": 3794
+ "min": 9285,
+ "brotli": 3904
}
},
{
@@ -63,12 +63,12 @@
"brotli": 478
},
"runtime": {
- "min": 8972,
- "brotli": 3643
+ "min": 9253,
+ "brotli": 3772
},
"total": {
- "min": 9920,
- "brotli": 4121
+ "min": 10201,
+ "brotli": 4250
}
}
]
diff --git a/.sizes/dom.js b/.sizes/dom.js
index 8ebaa48269..227713563b 100644
--- a/.sizes/dom.js
+++ b/.sizes/dom.js
@@ -1,4 +1,4 @@
-// size: 18085 (min) 6624 (brotli)
+// size: 18364 (min) 6749 (brotli)
var empty = [],
rest = Symbol();
function attrTag(attrs2) {
@@ -128,10 +128,10 @@ var registeredValues = {},
Render = class {
n = [];
o = {};
- z = { _: registeredValues };
+ A = { _: registeredValues };
constructor(renders, runtimeId, renderId) {
- (this.A = renders),
- (this.B = runtimeId),
+ (this.B = renders),
+ (this.C = runtimeId),
(this.p = renderId),
(this.q = renders[renderId]),
this.s();
@@ -141,7 +141,7 @@ var registeredValues = {},
}
s() {
let data2 = this.q,
- serializeContext = this.z,
+ serializeContext = this.A,
scopeLookup = this.o,
visits = data2.v,
branchIds = new Set(),
@@ -226,7 +226,7 @@ var registeredValues = {},
{ $global: $global } = scopeLookup;
$global ||
((scopeLookup.$global = $global = scopes.$ || {}),
- ($global.runtimeId = this.B),
+ ($global.runtimeId = this.C),
($global.renderId = this.p));
for (let scopeId in scopes)
if ("$" !== scopeId) {
@@ -251,7 +251,7 @@ var registeredValues = {},
}
} else
i === len || "string" != typeof resumes[i]
- ? delete this.A[this.p]
+ ? delete this.B[this.p]
: registeredValues[resumes[i++]](
scopeLookup[resumeData],
scopeLookup[resumeData],
@@ -294,7 +294,7 @@ function init(runtimeId = "M") {
});
}
function registerSubscriber(id, signal) {
- return register(id, signal.C), signal;
+ return register(id, signal.D), signal;
}
function nodeRef(id, key) {
return register(id, (scope) => () => scope[key]);
@@ -554,9 +554,11 @@ function normalizeBoolProp(value2) {
function toValueProp(it) {
return it.value;
}
-var parser = document.createElement("template");
-function parseHTML(html2) {
- return (parser.innerHTML = html2), parser.content;
+var parsers = {};
+function parseHTML(html2, ns) {
+ let parser = (parsers[ns] ||= document.createElementNS(ns, "template")),
+ content = ((parser.innerHTML = html2), parser.content || parser);
+ return content.firstChild || content.appendChild(new Text()), content;
}
function attr(element, name, value2) {
setAttribute(element, name, normalizeAttrValue(value2));
@@ -727,11 +729,18 @@ function attrsEvents(scope, nodeAccessor) {
}
function html(scope, value2, accessor) {
let firstChild = scope[accessor],
+ parentNode = firstChild.parentNode,
lastChild = scope[accessor + "-"] || firstChild,
- newContent = parseHTML(value2 || 0 === value2 ? value2 + "" : "");
- (scope[accessor] = newContent.firstChild),
+ newContent = parseHTML(
+ value2 || 0 === value2 ? value2 + "" : "",
+ parentNode.namespaceURI,
+ );
+ insertChildNodes(
+ parentNode,
+ firstChild,
+ (scope[accessor] = newContent.firstChild),
(scope[accessor + "-"] = newContent.lastChild),
- firstChild.parentNode.insertBefore(newContent, firstChild),
+ ),
removeChildNodes(firstChild, lastChild);
}
function props(scope, nodeIndex, index) {
@@ -766,6 +775,20 @@ function removeChildNodes(startNode, endNode) {
current.remove(), (current = next);
}
}
+function insertChildNodes(parentNode, referenceNode, startNode, endNode) {
+ parentNode.insertBefore(toInsertNode(startNode, endNode), referenceNode);
+}
+function toInsertNode(startNode, endNode) {
+ if (startNode === endNode) return startNode;
+ let parent = new DocumentFragment(),
+ stop = endNode.nextSibling,
+ current = startNode;
+ for (; current !== stop; ) {
+ let next = current.nextSibling;
+ parent.appendChild(current), (current = next);
+ }
+ return parent;
+}
var pendingScopes = [];
function createScope($global) {
let scope = { g: 1, $global: $global };
@@ -779,9 +802,9 @@ function destroyBranch(branch) {
branch.t?.k?.delete(branch), destroyNestedBranches(branch);
}
function destroyNestedBranches(branch) {
- (branch.D = 1),
+ (branch.E = 1),
branch.k?.forEach(destroyNestedBranches),
- branch.E?.forEach((scope) => {
+ branch.F?.forEach((scope) => {
for (let id in scope.h) scope.h[id]?.abort();
});
}
@@ -789,12 +812,7 @@ function removeAndDestroyBranch(branch) {
destroyBranch(branch), removeChildNodes(branch.a, branch.b);
}
function insertBranchBefore(branch, parentNode, nextSibling) {
- let current = branch.a,
- stop = branch.b.nextSibling;
- for (; current !== stop; ) {
- let next = current.nextSibling;
- parentNode.insertBefore(current, nextSibling), (current = next);
- }
+ insertChildNodes(parentNode, nextSibling, branch.a, branch.b);
}
var walker = document.createTreeWalker(document);
function trimWalkString(walkString) {
@@ -851,27 +869,41 @@ function walkInternal(walkCodes, scope, currentWalkIndex) {
}
return currentWalkIndex;
}
-function createBranchScopeWithRenderer(renderer, $global, parentScope) {
+function createBranchScopeWithRenderer(
+ renderer,
+ $global,
+ parentScope,
+ parentNode,
+) {
let branch = createBranch($global, renderer.u || parentScope, parentScope);
- return initBranch(renderer, branch), branch;
+ return initBranch(renderer, branch, parentNode), branch;
}
function createBranchScopeWithTagNameOrRenderer(
tagNameOrRenderer,
$global,
parentScope,
+ parentNode,
) {
if ("string" != typeof tagNameOrRenderer)
return createBranchScopeWithRenderer(
tagNameOrRenderer,
$global,
parentScope,
+ parentNode,
);
let branch = createBranch($global, parentScope, parentScope);
return (
(branch[0] =
branch.a =
branch.b =
- document.createElement(tagNameOrRenderer)),
+ document.createElementNS(
+ "svg" === tagNameOrRenderer
+ ? "http://www.w3.org/2000/svg"
+ : "math" === tagNameOrRenderer
+ ? "http://www.w3.org/1998/Math/MathML"
+ : parentNode.namespaceURI,
+ tagNameOrRenderer,
+ )),
branch
);
}
@@ -889,15 +921,13 @@ function createBranch($global, ownerScope, parentScope) {
branch
);
}
-function initBranch(renderer, branch) {
- let dom = renderer.l();
- return (
- walk(11 === dom.nodeType ? dom.firstChild : dom, renderer.F, branch),
- (branch.a = 11 === dom.nodeType ? dom.firstChild : dom),
- (branch.b = 11 === dom.nodeType ? dom.lastChild : dom),
- renderer.x && queueRender(branch, renderer.x),
- dom
- );
+function initBranch(renderer, branch, parentNode) {
+ let clone = renderer.l(parentNode.namespaceURI),
+ cloneParent = clone.parentNode;
+ walk(cloneParent?.firstChild || clone, renderer.G, branch),
+ (branch.a = cloneParent?.firstChild || clone),
+ (branch.b = cloneParent?.lastChild || clone),
+ renderer.x && queueRender(branch, renderer.x);
}
function dynamicTagAttrs(nodeAccessor, getContent, inputIsArgs) {
return (scope, attrsOrOp) => {
@@ -927,12 +957,12 @@ function createRendererWithOwner(template, rawWalks, setup, getArgs) {
walks = rawWalks ? trimWalkString(rawWalks) : " ";
return (owner) => ({
j: id,
- G: template,
- F: walks,
+ y: template,
+ G: walks,
x: setup,
l: _clone,
u: owner,
- H: void 0,
+ J: void 0,
get d() {
return (args ||= getArgs?.());
},
@@ -941,21 +971,19 @@ function createRendererWithOwner(template, rawWalks, setup, getArgs) {
function createRenderer(template, walks, setup, getArgs) {
return createRendererWithOwner(template, walks, setup, getArgs)();
}
-function _clone() {
- return (this.H ||= (function (html2) {
- let content = parseHTML(html2);
- if (content.firstChild) {
- if (
- content.firstChild === content.lastChild &&
- 8 !== content.firstChild.nodeType
- )
- return content.firstChild;
- let fragment = new DocumentFragment();
- return fragment.appendChild(content), fragment;
- }
- return new Text();
- })(this.G)).cloneNode(!0);
+function _clone(ns) {
+ return ((cloneCache[ns] ||= {})[this.y] ||= (function (html2, ns) {
+ let { firstChild: firstChild, lastChild: lastChild } = parseHTML(html2, ns),
+ parent = document.createElementNS(ns, "t");
+ return (
+ insertChildNodes(parent, null, firstChild, lastChild),
+ firstChild === lastChild && firstChild.nodeType < 8
+ ? () => firstChild.cloneNode(!0)
+ : () => parent.cloneNode(!0).firstChild
+ );
+ })(this.y, ns))();
}
+var cloneCache = {};
var conditional = function (nodeAccessor, fn, getIntersection) {
let rendererAccessor = nodeAccessor + "(",
intersection2 =
@@ -978,6 +1006,7 @@ var conditional = function (nodeAccessor, fn, getIntersection) {
newRenderer,
scope.$global,
scope,
+ prevBranch.b.parentNode,
)
: getEmptyBranch(scope[nodeAccessor]);
insertBranchBefore(
@@ -1028,6 +1057,7 @@ function setConditionalRendererOnlyChild(scope, nodeAccessor, newRenderer) {
newRenderer,
scope.$global,
scope,
+ referenceNode,
)
: void 0;
(referenceNode.textContent = ""),
@@ -1074,29 +1104,30 @@ function loop(nodeAccessor, renderer, forEach) {
let newMap,
newArray,
afterReference,
- parentNode,
referenceNode = scope[nodeAccessor],
- referenceIsMarker =
- 8 === referenceNode.nodeType || 3 === referenceNode.nodeType,
+ referenceIsMarker = referenceNode.nodeType > 1,
oldMap =
scope[nodeAccessor + "("] ||
(referenceIsMarker ? emptyMarkerMap : emptyMap),
oldArray = scope[nodeAccessor + "!"] || Array.from(oldMap.values()),
+ parentNode = referenceIsMarker
+ ? referenceNode.parentNode || oldArray[0].a.parentNode
+ : referenceNode,
needsReconciliation = !0;
- if (
- (forEach(valueOrOp, (key, args) => {
- let branch = oldMap.get(key);
- branch ||
- (branch = createBranchScopeWithRenderer(
- renderer,
- scope.$global,
- scope,
- )),
- params && params(branch, args),
- newMap
- ? (newMap.set(key, branch), newArray.push(branch))
- : ((newMap = new Map([[key, branch]])), (newArray = [branch]));
- }),
+ forEach(valueOrOp, (key, args) => {
+ let branch = oldMap.get(key);
+ branch ||
+ (branch = createBranchScopeWithRenderer(
+ renderer,
+ scope.$global,
+ scope,
+ parentNode,
+ )),
+ params && params(branch, args),
+ newMap
+ ? (newMap.set(key, branch), newArray.push(branch))
+ : ((newMap = new Map([[key, branch]])), (newArray = [branch]));
+ }),
newMap ||
(referenceIsMarker
? ((newMap = emptyMarkerMap),
@@ -1107,134 +1138,141 @@ function loop(nodeAccessor, renderer, forEach) {
(newMap = emptyMap),
(newArray = emptyArray),
(needsReconciliation = !1))),
- needsReconciliation)
- ) {
- if (referenceIsMarker) {
- oldMap === emptyMarkerMap && getEmptyBranch(referenceNode);
- let oldLastChild = oldArray[oldArray.length - 1];
- (afterReference = oldLastChild.b.nextSibling),
- (parentNode = oldLastChild.a.parentNode);
- } else (afterReference = null), (parentNode = referenceNode);
- !(function (parent, oldBranches, newBranches, afterReference) {
- let i,
- j,
- k,
- nextSibling,
- oldBranch,
- newBranch,
- oldStart = 0,
- newStart = 0,
- oldEnd = oldBranches.length - 1,
- newEnd = newBranches.length - 1,
- oldStartBranch = oldBranches[oldStart],
- newStartBranch = newBranches[newStart],
- oldEndBranch = oldBranches[oldEnd],
- newEndBranch = newBranches[newEnd];
- outer: {
- for (; oldStartBranch === newStartBranch; ) {
- if (
- (++oldStart, ++newStart, oldStart > oldEnd || newStart > newEnd)
- )
- break outer;
- (oldStartBranch = oldBranches[oldStart]),
- (newStartBranch = newBranches[newStart]);
- }
- for (; oldEndBranch === newEndBranch; ) {
- if ((--oldEnd, --newEnd, oldStart > oldEnd || newStart > newEnd))
- break outer;
- (oldEndBranch = oldBranches[oldEnd]),
- (newEndBranch = newBranches[newEnd]);
+ needsReconciliation &&
+ (referenceIsMarker
+ ? (oldMap === emptyMarkerMap && getEmptyBranch(referenceNode),
+ (afterReference = oldArray[oldArray.length - 1].b.nextSibling))
+ : (afterReference = null),
+ (function (parent, oldBranches, newBranches, afterReference) {
+ let i,
+ j,
+ k,
+ nextSibling,
+ oldBranch,
+ newBranch,
+ oldStart = 0,
+ newStart = 0,
+ oldEnd = oldBranches.length - 1,
+ newEnd = newBranches.length - 1,
+ oldStartBranch = oldBranches[oldStart],
+ newStartBranch = newBranches[newStart],
+ oldEndBranch = oldBranches[oldEnd],
+ newEndBranch = newBranches[newEnd];
+ outer: {
+ for (; oldStartBranch === newStartBranch; ) {
+ if (
+ (++oldStart, ++newStart, oldStart > oldEnd || newStart > newEnd)
+ )
+ break outer;
+ (oldStartBranch = oldBranches[oldStart]),
+ (newStartBranch = newBranches[newStart]);
+ }
+ for (; oldEndBranch === newEndBranch; ) {
+ if ((--oldEnd, --newEnd, oldStart > oldEnd || newStart > newEnd))
+ break outer;
+ (oldEndBranch = oldBranches[oldEnd]),
+ (newEndBranch = newBranches[newEnd]);
+ }
}
- }
- if (oldStart > oldEnd) {
- if (newStart <= newEnd) {
- (k = newEnd + 1),
- (nextSibling =
- k < newBranches.length ? newBranches[k].a : afterReference);
+ if (oldStart > oldEnd) {
+ if (newStart <= newEnd) {
+ (k = newEnd + 1),
+ (nextSibling =
+ k < newBranches.length ? newBranches[k].a : afterReference);
+ do {
+ insertBranchBefore(
+ newBranches[newStart++],
+ parent,
+ nextSibling,
+ );
+ } while (newStart <= newEnd);
+ }
+ } else if (newStart > newEnd)
do {
- insertBranchBefore(newBranches[newStart++], parent, nextSibling);
- } while (newStart <= newEnd);
- }
- } else if (newStart > newEnd)
- do {
- removeAndDestroyBranch(oldBranches[oldStart++]);
- } while (oldStart <= oldEnd);
- else {
- let oldLength = oldEnd - oldStart + 1,
- newLength = newEnd - newStart + 1,
- aNullable = oldBranches,
- sources = new Array(newLength);
- for (i = 0; i < newLength; ++i) sources[i] = -1;
- let pos = 0,
- synced = 0,
- keyIndex = new Map();
- for (j = newStart; j <= newEnd; ++j) keyIndex.set(newBranches[j], j);
- for (i = oldStart; i <= oldEnd && synced < newLength; ++i)
- (oldBranch = oldBranches[i]),
- (j = keyIndex.get(oldBranch)),
- void 0 !== j &&
- ((pos = pos > j ? 2147483647 : j),
- ++synced,
- (newBranch = newBranches[j]),
- (sources[j - newStart] = i),
- (aNullable[i] = null));
- if (oldLength === oldBranches.length && 0 === synced) {
- for (; newStart < newLength; ++newStart)
- insertBranchBefore(newBranches[newStart], parent, afterReference);
- for (; oldStart < oldLength; ++oldStart)
- removeAndDestroyBranch(oldBranches[oldStart]);
- } else {
- for (i = oldLength - synced; i > 0; )
- (oldBranch = aNullable[oldStart++]),
- null !== oldBranch && (removeAndDestroyBranch(oldBranch), i--);
- if (2147483647 === pos) {
- let seq = (function (a) {
- let u,
- v,
- p = a.slice(),
- result = [];
- result.push(0);
- for (let i = 0, il = a.length; i < il; ++i) {
- if (-1 === a[i]) continue;
- let j = result[result.length - 1];
- if (a[j] < a[i]) (p[i] = j), result.push(i);
- else {
- for (u = 0, v = result.length - 1; u < v; ) {
- let c = ((u + v) / 2) | 0;
- a[result[c]] < a[i] ? (u = c + 1) : (v = c);
+ removeAndDestroyBranch(oldBranches[oldStart++]);
+ } while (oldStart <= oldEnd);
+ else {
+ let oldLength = oldEnd - oldStart + 1,
+ newLength = newEnd - newStart + 1,
+ aNullable = oldBranches,
+ sources = new Array(newLength);
+ for (i = 0; i < newLength; ++i) sources[i] = -1;
+ let pos = 0,
+ synced = 0,
+ keyIndex = new Map();
+ for (j = newStart; j <= newEnd; ++j)
+ keyIndex.set(newBranches[j], j);
+ for (i = oldStart; i <= oldEnd && synced < newLength; ++i)
+ (oldBranch = oldBranches[i]),
+ (j = keyIndex.get(oldBranch)),
+ void 0 !== j &&
+ ((pos = pos > j ? 2147483647 : j),
+ ++synced,
+ (newBranch = newBranches[j]),
+ (sources[j - newStart] = i),
+ (aNullable[i] = null));
+ if (oldLength === oldBranches.length && 0 === synced) {
+ for (; newStart < newLength; ++newStart)
+ insertBranchBefore(
+ newBranches[newStart],
+ parent,
+ afterReference,
+ );
+ for (; oldStart < oldLength; ++oldStart)
+ removeAndDestroyBranch(oldBranches[oldStart]);
+ } else {
+ for (i = oldLength - synced; i > 0; )
+ (oldBranch = aNullable[oldStart++]),
+ null !== oldBranch &&
+ (removeAndDestroyBranch(oldBranch), i--);
+ if (2147483647 === pos) {
+ let seq = (function (a) {
+ let u,
+ v,
+ p = a.slice(),
+ result = [];
+ result.push(0);
+ for (let i = 0, il = a.length; i < il; ++i) {
+ if (-1 === a[i]) continue;
+ let j = result[result.length - 1];
+ if (a[j] < a[i]) (p[i] = j), result.push(i);
+ else {
+ for (u = 0, v = result.length - 1; u < v; ) {
+ let c = ((u + v) / 2) | 0;
+ a[result[c]] < a[i] ? (u = c + 1) : (v = c);
+ }
+ a[i] < a[result[u]] &&
+ (u > 0 && (p[i] = result[u - 1]), (result[u] = i));
}
- a[i] < a[result[u]] &&
- (u > 0 && (p[i] = result[u - 1]), (result[u] = i));
}
- }
- for (u = result.length, v = result[u - 1]; u-- > 0; )
- (result[u] = v), (v = p[v]);
- return result;
- })(sources);
- for (
- j = seq.length - 1, k = newBranches.length, i = newLength - 1;
- i >= 0;
- --i
- )
- -1 === sources[i] || j < 0 || i !== seq[j]
- ? ((pos = i + newStart),
+ for (u = result.length, v = result[u - 1]; u-- > 0; )
+ (result[u] = v), (v = p[v]);
+ return result;
+ })(sources);
+ for (
+ j = seq.length - 1, k = newBranches.length, i = newLength - 1;
+ i >= 0;
+ --i
+ )
+ -1 === sources[i] || j < 0 || i !== seq[j]
+ ? ((pos = i + newStart),
+ (newBranch = newBranches[pos++]),
+ (nextSibling =
+ pos < k ? newBranches[pos].a : afterReference),
+ insertBranchBefore(newBranch, parent, nextSibling))
+ : --j;
+ } else if (synced !== newLength)
+ for (k = newBranches.length, i = newLength - 1; i >= 0; --i)
+ -1 === sources[i] &&
+ ((pos = i + newStart),
(newBranch = newBranches[pos++]),
(nextSibling =
pos < k ? newBranches[pos].a : afterReference),
- insertBranchBefore(newBranch, parent, nextSibling))
- : --j;
- } else if (synced !== newLength)
- for (k = newBranches.length, i = newLength - 1; i >= 0; --i)
- -1 === sources[i] &&
- ((pos = i + newStart),
- (newBranch = newBranches[pos++]),
- (nextSibling = pos < k ? newBranches[pos].a : afterReference),
- insertBranchBefore(newBranch, parent, nextSibling));
+ insertBranchBefore(newBranch, parent, nextSibling));
+ }
}
- }
- })(parentNode, oldArray, newArray, afterReference);
- }
- (scope[nodeAccessor + "("] = newMap),
+ })(parentNode, oldArray, newArray, afterReference)),
+ (scope[nodeAccessor + "("] = newMap),
(scope[nodeAccessor + "!"] = newArray);
};
}
@@ -1382,7 +1420,7 @@ function dynamicClosure(
(helperSignal._ = (scope, value2) => {
_signal(scope, value2), subscribe(scope);
}),
- (helperSignal.C = subscribe),
+ (helperSignal.D = subscribe),
helperSignal
);
}
@@ -1436,7 +1474,7 @@ function queueSource(scope, signal, value2) {
}
function queueRender(scope, signal, value2) {
let i = pendingRenders.length,
- render = { m: scope, I: signal, J: value2, y: i };
+ render = { m: scope, H: signal, I: value2, z: i };
for (pendingRenders.push(render); i; ) {
let parentIndex = (i - 1) >> 1,
parent = pendingRenders[parentIndex];
@@ -1502,7 +1540,7 @@ function runRenders() {
}
pendingRenders[i] = item;
}
- render.m.c?.D || render.I(render.m, render.J);
+ render.m.c?.E || render.H(render.m, render.I);
}
!(function () {
for (let scope of pendingScopes) scope.g = 0;
@@ -1510,7 +1548,7 @@ function runRenders() {
})();
}
function comparePendingRenders(a, b) {
- return getBranchDepth(a) - getBranchDepth(b) || a.y - b.y;
+ return getBranchDepth(a) - getBranchDepth(b) || a.z - b.z;
}
function getBranchDepth(render) {
return render.m.c?.f || 0;
@@ -1521,7 +1559,7 @@ function resetAbortSignal(scope, id) {
}
function getAbortSignal(scope, id) {
return (
- scope.c && (scope.c.E ||= new Set()).add(scope),
+ scope.c && (scope.c.F ||= new Set()).add(scope),
((scope.h ||= {})[id] ||= new AbortController()).signal
);
}
@@ -1596,12 +1634,12 @@ var classIdToBranch = new Map(),
? (applyArgs(branch, MARK), (existing = !0))
: ((branch = component.scope = createScope(out.global)),
(branch._ = renderer.u),
- initBranch(renderer, branch)),
+ initBranch(renderer, branch, document.body)),
applyArgs(branch, args);
})),
!existing)
)
- return branch.a === branch.b ? branch.a : branch.a.parentNode;
+ return toInsertNode(branch.a, branch.b);
},
};
function noop() {}
@@ -1615,7 +1653,6 @@ var createTemplate = (templateId, ...rendererArgs) => {
};
function mount(input = {}, reference, position) {
let branch,
- dom,
parentNode = reference,
nextSibling = null,
{ $global: $global } = input;
@@ -1639,11 +1676,11 @@ function mount(input = {}, reference, position) {
let args = this.d,
effects = prepareEffects(() => {
(branch = createScope($global)),
- (dom = initBranch(this, branch)),
+ initBranch(this, branch, parentNode),
args?.(branch, [input]);
});
return (
- parentNode.insertBefore(dom, nextSibling),
+ insertChildNodes(parentNode, nextSibling, branch.a, branch.b),
runEffects(effects),
{
update: (newInput) => {
diff --git a/.sizes/name-cache.json b/.sizes/name-cache.json
index 051e6cddbf..4160627b9f 100644
--- a/.sizes/name-cache.json
+++ b/.sizes/name-cache.json
@@ -1 +1 @@
-{"vars":{"props":{"$empty":"e","$rest":"t","$attrTag":"n","$attrTags":"r","$attrTagIterator":"i","$forIn":"l","$forOf":"o","$forTo":"f","$isScheduled":"u","$port2":"a","$flushAndWaitFrame":"c","$triggerMacroTask":"s","$createScope":"d","$emptyScope":"h","$getEmptyScope":"g","$destroyScope":"p","$_destroyScope":"v","$onDestroy":"b","$removeAndDestroyScope":"m","$insertBefore":"y","$registeredValues":"k","$Render":"w","$isResuming":"C","$register":"A","$registerBoundSignal":"S","$init":"N","$registerSubscriber":"x","$nodeRef":"$","$MARK":"M","$CLEAN":"E","$DIRTY":"I","$state":"T","$value":"_","$accessorId":"O","$intersection":"B","$defaultGetOwnerScope":"V","$closure":"j","$dynamicClosure":"R","$childClosures":"q","$dynamicSubscribers":"D","$setTagVar":"P","$tagVarSignal":"W","$setTagVarChange":"L","$tagVarSignalChange":"z","$renderBodyClosures":"F","$tagIdsByGlobal":"U","$nextTagId":"G","$inChild":"J","$intersections":"X","$effect":"Z","$pendingSignals":"H","$pendingEffects":"K","$rendering":"Q","$queueEffect":"Y","$run":"ee","$prepareEffects":"te","$runEffects":"ne","$runSignals":"re","$resetAbortSignal":"ie","$getAbortSignal":"le","$stringifyClassObject":"oe","$NON_DIMENSIONAL":"fe","$stringifyStyleObject":"ue","$toDelimitedString":"ae","$isEventHandler":"ce","$getEventHandlerName":"se","$normalizeDynamicRenderer":"de","$elementHandlersByEvent":"he","$defaultDelegator":"ge","$on":"pe","$createDelegator":"ve","$handleDelegated":"be","$stripSpacesAndPunctuation":"me","$controllable_input_checked":"ye","$controllable_input_checked_effect":"ke","$controllable_input_checkedValue":"we","$controllable_input_checkedValue_effect":"Ce","$controllable_input_value":"Ae","$controllable_input_value_effect":"Se","$controllable_select_value":"Ne","$controllable_select_value_effect":"xe","$setSelectOptions":"$e","$controllable_detailsOrDialog_open":"Me","$controllable_detailsOrDialog_open_effect":"Ee","$inputType":"Ie","$setValueAndUpdateSelection":"Te","$setCheckboxValue":"_e","$delegateFormControl":"Oe","$formChangeHandlers":"Be","$syncControllable":"Ve","$onFormChange":"je","$onFormReset":"Re","$hasValueChanged":"qe","$hasCheckboxChanged":"De","$hasSelectChanged":"Pe","$hasFormElementChanged":"We","$normalizeStrProp":"Le","$normalizeBoolProp":"ze","$toValueProp":"Fe","$fallback":"Ue","$parser":"Ge","$parseHTML":"Je","$attr":"Xe","$setAttribute":"Ze","$classAttr":"He","$styleAttr":"Ke","$data":"Qe","$attrs":"Ye","$hasAttrAlias":"et","$partialAttrs":"tt","$attrsInternal":"nt","$attrsEvents":"rt","$html":"it","$props":"lt","$normalizeAttrValue":"ot","$lifecycle":"ft","$walker":"ut","$trimWalkString":"at","$walk":"ct","$walkInternal":"st","$createScopeWithRenderer":"dt","$createScopeWithTagNameOrRenderer":"ht","$initRenderer":"gt","$dynamicTagAttrs":"pt","$createRendererWithOwner":"vt","$createRenderer":"bt","$_clone":"mt","$conditional":"yt","$inConditionalScope":"kt","$conditionalOnlyChild":"wt","$setConditionalRendererOnlyChild":"Ct","$emptyMarkerMap":"At","$emptyMarkerArray":"St","$emptyMap":"Nt","$emptyArray":"xt","$loopOf":"$t","$loopIn":"Mt","$loopTo":"Et","$loop":"It","$inLoopScope":"Tt","$bySecondArg":"_t","$byFirstArg":"Ot","$isDifferentRenderer":"Bt","$classIdToScope":"Vt","$compat":"jt","$noop":"Rt","$createTemplate":"qt","$mount":"Dt","$parseHTMLOrSingleNode":"Wt","$marker":"Ft","$_clickCount_effect":"Qt","$_clickCount":"Yt","$_setup_":"zt","$_expr_comment_comments_id$ifBody":"ss","$_id$ifBody":"as","$_comment_comments$ifBody":"ts","$_ifBody":"ns","$_expr_input_path_i$forBody":"os","$_if$forBody":"cs","$_open$forBody_effect":"is","$_open$forBody":"ms","$_id$forBody":"ls","$_i$forBody":"us","$_comment_comments$forBody":"es","$_comment_text$forBody":"ds","$_comment$forBody":"rs","$_params_2$forBody":"bs","$_input_path$forBody":"ps","$_for":"hs","$_input_path_":"vs","$_input_comments_":"fs","$_input_$1":"js","$_input_":"ks","$_params__":"Ss","$noop2":"Pt","$textContent":"Lt","$normalizeString":"Ut","$contentClosures":"Gt","$_expr_comment_comments_id$if_content":"Zs","$_id$if_content":"$s","$_comment_comments$if_content":"_s","$_if_content":"gs","$_expr_input_path_i$for_content":"ws","$_if$for_content":"xs","$_open$for_content_effect":"Bs","$_open$for_content":"Ds","$_id$for_content":"Es","$_i$for_content":"Hs","$_comment_comments$for_content":"Xs","$_comment_text$for_content":"qs","$_comment$for_content":"ys","$_params_2$for_content":"zs","$_input_path$for_content":"As","$pendingSignal":"Ht","$scopeIsConnected":"Jt","$sortScopeByDOMPosition":"Xt","$ownerStartNode":"Zt","$queueSource":"Kt","$pendingScopes":"en","$loopClosure":"tn","$conditionalClosure":"nn","$queueRender":"rn","$abort":"on","$destroyBranch":"ln","$removeAndDestroyBranch":"un","$createBranchScopeWithRenderer":"fn","$createBranchScopeWithTagNameOrRenderer":"an","$createBranch":"cn","$pendingRender":"sn","$runRenders":"dn","$comparePendingRenders":"hn","$doc":"gn","$pendingRenders":"pn","$getBranchId":"bn","$getBranchDepth":"vn","$initBranch":"yn","$emptyBranch":"mn","$getEmptyBranch":"kn","$insertBranchBefore":"Cn","$destroyNestedBranches":"wn","$removeChildNodes":"An","$classIdToBranch":"Sn"}}}
\ No newline at end of file
+{"vars":{"props":{"$empty":"e","$rest":"t","$attrTag":"n","$attrTags":"r","$attrTagIterator":"i","$forIn":"l","$forOf":"o","$forTo":"f","$isScheduled":"u","$port2":"a","$flushAndWaitFrame":"c","$triggerMacroTask":"s","$createScope":"d","$emptyScope":"h","$getEmptyScope":"g","$destroyScope":"p","$_destroyScope":"v","$onDestroy":"b","$removeAndDestroyScope":"m","$insertBefore":"y","$registeredValues":"k","$Render":"w","$isResuming":"C","$register":"A","$registerBoundSignal":"S","$init":"N","$registerSubscriber":"x","$nodeRef":"$","$MARK":"M","$CLEAN":"E","$DIRTY":"I","$state":"T","$value":"_","$accessorId":"O","$intersection":"B","$defaultGetOwnerScope":"V","$closure":"j","$dynamicClosure":"R","$childClosures":"q","$dynamicSubscribers":"D","$setTagVar":"P","$tagVarSignal":"W","$setTagVarChange":"L","$tagVarSignalChange":"z","$renderBodyClosures":"F","$tagIdsByGlobal":"U","$nextTagId":"G","$inChild":"J","$intersections":"X","$effect":"Z","$pendingSignals":"H","$pendingEffects":"K","$rendering":"Q","$queueEffect":"Y","$run":"ee","$prepareEffects":"te","$runEffects":"ne","$runSignals":"re","$resetAbortSignal":"ie","$getAbortSignal":"le","$stringifyClassObject":"oe","$NON_DIMENSIONAL":"fe","$stringifyStyleObject":"ue","$toDelimitedString":"ae","$isEventHandler":"ce","$getEventHandlerName":"se","$normalizeDynamicRenderer":"de","$elementHandlersByEvent":"he","$defaultDelegator":"ge","$on":"pe","$createDelegator":"ve","$handleDelegated":"be","$stripSpacesAndPunctuation":"me","$controllable_input_checked":"ye","$controllable_input_checked_effect":"ke","$controllable_input_checkedValue":"we","$controllable_input_checkedValue_effect":"Ce","$controllable_input_value":"Ae","$controllable_input_value_effect":"Se","$controllable_select_value":"Ne","$controllable_select_value_effect":"xe","$setSelectOptions":"$e","$controllable_detailsOrDialog_open":"Me","$controllable_detailsOrDialog_open_effect":"Ee","$inputType":"Ie","$setValueAndUpdateSelection":"Te","$setCheckboxValue":"_e","$delegateFormControl":"Oe","$formChangeHandlers":"Be","$syncControllable":"Ve","$onFormChange":"je","$onFormReset":"Re","$hasValueChanged":"qe","$hasCheckboxChanged":"De","$hasSelectChanged":"Pe","$hasFormElementChanged":"We","$normalizeStrProp":"Le","$normalizeBoolProp":"ze","$toValueProp":"Fe","$fallback":"Ue","$parser":"Ge","$parseHTML":"Je","$attr":"Xe","$setAttribute":"Ze","$classAttr":"He","$styleAttr":"Ke","$data":"Qe","$attrs":"Ye","$hasAttrAlias":"et","$partialAttrs":"tt","$attrsInternal":"nt","$attrsEvents":"rt","$html":"it","$props":"lt","$normalizeAttrValue":"ot","$lifecycle":"ft","$walker":"ut","$trimWalkString":"at","$walk":"ct","$walkInternal":"st","$createScopeWithRenderer":"dt","$createScopeWithTagNameOrRenderer":"ht","$initRenderer":"gt","$dynamicTagAttrs":"pt","$createRendererWithOwner":"vt","$createRenderer":"bt","$_clone":"mt","$conditional":"yt","$inConditionalScope":"kt","$conditionalOnlyChild":"wt","$setConditionalRendererOnlyChild":"Ct","$emptyMarkerMap":"At","$emptyMarkerArray":"St","$emptyMap":"Nt","$emptyArray":"xt","$loopOf":"$t","$loopIn":"Mt","$loopTo":"Et","$loop":"It","$inLoopScope":"Tt","$bySecondArg":"_t","$byFirstArg":"Ot","$isDifferentRenderer":"Bt","$classIdToScope":"Vt","$compat":"jt","$noop":"Rt","$createTemplate":"qt","$mount":"Dt","$parseHTMLOrSingleNode":"Wt","$marker":"Ft","$_clickCount_effect":"Qt","$_clickCount":"Yt","$_setup_":"zt","$_expr_comment_comments_id$ifBody":"ss","$_id$ifBody":"as","$_comment_comments$ifBody":"ts","$_ifBody":"ns","$_expr_input_path_i$forBody":"os","$_if$forBody":"cs","$_open$forBody_effect":"is","$_open$forBody":"ms","$_id$forBody":"ls","$_i$forBody":"us","$_comment_comments$forBody":"es","$_comment_text$forBody":"ds","$_comment$forBody":"rs","$_params_2$forBody":"bs","$_input_path$forBody":"ps","$_for":"hs","$_input_path_":"vs","$_input_comments_":"fs","$_input_$1":"js","$_input_":"ks","$_params__":"Ss","$noop2":"Pt","$textContent":"Lt","$normalizeString":"Ut","$contentClosures":"Gt","$_expr_comment_comments_id$if_content":"Zs","$_id$if_content":"$s","$_comment_comments$if_content":"_s","$_if_content":"gs","$_expr_input_path_i$for_content":"ws","$_if$for_content":"xs","$_open$for_content_effect":"Bs","$_open$for_content":"Ds","$_id$for_content":"Es","$_i$for_content":"Hs","$_comment_comments$for_content":"Xs","$_comment_text$for_content":"qs","$_comment$for_content":"ys","$_params_2$for_content":"zs","$_input_path$for_content":"As","$pendingSignal":"Ht","$scopeIsConnected":"Jt","$sortScopeByDOMPosition":"Xt","$ownerStartNode":"Zt","$queueSource":"Kt","$pendingScopes":"en","$loopClosure":"tn","$conditionalClosure":"nn","$queueRender":"rn","$abort":"on","$destroyBranch":"ln","$removeAndDestroyBranch":"un","$createBranchScopeWithRenderer":"fn","$createBranchScopeWithTagNameOrRenderer":"an","$createBranch":"cn","$pendingRender":"sn","$runRenders":"dn","$comparePendingRenders":"hn","$doc":"gn","$pendingRenders":"pn","$getBranchId":"bn","$getBranchDepth":"vn","$initBranch":"yn","$emptyBranch":"mn","$getEmptyBranch":"kn","$insertBranchBefore":"Cn","$destroyNestedBranches":"wn","$removeChildNodes":"An","$classIdToBranch":"Sn","$getParseKind":"Nn","$insertChildNodes":"xn","$toInsertNode":"$n","$parseCache":"Mn","$parseHTMLChild":"In","$parsers":"_n","$cloneCache":"En"}}}
\ No newline at end of file
diff --git a/packages/runtime-class/src/runtime/helpers/tags-compat/runtime-dom.js b/packages/runtime-class/src/runtime/helpers/tags-compat/runtime-dom.js
index cff5cd4f55..ff64397a93 100644
--- a/packages/runtime-class/src/runtime/helpers/tags-compat/runtime-dom.js
+++ b/packages/runtime-class/src/runtime/helpers/tags-compat/runtime-dom.js
@@ -121,20 +121,13 @@ exports.p = function (domCompat) {
};
}
newRenderer = domCompat.createRenderer(
- (scope) => {
- if (skipAttrs) {
- renderAndMorph(scope, rendererFromAnywhere, renderer, {});
- }
- },
- () => {
- const realFragment = document.createDocumentFragment();
- ___createFragmentNode(null, null, realFragment);
- return realFragment;
- },
- (scope, input) => {
- if (domCompat.isOp(input)) return;
- renderAndMorph(scope, rendererFromAnywhere, renderer, input);
- },
+ (scope) =>
+ skipAttrs &&
+ renderAndMorph(scope, rendererFromAnywhere, renderer, {}),
+ () => ___createFragmentNode().startNode,
+ (scope, input) =>
+ domCompat.isOp(input) ||
+ renderAndMorph(scope, rendererFromAnywhere, renderer, input),
);
rendererCache.set(renderer, newRenderer);
}
diff --git a/packages/runtime-tags/src/__tests__/fixtures/namespaced-tags/__snapshots__/.name-cache.json b/packages/runtime-tags/src/__tests__/fixtures/namespaced-tags/__snapshots__/.name-cache.json
new file mode 100644
index 0000000000..6df0d6a808
--- /dev/null
+++ b/packages/runtime-tags/src/__tests__/fixtures/namespaced-tags/__snapshots__/.name-cache.json
@@ -0,0 +1,25 @@
+{
+ "vars": {
+ "props": {
+ "$_$": "e",
+ "$init": "t",
+ "$_Child_content2": "r",
+ "$_Child_content": "i",
+ "$_input_value$Parent_content": "n",
+ "$_setup$Parent_content": "a",
+ "$_Parent_content": "c",
+ "$_expr_Parent_Child_effect": "o",
+ "$_expr_Parent_Child": "s",
+ "$_Parent_input": "m",
+ "$_dynamicTagName3": "d",
+ "$_Child_input2": "f",
+ "$_dynamicTagName2": "l",
+ "$_Child_input": "g",
+ "$_dynamicTagName": "u",
+ "$_Child_effect": "h",
+ "$_Child": "b",
+ "$_Parent_effect": "y",
+ "$_Parent": "A"
+ }
+ }
+}
diff --git a/packages/runtime-tags/src/__tests__/fixtures/namespaced-tags/__snapshots__/csr-sanitized.expected.md b/packages/runtime-tags/src/__tests__/fixtures/namespaced-tags/__snapshots__/csr-sanitized.expected.md
new file mode 100644
index 0000000000..52cc3776c7
--- /dev/null
+++ b/packages/runtime-tags/src/__tests__/fixtures/namespaced-tags/__snapshots__/csr-sanitized.expected.md
@@ -0,0 +1,326 @@
+# Render `{"value":""}`
+
+```html
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
");
+ const _dynamicScope3 = _$.peekNextScope();
+ _$.dynamicTagInput(_scope0_id, "#text/5", Parent, {}, _$.register(/* @__PURE__ */_$.createRenderer(() => {
+ const _scope1_id = _$.nextScopeId();
+ _$.write(`${_$.toString(input.value)}${_$.markResumeNode(_scope1_id, "#text/0")}`);
+ _$.writeEffect(_scope1_id, "__tests__/template.marko_1_input_value/subscriber");
+ _$.debug(_$.writeScope(_scope1_id, {
+ "_": _$.ensureScopeWithId(_scope0_id)
+ }), "__tests__/template.marko", "12:3");
+ _$.resumeClosestBranch(_scope1_id);
+ }), "__tests__/template.marko_1_renderer", _scope0_id));
+ _$.write(`${_$.markResumeNode(_scope0_id, "#button/6")}${_$.markResumeNode(_scope0_id, "#button/7")}
${_$.markResumeNode(_scope0_id, "#div/0")}`);
+ _$.writeEffect(_scope0_id, "__tests__/template.marko_0_Parent_Child");
+ _$.writeEffect(_scope0_id, "__tests__/template.marko_0_Child");
+ _$.writeEffect(_scope0_id, "__tests__/template.marko_0_Parent");
+ _$.debug(_$.writeScope(_scope0_id, {
+ "input_value": input.value,
+ "Parent": Parent,
+ "Child": Child,
+ "#text/2!": _$.writeExistingScope(_dynamicScope),
+ "#text/2(": _$.normalizeDynamicRenderer(Child),
+ "#text/4!": _$.writeExistingScope(_dynamicScope2),
+ "#text/4(": _$.normalizeDynamicRenderer(Child),
+ "#text/5!": _$.writeExistingScope(_dynamicScope3),
+ "#text/5(": _$.normalizeDynamicRenderer(Parent)
+ }), "__tests__/template.marko", 0, {
+ "Parent": "1:5",
+ "Child": "2:5"
+ });
+ _$.resumeClosestBranch(_scope0_id);
+});
+export default /* @__PURE__ */_$.createTemplate("__tests__/template.marko", _renderer);
\ No newline at end of file
diff --git a/packages/runtime-tags/src/__tests__/fixtures/namespaced-tags/__snapshots__/resume-sanitized.expected.md b/packages/runtime-tags/src/__tests__/fixtures/namespaced-tags/__snapshots__/resume-sanitized.expected.md
new file mode 100644
index 0000000000..52cc3776c7
--- /dev/null
+++ b/packages/runtime-tags/src/__tests__/fixtures/namespaced-tags/__snapshots__/resume-sanitized.expected.md
@@ -0,0 +1,326 @@
+# Render `{"value":""}`
+
+```html
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+