@barefootjs/mojolicious 0.6.1 → 0.8.0

package/dist/adapter/index.js

@@ -1,4 +1,5 @@
 // src/adapter/mojo-adapter.ts
+import ts from "typescript";
 import {
   BaseAdapter,
   isBooleanAttr,
@@ -80,6 +81,22 @@ function resolveJsxChildrenProp(props) {
     return [];
   return prop.value.children;
 }
+function parsePureStringLiteral(source) {
+  const sf = ts.createSourceFile("__const.ts", `const __x = (${source});`, ts.ScriptTarget.Latest, false);
+  const stmt = sf.statements[0];
+  if (!stmt || !ts.isVariableStatement(stmt))
+    return null;
+  const decl = stmt.declarationList.declarations[0];
+  let init = decl?.initializer;
+  while (init && ts.isParenthesizedExpression(init))
+    init = init.expression;
+  if (!init)
+    return null;
+  if (ts.isStringLiteral(init) || ts.isNoSubstitutionTemplateLiteral(init)) {
+    return init.text;
+  }
+  return null;
+}
 
 class MojoAdapter extends BaseAdapter {
   name = "mojolicious";
@@ -94,6 +111,9 @@ class MojoAdapter extends BaseAdapter {
   propsObjectName = null;
   propsParams = [];
   stringValueNames = new Set;
+  moduleStringConsts = new Map;
+  loopBoundNames = new Map;
+  nullableOptionalProps = new Set;
   constructor(options = {}) {
     super();
     this.options = {
@@ -105,6 +125,7 @@ class MojoAdapter extends BaseAdapter {
     this.componentName = ir.metadata.componentName;
     this.propsObjectName = ir.metadata.propsObjectName ?? null;
     this.propsParams = ir.metadata.propsParams.map((p) => ({ name: p.name }));
+    this.nullableOptionalProps = new Set(ir.metadata.propsParams.filter((p) => p.defaultValue === undefined && !p.isRest && p.type?.kind !== "primitive").map((p) => p.name));
     this.stringValueNames = new Set;
     for (const s of ir.metadata.signals) {
       if (isStringTypeInfo(s.type) || isBareStringLiteral(s.initialValue)) {
@@ -115,6 +136,8 @@ class MojoAdapter extends BaseAdapter {
       if (isStringTypeInfo(p.type))
         this.stringValueNames.add(p.name);
     }
+    this.moduleStringConsts = this.collectModuleStringConsts(ir.metadata.localConstants);
+    this.loopBoundNames.clear();
     this.errors = [];
     this.childrenCaptureCounter = 0;
     if (!options?.siblingTemplatesRegistered) {
@@ -139,6 +162,27 @@ class MojoAdapter extends BaseAdapter {
       extension: this.extension
     };
   }
+  collectModuleStringConsts(constants) {
+    const map = new Map;
+    for (const c of constants ?? []) {
+      if (!c.isModule)
+        continue;
+      if (c.value === undefined)
+        continue;
+      const literal = parsePureStringLiteral(c.value);
+      if (literal !== null)
+        map.set(c.name, literal);
+    }
+    return map;
+  }
+  resolveModuleStringConst(name) {
+    if (this.loopBoundNames.has(name))
+      return null;
+    const value = this.moduleStringConsts.get(name);
+    if (value === undefined)
+      return null;
+    return `'${value.replace(/[\\']/g, (m) => `\\${m}`)}'`;
+  }
   generateScriptRegistrations(ir, scriptBaseName) {
     const hasInteractivity = this.hasClientInteractivity(ir);
     if (!hasInteractivity)
@@ -405,6 +449,10 @@ ${whenTrue}
     }
     const param = loop.param;
     const indexVar = loop.iterationShape === "keys" ? `$${param}` : loop.index ? `$${loop.index}` : "$_i";
+    const loopBound = loop.iterationShape === "keys" ? [param] : [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 renderedChildren = this.renderChildren(loop.children);
@@ -438,6 +486,13 @@ ${renderedChildren}` : renderedChildren;
     } else {
       lines.push(children);
     }
+    for (const n of loopBound) {
+      const c = (this.loopBoundNames.get(n) ?? 1) - 1;
+      if (c <= 0)
+        this.loopBoundNames.delete(n);
+      else
+        this.loopBoundNames.set(n, c);
+    }
     lines.push(`% }`);
     lines.push(`<%== bf->comment("/loop:${loop.markerId}") %>`);
     return lines.join(`
@@ -529,6 +584,12 @@ ${children}`;
       if (this.refuseUnsupportedAttrExpression(value.expr, name)) {
         return "";
       }
+      const bareId = value.expr.trim();
+      if (!isBooleanAttr(name) && !value.presenceOrUndefined && this.nullableOptionalProps.has(bareId)) {
+        const perl2 = this.convertExpressionToPerl(value.expr);
+        const body = isBooleanResultExpr(value.expr) || isAriaBooleanAttr(name) ? `${name}="<%= bf->bool_str(${perl2}) %>"` : `${name}="<%= ${perl2} %>"`;
+        return `<% if (defined ${perl2}) { %>${body}<% } %>`;
+      }
       if (isBooleanAttr(name) || value.presenceOrUndefined) {
         return `<%= ${this.convertExpressionToPerl(value.expr)} ? '${name}' : '' %>`;
       }
@@ -549,6 +610,10 @@ ${children}`;
         const entries = this.propsParams.map((p) => `${JSON.stringify(p.name)} => $${p.name}`);
         return `<%== bf->spread_attrs({${entries.join(", ")}}) %>`;
       }
+      const ternaryHashref = this.conditionalSpreadToPerl(trimmed);
+      if (ternaryHashref !== null) {
+        return `<%== bf->spread_attrs(${ternaryHashref}) %>`;
+      }
       const perlExpr = this.convertExpressionToPerl(value.expr);
       return `<%== bf->spread_attrs(${perlExpr}) %>`;
     },
@@ -713,6 +778,54 @@ ${reason}` : "";
     });
     return true;
   }
+  conditionalSpreadToPerl(expr) {
+    const sf = ts.createSourceFile("__spread.ts", `(${expr})`, ts.ScriptTarget.Latest, true);
+    if (sf.statements.length !== 1)
+      return null;
+    const stmt = sf.statements[0];
+    if (!ts.isExpressionStatement(stmt))
+      return null;
+    let node = stmt.expression;
+    while (ts.isParenthesizedExpression(node))
+      node = node.expression;
+    if (!ts.isConditionalExpression(node))
+      return null;
+    const unwrap = (e) => {
+      let n = e;
+      while (ts.isParenthesizedExpression(n))
+        n = n.expression;
+      return n;
+    };
+    const whenTrue = unwrap(node.whenTrue);
+    const whenFalse = unwrap(node.whenFalse);
+    if (!ts.isObjectLiteralExpression(whenTrue) || !ts.isObjectLiteralExpression(whenFalse)) {
+      return null;
+    }
+    const condPerl = this.convertExpressionToPerl(node.condition.getText(sf));
+    const truePerl = this.objectLiteralToPerlHashref(whenTrue, sf);
+    const falsePerl = this.objectLiteralToPerlHashref(whenFalse, sf);
+    if (truePerl === null || falsePerl === null)
+      return null;
+    return `${condPerl} ? ${truePerl} : ${falsePerl}`;
+  }
+  objectLiteralToPerlHashref(obj, sf) {
+    const entries = [];
+    for (const prop of obj.properties) {
+      if (!ts.isPropertyAssignment(prop))
+        return null;
+      let key;
+      if (ts.isIdentifier(prop.name)) {
+        key = prop.name.text;
+      } else if (ts.isStringLiteral(prop.name) || ts.isNoSubstitutionTemplateLiteral(prop.name)) {
+        key = prop.name.text;
+      } else {
+        return null;
+      }
+      const valPerl = this.convertExpressionToPerl(prop.initializer.getText(sf));
+      entries.push(`'${key.replace(/'/g, "\\'")}' => ${valPerl}`);
+    }
+    return entries.length === 0 ? "{}" : `{ ${entries.join(", ")} }`;
+  }
   convertExpressionToPerl(expr) {
     const trimmed = expr.trim();
     if (trimmed === "")
@@ -1056,6 +1169,9 @@ class MojoTopLevelEmitter {
     this.adapter = adapter;
   }
   identifier(name) {
+    const inlined = this.adapter.resolveModuleStringConst(name);
+    if (inlined !== null)
+      return inlined;
     return `$${name}`;
   }
   literal(value, literalType) {

package/dist/adapter/mojo-adapter.d.ts

@@ -58,8 +58,62 @@ export declare class MojoAdapter extends BaseAdapter implements IRNodeEmitter<Mo
      * true — selecting the string operator from the operand's type avoids that.
      */
     private stringValueNames;
+    /**
+     * Module-scope pure string-literal constants (`const X = 'literal'` at
+     * file top-level), keyed by name → resolved literal value. Populated at
+     * `generate()` entry from `ir.metadata.localConstants`. When an identifier
+     * in an expression resolves to one of these, the adapter inlines the
+     * literal instead of emitting `$X` against a stash variable that is never
+     * bound (a module const isn't a prop, signal, or local — the value would
+     * render empty). Hono inlines it for free; this restores parity. Only
+     * module-scope pure string literals qualify (see `collectModuleStringConsts`).
+     */
+    private moduleStringConsts;
+    /**
+     * Names currently bound by an enclosing loop body — the `my $<param>` and
+     * `my $<index>` bindings `renderLoop` introduces — ref-counted so nested
+     * loops compose. `resolveModuleStringConst` consults this so a loop
+     * variable whose name happens to match a module string const is NOT
+     * inlined as the const literal (mirrors the Go adapter's loop-param /
+     * loop-var shadowing guards). (#1749 review)
+     */
+    private loopBoundNames;
+    /**
+     * Prop names whose value is `undef` in the template body when the caller
+     * omits them — so a bare-reference attribute should be dropped rather
+     * than rendered as `attr=""`. The actual population criterion (see
+     * `generate()`) is: NO destructure default (`defaultValue === undefined`)
+     * AND non-rest (`!isRest`) AND non-primitive type (`type.kind !==
+     * 'primitive'`). It deliberately does NOT consult `p.optional`: the
+     * analyzer derives `optional` from the presence of a default initializer,
+     * not the `?` token, so it's not the right witness here. Excluding
+     * concrete primitives (`string`/`number`/`boolean`) mirrors the Go
+     * adapter's scope, which guards only `interface{}` (nillable) fields.
+     * Used by `elementAttrEmitter.emitExpression` to guard such an attribute
+     * with a Perl `defined $x` check (`<textarea>` omits `rows`), matching
+     * Hono's nullish-attribute omission. Concrete/defaulted props are
+     * excluded and always emit unconditionally.
+     */
+    private nullableOptionalProps;
     constructor(options?: MojoAdapterOptions);
     generate(ir: ComponentIR, options?: AdapterGenerateOptions): AdapterOutput;
+    /**
+     * Build the module pure-string-const map from the IR's localConstants.
+     * A const qualifies only when it is module-scope (`isModule`) and its
+     * initializer parses to a single string literal (`ts.StringLiteral` or
+     * `ts.NoSubstitutionTemplateLiteral`). Template literals with `${}`,
+     * numeric/object initializers, `Record<T,string>` maps, memos, and
+     * signals are all excluded — only a pure compile-time string can be
+     * inlined byte-for-byte.
+     */
+    private collectModuleStringConsts;
+    /**
+     * Resolve an identifier to its inlined Perl single-quoted string literal
+     * when it names a module pure-string const, else `null` (the caller then
+     * falls back to its normal `$name` stash lowering). Returns the Perl
+     * literal form `'<escaped>'` ready to drop into an expression.
+     */
+    resolveModuleStringConst(name: string): string | null;
     private generateScriptRegistrations;
     private hasClientInteractivity;
     /**
@@ -165,6 +219,32 @@ export declare class MojoAdapter extends BaseAdapter implements IRNodeEmitter<Mo
      * should drop the attribute / skip the emit).
      */
     private refuseUnsupportedAttrExpression;
+    /**
+     * Lower a conditional inline-object spread expression
+     *   `(COND ? { 'aria-describedby': describedBy } : {})`
+     * (either branch possibly `{}`) into a Perl inline ternary of
+     * hashrefs for `bf->spread_attrs`:
+     *   `$describedBy ? { 'aria-describedby' => $describedBy } : {}`
+     *
+     * The condition is translated via `convertExpressionToPerl` (a bare
+     * prop ident becomes `$describedBy`; Perl truthiness handles the
+     * test). Object literals become Perl hashrefs with `=>`; string-
+     * literal keys are quoted, values resolve via `convertExpressionToPerl`.
+     *
+     * Returns null when the expression is NOT this shape, or when a part
+     * can't be faithfully lowered (non-static key, etc.) so the caller
+     * falls back to the standard `convertExpressionToPerl` path (which
+     * records BF101). Scoped strictly to ternary-of-object-literals so no
+     * other spread shape regresses.
+     */
+    private conditionalSpreadToPerl;
+    /**
+     * Convert a static object literal into a Perl hashref string for a
+     * conditional spread. Only static string/identifier keys are allowed;
+     * values resolve via `convertExpressionToPerl`. Returns null for any
+     * computed/spread/dynamic key. Empty object → `{}`.
+     */
+    private objectLiteralToPerlHashref;
     private convertExpressionToPerl;
     /**
      * Render a full ParsedExpr tree to Perl for top-level (non-filter)

package/dist/adapter/mojo-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mojo-adapter.d.ts","sourceRoot":"","sources":["../../src/adapter/mojo-adapter.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mojo-adapter.d.ts","sourceRoot":"","sources":["../../src/adapter/mojo-adapter.ts"],"names":[],"mappings":"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"}

package/dist/build.js

@@ -1,4 +1,5 @@
 // src/adapter/mojo-adapter.ts
+import ts from "typescript";
 import {
   BaseAdapter,
   isBooleanAttr,
@@ -80,6 +81,22 @@ function resolveJsxChildrenProp(props) {
     return [];
   return prop.value.children;
 }
+function parsePureStringLiteral(source) {
+  const sf = ts.createSourceFile("__const.ts", `const __x = (${source});`, ts.ScriptTarget.Latest, false);
+  const stmt = sf.statements[0];
+  if (!stmt || !ts.isVariableStatement(stmt))
+    return null;
+  const decl = stmt.declarationList.declarations[0];
+  let init = decl?.initializer;
+  while (init && ts.isParenthesizedExpression(init))
+    init = init.expression;
+  if (!init)
+    return null;
+  if (ts.isStringLiteral(init) || ts.isNoSubstitutionTemplateLiteral(init)) {
+    return init.text;
+  }
+  return null;
+}
 
 class MojoAdapter extends BaseAdapter {
   name = "mojolicious";
@@ -94,6 +111,9 @@ class MojoAdapter extends BaseAdapter {
   propsObjectName = null;
   propsParams = [];
   stringValueNames = new Set;
+  moduleStringConsts = new Map;
+  loopBoundNames = new Map;
+  nullableOptionalProps = new Set;
   constructor(options = {}) {
     super();
     this.options = {
@@ -105,6 +125,7 @@ class MojoAdapter extends BaseAdapter {
     this.componentName = ir.metadata.componentName;
     this.propsObjectName = ir.metadata.propsObjectName ?? null;
     this.propsParams = ir.metadata.propsParams.map((p) => ({ name: p.name }));
+    this.nullableOptionalProps = new Set(ir.metadata.propsParams.filter((p) => p.defaultValue === undefined && !p.isRest && p.type?.kind !== "primitive").map((p) => p.name));
     this.stringValueNames = new Set;
     for (const s of ir.metadata.signals) {
       if (isStringTypeInfo(s.type) || isBareStringLiteral(s.initialValue)) {
@@ -115,6 +136,8 @@ class MojoAdapter extends BaseAdapter {
       if (isStringTypeInfo(p.type))
         this.stringValueNames.add(p.name);
     }
+    this.moduleStringConsts = this.collectModuleStringConsts(ir.metadata.localConstants);
+    this.loopBoundNames.clear();
     this.errors = [];
     this.childrenCaptureCounter = 0;
     if (!options?.siblingTemplatesRegistered) {
@@ -139,6 +162,27 @@ class MojoAdapter extends BaseAdapter {
       extension: this.extension
     };
   }
+  collectModuleStringConsts(constants) {
+    const map = new Map;
+    for (const c of constants ?? []) {
+      if (!c.isModule)
+        continue;
+      if (c.value === undefined)
+        continue;
+      const literal = parsePureStringLiteral(c.value);
+      if (literal !== null)
+        map.set(c.name, literal);
+    }
+    return map;
+  }
+  resolveModuleStringConst(name) {
+    if (this.loopBoundNames.has(name))
+      return null;
+    const value = this.moduleStringConsts.get(name);
+    if (value === undefined)
+      return null;
+    return `'${value.replace(/[\\']/g, (m) => `\\${m}`)}'`;
+  }
   generateScriptRegistrations(ir, scriptBaseName) {
     const hasInteractivity = this.hasClientInteractivity(ir);
     if (!hasInteractivity)
@@ -405,6 +449,10 @@ ${whenTrue}
     }
     const param = loop.param;
     const indexVar = loop.iterationShape === "keys" ? `$${param}` : loop.index ? `$${loop.index}` : "$_i";
+    const loopBound = loop.iterationShape === "keys" ? [param] : [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 renderedChildren = this.renderChildren(loop.children);
@@ -438,6 +486,13 @@ ${renderedChildren}` : renderedChildren;
     } else {
       lines.push(children);
     }
+    for (const n of loopBound) {
+      const c = (this.loopBoundNames.get(n) ?? 1) - 1;
+      if (c <= 0)
+        this.loopBoundNames.delete(n);
+      else
+        this.loopBoundNames.set(n, c);
+    }
     lines.push(`% }`);
     lines.push(`<%== bf->comment("/loop:${loop.markerId}") %>`);
     return lines.join(`
@@ -529,6 +584,12 @@ ${children}`;
       if (this.refuseUnsupportedAttrExpression(value.expr, name)) {
         return "";
       }
+      const bareId = value.expr.trim();
+      if (!isBooleanAttr(name) && !value.presenceOrUndefined && this.nullableOptionalProps.has(bareId)) {
+        const perl2 = this.convertExpressionToPerl(value.expr);
+        const body = isBooleanResultExpr(value.expr) || isAriaBooleanAttr(name) ? `${name}="<%= bf->bool_str(${perl2}) %>"` : `${name}="<%= ${perl2} %>"`;
+        return `<% if (defined ${perl2}) { %>${body}<% } %>`;
+      }
       if (isBooleanAttr(name) || value.presenceOrUndefined) {
         return `<%= ${this.convertExpressionToPerl(value.expr)} ? '${name}' : '' %>`;
       }
@@ -549,6 +610,10 @@ ${children}`;
         const entries = this.propsParams.map((p) => `${JSON.stringify(p.name)} => $${p.name}`);
         return `<%== bf->spread_attrs({${entries.join(", ")}}) %>`;
       }
+      const ternaryHashref = this.conditionalSpreadToPerl(trimmed);
+      if (ternaryHashref !== null) {
+        return `<%== bf->spread_attrs(${ternaryHashref}) %>`;
+      }
       const perlExpr = this.convertExpressionToPerl(value.expr);
       return `<%== bf->spread_attrs(${perlExpr}) %>`;
     },
@@ -713,6 +778,54 @@ ${reason}` : "";
     });
     return true;
   }
+  conditionalSpreadToPerl(expr) {
+    const sf = ts.createSourceFile("__spread.ts", `(${expr})`, ts.ScriptTarget.Latest, true);
+    if (sf.statements.length !== 1)
+      return null;
+    const stmt = sf.statements[0];
+    if (!ts.isExpressionStatement(stmt))
+      return null;
+    let node = stmt.expression;
+    while (ts.isParenthesizedExpression(node))
+      node = node.expression;
+    if (!ts.isConditionalExpression(node))
+      return null;
+    const unwrap = (e) => {
+      let n = e;
+      while (ts.isParenthesizedExpression(n))
+        n = n.expression;
+      return n;
+    };
+    const whenTrue = unwrap(node.whenTrue);
+    const whenFalse = unwrap(node.whenFalse);
+    if (!ts.isObjectLiteralExpression(whenTrue) || !ts.isObjectLiteralExpression(whenFalse)) {
+      return null;
+    }
+    const condPerl = this.convertExpressionToPerl(node.condition.getText(sf));
+    const truePerl = this.objectLiteralToPerlHashref(whenTrue, sf);
+    const falsePerl = this.objectLiteralToPerlHashref(whenFalse, sf);
+    if (truePerl === null || falsePerl === null)
+      return null;
+    return `${condPerl} ? ${truePerl} : ${falsePerl}`;
+  }
+  objectLiteralToPerlHashref(obj, sf) {
+    const entries = [];
+    for (const prop of obj.properties) {
+      if (!ts.isPropertyAssignment(prop))
+        return null;
+      let key;
+      if (ts.isIdentifier(prop.name)) {
+        key = prop.name.text;
+      } else if (ts.isStringLiteral(prop.name) || ts.isNoSubstitutionTemplateLiteral(prop.name)) {
+        key = prop.name.text;
+      } else {
+        return null;
+      }
+      const valPerl = this.convertExpressionToPerl(prop.initializer.getText(sf));
+      entries.push(`'${key.replace(/'/g, "\\'")}' => ${valPerl}`);
+    }
+    return entries.length === 0 ? "{}" : `{ ${entries.join(", ")} }`;
+  }
   convertExpressionToPerl(expr) {
     const trimmed = expr.trim();
     if (trimmed === "")
@@ -1056,6 +1169,9 @@ class MojoTopLevelEmitter {
     this.adapter = adapter;
   }
   identifier(name) {
+    const inlined = this.adapter.resolveModuleStringConst(name);
+    if (inlined !== null)
+      return inlined;
     return `$${name}`;
   }
   literal(value, literalType) {