@simitgroup/simpleapp-generator 1.0.45 → 1.0.47

package/src/generate.ts

@@ -12,14 +12,14 @@ import * as buildinschemas from './buildinschemas'
 import { JSONSchema7 } from 'json-schema';
 const { Eta } = require('eta');
 const { capitalizeFirstLetter }= require('./libs');
-const X_DOCUMENT_TYPE='x-document-type'
-const X_DOCUMENT_NAME='x-document-name'
-const X_COLLECTION_NAME='x-collection-name'
-const X_PAGE_TYPE='x-page-type'
-const extFb = '.xfb.json';
-const extHfb = '.xhfb.json';
-const extjsonschema = '.jsonschema.json';
-const extgroups = '.group.json';
+// const X_DOCUMENT_TYPE='x-document-type'
+// const X_DOCUMENT_NAME='x-document-name'
+// const X_COLLECTION_NAME='x-collection-name'
+const X_SIMPLEAPP_CONFIG='x-simpleapp-config'
+// const extFb = '.xfb.json';
+// const extHfb = '.xhfb.json';
+// const extjsonschema = '.jsonschema.json';
+// const extgroups = '.group.json';
 let jsonschemas = {};
 let configs:any = {}
 const docs = [];
@@ -242,7 +242,7 @@ const generateSchema = ( docname: string,
         }else if(foldertype=='nuxt'){
           const capname = capitalizeFirstLetter(docname)
           const validateWritePage = (folder:string,isexists:boolean)=>{
-            if(!jsonschemas[docname][X_PAGE_TYPE] ){
+            if(!jsonschemas[docname][X_SIMPLEAPP_CONFIG]['pageType'] ){
               return false
             }else if(!isexists){
               return true

package/src/processors/jsonschemabuilder.ts

@@ -3,7 +3,7 @@ import { JSONSchema7, JSONSchema7Definition,JSONSchema7Array,JSONSchema7TypeName
 import * as js7 from 'json-schema';
 import _ from 'lodash'
 import { capitalizeFirstLetter } from '../libs';
-import {SchemaType,SchemaConfig,JsonSchemaProperties,MyForeignKey} from "../type"
+import {SchemaType,SchemaConfig,JsonSchemaProperties} from "../type"
 // import * as schematemplates from '../schematype'
 import { Logger, ILogObj } from "tslog";
 import $RefParser from "@apidevtools/json-schema-ref-parser";
@@ -43,6 +43,7 @@ export const readJsonSchemaBuilder = async (docname: string,orijsondata:JSONSche
   
   let schemaconfigs:SchemaConfig = orijsondata[configname]
   const doctype=schemaconfigs.documentType
+
   if(!schemaconfigs.collectionName){
     schemaconfigs.documentName
   }
@@ -51,6 +52,18 @@ export const readJsonSchemaBuilder = async (docname: string,orijsondata:JSONSche
     schemaconfigs.foreignKeys={}
   }
 
+  if(schemaconfigs.generateDocumentNumber){
+    const tmp = {
+        type: "object",       
+        "x-foreignkey":"docnoformat", 
+        properties: {_id: {type: "string"},label: {type: "string"}}
+    }
+    orijsondata.properties["docNoFormat"] = tmp as JSONSchema7Definition
+  }
+
+  //apply some controls
+  //control docnoformatis required
+
   // let schemaprops:any = targettemplate.properties 
   // console.log("just want process targettemplate ######>>>",orijsondata)
   // let schemadefinitions = targettemplate.definitions

package/src/type.ts

@@ -1,4 +1,4 @@
-import  { JSONSchema7, JSONSchema7Definition } from 'json-schema';
+import  { JSONSchema7,JSONSchema7Type,JSONSchema7Version, JSONSchema7TypeName,JSONSchema7Definition } from 'json-schema';
 export type ChildModels = {
   [key: string]: { 
     type: string; 
@@ -78,7 +78,7 @@ apiSchemaName: string
 typename: string
 fullApiSchemaName: string
 fullTypeName:string
-jsonschema: JSONSchema7
+jsonschema: SimpleAppJSONSchema7
 bothEndCode: string
 frontEndCode: string
 backEndCode: string
@@ -123,14 +123,14 @@ export type DocumentApi = {
   description:string //description of api
 }
 export enum IsolationType {"none"="none" , "tenant"="tenant","org"="org", "branch"="branch"}
-export type ImportLibs = {"lib":string,"as":string}
+// export type ImportLibs = {"lib":string,"as":string}
 export type Formula =  {
   "jsonpath":string  //example: "$.subtotal","$.details[*]"
   "formula":string  //example "jslib.getDocumentSubTotal(@F{$.details})"
 } 
 
 export type SchemaConfig = {
-  isolationType: IsolationType
+  isolationType: IsolationType  
   requiredRoles?:string[]
   pageType?: string  
   uniqueKey?:string  
@@ -140,7 +140,7 @@ export type SchemaConfig = {
   allStatus?:DocumentStatus[]
   additionalApis?:DocumentApi[]      
   additionalAutoCompleteFields ?: string[]
-  libs?:ImportLibs[]   // both process class and frontend client class will import same lib
+  // libs?:ImportLibs[]   // both process class and frontend client class will import same lib
   formulas?: Formula[]  
   documentType: string
   documentName: string
@@ -148,28 +148,142 @@ export type SchemaConfig = {
   foreignKeys?:MyForeignKey,
 }
 
-// export type DefaultSchemaDefinitions = {
-//   [key:string]:JSONSchema7Object
-// }
-export type ForeignKeyProperty = {'x-foreignkey' ?:string}
+
 export type SchemaFields = {
-  _id: JSONSchema7 
-  tenantId: JSONSchema7 & ForeignKeyProperty
-  orgId: JSONSchema7 & ForeignKeyProperty
-  branchId: JSONSchema7 & ForeignKeyProperty
-  created: JSONSchema7 
-  updated: JSONSchema7 
-  createdby: JSONSchema7 
-  updatedby: JSONSchema7 
-  [key:string]:JSONSchema7  & ForeignKeyProperty
+  _id: SimpleAppJSONSchema7 
+  tenantId: SimpleAppJSONSchema7
+  orgId: SimpleAppJSONSchema7
+  branchId: SimpleAppJSONSchema7
+  created: SimpleAppJSONSchema7 
+  updated: SimpleAppJSONSchema7 
+  createdby: SimpleAppJSONSchema7 
+  updatedby: SimpleAppJSONSchema7 
+  [key:string]:SimpleAppJSONSchema7 | SimpleAppJSONSchema7[] | undefined
+
 }
 
-export type AdditionalSchemaType = {     
-  "x-simpleapp-config":SchemaConfig  
-  properties: SchemaFields
+
+export type SchemaType = {
+  type:string
+  definitions?:SimpleAppJSONSchema7
+  required?:string[]
+
+  "x-simpleapp-config":SchemaConfig
+  properties:  SchemaFields
 } 
 
-export type SchemaType = JSONSchema7 & AdditionalSchemaType
 
 
 
+// modified from jsonschemas
+export type SimpleAppJSONSchema7Definition = SimpleAppJSONSchema7 | boolean;
+export interface SimpleAppJSONSchema7 {
+  
+  'x-foreignkey' ?:string
+    $id?: string | undefined;
+    $ref?: string | undefined;
+    $schema?: JSONSchema7Version | undefined;
+    $comment?: string | undefined;
+
+    /**
+     * @see https://datatracker.ietf.org/doc/html/draft-bhutton-json-schema-00#section-8.2.4
+     * @see https://datatracker.ietf.org/doc/html/draft-bhutton-json-schema-validation-00#appendix-A
+     */
+    $defs?: {
+              [key: string]: JSONSchema7Definition;
+    } | undefined;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.1
+     */
+    type?: JSONSchema7TypeName | JSONSchema7TypeName[] | undefined;
+    enum?: JSONSchema7Type[] | undefined;
+    const?: JSONSchema7Type | undefined;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.2
+     */
+    multipleOf?: number | undefined;
+    maximum?: number | undefined;
+    exclusiveMaximum?: number | undefined;
+    minimum?: number | undefined;
+    exclusiveMinimum?: number | undefined;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.3
+     */
+    maxLength?: number | undefined;
+    minLength?: number | undefined;
+    pattern?: string | undefined;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.4
+     */
+    items?: SimpleAppJSONSchema7Definition | SimpleAppJSONSchema7Definition[] | undefined;
+    additionalItems?: JSONSchema7Definition | undefined;
+    maxItems?: number | undefined;
+    minItems?: number | undefined;
+    uniqueItems?: boolean | undefined;
+    contains?: SimpleAppJSONSchema7Definition | undefined;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.5
+     */
+    maxProperties?: number | undefined;
+    minProperties?: number | undefined;
+    required?: string[] | undefined;
+    properties?: {
+        [key: string]: SimpleAppJSONSchema7Definition;
+    } | undefined;
+    patternProperties?: {
+        [key: string]: SimpleAppJSONSchema7Definition;
+    } | undefined;
+    additionalProperties?: SimpleAppJSONSchema7Definition | undefined;
+    dependencies?: {
+        [key: string]: SimpleAppJSONSchema7Definition | string[];
+    } | undefined;
+    propertyNames?: SimpleAppJSONSchema7Definition | undefined;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.6
+     */
+    if?: SimpleAppJSONSchema7Definition | undefined;
+    then?: SimpleAppJSONSchema7Definition | undefined;
+    else?: SimpleAppJSONSchema7Definition | undefined;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-6.7
+     */
+    allOf?: SimpleAppJSONSchema7Definition[] | undefined;
+    anyOf?: SimpleAppJSONSchema7Definition[] | undefined;
+    oneOf?: SimpleAppJSONSchema7Definition[] | undefined;
+    not?: SimpleAppJSONSchema7Definition | undefined;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-7
+     */
+    format?: string | undefined;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-8
+     */
+    contentMediaType?: string | undefined;
+    contentEncoding?: string | undefined;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-9
+     */
+    definitions?: {
+        [key: string]: JSONSchema7Definition;
+    } | undefined;
+
+    /**
+     * @see https://tools.ietf.org/html/draft-handrews-json-schema-validation-01#section-10
+     */
+    title?: string | undefined;
+    description?: string | undefined;
+    default?: JSONSchema7Type | undefined;
+    readOnly?: boolean | undefined;
+    writeOnly?: boolean | undefined;
+    examples?: JSONSchema7Type | undefined;
+}

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

@@ -27,7 +27,9 @@ import { <%Object.keys(it.models).forEach(function(modelname) { %>  Default<%=mo
 export class <%= it.typename %>Processor extends SimpleAppService<<%= it.typename %>>  {
   protected documentIdentityCode='<%~ it.autocompletecode %>'
   protected documentIdentityLabel='<%~ it.autocompletename %>'
-  protected withDocNumberFormat= <%= it.hasdocformat %>
+  <%if(it.jsonschema['x-simpleapp-config']['generateDocumentNumber']){%>
+  protected withDocNumberFormat = true
+  <%}%>
 
   protected foreignkeys = <%~ JSON.stringify(it.foreignkeys)%>
 

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

@@ -125,8 +125,9 @@
                     <%let tablefields = Object.keys(obj.items.properties) %>
                     <% for(let a=0;a<tablefields.length;a++){%>
                         <%let col= tablefields[a] %>
+                        <% if(skipcolumns.includes(col)){ continue}%> 
                         <%let subobj = obj.items.properties[col] %>
-                        <column field="<%=col%>" #body="{index}" :header="camelCaseToWords('<%=col%>')">
+                        <column field="<%=col%>" #body="{index}" :header="camelCaseToWords('<%=col%>')">                            
                             <%if(subobj['x-foreignkey']){%>
                                 <SimpleAppAutocomplete v-model="data.<%=key%>[index].<%=col%>" 
                                     :setting="o.getField('#/properties/<%=key%>/items/properties/<%=col%>')" 

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

@@ -5,7 +5,9 @@
  * last change 2023-09-23
  * Author: Ks Tan
  */
- import _ from 'lodash'
+import _ from 'lodash'
+import * as sharelibs from '../sharelibs'
+import * as jsonpath from 'jsonpath'
 import { SimpleAppClient } from "./SimpleAppClient";
 import {
   <%Object.keys(it.models).forEach(function(modelname) { %>  Default<%=modelname%>,  <%})%>
@@ -47,6 +49,9 @@ export class <%= it.typename%>Client extends SimpleAppClient<<%= it.typename%>,<
   public readonly schema= <%~ JSON.stringify(it.jsonschema) %>;
   protected documentIdentityCode='<%~ it.autocompletecode %>'
   protected documentIdentityName='<%~ it.autocompletename %>'  
+  <%if(it.jsonschema['x-simpleapp-config']['generateDocumentNumber']){%>
+  protected withDocNumberFormat = true
+  <%}%>
   constructor() {    
     const {$event,$listen,$axios}=useNuxtApp()
     let xorg = useRoute().params.xorg
@@ -137,7 +142,18 @@ export class <%= it.typename%>Client extends SimpleAppClient<<%= it.typename%>,<
   reCalculateValue(){
     console.log('trigger new recalculate')
     const data = this.getData()
+    
+    <% if(it.jsonschema['x-simpleapp-config']['formulas']){ %>
+      <%Object.keys(it.jsonschema['x-simpleapp-config']['formulas']).forEach(function(index) { %>
+        <% let fml = it.jsonschema['x-simpleapp-config']['formulas'][index] %>
+        // <%~ JSON.stringify(fml) %>
+        //const tmp = jsonpath.query(vdata,fieldpath).filter((item:string)=>item!='')
+        
+        jsonpath.apply(data, '<%~ fml.jsonpath %>', function(value) { return <%~fml.formula %> });
 
+      <%}) %>
+    <%} %>
+    /*
     <%Object.keys(it.jsonschema.properties).forEach(function(key) { %>
       <%let obj = it.jsonschema.properties[key]%>
       <%if(obj['x-compute']){%> //x-compute first level field
@@ -207,6 +223,6 @@ export class <%= it.typename%>Client extends SimpleAppClient<<%= it.typename%>,<
         <%}) %> 
         } 
       <%} /*process compute for 2nd level sub tables*/%>
-    <%}) %>
+    <%}) %> */
   }
 }

package/templates/nest/src/simpleapp/generate/processors/simpleapp.processor.ts.eta

@@ -255,6 +255,8 @@ export class SimpleAppService<T extends { _id?: string }> {
     if(!data._id){
       data._id = crypto.randomUUID()
     }
+
+    this.logger.debug('this.withDocNumberFormat :' + this.withDocNumberFormat + '  && ' + '!data[this.documentIdentityCode] ==' + !data[this.documentIdentityCode])
     if(this.withDocNumberFormat && !data[this.documentIdentityCode]){
       await this.genNewDocNo(appuser,data)
     }
@@ -277,7 +279,14 @@ export class SimpleAppService<T extends { _id?: string }> {
     this.applyNestedDateTime(appuser,data,'create')
     const newdoc = new this.doc(data);
     
-    result = await newdoc.save({session:appuser.getDBSession()})
+    try{
+      result = await newdoc.save({session:appuser.getDBSession()})
+    }catch(err){
+      this.logger.error(err)
+      throw new InternalServerErrorException(err)
+    }
+    
+
     
     // this.doc.create(data)
     // this.doc
@@ -325,22 +334,9 @@ export class SimpleAppService<T extends { _id?: string }> {
     ajv.addFormat('documentno', /.*$/);
     
 
-    ajv.addKeyword({ keyword: 'x-document-no', schemaType:'boolean' });
-    ajv.addKeyword({ keyword: 'x-document-label',schemaType: 'boolean' });
-    ajv.addKeyword({ keyword: 'x-document-status', schemaType: 'array' });
-    ajv.addKeyword({ keyword: 'x-document-api',schemaType: 'array' });
-    ajv.addKeyword({ keyword: 'x-page-type',schemaType:'string' }); // undefine mean no generate page
-    ajv.addKeyword({ keyword: 'x-ignore-autocomplete',schemaType: 'boolean' });
-    ajv.addKeyword({ keyword: 'x-isolation-type', schemaType: 'string' });
-    ajv.addKeyword({ keyword: 'x-document-type', schemaType: 'string' });
-    ajv.addKeyword({ keyword: 'x-document-name', schemaType: 'string' });
-    ajv.addKeyword({ keyword: 'x-collection-name',schemaType: 'string' });
-    ajv.addKeyword({ keyword: 'x-autocomplete-field', schemaType: 'boolean' });
     ajv.addKeyword({ keyword: 'x-foreignkey', schemaType: 'string' });
-    ajv.addKeyword({ keyword: 'x-import-lib', schemaType: 'array' });
-    ajv.addKeyword({ keyword: 'x-compute', schemaType: 'object' });
-    ajv.addKeyword({ keyword: 'x-required-role', schemaType: 'array' });
-    
+    ajv.addKeyword({ keyword: 'x-simpleapp-config', schemaType: 'object' });    
+
     const issuccess = await this.hook(appuser,HookType.beforeValidation, data);
     if (!issuccess) {
       const errormsg: string[] = [];
@@ -535,7 +531,9 @@ export class SimpleAppService<T extends { _id?: string }> {
 
 
   async genNewDocNo(appuser:UserContext,data:T){
+    this.logger.debug("genNewDocNo")
     const result = await this.docnogenerator.generateNextNumberFromDocument(appuser,this.documentType,data)
+    this.logger.debug(result,"genNewDocNo")
     data[this.documentIdentityCode]=result    
   }
 

package/templates/nest/src/simpleapp/services/docno.service.ts.eta

@@ -21,7 +21,7 @@ export class DocnoformatService extends DocnoformatProcessor {
     @InjectModel('Docnoformat') mydoc: Model<Docnoformat>,
     docnogenerator: DocNumberFormatGenerator,
   ) {
-    super(mydoc,docnogenerator);
+    super(mydoc, docnogenerator);
   }
 
   //    hook = async (type: string, data?: any) => {
@@ -68,10 +68,11 @@ export class DocnoformatService extends DocnoformatProcessor {
     doctype = doctype.toUpperCase();
     const searchresult = await this.search(
       appuser,
-      { docNoType: doctype },
-      { default: 'desc' },
+     { docNoType:doctype},
+     undefined,
+     {default:'desc'}
     );
-    console.log(searchresult);
+    console.log('searchresult',searchresult);
     let data: any = [];
     for (let i = 0; i < searchresult.length; i++) {
       const s = searchresult[i];

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

@@ -53,7 +53,11 @@ defineShortcuts({
   'ctrl_enter': () => newData()
 })
 const refresh = () => {
-  obj.list().then((res:any) => {    
+  const searchbody: SearchBody = {
+    fields: props.listColumns.concat(['created']),
+    // sorts:props.sorts
+  }
+  obj.search(searchbody).then((res:any) => {    
     recordlist.value = res;
     disabled.value=false
   });

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

@@ -0,0 +1,52 @@
+<template>
+    <div>
+        <input 
+        autofocus
+            placeholder="search" 
+            v-model="searchvalue"                    
+            class="w-full border  p-2" 
+            type="search" />
+    </div>
+    <div class="max-h-screen overflow-auto">
+        <ul >
+            
+            <li v-for="item in filterlist">
+            
+                <div  :class="getSelectedCSS(item)">
+                    <a class="flex flex-row " @click="clickRow(item)">
+                        <div class="mr-2">{{item.name  }}</div>
+                        <div class="font font-bold text-right">{{item.code}}</div>
+                    </a>
+                </div>
+            
+            </li>
+        </ul>
+    </div>
+</template>
+<script setup lang="ts">
+import {ref} from 'vue'
+import {ListItem} from '~/types/listview'
+const props = defineProps<{list:any[]}>()
+const emit = defineEmits(['clickitem'])
+const searchvalue = ref('')
+const selecteditem =ref('')
+const clickRow=(item:ListItem)=>{
+    emit('clickitem',item)
+    selecteditem.value = item.code
+}
+const filterlist =  computed(()=>{    
+    const newlist =props.list.filter(item=>
+            String(item.name).toLowerCase().includes(searchvalue.value.toLowerCase()))
+
+    return newlist
+})
+const getSelectedCSS= (item:ListItem)=>{
+    if(selecteditem.value == item.code){
+        return "p-2 border bg-sky-200"
+    }else{
+        return "p-2 border hover-list-primary"
+    }
+
+}
+
+</script>

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

@@ -1,7 +1,7 @@
 
 <template>
     <FieldContainer :hidelabel="hidelabel" v-model="modelValue" :label="label" :description="description"  :setting="setting" :instancepath="instancepath" :error="error" #default="slotprops">
-        <div class="p-inputgroup flex-1 ">
+        <div class="p-inputgroup ">
             <InputText class="simpleapp-inputfield" 
                 :inputId="slotprops.uuid"
                 v-model="modelValue"    

package/templates/nuxt/layouts/sidelistcrud.vue.eta

@@ -0,0 +1,43 @@
+<script lang="ts" setup>
+/**
+ * This file was automatically generated by simpleapp generator during initialization.
+ * You may modify it
+ * last change 2023-09-09
+ * author: Ks Tan
+ */
+
+import Menus from '~/components/Menus.vue'
+const {$listen,$event} = useNuxtApp()
+const primarylist = ref()
+
+primarylist.value = []
+
+// $listen('*',(type:any,data:any)=>{ //simple use case, use any to prevent error
+$listen('listloaded',(newlist)=>{
+    primarylist.value = newlist
+})
+
+const selectItem=(item:any)=>{
+    $event('itemselected',item)
+}
+
+</script>
+<template>
+    <div>
+
+        <Menus />
+        <Invitation/>
+        <div class="grid grid-cols-4">
+            <div class="col col-span-1  ">
+                <ListView :list="primarylist" @clickitem="selectItem"></ListView>
+            </div>                        
+            <div class="col-span-3">
+                <slot>
+
+                </slot>
+            </div>
+            
+        </div>
+        
+    </div>
+</template>