@digitaldefiance/node-express-suite 3.6.0 → 3.6.2

package/README.md

@@ -1128,6 +1128,14 @@ The following v1.x patterns still work in v2.0:
 
 ## ChangeLog
 
+### Version 3.6.2
+
+- Use @digitaldefiance/mongoose-types to suppose mongoose generic types
+
+### Version 3.6.1
+
+- Fix mongoose schema to support generic ids
+
 ### Version 3.6.0
 
 - Version updates to reduce circular dependency

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@digitaldefiance/node-express-suite",
-  "version": "3.6.0",
+  "version": "3.6.2",
   "description": "Generic express application and routing library with decorator support",
   "main": "src/index.js",
   "types": "src/index.d.ts",
@@ -34,6 +34,7 @@
   "dependencies": {
     "@digitaldefiance/ecies-lib": "4.4.0",
     "@digitaldefiance/i18n-lib": "3.8.0",
+    "@digitaldefiance/mongoose-types": "8.20.1",
     "@digitaldefiance/node-ecies-lib": "4.4.0",
     "@digitaldefiance/suite-core-lib": "3.6.0",
     "@noble/curves": "^2.0.1",

package/src/documents/base.d.ts

@@ -1,3 +1,4 @@
 import { Document, Types } from 'mongoose';
-export type IBaseDocument<T, I extends Types.ObjectId | string = Types.ObjectId> = Document<I> & T;
+export type SupportedIdType = Types.ObjectId | string;
+export type IBaseDocument<T, I extends SupportedIdType = Types.ObjectId> = Document<I> & T;
 //# sourceMappingURL=base.d.ts.map

package/src/documents/base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/documents/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAG3C,MAAM,MAAM,aAAa,CACvB,CAAC,EACD,CAAC,SAAS,KAAK,CAAC,QAAQ,GAAG,MAAM,GAAG,KAAK,CAAC,QAAQ,IAChD,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC"}
+{"version":3,"file":"base.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/documents/base.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAG3C,MAAM,MAAM,eAAe,GAAG,KAAK,CAAC,QAAQ,GAAG,MAAM,CAAC;AAGtD,MAAM,MAAM,aAAa,CACvB,CAAC,EACD,CAAC,SAAS,eAAe,GAAG,KAAK,CAAC,QAAQ,IACxC,QAAQ,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC"}

package/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../packages/digitaldefiance-node-express-suite/src/index.ts"],"names":[],"mappings":"AAAA,OAAO,kBAAkB,CAAC;AAE1B,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,YAAY,EAAE,WAAW,IAAI,kBAAkB,EAAE,MAAM,WAAW,CAAC;AACnE,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,YAAY,EAAE,kBAAkB,IAAI,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAC7E,cAAc,cAAc,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../packages/digitaldefiance-node-express-suite/src/index.ts"],"names":[],"mappings":"AACA,OAAO,kBAAkB,CAAC;AAE1B,cAAc,eAAe,CAAC;AAC9B,cAAc,oBAAoB,CAAC;AACnC,cAAc,wBAAwB,CAAC;AACvC,cAAc,eAAe,CAAC;AAC9B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,YAAY,CAAC;AAC3B,cAAc,eAAe,CAAC;AAC9B,cAAc,aAAa,CAAC;AAC5B,cAAc,cAAc,CAAC;AAC7B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,eAAe,CAAC;AAC9B,cAAc,UAAU,CAAC;AACzB,cAAc,gBAAgB,CAAC;AAC/B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,kBAAkB,CAAC;AACjC,cAAc,UAAU,CAAC;AACzB,cAAc,YAAY,CAAC;AAC3B,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAC;AACzC,YAAY,EAAE,WAAW,IAAI,kBAAkB,EAAE,MAAM,WAAW,CAAC;AACnE,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,SAAS,CAAC;AACxB,OAAO,EAAE,eAAe,EAAE,MAAM,SAAS,CAAC;AAC1C,YAAY,EAAE,kBAAkB,IAAI,uBAAuB,EAAE,MAAM,SAAS,CAAC;AAC7E,cAAc,cAAc,CAAC"}

package/src/index.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withTransaction = exports.RouteBuilder = void 0;
 const tslib_1 = require("tslib");
+/// <reference path="./types/mongoose-override.d.ts" />
 require("reflect-metadata");
 tslib_1.__exportStar(require("./application"), exports);
 tslib_1.__exportStar(require("./application-base"), exports);

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/digitaldefiance-node-express-suite/src/index.ts"],"names":[],"mappings":";;;;AAAA,4BAA0B;AAE1B,wDAA8B;AAC9B,6DAAmC;AACnC,iEAAuC;AACvC,wDAA8B;AAC9B,qDAA2B;AAC3B,sDAA4B;AAC5B,sDAA4B;AAC5B,qDAA2B;AAC3B,wDAA8B;AAC9B,sDAA4B;AAC5B,uDAA6B;AAC7B,qDAA2B;AAC3B,sDAA4B;AAC5B,yDAA+B;AAC/B,wDAA8B;AAC9B,mDAAyB;AACzB,yDAA+B;AAC/B,yDAA+B;AAC/B,uDAA6B;AAC7B,wDAA8B;AAC9B,2DAAiC;AACjC,mDAAyB;AACzB,qDAA2B;AAC3B,oDAA0B;AAC1B,qDAA2B;AAC3B,sDAA4B;AAC5B,oDAA0B;AAC1B,qCAAyC;AAAhC,uGAAA,YAAY,OAAA;AAErB,oDAA0B;AAC1B,qDAA2B;AAC3B,yDAA+B;AAC/B,kDAAwB;AACxB,iCAA0C;AAAjC,wGAAA,eAAe,OAAA;AAExB,uDAA6B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../packages/digitaldefiance-node-express-suite/src/index.ts"],"names":[],"mappings":";;;;AAAA,uDAAuD;AACvD,4BAA0B;AAE1B,wDAA8B;AAC9B,6DAAmC;AACnC,iEAAuC;AACvC,wDAA8B;AAC9B,qDAA2B;AAC3B,sDAA4B;AAC5B,sDAA4B;AAC5B,qDAA2B;AAC3B,wDAA8B;AAC9B,sDAA4B;AAC5B,uDAA6B;AAC7B,qDAA2B;AAC3B,sDAA4B;AAC5B,yDAA+B;AAC/B,wDAA8B;AAC9B,mDAAyB;AACzB,yDAA+B;AAC/B,yDAA+B;AAC/B,uDAA6B;AAC7B,wDAA8B;AAC9B,2DAAiC;AACjC,mDAAyB;AACzB,qDAA2B;AAC3B,oDAA0B;AAC1B,qDAA2B;AAC3B,sDAA4B;AAC5B,oDAA0B;AAC1B,qCAAyC;AAAhC,uGAAA,YAAY,OAAA;AAErB,oDAA0B;AAC1B,qDAA2B;AAC3B,yDAA+B;AAC/B,kDAAwB;AACxB,iCAA0C;AAAjC,wGAAA,eAAe,OAAA;AAExB,uDAA6B"}

package/src/models/email-token.d.ts

@@ -1,11 +1,36 @@
 import { Connection, Schema } from 'mongoose';
-import { IEmailTokenDocument } from '../documents/email-token';
-import { BaseModelName } from '../enumerations';
-import { SchemaCollection } from '../enumerations/schema-collection';
-export declare function EmailTokenModel<TModelName extends string = BaseModelName, TCollection extends string = SchemaCollection>(connection: Connection, modelName?: TModelName, collection?: TCollection, schema?: Schema<IEmailTokenDocument>): import("mongoose").Model<IEmailTokenDocument, {}, {}, {}, import("mongoose").Document<unknown, {}, IEmailTokenDocument, {}, {}> & import("mongoose").Document<import("mongoose").Types.ObjectId, any, any, Record<string, any>, {}> & import("dist/packages/digitaldefiance-suite-core-lib/src").IEmailTokenBase<import("mongoose").Types.ObjectId, Date, import("dist/packages/digitaldefiance-suite-core-lib/src").EmailTokenType> & Required<{
-    _id: import("mongoose").Types.ObjectId;
+export declare function EmailTokenModel(connection: Connection, modelName?: string, collection?: string, schema?: Schema): import("mongoose").Model<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}, {}, {}, {}, import("mongoose").Document<unknown, {}, {
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}, {}, {}> & {
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+} & Required<{
+    _id: unknown;
 }> & {
     __v: number;
-}, any>;
+}, Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}>, {}, import("mongoose").ResolveSchemaOptions<import("mongoose").DefaultSchemaOptions>> & import("mongoose").FlatRecord<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}> & Required<{
+    _id: unknown;
+}> & {
+    __v: number;
+}>>;
 export default EmailTokenModel;
 //# sourceMappingURL=email-token.d.ts.map

package/src/models/email-token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"email-token.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/models/email-token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAGrE,wBAAgB,eAAe,CAC7B,UAAU,SAAS,MAAM,GAAG,aAAa,EACzC,WAAW,SAAS,MAAM,GAAG,gBAAgB,EAE7C,UAAU,EAAE,UAAU,EACtB,SAAS,GAAE,UAAmD,EAC9D,UAAU,GAAE,WAAwD,EACpE,MAAM,GAAE,MAAM,CAAC,mBAAmB,CAAoB;;;;QAGvD;AAED,eAAe,eAAe,CAAC"}
+{"version":3,"file":"email-token.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/models/email-token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAS,MAAM,UAAU,CAAC;AAMrD,wBAAgB,eAAe,CAC7B,UAAU,EAAE,UAAU,EACtB,SAAS,GAAE,MAAiC,EAC5C,UAAU,GAAE,MAAoC,EAChD,MAAM,GAAE,MAAyB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAGlC;AAED,eAAe,eAAe,CAAC"}

package/src/models/email-token.js.map

@@ -1 +1 @@
-{"version":3,"file":"email-token.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/models/email-token.ts"],"names":[],"mappings":";;AAMA,0CAUC;AAdD,kDAAgD;AAChD,yEAAqE;AACrE,wDAA0D;AAE1D,SAAgB,eAAe,CAI7B,UAAsB,EACtB,YAAwB,4BAAa,CAAC,UAAwB,EAC9D,aAA0B,oCAAgB,CAAC,UAAyB,EACpE,SAAsC,8BAAgB;IAEtD,OAAO,UAAU,CAAC,KAAK,CAAsB,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;AAC9E,CAAC;AAED,kBAAe,eAAe,CAAC"}
+{"version":3,"file":"email-token.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/models/email-token.ts"],"names":[],"mappings":";;AAMA,0CAOC;AAXD,kDAAgD;AAChD,yEAAqE;AACrE,wDAA0D;AAE1D,SAAgB,eAAe,CAC7B,UAAsB,EACtB,YAAoB,4BAAa,CAAC,UAAU,EAC5C,aAAqB,oCAAgB,CAAC,UAAU,EAChD,SAAiB,8BAAgB;IAEjC,OAAO,UAAU,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;AACzD,CAAC;AAED,kBAAe,eAAe,CAAC"}

package/src/models/mnemonic.d.ts

@@ -1,11 +1,36 @@
 import { Connection, Schema } from 'mongoose';
