apibara 2.0.0-beta.6 → 2.0.0-beta.7

package/dist/chunks/build.mjs

@@ -1,6 +1,6 @@
 import { createApibara, prepare, writeTypes, build as build$1 } from 'apibara/core';
 import { defineCommand } from 'citty';
-import consola from 'consola';
+import consola__default from 'consola';
 import { resolve } from 'pathe';
 import { c as commonArgs } from '../shared/apibara.1b515d04.mjs';
 
@@ -13,7 +13,7 @@ const build = defineCommand({
     ...commonArgs
   },
   async run({ args }) {
-    consola.start("Building");
+    consola__default.start("Building");
     const rootDir = resolve(args.dir || args._dir || ".");
     const apibara = await createApibara({
       rootDir

package/dist/chunks/dev.mjs

@@ -1,7 +1,7 @@
 import { spawn } from 'node:child_process';
 import { createApibara, prepare, writeTypes, build } from 'apibara/core';
 import { defineCommand } from 'citty';
-import consola from 'consola';
+import consola__default from 'consola';
 import { resolve } from 'pathe';
 import { c as commonArgs } from '../shared/apibara.1b515d04.mjs';
 
@@ -28,12 +28,12 @@ const dev = defineCommand({
     }
   },
   async run({ args }) {
-    consola.start("Starting dev server");
+    consola__default.start("Starting dev server");
     const rootDir = resolve(args.dir || args._dir || ".");
     let apibara;
     const reload = async () => {
       if (apibara) {
-        consola.info("Restarting dev server");
+        consola__default.info("Restarting dev server");
         if ("unwatch" in apibara.options._c12) {
           await apibara.options._c12.unwatch();
         }
@@ -51,7 +51,7 @@ const dev = defineCommand({
               if (diff.length === 0) {
                 return;
               }
-              consola.info(
+              consola__default.info(
                 `Nitro config updated:
                   ${diff.map((entry) => `  ${entry.toString()}`).join("\n")}`
               );
@@ -67,11 +67,11 @@ const dev = defineCommand({
       await build(apibara);
       apibara.hooks.hook("dev:reload", () => {
         if (childProcess) {
-          consola.start("Restarting indexers");
+          consola__default.start("Restarting indexers");
           childProcess.kill();
         } else {
-          consola.success("Dev server started");
-          consola.success("Starting indexers");
+          consola__default.success("Dev server started");
+          consola__default.success("Starting indexers");
         }
         const childArgs = [
           resolve(apibara.options.outputDir || "./.apibara/build", "main.mjs"),
@@ -79,12 +79,12 @@ const dev = defineCommand({
           ...args.preset ? ["--preset", args.preset] : [],
           ...args.sink ? ["--sink", args.sink] : []
         ];
-        childProcess = spawn("jiti", childArgs, {
+        childProcess = spawn("node", childArgs, {
           stdio: "inherit"
         });
         childProcess.on("close", (code) => {
           if (code !== null) {
-            consola.log(`Indexers process exited with code ${code}`);
+            consola__default.log(`Indexers process exited with code ${code}`);
           }
         });
       });

package/dist/chunks/prepare.mjs

@@ -1,6 +1,6 @@
 import { createApibara, writeTypes } from 'apibara/core';
 import { defineCommand } from 'citty';
-import consola from 'consola';
+import consola__default from 'consola';
 import { resolve } from 'pathe';
 import { c as commonArgs } from '../shared/apibara.1b515d04.mjs';
 
@@ -13,7 +13,7 @@ const prepare = defineCommand({
     ...commonArgs
   },
   async run({ args }) {
-    consola.start("Preparing Types");
+    consola__default.start("Preparing Types");
     const rootDir = resolve(args.dir || ".");
     const apibara = await createApibara({ rootDir });
     await writeTypes(apibara);

package/dist/core/index.mjs

@@ -1,4 +1,4 @@
-import consola from 'consola';
+import consola__default from 'consola';
 import { createHooks } from 'hookable';
 import { watchConfig, loadConfig } from 'c12';
 import { klona } from 'klona/full';
@@ -85,7 +85,7 @@ async function _loadUserConfig(configOverrides = {}, opts = {}, dev = false) {
 
 async function updateApibaraConfig(apibara, config) {
   await apibara.hooks.callHook("rollup:reload");
-  consola.success("Apibara config hot reloaded!");
+  consola__default.success("Apibara config hot reloaded!");
 }
 
 async function createApibara(config = {}, opts = {}, dev = false) {
@@ -94,7 +94,7 @@ async function createApibara(config = {}, opts = {}, dev = false) {
     options,
     hooks: createHooks(),
     close: () => apibara.hooks.callHook("close"),
-    logger: consola.withTag("apibara"),
+    logger: consola__default.withTag("apibara"),
     async updateConfig(config2) {
       updateApibaraConfig(apibara);
     }
@@ -200,7 +200,7 @@ async function buildProduction(apibara, rollupConfig) {
       throw new Error("No output options specified in Rollup config");
     }
     await bundle.close();
-    consola.success("Build completed successfully!");
+    consola__default.success("Build completed successfully!");
   } catch (error) {
     console.error("Build failed:", error);
     throw error;
@@ -216,7 +216,7 @@ async function build(apibara) {
 async function prepare(apibara) {
   await prepareDir(apibara.options.buildDir);
   await prepareDir(apibara.options.outputDir);
-  consola.success("Output directory cleaned");
+  consola__default.success("Output directory cleaned");
 }
 async function prepareDir(dir) {
   await fsp.mkdir(dir, { recursive: true });
@@ -334,7 +334,7 @@ declare module "apibara/types" {`,
       await fsp.writeFile(_file, file.contents);
     })
   );
-  consola.success("Types generated");
+  consola__default.success("Types generated");
 }
 const RELATIVE_RE = /^\.{1,2}\//;
 function relativeWithDot(from, to) {

package/dist/internal/citty/index.d.mts

@@ -0,0 +1 @@
+export * from 'citty';

package/dist/internal/citty/index.d.ts

@@ -0,0 +1 @@
+export * from 'citty';

package/dist/internal/citty/index.mjs

@@ -0,0 +1 @@
+export * from 'citty';

package/dist/internal/consola/index.d.mts

@@ -0,0 +1,2 @@
+export * from 'consola';
+import 'citty';

package/dist/internal/consola/index.d.ts

@@ -0,0 +1,2 @@
+export * from 'consola';
+import 'citty';

package/dist/internal/consola/index.mjs

@@ -0,0 +1 @@
+export * from 'consola';

package/dist/rollup/index.mjs

@@ -40,10 +40,12 @@ const getRollupConfig = (apibara, dev = false) => {
   const mainContent = `
 import { createClient } from "@apibara/protocol";
 import { createIndexer, run } from "@apibara/indexer";
-import consola from "consola";
-import { defineCommand, runMain } from "citty";
+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 = {
@@ -177,8 +179,7 @@ runMain(command);
       "@apibara/protocol",
       "@apibara/evm",
       "@apibara/starknet",
-      "@apibara/beaconchain",
-      "@apibara/cli"
+      "@apibara/beaconchain"
     ]
   };
 };

package/package.json

@@ -1,8 +1,7 @@
 {
   "name": "apibara",
-  "version": "2.0.0-beta.6",
+  "version": "2.0.0-beta.7",
   "type": "module",
-  "source": "./src/core/index.ts",
   "main": "./dist/core/index.mjs",
   "exports": {
     ".": {
@@ -32,6 +31,14 @@
     "./hooks": {
       "types": "./dist/hooks/index.d.ts",
       "import": "./dist/hooks/index.mjs"
+    },
+    "./internal/consola": {
+      "import": "./dist/internal/consola/index.mjs",
+      "types": "./dist/internal/consola/index.d.ts"
+    },
+    "./internal/citty": {
+      "import": "./dist/internal/citty/index.mjs",
+      "types": "./dist/internal/citty/index.d.ts"
     }
   },
   "bin": {
@@ -64,10 +71,10 @@
     "vitest": "^1.6.0"
   },
   "dependencies": {
-    "@apibara/evm": "2.0.0-beta.6",
-    "@apibara/indexer": "2.0.0-beta.6",
-    "@apibara/protocol": "2.0.0-beta.6",
-    "@apibara/starknet": "2.0.0-beta.6",
+    "@apibara/evm": "2.0.0-beta.7",
+    "@apibara/indexer": "2.0.0-beta.7",
+    "@apibara/protocol": "2.0.0-beta.7",
+    "@apibara/starknet": "2.0.0-beta.7",
     "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-json": "^6.1.0",
     "@rollup/plugin-node-resolve": "^15.2.3",

package/src/cli/commands/dev.ts

@@ -93,7 +93,7 @@ export default defineCommand({
           ...(args.sink ? ["--sink", args.sink] : []),
         ];
 
-        childProcess = spawn("jiti", childArgs, {
+        childProcess = spawn("node", childArgs, {
           stdio: "inherit",
         });
 

package/src/internal/citty/index.ts

@@ -0,0 +1 @@
+export * from "citty";

package/src/internal/consola/index.ts

@@ -0,0 +1 @@
+export * from "consola";

package/src/rollup/config.ts

@@ -57,10 +57,12 @@ export const getRollupConfig = (
   const mainContent = `
 import { createClient } from "@apibara/protocol";
 import { createIndexer, run } from "@apibara/indexer";
-import consola from "consola";
-import { defineCommand, runMain } from "citty";
+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 = {
@@ -202,7 +204,6 @@ runMain(command);
       "@apibara/evm",
       "@apibara/starknet",
       "@apibara/beaconchain",
-      "@apibara/cli",
     ],
   };
 };