@simitgroup/simpleapp-generator 1.0.16 → 1.0.20

package/src/index2.ts

@@ -0,0 +1,132 @@
+#! /usr/bin/env node
+
+import { error } from "console"
+
+const program =  require("commander") // add this line
+const Fieldtypes= require( './type')
+const generator= require( './generate')
+const fs = require( 'fs')
+const  createproject =require( './createproject')
+const {exec} =  require( "child_process")
+
+const capitalizeFirstLetter= require( './libs')
+const {Logger, ILogObj} = require( "tslog");
+
+const log :typeof Logger= new Logger();
+
+const figlet = require("figlet");
+// const program = new Command();
+const pj = require('../package.json')
+
+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("-s, --definations-folder <value>", "load defination files from which folder")
+  // .option("-b, --backend-folder <value>", "Create backend code at which folder")
+  // .option("-f, --frontend-folder <value>", "Create frontend code at which folder")
+  // .option("-i, --openapi3-yaml <value>", 'openapi3.yaml generated by backend server')  
+  .parse(process.argv);
+
+
+const options = program.opts();
+console.log(figlet.textSync(`SimpleApp Generator ${version}`));
+// console.log(options)
+let path=''
+if(!options.configFile){
+  log.error("Config file parameter is required. Example: simpleapp-generator -c ./config.json")
+  throw "Undefine configuration file"
+}
+else if(options.configFile && options.configFile[0]=='/'){
+  path=options.configFile
+}
+else if(options.configFile){
+  path=process.cwd()+'/'+options.configFile
+}else{
+  log.error("undefine configuration file, use command simpleapp-generator -c <configfilename.json>")  
+  throw error
+}
+const configs = require(path)
+console.log("configurations: ",configs)
+const definationsFolder = configs.definationsFolder ?? options.definationsFolder
+const backendFolder = configs.backendFolder ?? options.backendFolder
+const frontendFolder = configs.frontendFolder ?? options.frontendFolder
+const openapi3Yaml:string = configs.openapi3Yaml ?? options.openapi3Yaml
+
+const runGenNext = async (callback)=>{
+  let isnestready=false
+  if(!fs.existsSync(backendFolder)){
+    console.log("Nest does not exists, begin install nodejs environment tools: [pnpm, @nestjs/cli, @openapitools/openapi-generator-cli, nuxi]")
+    isnestready = await exec("npm install -g pnpm @nestjs/cli @openapitools/openapi-generator-cli nuxi",async (a,b,c)=>{
+      console.log("result of environment tools:",a,b,c)
+      console.log(`Install new nest backend: 'nest new -p pnpm ${backendFolder}'`)
+      return await exec(`nest new -p pnpm ${backendFolder}`,(a,b,c)=>{
+        console.log("new nest result",a,b,c)
+        return true
+      })
+    })    
+  }else{
+    isnestready=true
+  }
+  
+  
+  
+  if(isnestready){
+    if(!fs.existsSync(`${backendFolder}/.env`)){
+      log.info(`initial nest configuratoin for simpleapp generator`)
+      await createNest(backendFolder,callback)
+    }else{
+      log.warn(`.env file exists, skip nest initialization`)
+      callback()
+    }
+  }else{
+    log.error('nest not ready, which shouldnot continue')
+    throw error
+
+  }
+  
+}
+const runGenNuxt = async (callback)=>{  
+  
+  if(!fs.existsSync(frontendFolder)){
+    log.error(`${frontendFolder} does not exists, please run "npx nuxi@latest init ${frontendFolder}"`)
+  }else if(!fs.existsSync(`${frontendFolder}/.env`)){
+    log.info(`initial nuxt configuratoin for simpleapp generator`)
+    createNuxt(frontendFolder,callback)
+  }else{
+    log.warn(`.env file exists, skip nuxt initialization`)
+    callback()
+  }
+}
+
+
+const generateCode = async () =>{
+  
+  await runGenNext(async ()=>{  
+    log.info("runGenNext (backen) done")
+   await runGenNuxt( async ()=>{   
+      log.info("runGenNuxt (frontend) done")
+      generator.initialize(definationsFolder,backendFolder,frontendFolder)    
+      exec(`cd ${frontendFolder};npx prettier --write "./pages/**/*.vue" "./simpleapp/**/*" `)
+      exec(`cd ${backendFolder};npx run format `)
+      if(openapi3Yaml !=''){
+        
+        exec(`openapi-generator-cli generate -i ${openapi3Yaml} -o ${frontendFolder}/simpleapp/openapi -g typescript-axios --skip-validate-spec`,(error, stdout, stderr)=>{  
+            if(error){
+              log.error(stderr);      
+            } 
+          });  
+      }
+    })
+  })
+  
+}
+
+log.info("generate code: ")
+generateCode()
+
+
+
+// pnpm exec prettier ./src/docs  --write
+// 	pnpm exec prettier ./apiclients  --write