-import { IMnemonicDocument } from '../documents/mnemonic';
-import { BaseModelName } from '../enumerations';
-import { SchemaCollection } from '../enumerations/schema-collection';
-export declare function MnemonicModel<TModelName extends string = BaseModelName, TCollection extends string = SchemaCollection>(connection: Connection, modelName?: TModelName, collection?: TCollection, schema?: Schema<IMnemonicDocument>): import("mongoose").Model<IMnemonicDocument, {}, {}, {}, import("mongoose").Document<unknown, {}, IMnemonicDocument, {}, {}> & import("mongoose").Document<import("mongoose").Types.ObjectId, any, any, Record<string, any>, {}> & import("dist/packages/digitaldefiance-suite-core-lib/src").IMnemonicBase<import("mongoose").Types.ObjectId> & Required<{
-    _id: import("mongoose").Types.ObjectId;
+export declare function MnemonicModel(connection: Connection, modelName?: string, collection?: string, schema?: Schema): import("mongoose").Model<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}, {}, {}, {}, import("mongoose").Document<unknown, {}, {
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}, {}, {}> & {
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+} & Required<{
+    _id: unknown;
 }> & {
     __v: number;
-}, any>;
+}, Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}>, {}, import("mongoose").ResolveSchemaOptions<import("mongoose").DefaultSchemaOptions>> & import("mongoose").FlatRecord<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}> & Required<{
+    _id: unknown;
+}> & {
+    __v: number;
+}>>;
 export default MnemonicModel;
 //# sourceMappingURL=mnemonic.d.ts.map

package/src/models/mnemonic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mnemonic.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/models/mnemonic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAGrE,wBAAgB,aAAa,CAC3B,UAAU,SAAS,MAAM,GAAG,aAAa,EACzC,WAAW,SAAS,MAAM,GAAG,gBAAgB,EAE7C,UAAU,EAAE,UAAU,EACtB,SAAS,GAAE,UAAiD,EAC5D,UAAU,GAAE,WAAsD,EAClE,MAAM,GAAE,MAAM,CAAC,iBAAiB,CAAkB;;;;QAGnD;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"mnemonic.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/models/mnemonic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAS,MAAM,UAAU,CAAC;AAMrD,wBAAgB,aAAa,CAC3B,UAAU,EAAE,UAAU,EACtB,SAAS,GAAE,MAA+B,EAC1C,UAAU,GAAE,MAAkC,EAC9C,MAAM,GAAE,MAAuB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAGhC;AAED,eAAe,aAAa,CAAC"}

package/src/models/mnemonic.js.map

@@ -1 +1 @@
-{"version":3,"file":"mnemonic.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/models/mnemonic.ts"],"names":[],"mappings":";;AAMA,sCAUC;AAdD,kDAAgD;AAChD,yEAAqE;AACrE,kDAAqD;AAErD,SAAgB,aAAa,CAI3B,UAAsB,EACtB,YAAwB,4BAAa,CAAC,QAAsB,EAC5D,aAA0B,oCAAgB,CAAC,QAAuB,EAClE,SAAoC,yBAAc;IAElD,OAAO,UAAU,CAAC,KAAK,CAAoB,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;AAC5E,CAAC;AAED,kBAAe,aAAa,CAAC"}
+{"version":3,"file":"mnemonic.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/models/mnemonic.ts"],"names":[],"mappings":";;AAMA,sCAOC;AAXD,kDAAgD;AAChD,yEAAqE;AACrE,kDAAqD;AAErD,SAAgB,aAAa,CAC3B,UAAsB,EACtB,YAAoB,4BAAa,CAAC,QAAQ,EAC1C,aAAqB,oCAAgB,CAAC,QAAQ,EAC9C,SAAiB,yBAAc;IAE/B,OAAO,UAAU,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;AACzD,CAAC;AAED,kBAAe,aAAa,CAAC"}

package/src/models/role.d.ts

@@ -1,11 +1,36 @@
 import { Connection, Schema } from 'mongoose';
-import { IRoleDocument } from '../documents/role';
-import { BaseModelName } from '../enumerations';
-import { SchemaCollection } from '../enumerations/schema-collection';
-export declare function RoleModel<TModelName extends string = BaseModelName, TCollection extends string = SchemaCollection>(connection: Connection, modelName?: TModelName, collection?: TCollection, schema?: Schema<IRoleDocument>): import("mongoose").Model<IRoleDocument, {}, {}, {}, import("mongoose").Document<unknown, {}, IRoleDocument, {}, {}> & import("mongoose").Document<import("mongoose").Types.ObjectId, any, any, Record<string, any>, {}> & import("dist/packages/digitaldefiance-suite-core-lib/src").IRoleBase<import("mongoose").Types.ObjectId, Date, import("dist/packages/digitaldefiance-suite-core-lib/src").Role> & Required<{
-    _id: import("mongoose").Types.ObjectId;
+export declare function RoleModel(connection: Connection, modelName?: string, collection?: string, schema?: Schema): import("mongoose").Model<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}, {}, {}, {}, import("mongoose").Document<unknown, {}, {
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}, {}, {}> & {
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+} & Required<{
+    _id: unknown;
 }> & {
     __v: number;
-}, any>;
+}, Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}>, {}, import("mongoose").ResolveSchemaOptions<import("mongoose").DefaultSchemaOptions>> & import("mongoose").FlatRecord<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}> & Required<{
+    _id: unknown;
+}> & {
+    __v: number;
+}>>;
 export default RoleModel;
 //# sourceMappingURL=role.d.ts.map

package/src/models/role.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"role.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/models/role.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAGrE,wBAAgB,SAAS,CACvB,UAAU,SAAS,MAAM,GAAG,aAAa,EACzC,WAAW,SAAS,MAAM,GAAG,gBAAgB,EAE7C,UAAU,EAAE,UAAU,EACtB,SAAS,GAAE,UAA6C,EACxD,UAAU,GAAE,WAAkD,EAC9D,MAAM,GAAE,MAAM,CAAC,aAAa,CAAc;;;;QAG3C;AAED,eAAe,SAAS,CAAC"}
+{"version":3,"file":"role.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/models/role.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAS,MAAM,UAAU,CAAC;AAMrD,wBAAgB,SAAS,CACvB,UAAU,EAAE,UAAU,EACtB,SAAS,GAAE,MAA2B,EACtC,UAAU,GAAE,MAA8B,EAC1C,MAAM,GAAE,MAAmB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAG5B;AAED,eAAe,SAAS,CAAC"}

package/src/models/role.js.map

@@ -1 +1 @@
-{"version":3,"file":"role.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/models/role.ts"],"names":[],"mappings":";;AAMA,8BAUC;AAdD,kDAAgD;AAChD,yEAAqE;AACrE,0CAA6C;AAE7C,SAAgB,SAAS,CAIvB,UAAsB,EACtB,YAAwB,4BAAa,CAAC,IAAkB,EACxD,aAA0B,oCAAgB,CAAC,IAAmB,EAC9D,SAAgC,iBAAU;IAE1C,OAAO,UAAU,CAAC,KAAK,CAAgB,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;AACxE,CAAC;AAED,kBAAe,SAAS,CAAC"}
+{"version":3,"file":"role.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/models/role.ts"],"names":[],"mappings":";;AAMA,8BAOC;AAXD,kDAAgD;AAChD,yEAAqE;AACrE,0CAA6C;AAE7C,SAAgB,SAAS,CACvB,UAAsB,EACtB,YAAoB,4BAAa,CAAC,IAAI,EACtC,aAAqB,oCAAgB,CAAC,IAAI,EAC1C,SAAiB,iBAAU;IAE3B,OAAO,UAAU,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;AACzD,CAAC;AAED,kBAAe,SAAS,CAAC"}

package/src/models/used-direct-login-token.d.ts

@@ -1,11 +1,36 @@
 import { Connection, Schema } from 'mongoose';
-import { IUsedDirectLoginTokenDocument } from '../documents/used-direct-login-token';
-import { BaseModelName } from '../enumerations';
-import { SchemaCollection } from '../enumerations/schema-collection';
-export declare function UsedDirectLoginTokenModel<TModelName extends string = BaseModelName, TCollection extends string = SchemaCollection>(connection: Connection, modelName?: TModelName, collection?: TCollection, schema?: Schema<IUsedDirectLoginTokenDocument>): import("mongoose").Model<IUsedDirectLoginTokenDocument, {}, {}, {}, import("mongoose").Document<unknown, {}, IUsedDirectLoginTokenDocument, {}, {}> & import("mongoose").Document<import("mongoose").Types.ObjectId, any, any, Record<string, any>, {}> & import("dist/packages/digitaldefiance-suite-core-lib/src").IUsedDirectLoginTokenBase<import("mongoose").Types.ObjectId> & Required<{
-    _id: import("mongoose").Types.ObjectId;
+export declare function UsedDirectLoginTokenModel(connection: Connection, modelName?: string, collection?: string, schema?: Schema): import("mongoose").Model<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}, {}, {}, {}, import("mongoose").Document<unknown, {}, {
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}, {}, {}> & {
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+} & Required<{
+    _id: unknown;
 }> & {
     __v: number;
-}, any>;
+}, Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}>, {}, import("mongoose").ResolveSchemaOptions<import("mongoose").DefaultSchemaOptions>> & import("mongoose").FlatRecord<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}> & Required<{
+    _id: unknown;
+}> & {
+    __v: number;
+}>>;
 export default UsedDirectLoginTokenModel;
 //# sourceMappingURL=used-direct-login-token.d.ts.map

package/src/models/used-direct-login-token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"used-direct-login-token.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/models/used-direct-login-token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAC9C,OAAO,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AACrF,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAGrE,wBAAgB,yBAAyB,CACvC,UAAU,SAAS,MAAM,GAAG,aAAa,EACzC,WAAW,SAAS,MAAM,GAAG,gBAAgB,EAE7C,UAAU,EAAE,UAAU,EACtB,SAAS,GAAE,UAA6D,EACxE,UAAU,GAAE,WAAkE,EAC9E,MAAM,GAAE,MAAM,CAAC,6BAA6B,CAA8B;;;;QAO3E;AAED,eAAe,yBAAyB,CAAC"}
+{"version":3,"file":"used-direct-login-token.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/models/used-direct-login-token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAS,MAAM,UAAU,CAAC;AAMrD,wBAAgB,yBAAyB,CACvC,UAAU,EAAE,UAAU,EACtB,SAAS,GAAE,MAA2C,EACtD,UAAU,GAAE,MAA8C,EAC1D,MAAM,GAAE,MAAmC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;IAG5C;AAED,eAAe,yBAAyB,CAAC"}

package/src/models/used-direct-login-token.js.map

