@secondlayer/subgraphs 7.0.4 → 7.2.0

package/dist/testing/index.js

@@ -1449,7 +1449,7 @@ import { createHash as createHash2 } from "node:crypto";
 // package.json
 var package_default = {
   name: "@secondlayer/subgraphs",
-  version: "7.0.4",
+  version: "7.2.0",
   description: "Describe the Stacks data you want as one TypeScript file; it fills itself and survives reorgs.",
   license: "MIT",
   repository: {
@@ -1509,9 +1509,9 @@ var package_default = {
     prepublishOnly: "bun run build"
   },
   dependencies: {
-    "@secondlayer/shared": "^13.0.0",
-    "@secondlayer/stacks": "^6.2.2",
-    "@secondlayer/verify": "^0.5.4",
+    "@secondlayer/shared": "^13.1.0",
+    "@secondlayer/stacks": "^6.4.0",
+    "@secondlayer/verify": "^0.6.0",
     esbuild: "^0.28.2",
     kysely: "0.28.17",
     zod: "^4.3.6"
@@ -1970,6 +1970,41 @@ function printContractId(data) {
   const id = (typeof data.contract_identifier === "string" ? data.contract_identifier : undefined) ?? (typeof data.contract_id === "string" ? data.contract_id : undefined);
   return id || undefined;
 }
+var decodedPrints = new WeakMap;
+function decodedPrintTuple(event, data) {
+  if (decodedPrints.has(event))
+    return decodedPrints.get(event) ?? null;
+  const raw = data.raw_value;
+  const value = typeof raw === "string" && raw.startsWith("0x") ? decodeClarityValue(raw) : null;
+  const tuple = value && typeof value === "object" && !Array.isArray(value) ? value : null;
+  decodedPrints.set(event, tuple);
+  return tuple;
+}
+function printFieldEquals(decoded, key, expected) {
+  const value = decoded[key];
+  let actual;
+  if (typeof value === "string")
+    actual = value;
+  else if (typeof value === "bigint" || typeof value === "boolean")
+    actual = String(value);
+  else
+    return false;
+  return typeof expected === "string" ? actual === expected : expected.includes(actual);
+}
+function printFieldsAllow(filter, event, data) {
+  if (!filter.topic && !filter.where)
+    return true;
+  const decoded = decodedPrintTuple(event, data);
+  if (!decoded)
+    return false;
+  if (filter.topic && !printFieldEquals(decoded, "topic", filter.topic))
+    return false;
+  for (const [key, expected] of Object.entries(filter.where ?? {})) {
+    if (!printFieldEquals(decoded, key, expected))
+      return false;
+  }
+  return true;
+}
 function matchFilter(filter, transactions, eventsByTx, traitContracts, factoryContracts = new Map, vmEventsByTx = new Map) {
   const results = [];
   switch (filter.type) {
@@ -2206,7 +2241,7 @@ function matchFilter(filter, transactions, eventsByTx, traitContracts, factoryCo
             return false;
           if (!factoryAllows(filter, contractId, factoryContracts))
             return false;
-          return true;
+          return printFieldsAllow(filter, e, data);
         });
         if (matched.length > 0) {
           results.push({ tx, events: matched });
@@ -2330,6 +2365,22 @@ function decodeRawHex(hex) {
   }
   return hex;
 }
+function decodeStateHex(hex, abiType) {
+  if (abiType === undefined || !hex.startsWith("0x") || hex.length <= 2) {
+    return decodeRawHex(hex);
+  }
+  try {
+    const decode = clarityValueToJS;
+    return decode(abiType, deserializeCV4(hex.slice(2)));
+  } catch {
+    return decodeRawHex(hex);
+  }
+}
+function mapAbiTypes(filter, name) {
+  const abi = "abi" in filter ? filter.abi : undefined;
+  const def = abi?.maps?.find((m) => m.name === name);
+  return def ? [def.key, def.value] : [];
+}
 function safeBigInt(val) {
   if (typeof val === "bigint")
     return val;
@@ -2541,11 +2592,14 @@ function buildEventPayload(filter, tx, event) {
     case "var_set": {
       const data = event.data ?? {};
       const rawValue = typeof data.raw_value === "string" ? data.raw_value : "";
+      const varName = typeof data.var_name === "string" ? data.var_name : "";
+      const abi = "abi" in filter ? filter.abi : undefined;
+      const varType = abi?.variables?.find((v) => v.name === varName)?.type;
       return {
         contractId: printContractId(data) ?? "",
-        varName: typeof data.var_name === "string" ? data.var_name : "",
+        varName,
         rawValue,
-        value: decodeRawHex(rawValue),
+        value: decodeStateHex(rawValue, varType),
         tx: txMeta
       };
     }
@@ -2554,24 +2608,27 @@ function buildEventPayload(filter, tx, event) {
       const data = event.data ?? {};
       const rawKey = typeof data.raw_key === "string" ? data.raw_key : "";
       const rawValue = typeof data.raw_value === "string" ? data.raw_value : "";
+      const map = typeof data.map_name === "string" ? data.map_name : "";
+      const [keyType, valueType] = mapAbiTypes(filter, map);
       return {
         contractId: printContractId(data) ?? "",
-        map: typeof data.map_name === "string" ? data.map_name : "",
+        map,
         rawKey,
-        key: decodeRawHex(rawKey),
+        key: decodeStateHex(rawKey, keyType),
         rawValue,
-        value: decodeRawHex(rawValue),
+        value: decodeStateHex(rawValue, valueType),
         tx: txMeta
       };
     }
     case "map_delete": {
       const data = event.data ?? {};
       const rawKey = typeof data.raw_key === "string" ? data.raw_key : "";
+      const map = typeof data.map_name === "string" ? data.map_name : "";
       return {
         contractId: printContractId(data) ?? "",
-        map: typeof data.map_name === "string" ? data.map_name : "",
+        map,
         rawKey,
-        key: decodeRawHex(rawKey),
+        key: decodeStateHex(rawKey, mapAbiTypes(filter, map)[0]),
         tx: txMeta
       };
     }
@@ -2781,6 +2838,14 @@ function txFromRow(row) {
     ...typeof r.function_name === "string" ? { functionName: r.function_name } : {}
   };
 }
+function indexPrintWhereAllows(where, row) {
+  if (!where)
+    return true;
+  const value = row.payload?.value;
+  if (!value || typeof value !== "object" || Array.isArray(value))
+    return false;
+  return Object.entries(where).every(([key, expected]) => printFieldEquals(value, key, expected));
+}
 function toHandlerPayload(_filter, row) {
   const tx = defaultTx(txFromRow(row));
   if (row.event_type === "print") {
@@ -2938,7 +3003,7 @@ async function runSubgraphTest(input) {
       continue;
     for (const row of rows) {
       const payload = filter?.type === "contract_call" ? toContractCallPayload(row) : toHandlerPayload(filter, row);
-      if (filter?.type === "print_event" && filter.topic && payload.topic !== filter.topic) {
+      if (filter?.type === "print_event" && (filter.topic && payload.topic !== filter.topic || !indexPrintWhereAllows(filter.where, row))) {
         continue;
       }
       if (!firstEvent) {
@@ -3077,5 +3142,5 @@ export {
   toHandlerPayload
 };
 
-//# debugId=314CB09040BE8DD164756E2164756E21
+//# debugId=6B86A4A41B6DB6DF64756E2164756E21
 //# sourceMappingURL=index.js.map