@simitgroup/simpleapp-generator 2.0.3-b-alpha → 2.0.3-d-alpha

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

@@ -12,17 +12,17 @@ import * as mongoose from 'mongoose';
 
 export * from 'src/simple-app/_core/framework/schemas';
 
-<% 
+<%
   const getFieldType =(proptype, typename,actionname)=>{
     const systemtypes = ['Boolean','boolean','string','String','number','Number','object','Object','integer','Integer']
     if(!typename) throw actionname +" undefine schema";
-    let tmptypename = typename.replace('[','').replace(']','')        
+    let tmptypename = typename.replace('[','').replace(']','')
     if(proptype=='schema'){
-      tmptypename= upperFirstCase(tmptypename)        
+      tmptypename= upperFirstCase(tmptypename)
     }else if(systemtypes.includes(typename)){
         tmptypename = tmptypename.toLowerCase();
     }
-    
+
     if(typename.includes('[')){
       return  proptype=='schema' ?  `[${tmptypename}]` : `${tmptypename}[]`
     }else{
@@ -31,6 +31,42 @@ export * from 'src/simple-app/_core/framework/schemas';
   }
 %>
 
+<%
+  /**
+   * ENUM NAME RESOLUTION
+   *
+   * buildDefEnumMap and resolveEnumBaseName are shared helpers injected by getCodeGenHelper()
+   * in generate.ts — the single source of truth for this logic.
+   *
+   * buildDefEnumMap: reads $defs from the schema, returns Map<fingerprint, baseName>
+   *   e.g. licenseType in $defs + resourceName "tenant" → "TenantLicenseType"
+   *
+   * resolveEnumBaseName: looks up fingerprint in map (shared $defs enum),
+   *   falls back to modelName+fieldName for inline enums
+   *   e.g. model "TenantSubscription", field "currency" → "TenantSubscriptionCurrency"
+   */
+  const defEnumMap = buildDefEnumMap(it.jsonschema);
+
+  // Pre-pass: walk all models to collect every enum class name that will be used.
+  // This lets us generate a single import statement at the top of the file,
+  // so @Prop and @ApiProperty can reference the enum class directly instead of passing inline values.
+  const usedEnumNames = new Set();
+  for (const [modelName, modelData] of Object.entries(it.models)) {
+    for (const [fieldName, fieldObj] of Object.entries(modelData.model)) {
+      if (fieldObj && typeof fieldObj === 'object' && !Array.isArray(fieldObj) &&
+          fieldObj.type === 'string' && Array.isArray(fieldObj.enum) && fieldObj.enum.length > 0) {
+        // toTypeName converts raw model key (e.g. "TuitionclassScheduleSetting") to correctly-cased
+        // typename (e.g. "TuitionClassScheduleSetting") — same convention enum.ts.eta uses
+        usedEnumNames.add(resolveEnumBaseName(fieldObj.enum, defEnumMap, toTypeName(it.resourceName, modelName), fieldName) + 'Enum');
+      }
+    }
+  }
+%>
+
+<% if (usedEnumNames.size > 0) { %>
+import { <%~ [...usedEnumNames].join(', ') %> } from './<%= camelToKebab(it.resourceName) %>.enum';
+<% } %>
+
 <% const draw = (it, obj, key, currentModelName) => { %>    
     <%
             let required = false;
@@ -67,11 +103,24 @@ export * from 'src/simple-app/_core/framework/schemas';
         @Field(() => [<%=newtypename %>])
         @ApiProperty({type: ()=>[<%= newtypename  %>], required: <%= required %> })                    
         <%= key %> <%=required ? '' :'?' %>:  <%= getFieldType('type', newtypename, '') %>[];        
+    <% } else if(obj.type === 'string' && Array.isArray(obj.enum) && obj.enum.length > 0) { %>
+        <%
+          // Resolve the enum class name, then pass values inline to avoid needing an import.
+          // @Prop   — tells Mongoose to validate against allowed values
+          // @Field  — GraphQL treats it as String (enums need a separate GQL enum registration)
+          // @ApiProperty — enum + enumName tells Swagger to render a dropdown with the correct type name
+          const enumBaseName = resolveEnumBaseName(obj.enum, defEnumMap, toTypeName(it.resourceName, currentModelName), key);
+          const enumClassName = enumBaseName + 'Enum';
+        %>
+        @Prop()
+        @Field(() => String)
+        @ApiProperty({ enum: <%= enumClassName %>, required: <%= required %> })
+        <%= key %> <%=required ? '' :'?' %>: <%= enumClassName %>;
     <% }else{%>
         @Prop()
-        @Field()                
+        @Field()
         @ApiProperty({type: () => <%= getFieldType('schema',  obj.type,'') %> , required: <%= required %>})
-        <%= key %> <%=required ? '' :'?' %>:  <%= getFieldType('type',  obj.type,'') %>;        
+        <%= key %> <%=required ? '' :'?' %>:  <%= getFieldType('type',  obj.type,'') %>;
     <% } %>
 <% } %>
 