@@ -1 +1 @@
-{"version":3,"file":"used-direct-login-token.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/models/used-direct-login-token.ts"],"names":[],"mappings":";;AAMA,8DAcC;AAlBD,kDAAgD;AAChD,yEAAqE;AACrE,gFAAgF;AAEhF,SAAgB,yBAAyB,CAIvC,UAAsB,EACtB,YAAwB,4BAAa,CAAC,oBAAkC,EACxE,aAA0B,oCAAgB,CAAC,oBAAmC,EAC9E,SAAgD,oDAA0B;IAE1E,OAAO,UAAU,CAAC,KAAK,CACrB,SAAS,EACT,MAAM,EACN,UAAU,CACX,CAAC;AACJ,CAAC;AAED,kBAAe,yBAAyB,CAAC"}
+{"version":3,"file":"used-direct-login-token.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/models/used-direct-login-token.ts"],"names":[],"mappings":";;AAMA,8DAOC;AAXD,kDAAgD;AAChD,yEAAqE;AACrE,gFAAgF;AAEhF,SAAgB,yBAAyB,CACvC,UAAsB,EACtB,YAAoB,4BAAa,CAAC,oBAAoB,EACtD,aAAqB,oCAAgB,CAAC,oBAAoB,EAC1D,SAAiB,oDAA0B;IAE3C,OAAO,UAAU,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;AACzD,CAAC;AAED,kBAAe,yBAAyB,CAAC"}

package/src/models/user-role.d.ts

@@ -1,6 +1,3 @@
 import { Connection, Model, Schema } from 'mongoose';
-import { IUserRoleDocument } from '../documents/user-role';
-import { BaseModelName } from '../enumerations';
-import { SchemaCollection } from '../enumerations/schema-collection';
-export default function UserRoleModel<TModelName extends string = BaseModelName, TCollection extends string = SchemaCollection>(connection: Connection, modelName?: TModelName, collection?: TCollection, schema?: Schema<IUserRoleDocument>): Model<IUserRoleDocument>;
+export default function UserRoleModel(connection: Connection, modelName?: string, collection?: string, schema?: Schema): Model<any>;
 //# sourceMappingURL=user-role.d.ts.map

package/src/models/user-role.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user-role.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/models/user-role.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAGrE,MAAM,CAAC,OAAO,UAAU,aAAa,CACnC,UAAU,SAAS,MAAM,GAAG,aAAa,EACzC,WAAW,SAAS,MAAM,GAAG,gBAAgB,EAE7C,UAAU,EAAE,UAAU,EACtB,SAAS,GAAE,UAAiD,EAC5D,UAAU,GAAE,WAAsD,EAClE,MAAM,GAAE,MAAM,CAAC,iBAAiB,CAAkB,GACjD,KAAK,CAAC,iBAAiB,CAAC,CAE1B"}
+{"version":3,"file":"user-role.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/models/user-role.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAS,MAAM,UAAU,CAAC;AAM5D,MAAM,CAAC,OAAO,UAAU,aAAa,CACnC,UAAU,EAAE,UAAU,EACtB,SAAS,GAAE,MAA+B,EAC1C,UAAU,GAAE,MAAkC,EAC9C,MAAM,GAAE,MAAuB,GAC9B,KAAK,CAAC,GAAG,CAAC,CAEZ"}

package/src/models/user-role.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-role.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/models/user-role.ts"],"names":[],"mappings":";;AAMA,gCAUC;AAdD,kDAAgD;AAChD,yEAAqE;AACrE,oDAAsD;AAEtD,SAAwB,aAAa,CAInC,UAAsB,EACtB,YAAwB,4BAAa,CAAC,QAAsB,EAC5D,aAA0B,oCAAgB,CAAC,QAAuB,EAClE,SAAoC,0BAAc;IAElD,OAAO,UAAU,CAAC,KAAK,CAAoB,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;AAC5E,CAAC"}
+{"version":3,"file":"user-role.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/models/user-role.ts"],"names":[],"mappings":";;AAMA,gCAOC;AAXD,kDAAgD;AAChD,yEAAqE;AACrE,oDAAsD;AAEtD,SAAwB,aAAa,CACnC,UAAsB,EACtB,YAAoB,4BAAa,CAAC,QAAQ,EAC1C,aAAqB,oCAAgB,CAAC,QAAQ,EAC9C,SAAiB,0BAAc;IAE/B,OAAO,UAAU,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;AACzD,CAAC"}

package/src/models/user.d.ts

@@ -1,7 +1,4 @@
 import { Connection, Model, Schema } from 'mongoose';
-import { IUserDocument } from '../documents/user';
-import { BaseModelName } from '../enumerations';
-import { SchemaCollection } from '../enumerations/schema-collection';
-export declare function UserModel<TModelName extends string = BaseModelName, TCollection extends string = SchemaCollection>(connection: Connection, modelName?: TModelName, collection?: TCollection, schema?: Schema<IUserDocument>): Model<IUserDocument>;
+export declare function UserModel(connection: Connection, modelName?: string, collection?: string, schema?: Schema): Model<any>;
 export default UserModel;
 //# sourceMappingURL=user.d.ts.map

package/src/models/user.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/models/user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,mCAAmC,CAAC;AAGrE,wBAAgB,SAAS,CACvB,UAAU,SAAS,MAAM,GAAG,aAAa,EACzC,WAAW,SAAS,MAAM,GAAG,gBAAgB,EAE7C,UAAU,EAAE,UAAU,EACtB,SAAS,GAAE,UAA6C,EACxD,UAAU,GAAE,WAAkD,EAC9D,MAAM,GAAE,MAAM,CAAC,aAAa,CAAc,GACzC,KAAK,CAAC,aAAa,CAAC,CAEtB;AAED,eAAe,SAAS,CAAC"}
+{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/models/user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,EAAS,MAAM,UAAU,CAAC;AAM5D,wBAAgB,SAAS,CACvB,UAAU,EAAE,UAAU,EACtB,SAAS,GAAE,MAA2B,EACtC,UAAU,GAAE,MAA8B,EAC1C,MAAM,GAAE,MAAmB,GAC1B,KAAK,CAAC,GAAG,CAAC,CAEZ;AAED,eAAe,SAAS,CAAC"}

package/src/models/user.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/models/user.ts"],"names":[],"mappings":";;AAMA,8BAUC;AAdD,kDAAgD;AAChD,yEAAqE;AACrE,0CAA6C;AAE7C,SAAgB,SAAS,CAIvB,UAAsB,EACtB,YAAwB,4BAAa,CAAC,IAAkB,EACxD,aAA0B,oCAAgB,CAAC,IAAmB,EAC9D,SAAgC,iBAAU;IAE1C,OAAO,UAAU,CAAC,KAAK,CAAgB,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;AACxE,CAAC;AAED,kBAAe,SAAS,CAAC"}
+{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/models/user.ts"],"names":[],"mappings":";;AAMA,8BAOC;AAXD,kDAAgD;AAChD,yEAAqE;AACrE,0CAA6C;AAE7C,SAAgB,SAAS,CACvB,UAAsB,EACtB,YAAoB,4BAAa,CAAC,IAAI,EACtC,aAAqB,oCAAgB,CAAC,IAAI,EAC1C,SAAiB,iBAAU;IAE3B,OAAO,UAAU,CAAC,KAAK,CAAC,SAAS,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;AACzD,CAAC;AAED,kBAAe,SAAS,CAAC"}

package/src/schemas/email-token.d.ts

@@ -1,7 +1,5 @@
-import { Types } from 'mongoose';
-import { EmailTokenType } from '@digitaldefiance/suite-core-lib';
 import { Schema } from 'mongoose';
-import { IEmailTokenDocument } from '../documents/email-token';
+import { EmailTokenType } from '@digitaldefiance/suite-core-lib';
 import { BaseModelName } from '../enumerations';
 import { IConstants } from '../interfaces';
 /**
@@ -27,16 +25,24 @@ export interface EmailTokenSchemaOptions<TTokenType extends string = EmailTokenT
 /**
  * Factory function to create an extensible email token schema
  */
-export declare function createEmailTokenSchema<TTokenType extends string = EmailTokenType, TModelName extends string = BaseModelName, TConstants extends IConstants = IConstants, I extends Types.ObjectId | string = Types.ObjectId>(options?: EmailTokenSchemaOptions<TTokenType, TModelName>, constants?: TConstants): Schema<IEmailTokenDocument<I>>;
+export declare function createEmailTokenSchema<TTokenType extends string = EmailTokenType, TModelName extends string = BaseModelName, TConstants extends IConstants = IConstants>(options?: EmailTokenSchemaOptions<TTokenType, TModelName>, constants?: TConstants): Schema;
 /**
  * Default email token schema with base configuration
  */
-export declare const EmailTokenSchema: Schema<IEmailTokenDocument<Types.ObjectId>, import("mongoose").Model<IEmailTokenDocument<Types.ObjectId>, any, any, any, import("mongoose").Document<unknown, any, IEmailTokenDocument<Types.ObjectId>, any, {}> & import("mongoose").Document<Types.ObjectId, any, any, Record<string, any>, {}> & import("@digitaldefiance/suite-core-lib").IEmailTokenBase<Types.ObjectId, Date, EmailTokenType> & Required<{
-    _id: Types.ObjectId;
-}> & {
-    __v: number;
-}, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, IEmailTokenDocument<Types.ObjectId>, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<IEmailTokenDocument<Types.ObjectId>>, {}, import("mongoose").ResolveSchemaOptions<import("mongoose").DefaultSchemaOptions>> & import("mongoose").FlatRecord<IEmailTokenDocument<Types.ObjectId>> & Required<{
-    _id: Types.ObjectId;
+export declare const EmailTokenSchema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}>, {}, import("mongoose").ResolveSchemaOptions<import("mongoose").DefaultSchemaOptions>> & import("mongoose").FlatRecord<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}> & Required<{
+    _id: unknown;
 }> & {
     __v: number;
 }>;

package/src/schemas/email-token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"email-token.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/email-token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EACL,cAAc,EAGf,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,mBAAmB,EAAE,MAAM,0BAA0B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,uBAAuB,CACtC,UAAU,SAAS,MAAM,GAAG,cAAc,EAC1C,UAAU,SAAS,MAAM,GAAG,aAAa,EACzC,UAAU,SAAS,UAAU,GAAG,UAAU;IAE1C,oCAAoC;IACpC,aAAa,CAAC,EAAE,UAAU,EAAE,CAAC;IAC7B,oCAAoC;IACpC,aAAa,CAAC,EAAE,UAAU,CAAC;IAC3B,4CAA4C;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sCAAsC;IACtC,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IACxC,+CAA+C;IAC/C,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,MAAM,CAAC;IACzD,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,6BAA6B;IAC7B,MAAM,CAAC,EAAE,GAAG,CAAC;CACd;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,SAAS,MAAM,GAAG,cAAc,EAC1C,UAAU,SAAS,MAAM,GAAG,aAAa,EACzC,UAAU,SAAS,UAAU,GAAG,UAAU,EAC1C,CAAC,SAAS,KAAK,CAAC,QAAQ,GAAG,MAAM,GAAG,KAAK,CAAC,QAAQ,EAElD,OAAO,GAAE,uBAAuB,CAAC,UAAU,EAAE,UAAU,CAAM,EAC7D,SAAS,CAAC,EAAE,UAAU,GACrB,MAAM,CAAC,mBAAmB,CAAC,CAAC,CAAC,CAAC,CAiDhC;AAED;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;;;;;;EAA2B,CAAC"}
+{"version":3,"file":"email-token.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/email-token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAS,MAAM,UAAU,CAAC;AACzC,OAAO,EACL,cAAc,EAIf,MAAM,iCAAiC,CAAC;AAGzC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,uBAAuB,CACtC,UAAU,SAAS,MAAM,GAAG,cAAc,EAC1C,UAAU,SAAS,MAAM,GAAG,aAAa,EACzC,UAAU,SAAS,UAAU,GAAG,UAAU;IAE1C,oCAAoC;IACpC,aAAa,CAAC,EAAE,UAAU,EAAE,CAAC;IAC7B,oCAAoC;IACpC,aAAa,CAAC,EAAE,UAAU,CAAC;IAC3B,4CAA4C;IAC5C,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,sCAAsC;IACtC,cAAc,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,KAAK,OAAO,CAAC;IACxC,+CAA+C;IAC/C,iBAAiB,CAAC,EAAE,CAAC,KAAK,EAAE;QAAE,KAAK,EAAE,MAAM,CAAA;KAAE,KAAK,MAAM,CAAC;IACzD,SAAS,CAAC,EAAE,UAAU,CAAC;IACvB,6BAA6B;IAC7B,MAAM,CAAC,EAAE,GAAG,CAAC;CACd;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,UAAU,SAAS,MAAM,GAAG,cAAc,EAC1C,UAAU,SAAS,MAAM,GAAG,aAAa,EACzC,UAAU,SAAS,UAAU,GAAG,UAAU,EAE1C,OAAO,GAAE,uBAAuB,CAAC,UAAU,EAAE,UAAU,CAAM,EAC7D,SAAS,CAAC,EAAE,UAAU,GACrB,MAAM,CA8CR;AAED;;GAEG;AACH,eAAO,MAAM,gBAAgB;;;;;;;;;;;;;;;;EAA2B,CAAC"}

