@xyo-network/module-model 2.64.10 → 2.65.1

package/src/CreatableModuleDictionary.ts

@@ -0,0 +1,5 @@
+import { CreatableModuleFactory } from './CreatableModule'
+
+export interface CreatableModuleDictionary {
+  [key: string]: CreatableModuleFactory
+}

package/src/Events/ModuleBusy.ts

@@ -0,0 +1,9 @@
+import { EventData } from '@xyo-network/module-events'
+
+import { IndirectModule, ModuleEventArgs } from '../Module'
+
+export type ModuleBusyEventArgs<TModule extends IndirectModule = IndirectModule> = ModuleEventArgs<TModule, { busy: boolean }>
+
+export interface ModuleBusyEventData extends EventData {
+  moduleBusy: ModuleBusyEventArgs
+}

package/src/Events/ModuleQueried.ts

@@ -0,0 +1,19 @@
+import { QueryBoundWitness } from '@xyo-network/boundwitness-builder'
+import { EventData } from '@xyo-network/module-events'
+import { Payload } from '@xyo-network/payload-model'
+
+import { IndirectModule, ModuleEventArgs } from '../Module'
+import { ModuleQueryResult } from '../ModuleQueryResult'
+
+export type ModuleQueriedEventArgs = ModuleEventArgs<
+  IndirectModule,
+  {
+    payloads?: Payload[]
+    query: QueryBoundWitness
+    result: ModuleQueryResult
+  }
+>
+
+export interface ModuleQueriedEventData extends EventData {
+  moduleQueried: ModuleQueriedEventArgs
+}

package/src/Events/index.ts

@@ -0,0 +1,2 @@
+export * from './ModuleBusy'
+export * from './ModuleQueried'

package/src/Module.ts

@@ -1,32 +1,28 @@
 import { AccountInstance } from '@xyo-network/account-model'
+import { QueryBoundWitness } from '@xyo-network/boundwitness-builder'
 import { ModuleManifestPayload } from '@xyo-network/manifest-model'
-import { EventArgs, EventData, EventFunctions } from '@xyo-network/module-events'
+import { EventArgs, EventFunctions } from '@xyo-network/module-events'
 import { Payload } from '@xyo-network/payload-model'
 import { Promisable } from '@xyo-network/promise'
 
 import { AnyConfigSchema, ModuleConfig } from './Config'
+import { ModuleBusyEventData, ModuleQueriedEventData } from './Events'
 import { ModuleDescription } from './ModuleDescription'
 import { ModuleFilter } from './ModuleFilter'
 import { ModuleParams } from './ModuleParams'
 import { ModuleQueryResult } from './ModuleQueryResult'
 import { AddressPreviousHashPayload } from './Queries'
-import { QueryBoundWitness } from './Query'
 
-export interface ModuleResolver {
+export interface ResolveFunctions {
+  resolve<TModule extends Module = Module>(filter?: ModuleFilter): Promisable<TModule[]>
+  resolve<TModule extends Module = Module>(nameOrAddress: string): Promisable<TModule | undefined>
+  resolve<TModule extends Module = Module>(nameOrAddressOrFilter?: ModuleFilter | string): Promisable<TModule | TModule[] | undefined>
+}
+
+export interface ModuleResolver extends ResolveFunctions {
   addResolver: (resolver: ModuleResolver) => this
   isModuleResolver: boolean
   removeResolver: (resolver: ModuleResolver) => this
-  /**
-   * Resolves all modules matching the supplied filter. If no filter
-   * is supplied, all modules are returned
-   * @param filter Filter criteria for the desired modules
-   */
-  resolve<T extends IndirectModule = IndirectModule>(filter?: ModuleFilter): Promisable<T[]>
-  /**
-   * Resolves a single module, or undefined if no modules matched the filter.
-   * @param filter The desired Module's Address or Name
-   */
-  resolveOne<T extends IndirectModule = IndirectModule>(filter: string): Promisable<T | undefined>
 }
 
 export type ModuleEventArgs<
@@ -40,18 +36,7 @@ export type ModuleEventArgs<
       module: TModule
     }
 
