@xyo-network/witness-model 2.66.9 → 2.67.0-rc.2

package/dist/cjs/EventData.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=EventData.js.map

package/dist/cjs/EventData.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EventData.js","sourceRoot":"","sources":["../../src/EventData.ts"],"names":[],"mappings":""}

package/dist/cjs/Instance.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=Instance.js.map

package/dist/cjs/Instance.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Instance.js","sourceRoot":"","sources":["../../src/Instance.ts"],"names":[],"mappings":""}

package/dist/cjs/index.js

@@ -2,7 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 tslib_1.__exportStar(require("./Config"), exports);
+tslib_1.__exportStar(require("./EventData"), exports);
 tslib_1.__exportStar(require("./Events"), exports);
+tslib_1.__exportStar(require("./Instance"), exports);
 tslib_1.__exportStar(require("./Module"), exports);
 tslib_1.__exportStar(require("./Params"), exports);
 tslib_1.__exportStar(require("./Queries"), exports);

package/dist/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,mDAAwB;AACxB,mDAAwB;AACxB,mDAAwB;AACxB,mDAAwB;AACxB,oDAAyB;AACzB,uDAA4B;AAC5B,oDAAyB"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;;AAAA,mDAAwB;AACxB,sDAA2B;AAC3B,mDAAwB;AACxB,qDAA0B;AAC1B,mDAAwB;AACxB,mDAAwB;AACxB,oDAAyB;AACzB,uDAA4B;AAC5B,oDAAyB"}

package/dist/cjs/typeChecks.js

@@ -2,11 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.withWitnessInstance = exports.withWitnessModule = exports.asWitnessInstance = exports.asWitnessModule = exports.isWitnessModule = exports.isWitnessInstance = void 0;
 const module_model_1 = require("@xyo-network/module-model");
+const object_identity_1 = require("@xyo-network/object-identity");
 const Queries_1 = require("./Queries");
-exports.isWitnessInstance = module_model_1.IsInstanceFactory.create({ observe: 'function' }, module_model_1.isModuleInstance);
-exports.isWitnessModule = module_model_1.IsModuleFactory.create([Queries_1.WitnessObserveQuerySchema]);
-exports.asWitnessModule = module_model_1.AsFactory.create(exports.isWitnessModule);
-exports.asWitnessInstance = module_model_1.AsFactory.create(exports.isWitnessInstance);
+exports.isWitnessInstance = new module_model_1.IsInstanceFactory().create({ observe: 'function' }, [module_model_1.isModuleInstance]);
+exports.isWitnessModule = new module_model_1.IsModuleFactory().create([Queries_1.WitnessObserveQuerySchema]);
+exports.asWitnessModule = object_identity_1.AsObjectFactory.create(exports.isWitnessModule);
+exports.asWitnessInstance = object_identity_1.AsObjectFactory.create(exports.isWitnessInstance);
 exports.withWitnessModule = module_model_1.WithFactory.create(exports.isWitnessModule);
 exports.withWitnessInstance = module_model_1.WithFactory.create(exports.isWitnessInstance);
 //# sourceMappingURL=typeChecks.js.map

package/dist/cjs/typeChecks.js.map

