neoorm 0.8.3 → 0.8.4

package/dist/codegen/column-ts.d.ts

@@ -0,0 +1,41 @@
+import type { Manifest, ManifestColumn, ManifestTable } from "../dialect/types.js";
+import type { ValidationType } from "./validation/types.js";
+export type EnumAlias = {
+    name: string;
+    values: readonly string[];
+    array: boolean;
+};
+export type EnumRegistry = {
+    aliasForColumn: (accessor: string, tsName: string) => string | null;
+    declarations: string[];
+    byName: Map<string, EnumAlias>;
+};
+/** Map validator-neutral JSON/validation IR to a TypeScript type string. */
+export declare function validationTypeToTs(type: ValidationType): string;
+/** Collect hoisted `export type X = ...` enum aliases for enum/enumArray columns. */
+export declare function buildEnumRegistry(manifest: Manifest): EnumRegistry;
+/**
+ * Resolved TS type for a manifest column (the `resolvedType` printer).
+ * Uses the plugin `columnTsType`, hoisted enum aliases, and JSON validation
+ * generics — never the schema builder chain.
+ */
+export declare function columnTsType(col: ManifestColumn, manifest: Manifest, enums?: EnumRegistry | null, tableAccessor?: string): string;
+/** Non-nullable TS type for filter generic params (`StringFilter<PostStatus>`). */
+export declare function columnNonNullTsType(col: ManifestColumn, manifest: Manifest, enums?: EnumRegistry | null, tableAccessor?: string): string;
+/** SQL-name primary key mapped to TS names (empty when the table has no PK). */
+export declare function pkTsNames(table: ManifestTable): string[];
+/**
+ * Unique `where` candidates mirroring runtime `resolveUniqueConstraint`:
+ * PK group, single unique/primary columns, then unique btree indexes.
+ */
+export declare function uniqueKeyCandidates(table: ManifestTable): string[][];
+/** `timestamps()` / `.defaultNow()` / `.updatedAt()` — ORM-owned, not client-writable. */
+export declare function isManagedTimestamp(col: ManifestColumn): boolean;
+export declare function isJunctionTable(manifest: Manifest, accessor: string): boolean;
+export declare function isJunctionPkColumn(col: ManifestColumn, table: ManifestTable, isJunction: boolean): boolean;
+export declare function isOmittedOnCreate(col: ManifestColumn, table: ManifestTable, isJunction: boolean): boolean;
+export declare function isOmittedOnUpdate(col: ManifestColumn, table: ManifestTable, isJunction: boolean): boolean;
+export declare function isCreateRequired(col: ManifestColumn, table: ManifestTable, isJunction: boolean): boolean;
+export declare function updateScalarTsType(col: ManifestColumn, manifest: Manifest, enums?: EnumRegistry | null, tableAccessor?: string): string;
+export declare function columnByTsNameOrThrow(table: ManifestTable, tsName: string): ManifestColumn;
+//# sourceMappingURL=column-ts.d.ts.map

