npm - @currentjs/gen - Versions diffs - 0.3.2 → 0.5.0 - Mend

@currentjs/gen 0.3.2 → 0.5.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (69) hide show

package/CHANGELOG.md +10 -611
package/README.md +623 -427
package/dist/cli.js +2 -1
package/dist/commands/commit.js +25 -42
package/dist/commands/createApp.js +1 -0
package/dist/commands/createModule.js +151 -45
package/dist/commands/diff.js +27 -40
package/dist/commands/generateAll.js +141 -291
package/dist/commands/migrateCommit.js +6 -18
package/dist/commands/migratePush.d.ts +1 -0
package/dist/commands/migratePush.js +135 -0
package/dist/commands/migrateUpdate.d.ts +1 -0
package/dist/commands/migrateUpdate.js +147 -0
package/dist/commands/newGenerateAll.d.ts +4 -0
package/dist/commands/newGenerateAll.js +336 -0
package/dist/generators/controllerGenerator.d.ts +43 -19
package/dist/generators/controllerGenerator.js +547 -329
package/dist/generators/domainLayerGenerator.d.ts +21 -0
package/dist/generators/domainLayerGenerator.js +276 -0
package/dist/generators/dtoGenerator.d.ts +21 -0
package/dist/generators/dtoGenerator.js +518 -0
package/dist/generators/newControllerGenerator.d.ts +55 -0
package/dist/generators/newControllerGenerator.js +644 -0
package/dist/generators/newServiceGenerator.d.ts +19 -0
package/dist/generators/newServiceGenerator.js +266 -0
package/dist/generators/newStoreGenerator.d.ts +39 -0
package/dist/generators/newStoreGenerator.js +408 -0
package/dist/generators/newTemplateGenerator.d.ts +29 -0
package/dist/generators/newTemplateGenerator.js +510 -0
package/dist/generators/serviceGenerator.d.ts +16 -51
package/dist/generators/serviceGenerator.js +167 -586
package/dist/generators/storeGenerator.d.ts +35 -32
package/dist/generators/storeGenerator.js +291 -238
package/dist/generators/storeGeneratorV2.d.ts +31 -0
package/dist/generators/storeGeneratorV2.js +190 -0
package/dist/generators/templateGenerator.d.ts +21 -21
package/dist/generators/templateGenerator.js +393 -268
package/dist/generators/templates/appTemplates.d.ts +3 -1
package/dist/generators/templates/appTemplates.js +15 -10
package/dist/generators/templates/data/appYamlTemplate +5 -2
package/dist/generators/templates/data/cursorRulesTemplate +315 -221
package/dist/generators/templates/data/frontendScriptTemplate +45 -11
package/dist/generators/templates/data/mainViewTemplate +1 -1
package/dist/generators/templates/data/systemTsTemplate +5 -0
package/dist/generators/templates/index.d.ts +0 -3
package/dist/generators/templates/index.js +0 -3
package/dist/generators/templates/newStoreTemplates.d.ts +5 -0
package/dist/generators/templates/newStoreTemplates.js +141 -0
package/dist/generators/templates/storeTemplates.d.ts +1 -5
package/dist/generators/templates/storeTemplates.js +102 -219
package/dist/generators/templates/viewTemplates.js +1 -1
package/dist/generators/useCaseGenerator.d.ts +13 -0
package/dist/generators/useCaseGenerator.js +188 -0
package/dist/types/configTypes.d.ts +148 -0
package/dist/types/configTypes.js +10 -0
package/dist/utils/childEntityUtils.d.ts +18 -0
package/dist/utils/childEntityUtils.js +78 -0
package/dist/utils/commandUtils.d.ts +43 -0
package/dist/utils/commandUtils.js +124 -0
package/dist/utils/commitUtils.d.ts +4 -1
package/dist/utils/constants.d.ts +10 -0
package/dist/utils/constants.js +13 -1
package/dist/utils/diResolver.d.ts +32 -0
package/dist/utils/diResolver.js +204 -0
package/dist/utils/new_parts_of_migrationUtils.d.ts +0 -0
package/dist/utils/new_parts_of_migrationUtils.js +164 -0
package/dist/utils/typeUtils.d.ts +19 -0
package/dist/utils/typeUtils.js +70 -0
package/package.json +7 -3

package/dist/generators/templates/data/frontendScriptTemplate CHANGED Viewed

