@xyo-network/id-payload-plugin 2.28.0-rc.4 → 2.28.0-rc.7

package/dist/esm/Plugin.d.ts

@@ -1,5 +1,9 @@
-import { XyoPayloadPluginFunc } from '@xyo-network/payload-plugin';
 import { XyoIdPayload } from './Payload';
 import { XyoIdWitnessConfig } from './Witness';
-export declare const XyoIdPayloadPlugin: XyoPayloadPluginFunc<XyoIdPayload, XyoIdWitnessConfig>;
+export declare const XyoIdPayloadPlugin: () => import("@xyo-network/payload-plugin").XyoPayloadPlugin<XyoIdPayload, XyoIdWitnessConfig, import("@xyo-network/diviner").XyoDivinerConfig<XyoIdPayload, {
+    schema: string;
+    previousHash?: string | undefined;
+    sources?: string[] | undefined;
+    timestamp?: number | undefined;
+}>>;
 //# sourceMappingURL=Plugin.d.ts.map

package/dist/esm/Plugin.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AACA,OAAO,EAA4C,oBAAoB,EAAE,MAAM,6BAA6B,CAAA;AAE5G,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAGxC,OAAO,EAAgB,kBAAkB,EAAE,MAAM,WAAW,CAAA;AAE5D,eAAO,MAAM,kBAAkB,EAAE,oBAAoB,CAAC,YAAY,EAAE,kBAAkB,CAQlF,CAAA"}
+{"version":3,"file":"Plugin.d.ts","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AAGxC,OAAO,EAAgB,kBAAkB,EAA4B,MAAM,WAAW,CAAA;AAEtF,eAAO,MAAM,kBAAkB;;;;;GAY3B,CAAA"}

package/dist/esm/Plugin.js

@@ -1,14 +1,17 @@
-import { assertEx } from '@xylabs/assert';
 import { createXyoPayloadPlugin } from '@xyo-network/payload-plugin';
 import { XyoIdPayloadSchema } from './Schema';
 import { XyoIdPayloadTemplate } from './Template';
