@contractkit/plugin-typescript 0.26.0 → 0.28.0

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACR,iBAAiB,EAQpB,MAAM,mBAAmB,CAAC;AA0C3B,MAAM,WAAW,YAAY;IACzB,wFAAwF;IACxF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,6HAA6H;IAC7H,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE;QACL,8EAA8E;QAC9E,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,+EAA+E;QAC/E,KAAK,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,wDAAwD;IACxD,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,wEAAwE;IACxE,eAAe,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,SAAS;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE;QACL,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,OAAO,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,eAAe,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,SAAS;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,WAAW;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,sBAAsB;IACnC,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,WAAW,CAAC;CACvB;AAID,yGAAyG;AACzG,eAAO,MAAM,0BAA0B,MAAM,CAAC;AAO9C,QAAA,MAAM,MAAM,EAAE,iBAMb,CAAC;AAEF,eAAe,MAAM,CAAC;AAEtB,2GAA2G;AAC3G,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,sBAAsB,EAAE,OAAO,EAAE,MAAM,GAAG,iBAAiB,CAOzG"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACR,iBAAiB,EAQpB,MAAM,mBAAmB,CAAC;AA6C3B,MAAM,WAAW,YAAY;IACzB,wFAAwF;IACxF,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,6HAA6H;IAC7H,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE;QACL,8EAA8E;QAC9E,MAAM,CAAC,EAAE,MAAM,CAAC;QAChB,+EAA+E;QAC/E,KAAK,CAAC,EAAE,MAAM,CAAC;KAClB,CAAC;IACF,wDAAwD;IACxD,mBAAmB,CAAC,EAAE,MAAM,CAAC;IAC7B,wEAAwE;IACxE,eAAe,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,SAAS;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,CAAC,EAAE;QACL,GAAG,CAAC,EAAE,MAAM,CAAC;QACb,KAAK,CAAC,EAAE,MAAM,CAAC;QACf,OAAO,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IACF,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,SAAS;IACtB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,WAAW;IACxB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,MAAM,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,sBAAsB;IACnC,MAAM,CAAC,EAAE,YAAY,CAAC;IACtB,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,GAAG,CAAC,EAAE,SAAS,CAAC;IAChB,KAAK,CAAC,EAAE,WAAW,CAAC;CACvB;AAID,yGAAyG;AACzG,eAAO,MAAM,0BAA0B,MAAM,CAAC;AAO9C,QAAA,MAAM,MAAM,EAAE,iBAMb,CAAC;AAEF,eAAe,MAAM,CAAC;AAEtB,2GAA2G;AAC3G,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,sBAAsB,EAAE,OAAO,EAAE,MAAM,GAAG,iBAAiB,CAOzG"}

package/dist/index.js

