apibara 2.1.0-beta.1 → 2.1.0-beta.11

package/src/runtime/internal/app.ts

@@ -8,6 +8,7 @@ import {
   inMemoryPersistence,
   logger,
 } from "@apibara/indexer/plugins";
+import consola from "consola";
 import { config } from "#apibara-internal-virtual/config";
 import { indexers } from "#apibara-internal-virtual/indexers";
 import { createLogger } from "./logger";
@@ -42,36 +43,52 @@ export function createIndexer(indexerName: string, preset?: string) {
     );
   }
 
+  const indexerModule = indexerDefinition.indexer?.default;
+  if (indexerModule === undefined) {
+    consola.warn(
+      `Specified indexer "${indexerName}" but it does not export a default. Ignoring.`,
+    );
+    return;
+  }
+
   const definition =
-    typeof indexerDefinition.indexer === "function"
-      ? indexerDefinition.indexer(runtimeConfig)
-      : indexerDefinition.indexer;
+    typeof indexerModule === "function"
+      ? indexerModule(runtimeConfig)
+      : indexerModule;
 
-  let reporter: ConsolaReporter = createLogger({
+  const reporter: ConsolaReporter = createLogger({
     indexer: indexerName,
     preset,
     indexers: availableIndexers,
   });
 
-  if (config.logger) {
-    reporter = config.logger({
-      indexer: indexerName,
-      preset,
-      indexers: availableIndexers,
-    });
-  }
+  // TODO: Add support for custom logger
+  //
+  // Custom logger support is temporarily disabled to prevent bundling issues.
+  // Previously, when using the config object directly, Rollup would bundle everything
+  // referenced in apibara.config, including plugins. Now we serialize only the
+  // essential config properties (runtimeConfig, preset, presets) during build time,
+  // which prevents unwanted bundling but also means we can't access the logger
+  // configuration.
+  //
+  // if (config.logger) {
+  //   reporter = config.logger({
+  //     indexer: indexerName,
+  //     preset,
+  //     indexers: availableIndexers,
+  //   });
+  // }
 
   // Put the in-memory persistence plugin first so that it can be overridden by any user-defined
   // persistence plugin.
-  // Put the logger last since we want to override any user-defined logger.
   definition.plugins = [
     internalContext({
       indexerName,
       availableIndexers,
     } as InternalContext),
+    logger({ logger: reporter }),
     inMemoryPersistence(),
     ...(definition.plugins ?? []),
-    logger({ logger: reporter }),
   ];
 
   return _createIndexer(definition);

package/src/runtime/start.ts

@@ -1,6 +1,7 @@
 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({
@@ -23,6 +24,10 @@ const startCommand = defineCommand({
     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,

package/src/types/config.ts

@@ -1,16 +1,15 @@
 import type { ConsolaReporter } from "@apibara/indexer/plugins";
-import type { RollupCommonJSOptions } from "@rollup/plugin-commonjs";
 import type {
   C12InputConfig,
   ConfigWatcher,
   ResolvedConfig,
   WatchConfigOptions,
 } from "c12";
-import type { WatchOptions } from "chokidar";
 import type { NestedHooks } from "hookable";
+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,
@@ -71,7 +70,7 @@ export interface ApibaraOptions<
 
   // Dev
   dev: boolean;
-  watchOptions: WatchOptions;
+  watchOptions: WatchOptions["watch"];
 
   // Hooks
   hooks: NestedHooks<ApibaraHooks>;
@@ -79,11 +78,17 @@ export interface ApibaraOptions<
   // Logging
   logger?: LoggerFactory;
 
-  // Rollup
-  rollupConfig?: Partial<RollupConfig>;
+  // Rolldown
+  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[];
 
   // Advanced
   typescript: {

package/src/types/hooks.ts

@@ -1,12 +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:restart": () => 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

@@ -1,3 +1,6 @@
 import type { ApibaraConfig } from "apibara/types";
 
-export const config: ApibaraConfig = {};
+export const config: Pick<
+  ApibaraConfig,
+  "runtimeConfig" | "preset" | "presets"
+> = {};

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

@@ -7,4 +7,7 @@ export type IndexerConstructor =
     ) => IndexerWithStreamConfig<unknown, unknown, unknown>)
   | IndexerWithStreamConfig<unknown, unknown, unknown>;
 
-export const indexers: { name: string; indexer: IndexerConstructor }[] = [];
+export const indexers: {
+  name: string;
+  indexer: { default?: IndexerConstructor | undefined };
+}[] = [];

package/src/utils/helper.ts

@@ -0,0 +1,15 @@
+export function deserialize<T>(str: string): T {
+  return JSON.parse(str, (_, value) =>
+    typeof value === "string" && value.match(/^\d+n$/)
+      ? BigInt(value.slice(0, -1))
+      : value,
+  ) as T;
+}
+
+export function serialize<T extends Record<string, unknown>>(obj: T): string {
+  return JSON.stringify(
+    obj,
+    (_, value) => (typeof value === "bigint" ? `${value.toString()}n` : value),
+    "\t",
+  );
+}

package/dist/rollup/index.d.mts

@@ -1,6 +0,0 @@
-import { Apibara, RollupConfig } from 'apibara/types';
-export { Plugin } from 'rollup';
-
-declare function getRollupConfig(apibara: Apibara): RollupConfig;
-
-export { getRollupConfig };

package/dist/rollup/index.d.ts

@@ -1,6 +0,0 @@
-import { Apibara, RollupConfig } from 'apibara/types';
-export { Plugin } from 'rollup';
-
-declare function getRollupConfig(apibara: Apibara): RollupConfig;
-
-export { getRollupConfig };

package/dist/rollup/index.mjs

@@ -1,150 +0,0 @@
-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 { join } from 'pathe';
-import defu from 'defu';
-import virtual from '@rollup/plugin-virtual';
-import MagicString from 'magic-string';
-import { hash } from 'ohash';
-
-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",
-    ".js",
-    ".json",
-    ".node",
-    ".tsx",
-    ".jsx"
-  ];
-  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
-        },
-        sourcemap: true,
-        sourcemapExcludeSources: true,
-        sourcemapIgnoreList(relativePath, sourcemapPath) {
-          return relativePath.includes("node_modules");
-        }
-      },
-      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);
-        }
-      },
-      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/src/rollup/config.ts

