@danielhritcu/zenstack-custom 1.2.0 → 1.2.2

package/dist/cli.d.cts

@@ -1,7 +1,11 @@
 #!/usr/bin/env node
-import { Z as ZenConfig } from './config-CRQer7hw.cjs';
+import { Z as ZenConfig } from './config-rukOeRbn.cjs';
 import 'drizzle-orm/pg-core';
 
-declare function runCodegen(config: ZenConfig): Promise<void>;
+interface CodegenOptions {
+    /** SQL column names to ignore when matching composite FK signatures (e.g. 'app_slug' for RLS) */
+    ignoreCompositeFkColumns?: string[];
+}
+declare function runCodegen(config: ZenConfig, options?: CodegenOptions): Promise<void>;
 
-export { runCodegen };
+export { type CodegenOptions, runCodegen };

package/dist/cli.d.ts

@@ -1,7 +1,11 @@
 #!/usr/bin/env node
-import { Z as ZenConfig } from './config-CRQer7hw.js';
+import { Z as ZenConfig } from './config-rukOeRbn.js';
 import 'drizzle-orm/pg-core';
 
-declare function runCodegen(config: ZenConfig): Promise<void>;
+interface CodegenOptions {
+    /** SQL column names to ignore when matching composite FK signatures (e.g. 'app_slug' for RLS) */
+    ignoreCompositeFkColumns?: string[];
+}
+declare function runCodegen(config: ZenConfig, options?: CodegenOptions): Promise<void>;
 
-export { runCodegen };
+export { type CodegenOptions, runCodegen };

package/dist/cli.js

@@ -1962,7 +1962,7 @@ function unfoldRelationSelector(relation) {
   return relationName;
 }
 __name(unfoldRelationSelector, "unfoldRelationSelector");
-function buildRelations(tables, relationTargets = {}, filteredRelations = {}, throughRelations = {}, fkRelations = {}) {
+function buildRelations(tables, relationTargets = {}, filteredRelations = {}, throughRelations = {}, fkRelations = {}, options = {}) {
   const baseTables = tables.filter((table) => !table.derivedFrom);
   const sqlToBaseTable = /* @__PURE__ */ new Map();
   const modelToTable = /* @__PURE__ */ new Map();
@@ -2051,7 +2051,19 @@ function buildRelations(tables, relationTargets = {}, filteredRelations = {}, th
       if (!targetTable) continue;
       const signature = makePhysicalFKSignature(table, targetTable, fk);
       if (declaredFKRelations.has(signature)) continue;
-      throw new Error(`Missing explicit relation in supabase/schema/relations.ts for "${table.exportName}": [${fk.localColumns.join(", ")}] -> ${targetTable.exportName}([${fk.foreignColumns.join(", ")}]).`);
+      const ignoreCols = options.ignoreCompositeFkColumns ?? [];
+      if (ignoreCols.length > 0 && fk.localColumns.length > 1) {
+        const strippedFk = {
+          ...fk,
+          localColumns: fk.localColumns.filter((c) => !ignoreCols.includes(c)),
+          foreignColumns: fk.foreignColumns.filter((_, i) => !ignoreCols.includes(fk.localColumns[i]))
+        };
+        if (strippedFk.localColumns.length > 0) {
+          const strippedSig = makePhysicalFKSignature(table, targetTable, strippedFk);
+          if (declaredFKRelations.has(strippedSig)) continue;
+        }
+      }
+      console.warn(`Warning: undeclared FK "${table.exportName}": [${fk.localColumns.join(", ")}] -> ${targetTable.exportName}([${fk.foreignColumns.join(", ")}]). Add a relation in orm.config.ts or it will be auto-generated.`);
     }
   }
   const forwardByTarget = /* @__PURE__ */ new Map();
@@ -2477,7 +2489,7 @@ function resolveConfig(config) {
 __name(resolveConfig, "resolveConfig");
 
 // src/cli.ts
-async function runCodegen(config) {
+async function runCodegen(config, options = {}) {
   const resolved = resolveConfig(config);
   const outDir = path.resolve(process.cwd(), config.schema.output);
   const enumMap = discoverEnums(config.schema.enums);
@@ -2493,7 +2505,9 @@ async function runCodegen(config) {
     fieldToTypeDef = artifacts.fieldToTypeDef;
     typedJsonFields = artifacts.typedJsonFields;
   }
-  const { modelRelations, inverseRelations } = buildRelations(tables, resolved.relationTargets, resolved.filteredRelations, resolved.throughRelations, resolved.fkRelations);
+  const { modelRelations, inverseRelations } = buildRelations(tables, resolved.relationTargets, resolved.filteredRelations, resolved.throughRelations, resolved.fkRelations, {
+    ignoreCompositeFkColumns: options.ignoreCompositeFkColumns
+  });
   const schemaContent = emitSchemaTs({
     tables,
     enumMap,
@@ -2551,16 +2565,31 @@ async function runCodegen(config) {
 }
 __name(runCodegen, "runCodegen");
 async function main() {
-  const subcommand = process.argv[2];
-  const filePath = process.argv[3];
+  const args = process.argv.slice(2);
+  const flags = {};
+  const positional = [];
+  for (const arg of args) {
+    if (arg.startsWith("--")) {
+      const [key, ...rest] = arg.slice(2).split("=");
+      flags[key] = rest.join("=") || "true";
+    } else {
+      positional.push(arg);
+    }
+  }
+  const subcommand = positional[0];
+  const filePath = positional[1];
   if (subcommand !== "generate" || !filePath) {
-    console.error("Usage: zenstack-custom generate <config-file>");
+    console.error("Usage: zenstack-custom generate <config-file> [--ignore-cfk=col1,col2]");
     process.exit(1);
   }
+  const codegenOptions = {};
+  if (flags["ignore-cfk"]) {
+    codegenOptions.ignoreCompositeFkColumns = flags["ignore-cfk"].split(",").map((s) => s.trim());
+  }
   const resolvedPath = path.resolve(process.cwd(), filePath);
   const mod = await import(resolvedPath);
   const config = mod.default ?? mod;
-  await runCodegen(config);
+  await runCodegen(config, codegenOptions);
 }
 __name(main, "main");
 var isCLI = process.argv[1]?.endsWith("cli.js") || process.argv[1]?.endsWith("cli.cjs");