@currentjs/gen 0.2.1 → 0.3.0

package/CHANGELOG.md

@@ -4,38 +4,158 @@ All notable changes to this project will be documented in this file.
 
 
 
+
+
+## [0.3.0] - 2025-10-03
+
+- model relationship (between each other); - frontend script cleanup; - new command: migrate commit; - small refactoring.
+
+## [0.2.2] - 2025-10-02
+
+fix bug: required params after optional in the generated models; fix: views(templates) are not stored in the registry and being regenerated (overwritten); small readme fix; running 'npm i' on 'create app' and 'npm run build' on 'generate'
+
+
+## [0.3.0] - 2025-10-03
+
+- model relationship (between each other); - frontend script cleanup; - new command: migrate commit; - small refactoring.
+
 ## [0.2.1] - 2025-09-18
 
 Improve generated package.json
 
+
+
+## [0.3.0] - 2025-10-03
+
+- model relationship (between each other); - frontend script cleanup; - new command: migrate commit; - small refactoring.
+
+## [0.2.2] - 2025-10-02
+
+fix bug: required params after optional in the generated models; fix: views(templates) are not stored in the registry and being regenerated (overwritten); small readme fix; running 'npm i' on 'create app' and 'npm run build' on 'generate'
+
+
+## [0.3.0] - 2025-10-03
+
+- model relationship (between each other); - frontend script cleanup; - new command: migrate commit; - small refactoring.
+
 ## [0.2.0] - 2025-09-18
 
 implement multi-model generation (controllers, services); fix service-controller interaction; update documentation: more clear & reflect important things
 
 
+
+
+## [0.3.0] - 2025-10-03
+
+- model relationship (between each other); - frontend script cleanup; - new command: migrate commit; - small refactoring.
+
+## [0.2.2] - 2025-10-02
+
+fix bug: required params after optional in the generated models; fix: views(templates) are not stored in the registry and being regenerated (overwritten); small readme fix; running 'npm i' on 'create app' and 'npm run build' on 'generate'
+
+
+## [0.3.0] - 2025-10-03
+
+- model relationship (between each other); - frontend script cleanup; - new command: migrate commit; - small refactoring.
+
 ## [0.2.1] - 2025-09-18
 
 Improve generated package.json
 
+
+
+## [0.3.0] - 2025-10-03
+
+- model relationship (between each other); - frontend script cleanup; - new command: migrate commit; - small refactoring.
+
+## [0.2.2] - 2025-10-02
+
+fix bug: required params after optional in the generated models; fix: views(templates) are not stored in the registry and being regenerated (overwritten); small readme fix; running 'npm i' on 'create app' and 'npm run build' on 'generate'
+
+
+## [0.3.0] - 2025-10-03
+
+- model relationship (between each other); - frontend script cleanup; - new command: migrate commit; - small refactoring.
+
 ## [0.1.2] - 2025-09-18
 
 fix: failed to generate with empty permissions actions
 
 
 
+
+
+## [0.3.0] - 2025-10-03
+
+- model relationship (between each other); - frontend script cleanup; - new command: migrate commit; - small refactoring.
+
+## [0.2.2] - 2025-10-02
+
+fix bug: required params after optional in the generated models; fix: views(templates) are not stored in the registry and being regenerated (overwritten); small readme fix; running 'npm i' on 'create app' and 'npm run build' on 'generate'
+
+
+## [0.3.0] - 2025-10-03
+
+- model relationship (between each other); - frontend script cleanup; - new command: migrate commit; - small refactoring.
+
 ## [0.2.1] - 2025-09-18
 
 Improve generated package.json
 
