@xyo-network/node 2.33.0-rc.9 → 2.33.1

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.
@@ -1,3 +1,4 @@
1
+ import { XyoModuleQuery, XyoModuleQuerySchema, XyoQuery } from '@xyo-network/module';
1
2
  import { XyoNodeAttachQuery, XyoNodeAttachQuerySchema } from './Attach';
2
3
  import { XyoNodeAttachedQuery, XyoNodeAttachedQuerySchema } from './Attached';
3
4
  import { XyoNodeAvailableQuery, XyoNodeAvailableQuerySchema } from './Available';
@@ -6,6 +7,8 @@ export * from './Attach';
6
7
  export * from './Attached';
7
8
  export * from './Available';
8
9
  export * from './Detatch';
9
- export declare type XyoNodeQuerySchema = XyoNodeAttachQuerySchema | XyoNodeDetatchQuerySchema | XyoNodeAttachedQuerySchema | XyoNodeAvailableQuerySchema;
10
- export declare type XyoNodeQuery = XyoNodeAttachQuery | XyoNodeDetatchQuery | XyoNodeAttachedQuery | XyoNodeAvailableQuery;
10
+ declare type XyoNodeQuerySchemaBase = XyoNodeAttachQuerySchema | XyoNodeDetatchQuerySchema | XyoNodeAttachedQuerySchema | XyoNodeAvailableQuerySchema | XyoModuleQuerySchema;
11
+ export declare type XyoNodeQuerySchema<T extends string | void = void> = T extends string ? XyoNodeQuerySchemaBase | T : XyoNodeQuerySchemaBase;
12
+ declare type XyoNodeQueryBase = XyoNodeAttachQuery | XyoNodeDetatchQuery | XyoNodeAttachedQuery | XyoNodeAvailableQuery | XyoModuleQuery;
13
+ export declare type XyoNodeQuery<T extends XyoQuery | void = void> = T extends XyoQuery ? XyoNodeQueryBase | T : XyoNodeQueryBase;
11
14
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AACvE,OAAO,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAA;AAC7E,OAAO,EAAE,qBAAqB,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAA;AAChF,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAA;AAE1E,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA;AAEzB,oBAAY,kBAAkB,GAAG,wBAAwB,GAAG,yBAAyB,GAAG,0BAA0B,GAAG,2BAA2B,CAAA;AAEhJ,oBAAY,YAAY,GAAG,kBAAkB,GAAG,mBAAmB,GAAG,oBAAoB,GAAG,qBAAqB,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,oBAAoB,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAA;AAEpF,OAAO,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,UAAU,CAAA;AACvE,OAAO,EAAE,oBAAoB,EAAE,0BAA0B,EAAE,MAAM,YAAY,CAAA;AAC7E,OAAO,EAAE,qBAAqB,EAAE,2BAA2B,EAAE,MAAM,aAAa,CAAA;AAChF,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,WAAW,CAAA;AAE1E,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA;AAEzB,aAAK,sBAAsB,GACvB,wBAAwB,GACxB,yBAAyB,GACzB,0BAA0B,GAC1B,2BAA2B,GAC3B,oBAAoB,CAAA;AAExB,oBAAY,kBAAkB,CAAC,CAAC,SAAS,MAAM,GAAG,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,MAAM,GAAG,sBAAsB,GAAG,CAAC,GAAG,sBAAsB,CAAA;AAEvI,aAAK,gBAAgB,GAAG,kBAAkB,GAAG,mBAAmB,GAAG,oBAAoB,GAAG,qBAAqB,GAAG,cAAc,CAAA;AAEhI,oBAAY,YAAY,CAAC,CAAC,SAAS,QAAQ,GAAG,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,QAAQ,GAAG,gBAAgB,GAAG,CAAC,GAAG,gBAAgB,CAAA"}
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAKA,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Queries/index.ts"],"names":[],"mappings":"AAOA,cAAc,UAAU,CAAA;AACxB,cAAc,YAAY,CAAA;AAC1B,cAAc,aAAa,CAAA;AAC3B,cAAc,WAAW,CAAA"}
@@ -3,7 +3,7 @@ import { XyoModule, XyoModuleConfig } from '@xyo-network/module';
3
3
  import { XyoPayload } from '@xyo-network/payload';
4
4
  import { NodeModule } from './Node';
5
5
  import { XyoNodeQuery } from './Queries';
