apibara 2.0.0-beta.9 → 2.1.0-beta.10

package/src/runtime/internal/logger.ts

@@ -0,0 +1,70 @@
+import type {
+  ConsolaOptions,
+  ConsolaReporter,
+  LogLevel,
+  LogObject,
+  LogType,
+} from "consola";
+import { type ColorName, colors, getColor } from "consola/utils";
+import { murmurHash } from "ohash";
+
+const INDEXER_COLOR_MAP = [
+  colors.red,
+  colors.green,
+  colors.yellow,
+  colors.blue,
+  colors.magenta,
+  colors.cyan,
+];
+
+const TYPE_COLOR_MAP: { [k in LogType]?: string } = {
+  info: "cyan",
+  fail: "red",
+  success: "green",
+  ready: "green",
+  start: "magenta",
+};
+
+const LEVEL_COLOR_MAP: { [k in LogLevel]?: string } = {
+  0: "red",
+  1: "yellow",
+};
+
+const MAX_INDEXER_NAME_LENGTH = 20;
+
+class DefaultReporter implements ConsolaReporter {
+  private tag: string;
+
+  constructor(indexer: string, indexers: string[], preset?: string) {
+    const color =
+      INDEXER_COLOR_MAP[murmurHash(indexer) % INDEXER_COLOR_MAP.length];
+
+    const presetLength = preset ? preset.length : 0;
+
+    const longestIndexerName =
+      Math.max(...indexers.map((i) => i.length), indexer.length) + presetLength;
+
+    const paddedIndexer = `${indexer}${preset ? `:${preset} ` : ""}`
+      .padEnd(longestIndexerName, " ")
+      .slice(0, Math.min(longestIndexerName, MAX_INDEXER_NAME_LENGTH));
+
+    this.tag = color(`${paddedIndexer} |`);
+  }
+
+  log(logObj: LogObject, ctx: { options: ConsolaOptions }) {
+    const { args } = logObj;
+    const typeColor =
+      TYPE_COLOR_MAP[logObj.type] || LEVEL_COLOR_MAP[logObj.level] || "gray";
+
+    const type = getColor(typeColor as ColorName, "white")(logObj.type);
+    console.log(`${this.tag} ${type}`, ...args);
+  }
+}
+
+export function createLogger({
+  indexer,
+  indexers,
+  preset,
+}: { indexer: string; indexers: string[]; preset?: string }) {
+  return new DefaultReporter(indexer, indexers, preset);
+}

package/src/runtime/start.ts

@@ -0,0 +1,53 @@
+import { runWithReconnect } from "@apibara/indexer";
+import { createClient } from "@apibara/protocol";
+import { defineCommand, runMain } from "citty";
+import consola from "consola";
+import { createIndexer } from "./internal/app";
+
+const startCommand = defineCommand({
+  meta: {
+    name: "start",
+    description: "Start the indexer",
+  },
+  args: {
+    indexer: {
+      type: "string",
+      description: "Indexer name",
+      required: true,
+    },
+    preset: {
+      type: "string",
+      description: "Preset to use",
+    },
+  },
+  async run({ args }) {
+    const { indexer, preset } = args;
+
+    const indexerInstance = createIndexer(indexer, preset);
+    if (!indexerInstance) {
+      consola.error(`Specified indexer "${indexer}" but it was not defined`);
+      process.exit(1);
+    }
+
+    const client = createClient(
+      indexerInstance.streamConfig,
+      indexerInstance.options.streamUrl,
+    );
+
+    await runWithReconnect(client, indexerInstance);
+  },
+});
+
+export const mainCli = defineCommand({
+  meta: {
+    name: "indexer-runner",
+    description: "Run an indexer",
+  },
+  subCommands: {
+    start: () => startCommand,
+  },
+});
+
+runMain(mainCli);
+
+export default {};

package/src/types/apibara.ts

@@ -3,9 +3,17 @@ import type { Hookable } from "hookable";
 import type { ApibaraDynamicConfig, ApibaraOptions } from "./config";
 import type { ApibaraHooks } from "./hooks";
 
