@simitgroup/simpleapp-generator 1.5.1-alpha → 1.6.1-alpha

package/src/processors/jrxmlbuilder.ts

@@ -0,0 +1,38 @@
+import { existsSync, mkdirSync, writeFileSync } from 'fs';
+import * as constants from '../constant'
+import { SchemaPrintFormat } from "../type";
+import { Logger, ILogObj } from "tslog";
+
+const log: Logger<ILogObj> = new Logger();
+
+const { Eta } = require('eta');
+export const  generatePrintformat = async (configs,printFormats:SchemaPrintFormat[]) =>{
+    
+    console.log("Generate printformats ",printFormats);
+    const generateTemplateName = `${constants.templatedir}/printformats/template.jrxml._eta`    
+    log.info("Generate printformat ",generateTemplateName);
+    
+    const eta = new Eta({
+        views: '/',
+        
+        functionHeader: getCodeGenHelper()
+    });  
+    if(configs.printFormatDir && printFormats){
+        mkdirSync(configs.printFormatDir,{recursive:true})
+        for(let i=0;i<printFormats.length; i++){
+            const format = printFormats[i]
+            const targetfile = `${configs.printFormatDir}/${format.formatId}.jrxml`;
+            log.info("Process jrxml:",targetfile)
+            if(!existsSync(targetfile)){
+                const filecontent = eta.render(generateTemplateName, format)     
+                writeFileSync(targetfile,filecontent);
+            }
+            
+        }
+    }
+}
+
+
+const getCodeGenHelper = () => 'const capitalizeFirstLetter = (str) => str.slice(0, 1).toUpperCase() + str.slice(1);' +
+'const initType=(str)=>{return ["string","number","boolean","array","object"].includes(str) ? capitalizeFirstLetter(str) : str;};' +
+'const camelCaseToWords = (s) => {const result = s.replace(/([A-Z])/g, \' $1\');return result.charAt(0).toUpperCase() + result.slice(1);}'

package/src/type.ts

@@ -149,9 +149,15 @@ export type SchemaConfig = {
   documentType: string
   documentName: string
   collectionName?: string
-  foreignKeys?:MyForeignKey,
+  foreignKeys?:MyForeignKey
+  printFormats?: SchemaPrintFormat[]
 }
 