package/src/schemas/email-token.js

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmailTokenSchema = void 0;
 exports.createEmailTokenSchema = createEmailTokenSchema;
 const tslib_1 = require("tslib");
-const suite_core_lib_1 = require("@digitaldefiance/suite-core-lib");
 const mongoose_1 = require("mongoose");
+const suite_core_lib_1 = require("@digitaldefiance/suite-core-lib");
 const validator_1 = tslib_1.__importDefault(require("validator"));
 const enumerations_1 = require("../enumerations");
 /**
@@ -14,7 +14,7 @@ function createEmailTokenSchema(options = {}, constants) {
     const { tokenTypeEnum = Object.values(suite_core_lib_1.EmailTokenType), userModelName = enumerations_1.BaseModelName.User, expiresIn = '1d', validationMessage = (props) => (0, suite_core_lib_1.getSuiteCoreTranslation)(suite_core_lib_1.SuiteCoreStringKey.Error_InvalidEmailTemplate, {
         email: props.value,
     }), idType = mongoose_1.Schema.Types.ObjectId, } = options;
-    const schema = new mongoose_1.Schema({
+    const definition = {
         userId: {
             type: idType,
             required: true,
@@ -43,7 +43,8 @@ function createEmailTokenSchema(options = {}, constants) {
             default: Date.now,
             index: { expires: expiresIn },
         },
-    }, { timestamps: true });
+    };
+    const schema = new mongoose_1.Schema(definition, { timestamps: true });
     schema.index({ userId: 1, email: 1, type: 1 }, { unique: true });
     return schema;
 }

package/src/schemas/email-token.js.map

@@ -1 +1 @@
-{"version":3,"file":"email-token.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/email-token.ts"],"names":[],"mappings":";;;AAsCA,wDAyDC;;AA9FD,oEAIyC;AACzC,uCAAkC;AAClC,kEAAkC;AAElC,kDAAgD;AA0BhD;;GAEG;AACH,SAAgB,sBAAsB,CAMpC,UAA2D,EAAE,EAC7D,SAAsB;IAEtB,MAAM,EACJ,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,+BAAc,CAAiB,EAC7D,aAAa,GAAG,4BAAa,CAAC,IAAkB,EAChD,SAAS,GAAG,IAAI,EAChB,iBAAiB,GAAG,CAAC,KAAwB,EAAE,EAAE,CAC/C,IAAA,wCAAuB,EAAC,mCAAkB,CAAC,0BAA0B,EAAE;QACrE,KAAK,EAAE,KAAK,CAAC,KAAK;KACnB,CAAC,EACJ,MAAM,GAAG,iBAAM,CAAC,KAAK,CAAC,QAAQ,GAC/B,GAAG,OAAO,CAAC;IAEZ,MAAM,MAAM,GAAG,IAAI,iBAAM,CACvB;QACE,MAAM,EAAE;YACN,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,GAAG,EAAE,aAAa;YAClB,SAAS,EAAE,IAAI;SAChB;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,aAAa;YACnB,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,IAAI;SAChB;QACD,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;QACtE,KAAK,EAAE;YACL,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,IAAI;YACf,QAAQ,EAAE;gBACR,SAAS,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,mBAAS,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC9C,OAAO,EAAE,iBAAiB;aAC3B;SACF;QACD,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE;QACzC,SAAS,EAAE;YACT,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,IAAI,CAAC,GAAG;YACjB,KAAK,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE;SAC9B;KACF,EACD,EAAE,UAAU,EAAE,IAAI,EAAE,CACrB,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAEjE,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACU,QAAA,gBAAgB,GAAG,sBAAsB,EAAE,CAAC"}
+{"version":3,"file":"email-token.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/email-token.ts"],"names":[],"mappings":";;;AAsCA,wDAqDC;;AA3FD,uCAAyC;AACzC,oEAKyC;AACzC,kEAAkC;AAElC,kDAAgD;AA0BhD;;GAEG;AACH,SAAgB,sBAAsB,CAKpC,UAA2D,EAAE,EAC7D,SAAsB;IAEtB,MAAM,EACJ,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,+BAAc,CAAiB,EAC7D,aAAa,GAAG,4BAAa,CAAC,IAAkB,EAChD,SAAS,GAAG,IAAI,EAChB,iBAAiB,GAAG,CAAC,KAAwB,EAAE,EAAE,CAC/C,IAAA,wCAAuB,EAAC,mCAAkB,CAAC,0BAA0B,EAAE;QACrE,KAAK,EAAE,KAAK,CAAC,KAAK;KACnB,CAAC,EACJ,MAAM,GAAG,iBAAM,CAAC,KAAK,CAAC,QAAQ,GAC/B,GAAG,OAAO,CAAC;IAEZ,MAAM,UAAU,GAAG;QACjB,MAAM,EAAE;YACN,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,GAAG,EAAE,aAAa;YAClB,SAAS,EAAE,IAAI;SAChB;QACD,IAAI,EAAE;YACJ,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,aAAa;YACnB,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,IAAI;SAChB;QACD,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE;QACtE,KAAK,EAAE;YACL,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,IAAI;YACf,QAAQ,EAAE;gBACR,SAAS,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,mBAAS,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC9C,OAAO,EAAE,iBAAiB;aAC3B;SACF;QACD,QAAQ,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE;QACzC,SAAS,EAAE;YACT,IAAI,EAAE,IAAI;YACV,OAAO,EAAE,IAAI,CAAC,GAAG;YACjB,KAAK,EAAE,EAAE,OAAO,EAAE,SAAS,EAAE;SAC9B;KACF,CAAC;IAEF,MAAM,MAAM,GAAG,IAAI,iBAAM,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5D,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IACjE,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACU,QAAA,gBAAgB,GAAG,sBAAsB,EAAE,CAAC"}

package/src/schemas/mnemonic.d.ts

@@ -1,20 +1,26 @@
-import { Types } from 'mongoose';
 import { Schema } from 'mongoose';
-import { IMnemonicDocument } from '../documents/mnemonic';
 import { IConstants } from '../interfaces/constants';
 /**
  * Create a mnemonic schema with custom or default constants
  */
-export declare function createMnemonicSchema<T extends IConstants = IConstants, I extends string | Types.ObjectId = Types.ObjectId>(validationMessage?: () => string, constants?: T): Schema<IMnemonicDocument<I>>;
+export declare function createMnemonicSchema<T extends IConstants = IConstants>(validationMessage?: () => string, constants?: T): Schema;
 /**
  * Default mnemonic schema using AppConstants
  */
-export declare const MnemonicSchema: Schema<IMnemonicDocument<Types.ObjectId>, import("mongoose").Model<IMnemonicDocument<Types.ObjectId>, any, any, any, import("mongoose").Document<unknown, any, IMnemonicDocument<Types.ObjectId>, any, {}> & import("mongoose").Document<Types.ObjectId, any, any, Record<string, any>, {}> & import("@digitaldefiance/suite-core-lib").IMnemonicBase<Types.ObjectId> & Required<{
-    _id: Types.ObjectId;
-}> & {
-    __v: number;
-}, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, IMnemonicDocument<Types.ObjectId>, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<IMnemonicDocument<Types.ObjectId>>, {}, import("mongoose").ResolveSchemaOptions<import("mongoose").DefaultSchemaOptions>> & import("mongoose").FlatRecord<IMnemonicDocument<Types.ObjectId>> & Required<{
-    _id: Types.ObjectId;
+export declare const MnemonicSchema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}>, {}, import("mongoose").ResolveSchemaOptions<import("mongoose").DefaultSchemaOptions>> & import("mongoose").FlatRecord<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}> & Required<{
+    _id: unknown;
 }> & {
     __v: number;
 }>;

package/src/schemas/mnemonic.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mnemonic.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/mnemonic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAKjC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAElC,OAAO,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAC;AAC1D,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAAE,CAAC,SAAS,MAAM,GAAG,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,EACxH,iBAAiB,CAAC,EAAE,MAAM,MAAM,EAChC,SAAS,GAAE,CAAqB,GAC/B,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAgB9B;AAED;;GAEG;AACH,eAAO,MAAM,cAAc;;;;;;;;EAAyB,CAAC"}
+{"version":3,"file":"mnemonic.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/mnemonic.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAS,MAAM,UAAU,CAAC;AAQzC,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EACpE,iBAAiB,CAAC,EAAE,MAAM,MAAM,EAChC,SAAS,GAAE,CAAqB,GAC/B,MAAM,CAiBR;AAED;;GAEG;AACH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;EAAyB,CAAC"}

package/src/schemas/mnemonic.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MnemonicSchema = void 0;
 exports.createMnemonicSchema = createMnemonicSchema;
-const suite_core_lib_1 = require("@digitaldefiance/suite-core-lib");
 const mongoose_1 = require("mongoose");
