@contractkit/plugin-typescript 0.17.5 → 0.18.0

package/dist/index.js

@@ -1798,7 +1798,7 @@ function generateSdk(root, options = {}) {
   const lines = [];
   const includeInternal = options.includeInternal ?? false;
   const types = collectTypes2(root, options.modelsWithInput, options.modelsWithOutput, includeInternal);
-  const clientClassName = deriveClientClassName(root.file);
+  const clientClassName = options.clientClassName ?? deriveClientClassName(root.file);
   if (types.length > 0) {
     lines.push(...generateTypeImports2(types, root.file, options));
   }
@@ -1899,6 +1899,26 @@ function generateSdk(root, options = {}) {
   return lines.join("\n");
 }
 __name(generateSdk, "generateSdk");
+function generateClientMethods(root, options) {
+  const lines = [];
+  const methodNames = [];
+  const includeInternal = options.includeInternal ?? false;
+  for (const route of root.routes) {
+    for (const op of route.operations) {
+      const mods = resolveModifiers2(route, op);
+      if (!includeInternal && mods.includes("internal")) continue;
+      lines.push("");
+      if (mods.includes("deprecated")) lines.push("    /** @deprecated */");
+      lines.push(...generateMethod(route, op, root.file, options));
+      methodNames.push(deriveMethodName(op, route));
+    }
+  }
+  return {
+    lines,
+    methodNames
+  };
+}
+__name(generateClientMethods, "generateClientMethods");
 function generateMethod(route, op, file, options) {
   const lines = [];
   const methodName = deriveMethodName(op, route);
@@ -2202,6 +2222,38 @@ function deriveClientPropertyName(file) {
   return base.charAt(0).toLowerCase() + base.slice(1);
 }
 __name(deriveClientPropertyName, "deriveClientPropertyName");
+function getAreaSubarea(root) {
+  return {
+    area: root.meta?.area,
+    subarea: root.meta?.subarea
+  };
+}
+__name(getAreaSubarea, "getAreaSubarea");
+function pascal(value) {
+  return value.split(/[-_\s]+/).filter(Boolean).map((s) => s.charAt(0).toUpperCase() + s.slice(1)).join("");
+}
+__name(pascal, "pascal");
+function camel(value) {
+  const p = pascal(value);
+  return p.charAt(0).toLowerCase() + p.slice(1);
+}
+__name(camel, "camel");
+function deriveAreaClientClassName(area) {
+  return `${pascal(area)}Client`;
+}
+__name(deriveAreaClientClassName, "deriveAreaClientClassName");
+function deriveAreaPropertyName(area) {
+  return camel(area);
+}
+__name(deriveAreaPropertyName, "deriveAreaPropertyName");
+function deriveSubareaClientClassName(area, subarea) {
+  return `${pascal(area)}${pascal(subarea)}Client`;
+}
+__name(deriveSubareaClientClassName, "deriveSubareaClientClassName");
+function deriveSubareaPropertyName(subarea) {
+  return camel(subarea);
+}
+__name(deriveSubareaPropertyName, "deriveSubareaPropertyName");
 function collectTypes2(root, modelsWithInput, modelsWithOutput, includeInternal = false) {
   const types = /* @__PURE__ */ new Set();
   for (const route of root.routes) {
@@ -2516,22 +2568,128 @@ function generateSdkOptions() {
   ].join("\n");
 }
 __name(generateSdkOptions, "generateSdkOptions");
-function generateSdkAggregator(clients, sdkOptionsImportPath = "./sdk-options.js", sdkClassName = "Sdk") {
+function generateSdkAggregator(input) {
+  const sdkOptionsImportPath = input.sdkOptionsImportPath ?? "./sdk-options.js";
+  const sdkClassName = input.sdkClassName ?? "Sdk";
+  const inlinedByArea = /* @__PURE__ */ new Map();
+  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);
+      }
+      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);
+          }
+        }
+      }
+    }
+    inlinedByArea.set(area.area, {
+      lines: collected,
+      methodNames: seenMethods
+    });
+  }
   const lines = [];