@@ -414,7 +414,7 @@ window.AppConfig = {
    * @returns {any} Converted value
    */
   function convertFieldValue(value, fieldType) {
-    if (!value || value === '') {
+    if (value === undefined || value === null || value === '') {
       return null;
     }
@@ -422,6 +422,7 @@ window.AppConfig = {
       case 'number':
       case 'int':
       case 'integer':
+      case 'id':
         const intVal = parseInt(value, 10);
         return isNaN(intVal) ? null : intVal;
@@ -432,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':
@@ -474,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();
@@ -486,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);

package/dist/generators/templates/data/mainViewTemplate CHANGED Viewed

@@ -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 ADDED Viewed

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

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

@@ -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 CHANGED Viewed

@@ -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 ADDED Viewed

@@ -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 ADDED Viewed

@@ -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 CHANGED Viewed

@@ -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";

package/dist/generators/templates/storeTemplates.js CHANGED Viewed

@@ -1,260 +1,143 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.fileTemplates = exports.storeTemplates = void 0;
+exports.storeFileTemplate = exports.storeTemplates = void 0;
 exports.storeTemplates = {
     rowInterface: `export interface {{ENTITY_NAME}}Row {
   id: number;
 {{ROW_FIELDS}}
-  created_at: Date;
-  updated_at: Date;
-  deleted_at?: Date;
+  created_at: string;
+  updated_at: string;
+  deleted_at?: string;
 }`,
-    storeClass: `export class {{ENTITY_NAME}}Store implements StoreInterface<{{ENTITY_NAME}}, {{ENTITY_NAME}}Row> {
-  private static readonly FILTERABLE_FIELDS = [{{FILTERABLE_FIELDS_ARRAY}}];
-  private static readonly UPDATABLE_FIELDS = [{{UPDATABLE_FIELDS_ARRAY}}];
+    storeClass: `/**
+ * Data access layer for {{ENTITY_NAME}}
+ */
+@Injectable()
+export class {{ENTITY_NAME}}Store {
+  private tableName = '{{TABLE_NAME}}';
   constructor(private db: ISqlProvider) {}
-  async getById(id: number): Promise<{{ENTITY_NAME}} | null> {
-    try {
-      const query = 'SELECT * FROM {{TABLE_NAME}} WHERE id = :id AND deleted_at IS NULL';
-      const result = await this.db.query(query, { id });
-      if (!result.success || result.data.length === 0) {
-        return null;
-      }
-      return {{ENTITY_NAME}}Store.rowToModel(result.data[0] as {{ENTITY_NAME}}Row);
-    } catch (error) {
-      if (error instanceof MySQLConnectionError) {
-        throw new Error(\`Database connection error while fetching {{ENTITY_NAME}} with id \${id}: \${error.message}\`);
-      } else if (error instanceof MySQLQueryError) {
-        throw new Error(\`Query error while fetching {{ENTITY_NAME}} with id \${id}: \${error.message}\`);
-      }
-      throw error;
-    }
+  private toMySQLDatetime(date: Date): string {
+    return date.toISOString().slice(0, 19).replace('T', ' ');
   }
-  async getAll(page: number = 1, limit: number = 10): Promise<{{ENTITY_NAME}}[]> {
-    const offset = (page - 1) * limit;
-    const query = \`SELECT * FROM {{TABLE_NAME}} WHERE deleted_at IS NULL ORDER BY created_at DESC LIMIT \${limit} OFFSET \${offset}\`;
-    const result = await this.db.query(query, {});
-    if (!result.success) {
-      return [];
-    }
-    return result.data.map((row: {{ENTITY_NAME}}Row) => {{ENTITY_NAME}}Store.rowToModel(row));
+  private rowToModel(row: {{ENTITY_NAME}}Row): {{ENTITY_NAME}} {
+    return new {{ENTITY_NAME}}(
+      row.id,
+{{ROW_TO_MODEL_MAPPING}}
+    );
   }
-  async getAllByUserId(userId: number, page: number = 1, limit: number = 10): Promise<{{ENTITY_NAME}}[]> {
+  async getAll(page: number = 1, limit: number = 20): Promise<{{ENTITY_NAME}}[]> {
     const offset = (page - 1) * limit;
-    const query = \`SELECT * FROM {{TABLE_NAME}} WHERE user_id = :userId AND deleted_at IS NULL ORDER BY created_at DESC LIMIT \${limit} OFFSET \${offset}\`;
-    const result = await this.db.query(query, { userId });
-    if (!result.success) {
-      return [];
-    }
-    return result.data.map((row: {{ENTITY_NAME}}Row) => {{ENTITY_NAME}}Store.rowToModel(row));
-  }
+    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) }
+    );
-  async getBy(filters: Partial<Pick<{{ENTITY_NAME}}Row, {{FILTERABLE_FIELDS}}>>): Promise<{{ENTITY_NAME}} | null> {
-    const filterKeys = Object.keys(filters);
-    // Runtime validation against SQL injection
-    for (const key of filterKeys) {
-      if (!{{ENTITY_NAME}}Store.FILTERABLE_FIELDS.includes(key)) {
-        throw new Error(\`Invalid filter field: \${key}\`);
-      }
+    if (result.success && result.data) {
+      return result.data.map((row: {{ENTITY_NAME}}Row) => this.rowToModel(row));
     }
-    const whereConditions = filterKeys.map(key => \`\${key} = :\${key}\`);
-    if (whereConditions.length === 0) {
-      throw new Error('At least one filter condition is required');
-    }
-    const query = \`SELECT * FROM {{TABLE_NAME}} WHERE \${whereConditions.join(' AND ')} AND deleted_at IS NULL LIMIT 1\`;
-    const result = await this.db.query(query, filters);
-    if (!result.success || result.data.length === 0) {
-      return null;
-    }
-    return {{ENTITY_NAME}}Store.rowToModel(result.data[0] as {{ENTITY_NAME}}Row);
+    return [];
   }
-  async getAllBy(filters: Partial<Pick<{{ENTITY_NAME}}Row, {{FILTERABLE_FIELDS}}>>): Promise<{{ENTITY_NAME}}[]> {
-    const filterKeys = Object.keys(filters);
-    // Runtime validation against SQL injection
-    for (const key of filterKeys) {
-      if (!{{ENTITY_NAME}}Store.FILTERABLE_FIELDS.includes(key)) {
-        throw new Error(\`Invalid filter field: \${key}\`);
-      }
-    }
-    const whereConditions = filterKeys.map(key => \`\${key} = :\${key}\`);
-    if (whereConditions.length === 0) {
-      return this.getAll();
-    }
-    const query = \`SELECT * FROM {{TABLE_NAME}} WHERE \${whereConditions.join(' AND ')} AND deleted_at IS NULL ORDER BY created_at DESC\`;
-    const result = await this.db.query(query, filters);
-    if (!result.success) {
-      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 result.data.map((row: {{ENTITY_NAME}}Row) => {{ENTITY_NAME}}Store.rowToModel(row));
+    return 0;
   }
-  async insert(model: Omit<{{ENTITY_NAME}}, 'id'>): Promise<{{ENTITY_NAME}}> {
-    try {
-      const row = {{ENTITY_NAME}}Store.modelToRow(model as {{ENTITY_NAME}});
-      delete row.id; // Remove id for insert
-      row.created_at = new Date();
-      row.updated_at = new Date();
-      const fields = Object.keys(row);
-      const placeholders = fields.map(field => \`:\${field}\`).join(', ');
-      const query = \`INSERT INTO {{TABLE_NAME}} (\${fields.join(', ')}) VALUES (\${placeholders})\`;
-      const result = await this.db.query(query, row);
-      if (!result.success || !result.insertId) {
-        throw new Error('Failed to insert {{ENTITY_NAME}}: Insert operation did not return a valid ID');
-      }
-      return this.getById(Number(result.insertId));
-    } catch (error) {
-      if (error instanceof MySQLQueryError) {
-        throw new Error(\`Failed to insert {{ENTITY_NAME}}: \${error.message}\`);
-      } else if (error instanceof MySQLConnectionError) {
-        throw new Error(\`Database connection error while inserting {{ENTITY_NAME}}: \${error.message}\`);
-      }
-      throw error;
+  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 update(id: number, updates: Partial<Omit<{{ENTITY_NAME}}, 'id' | 'createdAt'>>): Promise<{{ENTITY_NAME}} | null> {
-    const existing = await this.getById(id);
-    if (!existing) {
-      return null;
-    }
-    // Extract only data properties, not methods
-    const updateData = this.extractDataProperties(updates);
-    const updateKeys = Object.keys(updateData);
-    // Runtime validation against SQL injection
-    for (const key of updateKeys) {
-      if (!{{ENTITY_NAME}}Store.UPDATABLE_FIELDS.includes(key)) {
-        throw new Error(\`Invalid update field: \${key}\`);
-      }
-    }
-    const updateFields = updateKeys.map(key => \`\${key} = :\${key}\`);
-    if (updateFields.length === 0) {
-      return existing;
+  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}}>;
     }
-    const params = { ...updateData, updated_at: new Date(), id };
-    const query = \`UPDATE {{TABLE_NAME}} SET \${updateFields.join(', ')}, updated_at = :updated_at WHERE id = :id\`;
-    await this.db.query(query, params);
-    return this.getById(id);
+    throw new Error('Failed to insert {{ENTITY_NAME}}');
   }
-  async upsert(model: Partial<{{ENTITY_NAME}}>): Promise<{{ENTITY_NAME}}> {
-    if (model.id) {
-      const existing = await this.getById(model.id);
-      if (existing) {
-        return this.update(model.id, model) as Promise<{{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}}>;
     }
-    return this.insert(model as Omit<{{ENTITY_NAME}}, 'id'>);
+    throw new Error('Failed to update {{ENTITY_NAME}}');
   }
   async softDelete(id: number): Promise<boolean> {
-    const query = 'UPDATE {{TABLE_NAME}} SET deleted_at = :deleted_at WHERE id = :id AND deleted_at IS NULL';
-    const result = await this.db.query(query, { deleted_at: new Date(), id });
-    return result.success && (result.affectedRows || 0) > 0;
-  }
+    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 }
+    );
-  async count(filters?: Partial<Pick<{{ENTITY_NAME}}Row, {{FILTERABLE_FIELDS}}>>): Promise<number> {
-    let query = 'SELECT COUNT(*) as count FROM {{TABLE_NAME}} WHERE deleted_at IS NULL';
-    let params: Record<string, any> = {};
-    if (filters && Object.keys(filters).length > 0) {
-      const whereConditions = Object.keys(filters).map(key => \`\${key} = :\${key}\`);
-      params = { ...filters };
-      query += \` AND \${whereConditions.join(' AND ')}\`;
-    }
-    const result = await this.db.query(query, params);
-    if (!result.success || result.data.length === 0) {
-      return 0;
-    }
-    return result.data[0].count;
+    return result.success;
   }
-{{CONVERSION_METHODS}}
-}`,
-    conversionMethods: `  static rowToModel(row: {{ENTITY_NAME}}Row): {{ENTITY_NAME}} {
-    return new {{ENTITY_NAME}}(
-      row.id,
-{{ROW_TO_MODEL_MAPPING}}
+  async hardDelete(id: number): Promise<boolean> {
+    const result = await this.db.query(
+      \`DELETE FROM \\\`\${this.tableName}\\\` WHERE id = :id\`,
+      { id }
     );
-  }
-  static modelToRow(model: {{ENTITY_NAME}}): Partial<{{ENTITY_NAME}}Row> {
-    return {
-      id: model.id,
-{{MODEL_TO_ROW_MAPPING}},
-      updated_at: new Date()
-    };
+    return result.success;
   }
-  private extractDataProperties(obj: any): Record<string, any> {
-    const result: Record<string, any> = {};
-    for (const [key, value] of Object.entries(obj)) {
-      // Only include properties that are not functions and are in updatable fields
-      if (typeof value !== 'function' && {{ENTITY_NAME}}Store.UPDATABLE_FIELDS.includes(key)) {
-        result[key] = value;
-      }
-    }
-    return result;
-  }`
+{{GET_BY_PARENT_ID_METHOD}}
+{{GET_RESOURCE_OWNER_METHOD}}}`
 };
-exports.fileTemplates = {
-    storeFile: `import { {{ENTITY_NAME}} } from '../../domain/entities/{{ENTITY_NAME}}';
-import { StoreInterface } from '../interfaces/StoreInterface';
-import { ProviderMysql, ISqlProvider, MySQLQueryError, MySQLConnectionError } from '@currentjs/provider-mysql';
+exports.storeFileTemplate = `import { Injectable } from '../../../../system';
+import { {{ENTITY_NAME}} } from '../../domain/entities/{{ENTITY_NAME}}';
+import type { ISqlProvider } from '@currentjs/provider-mysql';{{VALUE_OBJECT_IMPORTS}}
 {{ROW_INTERFACE}}
-{{STORE_CLASS}}`,
-    storeInterface: `export interface StoreInterface<TModel, TRow> {
-  getById(id: number): Promise<TModel | null>;
-  getAll(page?: number, limit?: number): Promise<TModel[]>;
-  getAllByUserId(userId: number, page?: number, limit?: number): Promise<TModel[]>;
-  getBy(filters: Partial<TRow>): Promise<TModel | null>;
-  getAllBy(filters: Partial<TRow>): Promise<TModel[]>;
-  insert(model: Omit<TModel, 'id'>): Promise<TModel>;
-  update(id: number, updates: Partial<Omit<TModel, 'id' | 'createdAt'>>): Promise<TModel | null>;
-  upsert(model: Partial<TModel>): Promise<TModel>;
-  softDelete(id: number): Promise<boolean>;
-  count(filters?: Partial<TRow>): Promise<number>;
-}`
-};
+{{STORE_CLASS}}
+`;

package/dist/generators/templates/viewTemplates.js CHANGED Viewed

@@ -484,7 +484,7 @@ function renderLayoutTemplate(layoutName) {
     <title>${layoutName}</title>
   </head>
   <body>
-    {{ content }}
+    {{{ content }}}
   </body>
   </html>
 `;