-import { XyoIdWitness } from './Witness';
-export const XyoIdPayloadPlugin = (config) => createXyoPayloadPlugin({
+import { XyoIdWitness, XyoIdWitnessConfigSchema } from './Witness';
+export const XyoIdPayloadPlugin = () => createXyoPayloadPlugin({
     auto: true,
     schema: XyoIdPayloadSchema,
     template: XyoIdPayloadTemplate,
-    witness: () => {
-        return new XyoIdWitness(assertEx(config?.witness, 'Missing config'));
+    witness: (config) => {
+        return new XyoIdWitness({
+            ...config,
+            schema: XyoIdWitnessConfigSchema,
+            targetSchema: XyoIdPayloadSchema,
+        });
     },
 });
 //# sourceMappingURL=Plugin.js.map

package/dist/esm/Plugin.js.map

@@ -1 +1 @@
-{"version":3,"file":"Plugin.js","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAE,sBAAsB,EAA0C,MAAM,6BAA6B,CAAA;AAG5G,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACjD,OAAO,EAAE,YAAY,EAAsB,MAAM,WAAW,CAAA;AAE5D,MAAM,CAAC,MAAM,kBAAkB,GAA2D,CAAC,MAAO,EAAkC,EAAE,CACpI,sBAAsB,CAAC;IACrB,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,kBAAkB;IAC1B,QAAQ,EAAE,oBAAoB;IAC9B,OAAO,EAAE,GAAiB,EAAE;QAC1B,OAAO,IAAI,YAAY,CAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,EAAE,gBAAgB,CAAC,CAAC,CAAA;IACtE,CAAC;CACF,CAAC,CAAA"}
+{"version":3,"file":"Plugin.js","sourceRoot":"","sources":["../../src/Plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAA;AAGpE,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAC7C,OAAO,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAA;AACjD,OAAO,EAAE,YAAY,EAAsB,wBAAwB,EAAE,MAAM,WAAW,CAAA;AAEtF,MAAM,CAAC,MAAM,kBAAkB,GAAG,GAAG,EAAE,CACrC,sBAAsB,CAAmC;IACvD,IAAI,EAAE,IAAI;IACV,MAAM,EAAE,kBAAkB;IAC1B,QAAQ,EAAE,oBAAoB;IAC9B,OAAO,EAAE,CAAC,MAAM,EAAgB,EAAE;QAChC,OAAO,IAAI,YAAY,CAAC;YACtB,GAAG,MAAM;YACT,MAAM,EAAE,wBAAwB;YAChC,YAAY,EAAE,kBAAkB;SACjC,CAAC,CAAA;IACJ,CAAC;CACF,CAAC,CAAA"}

package/dist/esm/Witness.d.ts

@@ -6,11 +6,10 @@ export declare const XyoIdWitnessConfigSchema: XyoIdWitnessConfigSchema;
 export declare type XyoIdWitnessConfig = XyoWitnessConfig<XyoIdPayload, {
     schema: XyoIdWitnessConfigSchema;
     targetSchema: XyoIdPayloadSchema;
-    salt?: string;
+    salt: string;
 }>;
-export declare class XyoIdWitness extends XyoWitness<XyoIdPayload> {
-    private salt;
-    constructor({ salt, ...config }: XyoIdWitnessConfig);
+export declare class XyoIdWitness extends XyoWitness<XyoIdPayload, XyoIdWitnessConfig> {
+    get salt(): string;
     observe(_fields?: Partial<XyoIdPayload>): Promise<XyoIdPayload>;
     static schema: XyoIdPayloadSchema;
 }

package/dist/esm/Witness.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEnE,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAE7C,oBAAY,wBAAwB,GAAG,+BAA+B,CAAA;AACtE,eAAO,MAAM,wBAAwB,EAAE,wBAA0D,CAAA;AAEjG,oBAAY,kBAAkB,GAAG,gBAAgB,CAC/C,YAAY,EACZ;IACE,MAAM,EAAE,wBAAwB,CAAA;IAChC,YAAY,EAAE,kBAAkB,CAAA;IAChC,IAAI,CAAC,EAAE,MAAM,CAAA;CACd,CACF,CAAA;AAED,qBAAa,YAAa,SAAQ,UAAU,CAAC,YAAY,CAAC;IACxD,OAAO,CAAC,IAAI,CAAQ;gBAER,EAAE,IAAI,EAAE,GAAG,MAAM,EAAE,EAAE,kBAAkB;IAKpC,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;IAQ9E,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAqB;CACvD"}
+{"version":3,"file":"Witness.d.ts","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEnE,OAAO,EAAE,YAAY,EAAE,MAAM,WAAW,CAAA;AACxC,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAE7C,oBAAY,wBAAwB,GAAG,+BAA+B,CAAA;AACtE,eAAO,MAAM,wBAAwB,EAAE,wBAA0D,CAAA;AAEjG,oBAAY,kBAAkB,GAAG,gBAAgB,CAC/C,YAAY,EACZ;IACE,MAAM,EAAE,wBAAwB,CAAA;IAChC,YAAY,EAAE,kBAAkB,CAAA;IAChC,IAAI,EAAE,MAAM,CAAA;CACb,CACF,CAAA;AAED,qBAAa,YAAa,SAAQ,UAAU,CAAC,YAAY,EAAE,kBAAkB,CAAC;IAC5E,IAAW,IAAI,WAEd;IAEc,OAAO,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,GAAG,OAAO,CAAC,YAAY,CAAC;IAQ9E,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAqB;CACvD"}

package/dist/esm/Witness.js

@@ -1,13 +1,10 @@
 import { delay } from '@xylabs/delay';
-import { uuid } from '@xyo-network/core';
 import { XyoWitness } from '@xyo-network/witness';
 import { XyoIdPayloadSchema } from './Schema';
 export const XyoIdWitnessConfigSchema = 'network.xyo.id.witness.config';
 export class XyoIdWitness extends XyoWitness {
-    salt;
-    constructor({ salt, ...config }) {
-        super(config);
-        this.salt = salt ?? uuid();
+    get salt() {
+        return this.config.salt;
     }
     async observe(_fields) {
         await delay(0);

package/dist/esm/Witness.js.map

@@ -1 +1 @@
-{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,mBAAmB,CAAA;AACxC,OAAO,EAAE,UAAU,EAAoB,MAAM,sBAAsB,CAAA;AAGnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAG7C,MAAM,CAAC,MAAM,wBAAwB,GAA6B,+BAA+B,CAAA;AAWjG,MAAM,OAAO,YAAa,SAAQ,UAAwB;IAChD,IAAI,CAAQ;IAEpB,YAAY,EAAE,IAAI,EAAE,GAAG,MAAM,EAAsB;QACjD,KAAK,CAAC,MAAM,CAAC,CAAA;QACb,IAAI,CAAC,IAAI,GAAG,IAAI,IAAI,IAAI,EAAE,CAAA;IAC5B,CAAC;IAEQ,KAAK,CAAC,OAAO,CAAC,OAA+B;QACpD,MAAM,KAAK,CAAC,CAAC,CAAC,CAAA;QACd,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM,EAAE,gBAAgB;SACzB,CAAA;IACH,CAAC;IAED,MAAM,CAAC,MAAM,GAAuB,kBAAkB,CAAA"}
+{"version":3,"file":"Witness.js","sourceRoot":"","sources":["../../src/Witness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,eAAe,CAAA;AACrC,OAAO,EAAE,UAAU,EAAoB,MAAM,sBAAsB,CAAA;AAGnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,UAAU,CAAA;AAG7C,MAAM,CAAC,MAAM,wBAAwB,GAA6B,+BAA+B,CAAA;AAWjG,MAAM,OAAO,YAAa,SAAQ,UAA4C;IAC5E,IAAW,IAAI;QACb,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAA;IACzB,CAAC;IAEQ,KAAK,CAAC,OAAO,CAAC,OAA+B;QACpD,MAAM,KAAK,CAAC,CAAC,CAAC,CAAA;QACd,OAAO;YACL,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM,EAAE,gBAAgB;SACzB,CAAA;IACH,CAAC;IAED,MAAM,CAAC,MAAM,GAAuB,kBAAkB,CAAA"}

package/package.json

@@ -10,17 +10,15 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js/issues"
   },
   "dependencies": {
-    "@xylabs/assert": "^2.6.7",
     "@xylabs/delay": "^2.6.7",
-    "@xyo-network/account": "^2.28.0-rc.4",
-    "@xyo-network/core": "^2.28.0-rc.4",
-    "@xyo-network/payload": "^2.28.0-rc.4",
-    "@xyo-network/payload-plugin": "^2.28.0-rc.4",
-    "@xyo-network/witness": "^2.28.0-rc.4",
+    "@xyo-network/payload": "^2.28.0-rc.7",
+    "@xyo-network/payload-plugin": "^2.28.0-rc.7",
+    "@xyo-network/witness": "^2.28.0-rc.7",
     "tslib": "^2.4.0"
   },
   "devDependencies": {
-    "@xylabs/tsconfig": "^2.5.123"
+    "@xylabs/tsconfig": "^2.5.127",
+    "@xyo-network/account": "^2.28.0-rc.7"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
   "browser": "dist/esm/index.js",
@@ -55,6 +53,6 @@
   },
   "sideEffects": false,
   "types": "dist/esm/index.d.ts",
-  "version": "2.28.0-rc.4",
+  "version": "2.28.0-rc.7",
   "stableVersion": "2.28.0-rc.2"
 }

package/src/Plugin.spec.ts

@@ -6,6 +6,7 @@ import { XyoIdPayloadSchema } from './Schema'
 describe('XyoIdPayloadPlugin', () => {
   test('Add to Resolver', () => {
     const resolver = new XyoPayloadPluginResolver().register(XyoIdPayloadPlugin())
-    expect(resolver.resolve({ schema: XyoIdPayloadSchema })).toBeDefined()
+    expect(resolver.resolve({ schema: XyoIdPayloadSchema })).toBeObject()
+    expect(resolver.witness(XyoIdPayloadSchema)).toBeObject()
   })
 })

package/src/Plugin.ts

@@ -1,17 +1,20 @@
-import { assertEx } from '@xylabs/assert'
-import { createXyoPayloadPlugin, XyoPayloadPlugin, XyoPayloadPluginFunc } from '@xyo-network/payload-plugin'
+import { createXyoPayloadPlugin } from '@xyo-network/payload-plugin'
 
 import { XyoIdPayload } from './Payload'
 import { XyoIdPayloadSchema } from './Schema'
 import { XyoIdPayloadTemplate } from './Template'
-import { XyoIdWitness, XyoIdWitnessConfig } from './Witness'
+import { XyoIdWitness, XyoIdWitnessConfig, XyoIdWitnessConfigSchema } from './Witness'
 
-export const XyoIdPayloadPlugin: XyoPayloadPluginFunc<XyoIdPayload, XyoIdWitnessConfig> = (config?): XyoPayloadPlugin<XyoIdPayload> =>
-  createXyoPayloadPlugin({
+export const XyoIdPayloadPlugin = () =>
+  createXyoPayloadPlugin<XyoIdPayload, XyoIdWitnessConfig>({
     auto: true,
     schema: XyoIdPayloadSchema,
     template: XyoIdPayloadTemplate,
-    witness: (): XyoIdWitness => {
-      return new XyoIdWitness(assertEx(config?.witness, 'Missing config'))
+    witness: (config): XyoIdWitness => {
+      return new XyoIdWitness({
+        ...config,
+        schema: XyoIdWitnessConfigSchema,
+        targetSchema: XyoIdPayloadSchema,
+      })
     },
   })

package/src/Witness.browser.spec.ts

@@ -11,10 +11,11 @@ describe('XyoIdWitness [Browser]', () => {
   test('observe', async () => {
     const witness = new XyoIdWitness({
       account: new XyoAccount(),
+      salt: 'test',
       schema: XyoIdWitnessConfigSchema,
       targetSchema: XyoIdPayloadSchema,
     })
     const observation = await witness.observe()
-    expect(observation.schema).toBe('network.xyo.id')
+    expect(observation.schema).toBe(XyoIdPayloadSchema)
   })
 })

package/src/Witness.spec.ts

@@ -7,6 +7,7 @@ describe('XyoIdWitness', () => {
   test('observe', async () => {
     const witness = new XyoIdWitness({
       account: new XyoAccount(),
+      salt: 'test',
       schema: XyoIdWitnessConfigSchema,
       targetSchema: XyoIdPayloadSchema,
     })

package/src/Witness.ts

@@ -1,5 +1,4 @@
 import { delay } from '@xylabs/delay'
-import { uuid } from '@xyo-network/core'
 import { XyoWitness, XyoWitnessConfig } from '@xyo-network/witness'
 
 import { XyoIdPayload } from './Payload'
@@ -13,16 +12,13 @@ export type XyoIdWitnessConfig = XyoWitnessConfig<
   {
     schema: XyoIdWitnessConfigSchema
     targetSchema: XyoIdPayloadSchema
-    salt?: string
+    salt: string
   }
 >
 
-export class XyoIdWitness extends XyoWitness<XyoIdPayload> {
-  private salt: string
-
-  constructor({ salt, ...config }: XyoIdWitnessConfig) {
-    super(config)
-    this.salt = salt ?? uuid()
+export class XyoIdWitness extends XyoWitness<XyoIdPayload, XyoIdWitnessConfig> {
+  public get salt() {
+    return this.config.salt
   }
 
   override async observe(_fields?: Partial<XyoIdPayload>): Promise<XyoIdPayload> {