zenstack-kit 0.1.12 → 0.1.14

package/dist/migrations/prisma/diff.d.ts

@@ -1,5 +1,5 @@
 import type { KyselyDialect } from "../../sql/kysely-adapter.js";
-import type { SchemaSnapshot, SchemaTable, SchemaColumn } from "../../schema/snapshot.js";
+import type { SchemaSnapshot, SchemaTable, SchemaColumn, SchemaEnum } from "../../schema/snapshot.js";
 export declare function diffSchemas(previous: SchemaSnapshot | null, current: SchemaSnapshot): {
     addedModels: SchemaTable[];
     removedModels: SchemaTable[];
@@ -83,6 +83,13 @@ export declare function diffSchemas(previous: SchemaSnapshot | null, current: Sc
         from: string;
         to: string;
     }>;
+    addedEnums: SchemaEnum[];
+    removedEnums: SchemaEnum[];
+    alteredEnums: {
+        enumName: string;
+        addedValues: string[];
+        removedValues: string[];
+    }[];
 };
 type PrismaDiff = ReturnType<typeof diffSchemas>;
 export declare function applyRenameMappings(diff: PrismaDiff, renameTables?: Array<{

package/dist/migrations/prisma/diff.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../../src/migrations/prisma/diff.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAC;AAyK1F,wBAAgB,WAAW,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI,EAAE,OAAO,EAAE,cAAc;;;;mBAsB5C,MAAM;gBAAU,YAAY;;;mBAC1B,MAAM;gBAAU,YAAY;;;mBAEvD,MAAM;oBACL,MAAM;kBACR,YAAY;iBACb,YAAY;;;mBAGV,MAAM;oBACL;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,EAAE,CAAA;SAAE;;;mBAGpC,MAAM;oBACL;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,EAAE,CAAA;SAAE;;;mBAGpC,MAAM;eACV;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,EAAE,CAAA;SAAE;;;mBAG/B,MAAM;eACV;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,EAAE,CAAA;SAAE;;;mBAG/B,MAAM;oBACL;YACV,IAAI,EAAE,MAAM,CAAC;YACb,OAAO,EAAE,MAAM,EAAE,CAAC;YAClB,eAAe,EAAE,MAAM,CAAC;YACxB,iBAAiB,EAAE,MAAM,EAAE,CAAC;SAC7B;;;mBAGU,MAAM;oBACL;YACV,IAAI,EAAE,MAAM,CAAC;YACb,OAAO,EAAE,MAAM,EAAE,CAAC;YAClB,eAAe,EAAE,MAAM,CAAC;YACxB,iBAAiB,EAAE,MAAM,EAAE,CAAC;SAC7B;;;mBAGU,MAAM;mBACN;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,EAAE,CAAA;SAAE;kBACpC;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,EAAE,CAAA;SAAE;;mBAiCxB,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;oBAClC,KAAK,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;EAE/E;AAED,KAAK,UAAU,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;AAkGjD,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,UAAU,EAChB,YAAY,GAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAM,EACtD,aAAa,GAAE,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAM,GACrE,UAAU,CA8FZ;AA2CD;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,EACpC,OAAO,EAAE,aAAa,GACrB;IAAE,EAAE,EAAE,MAAM,EAAE,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,CAkNlC"}
+{"version":3,"file":"diff.d.ts","sourceRoot":"","sources":["../../../src/migrations/prisma/diff.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AACjE,OAAO,KAAK,EAAE,cAAc,EAAE,WAAW,EAAE,YAAY,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AA4KtG,wBAAgB,WAAW,CAAC,QAAQ,EAAE,cAAc,GAAG,IAAI,EAAE,OAAO,EAAE,cAAc;;;;mBAsB5C,MAAM;gBAAU,YAAY;;;mBAC1B,MAAM;gBAAU,YAAY;;;mBAEvD,MAAM;oBACL,MAAM;kBACR,YAAY;iBACb,YAAY;;;mBAGV,MAAM;oBACL;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,EAAE,CAAA;SAAE;;;mBAGpC,MAAM;oBACL;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,EAAE,CAAA;SAAE;;;mBAGpC,MAAM;eACV;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,EAAE,CAAA;SAAE;;;mBAG/B,MAAM;eACV;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,EAAE,CAAA;SAAE;;;mBAG/B,MAAM;oBACL;YACV,IAAI,EAAE,MAAM,CAAC;YACb,OAAO,EAAE,MAAM,EAAE,CAAC;YAClB,eAAe,EAAE,MAAM,CAAC;YACxB,iBAAiB,EAAE,MAAM,EAAE,CAAC;SAC7B;;;mBAGU,MAAM;oBACL;YACV,IAAI,EAAE,MAAM,CAAC;YACb,OAAO,EAAE,MAAM,EAAE,CAAC;YAClB,eAAe,EAAE,MAAM,CAAC;YACxB,iBAAiB,EAAE,MAAM,EAAE,CAAC;SAC7B;;;mBAGU,MAAM;mBACN;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,EAAE,CAAA;SAAE;kBACpC;YAAE,IAAI,EAAE,MAAM,CAAC;YAAC,OAAO,EAAE,MAAM,EAAE,CAAA;SAAE;;mBA4ExB,KAAK,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;oBAClC,KAAK,CAAC;QAAE,SAAS,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAC;QAAC,EAAE,EAAE,MAAM,CAAA;KAAE,CAAC;;;;kBA/ClE,MAAM;qBACH,MAAM,EAAE;uBACN,MAAM,EAAE;;EAkD1B;AAED,KAAK,UAAU,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC;AAkGjD,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,UAAU,EAChB,YAAY,GAAE,KAAK,CAAC;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAM,EACtD,aAAa,GAAE,KAAK,CAAC;IAAE,KAAK,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAA;CAAE,CAAM,GACrE,UAAU,CA8FZ;AA2CD;;GAEG;AACH,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,UAAU,CAAC,OAAO,WAAW,CAAC,EACpC,OAAO,EAAE,aAAa,GACrB;IAAE,EAAE,EAAE,MAAM,EAAE,CAAC;IAAC,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,CAuPlC"}

package/dist/migrations/prisma/diff.js

@@ -1,4 +1,4 @@
-import { compileCreateTable, compileDropTable, compileAddColumn, compileDropColumn, compileRenameTable, compileRenameColumn, compileCreateIndex, compileDropIndex, compileAddUniqueConstraint, compileDropConstraint, compileAddForeignKeyConstraint, compileAddPrimaryKeyConstraint, compileAlterColumn, } from "../../sql/compiler.js";
+import { compileCreateTable, compileDropTable, compileAddColumn, compileDropColumn, compileRenameTable, compileRenameColumn, compileCreateIndex, compileDropIndex, compileAddUniqueConstraint, compileDropConstraint, compileAddForeignKeyConstraint, compileAddPrimaryKeyConstraint, compileAlterColumn, compileCreateEnum, compileDropEnum, compileAddEnumValue, } from "../../sql/compiler.js";
 function diffTableChanges(previousModel, currentModel, tableName) {
     const addedFields = [];
     const removedFields = [];
@@ -140,6 +140,37 @@ export function diffSchemas(previous, current) {
         removedForeignKeys.push(...modelDiff.removedForeignKeys);
         primaryKeyChanges.push(...modelDiff.primaryKeyChanges);
     }
+    // Diff enums
+    const previousEnums = new Map();
+    const currentEnums = new Map();
+    (previous?.enums ?? []).forEach((e) => previousEnums.set(e.name, e));
+    (current.enums ?? []).forEach((e) => currentEnums.set(e.name, e));
+    const addedEnums = [];
+    const removedEnums = [];
+    const alteredEnums = [];
+    for (const [enumName, enumDef] of currentEnums.entries()) {
+        if (!previousEnums.has(enumName)) {
+            addedEnums.push(enumDef);
+        }
+    }
+    for (const [enumName, enumDef] of previousEnums.entries()) {
+        if (!currentEnums.has(enumName)) {
+            removedEnums.push(enumDef);
+        }
+    }
+    // Check for altered enums (added/removed values)
+    for (const [enumName, currentEnum] of currentEnums.entries()) {
+        const previousEnum = previousEnums.get(enumName);
+        if (!previousEnum)
+            continue;
+        const prevValues = new Set(previousEnum.values);
+        const currValues = new Set(currentEnum.values);
+        const addedValues = currentEnum.values.filter((v) => !prevValues.has(v));
+        const removedValues = previousEnum.values.filter((v) => !currValues.has(v));
+        if (addedValues.length > 0 || removedValues.length > 0) {
+            alteredEnums.push({ enumName, addedValues, removedValues });
+        }
+    }
     return {
         addedModels,
         removedModels,
@@ -155,6 +186,9 @@ export function diffSchemas(previous, current) {
         primaryKeyChanges,
         renamedTables: [],
         renamedColumns: [],
+        addedEnums,
+        removedEnums,
+        alteredEnums,
     };
 }
 function columnsSignature(columns) {
@@ -329,6 +363,32 @@ export function buildSqlStatements(diff, dialect) {
     const up = [];
     const down = [];
     const compileOpts = { dialect };
+    // Create enums FIRST (before tables that use them)
+    for (const enumDef of diff.addedEnums) {
+        const sql = compileCreateEnum(enumDef, compileOpts);
+        if (sql) {
+            up.push(sql);
+            const dropSql = compileDropEnum(enumDef.name, compileOpts);
+            if (dropSql)
+                down.unshift(dropSql);
+        }
+    }
+    // Add new values to existing enums
+    for (const altered of diff.alteredEnums) {
+        for (const value of altered.addedValues) {
+            const sql = compileAddEnumValue(altered.enumName, value, compileOpts);
+            if (sql) {
+                up.push(sql);
+                // Note: PostgreSQL doesn't support removing enum values easily,
+                // so we don't add a down migration for added values
+            }
+        }
+        // Note: Removing enum values in PostgreSQL requires recreating the type
+        // which is complex and potentially data-losing. We skip this for now.
+        if (altered.removedValues.length > 0 && dialect === "postgres") {
+            up.push(`-- WARNING: Removing enum values (${altered.removedValues.join(", ")}) from "${altered.enumName}" requires manual migration`);
+        }
+    }
     // Table renames
     for (const rename of diff.renamedTables) {
         up.push(compileRenameTable(rename.from, rename.to, compileOpts));
@@ -438,5 +498,15 @@ export function buildSqlStatements(diff, dialect) {
         up.push(compileAddForeignKeyConstraint(tableName, foreignKey.name, foreignKey.columns, foreignKey.referencedTable, foreignKey.referencedColumns, compileOpts));
         down.unshift(compileDropConstraint(tableName, foreignKey.name, compileOpts));
     }
+    // Drop enums LAST (after tables that use them are dropped)
+    for (const enumDef of diff.removedEnums) {
+        const sql = compileDropEnum(enumDef.name, compileOpts);
+        if (sql) {
+            up.push(sql);
+            const createSql = compileCreateEnum(enumDef, compileOpts);
+            if (createSql)
+                down.unshift(createSql);
+        }
+    }
     return { up, down };
 }

package/dist/schema/pull.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../src/schema/pull.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAuB,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEnF,MAAM,WAAW,WAAW;IAC1B,uBAAuB;IACvB,OAAO,EAAE,aAAa,CAAC;IACvB,8BAA8B;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gDAAgD;IAChD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,6BAA6B;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,qDAAqD;IACrD,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB;AA8lBD,wBAAsB,UAAU,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CA4C1E"}
+{"version":3,"file":"pull.d.ts","sourceRoot":"","sources":["../../src/schema/pull.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAKH,OAAO,EAAuB,KAAK,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEnF,MAAM,WAAW,WAAW;IAC1B,uBAAuB;IACvB,OAAO,EAAE,aAAa,CAAC;IACvB,8BAA8B;IAC9B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,gDAAgD;IAChD,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,6BAA6B;IAC7B,UAAU,EAAE,MAAM,CAAC;IACnB,qDAAqD;IACrD,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB;AAsqBD,wBAAsB,UAAU,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CAkD1E"}

package/dist/schema/pull.js

@@ -91,7 +91,9 @@ function buildDatasourceBlock(dialect) {
     ].join("\n");
 }
 function buildModelBlock(options) {
-    const { table, foreignKeys, indexes, primaryKeys, allTables, columnDefaults } = options;
+    const { table, foreignKeys, indexes, primaryKeys, allTables, columnDefaults, enums = [] } = options;
+    // Build a map of enum names for quick lookup
+    const enumNames = new Set(enums.map((e) => e.name));
     const modelName = toPascalCase(table.name) || "Model";
     const fieldLines = [];
     // Get primary key columns for this table
@@ -170,7 +172,18 @@ function buildModelBlock(options) {
     for (const column of sortedColumns) {
         const fieldName = toCamelCase(column.name) || column.name;
         const mapped = fieldName !== column.name;
-        const { type, isArray } = normalizeType(column.dataType);
+        // Check if the column type is an enum (PostgreSQL stores udt_name for enum types)
+        const rawDataType = column.dataType.replace(/\[\]$/, ""); // Remove array suffix
+        const isEnumType = enumNames.has(rawDataType);
+        const isArray = column.dataType.endsWith("[]");
+        let type;
+        if (isEnumType) {
+            type = toPascalCase(rawDataType);
+        }
+        else {
+            const normalized = normalizeType(column.dataType);
+            type = normalized.type;
+        }
         const optional = column.isNullable ? "?" : "";
         const modifiers = [];
         const isPkColumn = pkColumns.has(column.name);
@@ -483,6 +496,44 @@ async function extractColumnDefaults(db, dialect, tableNames) {
     }
     return defaultsByTable;
 }
+async function extractEnums(db, dialect) {
+    const enums = [];
+    if (dialect === "postgres") {
+        // Query PostgreSQL system catalogs for enum types
+        const result = await sql `
+      SELECT
+        t.typname as enum_name,
+        e.enumlabel as enum_value
+      FROM pg_type t
+      JOIN pg_enum e ON t.oid = e.enumtypid
+      JOIN pg_catalog.pg_namespace n ON n.oid = t.typnamespace
+      WHERE n.nspname = 'public'
+      ORDER BY t.typname, e.enumsortorder
+    `.execute(db);
+        // Group by enum name
+        const enumMap = new Map();
+        for (const row of result.rows) {
+            if (!enumMap.has(row.enum_name)) {
+                enumMap.set(row.enum_name, []);
+            }
+            enumMap.get(row.enum_name).push(row.enum_value);
+        }
+        for (const [name, values] of enumMap) {
+            enums.push({ name, values });
+        }
+    }
+    // MySQL and SQLite don't have standalone enum types
+    // MySQL uses inline ENUM definitions in column types
+    return enums;
+}
+function buildEnumBlock(enumInfo) {
+    const lines = [`enum ${toPascalCase(enumInfo.name)} {`];
+    for (const value of enumInfo.values) {
+        lines.push(`  ${value}`);
+    }
+    lines.push("}");
+    return lines.join("\n");
+}
 export async function pullSchema(options) {
     const { db, destroy } = await createKyselyAdapter({
         dialect: options.dialect,
@@ -498,15 +549,20 @@ export async function pullSchema(options) {
         const indexes = await extractIndexes(db, options.dialect, tableNames);
         const primaryKeys = await extractPrimaryKeys(db, options.dialect, tableNames);
         const columnDefaultsByTable = await extractColumnDefaults(db, options.dialect, tableNames);
-        const blocks = filtered.map((table) => buildModelBlock({
+        const enums = await extractEnums(db, options.dialect);
+        // Build enum blocks
+        const enumBlocks = enums.map((e) => buildEnumBlock(e));
+        // Build model blocks
+        const modelBlocks = filtered.map((table) => buildModelBlock({
             table,
             foreignKeys,
             indexes,
             primaryKeys,
             allTables,
             columnDefaults: columnDefaultsByTable.get(table.name) ?? new Map(),
+            enums, // Pass enums for type mapping
         }));
-        const schema = [buildDatasourceBlock(options.dialect), ...blocks].join("\n\n");
+        const schema = [buildDatasourceBlock(options.dialect), ...enumBlocks, ...modelBlocks].join("\n\n");
         if (options.writeFile !== false) {
             await fs.mkdir(path.dirname(options.outputPath), { recursive: true });
             await fs.writeFile(options.outputPath, schema.trimEnd() + "\n", "utf-8");

package/dist/schema/snapshot.d.ts

@@ -10,6 +10,8 @@ export interface SchemaColumn {
     isArray: boolean;
     default?: string | number | boolean;
     isAutoincrement?: boolean;
+    /** If true, type refers to an enum name rather than a SQL type */
+    isEnum?: boolean;
 }
 export interface SchemaConstraint {
     name: string;
@@ -33,8 +35,13 @@ export interface SchemaTable {
     indexes: SchemaIndex[];
     foreignKeys: SchemaForeignKey[];
 }
+export interface SchemaEnum {
+    name: string;
+    values: string[];
+}
 export interface SchemaSnapshot {
     tables: SchemaTable[];
+    enums: SchemaEnum[];
 }
 export interface SchemaSnapshotFile {
     version: 2;

package/dist/schema/snapshot.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"snapshot.d.ts","sourceRoot":"","sources":["../../src/schema/snapshot.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAWH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;IACpC,eAAe,CAAC,EAAE,OAAO,CAAC;CAC3B;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,iBAAiB,EAAE,gBAAgB,EAAE,CAAC;IACtC,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,WAAW,EAAE,gBAAgB,EAAE,CAAC;CACjC;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,WAAW,EAAE,CAAC;CACvB;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,CAAC,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,cAAc,CAAC;CACxB;AAiUD,wBAAsB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAaxF;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,kBAAkB,CAMzE"}
+{"version":3,"file":"snapshot.d.ts","sourceRoot":"","sources":["../../src/schema/snapshot.ts"],"names":[],"mappings":"AAAA;;;;GAIG;AAWH,MAAM,WAAW,YAAY;IAC3B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,EAAE,OAAO,CAAC;IACjB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,OAAO,CAAC;IACpC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,kEAAkE;IAClE,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;CACnB;AAED,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,eAAe,EAAE,MAAM,CAAC;IACxB,iBAAiB,EAAE,MAAM,EAAE,CAAC;CAC7B;AAED,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,UAAU,CAAC,EAAE,gBAAgB,CAAC;IAC9B,iBAAiB,EAAE,gBAAgB,EAAE,CAAC;IACtC,OAAO,EAAE,WAAW,EAAE,CAAC;IACvB,WAAW,EAAE,gBAAgB,EAAE,CAAC;CACjC;AAED,MAAM,WAAW,UAAU;IACzB,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,EAAE,CAAC;CAClB;AAED,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,WAAW,EAAE,CAAC;IACtB,KAAK,EAAE,UAAU,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,kBAAkB;IACjC,OAAO,EAAE,CAAC,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,MAAM,EAAE,cAAc,CAAC;CACxB;AAuVD,wBAAsB,sBAAsB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,CAkBxF;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,kBAAkB,CAMzE"}

package/dist/schema/snapshot.js

@@ -65,9 +65,20 @@ function getDefaultValue(field) {
         if (funcName === "now") {
             return { hasDefault: true, default: "now()" };
         }
-        // Return function name for other functions
+        // cuid(), uuid(), nanoid() are handled at the application level by ZenStack/Prisma,
+        // not at the database level. We mark hasDefault as true so the column isn't
+        // required in INSERT statements (the ORM will provide the value).
+        if (funcName === "cuid" || funcName === "uuid" || funcName === "nanoid") {
+            return { hasDefault: true };
+        }
+        // Return function name for other functions (dbgenerated, etc.)
         return { hasDefault: true, default: `${funcName}()` };
     }
+    // Handle enum default values like @default(USER) - these are ReferenceExpr
+    if (expr.$type === "ReferenceExpr") {
+        const enumValue = expr.target.$refText;
+        return { hasDefault: true, default: enumValue };
+    }
     return { hasDefault: true };
 }
 function getTableName(model) {
@@ -124,12 +135,12 @@ function buildForeignKeyName(tableName, columns, _referencedTable, _referencedCo
 function getFieldType(field) {
     const ref = field.type.reference?.ref;
     if (ref && isDataModel(ref)) {
-        return { type: ref.name, isRelation: true };
+        return { type: ref.name, isRelation: true, isEnum: false };
     }
     if (ref && isEnum(ref)) {
-        return { type: ref.name, isRelation: false };
+        return { type: ref.name, isRelation: false, isEnum: true };
     }
-    return { type: field.type.type ?? "String", isRelation: false };
+    return { type: field.type.type ?? "String", isRelation: false, isEnum: false };
 }
 function getRelationFieldNames(field) {
     const relationAttr = getAttribute(field, "@relation");
@@ -164,14 +175,16 @@ function parseModel(model) {
         }
         const defaultInfo = getDefaultValue(field);
         const columnName = getColumnName(field);
-        const sqlType = mapFieldTypeToSQL(typeInfo.type);
+        // For enum types, store the enum name directly; for other types, map to SQL type
+        const columnType = typeInfo.isEnum ? typeInfo.type : mapFieldTypeToSQL(typeInfo.type);
         columns.push({
             name: columnName,
-            type: sqlType,
+            type: columnType,
             notNull: !field.type.optional,
             isArray: field.type.array ?? false,
             default: defaultInfo.default,
             isAutoincrement: defaultInfo.isAutoincrement,
+            isEnum: typeInfo.isEnum || undefined,
         });
     }
     const modelIdAttr = getAttribute(model, "@@id");
@@ -257,6 +270,13 @@ function parseModel(model) {
         foreignKeys: foreignKeys.sort((a, b) => a.name.localeCompare(b.name)),
     };
 }
+function parseEnum(enumDecl) {
+    const values = enumDecl.fields.map((field) => field.name);
+    return {
+        name: enumDecl.name,
+        values,
+    };
+}
 export async function generateSchemaSnapshot(schemaPath) {
     const loadResult = await loadDocument(schemaPath);
     if (!loadResult.success) {
@@ -267,7 +287,11 @@ export async function generateSchemaSnapshot(schemaPath) {
     const tables = dataModels
         .map((model) => parseModel(model))
         .sort((a, b) => a.name.localeCompare(b.name));
-    return { tables };
+    const enumDecls = loadResult.model.declarations.filter(isEnum);
+    const enums = enumDecls
+        .map((enumDecl) => parseEnum(enumDecl))
+        .sort((a, b) => a.name.localeCompare(b.name));
+    return { tables, enums };
 }
 export function createSnapshot(schema) {
     return {

package/dist/sql/compiler.d.ts

@@ -5,7 +5,7 @@
  * without requiring a database connection.
  */
 import type { KyselyDialect } from "./kysely-adapter.js";
-import type { SchemaTable, SchemaColumn } from "../schema/snapshot.js";
+import type { SchemaTable, SchemaColumn, SchemaEnum } from "../schema/snapshot.js";
 export interface SqlMigration {
     up: string[];
     down: string[];
@@ -71,4 +71,23 @@ export declare function compileAlterColumn(tableName: string, columnName: string
     setDefault?: string | number | boolean;
     dropDefault?: boolean;
 }, options: CompileSqlOptions): string[];
+/**
+ * Compile a CREATE TYPE ... AS ENUM statement for PostgreSQL
+ * For MySQL and SQLite, enums are handled differently (inline or as text)
+ */
+export declare function compileCreateEnum(enumDef: SchemaEnum, options: CompileSqlOptions): string | null;
+/**
+ * Compile a DROP TYPE statement for PostgreSQL
+ */
+export declare function compileDropEnum(enumName: string, options: CompileSqlOptions): string | null;
+/**
+ * Compile an ALTER TYPE ... ADD VALUE statement for PostgreSQL
+ * Adds a new value to an existing enum type
+ */
+export declare function compileAddEnumValue(enumName: string, value: string, options: CompileSqlOptions): string | null;
+/**
+ * Map column type considering enum types
+ * For enum columns, returns the enum type name (PostgreSQL) or text (other dialects)
+ */
+export declare function mapColumnTypeWithEnum(column: SchemaColumn, dialect: KyselyDialect): string;
 //# sourceMappingURL=compiler.d.ts.map

package/dist/sql/compiler.d.ts.map

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

package/dist/sql/compiler.js

@@ -47,10 +47,12 @@ export function compileCreateTable(model, options) {
     const db = createCompilerDb(options.dialect);
     let builder = db.schema.createTable(model.name);
     for (const column of model.columns) {
-        const columnType = mapColumnType(column.type, options.dialect, {
-            isArray: column.isArray,
-            isAutoincrement: column.isAutoincrement,
-        });
+        const columnType = column.isEnum
+            ? mapColumnTypeWithEnum(column, options.dialect)
+            : mapColumnType(column.type, options.dialect, {
+                isArray: column.isArray,
+                isAutoincrement: column.isAutoincrement,
+            });
         builder = builder.addColumn(column.name, sql.raw(columnType), (cb) => {
             // For SERIAL types in PostgreSQL, NOT NULL is implicit and we don't need defaults
             const isSerialType = column.isAutoincrement && options.dialect === "postgres";
@@ -58,7 +60,7 @@ export function compileCreateTable(model, options) {
                 cb = cb.notNull();
             }
             if (column.default !== undefined && !isSerialType) {
-                cb = cb.defaultTo(sql.raw(formatDefault(column.default, options.dialect)));
+                cb = cb.defaultTo(sql.raw(formatDefault(column.default, options.dialect, column)));
             }
             return cb;
         });
@@ -89,10 +91,12 @@ export function compileDropTable(tableName, options) {
  */
 export function compileAddColumn(tableName, column, options) {
     const db = createCompilerDb(options.dialect);
-    const columnType = mapColumnType(column.type, options.dialect, {
-        isArray: column.isArray,
-        isAutoincrement: column.isAutoincrement,
-    });
+    const columnType = column.isEnum
+        ? mapColumnTypeWithEnum(column, options.dialect)
+        : mapColumnType(column.type, options.dialect, {
+            isArray: column.isArray,
+            isAutoincrement: column.isAutoincrement,
+        });
     return (db.schema
         .alterTable(tableName)
         .addColumn(column.name, sql.raw(columnType), (cb) => {
@@ -101,7 +105,7 @@ export function compileAddColumn(tableName, column, options) {
             cb = cb.notNull();
         }
         if (column.default !== undefined && !isSerialType) {
-            cb = cb.defaultTo(sql.raw(formatDefault(column.default, options.dialect)));
+            cb = cb.defaultTo(sql.raw(formatDefault(column.default, options.dialect, column)));
         }
         return cb;
     })
@@ -251,12 +255,17 @@ function mapColumnType(type, dialect, options) {
 /**
  * Format a default value for SQL
  */
-function formatDefault(value, dialect) {
+function formatDefault(value, dialect, column) {
     if (typeof value === "string") {
         // Check if it's a function call like now() or autoincrement()
         if (/^\w+\([^)]*\)$/.test(value)) {
             return value;
         }
+        // For enum columns in PostgreSQL, we need to cast the default value
+        if (column?.isEnum && dialect === "postgres") {
+            const escapedValue = value.replace(/'/g, "''");
+            return `'${escapedValue}'::"${column.type}"`;
+        }
         // Escape string values
         return `'${value.replace(/'/g, "''")}'`;
     }
@@ -268,3 +277,55 @@ function formatDefault(value, dialect) {
     }
     return String(value);
 }
+/**
+ * Compile a CREATE TYPE ... AS ENUM statement for PostgreSQL
+ * For MySQL and SQLite, enums are handled differently (inline or as text)
+ */
+export function compileCreateEnum(enumDef, options) {
+    if (options.dialect !== "postgres") {
+        // MySQL and SQLite don't have standalone enum types
+        return null;
+    }
+    const values = enumDef.values.map((v) => `'${v.replace(/'/g, "''")}'`).join(", ");
+    return `CREATE TYPE "${enumDef.name}" AS ENUM (${values});`;
+}
+/**
+ * Compile a DROP TYPE statement for PostgreSQL
+ */
+export function compileDropEnum(enumName, options) {
+    if (options.dialect !== "postgres") {
+        return null;
+    }
+    return `DROP TYPE IF EXISTS "${enumName}";`;
+}
+/**
+ * Compile an ALTER TYPE ... ADD VALUE statement for PostgreSQL
+ * Adds a new value to an existing enum type
+ */
+export function compileAddEnumValue(enumName, value, options) {
+    if (options.dialect !== "postgres") {
+        return null;
+    }
+    const escapedValue = value.replace(/'/g, "''");
+    return `ALTER TYPE "${enumName}" ADD VALUE '${escapedValue}';`;
+}
+/**
+ * Map column type considering enum types
+ * For enum columns, returns the enum type name (PostgreSQL) or text (other dialects)
+ */
+export function mapColumnTypeWithEnum(column, dialect) {
+    if (column.isEnum) {
+        if (dialect === "postgres") {
+            // Use the native enum type for PostgreSQL
+            const baseType = `"${column.type}"`;
+            return column.isArray ? `${baseType}[]` : baseType;
+        }
+        // For MySQL and SQLite, fall back to text
+        return column.isArray ? "text[]" : "text";
+    }
+    // Use existing type mapping for non-enum columns
+    return mapColumnType(column.type, dialect, {
+        isArray: column.isArray,
+        isAutoincrement: column.isAutoincrement,
+    });
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zenstack-kit",
-  "version": "0.1.12",
+  "version": "0.1.14",
   "description": "Drizzle-kit like CLI tooling for ZenStack schemas with Kysely support",
   "type": "module",
   "main": "./dist/index.js",