@@ -123,7 +172,9 @@ export class <%=autoCompleteModelName %> {
 
     <% if(it.moreAutoComplete && Array.isArray(it.moreAutoComplete)) { %>
         <% it.moreAutoComplete.forEach(function(field){ %>
-            <% draw(it, it.models[it.apiSchemaName].model[field], field, autoCompleteModelName) %>
+            <% /* Pass it.apiSchemaName (main model) not autoCompleteModelName so enum names resolve
+                   to the same class as the main schema (e.g. CategoryCategoryTypeEnum, not CategoryAutoCompleteCategoryTypeEnum) */ %>
+            <% draw(it, it.models[it.apiSchemaName].model[field], field, it.apiSchemaName) %>
 
         <% }) %>
     <% } %>

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

@@ -4,27 +4,25 @@
  * Author: Ks Tan
  */
 
+import { BadRequestException, Injectable, Logger } from '@nestjs/common';
 import countrytimezone from 'countries-and-timezones';
-import countryToCurrency, { Currencies, Countries } from 'country-to-currency';
-import { Injectable, Scope, Inject, Logger, BadRequestException, InternalServerErrorException } from '@nestjs/common';
+import countryToCurrency from 'country-to-currency';
 import { UserContext } from '../user-context/user.context';
 // import { RegTenant } from './profile.types';
-import * as mongoose from 'mongoose';
-import { InjectConnection } from '@nestjs/mongoose';
-import { TenantService } from '../../resources/tenant/tenant.service';
-import { OrganizationService } from '../../resources/organization/organization.service';
 import { BranchService } from '../../resources/branch/branch.service';
-import { UserService } from '../../resources/user/user.service';
+import { OrganizationService } from '../../resources/organization/organization.service';
 import { PermissionService } from '../../resources/permission/permission.service';
+import { TenantService } from '../../resources/tenant/tenant.service';
+import { UserService } from '../../resources/user/user.service';
 
-import { Tenant } from '../../resources/tenant/tenant.schema';
-import { Organization } from '../../resources/organization/organization.schema';
 import { Branch } from '../../resources/branch/branch.schema';
-import { User } from '../../resources/user/user.schema';
+import { Organization } from '../../resources/organization/organization.schema';
 import { KeyValue, Permission } from '../../resources/permission/permission.schema';
+import { Tenant } from '../../resources/tenant/tenant.schema';
+import { User } from '../../resources/user/user.schema';
 
-import { UserContextInfo } from './profile.schema';
 import { PhotoService } from 'src/simple-app/features/upload-file/photo/photo.service';
+import { UserContextInfo } from './profile.schema';
 const Base64URL = require('@darkwolf/base64url');
 @Injectable()
 export class ProfileService {
@@ -90,13 +88,12 @@ export class ProfileService {
   async createTenant(appuser: UserContext, tenantName: string, timeZone: string, utcOffset: number, businessType: string, mobileNo: string, interestedInSales?: boolean) {
     // try{
 
-    
     const timezonedata = countrytimezone.getCountriesForTimezone(timeZone)[0];
     const countryCode = timezonedata['id'];
     const countryName = timezonedata['name'];
     const currencyCode = countryToCurrency[countryCode];
 
-    appuser.startTransaction()
+    appuser.startTransaction();
     const tenantdata: Tenant = {
       tenantId: 1,
       tenantName: tenantName,
@@ -159,13 +156,13 @@ export class ProfileService {
       workEnd: '22:00:00',
       workingHours: [],
       offdays: ['sat', 'sun'],
-      street1: '11, My Street 1',
-      street2: 'My Street 2',
-      postcode: '11111',
-      city: 'My City',
+      street1: '',
+      street2: '',
+      postcode: '',
+      city: '',
       tel: mobileNo,
       email: appuser.getEmail(),
-      region: 'My Region',
+      region: '',
       country: countryName,
       active: true,
       orgId: orgResult.orgId,

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

@@ -11,6 +11,7 @@ import type { Response as ExpressResponse } from 'express';
 import { Connection, Model } from 'mongoose';
 import { catchError, map, tap } from 'rxjs/operators';
 import { UserContext } from '../features/user-context/user.context';
+import { getErrorMessage } from '../utils/error';
 import { SimpleAppDbRevertService } from './simple-app-db-revert.service';
 @Injectable()
 export class SimpleAppInterceptor implements NestInterceptor {
@@ -92,7 +93,7 @@ export class SimpleAppInterceptor implements NestInterceptor {
 
         const responseBody = {
           // eslint-disable-next-line
-          message: err.message,
+          message: getErrorMessage(err).message ?? err.message,
           timestamp: new Date().toISOString(),
           path: url,
           // eslint-disable-next-line

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

@@ -1,4 +1,27 @@
-export const camelToKebab = (value) => value.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
+export const camelToKebab = (value: string) => value.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
 
-export const escapeRegExp = (value: string): string =>
-  value.replace(/[\\^$.*+?()\[\]{}|]/g, '\\$&');
+export const isValidEmail = (value: unknown): value is string => typeof value === 'string' && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value);
+
+export const nameFromEmail = (email: string): string => {
+  return email.split('@')[0];
+};
+
+export const escapeRegExp = (value: string): string => value.replace(/[\\^$.*+?()[\]{}|]/g, '\\$&');
+
+export function paddedUniqueCodeGenerator(usedCodes: Set<string>, prefix = 'LVL', padSize = 3) {
+  let index = 1;
+
+  const format = (n: number) => `${prefix}_${String(n).padStart(padSize, '0')}`;
+
+  return () => {
+    let code: string;
+
+    do {
+      code = format(index++);
+    } while (usedCodes.has(code));
+
+    usedCodes.add(code);
+
+    return code;
+  };
+}

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

@@ -4,42 +4,53 @@
  * last change 2024-02-24
  * Author: Ks Tan
  */
-import {getAllDocuments} from '~/simpleapp/generate/commons/documents'
-import { FormCrudEvent,SimpleAppDocumentType } from '~/types'
-export const getDocument = (docname:SimpleAppDocumentType) =>{
-        return getAllDocuments().find((item)=>item.docName==docname)   //?.docClass
-}
+import { getAllDocuments } from "~/simpleapp/generate/commons/documents";
+import { FormCrudEvent, SimpleAppDocumentType } from "~/types";
+export const getDocument = (docname: SimpleAppDocumentType | string) => {
+  const normalizedDocName = `${docname ?? ""}`.trim().toLowerCase();
+  if (!normalizedDocName) return undefined;
+
+  return getAllDocuments().find((item) => item.docName?.toLowerCase() == normalizedDocName); //?.docClass
+};
 
 // (appuser: UserContext, filter: any) => Promise<void>;
-export const onScreenAddDocument = <T>(docname:SimpleAppDocumentType,paras?:T,after?:(eventType:FormCrudEvent, data:T,visible:Ref<boolean>)=>Promise<void>)=>{
-        useNuxtApp().$event('ViewRecord',{
-            documentName: docname,
-            eventId:randomUUID(),
-            _id:'new',
-            paras:paras,
-            document: getDocument(docname)?.docClass,
-            viewer: getDocument(docname)?.viewer,    
-            after: (eventType:FormCrudEvent, data: any,visible:Ref<boolean>) => {
-                //do nothing
-                if(after)after(eventType,data as T,visible)
-            },
-            label:t(docname)
-        
-          })
-    }
-    export const onScreenEditDocument = <T>(docname:SimpleAppDocumentType,_id:string,after?:(eventType:FormCrudEvent, data:T,visible:Ref<boolean>)=>Promise<void>,autoclose:number=1)=>{
-        
-        useNuxtApp().$event('ViewRecord',{
-            documentName: docname,
-            eventId:randomUUID(),
-            _id:_id,
-            autoclose:autoclose,
-            document: getDocument(docname)?.docClass,
-            viewer: getDocument(docname)?.viewer,    
-            after: async (eventType:FormCrudEvent, data: any,visible:Ref<boolean>) => {
-                //do nothing
-                 if(after)after(eventType,data as T,visible)
-            },
-            label:t(docname)        
-          })
-    }
+export const onScreenAddDocument = <T>(
+  docname: SimpleAppDocumentType,
+  paras?: T,
+  after?: (eventType: FormCrudEvent, data: T, visible: Ref<boolean>) => Promise<void>,
+) => {
+  useNuxtApp().$event("ViewRecord", {
+    documentName: docname,
+    eventId: randomUUID(),
+    _id: "new",
+    paras: paras,
+    document: getDocument(docname)?.docClass,
+    viewer: getDocument(docname)?.viewer,
+    after: (eventType: FormCrudEvent, data: any, visible: Ref<boolean>) => {
+      //do nothing
+      if (after) after(eventType, data as T, visible);
+    },
+    label: t(docname),
+  });
+};
+
+export const onScreenEditDocument = <T>(
+  docname: SimpleAppDocumentType,
+  _id: string,
+  after?: (eventType: FormCrudEvent, data: T, visible: Ref<boolean>) => Promise<void>,
+  autoclose: number = 1,
+) => {
+  useNuxtApp().$event("ViewRecord", {
+    documentName: docname,
+    eventId: randomUUID(),
+    _id: _id,
+    autoclose: autoclose,
+    document: getDocument(docname)?.docClass,
+    viewer: getDocument(docname)?.viewer,
+    after: async (eventType: FormCrudEvent, data: any, visible: Ref<boolean>) => {
+      //do nothing
+      if (after) after(eventType, data as T, visible);
+    },
+    label: t(docname),
+  });
+};