-export type ModuleQueriedEventArgs = ModuleEventArgs<
-  IndirectModule,
-  {
-    payloads?: Payload[]
-    query: QueryBoundWitness
-    result: ModuleQueryResult
-  }
->
-
-export interface ModuleEventData extends EventData {
-  moduleQueried: ModuleQueriedEventArgs
-}
+export interface ModuleEventData extends ModuleQueriedEventData, ModuleBusyEventData {}
 
 export type ModuleQueryFunctions = {
   addressPreviousHash: () => Promisable<AddressPreviousHashPayload>
@@ -100,7 +85,7 @@ export type IndirectModule<
 export type DirectModule<
   TParams extends ModuleParams<AnyConfigSchema<ModuleConfig>> = ModuleParams<AnyConfigSchema<ModuleConfig>>,
   TEventData extends ModuleEventData = ModuleEventData,
-> = IndirectModule<TParams, TEventData> & ModuleQueryFunctions
+> = IndirectModule<TParams, TEventData> & ModuleQueryFunctions & ResolveFunctions
 
 export type ModuleInstance<
   TParams extends ModuleParams<AnyConfigSchema<ModuleConfig>> = ModuleParams<AnyConfigSchema<ModuleConfig>>,

package/src/ModuleFactory.ts

@@ -0,0 +1,40 @@
+import { Logger } from '@xyo-network/core'
+import merge from 'lodash/merge'
+
+import { CreatableModule, CreatableModuleFactory } from './CreatableModule'
+import { IndirectModule } from './Module'
+
+export class ModuleFactory<TModule extends IndirectModule> implements CreatableModuleFactory<TModule> {
+  configSchemas: CreatableModuleFactory<TModule>['configSchemas']
+
+  creatableModule: CreatableModule<TModule>
+
+  defaultLogger?: Logger | undefined
+
+  defaultParams?: TModule['params']
+
+  constructor(creatableModule: CreatableModule<TModule>, params?: TModule['params']) {
+    this.creatableModule = creatableModule
+    this.defaultParams = params
+    this.configSchemas = creatableModule.configSchemas
+  }
+
+  get configSchema(): string {
+    return this.configSchemas[0]
+  }
+
+  static withParams<T extends IndirectModule>(creatableModule: CreatableModule<T>, params?: T['params']) {
+    return new ModuleFactory(creatableModule, params)
+  }
+
+  create<T extends IndirectModule>(this: CreatableModuleFactory<T>, params?: TModule['params'] | undefined): Promise<T> {
+    const factory = this as ModuleFactory<T>
+    const schema = factory.creatableModule.configSchema
+    const mergedParams: TModule['params'] = merge(factory.defaultParams ?? {}, params, { config: { schema } })
+    return factory.creatableModule.create<T>(mergedParams)
+  }
+
+  factory<T extends IndirectModule>(this: CreatableModule<T>, _params?: T['params'] | undefined): CreatableModuleFactory<T> {
+    throw new Error('Method not implemented.')
+  }
+}

package/src/ModuleQueryResult.ts

@@ -1,4 +1,4 @@
 import { BoundWitness } from '@xyo-network/boundwitness-model'
 import { Payload } from '@xyo-network/payload-model'
 
-export type ModuleQueryResult<T extends Payload = Payload> = [BoundWitness, T[], Payload[]]
+export type ModuleQueryResult<E extends Payload[] = Payload[]> = [BoundWitness, Payload[], E]

package/src/Queries/Describe/Query.ts

@@ -1,4 +1,4 @@
-import { Query } from '../../Query'
+import { Query } from '@xyo-network/payload-model'
 
 export type ModuleDescribeQuerySchema = 'network.xyo.query.module.describe'
 export const ModuleDescribeQuerySchema: ModuleDescribeQuerySchema = 'network.xyo.query.module.describe'

package/src/Queries/Discover.ts

@@ -1,4 +1,4 @@
-import { Query } from '../Query'
+import { Query } from '@xyo-network/payload-model'
 
 export type ModuleDiscoverQuerySchema = 'network.xyo.query.module.discover'
 export const ModuleDiscoverQuerySchema: ModuleDiscoverQuerySchema = 'network.xyo.query.module.discover'

package/src/Queries/Manifest.ts

@@ -1,4 +1,4 @@
-import { Query } from '../Query'
+import { Query } from '@xyo-network/payload-model'
 
 export type ModuleManifestQuerySchema = 'network.xyo.query.module.manifest'
 export const ModuleManifestQuerySchema: ModuleManifestQuerySchema = 'network.xyo.query.module.manifest'

package/src/Queries/ModuleAddress/Query.ts

@@ -1,4 +1,4 @@
-import { Query } from '../../Query'
+import { Query } from '@xyo-network/payload-model'
 
 export type ModuleAddressQuerySchema = 'network.xyo.query.module.address'
 export const ModuleAddressQuerySchema: ModuleAddressQuerySchema = 'network.xyo.query.module.address'

package/src/Queries/Subscribe.ts

@@ -1,4 +1,4 @@
-import { Query } from '../Query'
+import { Query } from '@xyo-network/payload-model'
 
 export type ModuleSubscribeQuerySchema = 'network.xyo.query.module.subscribe'
 export const ModuleSubscribeQuerySchema: ModuleSubscribeQuerySchema = 'network.xyo.query.module.subscribe'

package/src/Queries/index.ts

@@ -1,4 +1,5 @@
-import { Query } from '../Query'
+import { Query } from '@xyo-network/payload-model'
+
 import { ModuleDescribeQuery } from './Describe'
 import { ModuleDiscoverQuery } from './Discover'
 import { ModuleAddressQuery } from './ModuleAddress'

package/src/index.ts

@@ -1,14 +1,16 @@
 export * from './asModule'
 export * from './Config'
 export * from './CreatableModule'
-export * from './Error'
+export * from './CreatableModuleDictionary'
+export * from './Events'
 export * from './isModule'
+export * from './lib'
 export * from './Module'
 export * from './ModuleDescription'
+export * from './ModuleFactory'
 export * from './ModuleFilter'
 export * from './ModuleParams'
 export * from './ModuleQueryResult'
 export * from './ModuleRepository'
 export * from './Queries'
-export * from './Query'
 export * from './withModule'

package/src/lib/duplicateModules.ts

@@ -0,0 +1,14 @@
+import { IndirectModule } from '../Module'
+
+/**
+ * Used to filter duplicates from an array of modules
+ * @example: modulesArray.filter(duplicateModules)
+ * @param value Current Module
+ * @param index Current Module's index
+ * @param array Module Array
+ * @returns True if the Module's address is the first occurrence of
+ * that address in the array, false otherwise
+ */
+export const duplicateModules = (value: IndirectModule, index: number, array: IndirectModule[]): value is IndirectModule => {
+  return array.findIndex((v) => v.address === value.address) === index
+}

package/src/lib/index.ts

@@ -0,0 +1,2 @@
+export * from './duplicateModules'
+export * from './serializable'

package/src/lib/serializable.ts

@@ -0,0 +1,41 @@
+// Inspired by https://stackoverflow.com/a/49079549/2803259
+
+import every from 'lodash/every'
+import isArray from 'lodash/isArray'
+import isBoolean from 'lodash/isBoolean'
+import isNull from 'lodash/isNull'
+import isNumber from 'lodash/isNumber'
+import isPlainObject from 'lodash/isPlainObject'
+import isString from 'lodash/isString'
+import isUndefined from 'lodash/isUndefined'
+import overSome from 'lodash/overSome'
+
+const JSONPrimitiveChecks = [isUndefined, isNull, isBoolean, isNumber, isString]
+const JSONComplexChecks = [isPlainObject, isArray]
+
+export const serializable = (field: unknown, depth?: number): boolean | null => {
+  let depthExceeded = false
+  const decrementDepth = () => (depth ? depth-- : undefined)
+
+  const recursiveSerializable = (field: unknown) => {
+    if (depth !== undefined && depth < 1) {
+      depthExceeded = true
+      return false
+    }
+
+    // decrement during every recursion
+    decrementDepth()
+
+    const nestedSerializable = (field: unknown): boolean => overSome(JSONComplexChecks)(field) && every(field as object, recursiveSerializable)
+
+    return overSome([...JSONPrimitiveChecks, nestedSerializable])(field)
+  }
+
+  const valid = recursiveSerializable(field)
+
+  return depthExceeded ? null : valid
+}
+
+export const serializableField = (field: unknown) => {
+  return overSome([...JSONPrimitiveChecks, ...JSONComplexChecks])(field)
+}

package/dist/cjs/Error.js

@@ -1,5 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ModuleErrorSchema = void 0;
-exports.ModuleErrorSchema = 'network.xyo.error.module';
-//# sourceMappingURL=Error.js.map

package/dist/cjs/Error.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Error.js","sourceRoot":"","sources":["../../src/Error.ts"],"names":[],"mappings":";;;AAGa,QAAA,iBAAiB,GAAsB,0BAA0B,CAAA"}

package/dist/cjs/Query/Payload.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Payload.js","sourceRoot":"","sources":["../../../src/Query/Payload.ts"],"names":[],"mappings":""}

package/dist/cjs/Query/QueryBoundWitness.js

@@ -1,8 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isQueryBoundWitness = exports.QueryBoundWitnessSchema = void 0;
-const boundwitness_model_1 = require("@xyo-network/boundwitness-model");
-exports.QueryBoundWitnessSchema = boundwitness_model_1.BoundWitnessSchema;
-const isQueryBoundWitness = (x) => (0, boundwitness_model_1.isBoundWitness)(x) && (x === null || x === void 0 ? void 0 : x.query) !== undefined;
-exports.isQueryBoundWitness = isQueryBoundWitness;
-//# sourceMappingURL=QueryBoundWitness.js.map

package/dist/cjs/Query/QueryBoundWitness.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"QueryBoundWitness.js","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitness.ts"],"names":[],"mappings":";;;AAAA,wEAAkG;AAIrF,QAAA,uBAAuB,GAA4B,uCAAkB,CAAA;AAQ3E,MAAM,mBAAmB,GAAG,CAAC,CAAkB,EAA0B,EAAE,CAAC,IAAA,mCAAc,EAAC,CAAC,CAAC,IAAI,CAAC,CAAuB,aAAvB,CAAC,uBAAD,CAAC,CAAwB,KAAK,MAAK,SAAS,CAAA;AAAxI,QAAA,mBAAmB,uBAAqH"}

