@an5/orm 1.0.0 → 1.0.2

package/dist/generator/src/metadata-generator.js

@@ -0,0 +1,72 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MetadataGenerator = void 0;
+const fs_1 = __importDefault(require("fs"));
+class MetadataGenerator {
+    constructor(outputPath) {
+        this.outputPath = outputPath;
+    }
+    generate(models) {
+        let metaContent = '// This file is auto-generated. Do not edit directly.\n\n';
+        metaContent += 'export const modelToTable: Record<string, string> = {\n';
+        for (const model of models) {
+            const props = this.getAllPropertyVariations(model.name);
+            const fullTableName = `[${model.schemaName}].[${model.tableName}]`;
+            for (const prop of props) {
+                metaContent += `  ${prop}: "${fullTableName}",\n`;
+            }
+        }
+        metaContent += '};\n\n';
+        metaContent += 'export const modelFields: Record<string, Record<string, { ts: string; sql: string }>> = {\n';
+        for (const model of models) {
+            const props = this.getAllPropertyVariations(model.name);
+            const fieldsStr = `{ ${model.fields.map(f => `${f.name}: { ts: "${f.type}${f.isOptional ? '?' : ''}", sql: "${f.sqlType}" }`).join(', ')} }`;
+            for (const prop of props) {
+                metaContent += `  ${prop}: ${fieldsStr},\n`;
+            }
+        }
+        metaContent += '};\n\n';
+        metaContent += 'export interface RelationDef {\n  modelName: string;\n  relationType: "many" | "one";\n  foreignKey: string;\n  localKey: string;\n}\n\n';
+        metaContent += 'export const relationMap: Record<string, Record<string, RelationDef>> = {\n';
+        for (const model of models) {
+            const props = this.getAllPropertyVariations(model.name);
+            let relationsContent = `  {\n`;
+            for (const rel of model.relations) {
+                relationsContent += `    ${rel.name}: { modelName: "${this.toCamelCase(rel.type)}", relationType: "${rel.isArray ? 'many' : 'one'}", foreignKey: "${rel.foreignKey || 'id'}", localKey: "${rel.localKey || 'id'}" },\n`;
+            }
+            relationsContent += `  }`;
+            for (const prop of props) {
+                metaContent += `  ${prop}: ${relationsContent},\n`;
+            }
+        }
+        metaContent += '};\n';
+        fs_1.default.writeFileSync(this.outputPath, metaContent);
+    }
+    getAllPropertyVariations(modelName) {
+        const variations = new Set();
+        // 1. Standard camelCase (e.g. User -> user, McpServer -> mcpServer)
+        variations.add(this.toCamelCase(modelName));
+        // 2. Handle known acronyms at start (e.g. LLMProvider -> lLMProvider)
+        // This is already handled by toCamelCase if it only lowercases the first letter.
+        // But we might want 'llmProvider' as well.
+        const acronyms = ['LLM', 'AI', 'MCP', 'IT', 'QC', 'HR', 'MR', 'WH', 'SSIS', 'API', 'URL', 'ID', 'JSON'];
+        for (const acronym of acronyms) {
+            if (modelName.startsWith(acronym)) {
+                // e.g. LLMProvider -> llmProvider
+                variations.add(acronym.toLowerCase() + modelName.slice(acronym.length));
+                // e.g. LLMProvider -> lLMProvider (Prisma style)
+                variations.add(acronym[0].toLowerCase() + acronym.slice(1) + modelName.slice(acronym.length));
+            }
+        }
+        return Array.from(variations);
+    }
+    toCamelCase(str) {
+        if (!str)
+            return '';
+        return str[0].toLowerCase() + str.slice(1);
+    }
+}
+exports.MetadataGenerator = MetadataGenerator;

package/dist/generator/src/parser.d.ts

@@ -0,0 +1,11 @@
+import { Model } from './types';
+export declare function sqlTypeToTs(sqlType: string): string;
+export declare class SchemaParser {
+    private schemaDir;
+    private schemaText;
+    constructor(schemaDir: string);
+    parse(): Promise<Model[]>;
+    private loadSchema;
+    private parseModelLine;
+    private postProcessRelations;
+}

package/dist/generator/src/parser.js