+
+
+## [0.3.0] - 2025-10-03
+
+- model relationship (between each other); - frontend script cleanup; - new command: migrate commit; - small refactoring.
+
+## [0.2.2] - 2025-10-02
+
+fix bug: required params after optional in the generated models; fix: views(templates) are not stored in the registry and being regenerated (overwritten); small readme fix; running 'npm i' on 'create app' and 'npm run build' on 'generate'
+
+
+## [0.3.0] - 2025-10-03
+
+- model relationship (between each other); - frontend script cleanup; - new command: migrate commit; - small refactoring.
+
 ## [0.2.0] - 2025-09-18
 
 implement multi-model generation (controllers, services); fix service-controller interaction; update documentation: more clear & reflect important things
 
 
+
+
+## [0.3.0] - 2025-10-03
+
+- model relationship (between each other); - frontend script cleanup; - new command: migrate commit; - small refactoring.
+
+## [0.2.2] - 2025-10-02
+
+fix bug: required params after optional in the generated models; fix: views(templates) are not stored in the registry and being regenerated (overwritten); small readme fix; running 'npm i' on 'create app' and 'npm run build' on 'generate'
+
+
+## [0.3.0] - 2025-10-03
+
+- model relationship (between each other); - frontend script cleanup; - new command: migrate commit; - small refactoring.
+
 ## [0.2.1] - 2025-09-18
 
 Improve generated package.json
 
+
+
+## [0.3.0] - 2025-10-03
+
+- model relationship (between each other); - frontend script cleanup; - new command: migrate commit; - small refactoring.
+
+## [0.2.2] - 2025-10-02
+
+fix bug: required params after optional in the generated models; fix: views(templates) are not stored in the registry and being regenerated (overwritten); small readme fix; running 'npm i' on 'create app' and 'npm run build' on 'generate'
+
+
+## [0.3.0] - 2025-10-03
+
+- model relationship (between each other); - frontend script cleanup; - new command: migrate commit; - small refactoring.
+
 ## [0.1.1] - 2025-09-17
 
 Initial release

package/README.md

@@ -213,7 +213,6 @@ currentjs diff Blog
 # In your deployment pipeline
 git clone your-repo
 currentjs generate  # Recreates all source code from YAML + patches
-npm run build
 npm run deploy
 ```
 
@@ -258,6 +257,94 @@ dist/
 
 With this setup, your repository stays focused on what matters: your specifications and customizations, not generated boilerplate!
 
+## Multi-Model Endpoint Support 🔀
+
+Working with multiple related models in a single module? CurrentJS now supports flexible endpoint configurations for multi-model scenarios.
+
+### Per-Endpoint Model Override
+
+Override the model for specific endpoints when you need to mix models within the same API or routes section:
+
+```yaml
+models:
+  - name: Cat
+    fields:
+      - name: name
+        type: string
+  - name: Person
+    fields:
+      - name: name
+        type: string
+      - name: email
+        type: string
+
+routes:
+  prefix: /cat
+  model: Cat  # Default model for this section
+  endpoints:
+    - path: /create
+      action: empty
+      view: catCreate
+      # Uses Cat model (from default)
+    
+    - path: /createOwner
+      action: empty
+      view: ownerCreate
+      model: Person  # Override to use Person model for this endpoint
+```
+
+**Result**: The `/cat/createOwner` page will generate a form with Person fields (name, email), not Cat fields.
+
+### Multiple API/Routes Sections
+
+Organize endpoints by model or functionality using arrays:
+
+```yaml
+# Multiple routes sections for different models
+routes:
+  - prefix: /cat
+    model: Cat
+    endpoints:
+      - path: /
+        action: list
+        view: catList
+      - path: /create
+        action: empty
+        view: catCreate
+  
+  - prefix: /person
+    model: Person
+    endpoints:
+      - path: /
+        action: list
+        view: personList
+      - path: /create
+        action: empty
+        view: personCreate
+```
+
+**Result**: Generates separate controllers with their own base paths and endpoints.
+
+### Automatic Model Inference
+
+If you don't specify a `model`, the system will infer it from the action handler:
+
+```yaml
+routes:
+  prefix: /cat
+  endpoints:
+    - path: /createOwner
+      action: createOwner
+      view: ownerCreate
+      # No model specified - inferred from action below
+
+actions:
+  createOwner:
+    handlers: [Person:default:create]  # Infers Person model
+```
+
+**Priority**: `endpoint.model` → inferred from handler → section `model` → first model in array
+
 ## Example: Building a Blog System 📝
 
 Here's how you'd create a complete very simple blog system:
@@ -345,7 +432,6 @@ permissions: []
 ### 3. Generate everything
 ```bash
 currentjs generate
