@apibara/indexer 2.1.0-beta.1 → 2.1.0-beta.11

package/dist/index.cjs

@@ -114,9 +114,13 @@ async function run(client, indexer, runOptions = {}) {
     if (indexer.options.startingCursor) {
       startingCursor = indexer.options.startingCursor;
     } else if (indexer.options.startingBlock !== void 0) {
-      startingCursor = {
-        orderKey: indexer.options.startingBlock
-      };
+      if (indexer.options.startingBlock === 0n) {
+        startingCursor = void 0;
+      } else if (indexer.options.startingBlock > 0n) {
+        startingCursor = {
+          orderKey: indexer.options.startingBlock - 1n
+        };
+      }
     }
     const request = indexer.streamConfig.Request.make({
       filter: isFactoryMode ? [indexer.options.filter, {}] : [indexer.options.filter],

package/dist/index.mjs

@@ -107,9 +107,13 @@ async function run(client, indexer, runOptions = {}) {
     if (indexer.options.startingCursor) {
       startingCursor = indexer.options.startingCursor;
     } else if (indexer.options.startingBlock !== void 0) {
-      startingCursor = {
-        orderKey: indexer.options.startingBlock
-      };
+      if (indexer.options.startingBlock === 0n) {
+        startingCursor = void 0;
+      } else if (indexer.options.startingBlock > 0n) {
+        startingCursor = {
+          orderKey: indexer.options.startingBlock - 1n
+        };
+      }
     }
     const request = indexer.streamConfig.Request.make({
       filter: isFactoryMode ? [indexer.options.filter, {}] : [indexer.options.filter],

package/dist/internal/testing.cjs

@@ -5,10 +5,11 @@ const testing = require('@apibara/protocol/testing');
 const context = require('../shared/indexer.077335f3.cjs');
 const index = require('../index.cjs');
 const config = require('../shared/indexer.601ceab0.cjs');
-require('consola');
+const logger = require('../shared/indexer.2416906c.cjs');
 const internal_plugins = require('./plugins.cjs');
 require('node:async_hooks');
 require('unctx');
+require('consola');
 require('hookable');
 require('node:assert');
 require('@opentelemetry/api');
@@ -62,6 +63,7 @@ function getMockIndexer(params) {
       async transform() {
       },
       plugins: [
+        logger.logger(),
         internal_plugins.internalContext(
           contextParams ?? {
             availableIndexers: ["testing"],

package/dist/internal/testing.mjs

@@ -3,10 +3,11 @@ import { MockStream } from '@apibara/protocol/testing';
 import { u as useIndexerContext } from '../shared/indexer.a55ad619.mjs';
 import { createIndexer, defineIndexer } from '../index.mjs';
 import { d as defineIndexerPlugin } from '../shared/indexer.9b21ddd2.mjs';
-import 'consola';
+import { l as logger } from '../shared/indexer.ff25c953.mjs';
 import { internalContext } from './plugins.mjs';
 import 'node:async_hooks';
 import 'unctx';
+import 'consola';
 import 'hookable';
 import 'node:assert';
 import '@opentelemetry/api';
@@ -60,6 +61,7 @@ function getMockIndexer(params) {
       async transform() {
       },
       plugins: [
+        logger(),
         internalContext(
           contextParams ?? {
             availableIndexers: ["testing"],

package/dist/testing/index.cjs

@@ -2,16 +2,16 @@
 
 const protocol = require('@apibara/protocol');
 const ci = require('ci-info');
+const context = require('../shared/indexer.077335f3.cjs');
 const index = require('../index.cjs');
 const internal_plugins = require('../internal/plugins.cjs');
 const logger = require('../shared/indexer.2416906c.cjs');
 const vcr_index = require('../vcr/index.cjs');
+require('node:async_hooks');
+require('unctx');
 require('consola');
 require('hookable');
 require('node:assert');
-require('../shared/indexer.077335f3.cjs');
-require('node:async_hooks');
-require('unctx');
 require('@opentelemetry/api');
 require('../shared/indexer.601ceab0.cjs');
 require('node:fs/promises');
@@ -24,6 +24,7 @@ function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'defau
 const ci__default = /*#__PURE__*/_interopDefaultCompat(ci);
 
 function createVcr() {
+  let result;
   return {
     async run(cassetteName, indexerConfig, range) {
       const vcrConfig = {
@@ -47,6 +48,9 @@ function createVcr() {
         ...indexerConfig.plugins ?? []
       ];
       const indexer = index.createIndexer(indexerConfig);
+      indexer.hooks.hook("run:after", () => {
+        result = context.useIndexerContext();
+      });
       if (!vcr_index.isCassetteAvailable(vcrConfig, cassetteName)) {
         if (ci__default.isCI) {
           throw new Error("Cannot record cassette in CI");
@@ -59,6 +63,7 @@ function createVcr() {
       } else {
         await vcr_index.replay(vcrConfig, indexer, cassetteName);
       }
+      return result;
     }
   };
 }

package/dist/testing/index.d.cts

@@ -2,11 +2,12 @@ import { I as IndexerWithStreamConfig } from '../shared/indexer.fedcd831.cjs';
 import '@apibara/protocol';
 import 'hookable';
 
+type VcrResult = Record<string, unknown>;
 declare function createVcr(): {
     run<TFilter, TBlock>(cassetteName: string, indexerConfig: IndexerWithStreamConfig<TFilter, TBlock>, range: {
         fromBlock: bigint;
         toBlock: bigint;
-    }): Promise<void>;
+    }): Promise<VcrResult>;
 };
 
-export { createVcr };
+export { type VcrResult, createVcr };

package/dist/testing/index.d.mts

@@ -2,11 +2,12 @@ import { I as IndexerWithStreamConfig } from '../shared/indexer.fedcd831.mjs';
 import '@apibara/protocol';
 import 'hookable';
 
+type VcrResult = Record<string, unknown>;
 declare function createVcr(): {
     run<TFilter, TBlock>(cassetteName: string, indexerConfig: IndexerWithStreamConfig<TFilter, TBlock>, range: {
         fromBlock: bigint;
         toBlock: bigint;
-    }): Promise<void>;
+    }): Promise<VcrResult>;
 };
 
-export { createVcr };
+export { type VcrResult, createVcr };

package/dist/testing/index.d.ts

@@ -2,11 +2,12 @@ import { I as IndexerWithStreamConfig } from '../shared/indexer.fedcd831.js';
 import '@apibara/protocol';
 import 'hookable';
 
+type VcrResult = Record<string, unknown>;
 declare function createVcr(): {
     run<TFilter, TBlock>(cassetteName: string, indexerConfig: IndexerWithStreamConfig<TFilter, TBlock>, range: {
         fromBlock: bigint;
         toBlock: bigint;
-    }): Promise<void>;
+    }): Promise<VcrResult>;
 };
 
-export { createVcr };
+export { type VcrResult, createVcr };

package/dist/testing/index.mjs

@@ -1,15 +1,15 @@
 import { createClient } from '@apibara/protocol';
 import ci from 'ci-info';
+import { u as useIndexerContext } from '../shared/indexer.a55ad619.mjs';
 import { createIndexer } from '../index.mjs';
 import { internalContext } from '../internal/plugins.mjs';
 import { l as logger } from '../shared/indexer.ff25c953.mjs';
 import { isCassetteAvailable, record, replay } from '../vcr/index.mjs';
+import 'node:async_hooks';
+import 'unctx';
 import 'consola';
 import 'hookable';
 import 'node:assert';
-import '../shared/indexer.a55ad619.mjs';
-import 'node:async_hooks';
-import 'unctx';
 import '@opentelemetry/api';
 import '../shared/indexer.9b21ddd2.mjs';
 import 'node:fs/promises';
@@ -18,6 +18,7 @@ import 'node:fs';
 import '@apibara/protocol/testing';
 
 function createVcr() {
+  let result;
   return {
     async run(cassetteName, indexerConfig, range) {
       const vcrConfig = {
@@ -41,6 +42,9 @@ function createVcr() {
         ...indexerConfig.plugins ?? []
       ];
       const indexer = createIndexer(indexerConfig);
+      indexer.hooks.hook("run:after", () => {
+        result = useIndexerContext();
+      });
       if (!isCassetteAvailable(vcrConfig, cassetteName)) {
         if (ci.isCI) {
           throw new Error("Cannot record cassette in CI");
@@ -53,6 +57,7 @@ function createVcr() {
       } else {
         await replay(vcrConfig, indexer, cassetteName);
       }
+      return result;
     }
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@apibara/indexer",
-  "version": "2.1.0-beta.1",
+  "version": "2.1.0-beta.11",
   "type": "module",
   "files": [
     "dist",
@@ -70,7 +70,7 @@
     "vitest": "^1.6.0"
   },
   "dependencies": {
-    "@apibara/protocol": "2.1.0-beta.1",
+    "@apibara/protocol": "2.1.0-beta.11",
     "@opentelemetry/api": "^1.9.0",
     "ci-info": "^4.1.0",
     "consola": "^3.2.3",

package/src/indexer.ts

@@ -225,9 +225,13 @@ export async function run<TFilter, TBlock>(
     if (indexer.options.startingCursor) {
       startingCursor = indexer.options.startingCursor;
     } else if (indexer.options.startingBlock !== undefined) {
-      startingCursor = {
-        orderKey: indexer.options.startingBlock,
-      };
+      if (indexer.options.startingBlock === 0n) {
+        startingCursor = undefined;
+      } else if (indexer.options.startingBlock > 0n) {
+        startingCursor = {
+          orderKey: indexer.options.startingBlock - 1n,
+        };
+      }
     }
 
     // if factory mode we add a empty filter at the end of the filter array.

package/src/internal/testing.ts

@@ -5,10 +5,9 @@ import {
   MockStream,
   type MockStreamResponse,
 } from "@apibara/protocol/testing";
-
 import { useIndexerContext } from "../context";
 import { type IndexerConfig, createIndexer, defineIndexer } from "../indexer";
-import { defineIndexerPlugin } from "../plugins";
+import { defineIndexerPlugin, logger } from "../plugins";
 import { type InternalContext, internalContext } from "./plugins";
 
 export type MockMessagesOptions = {
@@ -82,6 +81,7 @@ export function getMockIndexer(params?: MockIndexerParams) {
       filter: {},
       async transform() {},
       plugins: [
+        logger(),
         internalContext(
           contextParams ??
             ({

package/src/testing/index.ts

@@ -1,5 +1,6 @@
 import { createClient } from "@apibara/protocol";
 import ci from "ci-info";
+import { useIndexerContext } from "../context";
 import { type IndexerWithStreamConfig, createIndexer } from "../indexer";
 import { type InternalContext, internalContext } from "../plugins/context";
 import { logger } from "../plugins/logger";
@@ -8,7 +9,11 @@ import { isCassetteAvailable } from "../vcr/helper";
 import { record } from "../vcr/record";
 import { replay } from "../vcr/replay";
 
+export type VcrResult = Record<string, unknown>;
+
 export function createVcr() {
+  let result: VcrResult;
+
   return {
     async run<TFilter, TBlock>(
       cassetteName: string,
@@ -40,6 +45,10 @@ export function createVcr() {
 
       const indexer = createIndexer(indexerConfig);
 
+      indexer.hooks.hook("run:after", () => {
+        result = useIndexerContext();
+      });
+
       if (!isCassetteAvailable(vcrConfig, cassetteName)) {
         if (ci.isCI) {
           throw new Error("Cannot record cassette in CI");
@@ -53,6 +62,8 @@ export function createVcr() {
       } else {
         await replay(vcrConfig, indexer, cassetteName);
       }
+
+      return result;
     },
   };
 }