shiftapi 0.0.15 → 0.0.17

package/README.md

@@ -59,7 +59,7 @@ Typically used in a `postinstall` script:
 |--------|------|---------|-------------|
 | `server` | `string` | **(required)** | Path to the Go server entry point (e.g. `"./cmd/server"`) |
 | `baseUrl` | `string` | `"/"` | Base URL for the generated API client |
-| `url` | `string` | `"http://localhost:8080"` | Go server address (used by the Vite plugin for dev proxy) |
+| `url` | `string` | `"http://localhost:8080"` | Go server address (used by the Vite/Next.js plugins for dev proxy) |
 
 ## License
 

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

@@ -80,6 +80,36 @@ export const client = createClient({
   baseUrl: ${JSON.stringify(baseUrl)},
 });
 
+export { createClient };
+`;
+}
+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";
+
+const baseUrl =
+  process.env.NEXT_PUBLIC_SHIFTAPI_BASE_URL ||
+  (typeof window !== "undefined"
+    ? ${JSON.stringify(devApiPrefix)}
+    : ${JSON.stringify(devServerUrl)});
+
+/** Pre-configured, fully-typed API client. */
+export const client = createClient({ baseUrl });
+
 export { createClient };
 `;
 }
@@ -111,13 +141,13 @@ async function regenerateTypes(serverEntry, goRoot, baseUrl, isDev, previousType
   );
   return { types, virtualModuleSource, changed };
 }
-function writeGeneratedFiles(typesRoot, generatedDts, baseUrl) {
+function writeGeneratedFiles(typesRoot, generatedDts, baseUrl, options) {
   const outDir = resolve(typesRoot, ".shiftapi");
   if (!existsSync(outDir)) {
     mkdirSync(outDir, { recursive: true });
   }
   writeFileSync(resolve(outDir, "client.d.ts"), dtsTemplate(generatedDts));
-  writeFileSync(resolve(outDir, "client.js"), clientJsTemplate(baseUrl));
+  writeFileSync(resolve(outDir, "client.js"), options?.clientJsContent ?? clientJsTemplate(baseUrl));
   writeFileSync(
     resolve(outDir, "tsconfig.json"),
     JSON.stringify(
@@ -133,7 +163,7 @@ function writeGeneratedFiles(typesRoot, generatedDts, baseUrl) {
     ) + "\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");
@@ -146,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."
   );
 }
 
@@ -165,8 +200,9 @@ export {
   DEV_API_PREFIX,
   dtsTemplate,
   clientJsTemplate,
+  nextClientJsTemplate,
   virtualModuleTemplate,
   regenerateTypes,
   writeGeneratedFiles,
-  patchTsConfig
+  patchTsConfigPaths
 };

package/dist/{chunk-QBXBYTBE.js → chunk-EQN44FQG.js}

@@ -37,6 +37,14 @@ async function loadConfig(startDir, configPath) {
   }
   return { config, configDir: dirname(resolvedPath) };
 }
