@simitgroup/simpleapp-generator 1.0.29 → 1.0.32

package/src/framework.ts

@@ -20,6 +20,11 @@ let config = {
         "OAUTH2_CLIENTID":"client-id",
         "OAUTH2_CLIENTSECRET":"client-secret-value",
         "AUTH_SECRET_KEY":"my-secret",        
+    },
+    "bpmnsetting":{
+        "BPMN_HOST":"127.0.0.1",
+        "BPMN_PORT":"9000",
+        "BPMN_API_KEY":"12345"
     }
 }
 
@@ -61,7 +66,7 @@ export const prepareNest = (callback:Function)=>{
     if(!fs.existsSync(`${targetfolder}/.env`)){
 
     
-        exec(`cd ${targetfolder};pnpm install --save nest-keycloak-connect keycloak-connect @nestjs/serve-static jsonwebtoken axios @darkwolf/base64url json-schema @wearenova/mongoose-tenant @nestjs/swagger @nestjs/mongoose mongoose  ajv ajv-formats @nestjs/config`,async (error, stdout, stderr)=>{
+        exec(`cd ${targetfolder};pnpm install --save 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})
@@ -101,7 +106,7 @@ export const prepareNuxt = (callback:Function)=>{
         exec(`cd ${targetfolder};pnpm install;pnpm install -D @sidebase/nuxt-auth @nuxt/ui @types/node @vueuse/nuxt @sidebase/nuxt-auth @vueuse/core nuxt-security prettier `, (error, stdout, stderr)=>{                
             //;pnpm install    
             console.log(error, stdout, stderr)
-                exec(`cd ${targetfolder};pnpm install --save next-auth@4.21.1 @darkwolf/base64url @nuxt/ui ajv dotenv @fullcalendar/core @fullcalendar/vue3 quill uuid ajv-formats primeflex primeicons prettier primevue axios json-schema mitt @simitgroup/simpleapp-vue-component@latest`, (error, stdout, stderr)=>{                
+                exec(`cd ${targetfolder};pnpm install --save @darkwolf/base64url next-auth@4.21.1 @darkwolf/base64url @nuxt/ui ajv ajv-formats ajv-errors dotenv @fullcalendar/core @fullcalendar/vue3 quill uuid primeflex primeicons prettier primevue axios json-schema mitt @simitgroup/simpleapp-vue-component@latest`, (error, stdout, stderr)=>{                
                 console.log(error, stdout, stderr)
                 
                 fs.mkdirSync(`${targetfolder}/assets/css/`,{recursive:true})
@@ -159,7 +164,7 @@ export const prettyNuxt = ()=>{
                         
 }
 export const prettyNest = ()=>{
-    exec(`cd ${config.backendFolder};npm run format`)
+    exec(`cd ${config.backendFolder};npm run format;npx prettier --write src/dicts/foreignkeys.json`)
 }
 
 export const prepareOpenApiClient = () => {

package/src/generate.ts

@@ -26,20 +26,21 @@ export const initialize =  async (defFolder:string,backendfolder:string,frontend
   let activatemodules:ModuleObject[]=[]
   // 
   const files = readdirSync(defFolder)
+  // log.warn("all schemas:",files)
   // readdir(defFolder, (err, files) => {
     // files.forEach((file) => {
     for(let j = 0; j< files.length;j++){
       const file = files[j]
+      log.info(`Load `+clc.green(file))
       const filearr = file.split('.');
       let rendertype = 'basic';
       const docname = filearr[0].toLowerCase();
       const doctype = filearr[1].toLowerCase();
-      const jsonstring = readFileSync(defFolder +path.sep+ file, 'utf-8');
-      const jsondata = JSON.parse(jsonstring);
+      const jsonstring = readFileSync(defFolder +path.sep+ file, 'utf-8');      
       let allmodels: ChildModels = {} as ChildModels;
       
-      if (file.endsWith(extjsonschema)) {
-        log.info(`Load `+clc.green(file))
+      if (file.endsWith(extjsonschema)) {  
+        const jsondata = JSON.parse(jsonstring);      
         rendertype = 'basic';
         jsonschemas[docname] = jsondata;
         // foreignkeys:
@@ -96,6 +97,7 @@ const generate = (
       models: allmodels,
       autocompletecode:allmodels[capitalizeFirstLetter(docname)].codeField,
       autocompletename:allmodels[capitalizeFirstLetter(docname)].nameField,
+      moreAutoComplete:allmodels[capitalizeFirstLetter(docname)].moreAutoComplete,
       schema: allmodels[capitalizeFirstLetter(docname)].model,
       apiSchemaName: capitalizeFirstLetter(docname), //capitalizeFirstLetter(doctype) + 'ApiSchema',
       typename: capitalizeFirstLetter(docname),
@@ -108,6 +110,10 @@ const generate = (
       backEndCode: '',
       controllerCode:'',
       apiSchemaCode:'',
+      docStatusSettings:allmodels[capitalizeFirstLetter(docname)].docStatusSettings,
+      apiSettings:allmodels[capitalizeFirstLetter(docname)].apiSettings,
+      requireautocomplete:allmodels[capitalizeFirstLetter(docname)].requireautocomplete,
+      isolationtype:allmodels[capitalizeFirstLetter(docname)].isolationtype
     };
 
     // console.log('generate 2', JSON.stringify(variables));
@@ -269,8 +275,9 @@ const prepareEnvironments = (backendfolder:string,frontendfolder:string)=>{
   
   copyFileSync(`${constants.templatedir}/nest/SimpleAppService.eta`,`${targetfolder}/SimpleAppService.ts`)
   copyFileSync(`${constants.templatedir}/nest/SimpleAppController.eta`,`${targetfolder}/SimpleAppController.ts`)
+  copyFileSync(`${constants.templatedir}/nest/Workflow.eta`,`${targetfolder}/Workflow.ts`)
   copyFileSync(`${constants.templatedir}/nest/TenantMiddleware.eta`,`${targetfolder}/TenantMiddleware.ts`)
-  copyFileSync(`${constants.templatedir}/nest/User.eta`,`${targetfolder}/User.ts`)
+  copyFileSync(`${constants.templatedir}/nest/UserProvider.eta`,`${targetfolder}/UserProvider.ts`)
 
   //copy over frontend apiabstract class
   // copyFileSync(`${constants.templatedir}/nuxt.apigateway.eta`,`${targetfrontendfolder}/[...].ts`)
@@ -289,6 +296,12 @@ const finalize=(modules:ModuleObject[],backendfolder:string,frontendfolder:strin
   const eta = new Eta({views:constants.templatedir});
   const txtMainModule = eta.render('./nest/app.module.eta', modules);
   writeFileSync(`${backendfolder}/src/app.module.ts`, txtMainModule);
+  
+  const txtMainService = eta.render('./nest/app.service.eta', modules);
+  writeFileSync(`${backendfolder}/src/app.service.ts`, txtMainService);
+
+  const txtAppController = eta.render('./nest/app.controller.eta', modules);
+  writeFileSync(`${backendfolder}/src/app.controller.ts`, txtAppController);
 
   const foreignkeyfile =`${backendfolder}/src/dicts/foreignkeys.json`
   writeFileSync(foreignkeyfile, JSON.stringify(foreignkeys));

package/src/processors/jsonschemabuilder.ts

@@ -13,28 +13,64 @@ import {
   ChildModels,
   SchemaModel,
   TypeForeignKey,
-  TypeForeignKeyCatalogue
+  TypeForeignKeyCatalogue,
+  DocSetting,ApiSetting,DocStatusSetting,
+  
 } from '../type';
 import { json } from 'stream/consumers';
 const log: Logger<ILogObj> = new Logger();
+
 const X_DOCUMENT_NO='x-document-no'
+const X_DOCUMENT_LABEL='x-document-label'
+const X_AUTOCOMPLETE_FIELD='x-autocomplete-field'
 const X_DOCUMENT_NAME='x-document-name'
+const X_DOCUMENT_TYPE='x-document-type'
+const X_COLLECTION_NAME='x-document-collection'
+const X_DOCUMENT_STATUS='x-document-status'
+const X_DOCUMENT_API='x-document-api'
+const X_IGNORE_AUTOCOMPLETE='x-ignore-autocomplete'
 const FOREIGNKEY_PROPERTY='x-foreignkey'
+const X_TEL_NO='x-tel'
+const X_ISOLATION_TYPE='x-isolation-type'
+
+let docSetting:DocSetting={} as DocSetting
+
+
+
 let allmodels: ChildModels = {};
 let fullschema={}
-let fieldAutoCompleteCode=''
-let fieldAutoCompleteName=''
+// let fieldAutoCompleteCode=''
+// let fieldAutoCompleteName=''
+let moreAutoComplete:string[]=[]
+
+
+const newDocSetting=(doctype:string,docname:string):DocSetting=>{
+  return {
+    docName:docname,  //done
+    docType:doctype,  //done
+    colDocNo:'',      //done
+    colDocLabel:'',   //done
+    collectionName:docname, //done
+    autocompleteFields:[],
+    docStatusSettings:[],
+    apiSettings:[],
+    requireautocomplete:true,
+    isolationtype:"org"
 
+  }
+}
 export const readJsonSchemaBuilder = async (
   doctype: string,
   docname: string,
   orijsondata:JSONSchema7,
   allforeignkeys:TypeForeignKeyCatalogue
 ) => {
-  
-  fieldAutoCompleteCode=''
-  fieldAutoCompleteName=''
+  docSetting=newDocSetting(doctype,docname)
+  // fieldAutoCompleteCode=''
+  // fieldAutoCompleteName=''
+  moreAutoComplete=[]
   allmodels = {};
+  
   const validateddata: JSONSchema7 = { ...orijsondata };
   let schema: SchemaModel | SchemaModel[];
   const  tmpjsondata = await $RefParser.dereference(orijsondata).then((schema)=>{
@@ -52,12 +88,12 @@ export const readJsonSchemaBuilder = async (
   } else if (jsondata.type == 'array') {
     throw(`unsupport array type for ${docname}.${doctype}`)
   }
-  if(fieldAutoCompleteCode=='') {
+  if(docSetting.colDocNo=='' && docSetting.requireautocomplete) {
     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: '${X_DOCUMENT_NAME}'}`)
+  if(docSetting.colDocLabel=='' && docSetting.requireautocomplete) {
+    log.error(`you shall define 1 field with format: '${X_DOCUMENT_LABEL}'}`)
     throw "missing field format"
   }
   
@@ -82,6 +118,50 @@ const processObject =  (doctype: string,
     jsondata.properties['updated'] = {type: 'string',description: 'Control value, dont edit it',};
     jsondata.properties['createdby'] = {type: 'string',description: 'Control value, dont edit it',};
     jsondata.properties['updatedby'] = {type: 'string',description: 'Control value, dont edit it',};
+
+    if(jsondata[X_ISOLATION_TYPE] && ['none','tenant','org','branch'].includes(jsondata[X_ISOLATION_TYPE])  ){      
+      docSetting.isolationtype=jsondata[X_ISOLATION_TYPE]
+    }
+    if(jsondata[X_IGNORE_AUTOCOMPLETE] && jsondata[X_IGNORE_AUTOCOMPLETE]==true){
+      docSetting.requireautocomplete=false
+    }
+    if(jsondata[X_DOCUMENT_API] && Array.isArray(jsondata[X_DOCUMENT_API])){
+      log.warn("x-document-api exists:")
+      log.warn(jsondata[X_DOCUMENT_API])
+      for(let i=0; i<jsondata[X_DOCUMENT_API].length;i++){
+        const tmp:ApiSetting =jsondata[X_DOCUMENT_API][i]
+        if(!tmp.action){
+          const errmsg = "x-document-api defined but undefine property 'action'"
+          log.error(errmsg)
+          
+          throw errmsg
+        }
+        if(!tmp.method){
+          const errmsg = "x-document-api defined but undefine property 'method'"
+          log.error(errmsg)
+          throw errmsg
+        }
+        docSetting.apiSettings.push(tmp)
+      }
+    }
+      if(jsondata[X_DOCUMENT_STATUS] && Array.isArray(jsondata[X_DOCUMENT_STATUS])){
+        for(let i=0; i<jsondata[X_DOCUMENT_STATUS].length;i++){
+          const tmp:DocStatusSetting =jsondata[X_DOCUMENT_STATUS][i]
+          if(tmp.statusCode ===undefined){
+            const errmsg = "x-document-status defined but undefine property 'statusCode'"
+            log.error(errmsg)
+            throw errmsg
+          }
+          if(!tmp.statusName ===undefined){
+            const errmsg = "x-document-status defined but undefine property 'statusName'"
+            log.error(errmsg)
+            throw errmsg            
+          }
+          docSetting.docStatusSettings.push(tmp)
+        }
+     }
+
+
     return genSchema(
       capitalizeFirstLetter(docname),
       'object',
@@ -90,12 +170,8 @@ const processObject =  (doctype: string,
     );
 }
 
-const genSchema = (
-  docname: string,
-  schematype: string,
-  jsondata: JsonSchemaProperties,//JSONSchema7,//|JsonSchemaProperties|JSONSchema7Definition,
-  requiredlist: string[] | undefined,
-): SchemaModel => {
+const genSchema = (docname: string,schematype: string,jsondata: JsonSchemaProperties,
+  requiredlist: string[] | undefined): SchemaModel => {
   const newmodel: SchemaModel = {};
   const props = Object.getOwnPropertyNames(jsondata ??{});
   // console.log('==== jsondata', jsondata);
@@ -112,11 +188,29 @@ const genSchema = (
     const isrequired = requiredlist && requiredlist.includes(key);
     const newName: string = docname + capitalizeFirstLetter(key);
    if(obj.format && obj.format==X_DOCUMENT_NO){
-    fieldAutoCompleteCode=key
+    docSetting.colDocNo=key
+    obj.minLength=obj.minLength??1
+    jsondata[key]['minLength']=obj.minLength
+   }
+   if(obj.format && obj.format==X_DOCUMENT_LABEL){
+    docSetting.colDocLabel=key
+    obj.minLength=obj.minLength??1
+    jsondata[key]['minLength']=obj.minLength
    }
-   if(obj.format && obj.format==X_DOCUMENT_NAME){
-    fieldAutoCompleteName=key
+   
+   if(obj[X_COLLECTION_NAME]){
+    docSetting.collectionName=key    
    }
+
+
+   if(obj[X_AUTOCOMPLETE_FIELD]){
+    docSetting.autocompleteFields.push(key)
+   }
+   
+
+  //  if(obj.format && obj.format==X_TEL_NO){
+  //   obj.pattern=obj.pattern ?? '/^\d{7,15}$/gm'
+  //  }
   //  if (obj.type == 'object' && obj.items  ){
   //   console.log("Refer to another object",docname,': ',key,obj,obj.items)
     
@@ -132,11 +226,14 @@ const genSchema = (
         // console.warn("FOREIGNKEY_PROPERTY exists",FOREIGNKEY_PROPERTY,obj[FOREIGNKEY_PROPERTY])
         const masterdatacollection = obj[FOREIGNKEY_PROPERTY]
         const clientdatacollection = docname.toLowerCase()
-        const foreignkeyidentity= key+'._id'
+        const foreignkeyidentity= key
         if(!foreignkeys[masterdatacollection]){
           let tmp:TypeForeignKey = {} as TypeForeignKey
           tmp[clientdatacollection]=[foreignkeyidentity]
           foreignkeys[masterdatacollection] = tmp
+        }
+        else if(!foreignkeys[masterdatacollection][clientdatacollection]){
+          foreignkeys[masterdatacollection][clientdatacollection]=[foreignkeyidentity]
         }else{
           foreignkeys[masterdatacollection][clientdatacollection].push(foreignkeyidentity)
         }
@@ -159,7 +256,18 @@ const genSchema = (
       // console.log(key,'--------newmodel',obj, newmodel[key]);
     }
   }
-  allmodels[docname] = { type: schematype, model: newmodel,codeField: fieldAutoCompleteCode ,nameField: fieldAutoCompleteName };
+  allmodels[docname] = { 
+    type: schematype, 
+    model: newmodel,
+    codeField: docSetting.colDocNo ,
+    nameField: docSetting.colDocLabel,
+    moreAutoComplete:docSetting.autocompleteFields,
+    docStatusSettings:docSetting.docStatusSettings,
+    apiSettings:docSetting.apiSettings,
+    requireautocomplete:docSetting.requireautocomplete,
+    isolationtype:docSetting.isolationtype
+  };
+  // console.warn(docname,docSetting.isolationtype)
   return newmodel;
 };
 
@@ -198,3 +306,4 @@ const getField = (
   }
   return f;
 };
+

package/src/type.ts

@@ -1,6 +1,16 @@
 import { JSONSchema7, JSONSchema7Definition } from 'json-schema';
 export type ChildModels = {
-  [key: string]: { type: string; model: SchemaModel,codeField:string,nameField:string };
+  [key: string]: { 
+    type: string; 
+    model: SchemaModel,
+    codeField:string,
+    nameField:string,
+    moreAutoComplete:string[],
+    docStatusSettings:DocStatusSetting[],
+    apiSettings:ApiSetting[],
+    requireautocomplete: boolean
+    isolationtype:string
+  };
 };
 export enum Fieldtypes {
   'string' = 'string',
@@ -51,6 +61,7 @@ doctype: string
 models: ChildModels
 autocompletecode:string
 autocompletename:string
+moreAutoComplete:string[]
 schema: SchemaModel
 apiSchemaName: string
 typename: string
@@ -62,4 +73,37 @@ frontEndCode: string
 backEndCode: string
 controllerCode:string
 apiSchemaCode:string
+docStatusSettings:DocStatusSetting[],
+apiSettings:ApiSetting[],
+requireautocomplete:boolean,
+isolationtype:string
+}
+
+export type DocStatusSetting = {
+  statusCode:string,
+  statusName:string,
+  allowApi:string[],
+  readonly?:boolean,
+  description?:''
+}
+
+export type ApiSetting = {
+  method:string,
+  action:string,  
+  setDocStatus?:'',
+  description?:'',
+  bpmnApi?:'',
+  data?:any
+}
+export type DocSetting = {
+  docName:string,
+  docType:string,
+  colDocNo:string,
+  colDocLabel:string,
+  collectionName:string,
+  autocompleteFields:string[],
+  docStatusSettings:DocStatusSetting[],
+  apiSettings:ApiSetting[],
+  requireautocomplete:boolean
+  isolationtype:string
 }

package/templates/basic/controller.eta

@@ -2,7 +2,7 @@
  * 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
+ * last change 2023-09-18
  * Author: Ks Tan
  */
 import {
@@ -59,20 +59,6 @@ export class <%= it.typename %>Controller extends SimpleAppController<
   }
 
 
-  @Get(':id')
-  @ApiResponse({
-    status: 200,
-    description: 'Founds',
-    type: <%= it.fullApiSchemaName%>
-  })
-  @ApiResponse({ status: 404, description: 'Document not found' })
-  @ApiResponse({ status: 500, description: 'Internal error' })
-  @ApiOperation({ operationId: 'runFindOne' })
-  async findOne(@Param('id') id: string) {    
-    return await this._findOne(id);
-  }
-  
-
 
   @Post()
   @ApiResponse({
@@ -102,6 +88,38 @@ export class <%= it.typename %>Controller extends SimpleAppController<
     return await this._search(data)
   }
 
+
+/***************************** x-document-api definations *****************************************/
+
+<% for(let i=0;i<it.apiSettings.length;i++){%>
+<% let api = it.apiSettings[i] %>
+<%~ `@${capitalizeFirstLetter(api.method)}(':id/${api.action}')`%>
+@ApiResponse({status: 200,description: '<%=api.description%>'})
+@ApiOperation({ operationId: 'exec<%=capitalizeFirstLetter(api.action)%>' })
+async exec<%=capitalizeFirstLetter(api.action)%>(@Param('id') id: string){
+  return await this.service.exec<%=capitalizeFirstLetter(api.action)%>(id)
+} 
+<%}%>
+
+/*****************************customized code begin here *****************************************/
+  <%~ it.controllerCode %>
+
+/*****************************customized code end here *****************************************/
+
+  @Get(':id')
+  @ApiResponse({
+    status: 200,
+    description: 'Founds',
+    type: <%= it.fullApiSchemaName%>
+  })
+  @ApiResponse({ status: 404, description: 'Document not found' })
+  @ApiResponse({ status: 500, description: 'Internal error' })
+  @ApiOperation({ operationId: 'runFindOne' })
+  async findOne(@Param('id') id: string) {    
+    return await this._findOne(id);
+  }
+  
+
   @Put(':id')
   @ApiResponse({
     status: 200,
@@ -129,7 +147,6 @@ export class <%= it.typename %>Controller extends SimpleAppController<
   }
  
 
-   /*****************************customized code begin here *****************************************/
-  <%~ it.controllerCode %>
+   
  
 }

package/templates/basic/model.eta

@@ -29,4 +29,7 @@ const schemasetting = {
 };
 
 export const <%= it.doctype %>MongoSchema = new Schema(schemasetting,{collection: '<%= it.name %>'})
-.index({<%=it.autocompletecode%>:1,orgId:1},{unique:true});
+<%if(it.requireautocomplete){%>
+.index({<%=it.autocompletecode%>:1,orgId:1},{unique:true})
+.index({<%=it.autocompletename%>:1,orgId:1});
+<%}%>

package/templates/basic/pageindex.vue.eta

@@ -9,9 +9,11 @@
 <% let skipcolumns = ['_id','createdby','created','updatedby','updated','orgId','branchId','tenantId','doctype'] %>
 
   import { <%= it.typename %>Doc } from "../../../simpleapp/simpleappdocs/<%= it.typename %>Doc";
+  import SimpleAppDatatable from "@simitgroup/simpleapp-vue-component/src/components/SimpleAppDatatable.vue";
+  import {InputTableColumnType,InputTableColumn} from "@simitgroup/simpleapp-vue-component/src/type";
   const { $event, $listen } = useNuxtApp();
   const route = useRoute()  
-  const doc = new <%= it.typename %>Doc(route.params.xorg,$event, $listen);
+  const doc = new <%= it.typename %>Doc(route.params.xorg.toString(),$event, $listen);
   const documentpath = `/${route.params.xorg}/<%= it.name %>`;
   const data = doc.getReactiveData();
   const columns = [
@@ -21,6 +23,20 @@
         <%} else if(['string','number','integer'].indexOf(obj.type)>=0){%>'<%=key%>',<%}%>
     <%})%>
     ]
+  //prepare subtable if exists
+  <%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
+    <% let obj=it.jsonschema.properties[key] %>
+    
+    <% if(obj.type=='array' && obj.items.type=='object' && obj.items['properties']){ %>
+        <%let tablefields = Object.keys(obj.items.properties) %>
+        const <%=it.name%>_<%=key%> :InputTableColumn[] = [
+        <% for(let a=0;a<tablefields.length;a++){%>
+              {type:InputTableColumnType.field, field:'<%= tablefields[a] %>',style:'width:10%'},      
+        <%}%>
+        ]  
+    <%}%>
+  <%})%>
+  
 </script>
 <template>
     <div>    
@@ -39,7 +55,7 @@
         <% } else if(obj.type=='array'  && obj.items && obj.items.type =='string' ){ %>              
             <SimpleAppChip   autofocus :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>
         <% } else if(obj.type=='object'  && typeof obj['x-foreignkey']!='undefined'){ %>              
-            <SimpleAppAutocomplete  autofocus :setting="o.getField('#/properties/<%= key %>')"
+            <SimpleAppAutocomplete :setting="o.getField('#/properties/<%= key %>')"
                     v-model="data.<%= key %>" optionLabel="label" :remote-src="getAutocomplete('<%=obj['x-foreignkey']%>')"/>
         <% } else if(obj.type=='string'){ %>            
                 <% if(obj.format=='date'){ %>
@@ -55,9 +71,48 @@
                 <% } else {%>
                         <SimpleAppText   autofocus :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
                 <% }%>  
-        <% } else { %>           
-            <SimpleAppText   autofocus :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
-        <% }%>
+        <% } else if(obj.type=='object' && obj.properties){ %>                  
+            <SimpleAppValue :setting="o.getField('#/properties/<%= key %>')">
+            <%Object.keys(obj.properties).forEach(function(skey) { %>
+                <% let sobj=obj.properties[skey] %>
+                <% let fieldpath=`o.getField('#/properties/${key}/properties/${skey}')` %>
+                <% let vmodel=`data.${key}.${skey}` %>
+                <% let instancePath=`#/${key}/${skey}` %>
+
+                <% if(sobj.type=='boolean'){ %>
+                    <SimpleAppCheckbox  autofocus :setting="<%~fieldpath%>" instancePath="<%=instancePath%>" v-model="<%= vmodel %>"/>
+                <% } else if(sobj.type=='number' || sobj.type=='integer'){ %>
+                    <SimpleAppNumber  autofocus :setting="<%~fieldpath%>" instancePath="<%=instancePath%>" v-model="<%= vmodel %>"/>  
+                <% } else if(sobj.type=='array'  && sobj.items && sobj.items.type =='string' ){ %>              
+                    <SimpleAppChip   autofocus :setting="<%~fieldpath%>" instancePath="<%=instancePath%>" v-model="<%= vmodel %>"/>
+                <% } else if(sobj.type=='object'  && typeof sobj['x-foreignkey']!='undefined'){ %>              
+                    <SimpleAppAutocomplete  autofocus :setting="<%~fieldpath%>" instancePath="<%=instancePath%>"
+                            v-model="<%= vmodel %>" optionLabel="label" :remote-src="getAutocomplete('<%=sobj['x-foreignkey']%>')"/>
+                <% } else if(sobj.type=='string'){ %>            
+                         <% if(sobj.format=='date'){ %>
+                            <SimpleAppText type="<%=sobj.format%>" instancePath="<%=instancePath%>" autofocus :setting="<%~fieldpath%>" v-model="<%= vmodel %>"/>  
+                        <% } else if(sobj.format=='x-text'){ %>
+                            <SimpleAppTextarea :setting="<%~fieldpath%>'" instancePath="<%=instancePath%>" v-model="<%= vmodel %>"/>  
+                        <% } else if(sobj.format=='x-html'){ %>
+                            <SimpleAppEditor editorStyle="height: 320px" instancePath="<%=instancePath%>" :setting="<%=fieldpath%>" v-model="<%= vmodel %>"/>  
+                        <% } else if(sobj.format=='email'){ %>
+                            <SimpleAppText  autofocus type="<%=~obj.type%>" instancePath="<%=instancePath%>" :setting="<%=fieldpath%>" v-model="<%= vmodel %>"/>  
+                        <% } else if(sobj.enum){ %>
+                            <SimpleAppRadio  autofocus :setting="<%~fieldpath%>" instancePath="<%=instancePath%>" v-model="<%= vmodel %>"/>
+                        <% } else {%>
+                                <SimpleAppText   autofocus :setting="<%~fieldpath%>" instancePath="<%=instancePath%>" v-model="<%= vmodel %>"/>  
+                        <% }%> 
+                <% } %>
+            <%})%>   
+            </SimpleAppValue>            
+        <% } else if(obj.type=='array' && obj.items.type=='object'){%>
+            <button @click="doc.add<%=key%>()" type="button">+</button>
+            <SimpleAppInputTable :getAutocomplete="getAutocomplete" :getField="o.getField"
+                :setting="o.getField('#/properties/<%=key%>')" #default="row" v-model="data.<%=key%>" :columns="<%=it.name%>_<%=key%>"></SimpleAppInputTable>
+        <% } else{%>
+            <!-- Can auto generate <%=obj.key %> -->  
+            <!--  <%~ JSON.stringify(obj) %>-->  
+        <%}%>
       <%})%>   
       
     </CrudSimple>

