arri 0.0.18 → 0.0.20

package/dist/cli.cjs

@@ -2,18 +2,11 @@
 'use strict';
 
 const citty = require('citty');
+const node_child_process = require('node:child_process');
 const fs$e = require('node:fs');
-const ofetch = require('ofetch');
-const require$$0 = require('fs');
-const prettier = require('prettier');
-require('@sinclair/typebox');
-require('h3');
-const app = require('./shared/arri.38792eb4.cjs');
-require('@sinclair/typebox/errors');
-require('@sinclair/typebox/value');
-const dart = require('./shared/arri.234caf5e.cjs');
 const fs$f = require('node:fs/promises');
 const path$e = require('pathe');
+const require$$0 = require('fs');
 const require$$0$1 = require('path');
 const require$$2 = require('os');
 const require$$3 = require('crypto');
@@ -31,29 +24,25 @@ const require$$0$2 = require('util');
 const require$$0$3 = require('stream');
 const consola = require('consola');
 const esbuild = require('esbuild');
+const prettier = require('prettier');
+const app = require('./shared/arri.38792eb4.cjs');
+const index = require('./index.cjs');
 require('node:stream');
+const ofetch = require('ofetch');
+require('@sinclair/typebox');
+require('h3');
+require('@sinclair/typebox/errors');
+require('@sinclair/typebox/value');
+const dart = require('./shared/arri.234caf5e.cjs');
 const listhen = require('listhen');
 require('child_process');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
-function _interopNamespaceCompat(e) {
-    if (e && typeof e === 'object' && 'default' in e) return e;
-    const n = Object.create(null);
-    if (e) {
-        for (const k in e) {
-            n[k] = e[k];
-        }
-    }
-    n.default = e;
-    return n;
-}
-
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs$e);
-const require$$0__default = /*#__PURE__*/_interopDefaultCompat(require$$0);
-const prettier__namespace = /*#__PURE__*/_interopNamespaceCompat(prettier);
 const fs__default$1 = /*#__PURE__*/_interopDefaultCompat(fs$f);
 const path__default$1 = /*#__PURE__*/_interopDefaultCompat(path$e);
+const require$$0__default = /*#__PURE__*/_interopDefaultCompat(require$$0);
 const require$$0__default$1 = /*#__PURE__*/_interopDefaultCompat(require$$0$1);
 const require$$2__default = /*#__PURE__*/_interopDefaultCompat(require$$2);
 const require$$3__default = /*#__PURE__*/_interopDefaultCompat(require$$3);
@@ -65,74 +54,7 @@ const v8__default = /*#__PURE__*/_interopDefaultCompat(v8);
 const require$$0__default$4 = /*#__PURE__*/_interopDefaultCompat(require$$0$4);
 const require$$0__default$2 = /*#__PURE__*/_interopDefaultCompat(require$$0$2);
 const require$$0__default$3 = /*#__PURE__*/_interopDefaultCompat(require$$0$3);
-
-const codegenDart = 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
-    }
-  },
-  async run({ args }) {
-    const isUrl = args.location.startsWith("http://") || args.location.startsWith("https://");
-    let def;
-    if (isUrl) {
-      const result = await ofetch.ofetch(args.location);
-      def = result;
-    } else {
-      if (!fs$e.existsSync(args.location)) {
-        throw new Error(`Unable to find ${args.location}`);
-      }
-      const jsonString = JSON.parse(
-        fs$e.readFileSync(args.location, { encoding: "utf-8" })
-      );
-      def = jsonString;
-    }
-    if (!def) {
-      throw new Error("Unable to load ApplicationDefinition json file");
-    }
-    await dart.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
-    }
-  }
-});
-const codegen = citty.defineCommand({
-  subCommands: {
-    dart: codegenDart,
-    typescript: codegenTypescript
-  }
-});
+const prettier__default = /*#__PURE__*/_interopDefaultCompat(prettier);
 
 var commonjsGlobal = typeof globalThis !== 'undefined' ? globalThis : typeof window !== 'undefined' ? window : typeof global !== 'undefined' ? global : typeof self !== 'undefined' ? self : {};
 
