apibara 2.1.0-beta.19 → 2.1.0-beta.21

package/dist/chunks/add.mjs

@@ -1,5 +1,7 @@
 import { addIndexer } from 'apibara/create';
 import { defineCommand } from 'citty';
+import { a as checkForUnknownArgs } from '../shared/apibara.63c9a277.mjs';
+import 'consola';
 
 const add = defineCommand({
   meta: {
@@ -33,7 +35,8 @@ const add = defineCommand({
       description: "Root directory - apibara project root where apibara.config is located | default: current working directory"
     }
   },
-  async run({ args }) {
+  async run({ args, cmd }) {
+    await checkForUnknownArgs(args, cmd);
     const { indexerId, chain, network, storage, dnaUrl, dir } = args;
     await addIndexer({
       argIndexerId: indexerId,

package/dist/chunks/build.mjs

@@ -2,7 +2,8 @@ import { createApibara, prepare, writeTypes, build as build$1 } from 'apibara/co
 import { runtimeDir } from 'apibara/runtime/meta';
 import { defineCommand } from 'citty';
 import { resolve, join } from 'pathe';
-import { c as commonArgs } from '../shared/apibara.1b515d04.mjs';
+import { c as commonArgs, a as checkForUnknownArgs } from '../shared/apibara.63c9a277.mjs';
+import 'consola';
 
 const build = defineCommand({
   meta: {
@@ -12,7 +13,8 @@ const build = defineCommand({
   args: {
     ...commonArgs
   },
-  async run({ args }) {
+  async run({ args, cmd }) {
+    await checkForUnknownArgs(args, cmd);
     const rootDir = resolve(args.dir || args._dir || ".");
     const apibara = await createApibara({
       rootDir

package/dist/chunks/dev.mjs

@@ -4,7 +4,8 @@ import { runtimeDir } from 'apibara/runtime/meta';
 import { defineCommand } from 'citty';
 import { colors } from 'consola/utils';
 import { resolve, join } from 'pathe';
-import { c as commonArgs } from '../shared/apibara.1b515d04.mjs';
+import { c as commonArgs, a as checkForUnknownArgs } from '../shared/apibara.63c9a277.mjs';
+import 'consola';
 
 const hmrKeyRe = /^runtimeConfig\./;
 const dev = defineCommand({
@@ -22,15 +23,16 @@ const dev = defineCommand({
       type: "string",
       description: "Preset to use"
     },
-    alwaysReindex: {
+    "always-reindex": {
       type: "boolean",
       default: false,
-      description: "Reindex the indexers from the starting block on every restart (default: false)"
+      description: "Reindex the indexers from the starting block on every restart | default: `false`"
     }
   },
-  async run({ args }) {
+  async run({ args, data, cmd, rawArgs }) {
+    await checkForUnknownArgs(args, cmd);
     const rootDir = resolve(args.dir || args._dir || ".");
-    if (args.alwaysReindex) {
+    if (args["always-reindex"]) {
       process.env.APIBARA_ALWAYS_REINDEX = "true";
     }
     let apibara;
@@ -100,7 +102,6 @@ const dev = defineCommand({
           apibara.logger.log(
             `Indexers process exited${code !== null ? ` with code ${colors.red(code)}` : ""}`
           );
-          process.exit(code ?? 0);
         });
       });
     };

package/dist/chunks/init.mjs

@@ -1,5 +1,7 @@
 import { initializeProject } from 'apibara/create';
 import { defineCommand } from 'citty';
+import { a as checkForUnknownArgs } from '../shared/apibara.63c9a277.mjs';
+import 'consola';
 
 const init = defineCommand({
   meta: {
@@ -14,22 +16,24 @@ const init = defineCommand({
     },
     language: {
       type: "string",
-      description: "Language to use: typescript, ts or javascript, js",
+      description: "Language to use: typescript, ts or javascript, js | default: `ts`",
       default: "ts",
       alias: "l"
     },
-    noIndexer: {
+    "create-indexer": {
       type: "boolean",
-      description: "Do not create an indexer after initialization",
-      default: false
+      name: "create-indexer",
+      default: true,
+      description: "TODO"
     }
   },
-  async run({ args }) {
-    const { dir: targetDir, noIndexer, language } = args;
+  async run({ args, cmd }) {
+    await checkForUnknownArgs(args, cmd);
+    const { dir: targetDir, "create-indexer": createIndexer, language } = args;
     await initializeProject({
       argTargetDir: targetDir,
       argLanguage: language,
-      argNoCreateIndexer: noIndexer
+      argNoCreateIndexer: !createIndexer
     });
   }
 });

package/dist/chunks/prepare.mjs

@@ -1,7 +1,8 @@
 import { createApibara, writeTypes } from 'apibara/core';
 import { defineCommand } from 'citty';
 import { resolve } from 'pathe';
-import { c as commonArgs } from '../shared/apibara.1b515d04.mjs';
+import { c as commonArgs, a as checkForUnknownArgs } from '../shared/apibara.63c9a277.mjs';
+import 'consola';
 
 const prepare = defineCommand({
   meta: {
@@ -11,7 +12,8 @@ const prepare = defineCommand({
   args: {
     ...commonArgs
   },
-  async run({ args }) {
+  async run({ args, cmd }) {
+    await checkForUnknownArgs(args, cmd);
     const rootDir = resolve(args.dir || ".");
     const apibara = await createApibara({ rootDir });
     await writeTypes(apibara);

package/dist/chunks/start.mjs

@@ -4,7 +4,8 @@ import { defineCommand } from 'citty';
 import { colors } from 'consola/utils';
 import fse from 'fs-extra';
 import { resolve } from 'pathe';
-import { c as commonArgs } from '../shared/apibara.1b515d04.mjs';
+import { c as commonArgs, a as checkForUnknownArgs } from '../shared/apibara.63c9a277.mjs';
+import 'consola';
 
 const start = defineCommand({
   meta: {
@@ -23,9 +24,10 @@ const start = defineCommand({
       description: "The preset to use"
     }
   },
-  async run({ args }) {
+  async run({ args, cmd }) {
     const { indexer, preset } = args;
     const rootDir = resolve(args.dir || args._dir || ".");
+    await checkForUnknownArgs(args, cmd);
     const apibara = await createApibara({
       rootDir,
       preset
@@ -57,7 +59,6 @@ const start = defineCommand({
       apibara.logger.log(
         `Indexers process exited${code !== null ? ` with code ${colors.red(code)}` : ""}`
       );
-      process.exit(code ?? 0);
     });
   }
 });

package/dist/create/index.mjs

@@ -70,7 +70,7 @@ const packageVersions = {
   "@apibara/plugin-sqlite": "next",
   // Postgres Dependencies
   "@electric-sql/pglite": "^0.2.17",
-  "drizzle-orm": "^0.37.0",
+  "drizzle-orm": "^0.40.1",
   pg: "^8.13.1",
   "@types/pg": "^8.11.10",
   "drizzle-kit": "^0.29.0",

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

@@ -0,0 +1,29 @@
+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 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "apibara",
-  "version": "2.1.0-beta.19",
+  "version": "2.1.0-beta.21",
   "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.19",
+    "@apibara/starknet": "2.1.0-beta.21",
     "@types/fs-extra": "^11.0.4",
     "@types/node": "^20.14.0",
     "@types/prompts": "^2.4.9",
@@ -89,8 +89,8 @@
     "vitest": "^1.6.0"
   },
   "dependencies": {
-    "@apibara/indexer": "2.1.0-beta.19",
-    "@apibara/protocol": "2.1.0-beta.19",
+    "@apibara/indexer": "2.1.0-beta.21",
+    "@apibara/protocol": "2.1.0-beta.21",
     "@rollup/plugin-replace": "^6.0.2",
     "@rollup/plugin-virtual": "^3.0.2",
     "c12": "^1.11.1",

package/src/cli/commands/add.ts

@@ -1,5 +1,6 @@
 import { addIndexer } from "apibara/create";
 import { defineCommand } from "citty";
+import { checkForUnknownArgs } from "../common";
 
 export default defineCommand({
   meta: {
@@ -35,7 +36,9 @@ export default defineCommand({
         "Root directory - apibara project root where apibara.config is located | default: current working directory",
     },
   },
-  async run({ args }) {
+  async run({ args, cmd }) {
+    await checkForUnknownArgs(args, cmd);
+
     const { indexerId, chain, network, storage, dnaUrl, dir } = args;
 
     await addIndexer({

package/src/cli/commands/build.ts

@@ -2,7 +2,7 @@ import { build, createApibara, prepare, writeTypes } from "apibara/core";
 import { runtimeDir } from "apibara/runtime/meta";
 import { defineCommand } from "citty";
 import { join, resolve } from "pathe";
-import { commonArgs } from "../common";
+import { checkForUnknownArgs, commonArgs } from "../common";
 
 export default defineCommand({
   meta: {
@@ -12,8 +12,11 @@ export default defineCommand({
   args: {
     ...commonArgs,
   },
-  async run({ args }) {
+  async run({ args, cmd }) {
+    await checkForUnknownArgs(args, cmd);
+
     const rootDir = resolve((args.dir || args._dir || ".") as string);
+
     const apibara = await createApibara({
       rootDir,
     });

package/src/cli/commands/dev.ts

@@ -5,7 +5,7 @@ import type { Apibara } from "apibara/types";
 import { defineCommand } from "citty";
 import { colors } from "consola/utils";
 import { join, resolve } from "pathe";
-import { commonArgs } from "../common";
+import { checkForUnknownArgs, commonArgs } from "../common";
 
 // Hot module reloading key regex
 // for only runtimeConfig.* keys
@@ -26,17 +26,19 @@ export default defineCommand({
       type: "string",
       description: "Preset to use",
     },
-    alwaysReindex: {
+    "always-reindex": {
       type: "boolean",
       default: false,
       description:
-        "Reindex the indexers from the starting block on every restart (default: false)",
+        "Reindex the indexers from the starting block on every restart | default: `false`",
     },
   },
-  async run({ args }) {
+  async run({ args, data, cmd, rawArgs }) {
+    await checkForUnknownArgs(args, cmd);
+
     const rootDir = resolve((args.dir || args._dir || ".") as string);
 
-    if (args.alwaysReindex) {
+    if (args["always-reindex"]) {
       process.env.APIBARA_ALWAYS_REINDEX = "true";
     }
 
@@ -125,7 +127,6 @@ export default defineCommand({
               code !== null ? ` with code ${colors.red(code)}` : ""
             }`,
           );
-          process.exit(code ?? 0);
         });
       });
     };

package/src/cli/commands/init.ts

@@ -1,5 +1,6 @@
 import { initializeProject } from "apibara/create";
 import { defineCommand } from "citty";
+import { checkForUnknownArgs } from "../common";
 
 export default defineCommand({
   meta: {
@@ -14,23 +15,27 @@ export default defineCommand({
     },
     language: {
       type: "string",
-      description: "Language to use: typescript, ts or javascript, js",
+      description:
+        "Language to use: typescript, ts or javascript, js | default: `ts`",
       default: "ts",
       alias: "l",
     },
-    noIndexer: {
+    "create-indexer": {
       type: "boolean",
-      description: "Do not create an indexer after initialization",
-      default: false,
+      name: "create-indexer",
+      default: true,
+      description: "TODO",
     },
   },
-  async run({ args }) {
-    const { dir: targetDir, noIndexer, language } = args;
+  async run({ args, cmd }) {
+    await checkForUnknownArgs(args, cmd);
+
+    const { dir: targetDir, "create-indexer": createIndexer, language } = args;
 
     await initializeProject({
       argTargetDir: targetDir,
       argLanguage: language,
-      argNoCreateIndexer: noIndexer,
+      argNoCreateIndexer: !createIndexer,
     });
   },
 });

package/src/cli/commands/prepare.ts

@@ -2,7 +2,7 @@ import { createApibara, writeTypes } from "apibara/core";
 import {} from "apibara/types";
 import { defineCommand } from "citty";
 import { resolve } from "pathe";
-import { commonArgs } from "../common";
+import { checkForUnknownArgs, commonArgs } from "../common";
 
 export default defineCommand({
   meta: {
@@ -12,7 +12,9 @@ export default defineCommand({
   args: {
     ...commonArgs,
   },
-  async run({ args }) {
+  async run({ args, cmd }) {
+    await checkForUnknownArgs(args, cmd);
+
     const rootDir = resolve((args.dir || ".") as string);
     const apibara = await createApibara({ rootDir });
     await writeTypes(apibara);

package/src/cli/commands/start.ts

@@ -4,7 +4,7 @@ import { defineCommand } from "citty";
 import { colors } from "consola/utils";
 import fse from "fs-extra";
 import { resolve } from "pathe";
-import { commonArgs } from "../common";
+import { checkForUnknownArgs, commonArgs } from "../common";
 
 export default defineCommand({
   meta: {
@@ -23,10 +23,12 @@ export default defineCommand({
       description: "The preset to use",
     },
   },
-  async run({ args }) {
+  async run({ args, cmd }) {
     const { indexer, preset } = args;
     const rootDir = resolve((args.dir || args._dir || ".") as string);
 
+    await checkForUnknownArgs(args, cmd);
+
     const apibara = await createApibara({
       rootDir,
       preset,
@@ -67,7 +69,6 @@ export default defineCommand({
           code !== null ? ` with code ${colors.red(code)}` : ""
         }`,
       );
-      process.exit(code ?? 0);
     });
   },
 });

package/src/cli/common.ts

@@ -1,4 +1,10 @@
-import type { ArgsDef } from "citty";
+import {
+  type ArgsDef,
+  type CommandDef,
+  type ParsedArgs,
+  renderUsage,
+} from "citty";
+import consola from "consola";
 
 export const commonArgs = <ArgsDef>{
   dir: {
@@ -6,3 +12,29 @@ export const commonArgs = <ArgsDef>{
     description: "project root directory",
   },
 };
+
+export const checkForUnknownArgs = async <T extends ArgsDef = ArgsDef>(
+  args: ParsedArgs<T>,
+  cmd: CommandDef<T>,
+) => {
+  // Create a list of defined args including both the main arg names and their aliases
+  const definedArgs: string[] = [];
+  if (cmd.args) {
+    for (const [argName, argDef] of Object.entries(cmd.args)) {
+      definedArgs.push(argName);
+      // Add alias to definedArgs if it exists
+      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);
+  }
+};

package/src/create/constants.ts

@@ -79,7 +79,7 @@ export const packageVersions = {
   "@apibara/plugin-sqlite": "next",
   // Postgres Dependencies
   "@electric-sql/pglite": "^0.2.17",
-  "drizzle-orm": "^0.37.0",
+  "drizzle-orm": "^0.40.1",
   pg: "^8.13.1",
   "@types/pg": "^8.11.10",
   "drizzle-kit": "^0.29.0",

package/dist/shared/apibara.1b515d04.mjs

@@ -1,8 +0,0 @@
-const commonArgs = {
-  dir: {
-    type: "string",
-    description: "project root directory"
-  }
-};
-
-export { commonArgs as c };