@@ -1 +1 @@
-{"version":3,"file":"typeChecks.js","sourceRoot":"","sources":["../../src/typeChecks.ts"],"names":[],"mappings":";;;AAAA,4DAAwH;AAGxH,uCAAqD;AAExC,QAAA,iBAAiB,GAAG,gCAAiB,CAAC,MAAM,CAAkB,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,+BAAgB,CAAC,CAAA;AACxG,QAAA,eAAe,GAAG,8BAAe,CAAC,MAAM,CAAgB,CAAC,mCAAyB,CAAC,CAAC,CAAA;AAEpF,QAAA,eAAe,GAAG,wBAAS,CAAC,MAAM,CAAC,uBAAe,CAAC,CAAA;AACnD,QAAA,iBAAiB,GAAG,wBAAS,CAAC,MAAM,CAAC,yBAAiB,CAAC,CAAA;AACvD,QAAA,iBAAiB,GAAG,0BAAW,CAAC,MAAM,CAAC,uBAAe,CAAC,CAAA;AACvD,QAAA,mBAAmB,GAAG,0BAAW,CAAC,MAAM,CAAC,yBAAiB,CAAC,CAAA"}
+{"version":3,"file":"typeChecks.js","sourceRoot":"","sources":["../../src/typeChecks.ts"],"names":[],"mappings":";;;AAAA,4DAA6G;AAC7G,kEAA8D;AAI9D,uCAAqD;AAExC,QAAA,iBAAiB,GAAG,IAAI,gCAAiB,EAAmB,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,CAAC,+BAAgB,CAAC,CAAC,CAAA;AAChH,QAAA,eAAe,GAAG,IAAI,8BAAe,EAAiB,CAAC,MAAM,CAAC,CAAC,mCAAyB,CAAC,CAAC,CAAA;AAE1F,QAAA,eAAe,GAAG,iCAAe,CAAC,MAAM,CAAC,uBAAe,CAAC,CAAA;AACzD,QAAA,iBAAiB,GAAG,iCAAe,CAAC,MAAM,CAAC,yBAAiB,CAAC,CAAA;AAC7D,QAAA,iBAAiB,GAAG,0BAAW,CAAC,MAAM,CAAC,uBAAe,CAAC,CAAA;AACvD,QAAA,mBAAmB,GAAG,0BAAW,CAAC,MAAM,CAAC,yBAAiB,CAAC,CAAA"}

package/dist/esm/EventData.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=EventData.js.map

package/dist/esm/EventData.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"EventData.js","sourceRoot":"","sources":["../../src/EventData.ts"],"names":[],"mappings":""}

package/dist/esm/Instance.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=Instance.js.map

package/dist/esm/Instance.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"Instance.js","sourceRoot":"","sources":["../../src/Instance.ts"],"names":[],"mappings":""}

package/dist/esm/index.js

@@ -1,5 +1,7 @@
 export * from './Config';
+export * from './EventData';
 export * from './Events';
+export * from './Instance';
 export * from './Module';
 export * from './Params';
 export * from './Queries';

package/dist/esm/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAC3B,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA"}

package/dist/esm/typeChecks.js

@@ -1,9 +1,10 @@
-import { AsFactory, IsInstanceFactory, IsModuleFactory, isModuleInstance, WithFactory } from '@xyo-network/module-model';
+import { IsInstanceFactory, IsModuleFactory, isModuleInstance, WithFactory } from '@xyo-network/module-model';
+import { AsObjectFactory } from '@xyo-network/object-identity';
 import { WitnessObserveQuerySchema } from './Queries';
-export const isWitnessInstance = IsInstanceFactory.create({ observe: 'function' }, isModuleInstance);
-export const isWitnessModule = IsModuleFactory.create([WitnessObserveQuerySchema]);
-export const asWitnessModule = AsFactory.create(isWitnessModule);
-export const asWitnessInstance = AsFactory.create(isWitnessInstance);
+export const isWitnessInstance = new IsInstanceFactory().create({ observe: 'function' }, [isModuleInstance]);
+export const isWitnessModule = new IsModuleFactory().create([WitnessObserveQuerySchema]);
+export const asWitnessModule = AsObjectFactory.create(isWitnessModule);
+export const asWitnessInstance = AsObjectFactory.create(isWitnessInstance);
 export const withWitnessModule = WithFactory.create(isWitnessModule);
 export const withWitnessInstance = WithFactory.create(isWitnessInstance);
 //# sourceMappingURL=typeChecks.js.map

package/dist/esm/typeChecks.js.map

