arri 0.44.0 → 0.45.0

package/dist/shared/arri.e5993636.mjs

@@ -0,0 +1,403 @@
+import { existsSync } from 'node:fs';
+import fs from 'node:fs/promises';
+import { removeDisallowedChars, isAppDefinition } from '@arrirpc/codegen-utils';
+import { listenAndWatch } from '@joshmossas/listhen';
+import { loadConfig } from 'c12';
+import { defineCommand } from 'citty';
+import * as esbuild from 'esbuild';
+import { ofetch } from 'ofetch';
+import path from 'pathe';
+import { createConsola } from 'consola';
+import prettier from 'prettier';
+import { camelCase, kebabCase } from 'scule';
+
+function isArriConfig(input) {
+  if (typeof input !== "object" || input === null) {
+    return false;
+  }
+  if ("generators" in input) {
+    if (!Array.isArray(input.generators)) {
+      return false;
+    }
+  }
+  if ("port" in input) {
+    if (typeof input.port !== "number") {
+      return false;
+    }
+    if (Number.isNaN(input.port)) {
+      return false;
+    }
+  }
+  if ("entry" in input && typeof input.entry !== "string") {
+    return false;
+  }
+  return true;
+}
+function isResolvedArriConfig(input) {
+  if (!isArriConfig(input)) {
+    return false;
+  }
+  return typeof input.rootDir === "string" && typeof input.srcDir === "string" && (typeof input.procedureDir === "string" || typeof input.procedureDir === "boolean") && Array.isArray(input.procedureGlobPatterns) && Array.isArray(input.generators);
+}
+const defaultConfig = {
+  port: 3e3,
+  rootDir: ".",
+  srcDir: "src",
+  entry: "app.ts",
+  serverEntry: "",
+  procedureDir: "procedures",
+  procedureGlobPatterns: ["**/*.rpc.ts"],
+  generators: [],
+  buildDir: ".arri",
+  esbuild: {},
+  https: false,
+  http2: false,
+  devServer: {}
+};
+function defineConfig(config) {
+  return {
+    port: config.port ?? defaultConfig.port,
+    rootDir: config.rootDir ?? defaultConfig.rootDir,
+    srcDir: config.srcDir ?? defaultConfig.srcDir,
+    entry: config.entry ?? defaultConfig.entry,
+    procedureDir: config.procedureDir ?? defaultConfig.procedureDir,
+    procedureGlobPatterns: config.procedureGlobPatterns ?? defaultConfig.procedureGlobPatterns,
+    generators: config.generators ?? defaultConfig.generators,
+    buildDir: config.buildDir ?? defaultConfig.buildDir,
+    esbuild: config.esbuild ?? defaultConfig.esbuild,
+    serverEntry: config.serverEntry ?? "",
+    https: config.https ?? false,
+    http2: config.http2 ?? false,
+    devServer: config.devServer ?? {}
+  };
+}
+
+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 glob = await import('globby');
+  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(glob.globby, 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(glob, globPattern, config) {
+  if (!config.procedureDir) {
+    return [];
+  }
+  const target = `${config.rootDir}/${config.srcDir}/${config.procedureDir}/${globPattern}`.split("//").join("/").split("//").join("/");
+  const files = await glob(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;
+}
+
+const DEV_ENDPOINT_ROOT = `/__arri_dev__`;
+const DEV_DEFINITION_ENDPOINT = `${DEV_ENDPOINT_ROOT}/__definition`;
+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
+  );
+}
+
+export { DEV_DEFINITION_ENDPOINT as D, GEN_APP_FILE as G, OUT_CODEGEN as O, isResolvedArriConfig as a, defineConfig as b, createAppWithRoutesModule as c, defaultConfig as d, OUT_SERVER_ENTRY as e, OUT_APP_FILE as f, dev as g, isArriConfig as i, logger as l, setupWorkingDir as s };

package/package.json

