arri 0.63.1 → 0.63.3

package/dist/cli.cjs

@@ -3,11 +3,11 @@
 
 const citty = require('citty');
 const c12 = require('c12');
-const common = require('./shared/arri.7f2f73b2.cjs');
+const common = require('./shared/arri.27334236.cjs');
 const fs = require('node:fs');
 const codegenUtils = require('@arrirpc/codegen-utils');
-const ofetch = require('@joshmossas/ofetch');
 const chokidar = require('chokidar');
+const ofetch = require('ofetch');
 const path = require('pathe');
 const Degit = require('degit');
 const enquirer = require('enquirer');

package/dist/cli.mjs

@@ -1,11 +1,11 @@
 #! /usr/bin/env node
 import { defineCommand, runCommand, runMain } from 'citty';
 import { loadConfig } from 'c12';
-import { a as isArriConfig, l as logger, g as getArriPackageMetadata, e as dev } from './shared/arri.f4637ba5.mjs';
+import { a as isArriConfig, l as logger, g as getArriPackageMetadata, e as dev } from './shared/arri.cc4e1de8.mjs';
 import fs, { rmSync, readFileSync, writeFileSync } from 'node:fs';
 import { isAppDefinition, kebabCase } from '@arrirpc/codegen-utils';
-import { ofetch } from '@joshmossas/ofetch';
 import { watch } from 'chokidar';
+import { ofetch } from 'ofetch';
 import path from 'pathe';
 import Degit from 'degit';
 import enquirer from 'enquirer';

package/dist/index.cjs

@@ -5,11 +5,12 @@ const codegenKotlin = require('@arrirpc/codegen-kotlin');
 const codegenRust = require('@arrirpc/codegen-rust');
 const codegenSwift = require('@arrirpc/codegen-swift');
 const codegenTs = require('@arrirpc/codegen-ts');
-const common = require('./shared/arri.7f2f73b2.cjs');
+const common = require('./shared/arri.27334236.cjs');
 const node_child_process = require('node:child_process');
 const fs = require('node:fs');
-const fs$1 = require('node:fs/promises');
 const path = require('node:path');
+const chokidar = require('chokidar');
+const fs$1 = require('node:fs/promises');
 const codegenUtils = require('@arrirpc/codegen-utils');
 const listhen = require('@joshmossas/listhen');
 const esbuild = require('esbuild');
@@ -20,8 +21,8 @@ require('c12');
 require('citty');
 require('pathe');
 require('@arrirpc/schema');
-require('@joshmossas/ofetch');
 require('consola');
+require('ofetch');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 
@@ -37,11 +38,175 @@ function _interopNamespaceCompat(e) {
     return n;
 }
 
-const fs__namespace = /*#__PURE__*/_interopNamespaceCompat(fs$1);
+const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
 const path__default = /*#__PURE__*/_interopDefaultCompat(path);
+const chokidar__default = /*#__PURE__*/_interopDefaultCompat(chokidar);
+const fs__namespace = /*#__PURE__*/_interopNamespaceCompat(fs$1);
 const esbuild__default = /*#__PURE__*/_interopDefaultCompat(esbuild);
 const prettier__default = /*#__PURE__*/_interopDefaultCompat(prettier);
 