+export type SchemaPrintFormat = {
+  formatName: string
+  formatId: string
+  description?: string
+}
 
 export type SchemaFields = {
   _id: SimpleAppJSONSchema7 

package/templates/basic/nest/controller.ts.eta

@@ -1,3 +1,4 @@
+<%let simpleappconfig = it.jsonschema['x-simpleapp-config'] %>
 /**
  * This file was automatically generated by simpleapp generator. Every
  * MODIFICATION OVERRIDE BY GENERATEOR
@@ -34,12 +35,13 @@ import { Response } from 'express';
 import {AppUser} from '../commons/decorators/appuser.decorator'
 import {UserContext} from '../commons/user.context'
 
+
 <% const getFieldType =(proptype, typename)=>{
   const systemtypes = ['Boolean','boolean','string','String','number','Number','object','Object','integer','Integer']
   let tmptypename = typename.replace('[','').replace(']','')
   
   if(systemtypes.includes(tmptypename)){
-    
+    if(proptype=='type' ) tmptypename =tmptypename.toLowerCase();
   }else if(proptype=='schema'){
     tmptypename= 'schemas.'+tmptypename    
   }else{ //type
@@ -68,20 +70,19 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
   
   @Get()
   <%if(superadmindoctype.includes(it.doctype)){%>
-  @Roles(Role.SuperAdmin,Role.<%= `${it.typename}_search`%>)
+  @Roles(Role.SuperAdmin,Role.<%= `${it.typename}_access`%>)
   <%}else{%>
-  @Roles(Role.SuperAdmin,Role.SuperUser,Role.<%= `${it.typename}_search`%>)
+  @Roles(Role.SuperAdmin,Role.SuperUser,Role.<%= `${it.typename}_access`%>)
   <%}%>
   @HttpCode(200)
   @ApiResponse({
     status: 200,
-    description: 'Found',
-    type: String 
+    description: 'Found',    
   })
   @ApiResponse({ status: 500, description: 'Internal error' })
-  @ApiOperation({ operationId: 'runHello', description:"Say hello only" })
-  async hello(@AppUser() appuser: UserContext) {
-    return `Hello, welcome to ${ this.service.getDocumentName()}`//this._list(appuser);
+  @ApiOperation({ operationId: 'runDefault', description:"Run default behavior like say hello" })
+  async runDefault(@AppUser() appuser: UserContext) {
+    return await this.service.runDefault(appuser)
   }
   //autocomplete shall above :id
   @Post('/autocomplete')
@@ -168,11 +169,8 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
   <%}%>
   <% if(['post','put','patch'].includes(api.method)){ %>
     @ApiBody({ description: 'Request Body', 
-        type: 
-        <%= api.schema
-        ?  (api.schema.includes('[') ?  '[schemas.'+api.schema.replace('[','').replace(']','') + ']' : 'schemas.'+api.schema  )
-        : 'Object'
-        %> 
+        type: <%= getFieldType('schema',api.schema)%>
+       
         })
   <%}%>  
   @ApiResponse({status: 200,description: '<%=api.description%>' 
@@ -187,9 +185,7 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
   async <%=capitalizeFirstLetter(api.action) %>(
     @AppUser() appuser: UserContext,
     <%if(['post','put','patch'].includes(api.method.toLowerCase())){%> 
-      @Body() data:<%= api.schema 
-      ?  (api.schema.includes('[') ?  'types.'+api.schema.replace('[','').replace(']','') + '[]' : 'types.'+api.schema  )
-      : 'Object'%>,
+      @Body() data:<%= getFieldType('type',api.schema)%>,
       //@Body() data:any,
     <%}%>
     <% if(api.entryPoint && api.entryPoint.includes(':')) {%>
@@ -325,5 +321,26 @@ export class <%= it.typename %>Controller extends SimpleAppAbstractController<
   async delete(@AppUser() appuser: UserContext,@Param('id') id: string) {
     return this._delete(appuser,id);
   }
-  
+
+  <% if(simpleappconfig?.printFormats){%>
+  @Get(':id/print/:formatid')
+  @Roles(Role.SuperAdmin, Role.SuperUser, Role.<%= `${it.typename}_print`%>)
+  @ApiResponse({
+    status: 200,
+    description: 'return base64 pdf string',
+    type: String,
+  })
+  @ApiResponse({ status: 404, description: 'Document not found' })
+  @ApiResponse({ status: 500, description: 'Internal error' })
+  @ApiOperation({ operationId: 'runPrint' })
+  async print(@AppUser() appuser: UserContext, @Param('id') id: string, @Param('formatid') formatid: string) {
+    const data = await this.service.print(appuser, id,formatid);
+    if (!data) {
+      throw new NotFoundException(`${id} not found`, 'not found');
+    } else {
+      return data;
+    }
+  } 
+
+  <%}%>
 }

package/templates/basic/nest/processor.ts.eta

@@ -64,6 +64,7 @@ export class <%= it.typename %>Processor extends SimpleAppService<<%= it.typenam
 
    reCalculateValue(data:<%= it.typename %>){
     //console.log('trigger new recalculate')    
+    const $data = data;
     const jsopbj= new jsonpath['JSONPath']()
     <% if(it.jsonschema['x-simpleapp-config']['formulas']){ %>
         <%Object.keys(it.jsonschema['x-simpleapp-config']['formulas']).forEach(function(index) { %>
@@ -71,7 +72,7 @@ export class <%= it.typename %>Processor extends SimpleAppService<<%= it.typenam
           // <%~ JSON.stringify(fml) %>
           //const tmp = jsopbj.query(vdata,fieldpath).filter((item:string)=>item!='')
           
-          jsopbj.apply(data, '<%~ fml.jsonPath %>', function(value:any) { return <%~fml.formula %> });
+          jsopbj.apply($data, '<%~ fml.jsonPath %>', function($item:any) { return <%~fml.formula %> });
 
         <%}) %>
       <%} %>

package/templates/basic/nest/resolver.ts.eta

@@ -19,7 +19,7 @@ import { Request } from '@nestjs/common';
     let tmptypename = typename.replace('[','').replace(']','')
     
     if(systemtypes.includes(tmptypename)){
-      
+      if(proptype=='type' ) tmptypename =tmptypename.toLowerCase();
     }else if(proptype=='schema'){
       tmptypename= 'schemas.'+tmptypename    
     }else{ //type

package/templates/basic/nest/service.ts.eta

@@ -13,14 +13,32 @@ import { <%= it.typename %>Processor } from '../generate/processors/<%= it.docty
 //import { <%= it.typename %>,<%= it.typename %>Hooks} from '../generate/types';
 import * as types from '../generate/types';
 export { <%= it.typename %>} from '../generate/types';
+<% const getFieldType =(proptype, typename)=>{
+  const systemtypes = ['Boolean','boolean','string','String','number','Number','object','Object','integer','Integer']
+  let tmptypename = typename.replace('[','').replace(']','')
+  
+  if(systemtypes.includes(tmptypename)){
+    if(proptype=='type' ) tmptypename =tmptypename.toLowerCase();
+  }else if(proptype=='schema'){
+    tmptypename= 'schemas.'+tmptypename    
+  }else{ //type
+    tmptypename= 'types.'+tmptypename
+  }
 
+  if(typename.includes('[')){
+    return  proptype=='schema' ?  `[${tmptypename}]` : `${tmptypename}[]`
+  }else{
+    return tmptypename
+  }
+}
+%>
 
 @Injectable()
 export class <%= it.typename %>Service extends <%= it.typename %>Processor {
   <% const config = it.jsonschema['x-simpleapp-config']%>   
   <%if(config['loseDataIsolation']){%>protected strictIsolation = false;<%}%> 
       
-  public hooks: types.<%= it.typename %>Hooks = {}
+   //protected hooks: types.<%= it.typename %>Hooks = {}
     constructor(
         @InjectModel('<%= it.typename %>')  mydoc: Model<types.<%= it.typename %>>
         ){
@@ -28,6 +46,7 @@ export class <%= it.typename %>Service extends <%= it.typename %>Processor {
     }
 
 /***************************** begin x-document-api definitions *****************************************/
+/*
 <% for(let i=0;i<it.apiSettings.length;i++){%>
 <% let api = it.apiSettings[i] %>
   async run<%= capitalizeFirstLetter(api.action) %>(
@@ -50,9 +69,7 @@ export class <%= it.typename %>Service extends <%= it.typename %>Processor {
         <%}%>
             
         <%if(['post','put','patch'].includes(api.method.toLowerCase())){%> 
-              data:<%= api.schema 
-              ?  (api.schema.includes('[') ?  'types.'+api.schema.replace('[','').replace(']','') + '[]' : 'types.'+api.schema  )
-              : 'any'%>,
+              data:<%= getFieldType('schema',api.schema)%>,
             <%}%>
 
          ){
@@ -63,6 +80,7 @@ export class <%= it.typename %>Service extends <%= it.typename %>Processor {
     <%}%>
   } 
 <%}%>
+*/
 
 /***************************** end x-document-api definitions *****************************************/
 }

