@xyo-network/module-abstract 2.53.15 → 2.53.17

package/src/Error.ts

@@ -1,24 +1,24 @@
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { Payload } from '@xyo-network/payload-model'
 
-export type XyoErrorSchema = 'network.xyo.error'
-export const XyoErrorSchema: XyoErrorSchema = 'network.xyo.error'
+export type ModuleErrorSchema = 'network.xyo.error.module'
+export const ModuleErrorSchema: ModuleErrorSchema = 'network.xyo.error.module'
 
-export type XyoError = Payload<{ message?: string; schema: XyoErrorSchema; sources: string[] }>
+export type ModuleError = Payload<{ message?: string; schema: ModuleErrorSchema; sources: string[] }>
 
-export class XyoErrorBuilder extends PayloadBuilder {
+export class ModuleErrorBuilder extends PayloadBuilder {
   message?: string
   sources: string[]
   constructor(sources: string[], message?: string) {
-    super({ schema: XyoErrorSchema })
+    super({ schema: ModuleErrorSchema })
     this.sources = sources
     this.message = message
   }
 
-  override build(): XyoError {
+  override build(): ModuleError {
     return {
       message: this.message,
-      schema: XyoErrorSchema,
+      schema: ModuleErrorSchema,
       sources: this.sources,
     }
   }

package/src/Query/QueryBoundWitnessBuilder.ts

@@ -1,18 +1,18 @@
 import { assertEx } from '@xylabs/assert'
 import { BoundWitnessBuilder } from '@xyo-network/boundwitness-builder'
-import { XyoQuery, XyoQueryBoundWitness, XyoQueryBoundWitnessSchema } from '@xyo-network/module-model'
+import { Query, QueryBoundWitness, QueryBoundWitnessSchema } from '@xyo-network/module-model'
 import { PayloadSetPayload } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 
 export class QueryBoundWitnessBuilder<
-  TBoundWitness extends XyoQueryBoundWitness = XyoQueryBoundWitness,
-  TQuery extends XyoQuery = XyoQuery,
+  TBoundWitness extends QueryBoundWitness = QueryBoundWitness,
+  TQuery extends Query = Query,
 > extends BoundWitnessBuilder<TBoundWitness> {
   private _query: PayloadWrapper<TQuery> | undefined
   private _resultSet: PayloadWrapper<PayloadSetPayload> | undefined
 
   override hashableFields(): TBoundWitness {
-    return { ...super.hashableFields(), query: assertEx(this._query?.hash, 'No Query Specified'), schema: XyoQueryBoundWitnessSchema }
+    return { ...super.hashableFields(), query: assertEx(this._query?.hash, 'No Query Specified'), schema: QueryBoundWitnessSchema }
   }
 
   query<T extends TQuery | PayloadWrapper<TQuery>>(query: T) {

package/src/Query/QueryBoundWitnessValidator.ts

@@ -1,14 +1,15 @@
+import { assertEx } from '@xylabs/assert'
 import { BoundWitnessValidator } from '@xyo-network/boundwitness-validator'
-import { XyoQuery, XyoQueryBoundWitness, XyoQueryBoundWitnessSchema } from '@xyo-network/module-model'
+import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
+import { Query, QueryBoundWitness, QueryBoundWitnessSchema } from '@xyo-network/module-model'
+import { PayloadSetPayload } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 
-import { QueryBoundWitnessWrapper } from './QueryBoundWitnessWrapper'
-
-export class QueryBoundWitnessValidator<T extends XyoQuery = XyoQuery> extends BoundWitnessValidator<XyoQueryBoundWitness> {
+export class QueryBoundWitnessValidator<T extends Query = Query> extends BoundWitnessValidator<QueryBoundWitness> {
   private _query: PayloadWrapper<T> | undefined
 
   protected override get expectedSchema(): string {
-    return XyoQueryBoundWitnessSchema
+    return QueryBoundWitnessSchema
   }
 
   static isQueryBoundWitnessValidator(obj: unknown) {
@@ -24,17 +25,23 @@ export class QueryBoundWitnessValidator<T extends XyoQuery = XyoQuery> extends B
 
   validateResultSet() {
     const errors: Error[] = []
-    const wrapper = new QueryBoundWitnessWrapper(this.obj)
-    const required = wrapper.resultSet.payload.required
-    if (required) {
-      Object.entries(required).forEach(([key, value]) => {
-        const found = wrapper.payloadSchemas.reduce((count, schema) => {
-          return count + (schema === key ? 1 : 0)
-        }, 0)
-        if (found !== value) {
-          errors.push(Error(`validateResultSet: Missing Schema [${key}:${found}:${value}]`))
-        }
-      })
+    try {
+      const resultSetHash = assertEx(this.obj.resultSet, 'Missing ResultSet')
+      const wrapper = BoundWitnessWrapper.parse(this.obj)
+      const resultSet = PayloadWrapper.parse<PayloadSetPayload>(wrapper.payloads[resultSetHash] as PayloadSetPayload)
+      const required = resultSet?.payload.required
+      if (required) {
+        Object.entries(required).forEach(([key, value]) => {
+          const found = wrapper.payloadSchemas.reduce((count, schema) => {
+            return count + (schema === key ? 1 : 0)
+          }, 0)
+          if (found !== value) {
+            errors.push(Error(`validateResultSet: Missing Schema [${key}:${found}:${value}]`))
+          }
+        })
+      }
+    } catch (ex) {
+      errors.push(ex as Error)
     }
     return errors
   }

package/src/Query/QueryBoundWitnessWrapper.ts

@@ -1,12 +1,12 @@
 import { assertEx } from '@xylabs/assert'
 import { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'
-import { XyoQuery, XyoQueryBoundWitness } from '@xyo-network/module-model'
+import { Query, QueryBoundWitness } from '@xyo-network/module-model'
 import { Payload, PayloadSetPayload } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 
 import { QueryBoundWitnessValidator } from './QueryBoundWitnessValidator'
 
-export class QueryBoundWitnessWrapper<T extends XyoQuery = XyoQuery> extends BoundWitnessWrapper<XyoQueryBoundWitness> {
+export class QueryBoundWitnessWrapper<T extends Query = Query> extends BoundWitnessWrapper<QueryBoundWitness> {
   private _query: PayloadWrapper<T> | undefined
   private _resultSet: PayloadWrapper<PayloadSetPayload> | undefined
 
@@ -19,7 +19,7 @@ export class QueryBoundWitnessWrapper<T extends XyoQuery = XyoQuery> extends Bou
   get query() {
     return assertEx(
       (this._query =
-        this._query ?? this.payloads[this.boundwitness.query] ? PayloadWrapper.parse<T>(this.payloads[this.boundwitness.query]) : undefined),
+        this._query ?? this.payloads[this.boundwitness.query] ? (this.payloads[this.boundwitness.query] as PayloadWrapper<T>) : undefined),
       () => `Missing Query [${this.boundwitness}, ${JSON.stringify(this.payloads, null, 2)}]`,
     )
   }
@@ -31,19 +31,19 @@ export class QueryBoundWitnessWrapper<T extends XyoQuery = XyoQuery> extends Bou
         this._resultSet ??
         (resultSetHash
           ? this.payloads[resultSetHash]
-            ? PayloadWrapper.parse<PayloadSetPayload>(this.payloads[resultSetHash])
+            ? (this.payloads[resultSetHash] as PayloadWrapper<PayloadSetPayload>)
             : undefined
           : undefined)),
       () => `Missing resultSet [${resultSetHash}, ${JSON.stringify(this.payloads, null, 2)}]`,
     )
   }
 
-  static parseQuery<T extends XyoQuery = XyoQuery>(obj: unknown, payloads?: Payload[]): QueryBoundWitnessWrapper<T> {
+  static parseQuery<T extends Query = Query>(obj: unknown, payloads?: Payload[]): QueryBoundWitnessWrapper<T> {
     assertEx(!Array.isArray(obj), 'Array can not be converted to QueryBoundWitnessWrapper')
     switch (typeof obj) {
       case 'object': {
         const castWrapper = obj as QueryBoundWitnessWrapper<T>
-        const wrapper = castWrapper?.isQueryBoundWitnessWrapper ? castWrapper : new QueryBoundWitnessWrapper<T>(obj as XyoQueryBoundWitness, payloads)
+        const wrapper = castWrapper?.isQueryBoundWitnessWrapper ? castWrapper : new QueryBoundWitnessWrapper<T>(obj as QueryBoundWitness, payloads)
         if (!wrapper.valid) {
           console.warn(`Parsed invalid QueryBoundWitness ${JSON.stringify(wrapper.errors.map((error) => error.message))}`)
         }

package/src/QueryValidator/QueryValidator.ts

@@ -1,8 +1,8 @@
-import { XyoQueryBoundWitness } from '@xyo-network/module-model'
+import { QueryBoundWitness } from '@xyo-network/module-model'
 import { Payload } from '@xyo-network/payload-model'
 
-export type Queryable<T extends XyoQueryBoundWitness = XyoQueryBoundWitness> = (query: T, payloads?: Payload[]) => boolean
+export type Queryable<T extends QueryBoundWitness = QueryBoundWitness> = (query: T, payloads?: Payload[]) => boolean
 
-export interface QueryValidator<T extends XyoQueryBoundWitness = XyoQueryBoundWitness> {
+export interface QueryValidator<T extends QueryBoundWitness = QueryBoundWitness> {
   queryable: Queryable<T>
 }

package/src/QueryValidator/SupportedQueryValidator.ts

@@ -1,14 +1,10 @@
-import { Module, ModuleQuery, XyoQueryBoundWitness } from '@xyo-network/module-model'
+import { Module, ModuleQuery, QueryBoundWitness } from '@xyo-network/module-model'
 import { Payload } from '@xyo-network/payload-model'
 
 import { QueryBoundWitnessWrapper } from '../Query'
 import { Queryable, QueryValidator } from './QueryValidator'
 
-export const isQuerySupportedByModule = <T extends XyoQueryBoundWitness = XyoQueryBoundWitness>(
-  mod: Module,
-  query: T,
-  payloads?: Payload[],
-): boolean => {
+export const isQuerySupportedByModule = <T extends QueryBoundWitness = QueryBoundWitness>(mod: Module, query: T, payloads?: Payload[]): boolean => {
   const wrapper = QueryBoundWitnessWrapper.parseQuery<ModuleQuery>(query, payloads)
   const schema = wrapper.query.schema
   return mod.queries.includes(schema)

package/src/index.ts

@@ -2,7 +2,6 @@ export * from './AbstractModule'
 export * from './BaseEmitter'
 export * from './Error'
 export * from './lib'
-export * from './ModuleWrapper'
 export * from './Query'
 export * from './QueryValidator'
 export * from './Resolver'

package/dist/cjs/IdLogger.js

@@ -1,38 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.IdLogger = void 0;
-const shared_1 = require("@xyo-network/shared");
-class IdLogger {
-    constructor(logger, id) {
-        this._logger = logger;
-        this._id = id;
-    }
-    set id(id) {
-        this._id = () => id;
-    }
-    debug(message) {
-        var _a;
-        (_a = this._logger) === null || _a === void 0 ? void 0 : _a.debug(this.generate(message, (0, shared_1.getFunctionName)(3)));
-    }
-    error(message) {
-        var _a;
-        (_a = this._logger) === null || _a === void 0 ? void 0 : _a.error(this.generate(message, (0, shared_1.getFunctionName)(3)));
-    }
-    info(message) {
-        var _a;
-        (_a = this._logger) === null || _a === void 0 ? void 0 : _a.info(this.generate(message, (0, shared_1.getFunctionName)(3)));
-    }
-    log(message) {
-        var _a;
-        (_a = this._logger) === null || _a === void 0 ? void 0 : _a.log(this.generate(message, (0, shared_1.getFunctionName)(3)));
-    }
-    warn(message) {
-        var _a;
-        (_a = this._logger) === null || _a === void 0 ? void 0 : _a.warn(this.generate(message, (0, shared_1.getFunctionName)(3)));
-    }
-    generate(message, tag) {
-        return `${tag} ${this._id ? `[${this._id}] ` : ''}${typeof message === 'string' ? message : typeof message === 'object' ? JSON.stringify(message, null, 2) : `${message}`}`;
-    }
-}
-exports.IdLogger = IdLogger;
-//# sourceMappingURL=IdLogger.js.map

package/dist/cjs/IdLogger.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"IdLogger.js","sourceRoot":"","sources":["../../src/IdLogger.ts"],"names":[],"mappings":";;;AAAA,gDAA6D;AAE7D,MAAa,QAAQ;IAInB,YAAY,MAAc,EAAE,EAAiB;QAC3C,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;QACrB,IAAI,CAAC,GAAG,GAAG,EAAE,CAAA;IACf,CAAC;IAED,IAAI,EAAE,CAAC,EAAU;QACf,IAAI,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,EAAE,CAAA;IACrB,CAAC;IAED,KAAK,CAAC,OAAiB;;QACrB,MAAA,IAAI,CAAC,OAAO,0CAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAA,wBAAe,EAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACjE,CAAC;IACD,KAAK,CAAC,OAAiB;;QACrB,MAAA,IAAI,CAAC,OAAO,0CAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAA,wBAAe,EAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACjE,CAAC;IACD,IAAI,CAAC,OAAiB;;QACpB,MAAA,IAAI,CAAC,OAAO,0CAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAA,wBAAe,EAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAChE,CAAC;IACD,GAAG,CAAC,OAAiB;;QACnB,MAAA,IAAI,CAAC,OAAO,0CAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAA,wBAAe,EAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/D,CAAC;IACD,IAAI,CAAC,OAAiB;;QACpB,MAAA,IAAI,CAAC,OAAO,0CAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,IAAA,wBAAe,EAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAChE,CAAC;IAEO,QAAQ,CAAC,OAAiB,EAAE,GAAY;QAC9C,OAAO,GAAG,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,GAC/C,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,EACrH,EAAE,CAAA;IACJ,CAAC;CACF;AAlCD,4BAkCC"}

package/dist/cjs/ModuleWrapper.js

@@ -1,227 +0,0 @@
-"use strict";
-var ModuleWrapper_1;
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModuleWrapper = exports.moduleConstructable = void 0;
-const tslib_1 = require("tslib");
-const assert_1 = require("@xylabs/assert");
-const account_1 = require("@xyo-network/account");
-const address_payload_plugin_1 = require("@xyo-network/address-payload-plugin");
-const boundwitness_wrapper_1 = require("@xyo-network/boundwitness-wrapper");
-const core_1 = require("@xyo-network/core");
-const module_model_1 = require("@xyo-network/module-model");
-const payload_wrapper_1 = require("@xyo-network/payload-wrapper");
-const promise_1 = require("@xyo-network/promise");
-const compact_1 = tslib_1.__importDefault(require("lodash/compact"));
-const Error_1 = require("./Error");
-const lib_1 = require("./lib");
-const Query_1 = require("./Query");
-function moduleConstructable() {
-    return (constructor) => {
-        constructor;
-    };
-}
-exports.moduleConstructable = moduleConstructable;
-let ModuleWrapper = ModuleWrapper_1 = class ModuleWrapper extends core_1.Base {
-    constructor(params) {
-        const mutatedParams = Object.assign({}, params);
-        //unwrap it if already wrapped
-        const wrapper = params.module;
-        if (wrapper.module) {
-            mutatedParams.module = wrapper.module;
-        }
-        //set the root params to the wrapped module params
-        super(params.module.params);
-        this.eventData = {};
-        this.wrapperParams = params;
-    }
-    get account() {
-        return this.wrapperParams.account;
-    }
-    get address() {
-        return this.module.address;
-    }
-    get config() {
-        return this.module.config;
-    }
-    get downResolver() {
-        return this.module.downResolver;
-    }
-    get module() {
-        return this.wrapperParams.module;
-    }
-    get queries() {
-        return this.module.queries;
-    }
-    get upResolver() {
-        return this.module.upResolver;
-    }
-    static canWrap(module) {
-        return !!module && this.missingRequiredQueries(module).length === 0;
-    }
-    static hasRequiredQueries(module) {
-        return this.missingRequiredQueries(module).length === 0;
-    }
-    static missingRequiredQueries(module) {
-        const moduleQueries = module.queries;
-        return (0, compact_1.default)(this.requiredQueries.map((query) => {
-            return moduleQueries.find((item) => item === query) ? null : query;
-        }));
-    }
-    static tryWrap(module, account) {
-        var _a;
-        if (this.canWrap(module)) {
-            if (!account) {
-                (_a = this.defaultLogger) === null || _a === void 0 ? void 0 : _a.info('Anonymous Module Wrapper Created');
-            }
-            return new ModuleWrapper_1({ account, module: module });
-        }
-    }
-    static wrap(module, account) {
-        return (0, assert_1.assertEx)(this.tryWrap(module, account), 'Unable to wrap module as ModuleWrapper');
-    }
-    clearListeners(eventNames) {
-        return this.module.clearListeners(eventNames);
-    }
-    describe() {
-        var _a;
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            const description = {
-                address: this.module.address,
-                queries: this.module.queries,
-            };
-            if (this.config.name) {
-                description.name = this.config.name;
-            }
-            const discover = yield this.discover();
-            description.children = (0, compact_1.default)((_a = discover === null || discover === void 0 ? void 0 : discover.map((payload) => {
-                const address = payload.schema === address_payload_plugin_1.AddressSchema ? payload.address : undefined;
-                return address != this.module.address ? address : undefined;
-            })) !== null && _a !== void 0 ? _a : []);
-            return description;
-        });
-    }
-    discover() {
-        const queryPayload = payload_wrapper_1.PayloadWrapper.parse({ schema: module_model_1.ModuleDiscoverQuerySchema });
-        return this.sendQuery(queryPayload);
-    }
-    emit(eventName, eventArgs) {
-        return this.module.emit(eventName, eventArgs);
-    }
-    emitSerial(eventName, eventArgs) {
-        return this.module.emitSerial(eventName, eventArgs);
-    }
-    listenerCount(eventNames) {
-        return this.module.listenerCount(eventNames);
-    }
-    off(eventNames, listener) {
-        return this.module.off(eventNames, listener);
-    }
-    offAny(listener) {
-        return this.module.offAny(listener);
-    }
-    on(eventNames, listener) {
-        return this.module.on(eventNames, listener);
-    }
-    onAny(listener) {
-        return this.module.onAny(listener);
-    }
-    once(eventName, listener) {
-        return this.module.once(eventName, listener);
-    }
-    query(query, payloads) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            return yield this.module.query(query, payloads);
-        });
-    }
-    queryable(query, payloads) {
-        return this.module.queryable(query, payloads);
-    }
-    resolve(nameOrAddressOrFilter) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            switch (typeof nameOrAddressOrFilter) {
-                case 'string': {
-                    const byAddress = account_1.Account.isAddress(nameOrAddressOrFilter)
-                        ? (yield this.resolve({ address: [nameOrAddressOrFilter] })).pop()
-                        : undefined;
-                    return byAddress !== null && byAddress !== void 0 ? byAddress : (yield this.resolve({ name: [nameOrAddressOrFilter] })).pop();
-                }
-                default: {
-                    const filter = nameOrAddressOrFilter;
-                    return [...(yield this.module.downResolver.resolve(filter)), ...(yield this.module.upResolver.resolve(filter))].filter(lib_1.duplicateModules);
-                }
-            }
-        });
-    }
-    resolveWrapped(wrapper, nameOrAddressOrFilter) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            switch (typeof nameOrAddressOrFilter) {
-                case 'string': {
-                    const nameOrAddress = nameOrAddressOrFilter;
-                    const mod = yield this.resolve(nameOrAddress);
-                    return mod ? new wrapper({ account: this.account, module: mod }) : undefined;
-                }
-                default: {
-                    const filter = nameOrAddressOrFilter;
-                    return (yield this.resolve(filter)).map((mod) => new wrapper({ account: this.account, module: mod }));
-                }
-            }
-        });
-    }
-    bindQuery(query, payloads, account = this.account) {
-        const promise = new promise_1.PromiseEx((resolve) => {
-            const result = this.bindQueryInternal(query, payloads, account);
-            resolve === null || resolve === void 0 ? void 0 : resolve(result);
-            return result;
-        }, account);
-        return promise;
-    }
-    bindQueryInternal(query, payloads, account = this.account) {
-        const builder = new Query_1.QueryBoundWitnessBuilder().payloads(payloads).query(query);
-        const result = (account ? builder.witness(account) : builder).build();
-        return result;
-    }
-    filterErrors(query, result) {
-        var _a, _b;
-        return ((_b = (_a = result === null || result === void 0 ? void 0 : result[1]) === null || _a === void 0 ? void 0 : _a.filter((payload) => {
-            var _a;
-            if ((payload === null || payload === void 0 ? void 0 : payload.schema) === Error_1.XyoErrorSchema) {
-                const wrapper = new Query_1.QueryBoundWitnessWrapper(query[0]);
-                return (_a = payload.sources) === null || _a === void 0 ? void 0 : _a.includes(wrapper.hash);
-            }
-            return false;
-        })) !== null && _b !== void 0 ? _b : []);
-    }
-    sendQuery(queryPayload, payloads) {
-        return tslib_1.__awaiter(this, void 0, void 0, function* () {
-            //make sure we did not get wrapped payloads
-            const unwrappedPayloads = payloads === null || payloads === void 0 ? void 0 : payloads.map((payload) => (0, assert_1.assertEx)(payload_wrapper_1.PayloadWrapper.unwrap(payload), 'Unable to parse payload'));
-            const unwrappedQueryPayload = (0, assert_1.assertEx)(boundwitness_wrapper_1.BoundWitnessWrapper.unwrap(queryPayload), 'Unable to parse queryPayload');
-            // Bind them
-            const query = yield this.bindQuery(unwrappedQueryPayload, unwrappedPayloads);
-            // Send them off
-            const result = yield this.module.query(query[0], query[1]);
-            this.throwErrors(query, result);
-            return result[1];
-        });
-    }
-    throwErrors(query, result) {
-        const errors = this.filterErrors(query, result);
-        if ((errors === null || errors === void 0 ? void 0 : errors.length) > 0) {
-            const error = {
-                errors,
-                message: errors.reduce((message, error) => `${message}${message.length > 0 ? '|' : ''}${error === null || error === void 0 ? void 0 : error.message}`, ''),
-                name: 'XyoError',
-                query,
-                result,
-            };
-            throw error;
-        }
-    }
-};
-ModuleWrapper.requiredQueries = [module_model_1.ModuleDiscoverQuerySchema];
-ModuleWrapper = ModuleWrapper_1 = tslib_1.__decorate([
-    moduleConstructable(),
-    tslib_1.__metadata("design:paramtypes", [Object])
-], ModuleWrapper);
-exports.ModuleWrapper = ModuleWrapper;
-//# sourceMappingURL=ModuleWrapper.js.map

package/dist/cjs/ModuleWrapper.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ModuleWrapper.js","sourceRoot":"","sources":["../../src/ModuleWrapper.ts"],"names":[],"mappings":"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"}

package/dist/esm/IdLogger.js

@@ -1,31 +0,0 @@
-import { getFunctionName } from '@xyo-network/shared';
-export class IdLogger {
-    _id;
-    _logger;
-    constructor(logger, id) {
-        this._logger = logger;
-        this._id = id;
-    }
-    set id(id) {
-        this._id = () => id;
-    }
-    debug(message) {
-        this._logger?.debug(this.generate(message, getFunctionName(3)));
-    }
-    error(message) {
-        this._logger?.error(this.generate(message, getFunctionName(3)));
-    }
-    info(message) {
-        this._logger?.info(this.generate(message, getFunctionName(3)));
-    }
-    log(message) {
-        this._logger?.log(this.generate(message, getFunctionName(3)));
-    }
-    warn(message) {
-        this._logger?.warn(this.generate(message, getFunctionName(3)));
-    }
-    generate(message, tag) {
-        return `${tag} ${this._id ? `[${this._id}] ` : ''}${typeof message === 'string' ? message : typeof message === 'object' ? JSON.stringify(message, null, 2) : `${message}`}`;
-    }
-}
-//# sourceMappingURL=IdLogger.js.map

package/dist/esm/IdLogger.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"IdLogger.js","sourceRoot":"","sources":["../../src/IdLogger.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAU,MAAM,qBAAqB,CAAA;AAE7D,MAAM,OAAO,QAAQ;IACX,GAAG,CAAe;IAClB,OAAO,CAAQ;IAEvB,YAAY,MAAc,EAAE,EAAiB;QAC3C,IAAI,CAAC,OAAO,GAAG,MAAM,CAAA;QACrB,IAAI,CAAC,GAAG,GAAG,EAAE,CAAA;IACf,CAAC;IAED,IAAI,EAAE,CAAC,EAAU;QACf,IAAI,CAAC,GAAG,GAAG,GAAG,EAAE,CAAC,EAAE,CAAA;IACrB,CAAC;IAED,KAAK,CAAC,OAAiB;QACrB,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACjE,CAAC;IACD,KAAK,CAAC,OAAiB;QACrB,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACjE,CAAC;IACD,IAAI,CAAC,OAAiB;QACpB,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAChE,CAAC;IACD,GAAG,CAAC,OAAiB;QACnB,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAC/D,CAAC;IACD,IAAI,CAAC,OAAiB;QACpB,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAChE,CAAC;IAEO,QAAQ,CAAC,OAAiB,EAAE,GAAY;QAC9C,OAAO,GAAG,GAAG,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,IAAI,IAAI,CAAC,GAAG,IAAI,CAAC,CAAC,CAAC,EAAE,GAC/C,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,OAAO,OAAO,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,EACrH,EAAE,CAAA;IACJ,CAAC;CACF"}