package/src/installdependency.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+# npm install -g pnpm @nestjs/cli @openapitools/openapi-generator-cli nuxi
+# nest new -p pnpm $backendFolder
+npx nuxi@latest init ../../aaa
+# ${frontendFolder}"

package/src/installdependency.ts

@@ -0,0 +1,4 @@
+#!/bin/bash
+npm install -g pnpm @nestjs/cli @openapitools/openapi-generator-cli nuxi
+nest new -p pnpm $backendFolder
+npx nuxi@latest init ${frontendFolder}"

package/src/processors/jsonschemabuilder.ts

@@ -129,7 +129,7 @@ const genSchema = (
     if (obj.type == 'object') {
       
       if(obj[FOREIGNKEY_PROPERTY]){
-        console.warn("FOREIGNKEY_PROPERTY exists",FOREIGNKEY_PROPERTY,obj[FOREIGNKEY_PROPERTY])
+        // console.warn("FOREIGNKEY_PROPERTY exists",FOREIGNKEY_PROPERTY,obj[FOREIGNKEY_PROPERTY])
         const masterdatacollection = obj[FOREIGNKEY_PROPERTY]
         const clientdatacollection = docname.toLowerCase()
         const foreignkeyidentity= key+'._id'

package/templates/SimpleAppService.eta

@@ -123,10 +123,13 @@ export class SimpleAppService<T extends { _id?: string }> {
     addFormats(ajv);
     ajv.addFormat('field-autocomplete-code', /.*$/);
     ajv.addFormat('field-autocomplete-name', /.*$/);
+    ajv.addFormat('x-text',/.*$/)
+    ajv.addFormat('x-html',/.*$/)
     ajv.addKeyword({
       keyword: 'x-foreignkey',
       type: 'string',
     });
+
     if (!this.hook('pre-validation', data)) {
       const erromsg: string[] = [];
       for (let i = 0; i < this.errorlist.length; i++) {

package/templates/basic/pageindex.vue.eta

@@ -8,26 +8,30 @@
         <% let obj=it.jsonschema.properties[key] %>        
         <% if(skipcolumns.indexOf(key)>=0){ %>
         <% } else if(obj.type=='boolean'){ %>
-            <SimpleAppCheckbox :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>
+            <SimpleAppCheckbox  autofocus :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>
         <% } else if(obj.type=='number' || obj.type=='integer'){ %>
-            <SimpleAppNumber :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+            <SimpleAppNumber  autofocus :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
         <% } else if(obj.type=='array'  && obj.items && obj.items.type =='string' ){ %>              
-            <SimpleAppChip :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>
+            <SimpleAppChip   autofocus :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>
         <% } else if(obj.type=='object'  && typeof obj['x-foreignkey']!='undefined'){ %>              
-            <SimpleAppAutocomplete :setting="o.getField('#/properties/<%= key %>')"
+            <SimpleAppAutocomplete  autofocus :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'){ %>
-                    <SimpleAppText type="<%=formattype%>" :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+                    <SimpleAppText type="<%=obj.format%>"  autofocus :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+                <% } else if(obj.format=='x-text'){ %>
+                    <SimpleAppTextarea :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+                <% } else if(obj.format=='x-html'){ %>
+                    <SimpleAppEditor editorStyle="height: 320px" :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
                 <% } else if(obj.format=='email'){ %>
-                    <SimpleAppText type="<%=formattype%>" :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+                    <SimpleAppText  autofocus type="<%=obj.type%>" :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
                 <% } else if(obj.enum){ %>
-                    <SimpleAppRadio :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>
+                    <SimpleAppRadio  autofocus :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>
                 <% } else {%>
-                        <SimpleAppText :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+                        <SimpleAppText   autofocus :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
                 <% }%>  
         <% } else { %>           
-            <SimpleAppText  :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
+            <SimpleAppText   autofocus :setting="o.getField('#/properties/<%= key %>')" v-model="data.<%= key %>"/>  
         <% }%>
       <%})%>   
       

package/templates/nuxt/components.crudsimple.vue.eta

@@ -16,9 +16,10 @@
     <Dialog v-model:visible="visible" modal header="Header" class="crudsimple-dialog" :autoZIndex="false" :style="{zIndex:100, width: '80vw' }">        
         <SimpleAppForm :document="obj" :title="title" #default="o">     
           <div class="simpleapp-tool-bar"   >
-            <button class="bg-default" @click="newData" type="reset">New</button>
-            <button class="bg-primary" @click="saveData" type="submit">Save</button>
-            <button class="bg-danger" @click="deleteData($event)">Delete</button>
+            <button class="bg-default" :disabled="disabled" @click="newData" type="reset">New</button>
+            <button class="bg-primary" :disabled="disabled" @click="saveData" type="submit">Save</button>
+            <button class="bg-danger" :disabled="disabled" @click="deleteData($event)">Delete</button>
+            <ProgressSpinner v-if="disabled==true" style="width: 2rem; height: 2rem" ></ProgressSpinner>
             <ConfirmPopup></ConfirmPopup>
           </div>
         <slot :data="o.data" :getField="o.getField" name="default"></slot>
@@ -31,6 +32,9 @@ import { SimpleAppClient } from '@simitgroup//simpleapp-vue-component/src/Simple
 import SimpleAppForm from '@simitgroup/simpleapp-vue-component/src/components/SimpleAppForm.vue';
 import SimpleAppDatatable from '@simitgroup/simpleapp-vue-component/src/components/SimpleAppDatatable.vue';
 import Dialog from 'primevue/dialog';
+import axios from 'axios'
+import ProgressSpinner from 'primevue/progressspinner';
+
 import ConfirmPopup from 'primevue/confirmpopup';
 import { useConfirm } from "primevue/useconfirm";
 
@@ -43,44 +47,57 @@ const props = defineProps<{
 const visible = ref(false)
 const obj = props.document
 const data = obj.getReactiveData()
+const disabled=ref(false)
 const recordlist = ref();
-
+const setCsrf=()=>{
+  // const { csrf } = useCsrf()
+  //   console.log('csrf',csrf)
+  //   axios.defaults.headers.common = {      
+  //     "X-CSRF-TOKEN": csrf
+  //   };
+}
 
 const refresh = () => {
   obj.list().then((res:any) => {    
     recordlist.value = res;
+    disabled.value=false
   });
 };
 const newData = () => {
     obj.setNew()
+    setCsrf()
     visible.value=true;
 };
 
 const editRecord = (event: any) => {
   obj.getById(event.data._id);
+  setCsrf()
   visible.value=true
 };
 
 const saveData = () => {
+  disabled.value=true
   if (data.value._id == "") {
-    obj.create().then(()=>visible.value=false).finally(() => refresh());
+    obj.create().then(()=>{visible.value=false}).catch(()=>setCsrf()).finally(() => refresh());
   } else {
-    obj.update().then(()=>visible.value=false).finally(() => refresh());
+    obj.update().then(()=>visible.value=false).catch(()=>setCsrf()).finally(() => refresh());
   }
 };
 const deleteData = (event:Event) => {
-    console.log("deleteData")
+    
     confirm.require({
         target: event.currentTarget as HTMLElement,
         message:'Delete?',
         icon: 'pi pi-exclamation-triangle',
         acceptClass: 'p-button-danger',
         accept: ()=>{
+            disabled.value=true 
             obj.delete(data.value._id ?? "").then(()=>visible.value=false).finally(() => {
                 refresh();    
             });
         },
         reject: () => {
+            setCsrf()            
             console.log("Cancel delete")
         }
     })

package/templates/nuxt/nuxt.config.ts.eta

@@ -18,11 +18,17 @@ tailwindcss: {
     // Options
   },
   modules: [
+//    '@sidebase/nuxt-auth',
+    "nuxt-security",
     '@nuxtjs/tailwindcss',
+    '@vueuse/nuxt',
     // '@nuxtjs/color-mode'
 
   ],  
   ssr: true,
+  security: {
+    csrf: true,
+  },
   css: [
     "primevue/resources/themes/lara-light-blue/theme.css",
     'primeicons/primeicons.css'

package/templates/nuxt/plugins.simpleapp.ts.eta

@@ -1,4 +1,5 @@
 import { defineNuxtPlugin } from "#app";
+import axios from 'axios'
 import PrimeVue from "primevue/config";
 import SimpleAppAutocomplete from '@simitgroup/simpleapp-vue-component/src/components/SimpleAppAutocomplete.vue'
 import SimpleAppAutocompletemulti from '@simitgroup/simpleapp-vue-component/src/components/SimpleAppAutocompletemulti.vue'
@@ -6,7 +7,7 @@ import SimpleAppCalendar from '@simitgroup/simpleapp-vue-component/src/component
 import SimpleAppCheckbox from '@simitgroup/simpleapp-vue-component/src/components/SimpleAppCheckbox.vue'
 import SimpleAppChip from '@simitgroup/simpleapp-vue-component/src/components/SimpleAppChip.vue'
 import SimpleAppColor from '@simitgroup/simpleapp-vue-component/src/components/SimpleAppColor.vue'
-import SimpleAppEditor from '@simitgroup/simpleapp-vue-component/src/components/SimpleAppEditor.vue'
+// import SimpleAppEditor from '@simitgroup/simpleapp-vue-component/src/components/SimpleAppEditor.vue'
 import SimpleAppForm from '@simitgroup/simpleapp-vue-component/src/components/SimpleAppForm.vue'
 import SimpleAppList from '@simitgroup/simpleapp-vue-component/src/components/SimpleAppList.vue'
 import SimpleAppListmulti from '@simitgroup/simpleapp-vue-component/src/components/SimpleAppListmulti.vue'
@@ -26,12 +27,15 @@ import SimpleAppDatatable from '@simitgroup/simpleapp-vue-component/src/componen
 import mitt from 'mitt'
 import ToastService from 'primevue/toastservice';
 import ConfirmationService from 'primevue/confirmationservice';
-
+//import Quill from 'quill'
 const emitter = mitt()
 
 
 
 export default defineNuxtPlugin((nuxtApp) => {
+  const { csrf } = useCsrf()    
+  axios.defaults.headers.common = {"CSRF-TOKEN": csrf};
+
     nuxtApp.vueApp.use(PrimeVue, { ripple: true });
     nuxtApp.vueApp
     .component("SimpleAppAutocomplete",SimpleAppAutocomplete)
@@ -40,7 +44,7 @@ export default defineNuxtPlugin((nuxtApp) => {
     .component("SimpleAppCheckbox",SimpleAppCheckbox)
     .component("SimpleAppChip",SimpleAppChip)
     .component("SimpleAppColor",SimpleAppColor)
-    .component("SimpleAppEditor",SimpleAppEditor)
+    // .component("SimpleAppEditor",SimpleAppEditor) // not suitable, will cause problem in ssr mode
     .component("SimpleAppForm",SimpleAppForm)
     .component("SimpleAppList",SimpleAppList)
     .component("SimpleAppListmulti",SimpleAppListmulti)
@@ -56,6 +60,7 @@ export default defineNuxtPlugin((nuxtApp) => {
     .component("SimpleAppTextarea",SimpleAppTextarea)
     .component("SimpleAppValue",SimpleAppValue)
     .component("SimpleFieldContainer",SimpleFieldContainer)
+    //.component("Quill",Quill)  // cause problem in ssr mode
     .use(ToastService).use(ConfirmationService)
     ;
     return {

package/tsconfig.json

@@ -8,7 +8,7 @@
       "sourceMap": true,
       "esModuleInterop": true,
       "moduleResolution": "node",
-
+      "resolveJsonModule":true,
       "strictNullChecks": false,
     "noImplicitAny": false,
     "strictBindCallApply": false,

package/dist/app.module.ts

@@ -1,14 +0,0 @@
-import { Module } from '@nestjs/common';
-import { MongooseModule } from '@nestjs/mongoose';
-import { ConfigModule } from '@nestjs/config';
-
-import {PersonModule} from './docs/pes/pes.module'
-import {SalesinvoiceModule} from './docs/si/si.module'
-
-@Module({
-    //define environment variables: MONGODB_URL='mongodb://<user>:<pass>@<host>:<port>/<db>?authMechanism=DEFAULT'
-  imports: [ConfigModule.forRoot(),MongooseModule.forRoot(process.env.MONGODB_URL),PersonModule,SalesinvoiceModule,],
-  controllers: [],
-  providers: [],
-})
-export class AppModule {}