+const suite_core_lib_1 = require("@digitaldefiance/suite-core-lib");
 const constants_1 = require("../constants");
 /**
  * Create a mnemonic schema with custom or default constants
  */
 function createMnemonicSchema(validationMessage, constants = constants_1.LocalhostConstants) {
-    return new mongoose_1.Schema({
+    const definition = {
         hmac: {
             type: String,
             required: true,
@@ -21,7 +21,8 @@ function createMnemonicSchema(validationMessage, constants = constants_1.Localho
                     (() => (0, suite_core_lib_1.getSuiteCoreTranslation)(suite_core_lib_1.SuiteCoreStringKey.Validation_HmacRegex)),
             },
         },
-    });
+    };
+    return new mongoose_1.Schema(definition);
 }
 /**
  * Default mnemonic schema using AppConstants

package/src/schemas/mnemonic.js.map

@@ -1 +1 @@
-{"version":3,"file":"mnemonic.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/mnemonic.ts"],"names":[],"mappings":";;;AAaA,oDAmBC;AA/BD,oEAGyC;AACzC,uCAAkC;AAClC,4CAAkE;AAIlE;;GAEG;AACH,SAAgB,oBAAoB,CAClC,iBAAgC,EAChC,YAAe,8BAAiB;IAEhC,OAAO,IAAI,iBAAM,CAAuB;QACtC,IAAI,EAAE;YACJ,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,IAAI;YACX,QAAQ,EAAE;gBACR,SAAS,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC7D,OAAO,EACL,iBAAiB;oBACjB,CAAC,GAAG,EAAE,CACJ,IAAA,wCAAuB,EAAC,mCAAkB,CAAC,oBAAoB,CAAC,CAAC;aACtE;SACF;KACF,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACU,QAAA,cAAc,GAAG,oBAAoB,EAAE,CAAC"}
+{"version":3,"file":"mnemonic.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/mnemonic.ts"],"names":[],"mappings":";;;AAaA,oDAoBC;AAjCD,uCAAyC;AACzC,oEAIyC;AACzC,4CAAkE;AAIlE;;GAEG;AACH,SAAgB,oBAAoB,CAClC,iBAAgC,EAChC,YAAe,8BAAiB;IAEhC,MAAM,UAAU,GAAG;QACjB,IAAI,EAAE;YACJ,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;YACZ,KAAK,EAAE,IAAI;YACX,QAAQ,EAAE;gBACR,SAAS,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,SAAS,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC7D,OAAO,EACL,iBAAiB;oBACjB,CAAC,GAAG,EAAE,CACJ,IAAA,wCAAuB,EAAC,mCAAkB,CAAC,oBAAoB,CAAC,CAAC;aACtE;SACF;KACF,CAAC;IACF,OAAO,IAAI,iBAAM,CAAC,UAAU,CAAC,CAAC;AAChC,CAAC;AAED;;GAEG;AACU,QAAA,cAAc,GAAG,oBAAoB,EAAE,CAAC"}

package/src/schemas/role.d.ts

@@ -1,7 +1,5 @@
-import { Types } from 'mongoose';
-import { Role } from '@digitaldefiance/suite-core-lib';
 import { CallbackWithoutResultAndOptionalError, Schema } from 'mongoose';
-import { IRoleDocument } from '../documents/role';
+import { Role } from '@digitaldefiance/suite-core-lib';
 import { BaseModelName } from '../enumerations';
 import { IConstants } from '../interfaces';
 /**
@@ -13,23 +11,31 @@ export interface RoleSchemaOptions<TRole extends string = Role, TModelName exten
     /** Model name for user reference */
     userModelName?: TModelName;
     /** Custom pre-save validation function */
-    customValidation?: (doc: IRoleDocument<any>, next: CallbackWithoutResultAndOptionalError) => void;
+    customValidation?: <T = any>(doc: T, next: CallbackWithoutResultAndOptionalError) => void;
     /** ID type for references */
     idType?: any;
 }
 /**
  * Factory function to create an extensible role schema
  */
-export declare function createRoleSchema<TRole extends string = Role, TModelName extends string = BaseModelName, TConstants extends IConstants = IConstants, I extends Types.ObjectId | string = Types.ObjectId>(options?: RoleSchemaOptions<TRole, TModelName>, constants?: TConstants): Schema<IRoleDocument<I>>;
+export declare function createRoleSchema<TRole extends string = Role, TModelName extends string = BaseModelName, TConstants extends IConstants = IConstants>(options?: RoleSchemaOptions<TRole, TModelName>, constants?: TConstants): Schema;
 /**
  * Default role schema with base configuration
  */
-export declare const RoleSchema: Schema<IRoleDocument<Types.ObjectId>, import("mongoose").Model<IRoleDocument<Types.ObjectId>, any, any, any, import("mongoose").Document<unknown, any, IRoleDocument<Types.ObjectId>, any, {}> & import("mongoose").Document<Types.ObjectId, any, any, Record<string, any>, {}> & import("@digitaldefiance/suite-core-lib").IRoleBase<Types.ObjectId, Date, Role> & Required<{
-    _id: Types.ObjectId;
-}> & {
-    __v: number;
-}, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, IRoleDocument<Types.ObjectId>, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<IRoleDocument<Types.ObjectId>>, {}, import("mongoose").ResolveSchemaOptions<import("mongoose").DefaultSchemaOptions>> & import("mongoose").FlatRecord<IRoleDocument<Types.ObjectId>> & Required<{
-    _id: Types.ObjectId;
+export declare const RoleSchema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}>, {}, import("mongoose").ResolveSchemaOptions<import("mongoose").DefaultSchemaOptions>> & import("mongoose").FlatRecord<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}> & Required<{
+    _id: unknown;
 }> & {
     __v: number;
 }>;

package/src/schemas/role.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"role.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/role.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EACL,IAAI,EAGL,MAAM,iCAAiC,CAAC;AACzC,OAAO,EAAE,qCAAqC,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AACzE,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,iBAAiB,CAChC,KAAK,SAAS,MAAM,GAAG,IAAI,EAC3B,UAAU,SAAS,MAAM,GAAG,aAAa;IAEzC,8BAA8B;IAC9B,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC;IACnB,oCAAoC;IACpC,aAAa,CAAC,EAAE,UAAU,CAAC;IAC3B,0CAA0C;IAC1C,gBAAgB,CAAC,EAAE,CACjB,GAAG,EAAE,aAAa,CAAC,GAAG,CAAC,EACvB,IAAI,EAAE,qCAAqC,KACxC,IAAI,CAAC;IACV,6BAA6B;IAC7B,MAAM,CAAC,EAAE,GAAG,CAAC;CACd;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,SAAS,MAAM,GAAG,IAAI,EAC3B,UAAU,SAAS,MAAM,GAAG,aAAa,EACzC,UAAU,SAAS,UAAU,GAAG,UAAU,EAC1C,CAAC,SAAS,KAAK,CAAC,QAAQ,GAAG,MAAM,GAAG,KAAK,CAAC,QAAQ,EAClD,OAAO,GAAE,iBAAiB,CAAC,KAAK,EAAE,UAAU,CAAM,EAAE,SAAS,GAAE,UAA6B,GAAG,MAAM,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAyFxH;AAED;;GAEG;AACH,eAAO,MAAM,UAAU;;;;;;;;EAAqB,CAAC"}
+{"version":3,"file":"role.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/role.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qCAAqC,EAAE,MAAM,EAAS,MAAM,UAAU,CAAC;AAChF,OAAO,EAEL,IAAI,EAGL,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,iBAAiB,CAChC,KAAK,SAAS,MAAM,GAAG,IAAI,EAC3B,UAAU,SAAS,MAAM,GAAG,aAAa;IAEzC,8BAA8B;IAC9B,QAAQ,CAAC,EAAE,KAAK,EAAE,CAAC;IACnB,oCAAoC;IACpC,aAAa,CAAC,EAAE,UAAU,CAAC;IAC3B,0CAA0C;IAC1C,gBAAgB,CAAC,EAAE,CAAC,CAAC,GAAG,GAAG,EACzB,GAAG,EAAE,CAAC,EACN,IAAI,EAAE,qCAAqC,KACxC,IAAI,CAAC;IACV,6BAA6B;IAC7B,MAAM,CAAC,EAAE,GAAG,CAAC;CACd;AAED;;GAEG;AACH,wBAAgB,gBAAgB,CAC9B,KAAK,SAAS,MAAM,GAAG,IAAI,EAC3B,UAAU,SAAS,MAAM,GAAG,aAAa,EACzC,UAAU,SAAS,UAAU,GAAG,UAAU,EAC1C,OAAO,GAAE,iBAAiB,CAAC,KAAK,EAAE,UAAU,CAAM,EAAE,SAAS,GAAE,UAA6B,GAAG,MAAM,CAwFtG;AAED;;GAEG;AACH,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;EAAqB,CAAC"}

package/src/schemas/role.js

@@ -2,15 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoleSchema = void 0;
 exports.createRoleSchema = createRoleSchema;
-const suite_core_lib_1 = require("@digitaldefiance/suite-core-lib");
 const mongoose_1 = require("mongoose");
