@simitgroup/simpleapp-generator 1.0.31 → 1.0.33

package/documentation/stack.drawio

@@ -0,0 +1,106 @@
+<mxfile host="65bd71144e">
+    <diagram id="g2NRvyCy43iObyQwmQN3" name="Page-1">
+        <mxGraphModel dx="1092" dy="595" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="827" pageHeight="1169" math="0" shadow="0">
+            <root>
+                <mxCell id="0"/>
+                <mxCell id="1" parent="0"/>
+                <mxCell id="8" value="" style="edgeStyle=none;html=1;" edge="1" parent="1" source="2" target="7">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="11" style="edgeStyle=none;html=1;" edge="1" parent="1" source="2" target="10">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="13" value="" style="edgeStyle=none;html=1;" edge="1" parent="1" source="2" target="12">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="37" style="edgeStyle=none;html=1;" edge="1" parent="1" source="2" target="36">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="2" value="npm" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+                    <mxGeometry x="230" y="40" width="110" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="4" value="Nuxt Frontend" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+                    <mxGeometry x="80" y="140" width="200" height="200" as="geometry"/>
+                </mxCell>
+                <mxCell id="7" value="simpleapp-vue-component" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="4">
+                    <mxGeometry x="30" y="40" width="110" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="21" style="edgeStyle=none;html=1;" edge="1" parent="4" source="14" target="19">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="14" value="pages &amp;amp; client libs" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="4">
+                    <mxGeometry x="40" y="90" width="110" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="19" value="api-client" style="whiteSpace=wrap;html=1;rounded=1;" vertex="1" parent="4">
+                    <mxGeometry x="40" y="150" width="75" height="35" as="geometry"/>
+                </mxCell>
+                <mxCell id="5" value="Nest Backend" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+                    <mxGeometry x="310" y="140" width="200" height="200" as="geometry"/>
+                </mxCell>
+                <mxCell id="23" value="mongoose-schema" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="5">
+                    <mxGeometry x="40" y="155" width="110" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="24" value="doc-service" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="5">
+                    <mxGeometry x="40" y="125" width="110" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="25" value="api-countroller" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="5">
+                    <mxGeometry x="40" y="95" width="110" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="36" value="backend-libs" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="5">
+                    <mxGeometry x="40" y="30" width="110" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="6" value="Nest BPMN" style="swimlane;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+                    <mxGeometry x="530" y="140" width="200" height="200" as="geometry"/>
+                </mxCell>
+                <mxCell id="10" value="bpmn-server" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="6">
+                    <mxGeometry x="30" y="40" width="110" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="15" value="" style="edgeStyle=none;html=1;entryX=0.75;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="12" target="4">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="17" value="" style="edgeStyle=none;html=1;" edge="1" parent="1" source="12" target="16">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="26" style="edgeStyle=none;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="12" target="5">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="27" style="edgeStyle=none;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="12" target="6">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="35" value="" style="edgeStyle=none;html=1;" edge="1" parent="1" source="12" target="34">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="12" value="simpleapp-generator" style="rounded=1;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+                    <mxGeometry x="250" y="430" width="110" height="30" as="geometry"/>
+                </mxCell>
+                <mxCell id="20" style="edgeStyle=none;html=1;entryX=0.75;entryY=1;entryDx=0;entryDy=0;" edge="1" parent="1" source="16" target="19">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="16" value="openapi-generator" style="whiteSpace=wrap;html=1;rounded=1;" vertex="1" parent="1">
+                    <mxGeometry x="140" y="380" width="75" height="35" as="geometry"/>
+                </mxCell>
+                <mxCell id="32" style="edgeStyle=none;html=1;" edge="1" parent="1" source="28" target="12">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="28" value="jsonschema" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+                    <mxGeometry x="175" y="550" width="120" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="31" style="edgeStyle=none;html=1;" edge="1" parent="1" source="29" target="12">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="29" value="bpmn" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+                    <mxGeometry x="340" y="550" width="120" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="33" style="edgeStyle=none;html=1;entryX=0.916;entryY=1.003;entryDx=0;entryDy=0;entryPerimeter=0;" edge="1" parent="1" source="30" target="12">
+                    <mxGeometry relative="1" as="geometry"/>
+                </mxCell>
+                <mxCell id="30" value="UI Design (One day)" style="ellipse;whiteSpace=wrap;html=1;" vertex="1" parent="1">
+                    <mxGeometry x="490" y="550" width="120" height="80" as="geometry"/>
+                </mxCell>
+                <mxCell id="34" value="mobile app (One day)" style="whiteSpace=wrap;html=1;rounded=1;" vertex="1" parent="1">
+                    <mxGeometry x="600" y="415" width="120" height="60" as="geometry"/>
+                </mxCell>
+            </root>
+        </mxGraphModel>
+    </diagram>
+</mxfile>

