@simitgroup/simpleapp-generator 1.0.22 → 1.0.24

package/src/generate.ts

@@ -72,7 +72,7 @@ const generate = (
   frontendfolder:string
 ) => {
   const targetfolder = `${backendfolder}/src/docs/${doctype}`;
-  const frontendpagefolder=`${frontendfolder}/pages`
+  const frontendpagefolder=`${frontendfolder}/pages/[xorg]`
   try {
     
     mkdirSync(targetfolder,{ recursive: true });    
@@ -106,7 +106,8 @@ const generate = (
       bothEndCode: '',
       frontEndCode: '',
       backEndCode: '',
-      controllerCode:''
+      controllerCode:'',
+      apiSchemaCode:'',
     };
 
     // console.log('generate 2', JSON.stringify(variables));
@@ -126,21 +127,33 @@ const generate = (
     writeFileSync(`${targetfolder}/${doctype}.jsonschema.ts`, txtJsonSchema);
 
     // generate before save source code, wont override after regenerate
-    const customizefilename = `${targetfolder}/${doctype}.beforesave.ts`;
-    if (!existsSync(customizefilename)) {
-      const txtBeforeSave = eta.render('./beforesave', variables);
-      writeFileSync(
-        `${targetfolder}/${doctype}.beforesave.ts`,
-        txtBeforeSave,
-      );
-    }
+    // const customizefilename = `${targetfolder}/${doctype}.beforesave.ts`;
+    // if (!existsSync(customizefilename)) {
+    //   const txtBeforeSave = eta.render('./beforesave', variables);
+    //   writeFileSync(
+    //     `${targetfolder}/${doctype}.beforesave.ts`,
+    //     txtBeforeSave,
+    //   );
+    // }
     // write mongoose model file
     const txtModel = eta.render('./model', variables);
     writeFileSync(`${targetfolder}/${doctype}.model.ts`, txtModel);
 
     // prepare openapi schema
+    const apischemafile=`${targetfolder}/${doctype}.apischema.ts`
+    if (existsSync(apischemafile)) {
+      const apischemaCode = readFileSync(apischemafile).toString();
+      const regexapischema =
+      /\/\/<begin-apischema-code>([\s\S]*?)\/\/<end-apischema-code>/g;
+      const apischemaresult = apischemaCode.match(regexapischema);
+      if (apischemaresult) {
+        variables.apiSchemaCode = apischemaresult[0];
+      }else{
+        variables.apiSchemaCode="//<begin-apischema-code>\n//<end-apischema-code>";
+      }
+    }
     const txtApiSchema = eta.render('./apischema', variables);
-    writeFileSync(`${targetfolder}/${doctype}.apischema.ts`, txtApiSchema);
+    writeFileSync(apischemafile, txtApiSchema);
 
     // prepare backend classes
     // prepare frontend api client
@@ -158,17 +171,22 @@ const generate = (
         /\/\/<begin-backend-code>([\s\S]*?)\/\/<end-backend-code>/g;
       const bothendresult = servicecodes.match(regex1);
       const backendresult = servicecodes.match(regex2);
+      console.log("bothendresult",bothendresult)
+      console.log("backendresult",backendresult)
       if (bothendresult) {
-        bothEndCode = bothendresult[0];
+        variables.bothEndCode = bothendresult[0];
+      }else{
+        variables.bothEndCode="//<begin-bothend-code>\n//<end-bothend-code>";
       }
 
       if (backendresult) {
-        backEndCode = backendresult[0];
+        variables.backEndCode = backendresult[0];
+      }else{
+        variables.backEndCode="//<begin-backend-code>\n//<end-backend-code>";
       }
     }
 
-    variables.bothEndCode = bothEndCode ?? "//<begin-bothend-code>\n//<end-bothend-code>";
-    variables.backEndCode = backEndCode ?? "//<begin-backend-code>\n//<end-backend-code>";
+ 
     const txtService = eta.render('./service', variables);
     writeFileSync(`${targetfolder}/${doctype}.service.ts`, txtService);
 
@@ -193,8 +211,8 @@ const generate = (
     writeFileSync(`${targetfolder}/${doctype}.module.ts`, txtModule);
 
     // prepare readme
-    const txtReadme = eta.render('./readme', variables);
-    writeFileSync(`${targetfolder}/README.md`, txtReadme);
+    // const txtReadme = eta.render('./readme', variables);
+    // writeFileSync(`${targetfolder}/README.md`, txtReadme);
 
     const frontendfile = `${frontendfolder}/simpleapp/simpleappdocs/${variables.typename}Doc.ts`;
     let frontEndCode = '';
@@ -249,12 +267,10 @@ const prepareEnvironments = (backendfolder:string,frontendfolder:string)=>{
     //do nothing
   }
   
-  //copy over backend service class
-  
   copyFileSync(`${constants.templatedir}/nest/SimpleAppService.eta`,`${targetfolder}/SimpleAppService.ts`)
-  
-  //copy over backend controller
   copyFileSync(`${constants.templatedir}/nest/SimpleAppController.eta`,`${targetfolder}/SimpleAppController.ts`)
+  copyFileSync(`${constants.templatedir}/nest/TenantMiddleware.eta`,`${targetfolder}/TenantMiddleware.ts`)
+  copyFileSync(`${constants.templatedir}/nest/User.eta`,`${targetfolder}/User.ts`)
 
   //copy over frontend apiabstract class
   // copyFileSync(`${constants.templatedir}/nuxt.apigateway.eta`,`${targetfrontendfolder}/[...].ts`)

package/src/index.ts

@@ -27,7 +27,8 @@ program
 
 let path=''
 const options = program.opts();
-console.log(figlet.textSync(`SimpleApp Generator ${version}`));
+console.log(figlet.textSync(`SimpleApp Generator`));
+console.log(figlet.textSync(`${version}`));
 if(!options.configFile){
     log.error("Config file parameter is required. Example: simpleapp-generator -c ./config.json")
     throw "Undefine configuration file"

package/src/processors/jsonschemabuilder.ts

@@ -17,8 +17,8 @@ import {
 } from '../type';
 import { json } from 'stream/consumers';
 const log: Logger<ILogObj> = new Logger();
-const FIELD_AUTOCOMPLETE_CODE='field-autocomplete-code'
-const FIELD_AUTOCOMPLETE_NAME='field-autocomplete-name'
+const X_DOCUMENT_NO='x-document-no'
+const X_DOCUMENT_NAME='x-document-name'
 const FOREIGNKEY_PROPERTY='x-foreignkey'
 let allmodels: ChildModels = {};
 let fullschema={}
@@ -53,11 +53,11 @@ export const readJsonSchemaBuilder = async (
     throw(`unsupport array type for ${docname}.${doctype}`)
   }
   if(fieldAutoCompleteCode=='') {
-    log.error(`you shall define 1 field with format:'${FIELD_AUTOCOMPLETE_CODE}'`)
+    log.error(`you shall define 1 field with format:'${X_DOCUMENT_NO}'`)
     throw "missing field format"
   }
   if(fieldAutoCompleteName=='') {
-    log.error(`you shall define 1 field with format: '${FIELD_AUTOCOMPLETE_NAME}'}`)
+    log.error(`you shall define 1 field with format: '${X_DOCUMENT_NAME}'}`)
     throw "missing field format"
   }
   
@@ -75,9 +75,9 @@ const processObject =  (doctype: string,
     //ensure some field exists, also override it
     jsondata.properties['_id'] = {type: 'string',description: 'Control value, dont edit it',};
     jsondata.properties['doctype'] = {type: 'string', default:doctype, examples: [doctype],description: 'Control value, dont edit it',};
-    jsondata.properties['tenant_id'] = {type: 'number',description: 'Control value, dont edit it',};
-    jsondata.properties['organization_id'] = {type: 'number',description: 'Control value, dont edit it',};
-    jsondata.properties['branch_id'] = {type: 'number',description: 'Control value, dont edit it',};
+    jsondata.properties['tenantId'] = {type: 'number',description: 'Control value, dont edit it',};
+    jsondata.properties['orgId'] = {type: 'number',description: 'Control value, dont edit it',};
+    jsondata.properties['branchId'] = {type: 'number',description: 'Control value, dont edit it',};
     jsondata.properties['created'] = {type: 'string',description: 'Control value, dont edit it',};
     jsondata.properties['updated'] = {type: 'string',description: 'Control value, dont edit it',};
     jsondata.properties['createdby'] = {type: 'string',description: 'Control value, dont edit it',};
@@ -111,10 +111,10 @@ const genSchema = (
 
     const isrequired = requiredlist && requiredlist.includes(key);
     const newName: string = docname + capitalizeFirstLetter(key);
-   if(obj.format && obj.format==FIELD_AUTOCOMPLETE_CODE){
+   if(obj.format && obj.format==X_DOCUMENT_NO){
     fieldAutoCompleteCode=key
    }
-   if(obj.format && obj.format==FIELD_AUTOCOMPLETE_NAME){
+   if(obj.format && obj.format==X_DOCUMENT_NAME){
     fieldAutoCompleteName=key
    }
   //  if (obj.type == 'object' && obj.items  ){

package/src/type.ts

@@ -61,4 +61,5 @@ bothEndCode: string
 frontEndCode: string
 backEndCode: string
 controllerCode:string
+apiSchemaCode:string
 }

package/templates/basic/apischema.eta

@@ -1,7 +1,9 @@
 /**
- * This file was automatically generated by simpleapp generator.
- * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
- * and regenerate this file.
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR Except content between:
+ *    <begin-apischema-code><end-apischema-code>
+ * last change 2023-09-09
+ * Author: Ks Tan
  */
 import { ApiProperty } from '@nestjs/swagger';
 
@@ -26,4 +28,6 @@ import { ApiProperty } from '@nestjs/swagger';
         }    
 <%}) %>
 
-
+  /*****************************customized code begin here *****************************************/
+  <%~ it.apiSchemaCode %>
+ 

package/templates/basic/controller.eta

@@ -1,7 +1,9 @@
 /**
- * This file was automatically generated by simpleapp generator.
- * You can add your additional custom api in this file.
- * CODE GENERATOR WONT OVERRIDE THIS FILE
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR Except content between:
+ *    <begin-controller-code><end-controller-code>
+ * last change 2023-09-09
+ * Author: Ks Tan
  */
 import {
   Controller,
@@ -39,7 +41,7 @@ export class <%= it.typename %>Controller extends SimpleAppController<
     type: [<%= it.fullApiSchemaName%>]
   })
   @ApiResponse({ status: 500, description: 'Internal error' })
-  @ApiOperation({ operationId: 'runList' })
+  @ApiOperation({ operationId: 'runList', description:"List all data" })
   async list() {
     return this._list();
   }
@@ -51,7 +53,7 @@ export class <%= it.typename %>Controller extends SimpleAppController<
     type: ()=>[{id:'100',label:'label1'}],
   })
   @ApiResponse({ status: 500, description: 'Internal error' })
-  @ApiOperation({ operationId: 'autoComplete' })
+  @ApiOperation({ operationId: 'autoComplete',description:"retrieve array of {_id, code, name}" })
   async autoComplete(@Query('keyword') keyword: string) {
     return this._autocomplete(keyword);
   }
@@ -86,6 +88,20 @@ export class <%= it.typename %>Controller extends SimpleAppController<
     return await this._create(data)
   }
 
+  @Post('/search')
+  @ApiResponse({
+    status: 201,
+    description: 'success',
+    type: [<%= it.fullApiSchemaName%>]
+  })
+  @ApiResponse({ status: 400, description: 'bad request' })
+  @ApiResponse({ status: 500, description: 'internal error' })
+  @ApiBody({ description: 'Data', type: Object })
+  @ApiOperation({ operationId: 'runSearch' })
+  async search(@Body() data: Object) {
+    return await this._search(data)
+  }
+
   @Put(':id')
   @ApiResponse({
     status: 200,

package/templates/basic/jsonschema.eta

@@ -2,5 +2,7 @@
  * This file was automatically generated by simpleapp generator.
  * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
  * and regenerate this file.
+ * last change 2023-09-09
+ * Author: Ks Tan
  */
 export const <%= it.typename%>JsonSchema = <%~ JSON.stringify(it.jsonschema) %>

package/templates/basic/model.eta

@@ -2,16 +2,14 @@
  * This file was automatically generated by simpleapp generator.
  * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
  * and regenerate this file.
- * ALL FIELDS not compulsory, it control at microservice level using AJV
+ * last change 2023-09-09
+ * Author: Ks Tan
  */
 
 <% const schema = it.schema %>
 <% const typeclass = it.doctype+'type' %>
 import { Schema } from 'mongoose';
 import { <%Object.keys(it.models).forEach(function(key) { %> <%=key %>, <%})%> }  from './<%= it.doctype %>.type';
-import { beforeSave } from './<%= it.doctype %>.beforesave';
-
-
 const schemasetting = {
   
   <%Object.keys(it.schema).forEach(function(key) { %>    
@@ -31,5 +29,3 @@ const schemasetting = {
 };
 
 export const <%= it.doctype %>MongoSchema = new Schema(schemasetting,{collection: '<%= it.name %>'})
-  .post('validate', (doc: <%= it.typename %>) => beforeSave(doc))
-  .pre('save', () => {});

package/templates/basic/module.eta

@@ -2,6 +2,8 @@
  * This file was automatically generated by simpleapp generator.
  * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
  * and regenerate this file.
+ * last change 2023-09-09
+ * Author: Ks Tan
  */
 import { Module } from '@nestjs/common';
 import { <%= it.typename %>Controller } from './<%= it.doctype %>.controller';

package/templates/basic/pageindex.vue.eta

@@ -1,7 +1,32 @@
+<script setup lang="ts">
+/**
+ * This file was automatically generated by simpleapp everytime regenerate code.
+ * delete file "delete-me-for-avoid-override" if you want to modify this file and 
+ * prevent regenerate code override it.
+ * last change 2023-09-09
+ * author: Ks Tan
+ */
+<% let skipcolumns = ['_id','createdby','created','updatedby','updated','orgId','branchId','tenantId','doctype'] %>
+
+  import { <%= it.typename %>Doc } from "../../../simpleapp/simpleappdocs/<%= it.typename %>Doc";
+  const { $event, $listen } = useNuxtApp();
+  const route = useRoute()  
+  const doc = new <%= it.typename %>Doc(route.params.xorg,$event, $listen);
+  const documentpath = `/${route.params.xorg}/<%= it.name %>`;
+  const data = doc.getReactiveData();
+  const columns = [
+    <%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
+        <%let obj=it.jsonschema.properties[key] %>
+        <%if(skipcolumns.indexOf(key)>=0){%>/* skip system columns <%=key%>*/
+        <%} else if(['string','number','integer'].indexOf(obj.type)>=0){%>'<%=key%>',<%}%>
+    <%})%>
+    ]
+</script>
 <template>
-<% let skipcolumns = ['_id','createdby','created','updatedby','updated','organization_id','branch_id','tenant_id','doctype'] %>
     <div>    
-    <CrudSimple :document="doc"  title="<%= it.typename %>" #default="o" 
+    <CrudSimple :document="doc"  title="<%= it.typename %>"
+     #default="o" 
+     :path="documentpath"
     :listColumns="columns"> 
     
       <%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
@@ -38,17 +63,5 @@
     </CrudSimple>
   </div>
   </template>
-  <script setup lang="ts">
-  import { <%= it.typename %>Doc } from "../../simpleapp/simpleappdocs/<%= it.typename %>Doc";
-  const { $event, $listen } = useNuxtApp();
-  const doc = new <%= it.typename %>Doc($event, $listen);
-  const data = doc.getReactiveData();
-  const columns = [
-    <%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
-        <%let obj=it.jsonschema.properties[key] %>
-        <%if(skipcolumns.indexOf(key)>=0){%>/* skip system columns <%=key%>*/
-        <%} else if(['string','number','integer'].indexOf(obj.type)>=0){%>'<%=key%>',<%}%>
-    <%})%>
-    ]
-  </script>
+
   

package/templates/basic/pageindexwithid.vue.eta

@@ -1 +1,13 @@
-<template></template>
+<script setup lang="ts">
+/**
+ * This file was automatically generated by simpleapp everytime regenerate code.
+ * delete file "delete-me-for-avoid-override" if you want to modify this file and 
+ * prevent regenerate code override it.
+ * last change 2023-09-09
+ * author: Ks Tan
+ */
+import Index from './index.vue'
+</script>
+<template>
+    <Index/>
+</template>

package/templates/basic/service.eta

@@ -1,13 +1,16 @@
 /**
- * This file was automatically generated by simpleapp generator.
- * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
- * and regenerate this file.
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR Except content between:
+ *    <begin-bothend-code><end-bothend-code>
+ *    <begin-backend-code><end-backend-code>
+ * last change 2023-09-09
+ * Author: Ks Tan
  */
 import { Injectable } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 import {<%= it.typename%>JsonSchema } from './<%= it.doctype %>.jsonschema'
-import { SimpleAppService } from '../../class/SimpleAppService';
+import { SimpleAppService,IsolationType } from '../../class/SimpleAppService';
 import { <%Object.keys(it.models).forEach(function(key) { %> <%=key %>, <%})%> }  from './<%= it.doctype %>.type';
 
 
@@ -17,18 +20,17 @@ export class <%= it.typename %>Service extends SimpleAppService<<%= it.typename
   protected documentIdentityName='<%~ it.autocompletename %>'
     constructor(@InjectModel('<%= it.name %>')  mydoc: Model<<%= it.typename %>>,
   ) {
-    super(mydoc);
+    super(mydoc,IsolationType.org);
     this.setSchema(<%= it.typename%>JsonSchema)
   }
 
   
   /*****************************customized frontend + backend code*****************************************/
-  
-  
+    
   <%~ it.bothEndCode %>
 
   /*****************************customized backend only code*****************************************/
-
-  <%~ it.backEndCode %>
+  
+  <%~ it.backEndCode %>  
 
 }

package/templates/basic/simpleappclient.eta

@@ -1,7 +1,9 @@
 /**
- * This file was automatically generated by simpleapp generator.
- * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
- * and regenerate this file.
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR Except content between:
+ *    <begin-frontend-code><end-frontend-code>
+ * last change 2023-09-09
+ * Author: Ks Tan
  */
 import { SimpleAppClient } from "@simitgroup/simpleapp-vue-component/src/SimpleAppClient";
 
@@ -21,8 +23,8 @@ export class <%= it.typename%>Doc extends SimpleAppClient<<%= it.typename%>,<%=
   public readonly schema= <%~ JSON.stringify(it.jsonschema) %>;
   protected documentIdentityCode='<%~ it.autocompletecode %>'
   protected documentIdentityName='<%~ it.autocompletename %>'
-  constructor(event:any,listen?:any) {    
-    const apiconfig = new Configuration({ basePath:  useRuntimeConfig().public.APP_URL+'/api' });
+  constructor(xorg:string,event:any,listen?:any) {    
+    const apiconfig = new Configuration({ basePath:  `${useRuntimeConfig().public.APP_URL}/api/${xorg}` });
     const apiobj = new <%= it.doctype.toUpperCase()%>Api(apiconfig)
     super(apiobj,'<%= it.doctype %>','<%=it.name %>')
     this.event=event
@@ -56,11 +58,10 @@ export class <%= it.typename%>Doc extends SimpleAppClient<<%= it.typename%>,<%=
     }
 
   /*****************************customized frontend + backend code*****************************************/
-  
-  
+    
   <%~ it.bothEndCode %>
 
   /*****************************customized frontend only code*****************************************/
-
   <%~ it.frontEndCode %>
+
   }

package/templates/basic/type.eta

@@ -2,9 +2,10 @@
  * This file was automatically generated by simpleapp generator.
  * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
  * and regenerate this file.
+ * last change 2023-09-09
+ * Author: Ks Tan
  */
 
-
 <%Object.keys(it.models).forEach(function(prop){ %>  
   <% let schema = it.models[prop] %>
   export type <%= prop %> = {

package/templates/nest/SimpleAppController.eta

@@ -13,6 +13,7 @@ import { ApiTags, ApiBody, ApiResponse, ApiOperation } from '@nestjs/swagger';
 const doctype = 'person'.toUpperCase();
 type ServiceType = {
   list: Function;
+  search: Function;
   create: Function;
   update: Function;
   delete: Function;
@@ -34,10 +35,12 @@ export class SimpleAppController<TService extends ServiceType, TApiSchema, T> {
     this.service = service;
   }
 
-  
   async _list() {
     return this.service.list();
   }
+  async _search(searchObject:Object) {
+    return this.service.search(searchObject);
+  }
   async _autocomplete(keyword: string) {
     return this.service.getAutoComplete(keyword);
   }
@@ -47,7 +50,6 @@ export class SimpleAppController<TService extends ServiceType, TApiSchema, T> {
     return result as Type<TApiSchema>;
   }
 
-  
   async _create(data: TApiSchema) {
     //const newdata: persontype.Person = { ...data };
     const newdata: T = {} as T; //= { ...data };
@@ -55,14 +57,12 @@ export class SimpleAppController<TService extends ServiceType, TApiSchema, T> {
     return this.service.setData(newdata).create() as TApiSchema;
   }
 
-  
-  async _update( id: string,data: TApiSchema) {
+  async _update(id: string, data: TApiSchema) {
     const newdata: T = {} as T; //= { ...data };
     Object.assign(newdata, data); //
     return this.service.findIdThenUpdate(id, newdata) as TApiSchema;
   }
 
- 
   async _delete(id: string) {
     return this.service.findIdThenDelete(id);
   }