@sdk-it/typescript 0.29.0 → 0.30.0

package/dist/index.js

@@ -11,11 +11,11 @@ import {
   writeFiles
 } from "@sdk-it/core/file-system.js";
 import {
-  augmentSpec,
   cleanFiles,
   readWriteMetadata,
   sanitizeTag as sanitizeTag4,
-  securityToOptions as securityToOptions2
+  securityToOptions as securityToOptions2,
+  toIR
 } from "@sdk-it/spec";
 
 // packages/typescript/src/lib/agent/ai-sdk.ts
@@ -47,8 +47,7 @@ function createTool(entry, operation) {
       inputSchema: schemas.${schemaName},
 			execute: async (input) => {
 				console.log('Executing ${operation.operationId} tool with input:', input);
-        const client = context.client;
-        const response = await client.request(
+        const response = await context.client.request(
           '${entry.method.toUpperCase()} ${entry.path}' ,
           input as any,
         );
@@ -959,28 +958,10 @@ function generateCode(config) {
       "text/plain": "text"
     };
     for (const type in operation.requestBody.content) {
-      const { objectSchema, xProperties, xRequired } = coearceRequestInput(
-        config.spec,
-        operation,
-        type
+      schemas[shortContenTypeMap[type]] = zodDeserialzer.handle(
+        operationSchema(config.spec, operation, type),
+        true
       );
-      const additionalProperties = {};
-      for (const [name, prop] of Object.entries(xProperties)) {
-        additionalProperties[name] = {
-          name,
-          required: xRequired?.includes(name),
-          schema: prop,
-          in: prop["x-in"]
-        };
-      }
-      const schema = merge({}, objectSchema, {
-        required: Object.values(additionalProperties).filter((p) => p.required).map((p) => p.name),
-        properties: Object.entries(additionalProperties).reduce(
-          (acc, [, p]) => ({ ...acc, [p.name]: p.schema }),
-          {}
-        )
-      });
-      schemas[shortContenTypeMap[type]] = zodDeserialzer.handle(schema, true);
     }
     const details = buildInput(config.spec, operation);
     const endpoint = toEndpoint(
@@ -1107,7 +1088,7 @@ function bodyInputs(spec, ctSchema) {
     {}
   );
 }
-var contentTypeMap = {
+var contentTypeSerializerMap = {
   "application/json": "json",
   "application/x-www-form-urlencoded": "urlencoded",
   "multipart/form-data": "formdata",
@@ -1115,10 +1096,13 @@ var contentTypeMap = {
   "text/plain": "text",
   "application/empty": "empty"
 };
+var serializerContentTypeMap = Object.fromEntries(
+  Object.entries(contentTypeSerializerMap).map(([k, v]) => [v, k])
+);
 function buildInput(spec, operation) {
   const inputs = {};
   let outgoingContentType = "empty";
-  for (const [ct, value] of Object.entries(contentTypeMap)) {
+  for (const [ct, value] of Object.entries(contentTypeSerializerMap)) {
     if (operation.requestBody.content[ct]) {
       outgoingContentType = value;
       const { objectSchema, xProperties } = coearceRequestInput(
@@ -1138,9 +1122,33 @@ function buildInput(spec, operation) {
   }
   return {
     inputs,
-    outgoingContentType
+    outgoingContentType,
+    ct: serializerContentTypeMap[outgoingContentType]
   };
 }
+function operationSchema(ir, operation, type) {
+  const { objectSchema, xProperties, xRequired } = coearceRequestInput(
+    ir,
+    operation,
+    type
+  );
+  const additionalProperties = {};
+  for (const [name, prop] of Object.entries(xProperties)) {
+    additionalProperties[name] = {
+      name,
+      required: xRequired?.includes(name),
+      schema: prop,
+      in: prop["x-in"]
+    };
+  }
+  return merge({}, objectSchema, {
+    required: Object.values(additionalProperties).filter((p) => p.required).map((p) => p.name),
+    properties: Object.entries(additionalProperties).reduce(
+      (acc, [, p]) => ({ ...acc, [p.name]: p.schema }),
+      {}
+    )
+  });
+}
 
 // packages/typescript/src/lib/http/dispatcher.txt
 var dispatcher_default = "export type Unionize<T> = T extends [infer Single extends OutputType]\n  ? InstanceType<Single>\n  : T extends readonly [...infer Tuple extends OutputType[]]\n    ? { [I in keyof Tuple]: InstanceType<Tuple[I]> }[number]\n    : never;\n\nexport type InstanceType<T> =\n  T extends Type<infer U>\n    ? U\n    : T extends { type: Type<infer U> }\n      ? U\n      : T extends Array<unknown>\n        ? Unionize<T>\n        : never;\n\nexport interface Type<T> {\n  new (...args: any[]): T;\n}\nexport type Parser = (\n  response: Response,\n) => Promise<unknown> | ReadableStream<any>;\nexport type OutputType =\n  | Type<APIResponse>\n  | { parser: Parser; type: Type<APIResponse> };\n\nexport const fetchType = z\n  .function()\n  .args(z.instanceof(Request))\n  .returns(z.promise(z.instanceof(Response)))\n  .optional();\n\nexport async function parse<T extends OutputType[]>(\n  outputs: T,\n  response: Response,\n) <% if(!throwError) { %>\n: Promise<\n  [\n    Extract<InstanceType<T>, SuccessfulResponse>['data'],\n    Extract<InstanceType<T>, ProblematicResponse>['data'],\n  ]\n>\n  <% } %>\n\n\n\n {\n  let output: typeof APIResponse | null = null;\n  let parser: Parser = buffered;\n  for (const outputType of outputs) {\n    if ('parser' in outputType) {\n      parser = outputType.parser;\n      if (isTypeOf(outputType.type, APIResponse)) {\n        if (response.status === outputType.type.status) {\n          output = outputType.type;\n          break;\n        }\n      }\n    } else if (isTypeOf(outputType, APIResponse)) {\n      if (response.status === outputType.status) {\n        output = outputType;\n        break;\n      }\n    }\n  }\n\n\n  if (response.ok) {\n    const apiresponse = (output || APIResponse).create(\n      response.status,\n      await parser(response),\n    );\n    <% if(throwError) { %>\n      return <% if (outputType === 'default') { %>apiresponse as Extract<InstanceType<T>, SuccessfulResponse><% } else { %>apiresponse as Extract<InstanceType<T>, SuccessfulResponse>;<% } %>;\n    <% } else { %>\n      return [<% if (outputType === 'default') { %>apiresponse.data as Extract<InstanceType<T>, SuccessfulResponse>['data']<% } else { %>apiresponse as Extract<InstanceType<T>, SuccessfulResponse><% } %>, null] as const;\n    <% } %>\n  }\n<% if(throwError) { %>\n  throw (output || APIError).create(\n    response.status,\n    await parser(response),\n  );\n<% } else { %>\n  const data = (output || APIError).create(\n    response.status,\n    await parser(response),\n  );\n  return [null, data] as const;\n<% } %>\n}\n\nexport function isTypeOf<T extends Type<APIResponse>>(\n  instance: any,\n  baseType: T,\n): instance is T {\n  if (instance === baseType) {\n    return true;\n  }\n  const prototype = Object.getPrototypeOf(instance);\n  if (prototype === null) {\n    return false;\n  }\n  return isTypeOf(prototype, baseType);\n}\n\nexport class Dispatcher {\n  #interceptors: Interceptor[] = [];\n  #fetch: z.infer<typeof fetchType>;\n  constructor(interceptors: Interceptor[], fetch?: z.infer<typeof fetchType>) {\n    this.#interceptors = interceptors;\n    this.#fetch = fetch;\n  }\n\n  async send<T extends OutputType[]>(\n    config: RequestConfig,\n    outputs: T,\n    signal?: AbortSignal,\n  ) {\n    for (const interceptor of this.#interceptors) {\n      if (interceptor.before) {\n        config = await interceptor.before(config);\n      }\n    }\n\n    let response = await (this.#fetch ?? fetch)(\n      new Request(config.url, config.init),\n      {\n        ...config.init,\n        signal: signal,\n      },\n    );\n\n    for (let i = this.#interceptors.length - 1; i >= 0; i--) {\n      const interceptor = this.#interceptors[i];\n      if (interceptor.after) {\n        response = await interceptor.after(response.clone());\n      }\n    }\n\n    return await parse(outputs, response);\n  }\n}\n";
@@ -2188,13 +2196,11 @@ var SnippetEmitter = class {
 // packages/typescript/src/lib/typescript-snippet.ts
 var TypeScriptSnippet = class {
   #spec;
-  #settings;
   #snippetEmitter;
   #clientName;
   #packageName;
   constructor(spec, settings) {
     this.#spec = spec;
-    this.#settings = settings;
     this.#snippetEmitter = new SnippetEmitter(spec);
     this.#clientName = settings.name?.trim() ? pascalcase4(settings.name) : "Client";
     this.#packageName = settings.name ? `@${spinalcase3(this.#clientName.toLowerCase())}/sdk` : "sdk";
@@ -2941,7 +2947,7 @@ function security(spec) {
   return options;
 }
 async function generate(openapi, settings) {
-  const spec = augmentSpec(
+  const spec = toIR(
     {
       spec: openapi,
       responses: { flattenErrorResponses: true },
@@ -3254,6 +3260,7 @@ export {
   generate,
   generateCode,
   inputToPath,
+  operationSchema,
   toEndpoint,
   toHttpOutput,
   toInputs