@xyo-network/diviner-temporal-indexing-memory 2.84.19 → 2.85.1

package/package.json

@@ -13,36 +13,37 @@
     "@xylabs/array": "^2.13.20",
     "@xylabs/assert": "^2.13.20",
     "@xylabs/exists": "^2.13.20",
-    "@xyo-network/abstract-diviner": "~2.84.19",
-    "@xyo-network/archivist-model": "~2.84.19",
-    "@xyo-network/archivist-wrapper": "~2.84.19",
-    "@xyo-network/boundwitness-model": "~2.84.19",
-    "@xyo-network/diviner-boundwitness-model": "~2.84.19",
-    "@xyo-network/diviner-indexing-memory": "~2.84.19",
-    "@xyo-network/diviner-indexing-model": "~2.84.19",
-    "@xyo-network/diviner-jsonpath-aggregate-memory": "~2.84.19",
-    "@xyo-network/diviner-jsonpath-model": "~2.84.19",
-    "@xyo-network/diviner-model": "~2.84.19",
-    "@xyo-network/diviner-payload-model": "~2.84.19",
-    "@xyo-network/diviner-temporal-indexing-model": "~2.84.19",
-    "@xyo-network/diviner-wrapper": "~2.84.19",
-    "@xyo-network/hash": "~2.84.19",
-    "@xyo-network/module-model": "~2.84.19",
-    "@xyo-network/payload-builder": "~2.84.19",
-    "@xyo-network/payload-model": "~2.84.19",
-    "@xyo-network/witness-timestamp": "~2.84.19"
+    "@xyo-network/abstract-diviner": "~2.85.1",
+    "@xyo-network/archivist-model": "~2.85.1",
+    "@xyo-network/archivist-wrapper": "~2.85.1",
+    "@xyo-network/boundwitness-model": "~2.85.1",
+    "@xyo-network/diviner-boundwitness-model": "~2.85.1",
+    "@xyo-network/diviner-indexing-memory": "~2.85.1",
+    "@xyo-network/diviner-indexing-model": "~2.85.1",
+    "@xyo-network/diviner-jsonpath-aggregate-memory": "~2.85.1",
+    "@xyo-network/diviner-jsonpath-model": "~2.85.1",
+    "@xyo-network/diviner-model": "~2.85.1",
+    "@xyo-network/diviner-payload-model": "~2.85.1",
+    "@xyo-network/diviner-temporal-indexing-model": "~2.85.1",
+    "@xyo-network/diviner-wrapper": "~2.85.1",
+    "@xyo-network/hash": "~2.85.1",
+    "@xyo-network/module-model": "~2.85.1",
+    "@xyo-network/payload-builder": "~2.85.1",
+    "@xyo-network/payload-model": "~2.85.1",
+    "@xyo-network/payload-utils": "^2.85.1",
+    "@xyo-network/witness-timestamp": "~2.85.1"
   },
   "devDependencies": {
     "@xylabs/delay": "^2.13.20",
     "@xylabs/ts-scripts-yarn3": "^3.2.25",
     "@xylabs/tsconfig": "^3.2.25",
-    "@xyo-network/account": "~2.84.19",
-    "@xyo-network/boundwitness-builder": "~2.84.19",
-    "@xyo-network/diviner-boundwitness-memory": "~2.84.19",
-    "@xyo-network/diviner-payload-memory": "~2.84.19",
-    "@xyo-network/manifest": "~2.84.19",
-    "@xyo-network/memory-archivist": "~2.84.19",
-    "@xyo-network/node-memory": "~2.84.19",
+    "@xyo-network/account": "~2.85.1",
+    "@xyo-network/boundwitness-builder": "~2.85.1",
+    "@xyo-network/diviner-boundwitness-memory": "~2.85.1",
+    "@xyo-network/diviner-payload-memory": "~2.85.1",
+    "@xyo-network/manifest": "~2.85.1",
+    "@xyo-network/memory-archivist": "~2.85.1",
+    "@xyo-network/node-memory": "~2.85.1",
     "typescript": "^5.3.3"
   },
   "description": "Primary SDK for using XYO Protocol 2.0",
@@ -84,6 +85,6 @@
     "url": "https://github.com/XYOracleNetwork/sdk-xyo-client-js.git"
   },
   "sideEffects": false,
-  "version": "2.84.19",
+  "version": "2.85.1",
   "type": "module"
 }

package/src/IndexCandidateToIndexDiviner/Diviner.ts

@@ -16,6 +16,7 @@ import { PayloadHasher } from '@xyo-network/hash'
 import { Labels } from '@xyo-network/module-model'
 import { PayloadBuilder } from '@xyo-network/payload-builder'
 import { Payload, PayloadFields } from '@xyo-network/payload-model'
+import { intraBoundwitnessSchemaCombinations } from '@xyo-network/payload-utils'
 
 export type IndexablePayloads = [BoundWitness, ...Payload[]]
 
@@ -72,13 +73,14 @@ export class TemporalIndexingDivinerIndexCandidateToIndexDiviner<
       const validIndexableTuples: IndexablePayloads[] = bws.reduce<IndexablePayloads[]>((indexableTuples, bw) => {
         // If this Bound Witness doesn't contain all the required schemas don't index it
         if (!containsAll(bw.payload_schemas, this.indexableSchemas)) return indexableTuples
-        // Find the remaining indexable payloads
-        const indexablePayloadPositions = this.indexableSchemas.map((schema) => bw.payload_schemas.indexOf(schema))
-        const indexablePayloadHashes = indexablePayloadPositions.map((index) => bw.payload_hashes?.[index])
-        const indexablePayloads = indexablePayloadHashes.map((hash) => payloadDictionary[hash]).filter(exists)
-        // If we found a timestamp and the right amount of indexable payloads (of the
-        // correct schema as checked above) in this BW, then index it
-        if (indexablePayloads.length === this.indexableSchemas.length) indexableTuples.push([bw, ...indexablePayloads])
+        // If it does contain all the required schemas, then find the combinations of payloads
+        // that satisfy the required schemas
+        intraBoundwitnessSchemaCombinations(bw, this.indexableSchemas).map((combination) => {
+          const indexablePayloads = combination.map((hash) => payloadDictionary[hash]).filter(exists)
+          // If we found a timestamp and the right amount of indexable payloads (of the
+          // correct schema as checked above) in this BW, then index it
+          if (indexablePayloads.length === this.indexableSchemas.length) indexableTuples.push([bw, ...indexablePayloads])
+        })
         return indexableTuples
       }, [])
       // Create the indexes from the tuples