@sdk-it/typescript 0.42.1 → 0.43.0

package/dist/index.js

@@ -614,7 +614,7 @@ export async function prepare<const E extends keyof typeof schemas>(
 };
 
 // packages/typescript/src/lib/emitters/interface.ts
-import { followRef as followRef2, isRef as isRef2, parseRef as parseRef2, pascalcase as pascalcase2 } from "@sdk-it/core";
+import { followRef as followRef2, isRef as isRef2, parseRef as parseRef2, pascalcase as pascalcase2, resolveRef } from "@sdk-it/core";
 import { isPrimitiveSchema as isPrimitiveSchema2, sanitizeTag as sanitizeTag2 } from "@sdk-it/spec";
 var TypeScriptEmitter = class {
   #spec;
@@ -692,7 +692,23 @@ var TypeScriptEmitter = class {
     return allOfTypes.length > 1 ? `${allOfTypes.join(" & ")}` : allOfTypes[0];
   }
   oneOf(schemas, required) {
-    const oneOfTypes = schemas.map((sub) => this.handle(sub, true));
+    const isBareString = (s) => {
+      const r = resolveRef(this.#spec, s);
+      return r.type === "string" && !r.enum && !r.const && !r.format;
+    };
+    const isStringLiteral = (s) => {
+      const r = resolveRef(this.#spec, s);
+      return Array.isArray(r.enum) && r.enum.every((v) => typeof v === "string") || typeof r.const === "string";
+    };
+    const hasStringLiteral = schemas.some(isStringLiteral);
+    const seen = /* @__PURE__ */ new Set();
+    const oneOfTypes = [];
+    for (const sub of schemas) {
+      const part = hasStringLiteral && isBareString(sub) ? "(string & {})" : this.handle(sub, true);
+      if (seen.has(part)) continue;
+      seen.add(part);
+      oneOfTypes.push(part);
+    }
     return appendOptional2(
       oneOfTypes.length > 1 ? `${oneOfTypes.join(" | ")}` : oneOfTypes[0],
       required
@@ -784,7 +800,7 @@ function appendOptional2(type, isRequired) {
 import { merge, template } from "lodash-es";
 import { join } from "node:path";
 import { camelcase as camelcase4, spinalcase as spinalcase2 } from "stringcase";
-import { followRef as followRef3, isEmpty as isEmpty2, isRef as isRef3, resolveRef, sortArray } from "@sdk-it/core";
+import { followRef as followRef3, isEmpty as isEmpty2, isRef as isRef3, resolveRef as resolveRef2, sortArray } from "@sdk-it/core";
 import {
   forEachOperation as forEachOperation3
 } from "@sdk-it/spec";
@@ -804,6 +820,69 @@ import {
 // packages/typescript/src/lib/import-utilities.ts
 import { removeDuplicates } from "@sdk-it/core";
 
+// packages/typescript/src/lib/pagination-emit.ts
+function describe(p) {
+  switch (p.type) {
+    case "offset":
+      return {
+        className: "OffsetPagination",
+        items: p.items,
+        hasMore: p.hasMore,
+        statusCode: p.statusCode,
+        sameInputNames: p.limitParamName === "limit" && p.offsetParamName === "offset",
+        initialOverride: `limit: input.${p.limitParamName}, offset: input.${p.offsetParamName}`,
+        nextPageMapping: `${p.offsetParamName}: nextPageParams.offset, ${p.limitParamName}: nextPageParams.limit`
+      };
+    case "cursor":
+      return {
+        className: "CursorPagination",
+        items: p.items,
+        hasMore: p.hasMore,
+        statusCode: p.statusCode,
+        sameInputNames: p.cursorParamName === "cursor",
+        initialOverride: `cursor: input.${p.cursorParamName}`,
+        nextPageMapping: `${p.cursorParamName}: nextPageParams.cursor`
+      };
+    case "page":
+      return {
+        className: "Pagination",
+        items: p.items,
+        hasMore: p.hasMore,
+        statusCode: p.statusCode,
+        sameInputNames: p.pageNumberParamName === "page" && p.pageSizeParamName === "pageSize",
+        initialOverride: `page: input.${p.pageNumberParamName}, pageSize: input.${p.pageSizeParamName}`,
+        nextPageMapping: `${p.pageNumberParamName}: nextPageParams.page, ${p.pageSizeParamName}: nextPageParams.pageSize`
+      };
+  }
+  throw new Error(
+    `Unknown pagination type: ${p.type}`
+  );
+}
+function paginationOperation(pagination) {
+  const shape = describe(pagination);
+  const initialParams = shape.sameInputNames ? "input" : `{...input, ${shape.initialOverride}}`;
+  const nextPageParams = shape.sameInputNames ? "...nextPageParams" : shape.nextPageMapping;
+  return `{
+      const pagination = new ${shape.className}(${initialParams}, async (nextPageParams, requestOptions) => {
+        const dispatcher = new Dispatcher(options.interceptors, options.fetch);
+        const result = await dispatcher.send(
+          this.toRequest({...input, ${nextPageParams}}),
+          this.output,
+          requestOptions?.signal ?? options.signal,
+        );
+        if (result.status !== ${shape.statusCode}) { throw result; }
+        return {
+          data: result.data.${shape.items},
+          meta: {
+            hasMore: Boolean(result.data.${shape.hasMore}),
+          },
+        };
+      }, { signal: options.signal });
+      await pagination.getNextPage();
+      return pagination
+    }}`;
+}
+
 // packages/typescript/src/lib/status-map.ts
 var status_map_default = {
   "200": "Ok",
@@ -868,7 +947,7 @@ function toEndpoint(groupName, spec, specOperation, operation) {
             signal?: AbortSignal;
             interceptors: Interceptor[];
             fetch: z.infer<typeof fetchType>;
-          })${specOperation["x-pagination"] ? paginationOperation(specOperation) : normalOperation()}`
+          })${specOperation["x-pagination"] ? paginationOperation(specOperation["x-pagination"]) : normalOperation()}`
     );
   }
   return { schemas };
@@ -880,83 +959,6 @@ function normalOperation() {
             },
           }`;
 }
-function paginationOperation(operation) {
-  const pagination = operation["x-pagination"];
-  const data = `result.data`;
-  const returnValue = `pagination`;
-  if (pagination.type === "offset") {
-    const sameInputNames = pagination.limitParamName === "limit" && pagination.offsetParamName === "offset";
-    const initialParams = sameInputNames ? "input" : `{...input, limit: input.${pagination.limitParamName}, offset: input.${pagination.offsetParamName}}`;
-    const nextPageParams = sameInputNames ? "...nextPageParams" : `${pagination.offsetParamName}: nextPageParams.offset, ${pagination.limitParamName}: nextPageParams.limit`;
-    const logic = `const pagination = new OffsetPagination(${initialParams}, async (nextPageParams, requestOptions) => {
-        const dispatcher = new Dispatcher(options.interceptors, options.fetch);
-        const result = await dispatcher.send(
-          this.toRequest({...input, ${nextPageParams}}),
-          this.output,
-          requestOptions?.signal ?? options.signal,
-        );
-        return {
-          data: ${data}.${pagination.items},
-          meta: {
-            hasMore: Boolean(${data}.${pagination.hasMore}),
-          },
-        };
-      }, { signal: options.signal });
-      await pagination.getNextPage();
-      return ${returnValue}
-      `;
-    return `{${logic}}}`;
-  }
-  if (pagination.type === "cursor") {
-    const sameInputNames = pagination.cursorParamName === "cursor";
-    const initialParams = sameInputNames ? "input" : `{...input, cursor: input.${pagination.cursorParamName}}`;
-    const nextPageParams = sameInputNames ? "...nextPageParams" : `${pagination.cursorParamName}: nextPageParams.cursor`;
-    const logic = `
-      const pagination = new CursorPagination(${initialParams}, async (nextPageParams, requestOptions) => {
-        const dispatcher = new Dispatcher(options.interceptors, options.fetch);
-        const result = await dispatcher.send(
-          this.toRequest({...input, ${nextPageParams}}),
-          this.output,
-          requestOptions?.signal ?? options.signal,
-        );
-        return {
-          data: ${data}.${pagination.items},
-          meta: {
-            hasMore: Boolean(${data}.${pagination.hasMore}),
-          },
-        };
-      }, { signal: options.signal });
-      await pagination.getNextPage();
-      return ${returnValue}
-      `;
-    return `{${logic}}}`;
-  }
-  if (pagination.type === "page") {
-    const sameInputNames = pagination.pageNumberParamName === "page" && pagination.pageSizeParamName === "pageSize";
-    const initialParams = sameInputNames ? "input" : `{...input, page: input.${pagination.pageNumberParamName}, pageSize: input.${pagination.pageSizeParamName}}`;
-    const nextPageParams = sameInputNames ? "...nextPageParams" : `${pagination.pageNumberParamName}: nextPageParams.page, ${pagination.pageSizeParamName}: nextPageParams.pageSize`;
-    const logic = `
-      const pagination = new Pagination(${initialParams}, async (nextPageParams, requestOptions) => {
-        const dispatcher = new Dispatcher(options.interceptors, options.fetch);
-        const result = await dispatcher.send(
-          this.toRequest({...input, ${nextPageParams}}),
-          this.output,
-          requestOptions?.signal ?? options.signal,
-        );
-        return {
-          data: ${data}.${pagination.items},
-          meta: {
-            hasMore: Boolean(${data}.${pagination.hasMore}),
-          },
-        };
-      }, { signal: options.signal });
-      await pagination.getNextPage();
-      return ${returnValue}
-      `;
-    return `{${logic}}}`;
-  }
-  return normalOperation();
-}
 function toHttpOutput(spec, operationName, status, response, withGenerics = true) {
   const typeScriptDeserialzer = new TypeScriptEmitter(spec);
   const interfaceName = pascalcase3(sanitizeTag3(response["x-response-name"]));
@@ -1077,7 +1079,7 @@ var endpoints_default = "type DispatchReturn<E extends keyof typeof schemas> = A
 
 // packages/typescript/src/lib/generator.ts
 function coearceRequestInput(spec, operation, type) {
-  let objectSchema = resolveRef(
+  let objectSchema = resolveRef2(
     spec,
     operation.requestBody.content[type].schema
   );
@@ -1768,7 +1770,7 @@ function expandServerUrls(servers) {
 
 // packages/typescript/src/lib/typescript-snippet.ts
 import { camelcase as camelcase5, spinalcase as spinalcase3 } from "stringcase";
-import { isEmpty as isEmpty4, pascalcase as pascalcase4, resolveRef as resolveRef3 } from "@sdk-it/core";
+import { isEmpty as isEmpty4, pascalcase as pascalcase4, resolveRef as resolveRef4 } from "@sdk-it/core";
 import "@sdk-it/readme";
 import {
   forEachOperation as forEachOperation5,
@@ -1777,7 +1779,7 @@ import {
 } from "@sdk-it/spec";
 
 // packages/typescript/src/lib/emitters/snippet.ts
-import { followRef as followRef5, isRef as isRef5, resolveRef as resolveRef2 } from "@sdk-it/core";
+import { followRef as followRef5, isRef as isRef5, resolveRef as resolveRef3 } from "@sdk-it/core";
 var SnippetEmitter = class {
   spec;
   generatedRefs = /* @__PURE__ */ new Set();
@@ -1786,12 +1788,12 @@ var SnippetEmitter = class {
     this.spec = spec;
   }
   object(schema) {
-    const schemaObj = resolveRef2(this.spec, schema);
+    const schemaObj = resolveRef3(this.spec, schema);
     const result = {};
     const properties = schemaObj.properties || {};
     for (const [propName, propSchema] of Object.entries(properties)) {
       const isRequired = (schemaObj.required ?? []).includes(propName);
-      const resolvedProp = resolveRef2(this.spec, propSchema);
+      const resolvedProp = resolveRef3(this.spec, propSchema);
       if (isRequired || resolvedProp.example !== void 0 || resolvedProp.default !== void 0) {
         result[propName] = this.handle(propSchema);
       }
@@ -1804,7 +1806,7 @@ var SnippetEmitter = class {
     return result;
   }
   array(schema) {
-    const schemaObj = resolveRef2(this.spec, schema);
+    const schemaObj = resolveRef3(this.spec, schema);
     const itemsSchema = schemaObj.items;
     if (!itemsSchema) {
       return [];
@@ -1916,7 +1918,7 @@ var SnippetEmitter = class {
     if (isRef5(schemaOrRef)) {
       return this.ref(schemaOrRef.$ref);
     }
-    const schema = resolveRef2(this.spec, schemaOrRef);
+    const schema = resolveRef3(this.spec, schemaOrRef);
     if (schema.example !== void 0) {
       return schema.example;
     }
@@ -1981,7 +1983,7 @@ var TypeScriptSnippet = class {
     let payload = "{}";
     if (!isEmpty4(operation.requestBody)) {
       const contentTypes = Object.keys(operation.requestBody.content || {});
-      const schema = resolveRef3(
+      const schema = resolveRef4(
         this.#spec,
         operation.requestBody.content[contentTypes[0]].schema
       );