apibara 2.1.0-beta.3 → 2.1.0-beta.31

package/dist/types/index.d.ts

@@ -1,34 +1,30 @@
 import { ConsolaInstance } from 'consola';
 import { NestedHooks, Hookable } from 'hookable';
 import { ConsolaReporter } from '@apibara/indexer/plugins';
-import { RollupCommonJSOptions } from '@rollup/plugin-commonjs';
 import { C12InputConfig, WatchConfigOptions, ResolvedConfig, ConfigWatcher } from 'c12';
-import { WatchOptions } from 'chokidar';
-import { InputOptions, OutputOptions } from 'rollup';
+import { RolldownOptions, WatchOptions, InputOptions, OutputOptions } from 'rolldown';
 
 type DeepPartial<T> = T extends Record<string, any> ? {
     [P in keyof T]?: DeepPartial<T[P]> | T[P];
 } : T;
 
-type RollupConfig = InputOptions & {
-    output: OutputOptions;
-};
-
 interface ApibaraHooks {
-    "rollup:before": (apibara: Apibara, rollupConfig: RollupConfig) => void;
+    "rolldown:before": (apibara: Apibara, rolldownConfig: RolldownOptions) => void;
     compiled: (apibara: Apibara) => void;
-    "dev:restart": () => void;
-    "dev:reload": () => void;
-    "rollup:reload": () => void;
+    "dev:restart": () => Promise<void>;
+    "dev:reload": () => Promise<void>;
+    "rolldown:reload": () => Promise<void>;
     restart: () => void;
     close: () => void;
 }
 
-type LoggerFactory = ({ indexer, preset, }: {
+type RegisterFn = () => Promise<void>;
+type LoggerFactoryFn = ({ indexer, indexers, preset, }: LoggerFactoryArgs) => ConsolaReporter;
+type LoggerFactoryArgs = {
     indexer: string;
     indexers: string[];
     preset?: string;
-}) => ConsolaReporter;
+};
 /**
  * Apibara Config type (apibara.config)
  */
@@ -36,9 +32,8 @@ interface ApibaraConfig<T extends Record<string, DeepPartial<Pick<ApibaraConfig<
     runtimeConfig?: R;
     presets?: T;
     preset?: keyof T;
-    logger?: LoggerFactory;
 }
-type ApibaraDynamicConfig = Pick<ApibaraConfig, "runtimeConfig">;
+type ApibaraDynamicConfig = Pick<ApibaraConfig, "runtimeConfig" | "preset" | "presets">;
 /**
  * Config loader options
  */
@@ -57,14 +52,19 @@ interface ApibaraOptions<T extends Record<string, DeepPartial<Pick<ApibaraConfig
     buildDir: string;
     outputDir: string;
     indexersDir: string;
+    disableLogs?: boolean;
     dev: boolean;
-    watchOptions: WatchOptions;
+    watchOptions: WatchOptions["watch"];
     hooks: NestedHooks<ApibaraHooks>;
-    logger?: LoggerFactory;
-    rollupConfig?: Partial<RollupConfig>;
+    rolldownConfig?: Partial<RolldownOptions>;
+    /**
+     * @deprecated Use rolldownConfig instead. This option will be removed in future releases.
+     */
+    rollupConfig?: unknown;
     sourceMap?: boolean;
     entry: string;
