@gnar-engine/cli 1.0.8 → 1.0.10

package/bootstrap/services/control/src/config.js

@@ -7,8 +7,9 @@ export const config = {
     serviceName: 'controlService',
 
     // environment
-    environment: process.env.CONTROL_NODE_ENV || 'dev',
+    environment: process.env.CONTROL_NODE_ENV || 'development',
     runTests: process.env.CONTROL_RUN_TESTS || false,
+    resetDatabase: process.env.CONTROL_RESET_DATABASE || false,
 
     // microservice | modular-monolith
     architecture: process.env.GLOBAL_ARCHITECTURE || 'microservice',

package/bootstrap/services/page/src/config.js

@@ -5,6 +5,11 @@ export const config = {
     // service name
     serviceName: 'pageService',
 
+    // environment
+    environment: process.env.PAGE_NODE_ENV || 'developnent',
+    runTests: process.env.PAGE_RUN_TESTS || false,
+    resetDatabase: process.env.PAGE_RESET_DATABASE || false,
+
     // microservice | modular-monolith
     architecture: process.env.GLOBAL_ARCHITECTURE || 'microservice',
 

package/bootstrap/services/user/src/config.js

@@ -9,6 +9,7 @@ export const config = {
     // environment
     environment: process.env.USER_NODE_ENV || 'dev',
     runTests: process.env.USER_RUN_TESTS || false,
+    resetDatabase: process.env.USER_RESET_DATABASE || false,
 
     // microservice | modular-monolith
     architecture: process.env.GLOBAL_ARCHITECTURE || 'microservice',

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@gnar-engine/cli",
-    "version": "1.0.8",
+    "version": "1.0.10",
     "description": "Gnar Engine Development Framework CLI: Project bootstrap, scaffolder & control plane.",
     "type": "module",
     "bin": {

package/src/dev/commands.js

@@ -15,7 +15,7 @@ export function registerDevCommands(program) {
         .option('-a, --attach-all', 'Attach all services including database and message queues for debugging')
         .option('-t --test', 'Run all tests with ephemeral databases *NOT IMPLEMENTED')
         .option('--test-service <service>', 'Run the tests for the specified service with ephemeral databases (e.g. --test-service user)')
-        .option('-reset-databases, --reset-databases', 'Drop all service databases, re-running all migrations and seeders *NOT IMPLEMENTED')
+        .option('--reset-databases, --reset-databases', 'Drop all service databases, re-running all migrations and seeders *NOT IMPLEMENTED')
         .option('--reset-database <service>', 'Drop the specified service database, re-running all migrations and seeders (e.g. --reset-database user)')
         .addOption(new Option('--core-dev').hideHelp())
         .addOption(new Option('--bootstrap-dev').hideHelp())

package/src/dev/dev.service.js

@@ -430,6 +430,13 @@ async function buildAndUpContainers({
             serviceVolumes.push(`${gnarEngineCliConfig.coreDevPath}:${gnarEngineCliConfig.corePath}`);
         }
 
+        if (svc.extra_binds) {
+            svc.extra_binds.forEach((bind, index) => {
+                bind = `${gnarHiddenDir}/data/${svc.name}-data/bind-${index}/:${bind}`;
+                serviceVolumes.push(bind);
+            })
+        }
+
         // split from "port:port" to { port: port }
         const ports = {};
         for (const portMapping of svc.ports || []) {

package/templates/entity/src/services/mysql.{{entityName}}.service.js.hbs

@@ -1,23 +1,93 @@
-import { db } from '@gnar-engine/core';
+import { db, utils } from '@gnar-engine/core';
 
 export const {{entityName}} = {
     async getById({ id }) {
         const [result] = await db.query('SELECT * FROM {{lowerCasePlural entityName}} WHERE id = ?', [id]);
-        return result || null;
+
+        if (!result) {
+            return null;
+        }
+
+        return db.sql.helpers.objectToCamelCase(result);
     },
 
-    async getAll() {
-        return await db.query('SELECT * FROM {{lowerCasePlural entityName}}');
+    async getAll({ pageSize = 100, pageNum = 1 }) {
+        pageSize = Number(pageSize);
+        pageNum  = Number(pageNum);
+        const offset = (pageNum - 1) * pageSize;
+
+        const [rows] = await db.query(
+            'SELECT * FROM {{lowerCasePlural entityName}} LIMIT ? OFFSET ?',
+            [pageSize, offset]
+        );
+
+        const [[{ total }]] = await db.query(
+            'SELECT COUNT(*) AS total FROM {{lowerCasePlural entityName}}'
+        );
+
+        return {
+            data: rows.map(row => db.sql.helpers.objectToCamelCase(row)),
+            pagination: {
+                pageSize,
+                pageNum,
+                total
+            }
+        }
     },
 
     async create(data) {
-        const { insertId } = await db.query('INSERT INTO {{lowerCasePlural entityName}} (created_at, updated_at) VALUES (CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)');
-        return await this.getById({ id: insertId });
+        const id = utils.uuid();
+
+        // map columns and insert
+        const columns = ['id', ...Object.keys(data).map(db.sql.helpers.toSnake)];
+        const placeholders = columns.map(() => '?');
+        const values = [id, ...Object.values(data)];
+
+        const sql = `
+            INSERT INTO {{lowerCasePlural entityName}} (
+                ${columns.join(', ')},
+                created_at,
+                updated_at
+            )
+            VALUES (
+                ${placeholders.join(', ')},
+                CURRENT_TIMESTAMP,
+                CURRENT_TIMESTAMP
+            )
+        `;
+        await db.query(sql, [...values, id]);
+
+        // return result
+        const newItem = await this.getById({ id });
+        return db.sql.helpers.objectToCamelCase(newItem);
     },
 
-    async update({ id, ...data }) {
-        await db.query('UPDATE {{lowerCasePlural entityName}} SET updated_at = CURRENT_TIMESTAMP WHERE id = ?', [id]);
-        return await this.getById({ id });
+    async update({ id, updatedData }) {
+        if (!Object.keys(updatedData).length) {
+            return this.getById({ id });
+        }
+
+        // Handle many to many relations
+        const newOwnerIds = updatedData.ownerIds ? updatedData.ownerIds : null;
+        delete updatedData.ownerIds;
+
+        // map columns and update
+        const columns = Object.keys(updatedData).map((key) => db.sql.helpers.toSnake(key));
+        const assignments = columns.map(col => `${col} = ?`);
+        const values = Object.values(updatedData);
+
+        const sql = `
+            UPDATE {{lowerCasePlural entityName}}
+            SET
+                ${assignments.join(', ')},
+                updated_at = CURRENT_TIMESTAMP
+            WHERE id = ?
+        `;
+        await db.query(sql, [...values, id]);
+
+        // return result
+        const newItem = await this.getById({ id });
+        return db.sql.helpers.objectToCamelCase(newItem);
     },
 
     async delete({ id }) {

package/templates/service/src/app.js.hbs

@@ -8,13 +8,9 @@ import { httpController as {{lowerCase serviceName}}PlatformHttpController } fro
  */
 export const initService = async () => {
 
-	// Run migrations
-    if (config.db.type == 'mysql') {
-	    db.migrations.runMigrations({config});
-    }
-
-    // Run seeders
-	db.seeders.runSeeders({config});
+	// Run migrations & seeders
+	await db.migrations.runMigrations({config});
+	await db.seeders.runSeeders({config});
 
 	// Import command handlers after the command bus is initialised
 	await import('./commands/{{lowerCase serviceName}}.handler.js');

package/templates/service/src/mongodb.config.js.hbs

@@ -5,6 +5,11 @@ export const config = {
     // service name
     serviceName: '{{serviceName}}Service',
 
+    // environment
+    environment: process.env.{{upperCase serviceName}}_NODE_ENV || 'development',
+    runTests: process.env.{{upperCase serviceName}}_RUN_TESTS || false,
+    resetDatabase: process.env.{{upperCase serviceName}}_RESET_DATABASE || false,
+
     // microservice | modular-monolith
     architecture: process.env.GLOBAL_ARCHITECTURE || 'microservice',
 

package/templates/service/src/mysql.config.js.hbs

@@ -6,8 +6,9 @@ export const config = {
     serviceName: '{{serviceName}}Service',
 
     // environment
-    environment: process.env.{{upperCase serviceName}}_NODE_ENV || 'dev',
+    environment: process.env.{{upperCase serviceName}}_NODE_ENV || 'development',
     runTests: process.env.{{upperCase serviceName}}_RUN_TESTS || false,
+    resetDatabase: process.env.{{upperCase serviceName}}_RESET_DATABASE || false,
 
     // microservice | modular-monolith
     architecture: process.env.GLOBAL_ARCHITECTURE || 'microservice',

package/templates/service/src/services/mysql.{{serviceName}}.service.js.hbs

@@ -1,28 +1,93 @@
-import { db } from '@gnar-engine/core';
+import { db, utils } from '@gnar-engine/core';
 
 export const {{serviceName}} = {
     async getById({ id }) {
         const [result] = await db.query('SELECT * FROM {{lowerCasePlural serviceName}} WHERE id = ?', [id]);
-        return result || null;
-    },
 
-    async getByEmail({ email }) {
-        // Placeholder: implement if your service uses email
-        return null;
+        if (!result) {
+            return null;
+        }
+
+        return db.sql.helpers.objectToCamelCase(result);
     },
 
-    async getAll() {
-        return await db.query('SELECT * FROM {{lowerCasePlural serviceName}}');
+    async getAll({ pageSize = 100, pageNum = 1 }) {
+        pageSize = Number(pageSize);
+        pageNum  = Number(pageNum);
+        const offset = (pageNum - 1) * pageSize;
+
+        const [rows] = await db.query(
+            'SELECT * FROM {{lowerCasePlural serviceName}} LIMIT ? OFFSET ?',
+            [pageSize, offset]
+        );
+
+        const [[{ total }]] = await db.query(
+            'SELECT COUNT(*) AS total FROM {{lowerCasePlural serviceName}}'
+        );
+
+        return {
+            data: rows.map(row => db.sql.helpers.objectToCamelCase(row)),
+            pagination: {
+                pageSize,
+                pageNum,
+                total
+            }
+        }
     },
 
     async create(data) {
-        const { insertId } = await db.query('INSERT INTO {{lowerCasePlural serviceName}} (created_at, updated_at) VALUES (CURRENT_TIMESTAMP, CURRENT_TIMESTAMP)');
-        return await this.getById({ id: insertId });
+        const id = utils.uuid();
+
+        // map columns and insert
+        const columns = ['id', ...Object.keys(data).map(db.sql.helpers.toSnake)];
+        const placeholders = columns.map(() => '?');
+        const values = [id, ...Object.values(data)];
+
+        const sql = `
+            INSERT INTO {{lowerCasePlural serviceName}} (
+                ${columns.join(', ')},
+                created_at,
+                updated_at
+            )
+            VALUES (
+                ${placeholders.join(', ')},
+                CURRENT_TIMESTAMP,
+                CURRENT_TIMESTAMP
+            )
+        `;
+        await db.query(sql, [...values, id]);
+
+        // return result
+        const newItem = await this.getById({ id });
+        return db.sql.helpers.objectToCamelCase(newItem);
     },
 
-    async update({ id, ...data }) {
-        await db.query('UPDATE {{lowerCasePlural serviceName}} SET updated_at = CURRENT_TIMESTAMP WHERE id = ?', [id]);
-        return await this.getById({ id });
+    async update({ id, updatedData }) {
+        if (!Object.keys(updatedData).length) {
+            return this.getById({ id });
+        }
+
+        // Handle many to many relations
+        const newOwnerIds = updatedData.ownerIds ? updatedData.ownerIds : null;
+        delete updatedData.ownerIds;
+
+        // map columns and update
+        const columns = Object.keys(updatedData).map((key) => db.sql.helpers.toSnake(key));
+        const assignments = columns.map(col => `${col} = ?`);
+        const values = Object.values(updatedData);
+
+        const sql = `
+            UPDATE {{lowerCasePlural serviceName}}
+            SET
+                ${assignments.join(', ')},
+                updated_at = CURRENT_TIMESTAMP
+            WHERE id = ?
+        `;
+        await db.query(sql, [...values, id]);
+
+        // return result
+        const newItem = await this.getById({ id });
+        return db.sql.helpers.objectToCamelCase(newItem);
     },
 
     async delete({ id }) {