@barefootjs/go-template 0.18.7 → 0.19.0

package/dist/build.js

@@ -364,7 +364,7 @@ var init_path = __esm(() => {
 // src/adapter/go-template-adapter.ts
 import {
   BaseAdapter,
-  isBooleanAttr,
+  isBooleanAttr as isBooleanAttr2,
   parseExpression as parseExpression4,
   stringifyParsedExpr as stringifyParsedExpr2,
   parseStyleObjectEntries,
@@ -706,6 +706,8 @@ class CompileState {
   hoistedMemoLocals = new Map;
   loweringMatchers = [];
   nillablePropNames = new Set;
+  nullishConsumedPropNames = new Set;
+  omittableAttrConsumedPropNames = new Set;
   stringValueNames = new Set;
   rootScopeNodes = new Set;
   memoBackedLoopSlice = new Map;
@@ -1455,7 +1457,7 @@ function convertInitialValue(ctx, value, typeInfo, propsParams, preParsed) {
       return `in.${capitalizeFieldName(value)}`;
     }
   }
-  const propName = ctx.extractPropNameFromInitialValue(value);
+  const propName = ctx.extractPropNameFromInitialValue(value, preParsed);
   if (propName && propsParams?.some((p) => p.name === propName)) {
     return `in.${capitalizeFieldName(propName)}`;
   }
@@ -2599,11 +2601,12 @@ function recordIndexAccessToGoMap(ctx, val, ir) {
 }
 
 // src/adapter/props/prop-types.ts
+import { isBooleanAttr } from "@barefootjs/jsx";
 function buildPropTypeOverrides(ctx, ir) {
   const overrides = new Map;
   for (const signal of ir.metadata.signals) {
     const propNames = [signal.initialValue];
-    const extracted = ctx.extractPropNameFromInitialValue(signal.initialValue);
+    const extracted = ctx.extractPropNameFromInitialValue(signal.initialValue, signal.parsed);
     if (extracted)
       propNames.push(extracted);
     for (const propName of propNames) {
@@ -2660,11 +2663,96 @@ function collectToFixedPropNames(root) {
   walk(root);
   return names;
 }
+var NULLISH_SCALAR_GO_TYPES = new Set(["string", "int", "float64", "bool"]);
+function collectNullishConsumedPropNames(ctx, ir) {
+  const names = new Set;
+  const optionalParams = new Set(ir.metadata.propsParams.filter((p) => p.optional && p.defaultValue == null).map((p) => p.name));
+  if (optionalParams.size === 0)
+    return names;
+  const propsObject = ctx.state.propsObjectName;
+  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;
+    }
+    return null;
+  };
+  const isZeroEquivalentLiteral = (right) => right.kind === "literal" && (right.value === "" || right.value === false || right.value === null || right.literalType === "number" && Number(right.value) === 0);
+  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.kind === "logical" && rec.op === "??" && rec.left && rec.right) {
+      const propName = propNameOfLeft(rec.left);
+      if (propName && optionalParams.has(propName) && !isZeroEquivalentLiteral(rec.right)) {
+        names.add(propName);
+      }
+    }
+    for (const value of Object.values(rec))
+      walk(value);
+  };
+  walk(ir.root);
+  for (const signal of ir.metadata.signals) {
+    const match = ctx.extractPropFallback(signal.initialValue, signal.parsed);
+    if (!match || !optionalParams.has(match.propName))
+      continue;
+    const f = match.goFallback;
+    if (f === '""' || f === "false" || f === "nil" || Number(f) === 0)
+      continue;
+    names.add(match.propName);
+  }
+  return names;
+}
+function collectOmittableAttrConsumedPropNames(ctx, ir) {
+  const names = new Set;
+  const optionalParams = new Set(ir.metadata.propsParams.filter((p) => p.optional && p.defaultValue == null).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 === "element" && Array.isArray(rec.attrs)) {
+      for (const attr of rec.attrs) {
+        if (attr.name === "class" || attr.name === "className" || attr.name === "style")
+          continue;
+        if (isBooleanAttr(attr.name))
+          continue;
+        if (attr.value?.kind !== "expression" || attr.value.presenceOrUndefined)
+          continue;
+        const bareId = String(attr.value.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 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)) {
+    return "interface{}";
+  }
   return base;
 }
 function collectNillablePropNames(ctx, ir) {
@@ -2743,8 +2831,8 @@ class GoTemplateAdapter extends BaseAdapter {
     state: this.state,
     convertExpressionToGo: (jsExpr, out, preParsed) => this.convertExpressionToGo(jsExpr, out, preParsed),
     convertConditionToGo: (jsCondition, preParsed) => this.convertConditionToGo(jsCondition, preParsed),
-    extractPropNameFromInitialValue: (initialValue) => this.extractPropNameFromInitialValue(initialValue),
-    extractPropFallback: (initialValue) => this.extractPropFallback(initialValue),
+    extractPropNameFromInitialValue: (initialValue, preParsed) => this.extractPropNameFromInitialValue(initialValue, preParsed),
+    extractPropFallback: (initialValue, preParsed) => this.extractPropFallback(initialValue, preParsed),
     resolveModuleStringConst: (name) => this.resolveModuleStringConst(name)
   };
   get errors() {
@@ -2796,6 +2884,10 @@ class GoTemplateAdapter extends BaseAdapter {
     }
     this.state.loweringMatchers = prepareLoweringMatchers(ir.metadata);
     augmentInheritedPropAccesses(ir);
+    this.buildLocalTypeTables(ir, ir.metadata.componentName);
+    this.state.nullishConsumedPropNames = collectNullishConsumedPropNames(this.emitCtx, ir);
+    this.state.omittableAttrConsumedPropNames = collectOmittableAttrConsumedPropNames(this.emitCtx, ir);
+    this.state.nillablePropNames = collectNillablePropNames(this.emitCtx, ir);
   }
   generate(ir, options) {
     this.state.componentName = ir.metadata.componentName;
@@ -2804,7 +2896,6 @@ class GoTemplateAdapter extends BaseAdapter {
     this.state.templateVarCounter = 0;
     this.state.pendingChildrenDefines = [];
     this.primeCompileState(ir);
-    this.state.nillablePropNames = collectNillablePropNames(this.emitCtx, ir);
     this.state.stringValueNames = collectStringValueNames(ir);
     if (!options?.siblingTemplatesRegistered) {
       this.checkImportedLoopChildComponents(ir);
@@ -3323,10 +3414,18 @@ ${goFields.join(`
     this.emitStaticBodyWrappers(lines, ir, componentName, staticWithBody, emittedWrapperVars);
     const propFallbackVars = this.collectPropFallbackVars(ir);
     for (const [, info] of propFallbackVars) {
-      lines.push(`	${info.varName} := in.${info.fieldName}`);
-      lines.push(`	if ${info.varName} == ${info.zeroLiteral} {`);
-      lines.push(`		${info.varName} = ${info.goFallback}`);
-      lines.push(`	}`);
+      if (info.assertType) {
+        const deref = info.assertType === "int" ? `bf.ToInt(in.${info.fieldName})` : info.assertType === "float64" ? `bf.ToFloat64(in.${info.fieldName})` : `in.${info.fieldName}.(${info.assertType})`;
+        lines.push(`	var ${info.varName} ${info.assertType} = ${info.goFallback}`);
+        lines.push(`	if in.${info.fieldName} != nil {`);
+        lines.push(`		${info.varName} = ${deref}`);
+        lines.push(`	}`);
+      } else {
+        lines.push(`	${info.varName} := in.${info.fieldName}`);
+        lines.push(`	if ${info.varName} == ${info.zeroLiteral} {`);
+        lines.push(`		${info.varName} = ${info.goFallback}`);
+        lines.push(`	}`);
+      }
     }
     if (propFallbackVars.size > 0)
       lines.push("");
@@ -3406,7 +3505,7 @@ ${goFields.join(`
       const fieldName = capitalizeFieldName(signal.getter);
       if (propFieldNames.has(fieldName))
         continue;
-      const fallbackMatch = this.extractPropFallback(signal.initialValue);
+      const fallbackMatch = this.extractPropFallback(signal.initialValue, signal.parsed);
       const hoisted = fallbackMatch ? propFallbackVars.get(fallbackMatch.propName) : undefined;
       if (hoisted) {
         lines.push(`		${fieldName}: ${hoisted.varName},`);
@@ -4252,8 +4351,9 @@ ${goFields.join(`
     for (const nested of findNestedComponents(ir.root)) {
       localTaken.add(`${nested.name.charAt(0).toLowerCase()}${nested.name.slice(1)}s`);
     }
+    const propTypeOverrides = buildPropTypeOverrides(this.emitCtx, ir);
     for (const signal of ir.metadata.signals) {
-      const match = this.extractPropFallback(signal.initialValue);
+      const match = this.extractPropFallback(signal.initialValue, signal.parsed);
       if (!match)
         continue;
       if (result.has(match.propName))
@@ -4264,6 +4364,8 @@ ${goFields.join(`
       if (goPropDefault(param.defaultValue) !== null)
         continue;
       const fieldName = capitalizeFieldName(match.propName);
+      const concreteType = propTypeOverrides.get(param.name) ?? typeInfoToGo(this.emitCtx, param.type, param.defaultValue);
+      const nullishLowered = NULLISH_SCALAR_GO_TYPES.has(concreteType) && resolvePropGoType(this.emitCtx, param, propTypeOverrides) === "interface{}";
       let zeroLiteral;
       if (match.goFallback === "true" || match.goFallback === "false") {
         zeroLiteral = "false";
@@ -4274,20 +4376,31 @@ ${goFields.join(`
       } else {
         continue;
       }
-      if (match.goFallback === zeroLiteral)
-        continue;
-      if (zeroLiteral === "0" && Number(match.goFallback) === 0)
-        continue;
+      if (!nullishLowered) {
+        if (match.goFallback === zeroLiteral)
+          continue;
+        if (zeroLiteral === "0" && Number(match.goFallback) === 0)
+          continue;
+      }
       let varName = match.propName;
       while (localTaken.has(varName) || GO_KEYWORDS.has(varName)) {
         varName += "_";
       }
       localTaken.add(varName);
-      result.set(match.propName, { varName, fieldName, goFallback: match.goFallback, zeroLiteral });
+      result.set(match.propName, {
+        varName,
+        fieldName,
+        goFallback: match.goFallback,
+        zeroLiteral,
+        ...nullishLowered ? { assertType: concreteType } : {}
+      });
     }
     return result;
   }
-  extractPropFallback(initialValue) {
+  extractPropFallback(initialValue, preParsed) {
+    const structural = preParsed ? this.extractPropFallbackFromParsed(preParsed) : null;
+    if (structural)
+      return structural;
     if (!this.state.propsObjectName)
       return null;
     const trimmed = initialValue.trim();
@@ -4301,9 +4414,38 @@ ${goFields.join(`
       return null;
     return { propName: m[1], goFallback };
   }
-  extractPropNameFromInitialValue(initialValue) {
-    if (!this.state.propsObjectName)
+  extractPropFallbackFromParsed(preParsed) {
+    if (preParsed.kind !== "logical" || preParsed.op !== "??")
+      return null;
+    const left = preParsed.left;
+    const propName = left.kind === "identifier" && !this.state.propsObjectName ? left.name : left.kind === "member" && !left.computed && left.object.kind === "identifier" && left.object.name === this.state.propsObjectName ? left.property : null;
+    if (!propName)
+      return null;
+    let right = preParsed.right;
+    let negate = "";
+    if (right.kind === "unary" && right.op === "-") {
+      negate = "-";
+      right = right.argument;
+    }
+    if (right.kind !== "literal")
+      return null;
+    if (negate && right.literalType !== "number")
+      return null;
+    if (right.literalType === "string") {
+      return { propName, goFallback: JSON.stringify(right.value) };
+    }
+    const goFallback = goPropDefault(negate + (right.raw ?? String(right.value)));
+    if (goFallback === null)
       return null;
+    return { propName, goFallback };
+  }
+  extractPropNameFromInitialValue(initialValue, preParsed) {
+    if (!this.state.propsObjectName) {
+      if (preParsed?.kind === "logical" && (preParsed.op === "??" || preParsed.op === "||") && preParsed.left.kind === "identifier") {
+        return preParsed.left.name;
+      }
+      return null;
+    }
     const trimmed = initialValue.trim();
     const name = this.state.propsObjectName;
     const direct = new RegExp(`^${name}\\.(\\w+)(?:\\s*(?:\\?\\?|\\|\\|)\\s*.+)?$`);
@@ -4715,8 +4857,20 @@ ${goFields.join(`
     const wrapRight = wrapIfMultiToken(emit(right));
     if (op === "&&")
       return `and ${wrapLeft} ${wrapRight}`;
+    if (op === "??" && this.nillablePropNameOf(left) !== null) {
+      return `bf_nullish ${wrapLeft} ${wrapRight}`;
+    }
     return `or ${wrapLeft} ${wrapRight}`;
   }
+  nillablePropNameOf(expr) {
+    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.nullishConsumedPropNames.has(name) && this.state.nillablePropNames.has(name) ? name : null;
+  }
   conditional(test, consequent, alternate, emit) {
     const t = emit(test);
     const c = this.renderConditionalBranch(consequent);
@@ -6022,7 +6176,7 @@ ${children}`;
         if (css !== null)
           return `style="${css}"`;
       }
-      if (isBooleanAttr(name) || value.presenceOrUndefined) {
+      if (isBooleanAttr2(name) || value.presenceOrUndefined) {
         const { condition: goCond, preamble } = this.convertConditionToGo(value.expr, value.parsed);
         const body = name.startsWith("aria-") ? `${name}="true"` : name;
         return `${preamble}{{if ${goCond}}}${body}{{end}}`;

package/dist/index.js

@@ -24,7 +24,7 @@ var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require
 // src/adapter/go-template-adapter.ts
 import {
   BaseAdapter,
-  isBooleanAttr,
+  isBooleanAttr as isBooleanAttr2,
   parseExpression as parseExpression4,
   stringifyParsedExpr as stringifyParsedExpr2,
   parseStyleObjectEntries,
@@ -366,6 +366,8 @@ class CompileState {
   hoistedMemoLocals = new Map;
   loweringMatchers = [];
   nillablePropNames = new Set;
+  nullishConsumedPropNames = new Set;
+  omittableAttrConsumedPropNames = new Set;
   stringValueNames = new Set;
   rootScopeNodes = new Set;
   memoBackedLoopSlice = new Map;
@@ -1115,7 +1117,7 @@ function convertInitialValue(ctx, value, typeInfo, propsParams, preParsed) {
       return `in.${capitalizeFieldName(value)}`;
     }
   }
-  const propName = ctx.extractPropNameFromInitialValue(value);
+  const propName = ctx.extractPropNameFromInitialValue(value, preParsed);
   if (propName && propsParams?.some((p) => p.name === propName)) {
     return `in.${capitalizeFieldName(propName)}`;
   }
@@ -2259,11 +2261,12 @@ function recordIndexAccessToGoMap(ctx, val, ir) {
 }
 
 // src/adapter/props/prop-types.ts
+import { isBooleanAttr } from "@barefootjs/jsx";
 function buildPropTypeOverrides(ctx, ir) {
   const overrides = new Map;
   for (const signal of ir.metadata.signals) {
     const propNames = [signal.initialValue];
-    const extracted = ctx.extractPropNameFromInitialValue(signal.initialValue);
+    const extracted = ctx.extractPropNameFromInitialValue(signal.initialValue, signal.parsed);
     if (extracted)
       propNames.push(extracted);
     for (const propName of propNames) {
@@ -2320,11 +2323,96 @@ function collectToFixedPropNames(root) {
   walk(root);
   return names;
 }
+var NULLISH_SCALAR_GO_TYPES = new Set(["string", "int", "float64", "bool"]);
+function collectNullishConsumedPropNames(ctx, ir) {
+  const names = new Set;
+  const optionalParams = new Set(ir.metadata.propsParams.filter((p) => p.optional && p.defaultValue == null).map((p) => p.name));
+  if (optionalParams.size === 0)
+    return names;
+  const propsObject = ctx.state.propsObjectName;
+  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;
+    }
+    return null;
+  };
+  const isZeroEquivalentLiteral = (right) => right.kind === "literal" && (right.value === "" || right.value === false || right.value === null || right.literalType === "number" && Number(right.value) === 0);
+  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.kind === "logical" && rec.op === "??" && rec.left && rec.right) {
+      const propName = propNameOfLeft(rec.left);
+      if (propName && optionalParams.has(propName) && !isZeroEquivalentLiteral(rec.right)) {
+        names.add(propName);
+      }
+    }
+    for (const value of Object.values(rec))
+      walk(value);
+  };
+  walk(ir.root);
+  for (const signal of ir.metadata.signals) {
+    const match = ctx.extractPropFallback(signal.initialValue, signal.parsed);
+    if (!match || !optionalParams.has(match.propName))
+      continue;
+    const f = match.goFallback;
+    if (f === '""' || f === "false" || f === "nil" || Number(f) === 0)
+      continue;
+    names.add(match.propName);
+  }
+  return names;
+}
+function collectOmittableAttrConsumedPropNames(ctx, ir) {
+  const names = new Set;
+  const optionalParams = new Set(ir.metadata.propsParams.filter((p) => p.optional && p.defaultValue == null).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 === "element" && Array.isArray(rec.attrs)) {
+      for (const attr of rec.attrs) {
+        if (attr.name === "class" || attr.name === "className" || attr.name === "style")
+          continue;
+        if (isBooleanAttr(attr.name))
+          continue;
+        if (attr.value?.kind !== "expression" || attr.value.presenceOrUndefined)
+          continue;
+        const bareId = String(attr.value.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 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)) {
+    return "interface{}";
+  }
   return base;
 }
 function collectNillablePropNames(ctx, ir) {
@@ -2403,8 +2491,8 @@ class GoTemplateAdapter extends BaseAdapter {
     state: this.state,
     convertExpressionToGo: (jsExpr, out, preParsed) => this.convertExpressionToGo(jsExpr, out, preParsed),
     convertConditionToGo: (jsCondition, preParsed) => this.convertConditionToGo(jsCondition, preParsed),
-    extractPropNameFromInitialValue: (initialValue) => this.extractPropNameFromInitialValue(initialValue),
-    extractPropFallback: (initialValue) => this.extractPropFallback(initialValue),
+    extractPropNameFromInitialValue: (initialValue, preParsed) => this.extractPropNameFromInitialValue(initialValue, preParsed),
+    extractPropFallback: (initialValue, preParsed) => this.extractPropFallback(initialValue, preParsed),
     resolveModuleStringConst: (name) => this.resolveModuleStringConst(name)
   };
   get errors() {
@@ -2456,6 +2544,10 @@ class GoTemplateAdapter extends BaseAdapter {
     }
     this.state.loweringMatchers = prepareLoweringMatchers(ir.metadata);
     augmentInheritedPropAccesses(ir);
+    this.buildLocalTypeTables(ir, ir.metadata.componentName);
+    this.state.nullishConsumedPropNames = collectNullishConsumedPropNames(this.emitCtx, ir);
+    this.state.omittableAttrConsumedPropNames = collectOmittableAttrConsumedPropNames(this.emitCtx, ir);
+    this.state.nillablePropNames = collectNillablePropNames(this.emitCtx, ir);
   }
   generate(ir, options) {
     this.state.componentName = ir.metadata.componentName;
@@ -2464,7 +2556,6 @@ class GoTemplateAdapter extends BaseAdapter {
     this.state.templateVarCounter = 0;
     this.state.pendingChildrenDefines = [];
     this.primeCompileState(ir);
-    this.state.nillablePropNames = collectNillablePropNames(this.emitCtx, ir);
     this.state.stringValueNames = collectStringValueNames(ir);
     if (!options?.siblingTemplatesRegistered) {
       this.checkImportedLoopChildComponents(ir);
@@ -2983,10 +3074,18 @@ ${goFields.join(`
     this.emitStaticBodyWrappers(lines, ir, componentName, staticWithBody, emittedWrapperVars);
     const propFallbackVars = this.collectPropFallbackVars(ir);
     for (const [, info] of propFallbackVars) {
-      lines.push(`	${info.varName} := in.${info.fieldName}`);
-      lines.push(`	if ${info.varName} == ${info.zeroLiteral} {`);
-      lines.push(`		${info.varName} = ${info.goFallback}`);
-      lines.push(`	}`);
+      if (info.assertType) {
+        const deref = info.assertType === "int" ? `bf.ToInt(in.${info.fieldName})` : info.assertType === "float64" ? `bf.ToFloat64(in.${info.fieldName})` : `in.${info.fieldName}.(${info.assertType})`;
+        lines.push(`	var ${info.varName} ${info.assertType} = ${info.goFallback}`);
+        lines.push(`	if in.${info.fieldName} != nil {`);
+        lines.push(`		${info.varName} = ${deref}`);
+        lines.push(`	}`);
+      } else {
+        lines.push(`	${info.varName} := in.${info.fieldName}`);
+        lines.push(`	if ${info.varName} == ${info.zeroLiteral} {`);
+        lines.push(`		${info.varName} = ${info.goFallback}`);
+        lines.push(`	}`);
+      }
     }
     if (propFallbackVars.size > 0)
       lines.push("");
@@ -3066,7 +3165,7 @@ ${goFields.join(`
       const fieldName = capitalizeFieldName(signal.getter);
       if (propFieldNames.has(fieldName))
         continue;
-      const fallbackMatch = this.extractPropFallback(signal.initialValue);
+      const fallbackMatch = this.extractPropFallback(signal.initialValue, signal.parsed);
       const hoisted = fallbackMatch ? propFallbackVars.get(fallbackMatch.propName) : undefined;
       if (hoisted) {
         lines.push(`		${fieldName}: ${hoisted.varName},`);
@@ -3912,8 +4011,9 @@ ${goFields.join(`
     for (const nested of findNestedComponents(ir.root)) {
       localTaken.add(`${nested.name.charAt(0).toLowerCase()}${nested.name.slice(1)}s`);
     }
+    const propTypeOverrides = buildPropTypeOverrides(this.emitCtx, ir);
     for (const signal of ir.metadata.signals) {
-      const match = this.extractPropFallback(signal.initialValue);
+      const match = this.extractPropFallback(signal.initialValue, signal.parsed);
       if (!match)
         continue;
       if (result.has(match.propName))
@@ -3924,6 +4024,8 @@ ${goFields.join(`
       if (goPropDefault(param.defaultValue) !== null)
         continue;
       const fieldName = capitalizeFieldName(match.propName);
+      const concreteType = propTypeOverrides.get(param.name) ?? typeInfoToGo(this.emitCtx, param.type, param.defaultValue);
+      const nullishLowered = NULLISH_SCALAR_GO_TYPES.has(concreteType) && resolvePropGoType(this.emitCtx, param, propTypeOverrides) === "interface{}";
       let zeroLiteral;
       if (match.goFallback === "true" || match.goFallback === "false") {
         zeroLiteral = "false";
@@ -3934,20 +4036,31 @@ ${goFields.join(`
       } else {
         continue;
       }
-      if (match.goFallback === zeroLiteral)
-        continue;
-      if (zeroLiteral === "0" && Number(match.goFallback) === 0)
-        continue;
+      if (!nullishLowered) {
+        if (match.goFallback === zeroLiteral)
+          continue;
+        if (zeroLiteral === "0" && Number(match.goFallback) === 0)
+          continue;
+      }
       let varName = match.propName;
       while (localTaken.has(varName) || GO_KEYWORDS.has(varName)) {
         varName += "_";
       }
       localTaken.add(varName);
-      result.set(match.propName, { varName, fieldName, goFallback: match.goFallback, zeroLiteral });
+      result.set(match.propName, {
+        varName,
+        fieldName,
+        goFallback: match.goFallback,
+        zeroLiteral,
+        ...nullishLowered ? { assertType: concreteType } : {}
+      });
     }
     return result;
   }
-  extractPropFallback(initialValue) {
+  extractPropFallback(initialValue, preParsed) {
+    const structural = preParsed ? this.extractPropFallbackFromParsed(preParsed) : null;
+    if (structural)
+      return structural;
     if (!this.state.propsObjectName)
       return null;
     const trimmed = initialValue.trim();
@@ -3961,9 +4074,38 @@ ${goFields.join(`
       return null;
     return { propName: m[1], goFallback };
   }
-  extractPropNameFromInitialValue(initialValue) {
-    if (!this.state.propsObjectName)
+  extractPropFallbackFromParsed(preParsed) {
+    if (preParsed.kind !== "logical" || preParsed.op !== "??")
+      return null;
+    const left = preParsed.left;
+    const propName = left.kind === "identifier" && !this.state.propsObjectName ? left.name : left.kind === "member" && !left.computed && left.object.kind === "identifier" && left.object.name === this.state.propsObjectName ? left.property : null;
+    if (!propName)
+      return null;
+    let right = preParsed.right;
+    let negate = "";
+    if (right.kind === "unary" && right.op === "-") {
+      negate = "-";
+      right = right.argument;
+    }
+    if (right.kind !== "literal")
+      return null;
+    if (negate && right.literalType !== "number")
+      return null;
+    if (right.literalType === "string") {
+      return { propName, goFallback: JSON.stringify(right.value) };
+    }
+    const goFallback = goPropDefault(negate + (right.raw ?? String(right.value)));
+    if (goFallback === null)
       return null;
+    return { propName, goFallback };
+  }
+  extractPropNameFromInitialValue(initialValue, preParsed) {
+    if (!this.state.propsObjectName) {
+      if (preParsed?.kind === "logical" && (preParsed.op === "??" || preParsed.op === "||") && preParsed.left.kind === "identifier") {
+        return preParsed.left.name;
+      }
+      return null;
+    }
     const trimmed = initialValue.trim();
     const name = this.state.propsObjectName;
     const direct = new RegExp(`^${name}\\.(\\w+)(?:\\s*(?:\\?\\?|\\|\\|)\\s*.+)?$`);
@@ -4375,8 +4517,20 @@ ${goFields.join(`
     const wrapRight = wrapIfMultiToken(emit(right));
     if (op === "&&")
       return `and ${wrapLeft} ${wrapRight}`;
+    if (op === "??" && this.nillablePropNameOf(left) !== null) {
+      return `bf_nullish ${wrapLeft} ${wrapRight}`;
+    }
     return `or ${wrapLeft} ${wrapRight}`;
   }
+  nillablePropNameOf(expr) {
+    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.nullishConsumedPropNames.has(name) && this.state.nillablePropNames.has(name) ? name : null;
+  }
   conditional(test, consequent, alternate, emit) {
     const t = emit(test);
     const c = this.renderConditionalBranch(consequent);
@@ -5682,7 +5836,7 @@ ${children}`;
         if (css !== null)
           return `style="${css}"`;
       }
-      if (isBooleanAttr(name) || value.presenceOrUndefined) {
+      if (isBooleanAttr2(name) || value.presenceOrUndefined) {
         const { condition: goCond, preamble } = this.convertConditionToGo(value.expr, value.parsed);
         const body = name.startsWith("aria-") ? `${name}="true"` : name;
         return `${preamble}{{if ${goCond}}}${body}{{end}}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@barefootjs/go-template",
-  "version": "0.18.7",
+  "version": "0.19.0",
   "description": "Go html/template adapter for BarefootJS - generates Go template files from IR",
   "type": "module",
   "main": "./dist/index.js",
@@ -49,7 +49,7 @@
     "directory": "packages/adapter-go-template"
   },
   "dependencies": {
-    "@barefootjs/shared": "0.18.7"
+    "@barefootjs/shared": "0.19.0"
   },
   "peerDependencies": {
     "@barefootjs/jsx": ">=0.2.0",
@@ -57,6 +57,6 @@
   },
   "devDependencies": {
     "@barefootjs/adapter-tests": "0.1.0",
-    "@barefootjs/jsx": "0.18.7"
+    "@barefootjs/jsx": "0.19.0"
   }
 }