@contractkit/plugin-typescript 0.20.0 → 0.21.0

package/dist/index.js

@@ -2572,72 +2572,64 @@ function generateSdkOptions() {
   ].join("\n");
 }
 __name(generateSdkOptions, "generateSdkOptions");
-function generateSdkAggregator(input) {
-  const sdkOptionsImportPath = input.sdkOptionsImportPath ?? "./sdk-options.js";
-  const sdkClassName = input.sdkClassName ?? "Sdk";
-  const inlinedByArea = /* @__PURE__ */ new Map();
+function generateAreaClient(input) {
+  const { area, outPath, inlineFiles, subareaClients, sdkOptionsPath } = input;
+  const className = deriveAreaClientClassName(area);
+  const collectedMethodLines = [];
+  const seenMethods = /* @__PURE__ */ new Set();
   const typesByImportPath = /* @__PURE__ */ new Map();
   const unresolvedTypes = /* @__PURE__ */ new Set();
   let needsJson = false;
   let needsBigIntReplacer = false;
   let needsBigIntReviver = false;
   let needsQueryString = false;
-  for (const area of input.areas) {
-    const collected = [];
-    const seenMethods = /* @__PURE__ */ new Set();
-    for (const inline of area.inlineFiles) {
-      const includeInternal = inline.codegenOptions.includeInternal ?? false;
-      const { lines: methodLines, methodNames } = generateClientMethods(inline.root, inline.codegenOptions);
-      for (const name of methodNames) {
-        if (seenMethods.has(name)) {
-          throw new Error(`[sdk] duplicate method '${name}' in area '${area.area}': two area-level files contribute the same method. Disambiguate via 'sdk:' or move one into a subarea.`);
-        }
-        seenMethods.add(name);
+  for (const inline of inlineFiles) {
+    const includeInternal = inline.codegenOptions.includeInternal ?? false;
+    const { lines: methodLines, methodNames } = generateClientMethods(inline.root, inline.codegenOptions);
+    for (const name of methodNames) {
+      if (seenMethods.has(name)) {
+        throw new Error(`[sdk] duplicate method '${name}' in area '${area}': two area-level files contribute the same method. Disambiguate via 'sdk:' or move one into a subarea.`);
       }
-      collected.push(...methodLines);
-      if (sdkNeedsJson(inline.root, includeInternal)) needsJson = true;
-      if (sdkNeedsBigIntReplacer(inline.root, includeInternal)) needsBigIntReplacer = true;
-      if (sdkNeedsBigIntReviver(inline.root, includeInternal)) needsBigIntReviver = true;
-      if (sdkNeedsQueryString(inline.root, includeInternal)) needsQueryString = true;
-      const typesForFile = collectTypes2(inline.root, inline.codegenOptions.modelsWithInput, inline.codegenOptions.modelsWithOutput, includeInternal);
-      const { modelOutPaths, outPath } = inline.codegenOptions;
-      if (modelOutPaths && outPath) {
-        const fromDir = dirname3(outPath);
-        for (const t of typesForFile) {
-          const typeOutPath = modelOutPaths.get(t);
-          if (typeOutPath) {
-            let rel = relative3(fromDir, typeOutPath).replace(/\.ts$/, ".js");
-            if (!rel.startsWith(".")) rel = "./" + rel;
-            const set = typesByImportPath.get(rel) ?? /* @__PURE__ */ new Set();
-            set.add(t);
-            typesByImportPath.set(rel, set);
-          } else {
-            unresolvedTypes.add(t);
-          }
+      seenMethods.add(name);
+    }
+    collectedMethodLines.push(...methodLines);
+    if (sdkNeedsJson(inline.root, includeInternal)) needsJson = true;
+    if (sdkNeedsBigIntReplacer(inline.root, includeInternal)) needsBigIntReplacer = true;
+    if (sdkNeedsBigIntReviver(inline.root, includeInternal)) needsBigIntReviver = true;
+    if (sdkNeedsQueryString(inline.root, includeInternal)) needsQueryString = true;
+    const typesForFile = collectTypes2(inline.root, inline.codegenOptions.modelsWithInput, inline.codegenOptions.modelsWithOutput, includeInternal);
+    const { modelOutPaths } = inline.codegenOptions;
+    if (modelOutPaths) {
+      const fromDir = dirname3(outPath);
+      for (const t of typesForFile) {
+        const typeOutPath = modelOutPaths.get(t);
+        if (typeOutPath) {
+          let rel = relative3(fromDir, typeOutPath).replace(/\.ts$/, ".js");
+          if (!rel.startsWith(".")) rel = "./" + rel;
+          const set = typesByImportPath.get(rel) ?? /* @__PURE__ */ new Set();
+          set.add(t);
+          typesByImportPath.set(rel, set);
+        } else {
+          unresolvedTypes.add(t);
         }
       }
     }
-    inlinedByArea.set(area.area, {
-      lines: collected,
-      methodNames: seenMethods
-    });
   }
+  let sdkOptionsRel = relative3(dirname3(outPath), sdkOptionsPath).replace(/\.ts$/, ".js");
+  if (!sdkOptionsRel.startsWith(".")) sdkOptionsRel = "./" + sdkOptionsRel;
   const lines = [];
   const jsonImport = needsJson ? ", JsonValue" : "";
-  lines.push(`import type { SdkFetch${jsonImport} } from '${sdkOptionsImportPath}';`);
+  lines.push(`import type { SdkFetch${jsonImport} } from '${sdkOptionsRel}';`);
   const valueImports = [];
   if (needsBigIntReplacer) valueImports.push("bigIntReplacer");
   if (needsBigIntReviver) valueImports.push("parseJson");
   if (needsQueryString) valueImports.push("buildQueryString");
   if (valueImports.length > 0) {
-    lines.push(`import { ${valueImports.join(", ")} } from '${sdkOptionsImportPath}';`);
+    lines.push(`import { ${valueImports.join(", ")} } from '${sdkOptionsRel}';`);
   }
-  lines.push(`import type { SdkOptions } from '${sdkOptionsImportPath}';`);
-  lines.push(`import { createSdkFetch } from '${sdkOptionsImportPath}';`);
-  const typeImportPaths = [
+  for (const path of [
     ...typesByImportPath.keys()
-  ].sort();
-  for (const path of typeImportPaths) {
+  ].sort()) {
     const names = [
       ...typesByImportPath.get(path)
     ].sort();
@@ -2649,40 +2641,51 @@ function generateSdkAggregator(input) {
     lines.push(`import type { ${t} } from './${pascalToDotCase(t)}.js';`);
   }
   const importedClients = /* @__PURE__ */ new Set();
+  for (const sc of subareaClients) {
+    const key = `${sc.client.className}|${sc.client.importPath}`;
+    if (importedClients.has(key)) continue;
+    importedClients.add(key);
+    lines.push(`import { ${sc.client.className} } from '${sc.client.importPath}';`);
+  }
+  lines.push("");
+  lines.push(`export class ${className} {`);
+  for (const sc of subareaClients) {
+    lines.push(`    readonly ${sc.propertyName}: ${sc.client.className};`);
+  }
+  if (subareaClients.length > 0) lines.push("");
+  if (collectedMethodLines.length > 0 || subareaClients.length > 0) {
+    const fetchModifier = collectedMethodLines.length > 0 ? "private " : "";
+    lines.push(`    constructor(${fetchModifier}fetch: SdkFetch) {`);
+    for (const sc of subareaClients) {
+      lines.push(`        this.${sc.propertyName} = new ${sc.client.className}(fetch);`);
+    }
+    lines.push("    }");
+  }
+  for (const ln of collectedMethodLines) lines.push(ln);
+  lines.push("}");
+  lines.push("");
+  return lines.join("\n");
+}
+__name(generateAreaClient, "generateAreaClient");
+function generateSdkAggregator(input) {
+  const sdkOptionsImportPath = input.sdkOptionsImportPath ?? "./sdk-options.js";
+  const sdkClassName = input.sdkClassName ?? "Sdk";
+  const lines = [];
+  lines.push(`import type { SdkOptions } from '${sdkOptionsImportPath}';`);
+  lines.push(`import { createSdkFetch } from '${sdkOptionsImportPath}';`);
+  const importedClients = /* @__PURE__ */ new Set();
   const pushClientImport = /* @__PURE__ */ __name((c) => {
     const key = `${c.className}|${c.importPath}`;
     if (importedClients.has(key)) return;
     importedClients.add(key);
     lines.push(`import { ${c.className} } from '${c.importPath}';`);
   }, "pushClientImport");
+  for (const area of input.areas) pushClientImport(area.client);
   for (const c of input.topLevelClients) pushClientImport(c);
-  for (const area of input.areas) {
-    for (const sc of area.subareaClients) pushClientImport(sc.client);
-  }
   lines.push("");
-  for (const area of input.areas) {
-    const areaClassName = deriveAreaClientClassName(area.area);
-    const inlined = inlinedByArea.get(area.area);
-    lines.push(`class ${areaClassName} {`);
-    for (const sc of area.subareaClients) {
-      lines.push(`    readonly ${sc.propertyName}: ${sc.client.className};`);
-    }
-    if (area.subareaClients.length > 0) lines.push("");
-    if (inlined.lines.length > 0 || area.subareaClients.length > 0) {
-      const fetchModifier = inlined.lines.length > 0 ? "private " : "";
-      lines.push(`    constructor(${fetchModifier}fetch: SdkFetch) {`);
-      for (const sc of area.subareaClients) {
-        lines.push(`        this.${sc.propertyName} = new ${sc.client.className}(fetch);`);
-      }
-      lines.push("    }");
-    }
-    for (const ln of inlined.lines) lines.push(ln);
-    lines.push("}");
-    lines.push("");
-  }
   lines.push(`export class ${sdkClassName} {`);
   for (const area of input.areas) {
-    lines.push(`    readonly ${deriveAreaPropertyName(area.area)}: ${deriveAreaClientClassName(area.area)};`);
+    lines.push(`    readonly ${deriveAreaPropertyName(area.area)}: ${area.client.className};`);
   }
   for (const c of input.topLevelClients) {
     lines.push(`    readonly ${c.propertyName}: ${c.className};`);
@@ -2691,7 +2694,7 @@ function generateSdkAggregator(input) {
   lines.push("    constructor(options: SdkOptions) {");
   lines.push("        const sdkFetch = options.fetch ?? createSdkFetch(options);");
   for (const area of input.areas) {
-    lines.push(`        this.${deriveAreaPropertyName(area.area)} = new ${deriveAreaClientClassName(area.area)}(sdkFetch);`);
+    lines.push(`        this.${deriveAreaPropertyName(area.area)} = new ${area.client.className}(sdkFetch);`);
   }
   for (const c of input.topLevelClients) {
     lines.push(`        this.${c.propertyName} = new ${c.className}(sdkFetch);`);
@@ -3017,6 +3020,34 @@ function computeSdkOutPath(filePath, rootDir, clientOutput, commonRoot, meta = {
   return join(baseOutDir, relDir, defaultOutName);
 }
 __name(computeSdkOutPath, "computeSdkOutPath");
+function computeSdkAreaClientOutPath(area, rootDir, clientOutput) {
+  const filename = area;
+  const baseOutDir = resolve(rootDir);
+  const fixHiddenSegment = /* @__PURE__ */ __name((path) => {
+    const segments = path.split("/");
+    const last = segments[segments.length - 1] ?? "";
+    if (last.startsWith(".")) segments[segments.length - 1] = `${filename}${last}`;
+    return segments.join("/");
+  }, "fixHiddenSegment");
+  if (clientOutput && TEMPLATE_VAR_RE.test(clientOutput)) {
+    const resolved = resolveTemplate(clientOutput, {
+      filename,
+      dir: "",
+      ext: "ck",
+      area,
+      subarea: ""
+    });
+    const cleaned = fixHiddenSegment(resolved.replace(/\/+/g, "/").replace(/^\//, ""));
+    if (includesFilename(cleaned)) return join(baseOutDir, cleaned);
+    return join(baseOutDir, cleaned, `${filename}.client.ts`);
+  }
+  if (clientOutput) {
+    if (includesFilename(clientOutput)) return join(baseOutDir, clientOutput);
+    return join(baseOutDir, clientOutput, `${filename}.client.ts`);
+  }
+  return join(baseOutDir, `${filename}.client.ts`);
+}
+__name(computeSdkAreaClientOutPath, "computeSdkAreaClientOutPath");
 function computeSdkTypeOutPath(filePath, rootDir, typeOutput, commonRoot, meta = {}) {
   if (!filePath.endsWith(".ck")) return null;
   const baseName = filePath.split("/").pop();
@@ -3537,13 +3568,14 @@ function collectSdkOutput(config, rootDir, inputs, units, globalFiles) {
     content: generateSdkOptions()
   });
   const hasAnything = sdkClientInfos.length > 0 || areaBuckets.size > 0;
+  const areaClientOutPaths = /* @__PURE__ */ new Map();
   if (hasAnything) {
     const sdkEntryDir = dirname6(sdkEntryPath);
     const sdkOptionsRel = relative6(sdkEntryDir, sdkOptionsPath).replace(/\.ts$/, ".js");
     const sdkOptionsImportPath = sdkOptionsRel.startsWith(".") ? sdkOptionsRel : "./" + sdkOptionsRel;
     const sdkClassName = sdkName ? sdkName.split(/[-._\s]+/).map((s) => s.charAt(0).toUpperCase() + s.slice(1)).join("") + "Sdk" : "Sdk";
-    const toClientImport = /* @__PURE__ */ __name((info) => {
-      let rel = relative6(sdkEntryDir, info.outPath).replace(/\.ts$/, ".js");
+    const toClientImport = /* @__PURE__ */ __name((sourceDir, info) => {
+      let rel = relative6(sourceDir, info.outPath).replace(/\.ts$/, ".js");
       if (!rel.startsWith(".")) rel = "./" + rel;
       return {
         className: info.className,
@@ -3551,44 +3583,93 @@ function collectSdkOutput(config, rootDir, inputs, units, globalFiles) {
         importPath: rel
       };
     }, "toClientImport");
-    const topLevelClients = topLevelEntries.map((e) => ({
+    const topLevelClients = topLevelEntries.map((e) => toClientImport(sdkEntryDir, {
+      outPath: e.outPath,
       className: deriveClientClassName(e.ast.file),
-      propertyName: deriveClientPropertyName(e.ast.file),
-      importPath: (() => {
-        const rel = relative6(sdkEntryDir, e.outPath).replace(/\.ts$/, ".js");
-        return rel.startsWith(".") ? rel : "./" + rel;
-      })()
+      propertyName: deriveClientPropertyName(e.ast.file)
     }));
-    const areas = [
+    const areaInfos = [];
+    const sortedAreas = [
       ...areaBuckets.entries()
-    ].sort(([a], [b]) => a.localeCompare(b)).map(([area, bucket]) => ({
-      area,
-      inlineFiles: bucket.inlineRoots.map((root) => ({
+    ].sort(([a], [b]) => a.localeCompare(b));
+    for (const [area, bucket] of sortedAreas) {
+      const areaClientOutPath = computeSdkAreaClientOutPath(area, sdkBase, config.output.clients);
+      areaClientOutPaths.set(area, areaClientOutPath);
+      const areaClassName = deriveAreaClientClassName(area);
+      const areaPropertyName = deriveAreaPropertyName(area);
+      sdkClientInfos.push({
+        outPath: areaClientOutPath,
+        className: areaClassName,
+        propertyName: areaPropertyName
+      });
+      const subareaClients = bucket.leaves.sort((a, b) => a.subarea.localeCompare(b.subarea)).map((l) => ({
+        propertyName: deriveSubareaPropertyName(l.subarea),
+        client: toClientImport(dirname6(areaClientOutPath), {
+          outPath: l.outPath,
+          className: deriveSubareaClientClassName(area, l.subarea),
+          propertyName: deriveSubareaPropertyName(l.subarea)
+        })
+      }));
+      const allInlineRefs = /* @__PURE__ */ new Set();
+      for (const r of bucket.inlineRoots) {
+        for (const ref of collectOpRootRefs(r, modelMap)) allInlineRefs.add(ref);
+      }
+      const fingerprint = hashFingerprint({
+        kind: "sdk-area-client",
+        v: TYPESCRIPT_CODEGEN_VERSION,
+        outPath: areaClientOutPath,
+        area,
+        inlineRoots: bucket.inlineRoots,
+        subareaClients,
+        outPathSlice: sliceOutPathMap(allInlineRefs, sdkModelOutPaths, modelsWithInput, modelsWithOutput),
+        modelsWithInput: sliceModelSet(allInlineRefs, /* @__PURE__ */ new Set(), modelsWithInput),
+        modelsWithOutput: sliceModelSet(allInlineRefs, /* @__PURE__ */ new Set(), modelsWithOutput),
+        sdkOptionsPath,
+        includeInternal: config.includeInternal ?? false,
+        sub: subConfigKey
+      });
+      const inlineFilesForGen = bucket.inlineRoots.map((root) => ({
         root,
         codegenOptions: {
           typeImportPathTemplate: void 0,
-          outPath: sdkEntryPath,
+          outPath: areaClientOutPath,
           modelOutPaths: sdkModelOutPaths,
           sdkOptionsPath,
           modelsWithInput,
           modelsWithOutput,
           includeInternal: config.includeInternal
         }
-      })),
-      subareaClients: bucket.leaves.sort((a, b) => a.subarea.localeCompare(b.subarea)).map((l) => ({
-        propertyName: deriveSubareaPropertyName(l.subarea),
-        client: toClientImport({
-          outPath: l.outPath,
-          className: deriveSubareaClientClassName(area, l.subarea),
-          propertyName: deriveSubareaPropertyName(l.subarea)
+      }));
+      units.push({
+        key: `sdk-area-client::${areaClientOutPath}`,
+        fingerprint,
+        render: /* @__PURE__ */ __name(() => [
+          {
+            relativePath: areaClientOutPath,
+            content: generateAreaClient({
+              area,
+              outPath: areaClientOutPath,
+              inlineFiles: inlineFilesForGen,
+              subareaClients,
+              sdkOptionsPath
+            })
+          }
+        ], "render")
+      });
+      areaInfos.push({
+        area,
+        client: toClientImport(sdkEntryDir, {
+          outPath: areaClientOutPath,
+          className: areaClassName,
+          propertyName: areaPropertyName
         })
-      }))
-    }));
+      });
+    }
     globalFiles.push({
       relativePath: sdkEntryPath,
       content: generateSdkAggregator({
         topLevelClients,
-        areas,
+        areas: areaInfos,
         sdkOptionsImportPath,
         sdkClassName
       })