package/templates/basic/service.eta

@@ -6,11 +6,12 @@
  * last change 2023-09-09
  * Author: Ks Tan
  */
+import { UserProvider } from '../../class/UserProvider'
 import { Injectable } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 import {<%= it.typename%>JsonSchema } from './<%= it.doctype %>.jsonschema'
-import { SimpleAppService,IsolationType } from '../../class/SimpleAppService';
+import { SimpleAppService,IsolationType,HookType } from '../../class/SimpleAppService';
 import { <%Object.keys(it.models).forEach(function(key) { %> <%=key %>, <%})%> }  from './<%= it.doctype %>.type';
 
 
@@ -20,11 +21,36 @@ export class <%= it.typename %>Service extends SimpleAppService<<%= it.typename
   protected documentIdentityName='<%~ it.autocompletename %>'
     constructor(@InjectModel('<%= it.name %>')  mydoc: Model<<%= it.typename %>>,
   ) {
-    super(mydoc,IsolationType.org);
+    super('<%= it.doctype %>','<%= it.name %>',mydoc,IsolationType.<%=it.isolationtype%>);
     this.setSchema(<%= it.typename%>JsonSchema)
+    
+    <%if(it.moreAutoComplete.length>0){%>
+    this.addAutoCompleteField({
+        <%Object.keys(it.moreAutoComplete).forEach(function(key) { %>
+          <% let f=it.moreAutoComplete[key] %>
+          <%~ `${f}: '${f}'`,   %>
+        <%})%>
+      })
+    <%}%>
+    
   }
 
-  
+  /***************************** x-document-api definations *****************************************/
+
+  <%for(let i=0;i<it.apiSettings.length;i++){%>
+  <% let api = it.apiSettings[i] %>
+  async exec<%=capitalizeFirstLetter(api.action)%>(id:string){
+    <%if(api.bpmn!==undefined){%>
+    return await this.executeWorkFlow(id,"<%=api.bpmn%>","<%=api.setDocumentStatus%>")
+    <%}else if (api.setDocumentStatus !== undefined){%>
+    return await this.setDocumentStatus(id,'<%=api.setDocumentStatus%>')
+    <%}else {%>
+      return Promise.resolve("unknown action")
+    <%}%>
+    
+  } 
+  <%}%>
+
   /*****************************customized frontend + backend code*****************************************/
     
   <%~ it.bothEndCode %>