@magek/cli 0.0.4 → 0.0.6

package/dist/commands/new/command.js

@@ -44,9 +44,12 @@ const run = async (name, rawFields) => script_js_1.Script.init(`magek ${brand_js
 function generateImports(info) {
     const commandFieldTypes = info.fields.map((f) => f.type);
     const commandUsesUUID = commandFieldTypes.some((type) => type == 'UUID');
-    const componentsFromMagekTypes = ['Register'];
+    const componentsFromMagekCommon = ['Register'];
+    if (info.fields.length > 0) {
+        componentsFromMagekCommon.unshift('Field');
+    }
     if (commandUsesUUID) {
-        componentsFromMagekTypes.push('UUID');
+        componentsFromMagekCommon.push('UUID');
     }
     return [
         {
@@ -55,7 +58,7 @@ function generateImports(info) {
         },
         {
             packagePath: '@magek/common',
-            commaSeparatedComponents: componentsFromMagekTypes.join(', '),
+            commaSeparatedComponents: componentsFromMagekCommon.join(', '),
         },
     ];
 }

package/dist/commands/new/entity.js

@@ -60,6 +60,10 @@ function generateImports(info) {
     if (info.events.length > 0) {
         coreComponents.push('Reduces');
     }
+    const commonComponents = ['UUID'];
+    if (info.fields.length > 0) {
+        commonComponents.unshift('Field');
+    }
     return [
         {
             packagePath: '@magek/core',
@@ -67,7 +71,7 @@ function generateImports(info) {
         },
         {
             packagePath: '@magek/common',
-            commaSeparatedComponents: 'UUID',
+            commaSeparatedComponents: commonComponents.join(', '),
         },
         ...eventsImports,
     ];

package/dist/commands/new/event.js

@@ -41,7 +41,11 @@ const run = async (name, rawFields) => script_js_1.Script.init(`magek ${brand_js
     .step('Creating new event', generateEvent)
     .info('Event generated!')
     .done();
-function generateImports() {
+function generateImports(info) {
+    const commonComponents = ['UUID'];
+    if (info.fields.length > 0) {
+        commonComponents.unshift('Field');
+    }
     return [
         {
             packagePath: '@magek/core',
@@ -49,7 +53,7 @@ function generateImports() {
         },
         {
             packagePath: '@magek/common',
-            commaSeparatedComponents: 'UUID',
+            commaSeparatedComponents: commonComponents.join(', '),
         },
     ];
 }
@@ -59,7 +63,7 @@ const generateEvent = (info) => (0, generator_js_1.generate)({
     placementDir: path.join('src', 'events'),
     template: (0, generator_js_1.template)('event'),
     info: {
-        imports: generateImports(),
+        imports: generateImports(info),
         ...info,
     },
 });

package/dist/commands/new/query.js

@@ -44,9 +44,12 @@ const run = async (name, rawFields) => script_js_1.Script.init(`magek ${brand_js
 function generateImports(info) {
     const queryFieldTypes = info.fields.map((f) => f.type);
     const queryUsesUUID = queryFieldTypes.some((type) => type == 'UUID');
-    const componentsFromMagekTypes = ['QueryInfo'];
+    const componentsFromMagekCommon = ['QueryInfo'];
+    if (info.fields.length > 0) {
+        componentsFromMagekCommon.unshift('Field');
+    }
     if (queryUsesUUID) {
-        componentsFromMagekTypes.push('UUID');
+        componentsFromMagekCommon.push('UUID');
     }
     return [
         {
@@ -55,7 +58,7 @@ function generateImports(info) {
         },
         {
             packagePath: '@magek/common',
-            commaSeparatedComponents: componentsFromMagekTypes.join(', '),
+            commaSeparatedComponents: componentsFromMagekCommon.join(', '),
         },
     ];
 }

package/dist/commands/new/read-model.js

@@ -61,6 +61,13 @@ function generateImports(info) {
     if (info.projections.length > 0) {
         coreComponents.push('Projects');
     }
+    const commonComponents = ['UUID'];
+    if (info.fields.length > 0) {
+        commonComponents.unshift('Field');
+    }
+    if (info.projections.length > 0) {
+        commonComponents.push('ProjectionResult');
+    }
     return [
         {
             packagePath: '@magek/core',
@@ -68,7 +75,7 @@ function generateImports(info) {
         },
         {
             packagePath: '@magek/common',
-            commaSeparatedComponents: info.projections.length > 0 ? 'UUID, ProjectionResult' : 'UUID',
+            commaSeparatedComponents: commonComponents.join(', '),
         },
         ...eventsImports,
     ];

package/dist/commands/new/type.js

@@ -41,13 +41,33 @@ const run = async (name, rawFields) => script_js_1.Script.init(`magek ${brand_js
     .step('Creating new type', generateType)
     .info('Type generated!')
     .done();
+function generateImports(info) {
+    const typeFieldTypes = info.fields.map((f) => f.type);
+    const typeUsesUUID = typeFieldTypes.some((type) => type == 'UUID');
+    const componentsFromMagekCommon = [];
+    if (info.fields.length > 0) {
+        componentsFromMagekCommon.push('Field');
+    }
+    if (typeUsesUUID) {
+        componentsFromMagekCommon.push('UUID');
+    }
+    if (componentsFromMagekCommon.length === 0) {
+        return [];
+    }
+    return [
+        {
+            packagePath: '@magek/common',
+            commaSeparatedComponents: componentsFromMagekCommon.join(', '),
+        },
+    ];
+}
 const generateType = (info) => (0, generator_js_1.generate)({
     name: info.name,
     extension: '.ts',
     placementDir: path.join('src', 'common'),
     template: (0, generator_js_1.template)('type'),
     info: {
-        imports: [],
+        imports: generateImports(info),
         ...info,
     },
 });

package/dist/templates/event.stub

@@ -4,11 +4,20 @@ import { {{commaSeparatedComponents}} } from '{{{packagePath}}}'
 
 @Event
 export class {{{ name }}} {
+  {{#fields}}
+  @Field()
+  public readonly {{{name}}}!: {{{type}}}
+
+  {{/fields}}
   public constructor(
     {{#fields}}
-    readonly {{{name}}}: {{{type}}},
+    {{{name}}}: {{{type}}},
+    {{/fields}}
+  ) {
+    {{#fields}}
+    this.{{{name}}} = {{{name}}}
     {{/fields}}
-  ) {}
+  }
 
   public entityID(): UUID {
     return /* the associated entity ID */

package/dist/templates/type.stub

@@ -1,7 +1,11 @@
+{{#imports}}
+import { {{commaSeparatedComponents}} } from '{{{packagePath}}}'
+{{/imports}}
+
 export class {{{ name }}} {
-  public constructor(
-    {{#fields}}
-    public {{{name}}}: {{{type}}},
-    {{/fields}}
-  ) {}
+  {{#fields}}
+  @Field()
+  public {{{name}}}!: {{{type}}}
+
+  {{/fields}}
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@magek/cli",
   "description": "CLI of the Magek Framework, the next level of abstraction for cloud-native applications",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "author": "Boosterin Labs SLU",
   "homepage": "https://magek.ai",
   "publishConfig": {
@@ -12,7 +12,7 @@
   },
   "bugs": "https://github.com/theam/magek/issues",
   "dependencies": {
-    "@magek/common": "^0.0.4",
+    "@magek/common": "^0.0.6",
     "@oclif/core": "4.8.0",
     "@oclif/plugin-help": "6.2.36",
     "@oclif/plugin-plugins": "5.4.54",
@@ -23,12 +23,12 @@
     "inflected": "2.1.0",
     "inquirer": "13.2.0",
     "mustache": "4.2.0",
-    "ora": "9.0.0",
+    "ora": "9.1.0",
     "ts-morph": "27.0.2",
     "tslib": "2.8.1"
   },
   "devDependencies": {
-    "@magek/eslint-config": "^0.0.4",
+    "@magek/eslint-config": "^0.0.6",
     "@oclif/test": "4.1.15",
     "@types/chai": "5.2.3",
     "@types/chai-as-promised": "8.0.2",