@@ -1,87 +0,0 @@
-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 type { Apibara, RollupConfig } from "apibara/types";
-import { join } from "pathe";
-import type { OutputPluginOption } from "rollup";
-
-import defu from "defu";
-import { appConfig } from "./plugins/config";
-import { esmShim } from "./plugins/esm-shim";
-import { indexers } from "./plugins/indexers";
-
-const runtimeDependencies = ["better-sqlite3", "@electric-sql/pglite"];
-
-export function getRollupConfig(apibara: Apibara): RollupConfig {
-  const extensions: string[] = [
-    ".ts",
-    ".mjs",
-    ".js",
-    ".json",
-    ".node",
-    ".tsx",
-    ".jsx",
-  ];
-
-  const rollupConfig: RollupConfig & { plugins: OutputPluginOption[] } = defu(
-    // biome-ignore lint/suspicious/noExplicitAny: apibara.options.rollupConfig is typed
-    apibara.options.rollupConfig as any,
-    <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,
-        },
-        sourcemap: true,
-        sourcemapExcludeSources: true,
-        sourcemapIgnoreList(relativePath, sourcemapPath) {
-          return relativePath.includes("node_modules");
-        },
-      },
-      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);
-        }
-      },
-      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;
-}

package/src/rollup/index.ts

@@ -1,2 +0,0 @@
-export * from "./config";
-export type { Plugin } from "rollup";

package/src/rollup/plugins/config.ts

@@ -1,12 +0,0 @@
-import virtual from "@rollup/plugin-virtual";
-import type { Apibara } from "apibara/types";
-
-export function appConfig(apibara: Apibara) {
-  return virtual({
-    "#apibara-internal-virtual/config": `
-    import * as projectConfig from '${apibara.options._c12.configFile}';
-
-    export const config = projectConfig.default;
-    `,
-  });
-}

package/src/rollup/plugins/esm-shim.ts

@@ -1,69 +0,0 @@
-import MagicString from "magic-string";
-import type { Plugin } from "rollup";
-
-/**
- * An alternative to @rollup/plugin-esm-shim
- */
-export function esmShim(): Plugin {
-  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;
-
-        // Find the last import statement and its ending index
-        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: string[] | undefined;
-        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;
-    },
-  };
-}

package/src/types/rollup.ts

@@ -1,8 +0,0 @@
-import type {
-  InputOptions as RollupInputOptions,
-  OutputOptions as RollupOutputOptions,
-} from "rollup";
-
-export type RollupConfig = RollupInputOptions & {
-  output: RollupOutputOptions;
-};