package/dist/cjs/Query/index.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-tslib_1.__exportStar(require("./Payload"), exports);
-tslib_1.__exportStar(require("./QueryBoundWitness"), exports);
-//# sourceMappingURL=index.js.map

package/dist/cjs/Query/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Query/index.ts"],"names":[],"mappings":";;;AAAA,oDAAyB;AACzB,8DAAmC"}

package/dist/esm/Error.js

@@ -1,2 +0,0 @@
-export const ModuleErrorSchema = 'network.xyo.error.module';
-//# sourceMappingURL=Error.js.map

package/dist/esm/Error.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Error.js","sourceRoot":"","sources":["../../src/Error.ts"],"names":[],"mappings":"AAGA,MAAM,CAAC,MAAM,iBAAiB,GAAsB,0BAA0B,CAAA"}

package/dist/esm/Query/Payload.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=Payload.js.map

package/dist/esm/Query/Payload.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"Payload.js","sourceRoot":"","sources":["../../../src/Query/Payload.ts"],"names":[],"mappings":""}

package/dist/esm/Query/QueryBoundWitness.js

@@ -1,4 +0,0 @@
-import { BoundWitnessSchema, isBoundWitness } from '@xyo-network/boundwitness-model';
-export const QueryBoundWitnessSchema = BoundWitnessSchema;
-export const isQueryBoundWitness = (x) => isBoundWitness(x) && x?.query !== undefined;
-//# sourceMappingURL=QueryBoundWitness.js.map