+function goServer(options = {}) {
+  const outDir = options.outputDir ?? ".output";
+  const resolvedOutDir = options.cwd ? path__default.resolve(options.cwd, outDir) : outDir;
+  return common.defineServerConfig({
+    devFn: async (_, generators) => {
+      if (!fs__default.existsSync(resolvedOutDir)) {
+        fs__default.mkdirSync(resolvedOutDir);
+      }
+      const ignoredDirs = ["node_modules", ".arri", ".output"];
+      const watcher = chokidar__default.watch(".", {
+        ignoreInitial: true,
+        ignored: (path2, stats) => {
+          if (stats?.isFile() == true && !path2.endsWith(".go")) {
+            return true;
+          }
+          if (stats?.isDirectory()) {
+            for (const dir of ignoredDirs) {
+              if (path2.includes(dir)) {
+                return true;
+              }
+            }
+          }
+          return false;
+        },
+        cwd: options.cwd
+      });
+      let childProcess;
+      async function spawnProcess() {
+        try {
+          node_child_process.execSync(`go build -o ${outDir}/server`, {
+            stdio: "inherit",
+            cwd: options.cwd
+          });
+          childProcess = node_child_process.spawn(
+            `${outDir}/server`,
+            [`--def-out=${outDir}/__definition.json`],
+            {
+              stdio: "inherit",
+              cwd: options.cwd
+            }
+          );
+          childProcess.on("error", (_2) => {
+            childProcess?.kill("SIGTERM");
+            childProcess?.removeAllListeners();
+            childProcess = void 0;
+          });
+          childProcess.on("close", (_2) => {
+            childProcess?.removeAllListeners();
+            childProcess = void 0;
+          });
+        } catch (err) {
+          common.logger.error(err);
+        }
+      }
+      async function closeChildProcess() {
+        if (!childProcess)
+          return true;
+        return new Promise((res, rej) => {
+          childProcess?.on("close", () => res(true));
+          childProcess?.on("exit", () => res(true));
+          childProcess?.on("error", (err) => {
+            rej(err);
+          });
+          childProcess?.kill("SIGTERM");
+        });
+      }
+      spawnProcess();
+      watcher.on("all", async (evt) => {
+        common.logger.info(`Changed detected. Restarting server...`);
+        switch (evt) {
+          case "addDir":
+            return;
+          default: {
+            await closeChildProcess();
+            childProcess?.removeAllListeners();
+            childProcess = void 0;
+            spawnProcess();
+          }
+        }
+      });
+      if (generators.length == 0) {
+        common.logger.warn(
+          "No generators specified in arri config. Skipping codegen."
+        );
+        return;
+      }
+      let defFileCache = "";
+      let hasRunGenerators = false;
+      async function handleAppDef() {
+        let defFile = "";
+        try {
+          defFile = fs__default.readFileSync(
+            `${resolvedOutDir}/__definition.json`,
+            "utf8"
+          );
+        } catch (_2) {
+          return;
+        }
+        if (!defFile || defFile == defFileCache) {
+          return;
+        }
+        const startTime = /* @__PURE__ */ new Date();
+        if (hasRunGenerators) {
+          common.logger.info(
+            "App definition updated. Rerunning generators..."
+          );
+        } else {
+          common.logger.info("Running generators...");
+        }
+        defFileCache = defFile;
+        const appDef = JSON.parse(defFile);
+        await Promise.allSettled(
+          generators.map((gen) => gen.generator(appDef, true))
+        );
+        common.logger.success(
+          `Ran ${generators.length} generator(s) in ${( new Date()).getTime() - startTime.getTime()}ms`
+        );
+        hasRunGenerators = true;
+      }
+      const appDefWatcher = chokidar__default.watch(
+        [`${outDir}/__definition.json`],
+        {
+          cwd: options.cwd
+        }
+      );
+      appDefWatcher.on("add", () => handleAppDef());
+      appDefWatcher.on("change", () => handleAppDef());
+    },
+    buildFn: async (_, generators) => {
+      if (!fs__default.existsSync(outDir)) {
+        fs__default.mkdirSync(outDir);
+      }
+      node_child_process.execSync(`go build -o ${outDir}/server`, {
+        stdio: "inherit"
+      });
+      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."
+        );
+        return;
+      }
+      const startTime = /* @__PURE__ */ new Date();
+      common.logger.info(`Running generators...`);
+      const appDef = JSON.parse(
+        fs__default.readFileSync(`${resolvedOutDir}/__definition.json`, "utf8")
+      );
+      await Promise.all(
+        generators.map((gen) => gen.generator(appDef, false))
+      );
+      common.logger.success(
+        `Ran ${generators.length} generator(s) in ${( new Date()).getTime() - startTime.getTime()}ms`
+      );
+    }
+  });
+}
+
 function tsServer(serverConfig) {
   return common.defineServerConfig({
     devArgs: void 0,
@@ -571,7 +736,8 @@ const getRpcMetaFromPath = (config, filePath) => {
 };
 
 const servers = {
-  tsServer
+  tsServer,
+  goServer
 };
 
 const generators = {

package/dist/index.d.cts

@@ -29,6 +29,12 @@ interface ArriConfig<TDevArgs extends ArgsDef | undefined = any, TBuildArgs exte
 declare function isArriConfig(input: unknown): input is ArriConfig;
 declare function defineConfig(config: ArriConfig): ArriConfig;
 
+interface GoServerOptions {
+    outputDir?: string;
+    cwd?: string;
+}
+declare function goServer(options?: GoServerOptions): ServerConfig<any, any>;
+
 declare function tsServer(serverConfig?: TsServerConfig): ServerConfig<undefined, undefined>;
 interface TsServerConfig {
     port?: number;
@@ -64,6 +70,7 @@ interface TsServerConfig {
 
 declare const servers: {
     readonly tsServer: typeof tsServer;
+    readonly goServer: typeof goServer;
 };
 
 declare const generators: {

package/dist/index.d.mts

@@ -29,6 +29,12 @@ interface ArriConfig<TDevArgs extends ArgsDef | undefined = any, TBuildArgs exte
 declare function isArriConfig(input: unknown): input is ArriConfig;
 declare function defineConfig(config: ArriConfig): ArriConfig;
 
+interface GoServerOptions {
+    outputDir?: string;
+    cwd?: string;
+}
+declare function goServer(options?: GoServerOptions): ServerConfig<any, any>;
+
 declare function tsServer(serverConfig?: TsServerConfig): ServerConfig<undefined, undefined>;
 interface TsServerConfig {
     port?: number;
@@ -64,6 +70,7 @@ interface TsServerConfig {
 
 declare const servers: {
     readonly tsServer: typeof tsServer;
+    readonly goServer: typeof goServer;
 };
 
 declare const generators: {

package/dist/index.d.ts

@@ -29,6 +29,12 @@ interface ArriConfig<TDevArgs extends ArgsDef | undefined = any, TBuildArgs exte
 declare function isArriConfig(input: unknown): input is ArriConfig;
 declare function defineConfig(config: ArriConfig): ArriConfig;
 
+interface GoServerOptions {
+    outputDir?: string;
+    cwd?: string;
+}
+declare function goServer(options?: GoServerOptions): ServerConfig<any, any>;
+
 declare function tsServer(serverConfig?: TsServerConfig): ServerConfig<undefined, undefined>;
 interface TsServerConfig {
     port?: number;
@@ -64,6 +70,7 @@ interface TsServerConfig {
 
 declare const servers: {
     readonly tsServer: typeof tsServer;
+    readonly goServer: typeof goServer;
 };
 
 declare const generators: {

package/dist/index.mjs

@@ -3,12 +3,13 @@ import { kotlinClientGenerator } from '@arrirpc/codegen-kotlin';
 import { rustClientGenerator } from '@arrirpc/codegen-rust';
 import { swiftClientGenerator } from '@arrirpc/codegen-swift';
 import { typescriptClientGenerator } from '@arrirpc/codegen-ts';
-import { d as defineServerConfig, l as logger, i as isInsideDir } from './shared/arri.f4637ba5.mjs';
-export { D as DEV_DEFINITION_ENDPOINT, b as defineConfig, a as isArriConfig, c as isServerConfig } from './shared/arri.f4637ba5.mjs';
-import { execSync } from 'node:child_process';
-import { existsSync, readFileSync } from 'node:fs';
-import * as fs from 'node:fs/promises';
+import { d as defineServerConfig, l as logger, i as isInsideDir } from './shared/arri.cc4e1de8.mjs';
+export { D as DEV_DEFINITION_ENDPOINT, b as defineConfig, a as isArriConfig, c as isServerConfig } from './shared/arri.cc4e1de8.mjs';
+import { execSync, spawn } from 'node:child_process';
+import fs$1, { existsSync, readFileSync } from 'node:fs';
 import path from 'node:path';
+import chokidar from 'chokidar';
+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';
@@ -20,8 +21,170 @@ import 'c12';
 import 'citty';
 import 'pathe';
 import '@arrirpc/schema';
-import '@joshmossas/ofetch';
 import 'consola';
+import 'ofetch';
+
+function goServer(options = {}) {
+  const outDir = options.outputDir ?? ".output";
+  const resolvedOutDir = options.cwd ? path.resolve(options.cwd, outDir) : outDir;
+  return defineServerConfig({
+    devFn: async (_, generators) => {
+      if (!fs$1.existsSync(resolvedOutDir)) {
+        fs$1.mkdirSync(resolvedOutDir);
+      }
+      const ignoredDirs = ["node_modules", ".arri", ".output"];
+      const watcher = chokidar.watch(".", {
+        ignoreInitial: true,
+        ignored: (path2, stats) => {
+          if (stats?.isFile() == true && !path2.endsWith(".go")) {
+            return true;
+          }
+          if (stats?.isDirectory()) {
+            for (const dir of ignoredDirs) {
+              if (path2.includes(dir)) {
+                return true;
+              }
+            }
+          }
+          return false;
+        },
+        cwd: options.cwd
+      });
+      let childProcess;
+      async function spawnProcess() {
+        try {
+          execSync(`go build -o ${outDir}/server`, {
+            stdio: "inherit",
+            cwd: options.cwd
+          });
+          childProcess = spawn(
+            `${outDir}/server`,
+            [`--def-out=${outDir}/__definition.json`],
+            {
+              stdio: "inherit",
+              cwd: options.cwd
+            }
+          );
+          childProcess.on("error", (_2) => {
+            childProcess?.kill("SIGTERM");
+            childProcess?.removeAllListeners();
+            childProcess = void 0;
+          });
+          childProcess.on("close", (_2) => {
+            childProcess?.removeAllListeners();
+            childProcess = void 0;
+          });
+        } catch (err) {
+          logger.error(err);
+        }
+      }
+      async function closeChildProcess() {
+        if (!childProcess)
+          return true;
+        return new Promise((res, rej) => {
+          childProcess?.on("close", () => res(true));
+          childProcess?.on("exit", () => res(true));
+          childProcess?.on("error", (err) => {
+            rej(err);
+          });
+          childProcess?.kill("SIGTERM");
+        });
+      }
+      spawnProcess();
+      watcher.on("all", async (evt) => {
+        logger.info(`Changed detected. Restarting server...`);
+        switch (evt) {
+          case "addDir":
+            return;
+          default: {
+            await closeChildProcess();
+            childProcess?.removeAllListeners();
+            childProcess = void 0;
+            spawnProcess();
+          }
+        }
+      });
+      if (generators.length == 0) {
+        logger.warn(
+          "No generators specified in arri config. Skipping codegen."
+        );
+        return;
+      }
+      let defFileCache = "";
+      let hasRunGenerators = false;
+      async function handleAppDef() {
+        let defFile = "";
+        try {
+          defFile = fs$1.readFileSync(
+            `${resolvedOutDir}/__definition.json`,
+            "utf8"
+          );
+        } catch (_2) {
+          return;
+        }
+        if (!defFile || defFile == defFileCache) {
+          return;
+        }
+        const startTime = /* @__PURE__ */ new Date();
+        if (hasRunGenerators) {
+          logger.info(
+            "App definition updated. Rerunning generators..."
+          );
+        } else {
+          logger.info("Running generators...");
+        }
+        defFileCache = defFile;
+        const appDef = JSON.parse(defFile);
+        await Promise.allSettled(
+          generators.map((gen) => gen.generator(appDef, true))
+        );
+        logger.success(
+          `Ran ${generators.length} generator(s) in ${( new Date()).getTime() - startTime.getTime()}ms`
+        );
+        hasRunGenerators = true;
+      }
+      const appDefWatcher = chokidar.watch(
+        [`${outDir}/__definition.json`],
+        {
+          cwd: options.cwd
+        }
+      );
+      appDefWatcher.on("add", () => handleAppDef());
+      appDefWatcher.on("change", () => handleAppDef());
+    },
+    buildFn: async (_, generators) => {
+      if (!fs$1.existsSync(outDir)) {
+        fs$1.mkdirSync(outDir);
+      }
+      execSync(`go build -o ${outDir}/server`, {
+        stdio: "inherit"
+      });
+      execSync(
+        `${outDir}/server def -output ${outDir}/__definition.json`,
+        {
+          stdio: "inherit"
+        }
+      );
+      if (generators.length === 0) {
+        logger.warn(
+          "No generators specified in arri config. Skipping codegen."
+        );
+        return;
+      }
+      const startTime = /* @__PURE__ */ new Date();
+      logger.info(`Running generators...`);
+      const appDef = JSON.parse(
+        fs$1.readFileSync(`${resolvedOutDir}/__definition.json`, "utf8")
+      );
+      await Promise.all(
+        generators.map((gen) => gen.generator(appDef, false))
+      );
+      logger.success(
+        `Ran ${generators.length} generator(s) in ${( new Date()).getTime() - startTime.getTime()}ms`
+      );
+    }
+  });
+}
 
 function tsServer(serverConfig) {
   return defineServerConfig({
@@ -552,7 +715,8 @@ const getRpcMetaFromPath = (config, filePath) => {
 };
 
 const servers = {
-  tsServer
+  tsServer,
+  goServer
 };
 
 const generators = {

package/dist/shared/{arri.7f2f73b2.cjs → arri.27334236.cjs}

@@ -4,8 +4,8 @@ const c12 = require('c12');
 const citty = require('citty');
 const path = require('pathe');
 const schema = require('@arrirpc/schema');
-const ofetch = require('@joshmossas/ofetch');
 const consola = require('consola');
+const ofetch = require('ofetch');
 
 function _interopDefaultCompat (e) { return e && typeof e === 'object' && 'default' in e ? e.default : e; }
 

package/dist/shared/{arri.f4637ba5.mjs → arri.cc4e1de8.mjs}

@@ -2,8 +2,8 @@ import { loadConfig } from 'c12';
 import { defineCommand, runCommand } from 'citty';
 import path from 'pathe';
 import { a, ValidationError } from '@arrirpc/schema';
-import { ofetch } from '@joshmossas/ofetch';
 import { createConsola } from 'consola';
+import { ofetch } from 'ofetch';
 
 function isServerConfig(input) {
   if (typeof input !== "object" || input === null) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arri",
-  "version": "0.63.1",
+  "version": "0.63.3",
   "type": "module",
   "license": "MIT",
   "author": {
@@ -26,9 +26,9 @@
   ],
   "dependencies": {
     "@joshmossas/listhen": "^1.11.1",
-    "@joshmossas/ofetch": "^1.3.5",
+    "ofetch": "^1.4.1",
     "c12": "^2.0.1",
-    "chokidar": "^3.6.0",
+    "chokidar": "^4.0.1",
     "citty": "^0.1.6",
     "consola": "^3.2.3",
     "degit": "^2.8.4",
@@ -39,13 +39,13 @@
     "h3": "^1.13.0",
     "pathe": "^1.1.2",
     "prettier": "^3.3.3",
-    "@arrirpc/codegen-rust": "0.63.1",
-    "@arrirpc/codegen-dart": "0.63.1",
-    "@arrirpc/codegen-kotlin": "0.63.1",
-    "@arrirpc/codegen-ts": "0.63.1",
-    "@arrirpc/schema": "0.63.1",
-    "@arrirpc/codegen-swift": "0.63.1",
-    "@arrirpc/codegen-utils": "0.63.1"
+    "@arrirpc/codegen-dart": "0.63.3",
+    "@arrirpc/codegen-rust": "0.63.3",
+    "@arrirpc/codegen-kotlin": "0.63.3",
+    "@arrirpc/codegen-swift": "0.63.3",
+    "@arrirpc/codegen-ts": "0.63.3",
+    "@arrirpc/codegen-utils": "0.63.3",
+    "@arrirpc/schema": "0.63.3"
   },
   "devDependencies": {
     "@types/degit": "^2.8.6"