-    commonJS?: RollupCommonJSOptions;
+    node: boolean;
+    exportConditions?: string[];
     typescript: {
         strict?: boolean;
         internalPaths?: boolean;
@@ -85,6 +85,10 @@ interface Apibara {
     updateConfig: (config: ApibaraDynamicConfig) => void | Promise<void>;
 }
 
+type RolldownConfig = InputOptions & {
+    output: OutputOptions;
+};
+
 type ApibaraRuntimeConfig = Record<string, unknown>;
 
-export type { Apibara, ApibaraConfig, ApibaraDynamicConfig, ApibaraHooks, ApibaraOptions, ApibaraRuntimeConfig, DeepPartial, IndexerDefinition, LoadConfigOptions, LoggerFactory, RollupConfig };
+export type { Apibara, ApibaraConfig, ApibaraDynamicConfig, ApibaraHooks, ApibaraOptions, ApibaraRuntimeConfig, DeepPartial, IndexerDefinition, LoadConfigOptions, LoggerFactoryArgs, LoggerFactoryFn, RegisterFn, RolldownConfig };

package/dist/types/index.mjs

@@ -1 +1,2 @@
 
+//# sourceMappingURL=index.mjs.map

package/dist/types/index.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.mjs","sources":[],"sourcesContent":[],"names":[],"mappings":""}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apibara",
-  "version": "2.1.0-beta.3",
+  "version": "2.1.0-beta.31",
   "type": "module",
   "main": "./dist/core/index.mjs",
   "exports": {
@@ -20,9 +20,9 @@
       "types": "./dist/core/index.d.ts",
       "import": "./dist/core/index.mjs"
     },
-    "./rollup": {
-      "types": "./dist/rollup/index.d.ts",
-      "import": "./dist/rollup/index.mjs"
+    "./rolldown": {
+      "types": "./dist/rolldown/index.d.ts",
+      "import": "./dist/rolldown/index.mjs"
     },
     "./types": {
       "types": "./dist/types/index.d.ts",
@@ -32,6 +32,10 @@
       "types": "./dist/hooks/index.d.ts",
       "import": "./dist/hooks/index.mjs"
     },
+    "./common": {
+      "types": "./dist/common/index.d.ts",
+      "import": "./dist/common/index.mjs"
+    },
     "./runtime": {
       "types": "./dist/runtime/index.d.ts",
       "import": "./dist/runtime/index.mjs"
@@ -51,6 +55,22 @@
     "./dist/runtime/*": {
       "types": "./dist/runtime/*.d.ts",
       "import": "./dist/runtime/*.mjs"
+    },
+    "./indexer": {
+      "types": "./dist/indexer/index.d.ts",
+      "import": "./dist/indexer/index.mjs"
+    },
+    "./plugins": {
+      "types": "./dist/indexer/plugins.d.ts",
+      "import": "./dist/indexer/plugins.mjs"
+    },
+    "./testing": {
+      "types": "./dist/indexer/testing.d.ts",
+      "import": "./dist/indexer/testing.mjs"
+    },
+    "./vcr": {
+      "types": "./dist/indexer/vcr.d.ts",
+      "import": "./dist/indexer/vcr.mjs"
     }
   },
   "bin": {
@@ -73,10 +93,12 @@
     "playground:prepare": "pnpm playground prepare --dir playground",
     "playground:dev": "pnpm playground dev --dir playground",
     "playground:build": "pnpm playground build --dir playground",
-    "playground:start": "pnpm playground start --dir playground --indexer starknet"
+    "playground:start": "pnpm playground start --dir playground --indexer starknet",
+    "playground:init": "pnpm playground init playground",
+    "playground:add": "pnpm playground add --dir playground"
   },
   "devDependencies": {
-    "@apibara/starknet": "2.1.0-beta.3",
+    "@apibara/starknet": "2.1.0-beta.31",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^20.14.0",
     "@types/prompts": "^2.4.9",
@@ -87,19 +109,15 @@
     "vitest": "^1.6.0"
   },
   "dependencies": {
-    "@apibara/indexer": "2.1.0-beta.3",
-    "@apibara/protocol": "2.1.0-beta.3",
-    "@rollup/plugin-commonjs": "^26.0.1",
-    "@rollup/plugin-json": "^6.1.0",
-    "@rollup/plugin-node-resolve": "^15.2.3",
-    "@rollup/plugin-typescript": "^11.1.6",
+    "@apibara/indexer": "2.1.0-beta.31",
+    "@apibara/protocol": "2.1.0-beta.31",
+    "@rollup/plugin-replace": "^6.0.2",
     "@rollup/plugin-virtual": "^3.0.2",
     "c12": "^1.11.1",
     "chokidar": "^3.6.0",
     "citty": "^0.1.6",
-    "consola": "^3.2.3",
+    "consola": "^3.4.2",
     "defu": "^6.1.4",
-    "esbuild": "^0.23.0",
     "fs-extra": "^11.2.0",
     "hookable": "^5.5.3",
     "klona": "^2.0.6",
@@ -111,8 +129,7 @@
     "pkg-types": "^1.1.3",
     "prettier": "^3.5.2",
     "prompts": "^2.4.2",
-    "rollup": "^4.18.1",
-    "rollup-plugin-esbuild": "^6.1.1",
+    "rolldown": "1.0.0-beta.3",
     "ts-morph": "^25.0.1",
     "tslib": "^2.6.3",
     "untyped": "^1.4.2"

package/src/cli/commands/add.ts

@@ -1,5 +1,6 @@
 import { addIndexer } from "apibara/create";
 import { defineCommand } from "citty";
+import { checkForUnknownArgs } from "../common";
 
 export default defineCommand({
   meta: {
@@ -10,28 +11,35 @@ export default defineCommand({
   args: {
     indexerId: {
       type: "positional",
-      description: "Indexer ID",
+      description: "Indexer ID - must be in kebab-case",
       required: false,
     },
     chain: {
       type: "string",
-      description: "Chain",
+      description: "Blockchain - ethereum, beaconchain, starknet",
     },
     network: {
       type: "string",
-      description: "Network",
+      description: "Network - mainnet, sepolia, other",
     },
     storage: {
       type: "string",
-      description: "Storage",
+      description: "Storage - postgres, none",
     },
     dnaUrl: {
       type: "string",
-      description: "DNA URL",
+      description: "DNA URL - https://custom-dna-url.apibara.org",
+    },
+    dir: {
+      type: "string",
+      description:
+        "Root directory - apibara project root where apibara.config is located | default: current working directory",
     },
   },
-  async run({ args }) {
-    const { indexerId, chain, network, storage, dnaUrl } = args;
+  async run({ args, cmd }) {
+    await checkForUnknownArgs(args, cmd);
+
+    const { indexerId, chain, network, storage, dnaUrl, dir } = args;
 
     await addIndexer({
       argIndexerId: indexerId,
@@ -39,6 +47,7 @@ export default defineCommand({
       argNetwork: network,
       argStorage: storage,
       argDnaUrl: dnaUrl,
+      argRootDir: dir,
     });
   },
 });

package/src/cli/commands/build.ts

@@ -2,7 +2,7 @@ import { build, createApibara, prepare, writeTypes } from "apibara/core";
 import { runtimeDir } from "apibara/runtime/meta";
 import { defineCommand } from "citty";
 import { join, resolve } from "pathe";
-import { commonArgs } from "../common";
+import { checkForUnknownArgs, commonArgs } from "../common";
 
 export default defineCommand({
   meta: {
@@ -12,8 +12,11 @@ export default defineCommand({
   args: {
     ...commonArgs,
   },
-  async run({ args }) {
+  async run({ args, cmd }) {
+    await checkForUnknownArgs(args, cmd);
+
     const rootDir = resolve((args.dir || args._dir || ".") as string);
+
     const apibara = await createApibara({
       rootDir,
     });

package/src/cli/commands/dev.ts

@@ -5,11 +5,12 @@ import type { Apibara } from "apibara/types";
 import { defineCommand } from "citty";
 import { colors } from "consola/utils";
 import { join, resolve } from "pathe";
-import { commonArgs } from "../common";
+import { blueBright, gray } from "../../create/colors";
+import { checkForUnknownArgs, commonArgs } from "../common";
 
 // Hot module reloading key regex
-// for only runtimeConfig.* keys
-const hmrKeyRe = /^runtimeConfig\./;
+// for only runtimeConfig.*, presets.* keys & preset key
+const hmrKeyRe = /^(runtimeConfig\.|presets\.|preset$)/;
 
 export default defineCommand({
   meta: {
@@ -26,10 +27,29 @@ export default defineCommand({
       type: "string",
       description: "Preset to use",
     },
+    "always-reindex": {
+      type: "boolean",
+      default: false,
+      description:
+        "Reindex the indexers from the starting block on every restart | default: `false`",
+    },
   },
-  async run({ args }) {
+  async run({ args, data, cmd, rawArgs }) {
+    await checkForUnknownArgs(args, cmd);
+
     const rootDir = resolve((args.dir || args._dir || ".") as string);
 
+    if (args["always-reindex"]) {
+      process.env.APIBARA_ALWAYS_REINDEX = "true";
+    }
+
+    const selectedIndexers = new Set(
+      args.indexers
+        ?.split(",")
+        .map((i) => i.trim())
+        .sort() ?? [],
+    );
+
     let apibara: Apibara;
     let childProcess: ChildProcess | undefined;
 
@@ -46,6 +66,7 @@ export default defineCommand({
       apibara = await createApibara(
         {
           rootDir,
+          preset: args.preset,
         },
         {
           watch: true,
@@ -58,12 +79,12 @@ export default defineCommand({
               }
 
               apibara.logger.info(
-                `Config updated:
-                  ${diff.map((entry) => `  ${entry.toString()}`).join("\n")}`,
+                `Config updated: \n${diff.map((entry) => `  ${entry.toString()}`).join("\n")}`,
               );
 
               await (diff.every((e) => hmrKeyRe.test(e.key))
-                ? apibara.updateConfig(newConfig.config || {}) // Hot reload
+                ? // in hot reload we only update the runtime values & restart indexers,no build step, apibara instance remains the same
+                  apibara.updateConfig(newConfig.config || {}) // Hot reload
                 : reload()); // Full reload
             },
           },
@@ -71,7 +92,9 @@ export default defineCommand({
         true,
       );
 
-      apibara.hooks.hookOnce("restart", reload);
+      apibara.hooks.hookOnce("restart", async () => {
+        await reload();
+      });
 
       apibara.options.entry = join(runtimeDir, "dev.mjs");
 
@@ -79,38 +102,50 @@ export default defineCommand({
       await writeTypes(apibara);
       await build(apibara);
 
-      apibara.hooks.hook("dev:restart", () => {
+      apibara.hooks.hook("dev:restart", async () => {
         if (childProcess) {
           apibara.logger.info("Change detected, stopping indexers to restart");
-          childProcess.kill();
+          await killProcess(childProcess);
           childProcess = undefined;
         }
       });
 
-      apibara.hooks.hook("dev:reload", () => {
+      apibara.hooks.hook("dev:reload", async () => {
         if (childProcess) {
-          childProcess.kill();
+          await killProcess(childProcess);
+          childProcess = undefined;
+          apibara.logger.info("Restarting indexers");
         } else {
-          apibara.logger.success("Restarting indexers");
+          apibara.logger.info("Starting indexers");
+
+          const indexersText = apibara.indexers
+            .map((i) =>
+              selectedIndexers.has(i.name) || selectedIndexers.size === 0
+                ? blueBright(i.name)
+                : gray(i.name),
+            )
+            .join(", ");
+          apibara.logger.info("Indexers:", indexersText);
         }
 
         const childArgs = [
           resolve(apibara.options.outputDir || "./.apibara/build", "dev.mjs"),
           "start",
           ...(args.indexers ? ["--indexers", args.indexers] : []),
-          ...(args.preset ? ["--preset", args.preset] : []),
         ];
 
         childProcess = spawn("node", childArgs, {
           stdio: "inherit",
         });
 
-        childProcess.on("close", (code) => {
-          if (code !== null) {
-            apibara.logger.log(
-              `Indexers process exited with code ${colors.red(code)}`,
-            );
-          }
+        childProcess.on("close", (code, signal) => {
+          childProcess = undefined;
+          console.log();
+          apibara.logger.info(
+            `Indexers process exited${
+              code !== null ? ` with code ${colors.red(code)}` : ""
+            }`,
+          );
         });
       });
     };
@@ -118,3 +153,12 @@ export default defineCommand({
     await reload();
   },
 });
+
+async function killProcess(childProcess: ChildProcess | undefined) {
+  if (childProcess) {
+    await new Promise((resolve) => {
+      childProcess.once("exit", resolve);
+      childProcess.kill();
+    });
+  }
+}

package/src/cli/commands/init.ts

@@ -1,5 +1,6 @@
 import { initializeProject } from "apibara/create";
 import { defineCommand } from "citty";
+import { checkForUnknownArgs } from "../common";
 
 export default defineCommand({
   meta: {
@@ -14,23 +15,27 @@ export default defineCommand({
     },
     language: {
       type: "string",
-      description: "Language to use: typescript, ts or javascript, js",
+      description:
+        "Language to use: typescript, ts or javascript, js | default: `ts`",
       default: "ts",
       alias: "l",
     },
-    noIndexer: {
+    "create-indexer": {
       type: "boolean",
-      description: "Do not create an indexer after initialization",
-      default: false,
+      name: "create-indexer",
+      default: true,
+      description: "TODO",
     },
   },
-  async run({ args }) {
-    const { dir: targetDir, noIndexer, language } = args;
+  async run({ args, cmd }) {
+    await checkForUnknownArgs(args, cmd);
+
+    const { dir: targetDir, "create-indexer": createIndexer, language } = args;
 
     await initializeProject({
       argTargetDir: targetDir,
       argLanguage: language,
-      argNoCreateIndexer: noIndexer,
+      argNoCreateIndexer: !createIndexer,
     });
   },
 });

package/src/cli/commands/prepare.ts

@@ -2,7 +2,7 @@ import { createApibara, writeTypes } from "apibara/core";
 import {} from "apibara/types";
 import { defineCommand } from "citty";
 import { resolve } from "pathe";
-import { commonArgs } from "../common";
+import { checkForUnknownArgs, commonArgs } from "../common";
 
 export default defineCommand({
   meta: {
@@ -12,7 +12,9 @@ export default defineCommand({
   args: {
     ...commonArgs,
   },
-  async run({ args }) {
+  async run({ args, cmd }) {
+    await checkForUnknownArgs(args, cmd);
+
     const rootDir = resolve((args.dir || ".") as string);
     const apibara = await createApibara({ rootDir });
     await writeTypes(apibara);

package/src/cli/commands/start.ts

@@ -1,9 +1,10 @@
 import { spawn } from "node:child_process";
 import { createApibara } from "apibara/core";
 import { defineCommand } from "citty";
+import { colors } from "consola/utils";
 import fse from "fs-extra";
 import { resolve } from "pathe";
-import { commonArgs } from "../common";
+import { checkForUnknownArgs, commonArgs } from "../common";
 
 export default defineCommand({
   meta: {
@@ -22,12 +23,15 @@ export default defineCommand({
       description: "The preset to use",
     },
   },
-  async run({ args }) {
+  async run({ args, cmd }) {
     const { indexer, preset } = args;
     const rootDir = resolve((args.dir || args._dir || ".") as string);
 
+    await checkForUnknownArgs(args, cmd);
+
     const apibara = await createApibara({
       rootDir,
+      preset,
     });
 
     apibara.logger.start(
@@ -46,16 +50,19 @@ export default defineCommand({
 
     await apibara.close();
 
-    const childArgs = [
-      entry,
-      "start",
-      "--indexer",
-      indexer,
-      ...(preset ? ["--preset", preset] : []),
-    ];
+    const childArgs = [entry, "start", "--indexer", indexer];
 
-    spawn("node", childArgs, {
+    const childProcess = spawn("node", childArgs, {
       stdio: "inherit",
     });
+
+    childProcess.on("close", (code, signal) => {
+      console.log();
+      apibara.logger.info(
+        `Indexers process exited${
+          code !== null ? ` with code ${colors.red(code)}` : ""
+        }`,
+      );
+    });
   },
 });

package/src/cli/commands/write-project-info.ts

@@ -0,0 +1,56 @@
+import { spawn } from "node:child_process";
+import { join } from "node:path";
+import { build, createApibara, prepare, writeTypes } from "apibara/core";
+import { runtimeDir } from "apibara/runtime/meta";
+import { defineCommand } from "citty";
+import consola from "consola";
+import { resolve } from "pathe";
+import { checkForUnknownArgs, commonArgs } from "../common";
+
+export default defineCommand({
+  meta: {
+    name: "write-project-info",
+    description: "Write json-encoded information about the project.",
+  },
+  args: {
+    ...commonArgs,
+  },
+  async run({ args, cmd }) {
+    await checkForUnknownArgs(args, cmd);
+
+    consola.start("Generating `project-info.json`");
+
+    const rootDir = resolve((args.dir || ".") as string);
+    const apibara = await createApibara({ rootDir, disableLogs: true });
+
+    apibara.options.entry = join(runtimeDir, "project-info.mjs");
+
+    await prepare(apibara);
+    await writeTypes(apibara);
+    await build(apibara);
+
+    const childArgs = [
+      resolve(
+        apibara.options.outputDir || "./.apibara/build",
+        "project-info.mjs",
+      ),
+      "start",
+      "--build-dir",
+      apibara.options.buildDir,
+    ];
+
+    const child = spawn("node", childArgs, {
+      stdio: "inherit",
+    });
+
+    child.on("close", (code) => {
+      if (code === 0) {
+        consola.success("Project info written to `.apibara/project-info.json`");
+      }
+    });
+
+    child.on("error", (error) => {
+      consola.error(`Failed to write project info: ${error.message}`, error);
+    });
+  },
+});

package/src/cli/common.ts

@@ -1,4 +1,10 @@
-import type { ArgsDef } from "citty";
+import {
+  type ArgsDef,
+  type CommandDef,
+  type ParsedArgs,
+  renderUsage,
+} from "citty";
+import consola from "consola";
 
 export const commonArgs = <ArgsDef>{
   dir: {
@@ -6,3 +12,29 @@ export const commonArgs = <ArgsDef>{
     description: "project root directory",
   },
 };
+
+export const checkForUnknownArgs = async <T extends ArgsDef = ArgsDef>(
+  args: ParsedArgs<T>,
+  cmd: CommandDef<T>,
+) => {
+  // Create a list of defined args including both the main arg names and their aliases
+  const definedArgs: string[] = [];
+  if (cmd.args) {
+    for (const [argName, argDef] of Object.entries(cmd.args)) {
+      definedArgs.push(argName);
+      // Add alias to definedArgs if it exists
+      if (argDef.alias) {
+        definedArgs.push(argDef.alias);
+      }
+    }
+  }
+
+  const providedArgs = Object.keys(args).filter((arg) => arg !== "_");
+  const wrongArgs = providedArgs.filter((arg) => !definedArgs.includes(arg));
+
+  if (wrongArgs.length > 0) {
+    consola.error(`Unknown arguments: ${wrongArgs.join(", ")}`);
+    consola.info(await renderUsage(cmd));
+    process.exit(1);
+  }
+};

package/src/cli/index.ts

@@ -13,6 +13,8 @@ export const mainCli = defineCommand({
     prepare: () => import("./commands/prepare").then((r) => r.default),
     init: () => import("./commands/init").then((r) => r.default),
     add: () => import("./commands/add").then((r) => r.default),
+    "write-project-info": () =>
+      import("./commands/write-project-info").then((r) => r.default),
   },
 });
 

package/src/common/constants.ts

@@ -0,0 +1,6 @@
+export const ENV_INTERNAL_APIBARA_RUNTIME = "_APIBARA_RUNTIME";
+export const ENV_INTERNAL_APIBARA_PRESET = "_APIBARA_PRESET";
+export const ENV_INTERNAL_APIBARA_PRESETS = "_APIBARA_PRESETS";
+export const ENV_INTERNAL_APIBARA_PROCESSED_RUNTIME =
+  "_APIBARA_PROCESSED_RUNTIME";
+export const USER_ENV_APIBARA_RUNTIME_CONFIG = "APIBARA_RUNTIME_CONFIG";