+const suite_core_lib_1 = require("@digitaldefiance/suite-core-lib");
 const enumerations_1 = require("../enumerations");
 /**
  * Factory function to create an extensible role schema
  */
 function createRoleSchema(options = {}, constants = {}) {
     const { roleEnum = Object.values(suite_core_lib_1.Role), userModelName = enumerations_1.BaseModelName.User, customValidation, idType = mongoose_1.Schema.Types.ObjectId, } = options;
-    const schema = new mongoose_1.Schema({
+    const definition = {
         name: {
             type: String,
             enum: roleEnum,
@@ -60,18 +60,20 @@ function createRoleSchema(options = {}, constants = {}) {
             required: false,
             optional: true,
         },
-    }, { timestamps: true });
+    };
+    const schema = new mongoose_1.Schema(definition, { timestamps: true });
     schema.index({ name: 1 }, { unique: true });
     schema.pre('save', function (next) {
+        const doc = this;
         if (customValidation) {
-            customValidation(this, next);
+            customValidation(doc, next);
         }
         else {
             // Default validation
-            if (this.admin && this.child) {
+            if (doc.admin && doc.child) {
                 return next(new suite_core_lib_1.TranslatableSuiteError(suite_core_lib_1.SuiteCoreStringKey.Error_ChildRoleCannotBeAnAdminRole));
             }
-            if (this.system && this.child) {
+            if (doc.system && doc.child) {
                 return next(new suite_core_lib_1.TranslatableSuiteError(suite_core_lib_1.SuiteCoreStringKey.Error_ChildRoleCannotBeASystemRole));
             }
             next();

package/src/schemas/role.js.map

@@ -1 +1 @@
-{"version":3,"file":"role.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/role.ts"],"names":[],"mappings":";;;AAkCA,4CA8FC;AA/HD,oEAIyC;AACzC,uCAAyE;AAEzE,kDAAgD;AAuBhD;;GAEG;AACH,SAAgB,gBAAgB,CAK9B,UAAgD,EAAE,EAAE,YAAwB,EAAgB;IAC5F,MAAM,EACJ,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,qBAAI,CAAY,EACzC,aAAa,GAAG,4BAAa,CAAC,IAAkB,EAChD,gBAAgB,EAChB,MAAM,GAAG,iBAAM,CAAC,KAAK,CAAC,QAAQ,GAC/B,GAAG,OAAO,CAAC;IAEZ,MAAM,MAAM,GAAG,IAAI,iBAAM,CACvB;QACE,IAAI,EAAE;YACJ,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,IAAI;SAChB;QACD,KAAK,EAAE;YACL,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,KAAK;YACd,SAAS,EAAE,IAAI;SAChB;QACD,MAAM,EAAE;YACN,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,KAAK;YACd,SAAS,EAAE,IAAI;SAChB;QACD,KAAK,EAAE;YACL,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,KAAK;YACd,SAAS,EAAE,IAAI;SAChB;QACD,MAAM,EAAE;YACN,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,KAAK;YACd,SAAS,EAAE,IAAI;SAChB;QACD,SAAS,EAAE;YACT,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,aAAa;YAClB,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,IAAI;SAChB;QACD,SAAS,EAAE;YACT,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,aAAa;YAClB,QAAQ,EAAE,IAAI;SACf;QACD,SAAS,EAAE;YACT,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,IAAI;YACd,GAAG,EAAE,CAAC,CAAO,EAAE,EAAE,CAAC,CAAC;YACnB,GAAG,EAAE,CAAC,CAAO,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;SAC5C;QACD,SAAS,EAAE;YACT,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,aAAa;YAClB,QAAQ,EAAE,KAAK;YACf,QAAQ,EAAE,IAAI;SACf;KACF,EACD,EAAE,UAAU,EAAE,IAAI,EAAE,CACrB,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAE5C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,IAA2C;QACtE,IAAI,gBAAgB,EAAE,CAAC;YACrB,gBAAgB,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAC/B,CAAC;aAAM,CAAC;YACN,qBAAqB;YACrB,IAAI,IAAI,CAAC,KAAK,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBAC7B,OAAO,IAAI,CACT,IAAI,uCAAsB,CACxB,mCAAkB,CAAC,kCAAkC,CACtD,CACF,CAAC;YACJ,CAAC;YACD,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;gBAC9B,OAAO,IAAI,CACT,IAAI,uCAAsB,CACxB,mCAAkB,CAAC,kCAAkC,CACtD,CACF,CAAC;YACJ,CAAC;YACD,IAAI,EAAE,CAAC;QACT,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACU,QAAA,UAAU,GAAG,gBAAgB,EAAE,CAAC"}
+{"version":3,"file":"role.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/role.ts"],"names":[],"mappings":";;;AAkCA,4CA4FC;AA9HD,uCAAgF;AAChF,oEAKyC;AAEzC,kDAAgD;AAuBhD;;GAEG;AACH,SAAgB,gBAAgB,CAI9B,UAAgD,EAAE,EAAE,YAAwB,EAAgB;IAC5F,MAAM,EACJ,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,qBAAI,CAAY,EACzC,aAAa,GAAG,4BAAa,CAAC,IAAkB,EAChD,gBAAgB,EAChB,MAAM,GAAG,iBAAM,CAAC,KAAK,CAAC,QAAQ,GAC/B,GAAG,OAAO,CAAC;IAEZ,MAAM,UAAU,GAAG;QACjB,IAAI,EAAE;YACJ,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,QAAQ;YACd,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,IAAI;SAChB;QACD,KAAK,EAAE;YACL,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,KAAK;YACd,SAAS,EAAE,IAAI;SAChB;QACD,MAAM,EAAE;YACN,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,KAAK;YACd,SAAS,EAAE,IAAI;SAChB;QACD,KAAK,EAAE;YACL,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,KAAK;YACd,SAAS,EAAE,IAAI;SAChB;QACD,MAAM,EAAE;YACN,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,KAAK;YACd,SAAS,EAAE,IAAI;SAChB;QACD,SAAS,EAAE;YACT,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,aAAa;YAClB,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,IAAI;SAChB;QACD,SAAS,EAAE;YACT,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,aAAa;YAClB,QAAQ,EAAE,IAAI;SACf;QACD,SAAS,EAAE;YACT,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,IAAI;YACd,GAAG,EAAE,CAAC,CAAO,EAAE,EAAE,CAAC,CAAC;YACnB,GAAG,EAAE,CAAC,CAAO,EAAE,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;SAC5C;QACD,SAAS,EAAE;YACT,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,aAAa;YAClB,QAAQ,EAAE,KAAK;YACf,QAAQ,EAAE,IAAI;SACf;KACF,CAAC;IAEF,MAAM,MAAM,GAAG,IAAI,iBAAM,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5D,MAAM,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAE5C,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,UAAU,IAA2C;QACtE,MAAM,GAAG,GAAG,IAAI,CAAC;QACjB,IAAI,gBAAgB,EAAE,CAAC;YACrB,gBAAgB,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC;QAC9B,CAAC;aAAM,CAAC;YACN,qBAAqB;YACrB,IAAI,GAAG,CAAC,KAAK,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;gBAC3B,OAAO,IAAI,CACT,IAAI,uCAAsB,CACxB,mCAAkB,CAAC,kCAAkC,CACtD,CACF,CAAC;YACJ,CAAC;YACD,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,KAAK,EAAE,CAAC;gBAC5B,OAAO,IAAI,CACT,IAAI,uCAAsB,CACxB,mCAAkB,CAAC,kCAAkC,CACtD,CACF,CAAC;YACJ,CAAC;YACD,IAAI,EAAE,CAAC;QACT,CAAC;IACH,CAAC,CAAC,CAAC;IAEH,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACU,QAAA,UAAU,GAAG,gBAAgB,EAAE,CAAC"}

package/src/schemas/schema.js.map

@@ -1 +1 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/schema.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/schema.ts"],"names":[],"mappings":"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"}

package/src/schemas/used-direct-login-token.d.ts

@@ -1,6 +1,4 @@
-import { Types } from 'mongoose';
 import { Schema } from 'mongoose';
-import { IUsedDirectLoginTokenDocument } from '../documents/used-direct-login-token';
 import { BaseModelName } from '../enumerations';
 import { IConstants } from '../interfaces';
 /**
@@ -15,16 +13,24 @@ export interface UsedDirectLoginTokenSchemaOptions<TModelName extends string = B
 /**
  * Factory function to create an extensible used direct login token schema
  */
-export declare function createUsedDirectLoginTokenSchema<TModelName extends string = BaseModelName, TConstants extends IConstants = IConstants, I extends Types.ObjectId | string = Types.ObjectId>(options?: UsedDirectLoginTokenSchemaOptions<TModelName>, constants?: TConstants): Schema<IUsedDirectLoginTokenDocument<I>>;
+export declare function createUsedDirectLoginTokenSchema<TModelName extends string = BaseModelName, TConstants extends IConstants = IConstants>(options?: UsedDirectLoginTokenSchemaOptions<TModelName>, constants?: TConstants): Schema;
 /**
  * Default used direct login token schema with base configuration
  */
-export declare const UsedDirectLoginTokenSchema: Schema<IUsedDirectLoginTokenDocument<Types.ObjectId>, import("mongoose").Model<IUsedDirectLoginTokenDocument<Types.ObjectId>, any, any, any, import("mongoose").Document<unknown, any, IUsedDirectLoginTokenDocument<Types.ObjectId>, any, {}> & import("mongoose").Document<Types.ObjectId, any, any, Record<string, any>, {}> & import("dist/packages/digitaldefiance-suite-core-lib/src").IUsedDirectLoginTokenBase<Types.ObjectId> & Required<{
-    _id: Types.ObjectId;
-}> & {
-    __v: number;
-}, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, IUsedDirectLoginTokenDocument<Types.ObjectId>, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<IUsedDirectLoginTokenDocument<Types.ObjectId>>, {}, import("mongoose").ResolveSchemaOptions<import("mongoose").DefaultSchemaOptions>> & import("mongoose").FlatRecord<IUsedDirectLoginTokenDocument<Types.ObjectId>> & Required<{
-    _id: Types.ObjectId;
+export declare const UsedDirectLoginTokenSchema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}>, {}, import("mongoose").ResolveSchemaOptions<import("mongoose").DefaultSchemaOptions>> & import("mongoose").FlatRecord<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}> & Required<{
+    _id: unknown;
 }> & {
     __v: number;
 }>;

package/src/schemas/used-direct-login-token.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"used-direct-login-token.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/used-direct-login-token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,6BAA6B,EAAE,MAAM,sCAAsC,CAAC;AACrF,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,iCAAiC,CAChD,UAAU,SAAS,MAAM,GAAG,aAAa;IAEzC,oCAAoC;IACpC,aAAa,CAAC,EAAE,UAAU,CAAC;IAC3B,6BAA6B;IAC7B,MAAM,CAAC,EAAE,GAAG,CAAC;CACd;AAED;;GAEG;AACH,wBAAgB,gCAAgC,CAC9C,UAAU,SAAS,MAAM,GAAG,aAAa,EACzC,UAAU,SAAS,UAAU,GAAG,UAAU,EAC1C,CAAC,SAAS,KAAK,CAAC,QAAQ,GAAG,MAAM,GAAG,KAAK,CAAC,QAAQ,EAElD,OAAO,GAAE,iCAAiC,CAAC,UAAU,CAAM,EAC3D,SAAS,CAAC,EAAE,UAAU,GACrB,MAAM,CAAC,6BAA6B,CAAC,CAAC,CAAC,CAAC,CAW1C;AAED;;GAEG;AACH,eAAO,MAAM,0BAA0B;;;;;;;;EAAqC,CAAC"}
+{"version":3,"file":"used-direct-login-token.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/used-direct-login-token.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAS,MAAM,UAAU,CAAC;AAGzC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,iCAAiC,CAChD,UAAU,SAAS,MAAM,GAAG,aAAa;IAEzC,oCAAoC;IACpC,aAAa,CAAC,EAAE,UAAU,CAAC;IAC3B,6BAA6B;IAC7B,MAAM,CAAC,EAAE,GAAG,CAAC;CACd;AAED;;GAEG;AACH,wBAAgB,gCAAgC,CAC9C,UAAU,SAAS,MAAM,GAAG,aAAa,EACzC,UAAU,SAAS,UAAU,GAAG,UAAU,EAE1C,OAAO,GAAE,iCAAiC,CAAC,UAAU,CAAM,EAC3D,SAAS,CAAC,EAAE,UAAU,GACrB,MAAM,CAWR;AAED;;GAEG;AACH,eAAO,MAAM,0BAA0B;;;;;;;;;;;;;;;;EAAqC,CAAC"}

package/src/schemas/used-direct-login-token.js

@@ -9,10 +9,11 @@ const enumerations_1 = require("../enumerations");
  */
 function createUsedDirectLoginTokenSchema(options = {}, constants) {
     const { userModelName = enumerations_1.BaseModelName.User, idType = mongoose_1.Schema.Types.ObjectId } = options;
-    const schema = new mongoose_1.Schema({
+    const definition = {
         userId: { type: idType, required: true, ref: userModelName },
         token: { type: String, required: true },
-    });
+    };
+    const schema = new mongoose_1.Schema(definition);
     schema.index({ userId: 1, token: 1 }, { unique: true });
     return schema;
 }

package/src/schemas/used-direct-login-token.js.map

@@ -1 +1 @@
-{"version":3,"file":"used-direct-login-token.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/used-direct-login-token.ts"],"names":[],"mappings":";;;AAqBA,4EAkBC;AAtCD,uCAAkC;AAElC,kDAAgD;AAehD;;GAEG;AACH,SAAgB,gCAAgC,CAK9C,UAAyD,EAAE,EAC3D,SAAsB;IAEtB,MAAM,EAAE,aAAa,GAAG,4BAAa,CAAC,IAAkB,EAAE,MAAM,GAAG,iBAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,OAAO,CAAC;IAErG,MAAM,MAAM,GAAG,IAAI,iBAAM,CAAmC;QAC1D,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,aAAa,EAAE;QAC5D,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;KACxC,CAAC,CAAC;IAEH,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IAExD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACU,QAAA,0BAA0B,GAAG,gCAAgC,EAAE,CAAC"}
+{"version":3,"file":"used-direct-login-token.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/used-direct-login-token.ts"],"names":[],"mappings":";;;AAqBA,4EAiBC;AAtCD,uCAAyC;AAGzC,kDAAgD;AAehD;;GAEG;AACH,SAAgB,gCAAgC,CAI9C,UAAyD,EAAE,EAC3D,SAAsB;IAEtB,MAAM,EAAE,aAAa,GAAG,4BAAa,CAAC,IAAkB,EAAE,MAAM,GAAG,iBAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,GAAG,OAAO,CAAC;IAErG,MAAM,UAAU,GAAG;QACjB,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,aAAa,EAAE;QAC5D,KAAK,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;KACxC,CAAC;IAEF,MAAM,MAAM,GAAG,IAAI,iBAAM,CAAC,UAAU,CAAC,CAAC;IACtC,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IACxD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACU,QAAA,0BAA0B,GAAG,gCAAgC,EAAE,CAAC"}

package/src/schemas/user-role.d.ts

@@ -1,6 +1,4 @@
-import { Types } from 'mongoose';
 import { Schema } from 'mongoose';
-import { IUserRoleDocument } from '../documents/user-role';
 import { BaseModelName } from '../enumerations';
 import { IConstants } from '../interfaces';
 /**
@@ -17,16 +15,24 @@ export interface UserRoleSchemaOptions<TModelName extends string = BaseModelName
 /**
  * Factory function to create an extensible user-role schema
  */
-export declare function createUserRoleSchema<TModelName extends string = BaseModelName, TConstants extends IConstants = IConstants, I extends string | Types.ObjectId = Types.ObjectId>(options?: UserRoleSchemaOptions<TModelName>, constants?: TConstants): Schema<IUserRoleDocument<I>>;
+export declare function createUserRoleSchema<TModelName extends string = BaseModelName, TConstants extends IConstants = IConstants>(options?: UserRoleSchemaOptions<TModelName>, constants?: TConstants): Schema;
 /**
  * Default user-role schema with base configuration
  */
-export declare const UserRoleSchema: Schema<IUserRoleDocument<Types.ObjectId>, import("mongoose").Model<IUserRoleDocument<Types.ObjectId>, any, any, any, import("mongoose").Document<unknown, any, IUserRoleDocument<Types.ObjectId>, any, {}> & import("mongoose").Document<Types.ObjectId, any, any, Record<string, any>, {}> & import("dist/packages/digitaldefiance-suite-core-lib/src").IUserRoleBase<Types.ObjectId, Date> & Required<{
-    _id: Types.ObjectId;
-}> & {
-    __v: number;
-}, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, IUserRoleDocument<Types.ObjectId>, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<IUserRoleDocument<Types.ObjectId>>, {}, import("mongoose").ResolveSchemaOptions<import("mongoose").DefaultSchemaOptions>> & import("mongoose").FlatRecord<IUserRoleDocument<Types.ObjectId>> & Required<{
-    _id: Types.ObjectId;
+export declare const UserRoleSchema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}>, {}, import("mongoose").ResolveSchemaOptions<import("mongoose").DefaultSchemaOptions>> & import("mongoose").FlatRecord<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}> & Required<{
+    _id: unknown;
 }> & {
     __v: number;
 }>;

