@xyo-network/module-abstract-mongodb 2.74.3 → 2.74.5

package/dist/index.js

@@ -27,7 +27,7 @@ __export(src_exports, {
   DefaultLimit: () => DefaultLimit,
   DefaultMaxTimeMS: () => DefaultMaxTimeMS,
   DefaultOrder: () => DefaultOrder,
-  MongoDBModule: () => MongoDBModule,
+  MongoDBModuleMixin: () => MongoDBModuleMixin,
   escapeChar: () => escapeChar,
   fromDbProperty: () => fromDbProperty,
   removeId: () => removeId,
@@ -57,12 +57,44 @@ var DefaultMaxTimeMS = 2e3;
 var DefaultOrder = "desc";
 
 // src/Module.ts
-var import_assert = require("@xylabs/assert");
+var import_assert2 = require("@xylabs/assert");
 var import_lodash = require("@xylabs/lodash");
 var import_static_implements = require("@xylabs/static-implements");
-var import_module_abstract = require("@xyo-network/module-abstract");
 var import_module_model_mongodb = require("@xyo-network/module-model-mongodb");
+var import_sdk_xyo_mongo_js2 = require("@xyo-network/sdk-xyo-mongo-js");
+
+// src/config/getBaseMongoSdk.ts
+var import_assert = require("@xylabs/assert");
 var import_sdk_xyo_mongo_js = require("@xyo-network/sdk-xyo-mongo-js");
+
+// src/config/getMongoDBConfig.ts
+var getMongoDBConfig = /* @__PURE__ */ __name(() => {
+  const env = {};
+  if (process.env.MONGO_CONNECTION_STRING) {
+    env.MONGO_CONNECTION_STRING = process.env.MONGO_CONNECTION_STRING;
+  }
+  if (process.env.MONGO_DOMAIN) {
+    env.MONGO_DATABASE = process.env.MONGO_DATABASE;
+    env.MONGO_DOMAIN = process.env.MONGO_DOMAIN;
+    env.MONGO_PASSWORD = process.env.MONGO_PASSWORD;
+    env.MONGO_USERNAME = process.env.MONGO_USERNAME;
+  }
+  return env;
+}, "getMongoDBConfig");
+
+// src/config/getBaseMongoSdk.ts
+var getBaseMongoSdkPrivateConfig = /* @__PURE__ */ __name(() => {
+  const env = getMongoDBConfig();
+  return {
+    dbConnectionString: env.MONGO_CONNECTION_STRING,
+    dbDomain: (0, import_assert.assertEx)(env.MONGO_DOMAIN, "Missing Mongo Domain"),
+    dbName: (0, import_assert.assertEx)(env.MONGO_DATABASE, "Missing Mongo Database"),
+    dbPassword: (0, import_assert.assertEx)(env.MONGO_PASSWORD, "Missing Mongo Password"),
+    dbUserName: (0, import_assert.assertEx)(env.MONGO_USERNAME, "Missing Mongo Username")
+  };
+}, "getBaseMongoSdkPrivateConfig");
+
+// src/Module.ts
 function _ts_decorate(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -74,35 +106,49 @@ function _ts_decorate(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 __name(_ts_decorate, "_ts_decorate");
-var MongoDBModule = class MongoDBModule2 extends import_module_abstract.AbstractModuleInstance {
-  static {
-    __name(this, "MongoDBModule");
-  }
-  static labels = import_module_model_mongodb.MongoDBStorageClassLabels;
-  _boundWitnessSdk;
-  _payloadSdk;
-  get boundWitnessSdkConfig() {
-    return (0, import_lodash.merge)({}, this.params.boundWitnessSdkConfig, this.config.boundWitnessSdkConfig, {
-      collection: this.config.boundWitnessSdkConfig?.collection ?? this.params.boundWitnessSdkConfig?.collection ?? "bound_witnesses"
-    });
-  }
-  get boundWitnesses() {
-    this._boundWitnessSdk = this._boundWitnessSdk ?? new import_sdk_xyo_mongo_js.BaseMongoSdk(this.boundWitnessSdkConfig);
-    return (0, import_assert.assertEx)(this._boundWitnessSdk);
-  }
-  get payloadSdkConfig() {
-    return (0, import_lodash.merge)({}, this.params.payloadSdkConfig, this.config.payloadSdkConfig, {
-      collection: this.config.payloadSdkConfig?.collection ?? this.params.payloadSdkConfig?.collection ?? "payload"
-    });
-  }
-  get payloads() {
-    this._payloadSdk = this._payloadSdk ?? new import_sdk_xyo_mongo_js.BaseMongoSdk(this.payloadSdkConfig);
-    return (0, import_assert.assertEx)(this._payloadSdk);
-  }
-};
-MongoDBModule = _ts_decorate([
-  (0, import_static_implements.staticImplements)()
-], MongoDBModule);
+var MongoDBModuleMixin = /* @__PURE__ */ __name((ModuleBase) => {
+  let MongoModuleBase = class MongoModuleBase extends ModuleBase {
+    static {
+      __name(this, "MongoModuleBase");
+    }
+    static labels = import_module_model_mongodb.MongoDBStorageClassLabels;
+    _boundWitnessSdk;
+    _payloadSdk;
+    get boundWitnessSdkConfig() {
+      const config = {
+        collection: COLLECTIONS.BoundWitnesses,
+        ...getBaseMongoSdkPrivateConfig()
+      };
+      return (0, import_lodash.merge)(config, this.params.boundWitnessSdkConfig, this.config.boundWitnessSdkConfig, {
+        collection: this.config.boundWitnessSdkConfig?.collection ?? this.params.boundWitnessSdkConfig?.collection ?? "bound_witnesses"
+      });
+    }
+    get boundWitnesses() {
+      this._boundWitnessSdk = this._boundWitnessSdk ?? new import_sdk_xyo_mongo_js2.BaseMongoSdk(this.boundWitnessSdkConfig);
+      return (0, import_assert2.assertEx)(this._boundWitnessSdk);
+    }
+    get jobQueue() {
+      return (0, import_assert2.assertEx)(this.params.jobQueue, "MongoDBModule Error: jobQueue required for this module but is not defined");
+    }
+    get payloadSdkConfig() {
+      const config = {
+        collection: COLLECTIONS.Payloads,
+        ...getBaseMongoSdkPrivateConfig()
+      };
+      return (0, import_lodash.merge)(config, this.params.payloadSdkConfig, this.config.payloadSdkConfig, {
+        collection: this.config.payloadSdkConfig?.collection ?? this.params.payloadSdkConfig?.collection ?? "payload"
+      });
+    }
+    get payloads() {
+      this._payloadSdk = this._payloadSdk ?? new import_sdk_xyo_mongo_js2.BaseMongoSdk(this.payloadSdkConfig);
+      return (0, import_assert2.assertEx)(this._payloadSdk);
+    }
+  };
+  MongoModuleBase = _ts_decorate([
+    (0, import_static_implements.staticImplements)()
+  ], MongoModuleBase);
+  return MongoModuleBase;
+}, "MongoDBModuleMixin");
 
 // src/util/dbProperty.ts
 var escapeChar = "#";
@@ -122,7 +168,7 @@ var removeId = /* @__PURE__ */ __name((payload) => {
   DefaultLimit,
   DefaultMaxTimeMS,
   DefaultOrder,
-  MongoDBModule,
+  MongoDBModuleMixin,
   escapeChar,
   fromDbProperty,
   removeId,

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts","../src/Collections.ts","../src/Databases.ts","../src/Defaults.ts","../src/Module.ts","../src/util/dbProperty.ts","../src/util/removeId.ts"],"sourcesContent":["export * from './Collections'\nexport * from './Databases'\nexport * from './Defaults'\nexport * from './Module'\nexport * from './util'\n","// TODO: By DB\nexport const COLLECTIONS = {\n  AddressInfo: 'address_info' as const,\n  ArchivistStats: 'archivist_stats' as const,\n  BoundWitnesses: 'bound_witnesses' as const,\n  Payloads: 'payloads' as const,\n  Thumbnails: 'thumbnails' as const,\n  Users: 'users' as const,\n}\n","export const DATABASES = {\n  Archivist: 'archivist' as const,\n}\n","export const DefaultAggregateTimeoutMs = 10_000\nexport const DefaultLimit = 20\nexport const DefaultMaxTimeMS = 2000\nexport const DefaultOrder = 'desc'\n","import { assertEx } from '@xylabs/assert'\nimport { merge } from '@xylabs/lodash'\nimport { staticImplements } from '@xylabs/static-implements'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport { ModuleEventData, WithLabels } from '@xyo-network/module-model'\nimport { MongoDBModuleParams, MongoDBStorageClassLabels } from '@xyo-network/module-model-mongodb'\nimport { BoundWitnessWithMeta, PayloadWithMeta } from '@xyo-network/node-core-model'\nimport { BaseMongoSdk, BaseMongoSdkConfig } from '@xyo-network/sdk-xyo-mongo-js'\n\n@staticImplements<WithLabels<MongoDBStorageClassLabels>>()\nexport abstract class MongoDBModule<\n  TParams extends MongoDBModuleParams = MongoDBModuleParams,\n  TEventData extends ModuleEventData<object> = ModuleEventData<object>,\n> extends AbstractModuleInstance<TParams, TEventData> {\n  static labels = MongoDBStorageClassLabels\n\n  private _boundWitnessSdk: BaseMongoSdk<BoundWitnessWithMeta> | undefined\n  private _payloadSdk: BaseMongoSdk<PayloadWithMeta> | undefined\n\n  get boundWitnessSdkConfig(): BaseMongoSdkConfig {\n    return merge({}, this.params.boundWitnessSdkConfig, this.config.boundWitnessSdkConfig, {\n      collection: this.config.boundWitnessSdkConfig?.collection ?? this.params.boundWitnessSdkConfig?.collection ?? 'bound_witnesses',\n    })\n  }\n\n  get boundWitnesses() {\n    this._boundWitnessSdk = this._boundWitnessSdk ?? new BaseMongoSdk<BoundWitnessWithMeta>(this.boundWitnessSdkConfig)\n    return assertEx(this._boundWitnessSdk)\n  }\n\n  get payloadSdkConfig(): BaseMongoSdkConfig {\n    return merge({}, this.params.payloadSdkConfig, this.config.payloadSdkConfig, {\n      collection: this.config.payloadSdkConfig?.collection ?? this.params.payloadSdkConfig?.collection ?? 'payload',\n    })\n  }\n\n  get payloads() {\n    this._payloadSdk = this._payloadSdk ?? new BaseMongoSdk<PayloadWithMeta>(this.payloadSdkConfig)\n    return assertEx(this._payloadSdk)\n  }\n}\n","export const escapeChar = '#'\n\nexport const toDbProperty = (value: string) => value.replaceAll('.', escapeChar)\n\nexport const fromDbProperty = (value: string) => value.replaceAll(escapeChar, '.')\n","import { Payload } from '@xyo-network/payload-model'\nimport { OptionalId, WithId, WithoutId } from 'mongodb'\n\nexport const removeId = <T extends Payload = Payload>(payload: T | WithId<T> | WithoutId<T> | OptionalId<T>): WithoutId<T> => {\n  // eslint-disable-next-line @typescript-eslint/no-unused-vars\n  const { _id, ...withoutId } = payload as OptionalId<T>\n  return withoutId as WithoutId<T>\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;;;;;;;ACCO,IAAMA,cAAc;EACzBC,aAAa;EACbC,gBAAgB;EAChBC,gBAAgB;EAChBC,UAAU;EACVC,YAAY;EACZC,OAAO;AACT;;;ACRO,IAAMC,YAAY;EACvBC,WAAW;AACb;;;ACFO,IAAMC,4BAA4B;AAClC,IAAMC,eAAe;AACrB,IAAMC,mBAAmB;AACzB,IAAMC,eAAe;;;ACH5B,oBAAyB;AACzB,oBAAsB;AACtB,+BAAiC;AACjC,6BAAuC;AAEvC,kCAA+D;AAE/D,8BAAiD;;;;;;;;;;;;AAGjD,IAAsBC,gBAAf,MAAAA,uBAGGC,8CAAAA;SAAAA;;;EACR,OAAOC,SAASC;EAERC;EACAC;EAER,IAAIC,wBAA4C;AAC9C,eAAOC,qBAAM,CAAC,GAAG,KAAKC,OAAOF,uBAAuB,KAAKG,OAAOH,uBAAuB;MACrFI,YAAY,KAAKD,OAAOH,uBAAuBI,cAAc,KAAKF,OAAOF,uBAAuBI,cAAc;IAChH,CAAA;EACF;EAEA,IAAIC,iBAAiB;AACnB,SAAKP,mBAAmB,KAAKA,oBAAoB,IAAIQ,qCAAmC,KAAKN,qBAAqB;AAClH,eAAOO,wBAAS,KAAKT,gBAAgB;EACvC;EAEA,IAAIU,mBAAuC;AACzC,eAAOP,qBAAM,CAAC,GAAG,KAAKC,OAAOM,kBAAkB,KAAKL,OAAOK,kBAAkB;MAC3EJ,YAAY,KAAKD,OAAOK,kBAAkBJ,cAAc,KAAKF,OAAOM,kBAAkBJ,cAAc;IACtG,CAAA;EACF;EAEA,IAAIK,WAAW;AACb,SAAKV,cAAc,KAAKA,eAAe,IAAIO,qCAA8B,KAAKE,gBAAgB;AAC9F,eAAOD,wBAAS,KAAKR,WAAW;EAClC;AACF;AA9BsBL,gBAAAA,aAAAA;MADrBgB,2CAAAA;GACqBhB,aAAAA;;;ACVf,IAAMiB,aAAa;AAEnB,IAAMC,eAAe,wBAACC,UAAkBA,MAAMC,WAAW,KAAKH,UAAAA,GAAzC;AAErB,IAAMI,iBAAiB,wBAACF,UAAkBA,MAAMC,WAAWH,YAAY,GAAA,GAAhD;;;ACDvB,IAAMK,WAAW,wBAA8BC,YAAAA;AAEpD,QAAM,EAAEC,KAAK,GAAGC,UAAAA,IAAcF;AAC9B,SAAOE;AACT,GAJwB;","names":["COLLECTIONS","AddressInfo","ArchivistStats","BoundWitnesses","Payloads","Thumbnails","Users","DATABASES","Archivist","DefaultAggregateTimeoutMs","DefaultLimit","DefaultMaxTimeMS","DefaultOrder","MongoDBModule","AbstractModuleInstance","labels","MongoDBStorageClassLabels","_boundWitnessSdk","_payloadSdk","boundWitnessSdkConfig","merge","params","config","collection","boundWitnesses","BaseMongoSdk","assertEx","payloadSdkConfig","payloads","staticImplements","escapeChar","toDbProperty","value","replaceAll","fromDbProperty","removeId","payload","_id","withoutId"]}
+{"version":3,"sources":["../src/index.ts","../src/Collections.ts","../src/Databases.ts","../src/Defaults.ts","../src/Module.ts","../src/config/getBaseMongoSdk.ts","../src/config/getMongoDBConfig.ts","../src/util/dbProperty.ts","../src/util/removeId.ts"],"sourcesContent":["export * from './Collections'\nexport * from './Databases'\nexport * from './Defaults'\nexport * from './Module'\nexport * from './util'\n","// TODO: By DB\nexport const COLLECTIONS = {\n  AddressInfo: 'address_info' as const,\n  ArchivistStats: 'archivist_stats' as const,\n  BoundWitnesses: 'bound_witnesses' as const,\n  Payloads: 'payloads' as const,\n  Thumbnails: 'thumbnails' as const,\n  Users: 'users' as const,\n}\n","export const DATABASES = {\n  Archivist: 'archivist' as const,\n}\n","export const DefaultAggregateTimeoutMs = 10_000\nexport const DefaultLimit = 20\nexport const DefaultMaxTimeMS = 2000\nexport const DefaultOrder = 'desc'\n","import { assertEx } from '@xylabs/assert'\nimport { merge } from '@xylabs/lodash'\nimport { staticImplements } from '@xylabs/static-implements'\nimport { Module } from '@xyo-network/module-model'\nimport { MongoDBModule, MongoDBModuleParams, MongoDBModuleStatic, MongoDBStorageClassLabels } from '@xyo-network/module-model-mongodb'\nimport { BoundWitnessWithMeta, PayloadWithMeta } from '@xyo-network/node-core-model'\nimport { BaseMongoSdk, BaseMongoSdkConfig } from '@xyo-network/sdk-xyo-mongo-js'\n\nimport { COLLECTIONS } from './Collections'\nimport { getBaseMongoSdkPrivateConfig } from './config'\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type AnyAbstractModule<TParams extends MongoDBModuleParams = MongoDBModuleParams> = abstract new (...args: any[]) => Module<TParams>\n\nexport const MongoDBModuleMixin = <\n  TParams extends MongoDBModuleParams = MongoDBModuleParams,\n  TModule extends AnyAbstractModule<TParams> = AnyAbstractModule<TParams>,\n>(\n  ModuleBase: TModule,\n) => {\n  @staticImplements<MongoDBModuleStatic>()\n  abstract class MongoModuleBase extends ModuleBase implements MongoDBModule {\n    static labels = MongoDBStorageClassLabels\n    _boundWitnessSdk: BaseMongoSdk<BoundWitnessWithMeta> | undefined\n    _payloadSdk: BaseMongoSdk<PayloadWithMeta> | undefined\n\n    get boundWitnessSdkConfig(): BaseMongoSdkConfig {\n      const config = { collection: COLLECTIONS.BoundWitnesses, ...getBaseMongoSdkPrivateConfig() }\n      return merge(config, this.params.boundWitnessSdkConfig, this.config.boundWitnessSdkConfig, {\n        collection: this.config.boundWitnessSdkConfig?.collection ?? this.params.boundWitnessSdkConfig?.collection ?? 'bound_witnesses',\n      })\n    }\n\n    get boundWitnesses() {\n      this._boundWitnessSdk = this._boundWitnessSdk ?? new BaseMongoSdk<BoundWitnessWithMeta>(this.boundWitnessSdkConfig)\n      return assertEx(this._boundWitnessSdk)\n    }\n\n    get jobQueue() {\n      return assertEx(this.params.jobQueue, 'MongoDBModule Error: jobQueue required for this module but is not defined')\n    }\n\n    get payloadSdkConfig(): BaseMongoSdkConfig {\n      const config = { collection: COLLECTIONS.Payloads, ...getBaseMongoSdkPrivateConfig() }\n      return merge(config, this.params.payloadSdkConfig, this.config.payloadSdkConfig, {\n        collection: this.config.payloadSdkConfig?.collection ?? this.params.payloadSdkConfig?.collection ?? 'payload',\n      })\n    }\n\n    get payloads() {\n      this._payloadSdk = this._payloadSdk ?? new BaseMongoSdk<PayloadWithMeta>(this.payloadSdkConfig)\n      return assertEx(this._payloadSdk)\n    }\n  }\n  return MongoModuleBase\n}\n","import { assertEx } from '@xylabs/assert'\nimport { BaseMongoSdk, BaseMongoSdkPrivateConfig } from '@xyo-network/sdk-xyo-mongo-js'\nimport { Document } from 'mongodb'\n\nimport { getMongoDBConfig } from './getMongoDBConfig'\n\nexport const getBaseMongoSdkPrivateConfig = (): BaseMongoSdkPrivateConfig => {\n  const env = getMongoDBConfig()\n  return {\n    dbConnectionString: env.MONGO_CONNECTION_STRING,\n    dbDomain: assertEx(env.MONGO_DOMAIN, 'Missing Mongo Domain'),\n    dbName: assertEx(env.MONGO_DATABASE, 'Missing Mongo Database'),\n    dbPassword: assertEx(env.MONGO_PASSWORD, 'Missing Mongo Password'),\n    dbUserName: assertEx(env.MONGO_USERNAME, 'Missing Mongo Username'),\n  }\n}\n\nexport const getBaseMongoSdk = <T extends Document>(collection: string) => {\n  return new BaseMongoSdk<T>({ ...getBaseMongoSdkPrivateConfig(), collection })\n}\n","export type MongoDbConnectionStringEnvVar = 'MONGO_CONNECTION_STRING'\nexport type MongoDbEnvVars = 'MONGO_DATABASE' | 'MONGO_DOMAIN' | 'MONGO_PASSWORD' | 'MONGO_USERNAME'\n\nexport type MongoEnv = Record<MongoDbEnvVars | MongoDbConnectionStringEnvVar, string | undefined>\n\nexport const getMongoDBConfig = (): MongoEnv => {\n  const env: MongoEnv = {} as MongoEnv\n  if (process.env.MONGO_CONNECTION_STRING) {\n    env.MONGO_CONNECTION_STRING = process.env.MONGO_CONNECTION_STRING\n  }\n  if (process.env.MONGO_DOMAIN) {\n    env.MONGO_DATABASE = process.env.MONGO_DATABASE\n    env.MONGO_DOMAIN = process.env.MONGO_DOMAIN\n    env.MONGO_PASSWORD = process.env.MONGO_PASSWORD\n    env.MONGO_USERNAME = process.env.MONGO_USERNAME\n  }\n  return env\n}\n","export const escapeChar = '#'\n\nexport const toDbProperty = (value: string) => value.replaceAll('.', escapeChar)\n\nexport const fromDbProperty = (value: string) => value.replaceAll(escapeChar, '.')\n","import { Payload } from '@xyo-network/payload-model'\nimport { OptionalId, WithId, WithoutId } from 'mongodb'\n\nexport const removeId = <T extends Payload = Payload>(payload: T | WithId<T> | WithoutId<T> | OptionalId<T>): WithoutId<T> => {\n  // eslint-disable-next-line @typescript-eslint/no-unused-vars\n  const { _id, ...withoutId } = payload as OptionalId<T>\n  return withoutId as WithoutId<T>\n}\n"],"mappings":"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","names":["COLLECTIONS","AddressInfo","ArchivistStats","BoundWitnesses","Payloads","Thumbnails","Users","DATABASES","Archivist","DefaultAggregateTimeoutMs","DefaultLimit","DefaultMaxTimeMS","DefaultOrder","import_assert","import_sdk_xyo_mongo_js","getMongoDBConfig","env","process","MONGO_CONNECTION_STRING","MONGO_DOMAIN","MONGO_DATABASE","MONGO_PASSWORD","MONGO_USERNAME","getBaseMongoSdkPrivateConfig","env","getMongoDBConfig","dbConnectionString","MONGO_CONNECTION_STRING","dbDomain","assertEx","MONGO_DOMAIN","dbName","MONGO_DATABASE","dbPassword","MONGO_PASSWORD","dbUserName","MONGO_USERNAME","MongoDBModuleMixin","ModuleBase","MongoModuleBase","labels","MongoDBStorageClassLabels","_boundWitnessSdk","_payloadSdk","boundWitnessSdkConfig","config","collection","COLLECTIONS","BoundWitnesses","getBaseMongoSdkPrivateConfig","merge","params","boundWitnesses","BaseMongoSdk","assertEx","jobQueue","payloadSdkConfig","Payloads","payloads","staticImplements","escapeChar","toDbProperty","value","replaceAll","fromDbProperty","removeId","payload","_id","withoutId"]}

package/dist/index.mjs

@@ -23,12 +23,44 @@ var DefaultMaxTimeMS = 2e3;
 var DefaultOrder = "desc";
 
 // src/Module.ts
-import { assertEx } from "@xylabs/assert";
+import { assertEx as assertEx2 } from "@xylabs/assert";
 import { merge } from "@xylabs/lodash";
 import { staticImplements } from "@xylabs/static-implements";
-import { AbstractModuleInstance } from "@xyo-network/module-abstract";
 import { MongoDBStorageClassLabels } from "@xyo-network/module-model-mongodb";
+import { BaseMongoSdk as BaseMongoSdk2 } from "@xyo-network/sdk-xyo-mongo-js";
+
+// src/config/getBaseMongoSdk.ts
+import { assertEx } from "@xylabs/assert";
 import { BaseMongoSdk } from "@xyo-network/sdk-xyo-mongo-js";
+
+// src/config/getMongoDBConfig.ts
+var getMongoDBConfig = /* @__PURE__ */ __name(() => {
+  const env = {};
+  if (process.env.MONGO_CONNECTION_STRING) {
+    env.MONGO_CONNECTION_STRING = process.env.MONGO_CONNECTION_STRING;
+  }
+  if (process.env.MONGO_DOMAIN) {
+    env.MONGO_DATABASE = process.env.MONGO_DATABASE;
+    env.MONGO_DOMAIN = process.env.MONGO_DOMAIN;
+    env.MONGO_PASSWORD = process.env.MONGO_PASSWORD;
+    env.MONGO_USERNAME = process.env.MONGO_USERNAME;
+  }
+  return env;
+}, "getMongoDBConfig");
+
+// src/config/getBaseMongoSdk.ts
+var getBaseMongoSdkPrivateConfig = /* @__PURE__ */ __name(() => {
+  const env = getMongoDBConfig();
+  return {
+    dbConnectionString: env.MONGO_CONNECTION_STRING,
+    dbDomain: assertEx(env.MONGO_DOMAIN, "Missing Mongo Domain"),
+    dbName: assertEx(env.MONGO_DATABASE, "Missing Mongo Database"),
+    dbPassword: assertEx(env.MONGO_PASSWORD, "Missing Mongo Password"),
+    dbUserName: assertEx(env.MONGO_USERNAME, "Missing Mongo Username")
+  };
+}, "getBaseMongoSdkPrivateConfig");
+
+// src/Module.ts
 function _ts_decorate(decorators, target, key, desc) {
   var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
   if (typeof Reflect === "object" && typeof Reflect.decorate === "function")
@@ -40,35 +72,49 @@ function _ts_decorate(decorators, target, key, desc) {
   return c > 3 && r && Object.defineProperty(target, key, r), r;
 }
 __name(_ts_decorate, "_ts_decorate");
-var MongoDBModule = class MongoDBModule2 extends AbstractModuleInstance {
-  static {
-    __name(this, "MongoDBModule");
-  }
-  static labels = MongoDBStorageClassLabels;
-  _boundWitnessSdk;
-  _payloadSdk;
-  get boundWitnessSdkConfig() {
-    return merge({}, this.params.boundWitnessSdkConfig, this.config.boundWitnessSdkConfig, {
-      collection: this.config.boundWitnessSdkConfig?.collection ?? this.params.boundWitnessSdkConfig?.collection ?? "bound_witnesses"
-    });
-  }
-  get boundWitnesses() {
-    this._boundWitnessSdk = this._boundWitnessSdk ?? new BaseMongoSdk(this.boundWitnessSdkConfig);
-    return assertEx(this._boundWitnessSdk);
-  }
-  get payloadSdkConfig() {
-    return merge({}, this.params.payloadSdkConfig, this.config.payloadSdkConfig, {
-      collection: this.config.payloadSdkConfig?.collection ?? this.params.payloadSdkConfig?.collection ?? "payload"
-    });
-  }
-  get payloads() {
-    this._payloadSdk = this._payloadSdk ?? new BaseMongoSdk(this.payloadSdkConfig);
-    return assertEx(this._payloadSdk);
-  }
-};
-MongoDBModule = _ts_decorate([
-  staticImplements()
-], MongoDBModule);
+var MongoDBModuleMixin = /* @__PURE__ */ __name((ModuleBase) => {
+  let MongoModuleBase = class MongoModuleBase extends ModuleBase {
+    static {
+      __name(this, "MongoModuleBase");
+    }
+    static labels = MongoDBStorageClassLabels;
+    _boundWitnessSdk;
+    _payloadSdk;
+    get boundWitnessSdkConfig() {
+      const config = {
+        collection: COLLECTIONS.BoundWitnesses,
+        ...getBaseMongoSdkPrivateConfig()
+      };
+      return merge(config, this.params.boundWitnessSdkConfig, this.config.boundWitnessSdkConfig, {
+        collection: this.config.boundWitnessSdkConfig?.collection ?? this.params.boundWitnessSdkConfig?.collection ?? "bound_witnesses"
+      });
+    }
+    get boundWitnesses() {
+      this._boundWitnessSdk = this._boundWitnessSdk ?? new BaseMongoSdk2(this.boundWitnessSdkConfig);
+      return assertEx2(this._boundWitnessSdk);
+    }
+    get jobQueue() {
+      return assertEx2(this.params.jobQueue, "MongoDBModule Error: jobQueue required for this module but is not defined");
+    }
+    get payloadSdkConfig() {
+      const config = {
+        collection: COLLECTIONS.Payloads,
+        ...getBaseMongoSdkPrivateConfig()
+      };
+      return merge(config, this.params.payloadSdkConfig, this.config.payloadSdkConfig, {
+        collection: this.config.payloadSdkConfig?.collection ?? this.params.payloadSdkConfig?.collection ?? "payload"
+      });
+    }
+    get payloads() {
+      this._payloadSdk = this._payloadSdk ?? new BaseMongoSdk2(this.payloadSdkConfig);
+      return assertEx2(this._payloadSdk);
+    }
+  };
+  MongoModuleBase = _ts_decorate([
+    staticImplements()
+  ], MongoModuleBase);
+  return MongoModuleBase;
+}, "MongoDBModuleMixin");
 
 // src/util/dbProperty.ts
 var escapeChar = "#";
@@ -87,7 +133,7 @@ export {
   DefaultLimit,
   DefaultMaxTimeMS,
   DefaultOrder,
-  MongoDBModule,
+  MongoDBModuleMixin,
   escapeChar,
   fromDbProperty,
   removeId,

package/dist/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/Collections.ts","../src/Databases.ts","../src/Defaults.ts","../src/Module.ts","../src/util/dbProperty.ts","../src/util/removeId.ts"],"sourcesContent":["// TODO: By DB\nexport const COLLECTIONS = {\n  AddressInfo: 'address_info' as const,\n  ArchivistStats: 'archivist_stats' as const,\n  BoundWitnesses: 'bound_witnesses' as const,\n  Payloads: 'payloads' as const,\n  Thumbnails: 'thumbnails' as const,\n  Users: 'users' as const,\n}\n","export const DATABASES = {\n  Archivist: 'archivist' as const,\n}\n","export const DefaultAggregateTimeoutMs = 10_000\nexport const DefaultLimit = 20\nexport const DefaultMaxTimeMS = 2000\nexport const DefaultOrder = 'desc'\n","import { assertEx } from '@xylabs/assert'\nimport { merge } from '@xylabs/lodash'\nimport { staticImplements } from '@xylabs/static-implements'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport { ModuleEventData, WithLabels } from '@xyo-network/module-model'\nimport { MongoDBModuleParams, MongoDBStorageClassLabels } from '@xyo-network/module-model-mongodb'\nimport { BoundWitnessWithMeta, PayloadWithMeta } from '@xyo-network/node-core-model'\nimport { BaseMongoSdk, BaseMongoSdkConfig } from '@xyo-network/sdk-xyo-mongo-js'\n\n@staticImplements<WithLabels<MongoDBStorageClassLabels>>()\nexport abstract class MongoDBModule<\n  TParams extends MongoDBModuleParams = MongoDBModuleParams,\n  TEventData extends ModuleEventData<object> = ModuleEventData<object>,\n> extends AbstractModuleInstance<TParams, TEventData> {\n  static labels = MongoDBStorageClassLabels\n\n  private _boundWitnessSdk: BaseMongoSdk<BoundWitnessWithMeta> | undefined\n  private _payloadSdk: BaseMongoSdk<PayloadWithMeta> | undefined\n\n  get boundWitnessSdkConfig(): BaseMongoSdkConfig {\n    return merge({}, this.params.boundWitnessSdkConfig, this.config.boundWitnessSdkConfig, {\n      collection: this.config.boundWitnessSdkConfig?.collection ?? this.params.boundWitnessSdkConfig?.collection ?? 'bound_witnesses',\n    })\n  }\n\n  get boundWitnesses() {\n    this._boundWitnessSdk = this._boundWitnessSdk ?? new BaseMongoSdk<BoundWitnessWithMeta>(this.boundWitnessSdkConfig)\n    return assertEx(this._boundWitnessSdk)\n  }\n\n  get payloadSdkConfig(): BaseMongoSdkConfig {\n    return merge({}, this.params.payloadSdkConfig, this.config.payloadSdkConfig, {\n      collection: this.config.payloadSdkConfig?.collection ?? this.params.payloadSdkConfig?.collection ?? 'payload',\n    })\n  }\n\n  get payloads() {\n    this._payloadSdk = this._payloadSdk ?? new BaseMongoSdk<PayloadWithMeta>(this.payloadSdkConfig)\n    return assertEx(this._payloadSdk)\n  }\n}\n","export const escapeChar = '#'\n\nexport const toDbProperty = (value: string) => value.replaceAll('.', escapeChar)\n\nexport const fromDbProperty = (value: string) => value.replaceAll(escapeChar, '.')\n","import { Payload } from '@xyo-network/payload-model'\nimport { OptionalId, WithId, WithoutId } from 'mongodb'\n\nexport const removeId = <T extends Payload = Payload>(payload: T | WithId<T> | WithoutId<T> | OptionalId<T>): WithoutId<T> => {\n  // eslint-disable-next-line @typescript-eslint/no-unused-vars\n  const { _id, ...withoutId } = payload as OptionalId<T>\n  return withoutId as WithoutId<T>\n}\n"],"mappings":";;;;AACO,IAAMA,cAAc;EACzBC,aAAa;EACbC,gBAAgB;EAChBC,gBAAgB;EAChBC,UAAU;EACVC,YAAY;EACZC,OAAO;AACT;;;ACRO,IAAMC,YAAY;EACvBC,WAAW;AACb;;;ACFO,IAAMC,4BAA4B;AAClC,IAAMC,eAAe;AACrB,IAAMC,mBAAmB;AACzB,IAAMC,eAAe;;;ACH5B,SAASC,gBAAgB;AACzB,SAASC,aAAa;AACtB,SAASC,wBAAwB;AACjC,SAASC,8BAA8B;AAEvC,SAA8BC,iCAAiC;AAE/D,SAASC,oBAAwC;;;;;;;;;;;;AAGjD,IAAsBC,gBAAf,MAAAA,uBAGGC,uBAAAA;SAAAA;;;EACR,OAAOC,SAASC;EAERC;EACAC;EAER,IAAIC,wBAA4C;AAC9C,WAAOC,MAAM,CAAC,GAAG,KAAKC,OAAOF,uBAAuB,KAAKG,OAAOH,uBAAuB;MACrFI,YAAY,KAAKD,OAAOH,uBAAuBI,cAAc,KAAKF,OAAOF,uBAAuBI,cAAc;IAChH,CAAA;EACF;EAEA,IAAIC,iBAAiB;AACnB,SAAKP,mBAAmB,KAAKA,oBAAoB,IAAIQ,aAAmC,KAAKN,qBAAqB;AAClH,WAAOO,SAAS,KAAKT,gBAAgB;EACvC;EAEA,IAAIU,mBAAuC;AACzC,WAAOP,MAAM,CAAC,GAAG,KAAKC,OAAOM,kBAAkB,KAAKL,OAAOK,kBAAkB;MAC3EJ,YAAY,KAAKD,OAAOK,kBAAkBJ,cAAc,KAAKF,OAAOM,kBAAkBJ,cAAc;IACtG,CAAA;EACF;EAEA,IAAIK,WAAW;AACb,SAAKV,cAAc,KAAKA,eAAe,IAAIO,aAA8B,KAAKE,gBAAgB;AAC9F,WAAOD,SAAS,KAAKR,WAAW;EAClC;AACF;AA9BsBL,gBAAAA,aAAAA;EADrBgB,iBAAAA;GACqBhB,aAAAA;;;ACVf,IAAMiB,aAAa;AAEnB,IAAMC,eAAe,wBAACC,UAAkBA,MAAMC,WAAW,KAAKH,UAAAA,GAAzC;AAErB,IAAMI,iBAAiB,wBAACF,UAAkBA,MAAMC,WAAWH,YAAY,GAAA,GAAhD;;;ACDvB,IAAMK,WAAW,wBAA8BC,YAAAA;AAEpD,QAAM,EAAEC,KAAK,GAAGC,UAAAA,IAAcF;AAC9B,SAAOE;AACT,GAJwB;","names":["COLLECTIONS","AddressInfo","ArchivistStats","BoundWitnesses","Payloads","Thumbnails","Users","DATABASES","Archivist","DefaultAggregateTimeoutMs","DefaultLimit","DefaultMaxTimeMS","DefaultOrder","assertEx","merge","staticImplements","AbstractModuleInstance","MongoDBStorageClassLabels","BaseMongoSdk","MongoDBModule","AbstractModuleInstance","labels","MongoDBStorageClassLabels","_boundWitnessSdk","_payloadSdk","boundWitnessSdkConfig","merge","params","config","collection","boundWitnesses","BaseMongoSdk","assertEx","payloadSdkConfig","payloads","staticImplements","escapeChar","toDbProperty","value","replaceAll","fromDbProperty","removeId","payload","_id","withoutId"]}
+{"version":3,"sources":["../src/Collections.ts","../src/Databases.ts","../src/Defaults.ts","../src/Module.ts","../src/config/getBaseMongoSdk.ts","../src/config/getMongoDBConfig.ts","../src/util/dbProperty.ts","../src/util/removeId.ts"],"sourcesContent":["// TODO: By DB\nexport const COLLECTIONS = {\n  AddressInfo: 'address_info' as const,\n  ArchivistStats: 'archivist_stats' as const,\n  BoundWitnesses: 'bound_witnesses' as const,\n  Payloads: 'payloads' as const,\n  Thumbnails: 'thumbnails' as const,\n  Users: 'users' as const,\n}\n","export const DATABASES = {\n  Archivist: 'archivist' as const,\n}\n","export const DefaultAggregateTimeoutMs = 10_000\nexport const DefaultLimit = 20\nexport const DefaultMaxTimeMS = 2000\nexport const DefaultOrder = 'desc'\n","import { assertEx } from '@xylabs/assert'\nimport { merge } from '@xylabs/lodash'\nimport { staticImplements } from '@xylabs/static-implements'\nimport { Module } from '@xyo-network/module-model'\nimport { MongoDBModule, MongoDBModuleParams, MongoDBModuleStatic, MongoDBStorageClassLabels } from '@xyo-network/module-model-mongodb'\nimport { BoundWitnessWithMeta, PayloadWithMeta } from '@xyo-network/node-core-model'\nimport { BaseMongoSdk, BaseMongoSdkConfig } from '@xyo-network/sdk-xyo-mongo-js'\n\nimport { COLLECTIONS } from './Collections'\nimport { getBaseMongoSdkPrivateConfig } from './config'\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\nexport type AnyAbstractModule<TParams extends MongoDBModuleParams = MongoDBModuleParams> = abstract new (...args: any[]) => Module<TParams>\n\nexport const MongoDBModuleMixin = <\n  TParams extends MongoDBModuleParams = MongoDBModuleParams,\n  TModule extends AnyAbstractModule<TParams> = AnyAbstractModule<TParams>,\n>(\n  ModuleBase: TModule,\n) => {\n  @staticImplements<MongoDBModuleStatic>()\n  abstract class MongoModuleBase extends ModuleBase implements MongoDBModule {\n    static labels = MongoDBStorageClassLabels\n    _boundWitnessSdk: BaseMongoSdk<BoundWitnessWithMeta> | undefined\n    _payloadSdk: BaseMongoSdk<PayloadWithMeta> | undefined\n\n    get boundWitnessSdkConfig(): BaseMongoSdkConfig {\n      const config = { collection: COLLECTIONS.BoundWitnesses, ...getBaseMongoSdkPrivateConfig() }\n      return merge(config, this.params.boundWitnessSdkConfig, this.config.boundWitnessSdkConfig, {\n        collection: this.config.boundWitnessSdkConfig?.collection ?? this.params.boundWitnessSdkConfig?.collection ?? 'bound_witnesses',\n      })\n    }\n\n    get boundWitnesses() {\n      this._boundWitnessSdk = this._boundWitnessSdk ?? new BaseMongoSdk<BoundWitnessWithMeta>(this.boundWitnessSdkConfig)\n      return assertEx(this._boundWitnessSdk)\n    }\n\n    get jobQueue() {\n      return assertEx(this.params.jobQueue, 'MongoDBModule Error: jobQueue required for this module but is not defined')\n    }\n\n    get payloadSdkConfig(): BaseMongoSdkConfig {\n      const config = { collection: COLLECTIONS.Payloads, ...getBaseMongoSdkPrivateConfig() }\n      return merge(config, this.params.payloadSdkConfig, this.config.payloadSdkConfig, {\n        collection: this.config.payloadSdkConfig?.collection ?? this.params.payloadSdkConfig?.collection ?? 'payload',\n      })\n    }\n\n    get payloads() {\n      this._payloadSdk = this._payloadSdk ?? new BaseMongoSdk<PayloadWithMeta>(this.payloadSdkConfig)\n      return assertEx(this._payloadSdk)\n    }\n  }\n  return MongoModuleBase\n}\n","import { assertEx } from '@xylabs/assert'\nimport { BaseMongoSdk, BaseMongoSdkPrivateConfig } from '@xyo-network/sdk-xyo-mongo-js'\nimport { Document } from 'mongodb'\n\nimport { getMongoDBConfig } from './getMongoDBConfig'\n\nexport const getBaseMongoSdkPrivateConfig = (): BaseMongoSdkPrivateConfig => {\n  const env = getMongoDBConfig()\n  return {\n    dbConnectionString: env.MONGO_CONNECTION_STRING,\n    dbDomain: assertEx(env.MONGO_DOMAIN, 'Missing Mongo Domain'),\n    dbName: assertEx(env.MONGO_DATABASE, 'Missing Mongo Database'),\n    dbPassword: assertEx(env.MONGO_PASSWORD, 'Missing Mongo Password'),\n    dbUserName: assertEx(env.MONGO_USERNAME, 'Missing Mongo Username'),\n  }\n}\n\nexport const getBaseMongoSdk = <T extends Document>(collection: string) => {\n  return new BaseMongoSdk<T>({ ...getBaseMongoSdkPrivateConfig(), collection })\n}\n","export type MongoDbConnectionStringEnvVar = 'MONGO_CONNECTION_STRING'\nexport type MongoDbEnvVars = 'MONGO_DATABASE' | 'MONGO_DOMAIN' | 'MONGO_PASSWORD' | 'MONGO_USERNAME'\n\nexport type MongoEnv = Record<MongoDbEnvVars | MongoDbConnectionStringEnvVar, string | undefined>\n\nexport const getMongoDBConfig = (): MongoEnv => {\n  const env: MongoEnv = {} as MongoEnv\n  if (process.env.MONGO_CONNECTION_STRING) {\n    env.MONGO_CONNECTION_STRING = process.env.MONGO_CONNECTION_STRING\n  }\n  if (process.env.MONGO_DOMAIN) {\n    env.MONGO_DATABASE = process.env.MONGO_DATABASE\n    env.MONGO_DOMAIN = process.env.MONGO_DOMAIN\n    env.MONGO_PASSWORD = process.env.MONGO_PASSWORD\n    env.MONGO_USERNAME = process.env.MONGO_USERNAME\n  }\n  return env\n}\n","export const escapeChar = '#'\n\nexport const toDbProperty = (value: string) => value.replaceAll('.', escapeChar)\n\nexport const fromDbProperty = (value: string) => value.replaceAll(escapeChar, '.')\n","import { Payload } from '@xyo-network/payload-model'\nimport { OptionalId, WithId, WithoutId } from 'mongodb'\n\nexport const removeId = <T extends Payload = Payload>(payload: T | WithId<T> | WithoutId<T> | OptionalId<T>): WithoutId<T> => {\n  // eslint-disable-next-line @typescript-eslint/no-unused-vars\n  const { _id, ...withoutId } = payload as OptionalId<T>\n  return withoutId as WithoutId<T>\n}\n"],"mappings":"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","names":["COLLECTIONS","AddressInfo","ArchivistStats","BoundWitnesses","Payloads","Thumbnails","Users","DATABASES","Archivist","DefaultAggregateTimeoutMs","DefaultLimit","DefaultMaxTimeMS","DefaultOrder","assertEx","merge","staticImplements","MongoDBStorageClassLabels","BaseMongoSdk","assertEx","BaseMongoSdk","getMongoDBConfig","env","process","MONGO_CONNECTION_STRING","MONGO_DOMAIN","MONGO_DATABASE","MONGO_PASSWORD","MONGO_USERNAME","getBaseMongoSdkPrivateConfig","env","getMongoDBConfig","dbConnectionString","MONGO_CONNECTION_STRING","dbDomain","assertEx","MONGO_DOMAIN","dbName","MONGO_DATABASE","dbPassword","MONGO_PASSWORD","dbUserName","MONGO_USERNAME","MongoDBModuleMixin","ModuleBase","MongoModuleBase","labels","MongoDBStorageClassLabels","_boundWitnessSdk","_payloadSdk","boundWitnessSdkConfig","config","collection","COLLECTIONS","BoundWitnesses","getBaseMongoSdkPrivateConfig","merge","params","boundWitnesses","BaseMongoSdk","assertEx","jobQueue","payloadSdkConfig","Payloads","payloads","staticImplements","escapeChar","toDbProperty","value","replaceAll","fromDbProperty","removeId","payload","_id","withoutId"]}

package/dist/util/removeId.d.mts

@@ -1,7 +1,7 @@
 import { OptionalId, WithId, WithoutId } from 'mongodb';
 export declare const removeId: <T extends {
     schema: string;
-} = {
+} & import("@xyo-network/payload-model").PayloadFields = {
     schema: string;
-}>(payload: T | WithId<T> | WithoutId<T> | OptionalId<T>) => WithoutId<T>;
+} & import("@xyo-network/payload-model").PayloadFields>(payload: T | WithId<T> | WithoutId<T> | OptionalId<T>) => WithoutId<T>;
 //# sourceMappingURL=removeId.d.ts.map

package/dist/util/removeId.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"removeId.d.ts","sourceRoot":"","sources":["../../src/util/removeId.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAEvD,eAAO,MAAM,QAAQ;;;;yEAIpB,CAAA"}
+{"version":3,"file":"removeId.d.ts","sourceRoot":"","sources":["../../src/util/removeId.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAEvD,eAAO,MAAM,QAAQ;;;;8HAIpB,CAAA"}

package/dist/util/removeId.d.ts

@@ -1,7 +1,7 @@
 import { OptionalId, WithId, WithoutId } from 'mongodb';
 export declare const removeId: <T extends {
     schema: string;
-} = {
+} & import("@xyo-network/payload-model").PayloadFields = {
     schema: string;
-}>(payload: T | WithId<T> | WithoutId<T> | OptionalId<T>) => WithoutId<T>;
+} & import("@xyo-network/payload-model").PayloadFields>(payload: T | WithId<T> | WithoutId<T> | OptionalId<T>) => WithoutId<T>;
 //# sourceMappingURL=removeId.d.ts.map

package/dist/util/removeId.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"removeId.d.ts","sourceRoot":"","sources":["../../src/util/removeId.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAEvD,eAAO,MAAM,QAAQ;;;;yEAIpB,CAAA"}
+{"version":3,"file":"removeId.d.ts","sourceRoot":"","sources":["../../src/util/removeId.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,SAAS,CAAA;AAEvD,eAAO,MAAM,QAAQ;;;;8HAIpB,CAAA"}

package/package.json

@@ -11,17 +11,17 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.11.7",
+    "@xylabs/exists": "^2.11.7",
     "@xylabs/lodash": "^2.11.7",
     "@xylabs/static-implements": "^2.11.7",
-    "@xyo-network/module-abstract": "~2.74.3",
-    "@xyo-network/module-model": "~2.74.3",
-    "@xyo-network/module-model-mongodb": "~2.74.3",
-    "@xyo-network/node-core-model": "~2.74.3",
-    "@xyo-network/payload-model": "~2.74.3",
-    "mongodb": "^5.9.0"
+    "@xyo-network/module-model": "~2.74.5",
+    "@xyo-network/module-model-mongodb": "~2.74.5",
+    "@xyo-network/node-core-model": "~2.74.5",
+    "@xyo-network/payload-model": "~2.74.5",
+    "mongodb": "^6.1.0"
   },
   "peerDependencies": {
-    "@xyo-network/sdk-xyo-mongo-js": "~2.74.3"
+    "@xyo-network/sdk-xyo-mongo-js": "~2.74.5"
   },
   "peerDependenciesMeta": {
     "@xyo-network/sdk-xyo-mongo-js": {
@@ -31,7 +31,7 @@
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^3.0.28",
     "@xylabs/tsconfig": "^3.0.28",
-    "@xyo-network/sdk-xyo-mongo-js": "~2.74.3",
+    "@xyo-network/sdk-xyo-mongo-js": "~2.74.5",
     "fake-indexeddb": "^4.0.2",
     "typescript": "^5.2.2"
   },
@@ -69,5 +69,5 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.74.3"
+  "version": "2.74.5"
 }

package/src/Module.ts

@@ -1,41 +1,56 @@
 import { assertEx } from '@xylabs/assert'
 import { merge } from '@xylabs/lodash'
 import { staticImplements } from '@xylabs/static-implements'
-import { AbstractModuleInstance } from '@xyo-network/module-abstract'
-import { ModuleEventData, WithLabels } from '@xyo-network/module-model'
-import { MongoDBModuleParams, MongoDBStorageClassLabels } from '@xyo-network/module-model-mongodb'
+import { Module } from '@xyo-network/module-model'
+import { MongoDBModule, MongoDBModuleParams, MongoDBModuleStatic, MongoDBStorageClassLabels } from '@xyo-network/module-model-mongodb'
 import { BoundWitnessWithMeta, PayloadWithMeta } from '@xyo-network/node-core-model'
 import { BaseMongoSdk, BaseMongoSdkConfig } from '@xyo-network/sdk-xyo-mongo-js'
 
-@staticImplements<WithLabels<MongoDBStorageClassLabels>>()
-export abstract class MongoDBModule<
+import { COLLECTIONS } from './Collections'
+import { getBaseMongoSdkPrivateConfig } from './config'
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export type AnyAbstractModule<TParams extends MongoDBModuleParams = MongoDBModuleParams> = abstract new (...args: any[]) => Module<TParams>
+
+export const MongoDBModuleMixin = <
   TParams extends MongoDBModuleParams = MongoDBModuleParams,
-  TEventData extends ModuleEventData<object> = ModuleEventData<object>,
-> extends AbstractModuleInstance<TParams, TEventData> {
-  static labels = MongoDBStorageClassLabels
+  TModule extends AnyAbstractModule<TParams> = AnyAbstractModule<TParams>,
+>(
+  ModuleBase: TModule,
+) => {
+  @staticImplements<MongoDBModuleStatic>()
+  abstract class MongoModuleBase extends ModuleBase implements MongoDBModule {
+    static labels = MongoDBStorageClassLabels
+    _boundWitnessSdk: BaseMongoSdk<BoundWitnessWithMeta> | undefined
+    _payloadSdk: BaseMongoSdk<PayloadWithMeta> | undefined
 
-  private _boundWitnessSdk: BaseMongoSdk<BoundWitnessWithMeta> | undefined
-  private _payloadSdk: BaseMongoSdk<PayloadWithMeta> | undefined
+    get boundWitnessSdkConfig(): BaseMongoSdkConfig {
+      const config = { collection: COLLECTIONS.BoundWitnesses, ...getBaseMongoSdkPrivateConfig() }
+      return merge(config, this.params.boundWitnessSdkConfig, this.config.boundWitnessSdkConfig, {
+        collection: this.config.boundWitnessSdkConfig?.collection ?? this.params.boundWitnessSdkConfig?.collection ?? 'bound_witnesses',
+      })
+    }
 
-  get boundWitnessSdkConfig(): BaseMongoSdkConfig {
-    return merge({}, this.params.boundWitnessSdkConfig, this.config.boundWitnessSdkConfig, {
-      collection: this.config.boundWitnessSdkConfig?.collection ?? this.params.boundWitnessSdkConfig?.collection ?? 'bound_witnesses',
-    })
-  }
+    get boundWitnesses() {
+      this._boundWitnessSdk = this._boundWitnessSdk ?? new BaseMongoSdk<BoundWitnessWithMeta>(this.boundWitnessSdkConfig)
+      return assertEx(this._boundWitnessSdk)
+    }
 
-  get boundWitnesses() {
-    this._boundWitnessSdk = this._boundWitnessSdk ?? new BaseMongoSdk<BoundWitnessWithMeta>(this.boundWitnessSdkConfig)
-    return assertEx(this._boundWitnessSdk)
-  }
+    get jobQueue() {
+      return assertEx(this.params.jobQueue, 'MongoDBModule Error: jobQueue required for this module but is not defined')
+    }
 
-  get payloadSdkConfig(): BaseMongoSdkConfig {
-    return merge({}, this.params.payloadSdkConfig, this.config.payloadSdkConfig, {
-      collection: this.config.payloadSdkConfig?.collection ?? this.params.payloadSdkConfig?.collection ?? 'payload',
-    })
-  }
+    get payloadSdkConfig(): BaseMongoSdkConfig {
+      const config = { collection: COLLECTIONS.Payloads, ...getBaseMongoSdkPrivateConfig() }
+      return merge(config, this.params.payloadSdkConfig, this.config.payloadSdkConfig, {
+        collection: this.config.payloadSdkConfig?.collection ?? this.params.payloadSdkConfig?.collection ?? 'payload',
+      })
+    }
 
-  get payloads() {
-    this._payloadSdk = this._payloadSdk ?? new BaseMongoSdk<PayloadWithMeta>(this.payloadSdkConfig)
-    return assertEx(this._payloadSdk)
+    get payloads() {
+      this._payloadSdk = this._payloadSdk ?? new BaseMongoSdk<PayloadWithMeta>(this.payloadSdkConfig)
+      return assertEx(this._payloadSdk)
+    }
   }
+  return MongoModuleBase
 }

package/src/config/getBaseMongoSdk.ts

@@ -0,0 +1,20 @@
+import { assertEx } from '@xylabs/assert'
+import { BaseMongoSdk, BaseMongoSdkPrivateConfig } from '@xyo-network/sdk-xyo-mongo-js'
+import { Document } from 'mongodb'
+
+import { getMongoDBConfig } from './getMongoDBConfig'
+
+export const getBaseMongoSdkPrivateConfig = (): BaseMongoSdkPrivateConfig => {
+  const env = getMongoDBConfig()
+  return {
+    dbConnectionString: env.MONGO_CONNECTION_STRING,
+    dbDomain: assertEx(env.MONGO_DOMAIN, 'Missing Mongo Domain'),
+    dbName: assertEx(env.MONGO_DATABASE, 'Missing Mongo Database'),
+    dbPassword: assertEx(env.MONGO_PASSWORD, 'Missing Mongo Password'),
+    dbUserName: assertEx(env.MONGO_USERNAME, 'Missing Mongo Username'),
+  }
+}
+
+export const getBaseMongoSdk = <T extends Document>(collection: string) => {
+  return new BaseMongoSdk<T>({ ...getBaseMongoSdkPrivateConfig(), collection })
+}

package/src/config/getMongoDBConfig.ts

@@ -0,0 +1,18 @@
+export type MongoDbConnectionStringEnvVar = 'MONGO_CONNECTION_STRING'
+export type MongoDbEnvVars = 'MONGO_DATABASE' | 'MONGO_DOMAIN' | 'MONGO_PASSWORD' | 'MONGO_USERNAME'
+
+export type MongoEnv = Record<MongoDbEnvVars | MongoDbConnectionStringEnvVar, string | undefined>
+
+export const getMongoDBConfig = (): MongoEnv => {
+  const env: MongoEnv = {} as MongoEnv
+  if (process.env.MONGO_CONNECTION_STRING) {
+    env.MONGO_CONNECTION_STRING = process.env.MONGO_CONNECTION_STRING
+  }
+  if (process.env.MONGO_DOMAIN) {
+    env.MONGO_DATABASE = process.env.MONGO_DATABASE
+    env.MONGO_DOMAIN = process.env.MONGO_DOMAIN
+    env.MONGO_PASSWORD = process.env.MONGO_PASSWORD
+    env.MONGO_USERNAME = process.env.MONGO_USERNAME
+  }
+  return env
+}

package/src/config/hasMongoDBConfig.ts

@@ -0,0 +1,9 @@
+import { exists } from '@xylabs/exists'
+
+import { getMongoDBConfig } from './getMongoDBConfig'
+
+export const hasMongoDBConfig = (): boolean => {
+  const env = getMongoDBConfig()
+  const requiredValues = [env.MONGO_CONNECTION_STRING, env.MONGO_DATABASE, env.MONGO_DOMAIN, env.MONGO_PASSWORD, env.MONGO_USERNAME]
+  return requiredValues.every(exists)
+}

package/src/config/index.ts

@@ -0,0 +1,3 @@
+export * from './getBaseMongoSdk'
+export * from './getMongoDBConfig'
+export * from './hasMongoDBConfig'