package/package.json

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

package/src/framework.ts

@@ -6,7 +6,8 @@ import  {Eta}  from 'eta';
 const log: Logger<ILogObj> = new Logger();
 
 let config = {
-    "definationsFolder":"./definations",
+    "jsonschemaFolder":"./jsonschemaFolder",
+    "bpmnFolder":"./bpmn",
     "backendFolder":"./mybackend", 
     "backendPort":"8000",
     "mongoConnectStr":'mongodb://<user>:<pass>@<host>:<port>/<db>?authMechanism=DEFAULT',
@@ -20,6 +21,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 +67,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 ajv-errors @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 +107,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 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)=>{                
+                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})

package/src/generate.ts

@@ -15,16 +15,22 @@ const path = require('path');
 import {mkdirSync, readdir,readFileSync,writeFileSync,existsSync,copyFileSync, readdirSync} from 'fs'
 const { Eta } = require('eta');
 const { capitalizeFirstLetter }= require('./libs');
+const X_DOCUMENT_TYPE='x-document-type'
+const X_DOCUMENT_NAME='x-document-name'
+const X_COLLECTION_NAME='x-collection-name'
 const extFb = '.xfb.json';
 const extHfb = '.xhfb.json';
 const extjsonschema = '.jsonschema.json';
 let jsonschemas = {};
 const docs = [];
 
