@danielhritcu/zenstack-custom 1.1.0 → 1.2.0

package/dist/cli.d.cts

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { Z as ZenConfig } from './config-1Cdfs72F.cjs';
+import { Z as ZenConfig } from './config-CRQer7hw.cjs';
 import 'drizzle-orm/pg-core';
 
 declare function runCodegen(config: ZenConfig): Promise<void>;

package/dist/cli.d.ts

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { Z as ZenConfig } from './config-1Cdfs72F.js';
+import { Z as ZenConfig } from './config-CRQer7hw.js';
 import 'drizzle-orm/pg-core';
 
 declare function runCodegen(config: ZenConfig): Promise<void>;

package/dist/cli.js

@@ -908,6 +908,32 @@ __name(sortTypedJsonFields, "sortTypedJsonFields");
 
 // src/codegen/emit.ts
 var DB_ATTR_RE = /@db\.(\w+)(?:\((\d+)\))?/;
+function isUuidField(t, fieldName) {
+  const col = t.table[fieldName];
+  if (!col) return false;
+  return col.columnType === "PgUUID";
+}
+__name(isUuidField, "isUuidField");
+function isPkField(t, fieldName) {
+  const col = t.table[fieldName];
+  if (!col) return false;
+  if (col.primary) return true;
+  const sqlName = col.name;
+  return t.cfg.primaryKeys.some((pk) => pk.columns.some((c) => c.name === sqlName));
+}
+__name(isPkField, "isPkField");
+function findFkTarget(t, fieldName, fkRelations) {
+  const modelFks = fkRelations[t.modelName];
+  if (!modelFks) return null;
+  for (const fkInfo of Object.values(modelFks)) {
+    const idx = fkInfo.fields.indexOf(fieldName);
+    if (idx >= 0) {
+      return fkInfo.targetExportName;
+    }
+  }
+  return null;
+}
+__name(findFkTarget, "findFkTarget");
 function buildDerivedEnumName(modelName, fieldName) {
   return `${toPascalCase(modelName)}${toPascalCase(fieldName)}`;
 }
