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

package/dist/rollup/index.d.mts

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

package/dist/rollup/index.d.ts

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

package/dist/rollup/index.mjs

@@ -1,13 +1,90 @@
-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';
+import { join } from 'pathe';
+import defu from 'defu';
+import virtual from '@rollup/plugin-virtual';
+import MagicString from 'magic-string';
+import { hash } from 'ohash';
 
-const getRollupConfig = (apibara, dev = false) => {
+function appConfig(apibara) {
+  return virtual({
+    "#apibara-internal-virtual/config": `
+    import * as projectConfig from '${apibara.options._c12.configFile}';
+
+    export const config = projectConfig.default;
+    `
+  });
+}
+
+function esmShim() {
+  const ESMShim = `
+// -- Shims --
+import cjsUrl from 'node:url';
+import cjsPath from 'node:path';
+const __filename = cjsUrl.fileURLToPath(import.meta.url);
+const __dirname = cjsPath.dirname(__filename);
+// -- End Shims --
+`;
+  const CJSyntaxRegex = /__filename|__dirname/;
+  return {
+    name: "esm-shim",
+    renderChunk(code, _chunk, opts) {
+      if (opts.format === "es") {
+        if (code.includes(ESMShim) || !CJSyntaxRegex.test(code)) {
+          return null;
+        }
+        let endIndexOfLastImport = -1;
+        for (const match of code.matchAll(/^import\s.*';$/gm)) {
+          if (match.length === 0 || typeof match.index !== "number") {
+            continue;
+          }
+          endIndexOfLastImport = match.index + match[0].length;
+        }
+        const s = new MagicString(code);
+        s.appendRight(endIndexOfLastImport, ESMShim);
+        const sourceMap = s.generateMap({
+          includeContent: true
+        });
+        let sourcesContent;
+        if (Array.isArray(sourceMap.sourcesContent)) {
+          sourcesContent = [];
+          for (let i = 0; i < sourceMap.sourcesContent.length; i++) {
+            const content = sourceMap.sourcesContent[i];
+            if (typeof content === "string") {
+              sourcesContent.push(content);
+            }
+          }
+        }
+        return {
+          code: s.toString(),
+          map: {
+            ...sourceMap,
+            sourcesContent
+          }
+        };
+      }
+      return null;
+    }
+  };
+}
+
+function indexers(apibara) {
+  const indexers2 = [...new Set(apibara.indexers)];
+  return virtual({
+    "#apibara-internal-virtual/indexers": `
+    ${indexers2.map((i) => `import _${hash(i)} from '${i.indexer}';`).join("\n")}
+
+    export const indexers = [
+      ${indexers2.map((i) => `{ name: "${i.name}", indexer: _${hash(i)} }`).join(",\n")}
+    ];
+    `
+  });
+}
+
+const runtimeDependencies = ["better-sqlite3", "@electric-sql/pglite"];
+function getRollupConfig(apibara) {
   const extensions = [
     ".ts",
     ".mjs",
@@ -17,171 +94,57 @@ const getRollupConfig = (apibara, dev = false) => {
     ".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;
+  const rollupConfig = defu(
+    // biome-ignore lint/suspicious/noExplicitAny: apibara.options.rollupConfig is typed
+    apibara.options.rollupConfig,
+    {
+      input: apibara.options.entry,
+      output: {
+        dir: join(apibara.options.outputDir || "./.apibara/build"),
+        format: "esm",
+        exports: "auto",
+        entryFileNames: "[name].mjs",
+        chunkFileNames: "chunks/[name]-[hash].mjs",
+        generatedCode: {
+          constBindings: true
         },
-        load(id) {
-          if (id === "virtual:main.ts") {
-            return mainContent;
-          }
-          return null;
+        sourcemap: true,
+        sourcemapExcludeSources: true,
+        sourcemapIgnoreList(relativePath, sourcemapPath) {
+          return relativePath.includes("node_modules");
         }
       },
-      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"]
+      plugins: [],
+      onwarn(warning, rollupWarn) {
+        if (!["CIRCULAR_DEPENDENCY", "EVAL", "THIS_IS_UNDEFINED"].includes(
+          warning.code || ""
+        ) && !warning.message.includes("Unsupported source map comment") && !warning.message.includes("@__PURE__") && !warning.message.includes("/*#__PURE__*/")) {
+          rollupWarn(warning);
         }
-      })
-    ],
-    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"
-    ]
-  };
-};
+      },
+      treeshake: true,
+      external: [...builtinModules, ...runtimeDependencies]
+    }
+  );
+  rollupConfig.plugins.push(esmShim());
+  rollupConfig.plugins.push(json());
+  rollupConfig.plugins.push(
+    commonjs({
+      strictRequires: true,
+      requireReturnsDefault: "auto",
+      ...apibara.options.commonJS
+    })
+  );
+  rollupConfig.plugins.push(
+    nodeResolve({
+      extensions,
+      preferBuiltins: true,
+      mainFields: ["main"]
+    })
+  );
+  rollupConfig.plugins.push(indexers(apibara));
+  rollupConfig.plugins.push(appConfig(apibara));
+  return rollupConfig;
+}
 
 export { getRollupConfig };

