marko 6.0.155 → 6.0.157

package/dist/translator/index.js

@@ -133,33 +133,33 @@ var AccessorPrefix = /* @__PURE__ */ ((AccessorPrefix4) => {
   AccessorPrefix4["TagVariableChange"] = "TagVariableChange:";
   return AccessorPrefix4;
 })(AccessorPrefix || {});
-var AccessorProp = /* @__PURE__ */ ((AccessorProp5) => {
-  AccessorProp5["Global"] = "$global";
-  AccessorProp5["Owner"] = "_";
-  AccessorProp5["AbortControllers"] = "#AbortControllers";
-  AccessorProp5["AbortScopes"] = "#AbortScopes";
-  AccessorProp5["AwaitCounter"] = "#AwaitCounter";
-  AccessorProp5["BranchAccessor"] = "#BranchAccessor";
-  AccessorProp5["BranchScopes"] = "#BranchScopes";
-  AccessorProp5["CatchContent"] = "#CatchContent";
-  AccessorProp5["ClosestBranch"] = "#ClosestBranch";
-  AccessorProp5["ClosestBranchId"] = "#ClosestBranchId";
-  AccessorProp5["Creating"] = "#Creating";
-  AccessorProp5["Destroyed"] = "#Destroyed";
-  AccessorProp5["DetachedAwait"] = "#DetachedAwait";
-  AccessorProp5["EndNode"] = "#EndNode";
-  AccessorProp5["Id"] = "#Id";
-  AccessorProp5["LoopKey"] = "#LoopKey";
-  AccessorProp5["ParentBranch"] = "#ParentBranch";
-  AccessorProp5["PendingEffects"] = "#PendingEffects";
-  AccessorProp5["PendingRenders"] = "#PendingRenders";
-  AccessorProp5["PlaceholderBranch"] = "#PlaceholderBranch";
-  AccessorProp5["PlaceholderContent"] = "#PlaceholderContent";
-  AccessorProp5["Renderer"] = "#Renderer";
-  AccessorProp5["StartNode"] = "#StartNode";
-  AccessorProp5["TagVariable"] = "#TagVariable";
-  AccessorProp5["TagVariableChange"] = "#TagVariableChange";
-  return AccessorProp5;
+var AccessorProp = /* @__PURE__ */ ((AccessorProp6) => {
+  AccessorProp6["Global"] = "$global";
+  AccessorProp6["Owner"] = "_";
+  AccessorProp6["AbortControllers"] = "#AbortControllers";
+  AccessorProp6["AbortScopes"] = "#AbortScopes";
+  AccessorProp6["AwaitCounter"] = "#AwaitCounter";
+  AccessorProp6["BranchAccessor"] = "#BranchAccessor";
+  AccessorProp6["BranchScopes"] = "#BranchScopes";
+  AccessorProp6["CatchContent"] = "#CatchContent";
+  AccessorProp6["ClosestBranch"] = "#ClosestBranch";
+  AccessorProp6["ClosestBranchId"] = "#ClosestBranchId";
+  AccessorProp6["Creating"] = "#Creating";
+  AccessorProp6["Destroyed"] = "#Destroyed";
+  AccessorProp6["DetachedAwait"] = "#DetachedAwait";
+  AccessorProp6["EndNode"] = "#EndNode";
+  AccessorProp6["Id"] = "#Id";
+  AccessorProp6["LoopKey"] = "#LoopKey";
+  AccessorProp6["ParentBranch"] = "#ParentBranch";
+  AccessorProp6["PendingEffects"] = "#PendingEffects";
+  AccessorProp6["PendingRenders"] = "#PendingRenders";
+  AccessorProp6["PlaceholderBranch"] = "#PlaceholderBranch";
+  AccessorProp6["PlaceholderContent"] = "#PlaceholderContent";
+  AccessorProp6["Renderer"] = "#Renderer";
+  AccessorProp6["StartNode"] = "#StartNode";
+  AccessorProp6["TagVariable"] = "#TagVariable";
+  AccessorProp6["TagVariableChange"] = "#TagVariableChange";
+  return AccessorProp6;
 })(AccessorProp || {});
 
 // src/translator/util/evaluate.ts
@@ -253,6 +253,7 @@ function isNullableExpr(expr) {
 // src/translator/util/references.ts
 var import_compiler38 = require("@marko/compiler");
 var import_babel_utils26 = require("@marko/compiler/babel-utils");
+var import_config = require("@marko/compiler/config");
 
 // src/common/helpers.ts
 function classValue(classValue2) {
@@ -1298,33 +1299,33 @@ var AccessorPrefix2 = /* @__PURE__ */ ((AccessorPrefix4) => {
   AccessorPrefix4["TagVariableChange"] = "M";
   return AccessorPrefix4;
 })(AccessorPrefix2 || {});
-var AccessorProp2 = /* @__PURE__ */ ((AccessorProp5) => {
-  AccessorProp5["Global"] = "$";
-  AccessorProp5["Owner"] = "_";
-  AccessorProp5["AbortControllers"] = "A";
-  AccessorProp5["AbortScopes"] = "B";
-  AccessorProp5["AwaitCounter"] = "O";
-  AccessorProp5["BranchAccessor"] = "C";
-  AccessorProp5["BranchScopes"] = "D";
-  AccessorProp5["CatchContent"] = "E";
-  AccessorProp5["ClosestBranch"] = "F";
-  AccessorProp5["ClosestBranchId"] = "G";
-  AccessorProp5["Creating"] = "H";
-  AccessorProp5["Destroyed"] = "I";
-  AccessorProp5["DetachedAwait"] = "V";
-  AccessorProp5["EndNode"] = "K";
-  AccessorProp5["Id"] = "L";
-  AccessorProp5["LoopKey"] = "M";
-  AccessorProp5["ParentBranch"] = "N";
-  AccessorProp5["PendingEffects"] = "J";
-  AccessorProp5["PendingRenders"] = "W";
-  AccessorProp5["PlaceholderBranch"] = "P";
-  AccessorProp5["PlaceholderContent"] = "Q";
-  AccessorProp5["Renderer"] = "R";
-  AccessorProp5["StartNode"] = "S";
-  AccessorProp5["TagVariable"] = "T";
-  AccessorProp5["TagVariableChange"] = "U";
-  return AccessorProp5;
+var AccessorProp2 = /* @__PURE__ */ ((AccessorProp6) => {
+  AccessorProp6["Global"] = "$";
+  AccessorProp6["Owner"] = "_";
+  AccessorProp6["AbortControllers"] = "A";
+  AccessorProp6["AbortScopes"] = "B";
+  AccessorProp6["AwaitCounter"] = "O";
+  AccessorProp6["BranchAccessor"] = "C";
+  AccessorProp6["BranchScopes"] = "D";
+  AccessorProp6["CatchContent"] = "E";
+  AccessorProp6["ClosestBranch"] = "F";
+  AccessorProp6["ClosestBranchId"] = "G";
+  AccessorProp6["Creating"] = "H";
+  AccessorProp6["Destroyed"] = "I";
+  AccessorProp6["DetachedAwait"] = "V";
+  AccessorProp6["EndNode"] = "K";
+  AccessorProp6["Id"] = "L";
+  AccessorProp6["LoopKey"] = "M";
+  AccessorProp6["ParentBranch"] = "N";
+  AccessorProp6["PendingEffects"] = "J";
+  AccessorProp6["PendingRenders"] = "W";
+  AccessorProp6["PlaceholderBranch"] = "P";
+  AccessorProp6["PlaceholderContent"] = "Q";
+  AccessorProp6["Renderer"] = "R";
+  AccessorProp6["StartNode"] = "S";
+  AccessorProp6["TagVariable"] = "T";
+  AccessorProp6["TagVariableChange"] = "U";
+  return AccessorProp6;
 })(AccessorProp2 || {});
 
 // src/translator/util/marko-config.ts
@@ -2169,87 +2170,6 @@ function isStaticRoot(path7) {
   }
 }
 
-// src/translator/util/for-each-identifier.ts
-function forEachIdentifier(node, cb) {
-  switch (node.type) {
-    case "ObjectPattern":
-      for (const prop of node.properties) {
-        switch (prop.type) {
-          case "ObjectProperty":
-            if (prop.value.type === "AssignmentPattern") {
-              forEachIdentifier(prop.value.left, cb);
-            } else {
-              forEachIdentifier(prop.value, cb);
-            }
-            break;
-          case "RestElement":
-            forEachIdentifier(prop.argument, cb);
-            break;
-        }
-      }
-      break;
-    case "ArrayPattern":
-      for (const el of node.elements) {
-        if (el != null) {
-          switch (el.type) {
-            case "RestElement":
-              forEachIdentifier(el.argument, cb);
-              break;
-            case "AssignmentPattern":
-              forEachIdentifier(el.left, cb);
-              break;
-            default:
-              forEachIdentifier(el, cb);
-              break;
-          }
-        }
-      }
-      break;
-    case "Identifier":
-      cb(node);
-      break;
-  }
-}
-function forEachIdentifierPath(nodePath, cb) {
-  if (nodePath.isIdentifier()) {
-    cb(nodePath);
-  } else if (nodePath.isObjectPattern()) {
-    for (const prop of nodePath.get("properties")) {
-      if (prop.isObjectProperty()) {
-        const value = prop.get("value");
-        if (value.isAssignmentPattern()) {
-          forEachIdentifierPath(value.get("left"), cb);
-        } else {
-          forEachIdentifierPath(value, cb);
-        }
-      } else if (prop.isRestElement()) {
-        forEachIdentifierPath(prop.get("argument"), cb);
-      }
-    }
-  } else if (nodePath.isArrayPattern()) {
-    for (const el of nodePath.get("elements")) {
-      if (el) {
-        if (el.isRestElement()) {
-          forEachIdentifierPath(el.get("argument"), cb);
-        } else if (el.isAssignmentPattern()) {
-          forEachIdentifierPath(el.get("left"), cb);
-        } else {
-          forEachIdentifierPath(el, cb);
-        }
-      }
-    }
-  }
-}
-
-// src/translator/util/is-event-or-change-handler.ts
-function isEventOrChangeHandler(prop) {
-  return /^on[-A-Z][a-zA-Z0-9_$]|[a-zA-Z_$][a-zA-Z0-9_$]*Change$/.test(prop);
-}
-
-// src/translator/util/known-tag.ts
-var import_compiler37 = require("@marko/compiler");
-var import_babel_utils25 = require("@marko/compiler/babel-utils");
-
 // src/translator/visitors/program/index.ts
 var import_compiler27 = require("@marko/compiler");
 var import_babel_utils17 = require("@marko/compiler/babel-utils");
@@ -2336,18 +2256,26 @@ var entry_builder_default = {
       (it) => import_compiler9.types.importDeclaration([], import_compiler9.types.stringLiteral(it))
     );
     if (state.init) {
+      const isPage = entryFile.path.node.extra.page;
+      const initHelper = isPage ? "init" : "initEmbedded";
       body.unshift(
         import_compiler9.types.importDeclaration(
-          [import_compiler9.types.importSpecifier(import_compiler9.types.identifier("init"), import_compiler9.types.identifier("init"))],
+          [
+            import_compiler9.types.importSpecifier(
+              import_compiler9.types.identifier(initHelper),
+              import_compiler9.types.identifier(initHelper)
+            )
+          ],
           import_compiler9.types.stringLiteral(
             `${runtime_info_default.name}/${entryFile.markoOpts.optimize ? "" : "debug/"}dom`
           )
         )
       );
       const { runtimeId } = entryFile.markoOpts;
+      const readyId = !isPage && (0, import_babel_utils12.getTemplateId)(entryFile.markoOpts, entryFile.opts.filename);
       const initExpression = import_compiler9.types.callExpression(
-        import_compiler9.types.identifier("init"),
-        runtimeId ? [import_compiler9.types.stringLiteral(runtimeId)] : []
+        import_compiler9.types.identifier(initHelper),
+        readyId ? runtimeId ? [import_compiler9.types.stringLiteral(readyId), import_compiler9.types.stringLiteral(runtimeId)] : [import_compiler9.types.stringLiteral(readyId)] : runtimeId ? [import_compiler9.types.stringLiteral(runtimeId)] : []
       );
       body.push(
         exportInit ? import_compiler9.types.exportDefaultDeclaration(
@@ -2611,8 +2539,8 @@ function getHTMLRuntime() {
   };
 }
 function getRuntimePath(output) {
-  const { optimize } = getMarkoOpts();
-  return `${runtime_info_default.name}/${optimize ? "" : "debug/"}${output === "html" ? "html" : "dom"}`;
+  const { optimize: optimize2 } = getMarkoOpts();
+  return `${runtime_info_default.name}/${optimize2 ? "" : "debug/"}${output === "html" ? "html" : "dom"}`;
 }
 function filterArguments(args) {
   const filteredArgs = [];
@@ -3297,6 +3225,78 @@ var return_default = {
   ]
 };
 
+// src/translator/util/for-each-identifier.ts
+function forEachIdentifier(node, cb) {
+  switch (node.type) {
+    case "ObjectPattern":
+      for (const prop of node.properties) {
+        switch (prop.type) {
+          case "ObjectProperty":
+            if (prop.value.type === "AssignmentPattern") {
+              forEachIdentifier(prop.value.left, cb);
+            } else {
+              forEachIdentifier(prop.value, cb);
+            }
+            break;
+          case "RestElement":
+            forEachIdentifier(prop.argument, cb);
+            break;
+        }
+      }
+      break;
+    case "ArrayPattern":
+      for (const el of node.elements) {
+        if (el != null) {
+          switch (el.type) {
+            case "RestElement":
+              forEachIdentifier(el.argument, cb);
+              break;
+            case "AssignmentPattern":
+              forEachIdentifier(el.left, cb);
+              break;
+            default:
+              forEachIdentifier(el, cb);
+              break;
+          }
+        }
+      }
+      break;
+    case "Identifier":
+      cb(node);
+      break;
+  }
+}
+function forEachIdentifierPath(nodePath, cb) {
+  if (nodePath.isIdentifier()) {
+    cb(nodePath);
+  } else if (nodePath.isObjectPattern()) {
+    for (const prop of nodePath.get("properties")) {
+      if (prop.isObjectProperty()) {
+        const value = prop.get("value");
+        if (value.isAssignmentPattern()) {
+          forEachIdentifierPath(value.get("left"), cb);
+        } else {
+          forEachIdentifierPath(value, cb);
+        }
+      } else if (prop.isRestElement()) {
+        forEachIdentifierPath(prop.get("argument"), cb);
+      }
+    }
+  } else if (nodePath.isArrayPattern()) {
+    for (const el of nodePath.get("elements")) {
+      if (el) {
+        if (el.isRestElement()) {
+          forEachIdentifierPath(el.get("argument"), cb);
+        } else if (el.isAssignmentPattern()) {
+          forEachIdentifierPath(el.get("left"), cb);
+        } else {
+          forEachIdentifierPath(el, cb);
+        }
+      }
+    }
+  }
+}
+
 // src/translator/util/get-defined-binding-expression.ts
 var import_compiler18 = require("@marko/compiler");
 function getDeclaredBindingExpression(binding) {
@@ -3336,7 +3336,7 @@ function createScopeReadExpression(reference, section = reference.section) {
   );
   if (section === reference.section && reference.type !== 0 /* dom */) {
     const exprExtra = expr.extra ??= {};
-    exprExtra.read = createRead(reference, void 0, void 0);
+    exprExtra.read = createRead(reference, void 0);
     exprExtra.section = section;
   }
   return expr;
@@ -4802,7 +4802,8 @@ var html_default = {
         callRuntime(
           "_template",
           import_compiler24.types.stringLiteral(program.hub.file.metadata.marko.id),
-          contentId ? import_compiler24.types.identifier(contentId) : contentFn
+          contentId ? import_compiler24.types.identifier(contentId) : contentFn,
+          program.node.extra.page ? import_compiler24.types.numericLiteral(1) : void 0
         )
       );
       if (contentId) {
@@ -4988,31 +4989,44 @@ function normalizeTag(tag) {
   }
   for (let i = 0; i < attributes.length; i++) {
     const attr = attributes[i];
-    if (import_compiler26.types.isMarkoAttribute(attr) && attr.bound) {
-      attr.bound = false;
-      attributes.splice(++i, 0, getChangeHandler(tag, attr));
+    if (import_compiler26.types.isMarkoAttribute(attr)) {
+      if (attr.bound) {
+        attributes.splice(++i, 0, getChangeHandler(tag, attr));
+        attr.bound = false;
+      } else if (attr.modifier != null) {
+        attr.name += ":" + attr.modifier;
+      }
+      attr.modifier = null;
     }
   }
 }
 function getChangeHandler(tag, attr) {
   const attrName = attr.name;
   const changeAttrName = attrName + "Change";
+  const modifier = attr.modifier == null ? void 0 : withPreviousLocation(import_compiler26.types.identifier(attr.modifier), attr);
   if (import_compiler26.types.isIdentifier(attr.value)) {
     const binding = tag.scope.getBinding(attr.value.name);
     if (!binding)
       return import_compiler26.types.markoAttribute(
         changeAttrName,
-        buildChangeHandlerFunction(attr.value)
+        buildChangeHandlerFunction(attr.value, modifier)
       );
     const existingChangedAttr = BINDING_CHANGE_HANDLER.get(binding.identifier);
     if (!existingChangedAttr) {
       const bindingIdentifierPath = binding.path.getOuterBindingIdentifierPaths()[binding.identifier.name];
-      const changeAttrExpr = bindingIdentifierPath ? bindingIdentifierPath.parentPath === binding.path ? buildChangeHandlerFunction(attr.value) : bindingIdentifierPath.parentPath.isObjectProperty() ? getChangeHandlerFromObjectPattern(
+      let changeAttrExpr = bindingIdentifierPath ? bindingIdentifierPath.parentPath === binding.path ? buildChangeHandlerFunction(attr.value, modifier) : bindingIdentifierPath.parentPath.isObjectProperty() ? getChangeHandlerFromObjectPattern(
         bindingIdentifierPath.parentPath
       ) : void 0 : void 0;
       if (!changeAttrExpr) {
         throw tag.hub.buildError(attr.value, "Unable to bind to value.");
       }
+      if (modifier && import_compiler26.types.isIdentifier(changeAttrExpr)) {
+        changeAttrExpr = import_compiler26.types.logicalExpression(
+          "&&",
+          changeAttrExpr,
+          buildChangeHandlerFunction(attr.value, modifier)
+        );
+      }
       const changeHandlerAttr = import_compiler26.types.markoAttribute(
         changeAttrName,
         changeAttrExpr
@@ -5064,10 +5078,26 @@ function getChangeHandler(tag, attr) {
         import_compiler26.types.stringLiteral("Change")
       );
       const computed = memberProp.type !== "Identifier";
-      return import_compiler26.types.markoAttribute(
-        changeAttrName,
-        attr.value.optional ? import_compiler26.types.optionalMemberExpression(memberObj, memberProp, computed, true) : import_compiler26.types.memberExpression(memberObj, memberProp, computed)
-      );
+      let changeAttrExpr = attr.value.optional ? import_compiler26.types.optionalMemberExpression(memberObj, memberProp, computed, true) : import_compiler26.types.memberExpression(memberObj, memberProp, computed);
+      if (modifier) {
+        const newValueId = generateUid("next");
+        changeAttrExpr = import_compiler26.types.logicalExpression(
+          "&&",
+          changeAttrExpr,
+          import_compiler26.types.arrowFunctionExpression(
+            [import_compiler26.types.identifier(newValueId)],
+            import_compiler26.types.blockStatement([
+              import_compiler26.types.expressionStatement(
+                import_compiler26.types.callExpression(
+                  import_compiler26.types.memberExpression(memberObj, memberProp, computed),
+                  [import_compiler26.types.callExpression(modifier, [import_compiler26.types.identifier(newValueId)])]
+                )
+              )
+            ])
+          )
+        );
+      }
+      return import_compiler26.types.markoAttribute(changeAttrName, changeAttrExpr);
     }
   }
   throw tag.hub.buildError(
@@ -5075,8 +5105,12 @@ function getChangeHandler(tag, attr) {
     "Attributes may only be bound to identifiers or member expressions"
   );
 }
-function buildChangeHandlerFunction(id) {
+function buildChangeHandlerFunction(id, modifier) {
   const newId = "_new_" + id.name;
+  let newValue = withPreviousLocation(import_compiler26.types.identifier(newId), id);
+  if (modifier) {
+    newValue = import_compiler26.types.callExpression(modifier, [newValue]);
+  }
   return import_compiler26.types.arrowFunctionExpression(
     [withPreviousLocation(import_compiler26.types.identifier(newId), id)],
     import_compiler26.types.blockStatement([
@@ -5084,7 +5118,7 @@ function buildChangeHandlerFunction(id) {
         import_compiler26.types.assignmentExpression(
           "=",
           withPreviousLocation(import_compiler26.types.identifier(id.name), id),
-          withPreviousLocation(import_compiler26.types.identifier(newId), id)
+          newValue
         )
       )
     ])
@@ -5317,6 +5351,15 @@ function resolveRelativeToEntry(entryFile, file, req) {
   );
 }
 
+// src/translator/util/is-event-or-change-handler.ts
+function isEventOrChangeHandler(prop) {
+  return /^on[-A-Z][a-zA-Z0-9_$]|[a-zA-Z_$][a-zA-Z0-9_$]*Change$/.test(prop);
+}
+
+// src/translator/util/known-tag.ts
+var import_compiler37 = require("@marko/compiler");
+var import_babel_utils25 = require("@marko/compiler/babel-utils");
+
 // src/translator/util/nested-attribute-tags.ts
 var import_compiler28 = require("@marko/compiler");
 var import_babel_utils18 = require("@marko/compiler/babel-utils");
@@ -5578,6 +5621,13 @@ var native_tag_default = {
         );
       }
       const tagName = getCanonicalTagName(tag);
+      switch (tagName) {
+        case "html":
+        case "body":
+        case "head":
+          (0, import_babel_utils21.getProgram)().node.extra.page ??= true;
+          break;
+      }
       const isTextOnly = isTextOnlyNativeTag(tag);
       const seen = {};
       const { attributes } = tag.node;
@@ -8685,9 +8735,30 @@ function trackParamsReferences(body, type) {
     return paramsBinding;
   }
 }
+function getMarkoRootAsTag(path7) {
+  const tag = path7.isMarkoTag() ? path7 : getMarkoRoot(path7)?.parentPath;
+  if (tag?.isMarkoTag()) {
+    return tag;
+  }
+}
+function isReferenceInOwnBody(bindingPath, reference) {
+  const tag = getMarkoRootAsTag(bindingPath);
+  if (!tag) {
+    return false;
+  }
+  const body = tag.get("body");
+  let cur = reference;
+  while (cur) {
+    if (cur === body) {
+      return true;
+    }
+    cur = cur.parentPath;
+  }
+  return false;
+}
 function isReferenceHoisted(bindingPath, reference) {
-  const tag = bindingPath.isMarkoTag() ? bindingPath : getMarkoRoot(bindingPath)?.parentPath;
-  if (!tag?.isMarkoTag()) {
+  const tag = getMarkoRootAsTag(bindingPath);
+  if (!tag) {
     return false;
   }
   const body = tag.parentPath;
@@ -9440,7 +9511,7 @@ var [getFunctionReadsByExpression] = createProgramState(
 );
 function addRead(exprExtra, extra, binding, section, getter) {
   const readsByExpression = getReadsByExpression();
-  const read = { binding, extra, getter };
+  const read = { binding, extra, getter, ownVar: false };
   binding.reads.add(exprExtra);
   exprExtra.section = section;
   readsByExpression.set(
@@ -9485,6 +9556,10 @@ function addReadToExpression(root, binding, getter) {
     section,
     getter
   );
+  if (!getter && binding.type === 5 /* derived */) {
+    const babelBinding = root.scope.getBinding(binding.name);
+    read.ownVar = !!babelBinding && babelBinding.kind !== "param" && isReferenceInOwnBody(babelBinding.path, root);
+  }
   if (root.parent.type === "MarkoSpreadAttribute") {
     exprExtra.spreadFrom = binding;
   }
@@ -9620,6 +9695,12 @@ function getReadReplacement(node, signal) {
               [getScopeExpression(extra.section, readBinding.section)]
             );
           }
+        } else if (!import_config.optimize && read.ownVar) {
+          replacement = callRuntime(
+            "_assert_init",
+            extra.section ? getScopeExpression(extra.section, readBinding.section) : scopeIdentifier,
+            getScopeAccessorLiteral(readBinding)
+          );
         } else {
           replacement = createScopeReadExpression(readBinding, extra.section);
         }
@@ -9831,7 +9912,7 @@ function resolveReferencedBindings(expr, reads, intersectionsBySection) {
       const { extra, getter } = read;
       if (getter) {
         extra.section = expr.section;
-        extra.read = createRead(binding, void 0, getter);
+        extra.read = createGetterRead(binding, void 0, getter);
         addBindingGetter(binding, getter);
         if (getter.hoisted) {
           binding.hoists = sectionUtil.add(binding.hoists, getter.hoisted);
@@ -9854,20 +9935,23 @@ function resolveReferencedBindings(expr, reads, intersectionsBySection) {
       allBindings = bindingUtil.add(allBindings, binding);
     }
   } else if (reads) {
-    const { binding, extra, getter } = reads;
+    const { binding, extra, getter, ownVar } = reads;
     if (getter) {
+      extra.read = createGetterRead(binding, void 0, getter);
       addBindingGetter(binding, getter);
       if (getter.hoisted) {
         binding.hoists = sectionUtil.add(binding.hoists, getter.hoisted);
         hoistedBindings = bindingUtil.add(hoistedBindings, binding);
       }
-    } else if (binding.type === 6 /* constant */) {
-      constantBindings = binding;
-    } else if (binding.type !== 0 /* dom */) {
-      referencedBindings = binding;
+    } else {
+      extra.read = createRead(binding, void 0, ownVar);
+      if (binding.type === 6 /* constant */) {
+        constantBindings = binding;
+      } else if (binding.type !== 0 /* dom */) {
+        referencedBindings = binding;
+      }
     }
     extra.section = expr.section;
-    extra.read = createRead(binding, void 0, getter);
     allBindings = binding;
   }
   if (Array.isArray(referencedBindings)) {
@@ -9914,7 +9998,7 @@ function resolveReferencedBindings(expr, reads, intersectionsBySection) {
 function resolveExpressionReference(rootBindings, readBinding) {
   const upstreamRoot = readBinding.upstreamAlias && findClosestReference(readBinding.upstreamAlias, rootBindings);
   if (!upstreamRoot) {
-    return createRead(readBinding, void 0, void 0);
+    return createRead(readBinding, void 0);
   }
   let curBinding = readBinding;
   let props;
@@ -9927,15 +10011,18 @@ function resolveExpressionReference(rootBindings, readBinding) {
   if (Array.isArray(props)) {
     props.reverse();
   }
-  return createRead(upstreamRoot, props, void 0);
+  return createRead(upstreamRoot, props);
 }
 function isSupersetSources(a, b) {
   if (!b.sources) return true;
   if (!a.sources) return false;
   return bindingUtil.isSuperset(a.sources.state, b.sources.state) && bindingUtil.isSuperset(a.sources.param, b.sources.param);
 }
-function createRead(binding, props, getter) {
-  return { binding, props, getter };
+function createRead(binding, props, ownVar = false) {
+  return { binding, props, ownVar, getter: void 0 };
+}
+function createGetterRead(binding, props, getter) {
+  return { binding, props, ownVar: false, getter };
 }
 function getMemberExpressionPropString(expr) {
   switch (expr.property.type) {
@@ -12408,10 +12495,14 @@ var custom_tag_default = {
       if (!childFile) {
         throw tag.get("name").buildCodeFrameError("Unable to resolve file for tag.");
       }
-      const programSection = (0, import_babel_utils49.getProgram)().node.extra.section;
+      const programExtra = (0, import_babel_utils49.getProgram)().node.extra;
+      const programSection = programExtra.section;
       const childProgram = childFile.ast.program;
       const childExtra = childProgram.extra;
       const childSection = childExtra.section;
+      if (childExtra.page) {
+        programExtra.page ??= true;
+      }
       knownTagAnalyze(
         tag,
         childSection,
@@ -12956,15 +13047,6 @@ var tag_default = {
               `Unsupported arguments on the \`${attr.node.name}\` attribute.`
             );
           }
-          if (attr.node.modifier) {
-            if ((0, import_babel_utils51.isNativeTag)(attr.parentPath)) {
-              attr.node.name += `:${attr.node.modifier}`;
-            } else {
-              throw attr.buildCodeFrameError(
-                `Unsupported modifier \`${attr.node.modifier}\`.`
-              );
-            }
-          }
         }
       }
       switch (analyzeTagNameType(tag)) {
@@ -13195,9 +13277,6 @@ function scanTag(state, tag) {
             attr.get("arguments")[0]
           );
           break;
-        } else if (attr.node.modifier) {
-          addFeature(state, "class" /* Class */, "Attribute modifier", attr);
-          break;
         } else if (attr.node.bound) {
           addFeature(state, "tags" /* Tags */, "Bound attribute", attr);
           break;
@@ -13269,10 +13348,10 @@ function createInteropTranslator(translate5) {
       import_compiler65.taglib.resolveOptionalTaglibs(translate5.optionalTaglibs).concat(translate5.taglibs),
       taglibs
     ),
-    getRuntimeEntryFiles(output, optimize) {
+    getRuntimeEntryFiles(output, optimize2) {
       return [
-        ...translate5.getRuntimeEntryFiles(output, optimize),
-        ...getRuntimeEntryFiles(output, optimize)
+        ...translate5.getRuntimeEntryFiles(output, optimize2),
+        ...getRuntimeEntryFiles(output, optimize2)
       ];
     }
   };
@@ -13552,9 +13631,9 @@ var taglibs = [
     }
   ]
 ];
-function getRuntimeEntryFiles(output, optimize) {
+function getRuntimeEntryFiles(output, optimize2) {
   return [
-    `${runtime_info_default.name}${optimize ? "" : "/debug"}/${output === "html" ? "html" : "dom"}`
+    `${runtime_info_default.name}${optimize2 ? "" : "/debug"}/${output === "html" ? "html" : "dom"}`
   ];
 }
 // Annotate the CommonJS export names for ESM import in node: