@danielhritcu/zenstack-custom 1.1.0 → 1.2.1

package/dist/{config-1Cdfs72F.d.cts → config-rukOeRbn.d.cts}

@@ -57,6 +57,7 @@ interface ModelConfig {
     defaultWhere?: Record<string, unknown>;
     derived?: Record<string, DerivedField>;
     validate?: Record<string, unknown>;
+    branded?: Record<string, true>;
 }
 interface ExtendedSchema {
     tables: Record<string, PgTable>;
@@ -91,7 +92,9 @@ declare function defineConfig<T extends Record<string, PgTable>, D extends Recor
     derived?: D;
     models: (orm: T & {
         [K in keyof D]: D[K] extends DerivedModelDescriptor<infer TBase> ? TBase & D[K] : D[K];
-    }) => Record<string, ModelConfig>;
+    }) => {
+        [K in keyof T]: ModelConfig;
+    };
 }): ZenConfig;
 
 export { type AnyRelation as A, type DerivedField as D, type ExtendedSchema as E, type GlobalConfig as G, type ManyRelation as M, type OneRelation as O, type SchemaConfig as S, type ThroughPath as T, type ZenConfig as Z, type DerivedModelDescriptor as a, type ModelConfig as b, type ModelsOutput as c, type SearchField as d, type SearchProfile as e, type ThroughRelation as f, defineConfig as g };

package/dist/{config-1Cdfs72F.d.ts → config-rukOeRbn.d.ts}

@@ -57,6 +57,7 @@ interface ModelConfig {
     defaultWhere?: Record<string, unknown>;
     derived?: Record<string, DerivedField>;
     validate?: Record<string, unknown>;
+    branded?: Record<string, true>;
 }
 interface ExtendedSchema {
     tables: Record<string, PgTable>;
@@ -91,7 +92,9 @@ declare function defineConfig<T extends Record<string, PgTable>, D extends Recor
     derived?: D;
     models: (orm: T & {
         [K in keyof D]: D[K] extends DerivedModelDescriptor<infer TBase> ? TBase & D[K] : D[K];
-    }) => Record<string, ModelConfig>;
+    }) => {
+        [K in keyof T]: ModelConfig;
+    };
 }): ZenConfig;
 
 export { type AnyRelation as A, type DerivedField as D, type ExtendedSchema as E, type GlobalConfig as G, type ManyRelation as M, type OneRelation as O, type SchemaConfig as S, type ThroughPath as T, type ZenConfig as Z, type DerivedModelDescriptor as a, type ModelConfig as b, type ModelsOutput as c, type SearchField as d, type SearchProfile as e, type ThroughRelation as f, defineConfig as g };

package/dist/index.cjs

@@ -267,7 +267,8 @@ function model(table, opts) {
     search: opts.search,
     defaultWhere: opts.defaultWhere,
     derived: opts.derived,
-    validate: opts.validate
+    validate: opts.validate,
+    branded: opts.branded
   };
 }
 __name(model, "model");
@@ -1979,6 +1980,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)}`;
 }
@@ -2474,8 +2501,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()
   ];
@@ -2483,6 +2511,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)}> {}`);
@@ -2493,7 +2525,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("}");
@@ -2502,6 +2539,33 @@ function emitModelsTs(tables, typedJsonFields = []) {
   return out.join("\n");
 }
 __name(emitModelsTs, "emitModelsTs");
+function emitBrandedFieldLine(t, fieldName, exportName, branding, indent2) {
+  const customBranded = branding.brandedFields[t.modelName]?.[fieldName];
+  if (isUuidField(t, fieldName) && isPkField(t, fieldName)) {
+    const brand = `${t.modelName}.${fieldName}`;
+    return [
+      `${indent2}export type ${exportName} = string & { [__brand]: '${brand}' };`,
+      `${indent2}export const ${exportName} = (id: string): ${exportName} => id as ${exportName};`
+    ];
+  }
+  if (isUuidField(t, fieldName)) {
+    const targetExportName = findFkTarget(t, fieldName, branding.fkRelations);
+    if (targetExportName) {
+      return [
+        `${indent2}export type ${exportName} = ${targetExportName}.Id;`
+      ];
+    }
+  }
+  if (customBranded) {
+    const brand = `${t.modelName}.${fieldName}`;
+    return [
+      `${indent2}export type ${exportName} = string & { [__brand]: '${brand}' };`,
+      `${indent2}export const ${exportName} = (id: string): ${exportName} => id as ${exportName};`
+    ];
+  }
+  return null;
+}
+__name(emitBrandedFieldLine, "emitBrandedFieldLine");
 function emitViewsTs(views, typedJsonFields = []) {
   const jsonFieldAliases = createJsonFieldAliasMap(typedJsonFields);
   const out = [
@@ -2567,12 +2631,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()
   ];
@@ -2580,6 +2645,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, "  "));
@@ -2594,7 +2663,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("}");
@@ -2753,7 +2822,7 @@ function createJsonFieldAliasMap(typedJsonFields) {
   ]));
 }
 __name(createJsonFieldAliasMap, "createJsonFieldAliasMap");
-function emitEntityNamespaceBlock(entity, modelName, jsonFieldAliases, indent2 = "") {
+function emitEntityNamespaceBlock(entity, modelName, jsonFieldAliases, indent2 = "", branding) {
   const out = [];
   out.push(`${indent2}export interface ${entity.typeName} extends $.ModelResult<Schema, ${esc(modelName)}> {}`);
   out.push(`${indent2}export namespace ${entity.typeName} {`);
@@ -2763,7 +2832,13 @@ function emitEntityNamespaceBlock(entity, modelName, jsonFieldAliases, indent2 =
     if (jsonAlias) {
       out.push(`${indent2}  export interface ${exportName} extends Json.${jsonAlias} {}`);
     } else {
-      out.push(`${indent2}  export type ${exportName} = ${entity.typeName}[${esc(fieldName)}];`);
+      const isTable = "table" in entity;
+      const brandedLine = isTable && branding ? emitBrandedFieldLine(entity, fieldName, exportName, branding, `${indent2}  `) : null;
+      if (brandedLine) {
+        out.push(...brandedLine);
+      } else {
+        out.push(`${indent2}  export type ${exportName} = ${entity.typeName}[${esc(fieldName)}];`);
+      }
     }
   }
   out.push(`${indent2}}`);