@simitgroup/simpleapp-generator 1.0.33 → 1.0.35

package/src/buildinschemas/branch.ts

@@ -0,0 +1,39 @@
+import {SchemaType,RESTMethods,IsolationType} from '../type'
+
+export const branch:SchemaType ={
+    type: "object",
+    "x-simpleapp-config":{
+        isolationType:IsolationType.tenant,
+        documentType:'branch',
+        documentName:'branch',
+        pageType:"crud", 
+        uniqueKey:'branchCode',
+        documentTitle:'branchName',
+        additionalAutoCompleteFields: ['branchId']
+    },
+    "properties": {
+        _id:{type:'string'},
+        created:{type:'string'},
+        updated:{type:'string'},
+        createdby:{type:'string'},
+        updatedby:{type:'string'},
+        tenantId: {type:'integer',default:1,minimum:1 },
+        orgId: {type:'integer',default:1,minimum:1 },
+        branchId: {type:'integer',default:1,minimum:1 },
+        organization:{
+          type:"object",
+          "x-foreignkey":"organization",
+          properties:{
+              "_id":{"type":"string"},
+              "code":{"type":"string"},
+              "label":{"type":"string"},
+              "orgId":{"type":"integer"}
+          }
+        },
+        branchCode: {type: "string",minLength:1},
+        branchName: {type: "string",minLength:1},
+        active: {type: "boolean",default:true},
+        description: {type: "string",}
+      }
+    
+}

package/src/buildinschemas/docnoformat.ts

@@ -0,0 +1,58 @@
+import {SchemaType,RESTMethods,IsolationType} from '../type'
+
+export const docnoformat:SchemaType ={
+        type: "object",
+        "x-simpleapp-config":{
+            isolationType:IsolationType.tenant,
+            documentType:'docno',
+            documentName:'docnoformat',
+            pageType:"crud", 
+            uniqueKey:'docNoFormatNo',
+            documentTitle:'docNoFormatName',
+            additionalAutoCompleteFields: ['default'],
+            additionalApis:[{
+                "action":"listDocFormats",
+                "entrypoint":"/listdocformats/:doctype",
+                "requiredrole":["User"],
+                "method":RESTMethods.get, 
+                "execute":"listDocFormats",
+                "description":"get list of document format for 1 doctype"
+              } ]
+        },
+        
+        properties: {
+            _id:{type:'string'},
+            created:{type:'string'},
+            updated:{type:'string'},
+            createdby:{type:'string'},
+            updatedby:{type:'string'},
+            tenantId: {type:'integer',default:1,minimum:1 },
+            orgId: {type:'integer',default:1,minimum:1 },
+            branchId: {type:'integer',default:1,minimum:1 },
+          "docNoFormatNo": {"type": "string","examples": ["INV"]},
+          "docNoFormatName": { "type": "string", "examples": ["Invoice Default Format"]},
+          "active": {"type": "boolean","examples": [true],"default":true},
+          "default":{"type": "boolean","examples": [true],"default":true},
+          "docNoType": {"type": "string","examples": ["SI","PI"]},
+          "docNoPattern": {"type": "string","examples": ["SI{YYMM}-<000>","PI-2023-<0000>"],"description":"{date} format as ISO8601 symbol"},
+          "isMonthly": {"type": "boolean","examples": [false]},
+          "nextNumber":{"type":"integer","examples":[1],"default":1},
+          "monthlySetting": {
+            "type": "object",
+            "properties": {
+              "jan": {"type": "integer","default":1},
+              "feb": {"type": "integer","default":1},
+              "mar": {"type": "integer","default":1},
+              "apr": {"type": "integer","default":1},
+              "may": {"type": "integer","default":1},
+              "jun": {"type": "integer","default":1},
+              "jul": {"type": "integer","default":1},
+              "aug": {"type": "integer","default":1},
+              "sep": {"type": "integer","default":1},
+              "oct": {"type": "integer","default":1},
+              "nov": {"type": "integer","default":1},
+              "dec": {"type": "integer","default":1}
+            }
+          }
+        }
+      }

package/src/buildinschemas/index.ts

@@ -0,0 +1,7 @@
+export {tenant} from './tenant'
+export {organization} from './organization'
+export {branch} from './branch'
+export {permission} from './permission'
+export {user} from './user'
+export {autoincreament} from './autoincreament'
+export {docnoformat} from './docnoformat'

package/src/buildinschemas/organization.ts

