apibara 2.1.0-beta.3 → 2.1.0-beta.30

package/dist/runtime/internal/app.mjs

@@ -6,51 +6,82 @@ import {
   inMemoryPersistence,
   logger
 } from "@apibara/indexer/plugins";
+import {
+  Metadata,
+  createClient
+} from "@apibara/protocol";
+import consola from "consola";
 import { config } from "#apibara-internal-virtual/config";
 import { indexers } from "#apibara-internal-virtual/indexers";
+import { logger as instrumentationLogger } from "#apibara-internal-virtual/instrumentation";
+import { getProcessedRuntimeConfig } from "./helper.mjs";
 import { createLogger } from "./logger.mjs";
 export const availableIndexers = indexers.map((i) => i.name);
 export function createIndexer(indexerName, preset) {
-  let runtimeConfig = { ...config.runtimeConfig };
-  if (preset) {
-    if (config.presets === void 0) {
-      throw new Error(
-        `Specified preset "${preset}" but no presets were defined`
-      );
-    }
-    if (config.presets[preset] === void 0) {
-      throw new Error(`Specified preset "${preset}" but it was not defined`);
-    }
-    const presetValue = config.presets[preset];
-    runtimeConfig = { ...runtimeConfig, ...presetValue.runtimeConfig };
-  }
+  const runtimeConfig = getProcessedRuntimeConfig({
+    preset,
+    presets: config.presets,
+    runtimeConfig: config.runtimeConfig
+  });
+  process.env.APIBARA_RUNTIME_CONFIG_HOOK_DATA = JSON.stringify(runtimeConfig);
   const indexerDefinition = indexers.find((i) => i.name === indexerName);
   if (indexerDefinition === void 0) {
     throw new Error(
       `Specified indexer "${indexerName}" but it was not defined`
     );
   }
-  const definition = typeof indexerDefinition.indexer === "function" ? indexerDefinition.indexer(runtimeConfig) : indexerDefinition.indexer;
+  const indexerModule = indexerDefinition.indexer?.default;
+  if (indexerModule === void 0) {
+    consola.warn(
+      `Specified indexer "${indexerName}" but it does not export a default. Ignoring.`
+    );
+    return;
+  }
+  const definition = typeof indexerModule === "function" ? indexerModule(runtimeConfig) : indexerModule;
   let reporter = createLogger({
     indexer: indexerName,
     preset,
     indexers: availableIndexers
   });
-  if (config.logger) {
-    reporter = config.logger({
+  if (instrumentationLogger) {
+    const _reporter = instrumentationLogger({
       indexer: indexerName,
       preset,
       indexers: availableIndexers
     });
+    if (_reporter && "log" in _reporter) {
+      reporter = _reporter;
+    }
   }
   definition.plugins = [
     internalContext({
       indexerName,
       availableIndexers
     }),
+    logger({ logger: reporter }),
     inMemoryPersistence(),
-    ...definition.plugins ?? [],
-    logger({ logger: reporter })
+    ...definition.plugins ?? []
   ];
-  return _createIndexer(definition);
+  return {
+    indexer: _createIndexer(definition),
+    logger: consola.create({ reporters: [reporter] })
+  };
+}
+export function createAuthenticatedClient(config2, streamUrl, options) {
+  const dnaToken = process.env.DNA_TOKEN;
+  if (!dnaToken) {
+    consola.warn(
+      "DNA_TOKEN environment variable is not set. Trying to connect without authentication."
+    );
+  }
+  return createClient(config2, streamUrl, {
+    ...options,
+    defaultCallOptions: {
+      "*": {
+        metadata: Metadata({
+          Authorization: `Bearer ${dnaToken}`
+        })
+      }
+    }
+  });
 }

package/dist/runtime/internal/helper.d.ts

@@ -0,0 +1,12 @@
+/**
+ * Get the merged runtime config from the process.env.APIBARA_RUNTIME_CONFIG, presets and defaults.
+ * Priority (Highest to lowest):
+ * 1. process.env.APIBARA_RUNTIME_CONFIG
+ * 2. Preset
+ * 3. Defaults
+ */
+export declare function getProcessedRuntimeConfig({ preset, presets, runtimeConfig, }: {
+    preset?: string;
+    presets?: Record<string, unknown>;
+    runtimeConfig?: Record<string, unknown>;
+}): Record<string, unknown>;

package/dist/runtime/internal/helper.mjs

@@ -0,0 +1,33 @@
+import defu from "defu";
+export function getProcessedRuntimeConfig({
+  preset,
+  presets,
+  runtimeConfig
+}) {
+  let _runtimeConfig = { ...runtimeConfig };
+  const envRuntimeConfig = process.env.APIBARA_RUNTIME_CONFIG;
+  if (preset) {
+    if (presets === void 0) {
+      throw new Error(
+        `Specified preset "${preset}" but no presets were defined`
+      );
+    }
+    if (presets[preset] === void 0) {
+      throw new Error(`Specified preset "${preset}" but it was not defined`);
+    }
+    const presetValue = presets[preset];
+    _runtimeConfig = defu(presetValue.runtimeConfig, _runtimeConfig);
+  }
+  if (envRuntimeConfig) {
+    try {
+      const envRuntimeConfigValue = JSON.parse(envRuntimeConfig);
+      _runtimeConfig = defu(envRuntimeConfigValue, _runtimeConfig);
+    } catch (error) {
+      throw new Error(
+        "Failed to parse runtime config from process.env.APIBARA_RUNTIME_CONFIG. Please ensure it is a valid JSON string.",
+        { cause: error }
+      );
+    }
+  }
+  return _runtimeConfig;
+}

package/dist/runtime/project-info.d.ts

@@ -0,0 +1,3 @@
+export declare const mainCli: import("citty").CommandDef<import("citty").ArgsDef>;
+declare const _default: {};
+export default _default;

package/dist/runtime/project-info.mjs

@@ -0,0 +1,53 @@
+import { writeFileSync } from "node:fs";
+import { resolve } from "node:path";
+import { defineCommand, runMain } from "citty";
+import { config } from "#apibara-internal-virtual/config";
+import { availableIndexers, createIndexer } from "./internal/app.mjs";
+const startCommand = defineCommand({
+  meta: {
+    name: "write-project-info",
+    description: "Write json-encoded information about the project."
+  },
+  args: {
+    "build-dir": {
+      type: "string",
+      description: "project build directory"
+    }
+  },
+  async run({ args }) {
+    const projectInfo = {
+      indexers: {}
+    };
+    for (const preset of Object.keys(config.presets ?? {})) {
+      for (const indexer of availableIndexers) {
+        const { indexer: indexerInstance } = createIndexer(indexer, preset) ?? {};
+        if (!indexerInstance) {
+          continue;
+        }
+        projectInfo.indexers[indexer] = {
+          ...projectInfo.indexers[indexer] ?? {},
+          [preset]: {
+            type: indexerInstance.streamConfig.name,
+            isFactory: indexerInstance.options.factory !== void 0
+          }
+        };
+      }
+    }
+    const projectInfoPath = resolve(
+      args["build-dir"] ?? ".apibara",
+      "project-info.json"
+    );
+    writeFileSync(projectInfoPath, JSON.stringify(projectInfo, null, 2));
+  }
+});
+export const mainCli = defineCommand({
+  meta: {
+    name: "write-project-info-runner",
+    description: "Write json-encoded information about the project."
+  },
+  subCommands: {
+    start: () => startCommand
+  }
+});
+runMain(mainCli);
+export default {};

package/dist/runtime/start.mjs

@@ -1,7 +1,9 @@
 import { runWithReconnect } from "@apibara/indexer";
-import { createClient } from "@apibara/protocol";
 import { defineCommand, runMain } from "citty";
-import { createIndexer } from "./internal/app.mjs";
+import consola from "consola";
+import { blueBright } from "picocolors";
+import { register } from "#apibara-internal-virtual/instrumentation";
+import { createAuthenticatedClient, createIndexer } from "./internal/app.mjs";
 const startCommand = defineCommand({
   meta: {
     name: "start",
@@ -20,11 +22,23 @@ const startCommand = defineCommand({
   },
   async run({ args }) {
     const { indexer, preset } = args;
-    const indexerInstance = createIndexer(indexer, preset);
-    const client = createClient(
+    const { indexer: indexerInstance, logger } = createIndexer(indexer, preset) ?? {};
+    if (!indexerInstance) {
+      consola.error(`Specified indexer "${indexer}" but it was not defined`);
+      process.exit(1);
+    }
+    const client = createAuthenticatedClient(
       indexerInstance.streamConfig,
       indexerInstance.options.streamUrl
     );
+    if (register) {
+      consola.start("Registering from instrumentation");
+      await register();
+      consola.success("Registered from instrumentation");
+    }
+    if (logger) {
+      logger.info(`Indexer ${blueBright(indexer)} started`);
+    }
     await runWithReconnect(client, indexerInstance);
   }
 });

package/dist/shared/apibara.63c9a277.mjs

@@ -0,0 +1,29 @@
+import { renderUsage } from 'citty';
+import consola from 'consola';
+
+const commonArgs = {
+  dir: {
+    type: "string",
+    description: "project root directory"
+  }
+};
+const checkForUnknownArgs = async (args, cmd) => {
+  const definedArgs = [];
+  if (cmd.args) {
+    for (const [argName, argDef] of Object.entries(cmd.args)) {
+      definedArgs.push(argName);
+      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);
+  }
+};
+
+export { checkForUnknownArgs as a, commonArgs as c };

package/dist/shared/apibara.730bb1e4.mjs

@@ -0,0 +1,17 @@
+import colors from 'picocolors';
+
+const {
+  blue,
+  blueBright,
+  cyan,
+  gray,
+  green,
+  greenBright,
+  magenta,
+  red,
+  redBright,
+  reset,
+  yellow
+} = colors;
+
+export { blue as a, blueBright as b, green as c, cyan as d, reset as e, gray as g, magenta as m, red as r, yellow as y };

package/dist/types/index.d.mts

@@ -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,7 +32,6 @@ interface ApibaraConfig<T extends Record<string, DeepPartial<Pick<ApibaraConfig<
     runtimeConfig?: R;
     presets?: T;
     preset?: keyof T;
-    logger?: LoggerFactory;
 }
 type ApibaraDynamicConfig = Pick<ApibaraConfig, "runtimeConfig">;
 /**
@@ -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.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,7 +32,6 @@ interface ApibaraConfig<T extends Record<string, DeepPartial<Pick<ApibaraConfig<
     runtimeConfig?: R;
     presets?: T;
     preset?: keyof T;
-    logger?: LoggerFactory;
 }
 type ApibaraDynamicConfig = Pick<ApibaraConfig, "runtimeConfig">;
 /**
@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apibara",
-  "version": "2.1.0-beta.3",
+  "version": "2.1.0-beta.30",
   "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",
@@ -73,10 +73,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.30",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^20.14.0",
     "@types/prompts": "^2.4.9",
@@ -87,19 +89,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.30",
+    "@apibara/protocol": "2.1.0-beta.30",
+    "@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 +109,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,
     });