@xyo-network/node 2.33.0-rc.8 → 2.33.0

package/dist/esm/Queries/index.d.ts

@@ -1,3 +1,4 @@
+import { XyoModuleQuery, XyoModuleQuerySchema, XyoQuery } from '@xyo-network/module';
 import { XyoNodeAttachQuery, XyoNodeAttachQuerySchema } from './Attach';
 import { XyoNodeAttachedQuery, XyoNodeAttachedQuerySchema } from './Attached';
 import { XyoNodeAvailableQuery, XyoNodeAvailableQuerySchema } from './Available';
@@ -6,6 +7,8 @@ export * from './Attach';
 export * from './Attached';
 export * from './Available';
 export * from './Detatch';
-export declare type XyoNodeQuerySchema = XyoNodeAttachQuerySchema | XyoNodeDetatchQuerySchema | XyoNodeAttachedQuerySchema | XyoNodeAvailableQuerySchema;
-export declare type XyoNodeQuery = XyoNodeAttachQuery | XyoNodeDetatchQuery | XyoNodeAttachedQuery | XyoNodeAvailableQuery;
+declare type XyoNodeQuerySchemaBase = XyoNodeAttachQuerySchema | XyoNodeDetatchQuerySchema | XyoNodeAttachedQuerySchema | XyoNodeAvailableQuerySchema | XyoModuleQuerySchema;
+export declare type XyoNodeQuerySchema<T extends string | void = void> = T extends string ? XyoNodeQuerySchemaBase | T : XyoNodeQuerySchemaBase;
+declare type XyoNodeQueryBase = XyoNodeAttachQuery | XyoNodeDetatchQuery | XyoNodeAttachedQuery | XyoNodeAvailableQuery | XyoModuleQuery;
+export declare type XyoNodeQuery<T extends XyoQuery | void = void> = T extends XyoQuery ? XyoNodeQueryBase | T : XyoNodeQueryBase;
 //# sourceMappingURL=index.d.ts.map

package/dist/esm/Queries/index.d.ts.map

@@ -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"}
+{"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"}

package/dist/esm/Queries/index.js.map

@@ -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"}
+{"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"}

package/dist/esm/XyoNode.d.ts

@@ -3,7 +3,7 @@ import { XyoModule, XyoModuleConfig } from '@xyo-network/module';
 import { XyoPayload } from '@xyo-network/payload';
 import { NodeModule } from './Node';
 import { XyoNodeQuery } from './Queries';
