@currentjs/gen 0.3.1 → 0.5.0

package/dist/generators/templates/data/frontendScriptTemplate

@@ -394,8 +394,7 @@ window.AppConfig = {
         target.innerHTML = html;
         // Update browser history
         window.history.pushState({}, '', url);
-        // Re-initialize event listeners for new content
-        initializeEventListeners();
+        // No need to re-initialize - delegation handles new content automatically
       })
       .catch(error => {
         console.error('Navigation failed:', error);
@@ -415,7 +414,7 @@ window.AppConfig = {
    * @returns {any} Converted value
    */
   function convertFieldValue(value, fieldType) {
-    if (!value || value === '') {
+    if (value === undefined || value === null || value === '') {
       return null;
     }
     
@@ -423,6 +422,7 @@ window.AppConfig = {
       case 'number':
       case 'int':
       case 'integer':
+      case 'id':
         const intVal = parseInt(value, 10);
         return isNaN(intVal) ? null : intVal;
       
@@ -433,10 +433,15 @@ window.AppConfig = {
       
       case 'boolean':
       case 'bool':
-        if (value === 'true') return true;
-        if (value === 'false') return false;
+        if (value === 'true' || value === 'on' || value === '1') return true;
+        if (value === 'false' || value === 'off' || value === '0') return false;
         return Boolean(value);
+
+      case 'json':
+        try { return JSON.parse(value); } catch { return value; }
       
+      case 'datetime':
+      case 'date':
       case 'enum':
       case 'string':
       case 'text':
@@ -475,6 +480,30 @@ window.AppConfig = {
         jsonData[key] = convertedValue;
       }
     }
+
+    // Unchecked checkboxes are not included in FormData — default to false
+    for (const [fieldName, fieldType] of Object.entries(fieldTypes)) {
+      const ft = fieldType.toLowerCase();
+      if ((ft === 'boolean' || ft === 'bool') && !(fieldName in jsonData)) {
+        jsonData[fieldName] = false;
+      }
+    }
+
+    // Unflatten dot-notation keys (e.g., "amount.currency") into nested objects
+    const finalData = {};
+    for (const [key, value] of Object.entries(jsonData)) {
+      if (key.includes('.')) {
+        const parts = key.split('.');
+        let current = finalData;
+        for (let i = 0; i < parts.length - 1; i++) {
+          if (!(parts[i] in current)) current[parts[i]] = {};
+          current = current[parts[i]];
+        }
+        current[parts[parts.length - 1]] = value;
+      } else {
+        finalData[key] = value;
+      }
+    }
     
     const url = form.getAttribute('data-action') || form.action;
     const method = (form.getAttribute('data-method') || form.method || 'POST').toUpperCase();
@@ -487,16 +516,20 @@ window.AppConfig = {
         'Content-Type': 'application/json',
         'Accept': 'application/json'
       }),
-      body: JSON.stringify(jsonData)
+      body: JSON.stringify(finalData)
     })
-      .then(response => {
-        if (!response.ok) {
-          throw new Error(`HTTP ${response.status}: ${response.statusText}`);
+      .then(response =>
+        response.json()
+          .catch(() => ({}))
+          .then(body => ({ ok: response.ok, status: response.status, statusText: response.statusText, body }))
+      )
+      .then(({ ok, status, statusText, body }) => {
+        if (!ok) {
+          const message = body.message || body.error || `HTTP ${status}: ${statusText}`;
+          handleFormError({ message }, options);
+          return;
         }
-        return response.json();
-      })
-      .then(data => {
-        handleFormSuccess(data, strategy, options);
+        handleFormSuccess(body, strategy, options);
       })
       .catch(error => {
         console.error('Form submission failed:', error);
@@ -616,56 +649,52 @@ window.AppConfig = {
   // ===== INITIALIZATION =====
 
   /**
-   * Initialize event listeners for links and forms
+   * Initialize event delegation for links and forms
+   * Uses document-level listeners that work for all current and future elements
    */
   function initializeEventListeners() {
-    // Handle internal links
-    document.querySelectorAll('a[href]').forEach(link => {
+    // Only initialize once
+    if (window._appEventListenersInitialized) return;
+    window._appEventListenersInitialized = true;
+
+    // Handle all link clicks via delegation
+    document.addEventListener('click', function(event) {
+      const link = event.target.closest('a[href]');
+      if (!link) return;
+
       const href = link.getAttribute('href');
-      
+
       // Skip external links, anchors, and special protocols
-      if (!href || 
-          href.startsWith('http://') || 
-          href.startsWith('https://') || 
-          href.startsWith('mailto:') || 
-          href.startsWith('tel:') || 
+      if (!href ||
+          href.startsWith('http://') ||
+          href.startsWith('https://') ||
+          href.startsWith('mailto:') ||
+          href.startsWith('tel:') ||
           href.startsWith('#') ||
           href.startsWith('javascript:')) {
         return;
       }
-      
-      // Remove any existing event listeners and add new one
-      link.removeEventListener('click', handleLinkClick);
-      link.addEventListener('click', handleLinkClick);
-    });
-    
-    // Handle forms with strategy
-    document.querySelectorAll('form[data-strategy]').forEach(form => {
-      // Remove any existing event listeners and add new one
-      form.removeEventListener('submit', handleFormSubmit);
-      form.addEventListener('submit', handleFormSubmit);
-    });
-  }
 
-  /**
-   * Handle link click for internal navigation
-   * @param {Event} event - Click event
-   */
-  function handleLinkClick(event) {
-    event.preventDefault();
-    const href = event.currentTarget.getAttribute('href');
-    if (href) {
+      event.preventDefault();
       navigateToPage(href);
-    }
+    });
+
+    // Handle all form submissions via delegation
+    document.addEventListener('submit', function(event) {
+      const form = event.target.closest('form[data-strategy]');
+      if (!form) return;
+
+      event.preventDefault();
+      handleFormSubmit(event, form);
+    });
   }
 
   /**
    * Handle form submission
    * @param {Event} event - Submit event
    */
-  function handleFormSubmit(event) {
-    event.preventDefault();
-    const form = event.target;
+  function handleFormSubmit(event, form) {
+    //const form = event.target.closest ? event.target.closest('form') : event.target;
     
     // Check for confirmation message
     const confirmMessage = form.getAttribute('data-confirm-message');

package/dist/generators/templates/data/mainViewTemplate

@@ -10,7 +10,7 @@
 </head>
 <body>
   <div class="container-fluid">
-    <div id="main">{{ content }}</div>
+    <div id="main">{{{ content }}}</div>
   </div>
 </body>
 </html>

package/dist/generators/templates/data/systemTsTemplate

@@ -0,0 +1,5 @@
+export function Injectable() {
+  return function (target: any) {
+    target.__injectable = true;
+  };
+}

package/dist/generators/templates/index.d.ts

@@ -1,5 +1,2 @@
-export * from './serviceTemplates';
-export * from './controllerTemplates';
 export * from './storeTemplates';
-export * from './validationTemplates';
 export * from './appTemplates';

package/dist/generators/templates/index.js

@@ -14,8 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./serviceTemplates"), exports);
-__exportStar(require("./controllerTemplates"), exports);
 __exportStar(require("./storeTemplates"), exports);
-__exportStar(require("./validationTemplates"), exports);
 __exportStar(require("./appTemplates"), exports);

package/dist/generators/templates/newStoreTemplates.d.ts

@@ -0,0 +1,5 @@
+export declare const newStoreTemplates: {
+    rowInterface: string;
+    storeClass: string;
+};
+export declare const newStoreFileTemplate = "import { {{ENTITY_NAME}} } from '../../domain/entities/{{ENTITY_NAME}}';\nimport type { ISqlProvider } from '@currentjs/provider-mysql';{{VALUE_OBJECT_IMPORTS}}\n\n{{ROW_INTERFACE}}\n\n{{STORE_CLASS}}\n";

package/dist/generators/templates/newStoreTemplates.js

@@ -0,0 +1,141 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.newStoreFileTemplate = exports.newStoreTemplates = void 0;
+exports.newStoreTemplates = {
+    rowInterface: `export interface {{ENTITY_NAME}}Row {
+  id: number;
+{{ROW_FIELDS}}
+  created_at: string;
+  updated_at: string;
+  deleted_at?: string;
+}`,
+    storeClass: `/**
+ * Data access layer for {{ENTITY_NAME}}
+ */
+export class {{ENTITY_NAME}}Store {
+  private tableName = '{{TABLE_NAME}}';
+
+  constructor(private db: ISqlProvider) {}
+
+  private toMySQLDatetime(date: Date): string {
+    return date.toISOString().slice(0, 19).replace('T', ' ');
+  }
+
+  private rowToModel(row: {{ENTITY_NAME}}Row): {{ENTITY_NAME}} {
+    return new {{ENTITY_NAME}}(
+      row.id,
+{{ROW_TO_MODEL_MAPPING}}
+    );
+  }
+
+  async getAll(page: number = 1, limit: number = 20): Promise<{{ENTITY_NAME}}[]> {
+    const offset = (page - 1) * limit;
+    const result = await this.db.query(
+      \`SELECT {{FIELD_NAMES}} FROM \\\`\${this.tableName}\\\` WHERE deleted_at IS NULL LIMIT :limit OFFSET :offset\`,
+      { limit: String(limit), offset: String(offset) }
+    );
+
+    if (result.success && result.data) {
+      return result.data.map((row: {{ENTITY_NAME}}Row) => this.rowToModel(row));
+    }
+    return [];
+  }
+
+  async count(): Promise<number> {
+    const result = await this.db.query(
+      \`SELECT COUNT(*) as count FROM \\\`\${this.tableName}\\\` WHERE deleted_at IS NULL\`,
+      {}
+    );
+
+    if (result.success && result.data && result.data.length > 0) {
+      return parseInt(result.data[0].count, 10);
+    }
+    return 0;
+  }
+
+  async getById(id: number): Promise<{{ENTITY_NAME}} | null> {
+    const result = await this.db.query(
+      \`SELECT {{FIELD_NAMES}} FROM \\\`\${this.tableName}\\\` WHERE id = :id AND deleted_at IS NULL\`,
+      { id }
+    );
+
+    if (result.success && result.data && result.data.length > 0) {
+      return this.rowToModel(result.data[0] as {{ENTITY_NAME}}Row);
+    }
+    return null;
+  }
+
+  async insert(entity: {{ENTITY_NAME}}): Promise<{{ENTITY_NAME}}> {
+    const now = new Date();
+    const data: Partial<{{ENTITY_NAME}}Row> = {
+{{INSERT_DATA_MAPPING}},
+      created_at: this.toMySQLDatetime(now),
+      updated_at: this.toMySQLDatetime(now)
+    };
+
+    const fieldsList = Object.keys(data).map(f => \`\\\`\${f}\\\`\`).join(', ');
+    const placeholders = Object.keys(data).map(f => \`:\${f}\`).join(', ');
+
+    const result = await this.db.query(
+      \`INSERT INTO \\\`\${this.tableName}\\\` (\${fieldsList}) VALUES (\${placeholders})\`,
+      data
+    );
+
+    if (result.success && result.insertId) {
+      const newId = typeof result.insertId === 'string' ? parseInt(result.insertId, 10) : result.insertId;
+      return this.getById(newId) as Promise<{{ENTITY_NAME}}>;
+    }
+
+    throw new Error('Failed to insert {{ENTITY_NAME}}');
+  }
+
+  async update(id: number, entity: {{ENTITY_NAME}}): Promise<{{ENTITY_NAME}}> {
+    const now = new Date();
+    const data: Partial<{{ENTITY_NAME}}Row> & { id: number } = {
+{{UPDATE_DATA_MAPPING}},
+      updated_at: this.toMySQLDatetime(now),
+      id
+    };
+
+    const updateFields = {{UPDATE_FIELDS_ARRAY}}.map(f => \`\\\`\${f}\\\` = :\${f}\`).join(', ');
+
+    const result = await this.db.query(
+      \`UPDATE \\\`\${this.tableName}\\\` SET \${updateFields}, updated_at = :updated_at WHERE id = :id\`,
+      data
+    );
+
+    if (result.success) {
+      return this.getById(id) as Promise<{{ENTITY_NAME}}>;
+    }
+
+    throw new Error('Failed to update {{ENTITY_NAME}}');
+  }
+
+  async softDelete(id: number): Promise<boolean> {
+    const now = new Date();
+    const result = await this.db.query(
+      \`UPDATE \\\`\${this.tableName}\\\` SET deleted_at = :deleted_at WHERE id = :id\`,
+      { deleted_at: this.toMySQLDatetime(now), id }
+    );
+
+    return result.success;
+  }
+
+  async hardDelete(id: number): Promise<boolean> {
+    const result = await this.db.query(
+      \`DELETE FROM \\\`\${this.tableName}\\\` WHERE id = :id\`,
+      { id }
+    );
+
+    return result.success;
+  }
+{{GET_BY_PARENT_ID_METHOD}}
+{{GET_RESOURCE_OWNER_METHOD}}}`
+};
+exports.newStoreFileTemplate = `import { {{ENTITY_NAME}} } from '../../domain/entities/{{ENTITY_NAME}}';
+import type { ISqlProvider } from '@currentjs/provider-mysql';{{VALUE_OBJECT_IMPORTS}}
+
+{{ROW_INTERFACE}}
+
+{{STORE_CLASS}}
+`;

package/dist/generators/templates/storeTemplates.d.ts

@@ -1,9 +1,5 @@
 export declare const storeTemplates: {
     rowInterface: string;
     storeClass: string;
-    conversionMethods: string;
-};
-export declare const fileTemplates: {
-    storeFile: string;
-    storeInterface: string;
 };
+export declare const storeFileTemplate = "import { Injectable } from '../../../../system';\nimport { {{ENTITY_NAME}} } from '../../domain/entities/{{ENTITY_NAME}}';\nimport type { ISqlProvider } from '@currentjs/provider-mysql';{{VALUE_OBJECT_IMPORTS}}\n\n{{ROW_INTERFACE}}\n\n{{STORE_CLASS}}\n";