package/dist/esm/Query/QueryBoundWitness.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"QueryBoundWitness.js","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,kBAAkB,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAA;AAIlG,MAAM,CAAC,MAAM,uBAAuB,GAA4B,kBAAkB,CAAA;AAQlF,MAAM,CAAC,MAAM,mBAAmB,GAAG,CAAC,CAAkB,EAA0B,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC,IAAK,CAAuB,EAAE,KAAK,KAAK,SAAS,CAAA"}

package/dist/esm/Query/index.js

@@ -1,3 +0,0 @@
-export * from './Payload';
-export * from './QueryBoundWitness';
-//# sourceMappingURL=index.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/Query/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,qBAAqB,CAAA"}

package/dist/types/Error.d.ts

@@ -1,11 +0,0 @@
-import { Payload } from '@xyo-network/payload-model';
-export type ModuleErrorSchema = 'network.xyo.error.module';
-export declare const ModuleErrorSchema: ModuleErrorSchema;
-export type ModuleError = Payload<{
-    message?: string;
-    name?: string;
-    query?: string;
-    schema: ModuleErrorSchema;
-    sources?: string[];
-}>;
-//# sourceMappingURL=Error.d.ts.map

package/dist/types/Error.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Error.d.ts","sourceRoot":"","sources":["../../src/Error.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,MAAM,MAAM,iBAAiB,GAAG,0BAA0B,CAAA;AAC1D,eAAO,MAAM,iBAAiB,EAAE,iBAA8C,CAAA;AAE9E,MAAM,MAAM,WAAW,GAAG,OAAO,CAAC;IAChC,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,MAAM,EAAE,iBAAiB,CAAA;IACzB,OAAO,CAAC,EAAE,MAAM,EAAE,CAAA;CACnB,CAAC,CAAA"}

