@xyo-network/witness 2.46.3 → 2.47.0

package/dist/esm/AbstractWitness.js

@@ -20,7 +20,7 @@ export class AbstractWitness extends AbstractModule {
         this.started('throw');
         const payloadList = assertEx(payloads, 'Trying to witness nothing');
         assertEx(payloadList.length > 0, 'Trying to witness empty list');
-        payloadList?.forEach((payload) => assertEx(payload.schema, 'Missing Schema'));
+        payloadList?.forEach((payload) => assertEx(payload.schema, 'observe: Missing Schema'));
         this.logger?.debug(`result: ${JSON.stringify(payloadList, null, 2)}`);
         return payloadList;
     }

package/dist/esm/AbstractWitness.js.map

@@ -1 +1 @@
-{"version":3,"file":"AbstractWitness.js","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"AbstractWitness.js","sourceRoot":"","sources":["../../src/AbstractWitness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAA;AAC9C,OAAO,EACL,cAAc,EAId,wBAAwB,EACxB,eAAe,GAEhB,MAAM,qBAAqB,CAAA;AAE5B,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAI7D,OAAO,EAAE,4BAA4B,EAAmB,MAAM,WAAW,CAAA;AAGzE,MAAM,OAAgB,eAAqE,SAAQ,cAAuB;IACxH,MAAM,CAAU,YAAY,CAAQ;IAEpC,IAAa,OAAO;QAClB,OAAO,CAAC,4BAA4B,EAAE,GAAG,KAAK,CAAC,OAAO,CAAC,CAAA;IACzD,CAAC;IAED,IAAW,SAAS;QAClB,OAAO,IAAI,CAAC,MAAM,EAAE,SAAS,CAAA;IAC/B,CAAC;IAED,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAAgD;QAC3E,MAAM,YAAY,GAA4C,MAAM,IAAI,EAAE,CAAA;QAC1E,YAAY,CAAC,MAAM,GAAG,MAAM,EAAE,MAAM,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,YAAY,EAAE,CAAA;QACrE,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,YAAY,CAAC,CAAoB,CAAA;IAC9D,CAAC;IAEM,OAAO,CAAC,QAAuB;QACpC,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;QACrB,MAAM,WAAW,GAAG,QAAQ,CAAC,QAAQ,EAAE,2BAA2B,CAAC,CAAA;QACnE,QAAQ,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,8BAA8B,CAAC,CAAA;QAChE,WAAW,EAAE,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,EAAE,yBAAyB,CAAC,CAAC,CAAA;QACtF,IAAI,CAAC,MAAM,EAAE,KAAK,CAAC,WAAW,IAAI,CAAC,SAAS,CAAC,WAAW,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;QACrE,OAAO,WAAW,CAAA;IACpB,CAAC;IAEQ,KAAK,CAAC,KAAK,CAClB,KAAQ,EACR,QAAuB,EACvB,WAAqB;QAErB,MAAM,OAAO,GAAG,wBAAwB,CAAC,UAAU,CAAkB,KAAK,EAAE,QAAQ,CAAC,CAAA;QACrF,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,OAAO,CAAA;QACxC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC,CAAC,CAAA;QACtD,kFAAkF;QAClF,MAAM,mBAAmB,GAAG,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,cAAc,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,KAAK,CAAC,IAAI,EAAE,CAAA;QACrG,MAAM,YAAY,GAAG,IAAI,OAAO,EAAE,CAAA;QAClC,IAAI;YACF,QAAQ,UAAU,CAAC,MAAM,EAAE;gBACzB,KAAK,4BAA4B,CAAC,CAAC;oBACjC,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,mBAAmB,CAAC,CAAA;oBAC9D,OAAO,IAAI,CAAC,UAAU,CAAC,cAAc,EAAE,YAAY,CAAC,CAAA;iBACrD;gBACD,OAAO,CAAC,CAAC;oBACP,OAAO,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAA;iBACpC;aACF;SACF;QAAC,OAAO,EAAE,EAAE;YACX,MAAM,KAAK,GAAG,EAAW,CAAA;YACzB,OAAO,IAAI,CAAC,UAAU,CAAC,CAAC,IAAI,eAAe,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,YAAY,CAAC,CAAA;SACnG;IACH,CAAC;CACF;AAED,8CAA8C;AAC9C,MAAM,OAAgB,UAGpB,SAAQ,eAAwB;CAAG"}

package/dist/esm/WitnessWrapper.js

@@ -1,7 +1,21 @@
+import { assertEx } from '@xylabs/assert';
 import { ModuleWrapper } from '@xyo-network/module';
 import { PayloadWrapper } from '@xyo-network/payload-wrapper';
 import { XyoWitnessObserveQuerySchema } from './Queries';
 export class WitnessWrapper extends ModuleWrapper {
+    static requiredQueries = [XyoWitnessObserveQuerySchema, ...super.requiredQueries];
+    static tryWrap(module) {
+        const missingRequiredQueries = this.missingRequiredQueries(module);
+        if (missingRequiredQueries.length > 0) {
+            console.warn(`Missing queries: ${JSON.stringify(missingRequiredQueries, null, 2)}`);
+        }
+        else {
+            return new ModuleWrapper(module);
+        }
+    }
+    static wrap(module) {
+        return assertEx(this.tryWrap(module), 'Unable to wrap module as ModuleWrapper');
+    }
     observe(payloads) {
         const queryPayload = PayloadWrapper.parse({ schema: XyoWitnessObserveQuerySchema });
         return this.sendQuery(queryPayload, [queryPayload.payload, ...(payloads ?? [])]);

package/dist/esm/WitnessWrapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"WitnessWrapper.js","sourceRoot":"","sources":["../../src/WitnessWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAEnD,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,OAAO,EAA0B,4BAA4B,EAAE,MAAM,WAAW,CAAA;AAGhF,MAAM,OAAO,cAAe,SAAQ,aAAa;IAC/C,OAAO,CAAC,QAAuB;QAC7B,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAyB,EAAE,MAAM,EAAE,4BAA4B,EAAE,CAAC,CAAA;QAC3G,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IAClF,CAAC;CACF;AAED,6CAA6C;AAC7C,MAAM,OAAO,iBAAkB,SAAQ,cAAc;CAAG"}
+{"version":3,"file":"WitnessWrapper.js","sourceRoot":"","sources":["../../src/WitnessWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAU,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAE3D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAA;AAE7D,OAAO,EAA0B,4BAA4B,EAAE,MAAM,WAAW,CAAA;AAGhF,MAAM,OAAO,cAAe,SAAQ,aAAa;IAC/C,MAAM,CAAC,eAAe,GAAG,CAAC,4BAA4B,EAAE,GAAG,KAAK,CAAC,eAAe,CAAC,CAAA;IAEjF,MAAM,CAAC,OAAO,CAAC,MAAc;QAC3B,MAAM,sBAAsB,GAAG,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,CAAA;QAClE,IAAI,sBAAsB,CAAC,MAAM,GAAG,CAAC,EAAE;YACrC,OAAO,CAAC,IAAI,CAAC,oBAAoB,IAAI,CAAC,SAAS,CAAC,sBAAsB,EAAE,IAAI,EAAE,CAAC,CAAC,EAAE,CAAC,CAAA;SACpF;aAAM;YACL,OAAO,IAAI,aAAa,CAAC,MAAgB,CAAC,CAAA;SAC3C;IACH,CAAC;IAED,MAAM,CAAC,IAAI,CAAC,MAAc;QACxB,OAAO,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,wCAAwC,CAAC,CAAA;IACjF,CAAC;IAED,OAAO,CAAC,QAAuB;QAC7B,MAAM,YAAY,GAAG,cAAc,CAAC,KAAK,CAAyB,EAAE,MAAM,EAAE,4BAA4B,EAAE,CAAC,CAAA;QAC3G,OAAO,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC,YAAY,CAAC,OAAO,EAAE,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IAClF,CAAC;;AAGH,6CAA6C;AAC7C,MAAM,OAAO,iBAAkB,SAAQ,cAAc;CAAG"}

package/dist/types/WitnessWrapper.d.ts

@@ -1,7 +1,10 @@
-import { ModuleWrapper } from '@xyo-network/module';
+import { Module, ModuleWrapper } from '@xyo-network/module';
 import { XyoPayload, XyoPayloads } from '@xyo-network/payload-model';
 import { Witness } from './Witness';
 export declare class WitnessWrapper extends ModuleWrapper implements Witness {
+    static requiredQueries: string[];
+    static tryWrap(module: Module): ModuleWrapper | undefined;
+    static wrap(module: Module): ModuleWrapper;
     observe(payloads?: XyoPayload[]): Promise<XyoPayloads>;
 }
 /** @deprecated use WitnessWrapper instead */

package/dist/types/WitnessWrapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"WitnessWrapper.d.ts","sourceRoot":"","sources":["../../src/WitnessWrapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AACnD,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAIpE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,qBAAa,cAAe,SAAQ,aAAc,YAAW,OAAO;IAClE,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC;CAIvD;AAED,6CAA6C;AAC7C,qBAAa,iBAAkB,SAAQ,cAAc;CAAG"}
+{"version":3,"file":"WitnessWrapper.d.ts","sourceRoot":"","sources":["../../src/WitnessWrapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,qBAAqB,CAAA;AAC3D,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAIpE,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,qBAAa,cAAe,SAAQ,aAAc,YAAW,OAAO;IAClE,MAAM,CAAC,eAAe,WAA2D;IAEjF,MAAM,CAAC,OAAO,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IASzD,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE,MAAM,GAAG,aAAa;IAI1C,OAAO,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,GAAG,OAAO,CAAC,WAAW,CAAC;CAIvD;AAED,6CAA6C;AAC7C,qBAAa,iBAAkB,SAAQ,cAAc;CAAG"}

package/package.json

@@ -11,12 +11,12 @@
   },
   "dependencies": {
     "@xylabs/assert": "^2.7.1",
-    "@xyo-network/account": "^2.46.3",
-    "@xyo-network/module": "^2.46.3",
-    "@xyo-network/module-model": "^2.46.3",
-    "@xyo-network/payload-model": "^2.46.3",
-    "@xyo-network/payload-wrapper": "^2.46.3",
-    "@xyo-network/promise": "^2.46.3"
+    "@xyo-network/account": "^2.47.0",
+    "@xyo-network/module": "^2.47.0",
+    "@xyo-network/module-model": "^2.47.0",
+    "@xyo-network/payload-model": "^2.47.0",
+    "@xyo-network/payload-wrapper": "^2.47.0",
+    "@xyo-network/promise": "^2.47.0"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^2.14.15",
@@ -56,5 +56,5 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.46.3"
+  "version": "2.47.0"
 }

package/src/AbstractWitness.ts

@@ -38,7 +38,7 @@ export abstract class AbstractWitness<TConfig extends XyoWitnessConfig = XyoWitn
     this.started('throw')
     const payloadList = assertEx(payloads, 'Trying to witness nothing')
     assertEx(payloadList.length > 0, 'Trying to witness empty list')
-    payloadList?.forEach((payload) => assertEx(payload.schema, 'Missing Schema'))
+    payloadList?.forEach((payload) => assertEx(payload.schema, 'observe: Missing Schema'))
     this.logger?.debug(`result: ${JSON.stringify(payloadList, null, 2)}`)
     return payloadList
   }

package/src/WitnessWrapper.ts

@@ -1,4 +1,5 @@
-import { ModuleWrapper } from '@xyo-network/module'
+import { assertEx } from '@xylabs/assert'
+import { Module, ModuleWrapper } from '@xyo-network/module'
 import { XyoPayload, XyoPayloads } from '@xyo-network/payload-model'
 import { PayloadWrapper } from '@xyo-network/payload-wrapper'
 
@@ -6,6 +7,21 @@ import { XyoWitnessObserveQuery, XyoWitnessObserveQuerySchema } from './Queries'
 import { Witness } from './Witness'
 
 export class WitnessWrapper extends ModuleWrapper implements Witness {
+  static requiredQueries = [XyoWitnessObserveQuerySchema, ...super.requiredQueries]
+
+  static tryWrap(module: Module): ModuleWrapper | undefined {
+    const missingRequiredQueries = this.missingRequiredQueries(module)
+    if (missingRequiredQueries.length > 0) {
+      console.warn(`Missing queries: ${JSON.stringify(missingRequiredQueries, null, 2)}`)
+    } else {
+      return new ModuleWrapper(module as Module)
+    }
+  }
+
+  static wrap(module: Module): ModuleWrapper {
+    return assertEx(this.tryWrap(module), 'Unable to wrap module as ModuleWrapper')
+  }
+
   observe(payloads?: XyoPayload[]): Promise<XyoPayloads> {
     const queryPayload = PayloadWrapper.parse<XyoWitnessObserveQuery>({ schema: XyoWitnessObserveQuerySchema })
     return this.sendQuery(queryPayload, [queryPayload.payload, ...(payloads ?? [])])