@secondlayer/subgraphs 7.0.4 → 7.1.0

package/dist/testing/index.d.ts

@@ -1,4 +1,4 @@
-import { AbiContract as AbiContract3, ExtractFunctionArgs as ExtractFunctionArgs2, ExtractFunctionNames } from "@secondlayer/stacks/clarity";
+import { AbiContract as AbiContract3, ExtractFunctionArgs as ExtractFunctionArgs2, ExtractFunctionNames, ExtractMapKey, ExtractMapNames, ExtractMapValue, ExtractVariableNames, ExtractVariableType } from "@secondlayer/stacks/clarity";
 /**
 * How long a read stays valid.
 *
@@ -263,11 +263,23 @@ interface VarSetFilter extends TraitScope, FactoryScope {
 	type: "var_set";
 	contractId?: string | readonly string[];
 	varName?: string;
+	/**
+	* Contract ABI. With a `varName` the abi defines, `event.value` is typed
+	* and decoded from the variable's type. Pass it yourself
+	* (`normalizeAbi()` from `@secondlayer/stacks/clarity`).
+	*/
+	abi?: AbiContract2;
 }
 interface MapWriteFilter extends TraitScope, FactoryScope {
 	type: "map_set" | "map_insert" | "map_delete";
 	contractId?: string | readonly string[];
 	map?: string;
+	/**
+	* Contract ABI. With a `map` the abi defines, `event.key` and
+	* `event.value` are typed and decoded from the map's types. Pass it
+	* yourself (`normalizeAbi()` from `@secondlayer/stacks/clarity`).
+	*/
+	abi?: AbiContract2;
 }
 /**
 * One declared field of a print payload.
@@ -578,14 +590,14 @@ interface NestedContractCallPayload {
 	result: unknown;
 	tx: TxMeta;
 }
-interface VarSetPayload {
+interface VarSetEvent {
 	contractId: string;
 	varName: string;
 	rawValue: string;
 	value: unknown;
 	tx: TxMeta;
 }
-interface MapWritePayload {
+interface MapWriteEvent {
 	contractId: string;
 	map: string;
 	rawKey: string;
@@ -594,7 +606,7 @@ interface MapWritePayload {
 	value: unknown;
 	tx: TxMeta;
 }
-interface MapDeletePayload {
+interface MapDeleteEvent {
 	contractId: string;
 	map: string;
 	rawKey: string;
@@ -602,6 +614,31 @@ interface MapDeletePayload {
 	tx: TxMeta;
 }
 /**
+* State-write payloads. When the source carries a `const` `abi` and a known
+* `varName` / `map`, `value` (and `key`) are typed from the contract's
+* definition and decoded with it (camelCased tuple keys, `AbiToTS` shapes).
+* Without an `abi`, or with a name the abi lacks, they stay `unknown`.
+*/
+type VarSetPayload<F = unknown> = F extends {
+	abi: infer A extends AbiContract3;
+	varName: infer N extends string;
+} ? N extends ExtractVariableNames<A> ? Omit<VarSetEvent, "value"> & {
+	value: ExtractVariableType<A, N>;
+} : VarSetEvent : VarSetEvent;
+type MapWritePayload<F = unknown> = F extends {
+	abi: infer A extends AbiContract3;
+	map: infer N extends string;
+} ? N extends ExtractMapNames<A> ? Omit<MapWriteEvent, "key" | "value"> & {
+	key: ExtractMapKey<A, N>;
+	value: ExtractMapValue<A, N>;
+} : MapWriteEvent : MapWriteEvent;
+type MapDeletePayload<F = unknown> = F extends {
+	abi: infer A extends AbiContract3;
+	map: infer N extends string;
+} ? N extends ExtractMapNames<A> ? Omit<MapDeleteEvent, "key"> & {
+	key: ExtractMapKey<A, N>;
+} : MapDeleteEvent : MapDeleteEvent;
+/**
 * Print event typed per topic. When a `print_event` source declares a `prints`
 * map, the payload is a discriminated union keyed by `topic` with `data` typed
 * per topic; otherwise it falls back to the untyped {@link PrintEventPayload}.
@@ -666,9 +703,9 @@ type EventForFilter<F extends SubgraphFilter> = F extends {
 	type: "nested_contract_call";
 } ? NestedContractCallPayload : F extends {
 	type: "var_set";
-} ? VarSetPayload : F extends {
+} ? VarSetPayload<F> : F extends {
 	type: infer T extends "map_set" | "map_insert" | "map_delete";
-} ? T extends "map_delete" ? MapDeletePayload : MapWritePayload : never;
+} ? T extends "map_delete" ? MapDeletePayload<F> : MapWritePayload<F> : never;
 interface BlockMeta {
 	height: number;
 	hash: string;

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.1.0",
   description: "Describe the Stacks data you want as one TypeScript file; it fills itself and survives reorgs.",
   license: "MIT",
   repository: {
@@ -1510,8 +1510,8 @@ var package_default = {
   },
   dependencies: {
     "@secondlayer/shared": "^13.0.0",
-    "@secondlayer/stacks": "^6.2.2",
-    "@secondlayer/verify": "^0.5.4",
+    "@secondlayer/stacks": "^6.3.0",
+    "@secondlayer/verify": "^0.6.0",
     esbuild: "^0.28.2",
     kysely: "0.28.17",
     zod: "^4.3.6"
@@ -2330,6 +2330,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 +2557,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 +2573,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
       };
     }
@@ -3077,5 +3099,5 @@ export {
   toHandlerPayload
 };
 
-//# debugId=314CB09040BE8DD164756E2164756E21
+//# debugId=80779D350271083F64756E2164756E21
 //# sourceMappingURL=index.js.map