@@ -0,0 +1,206 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SchemaParser = void 0;
+exports.sqlTypeToTs = sqlTypeToTs;
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+// SQL Server type → TypeScript type mapping
+const AN5_TO_TS = {
+    // String types
+    'NVARCHAR': 'string',
+    'VARCHAR': 'string',
+    'CHAR': 'string',
+    'NCHAR': 'string',
+    'TEXT': 'string',
+    'NTEXT': 'string',
+    'XML': 'string',
+    // Numeric types
+    'INT': 'number',
+    'SMALLINT': 'number',
+    'TINYINT': 'number',
+    'BIGINT': 'number | bigint',
+    'FLOAT': 'number',
+    'REAL': 'number',
+    'DECIMAL': 'number',
+    'NUMERIC': 'number',
+    'MONEY': 'number',
+    'SMALLMONEY': 'number',
+    // Boolean
+    'BIT': 'boolean',
+    // Date types
+    'DATETIME': 'Date',
+    'DATETIME2': 'Date',
+    'SMALLDATETIME': 'Date',
+    'DATE': 'Date',
+    'TIME': 'Date',
+    'DATETIMEOFFSET': 'Date',
+    // Binary types
+    'VARBINARY': 'Buffer',
+    'BINARY': 'Buffer',
+    'IMAGE': 'Buffer',
+    // Other
+    'UNIQUEIDENTIFIER': 'string',
+    'SQL_VARIANT': 'any',
+    'ROWVERSION': 'Buffer',
+    'HIERARCHYID': 'string',
+    'GEOGRAPHY': 'string',
+    'GEOMETRY': 'string',
+    'VECTOR': 'number[] | string',
+};
+// Parse base type from "NVARCHAR(255)" → "NVARCHAR"
+function parseSqlType(raw) {
+    const match = raw.match(/^(\w+)(?:\((.+)\))?$/);
+    if (!match)
+        return { base: raw, params: '' };
+    return { base: match[1].toUpperCase(), params: match[2] || '' };
+}
+// Map SQL Server type to TypeScript type
+function sqlTypeToTs(sqlType) {
+    const { base } = parseSqlType(sqlType);
+    return AN5_TO_TS[base] || 'any';
+}
+class SchemaParser {
+    constructor(schemaDir) {
+        this.schemaDir = schemaDir;
+        this.schemaText = '';
+    }
+    async parse() {
+        this.loadSchema();
+        const lines = this.schemaText.split('\n');
+        const models = [];
+        let currentModel = null;
+        for (let line of lines) {
+            line = line.trim();
+            if (!line || line.startsWith('//'))
+                continue;
+            const modelHeaderMatch = line.match(/^model\s+(\w+)\s*\{/);
+            if (modelHeaderMatch) {
+                const modelName = modelHeaderMatch[1];
+                currentModel = {
+                    name: modelName,
+                    tableName: modelName.toLowerCase() + 's',
+                    schemaName: 'dbo',
+                    fields: [],
+                    relations: []
+                };
+                models.push(currentModel);
+                continue;
+            }
+            if (line === '}') {
+                currentModel = null;
+                continue;
+            }
+            if (currentModel) {
+                this.parseModelLine(line, currentModel);
+            }
+        }
+        this.postProcessRelations(models);
+        return models;
+    }
+    loadSchema() {
+        if (fs_1.default.existsSync(this.schemaDir)) {
+            const files = fs_1.default.readdirSync(this.schemaDir).filter(f => f.endsWith('.an5'));
+            for (const file of files) {
+                this.schemaText += fs_1.default.readFileSync(path_1.default.join(this.schemaDir, file), 'utf8') + '\n';
+            }
+        }
+        else {
+            throw new Error(`No schema directory found at ${this.schemaDir}`);
+        }
+    }
+    parseModelLine(line, model) {
+        if (line.startsWith('@@map')) {
+            const mapMatch = line.match(/@@map\("(.+)"\)/);
+            if (mapMatch)
+                model.tableName = mapMatch[1];
+            return;
+        }
+        if (line.startsWith('@@schema')) {
+            const schemaMatch = line.match(/@@schema\("(.+)"\)/);
+            if (schemaMatch)
+                model.schemaName = schemaMatch[1];
+            return;
+        }
+        if (line.startsWith('@@unique')) {
+            const uniqueMatch = line.match(/@@unique\(\[([\w,\s]+)\]\)/);
+            if (uniqueMatch) {
+                const fields = uniqueMatch[1].split(',').map(f => f.trim());
+                model.compoundUniques = model.compoundUniques || [];
+                model.compoundUniques.push(fields);
+            }
+            return;
+        }
+        if (line.startsWith('@@description')) {
+            const descMatch = line.match(/@@description\("(.+)"\)/);
+            if (descMatch)
+                model.description = descMatch[1];
+            return;
+        }
+        if (line.startsWith('@@'))
+            return;
+        const parts = line.split(/\s+/);
+        const fieldName = parts[0];
+        let fieldType = parts[1];
+        if (!fieldName || !fieldType)
+            return;
+        const isArray = fieldType.endsWith('[]');
+        const isOptional = fieldType.endsWith('?');
+        const cleanType = fieldType.replace('[]', '').replace('?', '');
+        // Parse SQL Server type (e.g., "NVARCHAR(255)" → base="NVARCHAR")
+        const { base: sqlBase } = parseSqlType(cleanType);
+        let tsType = 'any';
+        let isRelation = false;
+        // Check if it's a known SQL Server type
+        if (AN5_TO_TS[sqlBase]) {
+            tsType = sqlTypeToTs(cleanType);
+        }
+        else if (cleanType[0] === cleanType[0].toUpperCase() && !cleanType.includes('(')) {
+            // Uppercase without parens = likely a relation to another model
+            tsType = cleanType;
+            isRelation = true;
+        }
+        if (isRelation) {
+            let foreignKey = '', localKey = '', relationName = '';
+            const nameMatch = line.match(/@relation\("(\w+)"/);
+            if (nameMatch)
+                relationName = nameMatch[1];
+            const relationMatch = line.match(/@relation\((?:.*fields:\s*\[(\w+)\],)?\s*(?:.*references:\s*\[(\w+)\],?)?.*\)/);
+            if (relationMatch) {
+                foreignKey = relationMatch[1] || '';
+                localKey = relationMatch[2] || '';
+            }
+            model.relations.push({ name: fieldName, type: tsType, isArray, isOptional, foreignKey, localKey, relationName });
+        }
+        else {
+            const hasDefault = line.includes('@default') || line.includes('@updatedAt') || line.includes('@id');
+            const isId = line.includes('@id');
+            let description;
+            const descMatch = line.match(/@description\("(.+)"\)/);
+            if (descMatch)
+                description = descMatch[1];
+            model.fields.push({ name: fieldName, type: tsType, sqlType: cleanType, isOptional, hasDefault, isId, description });
+        }
+    }
+    postProcessRelations(models) {
+        for (const model of models) {
+            for (const rel of model.relations) {
+                if (!rel.foreignKey || !rel.localKey) {
+                    const targetModel = models.find(m => m.name === rel.type);
+                    if (targetModel) {
+                        let opposite = rel.relationName ?
+                            targetModel.relations.find(r => r.type === model.name && r.relationName === rel.relationName && r.foreignKey && r.localKey) :
+                            targetModel.relations.find(r => r.type === model.name && r.foreignKey && r.localKey);
+                        if (opposite) {
+                            rel.foreignKey = opposite.foreignKey;
+                            rel.localKey = opposite.localKey;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+exports.SchemaParser = SchemaParser;

package/dist/generator/src/python-generator.d.ts

@@ -0,0 +1,9 @@
+import { Model } from './types';
+export declare class PythonGenerator {
+    private outputPath;
+    constructor(outputPath: string);
+    generate(models: Model[]): void;
+    private getAllPropertyVariations;
+    private toCamelCase;
+    private toSnakeCase;
+}

package/dist/generator/src/python-generator.js

@@ -0,0 +1,85 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PythonGenerator = void 0;
+const fs_1 = __importDefault(require("fs"));
+class PythonGenerator {
+    constructor(outputPath) {
+        this.outputPath = outputPath;
+    }
+    generate(models) {
+        let pyContent = '# This file is auto-generated. Do not edit directly.\n\n';
+        // 1. MODEL_TO_TABLE
+        pyContent += 'MODEL_TO_TABLE = {\n';
+        for (const model of models) {
+            const props = this.getAllPropertyVariations(model.name);
+            const fullTableName = `[${model.schemaName}].[${model.tableName}]`;
+            for (const prop of props) {
+                pyContent += `    "${prop}": "${fullTableName}",\n`;
+            }
+        }
+        pyContent += '}\n\n';
+        // 2. MODEL_FIELDS
+        pyContent += 'MODEL_FIELDS = {\n';
+        for (const model of models) {
+            const props = this.getAllPropertyVariations(model.name);
+            const fieldsStr = `{ ${model.fields.map(f => `"${f.name}": "${f.type}${f.isOptional ? '?' : ''}"`).join(', ')} }`;
+            for (const prop of props) {
+                pyContent += `    "${prop}": ${fieldsStr},\n`;
+            }
+        }
+        pyContent += '}\n\n';
+        // 3. RELATION_MAP
+        pyContent += 'RELATION_MAP = {\n';
+        for (const model of models) {
+            const props = this.getAllPropertyVariations(model.name);
+            let relationsContent = `{\n`;
+            for (const rel of model.relations) {
+                relationsContent += `        "${rel.name}": {\n`;
+                relationsContent += `            "modelName": "${this.toCamelCase(rel.type)}",\n`;
+                relationsContent += `            "relationType": "${rel.isArray ? 'many' : 'one'}",\n`;
+                relationsContent += `            "foreignKey": "${rel.foreignKey || 'id'}",\n`;
+                relationsContent += `            "localKey": "${rel.localKey || 'id'}"\n`;
+                relationsContent += `        },\n`;
+            }
+            relationsContent += `    }`;
+            for (const prop of props) {
+                pyContent += `    "${prop}": ${relationsContent},\n`;
+            }
+        }
+        pyContent += '}\n';
+        fs_1.default.writeFileSync(this.outputPath, pyContent);
+    }
+    getAllPropertyVariations(modelName) {
+        const variations = new Set();
+        // 1. camelCase (User -> user, McpServer -> mcpServer)
+        variations.add(this.toCamelCase(modelName));
+        // 2. snake_case (User -> user, McpServer -> mcp_server)
+        variations.add(this.toSnakeCase(modelName));
+        const acronyms = ['LLM', 'AI', 'MCP', 'IT', 'QC', 'HR', 'MR', 'WH', 'SSIS', 'API', 'URL', 'ID', 'JSON'];
+        for (const acronym of acronyms) {
+            if (modelName.startsWith(acronym)) {
+                variations.add(acronym.toLowerCase() + modelName.slice(acronym.length));
+                variations.add(acronym[0].toLowerCase() + acronym.slice(1) + modelName.slice(acronym.length));
+                variations.add(this.toSnakeCase(acronym.toLowerCase() + modelName.slice(acronym.length)));
+            }
+        }
+        return Array.from(variations);
+    }
+    toCamelCase(str) {
+        if (!str)
+            return '';
+        return str[0].toLowerCase() + str.slice(1);
+    }
+    toSnakeCase(str) {
+        if (!str)
+            return '';
+        return str
+            .replace(/([A-Z]+)([A-Z][a-z])/g, '$1_$2')
+            .replace(/([a-z\d])([A-Z])/g, '$1_$2')
+            .toLowerCase();
+    }
+}
+exports.PythonGenerator = PythonGenerator;

package/dist/generator/src/types.d.ts

@@ -0,0 +1,27 @@
+export interface Field {
+    name: string;
+    type: string;
+    sqlType: string;
+    isOptional: boolean;
+    hasDefault: boolean;
+    isId: boolean;
+    description?: string;
+}
+export interface Relation {
+    name: string;
+    type: string;
+    isArray: boolean;
+    isOptional: boolean;
+    foreignKey: string;
+    localKey: string;
+    relationName: string;
+}
+export interface Model {
+    name: string;
+    tableName: string;
+    schemaName: string;
+    fields: Field[];
+    relations: Relation[];
+    compoundUniques?: string[][];
+    description?: string;
+}

package/dist/generator/src/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/migrate.js

@@ -15,8 +15,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("dotenv/config");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const an5_adapters_1 = require("an5-adapters");
-const rootDir = path_1.default.join(__dirname, '../');
+const an5_adapters_1 = require("@an5/adapters");
+const rootDir = process.cwd();
 let config = {};
 try {
     const configPath = path_1.default.join(rootDir, 'an5Orm.config.js');
@@ -295,4 +295,4 @@ main().catch((err) => {
     console.error('❌ Migration failed:', err);
     process.exit(1);
 });
-//# sourceMappingURL=migrate.js.map
+//# sourceMappingURL=migrate.js.map

package/dist/pull.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("dotenv/config");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const an5_adapters_1 = require("an5-adapters");
-const rootDir = path_1.default.join(__dirname, "../");
+const an5_adapters_1 = require("@an5/adapters");
+const rootDir = process.cwd();
 let config = {};
 try {
     const configPath = path_1.default.join(rootDir, "an5Orm.config.js");
@@ -333,4 +333,4 @@ pull().catch((err) => {
     console.error("❌ Pull failed:", err);
     process.exit(1);
 });
-//# sourceMappingURL=pull.js.map
+//# sourceMappingURL=pull.js.map

package/dist/push.js

@@ -6,8 +6,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 require("dotenv/config");
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
-const an5_adapters_1 = require("an5-adapters");
-const rootDir = path_1.default.join(__dirname, "../");
+const adapters_1 = require("@an5/adapters");
+const rootDir = process.cwd();
 let config = {};
 try {
     const configPath = path_1.default.join(rootDir, "an5Orm.config.js");
@@ -22,7 +22,7 @@ const schemaDir = path_1.default.resolve(rootDir, config.schemaDir || "an5Schema
 let _adapter = null;
 async function getDb() {
     if (!_adapter) {
-        _adapter = new an5_adapters_1.An5Adapter({ connectionString: process.env.DATABASE_URL });
+        _adapter = new adapters_1.An5Adapter({ connectionString: process.env.DATABASE_URL });
         await _adapter.$connect();
     }
     return _adapter;
@@ -42,6 +42,75 @@ function parseSqlType(raw) {
     const match = raw.match(/^(\w+)/);
     return match ? match[1].toUpperCase() : raw.toUpperCase();
 }
+function parseTableName(raw) {
+    const cleaned = raw.replace(/[\[\]"]/g, "");
+    const parts = cleaned.split(".").filter(Boolean);
+    if (parts.length >= 2) {
+        return { schema: parts[parts.length - 2], name: parts[parts.length - 1] };
+    }
+    return { name: cleaned };
+}
+function tableKey(raw) {
+    const table = parseTableName(raw);
+    return `${table.schema || "dbo"}.${table.name}`.toLowerCase();
+}
+function tableSqlName(raw) {
+    const table = parseTableName(raw);
+    return table.schema ? `[${table.schema}].[${table.name}]` : `[${table.name}]`;
+}
+function tableObjectName(raw) {
+    const table = parseTableName(raw);
+    return table.schema ? `${table.schema}.${table.name}` : table.name;
+}
+function safeIdentifierName(raw) {
+    return raw.replace(/[^A-Za-z0-9_]/g, "_").replace(/_+/g, "_").replace(/^_|_$/g, "");
+}
+async function dropTablesNotInSchema(models) {
+    var _a;
+    if (!((_a = config.push) === null || _a === void 0 ? void 0 : _a.dropTables)) {
+        return;
+    }
+    const validTableKeys = new Set(models.map(model => tableKey(model.tableName)));
+    const dbTables = await (await getDb()).$queryRawUnsafe(`
+    SELECT s.name AS schemaName, t.name AS tableName
+    FROM sys.tables t
+    INNER JOIN sys.schemas s ON s.schema_id = t.schema_id
+    WHERE t.is_ms_shipped = 0
+  `);
+    const tablesToDrop = dbTables.filter(table => !validTableKeys.has(`${table.schemaName}.${table.tableName}`.toLowerCase()));
+    if (tablesToDrop.length === 0) {
+        console.log("✅ No extra tables to drop.");
+        return;
+    }
+    console.warn(`⚠️ Dropping ${tablesToDrop.length} table(s) not present in schema because push.dropTables=true.`);
+    const dropKeys = new Set(tablesToDrop.map(table => `${table.schemaName}.${table.tableName}`.toLowerCase()));
+    const foreignKeys = await (await getDb()).$queryRawUnsafe(`
+    SELECT
+      fk.name AS constraintName,
+      ps.name AS parentSchema,
+      pt.name AS parentTable,
+      rs.name AS referencedSchema,
+      rt.name AS referencedTable
+    FROM sys.foreign_keys fk
+    INNER JOIN sys.tables pt ON pt.object_id = fk.parent_object_id
+    INNER JOIN sys.schemas ps ON ps.schema_id = pt.schema_id
+    INNER JOIN sys.tables rt ON rt.object_id = fk.referenced_object_id
+    INNER JOIN sys.schemas rs ON rs.schema_id = rt.schema_id
+  `);
+    for (const fk of foreignKeys) {
+        const parentKey = `${fk.parentSchema}.${fk.parentTable}`.toLowerCase();
+        const referencedKey = `${fk.referencedSchema}.${fk.referencedTable}`.toLowerCase();
+        if (dropKeys.has(parentKey) || dropKeys.has(referencedKey)) {
+            console.log(`Dropping foreign key [${fk.constraintName}] on [${fk.parentSchema}].[${fk.parentTable}]...`);
+            await (await getDb()).$executeRawUnsafe(`ALTER TABLE [${fk.parentSchema}].[${fk.parentTable}] DROP CONSTRAINT [${fk.constraintName}]`);
+        }
+    }
+    for (const table of tablesToDrop) {
+        console.log(`Dropping table [${table.schemaName}].[${table.tableName}]...`);
+        await (await getDb()).$executeRawUnsafe(`DROP TABLE [${table.schemaName}].[${table.tableName}]`);
+        console.log(`✅ Dropped [${table.schemaName}].[${table.tableName}]`);
+    }
+}
 async function push() {
     let schemaText = "";
     if (fs_1.default.existsSync(schemaDir)) {
@@ -160,12 +229,15 @@ async function push() {
         }
     }
     console.log(`🚀 Pushing schema to database...`);
+    await dropTablesNotInSchema(models);
     for (const model of models) {
-        console.log(`Processing table [${model.tableName}]...`);
+        const sqlTableName = tableSqlName(model.tableName);
+        const objectName = tableObjectName(model.tableName);
+        console.log(`Processing table ${sqlTableName}...`);
         // Check if table exists
-        const tableExists = await (await getDb()).$queryRawUnsafe(`SELECT name FROM sys.tables WHERE name = '${model.tableName}'`);
+        const tableExists = await (await getDb()).$queryRawUnsafe(`SELECT name FROM sys.tables WHERE object_id = OBJECT_ID('${objectName}')`);
         if (tableExists.length === 0) {
-            console.log(`Creating table [${model.tableName}]...`);
+            console.log(`Creating table ${sqlTableName}...`);
             const colDefs = model.fields.map((f) => {
                 let def = `[${f.name}] ${f.sqlType}`;
                 if (f.isId)
@@ -181,32 +253,32 @@ async function push() {
             // Add compound uniques as table constraints
             if (model.compoundUniques && model.compoundUniques.length > 0) {
                 model.compoundUniques.forEach((fields, idx) => {
-                    const constraintName = `UQ_${model.tableName}_compound_${idx}`;
+                    const constraintName = `UQ_${safeIdentifierName(model.tableName)}_compound_${idx}`;
                     const fieldsStr = fields.map(f => `[${f}]`).join(", ");
                     colDefs.push(`CONSTRAINT [${constraintName}] UNIQUE (${fieldsStr})`);
                 });
             }
-            const createSql = `CREATE TABLE [${model.tableName}] (\n  ${colDefs.join(",\n  ")}\n)`;
+            const createSql = `CREATE TABLE ${sqlTableName} (\n  ${colDefs.join(",\n  ")}\n)`;
             await (await getDb()).$executeRawUnsafe(createSql);
-            console.log(`✅ Table [${model.tableName}] created.`);
+            console.log(`✅ Table ${sqlTableName} created.`);
             // Create indexes
             if (model.indexes && model.indexes.length > 0) {
                 for (let idx = 0; idx < model.indexes.length; idx++) {
                     const fields = model.indexes[idx];
-                    const indexName = `IX_${model.tableName}_${fields.join("_")}`;
+                    const indexName = `IX_${safeIdentifierName(model.tableName)}_${fields.join("_")}`;
                     const fieldsStr = fields.map((f) => `[${f}]`).join(", ");
-                    console.log(`Creating index [${indexName}] on table [${model.tableName}]...`);
-                    await (await getDb()).$executeRawUnsafe(`CREATE INDEX [${indexName}] ON [${model.tableName}] (${fieldsStr})`);
+                    console.log(`Creating index [${indexName}] on table ${sqlTableName}...`);
+                    await (await getDb()).$executeRawUnsafe(`CREATE INDEX [${indexName}] ON ${sqlTableName} (${fieldsStr})`);
                 }
             }
         }
         else {
             // 1. Check for missing columns
             for (const field of model.fields) {
-                const colExists = await (await getDb()).$queryRawUnsafe(`SELECT name FROM sys.columns WHERE object_id = OBJECT_ID('${model.tableName}') AND name = '${field.name}'`);
+                const colExists = await (await getDb()).$queryRawUnsafe(`SELECT name FROM sys.columns WHERE object_id = OBJECT_ID('${objectName}') AND name = '${field.name}'`);
                 if (colExists.length === 0) {
-                    console.log(`Adding column [${field.name}] to table [${model.tableName}]...`);
-                    let alterSql = `ALTER TABLE [${model.tableName}] ADD [${field.name}] ${field.sqlType}`;
+                    console.log(`Adding column [${field.name}] to table ${sqlTableName}...`);
+                    let alterSql = `ALTER TABLE ${sqlTableName} ADD [${field.name}] ${field.sqlType}`;
                     if (field.defaultValue)
                         alterSql += ` ${field.defaultValue}`;
                     if (field.isUnique && !field.isId)
@@ -224,12 +296,12 @@ async function push() {
             if (model.compoundUniques && model.compoundUniques.length > 0) {
                 for (let idx = 0; idx < model.compoundUniques.length; idx++) {
                     const fields = model.compoundUniques[idx];
-                    const constraintName = `UQ_${model.tableName}_compound_${idx}`;
-                    const constraintExists = await (await getDb()).$queryRawUnsafe(`SELECT name FROM sys.objects WHERE type = 'UQ' AND parent_object_id = OBJECT_ID('${model.tableName}') AND name = '${constraintName}'`);
+                    const constraintName = `UQ_${safeIdentifierName(model.tableName)}_compound_${idx}`;
+                    const constraintExists = await (await getDb()).$queryRawUnsafe(`SELECT name FROM sys.objects WHERE type = 'UQ' AND parent_object_id = OBJECT_ID('${objectName}') AND name = '${constraintName}'`);
                     if (constraintExists.length === 0) {
-                        console.log(`Adding compound unique constraint [${constraintName}] to table [${model.tableName}]...`);
+                        console.log(`Adding compound unique constraint [${constraintName}] to table ${sqlTableName}...`);
                         const fieldsStr = fields.map((f) => `[${f}]`).join(", ");
-                        await (await getDb()).$executeRawUnsafe(`ALTER TABLE [${model.tableName}] ADD CONSTRAINT [${constraintName}] UNIQUE (${fieldsStr})`);
+                        await (await getDb()).$executeRawUnsafe(`ALTER TABLE ${sqlTableName} ADD CONSTRAINT [${constraintName}] UNIQUE (${fieldsStr})`);
                     }
                 }
             }
@@ -237,12 +309,12 @@ async function push() {
             if (model.indexes && model.indexes.length > 0) {
                 for (let idx = 0; idx < model.indexes.length; idx++) {
                     const fields = model.indexes[idx];
-                    const indexName = `IX_${model.tableName}_${fields.join("_")}`;
-                    const indexExists = await (await getDb()).$queryRawUnsafe(`SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('${model.tableName}') AND name = '${indexName}'`);
+                    const indexName = `IX_${safeIdentifierName(model.tableName)}_${fields.join("_")}`;
+                    const indexExists = await (await getDb()).$queryRawUnsafe(`SELECT name FROM sys.indexes WHERE object_id = OBJECT_ID('${objectName}') AND name = '${indexName}'`);
                     if (indexExists.length === 0) {
-                        console.log(`Creating index [${indexName}] on table [${model.tableName}]...`);
+                        console.log(`Creating index [${indexName}] on table ${sqlTableName}...`);
                         const fieldsStr = fields.map((f) => `[${f}]`).join(", ");
-                        await (await getDb()).$executeRawUnsafe(`CREATE INDEX [${indexName}] ON [${model.tableName}] (${fieldsStr})`);
+                        await (await getDb()).$executeRawUnsafe(`CREATE INDEX [${indexName}] ON ${sqlTableName} (${fieldsStr})`);
                     }
                 }
             }
@@ -255,4 +327,3 @@ push().catch((err) => {
     console.error("❌ Push failed:", err);
     process.exit(1);
 });
-//# sourceMappingURL=push.js.map

package/generator/src/index.ts

@@ -24,7 +24,7 @@ function clearGeneratedFiles(outputDir: string, extension: string) {
 }
 
 async function main() {
-  const rootDir = path.join(__dirname, '../../../');
+  const rootDir = process.cwd();
   let config: any = {};
   
   try {