postgresdk 0.2.0 → 0.2.1-alpha.1

package/dist/cli.js

@@ -2041,7 +2041,7 @@ ${registrations}
   
   router.get("/sdk/files/:path{.*}", (c) => {
     const path = c.req.param("path");
-    const content = SDK_MANIFEST.files[path];
+    const content = SDK_MANIFEST.files[path as keyof typeof SDK_MANIFEST.files];
     if (!content) {
       return c.text("File not found", 404);
     }
@@ -2084,13 +2084,13 @@ export * from "./include-spec";
 }
 
 // src/emit-sdk-bundle.ts
-function emitSdkBundle(clientFiles) {
+function emitSdkBundle(clientFiles, clientDir) {
   const files = {};
   for (const file of clientFiles) {
-    const parts = file.path.split("/");
-    const clientIndex = parts.lastIndexOf("client");
-    if (clientIndex >= 0 && clientIndex < parts.length - 1) {
-      const relativePath = parts.slice(clientIndex + 1).join("/");
+    const normalizedClientDir = clientDir.replace(/\\/g, "/");
+    const normalizedFilePath = file.path.replace(/\\/g, "/");
+    if (normalizedFilePath.startsWith(normalizedClientDir)) {
+      const relativePath = normalizedFilePath.substring(normalizedClientDir.length).replace(/^\//, "");
       files[relativePath] = file.content;
     }
   }
@@ -2155,7 +2155,12 @@ async function generate(configPath) {
   console.log("\uD83D\uDD17 Building relationship graph...");
   const graph = buildGraph(model);
   const serverDir = cfg.outServer || "./generated/server";
-  const clientDir = cfg.outClient || "./generated/client";
+  const originalClientDir = cfg.outClient || "./generated/client";
+  const sameDirectory = serverDir === originalClientDir;
+  let clientDir = originalClientDir;
+  if (sameDirectory) {
+    clientDir = join(originalClientDir, "sdk");
+  }
   const normDateType = cfg.dateType === "string" ? "string" : "date";
   console.log("\uD83D\uDCC1 Creating directories...");
   await ensureDirs([
@@ -2212,16 +2217,18 @@ async function generate(configPath) {
     path: join(serverDir, "router.ts"),
     content: emitRouter(Object.values(model.tables), !!normalizedAuth?.strategy && normalizedAuth.strategy !== "none")
   });
-  const clientFiles = files.filter((f) => f.path.includes(clientDir));
+  const clientFiles = files.filter((f) => {
+    return f.path.includes(clientDir);
+  });
   files.push({
     path: join(serverDir, "sdk-bundle.ts"),
-    content: emitSdkBundle(clientFiles)
+    content: emitSdkBundle(clientFiles, clientDir)
   });
   console.log("✍️  Writing files...");
   await writeFiles(files);
   console.log(`✅ Generated ${files.length} files`);
   console.log(`  Server: ${serverDir}`);
-  console.log(`  Client: ${clientDir}`);
+  console.log(`  Client: ${sameDirectory ? clientDir + " (in sdk subdir due to same output dir)" : clientDir}`);
 }
 
 // src/cli.ts

package/dist/emit-sdk-bundle.d.ts

@@ -5,4 +5,4 @@
 export declare function emitSdkBundle(clientFiles: {
     path: string;
     content: string;
-}[]): string;
+}[], clientDir: string): string;

package/dist/index.js

@@ -1804,7 +1804,7 @@ ${registrations}
   
   router.get("/sdk/files/:path{.*}", (c) => {
     const path = c.req.param("path");
-    const content = SDK_MANIFEST.files[path];
+    const content = SDK_MANIFEST.files[path as keyof typeof SDK_MANIFEST.files];
     if (!content) {
       return c.text("File not found", 404);
     }
@@ -1847,13 +1847,13 @@ export * from "./include-spec";
 }
 
 // src/emit-sdk-bundle.ts
-function emitSdkBundle(clientFiles) {
+function emitSdkBundle(clientFiles, clientDir) {
   const files = {};
   for (const file of clientFiles) {
-    const parts = file.path.split("/");
-    const clientIndex = parts.lastIndexOf("client");
-    if (clientIndex >= 0 && clientIndex < parts.length - 1) {
-      const relativePath = parts.slice(clientIndex + 1).join("/");
+    const normalizedClientDir = clientDir.replace(/\\/g, "/");
+    const normalizedFilePath = file.path.replace(/\\/g, "/");
+    if (normalizedFilePath.startsWith(normalizedClientDir)) {
+      const relativePath = normalizedFilePath.substring(normalizedClientDir.length).replace(/^\//, "");
       files[relativePath] = file.content;
     }
   }
@@ -1918,7 +1918,12 @@ async function generate(configPath) {
   console.log("\uD83D\uDD17 Building relationship graph...");
   const graph = buildGraph(model);
   const serverDir = cfg.outServer || "./generated/server";
-  const clientDir = cfg.outClient || "./generated/client";
+  const originalClientDir = cfg.outClient || "./generated/client";
+  const sameDirectory = serverDir === originalClientDir;
+  let clientDir = originalClientDir;
+  if (sameDirectory) {
+    clientDir = join(originalClientDir, "sdk");
+  }
   const normDateType = cfg.dateType === "string" ? "string" : "date";
   console.log("\uD83D\uDCC1 Creating directories...");
   await ensureDirs([
@@ -1975,16 +1980,18 @@ async function generate(configPath) {
     path: join(serverDir, "router.ts"),
     content: emitRouter(Object.values(model.tables), !!normalizedAuth?.strategy && normalizedAuth.strategy !== "none")
   });
-  const clientFiles = files.filter((f) => f.path.includes(clientDir));
+  const clientFiles = files.filter((f) => {
+    return f.path.includes(clientDir);
+  });
   files.push({
     path: join(serverDir, "sdk-bundle.ts"),
-    content: emitSdkBundle(clientFiles)
+    content: emitSdkBundle(clientFiles, clientDir)
   });
   console.log("✍️  Writing files...");
   await writeFiles(files);
   console.log(`✅ Generated ${files.length} files`);
   console.log(`  Server: ${serverDir}`);
-  console.log(`  Client: ${clientDir}`);
+  console.log(`  Client: ${sameDirectory ? clientDir + " (in sdk subdir due to same output dir)" : clientDir}`);
 }
 export {
   generate

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "postgresdk",
-  "version": "0.2.0",
+  "version": "0.2.1-alpha.1",
   "description": "Generate a typed server/client SDK from a Postgres schema (includes, Zod, Hono).",
   "type": "module",
   "bin": {
@@ -22,10 +22,11 @@
   },
   "scripts": {
     "build": "bun build src/cli.ts src/index.ts --outdir dist --target node --format esm --external=pg --external=zod --external=hono --external=node:* && tsc -p tsconfig.build.json --emitDeclarationOnly",
-    "test": "bun test:init && bun test:gen && bun test:pull",
+    "test": "bun test:init && bun test:gen && bun test:pull && bun test:typecheck",
     "test:init": "bun test/test-init.ts",
     "test:gen": "bun test/test-gen.ts",
     "test:pull": "bun test/test-pull.ts",
+    "test:typecheck": "bun test/test-typecheck.ts",
     "prepublishOnly": "npm run build",
     "publish:patch": "./publish.sh",
     "publish:minor": "./publish.sh",