arri 0.80.1 → 0.80.3

package/dist/index.cjs

@@ -8,10 +8,11 @@ const typescriptCodegen = require('@arrirpc/codegen-ts');
 const common = require('./shared/arri.pHQOQ5Wb.cjs');
 const node_child_process = require('node:child_process');
 const fs = require('node:fs');
+const node_process = require('node:process');
 const chokidar = require('chokidar');
 const path = require('pathe');
-const fs$1 = require('node:fs/promises');
 const os = require('node:os');
+const fs$1 = require('node:fs/promises');
 const codegenUtils = require('@arrirpc/codegen-utils');
 const listhen = require('@joshmossas/listhen');
 const esbuild = require('esbuild');
@@ -46,11 +47,33 @@ const typescriptCodegen__namespace = /*#__PURE__*/_interopNamespaceCompat(typesc
 const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 const chokidar__default = /*#__PURE__*/_interopDefaultCompat(chokidar);
 const path__default = /*#__PURE__*/_interopDefaultCompat(path);
-const fs__namespace = /*#__PURE__*/_interopNamespaceCompat(fs$1);
 const os__default = /*#__PURE__*/_interopDefaultCompat(os);
+const fs__namespace = /*#__PURE__*/_interopNamespaceCompat(fs$1);
 const esbuild__default = /*#__PURE__*/_interopDefaultCompat(esbuild);
 const prettier__default = /*#__PURE__*/_interopDefaultCompat(prettier);
 
+function createWindowsCompatibleImportPath(input, prefixWithFile = true) {
+  let separator;
+  for (const char of input) {
+    if (char === "\\") {
+      separator = "\\";
+      break;
+    }
+    if (char === "/") {
+      separator = "/";
+    }
+  }
+  const parts = input.split(separator ?? "/");
+  if (parts[0]?.endsWith(":") && prefixWithFile) {
+    parts.unshift("file:\\");
+  }
+  const newStr = parts.join("\\");
+  return newStr;
+}
+function isOnWindows() {
+  return os__default.type() === "Windows_NT";
+}
+
 function goServer(options = {}) {
   const outDir = options.outputDir ?? ".output";
   const resolvedOutDir = options.cwd ? path__default.resolve(options.cwd, outDir) : outDir;
@@ -78,14 +101,17 @@ function goServer(options = {}) {
         cwd: options.cwd
       });
       let childProcess;
+      common.logger.info(`Starting server`);
+      const buildCmd = goBuildCommand(outDir);
+      const startCmd = goStartServerCommand(outDir);
       async function spawnProcess() {
         try {
-          node_child_process.execSync(`go build -o ${outDir}/server`, {
+          node_child_process.execSync(buildCmd, {
             stdio: "inherit",
             cwd: options.cwd
           });
           childProcess = node_child_process.spawn(
-            `${outDir}/server`,
+            startCmd,
             [`--def-out=${outDir}/__definition.json`],
             {
               stdio: "inherit",
@@ -182,15 +208,16 @@ function goServer(options = {}) {
       if (!fs__default.existsSync(outDir)) {
         fs__default.mkdirSync(outDir);
       }
-      node_child_process.execSync(`go build -o ${outDir}/server`, {
-        stdio: "inherit"
+      const buildCmd = goBuildCommand(outDir);
+      const startCmd = goStartServerCommand(outDir);
+      node_child_process.execSync(buildCmd, {
+        stdio: "inherit",
+        cwd: options.cwd
+      });
+      node_child_process.execSync(`${startCmd} def -output ${outDir}/__definition.json`, {
+        stdio: "inherit",
+        cwd: options.cwd ?? node_process.cwd()
       });
-      node_child_process.execSync(
-        `${outDir}/server def -output ${outDir}/__definition.json`,
-        {
-          stdio: "inherit"
-        }
-      );
       if (generators.length === 0) {
         common.logger.warn(
           "No generators specified in arri config. Skipping codegen."
@@ -211,6 +238,18 @@ function goServer(options = {}) {
     }
   });
 }
+function goBuildCommand(outDir) {
+  if (isOnWindows()) {
+    return `go build -o ${outDir}/server.exe`;
+  }
+  return `go build -o ${outDir}/server`;
+}
+function goStartServerCommand(outDir) {
+  if (isOnWindows()) {
+    return `.\\${outDir}\\server.exe`;
+  }
+  return `./${outDir}/server`;
+}
 
 function tsServer(serverConfig) {
   return common.defineServerConfig({
@@ -298,31 +337,37 @@ async function startBuild(generators, serverConfig, skipCodeGen = false) {
   await setupWorkingDir(serverConfig);
   await Promise.all([
     createAppWithRoutesModule(serverConfig),
-    createServerEntryFile(serverConfig),
-    createCodegenEntryFile(serverConfig)
+    createServerEntryFile(serverConfig)
+    // createCodegenEntryFile(serverConfig),
   ]);
   await bundleAppEntry(serverConfig);
   common.logger.log("Finished bundling");
   const clientCount = generators.length ?? 0;
-  const codegenModule = path__default.resolve(
-    serverConfig.rootDir,
-    ".output",
-    OUT_CODEGEN
-  );
   if (!skipCodeGen) {
     common.logger.log("Generating Arri app definition (__definition.json)");
-    node_child_process.execSync(`node ${codegenModule}`, { env: process.env });
-    const defJson = path__default.resolve(
+    let appImportPath = path__default.resolve(
       serverConfig.rootDir,
       ".output",
-      "__definition.json"
+      OUT_APP_FILE
     );
-    const def = JSON.parse(fs.readFileSync(defJson, { encoding: "utf-8" }));
-    if (codegenUtils.isAppDefinition(def) && clientCount > 0) {
+    if (isOnWindows()) {
+      appImportPath = createWindowsCompatibleImportPath(appImportPath);
+    }
+    const app = (await import(appImportPath)).default;
+    const appDef = app.getAppDefinition();
+    if (codegenUtils.isAppDefinition(appDef) && clientCount > 0) {
+      fs__namespace.writeFile(
+        path__default.resolve(
+          serverConfig.rootDir,
+          ".output",
+          "__definition.json"
+        ),
+        JSON.stringify(appDef)
+      );
       const startTime = (/* @__PURE__ */ new Date()).getTime();
       common.logger.log(`Generating ${clientCount} client(s)...`);
       await Promise.all(
-        generators.map((generator) => generator.run(def, false)) ?? []
+        generators.map((generator) => generator.run(appDef, false)) ?? []
       );
       common.logger.log(
         `${clientCount} client(s) generated in ${(/* @__PURE__ */ new Date()).getTime() - startTime}ms`
@@ -335,11 +380,10 @@ async function startBuild(generators, serverConfig, skipCodeGen = false) {
   } else {
     common.logger.log("Skipping codegen");
   }
-  common.logger.log("Cleaning up files");
-  await fs__namespace.rm(codegenModule);
   common.logger.success(
     `Build finished! You can start your server by running "node .output/${OUT_SERVER_ENTRY}"`
   );
+  process.exit(0);
 }
 async function bundleAppEntry(config, _allowCodegen = true) {
   const appEntry = path__default.resolve(
@@ -424,30 +468,6 @@ void listen(toNodeListener(app.h3App), {
     virtualEntry
   );
 }
-async function createCodegenEntryFile(config) {
-  const appModule = path__default.resolve(config.rootDir, config.srcDir, config.entry);
-  const appImportParts = path__default.relative(path__default.resolve(config.rootDir, config.srcDir), appModule).split(".");
-  appImportParts.pop();
-  const virtualModule = await prettier__default.format(
-    `
-    import { writeFileSync } from 'node:fs';
-    import path from 'node:path';
-    import app from './${OUT_APP_FILE}';
-
-    const __dirname = new URL(".", import.meta.url).pathname;
-    const def = app.getAppDefinition();
-    writeFileSync(
-        path.resolve(__dirname, "../.output", "__definition.json"),
-        JSON.stringify(def),
-    );
-    process.exit(0);`,
-    { tabWidth: 4, parser: "typescript" }
-  );
-  await fs__namespace.writeFile(
-    path__default.resolve(config.rootDir, ".output", OUT_CODEGEN),
-    virtualModule
-  );
-}
 async function bundleFilesContext(config) {
   return await esbuild__default.context({
     ...config.esbuild,
@@ -513,8 +533,8 @@ async function createDevServer(config) {
       ".output",
       `${OUT_APP_FILE}?version=${Date.now()}`
     );
-    if (os__default.type() === "Windows_NT") {
-      importPath = createWindowsCompatibleAbsoluteImport(importPath);
+    if (isOnWindows()) {
+      importPath = createWindowsCompatibleImportPath(importPath);
     }
     const appEntry = (await import(importPath)).default;
     dynamicHandler.set(h3.fromNodeMiddleware(appEntry.h3App.handler));
@@ -530,24 +550,6 @@ async function createDevServer(config) {
     ws
   };
 }
-function createWindowsCompatibleAbsoluteImport(input) {
-  let separator;
-  for (const char of input) {
-    if (char === "\\") {
-      separator = "\\";
-      break;
-    }
-    if (char === "/") {
-      separator = "/";
-    }
-  }
-  const parts = input.split(separator ?? "/");
-  if (parts[0]?.endsWith(":")) {
-    parts.unshift("file:\\");
-  }
-  const newStr = parts.join("\\");
-  return newStr;
-}
 async function startDevServer(config, generators) {
   await setupWorkingDir(config);
   const watcher = await import('chokidar');
@@ -663,7 +665,6 @@ async function generateClientsFromDefinition(appDef, generators, isDev) {
 const GEN_APP_FILE = "__arri_app.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__default.resolve(config.rootDir, config.buildDir);
   const outDir = path__default.resolve(config.rootDir, ".output");

package/dist/index.mjs

@@ -6,11 +6,12 @@ import * as typescriptCodegen from '@arrirpc/codegen-ts';
 import { d as defineServerConfig, l as logger, i as isInsideDir } from './shared/arri.CGlJ9Ywd.mjs';
 export { D as DEV_DEFINITION_ENDPOINT, b as defineConfig, a as isArriConfig, c as isServerConfig } from './shared/arri.CGlJ9Ywd.mjs';
 import { execSync, spawn } from 'node:child_process';
-import fs$1, { existsSync, readFileSync } from 'node:fs';
+import fs$1, { existsSync } from 'node:fs';
+import { cwd } from 'node:process';
 import chokidar from 'chokidar';
 import path from 'pathe';
-import * as fs from 'node:fs/promises';
 import os from 'node:os';
+import * as fs from 'node:fs/promises';
 import { isAppDefinition, camelCase, removeDisallowedChars, kebabCase } from '@arrirpc/codegen-utils';
 export { createAppDefinition } from '@arrirpc/codegen-utils';
 import { listen } from '@joshmossas/listhen';
@@ -24,6 +25,28 @@ import '@arrirpc/schema';
 import 'consola';
 import 'ofetch';
 
+function createWindowsCompatibleImportPath(input, prefixWithFile = true) {
+  let separator;
+  for (const char of input) {
+    if (char === "\\") {
+      separator = "\\";
+      break;
+    }
+    if (char === "/") {
+      separator = "/";
+    }
+  }
+  const parts = input.split(separator ?? "/");
+  if (parts[0]?.endsWith(":") && prefixWithFile) {
+    parts.unshift("file:\\");
+  }
+  const newStr = parts.join("\\");
+  return newStr;
+}
+function isOnWindows() {
+  return os.type() === "Windows_NT";
+}
+
 function goServer(options = {}) {
   const outDir = options.outputDir ?? ".output";
   const resolvedOutDir = options.cwd ? path.resolve(options.cwd, outDir) : outDir;
@@ -51,14 +74,17 @@ function goServer(options = {}) {
         cwd: options.cwd
       });
       let childProcess;
+      logger.info(`Starting server`);
+      const buildCmd = goBuildCommand(outDir);
+      const startCmd = goStartServerCommand(outDir);
       async function spawnProcess() {
         try {
-          execSync(`go build -o ${outDir}/server`, {
+          execSync(buildCmd, {
             stdio: "inherit",
             cwd: options.cwd
           });
           childProcess = spawn(
-            `${outDir}/server`,
+            startCmd,
             [`--def-out=${outDir}/__definition.json`],
             {
               stdio: "inherit",
@@ -155,15 +181,16 @@ function goServer(options = {}) {
       if (!fs$1.existsSync(outDir)) {
         fs$1.mkdirSync(outDir);
       }
-      execSync(`go build -o ${outDir}/server`, {
-        stdio: "inherit"
+      const buildCmd = goBuildCommand(outDir);
+      const startCmd = goStartServerCommand(outDir);
+      execSync(buildCmd, {
+        stdio: "inherit",
+        cwd: options.cwd
+      });
+      execSync(`${startCmd} def -output ${outDir}/__definition.json`, {
+        stdio: "inherit",
+        cwd: options.cwd ?? cwd()
       });
-      execSync(
-        `${outDir}/server def -output ${outDir}/__definition.json`,
-        {
-          stdio: "inherit"
-        }
-      );
       if (generators.length === 0) {
         logger.warn(
           "No generators specified in arri config. Skipping codegen."
@@ -184,6 +211,18 @@ function goServer(options = {}) {
     }
   });
 }
+function goBuildCommand(outDir) {
+  if (isOnWindows()) {
+    return `go build -o ${outDir}/server.exe`;
+  }
+  return `go build -o ${outDir}/server`;
+}
+function goStartServerCommand(outDir) {
+  if (isOnWindows()) {
+    return `.\\${outDir}\\server.exe`;
+  }
+  return `./${outDir}/server`;
+}
 
 function tsServer(serverConfig) {
   return defineServerConfig({
@@ -271,31 +310,37 @@ async function startBuild(generators, serverConfig, skipCodeGen = false) {
   await setupWorkingDir(serverConfig);
   await Promise.all([
     createAppWithRoutesModule(serverConfig),
-    createServerEntryFile(serverConfig),
-    createCodegenEntryFile(serverConfig)
+    createServerEntryFile(serverConfig)
+    // createCodegenEntryFile(serverConfig),
   ]);
   await bundleAppEntry(serverConfig);
   logger.log("Finished bundling");
   const clientCount = generators.length ?? 0;
-  const codegenModule = path.resolve(
-    serverConfig.rootDir,
-    ".output",
-    OUT_CODEGEN
-  );
   if (!skipCodeGen) {
     logger.log("Generating Arri app definition (__definition.json)");
-    execSync(`node ${codegenModule}`, { env: process.env });
-    const defJson = path.resolve(
+    let appImportPath = path.resolve(
       serverConfig.rootDir,
       ".output",
-      "__definition.json"
+      OUT_APP_FILE
     );
-    const def = JSON.parse(readFileSync(defJson, { encoding: "utf-8" }));
-    if (isAppDefinition(def) && clientCount > 0) {
+    if (isOnWindows()) {
+      appImportPath = createWindowsCompatibleImportPath(appImportPath);
+    }
+    const app = (await import(appImportPath)).default;
+    const appDef = app.getAppDefinition();
+    if (isAppDefinition(appDef) && clientCount > 0) {
+      fs.writeFile(
+        path.resolve(
+          serverConfig.rootDir,
+          ".output",
+          "__definition.json"
+        ),
+        JSON.stringify(appDef)
+      );
       const startTime = (/* @__PURE__ */ new Date()).getTime();
       logger.log(`Generating ${clientCount} client(s)...`);
       await Promise.all(
-        generators.map((generator) => generator.run(def, false)) ?? []
+        generators.map((generator) => generator.run(appDef, false)) ?? []
       );
       logger.log(
         `${clientCount} client(s) generated in ${(/* @__PURE__ */ new Date()).getTime() - startTime}ms`
@@ -308,11 +353,10 @@ async function startBuild(generators, serverConfig, skipCodeGen = false) {
   } else {
     logger.log("Skipping codegen");
   }
-  logger.log("Cleaning up files");
-  await fs.rm(codegenModule);
   logger.success(
     `Build finished! You can start your server by running "node .output/${OUT_SERVER_ENTRY}"`
   );
+  process.exit(0);
 }
 async function bundleAppEntry(config, _allowCodegen = true) {
   const appEntry = path.resolve(
@@ -397,30 +441,6 @@ void listen(toNodeListener(app.h3App), {
     virtualEntry
   );
 }
-async function createCodegenEntryFile(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 virtualModule = await prettier.format(
-    `
-    import { writeFileSync } from 'node:fs';
-    import path from 'node:path';
-    import app from './${OUT_APP_FILE}';
-
-    const __dirname = new URL(".", import.meta.url).pathname;
-    const def = app.getAppDefinition();
-    writeFileSync(
-        path.resolve(__dirname, "../.output", "__definition.json"),
-        JSON.stringify(def),
-    );
-    process.exit(0);`,
-    { tabWidth: 4, parser: "typescript" }
-  );
-  await fs.writeFile(
-    path.resolve(config.rootDir, ".output", OUT_CODEGEN),
-    virtualModule
-  );
-}
 async function bundleFilesContext(config) {
   return await esbuild.context({
     ...config.esbuild,
@@ -486,8 +506,8 @@ async function createDevServer(config) {
       ".output",
       `${OUT_APP_FILE}?version=${Date.now()}`
     );
-    if (os.type() === "Windows_NT") {
-      importPath = createWindowsCompatibleAbsoluteImport(importPath);
+    if (isOnWindows()) {
+      importPath = createWindowsCompatibleImportPath(importPath);
     }
     const appEntry = (await import(importPath)).default;
     dynamicHandler.set(fromNodeMiddleware(appEntry.h3App.handler));
@@ -503,24 +523,6 @@ async function createDevServer(config) {
     ws
   };
 }
-function createWindowsCompatibleAbsoluteImport(input) {
-  let separator;
-  for (const char of input) {
-    if (char === "\\") {
-      separator = "\\";
-      break;
-    }
-    if (char === "/") {
-      separator = "/";
-    }
-  }
-  const parts = input.split(separator ?? "/");
-  if (parts[0]?.endsWith(":")) {
-    parts.unshift("file:\\");
-  }
-  const newStr = parts.join("\\");
-  return newStr;
-}
 async function startDevServer(config, generators) {
   await setupWorkingDir(config);
   const watcher = await import('chokidar');
@@ -636,7 +638,6 @@ async function generateClientsFromDefinition(appDef, generators, isDev) {
 const GEN_APP_FILE = "__arri_app.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");

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arri",
-  "version": "0.80.1",
+  "version": "0.80.3",
   "type": "module",
   "license": "MIT",
   "author": {
@@ -39,13 +39,13 @@
     "ofetch": "^1.4.1",
     "pathe": "^2.0.3",
     "prettier": "^3.5.3",
-    "@arrirpc/codegen-dart": "0.80.1",
-    "@arrirpc/codegen-kotlin": "0.80.1",
-    "@arrirpc/codegen-rust": "0.80.1",
-    "@arrirpc/codegen-swift": "0.80.1",
-    "@arrirpc/codegen-ts": "0.80.1",
-    "@arrirpc/codegen-utils": "0.80.1",
-    "@arrirpc/schema": "0.80.1"
+    "@arrirpc/codegen-kotlin": "0.80.3",
+    "@arrirpc/codegen-rust": "0.80.3",
+    "@arrirpc/codegen-dart": "0.80.3",
+    "@arrirpc/codegen-swift": "0.80.3",
+    "@arrirpc/codegen-ts": "0.80.3",
+    "@arrirpc/codegen-utils": "0.80.3",
+    "@arrirpc/schema": "0.80.3"
   },
   "devDependencies": {
     "@types/degit": "^2.8.6"