arri 0.43.2 → 0.45.0

package/dist/cli.mjs

@@ -3,160 +3,19 @@ import { defineCommand, runMain } from 'citty';
 import { execSync } from 'node:child_process';
 import fs$1, { existsSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import fs from 'node:fs/promises';
-import { removeDisallowedChars, isAppDefinition } from 'arri-codegen-utils';
+import { isAppDefinition } from '@arrirpc/codegen-utils';
 import { loadConfig } from 'c12';
-import * as esbuild from 'esbuild';
 import { build as build$1 } from 'esbuild';
 import { replace } from 'esbuild-plugin-replace';
 import path from 'pathe';
 import prettier from 'prettier';
-import { q as defaultConfig, o as isArriConfig, p as isResolvedArriConfig, a as DEV_DEFINITION_ENDPOINT } from './shared/arri.c3a553fc.mjs';
-import { createConsola } from 'consola';
-import { globby } from 'globby';
-import { camelCase, kebabCase } from 'scule';
+import { d as defaultConfig, l as logger, s as setupWorkingDir, c as createAppWithRoutesModule, O as OUT_CODEGEN, e as OUT_SERVER_ENTRY, G as GEN_APP_FILE, f as OUT_APP_FILE, i as isArriConfig, g as dev } from './shared/arri.e5993636.mjs';
 import { ofetch } from 'ofetch';
-import { listenAndWatch } from '@joshmossas/listhen';
 import Degit from 'degit';
 import enquirer from 'enquirer';
-import 'h3';
-import 'arri-validate';
-import 'h3-sse';
-
-const logger = createConsola().withTag("arri");
-const GEN_APP_FILE = "__arri_app.ts";
-const GEN_SERVER_ENTRY_FILE = "__arri_server.ts";
-const OUT_APP_FILE = "app.mjs";
-const OUT_SERVER_ENTRY = "server.mjs";
-const OUT_CODEGEN = "codegen.mjs";
-async function setupWorkingDir(config) {
-  const arriDir = path.resolve(config.rootDir, config.buildDir);
-  const outDir = path.resolve(config.rootDir, ".output");
-  if (existsSync(arriDir)) {
-    await fs.rm(arriDir, { recursive: true, force: true });
-  }
-  if (existsSync(outDir)) {
-    await fs.rm(outDir, { recursive: true, force: true });
-  }
-  await fs.mkdir(arriDir);
-  await fs.mkdir(outDir);
-}
-async function createAppWithRoutesModule(config) {
-  const appModule = path.resolve(config.rootDir, config.srcDir, config.entry);
-  const appImportParts = path.relative(path.resolve(config.rootDir, config.buildDir), appModule).split(".");
-  appImportParts.pop();
-  const routes = [];
-  const existingRoutes = [];
-  await Promise.all(
-    config.procedureGlobPatterns.map(async (pattern) => {
-      const results = await getFsRouteBatch(pattern, config);
-      for (const result of results) {
-        if (!existingRoutes.includes(result.name)) {
-          routes.push(result);
-          existingRoutes.push(result.name);
-        }
-      }
-    })
-  );
-  routes.sort((a, b) => a.name < b.name ? -1 : 1);
-  const module = await prettier.format(
-    `import sourceMapSupport from 'source-map-support';
-        sourceMapSupport.install();
-        import app from '${appImportParts.join(".")}';
-        ${routes.map(
-      (route) => `import ${route.importName} from '${route.importPath}';`
-    ).join("\n")}
-        const routes: {id: string; route: any}[] = [${routes.map(
-      (route) => `{ id: '${route.name}', route: ${route.importName} }`
-    ).join(",\n")}
-        ];
-        for(const route of routes) {
-            if(route.route.transport === 'http') {
-                app.rpc({
-                    name: route.id,
-                    ...route.route,
-                });
-                continue;
-            }
-            if (route.route.transport === 'ws') {
-                app.wsRpc({
-                    name: route.id,
-                    ...route.route,
-                });
-                continue;
-            }
-        }
-        export default app`,
-    { parser: "typescript", tabWidth: 4 }
-  );
-  await fs.writeFile(
-    path.resolve(config.rootDir, config.buildDir, GEN_APP_FILE),
-    module
-  );
-}
-async function getFsRouteBatch(globPattern, config) {
-  if (!config.procedureDir) {
-    return [];
-  }
-  const target = `${config.rootDir}/${config.srcDir}/${config.procedureDir}/${globPattern}`.split("//").join("/").split("//").join("/");
-  const files = await globby(target, {
-    onlyFiles: true
-  });
-  const routes = [];
-  for (const file of files) {
-    const meta = getRpcMetaFromPath(config, file);
-    if (meta) {
-      const importParts = path.relative(path.resolve(config.rootDir, config.buildDir), file).split(".");
-      importParts.pop();
-      importParts.push("js");
-      routes.push({
-        name: meta.id,
-        importName: camelCase(meta.id.split(".").join("_")),
-        importPath: `./${importParts.join(".")}`
-      });
-    }
-  }
-  return routes;
-}
-const disallowedNameChars = "~`!@#$%^&*()-+=[]{}\\|:;\"'<>,./";
-const getRpcMetaFromPath = (config, filePath) => {
-  if (!config.procedureDir) {
-    return void 0;
-  }
-  const resolvedFilePath = filePath.split("./").join("/");
-  const parts = resolvedFilePath.split("/");
-  const reversedParts = [...parts].reverse();
-  const nameParts = [];
-  for (const part of reversedParts) {
-    if (part === config.procedureDir) {
-      break;
-    }
-    nameParts.push(part);
-  }
-  const fileName = nameParts.reverse().pop() ?? "";
-  const serviceParts = nameParts.filter((part) => part.trim().length > 0).map((part) => removeDisallowedChars(part, disallowedNameChars));
-  const fileNameParts = fileName.split(".");
-  if (!fileNameParts.length) {
-    return void 0;
-  }
-  const rpcName = removeDisallowedChars(
-    fileNameParts[0],
-    disallowedNameChars
-  );
-  const httpParts = [
-    ...serviceParts.map((part) => kebabCase(part)),
-    kebabCase(rpcName)
-  ];
-  return {
-    id: [...serviceParts, rpcName].join("."),
-    httpPath: `/${httpParts.join("/")}`
-  };
-};
-function isInsideDir(dir, parentDir) {
-  if (path.resolve(dir).startsWith(path.resolve(parentDir))) {
-    return true;
-  }
-  return false;
-}
+import { kebabCase } from 'scule';
+import '@joshmossas/listhen';
+import 'consola';
 
 const build = defineCommand({
   args: {
@@ -414,7 +273,7 @@ const codegen = defineCommand({
           def ?? {
             arriSchemaVersion: "0.0.4",
             procedures: {},
-            models: {}
+            definitions: {}
           }
         )
       )
@@ -423,195 +282,6 @@ const codegen = defineCommand({
   }
 });
 
-const dev = defineCommand({
-  meta: {
-    name: "dev",
-    description: "Start the arri dev server"
-  },
-  args: {
-    config: {
-      type: "string",
-      description: "Path to the arri config file",
-      alias: "c",
-      default: "./arri.config.ts"
-    }
-  },
-  async run({ args }) {
-    process.env.ARRI_DEV_MODE = "true";
-    const { config } = await loadConfig({
-      configFile: path.resolve(args.config)
-    });
-    if (!isResolvedArriConfig(config)) {
-      throw new Error("Unable to find config");
-    }
-    const appEntry = path.resolve(
-      config.rootDir,
-      config.srcDir,
-      config.entry
-    );
-    if (!existsSync(appEntry)) {
-      throw new Error(`Unable to find entry at ${appEntry}`);
-    }
-    await startDevServer(config);
-  }
-});
-const startListener = (config, showQr = false) => listenAndWatch(path.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY), {
-  public: true,
-  port: config.port,
-  logger,
-  qr: showQr,
-  https: config.https,
-  http2: config.http2,
-  ws: true
-});
-async function bundleFilesContext(config) {
-  const serverContent = `import app from './${OUT_APP_FILE}';
-
-export default app.h3App;`;
-  await fs.writeFile(
-    path.resolve(config.rootDir, ".output", OUT_SERVER_ENTRY),
-    serverContent
-  );
-  return await esbuild.context({
-    ...config.esbuild,
-    entryPoints: [
-      path.resolve(config.rootDir, config.buildDir, GEN_APP_FILE)
-    ],
-    outfile: path.resolve(config.rootDir, ".output", OUT_APP_FILE),
-    format: "esm",
-    bundle: true,
-    packages: "external",
-    sourcemap: config.esbuild.sourcemap ?? true,
-    target: config.esbuild.target ?? "node20",
-    platform: config.esbuild.platform ?? "node"
-  });
-}
-async function startDevServer(config) {
-  await setupWorkingDir(config);
-  const watcher = await import('chokidar');
-  let fileWatcher;
-  await Promise.all([
-    createEntryModule(config),
-    createAppWithRoutesModule(config)
-  ]);
-  const context = await bundleFilesContext(config);
-  await context.rebuild();
-  const listener = await startListener(config, true);
-  setTimeout(async () => {
-    await generateClients(config);
-  }, 1e3);
-  const cleanExit = async () => {
-    process.exit();
-  };
-  process.on("exit", async () => {
-    await Promise.allSettled([
-      listener.close(),
-      fileWatcher?.close(),
-      context.dispose()
-    ]);
-  });
-  process.on("SIGINT", cleanExit);
-  process.on("SIGTERM", cleanExit);
-  async function load(isRestart, reason) {
-    if (fileWatcher) {
-      await fileWatcher.close();
-    }
-    const srcDir = path.resolve(config.rootDir ?? "", config.srcDir);
-    const dirsToWatch = [srcDir];
-    if (config.esbuild.alias) {
-      for (const key of Object.keys(config.esbuild.alias)) {
-        const alias = config.esbuild.alias[key];
-        if (alias) {
-          if (!isInsideDir(alias, srcDir)) {
-            dirsToWatch.push(alias);
-          }
-        }
-      }
-    }
-    if (config.devServer.additionalWatchDirs?.length) {
-      for (const dir of config.devServer.additionalWatchDirs) {
-        dirsToWatch.push(dir);
-      }
-    }
-    const buildDir = path.resolve(config.rootDir, config.buildDir);
-    const outDir = path.resolve(config.rootDir, ".output");
-    fileWatcher = watcher.watch(dirsToWatch, {
-      ignoreInitial: true,
-      ignored: [
-        buildDir,
-        outDir,
-        "**/.output",
-        "**/dist/**",
-        "**/node_modules/**",
-        "**/.git/**"
-      ]
-    });
-    fileWatcher.on("all", async (eventName, path2) => {
-      if (eventName === "addDir" || eventName === "add") {
-        return;
-      }
-      await createAppWithRoutesModule(config);
-      let bundleCreated = false;
-      try {
-        logger.log(
-          "Change detected. Bundling files and restarting server...."
-        );
-        await context.rebuild();
-        bundleCreated = true;
-      } catch (err) {
-        logger.error("ERROR", err);
-        bundleCreated = false;
-      }
-      if (bundleCreated && config.generators.length) {
-        setTimeout(async () => {
-          await generateClients(config);
-          bundleCreated = false;
-        }, 1e3);
-      }
-    });
-  }
-  await load();
-}
-async function generateClients(config) {
-  try {
-    const protocol = config.https === true || typeof config.https === "object" ? "https" : "http";
-    if (protocol === "https") {
-      process.env.NODE_TLS_REJECT_UNAUTHORIZED = "0";
-    }
-    const result = await ofetch(
-      `${protocol}://127.0.0.1:${config.port}${DEV_DEFINITION_ENDPOINT}`
-    );
-    if (!isAppDefinition(result)) {
-      return;
-    }
-    logger.log(`Generating client code...`);
-    const clientCount = config.generators.length;
-    await Promise.allSettled(
-      config.generators.map(
-        (generator) => generator.generator(result, true)
-      )
-    );
-    logger.success(
-      `Generated ${clientCount} client${clientCount === 1 ? "" : "s"}`
-    );
-  } catch (err) {
-    logger.error(err);
-  }
-}
-async function createEntryModule(config) {
-  const appModule = path.resolve(config.rootDir, config.srcDir, config.entry);
-  const appImportParts = path.relative(path.resolve(config.rootDir, config.srcDir), appModule).split(".");
-  appImportParts.pop();
-  const virtualEntry = `import { toNodeListener } from 'h3';
-import app from './${GEN_APP_FILE}';
-
-export default app.h3App;`;
-  await fs.writeFile(
-    path.resolve(config.rootDir, config.buildDir, GEN_SERVER_ENTRY_FILE),
-    virtualEntry
-  );
-}
-
 const init = defineCommand({
   meta: {
     name: "Init",

package/dist/index.cjs

@@ -1,49 +1,30 @@
 'use strict';
 
-const config = require('./shared/arri.0628c07d.cjs');
-const h3 = require('h3');
-require('arri-codegen-utils');
-require('arri-validate');
-require('h3-sse');
+const codegenDart = require('@arrirpc/codegen-dart');
+const codegenTs = require('@arrirpc/codegen-ts');
+const codegenKotlin = require('@arrirpc/codegen-kotlin');
+const codegenUtils = require('@arrirpc/codegen-utils');
+const dev = require('./shared/arri.547ce62e.cjs');
+require('node:fs');
+require('node:fs/promises');
+require('@joshmossas/listhen');
+require('c12');
+require('citty');
+require('esbuild');
+require('ofetch');
+require('pathe');
+require('consola');
+require('prettier');
 require('scule');
 
-const defineMiddleware = (middleware) => middleware;
 
-exports.ArriApp = config.ArriApp;
-exports.ArriRouter = config.ArriRouter;
-exports.ArriServerError = config.ArriServerError;
-exports.ArriServerErrorResponse = config.ArriServerErrorResponse;
-exports.DEV_DEFINITION_ENDPOINT = config.DEV_DEFINITION_ENDPOINT;
-exports.DEV_ENDPOINT_ROOT = config.DEV_ENDPOINT_ROOT;
-exports.EventStreamConnection = config.EventStreamConnection;
-exports.WsPeer = config.WsPeer;
-exports.createAppDefinition = config.createAppDefinition;
-exports.createHttpRpcDefinition = config.createHttpRpcDefinition;
-exports.createWsRpcDefinition = config.createWsRpcDefinition;
-exports.defaultConfig = config.defaultConfig;
-exports.defineConfig = config.defineConfig;
-exports.defineError = config.defineError;
-exports.defineEventStreamRpc = config.defineEventStreamRpc;
-exports.defineRoute = config.defineRoute;
-exports.defineRpc = config.defineRpc;
-exports.defineWebsocketRpc = config.defineWebsocketRpc;
-exports.errorResponseFromValidationErrors = config.errorResponseFromValidationErrors;
-exports.getRpcParamName = config.getRpcParamName;
-exports.getRpcPath = config.getRpcPath;
-exports.getRpcResponseName = config.getRpcResponseName;
-exports.handleH3Error = config.handleH3Error;
-exports.handleRoute = config.handleRoute;
-exports.isArriConfig = config.isArriConfig;
-exports.isEventStreamRpc = config.isEventStreamRpc;
-exports.isResolvedArriConfig = config.isResolvedArriConfig;
-exports.isRpc = config.isRpc;
-exports.isRpcParamSchema = config.isRpcParamSchema;
-exports.registerEventStreamRpc = config.registerEventStreamRpc;
-exports.registerRoute = config.registerRoute;
-exports.registerRpc = config.registerRpc;
-exports.registerWebsocketRpc = config.registerWebsocketRpc;
-exports.validateRpcRequestInput = config.validateRpcRequestInput;
-exports.defineMiddleware = defineMiddleware;
-Object.keys(h3).forEach(function (k) {
-    if (k !== 'default' && !Object.prototype.hasOwnProperty.call(exports, k)) exports[k] = h3[k];
-});
+
+exports.dartClientGenerator = codegenDart.dartClientGenerator;
+exports.typescriptClientGenerator = codegenTs.typescriptClientGenerator;
+exports.kotlinClientGenerator = codegenKotlin.kotlinClientGenerator;
+exports.createAppDefinition = codegenUtils.createAppDefinition;
+exports.DEV_DEFINITION_ENDPOINT = dev.DEV_DEFINITION_ENDPOINT;
+exports.defaultConfig = dev.defaultConfig;
+exports.defineConfig = dev.defineConfig;
+exports.isArriConfig = dev.isArriConfig;
+exports.isResolvedArriConfig = dev.isResolvedArriConfig;