@xyo-network/node-abstract 2.88.3 → 2.89.0-rc.2

package/dist/browser/index.cjs

@@ -153,9 +153,9 @@ var AbstractNode = class extends import_module_abstract.AbstractModuleInstance {
     return manifest;
   }
   async queryHandler(query, payloads, queryConfig) {
-    const wrapper = import_boundwitness_builder.QueryBoundWitnessWrapper.parseQuery(query, payloads);
+    const wrapper = await import_boundwitness_builder.QueryBoundWitnessWrapper.parseQuery(query, payloads);
     const queryPayload = await wrapper.getQuery();
-    (0, import_assert.assertEx)(this.queryable(query, payloads, queryConfig));
+    (0, import_assert.assertEx)(await this.queryable(query, payloads, queryConfig));
     const resultPayloads = [];
     switch (queryPayload.schema) {
       case import_node_model.NodeAttachQuerySchema: {

package/dist/browser/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/AbstractNode.ts"],"sourcesContent":["export * from './AbstractNode'\n","import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { ModuleManifestPayload, NodeManifestPayload, NodeManifestPayloadSchema } from '@xyo-network/manifest-model'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport {\n  duplicateModules,\n  Module,\n  ModuleConfig,\n  ModuleFilter,\n  ModuleFilterOptions,\n  ModuleInstance,\n  ModuleQueryHandlerResult,\n} from '@xyo-network/module-model'\nimport { CompositeModuleResolver } from '@xyo-network/module-resolver'\nimport {\n  NodeAttachedQuerySchema,\n  NodeAttachQuerySchema,\n  NodeConfigSchema,\n  NodeDetachQuerySchema,\n  NodeModule,\n  NodeModuleEventData,\n  NodeParams,\n  NodeQuery,\n  NodeQueryBase,\n  NodeRegisteredQuerySchema,\n} from '@xyo-network/node-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport abstract class AbstractNode<TParams extends NodeParams = NodeParams, TEventData extends NodeModuleEventData = NodeModuleEventData>\n  extends AbstractModuleInstance<TParams, TEventData>\n  implements NodeModule<TParams, TEventData>, Module<TParams, TEventData>\n{\n  static override readonly configSchemas: string[] = [NodeConfigSchema]\n\n  protected readonly privateResolver = new CompositeModuleResolver()\n\n  private readonly isNode = true\n\n  get isModuleResolver(): boolean {\n    return true\n  }\n\n  override get queries(): string[] {\n    return [NodeAttachQuerySchema, NodeDetachQuerySchema, NodeAttachedQuerySchema, NodeRegisteredQuerySchema, ...super.queries]\n  }\n\n  protected override get _queryAccountPaths(): Record<NodeQueryBase['schema'], string> {\n    return {\n      'network.xyo.query.node.attach': '1/1',\n      'network.xyo.query.node.attached': '1/2',\n      'network.xyo.query.node.detach': '1/3',\n      'network.xyo.query.node.registered': '1/4',\n    }\n  }\n\n  static isNode(module: unknown) {\n    return (module as AbstractNode).isNode\n  }\n\n  async attached(): Promise<string[]> {\n    return (await this.attachedModules()).map((module) => module.address)\n  }\n\n  async attachedModules(maxDepth = 2): Promise<ModuleInstance[]> {\n    return (await (this.resolve(undefined, { direction: 'down', maxDepth }) ?? [])).filter((module) => module.address !== this.address)\n  }\n\n  override async manifest(maxDepth?: number, ignoreAddresses?: string[]): Promise<ModuleManifestPayload> {\n    return await this.manifestHandler(maxDepth, ignoreAddresses)\n  }\n\n  register(_module: ModuleInstance): Promisable<void> {\n    throw new Error('Method not implemented.')\n  }\n\n  registered(): Promisable<string[]> {\n    throw new Error('Method not implemented.')\n  }\n\n  registeredModules(): Promisable<Module[]> {\n    throw new Error('Method not implemented.')\n  }\n\n  override async resolve(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n  override async resolve(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n  override async resolve(\n    nameOrAddressOrFilter?: ModuleFilter | string,\n    options?: ModuleFilterOptions,\n  ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n    //checking type of nameOrAddressOrFilter before calling other functions since TS seems\n    //to need help here narrowing before the call\n    if (typeof nameOrAddressOrFilter === 'string') {\n      switch (options?.visibility) {\n        case 'private': {\n          return await this.resolvePrivate(nameOrAddressOrFilter)\n        }\n        case 'all': {\n          return await this.resolveAll(nameOrAddressOrFilter)\n        }\n        default: {\n          return await super.resolve(nameOrAddressOrFilter, options)\n        }\n      }\n    } else {\n      switch (options?.visibility) {\n        case 'all': {\n          return await this.resolveAll(nameOrAddressOrFilter)\n        }\n        case 'private': {\n          return await this.resolvePrivate(nameOrAddressOrFilter)\n        }\n        default: {\n          return await super.resolve(nameOrAddressOrFilter, options)\n        }\n      }\n    }\n  }\n\n  unregister(_module: ModuleInstance): Promisable<this> {\n    throw new Error('Method not implemented.')\n  }\n\n  protected override async discoverHandler(maxDepth?: number): Promise<Payload[]> {\n    const childMods = await this.attachedModules(maxDepth)\n    const childModAddresses = await Promise.all(\n      childMods.map((mod) =>\n        new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address: mod.address, name: mod.config.name }).build(),\n      ),\n    )\n\n    return [...(await super.discoverHandler(maxDepth)), ...childModAddresses]\n  }\n\n  protected override async manifestHandler(maxDepth?: number, ignoreAddresses: string[] = []): Promise<ModuleManifestPayload> {\n    const manifest: NodeManifestPayload = { ...(await super.manifestHandler()), schema: NodeManifestPayloadSchema }\n    const newIgnoreAddresses = [...ignoreAddresses, this.address]\n\n    const notThisModule = (module: ModuleInstance) => module.address !== this.address && !ignoreAddresses.includes(module.address)\n    const toManifest = (module: ModuleInstance) => module.manifest(maxDepth, newIgnoreAddresses)\n\n    /*const privateModules = await Promise.all((await this.privateResolver.resolve()).filter(notThisModule).map(toManifest))\n    if (privateModules.length > 0) {\n      manifest.modules = manifest.modules ?? {}\n      manifest.modules.private = privateModules\n    }*/\n\n    const publicModules = await Promise.all((await this.resolve(undefined, { direction: 'down', maxDepth })).filter(notThisModule).map(toManifest))\n    if (publicModules.length > 0) {\n      manifest.modules = manifest.modules ?? {}\n      manifest.modules.public = publicModules\n    }\n\n    return manifest\n  }\n\n  protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(\n    query: T,\n    payloads?: Payload[],\n    queryConfig?: TConfig,\n  ): Promise<ModuleQueryHandlerResult> {\n    const wrapper = QueryBoundWitnessWrapper.parseQuery<NodeQuery>(query, payloads)\n    const queryPayload = await wrapper.getQuery()\n    assertEx(this.queryable(query, payloads, queryConfig))\n    const resultPayloads: Payload[] = []\n    switch (queryPayload.schema) {\n      case NodeAttachQuerySchema: {\n        const address = await this.attach(queryPayload.nameOrAddress, queryPayload.external)\n        if (address) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      case NodeDetachQuerySchema: {\n        const address = await this.detach(queryPayload.nameOrAddress)\n        if (address) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      case NodeAttachedQuerySchema: {\n        const addresses = await this.attached()\n        for (const address of addresses) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      case NodeRegisteredQuerySchema: {\n        const addresses = await this.registered()\n        for (const address of addresses) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      default: {\n        return await super.queryHandler(query, payloads)\n      }\n    }\n    return resultPayloads\n  }\n\n  private async resolveAll(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n  private async resolveAll(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n  private async resolveAll(\n    nameOrAddressOrFilter?: ModuleFilter | string,\n    options?: ModuleFilterOptions,\n  ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n    switch (typeof nameOrAddressOrFilter) {\n      case 'string': {\n        return (await this.resolvePrivate(nameOrAddressOrFilter, options)) ?? (await super.resolve(nameOrAddressOrFilter, options))\n      }\n      default: {\n        return [...(await this.resolvePrivate(nameOrAddressOrFilter, options)), ...(await super.resolve(nameOrAddressOrFilter, options))].filter(\n          duplicateModules,\n        )\n      }\n    }\n  }\n\n  private async resolvePrivate(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n  private async resolvePrivate(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n  private async resolvePrivate(\n    nameOrAddressOrFilter?: ModuleFilter | string,\n    options?: ModuleFilterOptions,\n  ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n    const direction = options?.direction ?? 'all'\n    const down = direction === 'down' || direction === 'all'\n    switch (typeof nameOrAddressOrFilter) {\n      case 'string': {\n        return down ? await this.privateResolver.resolve(nameOrAddressOrFilter) : undefined\n      }\n      default: {\n        return down ? await this.privateResolver.resolve(nameOrAddressOrFilter) : undefined\n      }\n    }\n  }\n\n  abstract attach(nameOrAddress: string, external?: boolean): Promisable<string | undefined>\n  abstract detach(nameOrAddress: string): Promisable<string | undefined>\n}\n"],"mappings":"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","names":["AbstractNode","AbstractModuleInstance","configSchemas","NodeConfigSchema","privateResolver","CompositeModuleResolver","isNode","isModuleResolver","queries","NodeAttachQuerySchema","NodeDetachQuerySchema","NodeAttachedQuerySchema","NodeRegisteredQuerySchema","_queryAccountPaths","module","attached","attachedModules","map","address","maxDepth","resolve","undefined","direction","filter","manifest","ignoreAddresses","manifestHandler","register","_module","Error","registered","registeredModules","nameOrAddressOrFilter","options","visibility","resolvePrivate","resolveAll","unregister","discoverHandler","childMods","childModAddresses","Promise","all","mod","PayloadBuilder","schema","AddressSchema","fields","name","config","build","NodeManifestPayloadSchema","newIgnoreAddresses","notThisModule","includes","toManifest","publicModules","length","modules","public","queryHandler","query","payloads","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","queryPayload","getQuery","assertEx","queryable","resultPayloads","attach","nameOrAddress","external","payload","push","detach","addresses","duplicateModules","down"]}
+{"version":3,"sources":["../../src/index.ts","../../src/AbstractNode.ts"],"sourcesContent":["export * from './AbstractNode'\n","import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { ModuleManifestPayload, NodeManifestPayload, NodeManifestPayloadSchema } from '@xyo-network/manifest-model'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport {\n  duplicateModules,\n  Module,\n  ModuleConfig,\n  ModuleFilter,\n  ModuleFilterOptions,\n  ModuleInstance,\n  ModuleQueryHandlerResult,\n} from '@xyo-network/module-model'\nimport { CompositeModuleResolver } from '@xyo-network/module-resolver'\nimport {\n  NodeAttachedQuerySchema,\n  NodeAttachQuerySchema,\n  NodeConfigSchema,\n  NodeDetachQuerySchema,\n  NodeModule,\n  NodeModuleEventData,\n  NodeParams,\n  NodeQuery,\n  NodeQueryBase,\n  NodeRegisteredQuerySchema,\n} from '@xyo-network/node-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport abstract class AbstractNode<TParams extends NodeParams = NodeParams, TEventData extends NodeModuleEventData = NodeModuleEventData>\n  extends AbstractModuleInstance<TParams, TEventData>\n  implements NodeModule<TParams, TEventData>, Module<TParams, TEventData>\n{\n  static override readonly configSchemas: string[] = [NodeConfigSchema]\n\n  protected readonly privateResolver = new CompositeModuleResolver()\n\n  private readonly isNode = true\n\n  get isModuleResolver(): boolean {\n    return true\n  }\n\n  override get queries(): string[] {\n    return [NodeAttachQuerySchema, NodeDetachQuerySchema, NodeAttachedQuerySchema, NodeRegisteredQuerySchema, ...super.queries]\n  }\n\n  protected override get _queryAccountPaths(): Record<NodeQueryBase['schema'], string> {\n    return {\n      'network.xyo.query.node.attach': '1/1',\n      'network.xyo.query.node.attached': '1/2',\n      'network.xyo.query.node.detach': '1/3',\n      'network.xyo.query.node.registered': '1/4',\n    }\n  }\n\n  static isNode(module: unknown) {\n    return (module as AbstractNode).isNode\n  }\n\n  async attached(): Promise<string[]> {\n    return (await this.attachedModules()).map((module) => module.address)\n  }\n\n  async attachedModules(maxDepth = 2): Promise<ModuleInstance[]> {\n    return (await (this.resolve(undefined, { direction: 'down', maxDepth }) ?? [])).filter((module) => module.address !== this.address)\n  }\n\n  override async manifest(maxDepth?: number, ignoreAddresses?: string[]): Promise<ModuleManifestPayload> {\n    return await this.manifestHandler(maxDepth, ignoreAddresses)\n  }\n\n  register(_module: ModuleInstance): Promisable<void> {\n    throw new Error('Method not implemented.')\n  }\n\n  registered(): Promisable<string[]> {\n    throw new Error('Method not implemented.')\n  }\n\n  registeredModules(): Promisable<Module[]> {\n    throw new Error('Method not implemented.')\n  }\n\n  override async resolve(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n  override async resolve(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n  override async resolve(\n    nameOrAddressOrFilter?: ModuleFilter | string,\n    options?: ModuleFilterOptions,\n  ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n    //checking type of nameOrAddressOrFilter before calling other functions since TS seems\n    //to need help here narrowing before the call\n    if (typeof nameOrAddressOrFilter === 'string') {\n      switch (options?.visibility) {\n        case 'private': {\n          return await this.resolvePrivate(nameOrAddressOrFilter)\n        }\n        case 'all': {\n          return await this.resolveAll(nameOrAddressOrFilter)\n        }\n        default: {\n          return await super.resolve(nameOrAddressOrFilter, options)\n        }\n      }\n    } else {\n      switch (options?.visibility) {\n        case 'all': {\n          return await this.resolveAll(nameOrAddressOrFilter)\n        }\n        case 'private': {\n          return await this.resolvePrivate(nameOrAddressOrFilter)\n        }\n        default: {\n          return await super.resolve(nameOrAddressOrFilter, options)\n        }\n      }\n    }\n  }\n\n  unregister(_module: ModuleInstance): Promisable<this> {\n    throw new Error('Method not implemented.')\n  }\n\n  protected override async discoverHandler(maxDepth?: number): Promise<Payload[]> {\n    const childMods = await this.attachedModules(maxDepth)\n    const childModAddresses = await Promise.all(\n      childMods.map((mod) =>\n        new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address: mod.address, name: mod.config.name }).build(),\n      ),\n    )\n\n    return [...(await super.discoverHandler(maxDepth)), ...childModAddresses]\n  }\n\n  protected override async manifestHandler(maxDepth?: number, ignoreAddresses: string[] = []): Promise<ModuleManifestPayload> {\n    const manifest: NodeManifestPayload = { ...(await super.manifestHandler()), schema: NodeManifestPayloadSchema }\n    const newIgnoreAddresses = [...ignoreAddresses, this.address]\n\n    const notThisModule = (module: ModuleInstance) => module.address !== this.address && !ignoreAddresses.includes(module.address)\n    const toManifest = (module: ModuleInstance) => module.manifest(maxDepth, newIgnoreAddresses)\n\n    /*const privateModules = await Promise.all((await this.privateResolver.resolve()).filter(notThisModule).map(toManifest))\n    if (privateModules.length > 0) {\n      manifest.modules = manifest.modules ?? {}\n      manifest.modules.private = privateModules\n    }*/\n\n    const publicModules = await Promise.all((await this.resolve(undefined, { direction: 'down', maxDepth })).filter(notThisModule).map(toManifest))\n    if (publicModules.length > 0) {\n      manifest.modules = manifest.modules ?? {}\n      manifest.modules.public = publicModules\n    }\n\n    return manifest\n  }\n\n  protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(\n    query: T,\n    payloads?: Payload[],\n    queryConfig?: TConfig,\n  ): Promise<ModuleQueryHandlerResult> {\n    const wrapper = await QueryBoundWitnessWrapper.parseQuery<NodeQuery>(query, payloads)\n    const queryPayload = await wrapper.getQuery()\n    assertEx(await this.queryable(query, payloads, queryConfig))\n    const resultPayloads: Payload[] = []\n    switch (queryPayload.schema) {\n      case NodeAttachQuerySchema: {\n        const address = await this.attach(queryPayload.nameOrAddress, queryPayload.external)\n        if (address) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      case NodeDetachQuerySchema: {\n        const address = await this.detach(queryPayload.nameOrAddress)\n        if (address) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      case NodeAttachedQuerySchema: {\n        const addresses = await this.attached()\n        for (const address of addresses) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      case NodeRegisteredQuerySchema: {\n        const addresses = await this.registered()\n        for (const address of addresses) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      default: {\n        return await super.queryHandler(query, payloads)\n      }\n    }\n    return resultPayloads\n  }\n\n  private async resolveAll(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n  private async resolveAll(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n  private async resolveAll(\n    nameOrAddressOrFilter?: ModuleFilter | string,\n    options?: ModuleFilterOptions,\n  ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n    switch (typeof nameOrAddressOrFilter) {\n      case 'string': {\n        return (await this.resolvePrivate(nameOrAddressOrFilter, options)) ?? (await super.resolve(nameOrAddressOrFilter, options))\n      }\n      default: {\n        return [...(await this.resolvePrivate(nameOrAddressOrFilter, options)), ...(await super.resolve(nameOrAddressOrFilter, options))].filter(\n          duplicateModules,\n        )\n      }\n    }\n  }\n\n  private async resolvePrivate(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n  private async resolvePrivate(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n  private async resolvePrivate(\n    nameOrAddressOrFilter?: ModuleFilter | string,\n    options?: ModuleFilterOptions,\n  ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n    const direction = options?.direction ?? 'all'\n    const down = direction === 'down' || direction === 'all'\n    switch (typeof nameOrAddressOrFilter) {\n      case 'string': {\n        return down ? await this.privateResolver.resolve(nameOrAddressOrFilter) : undefined\n      }\n      default: {\n        return down ? await this.privateResolver.resolve(nameOrAddressOrFilter) : undefined\n      }\n    }\n  }\n\n  abstract attach(nameOrAddress: string, external?: boolean): Promisable<string | undefined>\n  abstract detach(nameOrAddress: string): Promisable<string | undefined>\n}\n"],"mappings":"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","names":["AbstractNode","AbstractModuleInstance","configSchemas","NodeConfigSchema","privateResolver","CompositeModuleResolver","isNode","isModuleResolver","queries","NodeAttachQuerySchema","NodeDetachQuerySchema","NodeAttachedQuerySchema","NodeRegisteredQuerySchema","_queryAccountPaths","module","attached","attachedModules","map","address","maxDepth","resolve","undefined","direction","filter","manifest","ignoreAddresses","manifestHandler","register","_module","Error","registered","registeredModules","nameOrAddressOrFilter","options","visibility","resolvePrivate","resolveAll","unregister","discoverHandler","childMods","childModAddresses","Promise","all","mod","PayloadBuilder","schema","AddressSchema","fields","name","config","build","NodeManifestPayloadSchema","newIgnoreAddresses","notThisModule","includes","toManifest","publicModules","length","modules","public","queryHandler","query","payloads","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","queryPayload","getQuery","assertEx","queryable","resultPayloads","attach","nameOrAddress","external","payload","push","detach","addresses","duplicateModules","down"]}

package/dist/browser/index.js

@@ -129,9 +129,9 @@ var AbstractNode = class extends AbstractModuleInstance {
     return manifest;
   }
   async queryHandler(query, payloads, queryConfig) {
-    const wrapper = QueryBoundWitnessWrapper.parseQuery(query, payloads);
+    const wrapper = await QueryBoundWitnessWrapper.parseQuery(query, payloads);
     const queryPayload = await wrapper.getQuery();
-    assertEx(this.queryable(query, payloads, queryConfig));
+    assertEx(await this.queryable(query, payloads, queryConfig));
     const resultPayloads = [];
     switch (queryPayload.schema) {
       case NodeAttachQuerySchema: {

package/dist/browser/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/AbstractNode.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { ModuleManifestPayload, NodeManifestPayload, NodeManifestPayloadSchema } from '@xyo-network/manifest-model'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport {\n  duplicateModules,\n  Module,\n  ModuleConfig,\n  ModuleFilter,\n  ModuleFilterOptions,\n  ModuleInstance,\n  ModuleQueryHandlerResult,\n} from '@xyo-network/module-model'\nimport { CompositeModuleResolver } from '@xyo-network/module-resolver'\nimport {\n  NodeAttachedQuerySchema,\n  NodeAttachQuerySchema,\n  NodeConfigSchema,\n  NodeDetachQuerySchema,\n  NodeModule,\n  NodeModuleEventData,\n  NodeParams,\n  NodeQuery,\n  NodeQueryBase,\n  NodeRegisteredQuerySchema,\n} from '@xyo-network/node-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport abstract class AbstractNode<TParams extends NodeParams = NodeParams, TEventData extends NodeModuleEventData = NodeModuleEventData>\n  extends AbstractModuleInstance<TParams, TEventData>\n  implements NodeModule<TParams, TEventData>, Module<TParams, TEventData>\n{\n  static override readonly configSchemas: string[] = [NodeConfigSchema]\n\n  protected readonly privateResolver = new CompositeModuleResolver()\n\n  private readonly isNode = true\n\n  get isModuleResolver(): boolean {\n    return true\n  }\n\n  override get queries(): string[] {\n    return [NodeAttachQuerySchema, NodeDetachQuerySchema, NodeAttachedQuerySchema, NodeRegisteredQuerySchema, ...super.queries]\n  }\n\n  protected override get _queryAccountPaths(): Record<NodeQueryBase['schema'], string> {\n    return {\n      'network.xyo.query.node.attach': '1/1',\n      'network.xyo.query.node.attached': '1/2',\n      'network.xyo.query.node.detach': '1/3',\n      'network.xyo.query.node.registered': '1/4',\n    }\n  }\n\n  static isNode(module: unknown) {\n    return (module as AbstractNode).isNode\n  }\n\n  async attached(): Promise<string[]> {\n    return (await this.attachedModules()).map((module) => module.address)\n  }\n\n  async attachedModules(maxDepth = 2): Promise<ModuleInstance[]> {\n    return (await (this.resolve(undefined, { direction: 'down', maxDepth }) ?? [])).filter((module) => module.address !== this.address)\n  }\n\n  override async manifest(maxDepth?: number, ignoreAddresses?: string[]): Promise<ModuleManifestPayload> {\n    return await this.manifestHandler(maxDepth, ignoreAddresses)\n  }\n\n  register(_module: ModuleInstance): Promisable<void> {\n    throw new Error('Method not implemented.')\n  }\n\n  registered(): Promisable<string[]> {\n    throw new Error('Method not implemented.')\n  }\n\n  registeredModules(): Promisable<Module[]> {\n    throw new Error('Method not implemented.')\n  }\n\n  override async resolve(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n  override async resolve(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n  override async resolve(\n    nameOrAddressOrFilter?: ModuleFilter | string,\n    options?: ModuleFilterOptions,\n  ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n    //checking type of nameOrAddressOrFilter before calling other functions since TS seems\n    //to need help here narrowing before the call\n    if (typeof nameOrAddressOrFilter === 'string') {\n      switch (options?.visibility) {\n        case 'private': {\n          return await this.resolvePrivate(nameOrAddressOrFilter)\n        }\n        case 'all': {\n          return await this.resolveAll(nameOrAddressOrFilter)\n        }\n        default: {\n          return await super.resolve(nameOrAddressOrFilter, options)\n        }\n      }\n    } else {\n      switch (options?.visibility) {\n        case 'all': {\n          return await this.resolveAll(nameOrAddressOrFilter)\n        }\n        case 'private': {\n          return await this.resolvePrivate(nameOrAddressOrFilter)\n        }\n        default: {\n          return await super.resolve(nameOrAddressOrFilter, options)\n        }\n      }\n    }\n  }\n\n  unregister(_module: ModuleInstance): Promisable<this> {\n    throw new Error('Method not implemented.')\n  }\n\n  protected override async discoverHandler(maxDepth?: number): Promise<Payload[]> {\n    const childMods = await this.attachedModules(maxDepth)\n    const childModAddresses = await Promise.all(\n      childMods.map((mod) =>\n        new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address: mod.address, name: mod.config.name }).build(),\n      ),\n    )\n\n    return [...(await super.discoverHandler(maxDepth)), ...childModAddresses]\n  }\n\n  protected override async manifestHandler(maxDepth?: number, ignoreAddresses: string[] = []): Promise<ModuleManifestPayload> {\n    const manifest: NodeManifestPayload = { ...(await super.manifestHandler()), schema: NodeManifestPayloadSchema }\n    const newIgnoreAddresses = [...ignoreAddresses, this.address]\n\n    const notThisModule = (module: ModuleInstance) => module.address !== this.address && !ignoreAddresses.includes(module.address)\n    const toManifest = (module: ModuleInstance) => module.manifest(maxDepth, newIgnoreAddresses)\n\n    /*const privateModules = await Promise.all((await this.privateResolver.resolve()).filter(notThisModule).map(toManifest))\n    if (privateModules.length > 0) {\n      manifest.modules = manifest.modules ?? {}\n      manifest.modules.private = privateModules\n    }*/\n\n    const publicModules = await Promise.all((await this.resolve(undefined, { direction: 'down', maxDepth })).filter(notThisModule).map(toManifest))\n    if (publicModules.length > 0) {\n      manifest.modules = manifest.modules ?? {}\n      manifest.modules.public = publicModules\n    }\n\n    return manifest\n  }\n\n  protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(\n    query: T,\n    payloads?: Payload[],\n    queryConfig?: TConfig,\n  ): Promise<ModuleQueryHandlerResult> {\n    const wrapper = QueryBoundWitnessWrapper.parseQuery<NodeQuery>(query, payloads)\n    const queryPayload = await wrapper.getQuery()\n    assertEx(this.queryable(query, payloads, queryConfig))\n    const resultPayloads: Payload[] = []\n    switch (queryPayload.schema) {\n      case NodeAttachQuerySchema: {\n        const address = await this.attach(queryPayload.nameOrAddress, queryPayload.external)\n        if (address) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      case NodeDetachQuerySchema: {\n        const address = await this.detach(queryPayload.nameOrAddress)\n        if (address) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      case NodeAttachedQuerySchema: {\n        const addresses = await this.attached()\n        for (const address of addresses) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      case NodeRegisteredQuerySchema: {\n        const addresses = await this.registered()\n        for (const address of addresses) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      default: {\n        return await super.queryHandler(query, payloads)\n      }\n    }\n    return resultPayloads\n  }\n\n  private async resolveAll(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n  private async resolveAll(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n  private async resolveAll(\n    nameOrAddressOrFilter?: ModuleFilter | string,\n    options?: ModuleFilterOptions,\n  ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n    switch (typeof nameOrAddressOrFilter) {\n      case 'string': {\n        return (await this.resolvePrivate(nameOrAddressOrFilter, options)) ?? (await super.resolve(nameOrAddressOrFilter, options))\n      }\n      default: {\n        return [...(await this.resolvePrivate(nameOrAddressOrFilter, options)), ...(await super.resolve(nameOrAddressOrFilter, options))].filter(\n          duplicateModules,\n        )\n      }\n    }\n  }\n\n  private async resolvePrivate(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n  private async resolvePrivate(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n  private async resolvePrivate(\n    nameOrAddressOrFilter?: ModuleFilter | string,\n    options?: ModuleFilterOptions,\n  ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n    const direction = options?.direction ?? 'all'\n    const down = direction === 'down' || direction === 'all'\n    switch (typeof nameOrAddressOrFilter) {\n      case 'string': {\n        return down ? await this.privateResolver.resolve(nameOrAddressOrFilter) : undefined\n      }\n      default: {\n        return down ? await this.privateResolver.resolve(nameOrAddressOrFilter) : undefined\n      }\n    }\n  }\n\n  abstract attach(nameOrAddress: string, external?: boolean): Promisable<string | undefined>\n  abstract detach(nameOrAddress: string): Promisable<string | undefined>\n}\n"],"mappings":"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","names":["assertEx","AddressSchema","QueryBoundWitnessWrapper","NodeManifestPayloadSchema","AbstractModuleInstance","duplicateModules","CompositeModuleResolver","NodeAttachedQuerySchema","NodeAttachQuerySchema","NodeConfigSchema","NodeDetachQuerySchema","NodeRegisteredQuerySchema","PayloadBuilder","AbstractNode","AbstractModuleInstance","configSchemas","NodeConfigSchema","privateResolver","CompositeModuleResolver","isNode","isModuleResolver","queries","NodeAttachQuerySchema","NodeDetachQuerySchema","NodeAttachedQuerySchema","NodeRegisteredQuerySchema","_queryAccountPaths","module","attached","attachedModules","map","address","maxDepth","resolve","undefined","direction","filter","manifest","ignoreAddresses","manifestHandler","register","_module","Error","registered","registeredModules","nameOrAddressOrFilter","options","visibility","resolvePrivate","resolveAll","unregister","discoverHandler","childMods","childModAddresses","Promise","all","mod","PayloadBuilder","schema","AddressSchema","fields","name","config","build","NodeManifestPayloadSchema","newIgnoreAddresses","notThisModule","includes","toManifest","publicModules","length","modules","public","queryHandler","query","payloads","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","queryPayload","getQuery","assertEx","queryable","resultPayloads","attach","nameOrAddress","external","payload","push","detach","addresses","duplicateModules","down"]}
+{"version":3,"sources":["../../src/AbstractNode.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { ModuleManifestPayload, NodeManifestPayload, NodeManifestPayloadSchema } from '@xyo-network/manifest-model'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport {\n  duplicateModules,\n  Module,\n  ModuleConfig,\n  ModuleFilter,\n  ModuleFilterOptions,\n  ModuleInstance,\n  ModuleQueryHandlerResult,\n} from '@xyo-network/module-model'\nimport { CompositeModuleResolver } from '@xyo-network/module-resolver'\nimport {\n  NodeAttachedQuerySchema,\n  NodeAttachQuerySchema,\n  NodeConfigSchema,\n  NodeDetachQuerySchema,\n  NodeModule,\n  NodeModuleEventData,\n  NodeParams,\n  NodeQuery,\n  NodeQueryBase,\n  NodeRegisteredQuerySchema,\n} from '@xyo-network/node-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport abstract class AbstractNode<TParams extends NodeParams = NodeParams, TEventData extends NodeModuleEventData = NodeModuleEventData>\n  extends AbstractModuleInstance<TParams, TEventData>\n  implements NodeModule<TParams, TEventData>, Module<TParams, TEventData>\n{\n  static override readonly configSchemas: string[] = [NodeConfigSchema]\n\n  protected readonly privateResolver = new CompositeModuleResolver()\n\n  private readonly isNode = true\n\n  get isModuleResolver(): boolean {\n    return true\n  }\n\n  override get queries(): string[] {\n    return [NodeAttachQuerySchema, NodeDetachQuerySchema, NodeAttachedQuerySchema, NodeRegisteredQuerySchema, ...super.queries]\n  }\n\n  protected override get _queryAccountPaths(): Record<NodeQueryBase['schema'], string> {\n    return {\n      'network.xyo.query.node.attach': '1/1',\n      'network.xyo.query.node.attached': '1/2',\n      'network.xyo.query.node.detach': '1/3',\n      'network.xyo.query.node.registered': '1/4',\n    }\n  }\n\n  static isNode(module: unknown) {\n    return (module as AbstractNode).isNode\n  }\n\n  async attached(): Promise<string[]> {\n    return (await this.attachedModules()).map((module) => module.address)\n  }\n\n  async attachedModules(maxDepth = 2): Promise<ModuleInstance[]> {\n    return (await (this.resolve(undefined, { direction: 'down', maxDepth }) ?? [])).filter((module) => module.address !== this.address)\n  }\n\n  override async manifest(maxDepth?: number, ignoreAddresses?: string[]): Promise<ModuleManifestPayload> {\n    return await this.manifestHandler(maxDepth, ignoreAddresses)\n  }\n\n  register(_module: ModuleInstance): Promisable<void> {\n    throw new Error('Method not implemented.')\n  }\n\n  registered(): Promisable<string[]> {\n    throw new Error('Method not implemented.')\n  }\n\n  registeredModules(): Promisable<Module[]> {\n    throw new Error('Method not implemented.')\n  }\n\n  override async resolve(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n  override async resolve(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n  override async resolve(\n    nameOrAddressOrFilter?: ModuleFilter | string,\n    options?: ModuleFilterOptions,\n  ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n    //checking type of nameOrAddressOrFilter before calling other functions since TS seems\n    //to need help here narrowing before the call\n    if (typeof nameOrAddressOrFilter === 'string') {\n      switch (options?.visibility) {\n        case 'private': {\n          return await this.resolvePrivate(nameOrAddressOrFilter)\n        }\n        case 'all': {\n          return await this.resolveAll(nameOrAddressOrFilter)\n        }\n        default: {\n          return await super.resolve(nameOrAddressOrFilter, options)\n        }\n      }\n    } else {\n      switch (options?.visibility) {\n        case 'all': {\n          return await this.resolveAll(nameOrAddressOrFilter)\n        }\n        case 'private': {\n          return await this.resolvePrivate(nameOrAddressOrFilter)\n        }\n        default: {\n          return await super.resolve(nameOrAddressOrFilter, options)\n        }\n      }\n    }\n  }\n\n  unregister(_module: ModuleInstance): Promisable<this> {\n    throw new Error('Method not implemented.')\n  }\n\n  protected override async discoverHandler(maxDepth?: number): Promise<Payload[]> {\n    const childMods = await this.attachedModules(maxDepth)\n    const childModAddresses = await Promise.all(\n      childMods.map((mod) =>\n        new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address: mod.address, name: mod.config.name }).build(),\n      ),\n    )\n\n    return [...(await super.discoverHandler(maxDepth)), ...childModAddresses]\n  }\n\n  protected override async manifestHandler(maxDepth?: number, ignoreAddresses: string[] = []): Promise<ModuleManifestPayload> {\n    const manifest: NodeManifestPayload = { ...(await super.manifestHandler()), schema: NodeManifestPayloadSchema }\n    const newIgnoreAddresses = [...ignoreAddresses, this.address]\n\n    const notThisModule = (module: ModuleInstance) => module.address !== this.address && !ignoreAddresses.includes(module.address)\n    const toManifest = (module: ModuleInstance) => module.manifest(maxDepth, newIgnoreAddresses)\n\n    /*const privateModules = await Promise.all((await this.privateResolver.resolve()).filter(notThisModule).map(toManifest))\n    if (privateModules.length > 0) {\n      manifest.modules = manifest.modules ?? {}\n      manifest.modules.private = privateModules\n    }*/\n\n    const publicModules = await Promise.all((await this.resolve(undefined, { direction: 'down', maxDepth })).filter(notThisModule).map(toManifest))\n    if (publicModules.length > 0) {\n      manifest.modules = manifest.modules ?? {}\n      manifest.modules.public = publicModules\n    }\n\n    return manifest\n  }\n\n  protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(\n    query: T,\n    payloads?: Payload[],\n    queryConfig?: TConfig,\n  ): Promise<ModuleQueryHandlerResult> {\n    const wrapper = await QueryBoundWitnessWrapper.parseQuery<NodeQuery>(query, payloads)\n    const queryPayload = await wrapper.getQuery()\n    assertEx(await this.queryable(query, payloads, queryConfig))\n    const resultPayloads: Payload[] = []\n    switch (queryPayload.schema) {\n      case NodeAttachQuerySchema: {\n        const address = await this.attach(queryPayload.nameOrAddress, queryPayload.external)\n        if (address) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      case NodeDetachQuerySchema: {\n        const address = await this.detach(queryPayload.nameOrAddress)\n        if (address) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      case NodeAttachedQuerySchema: {\n        const addresses = await this.attached()\n        for (const address of addresses) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      case NodeRegisteredQuerySchema: {\n        const addresses = await this.registered()\n        for (const address of addresses) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      default: {\n        return await super.queryHandler(query, payloads)\n      }\n    }\n    return resultPayloads\n  }\n\n  private async resolveAll(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n  private async resolveAll(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n  private async resolveAll(\n    nameOrAddressOrFilter?: ModuleFilter | string,\n    options?: ModuleFilterOptions,\n  ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n    switch (typeof nameOrAddressOrFilter) {\n      case 'string': {\n        return (await this.resolvePrivate(nameOrAddressOrFilter, options)) ?? (await super.resolve(nameOrAddressOrFilter, options))\n      }\n      default: {\n        return [...(await this.resolvePrivate(nameOrAddressOrFilter, options)), ...(await super.resolve(nameOrAddressOrFilter, options))].filter(\n          duplicateModules,\n        )\n      }\n    }\n  }\n\n  private async resolvePrivate(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n  private async resolvePrivate(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n  private async resolvePrivate(\n    nameOrAddressOrFilter?: ModuleFilter | string,\n    options?: ModuleFilterOptions,\n  ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n    const direction = options?.direction ?? 'all'\n    const down = direction === 'down' || direction === 'all'\n    switch (typeof nameOrAddressOrFilter) {\n      case 'string': {\n        return down ? await this.privateResolver.resolve(nameOrAddressOrFilter) : undefined\n      }\n      default: {\n        return down ? await this.privateResolver.resolve(nameOrAddressOrFilter) : undefined\n      }\n    }\n  }\n\n  abstract attach(nameOrAddress: string, external?: boolean): Promisable<string | undefined>\n  abstract detach(nameOrAddress: string): Promisable<string | undefined>\n}\n"],"mappings":";;;;AAAA,SAASA,gBAAgB;AAEzB,SAAyBC,qBAAqB;AAC9C,SAASC,gCAAgC;AAEzC,SAAqDC,iCAAiC;AACtF,SAASC,8BAA8B;AACvC,SACEC,wBAOK;AACP,SAASC,+BAA+B;AACxC,SACEC,yBACAC,uBACAC,kBACAC,uBAMAC,iCACK;AACP,SAASC,sBAAsB;AAGxB,IAAeC,eAAf,cACGC,uBAAAA;EAjCV,OAiCUA;;;EAGR,OAAyBC,gBAA0B;IAACC;;EAEjCC,kBAAkB,IAAIC,wBAAAA;EAExBC,SAAS;EAE1B,IAAIC,mBAA4B;AAC9B,WAAO;EACT;EAEA,IAAaC,UAAoB;AAC/B,WAAO;MAACC;MAAuBC;MAAuBC;MAAyBC;SAA8B,MAAMJ;;EACrH;EAEA,IAAuBK,qBAA8D;AACnF,WAAO;MACL,iCAAiC;MACjC,mCAAmC;MACnC,iCAAiC;MACjC,qCAAqC;IACvC;EACF;EAEA,OAAOP,OAAOQ,QAAiB;AAC7B,WAAQA,OAAwBR;EAClC;EAEA,MAAMS,WAA8B;AAClC,YAAQ,MAAM,KAAKC,gBAAe,GAAIC,IAAI,CAACH,WAAWA,OAAOI,OAAO;EACtE;EAEA,MAAMF,gBAAgBG,WAAW,GAA8B;AAC7D,YAAQ,OAAO,KAAKC,QAAQC,QAAW;MAAEC,WAAW;MAAQH;IAAS,CAAA,KAAM,CAAA,IAAKI,OAAO,CAACT,WAAWA,OAAOI,YAAY,KAAKA,OAAO;EACpI;EAEA,MAAeM,SAASL,UAAmBM,iBAA4D;AACrG,WAAO,MAAM,KAAKC,gBAAgBP,UAAUM,eAAAA;EAC9C;EAEAE,SAASC,SAA2C;AAClD,UAAM,IAAIC,MAAM,yBAAA;EAClB;EAEAC,aAAmC;AACjC,UAAM,IAAID,MAAM,yBAAA;EAClB;EAEAE,oBAA0C;AACxC,UAAM,IAAIF,MAAM,yBAAA;EAClB;EAIA,MAAeT,QACbY,uBACAC,SACwD;AAGxD,QAAI,OAAOD,0BAA0B,UAAU;AAC7C,cAAQC,SAASC,YAAAA;QACf,KAAK,WAAW;AACd,iBAAO,MAAM,KAAKC,eAAeH,qBAAAA;QACnC;QACA,KAAK,OAAO;AACV,iBAAO,MAAM,KAAKI,WAAWJ,qBAAAA;QAC/B;QACA,SAAS;AACP,iBAAO,MAAM,MAAMZ,QAAQY,uBAAuBC,OAAAA;QACpD;MACF;IACF,OAAO;AACL,cAAQA,SAASC,YAAAA;QACf,KAAK,OAAO;AACV,iBAAO,MAAM,KAAKE,WAAWJ,qBAAAA;QAC/B;QACA,KAAK,WAAW;AACd,iBAAO,MAAM,KAAKG,eAAeH,qBAAAA;QACnC;QACA,SAAS;AACP,iBAAO,MAAM,MAAMZ,QAAQY,uBAAuBC,OAAAA;QACpD;MACF;IACF;EACF;EAEAI,WAAWT,SAA2C;AACpD,UAAM,IAAIC,MAAM,yBAAA;EAClB;EAEA,MAAyBS,gBAAgBnB,UAAuC;AAC9E,UAAMoB,YAAY,MAAM,KAAKvB,gBAAgBG,QAAAA;AAC7C,UAAMqB,oBAAoB,MAAMC,QAAQC,IACtCH,UAAUtB,IAAI,CAAC0B,QACb,IAAIC,eAA+B;MAAEC,QAAQC;IAAc,CAAA,EAAGC,OAAO;MAAE7B,SAASyB,IAAIzB;MAAS8B,MAAML,IAAIM,OAAOD;IAAK,CAAA,EAAGE,MAAK,CAAA,CAAA;AAI/H,WAAO;SAAK,MAAM,MAAMZ,gBAAgBnB,QAAAA;SAAeqB;;EACzD;EAEA,MAAyBd,gBAAgBP,UAAmBM,kBAA4B,CAAA,GAAoC;AAC1H,UAAMD,WAAgC;MAAE,GAAI,MAAM,MAAME,gBAAAA;MAAoBmB,QAAQM;IAA0B;AAC9G,UAAMC,qBAAqB;SAAI3B;MAAiB,KAAKP;;AAErD,UAAMmC,gBAAgB,wBAACvC,WAA2BA,OAAOI,YAAY,KAAKA,WAAW,CAACO,gBAAgB6B,SAASxC,OAAOI,OAAO,GAAvG;AACtB,UAAMqC,aAAa,wBAACzC,WAA2BA,OAAOU,SAASL,UAAUiC,kBAAAA,GAAtD;AAQnB,UAAMI,gBAAgB,MAAMf,QAAQC,KAAK,MAAM,KAAKtB,QAAQC,QAAW;MAAEC,WAAW;MAAQH;IAAS,CAAA,GAAII,OAAO8B,aAAAA,EAAepC,IAAIsC,UAAAA,CAAAA;AACnI,QAAIC,cAAcC,SAAS,GAAG;AAC5BjC,eAASkC,UAAUlC,SAASkC,WAAW,CAAC;AACxClC,eAASkC,QAAQC,SAASH;IAC5B;AAEA,WAAOhC;EACT;EAEA,MAAyBoC,aACvBC,OACAC,UACAC,aACmC;AACnC,UAAMC,UAAU,MAAMC,yBAAyBC,WAAsBL,OAAOC,QAAAA;AAC5E,UAAMK,eAAe,MAAMH,QAAQI,SAAQ;AAC3CC,aAAS,MAAM,KAAKC,UAAUT,OAAOC,UAAUC,WAAAA,CAAAA;AAC/C,UAAMQ,iBAA4B,CAAA;AAClC,YAAQJ,aAAatB,QAAM;MACzB,KAAKpC,uBAAuB;AAC1B,cAAMS,UAAU,MAAM,KAAKsD,OAAOL,aAAaM,eAAeN,aAAaO,QAAQ;AACnF,YAAIxD,SAAS;AACX,gBAAMyD,UAAU,MAAM,IAAI/B,eAA+B;YAAEC,QAAQC;UAAc,CAAA,EAAGC,OAAO;YAAE7B;UAAQ,CAAA,EAAGgC,MAAK;AAC7GqB,yBAAeK,KAAKD,OAAAA;QACtB;AACA;MACF;MACA,KAAKjE,uBAAuB;AAC1B,cAAMQ,UAAU,MAAM,KAAK2D,OAAOV,aAAaM,aAAa;AAC5D,YAAIvD,SAAS;AACX,gBAAMyD,UAAU,MAAM,IAAI/B,eAA+B;YAAEC,QAAQC;UAAc,CAAA,EAAGC,OAAO;YAAE7B;UAAQ,CAAA,EAAGgC,MAAK;AAC7GqB,yBAAeK,KAAKD,OAAAA;QACtB;AACA;MACF;MACA,KAAKhE,yBAAyB;AAC5B,cAAMmE,YAAY,MAAM,KAAK/D,SAAQ;AACrC,mBAAWG,WAAW4D,WAAW;AAC/B,gBAAMH,UAAU,MAAM,IAAI/B,eAA+B;YAAEC,QAAQC;UAAc,CAAA,EAAGC,OAAO;YAAE7B;UAAQ,CAAA,EAAGgC,MAAK;AAC7GqB,yBAAeK,KAAKD,OAAAA;QACtB;AACA;MACF;MACA,KAAK/D,2BAA2B;AAC9B,cAAMkE,YAAY,MAAM,KAAKhD,WAAU;AACvC,mBAAWZ,WAAW4D,WAAW;AAC/B,gBAAMH,UAAU,MAAM,IAAI/B,eAA+B;YAAEC,QAAQC;UAAc,CAAA,EAAGC,OAAO;YAAE7B;UAAQ,CAAA,EAAGgC,MAAK;AAC7GqB,yBAAeK,KAAKD,OAAAA;QACtB;AACA;MACF;MACA,SAAS;AACP,eAAO,MAAM,MAAMf,aAAaC,OAAOC,QAAAA;MACzC;IACF;AACA,WAAOS;EACT;EAIA,MAAcnC,WACZJ,uBACAC,SACwD;AACxD,YAAQ,OAAOD,uBAAAA;MACb,KAAK,UAAU;AACb,eAAQ,MAAM,KAAKG,eAAeH,uBAAuBC,OAAAA,KAAc,MAAM,MAAMb,QAAQY,uBAAuBC,OAAAA;MACpH;MACA,SAAS;AACP,eAAO;aAAK,MAAM,KAAKE,eAAeH,uBAAuBC,OAAAA;aAAe,MAAM,MAAMb,QAAQY,uBAAuBC,OAAAA;UAAWV,OAChIwD,gBAAAA;MAEJ;IACF;EACF;EAIA,MAAc5C,eACZH,uBACAC,SACwD;AACxD,UAAMX,YAAYW,SAASX,aAAa;AACxC,UAAM0D,OAAO1D,cAAc,UAAUA,cAAc;AACnD,YAAQ,OAAOU,uBAAAA;MACb,KAAK,UAAU;AACb,eAAOgD,OAAO,MAAM,KAAK5E,gBAAgBgB,QAAQY,qBAAAA,IAAyBX;MAC5E;MACA,SAAS;AACP,eAAO2D,OAAO,MAAM,KAAK5E,gBAAgBgB,QAAQY,qBAAAA,IAAyBX;MAC5E;IACF;EACF;AAIF;","names":["assertEx","AddressSchema","QueryBoundWitnessWrapper","NodeManifestPayloadSchema","AbstractModuleInstance","duplicateModules","CompositeModuleResolver","NodeAttachedQuerySchema","NodeAttachQuerySchema","NodeConfigSchema","NodeDetachQuerySchema","NodeRegisteredQuerySchema","PayloadBuilder","AbstractNode","AbstractModuleInstance","configSchemas","NodeConfigSchema","privateResolver","CompositeModuleResolver","isNode","isModuleResolver","queries","NodeAttachQuerySchema","NodeDetachQuerySchema","NodeAttachedQuerySchema","NodeRegisteredQuerySchema","_queryAccountPaths","module","attached","attachedModules","map","address","maxDepth","resolve","undefined","direction","filter","manifest","ignoreAddresses","manifestHandler","register","_module","Error","registered","registeredModules","nameOrAddressOrFilter","options","visibility","resolvePrivate","resolveAll","unregister","discoverHandler","childMods","childModAddresses","Promise","all","mod","PayloadBuilder","schema","AddressSchema","fields","name","config","build","NodeManifestPayloadSchema","newIgnoreAddresses","notThisModule","includes","toManifest","publicModules","length","modules","public","queryHandler","query","payloads","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","queryPayload","getQuery","assertEx","queryable","resultPayloads","attach","nameOrAddress","external","payload","push","detach","addresses","duplicateModules","down"]}

package/dist/node/index.cjs

@@ -152,9 +152,9 @@ var _AbstractNode = class _AbstractNode extends import_module_abstract.AbstractM
     return manifest;
   }
   async queryHandler(query, payloads, queryConfig) {
-    const wrapper = import_boundwitness_builder.QueryBoundWitnessWrapper.parseQuery(query, payloads);
+    const wrapper = await import_boundwitness_builder.QueryBoundWitnessWrapper.parseQuery(query, payloads);
     const queryPayload = await wrapper.getQuery();
-    (0, import_assert.assertEx)(this.queryable(query, payloads, queryConfig));
+    (0, import_assert.assertEx)(await this.queryable(query, payloads, queryConfig));
     const resultPayloads = [];
     switch (queryPayload.schema) {
       case import_node_model.NodeAttachQuerySchema: {

package/dist/node/index.cjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/index.ts","../../src/AbstractNode.ts"],"sourcesContent":["export * from './AbstractNode'\n","import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { ModuleManifestPayload, NodeManifestPayload, NodeManifestPayloadSchema } from '@xyo-network/manifest-model'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport {\n  duplicateModules,\n  Module,\n  ModuleConfig,\n  ModuleFilter,\n  ModuleFilterOptions,\n  ModuleInstance,\n  ModuleQueryHandlerResult,\n} from '@xyo-network/module-model'\nimport { CompositeModuleResolver } from '@xyo-network/module-resolver'\nimport {\n  NodeAttachedQuerySchema,\n  NodeAttachQuerySchema,\n  NodeConfigSchema,\n  NodeDetachQuerySchema,\n  NodeModule,\n  NodeModuleEventData,\n  NodeParams,\n  NodeQuery,\n  NodeQueryBase,\n  NodeRegisteredQuerySchema,\n} from '@xyo-network/node-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport abstract class AbstractNode<TParams extends NodeParams = NodeParams, TEventData extends NodeModuleEventData = NodeModuleEventData>\n  extends AbstractModuleInstance<TParams, TEventData>\n  implements NodeModule<TParams, TEventData>, Module<TParams, TEventData>\n{\n  static override readonly configSchemas: string[] = [NodeConfigSchema]\n\n  protected readonly privateResolver = new CompositeModuleResolver()\n\n  private readonly isNode = true\n\n  get isModuleResolver(): boolean {\n    return true\n  }\n\n  override get queries(): string[] {\n    return [NodeAttachQuerySchema, NodeDetachQuerySchema, NodeAttachedQuerySchema, NodeRegisteredQuerySchema, ...super.queries]\n  }\n\n  protected override get _queryAccountPaths(): Record<NodeQueryBase['schema'], string> {\n    return {\n      'network.xyo.query.node.attach': '1/1',\n      'network.xyo.query.node.attached': '1/2',\n      'network.xyo.query.node.detach': '1/3',\n      'network.xyo.query.node.registered': '1/4',\n    }\n  }\n\n  static isNode(module: unknown) {\n    return (module as AbstractNode).isNode\n  }\n\n  async attached(): Promise<string[]> {\n    return (await this.attachedModules()).map((module) => module.address)\n  }\n\n  async attachedModules(maxDepth = 2): Promise<ModuleInstance[]> {\n    return (await (this.resolve(undefined, { direction: 'down', maxDepth }) ?? [])).filter((module) => module.address !== this.address)\n  }\n\n  override async manifest(maxDepth?: number, ignoreAddresses?: string[]): Promise<ModuleManifestPayload> {\n    return await this.manifestHandler(maxDepth, ignoreAddresses)\n  }\n\n  register(_module: ModuleInstance): Promisable<void> {\n    throw new Error('Method not implemented.')\n  }\n\n  registered(): Promisable<string[]> {\n    throw new Error('Method not implemented.')\n  }\n\n  registeredModules(): Promisable<Module[]> {\n    throw new Error('Method not implemented.')\n  }\n\n  override async resolve(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n  override async resolve(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n  override async resolve(\n    nameOrAddressOrFilter?: ModuleFilter | string,\n    options?: ModuleFilterOptions,\n  ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n    //checking type of nameOrAddressOrFilter before calling other functions since TS seems\n    //to need help here narrowing before the call\n    if (typeof nameOrAddressOrFilter === 'string') {\n      switch (options?.visibility) {\n        case 'private': {\n          return await this.resolvePrivate(nameOrAddressOrFilter)\n        }\n        case 'all': {\n          return await this.resolveAll(nameOrAddressOrFilter)\n        }\n        default: {\n          return await super.resolve(nameOrAddressOrFilter, options)\n        }\n      }\n    } else {\n      switch (options?.visibility) {\n        case 'all': {\n          return await this.resolveAll(nameOrAddressOrFilter)\n        }\n        case 'private': {\n          return await this.resolvePrivate(nameOrAddressOrFilter)\n        }\n        default: {\n          return await super.resolve(nameOrAddressOrFilter, options)\n        }\n      }\n    }\n  }\n\n  unregister(_module: ModuleInstance): Promisable<this> {\n    throw new Error('Method not implemented.')\n  }\n\n  protected override async discoverHandler(maxDepth?: number): Promise<Payload[]> {\n    const childMods = await this.attachedModules(maxDepth)\n    const childModAddresses = await Promise.all(\n      childMods.map((mod) =>\n        new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address: mod.address, name: mod.config.name }).build(),\n      ),\n    )\n\n    return [...(await super.discoverHandler(maxDepth)), ...childModAddresses]\n  }\n\n  protected override async manifestHandler(maxDepth?: number, ignoreAddresses: string[] = []): Promise<ModuleManifestPayload> {\n    const manifest: NodeManifestPayload = { ...(await super.manifestHandler()), schema: NodeManifestPayloadSchema }\n    const newIgnoreAddresses = [...ignoreAddresses, this.address]\n\n    const notThisModule = (module: ModuleInstance) => module.address !== this.address && !ignoreAddresses.includes(module.address)\n    const toManifest = (module: ModuleInstance) => module.manifest(maxDepth, newIgnoreAddresses)\n\n    /*const privateModules = await Promise.all((await this.privateResolver.resolve()).filter(notThisModule).map(toManifest))\n    if (privateModules.length > 0) {\n      manifest.modules = manifest.modules ?? {}\n      manifest.modules.private = privateModules\n    }*/\n\n    const publicModules = await Promise.all((await this.resolve(undefined, { direction: 'down', maxDepth })).filter(notThisModule).map(toManifest))\n    if (publicModules.length > 0) {\n      manifest.modules = manifest.modules ?? {}\n      manifest.modules.public = publicModules\n    }\n\n    return manifest\n  }\n\n  protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(\n    query: T,\n    payloads?: Payload[],\n    queryConfig?: TConfig,\n  ): Promise<ModuleQueryHandlerResult> {\n    const wrapper = QueryBoundWitnessWrapper.parseQuery<NodeQuery>(query, payloads)\n    const queryPayload = await wrapper.getQuery()\n    assertEx(this.queryable(query, payloads, queryConfig))\n    const resultPayloads: Payload[] = []\n    switch (queryPayload.schema) {\n      case NodeAttachQuerySchema: {\n        const address = await this.attach(queryPayload.nameOrAddress, queryPayload.external)\n        if (address) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      case NodeDetachQuerySchema: {\n        const address = await this.detach(queryPayload.nameOrAddress)\n        if (address) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      case NodeAttachedQuerySchema: {\n        const addresses = await this.attached()\n        for (const address of addresses) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      case NodeRegisteredQuerySchema: {\n        const addresses = await this.registered()\n        for (const address of addresses) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      default: {\n        return await super.queryHandler(query, payloads)\n      }\n    }\n    return resultPayloads\n  }\n\n  private async resolveAll(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n  private async resolveAll(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n  private async resolveAll(\n    nameOrAddressOrFilter?: ModuleFilter | string,\n    options?: ModuleFilterOptions,\n  ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n    switch (typeof nameOrAddressOrFilter) {\n      case 'string': {\n        return (await this.resolvePrivate(nameOrAddressOrFilter, options)) ?? (await super.resolve(nameOrAddressOrFilter, options))\n      }\n      default: {\n        return [...(await this.resolvePrivate(nameOrAddressOrFilter, options)), ...(await super.resolve(nameOrAddressOrFilter, options))].filter(\n          duplicateModules,\n        )\n      }\n    }\n  }\n\n  private async resolvePrivate(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n  private async resolvePrivate(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n  private async resolvePrivate(\n    nameOrAddressOrFilter?: ModuleFilter | string,\n    options?: ModuleFilterOptions,\n  ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n    const direction = options?.direction ?? 'all'\n    const down = direction === 'down' || direction === 'all'\n    switch (typeof nameOrAddressOrFilter) {\n      case 'string': {\n        return down ? await this.privateResolver.resolve(nameOrAddressOrFilter) : undefined\n      }\n      default: {\n        return down ? await this.privateResolver.resolve(nameOrAddressOrFilter) : undefined\n      }\n    }\n  }\n\n  abstract attach(nameOrAddress: string, external?: boolean): Promisable<string | undefined>\n  abstract detach(nameOrAddress: string): Promisable<string | undefined>\n}\n"],"mappings":"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","names":["AbstractNode","AbstractModuleInstance","privateResolver","CompositeModuleResolver","isNode","isModuleResolver","queries","NodeAttachQuerySchema","NodeDetachQuerySchema","NodeAttachedQuerySchema","NodeRegisteredQuerySchema","_queryAccountPaths","module","attached","attachedModules","map","address","maxDepth","resolve","undefined","direction","filter","manifest","ignoreAddresses","manifestHandler","register","_module","Error","registered","registeredModules","nameOrAddressOrFilter","options","visibility","resolvePrivate","resolveAll","unregister","discoverHandler","childMods","childModAddresses","Promise","all","mod","PayloadBuilder","schema","AddressSchema","fields","name","config","build","NodeManifestPayloadSchema","newIgnoreAddresses","notThisModule","includes","toManifest","publicModules","length","modules","public","queryHandler","query","payloads","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","queryPayload","getQuery","assertEx","queryable","resultPayloads","attach","nameOrAddress","external","payload","push","detach","addresses","duplicateModules","down","configSchemas","NodeConfigSchema"]}
+{"version":3,"sources":["../../src/index.ts","../../src/AbstractNode.ts"],"sourcesContent":["export * from './AbstractNode'\n","import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { ModuleManifestPayload, NodeManifestPayload, NodeManifestPayloadSchema } from '@xyo-network/manifest-model'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport {\n  duplicateModules,\n  Module,\n  ModuleConfig,\n  ModuleFilter,\n  ModuleFilterOptions,\n  ModuleInstance,\n  ModuleQueryHandlerResult,\n} from '@xyo-network/module-model'\nimport { CompositeModuleResolver } from '@xyo-network/module-resolver'\nimport {\n  NodeAttachedQuerySchema,\n  NodeAttachQuerySchema,\n  NodeConfigSchema,\n  NodeDetachQuerySchema,\n  NodeModule,\n  NodeModuleEventData,\n  NodeParams,\n  NodeQuery,\n  NodeQueryBase,\n  NodeRegisteredQuerySchema,\n} from '@xyo-network/node-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport abstract class AbstractNode<TParams extends NodeParams = NodeParams, TEventData extends NodeModuleEventData = NodeModuleEventData>\n  extends AbstractModuleInstance<TParams, TEventData>\n  implements NodeModule<TParams, TEventData>, Module<TParams, TEventData>\n{\n  static override readonly configSchemas: string[] = [NodeConfigSchema]\n\n  protected readonly privateResolver = new CompositeModuleResolver()\n\n  private readonly isNode = true\n\n  get isModuleResolver(): boolean {\n    return true\n  }\n\n  override get queries(): string[] {\n    return [NodeAttachQuerySchema, NodeDetachQuerySchema, NodeAttachedQuerySchema, NodeRegisteredQuerySchema, ...super.queries]\n  }\n\n  protected override get _queryAccountPaths(): Record<NodeQueryBase['schema'], string> {\n    return {\n      'network.xyo.query.node.attach': '1/1',\n      'network.xyo.query.node.attached': '1/2',\n      'network.xyo.query.node.detach': '1/3',\n      'network.xyo.query.node.registered': '1/4',\n    }\n  }\n\n  static isNode(module: unknown) {\n    return (module as AbstractNode).isNode\n  }\n\n  async attached(): Promise<string[]> {\n    return (await this.attachedModules()).map((module) => module.address)\n  }\n\n  async attachedModules(maxDepth = 2): Promise<ModuleInstance[]> {\n    return (await (this.resolve(undefined, { direction: 'down', maxDepth }) ?? [])).filter((module) => module.address !== this.address)\n  }\n\n  override async manifest(maxDepth?: number, ignoreAddresses?: string[]): Promise<ModuleManifestPayload> {\n    return await this.manifestHandler(maxDepth, ignoreAddresses)\n  }\n\n  register(_module: ModuleInstance): Promisable<void> {\n    throw new Error('Method not implemented.')\n  }\n\n  registered(): Promisable<string[]> {\n    throw new Error('Method not implemented.')\n  }\n\n  registeredModules(): Promisable<Module[]> {\n    throw new Error('Method not implemented.')\n  }\n\n  override async resolve(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n  override async resolve(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n  override async resolve(\n    nameOrAddressOrFilter?: ModuleFilter | string,\n    options?: ModuleFilterOptions,\n  ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n    //checking type of nameOrAddressOrFilter before calling other functions since TS seems\n    //to need help here narrowing before the call\n    if (typeof nameOrAddressOrFilter === 'string') {\n      switch (options?.visibility) {\n        case 'private': {\n          return await this.resolvePrivate(nameOrAddressOrFilter)\n        }\n        case 'all': {\n          return await this.resolveAll(nameOrAddressOrFilter)\n        }\n        default: {\n          return await super.resolve(nameOrAddressOrFilter, options)\n        }\n      }\n    } else {\n      switch (options?.visibility) {\n        case 'all': {\n          return await this.resolveAll(nameOrAddressOrFilter)\n        }\n        case 'private': {\n          return await this.resolvePrivate(nameOrAddressOrFilter)\n        }\n        default: {\n          return await super.resolve(nameOrAddressOrFilter, options)\n        }\n      }\n    }\n  }\n\n  unregister(_module: ModuleInstance): Promisable<this> {\n    throw new Error('Method not implemented.')\n  }\n\n  protected override async discoverHandler(maxDepth?: number): Promise<Payload[]> {\n    const childMods = await this.attachedModules(maxDepth)\n    const childModAddresses = await Promise.all(\n      childMods.map((mod) =>\n        new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address: mod.address, name: mod.config.name }).build(),\n      ),\n    )\n\n    return [...(await super.discoverHandler(maxDepth)), ...childModAddresses]\n  }\n\n  protected override async manifestHandler(maxDepth?: number, ignoreAddresses: string[] = []): Promise<ModuleManifestPayload> {\n    const manifest: NodeManifestPayload = { ...(await super.manifestHandler()), schema: NodeManifestPayloadSchema }\n    const newIgnoreAddresses = [...ignoreAddresses, this.address]\n\n    const notThisModule = (module: ModuleInstance) => module.address !== this.address && !ignoreAddresses.includes(module.address)\n    const toManifest = (module: ModuleInstance) => module.manifest(maxDepth, newIgnoreAddresses)\n\n    /*const privateModules = await Promise.all((await this.privateResolver.resolve()).filter(notThisModule).map(toManifest))\n    if (privateModules.length > 0) {\n      manifest.modules = manifest.modules ?? {}\n      manifest.modules.private = privateModules\n    }*/\n\n    const publicModules = await Promise.all((await this.resolve(undefined, { direction: 'down', maxDepth })).filter(notThisModule).map(toManifest))\n    if (publicModules.length > 0) {\n      manifest.modules = manifest.modules ?? {}\n      manifest.modules.public = publicModules\n    }\n\n    return manifest\n  }\n\n  protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(\n    query: T,\n    payloads?: Payload[],\n    queryConfig?: TConfig,\n  ): Promise<ModuleQueryHandlerResult> {\n    const wrapper = await QueryBoundWitnessWrapper.parseQuery<NodeQuery>(query, payloads)\n    const queryPayload = await wrapper.getQuery()\n    assertEx(await this.queryable(query, payloads, queryConfig))\n    const resultPayloads: Payload[] = []\n    switch (queryPayload.schema) {\n      case NodeAttachQuerySchema: {\n        const address = await this.attach(queryPayload.nameOrAddress, queryPayload.external)\n        if (address) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      case NodeDetachQuerySchema: {\n        const address = await this.detach(queryPayload.nameOrAddress)\n        if (address) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      case NodeAttachedQuerySchema: {\n        const addresses = await this.attached()\n        for (const address of addresses) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      case NodeRegisteredQuerySchema: {\n        const addresses = await this.registered()\n        for (const address of addresses) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      default: {\n        return await super.queryHandler(query, payloads)\n      }\n    }\n    return resultPayloads\n  }\n\n  private async resolveAll(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n  private async resolveAll(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n  private async resolveAll(\n    nameOrAddressOrFilter?: ModuleFilter | string,\n    options?: ModuleFilterOptions,\n  ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n    switch (typeof nameOrAddressOrFilter) {\n      case 'string': {\n        return (await this.resolvePrivate(nameOrAddressOrFilter, options)) ?? (await super.resolve(nameOrAddressOrFilter, options))\n      }\n      default: {\n        return [...(await this.resolvePrivate(nameOrAddressOrFilter, options)), ...(await super.resolve(nameOrAddressOrFilter, options))].filter(\n          duplicateModules,\n        )\n      }\n    }\n  }\n\n  private async resolvePrivate(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n  private async resolvePrivate(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n  private async resolvePrivate(\n    nameOrAddressOrFilter?: ModuleFilter | string,\n    options?: ModuleFilterOptions,\n  ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n    const direction = options?.direction ?? 'all'\n    const down = direction === 'down' || direction === 'all'\n    switch (typeof nameOrAddressOrFilter) {\n      case 'string': {\n        return down ? await this.privateResolver.resolve(nameOrAddressOrFilter) : undefined\n      }\n      default: {\n        return down ? await this.privateResolver.resolve(nameOrAddressOrFilter) : undefined\n      }\n    }\n  }\n\n  abstract attach(nameOrAddress: string, external?: boolean): Promisable<string | undefined>\n  abstract detach(nameOrAddress: string): Promisable<string | undefined>\n}\n"],"mappings":"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","names":["AbstractNode","AbstractModuleInstance","privateResolver","CompositeModuleResolver","isNode","isModuleResolver","queries","NodeAttachQuerySchema","NodeDetachQuerySchema","NodeAttachedQuerySchema","NodeRegisteredQuerySchema","_queryAccountPaths","module","attached","attachedModules","map","address","maxDepth","resolve","undefined","direction","filter","manifest","ignoreAddresses","manifestHandler","register","_module","Error","registered","registeredModules","nameOrAddressOrFilter","options","visibility","resolvePrivate","resolveAll","unregister","discoverHandler","childMods","childModAddresses","Promise","all","mod","PayloadBuilder","schema","AddressSchema","fields","name","config","build","NodeManifestPayloadSchema","newIgnoreAddresses","notThisModule","includes","toManifest","publicModules","length","modules","public","queryHandler","query","payloads","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","queryPayload","getQuery","assertEx","queryable","resultPayloads","attach","nameOrAddress","external","payload","push","detach","addresses","duplicateModules","down","configSchemas","NodeConfigSchema"]}

package/dist/node/index.js

@@ -128,9 +128,9 @@ var _AbstractNode = class _AbstractNode extends AbstractModuleInstance {
     return manifest;
   }
   async queryHandler(query, payloads, queryConfig) {
-    const wrapper = QueryBoundWitnessWrapper.parseQuery(query, payloads);
+    const wrapper = await QueryBoundWitnessWrapper.parseQuery(query, payloads);
     const queryPayload = await wrapper.getQuery();
-    assertEx(this.queryable(query, payloads, queryConfig));
+    assertEx(await this.queryable(query, payloads, queryConfig));
     const resultPayloads = [];
     switch (queryPayload.schema) {
       case NodeAttachQuerySchema: {

package/dist/node/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/AbstractNode.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { ModuleManifestPayload, NodeManifestPayload, NodeManifestPayloadSchema } from '@xyo-network/manifest-model'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport {\n  duplicateModules,\n  Module,\n  ModuleConfig,\n  ModuleFilter,\n  ModuleFilterOptions,\n  ModuleInstance,\n  ModuleQueryHandlerResult,\n} from '@xyo-network/module-model'\nimport { CompositeModuleResolver } from '@xyo-network/module-resolver'\nimport {\n  NodeAttachedQuerySchema,\n  NodeAttachQuerySchema,\n  NodeConfigSchema,\n  NodeDetachQuerySchema,\n  NodeModule,\n  NodeModuleEventData,\n  NodeParams,\n  NodeQuery,\n  NodeQueryBase,\n  NodeRegisteredQuerySchema,\n} from '@xyo-network/node-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport abstract class AbstractNode<TParams extends NodeParams = NodeParams, TEventData extends NodeModuleEventData = NodeModuleEventData>\n  extends AbstractModuleInstance<TParams, TEventData>\n  implements NodeModule<TParams, TEventData>, Module<TParams, TEventData>\n{\n  static override readonly configSchemas: string[] = [NodeConfigSchema]\n\n  protected readonly privateResolver = new CompositeModuleResolver()\n\n  private readonly isNode = true\n\n  get isModuleResolver(): boolean {\n    return true\n  }\n\n  override get queries(): string[] {\n    return [NodeAttachQuerySchema, NodeDetachQuerySchema, NodeAttachedQuerySchema, NodeRegisteredQuerySchema, ...super.queries]\n  }\n\n  protected override get _queryAccountPaths(): Record<NodeQueryBase['schema'], string> {\n    return {\n      'network.xyo.query.node.attach': '1/1',\n      'network.xyo.query.node.attached': '1/2',\n      'network.xyo.query.node.detach': '1/3',\n      'network.xyo.query.node.registered': '1/4',\n    }\n  }\n\n  static isNode(module: unknown) {\n    return (module as AbstractNode).isNode\n  }\n\n  async attached(): Promise<string[]> {\n    return (await this.attachedModules()).map((module) => module.address)\n  }\n\n  async attachedModules(maxDepth = 2): Promise<ModuleInstance[]> {\n    return (await (this.resolve(undefined, { direction: 'down', maxDepth }) ?? [])).filter((module) => module.address !== this.address)\n  }\n\n  override async manifest(maxDepth?: number, ignoreAddresses?: string[]): Promise<ModuleManifestPayload> {\n    return await this.manifestHandler(maxDepth, ignoreAddresses)\n  }\n\n  register(_module: ModuleInstance): Promisable<void> {\n    throw new Error('Method not implemented.')\n  }\n\n  registered(): Promisable<string[]> {\n    throw new Error('Method not implemented.')\n  }\n\n  registeredModules(): Promisable<Module[]> {\n    throw new Error('Method not implemented.')\n  }\n\n  override async resolve(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n  override async resolve(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n  override async resolve(\n    nameOrAddressOrFilter?: ModuleFilter | string,\n    options?: ModuleFilterOptions,\n  ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n    //checking type of nameOrAddressOrFilter before calling other functions since TS seems\n    //to need help here narrowing before the call\n    if (typeof nameOrAddressOrFilter === 'string') {\n      switch (options?.visibility) {\n        case 'private': {\n          return await this.resolvePrivate(nameOrAddressOrFilter)\n        }\n        case 'all': {\n          return await this.resolveAll(nameOrAddressOrFilter)\n        }\n        default: {\n          return await super.resolve(nameOrAddressOrFilter, options)\n        }\n      }\n    } else {\n      switch (options?.visibility) {\n        case 'all': {\n          return await this.resolveAll(nameOrAddressOrFilter)\n        }\n        case 'private': {\n          return await this.resolvePrivate(nameOrAddressOrFilter)\n        }\n        default: {\n          return await super.resolve(nameOrAddressOrFilter, options)\n        }\n      }\n    }\n  }\n\n  unregister(_module: ModuleInstance): Promisable<this> {\n    throw new Error('Method not implemented.')\n  }\n\n  protected override async discoverHandler(maxDepth?: number): Promise<Payload[]> {\n    const childMods = await this.attachedModules(maxDepth)\n    const childModAddresses = await Promise.all(\n      childMods.map((mod) =>\n        new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address: mod.address, name: mod.config.name }).build(),\n      ),\n    )\n\n    return [...(await super.discoverHandler(maxDepth)), ...childModAddresses]\n  }\n\n  protected override async manifestHandler(maxDepth?: number, ignoreAddresses: string[] = []): Promise<ModuleManifestPayload> {\n    const manifest: NodeManifestPayload = { ...(await super.manifestHandler()), schema: NodeManifestPayloadSchema }\n    const newIgnoreAddresses = [...ignoreAddresses, this.address]\n\n    const notThisModule = (module: ModuleInstance) => module.address !== this.address && !ignoreAddresses.includes(module.address)\n    const toManifest = (module: ModuleInstance) => module.manifest(maxDepth, newIgnoreAddresses)\n\n    /*const privateModules = await Promise.all((await this.privateResolver.resolve()).filter(notThisModule).map(toManifest))\n    if (privateModules.length > 0) {\n      manifest.modules = manifest.modules ?? {}\n      manifest.modules.private = privateModules\n    }*/\n\n    const publicModules = await Promise.all((await this.resolve(undefined, { direction: 'down', maxDepth })).filter(notThisModule).map(toManifest))\n    if (publicModules.length > 0) {\n      manifest.modules = manifest.modules ?? {}\n      manifest.modules.public = publicModules\n    }\n\n    return manifest\n  }\n\n  protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(\n    query: T,\n    payloads?: Payload[],\n    queryConfig?: TConfig,\n  ): Promise<ModuleQueryHandlerResult> {\n    const wrapper = QueryBoundWitnessWrapper.parseQuery<NodeQuery>(query, payloads)\n    const queryPayload = await wrapper.getQuery()\n    assertEx(this.queryable(query, payloads, queryConfig))\n    const resultPayloads: Payload[] = []\n    switch (queryPayload.schema) {\n      case NodeAttachQuerySchema: {\n        const address = await this.attach(queryPayload.nameOrAddress, queryPayload.external)\n        if (address) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      case NodeDetachQuerySchema: {\n        const address = await this.detach(queryPayload.nameOrAddress)\n        if (address) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      case NodeAttachedQuerySchema: {\n        const addresses = await this.attached()\n        for (const address of addresses) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      case NodeRegisteredQuerySchema: {\n        const addresses = await this.registered()\n        for (const address of addresses) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      default: {\n        return await super.queryHandler(query, payloads)\n      }\n    }\n    return resultPayloads\n  }\n\n  private async resolveAll(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n  private async resolveAll(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n  private async resolveAll(\n    nameOrAddressOrFilter?: ModuleFilter | string,\n    options?: ModuleFilterOptions,\n  ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n    switch (typeof nameOrAddressOrFilter) {\n      case 'string': {\n        return (await this.resolvePrivate(nameOrAddressOrFilter, options)) ?? (await super.resolve(nameOrAddressOrFilter, options))\n      }\n      default: {\n        return [...(await this.resolvePrivate(nameOrAddressOrFilter, options)), ...(await super.resolve(nameOrAddressOrFilter, options))].filter(\n          duplicateModules,\n        )\n      }\n    }\n  }\n\n  private async resolvePrivate(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n  private async resolvePrivate(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n  private async resolvePrivate(\n    nameOrAddressOrFilter?: ModuleFilter | string,\n    options?: ModuleFilterOptions,\n  ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n    const direction = options?.direction ?? 'all'\n    const down = direction === 'down' || direction === 'all'\n    switch (typeof nameOrAddressOrFilter) {\n      case 'string': {\n        return down ? await this.privateResolver.resolve(nameOrAddressOrFilter) : undefined\n      }\n      default: {\n        return down ? await this.privateResolver.resolve(nameOrAddressOrFilter) : undefined\n      }\n    }\n  }\n\n  abstract attach(nameOrAddress: string, external?: boolean): Promisable<string | undefined>\n  abstract detach(nameOrAddress: string): Promisable<string | undefined>\n}\n"],"mappings":"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","names":["assertEx","AddressSchema","QueryBoundWitnessWrapper","NodeManifestPayloadSchema","AbstractModuleInstance","duplicateModules","CompositeModuleResolver","NodeAttachedQuerySchema","NodeAttachQuerySchema","NodeConfigSchema","NodeDetachQuerySchema","NodeRegisteredQuerySchema","PayloadBuilder","AbstractNode","AbstractModuleInstance","privateResolver","CompositeModuleResolver","isNode","isModuleResolver","queries","NodeAttachQuerySchema","NodeDetachQuerySchema","NodeAttachedQuerySchema","NodeRegisteredQuerySchema","_queryAccountPaths","module","attached","attachedModules","map","address","maxDepth","resolve","undefined","direction","filter","manifest","ignoreAddresses","manifestHandler","register","_module","Error","registered","registeredModules","nameOrAddressOrFilter","options","visibility","resolvePrivate","resolveAll","unregister","discoverHandler","childMods","childModAddresses","Promise","all","mod","PayloadBuilder","schema","AddressSchema","fields","name","config","build","NodeManifestPayloadSchema","newIgnoreAddresses","notThisModule","includes","toManifest","publicModules","length","modules","public","queryHandler","query","payloads","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","queryPayload","getQuery","assertEx","queryable","resultPayloads","attach","nameOrAddress","external","payload","push","detach","addresses","duplicateModules","down","configSchemas","NodeConfigSchema"]}
+{"version":3,"sources":["../../src/AbstractNode.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport { Promisable } from '@xylabs/promise'\nimport { AddressPayload, AddressSchema } from '@xyo-network/address-payload-plugin'\nimport { QueryBoundWitnessWrapper } from '@xyo-network/boundwitness-builder'\nimport { QueryBoundWitness } from '@xyo-network/boundwitness-model'\nimport { ModuleManifestPayload, NodeManifestPayload, NodeManifestPayloadSchema } from '@xyo-network/manifest-model'\nimport { AbstractModuleInstance } from '@xyo-network/module-abstract'\nimport {\n  duplicateModules,\n  Module,\n  ModuleConfig,\n  ModuleFilter,\n  ModuleFilterOptions,\n  ModuleInstance,\n  ModuleQueryHandlerResult,\n} from '@xyo-network/module-model'\nimport { CompositeModuleResolver } from '@xyo-network/module-resolver'\nimport {\n  NodeAttachedQuerySchema,\n  NodeAttachQuerySchema,\n  NodeConfigSchema,\n  NodeDetachQuerySchema,\n  NodeModule,\n  NodeModuleEventData,\n  NodeParams,\n  NodeQuery,\n  NodeQueryBase,\n  NodeRegisteredQuerySchema,\n} from '@xyo-network/node-model'\nimport { PayloadBuilder } from '@xyo-network/payload-builder'\nimport { Payload } from '@xyo-network/payload-model'\n\nexport abstract class AbstractNode<TParams extends NodeParams = NodeParams, TEventData extends NodeModuleEventData = NodeModuleEventData>\n  extends AbstractModuleInstance<TParams, TEventData>\n  implements NodeModule<TParams, TEventData>, Module<TParams, TEventData>\n{\n  static override readonly configSchemas: string[] = [NodeConfigSchema]\n\n  protected readonly privateResolver = new CompositeModuleResolver()\n\n  private readonly isNode = true\n\n  get isModuleResolver(): boolean {\n    return true\n  }\n\n  override get queries(): string[] {\n    return [NodeAttachQuerySchema, NodeDetachQuerySchema, NodeAttachedQuerySchema, NodeRegisteredQuerySchema, ...super.queries]\n  }\n\n  protected override get _queryAccountPaths(): Record<NodeQueryBase['schema'], string> {\n    return {\n      'network.xyo.query.node.attach': '1/1',\n      'network.xyo.query.node.attached': '1/2',\n      'network.xyo.query.node.detach': '1/3',\n      'network.xyo.query.node.registered': '1/4',\n    }\n  }\n\n  static isNode(module: unknown) {\n    return (module as AbstractNode).isNode\n  }\n\n  async attached(): Promise<string[]> {\n    return (await this.attachedModules()).map((module) => module.address)\n  }\n\n  async attachedModules(maxDepth = 2): Promise<ModuleInstance[]> {\n    return (await (this.resolve(undefined, { direction: 'down', maxDepth }) ?? [])).filter((module) => module.address !== this.address)\n  }\n\n  override async manifest(maxDepth?: number, ignoreAddresses?: string[]): Promise<ModuleManifestPayload> {\n    return await this.manifestHandler(maxDepth, ignoreAddresses)\n  }\n\n  register(_module: ModuleInstance): Promisable<void> {\n    throw new Error('Method not implemented.')\n  }\n\n  registered(): Promisable<string[]> {\n    throw new Error('Method not implemented.')\n  }\n\n  registeredModules(): Promisable<Module[]> {\n    throw new Error('Method not implemented.')\n  }\n\n  override async resolve(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n  override async resolve(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n  override async resolve(\n    nameOrAddressOrFilter?: ModuleFilter | string,\n    options?: ModuleFilterOptions,\n  ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n    //checking type of nameOrAddressOrFilter before calling other functions since TS seems\n    //to need help here narrowing before the call\n    if (typeof nameOrAddressOrFilter === 'string') {\n      switch (options?.visibility) {\n        case 'private': {\n          return await this.resolvePrivate(nameOrAddressOrFilter)\n        }\n        case 'all': {\n          return await this.resolveAll(nameOrAddressOrFilter)\n        }\n        default: {\n          return await super.resolve(nameOrAddressOrFilter, options)\n        }\n      }\n    } else {\n      switch (options?.visibility) {\n        case 'all': {\n          return await this.resolveAll(nameOrAddressOrFilter)\n        }\n        case 'private': {\n          return await this.resolvePrivate(nameOrAddressOrFilter)\n        }\n        default: {\n          return await super.resolve(nameOrAddressOrFilter, options)\n        }\n      }\n    }\n  }\n\n  unregister(_module: ModuleInstance): Promisable<this> {\n    throw new Error('Method not implemented.')\n  }\n\n  protected override async discoverHandler(maxDepth?: number): Promise<Payload[]> {\n    const childMods = await this.attachedModules(maxDepth)\n    const childModAddresses = await Promise.all(\n      childMods.map((mod) =>\n        new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address: mod.address, name: mod.config.name }).build(),\n      ),\n    )\n\n    return [...(await super.discoverHandler(maxDepth)), ...childModAddresses]\n  }\n\n  protected override async manifestHandler(maxDepth?: number, ignoreAddresses: string[] = []): Promise<ModuleManifestPayload> {\n    const manifest: NodeManifestPayload = { ...(await super.manifestHandler()), schema: NodeManifestPayloadSchema }\n    const newIgnoreAddresses = [...ignoreAddresses, this.address]\n\n    const notThisModule = (module: ModuleInstance) => module.address !== this.address && !ignoreAddresses.includes(module.address)\n    const toManifest = (module: ModuleInstance) => module.manifest(maxDepth, newIgnoreAddresses)\n\n    /*const privateModules = await Promise.all((await this.privateResolver.resolve()).filter(notThisModule).map(toManifest))\n    if (privateModules.length > 0) {\n      manifest.modules = manifest.modules ?? {}\n      manifest.modules.private = privateModules\n    }*/\n\n    const publicModules = await Promise.all((await this.resolve(undefined, { direction: 'down', maxDepth })).filter(notThisModule).map(toManifest))\n    if (publicModules.length > 0) {\n      manifest.modules = manifest.modules ?? {}\n      manifest.modules.public = publicModules\n    }\n\n    return manifest\n  }\n\n  protected override async queryHandler<T extends QueryBoundWitness = QueryBoundWitness, TConfig extends ModuleConfig = ModuleConfig>(\n    query: T,\n    payloads?: Payload[],\n    queryConfig?: TConfig,\n  ): Promise<ModuleQueryHandlerResult> {\n    const wrapper = await QueryBoundWitnessWrapper.parseQuery<NodeQuery>(query, payloads)\n    const queryPayload = await wrapper.getQuery()\n    assertEx(await this.queryable(query, payloads, queryConfig))\n    const resultPayloads: Payload[] = []\n    switch (queryPayload.schema) {\n      case NodeAttachQuerySchema: {\n        const address = await this.attach(queryPayload.nameOrAddress, queryPayload.external)\n        if (address) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      case NodeDetachQuerySchema: {\n        const address = await this.detach(queryPayload.nameOrAddress)\n        if (address) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      case NodeAttachedQuerySchema: {\n        const addresses = await this.attached()\n        for (const address of addresses) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      case NodeRegisteredQuerySchema: {\n        const addresses = await this.registered()\n        for (const address of addresses) {\n          const payload = await new PayloadBuilder<AddressPayload>({ schema: AddressSchema }).fields({ address }).build()\n          resultPayloads.push(payload)\n        }\n        break\n      }\n      default: {\n        return await super.queryHandler(query, payloads)\n      }\n    }\n    return resultPayloads\n  }\n\n  private async resolveAll(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n  private async resolveAll(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n  private async resolveAll(\n    nameOrAddressOrFilter?: ModuleFilter | string,\n    options?: ModuleFilterOptions,\n  ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n    switch (typeof nameOrAddressOrFilter) {\n      case 'string': {\n        return (await this.resolvePrivate(nameOrAddressOrFilter, options)) ?? (await super.resolve(nameOrAddressOrFilter, options))\n      }\n      default: {\n        return [...(await this.resolvePrivate(nameOrAddressOrFilter, options)), ...(await super.resolve(nameOrAddressOrFilter, options))].filter(\n          duplicateModules,\n        )\n      }\n    }\n  }\n\n  private async resolvePrivate(filter?: ModuleFilter, options?: ModuleFilterOptions): Promise<ModuleInstance[]>\n  private async resolvePrivate(nameOrAddress: string, options?: ModuleFilterOptions): Promise<ModuleInstance | undefined>\n  private async resolvePrivate(\n    nameOrAddressOrFilter?: ModuleFilter | string,\n    options?: ModuleFilterOptions,\n  ): Promise<ModuleInstance | ModuleInstance[] | undefined> {\n    const direction = options?.direction ?? 'all'\n    const down = direction === 'down' || direction === 'all'\n    switch (typeof nameOrAddressOrFilter) {\n      case 'string': {\n        return down ? await this.privateResolver.resolve(nameOrAddressOrFilter) : undefined\n      }\n      default: {\n        return down ? await this.privateResolver.resolve(nameOrAddressOrFilter) : undefined\n      }\n    }\n  }\n\n  abstract attach(nameOrAddress: string, external?: boolean): Promisable<string | undefined>\n  abstract detach(nameOrAddress: string): Promisable<string | undefined>\n}\n"],"mappings":";;;;;;;;;AAAA,SAASA,gBAAgB;AAEzB,SAAyBC,qBAAqB;AAC9C,SAASC,gCAAgC;AAEzC,SAAqDC,iCAAiC;AACtF,SAASC,8BAA8B;AACvC,SACEC,wBAOK;AACP,SAASC,+BAA+B;AACxC,SACEC,yBACAC,uBACAC,kBACAC,uBAMAC,iCACK;AACP,SAASC,sBAAsB;AAGxB,IAAeC,gBAAf,MAAeA,sBACZC,uBAAAA;EAKWC,kBAAkB,IAAIC,wBAAAA;EAExBC,SAAS;EAE1B,IAAIC,mBAA4B;AAC9B,WAAO;EACT;EAEA,IAAaC,UAAoB;AAC/B,WAAO;MAACC;MAAuBC;MAAuBC;MAAyBC;SAA8B,MAAMJ;;EACrH;EAEA,IAAuBK,qBAA8D;AACnF,WAAO;MACL,iCAAiC;MACjC,mCAAmC;MACnC,iCAAiC;MACjC,qCAAqC;IACvC;EACF;EAEA,OAAOP,OAAOQ,QAAiB;AAC7B,WAAQA,OAAwBR;EAClC;EAEA,MAAMS,WAA8B;AAClC,YAAQ,MAAM,KAAKC,gBAAe,GAAIC,IAAI,CAACH,WAAWA,OAAOI,OAAO;EACtE;EAEA,MAAMF,gBAAgBG,WAAW,GAA8B;AAC7D,YAAQ,OAAO,KAAKC,QAAQC,QAAW;MAAEC,WAAW;MAAQH;IAAS,CAAA,KAAM,CAAA,IAAKI,OAAO,CAACT,WAAWA,OAAOI,YAAY,KAAKA,OAAO;EACpI;EAEA,MAAeM,SAASL,UAAmBM,iBAA4D;AACrG,WAAO,MAAM,KAAKC,gBAAgBP,UAAUM,eAAAA;EAC9C;EAEAE,SAASC,SAA2C;AAClD,UAAM,IAAIC,MAAM,yBAAA;EAClB;EAEAC,aAAmC;AACjC,UAAM,IAAID,MAAM,yBAAA;EAClB;EAEAE,oBAA0C;AACxC,UAAM,IAAIF,MAAM,yBAAA;EAClB;EAIA,MAAeT,QACbY,uBACAC,SACwD;AAGxD,QAAI,OAAOD,0BAA0B,UAAU;AAC7C,cAAQC,mCAASC,YAAAA;QACf,KAAK,WAAW;AACd,iBAAO,MAAM,KAAKC,eAAeH,qBAAAA;QACnC;QACA,KAAK,OAAO;AACV,iBAAO,MAAM,KAAKI,WAAWJ,qBAAAA;QAC/B;QACA,SAAS;AACP,iBAAO,MAAM,MAAMZ,QAAQY,uBAAuBC,OAAAA;QACpD;MACF;IACF,OAAO;AACL,cAAQA,mCAASC,YAAAA;QACf,KAAK,OAAO;AACV,iBAAO,MAAM,KAAKE,WAAWJ,qBAAAA;QAC/B;QACA,KAAK,WAAW;AACd,iBAAO,MAAM,KAAKG,eAAeH,qBAAAA;QACnC;QACA,SAAS;AACP,iBAAO,MAAM,MAAMZ,QAAQY,uBAAuBC,OAAAA;QACpD;MACF;IACF;EACF;EAEAI,WAAWT,SAA2C;AACpD,UAAM,IAAIC,MAAM,yBAAA;EAClB;EAEA,MAAyBS,gBAAgBnB,UAAuC;AAC9E,UAAMoB,YAAY,MAAM,KAAKvB,gBAAgBG,QAAAA;AAC7C,UAAMqB,oBAAoB,MAAMC,QAAQC,IACtCH,UAAUtB,IAAI,CAAC0B,QACb,IAAIC,eAA+B;MAAEC,QAAQC;IAAc,CAAA,EAAGC,OAAO;MAAE7B,SAASyB,IAAIzB;MAAS8B,MAAML,IAAIM,OAAOD;IAAK,CAAA,EAAGE,MAAK,CAAA,CAAA;AAI/H,WAAO;SAAK,MAAM,MAAMZ,gBAAgBnB,QAAAA;SAAeqB;;EACzD;EAEA,MAAyBd,gBAAgBP,UAAmBM,kBAA4B,CAAA,GAAoC;AAC1H,UAAMD,WAAgC;MAAE,GAAI,MAAM,MAAME,gBAAAA;MAAoBmB,QAAQM;IAA0B;AAC9G,UAAMC,qBAAqB;SAAI3B;MAAiB,KAAKP;;AAErD,UAAMmC,gBAAgB,wBAACvC,WAA2BA,OAAOI,YAAY,KAAKA,WAAW,CAACO,gBAAgB6B,SAASxC,OAAOI,OAAO,GAAvG;AACtB,UAAMqC,aAAa,wBAACzC,WAA2BA,OAAOU,SAASL,UAAUiC,kBAAAA,GAAtD;AAQnB,UAAMI,gBAAgB,MAAMf,QAAQC,KAAK,MAAM,KAAKtB,QAAQC,QAAW;MAAEC,WAAW;MAAQH;IAAS,CAAA,GAAII,OAAO8B,aAAAA,EAAepC,IAAIsC,UAAAA,CAAAA;AACnI,QAAIC,cAAcC,SAAS,GAAG;AAC5BjC,eAASkC,UAAUlC,SAASkC,WAAW,CAAC;AACxClC,eAASkC,QAAQC,SAASH;IAC5B;AAEA,WAAOhC;EACT;EAEA,MAAyBoC,aACvBC,OACAC,UACAC,aACmC;AACnC,UAAMC,UAAU,MAAMC,yBAAyBC,WAAsBL,OAAOC,QAAAA;AAC5E,UAAMK,eAAe,MAAMH,QAAQI,SAAQ;AAC3CC,aAAS,MAAM,KAAKC,UAAUT,OAAOC,UAAUC,WAAAA,CAAAA;AAC/C,UAAMQ,iBAA4B,CAAA;AAClC,YAAQJ,aAAatB,QAAM;MACzB,KAAKpC,uBAAuB;AAC1B,cAAMS,UAAU,MAAM,KAAKsD,OAAOL,aAAaM,eAAeN,aAAaO,QAAQ;AACnF,YAAIxD,SAAS;AACX,gBAAMyD,UAAU,MAAM,IAAI/B,eAA+B;YAAEC,QAAQC;UAAc,CAAA,EAAGC,OAAO;YAAE7B;UAAQ,CAAA,EAAGgC,MAAK;AAC7GqB,yBAAeK,KAAKD,OAAAA;QACtB;AACA;MACF;MACA,KAAKjE,uBAAuB;AAC1B,cAAMQ,UAAU,MAAM,KAAK2D,OAAOV,aAAaM,aAAa;AAC5D,YAAIvD,SAAS;AACX,gBAAMyD,UAAU,MAAM,IAAI/B,eAA+B;YAAEC,QAAQC;UAAc,CAAA,EAAGC,OAAO;YAAE7B;UAAQ,CAAA,EAAGgC,MAAK;AAC7GqB,yBAAeK,KAAKD,OAAAA;QACtB;AACA;MACF;MACA,KAAKhE,yBAAyB;AAC5B,cAAMmE,YAAY,MAAM,KAAK/D,SAAQ;AACrC,mBAAWG,WAAW4D,WAAW;AAC/B,gBAAMH,UAAU,MAAM,IAAI/B,eAA+B;YAAEC,QAAQC;UAAc,CAAA,EAAGC,OAAO;YAAE7B;UAAQ,CAAA,EAAGgC,MAAK;AAC7GqB,yBAAeK,KAAKD,OAAAA;QACtB;AACA;MACF;MACA,KAAK/D,2BAA2B;AAC9B,cAAMkE,YAAY,MAAM,KAAKhD,WAAU;AACvC,mBAAWZ,WAAW4D,WAAW;AAC/B,gBAAMH,UAAU,MAAM,IAAI/B,eAA+B;YAAEC,QAAQC;UAAc,CAAA,EAAGC,OAAO;YAAE7B;UAAQ,CAAA,EAAGgC,MAAK;AAC7GqB,yBAAeK,KAAKD,OAAAA;QACtB;AACA;MACF;MACA,SAAS;AACP,eAAO,MAAM,MAAMf,aAAaC,OAAOC,QAAAA;MACzC;IACF;AACA,WAAOS;EACT;EAIA,MAAcnC,WACZJ,uBACAC,SACwD;AACxD,YAAQ,OAAOD,uBAAAA;MACb,KAAK,UAAU;AACb,eAAQ,MAAM,KAAKG,eAAeH,uBAAuBC,OAAAA,KAAc,MAAM,MAAMb,QAAQY,uBAAuBC,OAAAA;MACpH;MACA,SAAS;AACP,eAAO;aAAK,MAAM,KAAKE,eAAeH,uBAAuBC,OAAAA;aAAe,MAAM,MAAMb,QAAQY,uBAAuBC,OAAAA;UAAWV,OAChIwD,gBAAAA;MAEJ;IACF;EACF;EAIA,MAAc5C,eACZH,uBACAC,SACwD;AACxD,UAAMX,aAAYW,mCAASX,cAAa;AACxC,UAAM0D,OAAO1D,cAAc,UAAUA,cAAc;AACnD,YAAQ,OAAOU,uBAAAA;MACb,KAAK,UAAU;AACb,eAAOgD,OAAO,MAAM,KAAK5E,gBAAgBgB,QAAQY,qBAAAA,IAAyBX;MAC5E;MACA,SAAS;AACP,eAAO2D,OAAO,MAAM,KAAK5E,gBAAgBgB,QAAQY,qBAAAA,IAAyBX;MAC5E;IACF;EACF;AAIF;AArNUlB;AAGR,cAJoBD,eAIK+E,iBAA0B;EAACC;;AAJ/C,IAAehF,eAAf;","names":["assertEx","AddressSchema","QueryBoundWitnessWrapper","NodeManifestPayloadSchema","AbstractModuleInstance","duplicateModules","CompositeModuleResolver","NodeAttachedQuerySchema","NodeAttachQuerySchema","NodeConfigSchema","NodeDetachQuerySchema","NodeRegisteredQuerySchema","PayloadBuilder","AbstractNode","AbstractModuleInstance","privateResolver","CompositeModuleResolver","isNode","isModuleResolver","queries","NodeAttachQuerySchema","NodeDetachQuerySchema","NodeAttachedQuerySchema","NodeRegisteredQuerySchema","_queryAccountPaths","module","attached","attachedModules","map","address","maxDepth","resolve","undefined","direction","filter","manifest","ignoreAddresses","manifestHandler","register","_module","Error","registered","registeredModules","nameOrAddressOrFilter","options","visibility","resolvePrivate","resolveAll","unregister","discoverHandler","childMods","childModAddresses","Promise","all","mod","PayloadBuilder","schema","AddressSchema","fields","name","config","build","NodeManifestPayloadSchema","newIgnoreAddresses","notThisModule","includes","toManifest","publicModules","length","modules","public","queryHandler","query","payloads","queryConfig","wrapper","QueryBoundWitnessWrapper","parseQuery","queryPayload","getQuery","assertEx","queryable","resultPayloads","attach","nameOrAddress","external","payload","push","detach","addresses","duplicateModules","down","configSchemas","NodeConfigSchema"]}

package/package.json

@@ -12,16 +12,16 @@
   "dependencies": {
     "@xylabs/assert": "^2.13.29",
     "@xylabs/promise": "^2.13.29",
-    "@xyo-network/address-payload-plugin": "~2.88.3",
-    "@xyo-network/boundwitness-builder": "~2.88.3",
-    "@xyo-network/boundwitness-model": "~2.88.3",
-    "@xyo-network/manifest-model": "~2.88.3",
-    "@xyo-network/module-abstract": "~2.88.3",
-    "@xyo-network/module-model": "~2.88.3",
-    "@xyo-network/module-resolver": "~2.88.3",
-    "@xyo-network/node-model": "~2.88.3",
-    "@xyo-network/payload-builder": "~2.88.3",
-    "@xyo-network/payload-model": "~2.88.3"
+    "@xyo-network/address-payload-plugin": "~2.89.0-rc.2",
+    "@xyo-network/boundwitness-builder": "~2.89.0-rc.2",
+    "@xyo-network/boundwitness-model": "~2.89.0-rc.2",
+    "@xyo-network/manifest-model": "~2.89.0-rc.2",
+    "@xyo-network/module-abstract": "~2.89.0-rc.2",
+    "@xyo-network/module-model": "~2.89.0-rc.2",
+    "@xyo-network/module-resolver": "~2.89.0-rc.2",
+    "@xyo-network/node-model": "~2.89.0-rc.2",
+    "@xyo-network/payload-builder": "~2.89.0-rc.2",
+    "@xyo-network/payload-model": "~2.89.0-rc.2"
   },
   "devDependencies": {
     "@xylabs/ts-scripts-yarn3": "^3.2.42",
@@ -67,6 +67,7 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.88.3",
-  "type": "module"
+  "version": "2.89.0-rc.2",
+  "type": "module",
+  "stableVersion": "2.88.3"
 }

package/src/AbstractNode.ts

@@ -162,9 +162,9 @@ export abstract class AbstractNode<TParams extends NodeParams = NodeParams, TEve
     payloads?: Payload[],
     queryConfig?: TConfig,
   ): Promise<ModuleQueryHandlerResult> {
-    const wrapper = QueryBoundWitnessWrapper.parseQuery<NodeQuery>(query, payloads)
+    const wrapper = await QueryBoundWitnessWrapper.parseQuery<NodeQuery>(query, payloads)
     const queryPayload = await wrapper.getQuery()
-    assertEx(this.queryable(query, payloads, queryConfig))
+    assertEx(await this.queryable(query, payloads, queryConfig))
     const resultPayloads: Payload[] = []
     switch (queryPayload.schema) {
       case NodeAttachQuerySchema: {