@@ -0,0 +1,31 @@
+import {SchemaType,RESTMethods,IsolationType} from '../type'
+
+export const organization:SchemaType ={
+    type: "object",
+    "x-simpleapp-config":{
+        isolationType:IsolationType.tenant,
+        documentType:'org',
+        documentName:'organization',
+        pageType:"crud", 
+        uniqueKey:'orgCode',
+        documentTitle:'orgName',
+        additionalAutoCompleteFields: ['orgId']
+    },    
+    required:["orgId","orgCode","orgName"],
+    "properties": {
+        _id:{type:'string'},
+        created:{type:'string'},
+        updated:{type:'string'},
+        createdby:{type:'string'},
+        updatedby:{type:'string'},
+        tenantId: {type:'integer',default:1,minimum:1 },
+        orgId: {type:'integer',default:1,minimum:1 },
+        branchId: {type:'integer',default:1,minimum:1 },
+        orgCode: {"type": "string",  "minLength":1,},
+        orgName: {type: "string",},
+        active: {type: "boolean","default":true,},
+        description: {type: "string",format:"text",},
+        timezone: {"type": "string","examples": ["Asia/Kuala_Lumpur"]
+        }    
+    }
+  }

package/src/buildinschemas/permission.ts

@@ -0,0 +1,31 @@
+import {SchemaType,RESTMethods,IsolationType} from '../type'
+
+export const permission:SchemaType ={
+    type: "object",
+    "x-simpleapp-config":{
+        documentType:'perm',
+        documentName:'permission',        
+        isolationType:IsolationType.tenant,
+        additionalApis:[{
+            action:"listUser",
+            entrypoint:"listuser",
+            requiredrole:["SuperAdmin"],
+            method:RESTMethods.get,
+            execute:"listUser",
+            description:"Get current permissionlist lookup user info"
+          }]
+    },
+    properties: {
+        _id:{type:'string'},
+        created:{type:'string'},
+        updated:{type:'string'},
+        createdby:{type:'string'},
+        updatedby:{type:'string'},
+        tenantId: {type:'integer',default:1,minimum:1 ,"x-foreignkey":"branch" },
+        orgId: {type:'integer',default:1,minimum:1 ,"x-foreignkey":"branch" },
+        branchId: {type:'integer',default:1,minimum:1 ,"x-foreignkey":"branch" },
+        group: {"type": "string"},
+        uid: {"type": "string","x-foreignkey":"user"},
+        user_id : {"type":"string"}
+      }
+}

package/src/buildinschemas/tenant.ts

@@ -0,0 +1,38 @@
+import {SchemaType,RESTMethods,IsolationType} from '../type'
+
+export const tenant:SchemaType ={
+    type: "object",
+    "x-simpleapp-config":{
+        isolationType:IsolationType.none,
+        requiredRoles:["SuperAdmin"],    
+        pageType:'crud',
+        uniqueKey:'tenantId',
+        documentTitle:'tenantName',
+        documentName:'tenant',
+        documentType:'tenant',
+    },        
+    required:["tenantId","tenantName","owner"],
+    properties: {
+        _id:{type:'string'},
+        created:{type:'string'},
+        updated:{type:'string'},
+        createdby:{type:'string'},
+        updatedby:{type:'string'},
+        tenantId: {type:'integer',default:1,minimum:1 },
+        orgId: {type:'integer',default:1,minimum:1 },
+        branchId: {type:'integer',default:1,minimum:1 },
+        tenantName: {type: "string", minLength:3},
+        active: {"type": "boolean","examples": [true],default:true},
+        description: {"type": "string"},
+        owner: {
+            type: "object",
+            "x-foreignkey":"user", 
+            required :["_id","label","uid"],
+            properties:{
+                _id: {type:'string'},
+                label: {type:'string'},
+                uid: {type:'string'},
+            }
+        }      
+    }
+  }

package/src/buildinschemas/user.ts

@@ -0,0 +1,28 @@
+import {SchemaType,RESTMethods,IsolationType} from '../type'
+
+export const user:SchemaType ={
+    type: "object",
+    "x-simpleapp-config":{
+        documentType:'user',
+        documentName:'user',
+        isolationType:IsolationType.tenant,
+        uniqueKey:'email',
+        documentTitle:'fullname',
+        requiredRoles:["SuperUser"],    
+        additionalAutoCompleteFields:['uid']      
+    },
+    properties: {
+        _id:{type:'string'},
+        created:{type:'string'},
+        updated:{type:'string'},
+        createdby:{type:'string'},
+        updatedby:{type:'string'},
+        tenantId: {type:'integer',default:1,minimum:1 },
+        orgId: {type:'integer',default:1,minimum:1 },
+        branchId: {type:'integer',default:1,minimum:1 },
+        uid: {type: "string",},
+        fullname: {type: "string",minLength:3},
+        email: {type: "string",minLength:10,format: "email"},
+        active: {type: "boolean",default:true}   
+      }
+}