@@ -1283,13 +1283,13 @@ function generateHandler(route, op, root, options) {
   lines.push(...generateParamValidation(op.headers, "ctx.headers", "headers", op.headersMode ?? "strip", "", modelsWithInput));
   if (hasBody && op.request) {
     if (isSingleMultipart) {
-      lines.push(`    const multipartBody = ctx.body as MultipartBody;`);
+      lines.push(`    const multipartBody = ctx.parsedBody as MultipartBody;`);
       lines.push("");
     } else if (bodies.length === 1) {
-      lines.push(`    const body = await parseAndValidate(ctx.body, ${renderInputType(bodies[0].bodyType, modelsWithInput)});`);
+      lines.push(`    const body = await parseAndValidate(ctx.parsedBody, ${renderInputType(bodies[0].bodyType, modelsWithInput)});`);
       lines.push("");
     } else if (bodies.every((b) => bodyTypesStructurallyEqual(b.bodyType, bodies[0].bodyType))) {
-      lines.push(`    const body = await parseAndValidate(ctx.body, ${renderInputType(bodies[0].bodyType, modelsWithInput)});`);
+      lines.push(`    const body = await parseAndValidate(ctx.parsedBody, ${renderInputType(bodies[0].bodyType, modelsWithInput)});`);
       lines.push("");
     } else {
       const annotation = bodies.map((b) => b.contentType === "multipart/form-data" ? "MultipartBody" : `z.infer<typeof ${renderInputType(b.bodyType, modelsWithInput)}>`).join(" | ");
@@ -1298,9 +1298,9 @@ function generateHandler(route, op, root, options) {
       for (const b of bodies) {
         lines.push(`        case '${b.contentType}':`);
         if (b.contentType === "multipart/form-data") {
-          lines.push(`            body = ctx.body as MultipartBody;`);
+          lines.push(`            body = ctx.parsedBody as MultipartBody;`);
         } else {
-          lines.push(`            body = await parseAndValidate(ctx.body, ${renderInputType(b.bodyType, modelsWithInput)});`);
+          lines.push(`            body = await parseAndValidate(ctx.parsedBody, ${renderInputType(b.bodyType, modelsWithInput)});`);
         }
         lines.push(`            break;`);
       }
@@ -2590,6 +2590,71 @@ function generateSdkOptions() {
   ].join("\n");
 }
 __name(generateSdkOptions, "generateSdkOptions");
+var SCAFFOLD_DEP_VERSIONS = {
+  zod: "^4.3.6",
+  luxon: "^3.5.0",
+  typesLuxon: "^3.4.2",
+  typescript: "^6.0.3"
+};
+function generateSdkPackageJson(input) {
+  const dependencies = {};
+  if (input.deps.zod) dependencies.zod = SCAFFOLD_DEP_VERSIONS.zod;
+  if (input.deps.luxon) dependencies.luxon = SCAFFOLD_DEP_VERSIONS.luxon;
+  const devDependencies = {
+    typescript: SCAFFOLD_DEP_VERSIONS.typescript
+  };
+  if (input.deps.luxon) devDependencies["@types/luxon"] = SCAFFOLD_DEP_VERSIONS.typesLuxon;
+  const pkg = {
+    name: input.name,
+    version: "0.0.0",
+    type: "module",
+    main: "./dist/index.js",
+    types: "./dist/index.d.ts",
+    exports: {
+      ".": {
+        types: "./dist/index.d.ts",
+        import: "./dist/index.js"
+      }
+    },
+    files: [
+      "dist"
+    ],
+    scripts: {
+      build: "tsc -p tsconfig.json"
+    },
+    ...Object.keys(dependencies).length > 0 ? {
+      dependencies
+    } : {},
+    devDependencies
+  };
+  return JSON.stringify(pkg, null, 4) + "\n";
+}
+__name(generateSdkPackageJson, "generateSdkPackageJson");
+function generateSdkTsconfig() {
+  const tsconfig = {
+    compilerOptions: {
+      target: "ES2022",
+      module: "NodeNext",
+      moduleResolution: "NodeNext",
+      declaration: true,
+      outDir: "./dist",
+      rootDir: "./src",
+      strict: true,
+      esModuleInterop: true,
+      skipLibCheck: true,
+      forceConsistentCasingInFileNames: true
+    },
+    include: [
+      "src"
+    ],
+    exclude: [
+      "dist",
+      "node_modules"
+    ]
+  };
+  return JSON.stringify(tsconfig, null, 4) + "\n";
+}
+__name(generateSdkTsconfig, "generateSdkTsconfig");
 function generateAreaClient(input) {
   const { area, outPath, inlineFiles, subareaClients, sdkOptionsPath } = input;
   const className = deriveAreaClientClassName(area);
@@ -3193,8 +3258,10 @@ async function runTypescriptCodegen(inputs, ctx, config, rootDir) {
     fileExists: existsSync
   });
   deleteStalePaths(result.deletedPaths);
-  for (const { relativePath, content } of result.filesToWrite) {
-    ctx.emitFile(relativePath, content);
+  for (const { relativePath, content, ifAbsent } of result.filesToWrite) {
+    ctx.emitFile(relativePath, content, ifAbsent ? {
+      ifAbsent: true
+    } : void 0);
   }
   writeManifest(manifestPath, result.manifest);
 }
@@ -3719,6 +3786,26 @@ function collectSdkOutput(config, rootDir, inputs, units, globalFiles) {
 ${rootExports.sort().join("\n")}
 `
   });
+  if (config.scaffold) {
+    const coveredRoots = sdkContractEntries.map((e) => e.ast);
+    const deps = {
+      zod: !!config.zod,
+      luxon: coveredRoots.some((r) => rootNeedsScalar(r, "datetime") || rootNeedsScalar(r, "date") || rootNeedsScalar(r, "time") || rootNeedsScalar(r, "interval"))
+    };
+    globalFiles.push({
+      relativePath: join2(sdkBase, "package.json"),
+      content: generateSdkPackageJson({
+        name: sdkName ?? "sdk",
+        deps
+      }),
+      ifAbsent: true
+    });
+    globalFiles.push({
+      relativePath: join2(sdkBase, "tsconfig.json"),
+      content: generateSdkTsconfig(),
+      ifAbsent: true
+    });
+  }
 }
 __name(collectSdkOutput, "collectSdkOutput");
 function collectZodOutput(config, rootDir, inputs, units) {