apibara 2.1.0-beta.31 → 2.1.0-beta.33

package/src/cli/commands/start.ts

@@ -1,10 +1,10 @@
 import { spawn } from "node:child_process";
+import { checkForUnknownArgs, commonArgs } from "apibara/common";
 import { createApibara } from "apibara/core";
 import { defineCommand } from "citty";
 import { colors } from "consola/utils";
 import fse from "fs-extra";
 import { resolve } from "pathe";
-import { checkForUnknownArgs, commonArgs } from "../common";
 
 export default defineCommand({
   meta: {
@@ -50,7 +50,15 @@ export default defineCommand({
 
     await apibara.close();
 
-    const childArgs = [entry, "start", "--indexer", indexer];
+    const childArgs = [
+      entry,
+      "start",
+      "--indexer",
+      indexer,
+      // important: this is required to run the indexer with apibara cli to load runtime values correctly
+      "--no-standalone",
+      ...(preset ? ["--preset", preset] : []),
+    ];
 
     const childProcess = spawn("node", childArgs, {
       stdio: "inherit",

package/src/cli/commands/write-project-info.ts

@@ -1,11 +1,11 @@
 import { spawn } from "node:child_process";
 import { join } from "node:path";
+import { checkForUnknownArgs, commonArgs } from "apibara/common";
 import { build, createApibara, prepare, writeTypes } from "apibara/core";
 import { runtimeDir } from "apibara/runtime/meta";
 import { defineCommand } from "citty";
 import consola from "consola";
 import { resolve } from "pathe";
-import { checkForUnknownArgs, commonArgs } from "../common";
 
 export default defineCommand({
   meta: {

package/src/common/index.ts

@@ -1,2 +1,3 @@
 export * from "./constants";
 export * from "./helper";
+export * from "./cli";

package/src/create/templates.ts

@@ -87,8 +87,7 @@ ${storage === "postgres" ? `import * as schema from "../lib/schema";` : ""}
 
 
 export default function (runtimeConfig${language === "typescript" ? ": ApibaraRuntimeConfig" : ""}) {
-  const indexerId = "${indexerId}";
-  const { startingBlock, streamUrl } = runtimeConfig[indexerId];
+  const { startingBlock, streamUrl } = runtimeConfig["${indexerId}"];
   ${
     storage === "postgres"
       ? `const db = drizzle({
@@ -110,7 +109,7 @@ export default function (runtimeConfig${language === "typescript" ? ": ApibaraRu
     finality: "accepted",
     startingBlock: BigInt(startingBlock),
     filter: {
-      header: "always",
+      ${chain === "ethereum" ? "logs: []," : chain === "starknet" ? "events:  []," : ""}
     },
     plugins: [${storage === "postgres" ? "drizzleStorage({ db, migrate: { migrationsFolder: './drizzle' } })" : ""}],
     async transform({ endCursor, finality }) {

package/src/rolldown/config.ts

@@ -10,6 +10,7 @@ import type {
 } from "rolldown";
 import { indexers } from "./plugins/indexers";
 import { instrumentation } from "./plugins/instrumentation";
+import { staticConfig } from "./plugins/static-config";
 
 const runtimeDependencies = [
   "better-sqlite3",
@@ -77,8 +78,8 @@ export function getRolldownConfig(apibara: Apibara): RolldownOptions {
     },
   );
 
+  rolldownConfig.plugins?.push(staticConfig(apibara));
   rolldownConfig.plugins?.push(instrumentation(apibara));
   rolldownConfig.plugins?.push(indexers(apibara));
-
   return rolldownConfig;
 }

package/src/rolldown/plugins/static-config.ts

@@ -0,0 +1,21 @@
+import virtual from "@rollup/plugin-virtual";
+import { USER_ENV_APIBARA_RUNTIME_CONFIG } from "apibara/common";
+import type { Apibara } from "apibara/types";
+import type { RolldownPluginOption } from "rolldown";
+
+export function staticConfig(apibara: Apibara) {
+  const presetString = apibara.options.preset ?? "";
+  const presetsStringified = JSON.stringify(apibara.options.presets ?? {});
+  const runtimeConfigStringified = JSON.stringify(
+    apibara.options.runtimeConfig ?? {},
+  );
+
+  return virtual({
+    "#apibara-internal-virtual/static-config": `
+    export const preset = ${presetString ? `"${presetString}"` : "undefined"};
+    export const presets = ${presetsStringified};
+    export const runtimeConfig = ${runtimeConfigStringified};
+    export const userEnvRuntimeConfig = JSON.parse(process.env.${USER_ENV_APIBARA_RUNTIME_CONFIG} ?? "{}");
+    `,
+  }) as RolldownPluginOption;
+}

package/src/runtime/start.ts

@@ -1,9 +1,20 @@
 import { runWithReconnect } from "@apibara/indexer";
-import { getRuntimeDataFromEnv } from "apibara/common";
+import {
+  checkForUnknownArgs,
+  getProcessedRuntimeConfig,
+  getRuntimeDataFromEnv,
+} from "apibara/common";
 import { defineCommand, runMain } from "citty";
 import consola from "consola";
 import { blueBright } from "picocolors";
 import { register } from "#apibara-internal-virtual/instrumentation";
+// used when running with node .apibara/build/start.mjs as these values are made static during build time (except userEnvRuntimeConfig)
+import {
+  preset as originalPreset,
+  presets,
+  runtimeConfig,
+  userEnvRuntimeConfig,
+} from "#apibara-internal-virtual/static-config";
 import { createAuthenticatedClient, createIndexer } from "./internal/app";
 
 const startCommand = defineCommand({
@@ -17,11 +28,39 @@ const startCommand = defineCommand({
       description: "Indexer name",
       required: true,
     },
+    preset: {
+      type: "string",
+      description: "Preset name",
+    },
+    standalone: {
+      type: "boolean",
+      default: true,
+      description:
+        "--standalone: can run the indexer just with node and without apibara cli \n\t\t\t  --no-standalone: must run the indexer with apibara cli",
+    },
   },
-  async run({ args }) {
-    const { indexer } = args;
+  async run({ args, cmd }) {
+    const { indexer, preset: argPreset, standalone } = args;
+    await checkForUnknownArgs(args, cmd);
 
-    const { processedRuntimeConfig, preset } = getRuntimeDataFromEnv();
+    let preset: string | undefined;
+    let processedRuntimeConfig: Record<string, unknown> | undefined;
+
+    if (standalone) {
+      // when user does node .apibara/build/start.mjs
+      preset = argPreset ?? originalPreset;
+      processedRuntimeConfig = getProcessedRuntimeConfig({
+        preset,
+        presets,
+        runtimeConfig,
+        userEnvRuntimeConfig,
+      });
+    } else {
+      // When user does apibara start
+      const envResult = getRuntimeDataFromEnv();
+      preset = envResult.preset;
+      processedRuntimeConfig = envResult.processedRuntimeConfig;
+    }
 
     const { indexer: indexerInstance, logger } =
       createIndexer({
@@ -29,6 +68,7 @@ const startCommand = defineCommand({
         processedRuntimeConfig,
         preset,
       }) ?? {};
+
     if (!indexerInstance) {
       consola.error(`Specified indexer "${indexer}" but it was not defined`);
       process.exit(1);

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

@@ -0,0 +1,4 @@
+export const preset: string | undefined = undefined;
+export const presets: Record<string, unknown> = {};
+export const runtimeConfig: Record<string, unknown> = {};
+export const userEnvRuntimeConfig: Record<string, unknown> = {};

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

@@ -1,30 +0,0 @@
-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 };
-//# sourceMappingURL=apibara.63c9a277.mjs.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"apibara.63c9a277.mjs","sources":["../../src/cli/common.ts"],"sourcesContent":["import {\n  type ArgsDef,\n  type CommandDef,\n  type ParsedArgs,\n  renderUsage,\n} from \"citty\";\nimport consola from \"consola\";\n\nexport const commonArgs = <ArgsDef>{\n  dir: {\n    type: \"string\",\n    description: \"project root directory\",\n  },\n};\n\nexport const checkForUnknownArgs = async <T extends ArgsDef = ArgsDef>(\n  args: ParsedArgs<T>,\n  cmd: CommandDef<T>,\n) => {\n  // Create a list of defined args including both the main arg names and their aliases\n  const definedArgs: string[] = [];\n  if (cmd.args) {\n    for (const [argName, argDef] of Object.entries(cmd.args)) {\n      definedArgs.push(argName);\n      // Add alias to definedArgs if it exists\n      if (argDef.alias) {\n        definedArgs.push(argDef.alias);\n      }\n    }\n  }\n\n  const providedArgs = Object.keys(args).filter((arg) => arg !== \"_\");\n  const wrongArgs = providedArgs.filter((arg) => !definedArgs.includes(arg));\n\n  if (wrongArgs.length > 0) {\n    consola.error(`Unknown arguments: ${wrongArgs.join(\", \")}`);\n    consola.info(await renderUsage(cmd));\n    process.exit(1);\n  }\n};\n"],"names":[],"mappings":";;;AAQO,MAAM,UAAsB,GAAA;AAAA,EACjC,GAAK,EAAA;AAAA,IACH,IAAM,EAAA,QAAA;AAAA,IACN,WAAa,EAAA,wBAAA;AAAA,GACf;AACF,EAAA;AAEa,MAAA,mBAAA,GAAsB,OACjC,IAAA,EACA,GACG,KAAA;AAEH,EAAA,MAAM,cAAwB,EAAC,CAAA;AAC/B,EAAA,IAAI,IAAI,IAAM,EAAA;AACZ,IAAW,KAAA,MAAA,CAAC,SAAS,MAAM,CAAA,IAAK,OAAO,OAAQ,CAAA,GAAA,CAAI,IAAI,CAAG,EAAA;AACxD,MAAA,WAAA,CAAY,KAAK,OAAO,CAAA,CAAA;AAExB,MAAA,IAAI,OAAO,KAAO,EAAA;AAChB,QAAY,WAAA,CAAA,IAAA,CAAK,OAAO,KAAK,CAAA,CAAA;AAAA,OAC/B;AAAA,KACF;AAAA,GACF;AAEA,EAAM,MAAA,YAAA,GAAe,OAAO,IAAK,CAAA,IAAI,EAAE,MAAO,CAAA,CAAC,GAAQ,KAAA,GAAA,KAAQ,GAAG,CAAA,CAAA;AAClE,EAAM,MAAA,SAAA,GAAY,aAAa,MAAO,CAAA,CAAC,QAAQ,CAAC,WAAA,CAAY,QAAS,CAAA,GAAG,CAAC,CAAA,CAAA;AAEzE,EAAI,IAAA,SAAA,CAAU,SAAS,CAAG,EAAA;AACxB,IAAA,OAAA,CAAQ,MAAM,CAAsB,mBAAA,EAAA,SAAA,CAAU,IAAK,CAAA,IAAI,CAAC,CAAE,CAAA,CAAA,CAAA;AAC1D,IAAA,OAAA,CAAQ,IAAK,CAAA,MAAM,WAAY,CAAA,GAAG,CAAC,CAAA,CAAA;AACnC,IAAA,OAAA,CAAQ,KAAK,CAAC,CAAA,CAAA;AAAA,GAChB;AACF;;;;"}