relq 1.0.2 → 1.0.4

package/dist/cjs/cli/utils/spinner.cjs

@@ -1,108 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.colors = void 0;
-exports.createSpinner = createSpinner;
-exports.progressBar = progressBar;
-exports.formatBytes = formatBytes;
-exports.formatDuration = formatDuration;
-const SPINNER_FRAMES = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
-const SPINNER_INTERVAL = 80;
-function createSpinner() {
-    let intervalId = null;
-    let frameIndex = 0;
-    let currentMessage = '';
-    let isSpinning = false;
-    const clearLine = () => {
-        process.stdout.write('\r\x1b[K');
-    };
-    const render = () => {
-        if (!isSpinning)
-            return;
-        clearLine();
-        const frame = SPINNER_FRAMES[frameIndex];
-        process.stdout.write(`\x1b[36m${frame}\x1b[0m ${currentMessage}`);
-        frameIndex = (frameIndex + 1) % SPINNER_FRAMES.length;
-    };
-    return {
-        start(message) {
-            if (isSpinning)
-                this.stop();
-            currentMessage = message;
-            isSpinning = true;
-            frameIndex = 0;
-            intervalId = setInterval(render, SPINNER_INTERVAL);
-            render();
-        },
-        update(message) {
-            currentMessage = message;
-        },
-        succeed(message) {
-            this.stop();
-            console.log(`\x1b[32m✓\x1b[0m ${message || currentMessage}`);
-        },
-        fail(message) {
-            this.stop();
-            console.log(`\x1b[31m✗\x1b[0m ${message || currentMessage}`);
-        },
-        info(message) {
-            this.stop();
-            console.log(`\x1b[34mℹ\x1b[0m ${message || currentMessage}`);
-        },
-        warn(message) {
-            this.stop();
-            console.log(`\x1b[33m⚠\x1b[0m ${message || currentMessage}`);
-        },
-        stop() {
-            if (intervalId) {
-                clearInterval(intervalId);
-                intervalId = null;
-            }
-            if (isSpinning) {
-                clearLine();
-                isSpinning = false;
-            }
-        }
-    };
-}
-exports.colors = {
-    reset: '\x1b[0m',
-    bold: (text) => `\x1b[1m${text}\x1b[0m`,
-    dim: (text) => `\x1b[2m${text}\x1b[0m`,
-    red: (text) => `\x1b[31m${text}\x1b[0m`,
-    green: (text) => `\x1b[32m${text}\x1b[0m`,
-    yellow: (text) => `\x1b[33m${text}\x1b[0m`,
-    blue: (text) => `\x1b[34m${text}\x1b[0m`,
-    magenta: (text) => `\x1b[35m${text}\x1b[0m`,
-    cyan: (text) => `\x1b[36m${text}\x1b[0m`,
-    gray: (text) => `\x1b[90m${text}\x1b[0m`,
-    white: (text) => `\x1b[37m${text}\x1b[0m`,
-    success: (text) => `\x1b[32m${text}\x1b[0m`,
-    error: (text) => `\x1b[31m${text}\x1b[0m`,
-    warning: (text) => `\x1b[33m${text}\x1b[0m`,
-    info: (text) => `\x1b[34m${text}\x1b[0m`,
-    muted: (text) => `\x1b[90m${text}\x1b[0m`,
-};
-function progressBar(current, total, width = 30) {
-    const percentage = Math.min(100, Math.round((current / total) * 100));
-    const filled = Math.round((percentage / 100) * width);
-    const empty = width - filled;
-    const bar = '█'.repeat(filled) + '░'.repeat(empty);
-    return `\x1b[36m${bar}\x1b[0m ${percentage}%`;
-}
-function formatBytes(bytes) {
-    if (bytes === 0)
-        return '0 B';
-    const k = 1024;
-    const sizes = ['B', 'KB', 'MB', 'GB'];
-    const i = Math.floor(Math.log(bytes) / Math.log(k));
-    return `${parseFloat((bytes / Math.pow(k, i)).toFixed(1))} ${sizes[i]}`;
-}
-function formatDuration(ms) {
-    if (ms < 1000)
-        return `${ms}ms`;
-    if (ms < 60000)
-        return `${(ms / 1000).toFixed(1)}s`;
-    const minutes = Math.floor(ms / 60000);
-    const seconds = Math.round((ms % 60000) / 1000);
-    return `${minutes}m ${seconds}s`;
-}
+exports.success = exports.requireInit = exports.hint = exports.warning = exports.error = exports.fatal = exports.formatDuration = exports.formatBytes = exports.progressBar = exports.createSpinner = exports.colors = void 0;
+var cli_utils_1 = require("./cli-utils.cjs");
+Object.defineProperty(exports, "colors", { enumerable: true, get: function () { return cli_utils_1.colors; } });
+Object.defineProperty(exports, "createSpinner", { enumerable: true, get: function () { return cli_utils_1.createSpinner; } });
+Object.defineProperty(exports, "progressBar", { enumerable: true, get: function () { return cli_utils_1.progressBar; } });
+Object.defineProperty(exports, "formatBytes", { enumerable: true, get: function () { return cli_utils_1.formatBytes; } });
+Object.defineProperty(exports, "formatDuration", { enumerable: true, get: function () { return cli_utils_1.formatDuration; } });
+Object.defineProperty(exports, "fatal", { enumerable: true, get: function () { return cli_utils_1.fatal; } });
+Object.defineProperty(exports, "error", { enumerable: true, get: function () { return cli_utils_1.error; } });
+Object.defineProperty(exports, "warning", { enumerable: true, get: function () { return cli_utils_1.warning; } });
+Object.defineProperty(exports, "hint", { enumerable: true, get: function () { return cli_utils_1.hint; } });
+Object.defineProperty(exports, "requireInit", { enumerable: true, get: function () { return cli_utils_1.requireInit; } });
+Object.defineProperty(exports, "confirm", { enumerable: true, get: function () { return cli_utils_1.confirm; } });
+Object.defineProperty(exports, "success", { enumerable: true, get: function () { return cli_utils_1.success; } });

