v1.6.1

1. create tenant no need ask country, currency, timezeone, offsets, it autocapture from timezone
2. component select support multiple, simpleapp allow multi-select too
3. improve symbol of formula in jsconschema
4. support manage module in config
5. support runWorker concept, which allow execute code outside of service classes
6. provide data id at before validation hook
7.simpleapp support jrxml to pdf print preview
8. solve formula sometimes can't execute

Author: kstan79

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simitgroup/simpleapp-generator",
-  "version": "1.6.0-alpha",
+  "version": "1.6.1-alpha",
   "description": "frontend nuxtjs and backend nests code generator using jsonschema",
   "main": "dist/index.js",
   "scripts": {

src/framework.ts

@@ -18,6 +18,7 @@ let config = {
     "frontendFolder":"./frontend",
     "frontendPort":"8080",
     "printFormatDir":"./printformats",
+    "additionalNestModules":["cloudapi","printapi"],
     "oauthSetting":{
         "oauthBaseUrl":"https://keycloak-server-url/",
         "oauthRealm":"realm-name",
@@ -74,7 +75,7 @@ export const prepareNest = (callback:Function)=>{
 
         //@nestjs/graphql @nestjs/apollo graphql apollo-server-express apollo-server-core
         //@nestjs/graphql graphql-tools graphql apollo-server-express 
-        exec(`cd ${targetfolder};pnpm install --save @nestjs/graphql @nestjs/apollo @apollo/server graphql @nestjs/event-emitter dayjs bpmn-server@2.1.7 @casl/ability jsonpath yaml lodash @types/lodash nest-keycloak-connect keycloak-connect bpmn-client @nestjs/serve-static jsonwebtoken axios @darkwolf/base64url json-schema @wearenova/mongoose-tenant @nestjs/swagger @nestjs/mongoose mongoose  ajv ajv-formats ajv-errors @nestjs/config`,async (error, stdout, stderr)=>{
+        exec(`cd ${targetfolder};pnpm install --save @nestjs/graphql country-to-currency countries-and-timezones @nestjs/apollo @apollo/server graphql @nestjs/event-emitter dayjs bpmn-server@2.1.7 @casl/ability jsonpath yaml lodash @types/lodash nest-keycloak-connect keycloak-connect bpmn-client @nestjs/serve-static jsonwebtoken axios @darkwolf/base64url json-schema @wearenova/mongoose-tenant @nestjs/swagger @nestjs/mongoose mongoose  ajv ajv-formats ajv-errors @nestjs/config`,async (error, stdout, stderr)=>{
             // log.info(`dependency installed`)
             if(!error){
                 // fs.mkdirSync(`${targetfolder}/public_html`,{recursive:true})

templates/basic/nest/processor.ts.eta

@@ -64,14 +64,15 @@ export class <%= it.typename %>Processor extends SimpleAppService<<%= it.typenam
 
    reCalculateValue(data:<%= it.typename %>){
     //console.log('trigger new recalculate')    
+    const $data = data;
     const jsopbj= new jsonpath['JSONPath']()
     <% if(it.jsonschema['x-simpleapp-config']['formulas']){ %>
         <%Object.keys(it.jsonschema['x-simpleapp-config']['formulas']).forEach(function(index) { %>
           <% let fml = it.jsonschema['x-simpleapp-config']['formulas'][index] %>
           // <%~ JSON.stringify(fml) %>
           //const tmp = jsopbj.query(vdata,fieldpath).filter((item:string)=>item!='')
 
-          jsopbj.apply(data, '<%~ fml.jsonPath %>', function(value:any) { return <%~fml.formula %> });
+          jsopbj.apply($data, '<%~ fml.jsonPath %>', function($item:any) { return <%~fml.formula %> });
 
         <%}) %>
       <%} %>

templates/basic/nuxt/component.select.vue.eta

@@ -7,6 +7,8 @@
     :showNull="showNull"
     :allowAddNew="allowAddNew"
     :filter ="filter"
+    :multiple="multiple"
+    :hideLabel="hideLabel"
   />
 </template>
 <script setup lang="ts">
@@ -19,12 +21,14 @@
 import { ForeignKey } from '~/types';
 import { <%= it.typename %> } from "~/simpleapp/generate/openapi";
 const emits = defineEmits(["change"]);
-const modelValue = defineModel<string>();
+const modelValue = defineModel<string|string[]>();
 const props = defineProps<{ 
   placeholder?: string;
   showNull?:boolean;
   allowAddNew?: boolean;
   filter?: <%= it.typename %>;
+  multiple?:boolean;
+  hideLabel?:boolean;
    }>()
 const change = (id:string,data:ForeignKey) =>{
   emits('change',id,data)

templates/basic/nuxt/simpleapp.generate.client.ts.eta

@@ -53,25 +53,23 @@ export class <%= it.typename%>Client extends SimpleAppClient<openapi.<%= it.type
     const apiobj = getDocumentApi('<%=it.name %>')
     super(apiobj,'<%= it.doctype %>','<%=it.name %>')
     this.event=$event
-    this.listen=$listen
-    
-    this.setNew();    
-    watch(this.getData(),(newvalue)=>{
-      //console.log("Something change",this.completeformula)
+    this.listen=$listen    
+    this.setNew();        
+  }
+
+  setWatchChange = ()=>{
+    this.unwantchobj = watch(this.getData(),(newvalue)=>{
       if(this.completeformula==true){
-         // console.log("Trigger caclculate")
           this.completeformula=false
           this.reCalculateValue()
           this.completeformula=true
-      }else{
-          //console.log("avoid unlimited loop")
-      }                    
-    })    
-
+      }               
+    },{deep:true})    
   }
   setNew = ()=>{         
       const newdata = Default<%= it.typename%>(randomUUID())
       this.setData(newdata)
+      this.setWatchChange()
       return true
     }
   <%if(it.jsonschema.properties['readOnly'] || it.jsonschema.properties['documentStatus']){%>
@@ -176,15 +174,15 @@ export class <%= it.typename%>Client extends SimpleAppClient<openapi.<%= it.type
 
   reCalculateValue(){
     //console.log('trigger new recalculate')
-    const data = this.getData()
+    const $data = this.getData()
 
     <% if(it.jsonschema['x-simpleapp-config']['formulas']){ %>
       <%Object.keys(it.jsonschema['x-simpleapp-config']['formulas']).forEach(function(index) { %>
         <% let fml = it.jsonschema['x-simpleapp-config']['formulas'][index] %>
         // <%~ JSON.stringify(fml) %>
         //const tmp = jsonpath.query(vdata,fieldpath).filter((item:string)=>item!='')
 
-        jsonpath.apply(data, '<%~ fml.jsonPath %>', function(value) { return <%~fml.formula %> });
+        jsonpath.apply($data, '<%~ fml.jsonPath %>', function($item) { return <%~fml.formula %> });
 
       <%}) %>
     <%} %>

templates/nest/src/app.module.ts.eta

@@ -9,7 +9,12 @@ import { Module, MiddlewareConsumer, NestModule, Provider } from '@nestjs/common
 import { MongooseModule,MongooseModuleOptions } from '@nestjs/mongoose';
 import { GraphQLModule } from '@nestjs/graphql';
 import { ApolloDriver, ApolloDriverConfig } from '@nestjs/apollo';
-
+import {GenerateModule} from './simpleapp/simpleapp.module'
+<% const nestmodules = it.configs.additionalNestModules%>
+<% for(let i=0; i<nestmodules.length;i++){ %>
+<%    const modulename = capitalizeFirstLetter(nestmodules[i]) %>
+  import {<%= modulename %>Module } from  './<%=nestmodules[i]%>/<%=nestmodules[i]%>.module';
+<%}%>
 import { APP_GUARD,APP_INTERCEPTOR,APP_FILTER } from '@nestjs/core';
 import { ResponseInterceptor } from './simpleapp/generate/commons/interceptors/response.interceptor'
 import {
@@ -28,8 +33,6 @@ import { AppResolver } from './app.resolver';
 import { TenantMiddleware } from './simpleapp/generate/commons/middlewares/tenant.middleware';
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
-import {GenerateModule} from './simpleapp/simpleapp.module'
-import { CloudApiModule } from './cloudapi/cloudapi.module';
 import { UserMongoSchema } from './simpleapp/generate/models/user.model';
 import { PermissionMongoSchema } from './simpleapp/generate/models/perm.model';
 import { ApiEventMongoSchema } from './simpleapp/generate/models/apievent.model';
@@ -76,7 +79,12 @@ import { EventEmitterModule } from '@nestjs/event-emitter';
       tokenValidation: TokenValidation.ONLINE,
     }),
     GenerateModule,    
-    CloudApiModule,
+    
+    <% for(let i=0; i<nestmodules.length;i++){ %>
+    <%    const modulename = capitalizeFirstLetter(nestmodules[i]) %>
+      <%= modulename %>Module,
+    <%}%> 
+    
     MongooseModule.forFeature([
       { name: 'User', schema: UserMongoSchema },
       { name: 'Permission', schema: PermissionMongoSchema },

templates/nest/src/cloudapi/cloudapi.module.ts._eta

@@ -12,4 +12,4 @@ import { CloudApiService } from './cloudapi.service';
   providers: [CloudApiService],
   exports: [CloudApiService],
 })
-export class CloudApiModule {}
+export class CloudapiModule {}

templates/nest/src/printapi/printapi.module.ts.eta

@@ -12,4 +12,4 @@ import { PrintApiService } from './printapi.service';
   providers: [PrintApiService],
   exports: [PrintApiService],
 })
-export class PrintApiModule {}
+export class PrintapiModule {}

templates/nest/src/simpleapp/generate/commons/robotuser.service.ts.eta

@@ -81,10 +81,11 @@ export class SimpleAppRobotUserService {
     const nextrefresh = tokens.expires_in * 0.8;
     const appuser = this.prepareAppUser(undefined);
 
-    
-    setTimeout(async () => {
-      await this.refreshSystemToken();
-    }, nextrefresh * 1000);
+    if(tokens.access_token){
+      setTimeout(async () => {
+        await this.refreshSystemToken();
+      }, nextrefresh * 1000);
+    }
   }
 
   prepareAppUser(data: any) {

templates/nest/src/simpleapp/generate/commons/user.context.ts.eta

@@ -535,6 +535,7 @@ export class UserContext {
   };
 
   searchInsertedRecordId(collection: string, _id: string) {
+    if(!this.modifiedRecords.createds[collection]) return undefined
     return this.modifiedRecords.createds[collection].find(
       (item) => item === _id,
     );