package/templates/basic/nest/type.ts.eta

@@ -15,9 +15,9 @@ import {DefaultHooks} from  "../types"
         <% if(typeof obj == 'string') {%>
           <%= key %> <%if(obj.required){%>?<%}%>: <%= obj  %>; //child object
         <% }else if( Array.isArray( obj)){%>
-          <%= key %><%if(obj.required){%>?<%}%>: <%= obj[0] %>[]; //array 
+          <%= key %>?: <%= obj[0] %>[]; //array 1
         <% }else if( obj.type == 'array'){%>
-          <%= key %><%if(obj.required){%>?<%}%>: <%= obj.items.type %>[]; //array 
+          <%= key %><%if(obj.required){%>?<%}%>: <%= obj.items.type %>[]; //array 2
         <% }else{%>
           <%= key %> <% if(!obj.required || obj.required==false){%>?<%}%>: <%= obj.type %>;   // <%~ JSON.stringify(obj) %>
         <% } %>

package/templates/basic/nuxt/component.select.vue.eta

@@ -7,6 +7,8 @@
     :showNull="showNull"
     :allowAddNew="allowAddNew"
     :filter ="filter"
+    :multiple="multiple"
+    :hideLabel="hideLabel"
   />
 </template>
 <script setup lang="ts">
@@ -19,12 +21,14 @@
 import { ForeignKey } from '~/types';
 import { <%= it.typename %> } from "~/simpleapp/generate/openapi";
 const emits = defineEmits(["change"]);