@@ -1 +1 @@
-{"version":3,"file":"typeChecks.js","sourceRoot":"","sources":["../../src/typeChecks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,eAAe,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAGxH,OAAO,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAA;AAErD,MAAM,CAAC,MAAM,iBAAiB,GAAG,iBAAiB,CAAC,MAAM,CAAkB,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,gBAAgB,CAAC,CAAA;AACrH,MAAM,CAAC,MAAM,eAAe,GAAG,eAAe,CAAC,MAAM,CAAgB,CAAC,yBAAyB,CAAC,CAAC,CAAA;AAEjG,MAAM,CAAC,MAAM,eAAe,GAAG,SAAS,CAAC,MAAM,CAAC,eAAe,CAAC,CAAA;AAChE,MAAM,CAAC,MAAM,iBAAiB,GAAG,SAAS,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAA;AACpE,MAAM,CAAC,MAAM,iBAAiB,GAAG,WAAW,CAAC,MAAM,CAAC,eAAe,CAAC,CAAA;AACpE,MAAM,CAAC,MAAM,mBAAmB,GAAG,WAAW,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAA"}
+{"version":3,"file":"typeChecks.js","sourceRoot":"","sources":["../../src/typeChecks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,eAAe,EAAE,gBAAgB,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAC7G,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAA;AAI9D,OAAO,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAA;AAErD,MAAM,CAAC,MAAM,iBAAiB,GAAG,IAAI,iBAAiB,EAAmB,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,CAAC,gBAAgB,CAAC,CAAC,CAAA;AAC7H,MAAM,CAAC,MAAM,eAAe,GAAG,IAAI,eAAe,EAAiB,CAAC,MAAM,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAA;AAEvG,MAAM,CAAC,MAAM,eAAe,GAAG,eAAe,CAAC,MAAM,CAAC,eAAe,CAAC,CAAA;AACtE,MAAM,CAAC,MAAM,iBAAiB,GAAG,eAAe,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAA;AAC1E,MAAM,CAAC,MAAM,iBAAiB,GAAG,WAAW,CAAC,MAAM,CAAC,eAAe,CAAC,CAAA;AACpE,MAAM,CAAC,MAAM,mBAAmB,GAAG,WAAW,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAA"}

package/dist/types/EventData.d.ts

@@ -0,0 +1,6 @@
+import { ModuleEventData } from '@xyo-network/module-model';
+import { WitnessReportEndEventData, WitnessReportStartEventData } from './Events';
+import { WitnessModule } from './Module';
+export interface WitnessModuleEventData<T extends WitnessModule = WitnessModule> extends WitnessReportEndEventData<T>, WitnessReportStartEventData<T>, ModuleEventData {
+}
+//# sourceMappingURL=EventData.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"EventData.d.ts","sourceRoot":"","sources":["../../src/EventData.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAE3D,OAAO,EAAE,yBAAyB,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAA;AACjF,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAExC,MAAM,WAAW,sBAAsB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CAC7E,SAAQ,yBAAyB,CAAC,CAAC,CAAC,EAClC,2BAA2B,CAAC,CAAC,CAAC,EAC9B,eAAe;CAAG"}

package/dist/types/Events/ReportEnd.d.ts

@@ -2,12 +2,12 @@ import { EventData } from '@xyo-network/module';
 import { ModuleEventArgs } from '@xyo-network/module-model';
 import { Payload } from '@xyo-network/payload-model';
 import { WitnessModule } from '../Module';
-export type WitnessReportEndEventArgs = ModuleEventArgs<WitnessModule, {
+export type WitnessReportEndEventArgs<T extends WitnessModule = WitnessModule> = ModuleEventArgs<T, {
     errors?: Error[];
     inPayloads?: Payload[];
     outPayloads?: Payload[];
 }>;
-export interface WitnessReportEndEventData extends EventData {
-    reportEnd: WitnessReportEndEventArgs;
+export interface WitnessReportEndEventData<T extends WitnessModule = WitnessModule> extends EventData {
+    reportEnd: WitnessReportEndEventArgs<T>;
 }
 //# sourceMappingURL=ReportEnd.d.ts.map

package/dist/types/Events/ReportEnd.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReportEnd.d.ts","sourceRoot":"","sources":["../../../src/Events/ReportEnd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAEzC,MAAM,MAAM,yBAAyB,GAAG,eAAe,CACrD,aAAa,EACb;IACE,MAAM,CAAC,EAAE,KAAK,EAAE,CAAA;IAChB,UAAU,CAAC,EAAE,OAAO,EAAE,CAAA;IACtB,WAAW,CAAC,EAAE,OAAO,EAAE,CAAA;CACxB,CACF,CAAA;AAED,MAAM,WAAW,yBAA0B,SAAQ,SAAS;IAC1D,SAAS,EAAE,yBAAyB,CAAA;CACrC"}
+{"version":3,"file":"ReportEnd.d.ts","sourceRoot":"","sources":["../../../src/Events/ReportEnd.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAEzC,MAAM,MAAM,yBAAyB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,IAAI,eAAe,CAC9F,CAAC,EACD;IACE,MAAM,CAAC,EAAE,KAAK,EAAE,CAAA;IAChB,UAAU,CAAC,EAAE,OAAO,EAAE,CAAA;IACtB,WAAW,CAAC,EAAE,OAAO,EAAE,CAAA;CACxB,CACF,CAAA;AAED,MAAM,WAAW,yBAAyB,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CAAE,SAAQ,SAAS;IACnG,SAAS,EAAE,yBAAyB,CAAC,CAAC,CAAC,CAAA;CACxC"}

package/dist/types/Events/ReportStart.d.ts

@@ -2,10 +2,10 @@ import { EventData } from '@xyo-network/module';
 import { ModuleEventArgs } from '@xyo-network/module-model';
 import { Payload } from '@xyo-network/payload-model';
 import { WitnessModule } from '../Module';
-export interface WitnessReportStartEventData extends EventData {
-    reportStart: WitnessReportStartEventArgs;
-}
-export type WitnessReportStartEventArgs = ModuleEventArgs<WitnessModule, {
+export type WitnessReportStartEventArgs<T extends WitnessModule = WitnessModule> = ModuleEventArgs<T, {
     inPayloads?: Payload[];
 }>;
+export interface WitnessReportStartEventData<T extends WitnessModule = WitnessModule> extends EventData {
+    reportStart: WitnessReportStartEventArgs<T>;
+}
 //# sourceMappingURL=ReportStart.d.ts.map

package/dist/types/Events/ReportStart.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReportStart.d.ts","sourceRoot":"","sources":["../../../src/Events/ReportStart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAEzC,MAAM,WAAW,2BAA4B,SAAQ,SAAS;IAC5D,WAAW,EAAE,2BAA2B,CAAA;CACzC;AAED,MAAM,MAAM,2BAA2B,GAAG,eAAe,CACvD,aAAa,EACb;IACE,UAAU,CAAC,EAAE,OAAO,EAAE,CAAA;CACvB,CACF,CAAA"}
+{"version":3,"file":"ReportStart.d.ts","sourceRoot":"","sources":["../../../src/Events/ReportStart.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AAC/C,OAAO,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAA;AAC3D,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,OAAO,EAAE,aAAa,EAAE,MAAM,WAAW,CAAA;AAEzC,MAAM,MAAM,2BAA2B,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,IAAI,eAAe,CAChG,CAAC,EACD;IACE,UAAU,CAAC,EAAE,OAAO,EAAE,CAAA;CACvB,CACF,CAAA;AAED,MAAM,WAAW,2BAA2B,CAAC,CAAC,SAAS,aAAa,GAAG,aAAa,CAAE,SAAQ,SAAS;IACrG,WAAW,EAAE,2BAA2B,CAAC,CAAC,CAAC,CAAA;CAC5C"}

package/dist/types/Instance.d.ts

@@ -0,0 +1,8 @@
+import { ModuleInstance } from '@xyo-network/module-model';
+import { WitnessModuleEventData } from './EventData';
+import { CustomWitnessModule, WitnessModule } from './Module';
+import { WitnessParams } from './Params';
+import { Witness } from './Witness';
+export type WitnessInstance<TParams extends WitnessParams = WitnessParams> = WitnessModule<TParams> & Witness & ModuleInstance;
+export type CustomWitnessInstance<TParams extends WitnessParams = WitnessParams, TEvents extends WitnessModuleEventData<WitnessInstance<TParams>> = WitnessModuleEventData<WitnessInstance<TParams>>> = CustomWitnessModule<TParams, TEvents> & Witness & ModuleInstance;
+//# sourceMappingURL=Instance.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"Instance.d.ts","sourceRoot":"","sources":["../../src/Instance.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAE1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAA;AACpD,OAAO,EAAE,mBAAmB,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAC7D,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,MAAM,MAAM,eAAe,CAAC,OAAO,SAAS,aAAa,GAAG,aAAa,IAAI,aAAa,CAAC,OAAO,CAAC,GAAG,OAAO,GAAG,cAAc,CAAA;AAE9H,MAAM,MAAM,qBAAqB,CAC/B,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,OAAO,SAAS,sBAAsB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,GAAG,sBAAsB,CAAC,eAAe,CAAC,OAAO,CAAC,CAAC,IACjH,mBAAmB,CAAC,OAAO,EAAE,OAAO,CAAC,GAAG,OAAO,GAAG,cAAc,CAAA"}

package/dist/types/Module.d.ts

@@ -1,9 +1,6 @@
-import { Module, ModuleEventData, ModuleInstance } from '@xyo-network/module-model';
-import { WitnessReportEndEventData, WitnessReportStartEventData } from './Events';
+import { Module } from '@xyo-network/module-model';
+import { WitnessModuleEventData } from './EventData';
 import { WitnessParams } from './Params';
-import { Witness } from './Witness';
-export interface WitnessModuleEventData extends WitnessReportEndEventData, WitnessReportStartEventData, ModuleEventData {
-}
-export type WitnessModule<TParams extends WitnessParams = WitnessParams, TEventData extends WitnessModuleEventData = WitnessModuleEventData> = Module<TParams, TEventData>;
-export type WitnessInstance<TParams extends WitnessParams = WitnessParams, TEventData extends WitnessModuleEventData = WitnessModuleEventData> = WitnessModule<TParams, TEventData> & Witness & ModuleInstance;
+export type WitnessModule<TParams extends WitnessParams = WitnessParams> = Module<TParams, WitnessModuleEventData<WitnessModule>>;
+export type CustomWitnessModule<TParams extends WitnessParams = WitnessParams, TEvents extends WitnessModuleEventData<WitnessModule<TParams>> = WitnessModuleEventData<WitnessModule<TParams>>> = Module<TParams, TEvents>;
 //# sourceMappingURL=Module.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Module.d.ts","sourceRoot":"","sources":["../../src/Module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAA;AAEnF,OAAO,EAAE,yBAAyB,EAAE,2BAA2B,EAAE,MAAM,UAAU,CAAA;AACjF,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAA;AAEnC,MAAM,WAAW,sBAAuB,SAAQ,yBAAyB,EAAE,2BAA2B,EAAE,eAAe;CAAG;AAE1H,MAAM,MAAM,aAAa,CAAC,OAAO,SAAS,aAAa,GAAG,aAAa,EAAE,UAAU,SAAS,sBAAsB,GAAG,sBAAsB,IAAI,MAAM,CACnJ,OAAO,EACP,UAAU,CACX,CAAA;AAED,MAAM,MAAM,eAAe,CACzB,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,UAAU,SAAS,sBAAsB,GAAG,sBAAsB,IAChE,aAAa,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,OAAO,GAAG,cAAc,CAAA"}
+{"version":3,"file":"Module.d.ts","sourceRoot":"","sources":["../../src/Module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,2BAA2B,CAAA;AAElD,OAAO,EAAE,sBAAsB,EAAE,MAAM,aAAa,CAAA;AACpD,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAExC,MAAM,MAAM,aAAa,CAAC,OAAO,SAAS,aAAa,GAAG,aAAa,IAAI,MAAM,CAAC,OAAO,EAAE,sBAAsB,CAAC,aAAa,CAAC,CAAC,CAAA;AAEjI,MAAM,MAAM,mBAAmB,CAC7B,OAAO,SAAS,aAAa,GAAG,aAAa,EAC7C,OAAO,SAAS,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,GAAG,sBAAsB,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,IAC7G,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA"}

package/dist/types/index.d.ts

@@ -1,5 +1,7 @@
 export * from './Config';
+export * from './EventData';
 export * from './Events';
+export * from './Instance';
 export * from './Module';
 export * from './Params';
 export * from './Queries';

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,UAAU,CAAA;AACxB,cAAc,aAAa,CAAA;AAC3B,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,UAAU,CAAA;AACxB,cAAc,UAAU,CAAA;AACxB,cAAc,WAAW,CAAA;AACzB,cAAc,cAAc,CAAA;AAC5B,cAAc,WAAW,CAAA"}

package/dist/types/typeChecks.d.ts

@@ -1,13 +1,14 @@
-import { WitnessInstance, WitnessModule } from './Module';
-export declare const isWitnessInstance: import("@xyo-network/module-model").InstanceTypeCheck<WitnessInstance>;
+import { WitnessInstance } from './Instance';
+import { WitnessModule } from './Module';
+export declare const isWitnessInstance: import("@xyo-network/object-identity").ObjectTypeCheck<WitnessInstance>;
 export declare const isWitnessModule: import("@xyo-network/module-model").ModuleTypeCheck<WitnessModule>;
 export declare const asWitnessModule: {
-    (module: any): WitnessModule | undefined;
-    (module: any, assert: string | (() => string)): WitnessModule;
+    (obj: any, config?: import("@xyo-network/object-identity").ObjectTypeConfig | undefined): WitnessModule | undefined;
+    (obj: any, assert: string | (() => string), config?: import("@xyo-network/object-identity").ObjectTypeConfig | undefined): WitnessModule;
 };
 export declare const asWitnessInstance: {
-    (module: any): WitnessInstance | undefined;
-    (module: any, assert: string | (() => string)): WitnessInstance;
+    (obj: any, config?: import("@xyo-network/object-identity").ObjectTypeConfig | undefined): WitnessInstance | undefined;
+    (obj: any, assert: string | (() => string), config?: import("@xyo-network/object-identity").ObjectTypeConfig | undefined): WitnessInstance;
 };
 export declare const withWitnessModule: <R>(module: any, closure: (module: WitnessModule) => R) => R | undefined;
 export declare const withWitnessInstance: <R>(module: any, closure: (module: WitnessInstance) => R) => R | undefined;

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

@@ -1 +1 @@
-{"version":3,"file":"typeChecks.d.ts","sourceRoot":"","sources":["../../src/typeChecks.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAGzD,eAAO,MAAM,iBAAiB,wEAAuF,CAAA;AACrH,eAAO,MAAM,eAAe,oEAAqE,CAAA;AAEjG,eAAO,MAAM,eAAe;;;CAAoC,CAAA;AAChE,eAAO,MAAM,iBAAiB;;;CAAsC,CAAA;AACpE,eAAO,MAAM,iBAAiB,0EAAsC,CAAA;AACpE,eAAO,MAAM,mBAAmB,4EAAwC,CAAA"}
+{"version":3,"file":"typeChecks.d.ts","sourceRoot":"","sources":["../../src/typeChecks.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,eAAe,EAAE,MAAM,YAAY,CAAA;AAC5C,OAAO,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAGxC,eAAO,MAAM,iBAAiB,yEAA+F,CAAA;AAC7H,eAAO,MAAM,eAAe,oEAA2E,CAAA;AAEvG,eAAO,MAAM,eAAe;;;CAA0C,CAAA;AACtE,eAAO,MAAM,iBAAiB;;;CAA4C,CAAA;AAC1E,eAAO,MAAM,iBAAiB,0EAAsC,CAAA;AACpE,eAAO,MAAM,mBAAmB,4EAAwC,CAAA"}

package/package.json

@@ -10,15 +10,16 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xyo-network/core": "~2.66.9",
-    "@xyo-network/module": "~2.66.9",
-    "@xyo-network/module-model": "~2.66.9",
-    "@xyo-network/payload-model": "~2.66.9",
-    "@xyo-network/promise": "~2.66.9"
+    "@xyo-network/core": "~2.67.0-rc.2",
+    "@xyo-network/module": "~2.67.0-rc.2",
+    "@xyo-network/module-model": "~2.67.0-rc.2",
+    "@xyo-network/object-identity": "~2.67.0-rc.2",
+    "@xyo-network/payload-model": "~2.67.0-rc.2",
+    "@xyo-network/promise": "~2.67.0-rc.2"
   },
   "devDependencies": {
-    "@xylabs/ts-scripts-yarn3": "^2.18.11",
-    "@xylabs/tsconfig": "^2.18.11",
+    "@xylabs/ts-scripts-yarn3": "^2.19.0",
+    "@xylabs/tsconfig": "^2.19.0",
     "typescript": "^5.1.6"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -54,5 +55,6 @@
   },
   "sideEffects": false,
   "types": "dist/types/index.d.ts",
-  "version": "2.66.9"
+  "version": "2.67.0-rc.2",
+  "stableVersion": "2.66.9"
 }

package/src/EventData.ts

@@ -0,0 +1,9 @@
+import { ModuleEventData } from '@xyo-network/module-model'
+
+import { WitnessReportEndEventData, WitnessReportStartEventData } from './Events'
+import { WitnessModule } from './Module'
+
+export interface WitnessModuleEventData<T extends WitnessModule = WitnessModule>
+  extends WitnessReportEndEventData<T>,
+    WitnessReportStartEventData<T>,
+    ModuleEventData {}

package/src/Events/ReportEnd.ts

@@ -4,8 +4,8 @@ import { Payload } from '@xyo-network/payload-model'
 
 import { WitnessModule } from '../Module'
 
-export type WitnessReportEndEventArgs = ModuleEventArgs<
-  WitnessModule,
+export type WitnessReportEndEventArgs<T extends WitnessModule = WitnessModule> = ModuleEventArgs<
+  T,
   {
     errors?: Error[]
     inPayloads?: Payload[]
@@ -13,6 +13,6 @@ export type WitnessReportEndEventArgs = ModuleEventArgs<
   }
 >
 
-export interface WitnessReportEndEventData extends EventData {
-  reportEnd: WitnessReportEndEventArgs
+export interface WitnessReportEndEventData<T extends WitnessModule = WitnessModule> extends EventData {
+  reportEnd: WitnessReportEndEventArgs<T>
 }

package/src/Events/ReportStart.ts

@@ -4,13 +4,13 @@ import { Payload } from '@xyo-network/payload-model'
 
 import { WitnessModule } from '../Module'
 
-export interface WitnessReportStartEventData extends EventData {
-  reportStart: WitnessReportStartEventArgs
-}
-
-export type WitnessReportStartEventArgs = ModuleEventArgs<
-  WitnessModule,
+export type WitnessReportStartEventArgs<T extends WitnessModule = WitnessModule> = ModuleEventArgs<
+  T,
   {
     inPayloads?: Payload[]
   }
 >
+
+export interface WitnessReportStartEventData<T extends WitnessModule = WitnessModule> extends EventData {
+  reportStart: WitnessReportStartEventArgs<T>
+}

package/src/Instance.ts

@@ -0,0 +1,13 @@
+import { ModuleInstance } from '@xyo-network/module-model'
+
+import { WitnessModuleEventData } from './EventData'
+import { CustomWitnessModule, WitnessModule } from './Module'
+import { WitnessParams } from './Params'
+import { Witness } from './Witness'
+
+export type WitnessInstance<TParams extends WitnessParams = WitnessParams> = WitnessModule<TParams> & Witness & ModuleInstance
+
+export type CustomWitnessInstance<
+  TParams extends WitnessParams = WitnessParams,
+  TEvents extends WitnessModuleEventData<WitnessInstance<TParams>> = WitnessModuleEventData<WitnessInstance<TParams>>,
+> = CustomWitnessModule<TParams, TEvents> & Witness & ModuleInstance

package/src/Module.ts

@@ -1,17 +1,11 @@
-import { Module, ModuleEventData, ModuleInstance } from '@xyo-network/module-model'
+import { Module } from '@xyo-network/module-model'
 
-import { WitnessReportEndEventData, WitnessReportStartEventData } from './Events'
+import { WitnessModuleEventData } from './EventData'
 import { WitnessParams } from './Params'
-import { Witness } from './Witness'
 
-export interface WitnessModuleEventData extends WitnessReportEndEventData, WitnessReportStartEventData, ModuleEventData {}
+export type WitnessModule<TParams extends WitnessParams = WitnessParams> = Module<TParams, WitnessModuleEventData<WitnessModule>>
 
-export type WitnessModule<TParams extends WitnessParams = WitnessParams, TEventData extends WitnessModuleEventData = WitnessModuleEventData> = Module<
-  TParams,
-  TEventData
->
-
-export type WitnessInstance<
+export type CustomWitnessModule<
   TParams extends WitnessParams = WitnessParams,
-  TEventData extends WitnessModuleEventData = WitnessModuleEventData,
-> = WitnessModule<TParams, TEventData> & Witness & ModuleInstance
+  TEvents extends WitnessModuleEventData<WitnessModule<TParams>> = WitnessModuleEventData<WitnessModule<TParams>>,
+> = Module<TParams, TEvents>

package/src/index.ts

@@ -1,5 +1,7 @@
 export * from './Config'
+export * from './EventData'
 export * from './Events'
+export * from './Instance'
 export * from './Module'
 export * from './Params'
 export * from './Queries'

package/src/typeChecks.ts

@@ -1,12 +1,14 @@
-import { AsFactory, IsInstanceFactory, IsModuleFactory, isModuleInstance, WithFactory } from '@xyo-network/module-model'
+import { IsInstanceFactory, IsModuleFactory, isModuleInstance, WithFactory } from '@xyo-network/module-model'
+import { AsObjectFactory } from '@xyo-network/object-identity'
 
-import { WitnessInstance, WitnessModule } from './Module'
+import { WitnessInstance } from './Instance'
+import { WitnessModule } from './Module'
 import { WitnessObserveQuerySchema } from './Queries'
 
-export const isWitnessInstance = IsInstanceFactory.create<WitnessInstance>({ observe: 'function' }, isModuleInstance)
-export const isWitnessModule = IsModuleFactory.create<WitnessModule>([WitnessObserveQuerySchema])
+export const isWitnessInstance = new IsInstanceFactory<WitnessInstance>().create({ observe: 'function' }, [isModuleInstance])
+export const isWitnessModule = new IsModuleFactory<WitnessModule>().create([WitnessObserveQuerySchema])
 
-export const asWitnessModule = AsFactory.create(isWitnessModule)
-export const asWitnessInstance = AsFactory.create(isWitnessInstance)
+export const asWitnessModule = AsObjectFactory.create(isWitnessModule)
+export const asWitnessInstance = AsObjectFactory.create(isWitnessInstance)
 export const withWitnessModule = WithFactory.create(isWitnessModule)
 export const withWitnessInstance = WithFactory.create(isWitnessInstance)