@@ -1403,8 +1429,9 @@ function emitSchemaTs({ tables, enumMap, modelRelations, inverseRelations, searc
   return out.join("\n");
 }
 __name(emitSchemaTs, "emitSchemaTs");
-function emitModelsTs(tables, typedJsonFields = []) {
+function emitModelsTs(tables, typedJsonFields = [], branding) {
   const jsonFieldAliases = createJsonFieldAliasMap(typedJsonFields);
+  const hasBranding = branding && (Object.keys(branding.brandedFields).length > 0 || tables.some((t) => getEntityFieldNames(t).some((f) => isUuidField(t, f) && isPkField(t, f))));
   const out = [
     ...emitGeneratedFileBanner()
   ];
@@ -1412,6 +1439,10 @@ function emitModelsTs(tables, typedJsonFields = []) {
   out.push('import type * as $ from "@zenstackhq/orm";');
   out.push('import type * as Json from "./json";');
   out.push('import { type SchemaType as Schema } from "./schema";');
+  if (hasBranding) {
+    out.push("");
+    out.push("declare const __brand: unique symbol;");
+  }
   out.push("");
   for (const t of tables) {
     out.push(`export interface ${t.typeName} extends $.ModelResult<Schema, ${esc(t.modelName)}> {}`);
@@ -1422,7 +1453,12 @@ function emitModelsTs(tables, typedJsonFields = []) {
       if (jsonAlias) {
         out.push(`  export interface ${exportName} extends Json.${jsonAlias} {}`);
       } else {
-        out.push(`  export type ${exportName} = ${t.typeName}[${esc(fieldName)}];`);
+        const brandedLine = branding ? emitBrandedFieldLine(t, fieldName, exportName, branding, "  ") : null;
+        if (brandedLine) {
+          out.push(...brandedLine);
+        } else {
+          out.push(`  export type ${exportName} = ${t.typeName}[${esc(fieldName)}];`);
+        }
       }
     }
     out.push("}");
@@ -1431,6 +1467,33 @@ function emitModelsTs(tables, typedJsonFields = []) {
   return out.join("\n");
 }
 __name(emitModelsTs, "emitModelsTs");
+function emitBrandedFieldLine(t, fieldName, exportName, branding, indent) {
+  const customBranded = branding.brandedFields[t.modelName]?.[fieldName];
+  if (isUuidField(t, fieldName) && isPkField(t, fieldName)) {
+    const brand = `${t.modelName}.${fieldName}`;
+    return [
+      `${indent}export type ${exportName} = string & { [__brand]: '${brand}' };`,
+      `${indent}export const ${exportName} = (id: string): ${exportName} => id as ${exportName};`
+    ];
+  }
+  if (isUuidField(t, fieldName)) {
+    const targetExportName = findFkTarget(t, fieldName, branding.fkRelations);
+    if (targetExportName) {
+      return [
+        `${indent}export type ${exportName} = ${targetExportName}.Id;`
+      ];
+    }
+  }
+  if (customBranded) {
+    const brand = `${t.modelName}.${fieldName}`;
+    return [
+      `${indent}export type ${exportName} = string & { [__brand]: '${brand}' };`,
+      `${indent}export const ${exportName} = (id: string): ${exportName} => id as ${exportName};`
+    ];
+  }
+  return null;
+}
+__name(emitBrandedFieldLine, "emitBrandedFieldLine");
 function emitViewsTs(views, typedJsonFields = []) {
   const jsonFieldAliases = createJsonFieldAliasMap(typedJsonFields);
   const out = [
@@ -1496,12 +1559,13 @@ function emitInputTs(tables) {
   return out.join("\n");
 }
 __name(emitInputTs, "emitInputTs");
-function emitIndexTs({ tables, views, enumMap, typeDefs, typedJsonFields }) {
+function emitIndexTs({ tables, views, enumMap, typeDefs, typedJsonFields, branding }) {
   const allEnums = new Map([
     ...enumMap,
     ...collectDerivedEnums(tables, enumMap)
   ]);
   const jsonFieldAliases = createJsonFieldAliasMap(typedJsonFields);
+  const hasBranding = branding && (Object.keys(branding.brandedFields).length > 0 || tables.some((t) => getEntityFieldNames(t).some((f) => isUuidField(t, f) && isPkField(t, f))));
   const out = [
     ...emitGeneratedFileBanner()
   ];
@@ -1509,6 +1573,10 @@ function emitIndexTs({ tables, views, enumMap, typeDefs, typedJsonFields }) {
   out.push('import type * as $ from "@zenstackhq/orm";');
   out.push('import type * as RawJson from "../../supabase/schema/types";');
   out.push('import { type SchemaType as Schema } from "./schema";');
+  if (hasBranding) {
+    out.push("");
+    out.push("declare const __brand: unique symbol;");
+  }
   out.push("");
   out.push("export namespace Json {");
   out.push(...emitJsonNamespaceBlock(typeDefs, typedJsonFields, "  "));
@@ -1523,7 +1591,7 @@ function emitIndexTs({ tables, views, enumMap, typeDefs, typedJsonFields }) {
   out.push("");
   out.push("export namespace Table {");
   for (const table of tables) {
-    out.push(...emitEntityNamespaceBlock(table, table.modelName, jsonFieldAliases, "  "));
+    out.push(...emitEntityNamespaceBlock(table, table.modelName, jsonFieldAliases, "  ", branding));
     out.push("");
   }
   out.push("}");
@@ -1682,7 +1750,7 @@ function createJsonFieldAliasMap(typedJsonFields) {
   ]));
 }
 __name(createJsonFieldAliasMap, "createJsonFieldAliasMap");
-function emitEntityNamespaceBlock(entity, modelName, jsonFieldAliases, indent = "") {
+function emitEntityNamespaceBlock(entity, modelName, jsonFieldAliases, indent = "", branding) {
   const out = [];
   out.push(`${indent}export interface ${entity.typeName} extends $.ModelResult<Schema, ${esc(modelName)}> {}`);
   out.push(`${indent}export namespace ${entity.typeName} {`);
@@ -1692,7 +1760,13 @@ function emitEntityNamespaceBlock(entity, modelName, jsonFieldAliases, indent =
     if (jsonAlias) {
       out.push(`${indent}  export interface ${exportName} extends Json.${jsonAlias} {}`);
     } else {
-      out.push(`${indent}  export type ${exportName} = ${entity.typeName}[${esc(fieldName)}];`);
+      const isTable = "table" in entity;
+      const brandedLine = isTable && branding ? emitBrandedFieldLine(entity, fieldName, exportName, branding, `${indent}  `) : null;
+      if (brandedLine) {
+        out.push(...brandedLine);
+      } else {
+        out.push(`${indent}  export type ${exportName} = ${entity.typeName}[${esc(fieldName)}];`);
+      }
     }
   }
   out.push(`${indent}}`);
@@ -2241,6 +2315,7 @@ function resolveConfig(config) {
   const derivedFieldsMap = {};
   const validationSchemas = {};
   const fkRelations = {};
+  const brandedFields = {};
   for (const [derivedName, desc] of Object.entries(derived)) {
     const baseExportName = sqlNameToExportName(tables, desc.baseName);
     if (!derivedModels[baseExportName]) {
@@ -2373,6 +2448,9 @@ function resolveConfig(config) {
     if (modelConfig.validate) {
       validationSchemas[modelName] = modelConfig.validate;
     }
+    if (modelConfig.branded) {
+      brandedFields[modelName] = modelConfig.branded;
+    }
     if (modelConfig.search) {
       const modelSearchDefaults = {};
       for (const [profileName, profile] of Object.entries(modelConfig.search)) {
@@ -2392,7 +2470,8 @@ function resolveConfig(config) {
     modelScopes,
     derivedFields: derivedFieldsMap,
     validationSchemas,
-    fkRelations
+    fkRelations,
+    brandedFields
   };
 }
 __name(resolveConfig, "resolveConfig");
@@ -2426,12 +2505,17 @@ async function runCodegen(config) {
     fieldToTypeDef,
     views
   });
+  const branding = {
+    fkRelations: resolved.fkRelations,
+    brandedFields: resolved.brandedFields
+  };
   const indexContent = emitIndexTs({
     tables,
     views,
     enumMap,
     typeDefs,
-    typedJsonFields
+    typedJsonFields,
+    branding
   });
   const compatContent = emitCompatTs({
     tables,
@@ -2440,7 +2524,7 @@ async function runCodegen(config) {
     typedJsonFields
   });
   const ormTypesContent = emitOrmTypesTs(tables);
-  const modelsContent = emitModelsTs(tables, typedJsonFields);
+  const modelsContent = emitModelsTs(tables, typedJsonFields, branding);
   const inputContent = emitInputTs(tables);
   const enumsContent = emitEnumsTs(enumMap);
   const jsonContent = emitJsonTs(typeDefs, typedJsonFields);