+function findConfigDir(startDir, configPath) {
+  if (configPath) {
+    const resolved = resolve(startDir, configPath);
+    return existsSync(resolved) ? dirname(resolved) : void 0;
+  }
+  const file = findConfigFile(startDir);
+  return file ? dirname(file) : void 0;
+}
 function findConfigFile(startDir) {
   let dir = resolve(startDir);
   const root = resolve("/");
@@ -57,5 +65,6 @@ function findConfigFile(startDir) {
 
 export {
   defineConfig,
-  loadConfig
+  loadConfig,
+  findConfigDir
 };

package/dist/{index-PUAivaXi.d.ts → index-BG8_bsaE.d.ts}

@@ -22,5 +22,14 @@ declare function loadConfig(startDir: string, configPath?: string): Promise<{
     config: ShiftAPIConfig;
     configDir: string;
 }>;
+interface ShiftAPIPluginOptions {
+    /** Explicit path to shiftapi.config.ts (for advanced use only) */
+    configPath?: string;
+}
+/**
+ * Synchronously walk up from `startDir` to find the directory containing
+ * a shiftapi config file. Returns the directory path, or undefined.
+ */
+declare function findConfigDir(startDir: string, configPath?: string): string | undefined;
 
-export { type ShiftAPIConfig as S, defineConfig as d, loadConfig as l };
+export { type ShiftAPIConfig as S, type ShiftAPIPluginOptions as a, defineConfig as d, findConfigDir as f, loadConfig as l };

package/dist/index.d.ts

@@ -1 +1 @@
-export { S as ShiftAPIConfig, d as defineConfig } from './index-PUAivaXi.js';
+export { S as ShiftAPIConfig, d as defineConfig } from './index-BG8_bsaE.js';

package/dist/index.js

@@ -1,6 +1,6 @@
 import {
   defineConfig
-} from "./chunk-QBXBYTBE.js";
+} from "./chunk-EQN44FQG.js";
 export {
   defineConfig
 };

package/dist/internal.d.ts

@@ -1,12 +1,14 @@
-export { S as ShiftAPIConfig, d as defineConfig, l as loadConfig } from './index-PUAivaXi.js';
+export { S as ShiftAPIConfig, a as ShiftAPIPluginOptions, d as defineConfig, f as findConfigDir, l as loadConfig } from './index-BG8_bsaE.js';
 
 declare function regenerateTypes(serverEntry: string, goRoot: string, baseUrl: string, isDev: boolean, previousTypes: string): Promise<{
     types: string;
     virtualModuleSource: string;
     changed: boolean;
 }>;
-declare function writeGeneratedFiles(typesRoot: string, generatedDts: string, baseUrl: string): void;
-declare function patchTsConfig(tsconfigDir: string, typesRoot: string): void;
+declare function writeGeneratedFiles(typesRoot: string, generatedDts: string, baseUrl: string, options?: {
+    clientJsContent?: string;
+}): void;
+declare function patchTsConfigPaths(tsconfigDir: string, typesRoot: string): void;
 
 /**
  * Extracts the OpenAPI spec from a Go shiftapi server by running it with
@@ -23,10 +25,23 @@ 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, devApiPrefix?: string): string;
 declare function virtualModuleTemplate(baseUrl: string, devApiPrefix?: string): string;
 
 declare const MODULE_ID = "@shiftapi/client";
 declare const RESOLVED_MODULE_ID: string;
 declare const DEV_API_PREFIX = "/__shiftapi";
 
-export { DEV_API_PREFIX, MODULE_ID, RESOLVED_MODULE_ID, clientJsTemplate, dtsTemplate, extractSpec, generateTypes, patchTsConfig, regenerateTypes, virtualModuleTemplate, writeGeneratedFiles };
+declare class GoServerManager {
+    private readonly serverEntry;
+    private readonly goRoot;
+    private goProcess;
+    constructor(serverEntry: string, goRoot: string);
+    start(port: number): Promise<void>;
+    stop(): Promise<void>;
+    forceKill(): void;
+}
+
+declare function findFreePort(startPort: number): Promise<number>;
+
+export { DEV_API_PREFIX, GoServerManager, MODULE_ID, RESOLVED_MODULE_ID, clientJsTemplate, dtsTemplate, extractSpec, findFreePort, generateTypes, nextClientJsTemplate, patchTsConfigPaths, regenerateTypes, virtualModuleTemplate, writeGeneratedFiles };

package/dist/internal.js

@@ -6,26 +6,139 @@ import {
   dtsTemplate,
   extractSpec,
   generateTypes,
-  patchTsConfig,
+  nextClientJsTemplate,
+  patchTsConfigPaths,
   regenerateTypes,
   virtualModuleTemplate,
   writeGeneratedFiles
-} from "./chunk-M6SOET3R.js";
+} from "./chunk-DQX3QC7F.js";
 import {
   defineConfig,
+  findConfigDir,
   loadConfig
-} from "./chunk-QBXBYTBE.js";
+} from "./chunk-EQN44FQG.js";
+
+// src/goServer.ts
+import { spawn } from "child_process";
+import { resolve } from "path";
+var GoServerManager = class {
+  constructor(serverEntry, goRoot) {
+    this.serverEntry = serverEntry;
+    this.goRoot = goRoot;
+  }
+  goProcess = null;
+  start(port) {
+    return new Promise((resolveStart, rejectStart) => {
+      const proc = spawn(
+        "go",
+        ["run", "-tags", "shiftapidev", this.serverEntry],
+        {
+          cwd: resolve(this.goRoot),
+          stdio: ["ignore", "inherit", "inherit"],
+          detached: true,
+          env: {
+            ...process.env,
+            SHIFTAPI_PORT: String(port)
+          }
+        }
+      );
+      this.goProcess = proc;
+      let settled = false;
+      proc.on("error", (err) => {
+        console.error("[shiftapi] Failed to start Go server:", err.message);
+        if (!settled) {
+          settled = true;
+          rejectStart(err);
+        }
+      });
+      proc.on("exit", (code) => {
+        if (code !== null && code !== 0) {
+          console.error(`[shiftapi] Go server exited with code ${code}`);
+        }
+        this.goProcess = null;
+      });
+      proc.on("spawn", () => {
+        if (!settled) {
+          settled = true;
+          resolveStart();
+        }
+      });
+      console.log(
+        `[shiftapi] Go server starting on port ${port}: go run ${this.serverEntry}`
+      );
+    });
+  }
+  stop() {
+    const proc = this.goProcess;
+    if (!proc || !proc.pid) return Promise.resolve();
+    const pid = proc.pid;
+    this.goProcess = null;
+    return new Promise((resolve2) => {
+      const timeout = setTimeout(() => {
+        try {
+          process.kill(-pid, "SIGKILL");
+        } catch {
+        }
+        resolve2();
+      }, 5e3);
+      proc.on("exit", () => {
+        clearTimeout(timeout);
+        resolve2();
+      });
+      try {
+        process.kill(-pid, "SIGTERM");
+      } catch {
+        clearTimeout(timeout);
+        resolve2();
+      }
+    });
+  }
+  forceKill() {
+    if (this.goProcess?.pid) {
+      try {
+        process.kill(-this.goProcess.pid, "SIGTERM");
+      } catch {
+      }
+    }
+  }
+};
+
+// src/ports.ts
+import { createServer as createTcpServer } from "net";
+function isPortFree(port) {
+  return new Promise((resolve2) => {
+    const server = createTcpServer();
+    server.once("error", () => resolve2(false));
+    server.once("listening", () => {
+      server.close(() => resolve2(true));
+    });
+    server.listen(port);
+  });
+}
+async function findFreePort(startPort) {
+  for (let port = startPort; port < startPort + 20; port++) {
+    if (await isPortFree(port)) return port;
+  }
+  console.warn(
+    `[shiftapi] No free port found in range ${startPort}-${startPort + 19}, falling back to ${startPort}`
+  );
+  return startPort;
+}
 export {
   DEV_API_PREFIX,
+  GoServerManager,
   MODULE_ID,
   RESOLVED_MODULE_ID,
   clientJsTemplate,
   defineConfig,
   dtsTemplate,
   extractSpec,
+  findConfigDir,
+  findFreePort,
   generateTypes,
   loadConfig,
-  patchTsConfig,
+  nextClientJsTemplate,
+  patchTsConfigPaths,
   regenerateTypes,
   virtualModuleTemplate,
   writeGeneratedFiles

package/dist/prepare.js

@@ -2,12 +2,12 @@
 import {
   extractSpec,
   generateTypes,
-  patchTsConfig,
+  patchTsConfigPaths,
   writeGeneratedFiles
-} from "./chunk-M6SOET3R.js";
+} from "./chunk-DQX3QC7F.js";
 import {
   loadConfig
-} from "./chunk-QBXBYTBE.js";
+} from "./chunk-EQN44FQG.js";
 
 // src/prepare.ts
 import { resolve } from "path";
@@ -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.15",
+  "version": "0.0.17",
   "description": "CLI and codegen for shiftapi – fully-typed TypeScript clients from Go servers",
   "author": "Frank Chiarulli Jr. <frank@frankchiarulli.com>",
   "license": "MIT",