terminal-pilot 0.0.19 → 0.0.20

package/dist/commands/index.js

@@ -2899,6 +2899,7 @@ var graphemeSegmenter = new Intl.Segmenter(void 0, { granularity: "grapheme" });
 var graphemeSegmenter2 = new Intl.Segmenter(void 0, { granularity: "grapheme" });
 
 // ../design-system/src/components/template.ts
+var MAX_PARTIAL_DEPTH = 100;
 var HTML_ESCAPE = {
   "&": "&",
   "<": "&lt;",
@@ -2910,14 +2911,27 @@ var HTML_ESCAPE = {
   "=": "&#x3D;"
 };
 function renderTemplate(template, view, options = {}) {
-  const prepared = options.yield === void 0 ? template : template.split("{{yield}}").join(options.yield);
+  const prepared = options.yield === void 0 ? template : resolveTemplatePartials(template, options.partials ?? {}).split("{{yield}}").join(options.yield);
   const tokens = parseTemplate(prepared);
-  const escape = options.escape === "none" ? String : escapeHtml;
-  const preserveMissing = options.yield !== void 0 && options.escape === "none";
-  return renderTokens(tokens, { view }, prepared, escape, preserveMissing);
+  validatePartialReferences(tokens, options.partials ?? {}, []);
+  if (options.validate === true) {
+    const expanded = resolveTemplatePartials(prepared, options.partials ?? {});
+    validateVariables(parseTemplate(expanded), { view });
+  }
+  const state = {
+    escape: options.escape === "none" ? String : escapeHtml,
+    partials: options.partials ?? {},
+    partialStack: [],
+    preserveMissing: options.yield !== void 0 && options.escape === "none",
+    validate: options.validate === true
+  };
+  return renderTokens(tokens, { view }, prepared, state);
+}
+function resolveTemplatePartials(template, partials) {
+  return expandTemplatePartials(template, partials, []);
 }
-function renderTemplateInContext(template, context, escape, preserveMissing) {
-  return renderTokens(parseTemplate(template), context, template, escape, preserveMissing);
+function renderTemplateInContext(template, context, state) {
+  return renderTokens(parseTemplate(template), context, template, state);
 }
 function parseTemplate(template) {
   const root = [];
@@ -2940,9 +2954,6 @@ function parseTemplate(template) {
       index = standalone?.nextIndex ?? parsed.end;
       continue;
     }
-    if (parsed.kind === "partial") {
-      throw new Error(`Partials are not supported: "${parsed.name}"`);
-    }
     if (parsed.kind === "delimiter") {
       throw new Error("Custom delimiters are not supported");
     }
@@ -2960,6 +2971,15 @@ function parseTemplate(template) {
       index = standalone?.nextIndex ?? parsed.end;
       continue;
     }
+    if (parsed.kind === "partial") {
+      tokens.push({
+        type: "partial",
+        name: parsed.name,
+        indent: standalone === void 0 ? "" : template.slice(standalone.lineStart, open)
+      });
+      index = standalone?.nextIndex ?? parsed.end;
+      continue;
+    }
     if (parsed.kind === "close") {
       const frame2 = stack.pop();
       if (frame2 === void 0) {
@@ -3030,7 +3050,7 @@ function getStandalone(template, tagStart, tagEnd, kind) {
   }
   return void 0;
 }
-function renderTokens(tokens, context, template, escape, preserveMissing) {
+function renderTokens(tokens, context, template, state) {
   let output = "";
   for (const token of tokens) {
     switch (token.type) {
@@ -3039,32 +3059,62 @@ function renderTokens(tokens, context, template, escape, preserveMissing) {
         continue;
       case "name":
       case "unescaped": {
-        const value = lookup2(context, token.name);
-        if (value == null) {
-          if (preserveMissing) {
+        const result = lookup2(context, token.name);
+        if (!result.hit || result.value == null) {
+          if (state.validate) {
+            throw new Error(`Template variable "${token.name}" not found.`);
+          }
+          if (state.preserveMissing) {
             output += token.raw;
           }
           continue;
         }
-        const rendered = String(value);
-        output += token.type === "name" ? escape(rendered) : rendered;
+        const rendered = String(result.value);
+        output += token.type === "name" ? state.escape(rendered) : rendered;
+        continue;
+      }
+      case "partial": {
+        if (!Object.hasOwn(state.partials, token.name)) {
+          throw new Error(`Partial "${token.name}" not found.`);
+        }
+        if (state.partialStack.includes(token.name)) {
+          throw new Error(
+            `Circular partial reference detected: ${[...state.partialStack, token.name].join(" -> ")}.`
+          );
+        }
+        if (state.partialStack.length >= MAX_PARTIAL_DEPTH) {
+          throw new Error(`Maximum partial depth exceeded (${MAX_PARTIAL_DEPTH}).`);
+        }
+        const partial = indentPartial(state.partials[token.name], token.indent);
+        output += renderTokens(parseTemplate(partial), context, partial, {
+          ...state,
+          partialStack: [...state.partialStack, token.name]
+        });
         continue;
       }
       case "inverted": {
-        const value = lookup2(context, token.name);
+        const result = lookup2(context, token.name);
+        if (!result.hit && state.validate) {
+          throw new Error(`Template variable "${token.name}" not found.`);
+        }
+        const value = result.value;
         if (!value || Array.isArray(value) && value.length === 0) {
-          output += renderTokens(token.children, context, template, escape, preserveMissing);
+          output += renderTokens(token.children, context, template, state);
         }
         continue;
       }
       case "section": {
-        const value = lookup2(context, token.name);
+        const result = lookup2(context, token.name);
+        if (!result.hit && state.validate) {
+          throw new Error(`Template variable "${token.name}" not found.`);
+        }
+        const value = result.value;
         if (!value) {
           continue;
         }
         if (Array.isArray(value)) {
           for (const item of value) {
-            output += renderTokens(token.children, pushContext(context, item), template, escape, preserveMissing);
+            output += renderTokens(token.children, pushContext(context, item), template, state);
           }
           continue;
         }
@@ -3073,7 +3123,7 @@ function renderTokens(tokens, context, template, escape, preserveMissing) {
           const rendered = value.call(
             context.view,
             raw,
-            (nextTemplate) => renderTemplateInContext(nextTemplate, context, escape, preserveMissing)
+            (nextTemplate) => renderTemplateInContext(nextTemplate, context, state)
           );
           if (rendered != null) {
             output += String(rendered);
@@ -3081,10 +3131,10 @@ function renderTokens(tokens, context, template, escape, preserveMissing) {
           continue;
         }
         if (typeof value === "object" || typeof value === "string" || typeof value === "number") {
-          output += renderTokens(token.children, pushContext(context, value), template, escape, preserveMissing);
+          output += renderTokens(token.children, pushContext(context, value), template, state);
           continue;
         }
-        output += renderTokens(token.children, context, template, escape, preserveMissing);
+        output += renderTokens(token.children, context, template, state);
       }
     }
   }
@@ -3092,17 +3142,115 @@ function renderTokens(tokens, context, template, escape, preserveMissing) {
 }
 function lookup2(context, name) {
   if (name === ".") {
-    return callLambda(context.view, context.view);
+    return { hit: true, value: callLambda(context.view, context.view) };
   }
   let cursor = context;
   while (cursor !== void 0) {
     const result = name.includes(".") ? lookupDotted(cursor.view, name) : lookupName(cursor.view, name);
     if (result.hit) {
-      return callLambda(result.value, cursor.view);
+      return { hit: true, value: callLambda(result.value, cursor.view) };
     }
     cursor = cursor.parent;
   }
-  return void 0;
+  return { hit: false, value: void 0 };
+}
+function validateVariables(tokens, context) {
+  for (const token of tokens) {
+    if (token.type === "text" || token.type === "partial") {
+      continue;
+    }
+    if (token.type === "name" || token.type === "unescaped") {
+      if (!lookup2(context, token.name).hit) {
+        throw new Error(`Template variable "${token.name}" not found.`);
+      }
+      continue;
+    }
+    if (token.type !== "section" && token.type !== "inverted") {
+      continue;
+    }
+    const result = lookup2(context, token.name);
+    if (!result.hit) {
+      throw new Error(`Template variable "${token.name}" not found.`);
+    }
+    if (Array.isArray(result.value) && result.value.length > 0) {
+      for (const item of result.value) {
+        validateVariables(token.children, pushContext(context, item));
+      }
+      continue;
+    }
+    if (typeof result.value === "object" && result.value !== null || typeof result.value === "string" || typeof result.value === "number") {
+      validateVariables(token.children, pushContext(context, result.value));
+      continue;
+    }
+    validateVariables(token.children, context);
+  }
+}
+function validatePartialReferences(tokens, partials, partialStack) {
+  for (const token of tokens) {
+    if (token.type === "section" || token.type === "inverted") {
+      validatePartialReferences(token.children, partials, partialStack);
+      continue;
+    }
+    if (token.type !== "partial") {
+      continue;
+    }
+    if (!Object.hasOwn(partials, token.name)) {
+      throw new Error(`Partial "${token.name}" not found.`);
+    }
+    if (partialStack.includes(token.name)) {
+      throw new Error(
+        `Circular partial reference detected: ${[...partialStack, token.name].join(" -> ")}.`
+      );
+    }
+    if (partialStack.length >= MAX_PARTIAL_DEPTH) {
+      throw new Error(`Maximum partial depth exceeded (${MAX_PARTIAL_DEPTH}).`);
+    }
+    validatePartialReferences(parseTemplate(partials[token.name]), partials, [
+      ...partialStack,
+      token.name
+    ]);
+  }
+}
+function indentPartial(partial, indent) {
+  if (indent === "") {
+    return partial;
+  }
+  return partial.split("\n").map((line) => line === "" ? "" : `${indent}${line}`).join("\n");
+}
+function expandTemplatePartials(template, partials, partialStack) {
+  let output = "";
+  let index = 0;
+  while (index < template.length) {
+    const open = template.indexOf("{{", index);
+    if (open === -1) {
+      output += template.slice(index);
+      break;
+    }
+    const parsed = parseTag(template, open);
+    if (parsed.kind !== "partial") {
+      output += template.slice(index, parsed.end);
+      index = parsed.end;
+      continue;
+    }
+    if (!Object.hasOwn(partials, parsed.name)) {
+      throw new Error(`Partial "${parsed.name}" not found.`);
+    }
+    if (partialStack.includes(parsed.name)) {
+      throw new Error(
+        `Circular partial reference detected: ${[...partialStack, parsed.name].join(" -> ")}.`
+      );
+    }
+    if (partialStack.length >= MAX_PARTIAL_DEPTH) {
+      throw new Error(`Maximum partial depth exceeded (${MAX_PARTIAL_DEPTH}).`);
+    }
+    const standalone = getStandalone(template, open, parsed.end, parsed.kind);
+    const beforePartial = standalone === void 0 ? template.slice(index, open) : template.slice(index, standalone.lineStart);
+    const indent = standalone === void 0 ? "" : template.slice(standalone.lineStart, open);
+    const partial = indentPartial(partials[parsed.name], indent);
+    output += beforePartial + expandTemplatePartials(partial, partials, [...partialStack, parsed.name]);
+    index = standalone?.nextIndex ?? parsed.end;
+  }
+  return output;
 }
 function lookupName(view, name) {
   if (!isPropertyContainer(view) || !hasProperty(view, name)) {
@@ -3231,6 +3379,13 @@ function cloneConfigValue(value) {
 function isConfigObject(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
+function detectIndent(content) {
+  const match = content.match(/^[\t ]+/m);
+  if (match) {
+    return match[0];
+  }
+  return "  ";
+}
 function parse3(content) {
   if (!content || content.trim() === "") {
     return {};
@@ -3270,6 +3425,9 @@ function merge(base, patch) {
   }
   return result;
 }
+function configValuesEqual(left, right) {
+  return JSON.stringify(left) === JSON.stringify(right);
+}
 function prune(obj, shape) {
   let changed = false;
   const result = cloneConfigObject(obj);
@@ -3306,9 +3464,56 @@ function prune(obj, shape) {
   }
   return { changed, result };
 }
+function modifyAtPath(content, path10, value) {
+  const indent = detectIndent(content);
+  const formattingOptions = {
+    tabSize: indent === "	" ? 1 : indent.length,
+    insertSpaces: indent !== "	",
+    eol: "\n"
+  };
+  const edits = jsonc.modify(content, path10, value, { formattingOptions });
+  let result = jsonc.applyEdits(content, edits);
+  if (!result.endsWith("\n")) {
+    result += "\n";
+  }
+  return result;
+}
+function removeAtPath(content, path10) {
+  return modifyAtPath(content, path10, void 0);
+}
+function serializeUpdate(content, current, next) {
+  let result = content || "{}";
+  result = applyObjectUpdate(result, [], current, next);
+  if (!result.endsWith("\n")) {
+    result += "\n";
+  }
+  return result;
+}
+function applyObjectUpdate(content, path10, current, next) {
+  let result = content;
+  for (const key of Object.keys(current)) {
+    if (!hasConfigEntry(next, key)) {
+      result = removeAtPath(result, [...path10, key]);
+    }
+  }
+  for (const [key, nextValue] of Object.entries(next)) {
+    const nextPath = [...path10, key];
+    const hasCurrent = hasConfigEntry(current, key);
+    const currentValue = hasCurrent ? current[key] : void 0;
+    if (hasCurrent && isConfigObject(currentValue) && isConfigObject(nextValue)) {
+      result = applyObjectUpdate(result, nextPath, currentValue, nextValue);
+      continue;
+    }
+    if (!hasCurrent || !configValuesEqual(currentValue, nextValue)) {
+      result = modifyAtPath(result, nextPath, nextValue);
+    }
+  }
+  return result;
+}
 var jsonFormat = {
   parse: parse3,
   serialize,
+  serializeUpdate,
   merge,
   prune
 };
@@ -3690,7 +3895,7 @@ function pruneKeysByPrefix(table, prefix) {
   const result = {};
   for (const [key, value] of Object.entries(table)) {
     if (!key.startsWith(prefix)) {
-      result[key] = value;
+      setConfigEntry(result, key, value);
     }
   }
   return result;
@@ -3699,28 +3904,43 @@ function isConfigObject4(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
 function mergeWithPruneByPrefix(base, patch, pruneByPrefix) {
-  const result = { ...base };
+  const result = cloneConfigObject(base);
   const prefixMap = pruneByPrefix ?? {};
   for (const [key, value] of Object.entries(patch)) {
+    if (value === void 0) {
+      continue;
+    }
     const current = result[key];
     const prefix = prefixMap[key];
     if (isConfigObject4(current) && isConfigObject4(value)) {
       if (prefix) {
         const pruned = pruneKeysByPrefix(current, prefix);
-        result[key] = { ...pruned, ...value };
+        setConfigEntry(result, key, mergePrunedConfigObject(pruned, value));
       } else {
-        result[key] = mergeWithPruneByPrefix(
-          current,
-          value,
-          prefixMap
-        );
+        setConfigEntry(result, key, mergeWithPruneByPrefix(current, value, prefixMap));
       }
       continue;
     }
-    result[key] = value;
+    setConfigEntry(result, key, value);
   }
   return result;
 }
+function mergePrunedConfigObject(base, patch) {
+  const result = cloneConfigObject(base);
+  for (const [key, value] of Object.entries(patch)) {
+    if (value === void 0) {
+      continue;
+    }
+    setConfigEntry(result, key, value);
+  }
+  return result;
+}
+function serializeConfigUpdate(format, rawContent, current, next) {
+  if (rawContent !== null && format.serializeUpdate) {
+    return format.serializeUpdate(rawContent, current, next);
+  }
+  return format.serialize(next);
+}
 async function applyMutation(mutation, context, options) {
   switch (mutation.kind) {
     case "ensureDirectory":
@@ -4033,6 +4253,7 @@ async function applyConfigMerge(mutation, context, options) {
   }
   const format = getConfigFormat(formatName);
   const rawContent = await readFileIfExists(context.fs, targetPath);
+  let preserveContent = rawContent;
   let current;
   try {
     current = rawContent === null ? {} : format.parse(rawContent);
@@ -4041,6 +4262,7 @@ async function applyConfigMerge(mutation, context, options) {
       await backupInvalidDocument(context, targetPath, rawContent);
     }
     current = {};
+    preserveContent = null;
   }
   const value = resolveValue(mutation.value, options);
   let merged;
@@ -4049,7 +4271,7 @@ async function applyConfigMerge(mutation, context, options) {
   } else {
     merged = format.merge(current, value);
   }
-  const serialized = format.serialize(merged);
+  const serialized = serializeConfigUpdate(format, preserveContent, current, merged);
   const changed = serialized !== rawContent;
   if (changed && !context.dryRun) {
     await writeAtomically(context, targetPath, serialized);
@@ -4117,7 +4339,7 @@ async function applyConfigPrune(mutation, context, options) {
       details
     };
   }
-  const serialized = format.serialize(result);
+  const serialized = serializeConfigUpdate(format, rawContent, current, result);
   if (!context.dryRun) {
     await writeAtomically(context, targetPath, serialized);
   }
@@ -4142,6 +4364,7 @@ async function applyConfigTransform(mutation, context, options) {
   }
   const format = getConfigFormat(formatName);
   const rawContent = await readFileIfExists(context.fs, targetPath);
+  let preserveContent = rawContent;
   let current;
   try {
     current = rawContent === null ? {} : format.parse(rawContent);
@@ -4150,6 +4373,7 @@ async function applyConfigTransform(mutation, context, options) {
       await backupInvalidDocument(context, targetPath, rawContent);
     }
     current = {};
+    preserveContent = null;
   }
   const { content: transformed, changed } = mutation.transform(current, options);
   if (!changed) {
@@ -4173,7 +4397,7 @@ async function applyConfigTransform(mutation, context, options) {
       details
     };
   }
-  const serialized = format.serialize(transformed);
+  const serialized = serializeConfigUpdate(format, preserveContent, current, transformed);
   if (!context.dryRun) {
     await writeAtomically(context, targetPath, serialized);
   }