npm - postgresdk - Versions diffs - 0.9.1 → 0.9.3 - Mend

postgresdk 0.9.1 → 0.9.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/dist/cli.js CHANGED Viewed

@@ -602,8 +602,12 @@ function generateIncludeMethods(table, graph, opts, allTables) {
               continue;
             const [key1, edge1] = entry1;
             const [key2, edge2] = entry2;
-            if (opts.skipJunctionTables && (edge1.target.includes("_") || edge2.target.includes("_"))) {
-              continue;
+            if (opts.skipJunctionTables && allTables) {
+              const table1 = allTables.find((t) => t.name === edge1.target);
+              const table2 = allTables.find((t) => t.name === edge2.target);
+              if (table1 && isJunctionTable(table1) || table2 && isJunctionTable(table2)) {
+                continue;
+              }
             }
             const combinedPath = [key1, key2];
             const combinedSuffix = `With${pascal(key1)}And${pascal(key2)}`;
@@ -4159,18 +4163,6 @@ async function generate(configPath) {
       content: emitHonoRouter(Object.values(model.tables), !!normalizedAuth?.strategy && normalizedAuth.strategy !== "none", cfg.useJsExtensions)
     });
   }
-  const clientFiles = files.filter((f) => {
-    return f.path.includes(clientDir);
-  });
-  files.push({
-    path: join(serverDir, "sdk-bundle.ts"),
-    content: emitSdkBundle(clientFiles, clientDir)
-  });
-  const contractCode = emitUnifiedContract(model, cfg);
-  files.push({
-    path: join(serverDir, "contract.ts"),
-    content: contractCode
-  });
   const { generateUnifiedContract: generateUnifiedContract2, generateUnifiedContractMarkdown: generateUnifiedContractMarkdown2 } = await Promise.resolve().then(() => (init_emit_sdk_contract(), exports_emit_sdk_contract));
   if (process.env.SDK_DEBUG) {
     console.log(`[Index] Model has ${Object.keys(model.tables || {}).length} tables before contract generation`);
@@ -4180,6 +4172,22 @@ async function generate(configPath) {
     path: join(serverDir, "CONTRACT.md"),
     content: generateUnifiedContractMarkdown2(contract)
   });
+  files.push({
+    path: join(clientDir, "CONTRACT.md"),
+    content: generateUnifiedContractMarkdown2(contract)
+  });
+  const contractCode = emitUnifiedContract(model, cfg, graph);
+  files.push({
+    path: join(serverDir, "contract.ts"),
+    content: contractCode
+  });
+  const clientFiles = files.filter((f) => {
+    return f.path.includes(clientDir);
+  });
+  files.push({
+    path: join(serverDir, "sdk-bundle.ts"),
+    content: emitSdkBundle(clientFiles, clientDir)
+  });
   if (generateTests) {
     console.log("\uD83E\uDDEA Generating tests...");
     const relativeClientPath = relative(testDir, clientDir);

package/dist/index.js CHANGED Viewed

@@ -601,8 +601,12 @@ function generateIncludeMethods(table, graph, opts, allTables) {
               continue;
             const [key1, edge1] = entry1;
             const [key2, edge2] = entry2;
-            if (opts.skipJunctionTables && (edge1.target.includes("_") || edge2.target.includes("_"))) {
-              continue;
+            if (opts.skipJunctionTables && allTables) {
+              const table1 = allTables.find((t) => t.name === edge1.target);
+              const table2 = allTables.find((t) => t.name === edge2.target);
+              if (table1 && isJunctionTable(table1) || table2 && isJunctionTable(table2)) {
+                continue;
+              }
             }
             const combinedPath = [key1, key2];
             const combinedSuffix = `With${pascal(key1)}And${pascal(key2)}`;
@@ -3896,18 +3900,6 @@ async function generate(configPath) {
       content: emitHonoRouter(Object.values(model.tables), !!normalizedAuth?.strategy && normalizedAuth.strategy !== "none", cfg.useJsExtensions)
     });
   }
-  const clientFiles = files.filter((f) => {
-    return f.path.includes(clientDir);
-  });
-  files.push({
-    path: join(serverDir, "sdk-bundle.ts"),
-    content: emitSdkBundle(clientFiles, clientDir)
-  });
-  const contractCode = emitUnifiedContract(model, cfg);
-  files.push({
-    path: join(serverDir, "contract.ts"),
-    content: contractCode
-  });
   const { generateUnifiedContract: generateUnifiedContract2, generateUnifiedContractMarkdown: generateUnifiedContractMarkdown2 } = await Promise.resolve().then(() => (init_emit_sdk_contract(), exports_emit_sdk_contract));
   if (process.env.SDK_DEBUG) {
     console.log(`[Index] Model has ${Object.keys(model.tables || {}).length} tables before contract generation`);
@@ -3917,6 +3909,22 @@ async function generate(configPath) {
     path: join(serverDir, "CONTRACT.md"),
     content: generateUnifiedContractMarkdown2(contract)
   });
+  files.push({
+    path: join(clientDir, "CONTRACT.md"),
+    content: generateUnifiedContractMarkdown2(contract)
+  });
+  const contractCode = emitUnifiedContract(model, cfg, graph);
+  files.push({
+    path: join(serverDir, "contract.ts"),
+    content: contractCode
+  });
+  const clientFiles = files.filter((f) => {
+    return f.path.includes(clientDir);
+  });
+  files.push({
+    path: join(serverDir, "sdk-bundle.ts"),
+    content: emitSdkBundle(clientFiles, clientDir)
+  });
   if (generateTests) {
     console.log("\uD83E\uDDEA Generating tests...");
     const relativeClientPath = relative(testDir, clientDir);

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "postgresdk",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "description": "Generate a typed server/client SDK from a Postgres schema (includes, Zod, Hono).",
   "type": "module",
   "bin": {