@barefootjs/go-template 0.19.0 → 0.20.0

package/dist/build.js

@@ -708,6 +708,8 @@ class CompileState {
   nillablePropNames = new Set;
   nullishConsumedPropNames = new Set;
   omittableAttrConsumedPropNames = new Set;
+  textConsumedPropNames = new Set;
+  presenceCheckedPropNames = new Set;
   stringValueNames = new Set;
   rootScopeNodes = new Set;
   memoBackedLoopSlice = new Map;
@@ -1451,15 +1453,28 @@ function parsedLiteralToGo(ctx, expr, typeInfo) {
 
 // src/adapter/value/value-lowering.ts
 var EMPTY_PROP_FALLBACK_VARS = new Map;
+function nillableAwarePropRef(ctx, propName, expectedType) {
+  const fieldRef = `in.${capitalizeFieldName(propName)}`;
+  const scalar = expectedType.kind === "primitive" ? expectedType : expectedType.kind === "union" && expectedType.unionTypes?.length === 2 ? expectedType.unionTypes.find((t) => t.primitive !== "undefined" && t.primitive !== "null") : undefined;
+  if (ctx.state.nillablePropNames.has(propName) && scalar?.kind === "primitive") {
+    const goType = scalar.primitive === "boolean" ? "bool" : scalar.primitive === "number" ? "float64" : scalar.primitive === "string" ? "string" : null;
+    if (goType) {
+      const zero = goType === "bool" ? "false" : goType === "string" ? '""' : "0";
+      return `func() ${goType} { if v, ok := ${fieldRef}.(${goType}); ok { return v }; return ${zero} }()`;
+    }
+  }
+  return fieldRef;
+}
 function convertInitialValue(ctx, value, typeInfo, propsParams, preParsed) {
+  const propRef = (propName2) => nillableAwarePropRef(ctx, propName2, typeInfo);
   if (/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(value)) {
     if (propsParams?.some((p) => p.name === value)) {
-      return `in.${capitalizeFieldName(value)}`;
+      return propRef(value);
     }
   }
   const propName = ctx.extractPropNameFromInitialValue(value, preParsed);
   if (propName && propsParams?.some((p) => p.name === propName)) {
-    return `in.${capitalizeFieldName(propName)}`;
+    return propRef(propName);
   }
   if (typeInfo.kind === "primitive") {
     if (typeInfo.primitive === "boolean") {
@@ -1526,19 +1541,20 @@ function objectLiteralToGoMap(ctx, expr) {
     return null;
   return `map[string]interface{}{${entries.join(", ")}}`;
 }
-function getSignalInitialValueAsGo(ctx, initialValue, propsParams, propFallbackVars = EMPTY_PROP_FALLBACK_VARS) {
+function getSignalInitialValueAsGo(ctx, initialValue, propsParams, propFallbackVars = EMPTY_PROP_FALLBACK_VARS, signalType) {
+  const propRef = (propName2) => signalType ? nillableAwarePropRef(ctx, propName2, signalType) : `in.${capitalizeFieldName(propName2)}`;
   if (propsParams.some((p) => p.name === initialValue)) {
     const hoisted = propFallbackVars.get(initialValue);
     if (hoisted)
       return hoisted.varName;
-    return `in.${capitalizeFieldName(initialValue)}`;
+    return propRef(initialValue);
   }
   const propName = ctx.extractPropNameFromInitialValue(initialValue);
   if (propName && propsParams.some((p) => p.name === propName)) {
     const hoisted = propFallbackVars.get(propName);
     if (hoisted)
       return hoisted.varName;
-    return `in.${capitalizeFieldName(propName)}`;
+    return propRef(propName);
   }
   if (/^-?\d+$/.test(initialValue)) {
     return initialValue;
@@ -2008,9 +2024,34 @@ var EMPTY_PROP_FALLBACK_VARS2 = new Map;
 function getterCallName(e) {
   return e.kind === "call" && e.callee.kind === "identifier" && e.args.length === 0 ? e.callee.name : null;
 }
+function isBooleanTypeInfo(t) {
+  if (t.kind === "primitive")
+    return t.primitive === "boolean";
+  if (t.kind === "union" && t.unionTypes?.length === 2) {
+    const scalar = t.unionTypes.find((u) => u.primitive !== "undefined" && u.primitive !== "null");
+    return scalar?.kind === "primitive" && scalar.primitive === "boolean";
+  }
+  return false;
+}
+function isBooleanTypedGetter(ctx, name, signals) {
+  const signal = signals.find((s) => s.getter === name);
+  if (signal)
+    return signal.type !== undefined && isBooleanTypeInfo(signal.type);
+  const memo = (ctx.state.currentMemos ?? []).find((m) => m.name === name);
+  return memo?.type !== undefined && isBooleanTypeInfo(memo.type);
+}
 function propsMemberName(e) {
   return e.kind === "member" && !e.computed && e.object.kind === "identifier" && e.object.name === "props" ? e.property : null;
 }
+function propNameForPropsBinding(ctx, e) {
+  const propsObject = ctx.state.propsObjectName;
+  if (e.kind === "member" && !e.computed && e.object.kind === "identifier" && e.object.name === propsObject) {
+    return e.property;
+  }
+  if (!propsObject && e.kind === "identifier")
+    return e.name;
+  return null;
+}
 function matchFilterArmMemo(ctx, body, signals, propsParams) {
   const cb = asCallbackMethodCall2(body);
   if (!cb || cb.method !== "filter")
@@ -2149,6 +2190,17 @@ function memoInitialFromParsedBody(ctx, body, signals, propsParams, propFallback
     if (propName)
       return propRef(propName);
   }
+  if (body.kind === "binary" && (body.op === "!==" || body.op === "!=" || body.op === "===" || body.op === "==")) {
+    const other = body.right.kind === "identifier" && body.right.name === "undefined" ? body.left : body.left.kind === "identifier" && body.left.name === "undefined" ? body.right : null;
+    const propName = other ? propNameForPropsBinding(ctx, other) : null;
+    if (propName) {
+      const param = propsParams.find((p) => p.name === propName);
+      if (param && ctx.state.nillablePropNames.has(propName)) {
+        const isNe = body.op === "!==" || body.op === "!=";
+        return `in.${capitalizeFieldName(propName)} ${isNe ? "!=" : "=="} nil`;
+      }
+    }
+  }
   if (body.kind === "conditional") {
     const condName = getterCallName(body.test);
     if (condName) {
@@ -2183,6 +2235,18 @@ function memoInitialFromParsedBody(ctx, body, signals, propsParams, propFallback
         }
       }
     }
+    if (condName) {
+      const tName = getterCallName(body.consequent);
+      const fName = getterCallName(body.alternate);
+      if (tName && fName && isBooleanTypedGetter(ctx, tName, signals) && isBooleanTypedGetter(ctx, fName, signals)) {
+        const condGo = resolveGetterValueAsGo(ctx, condName, signals, propsParams, propFallbackVars, resolving);
+        const tGo = resolveGetterValueAsGo(ctx, tName, signals, propsParams, propFallbackVars, resolving);
+        const fGo = resolveGetterValueAsGo(ctx, fName, signals, propsParams, propFallbackVars, resolving);
+        if (condGo !== null && tGo !== null && fGo !== null) {
+          return `func() bool { if ${condGo} { return ${tGo} }; return ${fGo} }()`;
+        }
+      }
+    }
   }
   if (body.kind === "binary" && ["*", "+", "-", "/"].includes(body.op) && body.right.kind === "literal" && body.right.literalType === "number" && typeof body.right.value === "number" && Number.isInteger(body.right.value) && body.right.value >= 0) {
     const operator = body.op;
@@ -2271,7 +2335,7 @@ function computeMemoInitialValueOrNull(ctx, memo, signals, propsParams, propFall
 function resolveGetterValueAsGo(ctx, name, signals, propsParams, propFallbackVars, resolving = new Set) {
   const signal = signals.find((s) => s.getter === name);
   if (signal) {
-    return getSignalInitialValueAsGo(ctx, signal.initialValue, propsParams, propFallbackVars);
+    return getSignalInitialValueAsGo(ctx, signal.initialValue, propsParams, propFallbackVars, signal.type);
   }
   const memo = (ctx.state.currentMemos ?? []).find((m) => m.name === name);
   if (memo) {
@@ -2673,8 +2737,10 @@ function collectNullishConsumedPropNames(ctx, ir) {
   const propNameOfLeft = (left) => {
     if (left.kind === "identifier")
       return left.name;
-    if (left.kind === "member" && !left.computed && left.object.kind === "identifier" && left.object.name === propsObject) {
-      return left.property;
+    if (left.kind === "member" && !left.computed && left.object.kind === "identifier") {
+      if (left.object.name === propsObject)
+        return left.property;
+      return left.object.name;
     }
     return null;
   };
@@ -2745,12 +2811,60 @@ function collectOmittableAttrConsumedPropNames(ctx, ir) {
   walk(ir.root);
   return names;
 }
+function collectTextConsumedPropNames(ctx, ir) {
+  const names = new Set;
+  const optionalParams = new Set(ir.metadata.propsParams.filter((p) => p.optional && p.defaultValue == null && p.type.kind === "primitive").map((p) => p.name));
+  if (optionalParams.size === 0)
+    return names;
+  const propsObject = ctx.state.propsObjectName;
+  const walk = (node) => {
+    if (!node || typeof node !== "object")
+      return;
+    if (Array.isArray(node)) {
+      for (const item of node)
+        walk(item);
+      return;
+    }
+    const rec = node;
+    if (rec.type === "expression") {
+      const bareId = String(rec.expr ?? "").trim();
+      const propName = propsObject && bareId.startsWith(`${propsObject}.`) ? bareId.slice(propsObject.length + 1) : bareId;
+      if (/^[A-Za-z_$][\w$]*$/.test(propName) && optionalParams.has(propName)) {
+        names.add(propName);
+      }
+    }
+    for (const value of Object.values(rec))
+      walk(value);
+  };
+  walk(ir.root);
+  return names;
+}
+function collectPresenceCheckedPropNames(ctx, ir) {
+  const names = new Set;
+  const optionalParams = new Set(ir.metadata.propsParams.filter((p) => p.optional && p.defaultValue == null && p.type.kind === "primitive").map((p) => p.name));
+  if (optionalParams.size === 0)
+    return names;
+  const propsObject = ctx.state.propsObjectName;
+  const isUndefinedCheck = (op) => op === "!==" || op === "!=" || op === "===" || op === "==";
+  for (const memo of ir.metadata.memos) {
+    const body = memo.parsed;
+    if (!body || body.kind !== "binary" || !isUndefinedCheck(body.op))
+      continue;
+    const other = body.right.kind === "identifier" && body.right.name === "undefined" ? body.left : body.left.kind === "identifier" && body.left.name === "undefined" ? body.right : null;
+    if (!other)
+      continue;
+    const propName = other.kind === "member" && !other.computed && other.object.kind === "identifier" && other.object.name === propsObject ? other.property : !propsObject && other.kind === "identifier" ? other.name : null;
+    if (propName && optionalParams.has(propName))
+      names.add(propName);
+  }
+  return names;
+}
 function resolvePropGoType(ctx, param, propTypeOverrides) {
   const base = propTypeOverrides.get(param.name) ?? typeInfoToGo(ctx, param.type, param.defaultValue);
   if (param.optional && ctx.state.localStructFields.has(base)) {
     return "map[string]interface{}";
   }
-  if (param.optional && param.type.kind === "primitive" && (ctx.state.nullishConsumedPropNames.has(param.name) || ctx.state.omittableAttrConsumedPropNames.has(param.name)) && NULLISH_SCALAR_GO_TYPES.has(base)) {
+  if (param.optional && param.type.kind === "primitive" && (ctx.state.nullishConsumedPropNames.has(param.name) || ctx.state.omittableAttrConsumedPropNames.has(param.name) || ctx.state.textConsumedPropNames.has(param.name) || ctx.state.presenceCheckedPropNames.has(param.name)) && NULLISH_SCALAR_GO_TYPES.has(base)) {
     return "interface{}";
   }
   return base;
@@ -2887,6 +3001,8 @@ class GoTemplateAdapter extends BaseAdapter {
     this.buildLocalTypeTables(ir, ir.metadata.componentName);
     this.state.nullishConsumedPropNames = collectNullishConsumedPropNames(this.emitCtx, ir);
     this.state.omittableAttrConsumedPropNames = collectOmittableAttrConsumedPropNames(this.emitCtx, ir);
+    this.state.textConsumedPropNames = collectTextConsumedPropNames(this.emitCtx, ir);
+    this.state.presenceCheckedPropNames = collectPresenceCheckedPropNames(this.emitCtx, ir);
     this.state.nillablePropNames = collectNillablePropNames(this.emitCtx, ir);
   }
   generate(ir, options) {
@@ -4569,10 +4685,22 @@ ${goFields.join(`
       }
       return goExpr;
     }
+    const finalExpr = this.textNillablePropNameOf(classify.parsed) !== null ? `bf_string ${wrapIfMultiToken(goExpr)}` : goExpr;
     if (expr.slotId) {
-      return `{{bfTextStart "${expr.slotId}"}}{{${goExpr}}}{{bfTextEnd}}`;
+      return `{{bfTextStart "${expr.slotId}"}}{{${finalExpr}}}{{bfTextEnd}}`;
     }
-    return `{{${goExpr}}}`;
+    return `{{${finalExpr}}}`;
+  }
+  textNillablePropNameOf(expr) {
+    if (!expr)
+      return null;
+    let name = null;
+    if (expr.kind === "identifier") {
+      name = expr.name;
+    } else if (expr.kind === "member" && !expr.computed && expr.object.kind === "identifier" && expr.object.name === this.state.propsObjectName) {
+      name = expr.property;
+    }
+    return name !== null && this.state.textConsumedPropNames.has(name) && this.state.nillablePropNames.has(name) ? name : null;
   }
   isTemplateFragment(go, kind) {
     return go.startsWith("{{") || kind === "template-literal";
@@ -4788,7 +4916,7 @@ ${goFields.join(`
     }
     const obj = emit(object);
     if (property === "length")
-      return `len ${obj}`;
+      return `bf_length ${wrapIfMultiToken(obj)}`;
     if (optional) {
       return `bf_get ${wrapIfMultiToken(obj)} ${JSON.stringify(goFieldNameForKey(property))}`;
     }
@@ -4866,8 +4994,12 @@ ${goFields.join(`
     let name = null;
     if (expr.kind === "identifier") {
       name = expr.name;
-    } else if (expr.kind === "member" && !expr.computed && expr.object.kind === "identifier" && expr.object.name === this.state.propsObjectName) {
-      name = expr.property;
+    } else if (expr.kind === "member" && !expr.computed && expr.object.kind === "identifier") {
+      if (expr.object.name === this.state.propsObjectName) {
+        name = expr.property;
+      } else {
+        name = expr.object.name;
+      }
     }
     return name !== null && this.state.nullishConsumedPropNames.has(name) && this.state.nillablePropNames.has(name) ? name : null;
   }
@@ -5302,9 +5434,6 @@ ${goFields.join(`
   renderPredicateCondition(pred, param, datumField) {
     return this.renderFilterExpr(pred, param, new Map, datumField ?? undefined);
   }
-  needsParens(expr) {
-    return expr.kind === "logical" || expr.kind === "unary" || expr.kind === "conditional";
-  }
   splitPreamble(rendered) {
     if (!rendered.includes("{{"))
       return null;
@@ -5717,7 +5846,8 @@ ${goFields.join(`
           return plain(this.rootFieldRef(expr.callee.name));
         }
         if (expr.callee.kind === "identifier" && (identifierPath(expr.callee) ?? expr.callee.name) === "isValidElement" && expr.args.length === 1) {
-          return this.renderConditionExpr(expr.args[0]);
+          const inner = this.renderConditionExpr(expr.args[0]);
+          return { preamble: inner.preamble, expr: `(bf_is_element ${wrapIfMultiToken(inner.expr)})` };
         }
         if (expr.callee.kind === "identifier" && !this.templatePrimitives[identifierPath(expr.callee) ?? ""]) {
           const path = identifierPath(expr.callee) ?? expr.callee.name;
@@ -5834,9 +5964,9 @@ ${goFields.join(`
         const leftResult = this.renderConditionExpr(expr.left);
         const rightResult = this.renderConditionExpr(expr.right);
         const preamble = leftResult.preamble + rightResult.preamble;
-        const wrapLeft = this.needsParens(expr.left) ? `(${leftResult.expr})` : leftResult.expr;
-        const wrapRight = this.needsParens(expr.right) ? `(${rightResult.expr})` : rightResult.expr;
-        const result = expr.op === "&&" ? `and ${wrapLeft} ${wrapRight}` : `or ${wrapLeft} ${wrapRight}`;
+        const wrapLeft = wrapIfMultiToken(leftResult.expr);
+        const wrapRight = wrapIfMultiToken(rightResult.expr);
+        const result = expr.op === "&&" ? `and ${wrapLeft} ${wrapRight}` : expr.op === "??" && this.nillablePropNameOf(expr.left) !== null ? `bf_nullish ${wrapLeft} ${wrapRight}` : `or ${wrapLeft} ${wrapRight}`;
         return { preamble, expr: result };
       }
       case "conditional": {
@@ -6249,7 +6379,11 @@ ${children}`;
       if (e.kind === "expr" && !isSupported(parseExpression4(e.expr)).supported)
         return null;
     }
-    return entries.map((e) => e.kind === "literal" ? `${this.escapeAttrText(e.cssKey)}:${this.escapeAttrText(e.value)}` : `${this.escapeAttrText(e.cssKey)}:{{${this.convertExpressionToGo(e.expr)}}}`).join(";");
+    const args = entries.flatMap((e) => [
+      JSON.stringify(e.cssKey),
+      e.kind === "literal" ? JSON.stringify(e.value) : wrapIfMultiToken(this.convertExpressionToGo(e.expr))
+    ]);
+    return `{{bf_style_object ${args.join(" ")}}}`;
   }
   renderAttributes(element) {
     const parts = [];

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;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEtD,eAAO,MAAM,eAAe,EAAE,eA+H7B,CAAA"}
+{"version":3,"file":"conformance-pins.d.ts","sourceRoot":"","sources":["../src/conformance-pins.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AAEH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEtD,eAAO,MAAM,eAAe,EAAE,eAqI7B,CAAA"}

package/dist/index.js

@@ -368,6 +368,8 @@ class CompileState {
   nillablePropNames = new Set;
   nullishConsumedPropNames = new Set;
   omittableAttrConsumedPropNames = new Set;
+  textConsumedPropNames = new Set;
+  presenceCheckedPropNames = new Set;
   stringValueNames = new Set;
   rootScopeNodes = new Set;
   memoBackedLoopSlice = new Map;
@@ -1111,15 +1113,28 @@ function parsedLiteralToGo(ctx, expr, typeInfo) {
 
 // src/adapter/value/value-lowering.ts
 var EMPTY_PROP_FALLBACK_VARS = new Map;
+function nillableAwarePropRef(ctx, propName, expectedType) {
+  const fieldRef = `in.${capitalizeFieldName(propName)}`;
+  const scalar = expectedType.kind === "primitive" ? expectedType : expectedType.kind === "union" && expectedType.unionTypes?.length === 2 ? expectedType.unionTypes.find((t) => t.primitive !== "undefined" && t.primitive !== "null") : undefined;
+  if (ctx.state.nillablePropNames.has(propName) && scalar?.kind === "primitive") {
+    const goType = scalar.primitive === "boolean" ? "bool" : scalar.primitive === "number" ? "float64" : scalar.primitive === "string" ? "string" : null;
+    if (goType) {
+      const zero = goType === "bool" ? "false" : goType === "string" ? '""' : "0";
+      return `func() ${goType} { if v, ok := ${fieldRef}.(${goType}); ok { return v }; return ${zero} }()`;
+    }
+  }
+  return fieldRef;
+}
 function convertInitialValue(ctx, value, typeInfo, propsParams, preParsed) {
+  const propRef = (propName2) => nillableAwarePropRef(ctx, propName2, typeInfo);
   if (/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(value)) {
     if (propsParams?.some((p) => p.name === value)) {
-      return `in.${capitalizeFieldName(value)}`;
+      return propRef(value);
     }
   }
   const propName = ctx.extractPropNameFromInitialValue(value, preParsed);
   if (propName && propsParams?.some((p) => p.name === propName)) {
-    return `in.${capitalizeFieldName(propName)}`;
+    return propRef(propName);
   }
   if (typeInfo.kind === "primitive") {
     if (typeInfo.primitive === "boolean") {
@@ -1186,19 +1201,20 @@ function objectLiteralToGoMap(ctx, expr) {
     return null;
   return `map[string]interface{}{${entries.join(", ")}}`;
 }
-function getSignalInitialValueAsGo(ctx, initialValue, propsParams, propFallbackVars = EMPTY_PROP_FALLBACK_VARS) {
+function getSignalInitialValueAsGo(ctx, initialValue, propsParams, propFallbackVars = EMPTY_PROP_FALLBACK_VARS, signalType) {
+  const propRef = (propName2) => signalType ? nillableAwarePropRef(ctx, propName2, signalType) : `in.${capitalizeFieldName(propName2)}`;
   if (propsParams.some((p) => p.name === initialValue)) {
     const hoisted = propFallbackVars.get(initialValue);
     if (hoisted)
       return hoisted.varName;
-    return `in.${capitalizeFieldName(initialValue)}`;
+    return propRef(initialValue);
   }
   const propName = ctx.extractPropNameFromInitialValue(initialValue);
   if (propName && propsParams.some((p) => p.name === propName)) {
     const hoisted = propFallbackVars.get(propName);
     if (hoisted)
       return hoisted.varName;
-    return `in.${capitalizeFieldName(propName)}`;
+    return propRef(propName);
   }
   if (/^-?\d+$/.test(initialValue)) {
     return initialValue;
@@ -1668,9 +1684,34 @@ var EMPTY_PROP_FALLBACK_VARS2 = new Map;
 function getterCallName(e) {
   return e.kind === "call" && e.callee.kind === "identifier" && e.args.length === 0 ? e.callee.name : null;
 }
+function isBooleanTypeInfo(t) {
+  if (t.kind === "primitive")
+    return t.primitive === "boolean";
+  if (t.kind === "union" && t.unionTypes?.length === 2) {
+    const scalar = t.unionTypes.find((u) => u.primitive !== "undefined" && u.primitive !== "null");
+    return scalar?.kind === "primitive" && scalar.primitive === "boolean";
+  }
+  return false;
+}
+function isBooleanTypedGetter(ctx, name, signals) {
+  const signal = signals.find((s) => s.getter === name);
+  if (signal)
+    return signal.type !== undefined && isBooleanTypeInfo(signal.type);
+  const memo = (ctx.state.currentMemos ?? []).find((m) => m.name === name);
+  return memo?.type !== undefined && isBooleanTypeInfo(memo.type);
+}
 function propsMemberName(e) {
   return e.kind === "member" && !e.computed && e.object.kind === "identifier" && e.object.name === "props" ? e.property : null;
 }
+function propNameForPropsBinding(ctx, e) {
+  const propsObject = ctx.state.propsObjectName;
+  if (e.kind === "member" && !e.computed && e.object.kind === "identifier" && e.object.name === propsObject) {
+    return e.property;
+  }
+  if (!propsObject && e.kind === "identifier")
+    return e.name;
+  return null;
+}
 function matchFilterArmMemo(ctx, body, signals, propsParams) {
   const cb = asCallbackMethodCall2(body);
   if (!cb || cb.method !== "filter")
@@ -1809,6 +1850,17 @@ function memoInitialFromParsedBody(ctx, body, signals, propsParams, propFallback
     if (propName)
       return propRef(propName);
   }
+  if (body.kind === "binary" && (body.op === "!==" || body.op === "!=" || body.op === "===" || body.op === "==")) {
+    const other = body.right.kind === "identifier" && body.right.name === "undefined" ? body.left : body.left.kind === "identifier" && body.left.name === "undefined" ? body.right : null;
+    const propName = other ? propNameForPropsBinding(ctx, other) : null;
+    if (propName) {
+      const param = propsParams.find((p) => p.name === propName);
+      if (param && ctx.state.nillablePropNames.has(propName)) {
+        const isNe = body.op === "!==" || body.op === "!=";
+        return `in.${capitalizeFieldName(propName)} ${isNe ? "!=" : "=="} nil`;
+      }
+    }
+  }
   if (body.kind === "conditional") {
     const condName = getterCallName(body.test);
     if (condName) {
@@ -1843,6 +1895,18 @@ function memoInitialFromParsedBody(ctx, body, signals, propsParams, propFallback
         }
       }
     }
+    if (condName) {
+      const tName = getterCallName(body.consequent);
+      const fName = getterCallName(body.alternate);
+      if (tName && fName && isBooleanTypedGetter(ctx, tName, signals) && isBooleanTypedGetter(ctx, fName, signals)) {
+        const condGo = resolveGetterValueAsGo(ctx, condName, signals, propsParams, propFallbackVars, resolving);
+        const tGo = resolveGetterValueAsGo(ctx, tName, signals, propsParams, propFallbackVars, resolving);
+        const fGo = resolveGetterValueAsGo(ctx, fName, signals, propsParams, propFallbackVars, resolving);
+        if (condGo !== null && tGo !== null && fGo !== null) {
+          return `func() bool { if ${condGo} { return ${tGo} }; return ${fGo} }()`;
+        }
+      }
+    }
   }
   if (body.kind === "binary" && ["*", "+", "-", "/"].includes(body.op) && body.right.kind === "literal" && body.right.literalType === "number" && typeof body.right.value === "number" && Number.isInteger(body.right.value) && body.right.value >= 0) {
     const operator = body.op;
@@ -1931,7 +1995,7 @@ function computeMemoInitialValueOrNull(ctx, memo, signals, propsParams, propFall
 function resolveGetterValueAsGo(ctx, name, signals, propsParams, propFallbackVars, resolving = new Set) {
   const signal = signals.find((s) => s.getter === name);
   if (signal) {
-    return getSignalInitialValueAsGo(ctx, signal.initialValue, propsParams, propFallbackVars);
+    return getSignalInitialValueAsGo(ctx, signal.initialValue, propsParams, propFallbackVars, signal.type);
   }
   const memo = (ctx.state.currentMemos ?? []).find((m) => m.name === name);
   if (memo) {
@@ -2333,8 +2397,10 @@ function collectNullishConsumedPropNames(ctx, ir) {
   const propNameOfLeft = (left) => {
     if (left.kind === "identifier")
       return left.name;
-    if (left.kind === "member" && !left.computed && left.object.kind === "identifier" && left.object.name === propsObject) {
-      return left.property;
+    if (left.kind === "member" && !left.computed && left.object.kind === "identifier") {
+      if (left.object.name === propsObject)
+        return left.property;
+      return left.object.name;
     }
     return null;
   };
@@ -2405,12 +2471,60 @@ function collectOmittableAttrConsumedPropNames(ctx, ir) {
   walk(ir.root);
   return names;
 }
+function collectTextConsumedPropNames(ctx, ir) {
+  const names = new Set;
+  const optionalParams = new Set(ir.metadata.propsParams.filter((p) => p.optional && p.defaultValue == null && p.type.kind === "primitive").map((p) => p.name));
+  if (optionalParams.size === 0)
+    return names;
+  const propsObject = ctx.state.propsObjectName;
+  const walk = (node) => {
+    if (!node || typeof node !== "object")
+      return;
+    if (Array.isArray(node)) {
+      for (const item of node)
+        walk(item);
+      return;
+    }
+    const rec = node;
+    if (rec.type === "expression") {
+      const bareId = String(rec.expr ?? "").trim();
+      const propName = propsObject && bareId.startsWith(`${propsObject}.`) ? bareId.slice(propsObject.length + 1) : bareId;
+      if (/^[A-Za-z_$][\w$]*$/.test(propName) && optionalParams.has(propName)) {
+        names.add(propName);
+      }
+    }
+    for (const value of Object.values(rec))
+      walk(value);
+  };
+  walk(ir.root);
+  return names;
+}
+function collectPresenceCheckedPropNames(ctx, ir) {
+  const names = new Set;
+  const optionalParams = new Set(ir.metadata.propsParams.filter((p) => p.optional && p.defaultValue == null && p.type.kind === "primitive").map((p) => p.name));
+  if (optionalParams.size === 0)
+    return names;
+  const propsObject = ctx.state.propsObjectName;
+  const isUndefinedCheck = (op) => op === "!==" || op === "!=" || op === "===" || op === "==";
+  for (const memo of ir.metadata.memos) {
+    const body = memo.parsed;
+    if (!body || body.kind !== "binary" || !isUndefinedCheck(body.op))
+      continue;
+    const other = body.right.kind === "identifier" && body.right.name === "undefined" ? body.left : body.left.kind === "identifier" && body.left.name === "undefined" ? body.right : null;
+    if (!other)
+      continue;
+    const propName = other.kind === "member" && !other.computed && other.object.kind === "identifier" && other.object.name === propsObject ? other.property : !propsObject && other.kind === "identifier" ? other.name : null;
+    if (propName && optionalParams.has(propName))
+      names.add(propName);
+  }
+  return names;
+}
 function resolvePropGoType(ctx, param, propTypeOverrides) {
   const base = propTypeOverrides.get(param.name) ?? typeInfoToGo(ctx, param.type, param.defaultValue);
   if (param.optional && ctx.state.localStructFields.has(base)) {
     return "map[string]interface{}";
   }
-  if (param.optional && param.type.kind === "primitive" && (ctx.state.nullishConsumedPropNames.has(param.name) || ctx.state.omittableAttrConsumedPropNames.has(param.name)) && NULLISH_SCALAR_GO_TYPES.has(base)) {
+  if (param.optional && param.type.kind === "primitive" && (ctx.state.nullishConsumedPropNames.has(param.name) || ctx.state.omittableAttrConsumedPropNames.has(param.name) || ctx.state.textConsumedPropNames.has(param.name) || ctx.state.presenceCheckedPropNames.has(param.name)) && NULLISH_SCALAR_GO_TYPES.has(base)) {
     return "interface{}";
   }
   return base;
@@ -2547,6 +2661,8 @@ class GoTemplateAdapter extends BaseAdapter {
     this.buildLocalTypeTables(ir, ir.metadata.componentName);
     this.state.nullishConsumedPropNames = collectNullishConsumedPropNames(this.emitCtx, ir);
     this.state.omittableAttrConsumedPropNames = collectOmittableAttrConsumedPropNames(this.emitCtx, ir);
+    this.state.textConsumedPropNames = collectTextConsumedPropNames(this.emitCtx, ir);
+    this.state.presenceCheckedPropNames = collectPresenceCheckedPropNames(this.emitCtx, ir);
     this.state.nillablePropNames = collectNillablePropNames(this.emitCtx, ir);
   }
   generate(ir, options) {
@@ -4229,10 +4345,22 @@ ${goFields.join(`
       }
       return goExpr;
     }
+    const finalExpr = this.textNillablePropNameOf(classify.parsed) !== null ? `bf_string ${wrapIfMultiToken(goExpr)}` : goExpr;
     if (expr.slotId) {
-      return `{{bfTextStart "${expr.slotId}"}}{{${goExpr}}}{{bfTextEnd}}`;
+      return `{{bfTextStart "${expr.slotId}"}}{{${finalExpr}}}{{bfTextEnd}}`;
     }
-    return `{{${goExpr}}}`;
+    return `{{${finalExpr}}}`;
+  }
+  textNillablePropNameOf(expr) {
+    if (!expr)
+      return null;
+    let name = null;
+    if (expr.kind === "identifier") {
+      name = expr.name;
+    } else if (expr.kind === "member" && !expr.computed && expr.object.kind === "identifier" && expr.object.name === this.state.propsObjectName) {
+      name = expr.property;
+    }
+    return name !== null && this.state.textConsumedPropNames.has(name) && this.state.nillablePropNames.has(name) ? name : null;
   }
   isTemplateFragment(go, kind) {
     return go.startsWith("{{") || kind === "template-literal";
@@ -4448,7 +4576,7 @@ ${goFields.join(`
     }
     const obj = emit(object);
     if (property === "length")
-      return `len ${obj}`;
+      return `bf_length ${wrapIfMultiToken(obj)}`;
     if (optional) {
       return `bf_get ${wrapIfMultiToken(obj)} ${JSON.stringify(goFieldNameForKey(property))}`;
     }
@@ -4526,8 +4654,12 @@ ${goFields.join(`
     let name = null;
     if (expr.kind === "identifier") {
       name = expr.name;
-    } else if (expr.kind === "member" && !expr.computed && expr.object.kind === "identifier" && expr.object.name === this.state.propsObjectName) {
-      name = expr.property;
+    } else if (expr.kind === "member" && !expr.computed && expr.object.kind === "identifier") {
+      if (expr.object.name === this.state.propsObjectName) {
+        name = expr.property;
+      } else {
+        name = expr.object.name;
+      }
     }
     return name !== null && this.state.nullishConsumedPropNames.has(name) && this.state.nillablePropNames.has(name) ? name : null;
   }
@@ -4962,9 +5094,6 @@ ${goFields.join(`
   renderPredicateCondition(pred, param, datumField) {
     return this.renderFilterExpr(pred, param, new Map, datumField ?? undefined);
   }
-  needsParens(expr) {
-    return expr.kind === "logical" || expr.kind === "unary" || expr.kind === "conditional";
-  }
   splitPreamble(rendered) {
     if (!rendered.includes("{{"))
       return null;
@@ -5377,7 +5506,8 @@ ${goFields.join(`
           return plain(this.rootFieldRef(expr.callee.name));
         }
         if (expr.callee.kind === "identifier" && (identifierPath(expr.callee) ?? expr.callee.name) === "isValidElement" && expr.args.length === 1) {
-          return this.renderConditionExpr(expr.args[0]);
+          const inner = this.renderConditionExpr(expr.args[0]);
+          return { preamble: inner.preamble, expr: `(bf_is_element ${wrapIfMultiToken(inner.expr)})` };
         }
         if (expr.callee.kind === "identifier" && !this.templatePrimitives[identifierPath(expr.callee) ?? ""]) {
           const path = identifierPath(expr.callee) ?? expr.callee.name;
@@ -5494,9 +5624,9 @@ ${goFields.join(`
         const leftResult = this.renderConditionExpr(expr.left);
         const rightResult = this.renderConditionExpr(expr.right);
         const preamble = leftResult.preamble + rightResult.preamble;
-        const wrapLeft = this.needsParens(expr.left) ? `(${leftResult.expr})` : leftResult.expr;
-        const wrapRight = this.needsParens(expr.right) ? `(${rightResult.expr})` : rightResult.expr;
-        const result = expr.op === "&&" ? `and ${wrapLeft} ${wrapRight}` : `or ${wrapLeft} ${wrapRight}`;
+        const wrapLeft = wrapIfMultiToken(leftResult.expr);
+        const wrapRight = wrapIfMultiToken(rightResult.expr);
+        const result = expr.op === "&&" ? `and ${wrapLeft} ${wrapRight}` : expr.op === "??" && this.nillablePropNameOf(expr.left) !== null ? `bf_nullish ${wrapLeft} ${wrapRight}` : `or ${wrapLeft} ${wrapRight}`;
         return { preamble, expr: result };
       }
       case "conditional": {
@@ -5909,7 +6039,11 @@ ${children}`;
       if (e.kind === "expr" && !isSupported(parseExpression4(e.expr)).supported)
         return null;
     }
-    return entries.map((e) => e.kind === "literal" ? `${this.escapeAttrText(e.cssKey)}:${this.escapeAttrText(e.value)}` : `${this.escapeAttrText(e.cssKey)}:{{${this.convertExpressionToGo(e.expr)}}}`).join(";");
+    const args = entries.flatMap((e) => [
+      JSON.stringify(e.cssKey),
+      e.kind === "literal" ? JSON.stringify(e.value) : wrapIfMultiToken(this.convertExpressionToGo(e.expr))
+    ]);
+    return `{{bf_style_object ${args.join(" ")}}}`;
   }
   renderAttributes(element) {
     const parts = [];
@@ -6032,7 +6166,8 @@ var conformancePins = {
   "filter-nested-find-predicate": [
     { code: "BF101", severity: "error", issue: "https://github.com/piconic-ai/barefootjs/issues/2038" }
   ],
-  "dangerous-inner-html-dynamic": [{ code: "BF101", severity: "error", issue: "https://github.com/piconic-ai/barefootjs/issues/2215" }]
+  "dangerous-inner-html-dynamic": [{ code: "BF101", severity: "error", issue: "https://github.com/piconic-ai/barefootjs/issues/2215" }],
+  "date-method-uncatalogued": [{ code: "BF021", severity: "error", issue: "https://github.com/piconic-ai/barefootjs/issues/2274" }]
 };
 // src/render-divergences.ts
 var renderDivergences = {};