@xyo-network/api 2.38.13 → 2.38.15

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -2,12 +2,18 @@ import { XyoBoundWitness } from '@xyo-network/boundwitness';
2
2
  import { XyoDiviner } from '@xyo-network/diviner';
3
3
  import { XyoModuleParams } from '@xyo-network/module';
4
4
  import { XyoPayloads } from '@xyo-network/payload';
5
+ import { XyoArchivistApi } from '../../Archivist';
5
6
  import { XyoRemoteDivinerConfig } from '../XyoRemoteDivinerConfig';
6
7
  import { AddressHistoryDiviner } from './AddressHistoryDiviner';
8
+ export declare type XyoRemoteAddressHistoryDivinerParams = XyoModuleParams<XyoRemoteDivinerConfig> & {
9
+ api?: XyoArchivistApi;
10
+ };
7
11
  /** @description Diviner Context that connects to a remote Diviner using the API */
8
12
  export declare class XyoRemoteAddressHistoryDiviner extends XyoDiviner<XyoRemoteDivinerConfig> implements AddressHistoryDiviner {
9
- static create(params?: XyoModuleParams<XyoRemoteDivinerConfig>): Promise<XyoRemoteAddressHistoryDiviner>;
10
- get api(): import("../..").XyoArchivistApi;
13
+ protected _api?: XyoArchivistApi;
14
+ static create(params?: XyoRemoteAddressHistoryDivinerParams): Promise<XyoRemoteAddressHistoryDiviner>;
15
+ protected constructor(params?: XyoRemoteAddressHistoryDivinerParams);
16
+ get api(): XyoArchivistApi;
11
17
  queries(): string[];
12
18
  divine(payloads?: XyoPayloads): Promise<XyoBoundWitness[]>;
13
19
  static configSchema: "network.xyo.diviner.remote.config";
@@ -1 +1 @@
1
- {"version":3,"file":"XyoRemoteAddressHistoryDiviner.d.ts","sourceRoot":"","sources":["../../../../src/Diviner/AddressHistoryDiviner/XyoRemoteAddressHistoryDiviner.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAyB,MAAM,2BAA2B,CAAA;AAClF,OAAO,EAAE,UAAU,EAA+B,MAAM,sBAAsB,CAAA;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAGlD,OAAO,EAAE,sBAAsB,EAAgC,MAAM,2BAA2B,CAAA;AAChG,OAAO,EAAE,qBAAqB,EAAgC,MAAM,yBAAyB,CAAA;AAE7F,mFAAmF;AACnF,qBAAa,8BAA+B,SAAQ,UAAU,CAAC,sBAAsB,CAAE,YAAW,qBAAqB;WAC/F,MAAM,CAAC,MAAM,CAAC,EAAE,eAAe,CAAC,sBAAsB,CAAC;IAI7E,IAAW,GAAG,oCAEb;IAEe,OAAO;IAID,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IA0BhF,OAAgB,YAAY,sCAA+B;IAC3D,OAAgB,YAAY,6BAAwB;CACrD"}
1
+ {"version":3,"file":"XyoRemoteAddressHistoryDiviner.d.ts","sourceRoot":"","sources":["../../../../src/Diviner/AddressHistoryDiviner/XyoRemoteAddressHistoryDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAyB,MAAM,2BAA2B,CAAA;AAClF,OAAO,EAAE,UAAU,EAA+B,MAAM,sBAAsB,CAAA;AAC9E,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAA;AAElD,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAA;AAEjD,OAAO,EAAE,sBAAsB,EAAgC,MAAM,2BAA2B,CAAA;AAChG,OAAO,EAAE,qBAAqB,EAAgC,MAAM,yBAAyB,CAAA;AAE7F,oBAAY,oCAAoC,GAAG,eAAe,CAAC,sBAAsB,CAAC,GAAG;IAC3F,GAAG,CAAC,EAAE,eAAe,CAAA;CACtB,CAAA;AAED,mFAAmF;AACnF,qBAAa,8BAA+B,SAAQ,UAAU,CAAC,sBAAsB,CAAE,YAAW,qBAAqB;IACrH,SAAS,CAAC,IAAI,CAAC,EAAE,eAAe,CAAA;WAEV,MAAM,CAAC,MAAM,CAAC,EAAE,oCAAoC;IAI1E,SAAS,aAAa,MAAM,CAAC,EAAE,oCAAoC;IAKnE,IAAW,GAAG,oBAWb;IAEe,OAAO;IAID,MAAM,CAAC,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,eAAe,EAAE,CAAC;IA0BhF,OAAgB,YAAY,sCAA+B;IAC3D,OAAgB,YAAY,6BAAwB;CACrD"}
@@ -1,4 +1,3 @@
1
- import { assertEx } from '@xylabs/assert';
2
1
  import { XyoBoundWitnessSchema } from '@xyo-network/boundwitness';
3
2
  import { XyoDiviner, XyoDivinerDivineQuerySchema } from '@xyo-network/diviner';
4
3
  import { RemoteDivinerError } from '../RemoteDivinerError';
@@ -6,11 +5,25 @@ import { XyoRemoteDivinerConfigSchema } from '../XyoRemoteDivinerConfig';
6
5
  import { isAddressHistoryQueryPayload } from './AddressHistoryDiviner';
7
6
  /** @description Diviner Context that connects to a remote Diviner using the API */
8
7
  export class XyoRemoteAddressHistoryDiviner extends XyoDiviner {
8
+ _api;
9
9
  static async create(params) {
10
10
  return (await super.create(params));
11
11
  }
12
+ constructor(params) {
13
+ super(params);
14
+ this._api = params?.api;
15
+ }
12
16
  get api() {
13
- return assertEx(this.config?.api, 'API not defined');
17
+ if (this._api) {
18
+ return this._api;
19
+ }
20
+ // eslint-disable-next-line deprecation/deprecation
21
+ if (this.config?.api) {
22
+ this.logger?.warn('api specified in config but should be specified in params');
23
+ // eslint-disable-next-line deprecation/deprecation
24
+ return this.config?.api;
25
+ }
26
+ throw Error('No api specified');
14
27
  }
15
28
  queries() {
16
29
  return [XyoDivinerDivineQuerySchema, ...super.queries()];
@@ -1 +1 @@
1
- {"version":3,"file":"XyoRemoteAddressHistoryDiviner.js","sourceRoot":"","sources":["../../../../src/Diviner/AddressHistoryDiviner/XyoRemoteAddressHistoryDiviner.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAA;AACzC,OAAO,EAAmB,qBAAqB,EAAE,MAAM,2BAA2B,CAAA;AAClF,OAAO,EAAE,UAAU,EAAE,2BAA2B,EAAE,MAAM,sBAAsB,CAAA;AAI9E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uBAAuB,CAAA;AAC1D,OAAO,EAA0B,4BAA4B,EAAE,MAAM,2BAA2B,CAAA;AAChG,OAAO,EAAyB,4BAA4B,EAAE,MAAM,yBAAyB,CAAA;AAE7F,mFAAmF;AACnF,MAAM,OAAO,8BAA+B,SAAQ,UAAkC;IACpF,MAAM,CAAU,KAAK,CAAC,MAAM,CAAC,MAAgD;QAC3E,OAAO,CAAC,MAAM,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC,CAAmC,CAAA;IACvE,CAAC;IAED,IAAW,GAAG;QACZ,OAAO,QAAQ,CAAC,IAAI,CAAC,MAAM,EAAE,GAAG,EAAE,iBAAiB,CAAC,CAAA;IACtD,CAAC;IAEe,OAAO;QACrB,OAAO,CAAC,2BAA2B,EAAE,GAAG,KAAK,CAAC,OAAO,EAAE,CAAC,CAAA;IAC1D,CAAC;IAEe,KAAK,CAAC,MAAM,CAAC,QAAsB;QACjD,IAAI,CAAC,QAAQ;YAAE,OAAO,EAAE,CAAA;QACxB,IAAI;YACF,MAAM,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,4BAA4B,CAAC,CAAA;YACzD,IAAI,CAAC,KAAK;gBAAE,OAAO,EAAE,CAAA;YACrB,MAAM,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,KAAK,CAAA;YACxC,MAAM,IAAI,GAAwC,EAAE,CAAA;YACpD,IAAI,KAAK;gBAAE,IAAI,CAAC,KAAK,GAAG,KAAK,CAAA;YAC7B,IAAI,MAAM;gBAAE,IAAI,CAAC,MAAM,GAAG,GAAG,MAAM,EAAE,CAAA;YACrC,MAAM,CAAC,IAAI,EAAE,IAAI,EAAE,QAAQ,CAAC,GAC1B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,MAAM,GAAG,CAAC;gBAC1B,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,EAAE,OAAO,CAAC;gBAC9E,CAAC,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,cAAc,CAAC,GAAG,CAAC,OAAO,CAAC,CAAA;YAC3E,IAAI,QAAQ,EAAE,MAAM,IAAI,GAAG,EAAE;gBAC3B,MAAM,IAAI,kBAAkB,CAAC,QAAQ,EAAE,GAAG,QAAQ,CAAC,UAAU,KAAK,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAA;aACtF;YACD,IAAI,IAAI,EAAE,KAAK,EAAE,MAAM,EAAE;gBACvB,MAAM,IAAI,kBAAkB,CAAC,QAAQ,EAAE,IAAI,EAAE,KAAK,CAAC,CAAA;aACpD;YACD,OAAO,IAAI,IAAI,EAAE,CAAA;SAClB;QAAC,OAAO,EAAE,EAAE;YACX,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,CAAA;YACjB,MAAM,EAAE,CAAA;SACT;IACH,CAAC;IAED,MAAM,CAAU,YAAY,GAAG,4BAA4B,CAAA;IAC3D,MAAM,CAAU,YAAY,GAAG,qBAAqB,CAAA"}
1
+ {"version":3,"file":"XyoRemoteAddressHistoryDiviner.js","sourceRoot":"","sources":["../../../../src/Diviner/AddressHistoryDiviner/XyoRemoteAddressHistoryDiviner.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,7 @@ import { XyoArchivistApi } from '../Archivist';
3
3
  export declare type XyoRemoteDivinerConfigSchema = 'network.xyo.diviner.remote.config';
4
4
  export declare const XyoRemoteDivinerConfigSchema: XyoRemoteDivinerConfigSchema;
5
5
  export declare type XyoRemoteDivinerConfig = XyoDivinerConfig & {
6
+ /** @deprecated use in params instead */
6
7
  api?: XyoArchivistApi;
7
8
  archive?: string;
8
9
  schema: XyoRemoteDivinerConfigSchema;
@@ -1 +1 @@
1
- {"version":3,"file":"XyoRemoteDivinerConfig.d.ts","sourceRoot":"","sources":["../../../src/Diviner/XyoRemoteDivinerConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAE9C,oBAAY,4BAA4B,GAAG,mCAAmC,CAAA;AAC9E,eAAO,MAAM,4BAA4B,EAAE,4BAAkE,CAAA;AAE7G,oBAAY,sBAAsB,GAAG,gBAAgB,GAAG;IACtD,GAAG,CAAC,EAAE,eAAe,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,4BAA4B,CAAA;CACrC,CAAA"}
1
+ {"version":3,"file":"XyoRemoteDivinerConfig.d.ts","sourceRoot":"","sources":["../../../src/Diviner/XyoRemoteDivinerConfig.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAA;AAEvD,OAAO,EAAE,eAAe,EAAE,MAAM,cAAc,CAAA;AAE9C,oBAAY,4BAA4B,GAAG,mCAAmC,CAAA;AAC9E,eAAO,MAAM,4BAA4B,EAAE,4BAAkE,CAAA;AAE7G,oBAAY,sBAAsB,GAAG,gBAAgB,GAAG;IACtD,wCAAwC;IACxC,GAAG,CAAC,EAAE,eAAe,CAAA;IACrB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,MAAM,EAAE,4BAA4B,CAAA;CACrC,CAAA"}
package/package.json CHANGED
@@ -11,14 +11,14 @@
11
11
  "dependencies": {
12
12
  "@xylabs/assert": "^2.6.9",
13
13
  "@xylabs/delay": "^2.6.9",
14
- "@xyo-network/account": "^2.38.13",
15
- "@xyo-network/archivist": "^2.38.13",
16
- "@xyo-network/boundwitness": "^2.38.13",
17
- "@xyo-network/core": "^2.38.13",
18
- "@xyo-network/diviner": "^2.38.13",
19
- "@xyo-network/module": "^2.38.13",
20
- "@xyo-network/payload": "^2.38.13",
21
- "@xyo-network/schema-payload-plugin": "^2.38.13",
14
+ "@xyo-network/account": "^2.38.15",
15
+ "@xyo-network/archivist": "^2.38.15",
16
+ "@xyo-network/boundwitness": "^2.38.15",
17
+ "@xyo-network/core": "^2.38.15",
18
+ "@xyo-network/diviner": "^2.38.15",
19
+ "@xyo-network/module": "^2.38.15",
20
+ "@xyo-network/payload": "^2.38.15",
21
+ "@xyo-network/schema-payload-plugin": "^2.38.15",
22
22
  "tslib": "^2.4.0"
23
23
  },
24
24
  "peerDependencies": {
@@ -65,5 +65,5 @@
65
65
  },
66
66
  "sideEffects": false,
67
67
  "types": "dist/esm/index.d.ts",
68
- "version": "2.38.13"
68
+ "version": "2.38.15"
69
69
  }
@@ -1,21 +1,41 @@
1
- import { assertEx } from '@xylabs/assert'
2
1
  import { XyoBoundWitness, XyoBoundWitnessSchema } from '@xyo-network/boundwitness'
3
2
  import { XyoDiviner, XyoDivinerDivineQuerySchema } from '@xyo-network/diviner'
4
3
  import { XyoModuleParams } from '@xyo-network/module'
5
4
  import { XyoPayloads } from '@xyo-network/payload'
6
5
 
6
+ import { XyoArchivistApi } from '../../Archivist'
7
7
  import { RemoteDivinerError } from '../RemoteDivinerError'
8
8
  import { XyoRemoteDivinerConfig, XyoRemoteDivinerConfigSchema } from '../XyoRemoteDivinerConfig'
9
9
  import { AddressHistoryDiviner, isAddressHistoryQueryPayload } from './AddressHistoryDiviner'
10
10
 
11
+ export type XyoRemoteAddressHistoryDivinerParams = XyoModuleParams<XyoRemoteDivinerConfig> & {
12
+ api?: XyoArchivistApi
13
+ }
14
+
11
15
  /** @description Diviner Context that connects to a remote Diviner using the API */
12
16
  export class XyoRemoteAddressHistoryDiviner extends XyoDiviner<XyoRemoteDivinerConfig> implements AddressHistoryDiviner {
13
- static override async create(params?: XyoModuleParams<XyoRemoteDivinerConfig>) {
17
+ protected _api?: XyoArchivistApi
18
+
19
+ static override async create(params?: XyoRemoteAddressHistoryDivinerParams) {
14
20
  return (await super.create(params)) as XyoRemoteAddressHistoryDiviner
15
21
  }
16
22
 
23
+ protected constructor(params?: XyoRemoteAddressHistoryDivinerParams) {
24
+ super(params)
25
+ this._api = params?.api
26
+ }
27
+
17
28
  public get api() {
18
- return assertEx(this.config?.api, 'API not defined')
29
+ if (this._api) {
30
+ return this._api
31
+ }
32
+ // eslint-disable-next-line deprecation/deprecation
33
+ if (this.config?.api) {
34
+ this.logger?.warn('api specified in config but should be specified in params')
35
+ // eslint-disable-next-line deprecation/deprecation
36
+ return this.config?.api
37
+ }
38
+ throw Error('No api specified')
19
39
  }
20
40
 
21
41
  public override queries() {
@@ -6,6 +6,7 @@ export type XyoRemoteDivinerConfigSchema = 'network.xyo.diviner.remote.config'
6
6
  export const XyoRemoteDivinerConfigSchema: XyoRemoteDivinerConfigSchema = 'network.xyo.diviner.remote.config'
7
7
 
8
8
  export type XyoRemoteDivinerConfig = XyoDivinerConfig & {
9
+ /** @deprecated use in params instead */
9
10
  api?: XyoArchivistApi
10
11
  archive?: string
11
12
  schema: XyoRemoteDivinerConfigSchema