@danielhritcu/zenstack-custom 1.1.0 → 1.2.0

package/dist/codegen/index.d.cts

@@ -1,5 +1,5 @@
-import { a as DerivedModelDescriptor, E as ExtendedSchema, G as GlobalConfig, b as ModelConfig, c as ModelsOutput, M as ManyRelation, O as OneRelation, T as ThroughPath, f as ThroughRelation, A as AnyRelation, e as SearchProfile, D as DerivedField } from '../config-1Cdfs72F.cjs';
-export { S as SchemaConfig, d as SearchField, Z as ZenConfig, g as defineConfig } from '../config-1Cdfs72F.cjs';
+import { a as DerivedModelDescriptor, E as ExtendedSchema, G as GlobalConfig, b as ModelConfig, c as ModelsOutput, M as ManyRelation, O as OneRelation, T as ThroughPath, f as ThroughRelation, A as AnyRelation, e as SearchProfile, D as DerivedField } from '../config-CRQer7hw.cjs';
+export { S as SchemaConfig, d as SearchField, Z as ZenConfig, g as defineConfig } from '../config-CRQer7hw.cjs';
 import { PgTable, PgColumn, getTableConfig } from 'drizzle-orm/pg-core';
 
 declare function derived<TBase extends PgTable, const TWhere extends Record<string, unknown>>(base: TBase, opts: {
@@ -36,6 +36,7 @@ interface ModelOptions {
     defaultWhere?: Record<string, unknown>;
     derived?: Record<string, DerivedField>;
     validate?: Record<string, unknown>;
+    branded?: Record<string, true>;
 }
 declare function model(table: PgTable, opts: ModelOptions): ModelConfig;
 declare function defineModels(extendedSchema: {
@@ -74,7 +75,7 @@ type ThroughRelationPath = {
     [key: string]: true | ThroughRelationPath;
 };
 
-interface FKRelationInfo {
+interface FKRelationInfo$1 {
     targetExportName: string;
     fields: string[];
     references: string[];
@@ -91,7 +92,7 @@ interface LegacyConfig {
     modelScopes: Record<string, Record<string, unknown>>;
     derivedFields: Record<string, Record<string, DerivedField>>;
     validationSchemas: Record<string, Record<string, unknown>>;
-    fkRelations: Record<string, Record<string, FKRelationInfo>>;
+    fkRelations: Record<string, Record<string, FKRelationInfo$1>>;
 }
 declare function adaptToLegacyConfig(output: ModelsOutput): LegacyConfig;
 
@@ -205,11 +206,29 @@ declare function discoverViews(allViews: Record<string, unknown>): ViewInfo[];
 declare function extractFKs(table: PgTable): FKInfo[];
 
 type RelationTargets = Record<string, Record<string, string>>;
-declare function buildRelations(tables: TableInfo[], relationTargets?: RelationTargets, filteredRelations?: FilteredRelationsConfig, throughRelations?: ThroughRelationsConfig, fkRelations?: Record<string, Record<string, FKRelationInfo>>): {
+declare function buildRelations(tables: TableInfo[], relationTargets?: RelationTargets, filteredRelations?: FilteredRelationsConfig, throughRelations?: ThroughRelationsConfig, fkRelations?: Record<string, Record<string, FKRelationInfo$1>>): {
     modelRelations: Map<string, RelationField[]>;
     inverseRelations: Map<string, RelationField[]>;
 };
 
+interface FKRelationInfo {
+    targetExportName: string;
+    fields: string[];
+    references: string[];
+    relationName: string | null;
+}
+
+/**
+ * Branding context passed to namespace-emitting functions so they can
+ * produce branded ID types for UUID primary-key / foreign-key columns and
+ * for user-declared `branded` fields in the model config.
+ */
+interface BrandingInfo {
+    /** Map of modelName -> { relName -> FKRelationInfo } */
+    fkRelations: Record<string, Record<string, FKRelationInfo>>;
+    /** Map of modelName -> { fieldName -> true } for custom branded fields */
+    brandedFields: Record<string, Record<string, true>>;
+}
 declare function emitEnumBlock(info: EnumInfo): string;
 declare function emitFieldBlock(field: FieldInfo): string;
 declare function emitRelationField(rel: RelationField, opposite: string): string;
@@ -225,15 +244,16 @@ interface EmitSchemaOptions {
     views?: ViewInfo[];
 }
 declare function emitSchemaTs({ tables, enumMap, modelRelations, inverseRelations, searchDefaults, modelScopes, typeDefs, fieldToTypeDef, views, }: EmitSchemaOptions): string;
-declare function emitModelsTs(tables: TableInfo[], typedJsonFields?: TypedJsonFieldInfo[]): string;
+declare function emitModelsTs(tables: TableInfo[], typedJsonFields?: TypedJsonFieldInfo[], branding?: BrandingInfo): string;
 declare function emitViewsTs(views: ViewInfo[], typedJsonFields?: TypedJsonFieldInfo[]): string;
 declare function emitInputTs(tables: TableInfo[]): string;
-declare function emitIndexTs({ tables, views, enumMap, typeDefs, typedJsonFields, }: {
+declare function emitIndexTs({ tables, views, enumMap, typeDefs, typedJsonFields, branding, }: {
     tables: TableInfo[];
     views: ViewInfo[];
     enumMap: Map<string, EnumInfo>;
     typeDefs: Map<string, TypeDefInfo>;
     typedJsonFields: TypedJsonFieldInfo[];
+    branding?: BrandingInfo;
 }): string;
 declare function emitCompatTs({ tables, views, enumMap, typedJsonFields, }: {
     tables: TableInfo[];
@@ -262,4 +282,4 @@ declare function esc(s: string): string;
 declare function getDrizzleTableName(table: unknown): string;
 declare function writeFileIfChanged(filePath: string, content: string): boolean;
 
-export { APP_SLUG_JS, APP_SLUG_SQL, type ComputedFieldDeclaration, type ComputedFieldInfo, type ComputedFieldsConfig, DerivedField, type DerivedModelDeclaration, DerivedModelDescriptor, type DerivedModelsConfig, type EmitSchemaOptions, type EnumInfo, ExtendedSchema, type FKInfo, type FKRelationInfo, type FieldInfo, type FilteredRelationDeclaration, type FilteredRelationsConfig, GENERATED_FILE_BANNER, GlobalConfig, ManyRelation, ModelConfig, ModelsOutput, OneRelation, type RelationField, type ResolvedRelationTargets, type SearchDefaultDeclaration, type SearchDefaultsConfig, SearchProfile, type TableInfo, ThroughPath, ThroughRelation, type ThroughRelationDeclaration, type ThroughRelationPath, type ThroughRelationsConfig, type TypeDefField, type TypeDefInfo, type TypeDefMapping, type TypedJsonArtifacts, type TypedJsonFieldInfo, type ViewInfo, adaptToLegacyConfig, assertNoTypedColumnOverrides, buildRelations, buildTypeDefs, capitalize, defineModels, derived, discoverEnums, discoverTables, discoverViews, emitCompatTs, emitEnumBlock, emitEnumsTs, emitFieldBlock, emitGeneratedFileBanner, emitIndexTs, emitInputTs, emitJsonNamespaceBlock, emitJsonRawNamespaceBlock, emitJsonRawTs, emitJsonTs, emitModelsTs, emitOrmTypesTs, emitRelationField, emitSchemaTs, emitTypeDefsBlock, emitViewsTs, esc, extend, extractFKs, getDrizzleTableName, many, mapColumn, model, one, through, toPascalCase, uncapitalize, writeFileIfChanged };
+export { APP_SLUG_JS, APP_SLUG_SQL, type BrandingInfo, type ComputedFieldDeclaration, type ComputedFieldInfo, type ComputedFieldsConfig, DerivedField, type DerivedModelDeclaration, DerivedModelDescriptor, type DerivedModelsConfig, type EmitSchemaOptions, type EnumInfo, ExtendedSchema, type FKInfo, type FKRelationInfo$1 as FKRelationInfo, type FieldInfo, type FilteredRelationDeclaration, type FilteredRelationsConfig, GENERATED_FILE_BANNER, GlobalConfig, ManyRelation, ModelConfig, ModelsOutput, OneRelation, type RelationField, type ResolvedRelationTargets, type SearchDefaultDeclaration, type SearchDefaultsConfig, SearchProfile, type TableInfo, ThroughPath, ThroughRelation, type ThroughRelationDeclaration, type ThroughRelationPath, type ThroughRelationsConfig, type TypeDefField, type TypeDefInfo, type TypeDefMapping, type TypedJsonArtifacts, type TypedJsonFieldInfo, type ViewInfo, adaptToLegacyConfig, assertNoTypedColumnOverrides, buildRelations, buildTypeDefs, capitalize, defineModels, derived, discoverEnums, discoverTables, discoverViews, emitCompatTs, emitEnumBlock, emitEnumsTs, emitFieldBlock, emitGeneratedFileBanner, emitIndexTs, emitInputTs, emitJsonNamespaceBlock, emitJsonRawNamespaceBlock, emitJsonRawTs, emitJsonTs, emitModelsTs, emitOrmTypesTs, emitRelationField, emitSchemaTs, emitTypeDefsBlock, emitViewsTs, esc, extend, extractFKs, getDrizzleTableName, many, mapColumn, model, one, through, toPascalCase, uncapitalize, writeFileIfChanged };

package/dist/codegen/index.d.ts

@@ -1,5 +1,5 @@
-import { a as DerivedModelDescriptor, E as ExtendedSchema, G as GlobalConfig, b as ModelConfig, c as ModelsOutput, M as ManyRelation, O as OneRelation, T as ThroughPath, f as ThroughRelation, A as AnyRelation, e as SearchProfile, D as DerivedField } from '../config-1Cdfs72F.js';
-export { S as SchemaConfig, d as SearchField, Z as ZenConfig, g as defineConfig } from '../config-1Cdfs72F.js';
+import { a as DerivedModelDescriptor, E as ExtendedSchema, G as GlobalConfig, b as ModelConfig, c as ModelsOutput, M as ManyRelation, O as OneRelation, T as ThroughPath, f as ThroughRelation, A as AnyRelation, e as SearchProfile, D as DerivedField } from '../config-CRQer7hw.js';
+export { S as SchemaConfig, d as SearchField, Z as ZenConfig, g as defineConfig } from '../config-CRQer7hw.js';
 import { PgTable, PgColumn, getTableConfig } from 'drizzle-orm/pg-core';
 
 declare function derived<TBase extends PgTable, const TWhere extends Record<string, unknown>>(base: TBase, opts: {
@@ -36,6 +36,7 @@ interface ModelOptions {
     defaultWhere?: Record<string, unknown>;
     derived?: Record<string, DerivedField>;
     validate?: Record<string, unknown>;
+    branded?: Record<string, true>;
 }
 declare function model(table: PgTable, opts: ModelOptions): ModelConfig;
 declare function defineModels(extendedSchema: {
@@ -74,7 +75,7 @@ type ThroughRelationPath = {
     [key: string]: true | ThroughRelationPath;
 };
 
-interface FKRelationInfo {
+interface FKRelationInfo$1 {
     targetExportName: string;
     fields: string[];
     references: string[];
@@ -91,7 +92,7 @@ interface LegacyConfig {
     modelScopes: Record<string, Record<string, unknown>>;
     derivedFields: Record<string, Record<string, DerivedField>>;
     validationSchemas: Record<string, Record<string, unknown>>;
-    fkRelations: Record<string, Record<string, FKRelationInfo>>;
+    fkRelations: Record<string, Record<string, FKRelationInfo$1>>;
 }
 declare function adaptToLegacyConfig(output: ModelsOutput): LegacyConfig;
 
@@ -205,11 +206,29 @@ declare function discoverViews(allViews: Record<string, unknown>): ViewInfo[];
 declare function extractFKs(table: PgTable): FKInfo[];
 
 type RelationTargets = Record<string, Record<string, string>>;
-declare function buildRelations(tables: TableInfo[], relationTargets?: RelationTargets, filteredRelations?: FilteredRelationsConfig, throughRelations?: ThroughRelationsConfig, fkRelations?: Record<string, Record<string, FKRelationInfo>>): {
+declare function buildRelations(tables: TableInfo[], relationTargets?: RelationTargets, filteredRelations?: FilteredRelationsConfig, throughRelations?: ThroughRelationsConfig, fkRelations?: Record<string, Record<string, FKRelationInfo$1>>): {
     modelRelations: Map<string, RelationField[]>;
     inverseRelations: Map<string, RelationField[]>;
 };
 
+interface FKRelationInfo {
+    targetExportName: string;
+    fields: string[];
+    references: string[];
+    relationName: string | null;
+}
+
+/**
+ * Branding context passed to namespace-emitting functions so they can
+ * produce branded ID types for UUID primary-key / foreign-key columns and
+ * for user-declared `branded` fields in the model config.
+ */
+interface BrandingInfo {
+    /** Map of modelName -> { relName -> FKRelationInfo } */
+    fkRelations: Record<string, Record<string, FKRelationInfo>>;
+    /** Map of modelName -> { fieldName -> true } for custom branded fields */
+    brandedFields: Record<string, Record<string, true>>;
+}
 declare function emitEnumBlock(info: EnumInfo): string;
 declare function emitFieldBlock(field: FieldInfo): string;
 declare function emitRelationField(rel: RelationField, opposite: string): string;
@@ -225,15 +244,16 @@ interface EmitSchemaOptions {
     views?: ViewInfo[];
 }
 declare function emitSchemaTs({ tables, enumMap, modelRelations, inverseRelations, searchDefaults, modelScopes, typeDefs, fieldToTypeDef, views, }: EmitSchemaOptions): string;
-declare function emitModelsTs(tables: TableInfo[], typedJsonFields?: TypedJsonFieldInfo[]): string;
+declare function emitModelsTs(tables: TableInfo[], typedJsonFields?: TypedJsonFieldInfo[], branding?: BrandingInfo): string;
 declare function emitViewsTs(views: ViewInfo[], typedJsonFields?: TypedJsonFieldInfo[]): string;
 declare function emitInputTs(tables: TableInfo[]): string;
-declare function emitIndexTs({ tables, views, enumMap, typeDefs, typedJsonFields, }: {
+declare function emitIndexTs({ tables, views, enumMap, typeDefs, typedJsonFields, branding, }: {
     tables: TableInfo[];
     views: ViewInfo[];
     enumMap: Map<string, EnumInfo>;
     typeDefs: Map<string, TypeDefInfo>;
     typedJsonFields: TypedJsonFieldInfo[];
+    branding?: BrandingInfo;
 }): string;
 declare function emitCompatTs({ tables, views, enumMap, typedJsonFields, }: {
     tables: TableInfo[];
@@ -262,4 +282,4 @@ declare function esc(s: string): string;
 declare function getDrizzleTableName(table: unknown): string;
 declare function writeFileIfChanged(filePath: string, content: string): boolean;
 
-export { APP_SLUG_JS, APP_SLUG_SQL, type ComputedFieldDeclaration, type ComputedFieldInfo, type ComputedFieldsConfig, DerivedField, type DerivedModelDeclaration, DerivedModelDescriptor, type DerivedModelsConfig, type EmitSchemaOptions, type EnumInfo, ExtendedSchema, type FKInfo, type FKRelationInfo, type FieldInfo, type FilteredRelationDeclaration, type FilteredRelationsConfig, GENERATED_FILE_BANNER, GlobalConfig, ManyRelation, ModelConfig, ModelsOutput, OneRelation, type RelationField, type ResolvedRelationTargets, type SearchDefaultDeclaration, type SearchDefaultsConfig, SearchProfile, type TableInfo, ThroughPath, ThroughRelation, type ThroughRelationDeclaration, type ThroughRelationPath, type ThroughRelationsConfig, type TypeDefField, type TypeDefInfo, type TypeDefMapping, type TypedJsonArtifacts, type TypedJsonFieldInfo, type ViewInfo, adaptToLegacyConfig, assertNoTypedColumnOverrides, buildRelations, buildTypeDefs, capitalize, defineModels, derived, discoverEnums, discoverTables, discoverViews, emitCompatTs, emitEnumBlock, emitEnumsTs, emitFieldBlock, emitGeneratedFileBanner, emitIndexTs, emitInputTs, emitJsonNamespaceBlock, emitJsonRawNamespaceBlock, emitJsonRawTs, emitJsonTs, emitModelsTs, emitOrmTypesTs, emitRelationField, emitSchemaTs, emitTypeDefsBlock, emitViewsTs, esc, extend, extractFKs, getDrizzleTableName, many, mapColumn, model, one, through, toPascalCase, uncapitalize, writeFileIfChanged };
+export { APP_SLUG_JS, APP_SLUG_SQL, type BrandingInfo, type ComputedFieldDeclaration, type ComputedFieldInfo, type ComputedFieldsConfig, DerivedField, type DerivedModelDeclaration, DerivedModelDescriptor, type DerivedModelsConfig, type EmitSchemaOptions, type EnumInfo, ExtendedSchema, type FKInfo, type FKRelationInfo$1 as FKRelationInfo, type FieldInfo, type FilteredRelationDeclaration, type FilteredRelationsConfig, GENERATED_FILE_BANNER, GlobalConfig, ManyRelation, ModelConfig, ModelsOutput, OneRelation, type RelationField, type ResolvedRelationTargets, type SearchDefaultDeclaration, type SearchDefaultsConfig, SearchProfile, type TableInfo, ThroughPath, ThroughRelation, type ThroughRelationDeclaration, type ThroughRelationPath, type ThroughRelationsConfig, type TypeDefField, type TypeDefInfo, type TypeDefMapping, type TypedJsonArtifacts, type TypedJsonFieldInfo, type ViewInfo, adaptToLegacyConfig, assertNoTypedColumnOverrides, buildRelations, buildTypeDefs, capitalize, defineModels, derived, discoverEnums, discoverTables, discoverViews, emitCompatTs, emitEnumBlock, emitEnumsTs, emitFieldBlock, emitGeneratedFileBanner, emitIndexTs, emitInputTs, emitJsonNamespaceBlock, emitJsonRawNamespaceBlock, emitJsonRawTs, emitJsonTs, emitModelsTs, emitOrmTypesTs, emitRelationField, emitSchemaTs, emitTypeDefsBlock, emitViewsTs, esc, extend, extractFKs, getDrizzleTableName, many, mapColumn, model, one, through, toPascalCase, uncapitalize, writeFileIfChanged };

package/dist/codegen/index.js

@@ -138,7 +138,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");
@@ -1690,6 +1691,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)}`;
 }
@@ -2185,8 +2212,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()
   ];
@@ -2194,6 +2222,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)}> {}`);
@@ -2204,7 +2236,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("}");
@@ -2213,6 +2250,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 = [
@@ -2278,12 +2342,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()
   ];
@@ -2291,6 +2356,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, "  "));
@@ -2305,7 +2374,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("}");
@@ -2464,7 +2533,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} {`);
@@ -2474,7 +2543,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}}`);