@currentjs/gen 0.5.5 → 0.5.6

package/dist/utils/migrationUtils.js

@@ -33,6 +33,8 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getIdColumnDefinition = getIdColumnDefinition;
+exports.getFkColumnType = getFkColumnType;
 exports.mapYamlTypeToSql = mapYamlTypeToSql;
 exports.getTableName = getTableName;
 exports.getForeignKeyFieldName = getForeignKeyFieldName;
@@ -67,10 +69,24 @@ const TYPE_MAPPING = {
     array: 'JSON',
     object: 'JSON'
 };
-function mapYamlTypeToSql(yamlType, availableAggregates, availableValueObjects) {
-    // Simple aggregate reference → foreign key INT
+function getIdColumnDefinition(idType = 'numeric') {
+    switch (idType) {
+        case 'uuid': return 'id BINARY(16) PRIMARY KEY DEFAULT (UUID_TO_BIN(UUID(), 1))';
+        case 'nanoid': return 'id VARCHAR(21) PRIMARY KEY';
+        default: return 'id INT AUTO_INCREMENT PRIMARY KEY';
+    }
+}
+function getFkColumnType(idType = 'numeric') {
+    switch (idType) {
+        case 'uuid': return 'BINARY(16)';
+        case 'nanoid': return 'VARCHAR(21)';
+        default: return 'INT';
+    }
+}
+function mapYamlTypeToSql(yamlType, availableAggregates, availableValueObjects, identifiers = 'numeric') {
+    // Simple aggregate reference → foreign key column matching PK type
     if (availableAggregates.has(yamlType)) {
-        return 'INT';
+        return getFkColumnType(identifiers);
     }
     // Compound types: array ("Foo[]") or union ("Foo | Bar") → JSON column
     const parsed = (0, typeUtils_1.parseFieldType)(yamlType);
@@ -106,26 +122,27 @@ function buildChildToParentMap(aggregates) {
     }
     return map;
 }
-function generateCreateTableSQL(name, aggregate, availableAggregates, availableValueObjects, parentIdField) {
+function generateCreateTableSQL(name, aggregate, availableAggregates, availableValueObjects, parentIdField, identifiers = 'numeric') {
     const tableName = getTableName(name);
     const columns = [];
     const indexes = [];
     const foreignKeys = [];
-    columns.push('  id INT AUTO_INCREMENT PRIMARY KEY');
+    const fkType = getFkColumnType(identifiers);
+    columns.push(`  ${getIdColumnDefinition(identifiers)}`);
     // Root aggregates get an ownerId column; child entities get a parent ID column.
     if (parentIdField) {
-        columns.push(`  ${parentIdField} INT NOT NULL`);
+        columns.push(`  ${parentIdField} ${fkType} NOT NULL`);
         indexes.push(`  INDEX idx_${tableName}_${parentIdField} (${parentIdField})`);
     }
     else if (aggregate.root !== false) {
-        columns.push('  ownerId INT NOT NULL');
+        columns.push(`  ownerId ${fkType} NOT NULL`);
         indexes.push(`  INDEX idx_${tableName}_ownerId (ownerId)`);
     }
     for (const [fieldName, field] of Object.entries(aggregate.fields)) {
         if (isRelationshipField(field.type, availableAggregates)) {
             const foreignKeyName = getForeignKeyFieldName(fieldName);
             const nullable = field.required === false ? 'NULL DEFAULT NULL' : 'NOT NULL';
-            columns.push(`  ${foreignKeyName} INT ${nullable}`);
+            columns.push(`  ${foreignKeyName} ${fkType} ${nullable}`);
             indexes.push(`  INDEX idx_${tableName}_${foreignKeyName} (${foreignKeyName})`);
             const refTableName = getTableName(field.type);
             foreignKeys.push(`  CONSTRAINT fk_${tableName}_${foreignKeyName} \n` +
@@ -135,7 +152,7 @@ function generateCreateTableSQL(name, aggregate, availableAggregates, availableV
                 `    ON UPDATE CASCADE`);
         }
         else {
-            const sqlType = mapYamlTypeToSql(field.type, availableAggregates, availableValueObjects);
+            const sqlType = mapYamlTypeToSql(field.type, availableAggregates, availableValueObjects, identifiers);
             const nullable = field.required === false ? 'NULL DEFAULT NULL' : 'NOT NULL';
             columns.push(`  ${fieldName} ${sqlType} ${nullable}`);
             if (['string', 'number', 'integer', 'id'].includes(field.type)) {
@@ -154,14 +171,14 @@ function generateCreateTableSQL(name, aggregate, availableAggregates, availableV
 function generateDropTableSQL(tableName) {
     return `DROP TABLE IF EXISTS \`${tableName}\`;`;
 }
-function generateAddColumnSQL(tableName, fieldName, field, availableAggregates, availableValueObjects) {
+function generateAddColumnSQL(tableName, fieldName, field, availableAggregates, availableValueObjects, identifiers = 'numeric') {
     if (isRelationshipField(field.type, availableAggregates)) {
         const foreignKeyName = getForeignKeyFieldName(fieldName);
         const nullable = field.required === false ? 'NULL DEFAULT NULL' : 'NOT NULL';
-        return `ALTER TABLE \`${tableName}\` ADD COLUMN \`${foreignKeyName}\` INT ${nullable};`;
+        return `ALTER TABLE \`${tableName}\` ADD COLUMN \`${foreignKeyName}\` ${getFkColumnType(identifiers)} ${nullable};`;
     }
     else {
-        const sqlType = mapYamlTypeToSql(field.type, availableAggregates, availableValueObjects);
+        const sqlType = mapYamlTypeToSql(field.type, availableAggregates, availableValueObjects, identifiers);
         const nullable = field.required === false ? 'NULL DEFAULT NULL' : 'NOT NULL';
         return `ALTER TABLE \`${tableName}\` ADD COLUMN \`${fieldName}\` ${sqlType} ${nullable};`;
     }
@@ -169,14 +186,14 @@ function generateAddColumnSQL(tableName, fieldName, field, availableAggregates,
 function generateDropColumnSQL(tableName, columnName) {
     return `ALTER TABLE \`${tableName}\` DROP COLUMN \`${columnName}\`;`;
 }
-function generateModifyColumnSQL(tableName, fieldName, field, availableAggregates, availableValueObjects) {
+function generateModifyColumnSQL(tableName, fieldName, field, availableAggregates, availableValueObjects, identifiers = 'numeric') {
     if (isRelationshipField(field.type, availableAggregates)) {
         const foreignKeyName = getForeignKeyFieldName(fieldName);
         const nullable = field.required === false ? 'NULL DEFAULT NULL' : 'NOT NULL';
-        return `ALTER TABLE \`${tableName}\` MODIFY COLUMN \`${foreignKeyName}\` INT ${nullable};`;
+        return `ALTER TABLE \`${tableName}\` MODIFY COLUMN \`${foreignKeyName}\` ${getFkColumnType(identifiers)} ${nullable};`;
     }
     else {
-        const sqlType = mapYamlTypeToSql(field.type, availableAggregates, availableValueObjects);
+        const sqlType = mapYamlTypeToSql(field.type, availableAggregates, availableValueObjects, identifiers);
         const nullable = field.required === false ? 'NULL DEFAULT NULL' : 'NOT NULL';
         return `ALTER TABLE \`${tableName}\` MODIFY COLUMN \`${fieldName}\` ${sqlType} ${nullable};`;
     }
@@ -225,7 +242,7 @@ function sortAggregatesByDependencies(aggregates, availableAggregates) {
     }
     return sorted;
 }
-function compareSchemas(oldState, newAggregates, availableValueObjects) {
+function compareSchemas(oldState, newAggregates, availableValueObjects, identifiers = 'numeric') {
     const sqlStatements = [];
     const availableAggregates = new Set(Object.keys(newAggregates));
     const childToParent = buildChildToParentMap(newAggregates);
@@ -236,7 +253,7 @@ function compareSchemas(oldState, newAggregates, availableValueObjects) {
             const parentName = childToParent.get(name);
             const parentIdField = parentName ? `${parentName.toLowerCase()}Id` : undefined;
             sqlStatements.push(`-- Create ${tableName} table`);
-            sqlStatements.push(generateCreateTableSQL(name, aggregate, availableAggregates, availableValueObjects, parentIdField));
+            sqlStatements.push(generateCreateTableSQL(name, aggregate, availableAggregates, availableValueObjects, parentIdField, identifiers));
             sqlStatements.push('');
         }
         return sqlStatements;
@@ -259,7 +276,7 @@ function compareSchemas(oldState, newAggregates, availableValueObjects) {
         const parentIdField = parentName ? `${parentName.toLowerCase()}Id` : undefined;
         if (!oldAggregate) {
             sqlStatements.push(`-- Create ${tableName} table`);
-            sqlStatements.push(generateCreateTableSQL(name, newAggregate, availableAggregates, availableValueObjects, parentIdField));
+            sqlStatements.push(generateCreateTableSQL(name, newAggregate, availableAggregates, availableValueObjects, parentIdField, identifiers));
             sqlStatements.push('');
         }
         else {
@@ -281,7 +298,7 @@ function compareSchemas(oldState, newAggregates, availableValueObjects) {
                 const oldField = oldFields[fieldName];
                 if (!oldField) {
                     sqlStatements.push(`-- Add column ${fieldName} to ${tableName}`);
-                    sqlStatements.push(generateAddColumnSQL(tableName, fieldName, newField, availableAggregates, availableValueObjects));
+                    sqlStatements.push(generateAddColumnSQL(tableName, fieldName, newField, availableAggregates, availableValueObjects, identifiers));
                     sqlStatements.push('');
                 }
                 else {
@@ -289,7 +306,7 @@ function compareSchemas(oldState, newAggregates, availableValueObjects) {
                     const requiredChanged = oldField.required !== newField.required;
                     if (typeChanged || requiredChanged) {
                         sqlStatements.push(`-- Modify column ${fieldName} in ${tableName}`);
-                        sqlStatements.push(generateModifyColumnSQL(tableName, fieldName, newField, availableAggregates, availableValueObjects));
+                        sqlStatements.push(generateModifyColumnSQL(tableName, fieldName, newField, availableAggregates, availableValueObjects, identifiers));
                         sqlStatements.push('');
                     }
                 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@currentjs/gen",
-  "version": "0.5.5",
+  "version": "0.5.6",
   "description": "CLI code generator",
   "license": "LGPL-3.0",
   "author": "Konstantin Zavalny",