shiftapi 0.0.16 → 0.0.18

package/dist/{chunk-TE7E7CKV.js → chunk-DQX3QC7F.js}

@@ -83,7 +83,20 @@ export const client = createClient({
 export { createClient };
 `;
 }
-function nextClientJsTemplate(port, baseUrl) {
+function nextClientJsTemplate(port, baseUrl, devApiPrefix) {
+  if (!devApiPrefix) {
+    return `// Auto-generated by @shiftapi/next. Do not edit.
+import createClient from "openapi-fetch";
+
+const baseUrl =
+  process.env.NEXT_PUBLIC_SHIFTAPI_BASE_URL || ${JSON.stringify(baseUrl)};
+
+/** Pre-configured, fully-typed API client. */
+export const client = createClient({ baseUrl });
+
+export { createClient };
+`;
+  }
   const devServerUrl = `http://localhost:${port}`;
   return `// Auto-generated by @shiftapi/next. Do not edit.
 import createClient from "openapi-fetch";
@@ -91,7 +104,7 @@ import createClient from "openapi-fetch";
 const baseUrl =
   process.env.NEXT_PUBLIC_SHIFTAPI_BASE_URL ||
   (typeof window !== "undefined"
-    ? ${JSON.stringify("/__shiftapi")}
+    ? ${JSON.stringify(devApiPrefix)}
     : ${JSON.stringify(devServerUrl)});
 
 /** Pre-configured, fully-typed API client. */
@@ -150,7 +163,7 @@ function writeGeneratedFiles(typesRoot, generatedDts, baseUrl, options) {
     ) + "\n"
   );
 }
-function patchTsConfig(tsconfigDir, typesRoot) {
+function patchTsConfigPaths(tsconfigDir, typesRoot) {
   const tsconfigPath = resolve(tsconfigDir, "tsconfig.json");
   if (!existsSync(tsconfigPath)) return;
   const raw = readFileSync2(tsconfigPath, "utf-8");
@@ -163,14 +176,19 @@ function patchTsConfig(tsconfigDir, typesRoot) {
     );
     return;
   }
-  const rel = relative(tsconfigDir, resolve(typesRoot, ".shiftapi", "tsconfig.json"));
-  const extendsPath = rel.startsWith("..") ? rel : `./${rel}`;
-  if (tsconfig?.extends === extendsPath) return;
-  tsconfig.extends = extendsPath;
+  const dtsRel = relative(tsconfigDir, resolve(typesRoot, ".shiftapi", "client.d.ts"));
+  const dtsPath = dtsRel.startsWith("..") ? dtsRel : `./${dtsRel}`;
+  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) {
+    return;
+  }
+  tsconfig.compilerOptions.paths[MODULE_ID] = [dtsPath];
   const detectedIndent = raw.match(/^[ \t]+/m)?.[0] ?? "  ";
   writeFileSync(tsconfigPath, stringify(tsconfig, null, detectedIndent) + "\n");
   console.log(
-    "[shiftapi] Updated tsconfig.json to extend .shiftapi/tsconfig.json"
+    "[shiftapi] Updated tsconfig.json with @shiftapi/client path mapping."
   );
 }
 
@@ -186,5 +204,5 @@ export {
   virtualModuleTemplate,
   regenerateTypes,
   writeGeneratedFiles,
-  patchTsConfig
+  patchTsConfigPaths
 };

package/dist/internal.d.ts

@@ -8,7 +8,7 @@ declare function regenerateTypes(serverEntry: string, goRoot: string, baseUrl: s
 declare function writeGeneratedFiles(typesRoot: string, generatedDts: string, baseUrl: string, options?: {
     clientJsContent?: string;
 }): void;
-declare function patchTsConfig(tsconfigDir: string, typesRoot: string): void;
+declare function patchTsConfigPaths(tsconfigDir: string, typesRoot: string): void;
 
 /**
  * Extracts the OpenAPI spec from a Go shiftapi server by running it with
@@ -25,7 +25,7 @@ declare function generateTypes(spec: object): Promise<string>;
 
 declare function dtsTemplate(generatedTypes: string): string;
 declare function clientJsTemplate(baseUrl: string): string;
-declare function nextClientJsTemplate(port: number, baseUrl: string): string;
+declare function nextClientJsTemplate(port: number, baseUrl: string, devApiPrefix?: string): string;
 declare function virtualModuleTemplate(baseUrl: string, devApiPrefix?: string): string;
 
 declare const MODULE_ID = "@shiftapi/client";
@@ -44,4 +44,4 @@ declare class GoServerManager {
 
 declare function findFreePort(startPort: number): Promise<number>;
 
-export { DEV_API_PREFIX, GoServerManager, MODULE_ID, RESOLVED_MODULE_ID, clientJsTemplate, dtsTemplate, extractSpec, findFreePort, generateTypes, nextClientJsTemplate, patchTsConfig, regenerateTypes, virtualModuleTemplate, writeGeneratedFiles };
+export { DEV_API_PREFIX, GoServerManager, MODULE_ID, RESOLVED_MODULE_ID, clientJsTemplate, dtsTemplate, extractSpec, findFreePort, generateTypes, nextClientJsTemplate, patchTsConfigPaths, regenerateTypes, virtualModuleTemplate, writeGeneratedFiles };

package/dist/internal.js

@@ -7,11 +7,11 @@ import {
   extractSpec,
   generateTypes,
   nextClientJsTemplate,
-  patchTsConfig,
+  patchTsConfigPaths,
   regenerateTypes,
   virtualModuleTemplate,
   writeGeneratedFiles
-} from "./chunk-TE7E7CKV.js";
+} from "./chunk-DQX3QC7F.js";
 import {
   defineConfig,
   findConfigDir,
@@ -138,7 +138,7 @@ export {
   generateTypes,
   loadConfig,
   nextClientJsTemplate,
-  patchTsConfig,
+  patchTsConfigPaths,
   regenerateTypes,
   virtualModuleTemplate,
   writeGeneratedFiles

package/dist/prepare.js

@@ -2,9 +2,9 @@
 import {
   extractSpec,
   generateTypes,
-  patchTsConfig,
+  patchTsConfigPaths,
   writeGeneratedFiles
-} from "./chunk-TE7E7CKV.js";
+} from "./chunk-DQX3QC7F.js";
 import {
   loadConfig
 } from "./chunk-EQN44FQG.js";
@@ -26,7 +26,7 @@ async function main() {
   const spec = extractSpec(serverEntry, resolve(goRoot));
   const types = await generateTypes(spec);
   writeGeneratedFiles(configDir, types, baseUrl);
-  patchTsConfig(cwd, configDir);
+  patchTsConfigPaths(cwd, configDir);
   console.log("[shiftapi] Done. Generated .shiftapi/client.d.ts and .shiftapi/client.js");
 }
 main().catch((err) => {

package/package.json

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