@simitgroup/simpleapp-generator 1.2.1 → 1.2.3

package/package.json

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

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

@@ -9,9 +9,9 @@ import { Model } from 'mongoose';
 import { Injectable } from '@nestjs/common';
 import { UserContext } from '../generate/commons/user.context';
 import { <%= it.typename %>Processor } from '../generate/processors/<%= it.doctype %>.processor';
-import { <%= it.typename %>} from '../generate/types/<%= it.doctype %>.type';
-import {HookType} from '../generate/types'
-export { <%= it.typename %>} from '../generate/types/<%= it.doctype %>.type';
+import { <%= it.typename %>,<%= it.typename %>Hooks} from '../generate/types';
+
+export { <%= it.typename %>} from '../generate/types';
 
 
 @Injectable()
@@ -19,51 +19,13 @@ export class <%= it.typename %>Service extends <%= it.typename %>Processor {
   <% const config = it.jsonschema['x-simpleapp-config']%>   
   <%if(config['loseDataIsolation']){%>protected strictIsolation = false;<%}%> 
       
-
+  public hooks: <%= it.typename %>Hooks = {}
     constructor(
         @InjectModel('<%= it.typename %>')  mydoc: Model<<%= it.typename %>>
         ){
         super(mydoc)
     }
 
- //  hook = async (appuser:UserContext,type: HookType, data?: any) => {
-  //   switch(type){
-  //       case HookType.init:  //data = undefined
-  //       break;
-  //       case HookType.beforeSearch:  //data = filters
-  //       break;
-  //       case HookType.afterSearch: //data = search result
-  //       break;
-  //       case HookType.beforeValidation: //data = documentdata
-  //       break;
-  //       case HookType.afterValidation: //data = documentdata
-  //       break;
-  //       case HookType.beforeCreate: //data = documentdata
-  //       break;
-  //       case HookType.afterCreate: //data = after create result (final data from mongodb)
-  //       break;
-  //       case HookType.beforeUpdate: //data = documentdata
-  //       break;
-  //       case HookType.afterUpdate: //data = after update result (return from mongodb)
-  //       break;
-  //       case HookType.beforeDelete: //data = record _id
-  //       break;
-  //       case HookType.afterDelete: //data = deleted result
-  //       break;
-  //       case HookType.beforeFetchRecord: //data = record _id
-  //       break;
-  //       case HookType.afterFetchRecord: //data = document data
-  //       break;
-  //       case HookType.beforeSetStatus: //data = document data
-  //       break;
-  //       case HookType.afterSetStatus: //data = document data
-  //       break;
-  //       default:
-  //       break;
-  //       }
-  //   return true;
-  // };
-
 /***************************** begin x-document-api definitions *****************************************/
 <% for(let i=0;i<it.apiSettings.length;i++){%>
 <% let api = it.apiSettings[i] %>

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

@@ -5,6 +5,7 @@
  * last change 2023-09-09
  * Author: Ks Tan
  */
+import {DefaultHooks} from  "../types"
 
 <%Object.keys(it.models).forEach(function(prop){ %>  
   <% let schema = it.models[prop] %>
@@ -26,3 +27,9 @@
   }
 <%})%>
 
+
+
+export type <%=it.typename%>Hooks = DefaultHooks<<%=it.typename%>> & {
+  
+  
+}

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';
@@ -31,12 +32,12 @@ import {
 } from '@nestjs/common/exceptions';
 import { UserContext } from '../commons/user.context';
 import { DocNumberFormatGenerator } from '../commons/docnogenerator.service';
-import { IsolationType, HookType, MoreProjectionType } from '../types';
+import { IsolationType, DefaultHooks, MoreProjectionType } from '../types';
 @Injectable()
 export class SimpleAppService<T extends { _id?: string }> {
   @Inject(EventEmitter2)
   protected eventEmitter: EventEmitter2;
-
+  protected hooks: DefaultHooks<T> = {};
   protected logger = new Logger();
   protected strictIsolation = true;
   protected jsonschema = { type: 'object', properties: {}, required: [] };
@@ -73,14 +74,15 @@ export class SimpleAppService<T extends { _id?: string }> {
     this.documentName = docname;
     this.doc = newdoc;
     this.isolationtype = isolationtype;
-    this.hook(undefined, HookType.init, undefined);
+    if (this.hooks.init) this.hooks.init();
     // 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;
+  getHooks = () => this.hooks;
   getData = () => {
     //console.log('thisdata', this.data);
     return this.data;
@@ -181,12 +183,15 @@ export class SimpleAppService<T extends { _id?: string }> {
    */
   private async searchNoIsolation(appuser: UserContext, filters: Object) {
     try {
-      await this.hook(appuser, HookType.beforeSearch, filters);
+      if (this.hooks.beforeSearch)
+        await this.hooks.beforeSearch(appuser, filters);
       const products = await this.doc.find(filters);
       const productlist = products.map((p: T) => {
         return p;
       });
-      await this.hook(appuser, HookType.afterSearch, productlist);
+      if (this.hooks.afterSearch)
+        await this.hooks.afterSearch(appuser, productlist);
+
       //   console.log(products);
       return productlist;
     } catch (err) {
@@ -224,7 +229,9 @@ export class SimpleAppService<T extends { _id?: string }> {
 
       // console.log("initial search",filters)
       const newfilters = { ...filters, ...isolationFilter };
-      await this.hook(appuser, HookType.beforeSearch, newfilters);
+
+      if (this.hooks.beforeSearch)
+        await this.hooks.beforeSearch(appuser, newfilters);
       // console.log("before _find",newfilters)
       // console.log("this.doc",this.doc)
       const products = await this.doc
@@ -235,7 +242,9 @@ export class SimpleAppService<T extends { _id?: string }> {
         return p;
       });
       // console.log("after map",productlist)
-      await this.hook(appuser, HookType.afterSearch, productlist);
+      if (this.hooks.afterSearch)
+        await this.hooks.afterSearch(appuser, productlist);
+
       //   console.log(products);
       return productlist;
     } catch (err) {
@@ -244,9 +253,12 @@ export class SimpleAppService<T extends { _id?: string }> {
     // return this;
   }
   async findById(appuser: UserContext, id: string) {
-    await this.hook(appuser, HookType.beforeFetchRecord, id);
+    if (this.hooks.beforeFetchRecord)
+      await this.hooks.beforeFetchRecord(appuser, id);
     const data = await this.search(appuser, { _id: id });
-    await this.hook(appuser, HookType.afterFetchRecord, data[0]);
+    if (this.hooks.afterFetchRecord)
+      await this.hooks.afterFetchRecord(appuser, data[0]);
+
     if (data.length == 1) {
       // console.log('data0', data[0]);
       return data[0];
@@ -276,8 +288,7 @@ export class SimpleAppService<T extends { _id?: string }> {
       await this.genNewDocNo(appuser, data);
     }
 
-    await this.hook(appuser, HookType.beforeCreate, data);
-
+    if (this.hooks.beforeCreate) await this.hooks.beforeCreate(appuser, data);
     let isolationFilter: any = { ...appuser.getCreateFilter() };
     isolationFilter = this.polishIsolationFilter(isolationFilter, data);
 
@@ -288,10 +299,9 @@ export class SimpleAppService<T extends { _id?: string }> {
     Object.assign(data, isolationFilter);
     this.reCalculateValue(data);
     await this.validateData(appuser, data);
-    this.logger.debug('Create record', 'SimpleAppService');
-    this.logger.debug(data, 'SimpleAppService');
-
+    this.logger.debug(data, `after create validation`);
     this.applyNestedDateTime(appuser, data, 'create');
+    this.logger.debug(data, `Create Record ${this.documentName}`);
     const newdoc = new this.doc(data);
     await this.identifyForeignKeys(appuser, data);
     try {
@@ -306,7 +316,8 @@ export class SimpleAppService<T extends { _id?: string }> {
     // this.doc
 
     // result = await newdoc.save()
-    await this.hook(appuser, HookType.afterCreate, result);
+
+    if (this.hooks.afterCreate) await this.hooks.afterCreate(appuser, result);
 
     return result as T;
   }
@@ -345,9 +356,6 @@ export class SimpleAppService<T extends { _id?: string }> {
       }
     }
   };
-  hook = async (appuser: UserContext, type: string, data?: any) => {
-    return true;
-  };
   async validateData(appuser: UserContext, data: T) {
     const ajv = new Ajv({ allErrors: true, useDefaults: true });
     addFormats(ajv);
@@ -360,14 +368,18 @@ export class SimpleAppService<T extends { _id?: string }> {
 
     ajv.addKeyword({ keyword: 'x-foreignkey', schemaType: 'string' });
     ajv.addKeyword({ keyword: 'x-simpleapp-config', schemaType: 'object' });
-
-    const issuccess = await this.hook(appuser, HookType.beforeValidation, data);
+    this.logger.debug('run hook during validation');
+    let issuccess = true;
+    if (this.hooks.beforeValidation) {
+      issuccess = await this.hooks.beforeValidation(appuser, data);
+    }
+    // const issuccess = await this.hook(appuser, HookType.beforeValidation, data);
     if (!issuccess) {
       const errormsg: string[] = [];
       for (let i = 0; i < this.errorlist.length; i++) {
         errormsg.push(this.errorlist[i].message);
       }
-      this.logger.log('run hook during validation');
+
       throw new BadRequestException(
         'Before validation hook failed',
         errormsg as HttpExceptionOptions,
@@ -389,7 +401,8 @@ export class SimpleAppService<T extends { _id?: string }> {
         validate.errors as HttpExceptionOptions,
       );
     }
-    await this.hook(appuser, HookType.afterValidation, data);
+    if (this.hooks.afterValidation)
+      await this.hooks.afterValidation(appuser, data);
   }
 
   polishIsolationFilter = (filterIsolation: any, data: any = {}) => {
@@ -431,7 +444,7 @@ export class SimpleAppService<T extends { _id?: string }> {
 
     let dependency;
     try {
-      await this.hook(appuser, HookType.beforeDelete, id);
+      if (this.hooks.beforeDelete) await this.hooks.beforeDelete(appuser, id);
       this.logger.debug('delete record', this.documentName, id);
       dependency = await this.getRelatedRecords(id);
       //console.log('dependency', dependency);
@@ -452,8 +465,9 @@ export class SimpleAppService<T extends { _id?: string }> {
           ' delete result' + this.doc.collection.name,
         );
         // this.doc.findByIdAndDelete(id)
-        await this.hook(appuser, HookType.afterDelete, deleteresult);
 
+        if (this.hooks.afterDelete)
+          await this.hooks.afterDelete(appuser, deleteresult, id);
         //this.doc.findByIdAndDelete(id);
         return deleteresult;
       } else {
@@ -481,7 +495,9 @@ export class SimpleAppService<T extends { _id?: string }> {
     if (!existingdata) {
       throw new NotFoundException(`${id} not found`, 'not found');
     }
-    await this.hook(appuser, HookType.beforeUpdate, data);
+
+    if (this.hooks.beforeUpdate)
+      await this.hooks.beforeUpdate(appuser, id, data);
 
     const dbsession = appuser.getDBSession();
     if (!dbsession.inTransaction()) {
@@ -508,7 +524,9 @@ export class SimpleAppService<T extends { _id?: string }> {
         .findOneAndUpdate(isolationFilter, data)
         .session(dbsession);
       appuser.addUpdatedRecordId(this.documentName, data._id);
-      await this.hook(appuser, HookType.afterUpdate, result);
+
+      if (this.hooks.afterUpdate)
+        await this.hooks.afterUpdate(appuser, id, result);
       return await this.findById(appuser, id);
     } catch (err) {
       throw new InternalServerErrorException(err.message);
@@ -590,17 +608,23 @@ export class SimpleAppService<T extends { _id?: string }> {
     }
 
     data['documentStatus'] = docstatus;
-    await this.hook(appuser, HookType.beforeSetStatus, data);
+    // await this.hook(appuser, HookType.beforeSetStatus, data);
+    if (this.hooks.beforeSetStatus)
+      await this.hooks.beforeSetStatus(appuser, docstatus, data);
     if (data && !data['created']) {
       const createresult = await this.create(appuser, data);
-      await this.hook(appuser, HookType.afterSetStatus, createresult);
+      if (this.hooks.afterSetStatus)
+        await this.hooks.afterSetStatus(appuser, docstatus, createresult);
+
       return createresult;
     } else {
-      const originalresult = await this.findById(appuser,id)
-      const newdata = {...originalresult,...data}
+      const originalresult = await this.findById(appuser, id);
+      const newdata = { ...originalresult, ...data };
       const updateresult = await this.findIdThenUpdate(appuser, id, newdata);
-      const finaldata = await this.findById(appuser,id)
-      await this.hook(appuser, HookType.afterSetStatus, finaldata);
+      const finaldata = await this.findById(appuser, id);
+      if (this.hooks.afterSetStatus)
+        await this.hooks.afterSetStatus(appuser, docstatus, finaldata);
+
       return updateresult;
     }
   }
@@ -655,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/nest/src/simpleapp/generate/types/index.ts.eta

@@ -1,59 +1,7 @@
-/**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2023-10-28
- * Author: Ks Tan
- */
-export type ForeignKey = {
-  _id: string;
-  label: string;
-};
-export type ModifiedCollection = {
-  [key: string]: string[];
-};
-export type ModifiedRecords = {
-  createds: ModifiedCollection;
-  updateds: ModifiedCollection;
-  deleteds: ModifiedCollection;
-};
-export type DocNumberFormatResult = {
-  formatId: string;
-  formatName: string;
-  result: string;
-};
 
-export type SearchBody = {
-  filter?: Object;
 
-  fields?: any[];
-
-  sorts?: any[];
-};
-
-
-export enum IsolationType {
-  'none' = 'none',
-  'org' = 'org',
-  'tenant' = 'tenant',
-  'branch' = 'branch',
-}
-export enum HookType {
-  'init' = 'init',
-  'beforeSearch' = 'beforeSearch',
-  'afterSearch' = 'afterSearch',
-  'beforeValidation' = 'beforeValidation',
-  'afterValidation' = 'afterValidation',
-  'beforeCreate' = 'beforeCreate',
-  'afterCreate' = 'afterCreate',
-  'beforeUpdate' = 'beforeUpdate',
-  'afterUpdate' = 'afterUpdate',
-  'beforeDelete' = 'beforeDelete',
-  'afterDelete' = 'afterDelete',
-  'beforeFetchRecord' = 'beforeFetchRecord',
-  'afterFetchRecord' = 'afterFetchRecord',
-  'beforeSetStatus'='beforeSetStatus',
-  'afterSetStatus'='afterSetStatus'
-}
-export type MoreProjectionType = {
-  [key: string]: string;
-};
+<%for(let i=0; i<it.modules.length;i++){ %>
+<% const d = it.modules[i] %>      
+export * from './<%= d['doctype']%>.type'      
+<%}%>
+export * from './simpleapp.type'

package/templates/nest/src/simpleapp/generate/types/simpleapp.type.ts.eta

@@ -0,0 +1,76 @@
+/**
+ * This file was automatically generated by simpleapp generator. Every
+ * MODIFICATION OVERRIDE BY GENERATEOR
+ * last change 2024-01-25
+ * Author: Ks Tan
+ */
+import { UserContext } from 'src/simpleapp/generate/commons/user.context';
+export type ForeignKey = {
+  _id: string;
+  label: string;
+};
+export type ModifiedCollection = {
+  [key: string]: string[];
+};
+export type ModifiedRecords = {
+  createds: ModifiedCollection;
+  updateds: ModifiedCollection;
+  deleteds: ModifiedCollection;
+};
+export type DocNumberFormatResult = {
+  formatId: string;
+  formatName: string;
+  result: string;
+};
+
+export type SearchBody = {
+  filter?: Object;
+
+  fields?: any[];
+
+  sorts?: any[];
+};
+
+
+export enum IsolationType {
+  'none' = 'none',
+  'org' = 'org',
+  'tenant' = 'tenant',
+  'branch' = 'branch',
+}
+export type DefaultHooks<T> = {
+  init?: () => Promise<void> ;
+  beforeSearch?: (appuser:UserContext,filter:any) => Promise<void> ;
+  afterSearch?: (appuser:UserContext,data:T[]) => Promise<void> ;
+  beforeValidation?: (appuser:UserContext,data:T) => Promise<boolean> ;
+  afterValidation?: (appuser:UserContext,data:T) => Promise<void> ;
+  beforeCreate?: (appuser:UserContext,data:T) => Promise<void> ;
+  afterCreate?: (appuser:UserContext,data:T) => Promise<void> ;
+  beforeUpdate?: (appuser:UserContext,id:string,data:T) => Promise<void> ;
+  afterUpdate?: (appuser:UserContext,id:string,data:T) => Promise<void> ;
+  beforeDelete?: (appuser:UserContext,id:string) => Promise<void> ;
+  afterDelete?: (appuser:UserContext,data:any,id:string) => Promise<void> ;
+  beforeFetchRecord?: (appuser:UserContext,id:string) => Promise<void> ;
+  afterFetchRecord?: (appuser:UserContext,data:T) => Promise<void> ;
+  beforeSetStatus?: (appuser:UserContext,id:string,data:T) => Promise<void> ;
+  afterSetStatus ?: (appuser:UserContext,id:string,data:T) => Promise<void> ;
+};
+export type MoreProjectionType = {
+  [key: string]: string;
+};
+export type ApiEvent = {
+    _id: string
+    created: string
+    updated?:string
+    duration: number
+    createdBy: string
+    path: string
+    ip: string
+    method: string
+    headers: any
+    data?:  any
+    statusCode:number
+    status:string
+    errMsg?:string
+    errData?: any
+}

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

@@ -9,49 +9,17 @@ import { Model } from 'mongoose';
 import { Injectable } from '@nestjs/common';
 import { AutoincreamentProcessor } from '../generate/processors/autoinc.processor';
 
-import { Autoincreament } from '../generate/types/autoinc.type';
+import { Autoincreament,AutoincreamentHooks } from '../generate/types';
 import { UserContext } from '../generate/commons/user.context';
-export { Autoincreament } from '../generate/types/autoinc.type';
+export { Autoincreament } from '../generate/types';
 
 @Injectable()
 export class AutoincreamentService extends AutoincreamentProcessor {
+  hooks: AutoincreamentHooks = {};
   constructor(@InjectModel('Autoincreament') mydoc: Model<Autoincreament>) {
     super(mydoc);
   }
 
-  //    hook = async (appuser:UserContext,type: string, data?: any) => {
-  //     switch(type){
-  //         case 'init':
-  //         break;
-  //         case 'beforeSearch':
-  //         break;
-  //         case 'afterSearch':
-  //         break;
-  //         case 'beforeValidation':
-  //         break;
-  //         case 'afterValidation':
-  //         break;
-  //         case 'beforeCreate':
-  //         break;
-  //         case 'afterCreate':
-  //         break;
-  //         case 'beforeUpdate':
-  //         break;
-  //         case 'afterUpdate':
-  //         break;
-  //         case 'beforeDelete':
-  //         break;
-  //         case 'afterDelete':
-  //         break;
-  //         case 'beforeFetchRecord':
-  //         break;
-  //         case 'afterFetchRecord':
-  //         break;
-  //         default:
-  //         break;
-  //         }
-  //     return true;
-  //   };
 
   async runGenerateNextNo(
     appuser: UserContext,

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

@@ -8,16 +8,22 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 import { Injectable, InternalServerErrorException } from '@nestjs/common';
 import { BranchProcessor } from '../generate/processors/branch.processor';
-import { Branch } from '../generate/types/branch.type';
+import { Branch, BranchHooks } from '../generate/types';
 import { alldocuments } from '../generate/commons/dicts/documents';
-export { Branch } from '../generate/types/branch.type';
+
 import { AutoincreamentService } from './autoinc.service';
 import { UserContext } from '../generate/commons/user.context';
 import { Docnoformat, DocnoformatService } from './docno.service';
+
+export { Branch } from '../generate/types';
 // import { Docnoformat } from '../generate/types/docno.type';
 @Injectable()
 export class BranchService extends BranchProcessor {
   protected strictIsolation = false;
+  protected hooks: BranchHooks = {        
+    beforeCreate: async (appuser: UserContext, data: Branch) => await this.branchBeforeCreate(appuser,data),
+    afterCreate: async (appuser: UserContext, data: Branch) => await this.branchAfterCreate(appuser,data),
+  };
   constructor(
     @InjectModel('Branch') mydoc: Model<Branch>,
     private increament: AutoincreamentService,
@@ -25,47 +31,17 @@ export class BranchService extends BranchProcessor {
   ) {
     super(mydoc);
   }
-
-  hook = async (appuser: UserContext, type: string, data?: any) => {
-    switch (type) {
-      //         case 'init':
-      //         break;
-      //         case 'beforeSearch':
-      //         break;
-      //         case 'afterSearch':
-      //         break;
-      //         case 'beforeValidation':
-      //         break;
-      //         case 'afterValidation':
-      //         break;
-      case 'beforeCreate':
-        const searchresult = await this.increament.runGenerateNextNo(
-          appuser,
-          'branch',
-          'branchId',
-        );
-        data.branchId = searchresult.nextno;
-        break;
-      case 'afterCreate':
-        await this.generateDefaultDocNumbers(appuser, data);
-        break;
-      //         case 'beforeUpdate':
-      //         break;
-      //         case 'afterUpdate':
-      //         break;
-      //         case 'beforeDelete':
-      //         break;
-      //         case 'afterDelete':
-      //         break;
-      //         case 'beforeFetchRecord':
-      //         break;
-      //         case 'afterFetchRecord':
-      //         break;
-      //         default:
-      //         break;
-    }
-    return true;
-  };
+  async branchBeforeCreate(appuser: UserContext, data: Branch) {
+    const searchresult = await this.increament.runGenerateNextNo(
+      appuser,
+      'branch',
+      'branchId',
+    );
+    data.branchId = searchresult.nextno;
+  }
+  async branchAfterCreate(appuser: UserContext, data: Branch) {
+    await this.generateDefaultDocNumbers(appuser, data);
+  }
 
   generateDefaultDocNumbers = async (appuser, data) => {
     const branchName = data.branchName;

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

@@ -8,55 +8,22 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 import { Injectable, InternalServerErrorException } from '@nestjs/common';
 import { DocnoformatProcessor } from '../generate/processors/docno.processor';
-import { Docnoformat } from '../generate/types/docno.type';
+import { Docnoformat,DocnoformatHooks } from '../generate/types';
 import { UserContext } from '../generate/commons/user.context';
 import * as moment from 'moment';
 import { DocNumberFormatGenerator } from '../generate/commons/docnogenerator.service';
-export { Docnoformat } from '../generate/types/docno.type';
+export { Docnoformat } from '../generate/types';
 
 @Injectable()
 export class DocnoformatService extends DocnoformatProcessor {
   protected strictIsolation = false;
+  hooks: DocnoformatHooks = {};
   constructor(
     @InjectModel('Docnoformat') mydoc: Model<Docnoformat>,
   ) {
     super(mydoc);
   }
 
-  //    hook = async (type: string, data?: any) => {
-  //     switch(type){
-  //         case 'init':
-  //         break;
-  //         case 'beforeSearch':
-  //         break;
-  //         case 'afterSearch':
-  //         break;
-  //         case 'beforeValidation':
-  //         break;
-  //         case 'afterValidation':
-  //         break;
-  //         case 'beforeCreate':
-  //         break;
-  //         case 'afterCreate':
-  //         break;
-  //         case 'beforeUpdate':
-  //         break;
-  //         case 'afterUpdate':
-  //         break;
-  //         case 'beforeDelete':
-  //         break;
-  //         case 'afterDelete':
-  //         break;
-  //         case 'beforeFetchRecord':
-  //         break;
-  //         case 'afterFetchRecord':
-  //         break;
-  //         default:
-  //         break;
-  //         }
-  //     return true;
-  //   };
-
   /**
    * list document number format and prepare sample of docformat
    * @param appuser

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

@@ -8,14 +8,17 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 import { Injectable } from '@nestjs/common';
 import { OrganizationProcessor } from '../generate/processors/org.processor';
-import { Organization } from '../generate/types/org.type';
-export { Organization } from '../generate/types/org.type';
+import { Organization,OrganizationHooks } from '../generate/types';
+export { Organization } from '../generate/types';
 import { AutoincreamentService } from './autoinc.service';
 import { UserContext } from '../generate/commons/user.context';
 
 @Injectable()
 export class OrganizationService extends OrganizationProcessor {
   protected strictIsolation = false;
+  protected hooks : OrganizationHooks = {
+    beforeCreate: async (appuser: UserContext, data: Organization) => await this.orgBeforeCreate(appuser,data),
+  };
   constructor(
     @InjectModel('Organization') mydoc: Model<Organization>,
     private increament: AutoincreamentService,
@@ -23,43 +26,12 @@ export class OrganizationService extends OrganizationProcessor {
     super(mydoc);
   }
 
-  hook = async (appuser: UserContext, type: string, data?: any) => {
-    switch (type) {
-      //         case 'init':
-      //         break;
-      //         case 'beforeSearch':
-      //         break;
-      //         case 'afterSearch':
-      //         break;
-      //         case 'beforeValidation':
-      //         break;
-      //         case 'afterValidation':
-      //         break;
-      case 'beforeCreate':
-        const searchresult = await this.increament.runGenerateNextNo(
+  async orgBeforeCreate(appuser:UserContext,data:Organization){
+    const searchresult = await this.increament.runGenerateNextNo(
           appuser,
           'organization',
           'orgId',
         );
         data.orgId = searchresult.nextno;
-        break;
-      //         case 'afterCreate':
-      //         break;
-      //         case 'beforeUpdate':
-      //         break;
-      //         case 'afterUpdate':
-      //         break;
-      //         case 'beforeDelete':
-      //         break;
-      //         case 'afterDelete':
-      //         break;
-      //         case 'beforeFetchRecord':
-      //         break;
-      //         case 'afterFetchRecord':
-      //         break;
-      //         default:
-      //         break;
-    }
-    return true;
-  };
+  }  
 }

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

@@ -8,63 +8,20 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Model, PipelineStage } from 'mongoose';
 import { Injectable } from '@nestjs/common';
 import { PermissionProcessor } from '../generate/processors/perm.processor';
-import { Permission } from '../generate/types/perm.type';
+import { Permission,PermissionHooks } from '../generate/types';
 import { UserContext } from '../generate/commons/user.context';
-
-export { Permission } from '../generate/types/perm.type';
+export { Permission } from '../generate/types';
 
 @Injectable()
 export class PermissionService extends PermissionProcessor {
   protected strictIsolation = false;
+  protected hooks : PermissionHooks = {};
   constructor(
     @InjectModel('Permission') mydoc: Model<Permission>,    
     ) {
     super(mydoc);
   }
 
-  hook = async (appuser: UserContext, type: string, data?: any) => {
-    switch (
-      type
-      //         case 'init':
-      //         break;
-      //         case 'beforeSearch':
-      //         break;
-      //         case 'afterSearch':
-      //         break;
-      //         case 'beforeValidation':
-      //         break;
-      //         case 'afterValidation':
-      //         break;
-      //         case 'beforeCreate':
-      //         break;
-      //         case 'afterCreate':
-      //         break;
-      //         case 'beforeUpdate':
-      //         break;
-      //         case 'afterUpdate':
-      //         break;
-      //         case 'beforeDelete':
-      //         break;
-      //         case 'afterDelete':
-      // case 'beforeDeleteMany':
-      // this.logger.log(data, 'beforeDeleteMany');
-      // this.deleteMany(appuser,data)
-      //   break;
-      // case 'afterDeleteMany':
-      // this.logger.log(data, 'afterDeleteMany', data);
-      // break;
-
-      //         break;
-      //         case 'beforeFetchRecord':
-      //         break;
-      //         case 'afterFetchRecord':
-      //         break;
-      //         default:
-      //         break;
-    ) {
-    }
-    return true;
-  };
 
   async runListUser(appuser: UserContext) {
     const getallrecords: PipelineStage = { $match: {} };

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

@@ -9,13 +9,16 @@ import { InjectModel } from '@nestjs/mongoose';
 import { Model } from 'mongoose';
 import { Injectable } from '@nestjs/common';
 import { TenantProcessor } from '../generate/processors/tenant.processor';
-import { Tenant } from '../generate/types/tenant.type';
+import { Tenant,TenantHooks } from '../generate/types';
 import { AutoincreamentService } from './autoinc.service';
 import { UserContext } from '../generate/commons/user.context';
-export { Tenant } from '../generate/types/tenant.type';
+export { Tenant } from '../generate/types';
 
 @Injectable()
 export class TenantService extends TenantProcessor {
+  protected hooks : TenantHooks = {
+    beforeCreate: async (appuser: UserContext, data: Tenant) => await this.tenantBeforeCreate(appuser,data),
+  };
   constructor(
     @InjectModel('Tenant') mydoc: Model<Tenant>,
     private increament: AutoincreamentService,
@@ -24,45 +27,12 @@ export class TenantService extends TenantProcessor {
     super(mydoc);
   }
 
-  hook = async (appuser: UserContext, type: string, data?: any) => {
-    switch (type) {
-      //         case 'init':
-      //         break;
-      //         case 'beforeSearch':
-      //         break;
-      //         case 'afterSearch':
-      //         break;
-      //         case 'beforeValidation':
-      //         break;
-      //         case 'afterValidation':
-      //         break;
-      case 'beforeCreate':
-        const searchresult = await this.increament.runGenerateNextNo(
+  async tenantBeforeCreate(appuser:UserContext,data:Tenant){
+     const searchresult = await this.increament.runGenerateNextNo(
           appuser,
           'tenant',
           'tenantId',
         );
-        data.tenantId = searchresult.nextno;
-        data.uuid = crypto.randomUUID()
-        break;
-      // case 'afterCreate':
-      //   console.log('this.data',data)
-      // break;
-      //         case 'beforeUpdate':
-      //         break;
-      //         case 'afterUpdate':
-      //         break;
-      //         case 'beforeDelete':
-      //         break;
-      //         case 'afterDelete':
-      //         break;
-      //         case 'beforeFetchRecord':
-      //         break;
-      //         case 'afterFetchRecord':
-      //         break;
-      //         default:
-      //         break;
-    }
-    return true;
-  };
+        data.tenantId = searchresult.nextno;        
+  }    
 }

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/getOpenApi.generate.ts.eta

@@ -10,12 +10,15 @@ import axios from 'axios'
 
 
 const getAxiosConfig = () => {
+  const suffix = getCurrentXorg() ?  '/'+getCurrentXorg() : ''
   const config: o.Configuration = {
-    basePath: `${useRuntimeConfig().public.APP_URL}/api/${getCurrentXorg()}`,
+    basePath: `${useRuntimeConfig().public.APP_URL}/api${suffix}`,
     isJsonMime: () => true,
   };
   return config
 }
+
+
 export const getApiSession = async ()=> {
   const res = await (new o.PROFILEApi(getAxiosConfig(),undefined,useNuxtApp().$axios)).getSession()
   return res

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/plugins/20.simpleapp-userstore.ts.eta

@@ -93,15 +93,15 @@ export default defineNuxtPlugin( async(nuxtApp) => {
             })            
           },                  
           getCurrentXorg(){
-            return  (useRoute().params.xorg) ? String(useRoute().params.xorg) : undefined            
+            return  (useRoute().params.xorg) ? String(useRoute().params.xorg) : undefined           
           },
           async pingSession(){
-            let xorg = this.getCurrentXorg()    
+            let xorg = this.getCurrentXorg() 
             let apiurl=''
-            if(xorg===undefined){
+            if(!xorg){
               apiurl = `${useRuntimeConfig().public.APP_URL}/api`
             }else{
-              apiurl = `${useRuntimeConfig().public.APP_URL}/api/${xorg}`
+            apiurl = `${useRuntimeConfig().public.APP_URL}/api/${xorg}`
             }
             const {$axios} = useNuxtApp()
             return await new PROFILEApi(undefined,apiurl,$axios).getSession()

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'        
+<%}%> 

package/templates/nest/src/simpleapp/generate/types/apievent.type.ts.eta

@@ -1,22 +0,0 @@
-/**
- * This file was automatically generated by simpleapp generator. Every
- * MODIFICATION OVERRIDE BY GENERATEOR
- * last change 2023-10-28
- * Author: Ks Tan
- */
-export type ApiEvent = {
-    _id: string
-    created: string
-    updated?:string
-    duration: number
-    createdBy: string
-    path: string
-    ip: string
-    method: string
-    headers: any
-    data?:  any
-    statusCode:number
-    status:string
-    errMsg?:string
-    errData?: any
-}