@@ -165,12 +87,12 @@ function getAugmentedNamespace(n) {
 	return a;
 }
 
-var main$3 = {exports: {}};
+var main$2 = {exports: {}};
 
 const name = "dotenv";
 const version$2 = "16.3.1";
 const description = "Loads environment variables from .env file";
-const main$2 = "lib/main.js";
+const main$1 = "lib/main.js";
 const types$2 = "lib/main.d.ts";
 const exports$1 = {
 	".": {
@@ -233,7 +155,7 @@ const _package = {
 	name: name,
 	version: version$2,
 	description: description,
-	main: main$2,
+	main: main$1,
 	types: types$2,
 	exports: exports$1,
 	scripts: scripts,
@@ -248,23 +170,23 @@ const _package = {
 };
 
 const _package$1 = {
-    __proto__: null,
-    browser: browser,
-    default: _package,
-    description: description,
-    devDependencies: devDependencies,
-    engines: engines,
-    exports: exports$1,
-    funding: funding,
-    keywords: keywords$2,
-    license: license,
-    main: main$2,
-    name: name,
-    readmeFilename: readmeFilename,
-    repository: repository,
-    scripts: scripts,
-    types: types$2,
-    version: version$2
+	__proto__: null,
+	browser: browser,
+	default: _package,
+	description: description,
+	devDependencies: devDependencies,
+	engines: engines,
+	exports: exports$1,
+	funding: funding,
+	keywords: keywords$2,
+	license: license,
+	main: main$1,
+	name: name,
+	readmeFilename: readmeFilename,
+	repository: repository,
+	scripts: scripts,
+	types: types$2,
+	version: version$2
 };
 
 const require$$4 = /*@__PURE__*/getAugmentedNamespace(_package$1);
@@ -574,15 +496,15 @@ const DotenvModule = {
   populate
 };
 
-main$3.exports.configDotenv = DotenvModule.configDotenv;
-main$3.exports._configVault = DotenvModule._configVault;
-main$3.exports._parseVault = DotenvModule._parseVault;
-main$3.exports.config = DotenvModule.config;
-main$3.exports.decrypt = DotenvModule.decrypt;
-var parse_1$2 = main$3.exports.parse = DotenvModule.parse;
-main$3.exports.populate = DotenvModule.populate;
+main$2.exports.configDotenv = DotenvModule.configDotenv;
+main$2.exports._configVault = DotenvModule._configVault;
+main$2.exports._parseVault = DotenvModule._parseVault;
+main$2.exports.config = DotenvModule.config;
+main$2.exports.decrypt = DotenvModule.decrypt;
+var parse_1$2 = main$2.exports.parse = DotenvModule.parse;
+main$2.exports.populate = DotenvModule.populate;
 
-main$3.exports = DotenvModule;
+main$2.exports = DotenvModule;
 
 const suspectProtoRx = /"(?:_|\\u0{2}5[Ff]){2}(?:p|\\u0{2}70)(?:r|\\u0{2}72)(?:o|\\u0{2}6[Ff])(?:t|\\u0{2}74)(?:o|\\u0{2}6[Ff])(?:_|\\u0{2}5[Ff]){2}"\s*:/;
 const suspectConstructorRx = /"(?:c|\\u0063)(?:o|\\u006[Ff])(?:n|\\u006[Ee])(?:s|\\u0073)(?:t|\\u0074)(?:r|\\u0072)(?:u|\\u0075)(?:c|\\u0063)(?:t|\\u0074)(?:o|\\u006[Ff])(?:r|\\u0072)"\s*:/;
@@ -19887,9 +19809,294 @@ const globby = normalizeArguments(async (patterns, options) => {
 	return unionFastGlobResults(results, filter);
 });
 
+async function setupWorkingDir(config) {
+  const arriDir = path__default$1.resolve(config.rootDir, config.buildDir);
+  const outDir = path__default$1.resolve(config.rootDir, ".output");
+  if (fs$e.existsSync(arriDir)) {
+    await fs__default$1.rm(arriDir, { recursive: true, force: true });
+  }
+  if (fs$e.existsSync(outDir)) {
+    await fs__default$1.rm(outDir, { recursive: true, force: true });
+  }
+  await fs__default$1.mkdir(arriDir);
+  await fs__default$1.mkdir(outDir);
+}
+async function createRoutesModule(config) {
+  const routes = [];
+  await Promise.all(
+    config.procedureGlobPatterns.map(async (pattern) => {
+      const results = await getVirtualRouteBatch(pattern, config);
+      for (const result of results) {
+        routes.push(result);
+      }
+    })
+  );
+  routes.sort((a, b) => a.name < b.name ? -1 : 1);
+  const module = await prettier__default.format(
+    `${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")}
+        ];
+        export default routes`,
+    { parser: "typescript", tabWidth: 4 }
+  );
+  await fs__default$1.writeFile(
+    path__default$1.resolve(config.rootDir, config.buildDir, "routes.ts"),
+    module
+  );
+}
+async function getVirtualRouteBatch(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__default$1.relative(path__default$1.resolve(config.rootDir, config.buildDir), file).split(".");
+      importParts.pop();
+      routes.push({
+        name: meta.id,
+        importName: app.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) => app.removeDisallowedChars(part, disallowedNameChars));
+  const fileNameParts = fileName.split(".");
+  if (!fileNameParts.length) {
+    return void 0;
+  }
+  const rpcName = app.removeDisallowedChars(
+    fileNameParts[0],
+    disallowedNameChars
+  );
+  const httpParts = [
+    ...serviceParts.map((part) => app.kebabCase(part)),
+    app.kebabCase(rpcName)
+  ];
+  return {
+    id: [...serviceParts, rpcName].join("."),
+    httpPath: `/${httpParts.join("/")}`
+  };
+};
+
+const build = citty.defineCommand({
+  args: {
+    config: {
+      type: "string",
+      description: "Path to the arri config file",
+      alias: "c",
+      default: "./arri.config.ts"
+    },
+    skipCodegen: {
+      type: "boolean",
+      default: false
+    }
+  },
+  async run({ args }) {
+    const { config } = await loadConfig({
+      configFile: args.config,
+      defaultConfig: index.defaultConfig
+    });
+    if (!config) {
+      throw new Error("Unable to find arri config");
+    }
+    await startBuild(config);
+  }
+});
+const logger$1 = consola.createConsola({
+  fancy: true
+}).withTag("arri");
+async function startBuild(config) {
+  logger$1.log("Bundling server....");
+  await setupWorkingDir(config);
+  await Promise.all([
+    createRoutesModule(config),
+    createBuildEntryModule(config),
+    createBuildCodegenModule(config)
+  ]);
+  await bundleFiles$1(config);
+  logger$1.log("Finished bundling");
+  const clientCount = config.clientGenerators.length;
+  const codegenModule = path__default$1.resolve(config.rootDir, ".output", "codegen.js");
+  if (clientCount > 0) {
+    logger$1.log("Generating clients");
+    node_child_process.execSync(`node ${codegenModule}`);
+    const defJson = path__default$1.resolve(
+      config.rootDir,
+      ".output",
+      "__definition.json"
+    );
+    const def = JSON.parse(fs$e.readFileSync(defJson, { encoding: "utf-8" }));
+    if (app.isApplicationDef(def)) {
+      await Promise.all(
+        config.clientGenerators.map((plugin) => plugin.generator(def))
+      );
+    }
+    logger$1.log(`${clientCount} clients generated`);
+  } else {
+    logger$1.log("No client generators specified. Skipping codegen.");
+  }
+  logger$1.log("Cleaning up files");
+  await fs__default$1.rm(codegenModule);
+  logger$1.log(
+    `Build finished! You can start your server by running "node .output/server.js"`
+  );
+}
+async function bundleFiles$1(config) {
+  await esbuild.build({
+    ...config.esbuild,
+    entryPoints: [
+      path__default$1.resolve(config.rootDir, config.buildDir, "server.ts"),
+      path__default$1.resolve(config.rootDir, config.buildDir, "codegen.ts")
+    ],
+    platform: config.esbuild.platform ?? "node",
+    target: config.esbuild.target ?? "node18",
+    bundle: true,
+    outdir: path__default$1.resolve(config.rootDir, ".output")
+  });
+}
+async function createBuildEntryModule(config) {
+  const appModule = path__default$1.resolve(config.rootDir, config.srcDir, config.entry);
+  const appImportParts = path__default$1.relative(path__default$1.resolve(config.rootDir, config.buildDir), appModule).split(".");
+  appImportParts.pop();
+  const virtualEntry = `import { toNodeListener } from 'h3';
+import { listen } from 'listhen';
+import routes from './routes';
+import app from './${appImportParts.join(".")}';
+
+for (const route of routes) {
+    app.registerRpc(route.id, route.route);
+}
+
+void listen(toNodeListener(app.getH3Instance()), {
+    port: process.env.PORT ?? ${config.port},
+});`;
+  await fs__default$1.writeFile(
+    path__default$1.resolve(config.rootDir, config.buildDir, "server.ts"),
+    virtualEntry
+  );
+}
+async function createBuildCodegenModule(config) {
+  const appModule = path__default$1.resolve(config.rootDir, config.srcDir, config.entry);
+  const appImportParts = path__default$1.relative(path__default$1.resolve(config.rootDir, config.buildDir), appModule).split(".");
+  appImportParts.pop();
+  const virtualModule = await prettier__default.format(
+    `
+    import { writeFileSync } from 'node:fs';
+    import path from 'pathe';
+    import app from './${appImportParts.join(".")}';
+
+    const def = app.getAppDefinition();
+    writeFileSync(
+        path.resolve(__dirname, "__definition.json"),
+        JSON.stringify(def),
+    );`,
+    { tabWidth: 4, parser: "typescript" }
+  );
+  await fs__default$1.writeFile(
+    path__default$1.resolve(config.rootDir, config.buildDir, "codegen.ts"),
+    virtualModule
+  );
+}
+
+const codegenDart = 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
+    }
+  },
+  async run({ args }) {
+    const isUrl = args.location.startsWith("http://") || args.location.startsWith("https://");
+    let def;
+    if (isUrl) {
+      const result = await ofetch.ofetch(args.location);
+      def = result;
+    } else {
+      if (!fs$e.existsSync(args.location)) {
+        throw new Error(`Unable to find ${args.location}`);
+      }
+      const jsonString = JSON.parse(
+        fs$e.readFileSync(args.location, { encoding: "utf-8" })
+      );
+      def = jsonString;
+    }
+    if (!def) {
+      throw new Error("Unable to load ApplicationDefinition json file");
+    }
+    await dart.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
+    }
+  }
+});
+const codegen = citty.defineCommand({
+  subCommands: {
+    dart: codegenDart,
+    typescript: codegenTypescript
+  }
+});
+
 const logger = consola.createConsola({
   fancy: true
-}).withTag("[arri]");
+}).withTag("arri");
 const dev = citty.defineCommand({
   meta: {
     name: "dev",
@@ -19906,14 +20113,19 @@ const dev = citty.defineCommand({
   async run({ args }) {
     process.env.ARRI_DEV_MODE = "true";
     const config = await loadConfig({
-      configFile: path__default$1.resolve(args.config)
+      configFile: path__default$1.resolve(args.config),
+      defaultConfig: index.defaultConfig
     });
-    await main$1(config.config);
+    if (!config) {
+      throw new Error("Unable to find config");
+    }
+    await startDevServer(config.config);
   }
 });
 async function bundleFiles(config) {
   const outDir = path__default$1.resolve(config.rootDir, ".output");
   await esbuild.build({
+    ...config.esbuild,
     entryPoints: [
       path__default$1.resolve(config.rootDir, config.buildDir, "entry.ts")
     ],
@@ -19923,16 +20135,18 @@ async function bundleFiles(config) {
     platform: "node"
   });
 }
-async function main$1(config) {
+const startListener = (config, showQr = false) => listhen.listenAndWatch(path__default$1.resolve(config.rootDir, ".output", "entry.js"), {
+  public: true,
+  port: config.port,
+  logger,
+  qr: showQr
+});
+async function startDevServer(config) {
   await setupWorkingDir(config);
   let fileWatcher;
   await Promise.all([createRoutesModule(config), createEntryModule(config)]);
   await bundleFiles(config);
-  await listhen.listenAndWatch(path__default$1.resolve(config.rootDir, ".output", "entry.js"), {
-    public: true,
-    port: config.port,
-    logger
-  });
+  let listener = await startListener(config, true);
   setTimeout(async () => {
     await generateClients(config);
   }, 1e3);
@@ -19955,8 +20169,12 @@ async function main$1(config) {
         await createRoutesModule(config);
         let bundleCreated = false;
         try {
-          logger.log("Change detected. Bundling files....");
+          logger.log(
+            "Change detected. Bundling files and restarting server...."
+          );
           await bundleFiles(config);
+          await listener.close();
+          listener = await startListener(config);
           bundleCreated = true;
         } catch (err) {
           logger.error(err);
@@ -19996,18 +20214,6 @@ async function generateClients(config) {
     console.error(err);
   }
 }
-async function setupWorkingDir(config) {
-  const arriDir = path__default$1.resolve(config.rootDir, config.buildDir);
-  const outDir = path__default$1.resolve(config.rootDir, ".output");
-  if (fs$e.existsSync(arriDir)) {
-    await fs__default$1.rm(arriDir, { recursive: true, force: true });
-  }
-  if (fs$e.existsSync(outDir)) {
-    await fs__default$1.rm(outDir, { recursive: true, force: true });
-  }
-  await fs__default$1.mkdir(arriDir);
-  await fs__default$1.mkdir(outDir);
-}
 async function createEntryModule(config) {
   const appModule = path__default$1.resolve(config.rootDir, config.srcDir, config.entry);
   const appImportParts = path__default$1.relative(path__default$1.resolve(config.rootDir, config.buildDir), appModule).split(".");
@@ -20027,93 +20233,10 @@ export default app.getH3Instance();`;
     virtualEntry
   );
 }
-async function createRoutesModule(config) {
-  const routes = [];
-  await Promise.all(
-    config.procedureGlobPatterns.map(async (pattern) => {
-      const results = await getVirtualRouteBatch(pattern, config);
-      for (const result of results) {
-        routes.push(result);
-      }
-    })
-  );
-  routes.sort((a, b) => a.name < b.name ? -1 : 1);
-  const module = await prettier__namespace.format(
-    `${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")}
-        ];
-        export default routes`,
-    { parser: "typescript", tabWidth: 4 }
-  );
-  await fs__default$1.writeFile(
-    path__default$1.resolve(config.rootDir, config.buildDir, "routes.ts"),
-    module
-  );
-}
-async function getVirtualRouteBatch(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__default$1.relative(path__default$1.resolve(config.rootDir, config.buildDir), file).split(".");
-      importParts.pop();
-      routes.push({
-        name: meta.id,
-        importName: app.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) => app.removeDisallowedChars(part, disallowedNameChars));
-  const fileNameParts = fileName.split(".");
-  if (!fileNameParts.length) {
-    return void 0;
-  }
-  const rpcName = app.removeDisallowedChars(
-    fileNameParts[0],
-    disallowedNameChars
-  );
-  const httpParts = [
-    ...serviceParts.map((part) => app.kebabCase(part)),
-    app.kebabCase(rpcName)
-  ];
-  return {
-    id: [...serviceParts, rpcName].join("."),
-    httpPath: `/${httpParts.join("/")}`
-  };
-};
 
 const main = citty.defineCommand({
   subCommands: {
+    build,
     dev,
     codegen
   }