arri 0.2.2 → 0.3.0

package/dist/cli.cjs

@@ -3,8 +3,8 @@
 
 const citty = require('citty');
 const node_child_process = require('node:child_process');
-const node_fs = require('node:fs');
-const fs = require('node:fs/promises');
+const fs = require('node:fs');
+const fs$1 = require('node:fs/promises');
 const arriCodegenUtils = require('arri-codegen-utils');
 const c12 = require('c12');
 const consola = require('consola');
@@ -18,6 +18,7 @@ const arriCodegenDart = require('arri-codegen-dart');
 const ofetch = require('ofetch');
 const chokidar = require('chokidar');
 const listhen = require('listhen');
+const Degit = require('degit');
 require('arri-validate');
 require('h3');
 
@@ -35,19 +36,22 @@ function _interopNamespaceCompat(e) {
     return n;
 }
 
-const fs__default = /*#__PURE__*/_interopDefaultCompat(fs);
+const fs__default$1 = /*#__PURE__*/_interopDefaultCompat(fs);
+const fs__default = /*#__PURE__*/_interopDefaultCompat(fs$1);
+const consola__default = /*#__PURE__*/_interopDefaultCompat(consola);
 const esbuild__namespace = /*#__PURE__*/_interopNamespaceCompat(esbuild);
 const path__default = /*#__PURE__*/_interopDefaultCompat(path);
 const prettier__default = /*#__PURE__*/_interopDefaultCompat(prettier);
 const chokidar__default = /*#__PURE__*/_interopDefaultCompat(chokidar);