package/src/schemas/user-role.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user-role.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/user-role.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,qBAAqB,CACpC,UAAU,SAAS,MAAM,GAAG,aAAa;IAEzC,oCAAoC;IACpC,aAAa,CAAC,EAAE,UAAU,CAAC;IAC3B,oCAAoC;IACpC,aAAa,CAAC,EAAE,UAAU,CAAC;IAC3B,6BAA6B;IAC7B,MAAM,CAAC,EAAE,GAAG,CAAC;CACd;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,UAAU,SAAS,MAAM,GAAG,aAAa,EAAE,UAAU,SAAS,UAAU,GAAG,UAAU,EAAE,CAAC,SAAS,MAAM,GAAG,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,EAC5K,OAAO,GAAE,qBAAqB,CAAC,UAAU,CAAM,EAC/C,SAAS,CAAC,EAAE,UAAU,GACrB,MAAM,CAAC,iBAAiB,CAAC,CAAC,CAAC,CAAC,CAiD9B;AAED;;GAEG;AACH,eAAO,MAAM,cAAc;;;;;;;;EAAyB,CAAC"}
+{"version":3,"file":"user-role.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/user-role.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAS,MAAM,UAAU,CAAC;AAGzC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAE3C;;GAEG;AACH,MAAM,WAAW,qBAAqB,CACpC,UAAU,SAAS,MAAM,GAAG,aAAa;IAEzC,oCAAoC;IACpC,aAAa,CAAC,EAAE,UAAU,CAAC;IAC3B,oCAAoC;IACpC,aAAa,CAAC,EAAE,UAAU,CAAC;IAC3B,6BAA6B;IAC7B,MAAM,CAAC,EAAE,GAAG,CAAC;CACd;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAClC,UAAU,SAAS,MAAM,GAAG,aAAa,EACzC,UAAU,SAAS,UAAU,GAAG,UAAU,EAE1C,OAAO,GAAE,qBAAqB,CAAC,UAAU,CAAM,EAC/C,SAAS,CAAC,EAAE,UAAU,GACrB,MAAM,CA8CR;AAED;;GAEG;AACH,eAAO,MAAM,cAAc;;;;;;;;;;;;;;;;EAAyB,CAAC"}

package/src/schemas/user-role.js

@@ -9,7 +9,7 @@ const enumerations_1 = require("../enumerations");
  */
 function createUserRoleSchema(options = {}, constants) {
     const { userModelName = enumerations_1.BaseModelName.User, roleModelName = enumerations_1.BaseModelName.Role, idType = mongoose_1.Schema.Types.ObjectId, } = options;
-    const schema = new mongoose_1.Schema({
+    const definition = {
         userId: {
             type: idType,
             ref: userModelName,
@@ -41,7 +41,8 @@ function createUserRoleSchema(options = {}, constants) {
             required: false,
             optional: true,
         },
-    }, { timestamps: true });
+    };
+    const schema = new mongoose_1.Schema(definition, { timestamps: true });
     schema.index({ userId: 1, roleId: 1 }, { unique: true });
     schema.index({ userId: 1 });
     schema.index({ roleId: 1 });

package/src/schemas/user-role.js.map

@@ -1 +1 @@
-{"version":3,"file":"user-role.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/user-role.ts"],"names":[],"mappings":";;;AAuBA,oDAoDC;AA1ED,uCAAkC;AAElC,kDAAgD;AAiBhD;;GAEG;AACH,SAAgB,oBAAoB,CAClC,UAA6C,EAAE,EAC/C,SAAsB;IAEtB,MAAM,EACJ,aAAa,GAAG,4BAAa,CAAC,IAAkB,EAChD,aAAa,GAAG,4BAAa,CAAC,IAAkB,EAChD,MAAM,GAAG,iBAAM,CAAC,KAAK,CAAC,QAAQ,GAC/B,GAAG,OAAO,CAAC;IAEZ,MAAM,MAAM,GAAG,IAAI,iBAAM,CACvB;QACE,MAAM,EAAE;YACN,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,aAAa;YAClB,QAAQ,EAAE,IAAI;SACf;QACD,MAAM,EAAE;YACN,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,aAAa;YAClB,QAAQ,EAAE,IAAI;SACf;QACD,SAAS,EAAE;YACT,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,aAAa;YAClB,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,IAAI;SAChB;QACD,SAAS,EAAE;YACT,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,aAAa;YAClB,QAAQ,EAAE,IAAI;SACf;QACD,SAAS,EAAE;YACT,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,IAAI;SACf;QACD,SAAS,EAAE;YACT,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,aAAa;YAClB,QAAQ,EAAE,KAAK;YACf,QAAQ,EAAE,IAAI;SACf;KACF,EACD,EAAE,UAAU,EAAE,IAAI,EAAE,CACrB,CAAC;IAEF,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IACzD,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;IAC5B,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;IAE5B,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACU,QAAA,cAAc,GAAG,oBAAoB,EAAE,CAAC"}
+{"version":3,"file":"user-role.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/user-role.ts"],"names":[],"mappings":";;;AAuBA,oDAoDC;AA3ED,uCAAyC;AAGzC,kDAAgD;AAiBhD;;GAEG;AACH,SAAgB,oBAAoB,CAIlC,UAA6C,EAAE,EAC/C,SAAsB;IAEtB,MAAM,EACJ,aAAa,GAAG,4BAAa,CAAC,IAAkB,EAChD,aAAa,GAAG,4BAAa,CAAC,IAAkB,EAChD,MAAM,GAAG,iBAAM,CAAC,KAAK,CAAC,QAAQ,GAC/B,GAAG,OAAO,CAAC;IAEZ,MAAM,UAAU,GAAG;QACjB,MAAM,EAAE;YACN,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,aAAa;YAClB,QAAQ,EAAE,IAAI;SACf;QACD,MAAM,EAAE;YACN,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,aAAa;YAClB,QAAQ,EAAE,IAAI;SACf;QACD,SAAS,EAAE;YACT,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,aAAa;YAClB,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,IAAI;SAChB;QACD,SAAS,EAAE;YACT,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,aAAa;YAClB,QAAQ,EAAE,IAAI;SACf;QACD,SAAS,EAAE;YACT,IAAI,EAAE,IAAI;YACV,QAAQ,EAAE,IAAI;SACf;QACD,SAAS,EAAE;YACT,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,aAAa;YAClB,QAAQ,EAAE,KAAK;YACf,QAAQ,EAAE,IAAI;SACf;KACF,CAAC;IAEF,MAAM,MAAM,GAAG,IAAI,iBAAM,CAAC,UAAU,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC,CAAC;IAC5D,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC;IACzD,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;IAC5B,MAAM,CAAC,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC;IAC5B,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;GAEG;AACU,QAAA,cAAc,GAAG,oBAAoB,EAAE,CAAC"}

package/src/schemas/user.d.ts

@@ -1,21 +1,23 @@
-import { Types } from 'mongoose';
-import { AccountStatus } from '@digitaldefiance/suite-core-lib';
 import { Schema } from 'mongoose';
-import { IUserDocument } from '../documents/user';
 import { IConstants } from '../interfaces/constants';
-/**
- * Create a user schema with custom or default constants
- */
-export declare function createUserSchema<T extends IConstants = IConstants, I extends string | Types.ObjectId = Types.ObjectId>(usernameValidationMessage?: () => string, emailValidationMessage?: () => string, timezoneValidationMessage?: () => string, currencyValidationMessage?: () => string, supportedLanguages?: readonly string[], idType?: any, constants?: T): Schema<IUserDocument<string, I>>;
+export declare function createUserSchema<T extends IConstants = IConstants>(usernameValidationMessage?: () => string, emailValidationMessage?: () => string, timezoneValidationMessage?: () => string, currencyValidationMessage?: () => string, supportedLanguages?: readonly string[], idType?: any, constants?: T): Schema;
 /**
  * Default user schema with base configuration
  */