+  const jsonImport = needsJson ? ", JsonValue" : "";
+  lines.push(`import type { SdkFetch${jsonImport} } from '${sdkOptionsImportPath}';`);
+  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 type { SdkOptions } from '${sdkOptionsImportPath}';`);
   lines.push(`import { createSdkFetch } from '${sdkOptionsImportPath}';`);
-  for (const c of clients) {
+  const typeImportPaths = [
+    ...typesByImportPath.keys()
+  ].sort();
+  for (const path of typeImportPaths) {
+    const names = [
+      ...typesByImportPath.get(path)
+    ].sort();
+    lines.push(`import type { ${names.join(", ")} } from '${path}';`);
+  }
+  for (const t of [
+    ...unresolvedTypes
+  ].sort()) {
+    lines.push(`import type { ${t} } from './${pascalToDotCase(t)}.js';`);
+  }
+  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 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 c of clients) {
+  for (const area of input.areas) {
+    lines.push(`    readonly ${deriveAreaPropertyName(area.area)}: ${deriveAreaClientClassName(area.area)};`);
+  }
+  for (const c of input.topLevelClients) {
     lines.push(`    readonly ${c.propertyName}: ${c.className};`);
   }
   lines.push("");
   lines.push("    constructor(options: SdkOptions) {");
   lines.push("        const sdkFetch = options.fetch ?? createSdkFetch(options);");
-  for (const c of clients) {
+  for (const area of input.areas) {
+    lines.push(`        this.${deriveAreaPropertyName(area.area)} = new ${deriveAreaClientClassName(area.area)}(sdkFetch);`);
+  }
+  for (const c of input.topLevelClients) {
     lines.push(`        this.${c.propertyName} = new ${c.className}(sdkFetch);`);
   }
   lines.push("    }");
@@ -3059,18 +3217,71 @@ function runSdkGeneration(config, rootDir, inputs, emitFile) {
       emitFile(typeOutPath, content);
     }
   }
+  const areaBuckets = /* @__PURE__ */ new Map();
+  const topLevelEntries = [];
   if (config.output?.clients) {
     for (const ast of inputs.opRoots) {
       const sdkOutPath = computeSdkOutPath(ast.file, sdkBase, config.output.clients, ckCommonRoot, ast.meta);
       if (!sdkOutPath || !hasPublicOperations(ast, config.includeInternal)) continue;
+      const { area, subarea } = getAreaSubarea(ast);
+      if (area && subarea) {
+        const bucket = areaBuckets.get(area) ?? {
+          leaves: [],
+          inlineRoots: []
+        };
+        bucket.leaves.push({
+          ast,
+          outPath: sdkOutPath,
+          subarea
+        });
+        areaBuckets.set(area, bucket);
+      } else if (area) {
+        const bucket = areaBuckets.get(area) ?? {
+          leaves: [],
+          inlineRoots: []
+        };
+        bucket.inlineRoots.push(ast);
+        areaBuckets.set(area, bucket);
+      } else {
+        topLevelEntries.push({
+          ast,
+          outPath: sdkOutPath
+        });
+      }
+    }
+    for (const { ast, outPath, subarea } of [
+      ...areaBuckets.entries()
+    ].flatMap(([area, b]) => b.leaves.map((l) => ({
+      ...l,
+      area
+    })))) {
+      const className = deriveSubareaClientClassName(ast.meta?.area ?? "", subarea);
+      sdkClientInfos.push({
+        outPath,
+        className,
+        propertyName: deriveSubareaPropertyName(subarea)
+      });
+      emitFile(outPath, generateSdk(ast, {
+        typeImportPathTemplate: void 0,
+        outPath,
+        modelOutPaths: sdkModelOutPaths,
+        sdkOptionsPath,
+        modelsWithInput,
+        modelsWithOutput,
+        includeInternal: config.includeInternal,
+        clientClassName: className
+      }));
+    }
+    for (const { ast, outPath } of topLevelEntries) {
+      const className = deriveClientClassName(ast.file);
       sdkClientInfos.push({
-        outPath: sdkOutPath,
-        className: deriveClientClassName(ast.file),
+        outPath,
+        className,
         propertyName: deriveClientPropertyName(ast.file)
       });
-      emitFile(sdkOutPath, generateSdk(ast, {
+      emitFile(outPath, generateSdk(ast, {
         typeImportPathTemplate: void 0,
-        outPath: sdkOutPath,
+        outPath,
         modelOutPaths: sdkModelOutPaths,
         sdkOptionsPath,
         modelsWithInput,
@@ -3080,20 +3291,60 @@ function runSdkGeneration(config, rootDir, inputs, emitFile) {
     }
   }
   emitFile(sdkOptionsPath, generateSdkOptions());
-  if (sdkClientInfos.length > 0) {
+  const hasAnything = sdkClientInfos.length > 0 || areaBuckets.size > 0;
+  if (hasAnything) {
     const sdkEntryDir = dirname6(sdkEntryPath);
-    const clients = sdkClientInfos.map((c) => {
-      let rel = relative6(sdkEntryDir, c.outPath).replace(/\.ts$/, ".js");
+    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");
       if (!rel.startsWith(".")) rel = "./" + rel;
       return {
-        className: c.className,
-        propertyName: c.propertyName,
+        className: info.className,
+        propertyName: info.propertyName,
         importPath: rel
       };
-    });
-    const sdkOptionsRel = relative6(sdkEntryDir, sdkOptionsPath).replace(/\.ts$/, ".js");
-    const sdkClassName = sdkName ? sdkName.split(/[-._\s]+/).map((s) => s.charAt(0).toUpperCase() + s.slice(1)).join("") + "Sdk" : "Sdk";
-    emitFile(sdkEntryPath, generateSdkAggregator(clients, sdkOptionsRel.startsWith(".") ? sdkOptionsRel : "./" + sdkOptionsRel, sdkClassName));
+    }, "toClientImport");
+    const topLevelClients = topLevelEntries.map((e) => ({
+      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;
+      })()
+    }));
+    const areas = [
+      ...areaBuckets.entries()
+    ].sort(([a], [b]) => a.localeCompare(b)).map(([area, bucket]) => ({
+      area,
+      inlineFiles: bucket.inlineRoots.map((root) => ({
+        root,
+        codegenOptions: {
+          typeImportPathTemplate: void 0,
+          outPath: sdkEntryPath,
+          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)
+        })
+      }))
+    }));
+    emitFile(sdkEntryPath, generateSdkAggregator({
+      topLevelClients,
+      areas,
+      sdkOptionsImportPath,
+      sdkClassName
+    }));
   }
   const sdkSrcDir = dirname6(sdkEntryPath);
   const sdkTypeBarrels = generateBarrelFiles(sdkTypePaths);
@@ -3101,7 +3352,7 @@ function runSdkGeneration(config, rootDir, inputs, emitFile) {
   const rootExports = [
     `export * from './${basename3(sdkOptionsPath).replace(/\.ts$/, ".js")}';`
   ];
-  if (sdkClientInfos.length > 0) {
+  if (hasAnything) {
     rootExports.push(`export * from './${basename3(sdkEntryPath).replace(/\.ts$/, ".js")}';`);
   }
   for (const c of sdkClientInfos) {