package/dist/cjs/cli/utils/sql-generator.cjs

@@ -107,6 +107,13 @@ function quoteColumnRef(name) {
     }
     return name;
 }
+function normalizePgType(pgType) {
+    if (pgType.startsWith('_')) {
+        const baseType = pgType.slice(1);
+        return `${baseType}[]`;
+    }
+    return pgType;
+}
 function generateExtensionSQL(extensionName) {
     const quotedName = extensionName.includes('-') ? `"${extensionName}"` : extensionName;
     return `CREATE EXTENSION IF NOT EXISTS ${quotedName};`;
@@ -212,7 +219,8 @@ function generateTableSQL(table, options = {}) {
 }
 function generateColumnSQL(col) {
     const parts = [];
-    parts.push(`${quoteIdentifier(col.name).padEnd(28)}${col.dataType}`);
+    const normalizedType = normalizePgType(col.dataType);
+    parts.push(`${quoteIdentifier(col.name).padEnd(28)}${normalizedType}`);
     if (col.dataType.endsWith('[]')) {
     }
     if (col.isGenerated && col.generationExpression) {
@@ -340,7 +348,7 @@ function generateIndexSQL(index, tableName) {
     if (index.expression) {
         parts.push(`(${index.expression})`);
     }
-    else if (index.columns && index.columns.length > 0) {
+    else if (index.columns && Array.isArray(index.columns) && index.columns.length > 0) {
         const cols = index.columns.map(c => quoteColumnRef(c)).join(', ');
         parts.push(`(${cols})`);
     }

package/dist/cjs/cli/utils/type-generator.cjs

@@ -703,8 +703,18 @@ function formatDefaultValue(val, col, domainMap) {
     }
     if (cleaned === "'[]'" || cleaned === 'ARRAY[]')
         return 'emptyArray()';
+    const isJsonColumn = col.dataType.toLowerCase().includes('json');
+    if (isJsonColumn && cleaned.startsWith("'") && cleaned.endsWith("'")) {
+        const jsonStr = cleaned.slice(1, -1).replace(/''/g, "'");
+        try {
+            const parsed = JSON.parse(jsonStr);
+            return JSON.stringify(parsed);
+        }
+        catch {
+        }
+    }
     const pgArrayMatch = cleaned.match(/^'?\{([^}]*)\}'?$/);
-    if (pgArrayMatch) {
+    if (pgArrayMatch && !isJsonColumn) {
         const contents = pgArrayMatch[1];
         if (contents === '') {
             return 'emptyArray()';
@@ -739,16 +749,6 @@ function formatDefaultValue(val, col, domainMap) {
         }
         return 'emptyArray()';
     }
-    const isJsonColumn = col.dataType.toLowerCase().includes('json');
-    if (isJsonColumn && cleaned.startsWith("'") && cleaned.endsWith("'")) {
-        const jsonStr = cleaned.slice(1, -1).replace(/''/g, "'");
-        try {
-            const parsed = JSON.parse(jsonStr);
-            return JSON.stringify(parsed);
-        }
-        catch {
-        }
-    }
     if (cleaned.startsWith("'") && cleaned.endsWith("'")) {
         const str = cleaned.slice(1, -1).replace(/'/g, "\\'");
         return `'${str}'`;
@@ -1432,6 +1432,17 @@ function parseCheckValue(value, camelCase) {
     if (/^-?\d+(\.\d+)?$/.test(value)) {
         return value;
     }
+    const castMatch = value.match(/^\(?(.+?)\)?::[a-z_][a-z0-9_]*(\[\])?$/i);
+    if (castMatch) {
+        const innerValue = castMatch[1].trim();
+        if (/^-?\d+(\.\d+)?$/.test(innerValue)) {
+            return innerValue;
+        }
+        if (/^'.*'$/.test(innerValue)) {
+            return innerValue;
+        }
+        return parseCheckValue(innerValue, camelCase);
+    }
     if (/^TRUE$/i.test(value))
         return 'true';
     if (/^FALSE$/i.test(value))
@@ -1553,16 +1564,17 @@ function generateDefineTable(table, camelCase = true, childPartitions, enumNames
         if (enumMatch) {
             const colName = enumMatch[1];
             const valuesStr = enumMatch[2];
-            const values = valuesStr
-                .match(/'([^']+)'/g)
-                ?.map(v => v.replace(/'/g, '')) || [];
+            const values = valuesStr.match(/'([^']+)'/g)?.map(v => v.replace(/'/g, '')) || [];
             if (values.length > 0) {
-                columnChecks.set(colName.toLowerCase(), values);
+                columnChecks.set(colName, values);
             }
         }
     }
     const columns = table.columns
-        .map(col => generateColumnDef(col, seenColumns, camelCase, columnChecks.get(col.name.toLowerCase()), enumNames, domainNames, compositeNames, domainMap))
+        .map(col => {
+        const checkValues = columnChecks.get(col.name);
+        return generateColumnDef(col, seenColumns, camelCase, checkValues, enumNames, domainNames, compositeNames, domainMap);
+    })
         .filter(Boolean);
     const columnNames = Array.from(seenColumns);
     const indexesFn = table.indexes ? generateIndexes(table.indexes, columnNames, camelCase) : null;

package/dist/config.d.ts

@@ -387,13 +387,23 @@ export type BuildSelectType<T extends Record<string, ColumnConfig>> = {
 } & {
 	[K in keyof T as IsRequiredForSelect<T[K]> extends true ? never : K]?: T[K] extends ColumnConfig<infer U> ? U | null : unknown;
 };
-export type BuildInsertType<T extends Record<string, ColumnConfig>> = {
-	[K in keyof T as IsRequiredForInsert<T[K]> extends true ? K : never]: T[K] extends ColumnConfig<infer U> ? U : unknown;
+export type RequiredInsertKeys<T extends Record<string, ColumnConfig>> = {
+	[K in keyof T]: IsRequiredForInsert<T[K]> extends true ? K : never;
+}[keyof T];
+export type OptionalInsertKeys<T extends Record<string, ColumnConfig>> = {
+	[K in keyof T]: IsRequiredForInsert<T[K]> extends true ? never : K;
+}[keyof T];
+export type InferInsertValue<C extends ColumnConfig> = C extends ColumnConfig<infer U> ? C extends {
+	$nullable: true;
+} ? U | null : U : unknown;
+export type Simplify<T> = {
+	[K in keyof T]: T[K];
+} & {};
+export type BuildInsertType<T extends Record<string, ColumnConfig>> = Simplify<{
+	[K in RequiredInsertKeys<T>]: InferInsertValue<T[K]>;
 } & {
-	[K in keyof T as IsRequiredForInsert<T[K]> extends true ? never : K]?: T[K] extends ColumnConfig<infer U> ? T[K] extends {
-		$nullable: true;
-	} ? U | null : U : unknown;
-};
+	[K in OptionalInsertKeys<T>]?: InferInsertValue<T[K]>;
+}>;
 export interface TableDefinition<T extends Record<string, ColumnConfig>> {
 	$name: string;
 	$schema?: string;