package/dist/runtime/dev.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/dev.mjs

@@ -0,0 +1,55 @@
+import { runWithReconnect } from "@apibara/indexer";
+import { createClient } from "@apibara/protocol";
+import { defineCommand, runMain } from "citty";
+import { availableIndexers, createIndexer } from "./internal/app.mjs";
+const startCommand = defineCommand({
+  meta: {
+    name: "start",
+    description: "Start the indexer"
+  },
+  args: {
+    indexers: {
+      type: "string",
+      description: "Which indexers to run"
+    },
+    preset: {
+      type: "string",
+      description: "Preset to use"
+    }
+  },
+  async run({ args }) {
+    const { indexers: indexersArgs, preset } = args;
+    let selectedIndexers = availableIndexers;
+    if (indexersArgs) {
+      selectedIndexers = indexersArgs.split(",");
+    }
+    for (const indexer of selectedIndexers) {
+      if (!availableIndexers.includes(indexer)) {
+        throw new Error(
+          `Specified indexer "${indexer}" but it was not defined`
+        );
+      }
+    }
+    await Promise.all(
+      selectedIndexers.map(async (indexer) => {
+        const indexerInstance = createIndexer(indexer, preset);
+        const client = createClient(
+          indexerInstance.streamConfig,
+          indexerInstance.options.streamUrl
+        );
+        await runWithReconnect(client, indexerInstance);
+      })
+    );
+  }
+});
+export const mainCli = defineCommand({
+  meta: {
+    name: "indexer-dev-runner",
+    description: "Run indexer in dev mode"
+  },
+  subCommands: {
+    start: () => startCommand
+  }
+});
+runMain(mainCli);
+export default {};

package/dist/runtime/index.d.ts

@@ -0,0 +1,2 @@
+export { createIndexer } from "./internal/app";
+export { createLogger } from "./internal/logger";

package/dist/runtime/index.mjs

@@ -0,0 +1,2 @@
+export { createIndexer } from "./internal/app.mjs";
+export { createLogger } from "./internal/logger.mjs";

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

@@ -0,0 +1,2 @@
+export declare const availableIndexers: any;
+export declare function createIndexer(indexerName: string, preset?: string): import("@apibara/indexer").Indexer<unknown, unknown>;

package/dist/runtime/internal/app.mjs

@@ -0,0 +1,56 @@
+import { createIndexer as _createIndexer } from "@apibara/indexer";
+import {
+  internalContext
+} from "@apibara/indexer/internal/plugins";
+import {
+  inMemoryPersistence,
+  logger
+} from "@apibara/indexer/plugins";
+import { config } from "#apibara-internal-virtual/config";
+import { indexers } from "#apibara-internal-virtual/indexers";
+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 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;
+  let reporter = createLogger({
+    indexer: indexerName,
+    preset,
+    indexers: availableIndexers
+  });
+  if (config.logger) {
+    reporter = config.logger({
+      indexer: indexerName,
+      preset,
+      indexers: availableIndexers
+    });
+  }
+  definition.plugins = [
+    internalContext({
+      indexerName,
+      availableIndexers
+    }),
+    inMemoryPersistence(),
+    ...definition.plugins ?? [],
+    logger({ logger: reporter })
+  ];
+  return _createIndexer(definition);
+}

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

@@ -0,0 +1,14 @@
+import type { ConsolaOptions, ConsolaReporter, LogObject } from "consola";
+declare class DefaultReporter implements ConsolaReporter {
+    private tag;
+    constructor(indexer: string, indexers: string[], preset?: string);
+    log(logObj: LogObject, ctx: {
+        options: ConsolaOptions;
+    }): void;
+}
+export declare function createLogger({ indexer, indexers, preset, }: {
+    indexer: string;
+    indexers: string[];
+    preset?: string;
+}): DefaultReporter;
+export {};

package/dist/runtime/internal/logger.mjs

@@ -0,0 +1,45 @@
+import { 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 = {
+  info: "cyan",
+  fail: "red",
+  success: "green",
+  ready: "green",
+  start: "magenta"
+};
+const LEVEL_COLOR_MAP = {
+  0: "red",
+  1: "yellow"
+};
+const MAX_INDEXER_NAME_LENGTH = 20;
+class DefaultReporter {
+  tag;
+  constructor(indexer, indexers, preset) {
+    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, ctx) {
+    const { args } = logObj;
+    const typeColor = TYPE_COLOR_MAP[logObj.type] || LEVEL_COLOR_MAP[logObj.level] || "gray";
+    const type = getColor(typeColor, "white")(logObj.type);
+    console.log(`${this.tag} ${type}`, ...args);
+  }
+}
+export function createLogger({
+  indexer,
+  indexers,
+  preset
+}) {
+  return new DefaultReporter(indexer, indexers, preset);
+}

package/dist/runtime/start.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/start.mjs

@@ -0,0 +1,41 @@
+import { runWithReconnect } from "@apibara/indexer";
+import { createClient } from "@apibara/protocol";
+import { defineCommand, runMain } from "citty";
+import { createIndexer } from "./internal/app.mjs";
+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);
+    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/dist/types/index.d.mts