package/dist/codegen/column-ts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"column-ts.d.ts","sourceRoot":"","sources":["../../src/codegen/column-ts.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACX,QAAQ,EACR,cAAc,EACd,aAAa,EACb,MAAM,qBAAqB,CAAC;AAG7B,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,MAAM,MAAM,SAAS,GAAG;IACvB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1B,KAAK,EAAE,OAAO,CAAC;CACf,CAAC;AAEF,MAAM,MAAM,YAAY,GAAG;IAC1B,cAAc,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;IACpE,YAAY,EAAE,MAAM,EAAE,CAAC;IACvB,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAC/B,CAAC;AAEF,4EAA4E;AAC5E,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,cAAc,GAAG,MAAM,CAgD/D;AAgBD,qFAAqF;AACrF,wBAAgB,iBAAiB,CAAC,QAAQ,EAAE,QAAQ,GAAG,YAAY,CAmDlE;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAC3B,GAAG,EAAE,cAAc,EACnB,QAAQ,EAAE,QAAQ,EAClB,KAAK,CAAC,EAAE,YAAY,GAAG,IAAI,EAC3B,aAAa,CAAC,EAAE,MAAM,GACpB,MAAM,CA+BR;AAED,mFAAmF;AACnF,wBAAgB,mBAAmB,CAClC,GAAG,EAAE,cAAc,EACnB,QAAQ,EAAE,QAAQ,EAClB,KAAK,CAAC,EAAE,YAAY,GAAG,IAAI,EAC3B,aAAa,CAAC,EAAE,MAAM,GACpB,MAAM,CAOR;AAED,gFAAgF;AAChF,wBAAgB,SAAS,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE,CAQxD;AASD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,aAAa,GAAG,MAAM,EAAE,EAAE,CA4CpE;AAED,0FAA0F;AAC1F,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,cAAc,GAAG,OAAO,CAE/D;AAED,wBAAgB,eAAe,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,GAAG,OAAO,CAE7E;AAED,wBAAgB,kBAAkB,CACjC,GAAG,EAAE,cAAc,EACnB,KAAK,EAAE,aAAa,EACpB,UAAU,EAAE,OAAO,GACjB,OAAO,CAET;AAED,wBAAgB,iBAAiB,CAChC,GAAG,EAAE,cAAc,EACnB,KAAK,EAAE,aAAa,EACpB,UAAU,EAAE,OAAO,GACjB,OAAO,CAUT;AAED,wBAAgB,iBAAiB,CAChC,GAAG,EAAE,cAAc,EACnB,KAAK,EAAE,aAAa,EACpB,UAAU,EAAE,OAAO,GACjB,OAAO,CAKT;AAED,wBAAgB,gBAAgB,CAC/B,GAAG,EAAE,cAAc,EACnB,KAAK,EAAE,aAAa,EACpB,UAAU,EAAE,OAAO,GACjB,OAAO,CAgBT;AAED,wBAAgB,kBAAkB,CACjC,GAAG,EAAE,cAAc,EACnB,QAAQ,EAAE,QAAQ,EAClB,KAAK,CAAC,EAAE,YAAY,GAAG,IAAI,EAC3B,aAAa,CAAC,EAAE,MAAM,GACpB,MAAM,CAaR;AAED,wBAAgB,qBAAqB,CACpC,KAAK,EAAE,aAAa,EACpB,MAAM,EAAE,MAAM,GACZ,cAAc,CAQhB"}

package/dist/codegen/column-ts.js

