@simitgroup/simpleapp-generator 1.0.8 → 1.0.14

package/dist/processors/jsonschemabuilder.js

@@ -1,14 +1,34 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.readJsonSchemaBuilder = void 0;
 const libs_1 = require("../libs");
+const tslog_1 = require("tslog");
+const json_schema_ref_parser_1 = __importDefault(require("@apidevtools/json-schema-ref-parser"));
+const storage_1 = require("../storage");
 // import { ConflictException } from '@nestjs/common';
 const type_1 = require("../type");
+const log = new tslog_1.Logger();
+const FIELD_AUTOCOMPLETE_CODE = 'field-autocomplete-code';
+const FIELD_AUTOCOMPLETE_NAME = 'field-autocomplete-name';
+const FOREIGNKEY_PROPERTY = 'x-foreignkey';
 let allmodels = {};
-const readJsonSchemaBuilder = (doctype, docname, jsondata) => {
+let fullschema = {};
+let fieldAutoCompleteCode = '';
+let fieldAutoCompleteName = '';
+const readJsonSchemaBuilder = async (doctype, docname, orijsondata, allforeignkeys) => {
+    fieldAutoCompleteCode = '';
+    fieldAutoCompleteName = '';
     allmodels = {};
-    const validateddata = Object.assign({}, jsondata);
+    const validateddata = Object.assign({}, orijsondata);
     let schema;
+    const tmpjsondata = await json_schema_ref_parser_1.default.dereference(orijsondata).then((schema) => {
+        // console.log("schema",doctype, schema['properties']['category']? schema['properties']['category']:'')
+        return schema;
+    });
+    const jsondata = Object.assign({}, tmpjsondata);
     if (jsondata && jsondata.type == 'object') {
         //no _id then need add
         // console.log(jsondata)
@@ -18,7 +38,15 @@ const readJsonSchemaBuilder = (doctype, docname, jsondata) => {
     else if (jsondata.type == 'array') {
         throw (`unsupport array type for ${docname}.${doctype}`);
     }
-    return allmodels;
+    if (fieldAutoCompleteCode == '') {
+        log.error(`you shall define 1 field with format:'${FIELD_AUTOCOMPLETE_CODE}'`);
+        throw "missing field format";
+    }
+    if (fieldAutoCompleteName == '') {
+        log.error(`you shall define 1 field with format: '${FIELD_AUTOCOMPLETE_NAME}'}`);
+        throw "missing field format";
+    }
+    return Promise.resolve(allmodels);
 };
 exports.readJsonSchemaBuilder = readJsonSchemaBuilder;
 const processObject = (doctype, docname, jsondata) => {
@@ -50,14 +78,37 @@ requiredlist) => {
         Object.assign(obj, jsondata[key]);
         const objectitem = {};
         Object.assign(objectitem, obj.items);
-        // Object.assign(objtmp,jsondata?[key]:{});
         const isrequired = requiredlist && requiredlist.includes(key);
-        // console.log('----', key, isrequired, obj);
         const newName = docname + (0, libs_1.capitalizeFirstLetter)(key);
-        // console.log(key);
-        //need create sub model
-        // console.log("----",key,obj.type,objectitem.type)
+        if (obj.format && obj.format == FIELD_AUTOCOMPLETE_CODE) {
+            fieldAutoCompleteCode = key;
+        }
+        if (obj.format && obj.format == FIELD_AUTOCOMPLETE_NAME) {
+            fieldAutoCompleteName = key;
+        }
+        //  if (obj.type == 'object' && obj.items  ){
+        //   console.log("Refer to another object",docname,': ',key,obj,obj.items)
+        // obj,obj.items
+        //foreignkeys
+        //FOREIGNKEY_PROPERTY
+        // newmodel[key] = 'Object';
+        // }
+        // else 
         if (obj.type == 'object') {
+            if (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';
+                if (!storage_1.foreignkeys[masterdatacollection]) {
+                    let tmp = {};
+                    tmp[clientdatacollection] = [foreignkeyidentity];
+                    storage_1.foreignkeys[masterdatacollection] = tmp;
+                }
+                else {
+                    storage_1.foreignkeys[masterdatacollection][clientdatacollection].push(foreignkeyidentity);
+                }
+            }
             genSchema(newName, obj.type, obj.properties, obj.required);
             newmodel[key] = newName;
         }
@@ -78,7 +129,7 @@ requiredlist) => {
             // console.log(key,'--------newmodel',obj, newmodel[key]);
         }
     }
-    allmodels[docname] = { type: schematype, model: newmodel };
+    allmodels[docname] = { type: schematype, model: newmodel, codeField: fieldAutoCompleteCode, nameField: fieldAutoCompleteName };
     return newmodel;
 };
 const getField = (fieldname, obj, isrequired) => {

package/dist/processors/jsonschemabuilder.js.map

@@ -1 +1 @@
-{"version":3,"file":"jsonschemabuilder.js","sourceRoot":"","sources":["../../src/processors/jsonschemabuilder.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"jsonschemabuilder.js","sourceRoot":"","sources":["../../src/processors/jsonschemabuilder.ts"],"names":[],"mappings":"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"}

package/dist/storage.js

@@ -0,0 +1,5 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.foreignkeys = void 0;
+exports.foreignkeys = {};
+//# sourceMappingURL=storage.js.map

package/dist/storage.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"storage.js","sourceRoot":"","sources":["../src/storage.ts"],"names":[],"mappings":";;;AAEW,QAAA,WAAW,GAA2B,EAAE,CAAA"}

package/package.json

@@ -1,21 +1,25 @@
 {
   "name": "@simitgroup/simpleapp-generator",
-  "version": "1.0.8",
-  "description": "frontend nuxtjs and backend nests code generator using jsonschema",  
+  "version": "1.0.14",
+  "description": "frontend nuxtjs and backend nests code generator using jsonschema",
   "main": "dist/index.js",
   "scripts": {
     "generate": "ts-node src/index.ts -c ../sampleconfig.json; pnpm exec prettier ./backend  --write;pnpm exec prettier ./frontend  --write",
     "build": "npx tsc",
     "test": "echo \"Error: no test specified\" && exit 1"
-  },  
+  },
   "keywords": [],
-  "author": "Ks Tan",  
+  "author": "Ks Tan",
   "license": "ISC",
-  "repository": {"type": "git", "url": "git://github.com/SIMITGROUP/simpleapp-generator.git"},
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/SIMITGROUP/simpleapp-generator.git"
+  },
   "publishConfig": {
     "access": "public"
   },
   "dependencies": {
+    "@apidevtools/json-schema-ref-parser": "^10.1.0",
     "@nestjs/config": "^3.0.0",
     "@nestjs/mongoose": "^10.0.1",
     "@nestjs/swagger": "^7.1.8",
@@ -29,6 +33,7 @@
     "figlet": "^1.6.0",
     "fs": "0.0.1-security",
     "json-schema": "^0.4.0",
+    "json-schema-ref-parser": "^9.0.9",
     "mongoose": "^7.4.4",
     "path": "^0.12.7",
     "tslog": "^4.9.1"

package/src/createproject.ts

@@ -1,5 +1,5 @@
 import { exec ,spawn}  from "child_process";
-import {writeFileSync} from 'fs'
+import {mkdirSync, writeFileSync} from 'fs'
 import * as constants from './constant'
 import { Logger, ILogObj } from "tslog";
 const log: Logger<ILogObj> = new Logger();
@@ -32,24 +32,50 @@ export const createNuxt= (targetfolder:string,callback)=>{
     log.info("setting up nuxt frontend ${targetfolder}")
 
     log.info(`frontend nuxt project "${targetfolder}" created, installing module`)
-    exec(`cd ${targetfolder};mkdir plugins;pnpm install;pnpm install -D prettier`, (error, stdout, stderr)=>{                
+    exec(`cd ${targetfolder};pnpm install;pnpm install -D @types/node prettier @nuxtjs/tailwindcss`, (error, stdout, stderr)=>{                
     //;pnpm install    
-    if(!error){
-        exec(`pnpm install --save ajv ajv-formats primeflex primeicons primevue axios json-schema @simitgroup/simpleapp-vue-component@latest`, (error, stdout, stderr)=>{                
-        const eta = new Eta({views: constants.templatedir});              
+    console.log(error, stdout, stderr)
+        exec(`cd ${targetfolder};pnpm install --save ajv ajv-formats primeflex primeicons prettier primevue axios json-schema mitt @simitgroup/simpleapp-vue-component@latest`, (error, stdout, stderr)=>{                
+        console.log(error, stdout, stderr)
+        
+        mkdirSync(`${targetfolder}/assets/css/`,{recursive:true})
+        mkdirSync(`${targetfolder}/layouts`,{recursive:true})
+        mkdirSync(`${targetfolder}/components`,{recursive:true})
+        mkdirSync(`${targetfolder}/server/api`,{recursive:true})
+        mkdirSync(`${targetfolder}/pages`,{recursive:true})
+        mkdirSync(`${targetfolder}/plugins`,{recursive:true})
+        const eta = new Eta({views: `${constants.templatedir}/nuxt`});              
         const variables=[]            
-        const txtEnv = eta.render('./nuxt.env.eta', variables);                
-        writeFileSync(`${targetfolder}/.env`, txtEnv);
-        const txtConfig = eta.render('./nuxt.config.eta', variables);                
-        writeFileSync(`${targetfolder}/nuxt.config.ts`, txtConfig);
-        const txtPlugins = eta.render('./nuxt.plugins.eta', variables);                
-        writeFileSync(`${targetfolder}/plugins/simpleapp.ts`, txtPlugins);
+        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/[...].ts',
+            './nuxt.config.ts.eta':'nuxt.config.ts',
+            './pages.index.vue.eta':'pages/index.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',
+        }
+
+        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)
+            writeFileSync(file, txt);    
+        }
+       
         log.info("nuxt project completed")                
         callback()
         })
-    }else{
-        throw error
-    }
+    
     })         
 
 }

package/src/generate.ts

@@ -2,16 +2,17 @@
 // import { readJsonSchemaBuilder } from './processors/jsonschemabuilder';
 import * as constants from './constant'
 import {readJsonSchemaBuilder} from './processors/jsonschemabuilder'
+import {foreignkeys} from './storage'
 // import { compile } from 'json-schema-to-typescript';
 // import { Fieldtypes, SchemaModel, ChildModels } from './type';
-import { Fieldtypes, SchemaModel, ChildModels,ModuleObject } from './type'
+import { TypeForeignKeyCatalogue,  TypeGenerateDocumentVariable,ChildModels,ModuleObject } from './type'
 import { Logger, ILogObj } from "tslog";
 const log: Logger<ILogObj> = new Logger();
 const clc = require("cli-color");
 
 
 const path = require('path');
-import {mkdirSync,readdir,readFileSync,writeFileSync,existsSync,copyFileSync, readdirSync} from 'fs'
+import {mkdirSync, readdir,readFileSync,writeFileSync,existsSync,copyFileSync, readdirSync} from 'fs'
 const { Eta } = require('eta');
 const { capitalizeFirstLetter }= require('./libs');
 const extFb = '.xfb.json';
@@ -20,9 +21,10 @@ const extjsonschema = '.jsonschema.json';
 let jsonschemas = {};
 const docs = [];
 
-export const initialize =  (defFolder:string,backendfolder:string,frontendfolder:string) => {
+export const initialize =  async (defFolder:string,backendfolder:string,frontendfolder:string) => {
   prepareEnvironments(backendfolder,frontendfolder)
-let activatemodules:ModuleObject[]=[]
+  let activatemodules:ModuleObject[]=[]
+  // 
   const files = readdirSync(defFolder)
   // readdir(defFolder, (err, files) => {
     // files.forEach((file) => {
@@ -40,17 +42,22 @@ let activatemodules:ModuleObject[]=[]
         log.info(`Load `+clc.green(file))
         rendertype = 'basic';
         jsonschemas[docname] = jsondata;
-        allmodels = readJsonSchemaBuilder(doctype, docname, jsondata);
+        // foreignkeys:
+        // tmpforeignkeys:TypeForeignKey
+        allmodels = await readJsonSchemaBuilder(doctype, docname, jsondata,foreignkeys);
+         
+        //foreignkeycatalogues
+        // foreignkeys
         generate(docname, doctype, rendertype, allmodels,backendfolder,frontendfolder);        
         activatemodules.push({doctype:doctype,docname:capitalizeFirstLetter(docname)})
       } else {
         log.warn(`Load `+clc.yellow(file) + ` but it is not supported`)
-      }
-      
+      }      
     }
+    // log.warn("foreignkeys---",foreignkeys)
     log.info("Activated backend modules: ",activatemodules)
     // log.info(activatemodules)
-    loadSimpleAppModules(activatemodules,backendfolder)
+    finalize(activatemodules,backendfolder,frontendfolder)
     return Promise.resolve(true)
   }
   
@@ -65,12 +72,12 @@ const generate = (
   frontendfolder:string
 ) => {
   const targetfolder = `${backendfolder}/src/docs/${doctype}`;
-  
+  const frontendpagefolder=`${frontendfolder}/pages`
   try {
     
     mkdirSync(targetfolder,{ recursive: true });    
-    mkdirSync(`${frontendfolder}/server/docs/`,{ recursive: true });
-    
+    mkdirSync(`${frontendfolder}/simpleapp/simpleappdocs/`,{ recursive: true });
+    mkdirSync(frontendpagefolder,{recursive:true})
   } catch (err) {
     //do nothing if folder exists
   } finally {
@@ -83,10 +90,12 @@ const generate = (
         'const initType=(str)=>{return ["string","number","boolean","array","object"].includes(str) ? capitalizeFirstLetter(str) : str;}',
     });
     
-    const variables = {
+    const variables:TypeGenerateDocumentVariable = {
       name: docname,
       doctype: doctype,
       models: allmodels,
+      autocompletecode:allmodels[capitalizeFirstLetter(docname)].codeField,
+      autocompletename:allmodels[capitalizeFirstLetter(docname)].nameField,
       schema: allmodels[capitalizeFirstLetter(docname)].model,
       apiSchemaName: capitalizeFirstLetter(docname), //capitalizeFirstLetter(doctype) + 'ApiSchema',
       typename: capitalizeFirstLetter(docname),
@@ -187,7 +196,7 @@ const generate = (
     const txtReadme = eta.render('./readme', variables);
     writeFileSync(`${targetfolder}/README.md`, txtReadme);
 
-    const frontendfile = `${frontendfolder}/server/docs/${variables.typename}Doc.ts`;
+    const frontendfile = `${frontendfolder}/simpleapp/simpleappdocs/${variables.typename}Doc.ts`;
     let frontEndCode = '';
     if (existsSync(frontendfile)) {
       const clientcodes = readFileSync(frontendfile).toString();
@@ -203,28 +212,39 @@ const generate = (
       }
     }
     variables.frontEndCode = frontEndCode ?? '';
-    const txtDocClient = eta.render('./apiclient', variables);
+    const txtDocClient = eta.render('./simpleappclient.eta', variables);
     writeFileSync(frontendfile, txtDocClient);
 
-    // // fs.writeFileSync(`${targetfolder}/${doctype}.uischema.ts`, txtUISchema);
-    log.info(`- write completed: `+clc.green(doctype))
+    generateClientPage(variables,eta,frontendpagefolder)
+
+    
+    log.info(`- write completed: ${doctype}`)
+    
     
-    //create type
-    //create service
-    //create controller
-    //create module
-    //create apischema
-    //create beforesave if not exists
-    // console.log(schema, res);
   }
 };
 
+const generateClientPage=(variables:TypeGenerateDocumentVariable,eta,frontendpagefolder:string)=>{
+  const docname = variables.name
+  const targetfolder = `${frontendpagefolder}/${docname}`
+  const overridefilename = `${targetfolder}/delete-me-for-avoid-override`
+  if(!existsSync(targetfolder)){
+    mkdirSync(targetfolder)
+    writeFileSync(overridefilename,'delete this file to prevent override by generator')
+  }
+  if(existsSync(overridefilename)){
+    const txtIndex=  eta.render('./pageindex.vue.eta', variables);
+    const txtIndexwithid=  eta.render('./pageindexwithid.vue.eta', variables);
+    writeFileSync(`${targetfolder}/index.vue`,txtIndex)
+    writeFileSync(`${targetfolder}/[id].vue`,txtIndexwithid)
+  }
+}
 const prepareEnvironments = (backendfolder:string,frontendfolder:string)=>{
   const targetfolder = `${backendfolder}/src/class`
-  const targetfrontendfolder = `${frontendfolder}/server/class`
+  const targetfrontendfolder = `${frontendfolder}/server/api`
   try{
     mkdirSync(targetfolder,{recursive:true});
-    mkdirSync(targetfrontendfolder);
+    mkdirSync(targetfrontendfolder,{recursive:true});
   }catch(error){
     //do nothing
   }
@@ -237,7 +257,7 @@ const prepareEnvironments = (backendfolder:string,frontendfolder:string)=>{
   copyFileSync(`${constants.templatedir}/SimpleAppController.eta`,`${targetfolder}/SimpleAppController.ts`)
 
   //copy over frontend apiabstract class
-  // copyFileSync(`${constants.templatedir}/SimpleAppClient.eta`,`${targetfrontendfolder}/SimpleAppClient.ts`)
+  // copyFileSync(`${constants.templatedir}/nuxt.apigateway.eta`,`${targetfrontendfolder}/[...].ts`)
 
     //prepare backend config.ts
 
@@ -245,9 +265,23 @@ const prepareEnvironments = (backendfolder:string,frontendfolder:string)=>{
 }
 
 
-const loadSimpleAppModules=(modules:ModuleObject[],targetfolder:string)=>{
+const finalize=(modules:ModuleObject[],backendfolder:string,frontendfolder:string)=>{
+  log.info("Finalizing foreignkey:",foreignkeys)
+  mkdirSync(`${backendfolder}/src/dicts/`,{ recursive: true });
+  mkdirSync(`${frontendfolder}/composables/`,{ recursive: true });
+
   const eta = new Eta({views:constants.templatedir});
   const txtMainModule = eta.render('app.module.eta', modules);
-  writeFileSync(`${targetfolder}/src/app.module.ts`, txtMainModule);
+  writeFileSync(`${backendfolder}/src/app.module.ts`, txtMainModule);
 
+  const foreignkeyfile =`${backendfolder}/src/dicts/foreignkeys.json`
+  writeFileSync(foreignkeyfile, JSON.stringify(foreignkeys));
+  console.log("write to foreignkey file ",foreignkeyfile)
+  
+  const txtCatalogue = eta.render('./nuxt/composables.getautocomplete.ts.eta', modules);
+  writeFileSync(`${frontendfolder}/composables/getAutocomplete.ts`, txtCatalogue);
+
+  const txtMenus = eta.render('./nuxt/composables.getmenus.ts.eta', modules);
+  writeFileSync(`${frontendfolder}/composables/getMenus.ts`, txtMenus);
+  
 }

package/src/index.ts

@@ -7,29 +7,36 @@ const  {createNuxt,createNest} =require( './createproject')
 const {exec} =  require( "child_process")
 
 const capitalizeFirstLetter= require( './libs')
-// const {Logger, ILogObj} = require( "tslog");
+const {Logger, ILogObj} = require( "tslog");
+
+const log :typeof Logger= new Logger();
 
-// const log:  Logger = new Logger();
 const figlet = require("figlet");
 // const program = new Command();
+const pj = require('../package.json')
 
-
-let version='1.0.8'
+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')  
+  // .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)
-const configs = require(options.configFile)
+let path=''
+if(options.configFile[0]=='.'){
+  path=process.cwd()+'/'+options.configFile
+}else{
+  path=options.configFile
+}
+const configs = require(path)
 console.log("configurations: ",configs)
 const definationsFolder = configs.definationsFolder ?? options.definationsFolder
 const backendFolder = configs.backendFolder ?? options.backendFolder
@@ -38,41 +45,45 @@ const openapi3Yaml:string = configs.openapi3Yaml ?? options.openapi3Yaml
 
 const runGenNext = (callback)=>{
   if(!fs.existsSync(backendFolder)){
-    console.error(`${backendFolder} does not exists, please run "nest new -p pnpm ${backendFolder}"`)
+    log.error(`${backendFolder} does not exists, please run "nest new -p pnpm ${backendFolder}"`)
   }else if(!fs.existsSync(`${backendFolder}/.env`)){
-    console.log(`initial nest configuratoin for simpleapp generator`)
+    log.info(`initial nest configuratoin for simpleapp generator`)
     createNest(backendFolder,callback)
   }else{
-    console.log(`.env file exists, skip nest initialization`)
+    log.warn(`.env file exists, skip nest initialization`)
     callback()
   }
 }
 const runGenNuxt = (callback)=>{  
   if(!fs.existsSync(frontendFolder)){
-    console.error(`${frontendFolder} does not exists, please run "npx nuxi@latest init ${frontendFolder}"`)
+    log.error(`${frontendFolder} does not exists, please run "npx nuxi@latest init ${frontendFolder}"`)
   }else if(!fs.existsSync(`${frontendFolder}/.env`)){
-    console.log(`initial nuxt configuratoin for simpleapp generator`)
+    log.info(`initial nuxt configuratoin for simpleapp generator`)
     createNuxt(frontendFolder,callback)
   }else{
-    console.log(`.env file exists, skip nuxt initialization`)
+    log.warn(`.env file exists, skip nuxt initialization`)
     callback()
 
   }
 }
 runGenNext(()=>{
-  console.log("runGenNext (backen) done")
-  // runGenNuxt(()=>{   
-    console.log("runGenNuxt (frontend) done")
+  
+  log.info("runGenNext (backen) done")
+  runGenNuxt(()=>{   
+    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 generate -i ${openapi3Yaml} -o ${frontendFolder}/server/openapi -g typescript-axios --skip-validate-spec`,(error, stdout, stderr)=>{  
+      exec(`openapi-generator generate -i ${openapi3Yaml} -o ${frontendFolder}/simpleapp/openapi -g typescript-axios --skip-validate-spec`,(error, stdout, stderr)=>{  
           if(error){
-            console.error(stderr);      
+            log.error(stderr);      
           } 
         });  
     }
   })
+})