-const modelValue = defineModel<string>();
+const modelValue = defineModel<string|string[]>();
 const props = defineProps<{ 
   placeholder?: string;
   showNull?:boolean;
   allowAddNew?: boolean;
   filter?: <%= it.typename %>;
+  multiple?:boolean;
+  hideLabel?:boolean;
    }>()
 const change = (id:string,data:ForeignKey) =>{
   emits('change',id,data)

package/templates/basic/nuxt/pages.form.vue.eta

@@ -7,7 +7,7 @@
 <template>    
     <div>
         <% if(it.autocompletename){%> 
-            <title v-if="id">{{ data.<%=it.autocompletename%> ??  data.<%=it.autocompletecode%>}}</title>
+            <title v-if="id">{{ data.<%=it.autocompletename%> }}</title>
         <%}else{%> 
             <title v-if="id">{{ t(doc.getDocName())}}</title>
         <%}%> 

package/templates/basic/nuxt/pages.mobile.landing.vue.eta

@@ -1,69 +1,12 @@
-<% const skipcolumns = ['_id','createdBy','created','updatedBy','updated','orgId','branchId','tenantId','doctype'] %>  
 <template>
-
-   <PageDocList :document="doc" :columns="columns" :data="docdata" :sorts="sorts">
-   <template #mobileList="{index,item}">
-   </template>
-   <template #dataTableColumns>
-    <%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
-          <%let obj=it.jsonschema.properties[key] %>
-          <%let config=it.jsonschema['x-simpleapp-config'] %>
-          <%if(skipcolumns.indexOf(key)>=0){%>
-          <%} else if(config['uniqueKey'] && (config['uniqueKey']==key || config['documentTitle']==key)  ){%>
-          <Column #body="{index,data}" :header="t('<%=key%>')">
-            <RendererLink :value="data" :setting="{path:'<%=it.name%>'}" :fields="['<%=key%>']">{{ data.<%=key%> }}</RendererLink>
-          </Column>
-
-          <%} else if(['string','number','integer','boolean'].indexOf(obj.type)>=0){%>
-            <Column #body="{index,data}" :header="t('<%=key%>')">
-              {{data.<%=key%>}}
-            </Column>          
-          <%} else if(obj.type =='object' && obj['x-foreignkey'] ){%>
-            <Column #body="{index,data}" :header="t('<%=key%>')">
-              <RendererViewer :value="data.<%=key%>" :setting="{documentName:'<%=obj["x-foreignkey"]%>'}" :fields="['<%=key%>']">{{ data.label }}</RendererViewer>
-            </Column>            
-          <%}%>
-      <%})%>
-   </template>
-   <template #default><div><NuxtPage :_id="id ?? 'new'"/></div></template>    
-  </PageDocList>
+  <LadingPage/>
 </template>
-<script setup lang="ts">
+<script lang="ts" setup>
 /**
  * This file was automatically generated by simpleapp generator.
  * --remove-this-line-to-prevent-override--
  * last change 2023-09-09
  * author: Ks Tan
  */
-import { <%= it.typename %> } from '~/simpleapp/generate/openapi';
-  
-  const {$<%= it.typename %>Doc,$listen } = useNuxtApp();
-  const doc = $<%= it.typename %>Doc()
-  const docdata = doc.getReactiveData();
-  type <%= it.typename %>Key = keyof <%= it.typename %> 
-  definePageMeta({
-    menuPath:'nocategory/<%= it.name %>'    
-  });
-
-  const columns: <%= it.typename %>Key[] = [<%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
-        <%let obj=it.jsonschema.properties[key] %>
-        <%let config=it.jsonschema['x-simpleapp-config'] %>
-        <%if(skipcolumns.indexOf(key)>=0){%>
-        <%}else if(['string','number','integer','boolean'].indexOf(obj.type)>=0){%>'<%=key%>',
-        <%} %>
-    <%})%>]
-
-
-
-
-
-  const sorts:string[][] = [
-    <%if(it.jsonschema['x-simpleapp-config'] && it.jsonschema['x-simpleapp-config']['uniqueKey']){%>
-        ['<%=it.jsonschema['x-simpleapp-config']['uniqueKey']%>','asc'],
-    <%}%>
-    ]
-
-const id=computed(()=>useRoute().params.id)
-</script>
-
-  
+import LadingPage from '../../<%= it.name %>.vue'
+</script>

package/templates/basic/nuxt/simpleapp.generate.client.ts.eta

@@ -53,25 +53,23 @@ export class <%= it.typename%>Client extends SimpleAppClient<openapi.<%= it.type
     const apiobj = getDocumentApi('<%=it.name %>')
     super(apiobj,'<%= it.doctype %>','<%=it.name %>')
     this.event=$event
