@simitgroup/simpleapp-generator 1.6.7-o-alpha → 2.0.0-b-alpha

package/templates/basic/nest/default.ts.eta

@@ -4,26 +4,30 @@
  * last change 2024-02-23
  * Author: Ks Tan
  */
+import * as schema from './<%= camelToKebab(it.resourceName) %>.schema'
 
 <%Object.keys(it.models).forEach(function(modelname) { %>    
-export const Default<%=modelname%> = (uuid:string)=>{
-    // <%~ JSON.stringify(it.models[modelname].model) %>
+
+export const Default<%= toTypeName(it.resourceName ,modelname) %> = (uuid:string)=>{
     <% let model = it.models[modelname].model%>    
     <% if(model['_id'] && model['code'] && model['label']){%>
-      return undefined
+      const  data =  undefined
     <%} else{%>
-    return {
+     
+    const  data  = {
         <% if(it.models?.[modelname] && it.models[modelname]?.model && Object.keys(it.models[modelname]?.model).length === 0) { %>
           // Dynamic Object
-        <% } else { %>
-          _id : uuid,
-        <% } %>
+        <% } else if(modelname.toLowerCase() ==it.resourceName.toLowerCase()){ %>
+            
+              __v:0,
+          <% } %>
 
         <%Object.keys(it.models[modelname].model).forEach(function(key){%>      
           <%let field=it.models[modelname].model[key]%>                
             
           <%if(key=='_id'){ %>
-          // skip cause already hardcoded
+          
+            _id : uuid,
           <%}else if(key=='tenantId'){ %>
             tenantId : 0,//it will override by save handle
           <%}else if(key=='orgId'){ %>
@@ -41,18 +45,20 @@ export const Default<%=modelname%> = (uuid:string)=>{
           <%} else if(field.type=='boolean' ){%> 
               <%=key%> :false ,
           <%} else if(typeof field=='string'){%>
-            <%=key%> :  Default<%= field  %>(''),
+            <%=key%> :  Default<%= toTypeName(it.resourceName ,field)  %>(''),
           <%} else if(field.type=='string'){%>
               <%=key%> : '<%= field.default  %>',
             <%} else if(Array.isArray(field) && ['string','integer','number','boolean'].includes(field[0])) {%>
               <%=key%> : <<%=field[0]%>[]>[],  //typeof field == array     <%~JSON.stringify(field)%>    
             <%} else if(Array.isArray(field)) {%>
-              <%=key%> : [Default<%=field[0]%>(crypto.randomUUID())],  //typeof field == array     <%~JSON.stringify(field)%>    
+              <%=key%> : [Default<%= toTypeName(it.resourceName ,field[0])%>(crypto.randomUUID())],  //typeof field == array     <%~JSON.stringify(field)%>    
             <%} else {%>            
               <%=key%> : <%=field.default%>,  //else <%= typeof field %>
           <%}%>
+           
         <%})%>
     }
   <%}%>
+  return data
 } 
 <%})%>

package/templates/basic/nest/enum.ts.eta

@@ -0,0 +1,16 @@
+<% 
+const properties = it.jsonschema.properties
+const fnames = Object.keys(properties) 
+for(const fname of fnames){
+    const obj = properties[fname]
+
+    if(obj.type=='string' && Array.isArray(obj.enum) && obj.enum.length>0){ 
+        %>
+    export enum <%=it.typename%><%= upperFirstCase(fname)%>Enum{
+        <%for(const val of obj.enum){        
+%>
+            <%= val.toUpperCase()%> = '<%= val %>',        
+        <%}%>
+    }
+   <%}%>
+<%}%>

package/templates/basic/nest/model.ts.eta

@@ -1,32 +1,10 @@
-/**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2024-02-23
- * 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 '../types/<%= it.doctype %>.type';
-const schemasetting = {
-  
-  <%Object.keys(it.schema).forEach(function(key) { %>    
-    
-    <% if(key == '_id'){%>
-      <%= key %>: {type:'string', required:true},  //force _id as string
-    <% } else if(typeof schema[key] == 'string') {%>
-      <%= key %>: {type: <<%=schema[key]%>>{}, required:false},   //object
-    <% }else if( Array.isArray( schema[key])){%>
-      <%= key %>: [{type: <<%=schema[key]%>>{}, required:false}],  //custom array
-    <% }else if( schema[key].type == 'array'){%>
-      <%= key %>: [{type: <%= schema[key].item.type %>, required:false}]  //basic array
-    <% }else{%>
-      <%= key %>: {type: <%= capitalizeFirstLetter(schema[key].type) %>, required: <% if(key==it.autocompletecode || key==it.autocompletename){%>true<%}else{%>false<%}%>},  //field 
-    <% } %>
-  <%}) %>
-};
+import { <%=capitalizeFirstLetter(it.resourceName) %>} from './<%= camelToKebab(it.resourceName) %>.schema'
+import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
+import * as mongoose from 'mongoose';
+
+// create mongodb schema
 
-export const <%= capitalizeFirstLetter(it.name) %>MongoSchema = new Schema(schemasetting,{collection: '<%= it.name %>'})
+export const <%= capitalizeFirstLetter(it.typename) %>MongoSchema = SchemaFactory.createForClass(<%= it.typename %>)
 .pre('save', function(next) {
     this.increment();
     return next();

package/templates/basic/nest/module.ts.eta

@@ -0,0 +1,26 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-04-02
+ * Author: Ks Tan
+ */
+import { Module } from '@nestjs/common';
+import { MongooseModule } from '@nestjs/mongoose';
+import { <%= it.typename%>Service } from './<%= camelToKebab(it.resourceName)%>.service';
+import { <%= it.typename%>Controller } from './<%= camelToKebab(it.resourceName)%>.controller';
+import { <%= it.typename%>MongoSchema } from './<%= camelToKebab(it.resourceName)%>.model';
+import { <%= it.typename%>Resolver } from './<%= camelToKebab(it.resourceName)%>.resolver';
+
+import { DocumentNoFormatModule} from 'src/simple-app/.core/features/document-no-format/document-no-format.module';
+import { SimpleAppLogModule } from 'src/simple-app/.core/features/log/log.module';
+import { SimpleAppWebhookModule } from 'src/simple-app/.core/features/webhook/webhook.module';
+@Module({
+  imports: [ DocumentNoFormatModule,SimpleAppLogModule,SimpleAppWebhookModule,
+    MongooseModule.forFeature([
+      { name: '<%= it.typename%>', schema: <%= it.typename%>MongoSchema },
+     ])],
+  controllers: [<%= it.typename%>Controller],
+  providers: [<%= it.typename%>Service,<%= it.typename%>Resolver ],
+  exports: [MongooseModule,<%= it.typename%>Service,<%= it.typename%>Resolver ],
+})
+export class <%= it.typename%>Module {}

package/templates/basic/nest/resolver.ts.eta

@@ -5,15 +5,18 @@
  * Author: Ks Tan
  */
 import { Resolver, Query, Mutation, Args, ID,Context } from '@nestjs/graphql';
-import * as schemas from '../apischemas';
-import { AppUser } from '../commons/decorators/appuser.decorator';
-import { UserContext } from '../commons/user.context';
-import { <%= it.typename %>, <%= it.typename %>Service } from '../../services/<%= it.doctype.toLowerCase() %>.service';
-import { Roles } from '../commons/roles/roles.decorator';
-import { Role } from '../commons/roles/roles.enum';
-
 import { Request } from '@nestjs/common';
 
+import * as schemas from './<%= camelToKebab(it.resourceName) %>.schema';
+import { <%= it.typename %>Service } from './<%= camelToKebab(it.resourceName) %>.service';
+
+import { AppUser } from 'src/simple-app/.core/features/user-context/appuser.decorator';
+import { UserContext } from 'src/simple-app/.core/features/user-context/user.context';
+import { Roles } from 'src/simple-app/.core/features/auth/role-guard/roles.decorator';
+import { Role } from 'src/simple-app/.core/features/auth/role-guard/roles.enum';
+
+
+
 <% const getFieldType =(proptype, typename,actionname)=>{
     const systemtypes = ['Boolean','boolean','string','String','number','Number','object','Object','integer','Integer']
     if(!typename) throw actionname +" undefine schema";
@@ -48,7 +51,7 @@ export class <%= it.typename %>Resolver {
     @Roles(Role.SuperAdmin,Role.SuperUser,Role.<%= `${it.typename}_search`%>)
     <%}%>
     @Query(() => [schemas.<%= it.typename %>])
-    async <%= it.name %>s(@AppUser() appuser: UserContext): Promise<<%= it.typename %>[]> {                
+    async <%= it.name %>s(@AppUser() appuser: UserContext): Promise<schemas.<%= it.typename %>[]> {                
         
         return await this.service.search(appuser,undefined,undefined,undefined)
     }
@@ -60,7 +63,7 @@ export class <%= it.typename %>Resolver {
     @Roles(Role.SuperAdmin,Role.SuperUser,Role.<%= `${it.typename}_search`%>)
     <%}%>
     @Query(() => schemas.<%= it.typename %>)
-    async <%= it.name %>(@AppUser() appuser: UserContext,@Args('id', { type: () => ID } ) id: string): Promise<<%= it.typename %>> {
+    async <%= it.name %>(@AppUser() appuser: UserContext,@Args('id', { type: () => ID } ) id: string): Promise<schemas.<%= it.typename %>> {
         
         return await this.service.findById(appuser,id)
     }
@@ -75,52 +78,5 @@ export class <%= it.typename %>Resolver {
 
     /***************************** begin additionalAPI definations *****************************************/
 
-    <% for(let i=0;i<it.apiSettings.length;i++){%>
-    <% let api = it.apiSettings[i] %>
-    <% if(api.method!='get') continue %>
-    <%if(superadmindoctype.includes(it.doctype)){%>
-    @Roles(Role.SuperAdmin,
-    <%if(api.requiredRole && api.requiredRole.length>0) { %>
-        <% for(let r=0;r<api.requiredRole.length;r++){%>Role.<%=api.requiredRole[r]%>,<%}%>
-        <%}%>
-    )
-    <%}else{%>
-    @Roles(Role.SuperAdmin,Role.SuperUser,
-        <%if(api.requiredRole && api.requiredRole.length>0) { %>
-        <% for(let r=0;r<api.requiredRole.length;r++){%>Role.<%=api.requiredRole[r]%>,<%}%>
-        <%}%>
-        )
-    <%}%>
-      @Query(()=> <%= getFieldType('schema',api.responseType,api.action)%>)  
-
-
-
-      async <%= it.name %><%=capitalizeFirstLetter(api.action) %>(
-        @AppUser() appuser: UserContext,        
-        <% if(api.entryPoint && api.entryPoint.includes(':')) {%>
-              <%let subpath = api.entryPoint.split('/')%>
-              <% for(let a=0;a<subpath.length;a++){%>
-                <%const partstr = subpath[a]%>
-                <%if(partstr.includes(':')){%>
-                  <% const paraname = partstr.replace(':','') %>  
-                  @Args('<%=paraname%>') <%=paraname%>: string,
-                <%}%>    
-              <%}%>  
-            <%}%>
-             ){
-        
-          return await this.service.run<%=capitalizeFirstLetter(api.action)%>(appuser,<% if(api.entryPoint && api.entryPoint.includes(':')) {%>
-              <%let subpath = api.entryPoint.split('/')%>
-              <% for(let a=0;a<subpath.length;a++){%>
-                <%const partstr = subpath[a]%>
-                <%if(partstr.includes(':')){%>
-                  <% const paraname = partstr.replace(':','') %>  
-                  <%=paraname%>,
-                <%}%>    
-              <%}%>  
-            <%}%>            
-            )              
-      } 
-    <%}%>
     /***************************** end additionalAPI definitions *****************************************/
 }

package/templates/basic/nest/schema.ts.eta

@@ -0,0 +1,133 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-02-23
+ * Author: Ks Tan
+ */
+import { ApiProperty } from '@nestjs/swagger';
+import { Field, ObjectType,ID } from '@nestjs/graphql';
+import GraphQLJSON, { GraphQLJSONObject } from 'graphql-type-json';
+import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
+import * as mongoose from 'mongoose';
+
+export * from 'src/simple-app/.core/framework/schemas';
+
+<% 
+  const getFieldType =(proptype, typename,actionname)=>{
+    const systemtypes = ['Boolean','boolean','string','String','number','Number','object','Object','integer','Integer']
+    if(!typename) throw actionname +" undefine schema";
+    let tmptypename = typename.replace('[','').replace(']','')        
+    if(proptype=='schema'){
+      tmptypename= upperFirstCase(tmptypename)        
+    }
+    
+    if(typename.includes('[')){
+      return  proptype=='schema' ?  `[${tmptypename}]` : `${tmptypename}[]`
+    }else{
+      return tmptypename
+    }
+  }
+%>
+
+<% const draw = (it, obj, key, currentModelName) => { %>    
+    <%
+            let required = false;
+            const currentModel = it.models?.[currentModelName];
+            if (currentModel && (currentModel.required ?? []).includes(key)) {
+                required = true;
+            }
+        %>        
+
+    <% if(typeof obj == 'string') {%>
+        <% // This Is Dynamic Object %>
+        <% if(it.models?.[obj] && it.models[obj]?.model && Object.keys(it.models[obj]?.model).length === 0) { %>
+            @Prop({type: Object})
+            @Field(()=>GraphQLJSON)            
+            @ApiProperty({ type:()=>Object,required: <%= required %>, default: {} })
+            <%= key %> <%=required ? '' :'?' %>: Object;
+        <% } else { %>
+           
+            @Prop()
+            @Field()
+            <% const newtypename=  toTypeName(it.resourceName ,obj) %>
+            @ApiProperty({type: ()=><%=newtypename%>, required: <%= required %>})
+            <%= key %> <%=required ? '' :'?' %>:  <%= newtypename %>;
+        <% } %>
+    <%} else if(typeof obj.default !='undefined' && JSON.stringify(obj.default)=='{}'){%>    
+        @Prop({type: Object})
+        @Field(()=>GraphQLJSON)
+        @ApiProperty({ type:()=>Object,required: <%= required %>, default: {} })
+        <%= key %> <%=required ? '' :'?' %>: Object;
+    <% } else if( Array.isArray( obj)){%>
+        
+        <% const newtypename= toTypeName(it.resourceName ,obj[0])%>
+        @Prop()
+        @Field(() => [<%=newtypename %>])
+        @ApiProperty({type: ()=>[<%= newtypename  %>], required: <%= required %> })                    
+        <%= key %> <%=required ? '' :'?' %>:  <%= newtypename %>[];        
+    <% }else{%>
+        @Prop()
+        @Field()                
+        @ApiProperty({type: () => <%= getFieldType('schema',  obj.type,'') %> , required: <%= required %>})
+        <%= key %> <%=required ? '' :'?' %>:  <%= getFieldType('type',  obj.type,'') %>;        
+    <% } %>
+<% } %>
+
+<%Object.keys(it.models).forEach(function(name) { %>
+
+    <% let schema = it.models[name].model %>
+
+    <% // Skip Draw Dynamic Object Class %>
+    
+
+    @ObjectType()
+    @Schema({collection:'<%= name.toLowerCase() %>'})    
+    export class <%= toTypeName(it.resourceName ,name) %> { 
+        <% const thisObjKeys = Object.keys(schema) %>
+        <% if(thisObjKeys.length==0){%>
+
+        <% } %>
+
+
+        <% if(name.toLowerCase() ==it.resourceName.toLowerCase()){ %>
+            __v?:number;
+        <% } %>
+        <% Object.keys(schema).forEach(function(key) { %>
+            <% let obj = schema[key] %>
+            <% draw(it, obj, key, name) %>
+        <% }) %>
+    }
+<%}) %>
+
+/***************************************** Start Auto Complete *****************************************/
+<% const autoCompleteModelName = it.typename + 'AutoComplete';  %>
+@ObjectType()
+@Schema()
+export class <%=autoCompleteModelName %> {
+    @Prop()
+    @Field()
+    @ApiProperty({ type: String, required: true, default: '' })
+    _id: string;
+
+    @Prop()
+    @Field()
+    @ApiProperty({ type: String, required: true, default: '' })    
+    code: string;
+
+    @Prop()
+    @Field()
+    @ApiProperty({ type: String, required: true, default: '' })
+    label: string;
+
+    <% if(it.moreAutoComplete && Array.isArray(it.moreAutoComplete)) { %>
+        <% it.moreAutoComplete.forEach(function(field){ %>
+            <% draw(it, it.models[it.apiSchemaName].model[field], field, autoCompleteModelName) %>
+
+        <% }) %>
+    <% } %>
+}
+/****************************************** End Auto Complete ******************************************/
+
+/************************************** Customized Code Begin Here *************************************/
+<%~ it.apiSchemaCode %>
+ 

package/templates/basic/nest/service.ts.eta

@@ -1,89 +1,102 @@
 /**
- * This file was automatically generated by simpleapp generator. It is changable
- * --remove-this-line-to-prevent-override--
- * last change 2024-02-23
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-07-10
  * Author: Ks Tan
+ * Last Modified By: Yong Xiang
  */
+ 
 
+import { UserContext } from 'src/simple-app/.core/features/user-context/user.context'
+import * as sharelibs from 'src/simple-app/.core/share-libs'
+import { Injectable,Inject,forwardRef } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
+import jsonpath from 'jsonpath'
 import { Model } from 'mongoose';
-import { Injectable } from '@nestjs/common';
-import { UserContext } from '../generate/commons/user.context';
-import { <%= it.typename %>Processor } from '../generate/processors/<%= it.doctype %>.processor';
-//import { <%= it.typename %>,<%= it.typename %>Hooks} from '../generate/types';
-import * as types from '../generate/types';
-export { <%= it.typename %>} from '../generate/types';
-<% const getFieldType =(proptype, typename,actionname)=>{
-  const systemtypes = ['Boolean','boolean','string','String','number','Number','object','Object','integer','Integer']
-  console.log("run service typename----",typename)
-  if(!typename) throw actionname +" undefine schema";
+import {<%= it.typename%>JsonSchema } from './<%= camelToKebab(it.resourceName) %>.jsonschema'
+import { SimpleAppService } from 'src/simple-app/.core/framework/base/simple-app.service';
+import { IsolationType } from 'src/simple-app/.core/framework/schemas';
+import { EventEmitter2 } from '@nestjs/event-emitter';
+import { DocumentNoFormatService } from 'src/simple-app/.core/features/document-no-format/document-no-format.service';
 
-  let tmptypename = typename.replace('[','').replace(']','')
-  
-  if(systemtypes.includes(tmptypename)){
-    if(proptype=='type' ) tmptypename =tmptypename.toLowerCase();
-  }else if(proptype=='schema'){
-    tmptypename= 'schemas.'+tmptypename    
-  }else{ //type
-    tmptypename= 'types.'+tmptypename
-  }
+import * as defaultValue from './<%= camelToKebab(it.resourceName) %>.default'
+import * as schema from './<%= camelToKebab(it.resourceName) %>.schema';
+import { SimpleAppLogService } from 'src/simple-app/.core/features/log/log.service';
+import { RunWebhookService } from 'src/simple-app/.core/features/webhook/run-webhook.service';
+//export * from './<%= camelToKebab(it.resourceName) %>.schema';
 
-  if(typename.includes('[')){
-    return  proptype=='schema' ?  `[${tmptypename}]` : `${tmptypename}[]`
-  }else{
-    return tmptypename
-  }
-}
-%>
+
+<%if(it.jsonschema['x-import-lib']) {%>
+  <%let libs = it.jsonschema['x-import-lib'] %>
+  <%for(let l = 0; l< libs.length; l++) { %>
+      import * as <%=libs[l].importAs %> from '<%=libs[l].importFrom %>'
+  <%}%>
+<%}%>
 
 @Injectable()
-export class <%= it.typename %>Service extends <%= it.typename %>Processor {
-  <% const config = it.jsonschema['x-simpleapp-config']%>   
-  <%if(config['loseDataIsolation']){%>protected strictIsolation = false;<%}%> 
-      
-   //protected hooks: types.<%= it.typename %>Hooks = {}
+export class <%= it.typename %>Service extends SimpleAppService<schema.<%= it.typename %>>  {
+  protected documentIdentityCode='<%~ it.autocompletecode %>' as keyof schema.<%= it.typename %>;
+  protected documentIdentityLabel ='<%~ it.autocompletename %>' as keyof schema.<%= it.typename %> ;
+
+  <% if(skipIsolationDocument().includes(it.name.toLowerCase())) {%> 
+    protected strictIsolation = false;
+  <%}%>
+  <%if(it.jsonschema['x-simpleapp-config']['generateDocumentNumber']){%>
+  protected withDocNumberFormat = true;
+  <%}%>
+
+  protected foreignkeys = <%~ JSON.stringify(it.foreignkeys)%>;
     constructor(
-        @InjectModel('<%= it.typename %>')  mydoc: Model<types.<%= it.typename %>>
-        ){
-        super(mydoc)
+        @InjectModel('<%= it.typename %>')  mydoc: Model<schema.<%= it.typename %>>,
+        @Inject(forwardRef(() => EventEmitter2)) event2:EventEmitter2,
+        docNoGen:DocumentNoFormatService,
+        logSvc: SimpleAppLogService,
+        webhookSvc:RunWebhookService
+      ) {
+    super('<%= it.doctype.toUpperCase() %>','<%= it.name %>',mydoc,IsolationType.<%=it.isolationtype%>,event2,docNoGen,logSvc,webhookSvc);
+    this.setSchema(<%= it.typename%>JsonSchema)
+    this.setData(defaultValue.Default<%=it.typename%>(crypto.randomUUID()))
+    <%if(it.moreAutoComplete.length>0){%>
+    this.addAutoCompleteField({
+        <%Object.keys(it.moreAutoComplete).forEach(function(key) { %>
+          <% let f=it.moreAutoComplete[key] %>
+          <%~ `${f}: '${f}'`   %>,
+        <%})%>
+      })
+    <%}%>
     }
+   <%if(it.jsonschema.properties['readOnly'] || it.jsonschema.properties['documentStatus']){%>
+    public isReadOnly():boolean{      
+      <%if(it.jsonschema.properties['readOnly']){%>
+        if(this.data.readOnly) return true
+      <%}%>
+      <%if(it.jsonschema.properties['documentStatus']){%>
+        const docstatus = this.data.documentStatus
+        const statussetting = this.jsonschema['x-simpleapp-config'].allStatus?.find((item)=>item.status==docstatus)
+        if(statussetting && statussetting.readOnly) return true
+      <%}%>      
+      return false            
+    } 
+  <%}%>
 
-/***************************** begin x-document-api definitions *****************************************/
-/*
-<% for(let i=0;i<it.apiSettings.length;i++){%>
-<% let api = it.apiSettings[i] %>
-  async run<%= capitalizeFirstLetter(api.action) %>(
-    appuser: UserContext,    
-    <% if(api.entryPoint && api.entryPoint.includes(':')) {%>
-          <%let subpath = api.entryPoint.split('/')%>
-          <% for(let a=0;a<subpath.length;a++){%>
-            <%const partstr = subpath[a]%>
-            <%if(partstr.includes(':')){%>
-              <% const paraname = partstr.replace(':','') %>  
-               <%=paraname%>: string,
-            <%}%>    
-          <%}%>  
-        <%}%>
-        <% if(api.queryPara && api.queryPara.length>0) {%>
-            <%for(let q=0;q<api.queryPara.length; q++){%>
-              <% const qp = api['queryPara'][q] %>
-              <%=qp%>: string,
-            <%}%>
-        <%}%>
-            
-        <%if(['post','put','patch'].includes(api.method.toLowerCase())){%> 
-              data:<%= getFieldType('schema',api.schema,api.action)%>,
-            <%}%>
+   reCalculateValue(data:schema.<%= it.typename %>){
+    //console.log('trigger new recalculate')    
+    const $data = data;
+    <% 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($item:any) { return <%~fml.formula %> });
 
-         ){
-    <%if (api.workflowSetting && api.workflowSetting.bpmn){ %>      
-      return this.startWorkflow(appuser,'<%=api.workflowSetting.bpmn%>',data)
-    <%} else {%>
-       return "OK"
-    <%}%>
-  } 
-<%}%>
-*/
+        <%}) %>
+      <%} %>
+    
+  }
+
+
+  /***************************** additional execute *****************************************/
+    
 
-/***************************** end x-document-api definitions *****************************************/
 }

package/templates/basic/nest/service.ts.eta-backup

@@ -0,0 +1,50 @@
+/**
+ * This file was automatically generated by simpleapp generator. It is changable
+ * Modification will be overriden
+ * last change 2024-02-23
+ * Author: Ks Tan
+ */
+import { EventEmitter2 } from '@nestjs/event-emitter';
+import { InjectModel } from '@nestjs/mongoose';
+import { Model } from 'mongoose';
+import { Injectable } from '@nestjs/common';
+import { UserContext } from 'src/simple-app/.core/commons/user.context';
+import { <%= it.typename %>Entity } from './<%= camelToKebab(it.resourceName) %>.entity';
+import * as schema from './<%= camelToKebab(it.resourceName) %>.schema';
+export { <%= it.typename %>} from './<%= camelToKebab(it.resourceName) %>.schema';
+<% const getFieldType =(proptype, typename,actionname)=>{
+  const systemtypes = ['Boolean','boolean','string','String','number','Number','object','Object','integer','Integer']
+  console.log("run service typename----",typename)
+  if(!typename) throw actionname +" undefine schema";
+
+  let tmptypename = typename.replace('[','').replace(']','')
+  
+  if(systemtypes.includes(tmptypename)){
+    if(proptype=='type' ) tmptypename =tmptypename.toLowerCase();
+  }else if(proptype=='schema'){
+    tmptypename= 'schemas.'+tmptypename    
+  }else{ //type
+    tmptypename= 'types.'+tmptypename
+  }
+
+  if(typename.includes('[')){
+    return  proptype=='schema' ?  `[${tmptypename}]` : `${tmptypename}[]`
+  }else{
+    return tmptypename
+  }
+}
+%>
+
+@Injectable()
+export class <%= it.typename %>Service extends <%= it.typename %>Entity {
+  <% const config = it.jsonschema['x-simpleapp-config']%>   
+  <%if(config['loseDataIsolation']){%>protected strictIsolation = false;<%}%> 
+      
+   //protected hooks: types.<%= it.typename %>Hooks = {}
+    constructor(
+        @InjectModel('<%= it.typename %>')  mydoc: Model<schema.<%= it.typename %>>,
+        private emitter:EventEmitter2,
+        ){
+        super(mydoc,emitter)
+    }
+}

package/templates/basic/nuxt/default.ts.eta

@@ -4,9 +4,12 @@
  * last change 2024-02-23
  * Author: Ks Tan
  */
-<%Object.keys(it.models).forEach(function(modelname) { %>    
-export const Default<%=modelname%> = (uuid:string)=>{
-    // <%~ JSON.stringify(it.models[modelname].model) %>
+<%
+  Object.keys(it.models).forEach(function(modelname) { 
+    const newmodelname = toTypeName(it.resourceName,modelname)
+  %>  
+
+export const Default<%=newmodelname%> = (uuid:string)=>{
     <% let model = it.models[modelname].model%>    
     <% if(model['_id'] && model['code'] && model['label']){%>
       return undefined
@@ -14,8 +17,6 @@ export const Default<%=modelname%> = (uuid:string)=>{
     return {
         <% if(it.models?.[modelname] && it.models[modelname]?.model && Object.keys(it.models[modelname]?.model).length === 0) { %>
           // Dynamic Object
-        <% } else { %>
-          _id : uuid,
         <% } %>
 
 
@@ -25,6 +26,7 @@ export const Default<%=modelname%> = (uuid:string)=>{
 
           <%if(key=='_id'){ %>
           // skip cause already hardcoded
+            _id : uuid,
           <%}else if(key=='doctype'){ %>
             doctype : '<%=it.doctype.toUpperCase()%>',
           <%}else if(key=='tenantId'){ %>
@@ -42,14 +44,14 @@ export const Default<%=modelname%> = (uuid:string)=>{
           <%} else if(field.type=='boolean' ){%> 
               <%=key%> :false ,
           <%} else if(typeof field=='string'){%>
-            <%=key%> : Default<%= field  %>(''), //<%= field%> 
+            <%=key%> : Default<%= toTypeName(it.resourceName,field) %>(''), //<%= field%> 
           <%} else if(field.type=='string'){%>
               <%=key%> : '<%= field.default  %>',
 
             <%} else if(Array.isArray(field) && ['string','integer','number','boolean'].includes(field[0])) {%>
-              <%=key%> : <<%=field[0]%>[]>[],  //typeof field == array     <%~JSON.stringify(field)%> 
+              <%=key%> : <<%=field[0]%>[]>[],  //typeof field == array   %> 
             <%} else if(Array.isArray(field)) {%>
-              <%=key%> : [Default<%=field[0]%>(randomUUID())],  //typeof field == array     <%~JSON.stringify(field)%>    
+              <%=key%> : [Default<%=  toTypeName(it.resourceName,field[0])  %>(randomUUID())],  //typeof field == array   %>    
             <%} else {%>
               <%=key%> : <%=field.default%>,  //else <%= typeof field %>
           <%}%>