-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> {
+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> {
     /** Query Functions - Start */
     abstract attach(_address: string): void;
     abstract detatch(_address: string): void;

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

@@ -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"}
+{"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

@@ -12,13 +12,13 @@
   "dependencies": {
     "@xylabs/assert": "^2.6.7",
     "@xylabs/forget": "^2.6.7",
-    "@xyo-network/account": "^2.33.0-rc.8",
-    "@xyo-network/archivist": "^2.33.0-rc.8",
-    "@xyo-network/module": "^2.33.0-rc.8",
-    "@xyo-network/payload": "^2.33.0-rc.8",
-    "@xyo-network/promise": "^2.33.0-rc.8",
+    "@xyo-network/account": "^2.33.0",
+    "@xyo-network/archivist": "^2.33.0",
+    "@xyo-network/module": "^2.33.0",
+    "@xyo-network/payload": "^2.33.0",
+    "@xyo-network/promise": "^2.33.0",
     "lodash": "^4.17.21",
-    "terminal-kit": "^2.11.4",
+    "terminal-kit": "^2.11.6",
     "tslib": "^2.4.0",
     "yargs": "^17.5.1"
   },
@@ -26,7 +26,7 @@
     "xyo": "dist/cjs/cli/index.js"
   },
   "devDependencies": {
-    "@types/node": "^18.7.17",
+    "@types/node": "^18.7.18",
     "@types/terminal-kit": "^2.5.0",
     "ts-node": "^10.9.1",
     "typescript": "^4.8.3"
@@ -67,6 +67,5 @@
     "xyo-ts": "ts-node src/cli/index.ts"
   },
   "types": "dist/esm/index.d.ts",
-  "version": "2.33.0-rc.8",
-  "stableVersion": "2.32.1"
+  "version": "2.33.0"
 }

package/src/MemoryNode.spec.ts

@@ -1,7 +1,7 @@
 import { XyoArchivistAllQuery, XyoArchivistAllQuerySchema, XyoArchivistInsertQuery, XyoArchivistInsertQuerySchema } from '@xyo-network/archivist'
 import { XyoArchivistPayloadDiviner, XyoDivinerDivineQuery, XyoDivinerDivineQuerySchema, XyoHuriPayload, XyoHuriSchema } from '@xyo-network/diviner'
 import { XyoModule } from '@xyo-network/module'
-import { XyoPayloadBuilder, XyoPayloadSchema, XyoPayloadWrapper } from '@xyo-network/sdk'
+import { PayloadWrapper, XyoPayload, XyoPayloadBuilder, XyoPayloadSchema } from '@xyo-network/sdk'
 
 import { XyoMemoryNode } from './MemoryNode'
 
@@ -19,7 +19,9 @@ test('Create Node', async () => {
   const foundArchivist = node.get(archivist.address)
   expect(foundArchivist).toBeDefined()
   expect(foundArchivist?.address).toBe(archivist.address)
-  const testPayload = new XyoPayloadBuilder({ schema: XyoPayloadSchema }).fields({ test: true }).build()
+  const testPayload = new XyoPayloadBuilder<XyoPayload<{ schema: XyoPayloadSchema; test: boolean }>>({ schema: XyoPayloadSchema })
+    .fields({ test: true })
+    .build()
 
   const insertQuery: XyoArchivistInsertQuery = { payloads: [testPayload], schema: XyoArchivistInsertQuerySchema }
   await foundArchivist?.query(insertQuery)
@@ -32,7 +34,7 @@ test('Create Node', async () => {
   expect(payloads?.length).toBe(1)
 
   if (payloads && payloads[0]) {
-    const huri = new XyoPayloadWrapper(payloads[0]).hash
+    const huri = new PayloadWrapper(payloads[0]).hash
     const huriPayload: XyoHuriPayload = { huri, schema: XyoHuriSchema }
     const divineQuery: XyoDivinerDivineQuery = { payloads: [huriPayload], schema: XyoDivinerDivineQuerySchema }
     const foundDiviner = node.get(diviner.address)
@@ -42,7 +44,7 @@ test('Create Node', async () => {
       expect(payloads?.length).toBe(1)
       expect(payloads[0]).toBeDefined()
       if (payloads?.length === 1 && payloads[0]) {
-        expect(new XyoPayloadWrapper(payloads[0]).hash).toBe(huri)
+        expect(new PayloadWrapper(payloads[0]).hash).toBe(huri)
       }
     }
   }

package/src/Queries/index.ts

@@ -1,3 +1,5 @@
+import { XyoModuleQuery, XyoModuleQuerySchema, XyoQuery } from '@xyo-network/module'
+
 import { XyoNodeAttachQuery, XyoNodeAttachQuerySchema } from './Attach'
 import { XyoNodeAttachedQuery, XyoNodeAttachedQuerySchema } from './Attached'
 import { XyoNodeAvailableQuery, XyoNodeAvailableQuerySchema } from './Available'
@@ -8,6 +10,15 @@ export * from './Attached'
 export * from './Available'
 export * from './Detatch'
 
-export type XyoNodeQuerySchema = XyoNodeAttachQuerySchema | XyoNodeDetatchQuerySchema | XyoNodeAttachedQuerySchema | XyoNodeAvailableQuerySchema
+type XyoNodeQuerySchemaBase =
+  | XyoNodeAttachQuerySchema
+  | XyoNodeDetatchQuerySchema
+  | XyoNodeAttachedQuerySchema
+  | XyoNodeAvailableQuerySchema
+  | XyoModuleQuerySchema
+
+export type XyoNodeQuerySchema<T extends string | void = void> = T extends string ? XyoNodeQuerySchemaBase | T : XyoNodeQuerySchemaBase
+
+type XyoNodeQueryBase = XyoNodeAttachQuery | XyoNodeDetatchQuery | XyoNodeAttachedQuery | XyoNodeAvailableQuery | XyoModuleQuery
 
-export type XyoNodeQuery = XyoNodeAttachQuery | XyoNodeDetatchQuery | XyoNodeAttachedQuery | XyoNodeAvailableQuery
+export type XyoNodeQuery<T extends XyoQuery | void = void> = T extends XyoQuery ? XyoNodeQueryBase | T : XyoNodeQueryBase

package/src/XyoNode.ts

@@ -11,7 +11,7 @@ export abstract class XyoNode<
     TQueryResult extends XyoPayload = XyoPayload,
     TModule extends XyoModule = XyoModule,
   >
-  extends XyoModule<TConfig, TQuery, TQueryResult>
+  extends XyoModule<TQuery, TQueryResult, TConfig>
   implements NodeModule<TQuery, TQueryResult>
 {
   /** Query Functions - Start */