-    this.listen=$listen
-    
-    this.setNew();    
-    watch(this.getData(),(newvalue)=>{
-      //console.log("Something change",this.completeformula)
+    this.listen=$listen    
+    this.setNew();        
+  }
+
+  setWatchChange = ()=>{
+    this.unwantchobj = watch(this.getData(),(newvalue)=>{
       if(this.completeformula==true){
-         // console.log("Trigger caclculate")
           this.completeformula=false
           this.reCalculateValue()
           this.completeformula=true
-      }else{
-          //console.log("avoid unlimited loop")
-      }                    
-    })    
-
+      }               
+    },{deep:true})    
   }
   setNew = ()=>{         
       const newdata = Default<%= it.typename%>(randomUUID())
       this.setData(newdata)
+      this.setWatchChange()
       return true
     }
   <%if(it.jsonschema.properties['readOnly'] || it.jsonschema.properties['documentStatus']){%>
@@ -176,7 +174,7 @@ export class <%= it.typename%>Client extends SimpleAppClient<openapi.<%= it.type
   
   reCalculateValue(){
     //console.log('trigger new recalculate')
-    const data = this.getData()
+    const $data = this.getData()
     
     <% if(it.jsonschema['x-simpleapp-config']['formulas']){ %>
       <%Object.keys(it.jsonschema['x-simpleapp-config']['formulas']).forEach(function(index) { %>
@@ -184,7 +182,7 @@ export class <%= it.typename%>Client extends SimpleAppClient<openapi.<%= it.type
         // <%~ JSON.stringify(fml) %>
         //const tmp = jsonpath.query(vdata,fieldpath).filter((item:string)=>item!='')
         
-        jsonpath.apply(data, '<%~ fml.jsonPath %>', function(value) { return <%~fml.formula %> });
+        jsonpath.apply($data, '<%~ fml.jsonPath %>', function($item) { return <%~fml.formula %> });
 
       <%}) %>
     <%} %>

package/templates/nest/src/app.module.ts.eta

@@ -9,7 +9,12 @@ import { Module, MiddlewareConsumer, NestModule, Provider } from '@nestjs/common
 import { MongooseModule,MongooseModuleOptions } from '@nestjs/mongoose';
 import { GraphQLModule } from '@nestjs/graphql';
 import { ApolloDriver, ApolloDriverConfig } from '@nestjs/apollo';
-
+import {GenerateModule} from './simpleapp/simpleapp.module'
+<% const nestmodules = it.configs.additionalNestModules%>
+<% for(let i=0; i<nestmodules.length;i++){ %>
+<%    const modulename = capitalizeFirstLetter(nestmodules[i]) %>
+  import {<%= modulename %>Module } from  './<%=nestmodules[i]%>/<%=nestmodules[i]%>.module';
+<%}%>
 import { APP_GUARD,APP_INTERCEPTOR,APP_FILTER } from '@nestjs/core';
 import { ResponseInterceptor } from './simpleapp/generate/commons/interceptors/response.interceptor'
 import {
@@ -28,8 +33,6 @@ import { AppResolver } from './app.resolver';
 import { TenantMiddleware } from './simpleapp/generate/commons/middlewares/tenant.middleware';
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
-import {GenerateModule} from './simpleapp/simpleapp.module'
-import { CloudApiModule } from './cloudapi/cloudapi.module';
 import { UserMongoSchema } from './simpleapp/generate/models/user.model';
 import { PermissionMongoSchema } from './simpleapp/generate/models/perm.model';
 import { ApiEventMongoSchema } from './simpleapp/generate/models/apievent.model';
@@ -76,7 +79,12 @@ import { EventEmitterModule } from '@nestjs/event-emitter';
       tokenValidation: TokenValidation.ONLINE,
     }),
     GenerateModule,    
-    CloudApiModule,
+    
+    <% for(let i=0; i<nestmodules.length;i++){ %>
+    <%    const modulename = capitalizeFirstLetter(nestmodules[i]) %>
+      <%= modulename %>Module,
+    <%}%> 
+    
     MongooseModule.forFeature([
       { name: 'User', schema: UserMongoSchema },
       { name: 'Permission', schema: PermissionMongoSchema },

package/templates/nest/src/cloudapi/cloudapi.module.ts._eta

@@ -12,4 +12,4 @@ import { CloudApiService } from './cloudapi.service';
   providers: [CloudApiService],
   exports: [CloudApiService],
 })
-export class CloudApiModule {}
+export class CloudapiModule {}

package/templates/nest/src/printapi/api/.gitignore.eta

@@ -0,0 +1,4 @@
+wwwroot/*.js
+node_modules
+typings
+dist

package/templates/nest/src/printapi/api/.npmignore.eta

@@ -0,0 +1 @@
+# empty npmignore to ensure all required files (e.g., in the dist folder) are published by npm

package/templates/nest/src/printapi/api/.openapi-generator/FILES.eta

@@ -0,0 +1,8 @@
+.gitignore
+.npmignore
+api.ts
+base.ts
+common.ts
+configuration.ts
+git_push.sh
+index.ts

package/templates/nest/src/printapi/api/.openapi-generator/VERSION.eta

@@ -0,0 +1 @@
+7.4.0

package/templates/nest/src/printapi/api/.openapi-generator-ignore.eta

@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md