apibara 2.1.0-beta.10 → 2.1.0-beta.11

package/dist/chunks/dev.mjs

@@ -45,7 +45,8 @@ const dev = defineCommand({
       }
       apibara = await createApibara(
         {
-          rootDir
+          rootDir,
+          preset: args.preset
         },
         {
           watch: true,

package/dist/chunks/start.mjs

@@ -26,7 +26,8 @@ const start = defineCommand({
     const { indexer, preset } = args;
     const rootDir = resolve(args.dir || args._dir || ".");
     const apibara = await createApibara({
-      rootDir
+      rootDir,
+      preset
     });
     apibara.logger.start(
       `Starting indexer ${indexer}${preset ? ` with preset ${preset}` : ""}`

package/dist/core/index.mjs

@@ -4,6 +4,7 @@ import { watchConfig, loadConfig } from 'c12';
 import { klona } from 'klona/full';
 import { resolve, join, basename, isAbsolute, relative, dirname } from 'pathe';
 import defu from 'defu';
+import { s as serialize } from '../shared/apibara.af330c7d.mjs';
 import fse from 'fs-extra';
 import { getRolldownConfig } from 'apibara/rolldown';
 import { colors } from 'consola/utils';
@@ -46,8 +47,21 @@ async function presetResolver(options) {
 }
 
 async function resolveRuntimeConfigOptions(options) {
-  options.runtimeConfig = { ...options.runtimeConfig };
-  process.env.APIBARA_RUNTIME_CONFIG = JSON.stringify(options.runtimeConfig);
+  const { preset, presets } = options;
+  let runtimeConfig = { ...options.runtimeConfig };
+  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 = { ...runtimeConfig, ...presetValue.runtimeConfig };
+  }
+  process.env.APIBARA_RUNTIME_CONFIG = serialize(runtimeConfig);
 }
 
 const configResolvers = [

package/dist/hooks/index.mjs

@@ -1,5 +1,7 @@
+import { d as deserialize } from '../shared/apibara.af330c7d.mjs';
+
 function useRuntimeConfig() {
-  return JSON.parse(process.env.APIBARA_RUNTIME_CONFIG || "{}");
+  return deserialize(process.env.APIBARA_RUNTIME_CONFIG || "{}");
 }
 
 export { useRuntimeConfig };

package/dist/rolldown/index.mjs

@@ -1,16 +1,30 @@
 import { existsSync } from 'node:fs';
 import { builtinModules } from 'node:module';
+import replace from '@rollup/plugin-replace';
 import defu from 'defu';
 import { join } from 'pathe';
+import { s as serialize } from '../shared/apibara.af330c7d.mjs';
 import virtual from '@rollup/plugin-virtual';
 import { hash } from 'ohash';
 
 function appConfig(apibara) {
   return virtual({
     "#apibara-internal-virtual/config": `
-    import * as projectConfig from '${apibara.options._c12.configFile}';
+    const serializedConfig = \`process.env.APIBARA_CONFIG\`;
 
-    export const config = projectConfig.default;
+    if (serializedConfig === undefined || serializedConfig === "") {
+      throw new Error("APIBARA_CONFIG is not defined");
+    }
+
+    function deserialize(str) {
+      return JSON.parse(str, (_, value) =>
+        typeof value === "string" && value.match(/^\\d+n$/)
+          ? BigInt(value.slice(0, -1))
+          : value,
+      );
+    }
+
+    export const config = deserialize(serializedConfig);
     `
   });
 }
@@ -82,9 +96,31 @@ function getRolldownConfig(apibara) {
       external: [...builtinModules, ...runtimeDependencies]
     }
   );
+  rolldownConfig.plugins?.push(
+    replace({
+      preventAssignment: true,
+      values: {
+        "process.env.APIBARA_CONFIG": getSerializedRuntimeConfig(apibara)
+      }
+    })
+  );
   rolldownConfig.plugins?.push(indexers(apibara));
-  rolldownConfig.plugins?.push(appConfig(apibara));
+  rolldownConfig.plugins?.push(appConfig());
   return rolldownConfig;
 }
+function getSerializedRuntimeConfig(apibara) {
+  try {
+    return serialize({
+      runtimeConfig: apibara.options.runtimeConfig,
+      preset: apibara.options.preset,
+      presets: apibara.options.presets
+    });
+  } catch (error) {
+    throw new Error(
+      "Failed to serialize runtime config. Please ensure all values in your runtime configuration are JSON serializable. BigInt values are supported, but functions, symbols, etc. are not. Check your configuration for non-serializable values.",
+      { cause: error }
+    );
+  }
+}
 
 export { getRolldownConfig };

package/dist/runtime/internal/app.mjs

@@ -39,18 +39,11 @@ export function createIndexer(indexerName, preset) {
     return;
   }
   const definition = typeof indexerModule === "function" ? indexerModule(runtimeConfig) : indexerModule;
-  let reporter = createLogger({
+  const reporter = createLogger({
     indexer: indexerName,
     preset,
     indexers: availableIndexers
   });
-  if (config.logger) {
-    reporter = config.logger({
-      indexer: indexerName,
-      preset,
-      indexers: availableIndexers
-    });
-  }
   definition.plugins = [
     internalContext({
       indexerName,

package/dist/shared/apibara.af330c7d.mjs

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apibara",
-  "version": "2.1.0-beta.10",
+  "version": "2.1.0-beta.11",
   "type": "module",
   "main": "./dist/core/index.mjs",
   "exports": {
@@ -78,7 +78,7 @@
     "playground:add": "pnpm playground add --dir playground"
   },
   "devDependencies": {
-    "@apibara/starknet": "2.1.0-beta.10",
+    "@apibara/starknet": "2.1.0-beta.11",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^20.14.0",
     "@types/prompts": "^2.4.9",
@@ -89,8 +89,9 @@
     "vitest": "^1.6.0"
   },
   "dependencies": {
-    "@apibara/indexer": "2.1.0-beta.10",
-    "@apibara/protocol": "2.1.0-beta.10",
+    "@apibara/indexer": "2.1.0-beta.11",
+    "@apibara/protocol": "2.1.0-beta.11",
+    "@rollup/plugin-replace": "^6.0.2",
     "@rollup/plugin-virtual": "^3.0.2",
     "c12": "^1.11.1",
     "chokidar": "^3.6.0",

package/src/cli/commands/dev.ts

@@ -56,6 +56,7 @@ export default defineCommand({
       apibara = await createApibara(
         {
           rootDir,
+          preset: args.preset,
         },
         {
           watch: true,

package/src/cli/commands/start.ts

@@ -28,6 +28,7 @@ export default defineCommand({
 
     const apibara = await createApibara({
       rootDir,
+      preset,
     });
 
     apibara.logger.start(

package/src/core/config/resolvers/runtime-config.resolver.ts

@@ -1,6 +1,25 @@
 import type { ApibaraOptions } from "apibara/types";
+import { serialize } from "../../../utils/helper";
 
 export async function resolveRuntimeConfigOptions(options: ApibaraOptions) {
-  options.runtimeConfig = { ...options.runtimeConfig };
-  process.env.APIBARA_RUNTIME_CONFIG = JSON.stringify(options.runtimeConfig);
+  const { preset, presets } = options;
+  let runtimeConfig: Record<string, unknown> = { ...options.runtimeConfig };
+
+  if (preset) {
+    if (presets === undefined) {
+      throw new Error(
+        `Specified preset "${preset}" but no presets were defined`,
+      );
+    }
+
+    if (presets[preset] === undefined) {
+      throw new Error(`Specified preset "${preset}" but it was not defined`);
+    }
+
+    const presetValue = presets[preset] as {
+      runtimeConfig: Record<string, unknown>;
+    };
+    runtimeConfig = { ...runtimeConfig, ...presetValue.runtimeConfig };
+  }
+  process.env.APIBARA_RUNTIME_CONFIG = serialize(runtimeConfig);
 }

package/src/hooks/useRuntimeConfig.ts

@@ -1,5 +1,6 @@
 import type { ApibaraRuntimeConfig } from "apibara/types";
+import { deserialize } from "../utils/helper";
 
 export function useRuntimeConfig(): ApibaraRuntimeConfig {
-  return JSON.parse(process.env.APIBARA_RUNTIME_CONFIG || "{}");
+  return deserialize(process.env.APIBARA_RUNTIME_CONFIG || "{}");
 }

package/src/rolldown/config.ts

@@ -1,5 +1,6 @@
 import { existsSync } from "node:fs";
 import { builtinModules } from "node:module";
+import replace from "@rollup/plugin-replace";
 import type { Apibara } from "apibara/types";
 import defu from "defu";
 import { join } from "pathe";
@@ -8,6 +9,7 @@ import type {
   RolldownOptions,
   RolldownPluginOption,
 } from "rolldown";
+import { serialize } from "../utils/helper";
 import { appConfig } from "./plugins/config";
 import { indexers } from "./plugins/indexers";
 
@@ -76,8 +78,31 @@ export function getRolldownConfig(apibara: Apibara): RolldownOptions {
     },
   );
 
+  rolldownConfig.plugins?.push(
+    replace({
+      preventAssignment: true,
+      values: {
+        "process.env.APIBARA_CONFIG": getSerializedRuntimeConfig(apibara),
+      },
+    }) as RolldownPluginOption,
+  );
   rolldownConfig.plugins?.push(indexers(apibara));
   rolldownConfig.plugins?.push(appConfig(apibara));
 
   return rolldownConfig;
 }
+
+function getSerializedRuntimeConfig(apibara: Apibara) {
+  try {
+    return serialize({
+      runtimeConfig: apibara.options.runtimeConfig,
+      preset: apibara.options.preset,
+      presets: apibara.options.presets,
+    });
+  } catch (error) {
+    throw new Error(
+      "Failed to serialize runtime config. Please ensure all values in your runtime configuration are JSON serializable. BigInt values are supported, but functions, symbols, etc. are not. Check your configuration for non-serializable values.",
+      { cause: error },
+    );
+  }
+}

package/src/rolldown/plugins/config.ts

@@ -5,9 +5,21 @@ import type { RolldownPluginOption } from "rolldown";
 export function appConfig(apibara: Apibara) {
   return virtual({
     "#apibara-internal-virtual/config": `
-    import * as projectConfig from '${apibara.options._c12.configFile}';
+    const serializedConfig = \`process.env.APIBARA_CONFIG\`;
 
-    export const config = projectConfig.default;
+    if (serializedConfig === undefined || serializedConfig === "") {
+      throw new Error("APIBARA_CONFIG is not defined");
+    }
+
+    function deserialize(str) {
+      return JSON.parse(str, (_, value) =>
+        typeof value === "string" && value.match(/^\\d+n$/)
+          ? BigInt(value.slice(0, -1))
+          : value,
+      );
+    }
+
+    export const config = deserialize(serializedConfig);
     `,
   }) as RolldownPluginOption;
 }

package/src/runtime/internal/app.ts

@@ -56,19 +56,28 @@ export function createIndexer(indexerName: string, preset?: string) {
       ? 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.

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/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",
+  );
+}