@contractkit/plugin-typescript 0.28.0 → 0.28.1

package/dist/index.js

@@ -8,6 +8,160 @@ import { existsSync, readFileSync, writeFileSync, mkdirSync, rmSync, readdirSync
 // src/codegen-contract.ts
 import { relative, dirname } from "path";
 import { collectTypeRefs, computeModelsWithOutput as ckComputeModelsWithOutput, collectExternalOutputRefs as ckCollectExternalOutputRefs } from "@contractkit/core";
+
+// src/ts-render.ts
+var JSON_VALUE_TYPE_DECL = "export type JsonValue = string | number | boolean | null | JsonValue[] | { [key: string]: JsonValue };";
+function quoteKey(name) {
+  return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name) ? name : `'${name}'`;
+}
+__name(quoteKey, "quoteKey");
+function escapeJsDocLines(text) {
+  return text.replace(/\*\//g, "*\\/").split("\n");
+}
+__name(escapeJsDocLines, "escapeJsDocLines");
+function escapeSingleQuoted(s) {
+  return s.replace(/\\/g, "\\\\").replace(/'/g, "\\'").replace(/\n/g, "\\n").replace(/\r/g, "\\r");
+}
+__name(escapeSingleQuoted, "escapeSingleQuoted");
+function headerNameToProperty(name) {
+  const parts = name.split(/[-_]/).filter(Boolean);
+  return parts.map((p, i) => {
+    const lower = p.toLowerCase();
+    return i === 0 ? lower : lower.charAt(0).toUpperCase() + lower.slice(1);
+  }).join("");
+}
+__name(headerNameToProperty, "headerNameToProperty");
+function renderTsType(type) {
+  switch (type.kind) {
+    case "scalar":
+      return renderTsScalar(type.name);
+    case "array": {
+      const inner = renderTsType(type.item);
+      const needsParens = type.item.kind === "union" || type.item.kind === "discriminatedUnion" || type.item.kind === "intersection" || type.item.kind === "enum";
+      return needsParens ? `(${inner})[]` : `${inner}[]`;
+    }
+    case "tuple":
+      return `[${type.items.map(renderTsType).join(", ")}]`;
+    case "record":
+      return `Record<${renderTsType(type.key)}, ${renderTsType(type.value)}>`;
+    case "enum":
+      return type.values.map((v) => `'${escapeSingleQuoted(v)}'`).join(" | ");
+    case "literal":
+      return typeof type.value === "string" ? `'${escapeSingleQuoted(type.value)}'` : String(type.value);
+    case "union":
+      return type.members.map(renderTsType).join(" | ");
+    case "discriminatedUnion":
+      return type.members.map(renderTsType).join(" | ");
+    case "intersection":
+      return type.members.map(renderTsType).join(" & ");
+    case "ref":
+      return type.name;
+    case "lazy":
+      return renderTsType(type.inner);
+    case "inlineObject":
+      return renderTsInlineObject(type.fields);
+    default:
+      return "unknown";
+  }
+}
+__name(renderTsType, "renderTsType");
+function renderTsScalar(name) {
+  switch (name) {
+    case "string":
+    case "email":
+    case "url":
+    case "uuid":
+      return "string";
+    case "number":
+    case "int":
+      return "number";
+    case "bigint":
+      return "bigint";
+    case "boolean":
+      return "boolean";
+    case "date":
+    case "time":
+    case "datetime":
+    case "duration":
+    case "interval":
+      return "string";
+    case "null":
+      return "null";
+    case "unknown":
+      return "unknown";
+    case "object":
+      return "Record<string, unknown>";
+    case "binary":
+      return "Blob";
+    case "json":
+      return "JsonValue";
+    default: {
+      const _exhaustive = name;
+      throw new Error(`plugin-typescript: unmapped scalar '${String(_exhaustive)}' \u2014 add a case`);
+    }
+  }
+}
+__name(renderTsScalar, "renderTsScalar");
+function renderTsInlineObject(fields) {
+  const entries = fields.map((f) => {
+    const opt = f.optional ? "?" : "";
+    return `${quoteKey(f.name)}${opt}: ${renderTsType(f.type)}`;
+  });
+  return `{ ${entries.join("; ")} }`;
+}
+__name(renderTsInlineObject, "renderTsInlineObject");
+function renderInputTsType(type, modelsWithInput) {
+  if (!modelsWithInput || modelsWithInput.size === 0) return renderTsType(type);
+  switch (type.kind) {
+    case "ref":
+      return modelsWithInput.has(type.name) ? `${type.name}Input` : type.name;
+    case "array": {
+      const inner = renderInputTsType(type.item, modelsWithInput);
+      const needsParens = type.item.kind === "union" || type.item.kind === "discriminatedUnion" || type.item.kind === "intersection" || type.item.kind === "enum";
+      return needsParens ? `(${inner})[]` : `${inner}[]`;
+    }
+    case "intersection":
+      return type.members.map((m) => renderInputTsType(m, modelsWithInput)).join(" & ");
+    case "union":
+      return type.members.map((m) => renderInputTsType(m, modelsWithInput)).join(" | ");
+    case "discriminatedUnion":
+      return type.members.map((m) => renderInputTsType(m, modelsWithInput)).join(" | ");
+    case "inlineObject":
+      return `{ ${type.fields.map((f) => `${quoteKey(f.name)}${f.optional ? "?" : ""}: ${renderInputTsType(f.type, modelsWithInput)}`).join("; ")} }`;
+    case "lazy":
+      return renderInputTsType(type.inner, modelsWithInput);
+    default:
+      return renderTsType(type);
+  }
+}
+__name(renderInputTsType, "renderInputTsType");
+function renderOutputTsType(type, modelsWithOutput) {
+  if (!modelsWithOutput || modelsWithOutput.size === 0) return renderTsType(type);
+  switch (type.kind) {
+    case "ref":
+      return modelsWithOutput.has(type.name) ? `${type.name}Output` : type.name;
+    case "array": {
+      const inner = renderOutputTsType(type.item, modelsWithOutput);
+      const needsParens = type.item.kind === "union" || type.item.kind === "discriminatedUnion" || type.item.kind === "intersection" || type.item.kind === "enum";
+      return needsParens ? `(${inner})[]` : `${inner}[]`;
+    }
+    case "intersection":
+      return type.members.map((m) => renderOutputTsType(m, modelsWithOutput)).join(" & ");
+    case "union":
+      return type.members.map((m) => renderOutputTsType(m, modelsWithOutput)).join(" | ");
+    case "discriminatedUnion":
+      return type.members.map((m) => renderOutputTsType(m, modelsWithOutput)).join(" | ");
+    case "inlineObject":
+      return `{ ${type.fields.map((f) => `${quoteKey(f.name)}${f.optional ? "?" : ""}: ${renderOutputTsType(f.type, modelsWithOutput)}`).join("; ")} }`;
+    case "lazy":
+      return renderOutputTsType(type.inner, modelsWithOutput);
+    default:
+      return renderTsType(type);
+  }
+}
+__name(renderOutputTsType, "renderOutputTsType");
+
+// src/codegen-contract.ts
 function modeToWrapper(mode) {
   switch (mode) {
     case "strict":
@@ -56,7 +210,7 @@ function generateComments(model, outPath) {
     lines.push(` * @deprecated`);
   }
   if (model.description) {
-    lines.push(` * ${model.description}`);
+    for (const l of escapeJsDocLines(model.description)) lines.push(` * ${l}`);
   }
   const relPath = outPath ? relative(dirname(outPath), model.loc.file) : model.loc.file;
   lines.push(` * generated from [${model.name}](file://./${relPath}#L${model.loc.line})`);
@@ -199,9 +353,9 @@ function generateSimpleModel(model, outPath) {
       const outputKey = applyCase(field.name, outputCase);
       if (field.optional) {
         const guard = hasInputTransform ? `data.${inputKey} != null` : `data.${inputKey} !== undefined`;
-        lines.push(`    ...(${guard} ? { ${quoteKey(outputKey)}: data.${inputKey} } : {}),`);
+        lines.push(`    ...(${guard} ? { ${quoteKey2(outputKey)}: data.${inputKey} } : {}),`);
       } else {
-        lines.push(`    ${quoteKey(outputKey)}: data.${inputKey},`);
+        lines.push(`    ${quoteKey2(outputKey)}: data.${inputKey},`);
       }
     }
     lines.push(`}));`);
@@ -298,7 +452,7 @@ function generateThreeSchemaModel(model, outPath, modelsWithInput, modelsWithWri
   }
   const omitClause = fieldsToOmit.size > 0 ? `.omit({ ${[
     ...fieldsToOmit
-  ].map((f) => `${quoteKey(f)}: true`).join(", ")} })` : "";
+  ].map((f) => `${quoteKey2(f)}: true`).join(", ")} })` : "";
   if (bases.length > 0) {
     const { head, tail } = buildExtendChain(bases, (b) => modelsWithInput?.has(b) ? `${b}Input` : b);
     lines.push(`export const ${name}Input = ${head}${tail}${omitClause}.extend({`);
@@ -343,7 +497,7 @@ function renderFieldsAsPascalCase(fields, defaultMode) {
       expr += ".nullable()";
     }
     if (f.description) expr += `.describe("${escapeString(f.description)}")`;
-    return `${quoteKey(pascalKey)}: ${expr},`;
+    return `${quoteKey2(pascalKey)}: ${expr},`;
   });
 }
 __name(renderFieldsAsPascalCase, "renderFieldsAsPascalCase");
@@ -361,7 +515,7 @@ function renderFieldsAsSnakeCase(fields, defaultMode) {
       expr += ".nullable()";
     }
     if (f.description) expr += `.describe("${escapeString(f.description)}")`;
-    return `${quoteKey(snakeKey)}: ${expr},`;
+    return `${quoteKey2(snakeKey)}: ${expr},`;
   });
 }
 __name(renderFieldsAsSnakeCase, "renderFieldsAsSnakeCase");
@@ -377,7 +531,7 @@ function renderField(field, defaultMode) {
     expr += ".optional()";
   }
   if (field.description) expr += `.describe("${escapeString(field.description)}")`;
-  lines.push(`${quoteKey(field.name)}: ${expr},`);
+  lines.push(`${quoteKey2(field.name)}: ${expr},`);
   return lines;
 }
 __name(renderField, "renderField");
@@ -502,8 +656,10 @@ function renderScalar(s) {
       return "_ZodBinary";
     case "json":
       return "_ZodJson";
-    default:
-      return "z.unknown()";
+    default: {
+      const _exhaustive = s.name;
+      throw new Error(`plugin-typescript: unmapped scalar '${String(_exhaustive)}' \u2014 add a case`);
+    }
   }
 }
 __name(renderScalar, "renderScalar");
@@ -523,7 +679,7 @@ function renderRecord(r) {
 }
 __name(renderRecord, "renderRecord");
 function renderEnum(e) {
-  const vals = e.values.map((v) => `"${v}"`).join(", ");
+  const vals = e.values.map((v) => `"${escapeString(v)}"`).join(", ");
   return `z.enum([${vals}])`;
 }
 __name(renderEnum, "renderEnum");
@@ -572,9 +728,9 @@ function renderInlineObject(o, parseCaseTransform, defaultMode) {
     const transformEntries = o.fields.map((f) => {
       const snakeKey = camelToSnake(f.name);
       if (f.optional) {
-        return `    ...(data.${snakeKey} != null ? { ${quoteKey(f.name)}: data.${snakeKey} } : {}),`;
+        return `    ...(data.${snakeKey} != null ? { ${quoteKey2(f.name)}: data.${snakeKey} } : {}),`;
       }
-      return `    ${quoteKey(f.name)}: data.${snakeKey},`;
+      return `    ${quoteKey2(f.name)}: data.${snakeKey},`;
     }).join("\n");
     return `${wrapper}({
 ${joined}
@@ -588,9 +744,9 @@ ${transformEntries}
     const transformEntries = o.fields.map((f) => {
       const pascalKey = camelToPascal(f.name);
       if (f.optional) {
-        return `    ...(data.${pascalKey} != null ? { ${quoteKey(f.name)}: data.${pascalKey} } : {}),`;
+        return `    ...(data.${pascalKey} != null ? { ${quoteKey2(f.name)}: data.${pascalKey} } : {}),`;
       }
-      return `    ${quoteKey(f.name)}: data.${pascalKey},`;
+      return `    ${quoteKey2(f.name)}: data.${pascalKey},`;
     }).join("\n");
     return `${wrapper}({
 ${joined}
@@ -676,7 +832,7 @@ function renderInputField(field, modelsWithInput, defaultMode) {
     expr += ".optional()";
   }
   if (field.description) expr += `.describe("${escapeString(field.description)}")`;
-  lines.push(`${quoteKey(field.name)}: ${expr},`);
+  lines.push(`${quoteKey2(field.name)}: ${expr},`);
   return lines;
 }
 __name(renderInputField, "renderInputField");
@@ -736,17 +892,17 @@ function renderQueryField(field, modelsWithInput, defaultMode) {
     expr += ".optional()";
   }
   if (field.description) expr += `.describe("${escapeString(field.description)}")`;
-  return `${quoteKey(field.name)}: ${expr},`;
+  return `${quoteKey2(field.name)}: ${expr},`;
 }
 __name(renderQueryField, "renderQueryField");
 function isValidIdentifier(name) {
   return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name);
 }
 __name(isValidIdentifier, "isValidIdentifier");
-function quoteKey(name) {
+function quoteKey2(name) {
   return isValidIdentifier(name) ? name : `'${name}'`;
 }
-__name(quoteKey, "quoteKey");
+__name(quoteKey2, "quoteKey");
 function escapeString(s) {
   return s.replace(/\\/g, "\\\\").replace(/"/g, '\\"').replace(/\n/g, "\\n").replace(/\r/g, "\\r");
 }
@@ -950,149 +1106,6 @@ __name(pascalToDotCase, "pascalToDotCase");
 
 // src/codegen-operation.ts
 import { resolveModifiers, resolveSecurity, SECURITY_NONE, classifyContentType } from "@contractkit/core";
-
-// src/ts-render.ts
-var JSON_VALUE_TYPE_DECL = "export type JsonValue = string | number | boolean | null | JsonValue[] | { [key: string]: JsonValue };";
-function quoteKey2(name) {
-  return /^[a-zA-Z_$][a-zA-Z0-9_$]*$/.test(name) ? name : `'${name}'`;
-}
-__name(quoteKey2, "quoteKey");
-function headerNameToProperty(name) {
-  const parts = name.split(/[-_]/).filter(Boolean);
-  return parts.map((p, i) => {
-    const lower = p.toLowerCase();
-    return i === 0 ? lower : lower.charAt(0).toUpperCase() + lower.slice(1);
-  }).join("");
-}
-__name(headerNameToProperty, "headerNameToProperty");
-function renderTsType(type) {
-  switch (type.kind) {
-    case "scalar":
-      return renderTsScalar(type.name);
-    case "array": {
-      const inner = renderTsType(type.item);
-      const needsParens = type.item.kind === "union" || type.item.kind === "discriminatedUnion" || type.item.kind === "intersection" || type.item.kind === "enum";
-      return needsParens ? `(${inner})[]` : `${inner}[]`;
-    }
-    case "tuple":
-      return `[${type.items.map(renderTsType).join(", ")}]`;
-    case "record":
-      return `Record<${renderTsType(type.key)}, ${renderTsType(type.value)}>`;
-    case "enum":
-      return type.values.map((v) => `'${v}'`).join(" | ");
-    case "literal":
-      return typeof type.value === "string" ? `'${type.value}'` : String(type.value);
-    case "union":
-      return type.members.map(renderTsType).join(" | ");
-    case "discriminatedUnion":
-      return type.members.map(renderTsType).join(" | ");
-    case "intersection":
-      return type.members.map(renderTsType).join(" & ");
-    case "ref":
-      return type.name;
-    case "lazy":
-      return renderTsType(type.inner);
-    case "inlineObject":
-      return renderTsInlineObject(type.fields);
-    default:
-      return "unknown";
-  }
-}
-__name(renderTsType, "renderTsType");
-function renderTsScalar(name) {
-  switch (name) {
-    case "string":
-    case "email":
-    case "url":
-    case "uuid":
-      return "string";
-    case "number":
-    case "int":
-      return "number";
-    case "bigint":
-      return "bigint";
-    case "boolean":
-      return "boolean";
-    case "date":
-    case "datetime":
-    case "duration":
-    case "interval":
-      return "string";
-    case "null":
-      return "null";
-    case "unknown":
-      return "unknown";
-    case "object":
-      return "Record<string, unknown>";
-    case "binary":
-      return "Blob";
-    case "json":
-      return "JsonValue";
-    default:
-      return "unknown";
-  }
-}
-__name(renderTsScalar, "renderTsScalar");
-function renderTsInlineObject(fields) {
-  const entries = fields.map((f) => {
-    const opt = f.optional ? "?" : "";
-    return `${quoteKey2(f.name)}${opt}: ${renderTsType(f.type)}`;
-  });
-  return `{ ${entries.join("; ")} }`;
-}
-__name(renderTsInlineObject, "renderTsInlineObject");
-function renderInputTsType(type, modelsWithInput) {
-  if (!modelsWithInput || modelsWithInput.size === 0) return renderTsType(type);
-  switch (type.kind) {
-    case "ref":
-      return modelsWithInput.has(type.name) ? `${type.name}Input` : type.name;
-    case "array": {
-      const inner = renderInputTsType(type.item, modelsWithInput);
-      const needsParens = type.item.kind === "union" || type.item.kind === "discriminatedUnion" || type.item.kind === "intersection" || type.item.kind === "enum";
-      return needsParens ? `(${inner})[]` : `${inner}[]`;
-    }
-    case "intersection":
-      return type.members.map((m) => renderInputTsType(m, modelsWithInput)).join(" & ");
-    case "union":
-      return type.members.map((m) => renderInputTsType(m, modelsWithInput)).join(" | ");
-    case "discriminatedUnion":
-      return type.members.map((m) => renderInputTsType(m, modelsWithInput)).join(" | ");
-    case "inlineObject":
-      return `{ ${type.fields.map((f) => `${quoteKey2(f.name)}${f.optional ? "?" : ""}: ${renderInputTsType(f.type, modelsWithInput)}`).join("; ")} }`;
-    case "lazy":
-      return renderInputTsType(type.inner, modelsWithInput);
-    default:
-      return renderTsType(type);
-  }
-}
-__name(renderInputTsType, "renderInputTsType");
-function renderOutputTsType(type, modelsWithOutput) {
-  if (!modelsWithOutput || modelsWithOutput.size === 0) return renderTsType(type);
-  switch (type.kind) {
-    case "ref":
-      return modelsWithOutput.has(type.name) ? `${type.name}Output` : type.name;
-    case "array": {
-      const inner = renderOutputTsType(type.item, modelsWithOutput);
-      const needsParens = type.item.kind === "union" || type.item.kind === "discriminatedUnion" || type.item.kind === "intersection" || type.item.kind === "enum";
-      return needsParens ? `(${inner})[]` : `${inner}[]`;
-    }
-    case "intersection":
-      return type.members.map((m) => renderOutputTsType(m, modelsWithOutput)).join(" & ");
-    case "union":
-      return type.members.map((m) => renderOutputTsType(m, modelsWithOutput)).join(" | ");
-    case "discriminatedUnion":
-      return type.members.map((m) => renderOutputTsType(m, modelsWithOutput)).join(" | ");
-    case "inlineObject":
-      return `{ ${type.fields.map((f) => `${quoteKey2(f.name)}${f.optional ? "?" : ""}: ${renderOutputTsType(f.type, modelsWithOutput)}`).join("; ")} }`;
-    case "lazy":
-      return renderOutputTsType(type.inner, modelsWithOutput);
-    default:
-      return renderTsType(type);
-  }
-}
-__name(renderOutputTsType, "renderOutputTsType");
-
-// src/codegen-operation.ts
 import { basename, dirname as dirname2, relative as relative2 } from "path";
 function bodyParserToken(contentType) {
   switch (classifyContentType(contentType)) {
@@ -1244,7 +1257,7 @@ function generateHandler(route, op, root, options) {
   lines.push("/**");
   const desc = op.description ?? route.description;
   if (desc) {
-    lines.push(` * ${desc}`);
+    for (const l of escapeJsDocLines(desc)) lines.push(` * ${l}`);
   }
   const relFile = outPath ? relative2(dirname2(outPath), file) : file;
   lines.push(` * from [${basename(file)}](file://./${relFile}#L${op.loc.line})`);
@@ -1273,7 +1286,7 @@ function generateHandler(route, op, root, options) {
     middlewares.push(`bodyParserMiddleware([${tokensExpr}])`);
   }
   if (op.signature) {
-    const sigArgs = op.signaturePolicy ? `'${op.signature}', { policy: '${op.signaturePolicy}' }` : `'${op.signature}'`;
+    const sigArgs = op.signaturePolicy ? `'${escapeSingleQuoted(op.signature)}', { policy: '${escapeSingleQuoted(op.signaturePolicy)}' }` : `'${escapeSingleQuoted(op.signature)}'`;
     middlewares.push(`requireSignature(${sigArgs})`);
   }
   const middlewareStr = middlewares.length > 0 ? `, ${middlewares.join(", ")},` : ",";
@@ -1312,7 +1325,7 @@ function generateHandler(route, op, root, options) {
   const serviceParts = inferService(op, route, file);
   const respHeaders = primaryResponse?.headers ?? [];
   const hasRespHeaders = respHeaders.length > 0;
-  const headersAnnotation = hasRespHeaders ? `{ ${respHeaders.map((h) => `${quoteKey2(headerNameToProperty(h.name))}${h.optional ? "?" : ""}: ${renderOutputTsType(h.type, options.modelsWithOutput)}`).join("; ")} }` : "";
+  const headersAnnotation = hasRespHeaders ? `{ ${respHeaders.map((h) => `${quoteKey(headerNameToProperty(h.name))}${h.optional ? "?" : ""}: ${renderOutputTsType(h.type, options.modelsWithOutput)}`).join("; ")} }` : "";
   if (primaryResponse?.bodyType) {
     const { annotation, prelude } = formatTypeAnnotation(primaryResponse.bodyType, options.modelsWithOutput);
     if (prelude) {
@@ -1953,18 +1966,19 @@ function generateMethod(route, op, file, options) {
   const dataType = isVoid ? "void" : respCategory === "text" ? "string" : respCategory === "binary" ? "Blob" : renderOutputTsType(primaryResponse.bodyType, modelsWithOutput);
   const respHeaders = primaryResponse?.headers ?? [];
   const hasRespHeaders = respHeaders.length > 0;
-  const headersShape = hasRespHeaders ? `{ ${respHeaders.map((h) => `${quoteKey2(headerNameToProperty(h.name))}${h.optional ? "?" : ""}: ${renderOutputTsType(h.type, modelsWithOutput)}`).join("; ")} }` : "";
+  const headersShape = hasRespHeaders ? `{ ${respHeaders.map((h) => `${quoteKey(headerNameToProperty(h.name))}${h.optional ? "?" : ""}: ${renderOutputTsType(h.type, modelsWithOutput)}`).join("; ")} }` : "";
   const returnType = hasRespHeaders ? isVoid ? `{ headers: ${headersShape} }` : `{ data: ${dataType}; headers: ${headersShape} }` : dataType;
   const desc = op.description ?? route.description;
   if (op.name || desc) {
     const tags = [];
     if (op.name) tags.push(`@name ${op.name}`);
     if (desc) tags.push(`@description ${desc}`);
-    if (tags.length === 1) {
-      lines.push(`    /** ${tags[0]} */`);
+    const contentLines = tags.flatMap((t) => escapeJsDocLines(t));
+    if (contentLines.length === 1) {
+      lines.push(`    /** ${contentLines[0]} */`);
     } else {
       lines.push(`    /**`);
-      for (const tag of tags) lines.push(`     * ${tag}`);
+      for (const l of contentLines) lines.push(`     * ${l}`);
       lines.push(`     */`);
     }
   }
@@ -2040,7 +2054,7 @@ function generateMethod(route, op, file, options) {
   }
   const readBodyExpr = respCategory === "text" ? `await result.text()` : respCategory === "binary" ? `await result.blob()` : `await parseJson<${dataType}>(result)`;
   if (hasRespHeaders) {
-    const headerEntries = respHeaders.map((h) => `${quoteKey2(headerNameToProperty(h.name))}: result.headers.get('${h.name}') ?? undefined`).join(", ");
+    const headerEntries = respHeaders.map((h) => `${quoteKey(headerNameToProperty(h.name))}: result.headers.get('${h.name}') ?? undefined`).join(", ");
     if (isVoid) {
       lines.push(`        return { headers: { ${headerEntries} } };`);
     } else {
@@ -2152,7 +2166,7 @@ function buildMethodParams(route, op, modelsWithInput) {
   }
   if (op.query) {
     if (op.query.kind === "params") {
-      const fields = op.query.nodes.map((p) => `${quoteKey2(p.name)}?: ${renderInputTsType(p.type, modelsWithInput)}`).join("; ");
+      const fields = op.query.nodes.map((p) => `${quoteKey(p.name)}?: ${renderInputTsType(p.type, modelsWithInput)}`).join("; ");
       params.push({
         name: "query",
         type: `{ ${fields} }`,
@@ -2175,7 +2189,7 @@ function buildMethodParams(route, op, modelsWithInput) {
   }
   if (op.headers) {
     if (op.headers.kind === "params") {
-      const fields = op.headers.nodes.map((p) => `${quoteKey2(p.name)}?: ${renderInputTsType(p.type, modelsWithInput)}`).join("; ");
+      const fields = op.headers.nodes.map((p) => `${quoteKey(p.name)}?: ${renderInputTsType(p.type, modelsWithInput)}`).join("; ");
       params.push({
         name: "customHeaders",
         type: `{ ${fields} }`,
@@ -2877,7 +2891,7 @@ function generateComments2(model, outPath) {
     lines.push(` * @deprecated`);
   }
   if (model.description) {
-    lines.push(` * ${model.description}`);
+    for (const l of escapeJsDocLines(model.description)) lines.push(` * ${l}`);
   }
   const relPath = outPath ? relative4(dirname4(outPath), model.loc.file) : model.loc.file;
   lines.push(` * generated from [${model.name}](file://./${relPath}#L${model.loc.line})`);
@@ -2941,34 +2955,40 @@ function generateVisibilityModel(model, outPath, modelsWithInput, modelMap) {
   return lines;
 }
 __name(generateVisibilityModel, "generateVisibilityModel");
+function withFieldJsDoc(jsdocParts, line) {
+  if (jsdocParts.length === 0) return line;
+  const contentLines = escapeJsDocLines(jsdocParts.join(" "));
+  if (contentLines.length === 1) {
+    return `/** ${contentLines[0]} */
+    ${line}`;
+  }
+  const body = contentLines.map((l) => `     * ${l}`).join("\n");
+  return `/**
+${body}
+     */
+    ${line}`;
+}
+__name(withFieldJsDoc, "withFieldJsDoc");
 function renderField2(field) {
   const opt = field.optional || field.default !== void 0 ? "?" : "";
   let typeStr = renderTsType(field.type);
   if (field.nullable) typeStr += " | null";
-  const line = `${quoteKey2(field.name)}${opt}: ${typeStr};`;
+  const line = `${quoteKey(field.name)}${opt}: ${typeStr};`;
   const jsdocParts = [];
   if (field.deprecated) jsdocParts.push("@deprecated");
   if (field.description) jsdocParts.push(field.description);
-  if (jsdocParts.length > 0) {
-    return `/** ${jsdocParts.join(" ")} */
-    ${line}`;
-  }
-  return line;
+  return withFieldJsDoc(jsdocParts, line);
 }
 __name(renderField2, "renderField");
 function renderInputField2(field, modelsWithInput) {
   const opt = field.optional || field.default !== void 0 ? "?" : "";
   let typeStr = renderInputTsType(field.type, modelsWithInput);
   if (field.nullable) typeStr += " | null";
-  const line = `${quoteKey2(field.name)}${opt}: ${typeStr};`;
+  const line = `${quoteKey(field.name)}${opt}: ${typeStr};`;
   const jsdocParts = [];
   if (field.deprecated) jsdocParts.push("@deprecated");
   if (field.description) jsdocParts.push(field.description);
-  if (jsdocParts.length > 0) {
-    return `/** ${jsdocParts.join(" ")} */
-    ${line}`;
-  }
-  return line;
+  return withFieldJsDoc(jsdocParts, line);
 }
 __name(renderInputField2, "renderInputField");
 function camelToSnake2(s) {
@@ -3011,22 +3031,26 @@ function renderOutputField(field, outputCase, modelsWithOutput) {
   const key = applyOutputCase(field.name, outputCase);
   let typeStr = renderOutputTsType(field.type, modelsWithOutput);
   if (field.nullable) typeStr += " | null";
-  const line = `${quoteKey2(key)}${opt}: ${typeStr};`;
+  const line = `${quoteKey(key)}${opt}: ${typeStr};`;
   const jsdocParts = [];
   if (field.deprecated) jsdocParts.push("@deprecated");
   if (field.description) jsdocParts.push(field.description);
-  if (jsdocParts.length > 0) {
-    return `/** ${jsdocParts.join(" ")} */
-    ${line}`;
-  }
-  return line;
+  return withFieldJsDoc(jsdocParts, line);
 }
 __name(renderOutputField, "renderOutputField");
 
 // src/path-utils.ts
-import { resolve, join, relative as relative5, dirname as dirname5 } from "path";
+import { resolve, join, relative as relative5, dirname as dirname5, isAbsolute } from "path";
 import { collectTypeRefs as collectTypeRefs2, collectPublicTypeNames } from "@contractkit/core";
 var TEMPLATE_VAR_RE = /\{\w+\}/;
+function assertWithinBase(baseOutDir, outPath) {
+  const rel = relative5(resolve(baseOutDir), resolve(outPath));
+  if (rel === "" || rel.startsWith("..") || isAbsolute(rel)) {
+    throw new Error(`Refusing to emit outside output directory: resolved path "${outPath}" escapes "${baseOutDir}" (check options { keys } values used in output path templates)`);
+  }
+  return outPath;
+}
+__name(assertWithinBase, "assertWithinBase");
 function resolveTemplate(template, vars) {
   return template.replace(/\{(\w+)\}/g, (_, key) => vars[key] ?? `{${key}}`);
 }
@@ -3065,14 +3089,14 @@ function computeOpOutPath(filePath, baseDir, output, defaultSuffix, commonRoot,
       ext: "ck",
       ...meta
     });
-    if (includesFilename(resolved)) return join(baseOutDir, resolved);
-    return join(baseOutDir, resolved, defaultName);
+    if (includesFilename(resolved)) return assertWithinBase(baseOutDir, join(baseOutDir, resolved));
+    return assertWithinBase(baseOutDir, join(baseOutDir, resolved, defaultName));
   }
   if (output) {
-    if (includesFilename(output)) return join(baseOutDir, output);
-    return join(baseOutDir, output, relDir, defaultName);
+    if (includesFilename(output)) return assertWithinBase(baseOutDir, join(baseOutDir, output));
+    return assertWithinBase(baseOutDir, join(baseOutDir, output, relDir, defaultName));
   }
-  return join(baseOutDir, relDir, defaultName);
+  return assertWithinBase(baseOutDir, join(baseOutDir, relDir, defaultName));
 }
 __name(computeOpOutPath, "computeOpOutPath");
 function computeContractOutPath(filePath, baseDir, output, defaultSuffix, commonRoot, meta = {}) {
@@ -3093,14 +3117,14 @@ function computeSdkOutPath(filePath, rootDir, clientOutput, commonRoot, meta = {
       ext: "ck",
       ...meta
     });
-    if (includesFilename(resolved)) return join(baseOutDir, resolved);
-    return join(baseOutDir, resolved, defaultOutName);
+    if (includesFilename(resolved)) return assertWithinBase(baseOutDir, join(baseOutDir, resolved));
+    return assertWithinBase(baseOutDir, join(baseOutDir, resolved, defaultOutName));
   }
   if (clientOutput) {
-    if (includesFilename(clientOutput)) return join(baseOutDir, clientOutput);
-    return join(baseOutDir, clientOutput, relDir, defaultOutName);
+    if (includesFilename(clientOutput)) return assertWithinBase(baseOutDir, join(baseOutDir, clientOutput));
+    return assertWithinBase(baseOutDir, join(baseOutDir, clientOutput, relDir, defaultOutName));
   }
-  return join(baseOutDir, relDir, defaultOutName);
+  return assertWithinBase(baseOutDir, join(baseOutDir, relDir, defaultOutName));
 }
 __name(computeSdkOutPath, "computeSdkOutPath");
 function computeSdkAreaClientOutPath(area, rootDir, clientOutput) {
@@ -3121,14 +3145,14 @@ function computeSdkAreaClientOutPath(area, rootDir, clientOutput) {
       subarea: ""
     });
     const cleaned = fixHiddenSegment(resolved.replace(/\/+/g, "/").replace(/^\//, ""));
-    if (includesFilename(cleaned)) return join(baseOutDir, cleaned);
-    return join(baseOutDir, cleaned, `${filename}.client.ts`);
+    if (includesFilename(cleaned)) return assertWithinBase(baseOutDir, join(baseOutDir, cleaned));
+    return assertWithinBase(baseOutDir, join(baseOutDir, cleaned, `${filename}.client.ts`));
   }
   if (clientOutput) {
-    if (includesFilename(clientOutput)) return join(baseOutDir, clientOutput);
-    return join(baseOutDir, clientOutput, `${filename}.client.ts`);
+    if (includesFilename(clientOutput)) return assertWithinBase(baseOutDir, join(baseOutDir, clientOutput));
+    return assertWithinBase(baseOutDir, join(baseOutDir, clientOutput, `${filename}.client.ts`));
   }
-  return join(baseOutDir, `${filename}.client.ts`);
+  return assertWithinBase(baseOutDir, join(baseOutDir, `${filename}.client.ts`));
 }
 __name(computeSdkAreaClientOutPath, "computeSdkAreaClientOutPath");
 function computeSdkTypeOutPath(filePath, rootDir, typeOutput, commonRoot, meta = {}) {
@@ -3145,11 +3169,11 @@ function computeSdkTypeOutPath(filePath, rootDir, typeOutput, commonRoot, meta =
       ext: "ck",
       ...meta
     });
-    if (includesFilename(resolved)) return join(baseOutDir, resolved);
-    return join(baseOutDir, resolved, defaultOutName);
+    if (includesFilename(resolved)) return assertWithinBase(baseOutDir, join(baseOutDir, resolved));
+    return assertWithinBase(baseOutDir, join(baseOutDir, resolved, defaultOutName));
   }
-  if (includesFilename(typeOutput)) return join(baseOutDir, typeOutput);
-  return join(baseOutDir, typeOutput, relDir, defaultOutName);
+  if (includesFilename(typeOutput)) return assertWithinBase(baseOutDir, join(baseOutDir, typeOutput));
+  return assertWithinBase(baseOutDir, join(baseOutDir, typeOutput, relDir, defaultOutName));
 }
 __name(computeSdkTypeOutPath, "computeSdkTypeOutPath");
 function generateBarrelFiles(contractPaths) {