@currentjs/gen 0.5.1 → 0.5.2

package/dist/commands/createModule.js

@@ -38,6 +38,7 @@ const fs = __importStar(require("fs"));
 const path = __importStar(require("path"));
 const cliUtils_1 = require("../utils/cliUtils");
 const yaml_1 = require("yaml");
+const colors_1 = require("../utils/colors");
 function moduleYamlTemplate(moduleName) {
     const entityName = moduleName.charAt(0).toUpperCase() + moduleName.slice(1);
     const lower = moduleName.charAt(0).toLowerCase() + moduleName.slice(1);
@@ -226,4 +227,16 @@ function handleCreateModule(name) {
         appConfig.modules[moduleKey] = { path: moduleYamlRel };
     }
     fs.writeFileSync(appYamlPath, (0, yaml_1.stringify)(appConfig), 'utf8');
+    const output = `
+${colors_1.colors.green(`Module ${colors_1.colors.bold(name)} has been created`)}
+
+Run command ${colors_1.colors.green(colors_1.colors.bold(`current create model ${name}:modelname`))}
+  where ${colors_1.colors.italic(colors_1.colors.yellow('modelname'))} is name of the model in your module.
+At the end, that command will suggest you to create CRUD actions for the model and further steps.
+You can run this command as many times as needed.
+
+Alternatively, you may consider modifying module's config manually, and then run ${colors_1.colors.bold(colors_1.colors.green('current generate'))}
+  ${colors_1.colors.gray('config:')} ${colors_1.colors.cyan(colors_1.colors.italic(moduleYamlFile))}
+`;
+    console.log(output);
 }

package/dist/commands/generateAll.d.ts

@@ -1,4 +1,5 @@
 export declare function handleGenerateAll(yamlPathArg?: string, _outArg?: string, moduleName?: string, opts?: {
     force?: boolean;
     skip?: boolean;
+    withTemplates?: boolean;
 }): Promise<void>;

package/dist/commands/generateAll.js