-npm run build
 npm start
 ```
 
@@ -538,6 +624,174 @@ models:
         required: false
 ```
 
+### 🔗 Model Relationships
+
+You can define relationships between models by specifying another model name as the field type. The generator will automatically handle foreign keys, type checking, and UI components.
+
+**Basic Relationship Example:**
+```yaml
+models:
+  - name: Owner
+    fields:
+      - name: name
+        type: string
+        required: true
+      - name: email
+        type: string
+        required: true
+
+  - name: Cat
+    fields:
+      - name: name
+        type: string
+        required: true
+      - name: breed
+        type: string
+        required: false
+      - name: owner
+        type: Owner        # Relationship to Owner model
+        required: true
+```
+
+**Architecture: Rich Domain Models**
+
+The generator uses **Infrastructure-Level Relationship Assembly**:
+
+- **Domain Layer**: Works with full objects (no FKs)
+- **Infrastructure (Store)**: Handles FK ↔ Object conversion
+- **DTOs**: Use FKs for API transmission
+
+**What Gets Generated:**
+
+1. **Domain Model**: Pure business objects
+   ```typescript
+   import { Owner } from './Owner';
+   
+   export class Cat {
+     constructor(
+       public id: number,
+       public name: string,
+       public breed?: string,
+       public owner: Owner  // ✨ Full object, no FK!
+     ) {}
+   }
+   ```
+
+2. **DTOs**: Use foreign keys for API
+   ```typescript
+   export interface CatDTO {
+     name: string;
+     breed?: string;
+     ownerId: number;  // ✨ FK for over-the-wire
+   }
+   ```
+
+3. **Store**: Converts FK ↔ Object
+   ```typescript
+   export class CatStore {
+     constructor(
+       private db: ISqlProvider,
+       private ownerStore: OwnerStore  // ✨ Foreign store dependency
+     ) {}
+     
+     async loadRelationships(entity: Cat, row: CatRow): Promise<Cat> {
+       const owner = await this.ownerStore.getById(row.ownerId);
+       if (owner) entity.setOwner(owner);
+       return entity;
+     }
+     
+     async insert(cat: Cat): Promise<Cat> {
+       const row = {
+         name: cat.name,
+         ownerId: cat.owner?.id  // ✨ Extract FK to save
+       };
+       // ...
+     }
+   }
+   ```
+
+4. **Service**: Loads objects from FKs
+   ```typescript
+   export class CatService {
+     constructor(
+       private catStore: CatStore,
+       private ownerStore: OwnerStore  // ✨ To load relationships
+     ) {}
+     
+     async create(catData: CatDTO): Promise<Cat> {
+       // ✨ Load full owner object from FK
+       const owner = await this.ownerStore.getById(catData.ownerId);
+       const cat = new Cat(0, catData.name, catData.breed, owner);
+       return await this.catStore.insert(cat);
+     }
+   }
+   ```
+
+5. **HTML Forms**: Select dropdown with "Create New" button
+   ```html
+   <select id="ownerId" name="ownerId" required>
+     <option value="">-- Select Owner --</option>
+     <!-- Options loaded from /api/owner -->
+   </select>
+   <button onclick="window.open('/owner/create')">+ New</button>
+   ```
+
+**Relationship Naming Convention:**
+
+The generator automatically creates foreign key fields following this convention:
+- **Field name**: `owner` → **Foreign key**: `ownerId`
+- **Field name**: `author` → **Foreign key**: `authorId`
+- **Field name**: `parentComment` → **Foreign key**: `parentCommentId`
+
+The foreign key always references the `id` field of the related model.
+
+**Optional Configuration:**
+
+```yaml
+models:
+  - name: Post
+    fields:
+      - name: title
+        type: string
+        required: true
+      - name: author
+        type: User
+        required: true
+        displayFields: [name, email]  # Fields to show in dropdowns (optional)
+```
+
+**Configuration Options:**
+- `displayFields`: Array of fields from the related model to display in UI dropdowns (optional, defaults to showing the ID)
+
+**Multiple Relationships:**
+```yaml
+models:
+  - name: Comment
+    fields:
+      - name: content
+        type: string
+        required: true
+      - name: post
+        type: Post         # Creates foreign key: postId
+        required: true
+      - name: author
+        type: User         # Creates foreign key: authorId
+        required: true
+        displayFields: [username, email]
+      - name: parentComment
+        type: Comment      # Self-referential relationship
+        required: false    # Creates foreign key: parentCommentId
+```
+
+**Relationship Best Practices:**
+- ✅ Always define the foreign model first in the same module
+- ✅ Use descriptive field names for relationships (e.g., `author` instead of `user`)
+- ✅ Set appropriate `displayFields` to show meaningful data in dropdowns
+- ✅ Use `required: false` for optional relationships
+- ✅ Foreign keys are auto-generated following the pattern `fieldName + 'Id'`
+- ❌ Don't manually add foreign key fields (they're auto-generated)
+- ❌ Don't create circular dependencies between modules
+
 ### Action Handlers Explained
 
 **🔄 Handler vs Action Distinction:**