@@ -1,60 +1,50 @@
 {
   "name": "arri",
-  "version": "0.44.0",
+  "version": "0.45.0",
   "type": "module",
   "license": "MIT",
   "author": {
     "name": "joshmossas",
     "url": "https://github.com/joshmossas"
   },
-  "main": "./dist/index.cjs",
-  "module": "./dist/index.mjs",
-  "types": "./dist/index.d.ts",
-  "files": [
-    "dist"
-  ],
+  "bin": {
+    "arri": "./dist/cli.mjs"
+  },
   "bugs": {
     "url": "https://github.com/modiimedia/arri/issues"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/modiimedia/arri.git",
-    "directory": "packages/arri"
-  },
-  "bin": {
-    "arri": "./dist/cli.mjs"
+    "directory": "tooling/cli"
   },
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.ts",
+  "files": [
+    "dist"
+  ],
   "dependencies": {
-    "@joshmossas/listhen": "1.10.1",
-    "@parcel/watcher": "^2.4.1",
-    "@types/source-map-support": "^0.5.10",
+    "@joshmossas/listhen": "^1.10.1",
     "c12": "^1.10.0",
     "chokidar": "^3.6.0",
     "citty": "^0.1.6",
     "consola": "^3.2.3",
-    "crossws": "^0.2.4",
     "degit": "^2.8.4",
     "enquirer": "^2.4.1",
     "esbuild": "^0.21.2",
     "esbuild-plugin-replace": "^1.4.0",
     "globby": "^14.0.1",
-    "h3": "^1.11.1",
-    "h3-sse": "^0.0.12",
-    "jiti": "^1.21.0",
     "ofetch": "^1.3.4",
     "pathe": "^1.1.2",
     "prettier": "^3.2.5",
     "scule": "^1.3.0",
-    "source-map-support": "^0.5.21",
-    "uncrypto": "^0.1.3",
-    "arri-codegen-dart": "0.44.0",
-    "arri-codegen-ts": "0.44.0",
-    "arri-codegen-kotlin": "0.44.0",
-    "arri-codegen-utils": "0.44.0",
-    "arri-validate": "0.44.0"
+    "@arrirpc/codegen-dart": "0.45.0",
+    "@arrirpc/codegen-kotlin": "0.45.0",
+    "@arrirpc/codegen-ts": "0.45.0",
+    "@arrirpc/codegen-utils": "0.45.0"
   },
   "devDependencies": {
-    "@types/degit": "^2.8.6",
-    "bun-types": "^1.1.8"
+    "@types/degit": "^2.8.6"
   }
 }

package/dist/codegen.cjs

@@ -1,13 +0,0 @@
-'use strict';
-
-const arriCodegenDart = require('arri-codegen-dart');
-const arriCodegenTs = require('arri-codegen-ts');
-const arriCodegenKotlin = require('arri-codegen-kotlin');
-const arriCodegenUtils = require('arri-codegen-utils');
-
-
-
-exports.dartClientGenerator = arriCodegenDart.dartClientGenerator;
-exports.typescriptClientGenerator = arriCodegenTs.typescriptClientGenerator;
-exports.kotlinClientGenerator = arriCodegenKotlin.kotlinClientGenerator;
-exports.createAppDefinition = arriCodegenUtils.createAppDefinition;

package/dist/codegen.d.cts

@@ -1,4 +0,0 @@
-export { dartClientGenerator } from 'arri-codegen-dart';
-export { typescriptClientGenerator } from 'arri-codegen-ts';
-export { kotlinClientGenerator } from 'arri-codegen-kotlin';
-export { AppDefinition, createAppDefinition } from 'arri-codegen-utils';

package/dist/codegen.d.mts

@@ -1,4 +0,0 @@
-export { dartClientGenerator } from 'arri-codegen-dart';
-export { typescriptClientGenerator } from 'arri-codegen-ts';
-export { kotlinClientGenerator } from 'arri-codegen-kotlin';
-export { AppDefinition, createAppDefinition } from 'arri-codegen-utils';

package/dist/codegen.d.ts

@@ -1,4 +0,0 @@
-export { dartClientGenerator } from 'arri-codegen-dart';
-export { typescriptClientGenerator } from 'arri-codegen-ts';
-export { kotlinClientGenerator } from 'arri-codegen-kotlin';
-export { AppDefinition, createAppDefinition } from 'arri-codegen-utils';

package/dist/codegen.mjs

@@ -1,4 +0,0 @@
-export { dartClientGenerator } from 'arri-codegen-dart';
-export { typescriptClientGenerator } from 'arri-codegen-ts';
-export { kotlinClientGenerator } from 'arri-codegen-kotlin';
-export { createAppDefinition } from 'arri-codegen-utils';