@@ -0,0 +1,269 @@
+import { findFkReferencedColumn } from "../dialect/fk.js";
+import { getColumnTypeOrThrow } from "../plugins/registry.js";
+import { modelTypeName, pascalCase } from "./manifest-relations.js";
+/** Map validator-neutral JSON/validation IR to a TypeScript type string. */
+export function validationTypeToTs(type) {
+    switch (type.kind) {
+        case "string":
+            return "string";
+        case "number":
+            return "number";
+        case "bigint":
+            return "bigint";
+        case "boolean":
+            return "boolean";
+        case "date":
+            return "Date";
+        case "enum": {
+            const union = type.values.map((v) => JSON.stringify(v)).join(" | ");
+            return union.length > 0 ? union : "string";
+        }
+        case "unknown":
+            return "unknown";
+        case "record": {
+            const value = validationTypeToTs(type.value);
+            return `Record<string, ${value}>`;
+        }
+        case "array":
+            return `${validationTypeToTs(type.element)}[]`;
+        case "object": {
+            if (type.fields.length === 0)
+                return "Record<string, unknown>";
+            const fields = type.fields
+                .map((f) => {
+                const optional = f.optional ? "?" : "";
+                const ts = validationTypeToTs(f.type);
+                return `${f.name}${optional}: ${ts}${f.nullable ? " | null" : ""};`;
+            })
+                .join(" ");
+            return `{ ${fields} }`;
+        }
+        case "union":
+            return type.variants.map((v) => validationTypeToTs(v)).join(" | ");
+        case "literal":
+            return JSON.stringify(type.value);
+        case "tuple":
+            return `[${type.elements.map((e) => validationTypeToTs(e)).join(", ")}]`;
+        case "instance":
+            return type.tsName;
+        default: {
+            const _exhaustive = type;
+            return _exhaustive;
+        }
+    }
+}
+function enumValuesOf(col) {
+    const values = col.typeOptions?.values;
+    if (!values || values.length === 0)
+        return null;
+    return values;
+}
+function enumAliasSeed(col, modelName) {
+    const explicit = col.typeOptions?.name;
+    if (explicit !== undefined && explicit.length > 0) {
+        return pascalCase(explicit);
+    }
+    return `${modelName}${pascalCase(col.tsName)}`;
+}
+/** Collect hoisted `export type X = ...` enum aliases for enum/enumArray columns. */
+export function buildEnumRegistry(manifest) {
+    const byKey = new Map();
+    const byName = new Map();
+    const declarations = [];
+    const tables = Object.values(manifest.tables).sort((a, b) => a.accessor.localeCompare(b.accessor));
+    for (const table of tables) {
+        const modelName = modelTypeName(table.accessor);
+        for (const col of table.columns) {
+            if (col.kind !== "enum" && col.kind !== "enumArray")
+                continue;
+            const values = enumValuesOf(col);
+            if (!values)
+                continue;
+            const key = `${table.accessor}.${col.tsName}`;
+            let name = enumAliasSeed(col, modelName);
+            const existing = byName.get(name);
+            if (existing) {
+                if (existing.array === (col.kind === "enumArray") &&
+                    JSON.stringify(existing.values) === JSON.stringify(values)) {
+                    byKey.set(key, name);
+                    continue;
+                }
+                let i = 2;
+                while (byName.has(`${name}${i}`))
+                    i++;
+                name = `${name}${i}`;
+            }
+            const union = values.map((v) => JSON.stringify(v)).join(" | ");
+            const decl = col.kind === "enumArray"
+                ? `export type ${name} = (${union})[];`
+                : `export type ${name} = ${union};`;
+            byName.set(name, {
+                name,
+                values,
+                array: col.kind === "enumArray",
+            });
+            byKey.set(key, name);
+            declarations.push(decl);
+        }
+    }
+    declarations.sort();
+    return {
+        aliasForColumn: (accessor, tsName) => byKey.get(`${accessor}.${tsName}`) ?? null,
+        declarations,
+        byName,
+    };
+}
+/**
+ * Resolved TS type for a manifest column (the `resolvedType` printer).
+ * Uses the plugin `columnTsType`, hoisted enum aliases, and JSON validation
+ * generics — never the schema builder chain.
+ */
+export function columnTsType(col, manifest, enums, tableAccessor) {
+    if (col.kind === "fk") {
+        const referenced = findFkReferencedColumn(col, manifest);
+        if (referenced && referenced.kind !== "fk") {
+            return columnTsType({ ...referenced, nullable: col.nullable }, manifest, enums, tableAccessor);
+        }
+        return col.nullable ? "string | null" : "string";
+    }
+    if ((col.kind === "json" || col.kind === "jsonb") &&
+        col.validation !== undefined) {
+        const base = validationTypeToTs(col.validation);
+        return col.nullable ? `${base} | null` : base;
+    }
+    if (enums &&
+        tableAccessor &&
+        (col.kind === "enum" || col.kind === "enumArray")) {
+        const alias = enums.aliasForColumn(tableAccessor, col.tsName);
+        if (alias) {
+            return col.nullable ? `${alias} | null` : alias;
+        }
+    }
+    return getColumnTypeOrThrow(col.kind).columnTsType(col);
+}
+/** Non-nullable TS type for filter generic params (`StringFilter<PostStatus>`). */
+export function columnNonNullTsType(col, manifest, enums, tableAccessor) {
+    return columnTsType({ ...col, nullable: false }, manifest, enums, tableAccessor);
+}
+/** SQL-name primary key mapped to TS names (empty when the table has no PK). */
+export function pkTsNames(table) {
+    const bySql = new Map(table.columns.map((c) => [c.sqlName, c.tsName]));
+    const names = [];
+    for (const sqlName of table.primaryKey) {
+        const tsName = bySql.get(sqlName);
+        if (tsName !== undefined)
+            names.push(tsName);
+    }
+    return names;
+}
+function columnByTsName(table, tsName) {
+    return table.columns.find((c) => c.tsName === tsName);
+}
+/**
+ * Unique `where` candidates mirroring runtime `resolveUniqueConstraint`:
+ * PK group, single unique/primary columns, then unique btree indexes.
+ */
+export function uniqueKeyCandidates(table) {
+    const candidates = [];
+    const pk = pkTsNames(table);
+    if (pk.length > 0)
+        candidates.push(pk);
+    for (const col of table.columns) {
+        if (col.unique || col.primary) {
+            if (!candidates.some((c) => c.length === 1 && c[0] === col.tsName)) {
+                candidates.push([col.tsName]);
+            }
+        }
+    }
+    const bySql = new Map(table.columns.map((c) => [c.sqlName, c.tsName]));
+    for (const index of table.indexes) {
+        if (!index.unique)
+            continue;
+        if (index.using && index.using !== "btree")
+            continue;
+        if (index.keys?.some((key) => key.expr))
+            continue;
+        const tsNames = [];
+        let ok = true;
+        for (const sqlName of index.columns) {
+            const tsName = bySql.get(sqlName);
+            if (tsName === undefined) {
+                ok = false;
+                break;
+            }
+            tsNames.push(tsName);
+        }
+        if (!ok || tsNames.length === 0)
+            continue;
+        if (candidates.some((c) => c.length === tsNames.length &&
+            c.every((name) => tsNames.includes(name)))) {
+            continue;
+        }
+        candidates.push(tsNames);
+    }
+    return candidates;
+}
+/** `timestamps()` / `.defaultNow()` / `.updatedAt()` — ORM-owned, not client-writable. */
+export function isManagedTimestamp(col) {
+    return col.defaultNow || col.updatedAt === true;
+}
+export function isJunctionTable(manifest, accessor) {
+    return manifest.manyToMany.some((m) => m.throughAccessor === accessor);
+}
+export function isJunctionPkColumn(col, table, isJunction) {
+    return isJunction && table.primaryKey.includes(col.sqlName);
+}
+export function isOmittedOnCreate(col, table, isJunction) {
+    if (isJunctionPkColumn(col, table, isJunction)) {
+        return false;
+    }
+    return (col.primary ||
+        col.generated === true ||
+        col.kind === "serial" ||
+        isManagedTimestamp(col));
+}
+export function isOmittedOnUpdate(col, table, isJunction) {
+    if (isJunctionPkColumn(col, table, isJunction)) {
+        return true;
+    }
+    return col.primary || isManagedTimestamp(col);
+}
+export function isCreateRequired(col, table, isJunction) {
+    if (isOmittedOnCreate(col, table, isJunction)) {
+        return false;
+    }
+    // FK scalars are satisfied by relation writes (`author: { connect }`),
+    // mirroring schema-driven `IsRequired` which is never true for FKs.
+    if (col.kind === "fk") {
+        return false;
+    }
+    if (col.nullable) {
+        return false;
+    }
+    if (col.defaultNow || col.defaultValue !== undefined) {
+        return false;
+    }
+    return true;
+}
+export function updateScalarTsType(col, manifest, enums, tableAccessor) {
+    const base = columnTsType(col, manifest, enums, tableAccessor);
+    const nonNull = columnNonNullTsType(col, manifest, enums, tableAccessor);
+    switch (col.kind) {
+        case "int":
+        case "serial":
+        case "real":
+        case "double":
+        case "bigint":
+            return `${base} | { increment?: ${nonNull}; decrement?: ${nonNull}; multiply?: ${nonNull}; set?: ${base} }`;
+        default:
+            return `${base} | { set?: ${base} }`;
+    }
+}
+export function columnByTsNameOrThrow(table, tsName) {
+    const col = columnByTsName(table, tsName);
+    if (!col) {
+        throw new Error(`Column "${tsName}" not found on table "${table.accessor}"`);
+    }
+    return col;
+}
+//# sourceMappingURL=column-ts.js.map