package/src/constant.ts

@@ -1,2 +1,3 @@
 export const templatedir=__dirname+'/../templates'
-export const srcdir=__dirname
+export const srcdir=__dirname
+export const buildinschemafolder=__dirname+'/buildinschemas'

package/src/framework.ts

@@ -1,31 +1,33 @@
-import fs from 'fs'
+import fs, { copyFileSync, mkdirSync,existsSync, writeFileSync } from 'fs'
 import {spawn,exec} from "child_process"
+import _ from 'lodash'
 import { Logger, ILogObj } from "tslog";
 import * as constants from './constant'
 import  {Eta}  from 'eta';
 const log: Logger<ILogObj> = new Logger();
 
 let config = {
-    "jsonschemaFolder":"./jsonschemaFolder",
+    "jsonschemaFolder":"./jsonschemas",
     "bpmnFolder":"./bpmn",
-    "backendFolder":"./mybackend", 
+    "backendFolder":"./backend", 
+    "groupFolder":"./groups",
     "backendPort":"8000",
     "mongoConnectStr":'mongodb://<user>:<pass>@<host>:<port>/<db>?authMechanism=DEFAULT',
-    "frontendFolder":"./myfrontend",
+    "frontendFolder":"./frontend",
     "frontendPort":"8080",
-    "openapi3Yaml":"../openapi.yaml",
-    "keycloaksetting":{
-        "OAUTH2_BASEURL":"https://keycloak-server-url/",
-        "OAUTH2_REALM":"realm-name",
-        "OAUTH2_CONFIGURL":"https://keycloak-server-url/realms/realm-name",
-        "OAUTH2_CLIENTID":"client-id",
-        "OAUTH2_CLIENTSECRET":"client-secret-value",
-        "AUTH_SECRET_KEY":"my-secret",        
+    "oauthSetting":{
+        "oauthBaseUrl":"https://keycloak-server-url/",
+        "oauthRealm":"realm-name",
+        "oauthRealmUrl":"https://keycloak-server-url/realms/realm-name",
+        "oauthClient":"client-id",
+        "oauthClientSecret":"client-secret-value",
+        "oauthAuthSecretKey":"my-secret",        
+        "adminRole":"realmadmin"
     },
     "bpmnsetting":{
-        "BPMN_HOST":"127.0.0.1",
-        "BPMN_PORT":"9000",
-        "BPMN_API_KEY":"12345"
+        "bpmnHost":"127.0.0.1",
+        "bpmnPort":"9000",
+        "bpmnApiKey":"12345"
     }
 }
 
@@ -67,19 +69,19 @@ export const prepareNest = (callback:Function)=>{
     if(!fs.existsSync(`${targetfolder}/.env`)){
 
     
-        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)=>{
+        exec(`cd ${targetfolder};pnpm install --save moment @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})
-                const eta = new Eta({views: constants.templatedir});              
-                const variables=config    
-                const txtEnv = eta.render('./nest/nest.env.eta', variables);                
-                const txtMain = eta.render('./nest/nest.main.eta', variables);   
-                const txtRedirectHtml = eta.render('./nest/oauth2-redirect.eta', variables);   
+                // fs.mkdirSync(`${targetfolder}/public_html`,{recursive:true})
+                // const eta = new Eta({views: constants.templatedir});              
+                // const variables=config    
+                // const txtEnv = eta.render('./nest/nest.env.eta', variables);                
+                // const txtMain = eta.render('./nest/nest.main.eta', variables);   
+                // const txtRedirectHtml = eta.render('./nest/oauth2-redirect.eta', variables);   
 
-                fs.writeFileSync(`${targetfolder}/.env`, txtEnv);
-                fs.writeFileSync(`${targetfolder}/src/main.ts`, txtMain);            
-                fs.writeFileSync(`${targetfolder}/public_html/oauth2-redirect.html`, txtRedirectHtml);            
+                // fs.writeFileSync(`${targetfolder}/.env`, txtEnv);
+                // fs.writeFileSync(`${targetfolder}/src/main.ts`, txtMain);            
+                // fs.writeFileSync(`${targetfolder}/public_html/oauth2-redirect.html`, txtRedirectHtml);            
                 const tsconfigpath = process.cwd()+'/'+`${targetfolder}/tsconfig.json`
                 const tsconfig = require(tsconfigpath)
                 tsconfig.compilerOptions.esModuleInterop=true
@@ -99,57 +101,106 @@ export const prepareNest = (callback:Function)=>{
         callback()
     }
 }
+
+export const prepareProject =  async (callback)=>{
+    const dir = process.cwd() +'/'
+    log.info("prepareProject")
+    const generateTemplatefolder = `${constants.templatedir}/project/`
+    const eta = new Eta({views:generateTemplatefolder});
+    const vars = {
+        config:config
+    }
+    fs.readdirSync(`${constants.templatedir}/project`,{recursive:true}).forEach( (fullfilename)=>{        
+        const templatepath = `${generateTemplatefolder}/${fullfilename}`        
+        const filename:string = _.last(fullfilename.split('/'))
+        const targetfolder = dir+String(fullfilename).replace(filename,'')
+        console.log("Filename",targetfolder, filename)
+        if(targetfolder && !existsSync(targetfolder)){
+            console.log("Write directory",targetfolder)
+            mkdirSync(targetfolder,{recursive:true})
+        }
+        if(filename.includes('.eta')){    
+            const tofilename =targetfolder + filename.replace('.eta','')        
+            log.info(tofilename,"Render file")
+            const txt = eta.render(fullfilename,vars)
+            // log.info(fullfilename+"====>>"+tofilename)
+            // console.log(txt)
+            writeFileSync(tofilename,txt)            
+        }else if(filename.includes('.md')){
+            const tofilename =dir + filename.replace('.eta','')        
+            log.info(tofilename,"Copy")            
+            copyFileSync(templatepath ,tofilename)            
+        }
+    })
+
+    await exec(`npx prettier --write . `,()=>{
+        callback()
+    })
+    
+    
+
+    // fs.mkdirSync(`${dir}/groups`,{recursive:true})
+    // fs.mkdirSync(`${dir}/schemas`,{recursive:true})
+    // fs.mkdirSync(`${dir}/shares`,{recursive:true})
+
+}
 //prepare nuxt project for simpleapp generator
 export const prepareNuxt = (callback:Function)=>{
     const targetfolder = config.frontendFolder
     if(!fs.existsSync(`${targetfolder}/.env`)){
         //asume no environment. prepare now
-        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)=>{                
+        exec(`cd ${targetfolder};pnpm install;pnpm install -D @nuxtjs/tailwindcss @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 @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)=>{                
+                exec(`cd ${targetfolder};pnpm install --save  pinia @pinia/nuxt @nuxt/kit lodash @types/lodash @darkwolf/base64url next-auth@4.21.1 @darkwolf/base64url @nuxt/ui ajv ajv-formats ajv-errors dotenv @fullcalendar/core @fullcalendar/vue3 quill 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})
-                fs.mkdirSync(`${targetfolder}/layouts`,{recursive:true})
-                fs.mkdirSync(`${targetfolder}/components`,{recursive:true})
-                fs.mkdirSync(`${targetfolder}/server/api/[xorg]`,{recursive:true})
-                fs.mkdirSync(`${targetfolder}/server/api/auth`,{recursive:true})
-                fs.mkdirSync(`${targetfolder}/pages/[xorg]`,{recursive:true})
-                fs.mkdirSync(`${targetfolder}/plugins`,{recursive:true})
-                const eta = new Eta({views: `${constants.templatedir}/nuxt`});              
-                const variables=config
-                const writes = {
-                    './app.vue.eta':'app.vue',            
-                    './components.eventmonitor.vue.eta':'components/EventMonitor.vue',
-                    './components.menus.vue.eta':'components/Menus.vue',
-                    './components.crudsimple.vue.eta':'components/CrudSimple.vue',            
-                    './components.debugdocdata.vue.eta':'components/DebugDocumentData.vue',            
-                    './layouts.default.vue.eta':'layouts/default.vue',
-                    './server.api.ts.eta':'server/api/[xorg]/[...].ts',
-                    './server.api.auth.logout.ts.eta':'server/api/auth/logout.ts',
-                    './server.api.auth[...].ts.eta':'server/api/auth/[...].ts',
-                    './nuxt.config.ts.eta':'nuxt.config.ts',
-                    './pages.index.vue.eta':'pages/index.vue',
-                    './pages.[xorg].index.vue.eta':'pages/[xorg]/index.vue',
-                    './pages.login.vue.eta':'pages/login.vue',
-                    './plugins.simpleapp.ts.eta':'plugins/simpleapp.ts',
-                    './tailwind.config.ts.eta':'tailwind.config.ts',
-                    './tailwind.css.eta':'assets/css/tailwind.css',                    
-                    './env.eta':'.env',
-                }
+                // fs.mkdirSync(`${targetfolder}/assets/css/`,{recursive:true})
+                // fs.mkdirSync(`${targetfolder}/layouts`,{recursive:true})
+                // fs.mkdirSync(`${targetfolder}/components`,{recursive:true})
+                // fs.mkdirSync(`${targetfolder}/server/api/[xorg]`,{recursive:true})
+                // fs.mkdirSync(`${targetfolder}/server/api/auth`,{recursive:true})
+                // fs.mkdirSync(`${targetfolder}/pages/[xorg]`,{recursive:true})
+                // fs.mkdirSync(`${targetfolder}/plugins`,{recursive:true})
+                // const eta = new Eta({views: `${constants.templatedir}/nuxt`});              
+                // const variables=config
+                // const writes = {
+                //     './app.vue.eta':'app.vue',                                
+                //     './layouts.default.vue.eta':'layouts/default.vue',
+                //     './server.api.ts.eta':'server/api/[xorg]/[...].ts',
+                //     './server.api.auth.logout.ts.eta':'server/api/auth/logout.ts',
+                //     './server.api.auth[...].ts.eta':'server/api/auth/[...].ts',
+                //     './nuxt.config.ts.eta':'nuxt.config.ts',
+                //     './pages.index.vue.eta':'pages/index.vue',
+                //     './pages.[xorg].index.vue.eta':'pages/[xorg]/index.vue',
+                //     './pages.login.vue.eta':'pages/login.vue',
+                //     './plugins.10.simpleapp.ts.eta':'plugins/10.simpleapp.ts',
+                //     './tailwind.config.ts.eta':'tailwind.config.ts',
+                //     './tailwind.css.eta':'assets/css/tailwind.css',                    
+                //     './env.eta':'.env',
+                // }
         
-                const templates = Object.getOwnPropertyNames(writes)
-                for(let i=0; i<templates.length;i++){
-                    const template = templates[i]
-                    const filename = writes[template]
-                    const txt = eta.render(template, variables);                
-                    const file =`${targetfolder}/${filename}`
-                    log.info("writing ",file)
-                    fs.writeFileSync(file, txt);    
-                }
+                // const templates = Object.getOwnPropertyNames(writes)
+                // for(let i=0; i<templates.length;i++){
+                //     const template = templates[i]
+                //     const filename = writes[template]
+                //     const txt = eta.render(template, variables);                
+                //     const file =`${targetfolder}/${filename}`
+                //     log.info("writing ",file)
+                //     fs.writeFileSync(file, txt);    
+                // }
                
-                log.info("nuxt project completed")                
+
+                // const frontendtsconfigpath = process.cwd()+'/'+`${targetfolder}/tsconfig.json`
+                // const frontendtsconfig ={  
+                //     "extends": "./.nuxt/tsconfig.json",
+                //     "compilerOptions": {
+                //     "strictNullChecks":false
+                //     }
+                //   }                                    
+                // fs.writeFileSync(frontendtsconfigpath, JSON.stringify(frontendtsconfig));
+                // exec(`openapi-generator-cli generate -i  ${config.backendFolder}/openapi.yaml -o ${config.frontendFolder}/generate/openapi -g typescript-axios --skip-validate-spec`)
+                // log.info("nuxt project completed")                
                 callback()
                 })
             
@@ -161,7 +212,9 @@ export const prepareNuxt = (callback:Function)=>{
 }
 
 export const prettyNuxt = ()=>{
-    exec(`cd ${config.frontendFolder};npx prettier --write "./pages/**/*.vue" "./simpleapp/**/*" `)
+    
+    prepareOpenApiClient()
+    exec(`cd ${config.frontendFolder};npx prettier --write "./pages/**/*.vue" "./generate/docs/*.ts" `)
                         
 }
 export const prettyNest = ()=>{
@@ -169,5 +222,10 @@ export const prettyNest = ()=>{
 }
 
 export const prepareOpenApiClient = () => {
-    exec(`openapi-generator-cli generate -i ${config.openapi3Yaml} -o ${config.frontendFolder}/simpleapp/openapi -g typescript-axios --skip-validate-spec`)
+    const executestr = `openapi-generator-cli generate -i  ${config.backendFolder}/openapi.yaml -o ${config.frontendFolder}/generate/openapi -g typescript-axios --skip-validate-spec`
+    log.info("execute generate openapi:")
+    log.info(executestr)
+
+    const child5 = spawn('openapi-generator-cli',['generate','-i',`${config.backendFolder}/openapi.yaml`,'-o',`${config.frontendFolder}/simpleapp/generate/openapi`,'-g','typescript-axios','--skip-validate-spec'],{  stdio: 'inherit',})
+    // exec(executestr)
 }