npm - @lenne.tech/nest-server - Versions diffs - 12.0.0 → 12.1.0 - Mend

@lenne.tech/nest-server 12.0.0 → 12.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (693) hide show

package/dist/core/modules/file/core-file.service.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import { Logger } from '@nestjs/common';
-import { type Connection, mongo, Types } from 'mongoose';
+import type { Connection } from 'mongoose';
+import type { mongo, Types } from 'mongoose';
 import { Readable } from 'stream';
 import { FilterArgs } from '../../common/args/filter.args.js';
 import { ConfigService } from '../../common/services/config.service.js';
@@ -9,6 +10,7 @@ import { CoreFileInfo } from './core-file-info.model.js';
 import { FileServiceOptions } from './interfaces/file-service-options.interface.js';
 import { FileUploadSource } from './interfaces/file-upload.interface.js';
 import { FileStorageDriver, FileStorageResolution } from './file-storage.helper.js';
+import type { FileCollection } from './file-metadata.helper.js';
 import { FilesystemFileInfo } from './filesystem-file.helper.js';
 import { S3FileInfo } from './s3-file.helper.js';
 export type FileInputCheckType = 'file' | 'filename' | 'files' | 'filterArgs' | 'id';
@@ -20,8 +22,8 @@ export declare abstract class CoreFileService {
     protected readonly connection: Connection;
     protected readonly options?: CoreFileServiceOptions;
     files: mongo.GridFSBucket;
-    protected s3Files: mongo.Collection<any>;
-    protected filesystemFiles: mongo.Collection<any>;
+    protected get s3Files(): FileCollection;
+    protected get filesystemFiles(): FileCollection;
     protected readonly logger: Logger;
     protected readonly storageResolution: FileStorageResolution;
     protected constructor(connection: Connection, bucketName?: string, options?: CoreFileServiceOptions);

package/dist/core/modules/file/core-file.service.js CHANGED Viewed

@@ -1,33 +1,37 @@
 import { Logger, NotFoundException } from '@nestjs/common';
-import { mongo, Types } from 'mongoose';
 import { accessDeniedException } from '../../common/exceptions/access-denied.exception.js';
 import { getObjectIds, getStringIds } from '../../common/helpers/db.helper.js';
 import { convertFilterArgsToQuery } from '../../common/helpers/filter.helper.js';
 import { GridFSHelper } from '../../common/helpers/gridfs.helper.js';
 import { check } from '../../common/helpers/input.helper.js';
 import { prepareOutput } from '../../common/helpers/service.helper.js';
+import { isWellFormedId } from '../../common/persistence/id-format.js';
 import { ConfigService } from '../../common/services/config.service.js';
 import { RequestContext } from '../../common/services/request-context.service.js';
 import { CoreFileInfo } from './core-file-info.model.js';
 import { decideFileAccess, fileAccessNeedsRawDocument, resolveFileAccessPreset } from './file-access.helper.js';
 import { warnOnUndecidedFileAccess } from './file-roles.config.js';
 import { assertFileStorageAvailable, logFileStorage, resolveFileStorage, } from './file-storage.helper.js';
-import { DEFAULT_FILESYSTEM_DIR, FILESYSTEM_FILES_COLLECTION, FilesystemFileHelper, } from './filesystem-file.helper.js';
-import { S3_FILES_COLLECTION, S3FileHelper } from './s3-file.helper.js';
+import { fileMetadataCollection } from './file-metadata.store.js';
+import { DEFAULT_FILESYSTEM_DIR, FilesystemFileHelper } from './filesystem-file.helper.js';
+import { S3FileHelper } from './s3-file.helper.js';
+import { createGridFsBucket } from '../../common/persistence/mongo/mongoose-compat.js';
 export class CoreFileService {
     connection;
     options;
     files;
-    s3Files;
-    filesystemFiles;
+    get s3Files() {
+        return fileMetadataCollection(this.connection, 's3');
+    }
+    get filesystemFiles() {
+        return fileMetadataCollection(this.connection, 'filesystem');
+    }
     logger = new Logger(CoreFileService.name);
     storageResolution;
     constructor(connection, bucketName = 'fs', options) {
         this.connection = connection;
         this.options = options;
-        this.files = new mongo.GridFSBucket(connection.db, { bucketName });
-        this.s3Files = connection.db.collection(S3_FILES_COLLECTION);
-        this.filesystemFiles = connection.db.collection(FILESYSTEM_FILES_COLLECTION);
+        this.files = connection?.db ? createGridFsBucket(connection.db, { bucketName }) : undefined;
         this.storageResolution = resolveFileStorage(ConfigService.configFastButReadOnly);
         assertFileStorageAvailable(this.storageResolution, this.isStorageAvailable(this.storageResolution.driver));
         logFileStorage(this.storageResolution);
@@ -45,6 +49,9 @@ export class CoreFileService {
         return ConfigService.configFastButReadOnly?.file?.storageDir || DEFAULT_FILESYSTEM_DIR;
     }
     isStorageAvailable(driver) {
+        if (driver === 'gridfs') {
+            return !!this.files;
+        }
         return driver === 's3' ? !!this.options?.s3Service?.enabled : true;
     }
     get s3Storage() {
@@ -54,7 +61,7 @@ export class CoreFileService {
         return this.storageDriver === 'filesystem';
     }
     isMalformedFileId(id) {
-        return typeof id === 'string' && !(id.length === 24 && Types.ObjectId.isValid(id));
+        return typeof id === 'string' && !isWellFormedId(id);
     }
     async findFilesystemFileById(id) {
         return FilesystemFileHelper.findFileById(this.filesystemFiles, getObjectIds(id));

package/dist/core/modules/file/core-file.service.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"core-file.service.js","sourceRoot":"","sources":["../../../../src/core/modules/file/core-file.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAC3D,OAAO,EAAmB,KAAK,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAIzD,OAAO,EAAE,qBAAqB,EAAE,MAAM,oDAAoD,CAAC;AAC3F,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,mCAAmC,CAAC;AAC/E,OAAO,EAAE,wBAAwB,EAAE,MAAM,uCAAuC,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,KAAK,EAAE,MAAM,sCAAsC,CAAC;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,wCAAwC,CAAC;AACvE,OAAO,EAAE,aAAa,EAAE,MAAM,yCAAyC,CAAC;AACxE,OAAO,EAAE,cAAc,EAAE,MAAM,kDAAkD,CAAC;AAGlF,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,uBAAuB,EAAE,MAAM,yBAAyB,CAAC;AAChH,OAAO,EAAE,yBAAyB,EAAE,MAAM,wBAAwB,CAAC;AAGnE,OAAO,EACL,0BAA0B,EAG1B,cAAc,EACd,kBAAkB,GACnB,MAAM,0BAA0B,CAAC;AAClC,OAAO,EACL,sBAAsB,EACtB,2BAA2B,EAC3B,oBAAoB,GAErB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,mBAAmB,EAAE,YAAY,EAAc,MAAM,qBAAqB,CAAC;AAqBpF,MAAM,OAAgB,eAAe;IAmBd;IAEA;IAnBrB,KAAK,CAAqB;IAGhB,OAAO,CAAwB;IAG/B,eAAe,CAAwB;IAE9B,MAAM,GAAG,IAAI,MAAM,CAAC,eAAe,CAAC,IAAI,CAAC,CAAC;IAG1C,iBAAiB,CAAwB;IAK5D,YACqB,UAAsB,EACzC,UAAU,GAAG,IAAI,EACE,OAAgC;QAFhC,eAAU,GAAV,UAAU,CAAY;QAEtB,YAAO,GAAP,OAAO,CAAyB;QAGnD,IAAI,CAAC,KAAK,GAAG,IAAI,KAAK,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC;QACnE,IAAI,CAAC,OAAO,GAAG,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,CAAC;QAC7D,IAAI,CAAC,eAAe,GAAG,UAAU,CAAC,EAAE,CAAC,UAAU,CAAC,2BAA2B,CAAC,CAAC;QAK7E,IAAI,CAAC,iBAAiB,GAAG,kBAAkB,CAAC,aAAa,CAAC,qBAAqB,CAAC,CAAC;QACjF,0BAA0B,CAAC,IAAI,CAAC,iBAAiB,EAAE,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;QAC3G,cAAc,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;QAMvC,MAAM,MAAM,GAAG,aAAa,CAAC,qBAAqB,CAAC;QACnD,yBAAyB,CAAC;YACxB,UAAU,EAAE,MAAM,EAAE,IAAI;YACxB,cAAc,EAAE,IAAI,CAAC,WAAW,KAAK,eAAe,CAAC,SAAS,CAAC,WAAW;YAC1E,mBAAmB,EAAE,CAAC,CAAC,MAAM,EAAE,YAAY,IAAI,MAAM,CAAC,YAAY,CAAC,OAAO,KAAK,KAAK;SACrF,CAAC,CAAC;IACL,CAAC;IASD,IAAc,aAAa;QACzB,OAAO,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC;IACvC,CAAC;IAGD,IAAc,aAAa;QACzB,OAAO,aAAa,CAAC,qBAAqB,EAAE,IAAI,EAAE,UAAU,IAAI,sBAAsB,CAAC;IACzF,CAAC;IASS,kBAAkB,CAAC,MAAyB;QACpD,OAAO,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IACrE,CAAC;IAMD,IAAc,SAAS;QACrB,OAAO,IAAI,CAAC,aAAa,KAAK,IAAI,CAAC;IACrC,CAAC;IAGD,IAAc,iBAAiB;QAC7B,OAAO,IAAI,CAAC,aAAa,KAAK,YAAY,CAAC;IAC7C,CAAC;IAaS,iBAAiB,CAAC,EAAW;QACrC,OAAO,OAAO,EAAE,KAAK,QAAQ,IAAI,CAAC,CAAC,EAAE,CAAC,MAAM,KAAK,EAAE,IAAI,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;IACrF,CAAC;IAKS,KAAK,CAAC,sBAAsB,CAAC,EAA2B;QAChE,OAAO,oBAAoB,CAAC,YAAY,CAAC,IAAI,CAAC,eAAe,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC;IACnF,CAAC;IAKS,KAAK,CAAC,wBAAwB,CAAC,QAAgB;QACvD,OAAO,oBAAoB,CAAC,cAAc,CAAC,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;IAC7E,CAAC;IAKD,KAAK,CAAC,UAAU,CAAC,IAAoC,EAAE,cAAmC;QACxF,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,EAAE,GAAG,cAAc,EAAE,cAAc,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC;YACnF,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,EAAE,gBAAgB,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,MAAM,IAAI,CAAC;QAClE,MAAM,UAAU,GAAG,gBAAgB,EAAE,CAAC;QAItC,MAAM,QAAQ,GAAG,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,CAAC;QACrD,IAAI,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAC3B,MAAM,UAAU,GAAG,MAAM,oBAAoB,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,eAAe,EAAE;gBAChG,IAAI,EAAE,UAAU;gBAChB,WAAW,EAAE,QAAQ;gBACrB,QAAQ;gBACR,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAClC,CAAC,CAAC;YACH,OAAO,IAAI,CAAC,aAAa,CAAC,UAAqC,EAAE,cAAc,CAAC,CAAC;QACnF,CAAC;QACD,IAAI,IAAI,CAAC,aAAa,KAAK,IAAI,EAAE,CAAC;YAYhC,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE;gBACpF,IAAI,EAAE,UAAU;gBAChB,aAAa,EAAE,IAAI;gBACnB,WAAW,EAAE,QAAQ;gBACrB,QAAQ;gBACR,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aAClC,CAAC,CAAC;YACH,OAAO,IAAI,CAAC,aAAa,CAAC,UAAqC,EAAE,cAAc,CAAC,CAAC;QACnF,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,YAAY,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,EAAE;YAC9E,WAAW,EAAE,QAAQ;YACrB,QAAQ;YACR,GAAG,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SAClC,CAAC,CAAC;QACH,OAAO,IAAI,CAAC,aAAa,CAAC,QAAmC,EAAE,cAAc,CAAC,CAAC;IACjF,CAAC;IAKD,KAAK,CAAC,WAAW,CACf,KAAuC,EACvC,cAAmC;QAEnC,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,EAAE,GAAG,cAAc,EAAE,cAAc,EAAE,OAAO,EAAE,CAAC,CAAC,EAAE,CAAC;YACrF,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,QAAQ,GAA4B,EAAE,CAAC;QAC7C,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC,CAAC;QACvD,CAAC;QACD,OAAO,MAAM,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACrC,CAAC;IA4BD,KAAK,CAAC,eAAe,CAAC,IAAY,EAAE,OAAe,EAAE,cAAmC;QACtF,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,IAAI,EAAE,cAAc,CAAC,CAAC;QAClE,IAAI,CAAC,MAAM,EAAE,CAAC;YACZ,MAAM,IAAI,iBAAiB,CAAC,gCAAgC,IAAI,EAAE,CAAC,CAAC;QACtE,CAAC;QACD,OAAO,IAAI,CAAC,aAAa,CAAC,MAAM,EAAE,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,mBAAmB,CAAC,IAAI,EAAE,cAAc,CAAC,EAAE,cAAc,CAAC,CAAC;IACnH,CAAC;IAUD,KAAK,CAAC,aAAa,CAAC,EAA2B,EAAE,cAAmC;QAClF,IAAI,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,iBAAiB,CAAC,0BAA0B,EAAE,EAAE,CAAC,CAAC;QAC9D,CAAC;QACD,MAAM,QAAQ,GAAG,YAAY,CAAC,EAAE,CAAC,CAAC;QAClC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAChE,IAAI,CAAC,MAAM,EAAE,CAAC;YAIZ,MAAM,IAAI,iBAAiB,CAAC,0BAA0B,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAClF,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,aAAa,CACnC,MAAM,EACN,MAAM,CAAC,QAAQ,EACf,GAAG,EAAE,CAAC,IAAI,CAAC,aAAa,CAAC,QAAQ,EAAE,cAAc,CAAC,EAClD,cAAc,CACf,CAAC;QACF,OAAO,IAAI,CAAC,EAAE,CAAC;IACjB,CAAC;IAWS,KAAK,CAAC,aAAa,CAC3B,MAAoB,EACpB,OAAe,EACf,gBAAyC,EACzC,cAAmC;QAEnC,MAAM,MAAM,GAAG,MAAM,gBAAgB,EAAE,CAAC;QACxC,IAAI,CAAC,MAAM,EAAE,CAAC;YAGZ,MAAM,IAAI,iBAAiB,CAAC,gCAAgC,MAAM,CAAC,QAAQ,EAAE,CAAC,CAAC;QACjF,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,UAAU,CAChC;YACE,gBAAgB,EAAE,GAAG,EAAE,CAAC,MAAM;YAC9B,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE,MAAM,CAAC,WAAW,IAAI,0BAA0B;SAC3D,EACD,cAAc,CACf,CAAC;QAEF,IAAI,CAAC,IAAI,EAAE,CAAC;YAIV,MAAM,CAAC,OAAO,EAAE,EAAE,CAAC;YACnB,MAAM,qBAAqB,CAAC,cAAc,EAAE,WAAW,CAAC,CAAC;QAC3D,CAAC;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAKD,KAAK,CAAC,YAAY,CAAC,UAAuB,EAAE,cAAmC;QAC7E,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,UAAU,EAAE,EAAE,GAAG,cAAc,EAAE,cAAc,EAAE,YAAY,EAAE,CAAC,CAAC,EAAE,CAAC;YAC/F,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,WAAW,GAAG,wBAAwB,CAAC,UAAU,CAAC,CAAC;QACzD,IAAI,IAAI,CAAC,aAAa,KAAK,QAAQ,EAAE,CAAC;YAGpC,MAAM,IAAI,GAAG,MAAM,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC;YACtF,OAAO,IAAI,CAAC,aAAa,CAAC,IAAiC,EAAE,cAAc,CAAC,CAAC;QAC/E,CAAC;QAOD,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,IAAI,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC,IAAI,EAAE,CAAsC,CAAC;QAC7F,MAAM,UAAU,GAAG,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC;QACzE,MAAM,WAAW,GAAG,UAAU,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,KAAK,EAAE,UAAU,EAAE,CAAC;QAErF,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC/C,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC;YACjE,oBAAoB,CAAC,SAAS,CAAC,IAAI,CAAC,eAAe,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC;YACjF,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC,CAAC,EAAE,WAAW,CAAC;SAChE,CAAC,CAAC;QAOH,MAAM,MAAM,GAAG,IAAI,CAAC,kBAAkB,CAAC,CAAC,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE,GAAG,IAAI,CAAC,EAAG,IAAuB,CAAC,IAAI,CAAC,CAAC;QACvG,MAAM,KAAK,GAAG,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,CAAC,GAAG,KAAK,CAAC,CAAC;QAC3G,OAAO,IAAI,CAAC,aAAa,CAAC,KAAkC,EAAE,cAAc,CAAC,CAAC;IAChF,CAAC;IAUS,kBAAkB,CAAgC,IAAS,EAAE,IAA0B;QAC/F,MAAM,IAAI,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,SAAS,CAAC,EAAE,EAAE,CAAC,SAAS,KAAK,CAAC,IAAI,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC;QACvG,MAAM,SAAS,GAAuB,IAAI,CAAC,MAAM,CAAC,CAAC,CAAE,IAA2B,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC;QACxG,OAAO,CAAC,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YAC7B,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,SAAS,EAAE,CAAC;gBAC3C,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;gBAC1C,MAAM,KAAK,GAAG,IAAI,CAAC,aAAa,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;gBAC3C,IAAI,IAAI,KAAK,KAAK,EAAE,CAAC;oBACnB,SAAS;gBACX,CAAC;gBAGD,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,IAAI,EAAE,CAAC;oBACxC,OAAO,CAAC,CAAC;gBACX,CAAC;gBACD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;oBAC1C,OAAO,CAAC,CAAC,CAAC;gBACZ,CAAC;gBACD,OAAO,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC;YAC/C,CAAC;YACD,OAAO,CAAC,CAAC;QACX,CAAC,CAAC,CAAC;IACL,CAAC;IAeS,aAAa,CAAC,GAAwB,EAAE,KAAa;QAC7D,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACzB,OAAO,GAAG,EAAE,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;QACD,IAAI,OAAO,GAAQ,GAAG,CAAC;QACvB,KAAK,MAAM,OAAO,IAAI,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,CAAC;YACvC,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,OAAO,KAAK,QAAQ,EAAE,CAAC;gBAC7E,OAAO,SAAS,CAAC;YACnB,CAAC;YACD,OAAO,GAAG,OAAO,CAAC,OAAO,CAAC,CAAC;QAC7B,CAAC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAKD,KAAK,CAAC,WAAW,CAAC,EAA2B,EAAE,cAAmC;QAChF,IAAI,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,cAAc,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;YAC/E,OAAO,IAAI,CAAC;QACd,CAAC;QAGD,MAAM,QAAQ,GACZ,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;YAC/B,CAAC,MAAM,IAAI,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;YACvC,CAAC,MAAM,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAClE,OAAO,IAAI,CAAC,aAAa,CAAC,QAAmC,EAAE,cAAc,CAAC,CAAC;IACjF,CAAC;IAKD,KAAK,CAAC,iBAAiB,CAAC,QAAgB,EAAE,cAAmC;QAC3E,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,GAAG,cAAc,EAAE,cAAc,EAAE,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC;YAC3F,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,QAAQ,GACZ,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YACvC,CAAC,MAAM,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,CAAC;YAC/C,CAAC,MAAM,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC5D,OAAO,IAAI,CAAC,aAAa,CAAC,QAAmC,EAAE,cAAc,CAAC,CAAC;IACjF,CAAC;IAKD,KAAK,CAAC,aAAa,CACjB,EAA2B,EAC3B,cAAmC,EACnC,UAA8B;QAE9B,IAAI,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,cAAc,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;YAC/E,OAAO,IAAI,CAAC;QACd,CAAC;QAMD,MAAM,KAAK,GAAG,UAAU,IAAI,CAAC,MAAM,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC;QACxD,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;YACnB,OAAO,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAC5D,CAAC;QACD,IAAI,KAAK,KAAK,YAAY,EAAE,CAAC;YAC3B,OAAO,oBAAoB,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QAChE,CAAC;QACD,OAAO,YAAY,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE,CAAC,CAAiC,CAAC;IACvG,CAAC;IASS,KAAK,CAAC,UAAU,CAAC,EAA2B;QACpD,IAAI,MAAM,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC;YAClC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,MAAM,IAAI,CAAC,sBAAsB,CAAC,EAAE,CAAC,EAAE,CAAC;YAC1C,OAAO,YAAY,CAAC;QACtB,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAmBD,KAAK,CAAC,WAAW,CACf,EAA2B,EAC3B,cAAmC;QAEnC,IAAI,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,cAAc,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;YAC/E,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QAC7C,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC,aAAa,CAAC,MAAiC,EAAE,cAAc,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC;QAC5G,CAAC;QAED,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;QACrD,IAAI,MAAM,EAAE,CAAC;YAOX,OAAO;gBACL,IAAI,EAAE,MAAM,IAAI,CAAC,aAAa,CAAC,MAAiC,EAAE,cAAc,CAAC;gBACjF,KAAK,EAAE,YAAY;aACpB,CAAC;QACJ,CAAC;QAED,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC;QACjF,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,EAAE,IAAI,EAAE,MAAM,IAAI,CAAC,aAAa,CAAC,UAAqC,EAAE,cAAc,CAAC,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC;IACpH,CAAC;IAQD,KAAK,CAAC,cAAc,CAAC,EAA2B,EAAE,cAAmC;QACnF,IAAI,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,CAAC;YAC/B,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,cAAc,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;YAC/E,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;QAC/C,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,uBAAuB,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,WAAW,EAAE,EAAE,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAC3G,CAAC;IAeD,KAAK,CAAC,mBAAmB,CAAC,QAAgB,EAAE,cAAmC;QAC7E,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,GAAG,cAAc,EAAE,cAAc,EAAE,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC;YAC3F,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACzD,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;QACxE,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,CAAC;QACjE,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,oBAAoB,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;QAC5E,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC3E,IAAI,CAAC,UAAU,EAAE,CAAC;YAGhB,OAAO,YAAY,CAAC,wBAAwB,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACrE,CAAC;QACD,OAAO,YAAY,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;IACrE,CAAC;IAKD,KAAK,CAAC,SAAS,CAAC,EAA2B,EAAE,cAAmC;QAC9E,IAAI,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,cAAc,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;YAC/E,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,MAAM,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,EAAE,CAAC;YAClC,OAAO,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;QAC5D,CAAC;QACD,IAAI,MAAM,IAAI,CAAC,sBAAsB,CAAC,EAAE,CAAC,EAAE,CAAC;YAC1C,OAAO,oBAAoB,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QAChE,CAAC;QACD,OAAO,MAAM,YAAY,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,YAAY,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACpF,CAAC;IAKD,KAAK,CAAC,eAAe,CAAC,QAAgB,EAAE,cAAmC;QACzE,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,GAAG,cAAc,EAAE,cAAc,EAAE,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC;YAC3F,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;QACzD,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,YAAY,CAAC,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;QACxE,CAAC;QACD,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,CAAC;QACjE,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,oBAAoB,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,GAAG,CAAC,CAAC;QAC5E,CAAC;QAID,MAAM,UAAU,GAAG,MAAM,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC3E,IAAI,CAAC,UAAU,EAAE,CAAC;YAChB,OAAO,MAAM,YAAY,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,QAAQ,EAAE,CAAC,CAAC;QACvE,CAAC;QACD,OAAO,MAAM,YAAY,CAAC,gBAAgB,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,GAAG,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,CAAC;IAClF,CAAC;IAgBD,KAAK,CAAC,UAAU,CAAC,EAA2B,EAAE,cAAmC;QAC/E,IAAI,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,CAAC;YAC/B,MAAM,IAAI,iBAAiB,CAAC,0BAA0B,EAAE,EAAE,CAAC,CAAC;QAC9D,CAAC;QACD,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,EAAE,EAAE,EAAE,GAAG,cAAc,EAAE,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC;YAC/E,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,QAAQ,GAAG,YAAY,CAAC,EAAE,CAAC,CAAC;QAClC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QAClE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,iBAAiB,CAAC,0BAA0B,YAAY,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QAClF,CAAC;QACD,IAAI,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;YACxC,MAAM,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;YAC9E,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,IAAI,MAAM,IAAI,CAAC,sBAAsB,CAAC,QAAQ,CAAC,EAAE,CAAC;YAChD,MAAM,oBAAoB,CAAC,UAAU,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,eAAe,EAAE,QAAQ,CAAC,CAAC;YAC1F,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,MAAM,YAAY,CAAC,UAAU,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACpD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAKD,KAAK,CAAC,gBAAgB,CAAC,QAAgB,EAAE,cAAmC;QAC1E,IAAI,CAAC,CAAC,MAAM,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,EAAE,GAAG,cAAc,EAAE,cAAc,EAAE,UAAU,EAAE,CAAC,CAAC,EAAE,CAAC;YAC3F,OAAO,IAAI,CAAC;QACd,CAAC;QAOD,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;QACxE,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,MAAM,IAAI,iBAAiB,CAAC,gCAAgC,QAAQ,EAAE,CAAC,CAAC;QAC1E,CAAC;QACD,OAAO,MAAM,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,EAAE,cAAc,CAAC,CAAC;IAC5D,CAAC;IAgBS,KAAK,CAAC,cAAc,CAAC,EAA2B;QACxD,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC;YACnC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,OAAO,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC;IACnE,CAAC;IAQS,KAAK,CAAC,gBAAgB,CAAC,QAAgB;QAC/C,IAAI,CAAC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC;YACnC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,OAAO,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC7D,CAAC;IAuBS,KAAK,CAAC,cAAc,CAAC,EAA2B;QACxD,IAAI,IAAI,CAAC,iBAAiB,CAAC,EAAE,CAAC,EAAE,CAAC;YAC/B,OAAO,IAAI,CAAC;QACd,CAAC;QACD,MAAM,QAAQ,GACZ,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC,CAAC;YAC/B,CAAC,MAAM,IAAI,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAC;YACvC,CAAC,MAAM,YAAY,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,EAAE,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;QAClE,OAAQ,QAA2C,IAAI,IAAI,CAAC;IAC9D,CAAC;IAUS,KAAK,CAAC,oBAAoB,CAAC,QAAgB;QAOnD,MAAM,QAAQ,GACZ,CAAC,MAAM,IAAI,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;YACvC,CAAC,MAAM,IAAI,CAAC,wBAAwB,CAAC,QAAQ,CAAC,CAAC;YAC/C,CAAC,MAAM,YAAY,CAAC,cAAc,CAAC,IAAI,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC5D,OAAQ,QAA2C,IAAI,IAAI,CAAC;IAC9D,CAAC;IAiHS,cAAc,CAAC,cAAmC;QAC1D,MAAM,MAAM,GAAG,uBAAuB,CAAC,aAAa,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC;QAClF,IAAI,MAAM,KAAK,OAAO,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;YAC9C,OAAO,cAAc,EAAE,QAAQ,CAAC;QAClC,CAAC;QAED,MAAM,OAAO,GAAwB,EAAE,GAAG,cAAc,EAAE,QAAQ,EAAE,CAAC;QACrE,MAAM,OAAO,GAAG,cAAc,EAAE,WAAW,EAAE,EAAE,CAAC;QAChD,IAAI,OAAO,CAAC,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI,IAAI,OAAO,KAAK,EAAE,EAAE,CAAC;YACjG,OAAO,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;QACpC,CAAC;QACD,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;YAExB,MAAM,QAAQ,GAAG,cAAc,CAAC,GAAG,EAAE,EAAE,QAAQ,CAAC;YAChD,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS,IAAI,QAAQ,EAAE,CAAC;gBAC/C,OAAO,CAAC,QAAQ,GAAG,QAAQ,CAAC;YAC9B,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC;IAC3D,CAAC;IAES,WAAW,CACnB,KAAU,EACV,OAAqE;QAOrE,OAAO,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAClD,CAAC;IAMO,KAAK,CAAC,mBAAmB,CAC/B,KAAU,EACV,OAAqE;QAErE,MAAM,MAAM,GAAG,uBAAuB,CAAC,aAAa,CAAC,qBAAqB,EAAE,IAAI,CAAC,CAAC;QAIlF,IAAI,MAAM,KAAK,QAAQ,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC;QACd,CAAC;QAMD,MAAM,GAAG,GACP,CAAC,OAAO,EAAE,KAAK,IAAI,0BAA0B,CAAC,MAAM,EAAE,OAAO,EAAE,cAAc,CAAC;YAC5E,CAAC,CAAC,OAAO,EAAE,cAAc,KAAK,IAAI;gBAChC,CAAC,CAAC,MAAM,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC;gBAClC,CAAC,CAAC,MAAM,IAAI,CAAC,oBAAoB,CAAC,KAAK,CAAC;YAC1C,CAAC,CAAC,SAAS,CAAC;QAEhB,OAAO,gBAAgB,CAAC;YACtB,cAAc,EAAE,OAAO,EAAE,cAAc;YACvC,WAAW,EAAE,OAAO,EAAE,WAAW;YACjC,KAAK,EAAE,OAAO,EAAE,KAAK;YACrB,MAAM;YACN,GAAG;YAIH,QAAQ,EAAE,cAAc,CAAC,GAAG,EAAE,EAAE,QAAQ;SACzC,CAAC,CAAC;IACL,CAAC;IAUS,KAAK,CAAC,aAAa,CAC3B,QAA8C,EAC9C,OAA4B;QAE5B,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,OAAO,QAAQ,CAAC;QAClB,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QACrB,MAAM,QAAQ,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC,CAAC;QAC9E,OAAO,KAAK,CAAC,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,EAAE,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,CAAC,CAAC;IAC1E,CAAC;IAKS,KAAK,CAAC,QAAuC;QACrD,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC5B,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBACxB,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;oBAC7B,IAAI,CAAC,EAAE,GAAG,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACnC,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;aAAM,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE,CAAC;YACxC,QAAQ,CAAC,EAAE,GAAG,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;QAC3C,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;CACF"}
1	+ {"version":3,"file":"core-file.service.js","sourceRoot":"","sources":["../../../../src/core/modules/file/core-file.service.ts"],"names":[],"mappings":"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"}

package/dist/core/modules/file/file-metadata.helper.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { mongo, Types } from 'mongoose';
+import type { mongo, Types } from 'mongoose';
 export type FileCollection = mongo.Collection<any>;
 export type FileStorageMarker = 'filesystem' | 's3';
 export interface FileMetadataInfo {

package/dist/core/modules/file/file-metadata.helper.js CHANGED Viewed

@@ -1,6 +1,6 @@
-import { Types } from 'mongoose';
+import { newObjectId } from '../../common/persistence/mongo/mongoose-compat.js';
 export async function findMetadataById(collection, id) {
-    return (await collection.findOne({ _id: new Types.ObjectId(id) }));
+    return (await collection.findOne({ _id: newObjectId(id) }));
 }
 export async function findMetadataByName(collection, filename) {
     return (await collection.findOne({ filename }, { sort: { uploadDate: -1, _id: -1 } }));

package/dist/core/modules/file/file-metadata.helper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"file-metadata.helper.js","sourceRoot":"","sources":["../../../../src/core/modules/file/file-metadata.helper.ts"],"names":[],"mappings":"~~AAAA~~,OAAO,~~EAAS~~,~~KAAK~~,EAAE,MAAM,~~UAAU~~,CAAC;~~AAoExC~~,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,UAA0B,EAC1B,EAA2B;IAE3B,OAAO,CAAC,MAAM,UAAU,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,~~IAAI~~,~~KAAK,~~CAAC,~~QAAQ,CAAC,~~EAAE,CAAC,EAAE,CAAC,CAA4B,CAAC;~~AAChG~~,CAAC;AAeD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,UAA0B,EAC1B,QAAgB;IAIhB,OAAO,CAAC,MAAM,UAAU,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAA4B,CAAC;AACpH,CAAC;AAGD,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,UAA0B,EAC1B,SAAc,EAAE,EAChB,UAAe,EAAE;IAEjB,OAAO,CAAC,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,OAAO,EAAE,CAAuB,CAAC;AAClF,CAAC;AASD,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAU,CAAC;AAuB/C,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,UAA0B;IAClE,MAAM,SAAS,GAAG,GAAG,UAAU,CAAC,MAAM,IAAI,UAAU,CAAC,cAAc,EAAE,CAAC;IACtE,IAAI,oBAAoB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QACxC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,oBAAoB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACpC,IAAI,CAAC;QACH,MAAM,UAAU,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;QAC9C,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,oBAAoB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACvC,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}
1	+ {"version":3,"file":"file-metadata.helper.js","sourceRoot":"","sources":["../../../../src/core/modules/file/file-metadata.helper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,mDAAmD,CAAC;AAuEhF,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACpC,UAA0B,EAC1B,EAA2B;IAE3B,OAAO,CAAC,MAAM,UAAU,CAAC,OAAO,CAAC,EAAE,GAAG,EAAE,WAAW,CAAC,EAAE,CAAC,EAAE,CAAC,CAA4B,CAAC;AACzF,CAAC;AAeD,MAAM,CAAC,KAAK,UAAU,kBAAkB,CACtC,UAA0B,EAC1B,QAAgB;IAIhB,OAAO,CAAC,MAAM,UAAU,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,EAAE,EAAE,IAAI,EAAE,EAAE,UAAU,EAAE,CAAC,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAA4B,CAAC;AACpH,CAAC;AAGD,MAAM,CAAC,KAAK,UAAU,YAAY,CAChC,UAA0B,EAC1B,SAAc,EAAE,EAChB,UAAe,EAAE;IAEjB,OAAO,CAAC,MAAM,UAAU,CAAC,IAAI,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,OAAO,EAAE,CAAuB,CAAC;AAClF,CAAC;AASD,MAAM,oBAAoB,GAAG,IAAI,GAAG,EAAU,CAAC;AAuB/C,MAAM,CAAC,KAAK,UAAU,mBAAmB,CAAC,UAA0B;IAClE,MAAM,SAAS,GAAG,GAAG,UAAU,CAAC,MAAM,IAAI,UAAU,CAAC,cAAc,EAAE,CAAC;IACtE,IAAI,oBAAoB,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC;QACxC,OAAO,IAAI,CAAC;IACd,CAAC;IACD,oBAAoB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IACpC,IAAI,CAAC;QACH,MAAM,UAAU,CAAC,WAAW,CAAC,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC,CAAC;QAC9C,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,oBAAoB,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACvC,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC"}

package/dist/core/modules/file/file-metadata.models.d.ts ADDED Viewed

@@ -0,0 +1,35 @@
+import type { Schema } from 'mongoose';
+export declare const S3_FILE_MODEL = "CoreS3File";
+export declare const FILESYSTEM_FILE_MODEL = "CoreFilesystemFile";
+export declare const FILE_METADATA_MODELS: {
+    name: string;
+    schema: Schema<any, import("mongoose").Model<any, any, any, any, any, any, any>, {}, {}, {}, {}, import("mongoose").DefaultSchemaOptions, {
+        [x: number]: unknown;
+        [x: symbol]: unknown;
+        [x: string]: unknown;
+    }, import("mongoose").Document<unknown, {}, {
+        [x: number]: unknown;
+        [x: symbol]: unknown;
+        [x: string]: unknown;
+    }, {
+        id: string;
+    }, import("mongoose").DefaultSchemaOptions> & Omit<{
+        [x: number]: unknown;
+        [x: symbol]: unknown;
+        [x: string]: unknown;
+    } & Required<{
+        _id: unknown;
+    }> & {
+        __v: number;
+    }, "id"> & import("mongoose").HydratedDocumentOverrides<{
+        id: string;
+    }>, unknown, {
+        [x: number]: {};
+        [x: symbol]: {};
+        [x: string]: {};
+    } & Required<{
+        _id: unknown;
+    }> & {
+        __v: number;
+    }>;
+}[];

package/dist/core/modules/file/file-metadata.models.js ADDED Viewed

@@ -0,0 +1,20 @@
+import { createSchema } from '../../common/persistence/mongo/mongoose-compat.js';
+import { FILESYSTEM_FILES_COLLECTION } from './filesystem-file.helper.js';
+import { S3_FILES_COLLECTION } from './s3-file.helper.js';
+export const S3_FILE_MODEL = 'CoreS3File';
+export const FILESYSTEM_FILE_MODEL = 'CoreFilesystemFile';
+function fileMetadataSchema(collection) {
+    return createSchema({
+        contentType: { type: String },
+        filename: { index: true, type: String },
+        length: { type: Number },
+        metadata: { type: Object },
+        storage: { type: String },
+        uploadDate: { type: Date },
+    }, { autoCreate: false, autoIndex: false, collection, versionKey: false });
+}
+export const FILE_METADATA_MODELS = [
+    { name: S3_FILE_MODEL, schema: fileMetadataSchema(S3_FILES_COLLECTION) },
+    { name: FILESYSTEM_FILE_MODEL, schema: fileMetadataSchema(FILESYSTEM_FILES_COLLECTION) },
+];
+//# sourceMappingURL=file-metadata.models.js.map

package/dist/core/modules/file/file-metadata.models.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"file-metadata.models.js","sourceRoot":"","sources":["../../../../src/core/modules/file/file-metadata.models.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,mDAAmD,CAAC;AAEjF,OAAO,EAAE,2BAA2B,EAAE,MAAM,6BAA6B,CAAC;AAC1E,OAAO,EAAE,mBAAmB,EAAE,MAAM,qBAAqB,CAAC;AAc1D,MAAM,CAAC,MAAM,aAAa,GAAG,YAAY,CAAC;AAG1C,MAAM,CAAC,MAAM,qBAAqB,GAAG,oBAAoB,CAAC;AAG1D,SAAS,kBAAkB,CAAC,UAAkB;IAC5C,OAAO,YAAY,CACjB;QACE,WAAW,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;QAC7B,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE;QACvC,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;QACxB,QAAQ,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;QAC1B,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE;QACzB,UAAU,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE;KAC3B,EACD,EAAE,UAAU,EAAE,KAAK,EAAE,SAAS,EAAE,KAAK,EAAE,UAAU,EAAE,UAAU,EAAE,KAAK,EAAE,CACvE,CAAC;AACJ,CAAC;AAGD,MAAM,CAAC,MAAM,oBAAoB,GAAG;IAClC,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,kBAAkB,CAAC,mBAAmB,CAAC,EAAE;IACxE,EAAE,IAAI,EAAE,qBAAqB,EAAE,MAAM,EAAE,kBAAkB,CAAC,2BAA2B,CAAC,EAAE;CACzF,CAAC"}

package/dist/core/modules/file/file-metadata.store.d.ts ADDED Viewed

@@ -0,0 +1,6 @@
+import type { Connection } from 'mongoose';
+import type { DataStore } from '../../common/persistence/data-store.interface.js';
+import type { FileCollection } from './file-metadata.helper.js';
+export type FileMetadataStore = 'filesystem' | 's3';
+export declare function fileMetadataCollection(connection: Connection | null, store: FileMetadataStore): FileCollection;
+export declare function sqlFileCollection(store: DataStore<any>, collectionName: string): FileCollection;

package/dist/core/modules/file/file-metadata.store.js ADDED Viewed

@@ -0,0 +1,77 @@
+import { isObjectIdLike } from '../../common/helpers/id.helper.js';
+import { getRegisteredDataStore, getStoreForModel } from '../../common/persistence/persistence-runtime.registry.js';
+import { UnsupportedCapabilityError } from '../../common/persistence/unsupported-capability.error.js';
+import { FILESYSTEM_FILE_MODEL, S3_FILE_MODEL } from './file-metadata.models.js';
+import { FILESYSTEM_FILES_COLLECTION } from './filesystem-file.helper.js';
+import { S3_FILES_COLLECTION } from './s3-file.helper.js';
+import { newObjectId } from '../../common/persistence/mongo/mongoose-compat.js';
+const STORES = {
+    filesystem: { collection: FILESYSTEM_FILES_COLLECTION, model: FILESYSTEM_FILE_MODEL },
+    s3: { collection: S3_FILES_COLLECTION, model: S3_FILE_MODEL },
+};
+export function fileMetadataCollection(connection, store) {
+    const { collection, model } = STORES[store];
+    const dataStore = connection
+        ? connection.models?.[model]
+            ? getStoreForModel(connection.models[model])
+            : undefined
+        :
+            getRegisteredDataStore(model);
+    if (dataStore && !dataStore.capabilities.mongoosePopulate) {
+        return sqlFileCollection(dataStore, collection);
+    }
+    if (!connection) {
+        throw new UnsupportedCapabilityError(`The ${collection} file metadata has nowhere to go: no MongoDB is configured and no data source routes ${model}`);
+    }
+    return connection.db.collection(collection);
+}
+export function sqlFileCollection(store, collectionName) {
+    const find = async (filter, options = {}) => (await store.find(toWhere(filter ?? {}), toFindOptions(options))).map(toDocument);
+    const collection = {
+        collectionName,
+        countDocuments: async (filter = {}) => store.count(toWhere(filter)),
+        createIndex: async () => 'filename_1',
+        dbName: 'sql',
+        deleteOne: async (filter) => ({
+            acknowledged: true,
+            deletedCount: (await store.deleteOne(toWhere(filter))) ? 1 : 0,
+        }),
+        find: (filter, options) => ({ toArray: () => find(filter, options) }),
+        findOne: async (filter, options) => (await find(filter, { ...options, limit: 1 }))[0] ?? null,
+        insertOne: async (doc) => {
+            const { _id, ...fields } = doc;
+            await store.insert({ ...fields, id: String(_id) });
+            return { acknowledged: true, insertedId: _id };
+        },
+    };
+    return collection;
+}
+function toWhere(value) {
+    if (isObjectIdLike(value)) {
+        return value.toHexString();
+    }
+    if (Array.isArray(value)) {
+        return value.map(toWhere);
+    }
+    if (!value || typeof value !== 'object' || value instanceof Date || value instanceof RegExp) {
+        return value;
+    }
+    return Object.fromEntries(Object.entries(value).map(([key, entry]) => [key === '_id' ? 'id' : key, toWhere(entry)]));
+}
+function toFindOptions(options) {
+    const { collation, limit, skip, sort } = options;
+    return {
+        ...(collation ? { collation } : {}),
+        ...(limit ? { limit } : {}),
+        ...(skip ? { skip } : {}),
+        ...(sort ? { sort: toWhere(sort) } : {}),
+    };
+}
+function toDocument(record) {
+    const { id, ...fields } = record;
+    return {
+        _id: newObjectId(id),
+        ...Object.fromEntries(Object.entries(fields).filter(([, value]) => value !== null && value !== undefined)),
+    };
+}
+//# sourceMappingURL=file-metadata.store.js.map

package/dist/core/modules/file/file-metadata.store.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"file-metadata.store.js","sourceRoot":"","sources":["../../../../src/core/modules/file/file-metadata.store.ts"],"names":[],"mappings":"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"}

package/dist/core/modules/file/file-storage.helper.d.ts CHANGED Viewed

@@ -8,6 +8,7 @@ export interface FileStorageResolution {
 }
 export declare function hasUsableS3Config(config?: Partial<IServerOptions>): boolean;
 export declare function hasDatabaseConfig(config?: Partial<IServerOptions>): boolean;
+export declare function fileMetadataSqlSource(config?: Partial<IServerOptions>): string | undefined;
 export declare function resolveFileStorage(config?: Partial<IServerOptions>): FileStorageResolution;
 export declare function assertFileStorageAvailable(resolution: FileStorageResolution, available: boolean): void;
 export declare function logFileStorage(resolution: FileStorageResolution): void;

package/dist/core/modules/file/file-storage.helper.js CHANGED Viewed

@@ -1,4 +1,6 @@
 import { Logger } from '@nestjs/common';
+import { resolveDataSources, resolveModelSource } from '../../common/persistence/data-source.config.js';
+import { FILESYSTEM_FILE_MODEL } from './file-metadata.models.js';
 const logger = new Logger('CoreFileStorage');
 export const FILE_STORAGE_DRIVERS = ['filesystem', 'gridfs', 's3'];
 export function hasUsableS3Config(config) {
@@ -11,6 +13,23 @@ export function hasUsableS3Config(config) {
 export function hasDatabaseConfig(config) {
     return !!config?.mongoose?.uri;
 }
+export function fileMetadataSqlSource(config) {
+    if (!config?.database) {
+        return undefined;
+    }
+    try {
+        const resolved = resolveDataSources({
+            database: config.database,
+            explicitMongoose: !!config.mongoose,
+            mongooseUri: config.mongoose?.uri,
+        });
+        const source = resolveModelSource(resolved, FILESYSTEM_FILE_MODEL);
+        return source && resolved.sources[source]?.driver !== 'mongodb' ? source : undefined;
+    }
+    catch {
+        return undefined;
+    }
+}
 export function resolveFileStorage(config) {
     const configured = config?.file?.storage;
     if (configured !== undefined) {
@@ -27,6 +46,21 @@ export function resolveFileStorage(config) {
     if (hasUsableS3Config(config)) {
         return { driver: 's3', explicit: false, reason: 's3.bucket is configured' };
     }
+    if (config?.database === false) {
+        return {
+            driver: 'filesystem',
+            explicit: false,
+            reason: 'the project runs without a database (`database: false`) — file metadata has nowhere to go',
+        };
+    }
+    const sqlSource = fileMetadataSqlSource(config);
+    if (sqlSource) {
+        return {
+            driver: 'filesystem',
+            explicit: false,
+            reason: `no S3 bucket is configured and the file metadata lives in the SQL source "${sqlSource}"`,
+        };
+    }
     if (hasDatabaseConfig(config)) {
         return { driver: 'gridfs', explicit: false, reason: 'a database is configured and no S3 bucket is' };
     }

package/dist/core/modules/file/file-storage.helper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"file-storage.helper.js","sourceRoot":"","sources":["../../../../src/core/modules/file/file-storage.helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;~~AAIxC~~,MAAM,MAAM,GAAG,IAAI,MAAM,CAAC,iBAAiB,CAAC,CAAC;AAa7C,MAAM,CAAC,MAAM,oBAAoB,GAAwB,CAAC,YAAY,EAAE,QAAQ,EAAE,IAAI,CAAC,CAAC;AAsBxF,MAAM,UAAU,iBAAiB,CAAC,MAAgC;IAChE,MAAM,EAAE,GAAG,MAAM,EAAE,EAAE,CAAC;IACtB,IAAI,CAAC,EAAE,IAAI,OAAO,EAAE,KAAK,QAAQ,IAAK,EAA4B,CAAC,OAAO,KAAK,KAAK,EAAE,CAAC;QACrF,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,CAAC,CAAE,EAA0B,CAAC,MAAM,CAAC;AAC9C,CAAC;AAWD,MAAM,UAAU,iBAAiB,CAAC,MAAgC;IAChE,OAAO,CAAC,CAAC,MAAM,EAAE,QAAQ,EAAE,GAAG,CAAC;AACjC,CAAC;~~AAoBD~~,MAAM,UAAU,kBAAkB,CAAC,MAAgC;IACjE,MAAM,UAAU,GAAG,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC;IAEzC,IAAI,UAAU,KAAK,SAAS,EAAE,CAAC;QAC7B,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,UAA+B,CAAC,EAAE,CAAC;YACpE,MAAM,IAAI,KAAK,CACb,yBAAyB,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,IAAI;gBACrD,mBAAmB,oBAAoB,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAC7E,CAAC;QACJ,CAAC;QACD,OAAO;YACL,MAAM,EAAE,UAA+B;YACvC,QAAQ,EAAE,IAAI;YACd,MAAM,EAAE,2BAA2B,UAAU,GAAG;SACjD,CAAC;IACJ,CAAC;IAED,IAAI,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC;QAC9B,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,yBAAyB,EAAE,CAAC;IAC9E,CAAC;IAED,IAAI,iBAAiB,CAAC,MAAM,CAAC,EAAE,CAAC;QAC9B,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,MAAM,EAAE,8CAA8C,EAAE,CAAC;IACvG,CAAC;IAED,OAAO;QACL,MAAM,EAAE,YAAY;QACpB,QAAQ,EAAE,KAAK;QACf,MAAM,EAAE,mDAAmD;KAC5D,CAAC;AACJ,CAAC;AAqBD,MAAM,UAAU,0BAA0B,CAAC,UAAiC,EAAE,SAAkB;IAC9F,IAAI,SAAS,EAAE,CAAC;QACd,OAAO;IACT,CAAC;IAED,IAAI,CAAC,UAAU,CAAC,QAAQ,EAAE,CAAC;QAMzB,MAAM,IAAI,KAAK,CACb,iBAAiB,UAAU,CAAC,MAAM,iCAAiC,UAAU,CAAC,MAAM,0BAA0B;YAC5G,4GAA4G;YAC5G,mFAAmF,CACtF,CAAC;IACJ,CAAC;IAED,MAAM,IAAI,GACR,UAAU,CAAC,MAAM,KAAK,IAAI;QACxB,CAAC,CAAC,uHAAuH;QACzH,CAAC,CAAC,oCAAoC,UAAU,CAAC,MAAM,mDAAmD,CAAC;IAE/G,MAAM,IAAI,KAAK,CAAC,2BAA2B,UAAU,CAAC,MAAM,yCAAyC,IAAI,EAAE,CAAC,CAAC;AAC/G,CAAC;AAMD,MAAM,UAAU,cAAc,CAAC,UAAiC;IAC9D,MAAM,GAAG,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,WAAW,CAAC;IAC7D,MAAM,CAAC,GAAG,CAAC,iBAAiB,UAAU,CAAC,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,MAAM,GAAG,CAAC,CAAC;AACnF,CAAC"}
1	+ {"version":3,"file":"file-storage.helper.js","sourceRoot":"","sources":["../../../../src/core/modules/file/file-storage.helper.ts"],"names":[],"mappings":"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"}

package/dist/core/modules/file/filesystem-file.helper.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { Types } from 'mongoose';
+import type { Types } from 'mongoose';
 import { Readable } from 'stream';
 import { FileCollection, FileMetadataInfo } from './file-metadata.helper.js';
 export declare const FILESYSTEM_FILES_COLLECTION = "filesystem-files";

package/dist/core/modules/file/filesystem-file.helper.js CHANGED Viewed

@@ -1,20 +1,20 @@
 import { createReadStream, createWriteStream } from 'fs';
 import { mkdir, rm, stat } from 'fs/promises';
-import { Types } from 'mongoose';
 import * as path from 'path';
 import { pipeline } from 'stream/promises';
 import { Readable } from 'stream';
 import { ensureFilenameIndex, findMetadata, findMetadataById, findMetadataByName, } from './file-metadata.helper.js';
 import { streamToBuffer } from './s3-file.helper.js';
+import { newObjectId } from '../../common/persistence/mongo/mongoose-compat.js';
 export const FILESYSTEM_FILES_COLLECTION = 'filesystem-files';
 export const DEFAULT_FILESYSTEM_DIR = 'uploads/files';
 export class FilesystemFileHelper {
     static filePath(directory, id) {
-        const objectId = typeof id === 'string' ? new Types.ObjectId(id) : id;
+        const objectId = typeof id === 'string' ? newObjectId(id) : id;
         return path.join(path.resolve(directory), objectId.toHexString());
     }
     static async writeFile(directory, collection, options) {
-        const _id = new Types.ObjectId();
+        const _id = newObjectId();
         const target = FilesystemFileHelper.filePath(directory, _id);
         await mkdir(path.dirname(target), { recursive: true });
         try {
@@ -59,7 +59,7 @@ export class FilesystemFileHelper {
         return findMetadata(collection, filter, options);
     }
     static async deleteFile(directory, collection, id) {
-        const objectId = typeof id === 'string' ? new Types.ObjectId(id) : id;
+        const objectId = typeof id === 'string' ? newObjectId(id) : id;
         await rm(FilesystemFileHelper.filePath(directory, objectId), { force: true });
         await collection.deleteOne({ _id: objectId });
     }

package/dist/core/modules/file/filesystem-file.helper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"filesystem-file.helper.js","sourceRoot":"","sources":["../../../../src/core/modules/file/filesystem-file.helper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,MAAM,IAAI,CAAC;AACzD,OAAO,EAAE,KAAK,EAAE,EAAE,EAAE,IAAI,EAAE,MAAM,aAAa,CAAC;~~AAC9C~~,OAAO,~~EAAE,~~KAAK,~~EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,KAAK,~~IAAI,MAAM,MAAM,CAAC;AAC7B,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,EACL,mBAAmB,EAGnB,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;~~AAGrD~~,MAAM,CAAC,MAAM,2BAA2B,GAAG,kBAAkB,CAAC;AAG9D,MAAM,CAAC,MAAM,sBAAsB,GAAG,eAAe,CAAC;~~AA6BtD~~,MAAM,OAAO,oBAAoB;IAQ/B,MAAM,CAAC,QAAQ,CAAC,SAAiB,EAAE,EAA2B;QAC5D,MAAM,QAAQ,GAAG,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,~~IAAI~~,~~KAAK,~~CAAC,~~QAAQ,CAAC,~~EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;~~QACtE~~,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;IACpE,CAAC;IAaD,MAAM,CAAC,KAAK,CAAC,SAAS,CACpB,SAAiB,EACjB,UAA0B,EAC1B,OAMC;QAED,MAAM,GAAG,GAAG,~~IAAI~~,~~KAAK,CAAC,QAAQ,~~EAAE,CAAC;~~QACjC~~,MAAM,MAAM,GAAG,oBAAoB,CAAC,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;QAE7D,MAAM,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;QAEvD,IAAI,CAAC;YACH,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;gBACnB,MAAM,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;YAC3E,CAAC;iBAAM,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;gBACxB,MAAM,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAC;YAC1D,CAAC;iBAAM,CAAC;gBACN,MAAM,IAAI,KAAK,CAAC,mEAAmE,CAAC,CAAC;YACvF,CAAC;YAED,MAAM,KAAK,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,CAAC;YACjC,IAAI,CAAC,KAAK,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC;gBACrD,MAAM,IAAI,KAAK,CAAC,QAAQ,GAAG,CAAC,WAAW,EAAE,oBAAoB,CAAC,CAAC;YACjE,CAAC;YAKD,MAAM,mBAAmB,CAAC,UAAU,CAAC,CAAC;YAEtC,MAAM,QAAQ,GAAuB;gBACnC,GAAG;gBACH,WAAW,EAAE,OAAO,CAAC,WAAW;gBAChC,QAAQ,EAAE,OAAO,CAAC,QAAQ;gBAC1B,MAAM,EAAE,KAAK,CAAC,IAAI;gBAClB,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAG3D,OAAO,EAAE,YAAY;gBACrB,UAAU,EAAE,IAAI,IAAI,EAAE;aACvB,CAAC;YACF,MAAM,UAAU,CAAC,SAAS,CAAC,QAAe,CAAC,CAAC;YAC5C,OAAO,QAAQ,CAAC;QAClB,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;YACzD,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAKD,MAAM,CAAC,KAAK,CAAC,YAAY,CACvB,UAA0B,EAC1B,EAA2B;QAE3B,OAAO,gBAAgB,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAC1C,CAAC;IAKD,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,UAA0B,EAAE,QAAgB;QACtE,OAAO,kBAAkB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAClD,CAAC;IAKD,MAAM,CAAC,KAAK,CAAC,SAAS,CACpB,UAA0B,EAC1B,SAAc,EAAE,EAChB,UAAe,EAAE;QAEjB,OAAO,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IAUD,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,SAAiB,EAAE,UAA0B,EAAE,EAA2B;QAChG,MAAM,QAAQ,GAAG,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,~~IAAI~~,~~KAAK,~~CAAC,~~QAAQ,CAAC,~~EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;~~QACtE~~,MAAM,EAAE,CAAC,oBAAoB,CAAC,QAAQ,CAAC,SAAS,EAAE,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC;QAC9E,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;IAChD,CAAC;IAKD,MAAM,CAAC,SAAS,CAAC,SAAiB,EAAE,EAA2B;QAC7D,OAAO,gBAAgB,CAAC,oBAAoB,CAAC,QAAQ,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC;IACxE,CAAC;IAKD,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,SAAiB,EAAE,EAA2B;QACnE,OAAO,cAAc,CAAC,oBAAoB,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC;IACvE,CAAC;CACF"}
1	+ {"version":3,"file":"filesystem-file.helper.js","sourceRoot":"","sources":["../../../../src/core/modules/file/filesystem-file.helper.ts"],"names":[],"mappings":"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"}

package/dist/core/modules/file/s3-file.helper.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { Types } from 'mongoose';
+import type { Types } from 'mongoose';
 import { Readable } from 'stream';
 import { CoreS3Service } from '../../common/services/core-s3.service.js';
 import { FileCollection, FileMetadataInfo } from './file-metadata.helper.js';

package/dist/core/modules/file/s3-file.helper.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { Types } from 'mongoose';
 import { ensureFilenameIndex, findMetadata, findMetadataById, findMetadataByName, } from './file-metadata.helper.js';
+import { newObjectId } from '../../common/persistence/mongo/mongoose-compat.js';
 export const S3_FILES_COLLECTION = 's3-files';
 export function isKnownUploadSize(size) {
     return typeof size === 'number' && Number.isSafeInteger(size) && size > 0;
@@ -13,7 +13,7 @@ export async function streamToBuffer(stream) {
 }
 export class S3FileHelper {
     static async writeFile(s3Service, collection, options) {
-        const _id = new Types.ObjectId();
+        const _id = newObjectId();
         const key = _id.toHexString();
         const body = options.body ?? options.buffer;
         if (!body) {
@@ -29,7 +29,7 @@ export class S3FileHelper {
         });
     }
     static async copyFile(s3Service, collection, options) {
-        const _id = new Types.ObjectId();
+        const _id = newObjectId();
         await s3Service.copyObject(options.sourceKey, _id.toHexString(), options.sourceBucket, options.contentType);
         return S3FileHelper.recordFile(s3Service, collection, _id, {
             contentType: options.contentType,
@@ -66,12 +66,12 @@ export class S3FileHelper {
         return findMetadata(collection, filter, options);
     }
     static async deleteFile(s3Service, collection, id) {
-        const objectId = typeof id === 'string' ? new Types.ObjectId(id) : id;
+        const objectId = typeof id === 'string' ? newObjectId(id) : id;
         await s3Service.deleteObject(objectId.toHexString());
         await collection.deleteOne({ _id: objectId });
     }
     static async getStream(s3Service, id) {
-        const objectId = typeof id === 'string' ? new Types.ObjectId(id) : id;
+        const objectId = typeof id === 'string' ? newObjectId(id) : id;
         return (await s3Service.getObject(objectId.toHexString())).body;
     }
     static async getBuffer(s3Service, id) {

package/dist/core/modules/file/s3-file.helper.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"s3-file.helper.js","sourceRoot":"","sources":["../../../../src/core/modules/file/s3-file.helper.ts"],"names":[],"mappings":"~~AAAA~~,OAAO,~~EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AAIjC,OAAO,~~EACL,mBAAmB,EAGnB,YAAY,EACZ,gBAAgB,EAChB,kBAAkB,GACnB,MAAM,2BAA2B,CAAC;~~AASnC~~,MAAM,CAAC,MAAM,mBAAmB,GAAG,UAAU,CAAC;AAsB9C,MAAM,UAAU,iBAAiB,CAAC,IAAa;IAC7C,OAAO,OAAO,IAAI,KAAK,QAAQ,IAAI,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC;AAC5E,CAAC;AAKD,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,MAAgB;IACnD,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,IAAI,KAAK,EAAE,MAAM,KAAK,IAAI,MAAM,EAAE,CAAC;QACjC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC;IAClC,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC;~~AAQD~~,MAAM,OAAO,YAAY;IAQvB,MAAM,CAAC,KAAK,CAAC,SAAS,CACpB,SAAwB,EACxB,UAA0B,EAC1B,OAOC;QAED,MAAM,GAAG,GAAG,~~IAAI~~,~~KAAK,CAAC,QAAQ,~~EAAE,CAAC;~~QACjC~~,MAAM,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC;QAO9B,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,IAAI,OAAO,CAAC,MAAM,CAAC;QAC5C,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,+DAA+D,CAAC,CAAC;QACnF,CAAC;QACD,MAAM,aAAa,GAAG,iBAAiB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC;QAChH,MAAM,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,IAAI,EAAE,OAAO,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QAEzE,OAAO,YAAY,CAAC,UAAU,CAAC,SAAS,EAAE,UAAU,EAAE,GAAG,EAAE;YACzD,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,MAAM,EAAE,aAAa;YACrB,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC3B,CAAC,CAAC;IACL,CAAC;IAYD,MAAM,CAAC,KAAK,CAAC,QAAQ,CACnB,SAAwB,EACxB,UAA0B,EAC1B,OAOC;QAED,MAAM,GAAG,GAAG,~~IAAI~~,~~KAAK,CAAC,QAAQ,~~EAAE,CAAC;~~QACjC~~,MAAM,SAAS,CAAC,UAAU,CAAC,OAAO,CAAC,SAAS,EAAE,GAAG,CAAC,WAAW,EAAE,EAAE,OAAO,CAAC,YAAY,EAAE,OAAO,CAAC,WAAW,CAAC,CAAC;QAE5G,OAAO,YAAY,CAAC,UAAU,CAAC,SAAS,EAAE,UAAU,EAAE,GAAG,EAAE;YACzD,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,MAAM,EAAE,OAAO,CAAC,aAAa;YAC7B,QAAQ,EAAE,OAAO,CAAC,QAAQ;SAC3B,CAAC,CAAC;IACL,CAAC;IAQS,MAAM,CAAC,KAAK,CAAC,UAAU,CAC/B,SAAwB,EACxB,UAA0B,EAC1B,GAAmB,EACnB,OAAoG;QAKpG,MAAM,IAAI,GAAG,MAAM,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,CAAC;QAC3D,IAAI,CAAC,IAAI,EAAE,CAAC;YACV,MAAM,IAAI,KAAK,CAAC,mCAAmC,CAAC,CAAC;QACvD,CAAC;QAKD,MAAM,mBAAmB,CAAC,UAAU,CAAC,CAAC;QAEtC,MAAM,QAAQ,GAAe;YAC3B,GAAG;YACH,WAAW,EAAE,OAAO,CAAC,WAAW;YAChC,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAC1B,MAAM,EAAE,OAAO,CAAC,MAAM,IAAI,IAAI,CAAC,aAAa;YAC5C,QAAQ,EAAE,OAAO,CAAC,QAAQ;YAG1B,OAAO,EAAE,IAAI;YACb,UAAU,EAAE,IAAI,IAAI,EAAE;SACvB,CAAC;QACF,MAAM,UAAU,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;QACrC,OAAO,QAAQ,CAAC;IAClB,CAAC;IAKD,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,UAA0B,EAAE,EAA2B;QAC/E,OAAO,gBAAgB,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IAC1C,CAAC;IAKD,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,UAA0B,EAAE,QAAgB;QACtE,OAAO,kBAAkB,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAClD,CAAC;IAKD,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,UAA0B,EAAE,SAAc,EAAE,EAAE,UAAe,EAAE;QACpF,OAAO,YAAY,CAAC,UAAU,EAAE,MAAM,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IAKD,MAAM,CAAC,KAAK,CAAC,UAAU,CACrB,SAAwB,EACxB,UAA0B,EAC1B,EAA2B;QAE3B,MAAM,QAAQ,GAAG,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,~~IAAI~~,~~KAAK,~~CAAC,~~QAAQ,CAAC,~~EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;~~QACtE~~,MAAM,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC;QACrD,MAAM,UAAU,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,QAAQ,EAAE,CAAC,CAAC;IAChD,CAAC;IAKD,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,SAAwB,EAAE,EAA2B;QAC1E,MAAM,QAAQ,GAAG,OAAO,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,~~IAAI~~,~~KAAK,~~CAAC,~~QAAQ,CAAC,~~EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;~~QACtE~~,OAAO,CAAC,MAAM,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IAClE,CAAC;IAKD,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,SAAwB,EAAE,EAA2B;QAC1E,OAAO,cAAc,CAAC,MAAM,YAAY,CAAC,SAAS,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC,CAAC;IACrE,CAAC;CACF"}
1	+ {"version":3,"file":"s3-file.helper.js","sourceRoot":"","sources":["../../../../src/core/modules/file/s3-file.helper.ts"],"names":[],"mappings":"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"}

package/dist/core/modules/health-check/core-health-check.module.js CHANGED Viewed

@@ -5,7 +5,9 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
 import { Module } from '@nestjs/common';
-import { TerminusModule } from '@nestjs/terminus';
+import { ModuleRef } from '@nestjs/core';
+import { HealthIndicatorService, MongooseHealthIndicator, TerminusModule } from '@nestjs/terminus';
+import { getConnectionToken } from '../../common/persistence/mongo/mongoose-compat.js';
 import { CoreHealthCheckController } from './core-health-check.controller.js';
 import { CoreHealthCheckResolver } from './core-health-check.resolver.js';
 import { CoreHealthCheckService } from './core-health-check.service.js';
@@ -15,7 +17,15 @@ CoreHealthCheckModule = __decorate([
     Module({
         controllers: [CoreHealthCheckController],
         imports: [TerminusModule],
-        providers: [CoreHealthCheckService, CoreHealthCheckResolver],
+        providers: [
+            CoreHealthCheckService,
+            CoreHealthCheckResolver,
+            {
+                inject: [ModuleRef, HealthIndicatorService, { optional: true, token: getConnectionToken() }],
+                provide: MongooseHealthIndicator,
+                useFactory: (moduleRef, indicators, connection) => connection ? new MongooseHealthIndicator(moduleRef, indicators) : null,
+            },
+        ],
     })
 ], CoreHealthCheckModule);
 export { CoreHealthCheckModule };

package/dist/core/modules/health-check/core-health-check.module.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"core-health-check.module.js","sourceRoot":"","sources":["../../../../src/core/modules/health-check/core-health-check.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;~~AAElD~~,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;~~AAWjE~~,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;CAAG,CAAA;AAAxB,qBAAqB;~~IALjC~~,MAAM,CAAC;QACN,WAAW,EAAE,CAAC,yBAAyB,CAAC;QACxC,OAAO,EAAE,CAAC,cAAc,CAAC;QACzB,SAAS,EAAE,CAAC,sBAAsB,EAAE,uBAAuB,CAAC;~~KAC7D~~,CAAC;GACW,qBAAqB,CAAG"}
1	+ {"version":3,"file":"core-health-check.module.js","sourceRoot":"","sources":["../../../../src/core/modules/health-check/core-health-check.module.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,gBAAgB,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AACzC,OAAO,EAAE,sBAAsB,EAAE,uBAAuB,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAEnG,OAAO,EAAE,kBAAkB,EAAE,MAAM,mDAAmD,CAAC;AAEvF,OAAO,EAAE,yBAAyB,EAAE,MAAM,mCAAmC,CAAC;AAC9E,OAAO,EAAE,uBAAuB,EAAE,MAAM,iCAAiC,CAAC;AAC1E,OAAO,EAAE,sBAAsB,EAAE,MAAM,gCAAgC,CAAC;AAsBjE,IAAM,qBAAqB,GAA3B,MAAM,qBAAqB;CAAG,CAAA;AAAxB,qBAAqB;IAhBjC,MAAM,CAAC;QACN,WAAW,EAAE,CAAC,yBAAyB,CAAC;QACxC,OAAO,EAAE,CAAC,cAAc,CAAC;QACzB,SAAS,EAAE;YACT,sBAAsB;YACtB,uBAAuB;YACvB;gBACE,MAAM,EAAE,CAAC,SAAS,EAAE,sBAAsB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,kBAAkB,EAAE,EAAE,CAAC;gBAC5F,OAAO,EAAE,uBAAuB;gBAGhC,UAAU,EAAE,CAAC,SAAoB,EAAE,UAAkC,EAAE,UAAoB,EAAE,EAAE,CAC7F,UAAU,CAAC,CAAC,CAAC,IAAI,uBAAuB,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC,IAAI;aACzE;SACF;KACF,CAAC;GACW,qBAAqB,CAAG"}