@digitaldefiance/express-suite-starter 2.3.24 → 2.3.26

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitaldefiance/express-suite-starter",
-  "version": "2.3.24",
+  "version": "2.3.26",
   "license": "MIT",
   "bin": {
     "create-express-suite": "./dist/src/cli.js"
@@ -31,7 +31,7 @@
     "publish:public": "npm publish --access public"
   },
   "dependencies": {
-    "@digitaldefiance/express-suite-react-components": "^2.9.35",
+    "@digitaldefiance/express-suite-react-components": "^2.9.39",
     "@digitaldefiance/i18n-lib": "^3.8.16",
     "@inquirer/prompts": "^7.5.0",
     "chalk": "^4.1.2",

package/scaffolding/api-lib/src/lib/documents/user.ts

@@ -2,16 +2,17 @@ import { Types } from '@digitaldefiance/mongoose-types';
 import { AccountStatus, IUserBase } from '@digitaldefiance/suite-core-lib';
 import { IBaseDocument } from '@digitaldefiance/node-express-suite';
 import { CoreLanguageCode } from '@digitaldefiance/i18n-lib';
+import { PlatformID } from '@digitaldefiance/node-ecies-lib';
 
 /**
  * Composite interface for user collection documents
  */
-export interface IUserDocument<I = Types.ObjectId, D extends Date = Date, S extends string = CoreLanguageCode, A extends AccountStatus = AccountStatus> extends IBaseDocument<
+export interface IUserDocument<TID extends PlatformID = PlatformID, TDate extends Date = Date, TLanguage extends string = CoreLanguageCode, TAccountStatus extends AccountStatus = AccountStatus> extends IBaseDocument<
   IUserBase<
-    I,
-    D,
-    S,
-    A
+    TID,
+    TDate,
+    TLanguage,
+    TAccountStatus
   >
 > {
 }

package/scaffolding/api-lib/src/lib/environment.ts

@@ -5,8 +5,9 @@ import { IEnvironmentAws } from './interfaces/environment-aws';
 import { Constants } from './constants';
 import { getSuiteCoreTranslation, SuiteCoreStringKey } from '@digitaldefiance/suite-core-lib';
 import { EmailService } from './services/email';
+import { PlatformID } from '@digitaldefiance/node-ecies-lib';
 
-export class Environment extends BaseEnvironment implements IEnvironment {
+export class Environment<TID extends PlatformID> extends BaseEnvironment<TID> implements IEnvironment<TID> {
   private _aws: IEnvironmentAws;
 
   constructor(path?: string, initialization = false, override = true) {

package/scaffolding/api-lib/src/lib/interfaces/environment.ts

@@ -1,7 +1,8 @@
 import { IEnvironment as IBaseEnvironment } from '@digitaldefiance/node-express-suite';
 import { IEnvironmentAws } from './environment-aws';
+import { PlatformID } from '@digitaldefiance/node-ecies-lib';
 
-export interface IEnvironment extends IBaseEnvironment {
+export interface IEnvironment<TID extends PlatformID> extends IBaseEnvironment<TID> {
   /**
    * AWS configuration
    */

package/scaffolding/api-lib/src/lib/routers/api.ts

@@ -3,20 +3,21 @@ import { ITokenRole, ITokenUser, IUserBase } from '@digitaldefiance/suite-core-l
 import { Types } from '@digitaldefiance/mongoose-types';
 import { Environment } from '../environment';
 import { IConstants } from '../interfaces/constants';
+import { CoreLanguageCode } from '@digitaldefiance/i18n-lib';
 
 export class ApiRouter<
-  I extends Types.ObjectId | string = Types.ObjectId,
-  D extends Date = Date,
-  S extends string = string,
-  A extends string = string,
-  TUser extends IUserBase<I, D, S, A> = IUserBase<I, D, S, A>,
-  TTokenRole extends ITokenRole<I, D> = ITokenRole<I, D>,
+  TID extends Types.ObjectId | string = Types.ObjectId,
+  TDate extends Date = Date,
+  TLanguage extends CoreLanguageCode = CoreLanguageCode,
+  TAccountStatus extends string = string,
+  TUser extends IUserBase<TID, TDate, TLanguage, TAccountStatus> = IUserBase<TID, TDate, TLanguage, TAccountStatus>,
+  TTokenRole extends ITokenRole<TID, TDate> = ITokenRole<TID, TDate>,
   TTokenUser extends ITokenUser = ITokenUser,
-  TEnvironment extends Environment = Environment,
+  TEnvironment extends Environment<TID> = Environment<TID>,
   TConstants extends IConstants = IConstants,
-  TBaseDocument extends IBaseDocument<any, Types.ObjectId> = IBaseDocument<any, Types.ObjectId>,
-  TApplication extends IApplication = IApplication,
-> extends BaseApiRouter<I,D,S,A, TUser,TTokenRole,TBaseDocument, TTokenUser,TConstants, TEnvironment, TApplication> {
+  TBaseDocument extends IBaseDocument<any, TID> = IBaseDocument<any, TID>,
+  TApplication extends IApplication<TID> = IApplication<TID>,
+> extends BaseApiRouter<TID,TDate,TLanguage,TAccountStatus, TUser,TTokenRole,TBaseDocument, TTokenUser,TConstants, TEnvironment, TApplication> {
   constructor(app: TApplication) {
     super(app);
   }

package/scaffolding/api-lib/src/lib/services/email.ts

@@ -7,27 +7,26 @@ function debugLog(debug: boolean, type: 'log' | 'warn' | 'error', ...args: any[]
     console[type](...args);
   }
 }
-import { Types } from '@digitaldefiance/mongoose-types';
 import { Environment } from '../environment';
-import { IConstants } from '../interfaces/constants';
+import { PlatformID } from '@digitaldefiance/node-ecies-lib';
 
 /**
  * A generic service for sending emails using Amazon SES.
  */
-export class EmailService {
+export class EmailService<TID extends PlatformID> {
   private readonly sesClient: SESClient;
   private readonly emailSender: string;
   private readonly disableEmailSend: boolean;
   private readonly debug: boolean;
-  private readonly application: IApplication;
+  private readonly application: IApplication<TID>;
 
   /**
    * Constructs an instance of EmailService.
    * @param config Configuration object containing AWS credentials, region, sender email, and debug/disable flags.
    */
-  constructor(application: IApplication) {
+  constructor(application: IApplication<TID>) {
     this.application = application;
-    const environment = application.environment as Environment;
+    const environment = application.environment as Environment<TID>;
     this.emailSender = environment.emailSender;
     this.disableEmailSend = environment.disableEmailSend;
     this.debug = environment.debug;