-export declare const UserSchema: Schema<IUserDocument<string, Types.ObjectId>, import("mongoose").Model<IUserDocument<string, Types.ObjectId>, any, any, any, import("mongoose").Document<unknown, any, IUserDocument<string, Types.ObjectId>, any, {}> & import("mongoose").Document<Types.ObjectId, any, any, Record<string, any>, {}> & import("@digitaldefiance/suite-core-lib").IUserBase<Types.ObjectId, Date, string, AccountStatus> & Required<{
-    _id: Types.ObjectId;
-}> & {
-    __v: number;
-}, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, IUserDocument<string, Types.ObjectId>, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<IUserDocument<string, Types.ObjectId>>, {}, import("mongoose").ResolveSchemaOptions<import("mongoose").DefaultSchemaOptions>> & import("mongoose").FlatRecord<IUserDocument<string, Types.ObjectId>> & Required<{
-    _id: Types.ObjectId;
+export declare const UserSchema: Schema<any, import("mongoose").Model<any, any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}>, {}, import("mongoose").ResolveSchemaOptions<import("mongoose").DefaultSchemaOptions>> & import("mongoose").FlatRecord<{
+    [x: number]: unknown;
+    [x: symbol]: unknown;
+    [x: string]: unknown;
+}> & Required<{
+    _id: unknown;
 }> & {
     __v: number;
 }>;

package/src/schemas/user.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAEjC,OAAO,EACL,aAAa,EAGd,MAAM,iCAAiC,CAAC;AAEzC,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGlC,OAAO,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAC;AAElD,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD;;GAEG;AACH,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAAE,CAAC,SAAS,MAAM,GAAG,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,EACpH,yBAAyB,CAAC,EAAE,MAAM,MAAM,EACxC,sBAAsB,CAAC,EAAE,MAAM,MAAM,EACrC,yBAAyB,CAAC,EAAE,MAAM,MAAM,EACxC,yBAAyB,CAAC,EAAE,MAAM,MAAM,EACxC,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,EACtC,MAAM,GAAE,GAA2B,EACnC,SAAS,GAAE,CAAqB,GAC/B,MAAM,CAAC,aAAa,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAuMlC;AAED;;GAEG;AACH,eAAO,MAAM,UAAU;;;;;;;;EAAqB,CAAC"}
+{"version":3,"file":"user.d.ts","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/user.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAS,MAAM,UAAU,CAAC;AAazC,OAAO,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAErD,wBAAgB,gBAAgB,CAAC,CAAC,SAAS,UAAU,GAAG,UAAU,EAChE,yBAAyB,CAAC,EAAE,MAAM,MAAM,EACxC,sBAAsB,CAAC,EAAE,MAAM,MAAM,EACrC,yBAAyB,CAAC,EAAE,MAAM,MAAM,EACxC,yBAAyB,CAAC,EAAE,MAAM,MAAM,EACxC,kBAAkB,CAAC,EAAE,SAAS,MAAM,EAAE,EACtC,MAAM,GAAE,GAA2B,EACnC,SAAS,GAAE,CAAqB,GAC/B,MAAM,CAmMR;AAED;;GAEG;AACH,eAAO,MAAM,UAAU;;;;;;;;;;;;;;;;EAAqB,CAAC"}

package/src/schemas/user.js

@@ -3,21 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserSchema = void 0;
 exports.createUserSchema = createUserSchema;
 const tslib_1 = require("tslib");
+const mongoose_1 = require("mongoose");
 const i18n_lib_1 = require("@digitaldefiance/i18n-lib");
 const suite_core_lib_1 = require("@digitaldefiance/suite-core-lib");
 const currency_codes_1 = require("currency-codes");
-const mongoose_1 = require("mongoose");
 const validator_1 = tslib_1.__importDefault(require("validator"));
 const constants_1 = require("../constants");
 const enumerations_1 = require("../enumerations");
-/**
- * Create a user schema with custom or default constants
- */
 function createUserSchema(usernameValidationMessage, emailValidationMessage, timezoneValidationMessage, currencyValidationMessage, supportedLanguages, idType = mongoose_1.Schema.Types.ObjectId, constants = constants_1.LocalhostConstants) {
-    /**
-     * Schema for users
-     */
-    return new mongoose_1.Schema({
+    const definition = {
         /**
          * The unique identifier for the user
          */
@@ -190,7 +184,8 @@ function createUserSchema(usernameValidationMessage, emailValidationMessage, tim
             ],
             default: [],
         },
-    }, { timestamps: true });
+    };
+    return new mongoose_1.Schema(definition, { timestamps: true });
 }
 /**
  * Default user schema with base configuration

package/src/schemas/user.js.map

@@ -1 +1 @@
-{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/user.ts"],"names":[],"mappings":";;;AAkBA,4CA+MC;;AAhOD,wDAA2E;AAC3E,oEAIyC;AACzC,mDAAuC;AACvC,uCAAkC;AAClC,kEAAkC;AAClC,4CAAkE;AAElE,kDAAgD;AAGhD;;GAEG;AACH,SAAgB,gBAAgB,CAC9B,yBAAwC,EACxC,sBAAqC,EACrC,yBAAwC,EACxC,yBAAwC,EACxC,kBAAsC,EACtC,SAAc,iBAAM,CAAC,KAAK,CAAC,QAAQ,EACnC,YAAe,8BAAiB;IAEhC;;OAEG;IACH,OAAO,IAAI,iBAAM,CACf;QACE;;WAEG;QACH,QAAQ,EAAE;YACR,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE;gBACR,SAAS,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,SAAS,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;gBACzD,OAAO,EACL,yBAAyB;oBACzB,CAAC,GAAG,EAAE,CACJ,IAAA,wCAAuB,EACrB,mCAAkB,CAAC,qCAAqC,CACzD,CAAC;aACP;SACF;QACD;;WAEG;QACH,KAAK,EAAE;YACL,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;YACZ,QAAQ,EAAE;gBACR,SAAS,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,mBAAS,CAAC,OAAO,CAAC,CAAC,CAAC;gBAC9C,OAAO,EACL,sBAAsB;oBACtB,CAAC,CAAC,KAAwB,EAAE,EAAE,CAC5B,IAAA,wCAAuB,EACrB,mCAAkB,CAAC,0BAA0B,EAC7C,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,EAAE,CACvB,CAAC;aACP;SACF;QACD;;WAEG;QACH,SAAS,EAAE;YACT,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,IAAI;SACb;QACD;;WAEG;QACH,QAAQ,EAAE;YACR,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,KAAK;YACd,QAAQ,EAAE;gBACR,SAAS,EAAE,UAAU,CAAS;oBAC5B,OAAO,IAAA,0BAAe,EAAC,CAAC,CAAC,CAAC;gBAC5B,CAAC;gBACD,OAAO,EACL,yBAAyB;oBACzB,CAAC,CAAC,KAAwB,EAAE,EAAE,CAC5B,IAAA,wCAAuB,EACrB,mCAAkB,CAAC,+BAA+B,EAClD,EAAE,QAAQ,EAAE,KAAK,CAAC,KAAK,EAAE,CAC1B,CAAC;aACP;SACF;QACD,QAAQ,EAAE;YACR,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,IAAI;YACd,OAAO,EAAE,KAAK;YACd,QAAQ,EAAE;gBACR,SAAS,EAAE,UAAU,CAAS;oBAC5B,OAAO,IAAA,sBAAK,GAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;gBAC7B,CAAC;gBACD,OAAO,EAAE,yBAAyB,IAAI,CAAC,CAAC,KAAwB,EAAE,EAAE,CAClE,IAAA,wCAAuB,EACrB,mCAAkB,CAAC,+BAA+B,EAClD,EAAE,QAAQ,EAAE,KAAK,CAAC,KAAK,EAAE,CAC1B,CAAC;aACL;SACF;QACD;;WAEG;QACH,YAAY,EAAE;YACZ,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,kBAAkB,IAAI,MAAM,CAAC,MAAM,CAAC,wBAAa,CAAC;YACxD,OAAO,EAAE,wBAAa,CAAC,KAAK;YAC5B,QAAQ,EAAE,IAAI;SACf;QACD;;WAEG;QACH,QAAQ,EAAE;YACR,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,KAAK;YACd,QAAQ,EAAE,IAAI;SACf;QACD;;WAEG;QACH,eAAe,EAAE;YACf,IAAI,EAAE,OAAO;YACb,OAAO,EAAE,IAAI;YACb,QAAQ,EAAE,IAAI;SACf;QACD;;WAEG;QACH,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE;QAC1C;;WAEG;QACH,aAAa,EAAE,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE;QAChD;;WAEG;QACH,aAAa,EAAE;YACb,IAAI,EAAE,MAAM;YACZ,IAAI,EAAE,MAAM,CAAC,MAAM,CAAC,8BAAa,CAAC;YAClC,OAAO,EAAE,8BAAa,CAAC,wBAAwB;SAChD;QACD;;WAEG;QACH,SAAS,EAAE;YACT,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,4BAAa,CAAC,IAAI;YACvB,QAAQ,EAAE,IAAI;YACd,SAAS,EAAE,IAAI;SAChB;QACD;;WAEG;QACH,SAAS,EAAE;YACT,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,4BAAa,CAAC,IAAI;YACvB,QAAQ,EAAE,IAAI;SACf;QACD;;WAEG;QACH,SAAS,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE;QACzC;;WAEG;QACH,SAAS,EAAE;YACT,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,4BAAa,CAAC,IAAI;YACvB,QAAQ,EAAE,IAAI;SACf;QACD;;WAEG;QACH,UAAU,EAAE;YACV,IAAI,EAAE,MAAM;YACZ,GAAG,EAAE,4BAAa,CAAC,QAAQ;YAC3B,QAAQ,EAAE,KAAK;SAChB;QACD;;WAEG;QACH,gBAAgB,EAAE;YAChB,IAAI,EAAE,MAAM;YACZ,QAAQ,EAAE,KAAK;SAChB;QACD;;WAEG;QACH,yBAAyB,EAAE;YACzB,IAAI,EAAE;gBACJ,IAAI,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;gBACtC,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;gBACpC,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;gBACzC,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;gBAC5C,UAAU,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;aAC7C;YACD,QAAQ,EAAE,KAAK;SAChB;QACD;;WAEG;QACH,WAAW,EAAE;YACX,IAAI,EAAE;gBACJ;oBACE,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;oBACzC,YAAY,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;oBAC9C,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;oBAC1C,SAAS,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE;iBAC5C;aACF;YACD,OAAO,EAAE,EAAE;SACZ;KACF,EACD,EAAE,UAAU,EAAE,IAAI,EAAE,CACrB,CAAC;AACJ,CAAC;AAED;;GAEG;AACU,QAAA,UAAU,GAAG,gBAAgB,EAAE,CAAC"}
+{"version":3,"file":"user.js","sourceRoot":"","sources":["../../../../../packages/digitaldefiance-node-express-suite/src/schemas/user.ts"],"names":[],"mappings":"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"}