apibara 2.1.0-beta.4 → 2.1.0-beta.6

package/dist/core/index.mjs

@@ -24,7 +24,9 @@ const ApibaraDefaults = {
     strict: false,
     generateRuntimeConfigTypes: true,
     internalPaths: false
-  }
+  },
+  node: true,
+  exportConditions: ["node"]
 };
 
 async function resolvePathOptions(options) {
@@ -141,11 +143,11 @@ function formatRollupError(_error) {
     for (const error of errors) {
       const id = error.path || error.id || _error.id;
       let path = isAbsolute(id) ? relative(process.cwd(), id) : id;
-      const location = error.loc || error.location;
+      const location = error.loc;
       if (location) {
         path += `:${location.line}:${location.column}`;
       }
-      const text = error.text || error.frame;
+      const text = error.frame;
       logs.push(
         `Rollup error while processing \`${path}\`` + text ? "\n\n" + text : ""
       );

package/dist/create/index.mjs

@@ -705,6 +705,90 @@ async function createStorageRelatedFiles(options) {
     await createDrizzleStorageFiles(options);
   }
 }
+const gitIgnoreItems = [
+  {
+    isRecommended: false,
+    value: "node_modules"
+  },
+  {
+    isRecommended: false,
+    value: "dist"
+  },
+  {
+    isRecommended: true,
+    description: "build and dev files of apibara",
+    value: ".apibara"
+  },
+  {
+    isRecommended: false,
+    value: ".env"
+  },
+  {
+    isRecommended: false,
+    description: "for mac users",
+    value: ".DS_Store"
+  }
+];
+async function createGitIgnoreFile(cwd) {
+  const gitIgnorePath = path.join(cwd, ".gitignore");
+  if (fs.existsSync(gitIgnorePath)) {
+    const result = await prompts([
+      {
+        type: "select",
+        name: "overwrite",
+        message: `${cyan(".gitignore")} already exists. Please choose how to proceed:`,
+        initial: 0,
+        choices: [
+          {
+            title: "Choose items to append in your .gitignore",
+            value: "append"
+          },
+          {
+            title: "Keep original",
+            value: "ignore"
+          },
+          {
+            title: "Overwrite",
+            value: "overwrite"
+          }
+        ]
+      },
+      {
+        type: (overwrite2) => overwrite2 === "append" ? "multiselect" : null,
+        name: "ignoreItems",
+        message: "Choose items to append in your .gitignore",
+        choices: gitIgnoreItems.map((item) => ({
+          title: `${yellow(item.value)}${item.description ? ` - ${item.description}` : ""}${item.isRecommended ? ` ${green("(recommended)")}` : ""}`,
+          value: item.value
+        }))
+      }
+    ]);
+    const { overwrite, ignoreItems } = result;
+    if (overwrite === "append" && ignoreItems.length > 0) {
+      const gitIgnoreContent = fs.readFileSync(gitIgnorePath, "utf8");
+      fs.writeFileSync(
+        gitIgnorePath,
+        `${gitIgnoreContent}
+${result.ignoreItems.join("\n")}`
+      );
+      consola.success(`Updated ${cyan(".gitignore")}`);
+      return;
+    }
+    if (overwrite === "overwrite") {
+      fs.writeFileSync(
+        gitIgnorePath,
+        gitIgnoreItems.map((item) => item.value).join("\n")
+      );
+      consola.success(`Updated ${cyan(".gitignore")}`);
+      return;
+    }
+  }
+  fs.writeFileSync(
+    gitIgnorePath,
+    gitIgnoreItems.map((item) => item.value).join("\n")
+  );
+  consola.success(`Created ${cyan(".gitignore")}`);
+}
 
 async function initializeProject({
   argTargetDir,
@@ -789,24 +873,25 @@ async function initializeProject({
     JSON.stringify(packageJson, null, 2) + "\n"
   );
   await formatFile(packageJsonPath);
-  consola$1.success("Created ", cyan("package.json"));
+  consola$1.success("Created", cyan("package.json"));
   if (isTs) {
     const tsConfigPath = path.join(root, "tsconfig.json");
     const tsConfig = generateTsConfig();
     fs.writeFileSync(tsConfigPath, JSON.stringify(tsConfig, null, 2) + "\n");
     await formatFile(tsConfigPath);
-    consola$1.success("Created ", cyan("tsconfig.json"));
+    consola$1.success("Created", cyan("tsconfig.json"));
   }
   const apibaraConfigPath = path.join(root, `apibara.config.${configExt}`);
   const apibaraConfig = generateApibaraConfig(isTs);
   fs.writeFileSync(apibaraConfigPath, apibaraConfig);
   await formatFile(apibaraConfigPath);
-  consola$1.success("Created ", cyan(`apibara.config.${configExt}`));
+  consola$1.success("Created", cyan(`apibara.config.${configExt}`));
   const indexersDir = path.join(root, "indexers");
   if (!fs.existsSync(indexersDir)) {
     fs.mkdirSync(indexersDir, { recursive: true });
     consola$1.success(`Created ${cyan("indexers")} directory`);
   }
+  await createGitIgnoreFile(root);
   console.log("\n");
   consola$1.ready(green("Project initialized successfully"));
   console.log();

package/dist/rollup/index.mjs

@@ -74,7 +74,7 @@ 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")}
+    ${indexers2.map((i) => `import * as _${hash(i)} from '${i.indexer}';`).join("\n")}
 
     export const indexers = [
       ${indexers2.map((i) => `{ name: "${i.name}", indexer: _${hash(i)} }`).join(",\n")}
@@ -138,8 +138,9 @@ function getRollupConfig(apibara) {
   rollupConfig.plugins.push(
     nodeResolve({
       extensions,
-      preferBuiltins: true,
-      mainFields: ["main"]
+      preferBuiltins: !!apibara.options.node,
+      mainFields: ["main"],
+      exportConditions: apibara.options.exportConditions
     })
   );
   rollupConfig.plugins.push(indexers(apibara));

package/dist/runtime/dev.mjs

@@ -33,6 +33,9 @@ const startCommand = defineCommand({
     await Promise.all(
       selectedIndexers.map(async (indexer) => {
         const indexerInstance = createIndexer(indexer, preset);
+        if (!indexerInstance) {
+          return;
+        }
         const client = createClient(
           indexerInstance.streamConfig,
           indexerInstance.options.streamUrl

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

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

package/dist/runtime/internal/app.mjs

@@ -6,6 +6,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.mjs";
@@ -30,7 +31,14 @@ export function createIndexer(indexerName, preset) {
       `Specified indexer "${indexerName}" but it was not defined`
     );
   }
-  const definition = typeof indexerDefinition.indexer === "function" ? indexerDefinition.indexer(runtimeConfig) : indexerDefinition.indexer;
+  const indexerModule = indexerDefinition.indexer?.default;
+  if (indexerModule === void 0) {
+    consola.warn(
+      `Specified indexer "${indexerName}" but it does not export a default. Ignoring.`
+    );
+    return;
+  }
+  const definition = typeof indexerModule === "function" ? indexerModule(runtimeConfig) : indexerModule;
   let reporter = createLogger({
     indexer: indexerName,
     preset,

package/dist/runtime/start.mjs

@@ -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.mjs";
 const startCommand = defineCommand({
   meta: {
@@ -21,6 +22,10 @@ const startCommand = defineCommand({
   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

package/dist/types/index.d.mts

@@ -65,6 +65,8 @@ interface ApibaraOptions<T extends Record<string, DeepPartial<Pick<ApibaraConfig
     sourceMap?: boolean;
     entry: string;
     commonJS?: RollupCommonJSOptions;
+    node: boolean;
+    exportConditions?: string[];
     typescript: {
         strict?: boolean;
         internalPaths?: boolean;

package/dist/types/index.d.ts

@@ -65,6 +65,8 @@ interface ApibaraOptions<T extends Record<string, DeepPartial<Pick<ApibaraConfig
     sourceMap?: boolean;
     entry: string;
     commonJS?: RollupCommonJSOptions;
+    node: boolean;
+    exportConditions?: string[];
     typescript: {
         strict?: boolean;
         internalPaths?: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apibara",
-  "version": "2.1.0-beta.4",
+  "version": "2.1.0-beta.6",
   "type": "module",
   "main": "./dist/core/index.mjs",
   "exports": {
@@ -76,7 +76,7 @@
     "playground:start": "pnpm playground start --dir playground --indexer starknet"
   },
   "devDependencies": {
-    "@apibara/starknet": "2.1.0-beta.4",
+    "@apibara/starknet": "2.1.0-beta.6",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^20.14.0",
     "@types/prompts": "^2.4.9",
@@ -87,8 +87,8 @@
     "vitest": "^1.6.0"
   },
   "dependencies": {
-    "@apibara/indexer": "2.1.0-beta.4",
-    "@apibara/protocol": "2.1.0-beta.4",
+    "@apibara/indexer": "2.1.0-beta.6",
+    "@apibara/protocol": "2.1.0-beta.6",
     "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",
@@ -99,7 +99,6 @@
     "citty": "^0.1.6",
     "consola": "^3.2.3",
     "defu": "^6.1.4",
-    "esbuild": "^0.23.0",
     "fs-extra": "^11.2.0",
     "hookable": "^5.5.3",
     "klona": "^2.0.6",
@@ -111,8 +110,7 @@
     "pkg-types": "^1.1.3",
     "prettier": "^3.5.2",
     "prompts": "^2.4.2",
-    "rollup": "^4.18.1",
-    "rollup-plugin-esbuild": "^6.1.1",
+    "rollup": "^4.34.8",
     "ts-morph": "^25.0.1",
     "tslib": "^2.6.3",
     "untyped": "^1.4.2"

package/src/core/build/error.ts

@@ -1,10 +1,7 @@
-import type esbuild from "esbuild";
 import { isAbsolute, relative } from "pathe";
 import type rollup from "rollup";
 
-export function formatRollupError(
-  _error: rollup.RollupError | esbuild.OnResolveResult,
-) {
+export function formatRollupError(_error: rollup.RollupError) {
   try {
     const logs: string[] = [_error.toString()];
     // biome-ignore lint/suspicious/noExplicitAny: <explanation>
@@ -12,15 +9,11 @@ export function formatRollupError(
     for (const error of errors) {
       const id = error.path || error.id || (_error as rollup.RollupError).id;
       let path = isAbsolute(id) ? relative(process.cwd(), id) : id;
-      const location =
-        (error as rollup.RollupError).loc ||
-        (error as esbuild.PartialMessage).location;
+      const location = (error as rollup.RollupError).loc;
       if (location) {
         path += `:${location.line}:${location.column}`;
       }
-      const text =
-        (error as esbuild.PartialMessage).text ||
-        (error as rollup.RollupError).frame;
+      const text = (error as rollup.RollupError).frame;
 
       logs.push(
         `Rollup error while processing \`${path}\`` + text ? "\n\n" + text : "",

package/src/core/config/defaults.ts

@@ -14,4 +14,7 @@ export const ApibaraDefaults: ApibaraConfig = {
     generateRuntimeConfigTypes: true,
     internalPaths: false,
   },
+
+  node: true,
+  exportConditions: ["node"],
 };

package/src/create/init.ts

@@ -5,6 +5,7 @@ import prompts from "prompts";
 import { addIndexer } from "./add";
 import { cyan, green } from "./colors";
 import {
+  createGitIgnoreFile,
   generateApibaraConfig,
   generatePackageJson,
   generateTsConfig,
@@ -129,7 +130,7 @@ export async function initializeProject({
     JSON.stringify(packageJson, null, 2) + "\n",
   );
   await formatFile(packageJsonPath);
-  consola.success("Created ", cyan("package.json"));
+  consola.success("Created", cyan("package.json"));
 
   // Generate tsconfig.json if TypeScript
   if (isTs) {
@@ -137,7 +138,7 @@ export async function initializeProject({
     const tsConfig = generateTsConfig();
     fs.writeFileSync(tsConfigPath, JSON.stringify(tsConfig, null, 2) + "\n");
     await formatFile(tsConfigPath);
-    consola.success("Created ", cyan("tsconfig.json"));
+    consola.success("Created", cyan("tsconfig.json"));
   }
 
   const apibaraConfigPath = path.join(root, `apibara.config.${configExt}`);
@@ -145,7 +146,7 @@ export async function initializeProject({
   const apibaraConfig = generateApibaraConfig(isTs);
   fs.writeFileSync(apibaraConfigPath, apibaraConfig);
   await formatFile(apibaraConfigPath);
-  consola.success("Created ", cyan(`apibara.config.${configExt}`));
+  consola.success("Created", cyan(`apibara.config.${configExt}`));
 
   // Create "indexers" directory if not exists
   const indexersDir = path.join(root, "indexers");
@@ -154,6 +155,8 @@ export async function initializeProject({
     consola.success(`Created ${cyan("indexers")} directory`);
   }
 
+  await createGitIgnoreFile(root);
+
   console.log("\n");
 
   consola.ready(green("Project initialized successfully"));

package/src/create/templates.ts

@@ -1,6 +1,7 @@
 import fs from "node:fs";
 import path from "node:path";
 import { consola } from "consola";
+import prompts from "prompts";
 import { type ObjectLiteralExpression, Project, SyntaxKind } from "ts-morph";
 import { cyan, green, magenta, yellow } from "./colors";
 import { packageVersions } from "./constants";
@@ -466,3 +467,103 @@ export async function createStorageRelatedFiles(options: IndexerOptions) {
     await createDrizzleStorageFiles(options);
   }
 }
+
+const gitIgnoreItems: {
+  isRecommended: boolean;
+  description?: string;
+  value: string;
+}[] = [
+  {
+    isRecommended: false,
+    value: "node_modules",
+  },
+  {
+    isRecommended: false,
+    value: "dist",
+  },
+  {
+    isRecommended: true,
+    description: "build and dev files of apibara",
+    value: ".apibara",
+  },
+  {
+    isRecommended: false,
+    value: ".env",
+  },
+  {
+    isRecommended: false,
+    description: "for mac users",
+    value: ".DS_Store",
+  },
+];
+
+export async function createGitIgnoreFile(cwd: string) {
+  const gitIgnorePath = path.join(cwd, ".gitignore");
+
+  if (fs.existsSync(gitIgnorePath)) {
+    const result = await prompts([
+      {
+        type: "select",
+        name: "overwrite",
+        message: `${cyan(".gitignore")} already exists. Please choose how to proceed:`,
+        initial: 0,
+        choices: [
+          {
+            title: "Choose items to append in your .gitignore",
+            value: "append",
+          },
+          {
+            title: "Keep original",
+            value: "ignore",
+          },
+          {
+            title: "Overwrite",
+            value: "overwrite",
+          },
+        ],
+      },
+      {
+        type: (overwrite: "append" | "ignore" | "overwrite") =>
+          overwrite === "append" ? "multiselect" : null,
+        name: "ignoreItems",
+        message: "Choose items to append in your .gitignore",
+        choices: gitIgnoreItems.map((item) => ({
+          title: `${yellow(item.value)}${
+            item.description ? ` - ${item.description}` : ""
+          }${item.isRecommended ? ` ${green("(recommended)")}` : ""}`,
+          value: item.value,
+        })),
+      },
+    ]);
+
+    const { overwrite, ignoreItems } = result as {
+      overwrite: "append" | "ignore" | "overwrite";
+      ignoreItems: string[];
+    };
+
+    if (overwrite === "append" && ignoreItems.length > 0) {
+      const gitIgnoreContent = fs.readFileSync(gitIgnorePath, "utf8");
+      fs.writeFileSync(
+        gitIgnorePath,
+        `${gitIgnoreContent}\n${result.ignoreItems.join("\n")}`,
+      );
+      consola.success(`Updated ${cyan(".gitignore")}`);
+      return;
+    }
+
+    if (overwrite === "overwrite") {
+      fs.writeFileSync(
+        gitIgnorePath,
+        gitIgnoreItems.map((item) => item.value).join("\n"),
+      );
+      consola.success(`Updated ${cyan(".gitignore")}`);
+      return;
+    }
+  }
+
+  fs.writeFileSync(
+    gitIgnorePath,
+    gitIgnoreItems.map((item) => item.value).join("\n"),
+  );
+  consola.success(`Created ${cyan(".gitignore")}`);
+}

package/src/rollup/config.ts

@@ -76,10 +76,12 @@ export function getRollupConfig(apibara: Apibara): RollupConfig {
   rollupConfig.plugins.push(
     nodeResolve({
       extensions,
-      preferBuiltins: true,
+      preferBuiltins: !!apibara.options.node,
       mainFields: ["main"],
+      exportConditions: apibara.options.exportConditions,
     }),
   );
+
   rollupConfig.plugins.push(indexers(apibara));
   rollupConfig.plugins.push(appConfig(apibara));
 

package/src/rollup/plugins/indexers.ts

@@ -7,7 +7,7 @@ export function indexers(apibara: Apibara) {
 
   return virtual({
     "#apibara-internal-virtual/indexers": `
-    ${indexers.map((i) => `import _${hash(i)} from '${i.indexer}';`).join("\n")}
+    ${indexers.map((i) => `import * as _${hash(i)} from '${i.indexer}';`).join("\n")}
 
     export const indexers = [
       ${indexers.map((i) => `{ name: "${i.name}", indexer: _${hash(i)} }`).join(",\n")}

package/src/runtime/dev.ts

@@ -37,6 +37,9 @@ const startCommand = defineCommand({
     await Promise.all(
       selectedIndexers.map(async (indexer) => {
         const indexerInstance = createIndexer(indexer, preset);
+        if (!indexerInstance) {
+          return;
+        }
 
         const client = createClient(
           indexerInstance.streamConfig,

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,10 +43,18 @@ 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({
     indexer: indexerName,

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

@@ -84,6 +84,8 @@ export interface ApibaraOptions<
   sourceMap?: boolean;
   entry: string;
   commonJS?: RollupCommonJSOptions;
+  node: boolean;
+  exportConditions?: string[];
 
   // Advanced
   typescript: {

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 };
+}[] = [];