package/dist/types/Query/Payload.d.ts

@@ -1,13 +0,0 @@
-import { Payload } from '@xyo-network/payload-model';
-export interface QueryFields {
-    /** @field The addresses of the intended handlers */
-    address?: string | [string];
-    /** @field The maximum XYO that can be spent executing the query */
-    budget?: number;
-    /** @field The frequency on which this query can be rerun */
-    maxFrequency?: 'once' | 'second' | 'minute' | 'hour' | 'day' | 'week' | 'month' | 'year';
-    /** @field The starting point for the bidding on the query */
-    minBid?: number;
-}
-export type Query<T extends Payload | void = void> = T extends Payload ? Payload<T & QueryFields> : Payload<QueryFields>;
-//# sourceMappingURL=Payload.d.ts.map

package/dist/types/Query/Payload.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"Payload.d.ts","sourceRoot":"","sources":["../../../src/Query/Payload.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,MAAM,WAAW,WAAW;IAC1B,oDAAoD;IACpD,OAAO,CAAC,EAAE,MAAM,GAAG,CAAC,MAAM,CAAC,CAAA;IAE3B,mEAAmE;IACnE,MAAM,CAAC,EAAE,MAAM,CAAA;IAEf,4DAA4D;IAC5D,YAAY,CAAC,EAAE,MAAM,GAAG,QAAQ,GAAG,QAAQ,GAAG,MAAM,GAAG,KAAK,GAAG,MAAM,GAAG,OAAO,GAAG,MAAM,CAAA;IAExF,6DAA6D;IAC7D,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB;AAED,MAAM,MAAM,KAAK,CAAC,CAAC,SAAS,OAAO,GAAG,IAAI,GAAG,IAAI,IAAI,CAAC,SAAS,OAAO,GAAG,OAAO,CAAC,CAAC,GAAG,WAAW,CAAC,GAAG,OAAO,CAAC,WAAW,CAAC,CAAA"}

package/dist/types/Query/QueryBoundWitness.d.ts