@@ -94,7 +94,7 @@ async function handleGenerateAll(yamlPathArg, _outArg, moduleName, opts) {
         // eslint-disable-next-line no-await-in-loop
         await controllerGen.generateAndSaveFiles(moduleYamlPath, moduleDir, opts);
         // eslint-disable-next-line no-await-in-loop
-        await templateGen.generateAndSaveFiles(moduleYamlPath, moduleDir, opts);
+        await templateGen.generateAndSaveFiles(moduleYamlPath, moduleDir, { force: opts === null || opts === void 0 ? void 0 : opts.force, skipOnConflict: opts === null || opts === void 0 ? void 0 : opts.skip, onlyIfMissing: !(opts === null || opts === void 0 ? void 0 : opts.withTemplates) });
         // Find srcDir by probing upward for app.ts
         let probeDir = moduleDir;
         let srcDir = null;

package/dist/commands/init.d.ts

@@ -0,0 +1 @@
+export declare function handleInit(rawName?: string): void;

package/dist/commands/{createApp.js → init.js}

@@ -33,11 +33,11 @@ var __importStar = (this && this.__importStar) || (function () {
     };
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.handleCreateApp = handleCreateApp;
+exports.handleInit = handleInit;
 const path = __importStar(require("path"));
 const cliUtils_1 = require("../utils/cliUtils");
 const appTemplates_1 = require("../generators/templates/appTemplates");
-function handleCreateApp(rawName) {
+function handleInit(rawName) {
     const targetRoot = rawName ? (0, cliUtils_1.toAbsolute)(rawName) : process.cwd();
     (0, cliUtils_1.ensureDir)(targetRoot);
     // Basic structure using constants

package/dist/commands/migrateCommit.js

@@ -39,70 +39,41 @@ const path = __importStar(require("path"));
 const yaml_1 = require("yaml");
 const colors_1 = require("../utils/colors");
 const cliUtils_1 = require("../utils/cliUtils");
+const commandUtils_1 = require("../utils/commandUtils");
+const configTypes_1 = require("../types/configTypes");
 const migrationUtils_1 = require("../utils/migrationUtils");
-function collectModelsFromYaml(yamlPath) {
-    const yamlContent = fs.readFileSync(yamlPath, 'utf8');
-    const config = (0, yaml_1.parse)(yamlContent);
-    const projectRoot = path.dirname(yamlPath);
-    const allModels = [];
+function collectAggregatesFromModules(appYamlPath) {
+    const appConfig = (0, commandUtils_1.loadAppConfig)(appYamlPath);
+    const moduleEntries = (0, commandUtils_1.getModuleEntries)(appConfig);
+    const projectRoot = path.dirname(appYamlPath);
+    const allAggregates = {};
     const sources = [];
-    // Check if it's a module YAML (has models directly)
-    if (config.models) {
-        allModels.push(...config.models);
-        sources.push(`app.yaml (${config.models.length} model(s))`);
-    }
-    // App YAML: modules as Record<string, { path }> — resolve path and read module YAML for .models
-    if (config.modules && typeof config.modules === 'object' && !Array.isArray(config.modules)) {
-        let moduleCount = 0;
-        for (const entry of Object.values(config.modules)) {
-            const modulePath = entry.path;
-            if (!modulePath)
-                continue;
-            const moduleYamlPath = path.isAbsolute(modulePath)
-                ? modulePath
-                : path.resolve(projectRoot, modulePath);
-            if (fs.existsSync(moduleYamlPath)) {
-                const moduleYamlContent = fs.readFileSync(moduleYamlPath, 'utf8');
-                const moduleConfig = (0, yaml_1.parse)(moduleYamlContent);
-                if (moduleConfig.models) {
-                    allModels.push(...moduleConfig.models);
-                    moduleCount++;
-                }
-            }
-        }
-        if (moduleCount > 0) {
-            sources.push(`app.yaml modules section (${moduleCount} module(s))`);
-        }
-    }
-    // Also check for module YAMLs in src/modules/*/module.yaml (as fallback)
-    const modulesDir = path.join(projectRoot, 'src', 'modules');
-    if (fs.existsSync(modulesDir)) {
-        const moduleFolders = fs.readdirSync(modulesDir).filter(f => {
-            const stat = fs.statSync(path.join(modulesDir, f));
-            return stat.isDirectory();
-        });
-        let moduleYamlCount = 0;
-        for (const moduleFolder of moduleFolders) {
-            const moduleYamlPath = path.join(modulesDir, moduleFolder, 'module.yaml');
-            if (fs.existsSync(moduleYamlPath)) {
-                const moduleYamlContent = fs.readFileSync(moduleYamlPath, 'utf8');
-                const moduleConfig = (0, yaml_1.parse)(moduleYamlContent);
-                if (moduleConfig.models) {
-                    allModels.push(...moduleConfig.models);
-                    moduleYamlCount++;
-                }
-            }
+    for (const entry of moduleEntries) {
+        const moduleYamlPath = path.isAbsolute(entry.path)
+            ? entry.path
+            : path.resolve(projectRoot, entry.path);
+        if (!fs.existsSync(moduleYamlPath)) {
+            // eslint-disable-next-line no-console
+            console.warn(colors_1.colors.yellow(`   Module YAML not found: ${moduleYamlPath}`));
+            continue;
         }
-        if (moduleYamlCount > 0) {
-            sources.push(`src/modules/*/module.yaml (${moduleYamlCount} module(s))`);
+        const moduleYamlContent = fs.readFileSync(moduleYamlPath, 'utf8');
+        const moduleConfig = (0, yaml_1.parse)(moduleYamlContent);
+        if (!(0, configTypes_1.isValidModuleConfig)(moduleConfig)) {
+            // eslint-disable-next-line no-console
+            console.warn(colors_1.colors.yellow(`   Skipping ${moduleYamlPath}: not a valid module config (missing domain/useCases)`));
+            continue;
         }
+        const aggregates = moduleConfig.domain.aggregates;
+        const count = Object.keys(aggregates).length;
+        Object.assign(allAggregates, aggregates);
+        sources.push(`${entry.name} (${count} aggregate(s))`);
     }
-    // Log sources
     if (sources.length > 0) {
         // eslint-disable-next-line no-console
         console.log(colors_1.colors.gray(`   Sources: ${sources.join(', ')}`));
     }
-    return allModels;
+    return allAggregates;
 }
 function handleMigrateCommit(yamlPath) {
     try {
@@ -116,24 +87,21 @@ function handleMigrateCommit(yamlPath) {
         console.log(colors_1.colors.gray(`   Project root: ${projectRoot}`));
         // eslint-disable-next-line no-console
         console.log(colors_1.colors.gray(`   Migrations dir: ${migrationsDir}`));
-        // Ensure migrations directory exists
         if (!fs.existsSync(migrationsDir)) {
             fs.mkdirSync(migrationsDir, { recursive: true });
             // eslint-disable-next-line no-console
             console.log(colors_1.colors.green(`   ✓ Created migrations directory`));
         }
-        // Collect all models from YAML files
         // eslint-disable-next-line no-console
-        console.log(colors_1.colors.cyan('\n📋 Collecting models from all modules...'));
-        const currentModels = collectModelsFromYaml(resolvedYamlPath);
-        if (currentModels.length === 0) {
+        console.log(colors_1.colors.cyan('\n📋 Collecting aggregates from all modules...'));
+        const currentAggregates = collectAggregatesFromModules(resolvedYamlPath);
+        if (Object.keys(currentAggregates).length === 0) {
             // eslint-disable-next-line no-console
-            console.log(colors_1.colors.yellow('⚠️  No models found in YAML configuration.'));
+            console.log(colors_1.colors.yellow('⚠️  No aggregates found in module configuration.'));
             return;
         }
         // eslint-disable-next-line no-console
-        console.log(colors_1.colors.green(`✓ Found ${currentModels.length} model(s): ${currentModels.map(m => m.name).join(', ')}`));
-        // Load previous state
+        console.log(colors_1.colors.green(`✓ Found ${Object.keys(currentAggregates).length} aggregate(s): ${Object.keys(currentAggregates).join(', ')}`));
         const oldState = (0, migrationUtils_1.loadSchemaState)(stateFilePath);
         if (oldState) {
             // eslint-disable-next-line no-console
@@ -143,16 +111,14 @@ function handleMigrateCommit(yamlPath) {
             // eslint-disable-next-line no-console
             console.log(colors_1.colors.cyan('📖 No previous schema state found - will generate initial migration'));
         }
-        // Compare schemas and generate SQL
         // eslint-disable-next-line no-console
         console.log(colors_1.colors.cyan('\n🔍 Comparing schemas...'));
-        const sqlStatements = (0, migrationUtils_1.compareSchemas)(oldState, currentModels);
+        const sqlStatements = (0, migrationUtils_1.compareSchemas)(oldState, currentAggregates);
         if (sqlStatements.length === 0 || sqlStatements.every(s => s.trim() === '' || s.startsWith('--'))) {
             // eslint-disable-next-line no-console
             console.log(colors_1.colors.yellow('⚠️  No changes detected. Schema is up to date.'));
             return;
         }
-        // Generate migration file
         const timestamp = (0, migrationUtils_1.generateTimestamp)();
         const migrationFileName = (0, migrationUtils_1.getMigrationFileName)(timestamp);
         const migrationFilePath = path.join(migrationsDir, migrationFileName);
@@ -163,9 +129,8 @@ function handleMigrateCommit(yamlPath) {
 `;
         const migrationContent = migrationHeader + sqlStatements.join('\n');
         fs.writeFileSync(migrationFilePath, migrationContent);
-        // Update state file
         const newState = {
-            models: currentModels,
+            aggregates: currentAggregates,
             version: timestamp,
             timestamp: new Date().toISOString()
         };

package/dist/generators/domainLayerGenerator.js

@@ -215,12 +215,45 @@ class DomainLayerGenerator {
     }`;
         })
             .join('\n');
+        // Generate validation logic from field constraints
+        // we don't use constraints at models, since we use DTOs (use cases) for validation
+        // Model – is a place not for validation, but for business logic!
+        // kept this code for reference
+        /*
+        const validations: string[] = [];
+        sortedFields.forEach(([fieldName, fieldConfig]) => {
+          const { constraints } = fieldConfig;
+          if (!constraints) return;
+    
+          if (constraints.min !== undefined) {
+            validations.push(`        if (this.${fieldName} < ${constraints.min}) {
+                throw new Error('${name}.${fieldName} must be at least ${constraints.min}');
+            }`);
+          }
+          if (constraints.max !== undefined) {
+            validations.push(`        if (this.${fieldName} > ${constraints.max}) {
+                throw new Error('${name}.${fieldName} must be at most ${constraints.max}');
+            }`);
+          }
+          if (constraints.pattern) {
+            validations.push(`        if (!/${constraints.pattern}/.test(String(this.${fieldName}))) {
+                throw new Error('${name}.${fieldName} does not match required pattern');
+            }`);
+          }
+        });
+    
+        const constructorBody = validations.length > 0
+          ? `\n        this.validate();\n    }\n\n    private validate(): void {\n${validations.join('\n')}\n    }`
+          : ' }';
+        */
+        const constructorBody = '';
         const rootComment = config.root ? '// Aggregate Root\n' : '';
         const enumTypeDefsCode = enumTypeDefinitions.length > 0 ? enumTypeDefinitions.join('\n') + '\n\n' : '';
         return `${imports ? imports + '\n\n' : ''}${enumTypeDefsCode}${rootComment}export class ${name} {
     public constructor(
         ${constructorParamsStr}
-    ) { }
+    ) {${constructorBody}
+    }
 ${setterMethods}
 }`;
     }

package/dist/generators/templateGenerator.d.ts

@@ -26,5 +26,6 @@ export declare class TemplateGenerator {
     generateAndSaveFiles(yamlFilePath: string, moduleDir: string, opts?: {
         force?: boolean;
         skipOnConflict?: boolean;
+        onlyIfMissing?: boolean;
     }): Promise<void>;
 }

package/dist/generators/templateGenerator.js

@@ -458,16 +458,22 @@ ${options}
         return this.generateFromConfig(config);
     }
     async generateAndSaveFiles(yamlFilePath, moduleDir, opts) {
+        let isGenerated = false;
         const templatesByName = this.generateFromYamlFile(yamlFilePath);
         const viewsDir = path.join(moduleDir, 'views');
         fs.mkdirSync(viewsDir, { recursive: true });
         for (const [name, content] of Object.entries(templatesByName)) {
             const filePath = path.join(viewsDir, `${name}.html`);
+            if ((opts === null || opts === void 0 ? void 0 : opts.onlyIfMissing) && fs.existsSync(filePath))
+                continue;
             // eslint-disable-next-line no-await-in-loop
             await (0, generationRegistry_1.writeGeneratedFile)(filePath, content, { force: !!(opts === null || opts === void 0 ? void 0 : opts.force), skipOnConflict: !!(opts === null || opts === void 0 ? void 0 : opts.skipOnConflict) });
+            isGenerated = true;
+        }
+        if (isGenerated) {
+            // eslint-disable-next-line no-console
+            console.log('\n' + colors_1.colors.green('Template files generated successfully!') + '\n');
         }
-        // eslint-disable-next-line no-console
-        console.log('\n' + colors_1.colors.green('Template files generated successfully!') + '\n');
     }
 }
 exports.TemplateGenerator = TemplateGenerator;