Schema for Subobject

lenneTech · Jan 16, 2024 · f9c7ed0 · f9c7ed0
1 parent f08f6c1
commit f9c7ed0
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 16 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@lenne.tech/cli",
-  "version": "0.0.99",
+  "version": "0.0.100",
   "description": "lenne.Tech CLI: lt",
   "keywords": [
     "lenne.Tech",

diff --git a/src/commands/server/module.ts b/src/commands/server/module.ts
@@ -64,6 +64,7 @@ const NewCommand: GluegunCommand = {
     const props: Record<string, ServerProps> = {};
     const setProps = true;
     let refsSet = false;
+    let schemaSet = false;
     while (setProps) {
       const name = (
         await ask({
@@ -92,14 +93,18 @@ const NewCommand: GluegunCommand = {
         type = 'JSON';
       }
 
-      if (type === 'Use own')
+      let schema: string;
+      if (type === 'Subobject') {
         type = (
           await ask({
             type: 'input',
             name: 'input',
-            message: `Enter property type (e.g. MyClass or MyClass[])`,
+            message: `Enter property type (e.g. MyClass)`,
           })
         ).input;
+        schema = type;
+        schemaSet = true;
+      }
 
       let reference: string;
       let enumRef: string;
@@ -135,7 +140,7 @@ const NewCommand: GluegunCommand = {
 
       const nullable = await confirm(`Nullable?`, true);
 
-      props[name] = { name, nullable, isArray, type, reference, enumRef };
+      props[name] = { name, nullable, isArray, type, reference, enumRef, schema };
     }
 
     const generateSpinner = spin('Generate files');
@@ -239,8 +244,8 @@ const NewCommand: GluegunCommand = {
     info(``);
 
     // We're done, so show what to do next
-    if (refsSet) {
-      success(`HINT: References have been added, so it is necessary to add the corresponding imports!`);
+    if (refsSet || schemaSet) {
+      success(`HINT: References / Schemata have been added, so it is necessary to add the corresponding imports!`);
     }
 
     if (!toolbox.parameters.options.fromGluegunMenu) {

diff --git a/src/commands/server/object.ts b/src/commands/server/object.ts
@@ -63,6 +63,7 @@ const NewCommand: GluegunCommand = {
     const props: Record<string, ServerProps> = {};
     const setProps = true;
     let refsSet = false;
+    let schemaSet = false;
     while (setProps) {
       const name = (
         await ask({
@@ -91,14 +92,20 @@ const NewCommand: GluegunCommand = {
         type = 'JSON';
       }
 
-      if (type === 'Use own')
+      let schema: string;
+      if (type === 'Subobject')
+      {
         type = (
           await ask({
             type: 'input',
             name: 'input',
-            message: `Enter property type (e.g. MyClass or MyClass[])`,
+            message: `Enter property type (e.g. MyClass)`,
           })
         ).input;
+        schema = type;
+        schemaSet = true;
+      }
+
 
       let reference: string;
       let enumRef: string;
@@ -134,7 +141,7 @@ const NewCommand: GluegunCommand = {
 
       const nullable = await confirm(`Nullable?`, true);
 
-      props[name] = { name, nullable, isArray, type, reference, enumRef };
+      props[name] = { name, nullable, isArray, type, reference, enumRef, schema };
     }
 
     const generateSpinner = spin('Generate files');
@@ -173,18 +180,18 @@ const NewCommand: GluegunCommand = {
     generateSpinner.succeed('Files generated');
 
     // Linting
-    if (await confirm('Run lint?', true)) {
-      await system.run('npm run lint');
-    }
+    // if (await confirm('Run lint?', true)) {
+    //   await system.run('npm run lint');
+    // }
 
     // We're done, so show what to do next
     info(``);
     success(`Generated ${namePascal}Object in ${helper.msToMinutesAndSeconds(timer())}m.`);
     info(``);
 
     // We're done, so show what to do next
-    if (refsSet) {
-      success(`HINT: References have been added, so it is necessary to add the corresponding imports!`);
+    if (refsSet || schemaSet) {
+      success(`HINT: References / Schemata have been added, so it is necessary to add the corresponding imports!`);
     }
 
     if (!toolbox.parameters.options.fromGluegunMenu) {

diff --git a/src/extensions/server.ts b/src/extensions/server.ts
@@ -153,6 +153,7 @@ export class Server {
     for (const [name, item] of Object.entries<ServerProps>(props)) {
       const propName = this.camelCase(name);
       const reference = item.reference?.trim() ? this.pascalCase(item.reference.trim()) : '';
+      const schema = item.schema?.trim() ? this.pascalCase(item.schema.trim()) : '';
       const enumRef = item.enumRef?.trim() ? this.pascalCase(item.enumRef.trim()) : '';
       const modelFieldType = enumRef
         ? 'String'
@@ -183,6 +184,8 @@ export class Server {
   @Prop(${
     reference
       ? (isArray ? '[' : '') + `{ ref: '${reference}', type: Schema.Types.ObjectId }` + (isArray ? ']' : '')
+      : schema
+      ? (isArray ? '[' : '') + `{ type: ${schema}Schema }` + (isArray ? ']' : '')
       : enumRef
       ? (isArray ? '[' : '') + `{ enum: ${item.nullable ? `Object.values(${enumRef}).concat([null])` : enumRef}, type: String }` + (isArray ? ']' : '')
       : type === 'Json'

diff --git a/src/interfaces/ServerProps.interface.ts b/src/interfaces/ServerProps.interface.ts
@@ -7,5 +7,6 @@ export interface ServerProps {
   nullable: boolean;
   reference: string;
   enumRef: string;
+  schema: string;
   type: string;
 }