marko 6.0.91 → 6.0.92

package/dist/translator/index.js

@@ -2591,8 +2591,8 @@ var import_compiler13 = require("@marko/compiler");
 function normalizeStringExpression(parts) {
   const strs = [];
   const exprs = [];
-  let curStr = parts[0];
-  for (let i = 1; i < parts.length; i++) {
+  let curStr = "";
+  for (let i = 0; i < parts.length; i++) {
     let content = parts[i];
     if (typeof content === "object") {
       if (import_compiler13.types.isStringLiteral(content)) {
@@ -4166,7 +4166,8 @@ function replaceEffectNode(node) {
 function replaceBindingReadNode(node) {
   switch (node.type) {
     case "Identifier":
-    case "MemberExpression": {
+    case "MemberExpression":
+    case "OptionalMemberExpression": {
       return getReadReplacement(node);
     }
   }
@@ -4576,7 +4577,8 @@ function replaceNode(node, container) {
 function replaceBindingReadNode2(node) {
   switch (node.type) {
     case "Identifier":
-    case "MemberExpression": {
+    case "MemberExpression":
+    case "OptionalMemberExpression": {
       const { extra } = node;
       if (extra && !(extra.read && !extra.read.binding.declared || extra.binding && !extra.binding.declared)) {
         return getReadReplacement(node);
@@ -4781,20 +4783,19 @@ function getChangeHandler(tag, attr) {
       changeAttrName,
       withPreviousLocation(import_compiler25.types.identifier(changeHandlerId), attr.value)
     );
-  } else if (import_compiler25.types.isMemberExpression(attr.value)) {
+  } else if (import_compiler25.types.isMemberExpression(attr.value) || import_compiler25.types.isOptionalMemberExpression(attr.value)) {
     const prop = attr.value.property;
     if (!import_compiler25.types.isPrivateName(attr.value.property)) {
+      const memberObj = import_compiler25.types.cloneNode(attr.value.object);
+      const memberProp = prop.type === "Identifier" ? withPreviousLocation(import_compiler25.types.identifier(prop.name + "Change"), prop) : import_compiler25.types.binaryExpression(
+        "+",
+        import_compiler25.types.cloneNode(prop),
+        import_compiler25.types.stringLiteral("Change")
+      );
+      const computed = memberProp.type !== "Identifier";
       return import_compiler25.types.markoAttribute(
         changeAttrName,
-        import_compiler25.types.memberExpression(
-          import_compiler25.types.cloneNode(attr.value.object),
-          prop.type === "Identifier" ? withPreviousLocation(import_compiler25.types.identifier(prop.name + "Change"), prop) : import_compiler25.types.binaryExpression(
-            "+",
-            import_compiler25.types.cloneNode(prop),
-            import_compiler25.types.stringLiteral("Change")
-          ),
-          prop.type !== "Identifier"
-        )
+        attr.value.optional ? import_compiler25.types.optionalMemberExpression(memberObj, memberProp, computed, true) : import_compiler25.types.memberExpression(memberObj, memberProp, computed)
       );
     }
   }
@@ -8077,7 +8078,8 @@ function trackReference(referencePath, binding) {
   let propPath = binding.name;
   while (true) {
     const { parent } = root;
-    if (!import_compiler35.types.isMemberExpression(parent)) break;
+    if (!import_compiler35.types.isMemberExpression(parent) && !import_compiler35.types.isOptionalMemberExpression(parent))
+      break;
     const prop = getMemberExpressionPropString(parent);
     if (prop === void 0) break;
     if (reference.upstreamAlias && reference.excludeProperties !== void 0 && !propsUtil.has(reference.excludeProperties, prop)) {

package/dist/translator/util/get-defined-binding-expression.d.ts

@@ -1,3 +1,3 @@
 import { types as t } from "@marko/compiler";
 import { type Binding } from "./references";
-export declare function getDeclaredBindingExpression(binding: Binding): t.Identifier | t.OptionalMemberExpression | t.MemberExpression;
+export declare function getDeclaredBindingExpression(binding: Binding): t.Identifier | t.MemberExpression | t.OptionalMemberExpression;

package/dist/translator/util/references.d.ts

@@ -108,7 +108,7 @@ export declare function getDebugName(binding: Binding): string;
 export declare function getDebugNames(refs: ReferencedBindings): string;
 export declare function getSectionInstancesAccessor(section: Section): string;
 export declare function getSectionInstancesAccessorLiteral(section: Section): t.StringLiteral | t.NumericLiteral | undefined;
-export declare function getReadReplacement(node: t.Identifier | t.MemberExpression): t.Node | undefined;
+export declare function getReadReplacement(node: t.Identifier | t.MemberExpression | t.OptionalMemberExpression): t.Node | undefined;
 export interface ReferencedExtra extends t.NodeExtra {
     section: Section;
     fnExtra?: FnExtra;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.91",
+  "version": "6.0.92",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",