@@ -1,9 +1,9 @@
 import { ConsolaInstance } from 'consola';
 import { NestedHooks, Hookable } from 'hookable';
-import { Sink } from '@apibara/indexer';
+import { ConsolaReporter } from '@apibara/indexer/plugins';
+import { RollupCommonJSOptions } from '@rollup/plugin-commonjs';
 import { C12InputConfig, WatchConfigOptions, ResolvedConfig, ConfigWatcher } from 'c12';
 import { WatchOptions } from 'chokidar';
-import { TSConfig } from 'pkg-types';
 import { InputOptions, OutputOptions } from 'rollup';
 
 type DeepPartial<T> = T extends Record<string, any> ? {
@@ -17,23 +17,26 @@ type RollupConfig = InputOptions & {
 interface ApibaraHooks {
     "rollup:before": (apibara: Apibara, rollupConfig: RollupConfig) => void;
     compiled: (apibara: Apibara) => void;
+    "dev:restart": () => void;
     "dev:reload": () => void;
     "rollup:reload": () => void;
     restart: () => void;
     close: () => void;
 }
 
+type LoggerFactory = ({ indexer, preset, }: {
+    indexer: string;
+    indexers: string[];
+    preset?: string;
+}) => ConsolaReporter;
 /**
  * Apibara Config type (apibara.config)
  */
-interface ApibaraConfig<T extends Record<string, DeepPartial<ApibaraConfig<T, R>>> = {}, R extends Record<string, unknown> = {}> extends DeepPartial<Omit<ApibaraOptions<T, R>, "preset" | "presets" | "dev">>, C12InputConfig<ApibaraConfig<T, R>> {
-    sink?: {
-        default: () => Sink;
-        [key: string]: () => Sink;
-    };
+interface ApibaraConfig<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>> {
     runtimeConfig?: R;
     presets?: T;
     preset?: keyof T;
+    logger?: LoggerFactory;
 }
 type ApibaraDynamicConfig = Pick<ApibaraConfig, "runtimeConfig">;
 /**
@@ -43,13 +46,9 @@ interface LoadConfigOptions {
     watch?: boolean;
     c12?: WatchConfigOptions;
 }
-interface ApibaraOptions<T extends Record<string, DeepPartial<ApibaraConfig<T, R>>> = {}, R extends Record<string, unknown> = {}> {
+interface ApibaraOptions<T extends Record<string, DeepPartial<Pick<ApibaraConfig<T, R>, "runtimeConfig">>> = Record<string, never>, R extends Record<string, unknown> = Record<string, never>> {
     _config: ApibaraConfig<T, R>;
     _c12: ResolvedConfig<ApibaraConfig<T, R>> | ConfigWatcher<ApibaraConfig<T, R>>;
-    sink: {
-        default: () => Sink;
-        [key: string]: () => Sink;
-    };
     presets?: T;
     preset?: keyof T;
     debug: boolean;
@@ -57,26 +56,30 @@ interface ApibaraOptions<T extends Record<string, DeepPartial<ApibaraConfig<T, R
     rootDir: string;
     buildDir: string;
     outputDir: string;
+    indexersDir: string;
     dev: boolean;
     watchOptions: WatchOptions;
     hooks: NestedHooks<ApibaraHooks>;
-    rollupConfig?: RollupConfig;
+    logger?: LoggerFactory;
+    rollupConfig?: Partial<RollupConfig>;
+    sourceMap?: boolean;
     entry: string;
-    minify: boolean;
+    commonJS?: RollupCommonJSOptions;
     typescript: {
         strict?: boolean;
         internalPaths?: boolean;
         generateRuntimeConfigTypes?: boolean;
-        generateTsConfig?: boolean;
-        /** the path of the generated `tsconfig.json`, relative to buildDir */
-        tsconfigPath: string;
-        tsConfig?: Partial<TSConfig>;
     };
 }
 
+type IndexerDefinition = {
+    name: string;
+    indexer: string;
+};
 interface Apibara {
     options: ApibaraOptions;
     hooks: Hookable<ApibaraHooks>;
+    indexers: IndexerDefinition[];
     logger: ConsolaInstance;
     close: () => Promise<void>;
     updateConfig: (config: ApibaraDynamicConfig) => void | Promise<void>;
@@ -84,4 +87,4 @@ interface Apibara {
 
 type ApibaraRuntimeConfig = Record<string, unknown>;
 
-export type { Apibara, ApibaraConfig, ApibaraDynamicConfig, ApibaraHooks, ApibaraOptions, ApibaraRuntimeConfig, DeepPartial, LoadConfigOptions, RollupConfig };
+export type { Apibara, ApibaraConfig, ApibaraDynamicConfig, ApibaraHooks, ApibaraOptions, ApibaraRuntimeConfig, DeepPartial, IndexerDefinition, LoadConfigOptions, LoggerFactory, RollupConfig };