arri 0.27.1 → 0.28.0

package/dist/cli.cjs

@@ -12,10 +12,9 @@ const esbuild = require('esbuild');
 const esbuildPluginReplace = require('esbuild-plugin-replace');
 const path = require('pathe');
 const prettier = require('prettier');
-const config = require('./shared/arri.22a9d5c0.cjs');
+const config = require('./shared/arri.31b22fac.cjs');
 const globby = require('globby');
 const scule = require('scule');
-const arriCodegenDart = require('arri-codegen-dart');
 const ofetch = require('ofetch');
 const listhen = require('@joshmossas/listhen');
 const chokidar = require('chokidar');
@@ -348,75 +347,70 @@ async function createCodegenEntryFile(config) {
   );
 }
 
-const codegenDart = citty.defineCommand({
+const codegen = citty.defineCommand({
   args: {
-    location: {
+    schema: {
       type: "positional",
-      required: true,
-      description: "The path to an Arri definition file or a url that returns an Arri definition file."
-    },
-    clientName: {
-      type: "string",
-      alias: ["name"],
+      alias: ["l"],
       required: true
     },
-    outFile: {
+    config: {
       type: "string",
-      alias: ["out", "o"],
-      required: true
+      alias: ["c"],
+      default: "arri.config.ts"
     }
   },
   async run({ args }) {
-    const isUrl = args.location.startsWith("http://") || args.location.startsWith("https://");
+    const isUrl = args.schema.startsWith("http://") || args.schema.startsWith("https://");
+    const isTs = args.schema.endsWith(".ts");
+    const isJs = args.schema.endsWith(".js");
     let def;
     if (isUrl) {
-      const result = await ofetch.ofetch(args.location);
+      const result = await ofetch.ofetch(args.schema);
+      if (!arriCodegenUtils.isAppDefinition(result)) {
+        throw new Error(`Invalid App Definition at ${args.schema}`);
+      }
       def = result;
     } else {
-      if (!fs.existsSync(args.location)) {
-        throw new Error(`Unable to find ${args.location}`);
+      if (!fs__default$1.existsSync(args.schema)) {
+        throw new Error(`Unable to find ${args.schema}`);
+      }
+      if (isTs || isJs) {
+        const schemaResult = await c12.loadConfig({
+          configFile: args.schema
+        });
+        if (!arriCodegenUtils.isAppDefinition(schemaResult.config)) {
+          throw new Error(`Invalid App Definition at ${args.schema}`);
+        }
+        def = schemaResult.config;
+      } else {
+        const jsonString = JSON.parse(
+          fs__default$1.readFileSync(args.schema, { encoding: "utf-8" })
+        );
+        if (!arriCodegenUtils.isAppDefinition(jsonString)) {
+          throw new Error(`Invalid App Definition at ${args.schema}`);
+        }
+        def = jsonString;
       }
-      const jsonString = JSON.parse(
-        fs.readFileSync(args.location, { encoding: "utf-8" })
-      );
-      def = jsonString;
     }
     if (!def) {
-      throw new Error("Unable to load ApplicationDefinition json file");
+      throw new Error(`Unable to find App Definition at ${args.schema}`);
     }
-    await arriCodegenDart.dartClientGenerator({
-      clientName: args.clientName,
-      outputFile: args.outFile
-    }).generator(def);
-  }
-});
-const codegenTypescript = citty.defineCommand({
-  args: {
-    location: {
-      type: "positional",
-      required: true,
-      description: "The path to an Arri definition file or a url that returns an Arri definition file."
-    },
-    clientName: {
-      type: "string",
-      alias: ["name"],
-      required: true
-    },
-    outFile: {
-      type: "string",
-      alias: ["out", "o"],
-      required: true
+    if (!fs__default$1.existsSync(path__default.resolve(args.config))) {
+      throw new Error(
+        `Unable to load arri config at ${args.config}. Please specify a valid config path with --config`
+      );
     }
-  },
-  run({ args }) {
-  }
-});
-const codegen = citty.defineCommand({
-  subCommands: {
-    dart: codegenDart,
-    typescript: codegenTypescript
-  },
-  run({ args }) {
+    const configPath = path__default.resolve(args.config);
+    const { config: config$1 } = await c12.loadConfig({ configFile: configPath });
+    if (!config.isResolvedArriConfig(config$1)) {
+      throw new Error(`Invalid arri config at ${args.config}`);
+    }
+    consola__default.info(`Generating ${config$1.clientGenerators.length} clients`);
+    await Promise.allSettled(
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      config$1.clientGenerators.map((gen) => gen.generator(def))
+    );
   }
 });
 

package/dist/cli.mjs

@@ -11,10 +11,9 @@ import { build as build$1 } from 'esbuild';
 import { replace } from 'esbuild-plugin-replace';
 import path from 'pathe';
 import prettier from 'prettier';
-import { n as defaultConfig, m as isResolvedArriConfig, a as DEV_DEFINITION_ENDPOINT } from './shared/arri.8cfc63cb.mjs';
+import { n as defaultConfig, m as isResolvedArriConfig, a as DEV_DEFINITION_ENDPOINT } from './shared/arri.d9f65487.mjs';
 import { globby } from 'globby';
 import { camelCase, kebabCase } from 'scule';
-import { dartClientGenerator } from 'arri-codegen-dart';
 import { ofetch } from 'ofetch';
 import { listenAndWatch } from '@joshmossas/listhen';
 import chokidar from 'chokidar';
@@ -324,75 +323,70 @@ async function createCodegenEntryFile(config) {
   );
 }
 
-const codegenDart = defineCommand({
+const codegen = defineCommand({
   args: {
-    location: {
+    schema: {
       type: "positional",
-      required: true,
-      description: "The path to an Arri definition file or a url that returns an Arri definition file."
-    },
-    clientName: {
-      type: "string",
-      alias: ["name"],
+      alias: ["l"],
       required: true
     },
-    outFile: {
+    config: {
       type: "string",
-      alias: ["out", "o"],
-      required: true
+      alias: ["c"],
+      default: "arri.config.ts"
     }
   },
   async run({ args }) {
-    const isUrl = args.location.startsWith("http://") || args.location.startsWith("https://");
+    const isUrl = args.schema.startsWith("http://") || args.schema.startsWith("https://");
+    const isTs = args.schema.endsWith(".ts");
+    const isJs = args.schema.endsWith(".js");
     let def;
     if (isUrl) {
-      const result = await ofetch(args.location);
+      const result = await ofetch(args.schema);
+      if (!isAppDefinition(result)) {
+        throw new Error(`Invalid App Definition at ${args.schema}`);
+      }
       def = result;
     } else {
-      if (!existsSync(args.location)) {
-        throw new Error(`Unable to find ${args.location}`);
+      if (!fs$1.existsSync(args.schema)) {
+        throw new Error(`Unable to find ${args.schema}`);
+      }
+      if (isTs || isJs) {
+        const schemaResult = await loadConfig({
+          configFile: args.schema
+        });
+        if (!isAppDefinition(schemaResult.config)) {
+          throw new Error(`Invalid App Definition at ${args.schema}`);
+        }
+        def = schemaResult.config;
+      } else {
+        const jsonString = JSON.parse(
+          fs$1.readFileSync(args.schema, { encoding: "utf-8" })
+        );
+        if (!isAppDefinition(jsonString)) {
+          throw new Error(`Invalid App Definition at ${args.schema}`);
+        }
+        def = jsonString;
       }
-      const jsonString = JSON.parse(
-        readFileSync(args.location, { encoding: "utf-8" })
-      );
-      def = jsonString;
     }
     if (!def) {
-      throw new Error("Unable to load ApplicationDefinition json file");
+      throw new Error(`Unable to find App Definition at ${args.schema}`);
     }
-    await dartClientGenerator({
-      clientName: args.clientName,
-      outputFile: args.outFile
-    }).generator(def);
-  }
-});
-const codegenTypescript = defineCommand({
-  args: {
-    location: {
-      type: "positional",
-      required: true,
-      description: "The path to an Arri definition file or a url that returns an Arri definition file."
-    },
-    clientName: {
-      type: "string",
-      alias: ["name"],
-      required: true
-    },
-    outFile: {
-      type: "string",
-      alias: ["out", "o"],
-      required: true
+    if (!fs$1.existsSync(path.resolve(args.config))) {
+      throw new Error(
+        `Unable to load arri config at ${args.config}. Please specify a valid config path with --config`
+      );
     }
-  },
-  run({ args }) {
-  }
-});
-const codegen = defineCommand({
-  subCommands: {
-    dart: codegenDart,
-    typescript: codegenTypescript
-  },
-  run({ args }) {
+    const configPath = path.resolve(args.config);
+    const { config } = await loadConfig({ configFile: configPath });
+    if (!isResolvedArriConfig(config)) {
+      throw new Error(`Invalid arri config at ${args.config}`);
+    }
+    consola.info(`Generating ${config.clientGenerators.length} clients`);
+    await Promise.allSettled(
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+      config.clientGenerators.map((gen) => gen.generator(def))
+    );
   }
 });
 

package/dist/index.cjs

@@ -1,10 +1,10 @@
 'use strict';
 
-const config = require('./shared/arri.22a9d5c0.cjs');
+const config = require('./shared/arri.31b22fac.cjs');
 const h3 = require('h3');
+require('arri-codegen-utils');
 require('arri-validate');
 require('h3-sse');
-require('arri-codegen-utils');
 require('scule');
 
 const defineMiddleware = (middleware) => middleware;

package/dist/index.d.cts

@@ -119,6 +119,7 @@ interface Rpc<TIsEventStream extends boolean = false, TParams extends RpcParamSc
     description?: string;
     params: TParams;
     response: TResponse;
+    isDeprecated?: boolean;
     isEventStream?: TIsEventStream;
     pingInterval?: TIsEventStream extends true ? number : undefined;
     handler: TIsEventStream extends true ? EventStreamRpcHandler<TParams extends RpcParamSchema ? InferType<TParams> : undefined, TResponse extends RpcParamSchema ? InferType<TResponse> : undefined> : RpcHandler<TParams extends RpcParamSchema ? InferType<TParams> : undefined, TResponse extends RpcParamSchema ? InferType<TResponse> : void>;

package/dist/index.d.mts

@@ -119,6 +119,7 @@ interface Rpc<TIsEventStream extends boolean = false, TParams extends RpcParamSc
     description?: string;
     params: TParams;
     response: TResponse;
+    isDeprecated?: boolean;
     isEventStream?: TIsEventStream;
     pingInterval?: TIsEventStream extends true ? number : undefined;
     handler: TIsEventStream extends true ? EventStreamRpcHandler<TParams extends RpcParamSchema ? InferType<TParams> : undefined, TResponse extends RpcParamSchema ? InferType<TResponse> : undefined> : RpcHandler<TParams extends RpcParamSchema ? InferType<TParams> : undefined, TResponse extends RpcParamSchema ? InferType<TResponse> : void>;

package/dist/index.d.ts

@@ -119,6 +119,7 @@ interface Rpc<TIsEventStream extends boolean = false, TParams extends RpcParamSc
     description?: string;
     params: TParams;
     response: TResponse;
+    isDeprecated?: boolean;
     isEventStream?: TIsEventStream;
     pingInterval?: TIsEventStream extends true ? number : undefined;
     handler: TIsEventStream extends true ? EventStreamRpcHandler<TParams extends RpcParamSchema ? InferType<TParams> : undefined, TResponse extends RpcParamSchema ? InferType<TResponse> : undefined> : RpcHandler<TParams extends RpcParamSchema ? InferType<TParams> : undefined, TResponse extends RpcParamSchema ? InferType<TResponse> : void>;

package/dist/index.mjs

@@ -1,8 +1,8 @@
-export { A as ArriApp, p as ArriRouter, a as DEV_DEFINITION_ENDPOINT, D as DEV_ENDPOINT_ROOT, E as ErrorResponse, x as EventStreamConnection, c as createRpcDefinition, n as defaultConfig, o as defineConfig, h as defineError, u as defineEventStreamRpc, q as defineRoute, d as defineRpc, j as errorResponseFromValidationErrors, e as getRpcParamName, g as getRpcPath, f as getRpcResponseName, k as handleH3Error, t as handleRoute, l as isArriConfig, w as isEventStreamRpc, m as isResolvedArriConfig, b as isRpc, i as isRpcParamSchema, y as registerEventStreamRpc, s as registerRoute, r as registerRpc, v as validateRpcRequestInput } from './shared/arri.8cfc63cb.mjs';
+export { A as ArriApp, p as ArriRouter, a as DEV_DEFINITION_ENDPOINT, D as DEV_ENDPOINT_ROOT, E as ErrorResponse, x as EventStreamConnection, c as createRpcDefinition, n as defaultConfig, o as defineConfig, h as defineError, u as defineEventStreamRpc, q as defineRoute, d as defineRpc, j as errorResponseFromValidationErrors, e as getRpcParamName, g as getRpcPath, f as getRpcResponseName, k as handleH3Error, t as handleRoute, l as isArriConfig, w as isEventStreamRpc, m as isResolvedArriConfig, b as isRpc, i as isRpcParamSchema, y as registerEventStreamRpc, s as registerRoute, r as registerRpc, v as validateRpcRequestInput } from './shared/arri.d9f65487.mjs';
 export * from 'h3';
+import 'arri-codegen-utils';
 import 'arri-validate';
 import 'h3-sse';
-import 'arri-codegen-utils';
 import 'scule';
 
 const defineMiddleware = (middleware) => middleware;

package/dist/shared/{arri.22a9d5c0.cjs → arri.31b22fac.cjs}

@@ -1,9 +1,9 @@
 'use strict';
 
+const arriCodegenUtils = require('arri-codegen-utils');
 const h3 = require('h3');
 const arriValidate = require('arri-validate');
 const h3Sse = require('h3-sse');
-const arriCodegenUtils = require('arri-codegen-utils');
 const scule = require('scule');
 
 const ErrorResponse = arriValidate.a.object({
@@ -233,6 +233,7 @@ function createRpcDefinition(rpcName, httpPath, procedure) {
     method,
     params: getRpcParamName(rpcName, procedure),
     response: getRpcResponseDefinition(rpcName, procedure),
+    isDeprecated: procedure.isDeprecated,
     isEventStream: procedure.isEventStream === true ? true : void 0
   };
 }
@@ -934,7 +935,7 @@ class ArriApp {
   }
   getAppDefinition() {
     const appDef = {
-      arriSchemaVersion: "0.0.2",
+      arriSchemaVersion: arriCodegenUtils.SCHEMA_VERSION,
       info: this.appInfo,
       procedures: {},
       models: this.models

package/dist/shared/{arri.8cfc63cb.mjs → arri.d9f65487.mjs}

@@ -1,7 +1,7 @@
+import { isRpcHttpMethod, removeDisallowedChars, SCHEMA_VERSION } from 'arri-codegen-utils';
 import { createError, isError, setResponseStatus, send, eventHandler, isPreflightRequest, setResponseHeader, readRawBody, getValidatedQuery, defineEventHandler, getQuery, setHeader, createRouter, createApp, sendError } from 'h3';
 import { a, isAObjectSchema, isARecordSchema, isADiscriminatorSchema } from 'arri-validate';
 import { createEventStream } from 'h3-sse';
-import { isRpcHttpMethod, removeDisallowedChars } from 'arri-codegen-utils';
 import { kebabCase, pascalCase } from 'scule';
 
 const ErrorResponse = a.object({
@@ -231,6 +231,7 @@ function createRpcDefinition(rpcName, httpPath, procedure) {
     method,
     params: getRpcParamName(rpcName, procedure),
     response: getRpcResponseDefinition(rpcName, procedure),
+    isDeprecated: procedure.isDeprecated,
     isEventStream: procedure.isEventStream === true ? true : void 0
   };
 }
@@ -932,7 +933,7 @@ class ArriApp {
   }
   getAppDefinition() {
     const appDef = {
-      arriSchemaVersion: "0.0.2",
+      arriSchemaVersion: SCHEMA_VERSION,
       info: this.appInfo,
       procedures: {},
       models: this.models

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arri",
-  "version": "0.27.1",
+  "version": "0.28.0",
   "type": "module",
   "license": "MIT",
   "author": {
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@joshmossas/listhen": "1.6.0",
-    "c12": "^1.9.0",
+    "c12": "^1.10.0",
     "chokidar": "^3.6.0",
     "citty": "^0.1.6",
     "consola": "^3.2.3",
@@ -42,13 +42,13 @@
     "prettier": "^3.2.5",
     "scule": "^1.3.0",
     "uncrypto": "^0.1.3",
-    "arri-codegen-utils": "0.27.1",
-    "arri-validate": "0.27.1",
-    "arri-codegen-ts": "0.27.1",
-    "arri-codegen-dart": "0.27.1"
+    "arri-codegen-dart": "0.28.0",
+    "arri-validate": "0.28.0",
+    "arri-codegen-ts": "0.28.0",
+    "arri-codegen-utils": "0.28.0"
   },
   "devDependencies": {
     "@types/degit": "^2.8.6",
-    "bun-types": "^1.0.29"
+    "bun-types": "^1.0.30"
   }
 }