+export type IndexerDefinition = {
+  // Name of the indexer.
+  name: string;
+  // Path to the indexer file.
+  indexer: string;
+};
+
 export interface Apibara {
   options: ApibaraOptions;
   hooks: Hookable<ApibaraHooks>;
+  indexers: IndexerDefinition[];
   logger: ConsolaInstance;
   close: () => Promise<void>;
   updateConfig: (config: ApibaraDynamicConfig) => void | Promise<void>;

package/src/types/config.ts

@@ -1,34 +1,36 @@
-import type { Sink } from "@apibara/indexer";
+import type { ConsolaReporter } from "@apibara/indexer/plugins";
 import type {
   C12InputConfig,
   ConfigWatcher,
   ResolvedConfig,
   WatchConfigOptions,
 } from "c12";
-import type { WatchOptions } from "chokidar";
 import type { NestedHooks } from "hookable";
-import type { TSConfig } from "pkg-types";
+import type { WatchOptions } from "rolldown";
+import type { RolldownOptions } from "rolldown";
 import type { DeepPartial } from "./_utils";
 import type { ApibaraHooks } from "./hooks";
-import type { RollupConfig } from "./rollup";
+
+export type LoggerFactory = ({
+  indexer,
+  preset,
+}: { indexer: string; indexers: string[]; preset?: string }) => ConsolaReporter;
 
 /**
  * Apibara Config type (apibara.config)
  */
 export interface ApibaraConfig<
-  // biome-ignore lint/complexity/noBannedTypes: <explanation>
-  T extends Record<string, DeepPartial<ApibaraConfig<T, R>>> = {},
-  // biome-ignore lint/complexity/noBannedTypes: <explanation>
-  R extends Record<string, unknown> = {},
-> extends DeepPartial<Omit<ApibaraOptions<T, R>, "preset" | "presets" | "dev">>,
+  T extends Record<
+    string,
+    DeepPartial<Pick<ApibaraConfig<T, R>, "runtimeConfig">>
+  > = Record<string, never>,
+  R extends Record<string, unknown> = Record<string, never>,
+> extends Partial<Omit<ApibaraOptions<T, R>, "preset" | "presets" | "dev">>,
     C12InputConfig<ApibaraConfig<T, R>> {
-  sink?: {
-    default: () => Sink;
-    [key: string]: () => Sink;
-  };
   runtimeConfig?: R;
   presets?: T;
   preset?: keyof T;
+  logger?: LoggerFactory;
 }
 
 export type ApibaraDynamicConfig = Pick<ApibaraConfig, "runtimeConfig">;
@@ -42,10 +44,11 @@ export interface LoadConfigOptions {
 }
 
 export interface ApibaraOptions<
-  // biome-ignore lint/complexity/noBannedTypes: <explanation>
-  T extends Record<string, DeepPartial<ApibaraConfig<T, R>>> = {},
-  // biome-ignore lint/complexity/noBannedTypes: <explanation>
-  R extends Record<string, unknown> = {},
+  T extends Record<
+    string,
+    DeepPartial<Pick<ApibaraConfig<T, R>, "runtimeConfig">>
+  > = Record<string, never>,
+  R extends Record<string, unknown> = Record<string, never>,
 > {
   // Internal
   _config: ApibaraConfig<T, R>;
@@ -53,12 +56,6 @@ export interface ApibaraOptions<
     | ResolvedConfig<ApibaraConfig<T, R>>
     | ConfigWatcher<ApibaraConfig<T, R>>;
 
-  // Sink
-  sink: {
-    default: () => Sink;
-    [key: string]: () => Sink;
-  };
-
   // Presets
   presets?: T;
   preset?: keyof T;
@@ -69,25 +66,34 @@ export interface ApibaraOptions<
   rootDir: string;
   buildDir: string;
   outputDir: string;
+  indexersDir: string;
+
   // Dev
   dev: boolean;
-  watchOptions: WatchOptions;
+  watchOptions: WatchOptions["watch"];
 
   // Hooks
   hooks: NestedHooks<ApibaraHooks>;
-  // Rollup
-  rollupConfig?: RollupConfig;
+
+  // Logging
+  logger?: LoggerFactory;
+
+  // Rolldown
+  rolldownConfig?: Partial<RolldownOptions>;
+
+  /**
+   * @deprecated Use rolldownConfig instead. This option will be removed in future releases.
+   */
+  rollupConfig?: unknown;
+  sourceMap?: boolean;
   entry: string;
-  minify: boolean;
+  node: boolean;
+  exportConditions?: string[];
 
   // Advanced
   typescript: {
     strict?: boolean;
     internalPaths?: boolean;
     generateRuntimeConfigTypes?: boolean;
-    generateTsConfig?: boolean;
-    /** the path of the generated `tsconfig.json`, relative to buildDir */
-    tsconfigPath: string;
-    tsConfig?: Partial<TSConfig>;
   };
 }

package/src/types/hooks.ts

@@ -1,11 +1,15 @@
+import type { RolldownOptions } from "rolldown";
 import type { Apibara } from "./apibara";
-import type { RollupConfig } from "./rollup";
 
 export interface ApibaraHooks {
-  "rollup:before": (apibara: Apibara, rollupConfig: RollupConfig) => void;
+  "rolldown:before": (
+    apibara: Apibara,
+    rolldownConfig: RolldownOptions,
+  ) => void;
   compiled: (apibara: Apibara) => void;
-  "dev:reload": () => void;
-  "rollup:reload": () => void;
+  "dev:restart": () => Promise<void>;
+  "dev:reload": () => Promise<void>;
+  "rolldown:reload": () => Promise<void>;
   restart: () => void;
   close: () => void;
 }

package/src/types/index.ts

@@ -2,5 +2,5 @@ export * from "./apibara";
 export * from "./_utils";
 export * from "./config";
 export * from "./hooks";
-export * from "./rollup";
+export * from "./rolldown";
 export * from "./runtime";

package/src/types/rolldown.ts

@@ -0,0 +1,5 @@
+import type { InputOptions, OutputOptions } from "rolldown";
+
+export type RolldownConfig = InputOptions & {
+  output: OutputOptions;
+};

package/src/types/virtual/config.d.ts

@@ -0,0 +1,3 @@
+import type { ApibaraConfig } from "apibara/types";
+
+export const config: ApibaraConfig = {};

package/src/types/virtual/indexers.d.ts

@@ -0,0 +1,13 @@
+import type { IndexerWithStreamConfig } from "@apibara/indexer";
+import type { ApibaraRuntimeConfig } from "apibara/types";
+
+export type IndexerConstructor =
+  | ((
+      runtimeConfig: ApibaraRuntimeConfig,
+    ) => IndexerWithStreamConfig<unknown, unknown, unknown>)
+  | IndexerWithStreamConfig<unknown, unknown, unknown>;
+
+export const indexers: {
+  name: string;
+  indexer: { default?: IndexerConstructor | undefined };
+}[] = [];

package/dist/internal/citty/index.d.mts

@@ -1 +0,0 @@
-export * from 'citty';

package/dist/internal/citty/index.d.ts

@@ -1 +0,0 @@
-export * from 'citty';

package/dist/internal/citty/index.mjs

@@ -1 +0,0 @@
-export * from 'citty';

package/dist/internal/consola/index.d.mts

@@ -1,2 +0,0 @@
-export * from 'consola';
-import 'citty';

package/dist/internal/consola/index.d.ts

@@ -1,2 +0,0 @@
-export * from 'consola';
-import 'citty';

package/dist/internal/consola/index.mjs

@@ -1 +0,0 @@
-export * from 'consola';

package/dist/rollup/index.d.mts

@@ -1,5 +0,0 @@
-import { Apibara, RollupConfig } from 'apibara/types';
-
-declare const getRollupConfig: (apibara: Apibara, dev?: boolean) => RollupConfig;
-
-export { getRollupConfig };

package/dist/rollup/index.d.ts

@@ -1,5 +0,0 @@
-import { Apibara, RollupConfig } from 'apibara/types';
-
-declare const getRollupConfig: (apibara: Apibara, dev?: boolean) => RollupConfig;
-
-export { getRollupConfig };

package/dist/rollup/index.mjs

@@ -1,187 +0,0 @@
-import { existsSync } from 'node:fs';
-import { builtinModules } from 'node:module';
-import commonjs from '@rollup/plugin-commonjs';
-import json from '@rollup/plugin-json';
-import { nodeResolve } from '@rollup/plugin-node-resolve';
-import typescript from '@rollup/plugin-typescript';
-import fse from 'fs-extra';
-import { join, basename } from 'pathe';
-
-const getRollupConfig = (apibara, dev = false) => {
-  const extensions = [
-    ".ts",
-    ".mjs",
-    ".js",
-    ".json",
-    ".node",
-    ".tsx",
-    ".jsx"
-  ];
-  const indexerDir = join(apibara.options.rootDir, "indexers");
-  const configPath = join(apibara.options.rootDir, "./apibara.config.ts");
-  if (!existsSync(indexerDir)) {
-    throw new Error(`Indexers directory not found: ${indexerDir}`);
-  }
-  if (!existsSync(configPath)) {
-    throw new Error(`Config file not found: ${configPath}`);
-  }
-  let indexerFiles = [];
-  try {
-    indexerFiles = fse.readdirSync(indexerDir).filter((file) => file.endsWith(".indexer.ts"));
-    if (indexerFiles.length === 0) {
-      console.warn(`No indexer files found in ${indexerDir}`);
-    }
-  } catch (error) {
-    console.error(`Error reading indexers directory: ${error}`);
-  }
-  const indexerImports = indexerFiles.map(
-    (file, index) => `import indexer${index} from '${join(indexerDir, file)}';`
-  ).join("\n");
-  const mainContent = `
-import { createClient } from "@apibara/protocol";
-import { createIndexer, run } from "@apibara/indexer";
-import { consola as _consola } from "apibara/internal/consola";
-import { defineCommand, runMain } from "apibara/internal/citty";
-import config from './${configPath}';
-
-const consola = _consola.withTag("Apibara | ");
-
-${indexerImports}
-
-const indexers = {
-  ${indexerFiles.map(
-    (file, index) => `'${basename(file, ".indexer.ts")}': indexer${index},`
-  ).join("\n  ")}
-};
-
-const command = defineCommand({
-  meta: {
-    name: "run-indexers",
-    description: "Run Apibara indexers",
-  },
-  args: {
-    indexers: {
-      type: "string",
-      description: "Comma-separated list of indexers to run",
-    },
-    preset: {
-      type: "string",
-      description: "Preset to use",
-    },
-    sink: {
-      type: "string",
-      description: "Sink to use",
-    },
-  },
-  async run({ args }) {
-    const selectedIndexers = args.indexers ? args.indexers.split(',') : Object.keys(indexers);
-    const preset = args.preset || config.preset || 'default';
-    const sinkName = args.sink || 'default';
-
-    // Apply preset
-    let runtimeConfig = { ...config.runtimeConfig };
-    if (preset && config.presets && config.presets[preset]) {
-      runtimeConfig = { ...runtimeConfig, ...config.presets[preset].runtimeConfig };
-    }
-
-    // Get sink function
-    const sinkFunction = config.sink?.[sinkName];
-    if (!sinkFunction) {
-      throw new Error(\`Sink \${sinkName} not found\`);
-    }
-
-    await Promise.all(selectedIndexers.map(async (name) => {
-      if (!indexers[name]) {
-        console.error(\`Indexer \${name} not found\`);
-        return;
-      }
-
-      const indexerConfig = indexers[name]
-      const indexer = typeof indexerConfig === 'function'
-        ? await createIndexer(indexerConfig(runtimeConfig))
-        : createIndexer(indexerConfig);
-
-      const client = createClient(indexer.streamConfig, indexer.options.streamUrl);
-      const sink = sinkFunction();
-
-      try {
-        consola.log("Running Indexer: ", name);
-        await run(client, indexer, sink);
-      } catch (error) {
-        consola.error(\`Error in indexer \${name}:\`, error);
-      }
-    }));
-  },
-});
-
-runMain(command);
-`;
-  return {
-    input: {
-      main: "virtual:main.ts"
-    },
-    output: {
-      dir: join(apibara.options.outputDir || "./.apibara/build"),
-      format: "esm",
-      exports: "auto",
-      entryFileNames: "[name].mjs",
-      chunkFileNames: "chunks/[name]-[hash].mjs",
-      generatedCode: {
-        constBindings: true
-      },
-      sourcemap: true,
-      sourcemapExcludeSources: true,
-      sourcemapIgnoreList(relativePath, sourcemapPath) {
-        return relativePath.includes("node_modules");
-      }
-    },
-    plugins: [
-      {
-        name: "virtual",
-        resolveId(id) {
-          if (id === "virtual:main.ts") {
-            return id;
-          }
-          return null;
-        },
-        load(id) {
-          if (id === "virtual:main.ts") {
-            return mainContent;
-          }
-          return null;
-        }
-      },
-      nodeResolve({
-        extensions,
-        preferBuiltins: true
-      }),
-      commonjs(),
-      json(),
-      typescript({
-        tsconfig: join(apibara.options.rootDir, "./tsconfig.json"),
-        compilerOptions: {
-          outDir: join(apibara.options.outputDir || "./.apibara/build"),
-          declarationDir: join(apibara.options.outputDir || "./.apibara/build"),
-          noEmit: false,
-          types: ["node"]
-        }
-      })
-    ],
-    onwarn(warning, rollupWarn) {
-      if (!["CIRCULAR_DEPENDENCY", "EVAL"].includes(warning.code || "") && !warning.message.includes("Unsupported source map comment") && !warning.message.includes("@__PURE__")) {
-        rollupWarn(warning);
-      }
-    },
-    treeshake: true,
-    external: [
-      ...builtinModules,
-      "@apibara/indexer",
-      "@apibara/protocol",
-      "@apibara/evm",
-      "@apibara/starknet",
-      "@apibara/beaconchain"
-    ]
-  };
-};
-
-export { getRollupConfig };

package/src/internal/citty/index.ts

@@ -1 +0,0 @@
-export * from "citty";

package/src/internal/consola/index.ts

@@ -1 +0,0 @@
-export * from "consola";