@simitgroup/simpleapp-generator 1.2.2 → 1.2.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@simitgroup/simpleapp-generator",
-  "version": "1.2.2",
+  "version": "1.2.3",
   "description": "frontend nuxtjs and backend nests code generator using jsonschema",
   "main": "dist/index.js",
   "scripts": {

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

@@ -12,7 +12,7 @@
 <script setup lang="ts">
 /**
  * This file was automatically generated by simpleapp everytime regenerate code.
- * delete file "delete-me-for-avoid-override" if you want to modify this file and 
+ * delete file "delete-me.txt" if you want to modify this file and 
  * prevent regenerate code override it.
  * last change 2023-09-09
  * author: Ks Tan

package/templates/nest/src/simpleapp/generate/commons/interceptors/response.interceptor.ts.eta

@@ -17,7 +17,7 @@ import { catchError, tap } from 'rxjs/operators';
 import { Model, Connection, ClientSession } from 'mongoose';
 import { InjectConnection, InjectModel } from '@nestjs/mongoose';
 import { UserContext } from '../user.context';
-import { ApiEvent } from '../../types/apievent.type';
+import { ApiEvent } from '../../types';
 @Injectable()
 export class ResponseInterceptor implements NestInterceptor {
   constructor(

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

@@ -7,7 +7,8 @@
 import { Injectable, Logger, Inject } from '@nestjs/common';
 import { InjectModel } from '@nestjs/mongoose';
 import jsonpath from 'jsonpath';
-import { uniq } from 'lodash';
+import _ from 'lodash';
+
 import { AuditTrail } from '../commons/audittrail.service';
 import { foreignkeys } from '../commons/dicts/foreignkeys';
 import { EventEmitter2 } from '@nestjs/event-emitter';
@@ -77,7 +78,7 @@ export class SimpleAppService<T extends { _id?: string }> {
     // this.tenantdoc = tenantdoc
   }
   getDocumentType = () => this.documentType;
-  getDocumentName = () => this.documentName;
+  getDocumentName = (capFirst:boolean=false) => capFirst ? _.upperFirst(this.documentName) :this.documentName;  
   getRecordId = (): string => this.data._id;
   setSchema = (newschema) => (this.jsonschema = newschema);
   getSchema = () => this.doc.schema.obj;
@@ -297,7 +298,7 @@ export class SimpleAppService<T extends { _id?: string }> {
     this.logger.debug(data, 'SimpleAppService');
     Object.assign(data, isolationFilter);
     this.reCalculateValue(data);
-    await this.validateData(appuser, data);        
+    await this.validateData(appuser, data);
     this.logger.debug(data, `after create validation`);
     this.applyNestedDateTime(appuser, data, 'create');
     this.logger.debug(data, `Create Record ${this.documentName}`);
@@ -378,7 +379,7 @@ export class SimpleAppService<T extends { _id?: string }> {
       for (let i = 0; i < this.errorlist.length; i++) {
         errormsg.push(this.errorlist[i].message);
       }
-      
+
       throw new BadRequestException(
         'Before validation hook failed',
         errormsg as HttpExceptionOptions,
@@ -678,7 +679,7 @@ export class SimpleAppService<T extends { _id?: string }> {
 
       if (results.length > 0) {
         if (results.length > 1) {
-          results = uniq<string>(results);
+          results = _.uniq<string>(results);
         }
 
         keystore[collectionname] = results;

package/templates/nuxt/components/simpleApp/SimpleAppAutocomplete.vue.eta

@@ -21,16 +21,15 @@
         <div v-else class="p-3 border rounded-lg border-gray-300 dark:border-blue-900/40 ">
             <span :readonly="readonly" class="cursor-pointer text-primary-600  dark:text-primary-400 "
                 tabindex="0" @click="openViewer(true)">{{ modelValue && modelValue.label ?  modelValue.label:'-' }}</span>
-        </div>
+        </div>        
 </template>
 <script setup lang="ts">
 import { isNull } from 'lodash';
+import * as jsonpath from 'jsonpath';
 import {autocompletetype,SchemaConfig,SchemaType} from '~/types'
 const autocompleteinput = ref()
 const {$event} = useNuxtApp()
 const list = ref<any[]>([])
-const emptyautocomplete =():autocompletetype=> ({_id:'',code:'',label:''})
-
 const props = withDefaults(defineProps<{
     setting:any    
     allowAddNew?:boolean
@@ -41,15 +40,22 @@ const props = withDefaults(defineProps<{
 }>(),{
 allowAddNew:true,showNull:true
 })
-const autocompleteitem = ref<autocompletetype>(emptyautocomplete())
+
+const path = '$'+props.setting.instancepath
+const modifiedpath = path.replaceAll('/','.')        
+const queryresult = jsonpath.query(props.setting.defaultValue,modifiedpath)[0]
+
+const emptyautocomplete = computed(():autocompletetype=> queryresult)
+
+const autocompleteitem = ref<autocompletetype>(emptyautocomplete.value)
 const modelValue = defineModel<autocompletetype>()        
 if(modelValue.value && modelValue.value._id){
     autocompleteitem.value={...modelValue.value}
 }
 //clear auto complete auto set value = empty
 const clear = ()=>{
-    autocompleteitem.value = emptyautocomplete()
-    modelValue.value = emptyautocomplete()
+    autocompleteitem.value = emptyautocomplete.value
+    modelValue.value = emptyautocomplete.value
 }
 const buttonClass=computed(()=>modelValue.value?._id ? 'pi pi-link' : 'pi pi-angle-down')
 
@@ -63,7 +69,7 @@ const beforeShow = ()=>{
 //recorrect data if lose focus
 const onBlurAutocomplete = ()=>{   
     if(  autocompleteitem.value === null){
-        autocompleteitem.value = emptyautocomplete()
+        autocompleteitem.value = emptyautocomplete.value
     }
     if(isNull(modelValue.value )){
         modelValue.value = autocompleteitem.value
@@ -94,13 +100,13 @@ const pickAutoComplete = (event:any)=>{
     console.log("event",event,'event.value._id',"'"+event.value._id+"'")
     if(event.value._id===''){
         
-        modelValue.value =  emptyautocomplete()
-        autocompleteitem.value = emptyautocomplete()
+        modelValue.value =  emptyautocomplete.value
+        autocompleteitem.value = emptyautocomplete.value
         console.log(modelValue.value )
     } else if(event.value._id==='new'){
         
-        modelValue.value =  emptyautocomplete()
-        autocompleteitem.value = emptyautocomplete()
+        modelValue.value =  emptyautocomplete.value
+        autocompleteitem.value = emptyautocomplete.value
         openViewer(false)        
     } 
     else if(typeof event.value.query == 'undefined'){      

package/templates/nuxt/components/simpleApp/SimpleAppForm.vue.eta

@@ -1,5 +1,5 @@
 <template>
-    <form class="simpleapp-form" @submit.prevent="true">
+    <form class="simpleapp-form" @submit.prevent="true">        
         <slot name="header"><h3 class="flex flex-col">{{ title }}</h3></slot>
         <slot  name="default" :data="document.getData()" :getField="getField"></slot>
     </form>
@@ -9,7 +9,8 @@
 import * as jsonpath from 'jsonpath';
 import { SimpleAppClient } from  '~/simpleapp/generate/clients/SimpleAppClient'
 import type { JSONSchema7,JSONSchema7Definition } from 'json-schema';
-import _ from 'lodash'
+import * as alldefaults from '~/simpleapp/generate/defaults'
+import _, { upperFirst } from 'lodash'
     const props = defineProps<{
         title?:string,
         document: SimpleAppClient<any,any>
@@ -29,7 +30,11 @@ import _ from 'lodash'
         const fieldsetting = getPathObject(schema,path)
         // console.log("setting",fieldsetting)
         
+        type defaulttype = typeof alldefaults
+        type keytype = keyof defaulttype
         
+        const x : keytype = 'Default'+ props.document.getDocName(true)   as keytype
+        const defaultvalue = alldefaults[x](crypto.randomUUID())
         return {
             path: path,
             key: _.last(path.split('/')),
@@ -41,15 +46,13 @@ import _ from 'lodash'
             modelField: 'email',
             isrequired: getIsRequired(schema,path),
             errors: props.document.getErrors(),
-            readonly: isreadonly.value
+            readonly: isreadonly.value,
+            defaultValue: defaultvalue
         } //as SimpleAppFieldSetting
     }
 
     //    "schemaPath": "#/properties/email/format",
 
-    const getModelValue=(data:any,path:string)=>{
-
-    }
     const getIsRequired=(schema:any,path:string)=>{
         if(!path){
             console.error('unknown path')

package/templates/nuxt/composables/stringHelper.generate.ts.eta

@@ -1,4 +1,6 @@
 import plugin from 'primevue/config';
+import _ from 'lodash'
+
 import {Md5} from 'ts-md5'
 import moment from "moment";
 export const camelCaseToWords = (s: string) =>{
@@ -19,4 +21,5 @@ export const t = (txt:string,options?:any):string => useNuxtApp().$i18n.t(txt,op
 export const today = () => moment().format('YYYY-MM-DD')
 export const dateToString = (date:Date) => moment(date).format('YYYY-MM-DD')
 export const getMoment = (startTime:string)=> moment(startTime)
-export const lastDateOfMonth = (datestr:string) => moment(datestr).endOf('month').format('YYYY-MM-DD');
+export const lastDateOfMonth = (datestr:string) => moment(datestr).endOf('month').format('YYYY-MM-DD');
+export const upperFirst = (str:string) => _.upperFirst(str)

package/templates/nuxt/simpleapp/generate/clients/SimpleAppClient.ts.eta

@@ -45,7 +45,7 @@ export class SimpleAppClient<
   }
 
   getDocType = () => this.doctype;
-  getDocName = () => this.docname;
+  getDocName = (capFirst:boolean=false) => capFirst ? upperFirst(this.docname) :this.docname;
   setNew = ()=>{}
   isNew = () => this.data.value?.created==''
   setSchema = (schema: SchemaType) => (this.schema = schema);

package/templates/nuxt/simpleapp/generate/defaults/index.ts.eta

@@ -0,0 +1,4 @@
+<%for(let i=0; i<it.modules.length;i++){ %>
+<% const d = it.modules[i] %>      
+export {Default<%= d['docname']%>} from './<%= d['docname']%>.default'        
+<%}%>