@barefootjs/mojolicious 0.18.4 → 0.18.7

package/dist/build.js

@@ -19,7 +19,12 @@ import {
   queryHrefArgs,
   isValidHelperId,
   sortComparatorFromArrow as sortComparatorFromArrow2,
-  isLowerableLoopDestructure
+  isLowerableLoopDestructure,
+  isDangerousInnerHtmlAttr,
+  resolveDangerousInnerHtml,
+  dangerousInnerHtmlMetacharViolation,
+  dangerousInnerHtmlDiagnostic,
+  resolveStaticLoopSource
 } from "@barefootjs/jsx";
 
 // src/adapter/boolean-result.ts
@@ -76,7 +81,7 @@ function isAriaBooleanAttr(name) {
 }
 
 // src/adapter/mojo-adapter.ts
-import { BF_SLOT, BF_COND, BF_REGION } from "@barefootjs/shared";
+import { BF_SLOT, BF_COND, BF_REGION, escapeHtml } from "@barefootjs/shared";
 
 // src/adapter/lib/constants.ts
 var MOJO_TEMPLATE_PRIMITIVES = {
@@ -85,7 +90,10 @@ var MOJO_TEMPLATE_PRIMITIVES = {
   Number: { arity: 1, emit: (args) => `bf->number(${args[0]})` },
   "Math.floor": { arity: 1, emit: (args) => `bf->floor(${args[0]})` },
   "Math.ceil": { arity: 1, emit: (args) => `bf->ceil(${args[0]})` },
-  "Math.round": { arity: 1, emit: (args) => `bf->round(${args[0]})` }
+  "Math.round": { arity: 1, emit: (args) => `bf->round(${args[0]})` },
+  "Math.min": { arity: 2, emit: (args) => `bf->min(${args[0]}, ${args[1]})` },
+  "Math.max": { arity: 2, emit: (args) => `bf->max(${args[0]}, ${args[1]})` },
+  "Math.abs": { arity: 1, emit: (args) => `bf->abs(${args[0]})` }
 };
 var MOJO_PRIMITIVE_EMIT_MAP = Object.fromEntries(Object.entries(MOJO_TEMPLATE_PRIMITIVES).map(([k, v]) => [k, v.emit]));
 
@@ -190,6 +198,12 @@ function renderArrayMethod(method, object, args, emit) {
       const recv = emit(object);
       return `bf->trim(${recv})`;
     }
+    case "trimStart":
+    case "trimEnd": {
+      const fn = method === "trimStart" ? "trim_start" : "trim_end";
+      const recv = emit(object);
+      return `bf->${fn}(${recv})`;
+    }
     case "toFixed": {
       const recv = emit(object);
       const digits = args.length >= 1 ? emit(args[0]) : "0";
@@ -223,6 +237,12 @@ function renderArrayMethod(method, object, args, emit) {
       const newS = emit(args[1]);
       return `bf->replace(${recv}, ${oldS}, ${newS})`;
     }
+    case "replaceAll": {
+      const recv = emit(object);
+      const oldS = emit(args[0]);
+      const newS = emit(args[1]);
+      return `bf->replace_all(${recv}, ${oldS}, ${newS})`;
+    }
     case "repeat": {
       const recv = emit(object);
       const count = args.length === 0 ? "0" : emit(args[0]);
@@ -323,6 +343,42 @@ function renderFlatMethod(recv, depth, emit) {
   return `bf->flat(${recv}, ${d})`;
 }
 
+// src/adapter/lib/static-value.ts
+function escapePerlSingleQuote2(s) {
+  return s.replace(/\\/g, "\\\\").replace(/'/g, "\\'");
+}
+function staticValueToPerl(value) {
+  if (value === null || value === undefined)
+    return "undef";
+  if (typeof value === "boolean")
+    return null;
+  if (typeof value === "number")
+    return String(value);
+  if (typeof value === "string")
+    return `'${escapePerlSingleQuote2(value)}'`;
+  if (Array.isArray(value)) {
+    const items = [];
+    for (const el of value) {
+      const serialized = staticValueToPerl(el);
+      if (serialized === null)
+        return null;
+      items.push(serialized);
+    }
+    return `[${items.join(", ")}]`;
+  }
+  if (typeof value === "object") {
+    const entries = [];
+    for (const [key, val] of Object.entries(value)) {
+      const serialized = staticValueToPerl(val);
+      if (serialized === null)
+        return null;
+      entries.push(`${perlHashKey(key)} => ${serialized}`);
+    }
+    return `{ ${entries.join(", ")} }`;
+  }
+  return null;
+}
+
 // src/adapter/expr/emitters.ts
 import {
   groupBinaryOperand,
@@ -381,7 +437,7 @@ class MojoFilterEmitter {
       return "undef";
     return String(value);
   }
-  member(object, property, _computed, emit) {
+  member(object, property, _computed, _optional, emit) {
     if (property === "length" && (asCallbackMethodCall(object) !== null || object.kind === "array-literal")) {
       return `scalar(@{${emit(object)}})`;
     }
@@ -516,7 +572,7 @@ class MojoTopLevelEmitter {
       return "undef";
     return String(value);
   }
-  member(object, property, _computed, emit) {
+  member(object, property, _computed, _optional, emit) {
     if (object.kind === "identifier" && object.name === "props") {
       return `$${property}`;
     }
@@ -526,8 +582,13 @@ class MojoTopLevelEmitter {
         return staticValue;
     }
     const obj = emit(object);
-    if (property === "length")
+    if (property === "length") {
+      const isStr = (e) => isStringTypedOperand2(e, (n) => this.ctx._isStringValueName(n));
+      const isStringReceiver = isStr(object) || object.kind === "identifier" && this.ctx._isStringValueName(object.name);
+      if (isStringReceiver)
+        return `length(${obj})`;
       return `scalar(@{${obj}})`;
+    }
     return `${obj}->{${property}}`;
   }
   indexAccess(object, index, emit) {
@@ -914,6 +975,9 @@ function generateDerivedMemoSeed(ctx, ir) {
 ` : "";
 }
 
+// src/adapter/props/prop-classes.ts
+import { collectLoopBoundNames } from "@barefootjs/jsx";
+
 // src/adapter/value/parsed-literal.ts
 function isStringTypeInfo(type) {
   return type?.kind === "primitive" && type.primitive === "string";
@@ -950,6 +1014,12 @@ function collectStringValueNames(ir) {
     if (isStringTypeInfo(p.type))
       names.add(p.name);
   }
+  for (const c of ir.metadata.localConstants) {
+    if (isStringTypeInfo(c.type ?? undefined) || isBareStringLiteral(c.value))
+      names.add(c.name);
+  }
+  for (const bound of collectLoopBoundNames(ir))
+    names.delete(bound);
   return names;
 }
 
@@ -976,6 +1046,7 @@ class MojoAdapter extends BaseAdapter {
   options;
   errors = [];
   inLoop = false;
+  currentLoopKeyDepth = 0;
   propsObjectName = null;
   propsParams = [];
   booleanTypedProps = new Set;
@@ -1108,7 +1179,7 @@ class MojoAdapter extends BaseAdapter {
     return this.renderElement(node);
   }
   emitText(node) {
-    return node.value;
+    return escapeHtml(node.value);
   }
   emitExpression(node) {
     return this.renderExpression(node);
@@ -1179,7 +1250,8 @@ class MojoAdapter extends BaseAdapter {
   renderElement(element) {
     const tag = element.tag;
     const attrs = this.renderAttributes(element);
-    const children = this.renderChildren(element.children);
+    const dangerousHtml = this.renderDangerousInnerHtml(element);
+    const children = dangerousHtml !== null ? dangerousHtml : this.renderChildren(element.children);
     let hydrationAttrs = "";
     if (element.needsScope) {
       hydrationAttrs += ` ${this.renderScopeMarker("")}`;
@@ -1214,6 +1286,22 @@ class MojoAdapter extends BaseAdapter {
     }
     return `<${tag}${attrs}${hydrationAttrs}>${children}</${tag}>`;
   }
+  renderDangerousInnerHtml(element) {
+    const resolution = resolveDangerousInnerHtml(element);
+    if (!resolution)
+      return null;
+    if (resolution.kind === "dynamic") {
+      this.errors.push(dangerousInnerHtmlDiagnostic(resolution.expr, resolution.loc));
+      return "";
+    }
+    const violation = dangerousInnerHtmlMetacharViolation(resolution.html, this.name);
+    if (violation) {
+      const attr = element.attrs.find(isDangerousInnerHtmlAttr);
+      this.errors.push(dangerousInnerHtmlDiagnostic(`{ __html: ${JSON.stringify(resolution.html)} }`, attr.loc, violation));
+      return "";
+    }
+    return resolution.html;
+  }
   renderExpression(expr) {
     if (expr.clientOnly) {
       if (expr.slotId) {
@@ -1221,7 +1309,7 @@ class MojoAdapter extends BaseAdapter {
       }
       return "";
     }
-    const perlExpr = this.convertExpressionToPerl(expr.expr);
+    const perlExpr = this.convertExpressionToPerl(expr.expr, expr.parsed);
     if (expr.slotId) {
       return `<%== bf->text_start("${expr.slotId}") %><%= ${perlExpr} %><%== bf->text_end %>`;
     }
@@ -1313,8 +1401,12 @@ ${whenTrue}
         }
       });
     }
+    const staticItems = resolveStaticLoopSource(loop.arrayParsed, this.localConstants, {
+      isNameShadowed: (name) => this.loopBoundNames.has(name)
+    });
+    const staticArray = staticItems !== null ? staticValueToPerl(staticItems) : null;
     const arrayName = loop.array.trim();
-    if (/^[A-Za-z_$][\w$]*$/.test(arrayName)) {
+    if (staticArray === null && /^[A-Za-z_$][\w$]*$/.test(arrayName)) {
       const arrayConst = (this.localConstants ?? []).find((c) => c.name === arrayName);
       if (arrayConst && !arrayConst.isModule && this.resolveLiteralConst(arrayName) === null) {
         this.errors.push({
@@ -1328,7 +1420,7 @@ ${whenTrue}
         });
       }
     }
-    const rawArray = this.convertExpressionToPerl(loop.array);
+    const rawArray = staticArray ?? this.convertExpressionToPerl(loop.array);
     let sortedHoist = null;
     let array = rawArray;
     if (loop.sortComparator) {
@@ -1337,13 +1429,16 @@ ${whenTrue}
     }
     const param = loop.param;
     const indexVar = loop.iterationShape === "keys" ? `$${param}` : loop.index ? `$${loop.index}` : "$_i";
-    const loopBound = loop.iterationShape === "keys" ? [param] : supportableDestructure ? ["__bf_item", ...(loop.paramBindings ?? []).map((b) => b.name), loop.index ?? "_i"] : [param, loop.index ?? "_i"];
+    const loopBound = loop.objectIteration === "entries" ? [param, loop.index ?? "_k"] : loop.objectIteration === "keys" || loop.objectIteration === "values" || loop.iterationShape === "keys" ? [param] : supportableDestructure ? ["__bf_item", ...(loop.paramBindings ?? []).map((b) => b.name), loop.index ?? "_i"] : [param, loop.index ?? "_i"];
     for (const n of loopBound) {
       this.loopBoundNames.set(n, (this.loopBoundNames.get(n) ?? 0) + 1);
     }
     const prevInLoop = this.inLoop;
     this.inLoop = true;
+    const prevLoopKeyDepth = this.currentLoopKeyDepth;
+    this.currentLoopKeyDepth = loop.depth;
     const renderedChildren = this.renderChildren(loop.children);
+    this.currentLoopKeyDepth = prevLoopKeyDepth;
     this.inLoop = prevInLoop;
     const children = loop.bodyIsItemConditional && loop.key ? `<%== bf->comment("loop-i:" . ${this.convertExpressionToPerl(loop.key)}) %>
 ${renderedChildren}` : renderedChildren;
@@ -1377,23 +1472,31 @@ ${renderedChildren}` : renderedChildren;
       }
       lines.push(`% my $${sortedHoist} = ${sorted};`);
     }
-    lines.push(`% for my ${indexVar} (0..$#{${array}}) {`);
-    if (loop.iterationShape !== "keys") {
-      if (supportableDestructure) {
-        lines.push(`% my $__bf_item = ${array}->[${indexVar}];`);
-        for (const b of loop.paramBindings ?? []) {
-          const parent = perlSegmentAccessor("$__bf_item", b.segments ?? []);
-          if (b.rest?.kind === "object") {
-            const exclude = b.rest.exclude.map((k) => perlStringLiteral(k.key)).join(", ");
-            lines.push(`% my $${b.name} = bf->omit(${parent}, [${exclude}]);`);
-          } else if (b.rest?.kind === "array") {
-            lines.push(`% my $${b.name} = bf->slice(${parent}, ${b.rest.from}, undef);`);
-          } else {
-            lines.push(`% my $${b.name} = ${perlSegmentAccessor("$__bf_item", b.segments ?? [])};`);
+    if (loop.objectIteration) {
+      const keyVar = loop.objectIteration === "values" ? "$__bf_k" : `$${loop.index ?? param}`;
+      lines.push(`% for my ${keyVar} (sort keys %{${array}}) {`);
+      if (loop.objectIteration === "entries" || loop.objectIteration === "values") {
+        lines.push(`% my $${param} = ${array}->{${keyVar}};`);
+      }
+    } else {
+      lines.push(`% for my ${indexVar} (0..$#{${array}}) {`);
+      if (loop.iterationShape !== "keys") {
+        if (supportableDestructure) {
+          lines.push(`% my $__bf_item = ${array}->[${indexVar}];`);
+          for (const b of loop.paramBindings ?? []) {
+            const parent = perlSegmentAccessor("$__bf_item", b.segments ?? []);
+            if (b.rest?.kind === "object") {
+              const exclude = b.rest.exclude.map((k) => perlStringLiteral(k.key)).join(", ");
+              lines.push(`% my $${b.name} = bf->omit(${parent}, [${exclude}]);`);
+            } else if (b.rest?.kind === "array") {
+              lines.push(`% my $${b.name} = bf->slice(${parent}, ${b.rest.from}, undef);`);
+            } else {
+              lines.push(`% my $${b.name} = ${perlSegmentAccessor("$__bf_item", b.segments ?? [])};`);
+            }
           }
+        } else {
+          lines.push(`% my $${param} = ${array}->[${indexVar}];`);
         }
-      } else {
-        lines.push(`% my $${param} = ${array}->[${indexVar}];`);
       }
     }
     if (loop.filterPredicate) {
@@ -1448,9 +1551,20 @@ ${renderedChildren}` : renderedChildren;
   };
   renderComponent(comp) {
     const propParts = [];
+    const namedSlotCaptures = [];
     for (const p of comp.props) {
       if ((p.name.match(/^on[A-Z]/) || p.name === "ref") && p.value.kind === "expression")
         continue;
+      if (p.value.kind === "jsx-children" && p.name !== "children") {
+        const prevInLoop = this.inLoop;
+        this.inLoop = false;
+        const slotBody = this.renderChildren(p.value.children);
+        this.inLoop = prevInLoop;
+        const varName = `$bf_prop_${this.childrenCaptureCounter++}`;
+        namedSlotCaptures.push(`<% my ${varName} = begin %>${slotBody}<% end %>`);
+        propParts.push(`${perlHashKey(p.name)} => ${varName}`);
+        continue;
+      }
       const lowered = emitAttrValue(p.value, this.componentPropEmitter, p.name);
       if (lowered)
         propParts.push(lowered);
@@ -1467,9 +1581,9 @@ ${renderedChildren}` : renderedChildren;
       const childrenBody = this.renderChildren(effectiveChildren);
       this.inLoop = prevInLoop;
       const varName = `$bf_children_${comp.slotId ?? "c" + this.childrenCaptureCounter++}`;
-      return `<% my ${varName} = begin %>${childrenBody}<% end %><%== bf->render_child('${tplName}'${propsStr}, children => ${varName}) %>`;
+      return `${namedSlotCaptures.join("")}<% my ${varName} = begin %>${childrenBody}<% end %><%== bf->render_child('${tplName}'${propsStr}, children => ${varName}) %>`;
     }
-    return `<%== bf->render_child('${tplName}'${propsStr}) %>`;
+    return `${namedSlotCaptures.join("")}<%== bf->render_child('${tplName}'${propsStr}) %>`;
   }
   childrenCaptureCounter = 0;
   presenceVarCounter = 0;
@@ -1514,7 +1628,7 @@ ${alternate}
 ${children}`;
   }
   elementAttrEmitter = {
-    emitLiteral: (value, name) => `${name}="${value.value}"`,
+    emitLiteral: (value, name) => `${name}="${escapeHtml(value.value)}"`,
     emitExpression: (value, name) => {
       if (name === "style") {
         const css = this.tryLowerStyleObject(value.expr);
@@ -1569,7 +1683,7 @@ ${children}`;
       if (ternaryHashref !== null) {
         return `<%== bf->spread_attrs(${ternaryHashref}) %>`;
       }
-      if (/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(trimmed)) {
+      if (/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(trimmed) && !this.loopBoundNames.has(trimmed)) {
         const localConst = this.localConstants.find((c) => c.name === trimmed && !c.isModule);
         if (localConst?.value !== undefined) {
           const initTrimmed = localConst.value.trim();
@@ -1605,12 +1719,15 @@ ${children}`;
     for (const attr of element.attrs) {
       if (attr.clientOnly)
         continue;
+      if (isDangerousInnerHtmlAttr(attr))
+        continue;
       let attrName;
       if (attr.name === "className")
         attrName = "class";
-      else if (attr.name === "key")
-        attrName = "data-key";
-      else
+      else if (attr.name === "key") {
+        const depth = this.currentLoopKeyDepth;
+        attrName = depth > 0 ? `data-key-${depth}` : "data-key";
+      } else
         attrName = attr.name;
       const lowered = emitAttrValue(attr.value, this.elementAttrEmitter, attrName);
       if (lowered)

package/dist/conformance-pins.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"conformance-pins.d.ts","sourceRoot":"","sources":["../src/conformance-pins.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEtD,eAAO,MAAM,eAAe,EAAE,eA0I7B,CAAA"}
+{"version":3,"file":"conformance-pins.d.ts","sourceRoot":"","sources":["../src/conformance-pins.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEtD,eAAO,MAAM,eAAe,EAAE,eAmI7B,CAAA"}