+const Degit__default = /*#__PURE__*/_interopDefaultCompat(Degit);
 
 async function setupWorkingDir(config) {
   const arriDir = path__default.resolve(config.rootDir, config.buildDir);
   const outDir = path__default.resolve(config.rootDir, ".output");
-  if (node_fs.existsSync(arriDir)) {
+  if (fs.existsSync(arriDir)) {
     await fs__default.rm(arriDir, { recursive: true, force: true });
   }
-  if (node_fs.existsSync(outDir)) {
+  if (fs.existsSync(outDir)) {
     await fs__default.rm(outDir, { recursive: true, force: true });
   }
   await fs__default.mkdir(arriDir);
@@ -185,9 +189,9 @@ const build = citty.defineCommand({
     await startBuild(config$1, args.skipCodegen);
   }
 });
-const logger$1 = consola.createConsola().withTag("arri");
+const logger$2 = consola.createConsola().withTag("arri");
 async function startBuild(config, skipCodeGen = false) {
-  logger$1.log("Bundling server....");
+  logger$2.log("Bundling server....");
   await setupWorkingDir(config);
   await Promise.all([
     createRoutesModule(config),
@@ -196,30 +200,30 @@ async function startBuild(config, skipCodeGen = false) {
   ]);
   await transpileFiles(config);
   await bundleFiles(config);
-  logger$1.log("Finished bundling");
+  logger$2.log("Finished bundling");
   const clientCount = config.clientGenerators.length;
   const codegenModule = path__default.resolve(config.rootDir, ".output", "codegen.js");
   if (clientCount > 0 && !skipCodeGen) {
-    logger$1.log("Generating clients");
+    logger$2.log("Generating clients");
     node_child_process.execSync(`node ${codegenModule}`);
     const defJson = path__default.resolve(
       config.rootDir,
       ".output",
       "__definition.json"
     );
-    const def = JSON.parse(node_fs.readFileSync(defJson, { encoding: "utf-8" }));
+    const def = JSON.parse(fs.readFileSync(defJson, { encoding: "utf-8" }));
     if (arriCodegenUtils.isAppDefinition(def)) {
       await Promise.all(
         config.clientGenerators.map((plugin) => plugin.generator(def))
       );
     }
-    logger$1.log(`${clientCount} clients generated`);
+    logger$2.log(`${clientCount} clients generated`);
   } else {
-    logger$1.log("No client generators specified. Skipping codegen.");
+    logger$2.log("No client generators specified. Skipping codegen.");
   }
-  logger$1.log("Cleaning up files");
+  logger$2.log("Cleaning up files");
   await fs__default.rm(codegenModule);
-  logger$1.log(
+  logger$2.log(
     `Build finished! You can start your server by running "node .output/server.js"`
   );
 }
@@ -354,11 +358,11 @@ const codegenDart = citty.defineCommand({
       const result = await ofetch.ofetch(args.location);
       def = result;
     } else {
-      if (!node_fs.existsSync(args.location)) {
+      if (!fs.existsSync(args.location)) {
         throw new Error(`Unable to find ${args.location}`);
       }
       const jsonString = JSON.parse(
-        node_fs.readFileSync(args.location, { encoding: "utf-8" })
+        fs.readFileSync(args.location, { encoding: "utf-8" })
       );
       def = jsonString;
     }
@@ -401,7 +405,7 @@ const codegen = citty.defineCommand({
   }
 });
 
-const logger = consola.createConsola().withTag("arri");
+const logger$1 = consola.createConsola().withTag("arri");
 const dev = citty.defineCommand({
   meta: {
     name: "dev",
@@ -429,7 +433,7 @@ const dev = citty.defineCommand({
 const startListener = (config, showQr = false) => listhen.listenAndWatch(path__default.resolve(config.rootDir, ".output", "server.js"), {
   public: true,
   port: config.port,
-  logger,
+  logger: logger$1,
   qr: showQr
 });
 async function bundleFilesContext(config) {
@@ -492,14 +496,14 @@ async function startDevServer(config) {
         await createRoutesModule(config);
         let bundleCreated = false;
         try {
-          logger.log(
+          logger$1.log(
             "Change detected. Bundling files and restarting server...."
           );
           await transpileFiles(config);
           await bundleFiles.rebuild();
           bundleCreated = true;
         } catch (err) {
-          logger.error("ERROR", err);
+          logger$1.error("ERROR", err);
           bundleCreated = false;
         }
         if (bundleCreated && config.clientGenerators.length) {
@@ -522,14 +526,14 @@ async function generateClients(config$1) {
     if (!arriCodegenUtils.isAppDefinition(result)) {
       return;
     }
-    logger.log(`Generating client code...`);
+    logger$1.log(`Generating client code...`);
     const clientCount = config$1.clientGenerators.length;
     await Promise.all(
       config$1.clientGenerators.map(
         (generator) => generator.generator(result)
       )
     );
-    logger.log(
+    logger$1.log(
       `Generated ${clientCount} client${clientCount === 1 ? "" : "s"}`
     );
   } catch (err) {
@@ -564,11 +568,80 @@ export default app.h3App;`;
   );
 }
 
+const logger = consola.createConsola();
+const init = citty.defineCommand({
+  meta: {
+    name: "Init",
+    description: "Scaffold an Arri app"
+  },
+  args: {
+    dir: {
+      type: "positional",
+      required: true,
+      description: "Directory where to initialize the project"
+    },
+    force: {
+      type: "boolean",
+      default: false,
+      alias: "f",
+      description: "Force created a project when if a directory already exists"
+    }
+  },
+  async run(context) {
+    const dir = path__default.resolve(context.args.dir);
+    if (!fs__default$1.existsSync(dir)) {
+      fs__default$1.mkdirSync(dir);
+    }
+    const dirFiles = fs__default$1.readdirSync(dir);
+    if (dirFiles.length && !context.args.force) {
+      logger.error(
+        `"${context.args.dir}" is a non-empty directory. To continue with this operation rerun "arri init" with the --force flag.`
+      );
+      process.exit(1);
+    }
+    const degit = Degit__default("https://github.com/modiimedia/arri-starters", {
+      force: context.args.force
+    });
+    await degit.clone(dir);
+    fs.rmSync(path__default.resolve(dir, "pnpm-lock.yaml"));
+    const packageJson = JSON.parse(
+      fs.readFileSync(path__default.resolve(dir, "package.json"), {
+        encoding: "utf-8"
+      })
+    );
+    packageJson.name = scule.kebabCase(context.args.dir);
+    packageJson.description = "An RPC server created with Arri RPC";
+    packageJson.private = true;
+    delete packageJson.license;
+    delete packageJson.main;
+    delete packageJson.author;
+    delete packageJson.tags;
+    fs.writeFileSync(
+      path__default.resolve(dir, "package.json"),
+      await prettier__default.format(JSON.stringify(packageJson), {
+        parser: "json",
+        tabWidth: 4,
+        semi: true,
+        endOfLine: "lf",
+        trailingComma: "all"
+      })
+    );
+    consola__default.log(
+      `Project initialized in ${context.args.dir}. To get started:
+cd ${context.args.dir}
+npm install
+npm run dev`
+    );
+    process.exit(0);
+  }
+});
+
 const main = citty.defineCommand({
   subCommands: {
     build,
     dev,
-    codegen
+    codegen,
+    init
   }
 });
 void citty.runMain(main);

package/dist/cli.mjs

@@ -1,11 +1,11 @@
 #! /usr/bin/env node
 import { defineCommand, runMain } from 'citty';
 import { execSync } from 'node:child_process';
-import { existsSync, readFileSync } from 'node:fs';
+import fs$1, { existsSync, readFileSync, rmSync, writeFileSync } from 'node:fs';
 import fs from 'node:fs/promises';
 import { removeDisallowedChars, isAppDefinition } from 'arri-codegen-utils';
 import { loadConfig } from 'c12';
-import { createConsola } from 'consola';
+import consola, { createConsola } from 'consola';
 import * as esbuild from 'esbuild';
 import { build as build$1 } from 'esbuild';
 import path from 'pathe';
@@ -17,6 +17,7 @@ import { dartClientGenerator } from 'arri-codegen-dart';
 import { ofetch } from 'ofetch';
 import chokidar from 'chokidar';
 import { listenAndWatch } from 'listhen';
+import Degit from 'degit';
 import 'arri-validate';
 import 'h3';
 
@@ -164,9 +165,9 @@ const build = defineCommand({
     await startBuild(config, args.skipCodegen);
   }
 });
-const logger$1 = createConsola().withTag("arri");
+const logger$2 = createConsola().withTag("arri");
 async function startBuild(config, skipCodeGen = false) {
-  logger$1.log("Bundling server....");
+  logger$2.log("Bundling server....");
   await setupWorkingDir(config);
   await Promise.all([
     createRoutesModule(config),
@@ -175,11 +176,11 @@ async function startBuild(config, skipCodeGen = false) {
   ]);
   await transpileFiles(config);
   await bundleFiles(config);
-  logger$1.log("Finished bundling");
+  logger$2.log("Finished bundling");
   const clientCount = config.clientGenerators.length;
   const codegenModule = path.resolve(config.rootDir, ".output", "codegen.js");
   if (clientCount > 0 && !skipCodeGen) {
-    logger$1.log("Generating clients");
+    logger$2.log("Generating clients");
     execSync(`node ${codegenModule}`);
     const defJson = path.resolve(
       config.rootDir,
@@ -192,13 +193,13 @@ async function startBuild(config, skipCodeGen = false) {
         config.clientGenerators.map((plugin) => plugin.generator(def))
       );
     }
-    logger$1.log(`${clientCount} clients generated`);
+    logger$2.log(`${clientCount} clients generated`);
   } else {
-    logger$1.log("No client generators specified. Skipping codegen.");
+    logger$2.log("No client generators specified. Skipping codegen.");
   }
-  logger$1.log("Cleaning up files");
+  logger$2.log("Cleaning up files");
   await fs.rm(codegenModule);
-  logger$1.log(
+  logger$2.log(
     `Build finished! You can start your server by running "node .output/server.js"`
   );
 }
@@ -380,7 +381,7 @@ const codegen = defineCommand({
   }
 });
 
-const logger = createConsola().withTag("arri");
+const logger$1 = createConsola().withTag("arri");
 const dev = defineCommand({
   meta: {
     name: "dev",
@@ -408,7 +409,7 @@ const dev = defineCommand({
 const startListener = (config, showQr = false) => listenAndWatch(path.resolve(config.rootDir, ".output", "server.js"), {
   public: true,
   port: config.port,
-  logger,
+  logger: logger$1,
   qr: showQr
 });
 async function bundleFilesContext(config) {
@@ -471,14 +472,14 @@ async function startDevServer(config) {
         await createRoutesModule(config);
         let bundleCreated = false;
         try {
-          logger.log(
+          logger$1.log(
             "Change detected. Bundling files and restarting server...."
           );
           await transpileFiles(config);
           await bundleFiles.rebuild();
           bundleCreated = true;
         } catch (err) {
-          logger.error("ERROR", err);
+          logger$1.error("ERROR", err);
           bundleCreated = false;
         }
         if (bundleCreated && config.clientGenerators.length) {
@@ -501,14 +502,14 @@ async function generateClients(config) {
     if (!isAppDefinition(result)) {
       return;
     }
-    logger.log(`Generating client code...`);
+    logger$1.log(`Generating client code...`);
     const clientCount = config.clientGenerators.length;
     await Promise.all(
       config.clientGenerators.map(
         (generator) => generator.generator(result)
       )
     );
-    logger.log(
+    logger$1.log(
       `Generated ${clientCount} client${clientCount === 1 ? "" : "s"}`
     );
   } catch (err) {
@@ -543,11 +544,80 @@ export default app.h3App;`;
   );
 }
 
+const logger = createConsola();
+const init = defineCommand({
+  meta: {
+    name: "Init",
+    description: "Scaffold an Arri app"
+  },
+  args: {
+    dir: {
+      type: "positional",
+      required: true,
+      description: "Directory where to initialize the project"
+    },
+    force: {
+      type: "boolean",
+      default: false,
+      alias: "f",
+      description: "Force created a project when if a directory already exists"
+    }
+  },
+  async run(context) {
+    const dir = path.resolve(context.args.dir);
+    if (!fs$1.existsSync(dir)) {
+      fs$1.mkdirSync(dir);
+    }
+    const dirFiles = fs$1.readdirSync(dir);
+    if (dirFiles.length && !context.args.force) {
+      logger.error(
+        `"${context.args.dir}" is a non-empty directory. To continue with this operation rerun "arri init" with the --force flag.`
+      );
+      process.exit(1);
+    }
+    const degit = Degit("https://github.com/modiimedia/arri-starters", {
+      force: context.args.force
+    });
+    await degit.clone(dir);
+    rmSync(path.resolve(dir, "pnpm-lock.yaml"));
+    const packageJson = JSON.parse(
+      readFileSync(path.resolve(dir, "package.json"), {
+        encoding: "utf-8"
+      })
+    );
+    packageJson.name = kebabCase(context.args.dir);
+    packageJson.description = "An RPC server created with Arri RPC";
+    packageJson.private = true;
+    delete packageJson.license;
+    delete packageJson.main;
+    delete packageJson.author;
+    delete packageJson.tags;
+    writeFileSync(
+      path.resolve(dir, "package.json"),
+      await prettier.format(JSON.stringify(packageJson), {
+        parser: "json",
+        tabWidth: 4,
+        semi: true,
+        endOfLine: "lf",
+        trailingComma: "all"
+      })
+    );
+    consola.log(
+      `Project initialized in ${context.args.dir}. To get started:
+cd ${context.args.dir}
+npm install
+npm run dev`
+    );
+    process.exit(0);
+  }
+});
+
 const main = defineCommand({
   subCommands: {
     build,
     dev,
-    codegen
+    codegen,
+    init
   }
 });
 void runMain(main);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arri",
-  "version": "0.2.2",
+  "version": "0.3.0",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.mjs",
@@ -17,11 +17,11 @@
     "arri": "./dist/cli.mjs"
   },
   "dependencies": {
-    "ajv": "^8.12.0",
     "c12": "^1.5.1",
     "chokidar": "^3.5.3",
     "citty": "^0.1.4",
     "consola": "^3.2.3",
+    "degit": "^2.8.4",
     "esbuild": "^0.19.5",
     "globby": "^13.2.2",
     "h3": "^1.8.2",
@@ -30,15 +30,16 @@
     "pathe": "^1.1.1",
     "prettier": "^3.0.3",
     "scule": "^1.0.0",
-    "arri-codegen-dart": "0.2.2",
-    "arri-codegen-utils": "0.2.2",
-    "arri-validate": "0.2.2",
-    "arri-codegen-ts": "0.2.2"
+    "arri-codegen-ts": "0.3.0",
+    "arri-validate": "0.3.0",
+    "arri-codegen-utils": "0.3.0",
+    "arri-codegen-dart": "0.3.0"
   },
   "peerDependencies": {
     "listhen": "1.x"
   },
   "devDependencies": {
+    "@types/degit": "^2.8.5",
     "bun-types": "^1.0.7"
   }
 }