package/dist/codegen/column-ts.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"column-ts.js","sourceRoot":"","sources":["../../src/codegen/column-ts.ts"],"names":[],"mappings":"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"}

package/dist/codegen/emit-includes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"emit-includes.d.ts","sourceRoot":"","sources":["../../src/codegen/emit-includes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,QAAQ,EAIR,MAAM,qBAAqB,CAAC;AA6E7B,wBAAgB,cAAc,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAiCzD"}
+{"version":3,"file":"emit-includes.d.ts","sourceRoot":"","sources":["../../src/codegen/emit-includes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,QAAQ,EAIR,MAAM,qBAAqB,CAAC;AA8E7B,wBAAgB,cAAc,CAAC,QAAQ,EAAE,QAAQ,GAAG,MAAM,CAsCzD"}

package/dist/codegen/emit-includes.js

@@ -22,11 +22,12 @@ function emitRelationIncludeType(manifest, tableAccessor, relation) {
     const target = manifest.tables[relation.targetAccessor];
     const columns = target?.columns ?? [];
     const nestedWith = `${modelTypeName(relation.targetAccessor)}With`;
+    const targetWhere = `${modelTypeName(relation.targetAccessor)}Where`;
     return `export type ${typeName} =
   | boolean
   | {
       select?: ${selectType(columns)};
-      where?: Record<string, unknown>;
+      where?: ${targetWhere};
       orderBy?: ${orderByType(columns)};
       take?: number;
       skip?: number;
@@ -48,18 +49,25 @@ function emitTableWithType(manifest, table) {
         .join("\n");
     const countField = manyRelations.length > 0
         ? `\n  _count?: {\n${manyRelations
-            .map((rel) => `    ${rel.name}?: true | { where?: Record<string, unknown> };`)
+            .map((rel) => {
+            const targetWhere = `${modelTypeName(rel.targetAccessor)}Where`;
+            return `    ${rel.name}?: true | { where?: ${targetWhere} };`;
+        })
             .join("\n")}\n  };`
         : "";
     return `export type ${typeName} = {\n${fields}${countField}\n};`;
 }
 export function emitIncludesTs(manifest) {
+    const tables = Object.values(manifest.tables).sort((a, b) => a.accessor.localeCompare(b.accessor));
+    const withNames = tables.map((t) => `${modelTypeName(t.accessor)}With`);
+    const whereNames = tables.map((t) => `${modelTypeName(t.accessor)}Where`);
     const lines = [
         "// Auto-generated by neoorm generate — do not edit",
-        `import type { OrderDirection } from "neoorm/schema";`,
+        `import type { ${whereNames.join(", ")} } from "./query-types.js";`,
+        "",
+        `type OrderDirection = "asc" | "desc";`,
         "",
     ];
-    const tables = Object.values(manifest.tables).sort((a, b) => a.accessor.localeCompare(b.accessor));
     for (const table of tables) {
         for (const rel of effectiveRelations(manifest, table)) {
             lines.push(emitRelationIncludeType(manifest, table.accessor, rel));
@@ -77,6 +85,7 @@ export function emitIncludesTs(manifest) {
     lines.push(includeMapEntries);
     lines.push(`};`);
     lines.push("");
+    void withNames;
     return lines.join("\n");
 }
 //# sourceMappingURL=emit-includes.js.map

package/dist/codegen/emit-includes.js.map

@@ -1 +1 @@
-{"version":3,"file":"emit-includes.js","sourceRoot":"","sources":["../../src/codegen/emit-includes.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"emit-includes.js","sourceRoot":"","sources":["../../src/codegen/emit-includes.ts"],"names":[],"mappings":"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"}

package/dist/codegen/emit-models.d.ts

@@ -1,3 +1,4 @@
-import type { Manifest } from "../dialect/types.js";
+import type { Manifest, ManifestTable } from "../dialect/types.js";
+export declare function relationResultTypeFor(manifest: Manifest, table: ManifestTable, relationName: string): string;
 export declare function emitModelsTs(manifest: Manifest, packageImportPath?: string): string;
 //# sourceMappingURL=emit-models.d.ts.map

package/dist/codegen/emit-models.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"emit-models.d.ts","sourceRoot":"","sources":["../../src/codegen/emit-models.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACX,QAAQ,EAGR,MAAM,qBAAqB,CAAC;AAsH7B,wBAAgB,YAAY,CAC3B,QAAQ,EAAE,QAAQ,EAClB,iBAAiB,SAAW,GAC1B,MAAM,CAiGR"}
+{"version":3,"file":"emit-models.d.ts","sourceRoot":"","sources":["../../src/codegen/emit-models.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACX,QAAQ,EAER,aAAa,EACb,MAAM,qBAAqB,CAAC;AA0K7B,wBAAgB,qBAAqB,CACpC,QAAQ,EAAE,QAAQ,EAClB,KAAK,EAAE,aAAa,EACpB,YAAY,EAAE,MAAM,GAClB,MAAM,CAUR;AAED,wBAAgB,YAAY,CAC3B,QAAQ,EAAE,QAAQ,EAClB,iBAAiB,SAAW,GAC1B,MAAM,CAqHR"}

package/dist/codegen/emit-models.js

@@ -1,19 +1,5 @@
-import { findFkReferencedColumn } from "../dialect/fk.js";
-import { getColumnTypeOrThrow } from "../plugins/registry.js";
+import { buildEnumRegistry, columnTsType, } from "./column-ts.js";
 import { effectiveRelations, modelTypeName } from "./manifest-relations.js";
-function columnTsType(col, manifest) {
-    if (col.kind === "fk") {
-        const referenced = findFkReferencedColumn(col, manifest);
-        if (referenced && referenced.kind !== "fk") {
-            return getColumnTypeOrThrow(referenced.kind).columnTsType({
-                ...referenced,
-                nullable: col.nullable,
-            });
-        }
-        return col.nullable ? "string | null" : "string";
-    }
-    return getColumnTypeOrThrow(col.kind).columnTsType(col);
-}
 function emitGeoJsonTypes(manifest) {
     const hasPostgis = (manifest.extensions ?? []).includes("postgis");
     if (!hasPostgis)
@@ -33,12 +19,12 @@ function emitGeoJsonTypes(manifest) {
         "",
     ];
 }
-function emitBaseModel(manifest, table) {
+function emitBaseModel(manifest, table, enums) {
     const name = modelTypeName(table.accessor);
     const fields = table.columns
-        .map((col) => `  ${col.tsName}: ${columnTsType(col, manifest)};`)
+        .map((col) => `  ${col.tsName}: ${columnTsType(col, manifest, enums, table.accessor)};`)
         .join("\n");
-    return `export type ${name} = {\n${fields}\n};`;
+    return `export interface ${name} {\n${fields}\n}`;
 }
 function hiddenKeysType(table) {
     const hidden = table.columns
@@ -75,30 +61,88 @@ function emitPayloadType(manifest, table) {
     }
     return `export type ${payloadName} = StripCapablePayload<${rowType}, ${hiddenType}>;`;
 }
-function emitWithIncludesType(manifest, table) {
-    const baseName = modelTypeName(table.accessor);
-    const withName = `${modelTypeName(table.accessor)}With`;
-    const includesName = `${baseName}WithIncludes`;
-    const relations = effectiveRelations(manifest, table);
-    if (relations.length === 0) {
-        return `export type ${includesName}<W extends ${withName} | undefined = undefined> = ${baseName};`;
-    }
-    const includeParts = relations
-        .map((rel) => {
+function includePartsFor(manifest, table) {
+    return effectiveRelations(manifest, table).map((rel) => {
         const target = manifest.tables[rel.targetAccessor];
         const targetName = target
             ? modelTypeName(target.accessor)
             : modelTypeName(rel.targetAccessor);
         const cardinality = rel.cardinality === "many" ? "many" : "one";
-        return `  IncludeRelation<W, "${rel.name}", "${cardinality}", ${targetName}>`;
-    })
-        .join(" &\n");
-    return `export type ${includesName}<W extends ${withName} | undefined = undefined> = ${baseName} &
-${includeParts} &
-  IncludeCount<W>;`;
+        return `IncludeRelation<W, "${rel.name}", "${cardinality}", ${targetName}>`;
+    });
+}
+function emitRelationsType(manifest, table) {
+    const baseName = modelTypeName(table.accessor);
+    const withName = `${modelTypeName(table.accessor)}With`;
+    const includeParts = includePartsFor(manifest, table);
+    if (includeParts.length === 0) {
+        return `export type ${baseName}Relations<W extends ${withName}> = IncludeCount<W>;`;
+    }
+    const joined = includeParts.join(" &\n  ");
+    return `export type ${baseName}Relations<W extends ${withName}> =\n  ${joined} &\n  IncludeCount<W>;`;
+}
+function emitWithIncludesType(table) {
+    const baseName = modelTypeName(table.accessor);
+    const withName = `${modelTypeName(table.accessor)}With`;
+    const includesName = `${baseName}WithIncludes`;
+    const relationsName = `${baseName}Relations`;
+    return `export type ${includesName}<W extends ${withName} | undefined = undefined> = [W] extends [undefined] ? ${baseName} : ${baseName} & ${relationsName}<Extract<W, ${withName}>>;`;
+}
+function emitHiddenKeysType(table) {
+    const baseName = modelTypeName(table.accessor);
+    return `export type ${baseName}HiddenKeys = ${hiddenKeysType(table)};`;
+}
+function emitFindResultType(table) {
+    const baseName = modelTypeName(table.accessor);
+    const withName = `${baseName}With`;
+    const hiddenName = `${baseName}HiddenKeys`;
+    const relationsName = `${baseName}Relations`;
+    return `export type ${baseName}FindResult<W extends ${withName} | undefined = undefined, S = undefined, O = undefined, IH = undefined> = [W] extends [undefined]
+  ? [S] extends [undefined]
+    ? [O] extends [undefined]
+      ? IH extends true
+        ? ${baseName}
+        : Omit<${baseName}, ${hiddenName}>
+      : Omit<${baseName}, (SelectKeys<O> & keyof ${baseName}) | (IH extends true ? never : ${hiddenName})>
+    : Pick<${baseName}, SelectKeys<S> & keyof ${baseName}>
+  : ([S] extends [undefined]
+    ? [O] extends [undefined]
+      ? IH extends true
+        ? ${baseName}
+        : Omit<${baseName}, ${hiddenName}>
+      : Omit<${baseName}, (SelectKeys<O> & keyof ${baseName}) | (IH extends true ? never : ${hiddenName})>
+    : Pick<${baseName}, SelectKeys<S> & keyof ${baseName}>) & ${relationsName}<Extract<W, ${withName}>>;`;
+}
+function emitCreateResultType(table) {
+    const baseName = modelTypeName(table.accessor);
+    const withName = `${baseName}With`;
+    const relationsName = `${baseName}Relations`;
+    return `export type ${baseName}CreateResult<W extends ${withName}> = ${baseName} & ${relationsName}<W>;`;
+}
+function emitMutationResultType(table) {
+    const baseName = modelTypeName(table.accessor);
+    const withName = `${baseName}With`;
+    const relationsName = `${baseName}Relations`;
+    return `export type ${baseName}MutationResult<W extends ${withName}> = ${baseName} & ${relationsName}<W>;`;
+}
+function emitRelationListType(rel, targetModelName) {
+    return rel.cardinality === "many"
+        ? `${targetModelName}[]`
+        : `${targetModelName} | null`;
+}
+export function relationResultTypeFor(manifest, table, relationName) {
+    const rel = effectiveRelations(manifest, table).find((r) => r.name === relationName);
+    if (!rel)
+        return "Record<string, unknown>";
+    const target = manifest.tables[rel.targetAccessor];
+    const targetName = target
+        ? modelTypeName(target.accessor)
+        : modelTypeName(rel.targetAccessor);
+    return emitRelationListType(rel, targetName);
 }
 export function emitModelsTs(manifest, packageImportPath = "neoorm") {
     const tables = Object.values(manifest.tables).sort((a, b) => a.accessor.localeCompare(b.accessor));
+    const enums = buildEnumRegistry(manifest);
     const withTypeNames = tables.map((t) => `${modelTypeName(t.accessor)}With`);
     const lines = [
         "// Auto-generated by neoorm generate — do not edit",
@@ -106,22 +150,28 @@ export function emitModelsTs(manifest, packageImportPath = "neoorm") {
         `import type { ${withTypeNames.join(", ")} } from "./includes.js";`,
         "",
         ...emitGeoJsonTypes(manifest),
+        ...enums.declarations.flatMap((decl) => [decl, ""]),
         "type SelectKeys<S> = S extends readonly (infer K extends PropertyKey)[]",
         "  ? K",
         "  : S extends Record<string, unknown>",
         "    ? { [K in keyof S]: S[K] extends true ? K : never }[keyof S]",
         "    : never;",
         "",
-        "type ApplySelect<Row extends Record<string, unknown>, S> = Pick<",
+        "type ApplySelect<Row extends object, S> = Pick<",
         "  Row,",
         "  SelectKeys<S> & keyof Row",
         ">;",
         "",
+        "type ApplyOmit<Row extends object, O> = Omit<",
+        "  Row,",
+        "  SelectKeys<O> & keyof Row",
+        ">;",
+        "",
         "type IncludeRelation<",
         "  W,",
         "  Key extends PropertyKey,",
         '  Cardinality extends "one" | "many",',
-        "  TModel extends Record<string, unknown>,",
+        "  TModel extends object,",
         "> = W extends { [K in Key]?: infer Inc }",
         "  ? Inc extends { select: infer S }",
         '    ? Cardinality extends "many"',
@@ -140,7 +190,7 @@ export function emitModelsTs(manifest, packageImportPath = "neoorm") {
         "",
     ];
     for (const table of tables) {
-        lines.push(emitBaseModel(manifest, table));
+        lines.push(emitBaseModel(manifest, table, enums));
         lines.push("");
     }
     for (const table of tables) {
@@ -148,7 +198,19 @@ export function emitModelsTs(manifest, packageImportPath = "neoorm") {
         lines.push("");
     }
     for (const table of tables) {
-        lines.push(emitWithIncludesType(manifest, table));
+        lines.push(emitWithIncludesType(table));
+        lines.push("");
+    }
+    for (const table of tables) {
+        lines.push(emitHiddenKeysType(table));
+        lines.push("");
+        lines.push(emitRelationsType(manifest, table));
+        lines.push("");
+        lines.push(emitFindResultType(table));
+        lines.push("");
+        lines.push(emitCreateResultType(table));
+        lines.push("");
+        lines.push(emitMutationResultType(table));
         lines.push("");
     }
     const modelEntries = tables