@@ -1,17 +0,0 @@
-import { BoundWitness, BoundWitnessSchema } from '@xyo-network/boundwitness-model';
-import { Payload } from '@xyo-network/payload-model';
-export type QueryBoundWitnessSchema = BoundWitnessSchema;
-export declare const QueryBoundWitnessSchema: QueryBoundWitnessSchema;
-export type QueryBoundWitness = BoundWitness<{
-    query: string;
-    resultSet?: string;
-    schema: BoundWitnessSchema;
-}>;
-export declare const isQueryBoundWitness: (x?: Payload | null) => x is import("@xyo-network/payload-model").SchemaFields & import("@xyo-network/payload-model").PayloadFields & import("@xyo-network/boundwitness-model").BoundWitnessFields & {
-    query: string;
-    resultSet?: string | undefined;
-    schema: BoundWitnessSchema;
-} & {
-    schema: "network.xyo.boundwitness";
-};
-//# sourceMappingURL=QueryBoundWitness.d.ts.map

package/dist/types/Query/QueryBoundWitness.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"QueryBoundWitness.d.ts","sourceRoot":"","sources":["../../../src/Query/QueryBoundWitness.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,kBAAkB,EAAkB,MAAM,iCAAiC,CAAA;AAClG,OAAO,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAA;AAEpD,MAAM,MAAM,uBAAuB,GAAG,kBAAkB,CAAA;AACxD,eAAO,MAAM,uBAAuB,EAAE,uBAA4C,CAAA;AAElF,MAAM,MAAM,iBAAiB,GAAG,YAAY,CAAC;IAC3C,KAAK,EAAE,MAAM,CAAA;IACb,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB,MAAM,EAAE,kBAAkB,CAAA;CAC3B,CAAC,CAAA;AAEF,eAAO,MAAM,mBAAmB,OAAQ,OAAO,GAAG,IAAI;WAL7C,MAAM;;YAEL,kBAAkB;;;CAGyH,CAAA"}

package/dist/types/Query/index.d.ts

@@ -1,3 +0,0 @@
-export * from './Payload';
-export * from './QueryBoundWitness';
-//# sourceMappingURL=index.d.ts.map

package/dist/types/Query/index.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/Query/index.ts"],"names":[],"mappings":"AAAA,cAAc,WAAW,CAAA;AACzB,cAAc,qBAAqB,CAAA"}

package/src/Error.ts

@@ -1,12 +0,0 @@
-import { Payload } from '@xyo-network/payload-model'
-
-export type ModuleErrorSchema = 'network.xyo.error.module'
-export const ModuleErrorSchema: ModuleErrorSchema = 'network.xyo.error.module'
-
-export type ModuleError = Payload<{
-  message?: string
-  name?: string
-  query?: string
-  schema: ModuleErrorSchema
-  sources?: string[]
-}>

package/src/Query/Payload.ts

@@ -1,17 +0,0 @@
-import { Payload } from '@xyo-network/payload-model'
-
-export interface QueryFields {
-  /** @field The addresses of the intended handlers */
-  address?: string | [string]
-
-  /** @field The maximum XYO that can be spent executing the query */
-  budget?: number
-
-  /** @field The frequency on which this query can be rerun */
-  maxFrequency?: 'once' | 'second' | 'minute' | 'hour' | 'day' | 'week' | 'month' | 'year'
-
-  /** @field The starting point for the bidding on the query */
-  minBid?: number
-}
-
-export type Query<T extends Payload | void = void> = T extends Payload ? Payload<T & QueryFields> : Payload<QueryFields>

package/src/Query/QueryBoundWitness.ts

@@ -1,13 +0,0 @@
-import { BoundWitness, BoundWitnessSchema, isBoundWitness } from '@xyo-network/boundwitness-model'
-import { Payload } from '@xyo-network/payload-model'
-
-export type QueryBoundWitnessSchema = BoundWitnessSchema
-export const QueryBoundWitnessSchema: QueryBoundWitnessSchema = BoundWitnessSchema
-
-export type QueryBoundWitness = BoundWitness<{
-  query: string
-  resultSet?: string
-  schema: BoundWitnessSchema
-}>
-
-export const isQueryBoundWitness = (x?: Payload | null): x is QueryBoundWitness => isBoundWitness(x) && (x as QueryBoundWitness)?.query !== undefined

package/src/Query/index.ts

@@ -1,2 +0,0 @@
-export * from './Payload'
-export * from './QueryBoundWitness'