shiftapi 0.0.19 → 0.0.21

package/dist/{chunk-DQX3QC7F.js → chunk-7OWLTM22.js}

@@ -59,12 +59,13 @@ function indent(text, spaces = 2) {
   const prefix = " ".repeat(spaces);
   return text.split("\n").map((line) => line ? prefix + line : line).join("\n");
 }
-function dtsTemplate(generatedTypes) {
+function dtsTemplate(generatedTypes, openapiImport) {
+  const src = openapiImport ?? "openapi-fetch";
   return `// Auto-generated by shiftapi. Do not edit.
 declare module "@shiftapi/client" {
 ${indent(generatedTypes)}
 
-  import type createClient from "openapi-fetch";
+  import type createClient from "${src}";
 
   export const client: ReturnType<typeof createClient<paths>>;
   export { createClient };
@@ -86,7 +87,7 @@ export { createClient };
 function nextClientJsTemplate(port, baseUrl, devApiPrefix) {
   if (!devApiPrefix) {
     return `// Auto-generated by @shiftapi/next. Do not edit.
-import createClient from "openapi-fetch";
+import createClient from "./openapi-fetch.js";
 
 const baseUrl =
   process.env.NEXT_PUBLIC_SHIFTAPI_BASE_URL || ${JSON.stringify(baseUrl)};
@@ -99,7 +100,7 @@ export { createClient };
   }
   const devServerUrl = `http://localhost:${port}`;
   return `// Auto-generated by @shiftapi/next. Do not edit.
-import createClient from "openapi-fetch";
+import createClient from "./openapi-fetch.js";
 
 const baseUrl =
   process.env.NEXT_PUBLIC_SHIFTAPI_BASE_URL ||
@@ -146,15 +147,22 @@ function writeGeneratedFiles(typesRoot, generatedDts, baseUrl, options) {
   if (!existsSync(outDir)) {
     mkdirSync(outDir, { recursive: true });
   }
-  writeFileSync(resolve(outDir, "client.d.ts"), dtsTemplate(generatedDts));
+  const useLocalOpenapi = !!options?.openapiSource;
+  writeFileSync(resolve(outDir, "client.d.ts"), dtsTemplate(generatedDts, useLocalOpenapi ? "./openapi-fetch.js" : void 0));
   writeFileSync(resolve(outDir, "client.js"), options?.clientJsContent ?? clientJsTemplate(baseUrl));
+  if (options?.openapiSource) {
+    writeFileSync(resolve(outDir, "openapi-fetch.js"), options.openapiSource);
+  }
+  if (options?.openapiDts) {
+    writeFileSync(resolve(outDir, "openapi-fetch.d.ts"), options.openapiDts);
+  }
   writeFileSync(
     resolve(outDir, "tsconfig.json"),
     JSON.stringify(
       {
         compilerOptions: {
           paths: {
-            [MODULE_ID]: ["./client.d.ts"]
+            [MODULE_ID]: ["./client"]
           }
         }
       },
@@ -176,15 +184,15 @@ function patchTsConfigPaths(tsconfigDir, typesRoot) {
     );
     return;
   }
-  const dtsRel = relative(tsconfigDir, resolve(typesRoot, ".shiftapi", "client.d.ts"));
-  const dtsPath = dtsRel.startsWith("..") ? dtsRel : `./${dtsRel}`;
+  const clientRel = relative(tsconfigDir, resolve(typesRoot, ".shiftapi", "client"));
+  const clientPath = clientRel.startsWith("..") ? clientRel : `./${clientRel}`;
   tsconfig.compilerOptions = tsconfig.compilerOptions || {};
   tsconfig.compilerOptions.paths = tsconfig.compilerOptions.paths || {};
   const existing = tsconfig.compilerOptions.paths[MODULE_ID];
-  if (Array.isArray(existing) && existing.length === 1 && existing[0] === dtsPath) {
+  if (Array.isArray(existing) && existing.length === 1 && existing[0] === clientPath) {
     return;
   }
-  tsconfig.compilerOptions.paths[MODULE_ID] = [dtsPath];
+  tsconfig.compilerOptions.paths[MODULE_ID] = [clientPath];
   const detectedIndent = raw.match(/^[ \t]+/m)?.[0] ?? "  ";
   writeFileSync(tsconfigPath, stringify(tsconfig, null, detectedIndent) + "\n");
   console.log(

package/dist/internal.d.ts

@@ -7,6 +7,8 @@ declare function regenerateTypes(serverEntry: string, goRoot: string, baseUrl: s
 }>;
 declare function writeGeneratedFiles(typesRoot: string, generatedDts: string, baseUrl: string, options?: {
     clientJsContent?: string;
+    openapiSource?: string;
+    openapiDts?: string;
 }): void;
 declare function patchTsConfigPaths(tsconfigDir: string, typesRoot: string): void;
 
@@ -23,7 +25,7 @@ declare function extractSpec(serverEntry: string, goRoot: string): object;
  */
 declare function generateTypes(spec: object): Promise<string>;
 
-declare function dtsTemplate(generatedTypes: string): string;
+declare function dtsTemplate(generatedTypes: string, openapiImport?: string): string;
 declare function clientJsTemplate(baseUrl: string): string;
 declare function nextClientJsTemplate(port: number, baseUrl: string, devApiPrefix?: string): string;
 declare function virtualModuleTemplate(baseUrl: string, devApiPrefix?: string): string;

package/dist/internal.js

@@ -11,7 +11,7 @@ import {
   regenerateTypes,
   virtualModuleTemplate,
   writeGeneratedFiles
-} from "./chunk-DQX3QC7F.js";
+} from "./chunk-7OWLTM22.js";
 import {
   defineConfig,
   findConfigDir,

package/dist/prepare.js

@@ -4,7 +4,7 @@ import {
   generateTypes,
   patchTsConfigPaths,
   writeGeneratedFiles
-} from "./chunk-DQX3QC7F.js";
+} from "./chunk-7OWLTM22.js";
 import {
   loadConfig
 } from "./chunk-EQN44FQG.js";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shiftapi",
-  "version": "0.0.19",
+  "version": "0.0.21",
   "description": "CLI and codegen for shiftapi – fully-typed TypeScript clients from Go servers",
   "author": "Frank Chiarulli Jr. <frank@frankchiarulli.com>",
   "license": "MIT",