-export const initialize =  async (defFolder:string,backendfolder:string,frontendfolder:string,callback:Function) => {
+export const initialize =  async (defFolder:string,bpmnFolder:string,backendfolder:string,frontendfolder:string,callback:Function) => {
   prepareEnvironments(backendfolder,frontendfolder)
   let activatemodules:ModuleObject[]=[]
   // 
+  /*
+  load available bpmn into array
+   */
   const files = readdirSync(defFolder)
   // log.warn("all schemas:",files)
   // readdir(defFolder, (err, files) => {
@@ -34,19 +40,21 @@ export const initialize =  async (defFolder:string,backendfolder:string,frontend
       log.info(`Load `+clc.green(file))
       const filearr = file.split('.');
       let rendertype = 'basic';
-      const docname = filearr[0].toLowerCase();
-      const doctype = filearr[1].toLowerCase();
+      let docname = filearr[0].toLowerCase();
+      let doctype = filearr[1].toLowerCase();
+    
       const jsonstring = readFileSync(defFolder +path.sep+ file, 'utf-8');      
       let allmodels: ChildModels = {} as ChildModels;
       
       if (file.endsWith(extjsonschema)) {  
-        const jsondata = JSON.parse(jsonstring);      
+        const jsondata = JSON.parse(jsonstring);    
         rendertype = 'basic';
         jsonschemas[docname] = jsondata;
+
         // foreignkeys:
         // tmpforeignkeys:TypeForeignKey
         allmodels = await readJsonSchemaBuilder(doctype, docname, jsondata,foreignkeys);
-         
+        
         //foreignkeycatalogues
         // foreignkeys
         generate(docname, doctype, rendertype, allmodels,backendfolder,frontendfolder);        
@@ -110,6 +118,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));
@@ -271,8 +283,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`)
@@ -291,6 +304,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));
@@ -301,5 +320,9 @@ const finalize=(modules:ModuleObject[],backendfolder:string,frontendfolder:strin
 
   const txtMenus = eta.render('./nuxt/composables.getmenus.ts.eta', modules);
   writeFileSync(`${frontendfolder}/composables/getMenus.ts`, txtMenus);
+
+  const txtStringHelper= eta.render('./nuxt/composables.stringHelper.ts.eta', modules);
+  writeFileSync(`${frontendfolder}/composables/stringHelper.ts`, txtStringHelper);
+  
   
 }

package/src/index.ts

@@ -22,7 +22,7 @@ let version=pj.version
 program
   .version(version)
   .description("An simpleapp CLI tool for generate frontend (vuejs) and backend(nestjs) codes")  
-  .option("-c, --config-file <value>", 'configuration file content such as:{"definationsFolder":"./definations", "backendFolder":"./nestproject/src/docs", "frontendFolder":"./nuxt/server"}')
+  .option("-c, --config-file <value>", 'configuration file')
   .parse(process.argv);
 
 let path=''
@@ -44,7 +44,8 @@ if(!options.configFile){
   }
   const configs = require(path)
   console.log("configurations: ",configs)
-  const definationsFolder = configs.definationsFolder
+  const jsonschemaFolder = configs.jsonschemaFolder
+  const bpmnFolder = configs.bpmnFolder
   const backendFolder = configs.backendFolder 
   const frontendFolder = configs.frontendFolder 
   const openapi3Yaml = configs.openapi3Yaml
@@ -55,7 +56,7 @@ const run = async()=>{
         fw.runCreateNest(()=>{
             fw.prepareNest(()=>{
                 fw.prepareNuxt(()=>{
-                    generate.initialize(definationsFolder,backendFolder,frontendFolder,()=>{
+                    generate.initialize(jsonschemaFolder,bpmnFolder,backendFolder,frontendFolder,()=>{
                         fw.prepareOpenApiClient()
                         fw.prettyNuxt()    
                         fw.prettyNest()                                                

package/src/processors/jsonschemabuilder.ts

@@ -13,32 +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_NAME='x-document-name'
+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)=>{
@@ -56,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"
   }
   
@@ -86,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',
@@ -94,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);
@@ -116,18 +188,25 @@ 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_NAME){
-    fieldAutoCompleteName=key
+   if(obj.format && obj.format==X_DOCUMENT_LABEL){
+    docSetting.colDocLabel=key
     obj.minLength=obj.minLength??1
     jsondata[key]['minLength']=obj.minLength
    }
+   
+   if(obj[X_COLLECTION_NAME]){
+    docSetting.collectionName=key    
+   }
+
+
    if(obj[X_AUTOCOMPLETE_FIELD]){
-    moreAutoComplete.push(key)
+    docSetting.autocompleteFields.push(key)
    }
+   
 
   //  if(obj.format && obj.format==X_TEL_NO){
   //   obj.pattern=obj.pattern ?? '/^\d{7,15}$/gm'
@@ -177,7 +256,18 @@ const genSchema = (
       // console.log(key,'--------newmodel',obj, newmodel[key]);
     }
   }
-  allmodels[docname] = { type: schematype, model: newmodel,codeField: fieldAutoCompleteCode ,nameField: fieldAutoCompleteName,moreAutoComplete:moreAutoComplete };
+  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;
 };
 
@@ -216,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,moreAutoComplete: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',
@@ -63,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)}('${api.action}')`%>
+@ApiResponse({status: 200,description: '<%=api.description%>',type: () =><%~JSON.stringify(api.returntype)%> })
+@ApiOperation({ operationId: '<%=api.execute%>' })
+async <%=api.execute%>(){
+  return await this.service.<%=api.execute%>()
+} 
+<%}%>
+
+/*****************************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,6 +29,7 @@ const schemasetting = {
 };
 
 export const <%= it.doctype %>MongoSchema = new Schema(schemasetting,{collection: '<%= it.name %>'})
+<%if(it.requireautocomplete){%>
 .index({<%=it.autocompletecode%>:1,orgId:1},{unique:true})
 .index({<%=it.autocompletename%>:1,orgId:1});
-
+<%}%>

package/templates/basic/pageindex.vue.eta

@@ -36,7 +36,7 @@
         ]  
     <%}%>
   <%})%>
-  
+  //end
 </script>
 <template>
     <div>    
@@ -46,7 +46,8 @@
     :listColumns="columns"> 
     
       <%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
-        <% let obj=it.jsonschema.properties[key] %>        
+      
+        <% let obj=it.jsonschema.properties[key] %>
         <% if(skipcolumns.indexOf(key)>=0){ %>
         <% } else if(obj.type=='boolean'){ %>
             <SimpleAppCheckbox  autofocus :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>
@@ -55,7 +56,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  :getAutocomplete="getAutocomplete" :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'){ %>