@@ -632,12 +886,6 @@ api:
   prefix: /api/posts
   endpoints: [...]
 
-# You can create separate API configs for other models
-commentApi:
-  model: Comment                       # This API serves the Comment model
-  prefix: /api/comments
-  endpoints: [...]
-
 actions:
   createPost:
     handlers: [Post:default:create]    # Calls PostService.create()

package/dist/cli.js

@@ -8,6 +8,9 @@ const commit_1 = require("./commands/commit");
 const diff_1 = require("./commands/diff");
 const colors_1 = require("./utils/colors");
 const infer_1 = require("./commands/infer");
+const migrateCommit_1 = require("./commands/migrateCommit");
+// import { handleMigratePush } from './commands/migratePush';
+// import { handleMigrateUpdate } from './commands/migrateUpdate';
 function printHelp() {
     const title = colors_1.colors.bold(colors_1.colors.brightCyan('currentjs - Clean architecture CLI'));
     const usage = colors_1.colors.bold('Usage:');
@@ -24,6 +27,7 @@ ${usage}
   ${cmd('currentjs commit')} ${colors_1.colors.gray('[<file> ...]')} ${flag('--yaml')} ${colors_1.colors.gray('app.yaml')}
   ${cmd('currentjs diff')} ${colors_1.colors.gray('<module|*>')} ${flag('--yaml')} ${colors_1.colors.gray('app.yaml')}
   ${cmd('currentjs infer')} ${flag('--file')} ${colors_1.colors.gray('src/modules/<Module>/domain/entities/<Entity>.ts')} ${colors_1.colors.gray('[')}${flag('--write')}${colors_1.colors.gray(']')}
+  ${cmd('currentjs migrate commit')} ${flag('--yaml')} ${colors_1.colors.gray('app.yaml')}
 
 ${options}
   ${flag('--yaml')} <path>   ${colors_1.colors.gray('Path to app.yaml (default: ./app.yaml)')}
@@ -65,6 +69,9 @@ function parseArgs(argv) {
     else if (result.command === 'infer') {
         // no subcommands
     }
+    else if (result.command === 'migrate') {
+        result.sub = rest.shift();
+    }
     for (let i = 0; i < rest.length; i += 1) {
         const token = rest[i];
         if (token === '--yaml') {
@@ -127,6 +134,25 @@ async function run() {
                 (0, infer_1.handleInfer)(fileArg, write);
                 return;
             }
+            case 'migrate': {
+                if (args.sub === 'commit') {
+                    (0, migrateCommit_1.handleMigrateCommit)(args.yaml);
+                    return;
+                }
+                if (args.sub === 'push') {
+                    console.log(colors_1.colors.yellow('⚠️  Not implemented yet'));
+                    // await handleMigratePush(args.yaml);
+                    return;
+                }
+                if (args.sub === 'update') {
+                    console.log(colors_1.colors.yellow('⚠️  Not implemented yet'));
+                    // await handleMigrateUpdate(args.yaml);
+                    return;
+                }
+                printHelp();
+                process.exitCode = 1;
+                return;
+            }
             default: {
                 printHelp();
                 process.exitCode = 1;

package/dist/commands/commit.js

@@ -43,6 +43,7 @@ const validationGenerator_1 = require("../generators/validationGenerator");
 const serviceGenerator_1 = require("../generators/serviceGenerator");
 const controllerGenerator_1 = require("../generators/controllerGenerator");
 const storeGenerator_1 = require("../generators/storeGenerator");
+const templateGenerator_1 = require("../generators/templateGenerator");
 const generationRegistry_1 = require("../utils/generationRegistry");
 const commitUtils_1 = require("../utils/commitUtils");
 const colors_1 = require("../utils/colors");
@@ -88,6 +89,7 @@ function handleCommit(yamlPathArg, files) {
     const svcGen = new serviceGenerator_1.ServiceGenerator();
     const ctrlGen = new controllerGenerator_1.ControllerGenerator();
     const storeGen = new storeGenerator_1.StoreGenerator();
+    const tplGen = new templateGenerator_1.TemplateGenerator();
     const diffs = [];
     modulesList.forEach(moduleYamlRel => {
         const moduleYamlPath = path.isAbsolute(moduleYamlRel)
@@ -109,6 +111,7 @@ function handleCommit(yamlPathArg, files) {
         const nextServices = svcGen.generateFromYamlFile(moduleYamlPath);
         const nextControllers = ctrlGen.generateFromYamlFile(moduleYamlPath);
         const nextStores = storeGen.generateFromYamlFile(moduleYamlPath);
+        const nextTemplates = tplGen.generateFromYamlFile(moduleYamlPath);
         // Helper to evaluate only user-changed files and compute diff vs freshly generated code
         const consider = (target, generated) => {
             if (!fs.existsSync(target))
@@ -143,6 +146,7 @@ function handleCommit(yamlPathArg, files) {
         Object.entries(nextServices).forEach(([entity, code]) => consider(path.join(appOut, 'services', `${entity}Service.ts`), code));
         Object.entries(nextControllers).forEach(([entity, code]) => consider(path.join(infraOut, 'controllers', `${entity}Controller.ts`), code));
         Object.entries(nextStores).forEach(([entity, code]) => consider(path.join(infraOut, 'stores', `${entity}Store.ts`), code));
+        Object.entries(nextTemplates).forEach(([, { file, contents }]) => consider(file, contents));
     });
     const commitsDir = (0, generationRegistry_1.ensureCommitsDir)();
     const timestamp = new Date().toISOString().replace(/[:.]/g, '-');

package/dist/commands/createApp.js

@@ -46,11 +46,13 @@ function handleCreateApp(rawName) {
     const webDir = path.join(targetRoot, appTemplates_1.DEFAULT_DIRECTORIES.WEB);
     const templatesDir = path.join(targetRoot, appTemplates_1.DEFAULT_DIRECTORIES.TEMPLATES);
     const servicesDir = path.join(targetRoot, appTemplates_1.DEFAULT_DIRECTORIES.SERVICES);
+    const migrationsDir = path.join(targetRoot, appTemplates_1.DEFAULT_DIRECTORIES.MIGRATIONS);
     (0, cliUtils_1.ensureDir)(srcDir);
     (0, cliUtils_1.ensureDir)(distDir);
     (0, cliUtils_1.ensureDir)(webDir);
     (0, cliUtils_1.ensureDir)(templatesDir);
     (0, cliUtils_1.ensureDir)(servicesDir);
+    (0, cliUtils_1.ensureDir)(migrationsDir);
     // Files using imported templates
     (0, cliUtils_1.writeFileIfMissing)(path.join(targetRoot, appTemplates_1.DEFAULT_FILES.PACKAGE_JSON), (0, appTemplates_1.packageJsonTemplate)(path.basename(targetRoot)));
     (0, cliUtils_1.writeFileIfMissing)(path.join(targetRoot, appTemplates_1.DEFAULT_FILES.TSCONFIG), appTemplates_1.tsconfigTemplate);
@@ -61,4 +63,9 @@ function handleCreateApp(rawName) {
     (0, cliUtils_1.writeFileIfMissing)(path.join(templatesDir, appTemplates_1.DEFAULT_FILES.ERROR_TEMPLATE), appTemplates_1.errorTemplate);
     (0, cliUtils_1.writeFileIfMissing)(path.join(webDir, appTemplates_1.DEFAULT_FILES.FRONTEND_SCRIPT), appTemplates_1.frontendScriptTemplate);
     (0, cliUtils_1.writeFileIfMissing)(path.join(webDir, appTemplates_1.DEFAULT_FILES.TRANSLATIONS), appTemplates_1.translationsTemplate);
+    // Run npm install
+    (0, cliUtils_1.runCommand)('npm install', {
+        cwd: targetRoot,
+        errorMessage: '[X] Failed to install dependencies:'
+    });
 }

package/dist/commands/diff.js

@@ -43,6 +43,7 @@ const validationGenerator_1 = require("../generators/validationGenerator");
 const serviceGenerator_1 = require("../generators/serviceGenerator");
 const controllerGenerator_1 = require("../generators/controllerGenerator");
 const storeGenerator_1 = require("../generators/storeGenerator");
+const templateGenerator_1 = require("../generators/templateGenerator");
 const generationRegistry_1 = require("../utils/generationRegistry");
 const commitUtils_1 = require("../utils/commitUtils");
 const colors_1 = require("../utils/colors");
@@ -81,6 +82,7 @@ async function handleDiff(yamlPathArg, moduleName) {
     const svcGen = new serviceGenerator_1.ServiceGenerator();
     const ctrlGen = new controllerGenerator_1.ControllerGenerator();
     const storeGen = new storeGenerator_1.StoreGenerator();
+    const tplGen = new templateGenerator_1.TemplateGenerator();
     const results = [];
     for (const moduleYamlRel of filteredModules) {
         const moduleYamlPath = path.isAbsolute(moduleYamlRel)
@@ -97,6 +99,7 @@ async function handleDiff(yamlPathArg, moduleName) {
         const nextServices = svcGen.generateFromYamlFile(moduleYamlPath);
         const nextControllers = ctrlGen.generateFromYamlFile(moduleYamlPath);
         const nextStores = storeGen.generateFromYamlFile(moduleYamlPath);
+        const nextTemplates = tplGen.generateFromYamlFile(moduleYamlPath);
         const consider = (target, generated) => {
             const rel = path.relative(process.cwd(), target);
             if (!fs.existsSync(target)) {
@@ -136,6 +139,7 @@ async function handleDiff(yamlPathArg, moduleName) {
         Object.entries(nextServices).forEach(([e, code]) => consider(path.join(appOut, 'services', `${e}Service.ts`), code));
         Object.entries(nextControllers).forEach(([e, code]) => consider(path.join(infraOut, 'controllers', `${e}Controller.ts`), code));
         Object.entries(nextStores).forEach(([e, code]) => consider(path.join(infraOut, 'stores', `${e}Store.ts`), code));
+        Object.entries(nextTemplates).forEach(([, { file, contents }]) => consider(file, contents));
     }
     if (results.length === 0) {
         // eslint-disable-next-line no-console