@xyo-network/diviner-payload-pointer-memory 5.2.18 → 5.2.20

package/dist/neutral/combineRules.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"combineRules.d.ts","sourceRoot":"","sources":["../../src/combineRules.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,EACV,WAAW,EACX,qBAAqB,EACtB,MAAM,4CAA4C,CAAA;AAUnD,eAAO,MAAM,YAAY,GAAI,OAAO,WAAW,EAAE,EAAE,KAAG,qBA0BrD,CAAA"}
+{"version":3,"file":"combineRules.d.ts","sourceRoot":"","sources":["../../src/combineRules.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EACV,WAAW,EACX,qBAAqB,EACtB,MAAM,4CAA4C,CAAA;AAUnD,eAAO,MAAM,YAAY,GAAI,OAAO,WAAW,EAAE,EAAE,KAAG,qBA0BrD,CAAA"}

package/dist/neutral/index.mjs

@@ -1,5 +1,5 @@
 // src/Diviner.ts
-import { assertEx as assertEx2 } from "@xylabs/assert";
+import { assertEx as assertEx2 } from "@xylabs/sdk-js";
 import { AbstractDiviner } from "@xyo-network/diviner-abstract";
 import { asDivinerInstance } from "@xyo-network/diviner-model";
 import {
@@ -15,8 +15,7 @@ import { isBoundWitnessPointer } from "@xyo-network/diviner-payload-pointer-mode
 import { PayloadWrapper } from "@xyo-network/payload-wrapper";
 
 // src/combineRules.ts
-import { assertEx } from "@xylabs/assert";
-import { exists } from "@xylabs/exists";
+import { assertEx, exists } from "@xylabs/sdk-js";
 import {
   isPayloadAddressRule,
   isPayloadSchemaRule,

package/dist/neutral/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/Diviner.ts","../../src/findPayload.ts","../../src/combineRules.ts"],"sourcesContent":["import { assertEx } from '@xylabs/assert'\nimport type { ArchivistInstance } from '@xyo-network/archivist-model'\nimport { AbstractDiviner } from '@xyo-network/diviner-abstract'\nimport type { BoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-abstract'\nimport type { DivinerInstance, DivinerModuleEventData } from '@xyo-network/diviner-model'\nimport { asDivinerInstance } from '@xyo-network/diviner-model'\nimport type { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'\nimport type {\n  PayloadPointerDivinerParams,\n  PointerPayload,\n} from '@xyo-network/diviner-payload-pointer-model'\nimport {\n  isPointerPayload,\n  PayloadPointerDivinerConfigSchema,\n} from '@xyo-network/diviner-payload-pointer-model'\nimport type { Payload, Schema } from '@xyo-network/payload-model'\n\nimport { findPayload } from './findPayload.ts'\n\nexport class PayloadPointerDiviner<\n  TParams extends PayloadPointerDivinerParams = PayloadPointerDivinerParams,\n  TIn extends PointerPayload = PointerPayload,\n  TOut extends Payload = Payload,\n  TEventData extends DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut> = DivinerModuleEventData<\n    DivinerInstance<TParams, TIn, TOut>,\n    TIn,\n    TOut\n  >,\n> extends AbstractDiviner<TParams, TIn, TOut, TEventData> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, PayloadPointerDivinerConfigSchema]\n  static override readonly defaultConfigSchema: Schema = PayloadPointerDivinerConfigSchema\n\n  protected override async divineHandler(payloads?: TIn[]): Promise<TOut[]> {\n    const pointer = payloads?.find(isPointerPayload)\n    if (!pointer) return []\n    const archivist = await this.getConfigArchivist()\n    const boundWitnessDiviner = await this.getBoundWitnessDiviner()\n    const payloadDiviner = await this.getPayloadDiviner()\n    const result = (await findPayload(archivist, boundWitnessDiviner, payloadDiviner, pointer)) as TOut | undefined\n    return result ? [result] : []\n  }\n\n  /**\n   * Returns the archivist instance for the given config\n   * @returns The archivist instance corresponding to the config\n   */\n  private async getBoundWitnessDiviner(): Promise<BoundWitnessDiviner> {\n    const name = assertEx(this.config?.boundWitnessDiviner, () => 'Missing archivist in config')\n    const mod = assertEx(await this.resolve(name), () => `Config.boundWitnessDiviner module value of ${name} not resolved`)\n    const diviner = assertEx(asDivinerInstance(mod), () => `Module ${name} is not an BoundWitnessDiviner`)\n    return diviner as BoundWitnessDiviner\n  }\n\n  /**\n   * Returns the archivist instance for the given config\n   * @returns The archivist instance corresponding to the config\n   */\n  private async getConfigArchivist(): Promise<ArchivistInstance> {\n    const name = assertEx(this.config?.archivist, () => 'Missing archivist in config')\n    return assertEx(await this.archivistInstance(), () => `Config.archivist module value of ${name} not resolved`)\n  }\n\n  /**\n   * Returns the archivist instance for the given config\n   * @returns The archivist instance corresponding to the config\n   */\n  private async getPayloadDiviner(): Promise<PayloadDiviner> {\n    const name = assertEx(this.config?.payloadDiviner, () => 'Missing payloadDiviner in config')\n    const mod = assertEx(await this.resolve(name), () => `Config.payloadDiviner module value of ${name} not resolved`)\n    const diviner = assertEx(asDivinerInstance(mod), () => `Module ${name} is not an PayloadDiviner`)\n    return diviner as PayloadDiviner\n  }\n}\n","import type { ArchivistInstance } from '@xyo-network/archivist-model'\nimport { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport type { BoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-abstract'\nimport type { BoundWitnessDivinerQueryPayload } from '@xyo-network/diviner-boundwitness-model'\nimport { BoundWitnessDivinerQuerySchema } from '@xyo-network/diviner-boundwitness-model'\nimport type { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'\nimport type { PayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'\nimport { PayloadDivinerQuerySchema } from '@xyo-network/diviner-payload-model'\nimport type {\n  PayloadRule, PayloadSearchCriteria, PointerPayload,\n} from '@xyo-network/diviner-payload-pointer-model'\nimport { isBoundWitnessPointer } from '@xyo-network/diviner-payload-pointer-model'\nimport type { Payload, Schema } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nimport { combineRules } from './combineRules.ts'\n\nconst limit = 1\n\nconst createBoundWitnessFilterFromSearchCriteria = (searchCriteria: PayloadSearchCriteria): BoundWitnessDivinerQueryPayload[] => {\n  const {\n    addresses, order = 'desc', schemas, cursor,\n  } = searchCriteria\n  const query: BoundWitnessDivinerQueryPayload = {\n    addresses,\n    limit,\n    order,\n    payload_schemas: schemas,\n    schema: BoundWitnessDivinerQuerySchema,\n  }\n  if (cursor) query.cursor = cursor\n  return [query]\n}\n\nconst createPayloadFilterFromSearchCriteria = (searchCriteria: PayloadSearchCriteria): Payload[] => {\n  const { order = 'desc', schemas } = searchCriteria\n  const query: PayloadDivinerQueryPayload = {\n    limit, order, schema: PayloadDivinerQuerySchema, schemas,\n  }\n  return [query]\n}\n\nexport const findPayload = async (\n  archivist: ArchivistInstance,\n  boundWitnessDiviner: BoundWitnessDiviner,\n  payloadDiviner: PayloadDiviner,\n  pointer: PointerPayload,\n): Promise<Payload | undefined> => {\n  const reference = pointer.reference as PayloadRule[][]\n  const searchCriteria = combineRules(reference)\n  const { addresses } = searchCriteria\n  const findWitnessedPayload = addresses?.length\n  const returnBoundWitness = isBoundWitnessPointer(pointer)\n  if (returnBoundWitness || findWitnessedPayload) {\n    const filter = createBoundWitnessFilterFromSearchCriteria(searchCriteria)\n    const result = await boundWitnessDiviner.divine(filter)\n    const bw = result?.[0] ? BoundWitnessWrapper.parse(result[0]) : undefined\n    if (bw) {\n      if (returnBoundWitness) return bw.payload\n      const { schemas, order = 'desc' } = searchCriteria\n      let payloadIndex = order === 'asc' ? 0 : bw.payloadHashes.length - 1\n      if (schemas) {\n        const schemaInSearchCriteria = (schema: Schema) => schemas.includes(schema)\n        payloadIndex = order === 'asc' ? bw.payloadSchemas.findIndex(schemaInSearchCriteria) : bw.payloadSchemas.findLastIndex(schemaInSearchCriteria)\n      }\n      const hash = bw.payloadHashes[payloadIndex]\n      const result = await archivist.get([hash])\n      return result?.[0] ? PayloadWrapper.wrap(result?.[0]).payload : undefined\n    }\n  } else {\n    // Find payload\n    const filter = createPayloadFilterFromSearchCriteria(searchCriteria)\n    const result = await payloadDiviner.divine(filter)\n    return result?.[0] ? PayloadWrapper.wrap(result?.[0]).payload : undefined\n  }\n}\n","import { assertEx } from '@xylabs/assert'\nimport { exists } from '@xylabs/exists'\nimport type { Address } from '@xylabs/hex'\nimport type { Order } from '@xyo-network/diviner-payload-model'\nimport type {\n  PayloadRule,\n  PayloadSearchCriteria,\n} from '@xyo-network/diviner-payload-pointer-model'\nimport {\n  isPayloadAddressRule,\n  isPayloadSchemaRule,\n  isPayloadSequenceOrderRule,\n} from '@xyo-network/diviner-payload-pointer-model'\n\n// TODO: Could make it so that composability is such that we:\n// • AND first dimension of array\n// • OR 2nd dimension of array\nexport const combineRules = (rules: PayloadRule[][]): PayloadSearchCriteria => {\n  const addresses = rules\n    .flat()\n    .filter(isPayloadAddressRule)\n    .map(r => r.address)\n    .filter(exists) as Address[]\n\n  const schemas = rules\n    .flat()\n    .filter(isPayloadSchemaRule)\n    .map(r => r.schema)\n    .filter(exists)\n  assertEx(schemas.length, () => 'At least one schema must be supplied')\n\n  const sequenceOrderRule = rules.flat().filter(isPayloadSequenceOrderRule).filter(exists)\n  assertEx(sequenceOrderRule.length < 2, () => 'Must not supply more than 1 direction/timestamp rule')\n\n  const order: Order = sequenceOrderRule[0]?.order || 'desc'\n  const cursor = sequenceOrderRule[0]?.sequence\n\n  return {\n    addresses,\n    cursor,\n    order,\n    schemas,\n  }\n}\n"],"mappings":"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","names":["assertEx","result","assertEx"]}
+{"version":3,"sources":["../../src/Diviner.ts","../../src/findPayload.ts","../../src/combineRules.ts"],"sourcesContent":["import { assertEx } from '@xylabs/sdk-js'\nimport type { ArchivistInstance } from '@xyo-network/archivist-model'\nimport { AbstractDiviner } from '@xyo-network/diviner-abstract'\nimport type { BoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-abstract'\nimport type { DivinerInstance, DivinerModuleEventData } from '@xyo-network/diviner-model'\nimport { asDivinerInstance } from '@xyo-network/diviner-model'\nimport type { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'\nimport type {\n  PayloadPointerDivinerParams,\n  PointerPayload,\n} from '@xyo-network/diviner-payload-pointer-model'\nimport {\n  isPointerPayload,\n  PayloadPointerDivinerConfigSchema,\n} from '@xyo-network/diviner-payload-pointer-model'\nimport type { Payload, Schema } from '@xyo-network/payload-model'\n\nimport { findPayload } from './findPayload.ts'\n\nexport class PayloadPointerDiviner<\n  TParams extends PayloadPointerDivinerParams = PayloadPointerDivinerParams,\n  TIn extends PointerPayload = PointerPayload,\n  TOut extends Payload = Payload,\n  TEventData extends DivinerModuleEventData<DivinerInstance<TParams, TIn, TOut>, TIn, TOut> = DivinerModuleEventData<\n    DivinerInstance<TParams, TIn, TOut>,\n    TIn,\n    TOut\n  >,\n> extends AbstractDiviner<TParams, TIn, TOut, TEventData> {\n  static override readonly configSchemas: Schema[] = [...super.configSchemas, PayloadPointerDivinerConfigSchema]\n  static override readonly defaultConfigSchema: Schema = PayloadPointerDivinerConfigSchema\n\n  protected override async divineHandler(payloads?: TIn[]): Promise<TOut[]> {\n    const pointer = payloads?.find(isPointerPayload)\n    if (!pointer) return []\n    const archivist = await this.getConfigArchivist()\n    const boundWitnessDiviner = await this.getBoundWitnessDiviner()\n    const payloadDiviner = await this.getPayloadDiviner()\n    const result = (await findPayload(archivist, boundWitnessDiviner, payloadDiviner, pointer)) as TOut | undefined\n    return result ? [result] : []\n  }\n\n  /**\n   * Returns the archivist instance for the given config\n   * @returns The archivist instance corresponding to the config\n   */\n  private async getBoundWitnessDiviner(): Promise<BoundWitnessDiviner> {\n    const name = assertEx(this.config?.boundWitnessDiviner, () => 'Missing archivist in config')\n    const mod = assertEx(await this.resolve(name), () => `Config.boundWitnessDiviner module value of ${name} not resolved`)\n    const diviner = assertEx(asDivinerInstance(mod), () => `Module ${name} is not an BoundWitnessDiviner`)\n    return diviner as BoundWitnessDiviner\n  }\n\n  /**\n   * Returns the archivist instance for the given config\n   * @returns The archivist instance corresponding to the config\n   */\n  private async getConfigArchivist(): Promise<ArchivistInstance> {\n    const name = assertEx(this.config?.archivist, () => 'Missing archivist in config')\n    return assertEx(await this.archivistInstance(), () => `Config.archivist module value of ${name} not resolved`)\n  }\n\n  /**\n   * Returns the archivist instance for the given config\n   * @returns The archivist instance corresponding to the config\n   */\n  private async getPayloadDiviner(): Promise<PayloadDiviner> {\n    const name = assertEx(this.config?.payloadDiviner, () => 'Missing payloadDiviner in config')\n    const mod = assertEx(await this.resolve(name), () => `Config.payloadDiviner module value of ${name} not resolved`)\n    const diviner = assertEx(asDivinerInstance(mod), () => `Module ${name} is not an PayloadDiviner`)\n    return diviner as PayloadDiviner\n  }\n}\n","import type { ArchivistInstance } from '@xyo-network/archivist-model'\nimport { BoundWitnessWrapper } from '@xyo-network/boundwitness-wrapper'\nimport type { BoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-abstract'\nimport type { BoundWitnessDivinerQueryPayload } from '@xyo-network/diviner-boundwitness-model'\nimport { BoundWitnessDivinerQuerySchema } from '@xyo-network/diviner-boundwitness-model'\nimport type { PayloadDiviner } from '@xyo-network/diviner-payload-abstract'\nimport type { PayloadDivinerQueryPayload } from '@xyo-network/diviner-payload-model'\nimport { PayloadDivinerQuerySchema } from '@xyo-network/diviner-payload-model'\nimport type {\n  PayloadRule, PayloadSearchCriteria, PointerPayload,\n} from '@xyo-network/diviner-payload-pointer-model'\nimport { isBoundWitnessPointer } from '@xyo-network/diviner-payload-pointer-model'\nimport type { Payload, Schema } from '@xyo-network/payload-model'\nimport { PayloadWrapper } from '@xyo-network/payload-wrapper'\n\nimport { combineRules } from './combineRules.ts'\n\nconst limit = 1\n\nconst createBoundWitnessFilterFromSearchCriteria = (searchCriteria: PayloadSearchCriteria): BoundWitnessDivinerQueryPayload[] => {\n  const {\n    addresses, order = 'desc', schemas, cursor,\n  } = searchCriteria\n  const query: BoundWitnessDivinerQueryPayload = {\n    addresses,\n    limit,\n    order,\n    payload_schemas: schemas,\n    schema: BoundWitnessDivinerQuerySchema,\n  }\n  if (cursor) query.cursor = cursor\n  return [query]\n}\n\nconst createPayloadFilterFromSearchCriteria = (searchCriteria: PayloadSearchCriteria): Payload[] => {\n  const { order = 'desc', schemas } = searchCriteria\n  const query: PayloadDivinerQueryPayload = {\n    limit, order, schema: PayloadDivinerQuerySchema, schemas,\n  }\n  return [query]\n}\n\nexport const findPayload = async (\n  archivist: ArchivistInstance,\n  boundWitnessDiviner: BoundWitnessDiviner,\n  payloadDiviner: PayloadDiviner,\n  pointer: PointerPayload,\n): Promise<Payload | undefined> => {\n  const reference = pointer.reference as PayloadRule[][]\n  const searchCriteria = combineRules(reference)\n  const { addresses } = searchCriteria\n  const findWitnessedPayload = addresses?.length\n  const returnBoundWitness = isBoundWitnessPointer(pointer)\n  if (returnBoundWitness || findWitnessedPayload) {\n    const filter = createBoundWitnessFilterFromSearchCriteria(searchCriteria)\n    const result = await boundWitnessDiviner.divine(filter)\n    const bw = result?.[0] ? BoundWitnessWrapper.parse(result[0]) : undefined\n    if (bw) {\n      if (returnBoundWitness) return bw.payload\n      const { schemas, order = 'desc' } = searchCriteria\n      let payloadIndex = order === 'asc' ? 0 : bw.payloadHashes.length - 1\n      if (schemas) {\n        const schemaInSearchCriteria = (schema: Schema) => schemas.includes(schema)\n        payloadIndex = order === 'asc' ? bw.payloadSchemas.findIndex(schemaInSearchCriteria) : bw.payloadSchemas.findLastIndex(schemaInSearchCriteria)\n      }\n      const hash = bw.payloadHashes[payloadIndex]\n      const result = await archivist.get([hash])\n      return result?.[0] ? PayloadWrapper.wrap(result?.[0]).payload : undefined\n    }\n  } else {\n    // Find payload\n    const filter = createPayloadFilterFromSearchCriteria(searchCriteria)\n    const result = await payloadDiviner.divine(filter)\n    return result?.[0] ? PayloadWrapper.wrap(result?.[0]).payload : undefined\n  }\n}\n","import type { Address } from '@xylabs/sdk-js'\nimport { assertEx, exists } from '@xylabs/sdk-js'\nimport type { Order } from '@xyo-network/diviner-payload-model'\nimport type {\n  PayloadRule,\n  PayloadSearchCriteria,\n} from '@xyo-network/diviner-payload-pointer-model'\nimport {\n  isPayloadAddressRule,\n  isPayloadSchemaRule,\n  isPayloadSequenceOrderRule,\n} from '@xyo-network/diviner-payload-pointer-model'\n\n// TODO: Could make it so that composability is such that we:\n// • AND first dimension of array\n// • OR 2nd dimension of array\nexport const combineRules = (rules: PayloadRule[][]): PayloadSearchCriteria => {\n  const addresses = rules\n    .flat()\n    .filter(isPayloadAddressRule)\n    .map(r => r.address)\n    .filter(exists) as Address[]\n\n  const schemas = rules\n    .flat()\n    .filter(isPayloadSchemaRule)\n    .map(r => r.schema)\n    .filter(exists)\n  assertEx(schemas.length, () => 'At least one schema must be supplied')\n\n  const sequenceOrderRule = rules.flat().filter(isPayloadSequenceOrderRule).filter(exists)\n  assertEx(sequenceOrderRule.length < 2, () => 'Must not supply more than 1 direction/timestamp rule')\n\n  const order: Order = sequenceOrderRule[0]?.order || 'desc'\n  const cursor = sequenceOrderRule[0]?.sequence\n\n  return {\n    addresses,\n    cursor,\n    order,\n    schemas,\n  }\n}\n"],"mappings":"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","names":["assertEx","result","assertEx"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xyo-network/diviner-payload-pointer-memory",
-  "version": "5.2.18",
+  "version": "5.2.20",
   "description": "Primary SDK for using XYO Protocol 2.0",
   "homepage": "https://xyo.network",
   "bugs": {
@@ -36,45 +36,43 @@
     "!**/*.test.*"
   ],
   "dependencies": {
-    "@xylabs/assert": "~5.0.50",
-    "@xylabs/exists": "~5.0.50",
-    "@xyo-network/boundwitness-wrapper": "~5.2.18",
-    "@xyo-network/diviner-abstract": "~5.2.18",
-    "@xyo-network/diviner-boundwitness-model": "~5.2.18",
-    "@xyo-network/diviner-model": "~5.2.18",
-    "@xyo-network/diviner-payload-model": "~5.2.18",
-    "@xyo-network/diviner-payload-pointer-model": "~5.2.18",
-    "@xyo-network/payload-model": "~5.2.18",
-    "@xyo-network/payload-wrapper": "~5.2.18"
+    "@xylabs/sdk-js": "~5.0.61",
+    "@xyo-network/boundwitness-wrapper": "workspace:~",
+    "@xyo-network/diviner-abstract": "workspace:~",
+    "@xyo-network/diviner-boundwitness-model": "workspace:~",
+    "@xyo-network/diviner-model": "workspace:~",
+    "@xyo-network/diviner-payload-model": "workspace:~",
+    "@xyo-network/diviner-payload-pointer-model": "workspace:~",
+    "@xyo-network/payload-model": "workspace:~",
+    "@xyo-network/payload-wrapper": "workspace:~"
   },
   "devDependencies": {
     "@types/uuid": "~11.0.0",
-    "@xylabs/delay": "~5.0.50",
-    "@xylabs/hex": "~5.0.50",
-    "@xylabs/ts-scripts-yarn3": "~7.2.8",
-    "@xylabs/tsconfig": "~7.2.8",
-    "@xylabs/vitest-extended": "~5.0.50",
-    "@xyo-network/account": "~5.2.18",
-    "@xyo-network/account-model": "~5.2.18",
-    "@xyo-network/archivist-memory": "~5.2.18",
-    "@xyo-network/archivist-model": "~5.2.18",
-    "@xyo-network/boundwitness-builder": "~5.2.18",
-    "@xyo-network/boundwitness-model": "~5.2.18",
-    "@xyo-network/diviner-boundwitness-abstract": "~5.2.18",
-    "@xyo-network/diviner-boundwitness-memory": "~5.2.18",
-    "@xyo-network/diviner-payload-abstract": "~5.2.18",
-    "@xyo-network/diviner-payload-generic": "~5.2.18",
-    "@xyo-network/diviner-payload-memory": "~5.2.18",
-    "@xyo-network/node-memory": "~5.2.18",
-    "@xyo-network/node-model": "~5.2.18",
-    "@xyo-network/payload-builder": "~5.2.18",
-    "@xyo-network/wallet": "~5.2.18",
-    "@xyo-network/wallet-model": "~5.2.18",
+    "@xylabs/sdk-js": "~5.0.61",
+    "@xylabs/ts-scripts-yarn3": "~7.2.32",
+    "@xylabs/tsconfig": "~7.2.32",
+    "@xylabs/vitest-extended": "~5.0.61",
+    "@xyo-network/account": "workspace:~",
+    "@xyo-network/account-model": "workspace:~",
+    "@xyo-network/archivist-memory": "workspace:~",
+    "@xyo-network/archivist-model": "workspace:~",
+    "@xyo-network/boundwitness-builder": "workspace:~",
+    "@xyo-network/boundwitness-model": "workspace:~",
+    "@xyo-network/diviner-boundwitness-abstract": "workspace:~",
+    "@xyo-network/diviner-boundwitness-memory": "workspace:~",
+    "@xyo-network/diviner-payload-abstract": "workspace:~",
+    "@xyo-network/diviner-payload-generic": "workspace:~",
+    "@xyo-network/diviner-payload-memory": "workspace:~",
+    "@xyo-network/node-memory": "workspace:~",
+    "@xyo-network/node-model": "workspace:~",
+    "@xyo-network/payload-builder": "workspace:~",
+    "@xyo-network/wallet": "workspace:~",
+    "@xyo-network/wallet-model": "workspace:~",
     "typescript": "~5.9.3",
     "uuid": "~13.0.0",
-    "vitest": "~4.0.15"
+    "vitest": "~4.0.16"
   },
   "publishConfig": {
     "access": "public"
   }
-}
+}

package/src/Diviner.ts

@@ -1,4 +1,4 @@
-import { assertEx } from '@xylabs/assert'
+import { assertEx } from '@xylabs/sdk-js'
 import type { ArchivistInstance } from '@xyo-network/archivist-model'
 import { AbstractDiviner } from '@xyo-network/diviner-abstract'
 import type { BoundWitnessDiviner } from '@xyo-network/diviner-boundwitness-abstract'

package/src/combineRules.ts

@@ -1,6 +1,5 @@
-import { assertEx } from '@xylabs/assert'
-import { exists } from '@xylabs/exists'
-import type { Address } from '@xylabs/hex'
+import type { Address } from '@xylabs/sdk-js'
+import { assertEx, exists } from '@xylabs/sdk-js'
 import type { Order } from '@xyo-network/diviner-payload-model'
 import type {
   PayloadRule,

package/src/spec/testUtil/Archivist/getArchivist.ts

@@ -1,4 +1,4 @@
-import { assertEx } from '@xylabs/assert'
+import { assertEx } from '@xylabs/sdk-js'
 import type { ArchivistInstance } from '@xyo-network/archivist-model'
 import { asArchivistInstance } from '@xyo-network/archivist-model'
 import type { NodeInstance } from '@xyo-network/node-model'