@simitgroup/simpleapp-generator 1.0.23 → 1.0.25

package/templates/nuxt/server.api.ts.eta

@@ -1,29 +1,43 @@
+/**
+ * This file was automatically generated by simpleapp generator during initialization.
+ * DO NOT MODIFY IT BY HAND.
+ * last change 2023-09-09
+ * author: Ks Tan
+ */
+
+ 
 import axios from 'axios';
-// import { getServerSession } from '#auth'
-// import type { Session } from 'next-auth';
+import { getServerSession } from '#auth'
+import type { Session } from 'next-auth';
 
 export default defineEventHandler(async (event) => {
-    // let session: Session | null = null
-    // try {
-    //     session = await getServerSession(event)
-    // } catch (error) {
-    //     return sendRedirect(event, '/login', 401)
-    // }
+    type additionalprops = {accessToken?:string} 
+    let session:any=null
+    
+    
+    try {
+        session = await getServerSession(event)
+        
+    } catch (error) {
+        return sendRedirect(event, '/login', 401)
+    }
 
     return new Promise<any>(async (resolve, reject) => {
-        // if(!session || !session.accessToken) {
-            // reject({ statusMessage: 'Unauthorized', statusCode: 401 });
-            // throw createError({ statusMessage: 'Unauthorized', statusCode: 401 })
-        // }
+        if(!session) {
+        //if(!session || !session.accessToken) {    
+            reject({ statusMessage: 'Unauthorized', statusCode: 401 });
+            throw createError({ statusMessage: 'Unauthorized', statusCode: 401 })
+        }
         // console.log("------hihi------")
         const seperateSymbol = '.';
         // const seperateSymbol = '&';
-        const key = event.context.params?.key ?? ''
-        const platform = event.context.params?.platform ?? ''
-        const otherLink = event.context.params?._ ?? ''
+        const xOrg = event.context.params?.xorg ?? ''
+        const documentLink = event.context.params?._ ?? ''
+        // const platform = event.context.params?.platform ?? ''
+        
 
         // console.error("event.context???",event.context)
-        // const accessToken = session?.accessToken;
+        const accessToken = session?.accessToken;
         
         // const allowPlatform = ['report-api', 'cloudapi'];
         // if(!key || !platform || !allowPlatform.includes(platform) || !accessToken) {
@@ -60,14 +74,14 @@ export default defineEventHandler(async (event) => {
         // }
 
         const frontEndRes = event.node.res;
-        const url = process.env.SIMPLEAPP_BACKEND_URL +platform + '/' + otherLink;
+        const url = process.env.SIMPLEAPP_BACKEND_URL + '/' + documentLink;
         // console.warn('backend server-----',req.method,url,forwardData)
         const axiosConfig: any = {
             method: req.method,
             url: url,
             headers: {
-        //         Authorization: `Bearer ${accessToken}`,
-        //         'X-Org': `${xOrg}`,
+                Authorization: `Bearer ${accessToken}`,
+                'X-Org': xOrg,
             },
             data: forwardData,
             params: forwardData,

package/src/createproject.ts

@@ -1,121 +0,0 @@
-import { exec ,spawn}  from "child_process";
-import {mkdirSync, writeFileSync} from 'fs'
-import * as constants from './constant'
-import { Logger, ILogObj } from "tslog";
-const log: Logger<ILogObj> = new Logger();
-
-
-const { Eta } = require('eta');
-
-const  checkNodeJS= (callback)=>{
-    return  exec(`npx -v`,(error, stdout, stderr)=>{
-        if(error){            
-            throw ("Nodejs not exists")            
-        }else{
-            callback()
-        }
-    })
-}
-
-const checkNestCli = (callback)=>{
-    log.info("setting up nest backend")
-    return  exec(`npx -v`, (error, stdout, stderr)=>{
-        if(error){            
-            return  exec(`npm i -g @nestjs/cli`, (error, stdout, stderr)=>{
-                callback()
-            })
-        }else{
-            callback()
-        }
-    })
-}
-
-export const installDependency = async () =>{
-    log.info("installDependency 'npm install -g pnpm @nestjs/cli @openapitools/openapi-generator-cli nuxi'")
-    return await exec("npm install -g pnpm @nestjs/cli @openapitools/openapi-generator-cli nuxi")
-}
-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};pnpm install;pnpm install -D @types/node @vueuse/nuxt @sidebase/nuxt-auth @vueuse/core nuxt-security prettier @nuxtjs/tailwindcss`, (error, stdout, stderr)=>{                
-    //;pnpm install    
-    console.log(error, stdout, stderr)
-        exec(`cd ${targetfolder};pnpm install --save ajv dotenv @fullcalendar/core @fullcalendar/vue3 quill uuid ajv-formats primeflex primeicons prettier primevue axios json-schema mitt @simitgroup/simpleapp-vue-component@latest`, (error, stdout, stderr)=>{                
-        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 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()
-        })
-    
-    })         
-
-}
-
-export const createNest= (targetfolder:string,callback)=>{    
-//   checkNestCli(()=>{                    
-
-    log.info(`creating backend project ${targetfolder}`)
-    exec(`cd ${targetfolder};pnpm install --save @nestjs/swagger @nestjs/mongoose mongoose  ajv ajv-formats @nestjs/config`,async (error, stdout, stderr)=>{
-        // log.info(`dependency installed`)
-        if(!error){
-            exec(`pnpm install ajv ajv-formats axios json-schema`, (error, stdout, stderr)=>{                
-            const eta = new Eta({views: constants.templatedir});              
-            const variables=[]            
-            const txtEnv = eta.render('./nest.env.eta', variables);                
-            const txtMain = eta.render('./nest.main.eta', variables);   
-
-            writeFileSync(`${targetfolder}/.env`, txtEnv);
-            writeFileSync(`${targetfolder}/src/main.ts`, txtMain);            
-            const tsconfigpath = process.cwd()+'/'+`${targetfolder}/tsconfig.json`
-            const tsconfig = require(tsconfigpath)
-            tsconfig.compilerOptions.esModuleInterop=true
-            tsconfig.compilerOptions.resolveJsonModule=true
-            writeFileSync(tsconfigpath, JSON.stringify(tsconfig));
-
-            log.info("nest project completed")                
-            callback()
-        })
-        } else{
-        log.error(stderr)
-        throw error
-        }
-    })
-    // 
-// })                    
-
-}

package/src/index2.ts-old

@@ -1,132 +0,0 @@
-#! /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

@@ -1,5 +0,0 @@
-#!/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/templates/basic/backend.config.eta

@@ -1 +0,0 @@
-export const API_BASE_URL = 'http://localhost:3000';

package/templates/basic/beforesave.eta

@@ -1,7 +0,0 @@
-/**
- * This file was automatically generated by simpleapp generator.
- * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
- * and regenerate this file.
- */
-import { <%= it.typename %> } from './<%= it.doctype %>.type';
-export const beforeSave = (doc: <%= it.typename %>) => {}

package/templates/basic/controller2.eta

@@ -1,86 +0,0 @@
-/**
- * This file was automatically generated by simpleapp generator.
- * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
- * and regenerate this file.
- */
-import {
-  Controller,
-  Get,
-  Put,
-  Post,
-  Delete,
-  Body,
-  Param,
-  Type,
-} from '@nestjs/common';
-import { <%= it.doctype %>Service } from './<%= it.doctype %>.service';
-import * as <%= it.doctype %>type from './<%= it.doctype %>.type';
-import * as <%= it.doctype %>apischema from './<%= it.doctype %>.apischema';
-import { ApiTags, ApiBody, ApiResponse,ApiOperation } from '@nestjs/swagger';
-
-const doctype = '<%= it.doctype %>'.toUpperCase();
-@ApiTags(doctype)
-@Controller(doctype.toLowerCase())
-export class <%= it.doctype %>Controller {
-  constructor(private readonly service: <%= it.doctype %>Service) {}
-
-  /********************ok*****************/
-  @Get()
-  @ApiResponse({
-    status: 200,
-    description: 'Found',
-  })
-  @ApiResponse({ status: 500, description: 'Internal error' })
-  @ApiOperation({ operationId: 'runList' })
-  async list() {
-    return this.service.list();
-  }
-  /********************ok*****************/
-  @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) {
-    const result = await this.service.findById(id)
-    return result as <%= it.fullApiSchemaName %>;
-  }
-
-  /********************ok*****************/
-  @Post()
-  @ApiResponse({ status: 201, description: 'success', type: <%= it.fullApiSchemaName %> })
-  @ApiResponse({ status: 400, description: 'bad request' })
-  @ApiResponse({ status: 500, description: 'internal error' })
-  @ApiBody({ description: 'Data', type: <%= it.fullApiSchemaName %> })
-  @ApiOperation({ operationId: 'runCreate' })
-  async create(@Body() data: <%= it.fullApiSchemaName %>) {
-    //const newdata: <%= it.fullTypeName %> = { ...data };
-    const newdata: persontype.Person = {} as persontype.Person; //= { ...data };
-    Object.assign(newdata, data); //
-    return this.service.setData(newdata).create();
-  }
-
-  /********************ok*****************/
-  @Put(':id')
-  @ApiResponse({ status: 200, description: 'success', type: <%= it.fullApiSchemaName %> })
-  @ApiResponse({ status: 404, description: 'Document not found' })
-  @ApiResponse({ status: 500, description: 'Internal error' })
-  @ApiBody({ description: 'Data', type: <%= it.fullApiSchemaName %> })
-  @ApiOperation({ operationId: 'runUpdate' })
-  async update(@Param('id') id: string, @Body() data: <%= it.fullApiSchemaName %>) {
-    //const newdata: <%= it.fullTypeName %> = { ...data };
-    const newdata: persontype.Person = {} as persontype.Person; //= { ...data };
-    Object.assign(newdata, data); //
-    return this.service.findIdThenUpdate(id, newdata);
-  }
-
-  /********************ok*****************/
-  @Delete(':id')
-  @ApiResponse({ status: 200, description: 'success', type: <%= it.fullApiSchemaName %> })
-  @ApiResponse({ status: 404, description: 'Document not found' })
-  @ApiResponse({ status: 500, description: 'Internal error' })
-  @ApiOperation({ operationId: 'runDelete' })
-  async delete(@Param('id') id: string) {
-    return this.service.findIdThenDelete(id);
-  }
-}

package/templates/basic/frontend.config.eta

@@ -1 +0,0 @@
-export const API_BASE_URL = useRuntimeConfig().public.API_BASE_URL

package/templates/basic/model-converter.etabackup

@@ -1,21 +0,0 @@
-/**
- * This file was automatically generated by simpleapp generator.
- * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
- * and regenerate this file.
- */
-<% const schema = it.schema %>
-<% const typeclass = it.doctype+'type' %>
-import { Schema } from 'mongoose';
-import { beforeSave } from './<%= it.doctype %>.beforesave';
-import {<%= it.typename%>JsonSchema } from './<%= it.doctype %>.jsonschema'
-import { createMongooseSchema } from 'convert-json-schema-to-mongoose';
- import { <%= it.typename%> }  from './<%= it.doctype %>.type';
-
-// import { <%Object.keys(it.models).forEach(function(key) { %> <%=key %>, <%})%> }  from './<%= it.doctype %>.type';
-const schema1 = <%= it.typename%>JsonSchema 
-
-const schemasetting = createMongooseSchema(schema1,schema1)
-
-export const <%= it.doctype %>MongoSchema = new Schema(schemasetting)
-  .post('validate', (doc: <%= it.typename %>) => beforeSave(doc))
-  .pre('save', () => {});

package/templates/basic/readme.eta

@@ -1,3 +0,0 @@
-Installation
-1. copy `import { <%= it.typename%>Module } from './docs/<%= it.doctype%>/<%= it.doctype%>.module';` into src/app.module.ts
-2. append `<%= it.typename%>Module` into array `imports`

package/templates/basic/service.etabackupe

@@ -1,106 +0,0 @@
-import { Injectable } from '@nestjs/common';
-import { InjectModel } from '@nestjs/mongoose';
-import { Model } from 'mongoose';
-import Ajv from 'ajv';
-import addFormats from 'ajv-formats';
-import addKeyword from "ajv-keywords";
-
-
-import * as <%= it.doctype %>type from './<%= it.doctype %>.type';
-import * as <%= it.doctype %>apischema from './<%= it.doctype %>.apischema';
-
-//import { <%= it.typename %> } from './<%= it.doctype %>.type';
-//import { <%= it.apiSchemaName %> } from './<%= it.doctype %>.apischema';
-import {
-  NotFoundException,
-  InternalServerErrorException,
-} from '@nestjs/common/exceptions';
-@Injectable()
-export class <%= it.doctype %>Service {
-  private jsonschema = <%~ JSON.stringify(it.jsonschema) %>;
-  
-  constructor(
-    @InjectModel('<%= it.name %>') private readonly doc: Model<<%= it.fullTypeName %>>,
-  ) {}
-
-  getSchema() {
-    return this.doc.schema.obj;
-  }
-  async list() {
-    try {
-      const products = await this.doc.find();
-      const productlist = products.map((p: <%= it.fullTypeName %>) => {
-        return p;
-      });
-      //   console.log(products);
-      return productlist;
-    } catch (err) {
-      throw new InternalServerErrorException(err.message);
-    }
-  }
-  async findById(id: string) {
-    let data;
-
-    try {
-      data = await this.doc.findById(id);
-    } catch (err) {
-      //error
-      throw new InternalServerErrorException(err.message);
-    }
-
-    if (!data) {
-      //data not found
-      throw new NotFoundException('Document Not found:');
-    }
-    return data;
-  }
-  async create(data: <%= it.fullTypeName %>) {
-    let result;
-
-    try {
-      delete data._id;
-      this.validateData(data);
-      const newdoc = new this.doc(data);
-      result = await newdoc.save();
-    } catch (err) {
-      throw new InternalServerErrorException(err.message);
-    }
-    return result as <%= it.fullTypeName %>;
-  }
-  async update(id: string, data: <%= it.fullTypeName %>) {
-    const existingdata = await this.findById(id);
-    try {
-      this.validateData(data);
-      const result = await existingdata.updateOne(data);
-      return result;
-    } catch (err) {
-      throw new InternalServerErrorException(err.message);
-    }
-  }
-  async delete(id: string) {
-    const data = await this.findById(id);
-    try {
-      const deleteresult = await this.doc.findByIdAndDelete(id);
-      return deleteresult;
-    } catch (err) {
-      throw new InternalServerErrorException(err.message);
-    }
-  }
-
-  validateData(data: <%=it.doctype %>type.<%= it.typename %>) {
-    const ajv = new Ajv({ allErrors: true });
-    addFormats(ajv);
-    ajv.addKeyword('example');
-
-    const validate = ajv.compile(this.jsonschema);
-    const valid = validate(data);    
-    if (!valid) {
-      console.log(validate.errors);
-      const erromsg: string[] = [];
-      for (let i = 0; i < validate.errors.length; i++) {
-        erromsg.push(validate.errors[i].message);
-      }
-      throw new InternalServerErrorException(erromsg.join('\n'));
-    }
-  }
-}

package/templates/basic/type.etabackup

@@ -1,23 +0,0 @@
-<%Object.keys(it.models).forEach(function(prop){ %>  
-  <% let schema = it.models[prop] %>
-  export type <%= prop %> = {
-      <% if(it.apiSchemaName == prop ) {%>        
-        _id?: string;        
-        doctype?: string;
-      <% } %>
-      <%Object.keys(schema.model).forEach(function(key){ %>     
-      <% const obj = schema.model[key] %>
-        <% if(typeof obj == 'string') {%>
-          <%= key %>?: <%= obj  %>; //child object
-        <% }else if( Array.isArray( obj)){%>
-          <%= key %>?: <%= obj[0] %>[]; //array 
-        <% }else if( obj.type == 'array'){%>
-          <%= key %>?: <%= obj.items.type %>[]; //array 
-        <% }else{%>
-          <%= key %> <% if(!obj.required || obj.required==false){%>?<%}%>: <%= obj.type %>;   // <%~ JSON.stringify(obj) %>
-        <% } %>
-      <%})%>
-
-  }
-<%})%>
-

package/templates/basic/uischema.eta

@@ -1,13 +0,0 @@
-export <%= it.typename %>UiSchema <%= it.typename %> = {
-  id: {type: "string",format:"text",title:"ID"},
-  doctype: {type: "string",format:"text",title:"ID"},
-  <%Object.keys(it.schema).forEach(function(prop) { %>
-  <%=prop  %>: {
-    <% Object.keys(it.schema[prop]).forEach(function(fkey){   %>
-      <%=fkey %>:  {type: "<%= it.schema[prop][fkey].datatype %>;",format:"<%= it.schema[prop][fkey].type %>;",title:"<%= it.schema[prop][fkey].title %>;"},
-      
-      
-    <% }) %>
-  };
-  <%}) %>
-};