@simitgroup/simpleapp-generator 2.0.2-l-alpha → 2.0.2-n-alpha

package/ReleaseNote.md

@@ -1,3 +1,7 @@
+[2.0.2n-alpha]
+
+1. Fix generated code eslint error
+
 [2.0.2l-alpha]
 
 1. Add direct debit mini api scope

package/app-publish.sh

@@ -1 +1,3 @@
+# npm config set //registry.npmjs.org/:_authToken=YOUR_TOKEN
+
 npm run build && npm publish --access public

package/package.json

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

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

@@ -19,6 +19,8 @@ export * from 'src/simple-app/_core/framework/schemas';
     let tmptypename = typename.replace('[','').replace(']','')        
     if(proptype=='schema'){
       tmptypename= upperFirstCase(tmptypename)        
+    }else if(systemtypes.includes(typename)){
+        tmptypename = tmptypename.toLowerCase();
     }
     
     if(typename.includes('[')){
@@ -44,27 +46,27 @@ export * from 'src/simple-app/_core/framework/schemas';
             @Prop({type: Object})
             @Field(()=>GraphQLJSON)            
             @ApiProperty({ type:()=>Object,required: <%= required %>, default: {} })
-            <%= key %> <%=required ? '' :'?' %>: Object;
+            <%= key %> <%=required ? '' :'?' %>: object;
         <% } else { %>
            
             @Prop()
             @Field()
             <% const newtypename=  toTypeName(it.resourceName ,obj) %>
             @ApiProperty({type: ()=><%=newtypename%>, required: <%= required %>})
-            <%= key %> <%=required ? '' :'?' %>:  <%= newtypename %>;
+            <%= key %> <%=required ? '' :'?' %>:  <%= getFieldType('type', newtypename, '') %>;
         <% } %>
     <%} else if(typeof obj.default !='undefined' && JSON.stringify(obj.default)=='{}'){%>    
         @Prop({type: Object})
         @Field(()=>GraphQLJSON)
         @ApiProperty({ type:()=>Object,required: <%= required %>, default: {} })
-        <%= key %> <%=required ? '' :'?' %>: Object;
+        <%= key %> <%=required ? '' :'?' %>: object;
     <% } else if( Array.isArray( obj)){%>
-        
+
         <% const newtypename= toTypeName(it.resourceName ,obj[0])%>
         @Prop()
         @Field(() => [<%=newtypename %>])
         @ApiProperty({type: ()=>[<%= newtypename  %>], required: <%= required %> })                    
-        <%= key %> <%=required ? '' :'?' %>:  <%= newtypename %>[];        
+        <%= key %> <%=required ? '' :'?' %>:  <%= getFieldType('type', newtypename, '') %>[];        
     <% }else{%>
         @Prop()
         @Field()                

package/templates/nest/src/simple-app/_core/features/auth/keycloak/keycloak.guard.ts.eta

@@ -31,7 +31,7 @@ export class CustomKeycloakGuard implements CanActivate {
     // If API key is not present, fall back to Keycloak authentication
     try {
       const canActivate = await this.resourceGuard.canActivate(context);
-      return canActivate as boolean;
+      return canActivate;
     } catch (error) {
       throw new UnauthorizedException('Invalid API key or Keycloak token');
     }

package/templates/nest/src/simple-app/_core/features/document-no-format/document-no-format.service.ts.eta

@@ -23,7 +23,7 @@ export class SimpleAppDocumentNoFormatService {
       { $sort: { default: -1 } },
     ]);
 
-    let data: DocumentNoFormatPreview[] = [];
+    const data: DocumentNoFormatPreview[] = [];
     for (let i = 0; i < searchresult.length; i++) {
       const s = searchresult[i];
       if (s.active && s.docNoPattern) {

package/templates/nest/src/simple-app/_core/features/log/schemas/api-event.schema.ts.eta

@@ -34,9 +34,9 @@ export class ApiEvent {
   @Prop()
   method: string;
   @Prop({type:Object})
-  headers: Object;  
+  headers: object;  
   @Prop({type:Object})
-  data?: Object;
+  data?: object;
   @Prop()
   statusCode: number;
   @Prop()
@@ -44,7 +44,7 @@ export class ApiEvent {
   @Prop()
   errMsg?: string;
   @Prop({type:Object})
-  errData?: Object;
+  errData?: object;
 }
 
 export const ApiEventMongoSchema = SchemaFactory.createForClass(ApiEvent)

package/templates/nest/src/simple-app/_core/features/log/schemas/document-event.schema.ts.eta

@@ -74,7 +74,7 @@ export class DocumentEvent {
   @Prop({ type: () => Object })
   @Field(() => GraphQLJSON)
   @ApiProperty({ type: () => Object, required: false, default: {} })
-  eventData: Object;
+  eventData: object;
 }
 
 /***************************************** Start Auto Complete *****************************************/

package/templates/nest/src/simple-app/_core/features/maintenance/schemas/db-update.ts.eta

@@ -9,9 +9,9 @@ import { ApiProperty } from '@nestjs/swagger';
 
 export class UpgradeScript {
     @ApiProperty({ type: String})
-    id: String
+    id: string
     @ApiProperty({ type: String})
-    subject:String
+    subject:string
     @ApiProperty({ type: String})
-    description:String
+    description:string
 }

package/templates/nest/src/simple-app/_core/features/profile/profile.schema.ts.eta

@@ -103,9 +103,9 @@ export class ProfileUserBranch {
   @ApiProperty({ type: BranchMinInfo })
   branch: BranchMinInfo;
   @ApiProperty({ type: String })
-  orgRecordId: String;
+  orgRecordId: string;
   @ApiProperty({ type: String })
-  xOrg: String;
+  xOrg: string;
   @ApiProperty({ type: Object, required: false })
   organization?: any;
 }
@@ -124,20 +124,20 @@ export class RegTenant {
     examples: ['my company 1'],
     default: '',
   })
-  tenantName: String;
+  tenantName: string;
   @ApiProperty({
     type: String,
     required: true,
     examples: ['Asia/Kuala_Lumpur'],
     default: '',
   })
-  timeZone: String;
+  timeZone: string;
   @ApiProperty({
     type: Number,
     required: true,
     examples: [0, -460],
   })
-  utcOffset: Number;
+  utcOffset: number;
 }
 /****************------unchecked schema------********************/
 

package/templates/nest/src/simple-app/_core/features/user-context/user.context.ts.eta

@@ -578,15 +578,9 @@ export class UserContext extends UserContextInfo {
         }
       }
 
-      // Tenant permissions for DevSupport role
-      if (this.roles.includes(Role.DevSupport)) {
-        const tenantRoles = [
-          Role.Tenant_access,
-          Role.Tenant_search,
-          Role.Tenant_create,
-          Role.Tenant_update,
-          Role.Tenant_delete,
-        ];
+      // Tenant permissions for DevSupport and DevBilling roles
+      const tenantRoles = [Role.Tenant_access, Role.Tenant_search, Role.Tenant_create, Role.Tenant_update, Role.Tenant_delete];
+      if (this.roles.includes(Role.DevSupport) || this.roles.includes(Role.DevBilling)) {
         for (let r = 0; r < tenantRoles.length; r++) {
           if (!this.roles.includes(tenantRoles[r])) {
             this.roles.push(tenantRoles[r]);
@@ -614,6 +608,20 @@ export class UserContext extends UserContextInfo {
         }
       }
 
+      // Grant Admin role to DevSupport and DevBilling for e-invoice
+      if (this.roles.includes(Role.DevSupport) || this.roles.includes(Role.DevBilling)) {
+        if (!this.roles.includes(Role.Admin)) {
+          this.roles.push(Role.Admin);
+        }
+      }
+
+      // Grant Billing role to DevBilling for tenant billing operations
+      if (this.roles.includes(Role.DevBilling)) {
+        if (!this.roles.includes(Role.Billing)) {
+          this.roles.push(Role.Billing);
+        }
+      }
+
       this.moreProps = this.setMoreProps(userProfile);
       // this.package = userProfile['package'];
       // this.appintegration = await this.setAppIntegration();
@@ -629,7 +637,7 @@ export class UserContext extends UserContextInfo {
     // this.logger.verbose(`User ${this.uid} have _id (${this.getId()}), groups (${this.groups.join(',')}) and roles (${this.getRoles().join(',')}).`);
   };
 
-  generateXOrg = (tenantId: Number, orgId: Number, branchId: Number): string => {
+  generateXOrg = (tenantId: number, orgId: number, branchId: number): string => {
     return Base64URL.encodeText(`${tenantId}-${orgId}-${branchId}`);
   };
 
@@ -870,7 +878,7 @@ export class UserContext extends UserContextInfo {
   }
 
   async getAllTenants(): Promise<TenantPermission[]> {
-    let results: TenantPermission[] = [];
+    const results: TenantPermission[] = [];
     if (this.getId() != '') {
       const pipelines: PipelineStage[] = [
         {
@@ -1160,13 +1168,7 @@ export class UserContext extends UserContextInfo {
       }
 
       if (this.roles.includes(Role.DevSupport)) {
-        const tenantRoles = [
-          Role.Tenant_access,
-          Role.Tenant_search,
-          Role.Tenant_create,
-          Role.Tenant_update,
-          Role.Tenant_delete,
-        ];
+        const tenantRoles = [Role.Tenant_access, Role.Tenant_search, Role.Tenant_create, Role.Tenant_update, Role.Tenant_delete];
         for (let r = 0; r < tenantRoles.length; r++) {
           if (!this.roles.includes(tenantRoles[r])) {
             this.roles.push(tenantRoles[r]);

package/templates/nest/src/simple-app/_core/features/webhook/run-webhook.service.ts.eta

@@ -140,7 +140,7 @@ export class RunWebhookService {
       this.logger.warn(msg);
     }
     const logbody = options.body;
-    let body = typeof logbody == 'string' ? logbody : JSON.stringify(logbody, null, 4);
+    const body = typeof logbody == 'string' ? logbody : JSON.stringify(logbody, null, 4);
 
     const whlog: WebhookLog = {
       _id: crypto.randomUUID(),

package/templates/nest/src/simple-app/_core/framework/base/simple-app.service.ts.eta

@@ -17,14 +17,14 @@ import { AnyKeys, AnyObject, FilterQuery, Model, PipelineStage, mongo } from 'mo
 // import { CloudApiService } from 'src/cloudapi/cloudapi.service';
 import { foreignkeys } from '../../features/foreign-key/foreignkeys.dict';
 
+import { Response } from 'express';
 import { camelToKebab } from 'src/simple-app/_core/utils/string-utils';
 import { SimpleAppDocumentNoFormatService } from '../../features/document-no-format/document-no-format.service';
 import { SimpleAppLogService } from '../../features/log/log.service';
 import { UserContext } from '../../features/user-context/user.context';
 import { RunWebhookService } from '../../features/webhook/run-webhook.service';
-import { DeleteResultType, IsolationType, MoreProjectionType, PatchManyRequest, SchemaFields, SearchBody, TextSearchBody, UniqueKeyExistResponse } from '../schemas';
+import { DeleteResultType, IsolationType, MoreProjectionType, PatchManyRequest, SchemaFields, TextSearchBody, UniqueKeyExistResponse } from '../schemas';
 import { SearchWithRelation } from './dto/simple-app-search-with-relation.dto';
-import { Response } from 'express';
 
 @Injectable()
 export class SimpleAppService<T extends SchemaFields> {
@@ -209,12 +209,12 @@ export class SimpleAppService<T extends SchemaFields> {
     }
     // return this;
   }
-  async aggregateNoIsolation(appUser: UserContext, pipeline: PipelineStage[]) {
+  async aggregateNoIsolation<T>(appUser: UserContext, pipeline: PipelineStage[]) {
     if (pipeline[0] && pipeline[0]['$match']) {
       try {
         this.logger.verbose(pipeline, `${this.documentName} aggregate:`);
 
-        return await this.doc.aggregate(pipeline, {
+        return await this.doc.aggregate<T>(pipeline, {
           session: appUser.getDBSession(),
         });
       } catch (err) {
@@ -316,7 +316,7 @@ export class SimpleAppService<T extends SchemaFields> {
       const isolationFilter = { ...this.getIsolationFilter(appUser) };
       this.polishIsolationFilter(isolationFilter);
 
-      const newfilters: FilterQuery<T> = { ...(filters as FilterQuery<T>), ...isolationFilter };
+      const newfilters: FilterQuery<T> = { ...filters, ...isolationFilter };
 
       let pageSize: number;
       let pageNo: number;
@@ -345,7 +345,7 @@ export class SimpleAppService<T extends SchemaFields> {
         items = rows;
         total = count;
       } else {
-        const pipelines = this.searchToAggregate(appUser, newfilters, projection as any, sort as any, lookup as any, { pageSize, pageNo });
+        const pipelines = this.searchToAggregate(appUser, newfilters, projection as any, sort, lookup as any, { pageSize, pageNo });
 
         const countPipeline: PipelineStage[] = [{ $match: newfilters }];
         const collections = Object.keys(lookup);
@@ -430,7 +430,6 @@ export class SimpleAppService<T extends SchemaFields> {
     const pageNo = rawPageNo < 0 ? 0 : rawPageNo;
     const skip = pageNo * finalPageSize;
 
-
     return { pageSize: finalPageSize, skip, pageNo };
   }
 
@@ -589,7 +588,7 @@ export class SimpleAppService<T extends SchemaFields> {
       await this.callWebhook(appUser, 'create', result);
       return result as T;
     } catch (err) {
-      await this.runErrorEvent(appUser, 'errorCreate', data, err)
+      await this.runErrorEvent(appUser, 'errorCreate', data, err);
       throw new InternalServerErrorException(`createHook ${this.documentType} error: ${JSON.stringify(err)}`, `${this.documentType} createHook error`);
     }
   }
@@ -632,7 +631,7 @@ export class SimpleAppService<T extends SchemaFields> {
     ajv.addKeyword({ keyword: 'x-remote', schemaType: 'object' });
     ajv.addKeyword({ keyword: 'x-readonly', schemaType: 'boolean' });
     this.logger.debug('run hook during validation');
-    let issuccess = true;
+    const issuccess = true;
     // if (this.hooks.beforeValidation) {
     //   issuccess = await this.hooks.beforeValidation(appUser, data, _id);
     // }
@@ -739,7 +738,7 @@ export class SimpleAppService<T extends SchemaFields> {
       if (err instanceof ForbiddenException) {
         throw new ForbiddenException(err);
       } else {
-        await this.runErrorEvent(appUser, 'errorDelete', deletedata, err)
+        await this.runErrorEvent(appUser, 'errorDelete', deletedata, err);
         throw new InternalServerErrorException(err);
       } //JSON.stringify(dependency),JSON.stringify(dependency)
     }
@@ -862,7 +861,7 @@ export class SimpleAppService<T extends SchemaFields> {
       return result; // await this.findById(appUser, id);
     } catch (err) {
       this.logger.error(err);
-      await this.runErrorEvent(appUser, 'errorUpdate', data, err)
+      await this.runErrorEvent(appUser, 'errorUpdate', data, err);
       throw new InternalServerErrorException(err.message);
     }
   };
@@ -1017,7 +1016,7 @@ export class SimpleAppService<T extends SchemaFields> {
     // };
 
     const filter = data.filter;
-    const patch = data.data as Object;
+    const patch = data.data as object;
 
     const isolationFilter = { ...this.getIsolationFilter(appUser), ...(filter || {}) };
     this.polishIsolationFilter(isolationFilter);
@@ -1115,7 +1114,7 @@ export class SimpleAppService<T extends SchemaFields> {
     await this.runEvent(appUser, 'beforeSetStatus', { docStatus: docstatus, prevData: existdata, newData: data }, false);
 
     // if (this.hooks.beforeSetStatus) await this.hooks.beforeSetStatus(appUser, docstatus, data, existdata);
-    try{
+    try {
       if (data && !data['created']) {
         const createresult = await this.create(appUser, data);
         await this.runEvent(appUser, 'afterSetStatus', { docStatus: docstatus, data: createresult }, false);
@@ -1132,8 +1131,8 @@ export class SimpleAppService<T extends SchemaFields> {
         await this.callWebhook(appUser, docstatus, finaldata);
         return updateresult;
       }
-    }catch(e){
-      await this.runErrorEvent(appUser, 'errorSetStatus', data, e)
+    } catch (e) {
+      await this.runErrorEvent(appUser, 'errorSetStatus', data, e);
     }
   }
 
@@ -1167,7 +1166,7 @@ export class SimpleAppService<T extends SchemaFields> {
    * @return     {Promise}      { description_of_the_return_value }
    */
   async runEvent(appUser: UserContext, shortEventName: string, payloads: any, enforce: boolean = true) {
-    const eventName = this.setHookName(shortEventName)
+    const eventName = this.setHookName(shortEventName);
     try {
       if (enforce && !this.eventEmitter.hasListeners(eventName)) {
         throw new InternalServerErrorException(`${eventName} seems no listener`);
@@ -1189,17 +1188,16 @@ export class SimpleAppService<T extends SchemaFields> {
     }
   }
 
-   async runErrorEvent(appUser: UserContext, shortEventName: string, payloads: any, error:any) {
-    const eventName = this.setHookName(shortEventName)
-      try{
-        if (this.eventEmitter.hasListeners(eventName)) {
-          console.log('run eventName', eventName);
-          const res = await this.eventEmitter.emitAsync(eventName, appUser, payloads,error);
-        }
-      }catch(e){
-        //runErrorEvent wont handle more error
+  async runErrorEvent(appUser: UserContext, shortEventName: string, payloads: any, error: any) {
+    const eventName = this.setHookName(shortEventName);
+    try {
+      if (this.eventEmitter.hasListeners(eventName)) {
+        console.log('run eventName', eventName);
+        const res = await this.eventEmitter.emitAsync(eventName, appUser, payloads, error);
       }
-
+    } catch (e) {
+      //runErrorEvent wont handle more error
+    }
   }
   // startWorkflow(appUser: UserContext, processName: WorkflowName, workflowData: any) {
   //   return this.eventEmitter.emit('workflow.start', appUser, processName, workflowData);

package/templates/nest/src/simple-app/_core/framework/schemas/others.schema.ts.eta

@@ -19,7 +19,7 @@ export class PatchManyRequest<T> {
   data: Partial<T>;
 
   @ApiProperty({ type: () => Object, required: false })  
-  filter?: Object | null;
+  filter?: object | null;
 }
 
 @ObjectType()

package/templates/nest/src/simple-app/_core/framework/schemas/simple-app.schema.ts.eta

@@ -18,12 +18,12 @@ export class DocNumberFormatResult {
 }
 
 export class SearchBody {
-  filter?: Object;
+  filter?: object;
 
   fields?: any[];
 
   sorts?: any[];
-  lookup?: Object;
+  lookup?: object;
   pagination?: {
     pageSize?: number;
     pageNo?: number;

package/templates/nest/src/simple-app/_core/framework/simple-app.interceptor.ts.eta

@@ -4,11 +4,11 @@
  * last change 2023-03-17
  * Author: Ks Tan
  */
-import { Injectable, NestInterceptor, ExecutionContext, CallHandler, BadGatewayException, HttpException } from '@nestjs/common';
-import { Observable, throwError } from 'rxjs';
-import { catchError, tap, map } from 'rxjs/operators';
-import { Model, Connection, ClientSession } from 'mongoose';
+import { CallHandler, ExecutionContext, Injectable, NestInterceptor } from '@nestjs/common';
 import { InjectConnection, InjectModel } from '@nestjs/mongoose';
+import { Connection, Model } from 'mongoose';
+import { Observable } from 'rxjs';
+import { catchError, map, tap } from 'rxjs/operators';
 import { UserContext } from '../features/user-context/user.context';
 import { ApiEvent } from './schemas';
 import { SimpleAppDbRevertService } from './simple-app-db-revert.service';
@@ -17,11 +17,10 @@ export class SimpleAppInterceptor implements NestInterceptor {
   constructor(
     @InjectConnection() private readonly connection: Connection,
     @InjectModel('ApiEvent') private apieventmodel: Model<ApiEvent>,
-    private simpleAppDbRevertService:SimpleAppDbRevertService
+    private simpleAppDbRevertService: SimpleAppDbRevertService,
   ) {}
 
   async intercept(context: ExecutionContext, next: CallHandler): Promise<Observable<any>> {
-    
     //not http request then exclude such as graphql
     if (context.getType() != 'http') {
       // obtain usersession here
@@ -35,7 +34,6 @@ export class SimpleAppInterceptor implements NestInterceptor {
     const resp = context.switchToHttp().getResponse();
     //console.log("want to get user session:", Object.keys(req))
 
-
     if (req.url == '/health') {
       return next.handle().pipe(
         tap(async () => {
@@ -44,7 +42,6 @@ export class SimpleAppInterceptor implements NestInterceptor {
       );
     }
 
-
     const usersession: UserContext = req['sessionuser'];
     //console.log("after read user session:",usersession)
     const method = req['method'];
@@ -86,7 +83,7 @@ export class SimpleAppInterceptor implements NestInterceptor {
     return next.handle().pipe(
       map((data) => {
         if (data && typeof data === 'object' && 'pagination' in data && 'items' in data) {
-          return data; 
+          return data;
         }
         return data;
       }),
@@ -94,7 +91,7 @@ export class SimpleAppInterceptor implements NestInterceptor {
         // console.log('**************catchError at interceptor ',method,url)
         if (usersession.inTransaction()) {
           // await usersession.rollBackTransaction();
-          await usersession.rollBackTransaction(this.simpleAppDbRevertService)
+          await usersession.rollBackTransaction(this.simpleAppDbRevertService);
 
           canCommit = false;
         }
@@ -127,12 +124,12 @@ export class SimpleAppInterceptor implements NestInterceptor {
 
         if (process.env.DRYRUN == 'true') {
           // console.warn('--------dryrun! roll back everything-----------');
-          if ( canCommit) {            
-            await usersession.rollBackTransaction(this.simpleAppDbRevertService)
+          if (canCommit) {
+            await usersession.rollBackTransaction(this.simpleAppDbRevertService);
           }
         } else {
-          if ( canCommit) {
-            await usersession.commitTransaction()
+          if (canCommit) {
+            await usersession.commitTransaction();
           }
         }
         await usersession.endSession();

package/templates/nest/src/simple-app/_core/utils/string-utils.ts.eta

@@ -1 +1,4 @@
-export const camelToKebab = (value) => value.replace(/([a-z])([A-Z])/g, "$1-$2").toLowerCase()
+export const camelToKebab = (value) => value.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
+
+export const escapeRegExp = (value: string): string =>
+  value.replace(/[\\^$.*+?()\[\]{}|]/g, '\\$&');