zenstack-kit 0.1.4 → 0.1.7

package/dist/schema/pull.d.ts

@@ -13,6 +13,8 @@ export interface PullOptions {
     databasePath?: string;
     /** Output path for schema */
     outputPath: string;
+    /** Write the schema to outputPath (default: true) */
+    writeFile?: boolean;
 }
 export interface PullResult {
     outputPath: string;

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;CACpB;AAED,MAAM,WAAW,UAAU;IACzB,UAAU,EAAE,MAAM,CAAC;IACnB,MAAM,EAAE,MAAM,CAAC;IACf,UAAU,EAAE,MAAM,CAAC;CACpB;AAofD,wBAAsB,UAAU,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,CAwC1E"}
+{"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"}

package/dist/schema/pull.js

@@ -52,6 +52,10 @@ function normalizeType(dataType) {
     const isArray = lower.endsWith("[]");
     const base = isArray ? lower.slice(0, -2) : lower;
     const normalized = base.replace(/\(.+\)/, "").trim();
+    if (normalized.includes("uuid") || normalized.includes("citext"))
+        return { type: "String", isArray };
+    if (normalized.includes("jsonb"))
+        return { type: "Json", isArray };
     if (normalized.includes("bigint"))
         return { type: "BigInt", isArray };
     if (normalized.includes("int"))
@@ -87,7 +91,7 @@ function buildDatasourceBlock(dialect) {
     ].join("\n");
 }
 function buildModelBlock(options) {
-    const { table, foreignKeys, indexes, primaryKeys, allTables } = options;
+    const { table, foreignKeys, indexes, primaryKeys, allTables, columnDefaults } = options;
     const modelName = toPascalCase(table.name) || "Model";
     const fieldLines = [];
     // Get primary key columns for this table
@@ -123,6 +127,45 @@ function buildModelBlock(options) {
             }
         }
     }
+    const getDefaultExpr = (columnName) => columnDefaults.get(columnName) ?? null;
+    const buildDefaultAttribute = (defaultExpr, dataType) => {
+        if (!defaultExpr)
+            return null;
+        const normalized = defaultExpr.trim();
+        if (!normalized || normalized.toLowerCase() === "null")
+            return null;
+        const lower = normalized.toLowerCase();
+        if (lower.includes("nextval("))
+            return null;
+        if (lower === "current_timestamp" ||
+            lower === "current_timestamp()" ||
+            lower === "now()" ||
+            lower.includes("datetime('now") ||
+            lower.includes("now()")) {
+            return "@default(now())";
+        }
+        if (lower.includes("uuid_generate_v4()") || lower.includes("gen_random_uuid()") || lower === "uuid()") {
+            return "@default(uuid())";
+        }
+        if (lower === "true" || lower === "false") {
+            return `@default(${lower})`;
+        }
+        if ((lower === "0" || lower === "1") && dataType.toLowerCase().includes("bool")) {
+            return `@default(${lower === "1" ? "true" : "false"})`;
+        }
+        if (/^-?\d+(\.\d+)?$/.test(normalized)) {
+            return `@default(${normalized})`;
+        }
+        if ((normalized.startsWith("'") && normalized.endsWith("'")) ||
+            (normalized.startsWith("\"") && normalized.endsWith("\""))) {
+            const unquoted = normalized
+                .slice(1, -1)
+                .replace(/''/g, "'")
+                .replace(/\\"/g, "\"");
+            return `@default(${JSON.stringify(unquoted)})`;
+        }
+        return "@default(dbgenerated())";
+    };
     const sortedColumns = [...table.columns].sort((a, b) => a.name.localeCompare(b.name));
     for (const column of sortedColumns) {
         const fieldName = toCamelCase(column.name) || column.name;
@@ -146,7 +189,13 @@ function buildModelBlock(options) {
             modifiers.push(`@map("${column.name}")`);
         }
         if (column.hasDefaultValue && !modifiers.some((m) => m.includes("@default"))) {
-            modifiers.push("@default(dbgenerated())");
+            const attr = buildDefaultAttribute(getDefaultExpr(column.name), column.dataType);
+            if (attr) {
+                modifiers.push(attr);
+            }
+            else {
+                modifiers.push("@default(dbgenerated())");
+            }
         }
         const typeSuffix = isArray ? "[]" : "";
         const modifierText = modifiers.length > 0 ? ` ${modifiers.join(" ")}` : "";
@@ -389,6 +438,51 @@ async function extractPrimaryKeys(db, dialect, tableNames) {
     }
     return primaryKeys;
 }
+async function extractColumnDefaults(db, dialect, tableNames) {
+    const defaultsByTable = new Map();
+    const tableSet = new Set(tableNames);
+    const setDefault = (table, column, value) => {
+        if (!defaultsByTable.has(table)) {
+            defaultsByTable.set(table, new Map());
+        }
+        defaultsByTable.get(table).set(column, value);
+    };
+    if (dialect === "sqlite") {
+        for (const tableName of tableNames) {
+            const result = await sql `
+        PRAGMA table_info(${sql.raw(`"${tableName}"`)})
+      `.execute(db);
+            for (const row of result.rows) {
+                setDefault(tableName, row.name, row.dflt_value);
+            }
+        }
+    }
+    else if (dialect === "postgres") {
+        const result = await sql `
+      SELECT table_name, column_name, column_default
+      FROM information_schema.columns
+      WHERE table_schema = 'public'
+    `.execute(db);
+        for (const row of result.rows) {
+            if (!tableSet.has(row.table_name))
+                continue;
+            setDefault(row.table_name, row.column_name, row.column_default);
+        }
+    }
+    else if (dialect === "mysql") {
+        const result = await sql `
+      SELECT TABLE_NAME, COLUMN_NAME, COLUMN_DEFAULT
+      FROM information_schema.COLUMNS
+      WHERE TABLE_SCHEMA = DATABASE()
+    `.execute(db);
+        for (const row of result.rows) {
+            if (!tableSet.has(row.TABLE_NAME))
+                continue;
+            setDefault(row.TABLE_NAME, row.COLUMN_NAME, row.COLUMN_DEFAULT);
+        }
+    }
+    return defaultsByTable;
+}
 export async function pullSchema(options) {
     const { db, destroy } = await createKyselyAdapter({
         dialect: options.dialect,
@@ -403,16 +497,20 @@ export async function pullSchema(options) {
         const foreignKeys = await extractForeignKeys(db, options.dialect);
         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({
             table,
             foreignKeys,
             indexes,
             primaryKeys,
             allTables,
+            columnDefaults: columnDefaultsByTable.get(table.name) ?? new Map(),
         }));
         const schema = [buildDatasourceBlock(options.dialect), ...blocks].join("\n\n");
-        await fs.mkdir(path.dirname(options.outputPath), { recursive: true });
-        await fs.writeFile(options.outputPath, schema.trimEnd() + "\n", "utf-8");
+        if (options.writeFile !== false) {
+            await fs.mkdir(path.dirname(options.outputPath), { recursive: true });
+            await fs.writeFile(options.outputPath, schema.trimEnd() + "\n", "utf-8");
+        }
         return {
             outputPath: options.outputPath,
             schema,

package/package.json

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