6
- export declare abstract class XyoNode<TConfig extends XyoModuleConfig = XyoModuleConfig, TQuery extends XyoNodeQuery = XyoNodeQuery, TQueryResult extends XyoPayload = XyoPayload, TModule extends XyoModule = XyoModule> extends XyoModule<TConfig, TQuery, TQueryResult> implements NodeModule<TQuery, TQueryResult> {
6
+ export declare abstract class XyoNode<TConfig extends XyoModuleConfig = XyoModuleConfig, TQuery extends XyoNodeQuery = XyoNodeQuery, TQueryResult extends XyoPayload = XyoPayload, TModule extends XyoModule = XyoModule> extends XyoModule<TQuery, TQueryResult, TConfig> implements NodeModule<TQuery, TQueryResult> {
7
7
  /** Query Functions - Start */
8
8
  abstract attach(_address: string): void;
9
9
  abstract detatch(_address: string): void;
@@ -1 +1 @@
1
- {"version":3,"file":"XyoNode.d.ts","sourceRoot":"","sources":["../../src/XyoNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAgH,YAAY,EAAE,MAAM,WAAW,CAAA;AAEtJ,8BAAsB,OAAO,CACzB,OAAO,SAAS,eAAe,GAAG,eAAe,EACjD,MAAM,SAAS,YAAY,GAAG,YAAY,EAC1C,YAAY,SAAS,UAAU,GAAG,UAAU,EAC5C,OAAO,SAAS,SAAS,GAAG,SAAS,CAEvC,SAAQ,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,YAAY,CAC/C,YAAW,UAAU,CAAC,MAAM,EAAE,YAAY,CAAC;IAE3C,8BAA8B;IAC9B,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IACvC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IACxC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAEpD,UAAU,IAAI,MAAM,EAAE;IAGtB,QAAQ,IAAI,MAAM,EAAE;IAIpB,gBAAgB,IAAI,SAAS,EAAE;IAG/B,eAAe,IAAI,SAAS,EAAE;IAG9B,4BAA4B;IAE5B,KAAK,CAAC,KAAK,EAAE,MAAM;IA0BnB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAIhC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;CACpD"}
1
+ {"version":3,"file":"XyoNode.d.ts","sourceRoot":"","sources":["../../src/XyoNode.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AACjD,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAA;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,QAAQ,CAAA;AACnC,OAAO,EAAgH,YAAY,EAAE,MAAM,WAAW,CAAA;AAEtJ,8BAAsB,OAAO,CACzB,OAAO,SAAS,eAAe,GAAG,eAAe,EACjD,MAAM,SAAS,YAAY,GAAG,YAAY,EAC1C,YAAY,SAAS,UAAU,GAAG,UAAU,EAC5C,OAAO,SAAS,SAAS,GAAG,SAAS,CAEvC,SAAQ,SAAS,CAAC,MAAM,EAAE,YAAY,EAAE,OAAO,CAC/C,YAAW,UAAU,CAAC,MAAM,EAAE,YAAY,CAAC;IAE3C,8BAA8B;IAC9B,QAAQ,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IACvC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IACxC,QAAQ,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,GAAG,SAAS,GAAG,IAAI;IAEpD,UAAU,IAAI,MAAM,EAAE;IAGtB,QAAQ,IAAI,MAAM,EAAE;IAIpB,gBAAgB,IAAI,SAAS,EAAE;IAG/B,eAAe,IAAI,SAAS,EAAE;IAG9B,4BAA4B;IAE5B,KAAK,CAAC,KAAK,EAAE,MAAM;IA0BnB,QAAQ,CAAC,OAAO,EAAE,OAAO,GAAG,IAAI;IAIhC,QAAQ,CAAC,GAAG,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,GAAG,SAAS;CACpD"}
package/package.json CHANGED
@@ -12,13 +12,13 @@
12
12
  "dependencies": {
13
13
  "@xylabs/assert": "^2.6.7",
14
14
  "@xylabs/forget": "^2.6.7",
15
- "@xyo-network/account": "^2.33.0-rc.9",
16
- "@xyo-network/archivist": "^2.33.0-rc.9",
17
- "@xyo-network/module": "^2.33.0-rc.9",
18
- "@xyo-network/payload": "^2.33.0-rc.9",
19
- "@xyo-network/promise": "^2.33.0-rc.9",
15
+ "@xyo-network/account": "^2.33.1",
16
+ "@xyo-network/archivist": "^2.33.1",
17
+ "@xyo-network/module": "^2.33.1",
18
+ "@xyo-network/payload": "^2.33.1",
19
+ "@xyo-network/promise": "^2.33.1",
20
20
  "lodash": "^4.17.21",
21
- "terminal-kit": "^2.11.4",
21
+ "terminal-kit": "^2.11.6",
22
22
  "tslib": "^2.4.0",
23
23
  "yargs": "^17.5.1"
24
24
  },
@@ -26,7 +26,7 @@
26
26
  "xyo": "dist/cjs/cli/index.js"
27
27
  },
28
28
  "devDependencies": {
29
- "@types/node": "^18.7.17",
29
+ "@types/node": "^18.7.18",
30
30
  "@types/terminal-kit": "^2.5.0",
31
31
  "ts-node": "^10.9.1",
32
32
  "typescript": "^4.8.3"
@@ -67,6 +67,5 @@
67
67
  "xyo-ts": "ts-node src/cli/index.ts"
68
68
  },
69
69
  "types": "dist/esm/index.d.ts",
70
- "version": "2.33.0-rc.9",
71
- "stableVersion": "2.32.1"
70
+ "version": "2.33.1"
72
71
  }
@@ -1,7 +1,7 @@
1
1
  import { XyoArchivistAllQuery, XyoArchivistAllQuerySchema, XyoArchivistInsertQuery, XyoArchivistInsertQuerySchema } from '@xyo-network/archivist'
2
2
  import { XyoArchivistPayloadDiviner, XyoDivinerDivineQuery, XyoDivinerDivineQuerySchema, XyoHuriPayload, XyoHuriSchema } from '@xyo-network/diviner'
3
3
  import { XyoModule } from '@xyo-network/module'
4
- import { XyoPayloadBuilder, XyoPayloadSchema, XyoPayloadWrapper } from '@xyo-network/sdk'
4
+ import { PayloadWrapper, XyoPayload, XyoPayloadBuilder, XyoPayloadSchema } from '@xyo-network/sdk'
5
5
 
6
6
  import { XyoMemoryNode } from './MemoryNode'
7
7
 
@@ -19,7 +19,9 @@ test('Create Node', async () => {
19
19
  const foundArchivist = node.get(archivist.address)
20
20
  expect(foundArchivist).toBeDefined()
21
21
  expect(foundArchivist?.address).toBe(archivist.address)
22
- const testPayload = new XyoPayloadBuilder({ schema: XyoPayloadSchema }).fields({ test: true }).build()
22
+ const testPayload = new XyoPayloadBuilder<XyoPayload<{ schema: XyoPayloadSchema; test: boolean }>>({ schema: XyoPayloadSchema })
23
+ .fields({ test: true })
24
+ .build()
23
25
 
24
26
  const insertQuery: XyoArchivistInsertQuery = { payloads: [testPayload], schema: XyoArchivistInsertQuerySchema }
25
27
  await foundArchivist?.query(insertQuery)
@@ -32,7 +34,7 @@ test('Create Node', async () => {
32
34
  expect(payloads?.length).toBe(1)
33
35
 
34
36
  if (payloads && payloads[0]) {
35
- const huri = new XyoPayloadWrapper(payloads[0]).hash
37
+ const huri = new PayloadWrapper(payloads[0]).hash
36
38
  const huriPayload: XyoHuriPayload = { huri, schema: XyoHuriSchema }
37
39
  const divineQuery: XyoDivinerDivineQuery = { payloads: [huriPayload], schema: XyoDivinerDivineQuerySchema }
38
40
  const foundDiviner = node.get(diviner.address)
@@ -42,7 +44,7 @@ test('Create Node', async () => {
42
44
  expect(payloads?.length).toBe(1)
43
45
  expect(payloads[0]).toBeDefined()
44
46
  if (payloads?.length === 1 && payloads[0]) {
45
- expect(new XyoPayloadWrapper(payloads[0]).hash).toBe(huri)
47
+ expect(new PayloadWrapper(payloads[0]).hash).toBe(huri)
46
48
  }
47
49
  }
48
50
  }
@@ -1,3 +1,5 @@
1
+ import { XyoModuleQuery, XyoModuleQuerySchema, XyoQuery } from '@xyo-network/module'
2
+
1
3
  import { XyoNodeAttachQuery, XyoNodeAttachQuerySchema } from './Attach'
2
4
  import { XyoNodeAttachedQuery, XyoNodeAttachedQuerySchema } from './Attached'
3
5
  import { XyoNodeAvailableQuery, XyoNodeAvailableQuerySchema } from './Available'
@@ -8,6 +10,15 @@ export * from './Attached'
8
10
  export * from './Available'
9
11
  export * from './Detatch'
10
12
 
11
- export type XyoNodeQuerySchema = XyoNodeAttachQuerySchema | XyoNodeDetatchQuerySchema | XyoNodeAttachedQuerySchema | XyoNodeAvailableQuerySchema
13
+ type XyoNodeQuerySchemaBase =
14
+ | XyoNodeAttachQuerySchema
15
+ | XyoNodeDetatchQuerySchema
16
+ | XyoNodeAttachedQuerySchema
17
+ | XyoNodeAvailableQuerySchema
18
+ | XyoModuleQuerySchema
19
+
20
+ export type XyoNodeQuerySchema<T extends string | void = void> = T extends string ? XyoNodeQuerySchemaBase | T : XyoNodeQuerySchemaBase
21
+
22
+ type XyoNodeQueryBase = XyoNodeAttachQuery | XyoNodeDetatchQuery | XyoNodeAttachedQuery | XyoNodeAvailableQuery | XyoModuleQuery
12
23
 
13
- export type XyoNodeQuery = XyoNodeAttachQuery | XyoNodeDetatchQuery | XyoNodeAttachedQuery | XyoNodeAvailableQuery
24
+ export type XyoNodeQuery<T extends XyoQuery | void = void> = T extends XyoQuery ? XyoNodeQueryBase | T : XyoNodeQueryBase
package/src/XyoNode.ts CHANGED
@@ -11,7 +11,7 @@ export abstract class XyoNode<
11
11
  TQueryResult extends XyoPayload = XyoPayload,
12
12
  TModule extends XyoModule = XyoModule,
13
13
  >
14
- extends XyoModule<TConfig, TQuery, TQueryResult>
14
+ extends XyoModule<TQuery, TQueryResult, TConfig>
15
15
  implements NodeModule<TQuery, TQueryResult>
16
16
  {
17
17
  /** Query Functions - Start */