easy-cms 0.47.4 → 0.49.0

package/README.md

@@ -20,9 +20,9 @@ npx easy-cms migrate:create <name>    # a migration for config changes
 npx easy-cms migrate                  # apply pending migrations
 npx easy-cms migrate:status
 npx easy-cms generate:types [--out file.ts]
-npx easy-cms create-admin [--email you@example.com] [--name] [--role]
+npx easy-cms admin:create [--email you@example.com] [--name] [--role]
 npx easy-cms serve [--port 4000] [--watch]
-npx easy-cms run-scheduled            # due scheduled jobs, webhook and email retries (cron)
+npx easy-cms jobs:run            # due scheduled jobs, webhook and email retries (cron)
 npx easy-cms backup <file>            # SQLite snapshot while the CMS runs
 npx easy-cms copy --from <config>     # copy content to another database
 ```

package/dist/bin.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 import {
   run
-} from "./chunk-73JSCLZP.js";
+} from "./chunk-IP3UPED4.js";
 
 // src/bin.ts
 process.exitCode = await run(process.argv.slice(2));

package/dist/{chunk-73JSCLZP.js → chunk-IP3UPED4.js}

@@ -7,14 +7,12 @@ import { parseArgs } from "util";
 import { gzipSync } from "zlib";
 import {
   ConfigError,
-  copyDatabase,
   createEasyCMS as createEasyCMS2,
   EasyCMSError,
-  generateTypes,
   loadConfig,
-  ValidationError,
-  writeBackupFile
+  ValidationError
 } from "@easy-cms/core";
+import { copyDatabase, generateTypes, writeBackupFile } from "@easy-cms/core/internal";
 
 // src/serve.ts
 import { watch } from "fs";
@@ -24,9 +22,9 @@ import { pipeline } from "stream/promises";
 import { adminHandlerFor } from "@easy-cms/admin";
 import {
   createEasyCMS,
-  createRestHandler,
-  createRootEndpointHandler
+  createRestHandler
 } from "@easy-cms/core";
+import { createRootEndpointHandler, forwardedClientIp } from "@easy-cms/core/internal";
 function createStandaloneHandler(cms) {
   const config = cms.config;
   const adminPath = `/${config.admin.path.replace(/^\/+|\/+$/g, "")}`;
@@ -90,7 +88,7 @@ function header(req, name) {
 }
 function clientIpOf(req, trustProxy) {
   if (trustProxy) {
-    const forwarded = header(req, "x-forwarded-for")?.split(",")[0]?.trim();
+    const forwarded = forwardedClientIp(header(req, "x-forwarded-for"));
     if (forwarded) return forwarded;
   }
   return req.socket.remoteAddress;
@@ -197,9 +195,9 @@ Commands:
   migrate:create <name>   Create a migration from config changes
   migrate:status          List migrations and whether they are applied
   generate:types          Write TypeScript types for your collections and globals
-  create-admin            Create an admin user
+  admin:create            Create an admin user (also: create-admin)
   serve                   Run the CMS as its own server (admin + REST API)
-  run-scheduled           Run due scheduled publishes, webhook and email retries
+  jobs:run                Run due scheduled publishes, jobs, webhook and email retries (also: run-scheduled)
   backup <file>           Copy the database to a SQLite file while the CMS runs
   copy --from <config>    Copy all content from another config's database into this one
   <plugin command>        Commands from your config's plugins, e.g. nested:rebuild
@@ -230,7 +228,7 @@ Lists migration files and whether each has been applied.
 Writes interfaces for every collection and global (default: easy-cms-types.ts).
 The file has no imports, so a frontend in another repository can copy it.
 `,
-  "create-admin": `Usage: easy-cms create-admin [--email <email>] [--name <name>] [--role <role>] [options]
+  "admin:create": `Usage: easy-cms admin:create [--email <email>] [--name <name>] [--role <role>] [options]
 
 Creates a user (role "admin" unless --role is given). The password is asked for in the
 terminal, or read from EASY_CMS_ADMIN_PASSWORD when there is no terminal.
@@ -255,7 +253,7 @@ development its tables are created, in production run \`easy-cms migrate\` first
 Uploaded files are not copied: they stay in the uploads folder or bucket.
 Stop writing to the source while copying, or copy from a backup.
 `,
-  "run-scheduled": `Usage: easy-cms run-scheduled [options]
+  "jobs:run": `Usage: easy-cms jobs:run [options]
 
 Runs due scheduled publishes and unpublishes, and retries failed webhook deliveries, once:
 for a cron job where no server process keeps running. Servers do this every minute on their own.
@@ -274,22 +272,31 @@ In production (NODE_ENV=production) pending migrations stop the server from star
 `
 };
 async function run(argv, io = defaultIO) {
+  const loose = parseArgs({
+    args: [...argv],
+    allowPositionals: true,
+    strict: false,
+    options: OPTIONS
+  });
+  const [named, ...looseRest] = loose.positionals;
+  const command = named === void 0 ? void 0 : RENAMED_COMMANDS[named] ?? named;
+  if (command && !(command in COMMAND_HELP))
+    return await pluginCommand(command, looseRest, loose.values, io);
   let parsed;
   try {
     parsed = parse(argv);
   } catch (error) {
     io.err(error.message);
-    io.err(HELP);
+    io.err(command ? COMMAND_HELP[command] : HELP);
     return 1;
   }
-  const { values, positionals } = parsed;
-  const [command, ...rest] = positionals;
+  const { values } = parsed;
+  const rest = parsed.positionals.slice(1);
   if (!command) {
     ;
     (values.help ? io.out : io.err)(HELP);
     return values.help ? 0 : 1;
   }
-  if (!(command in COMMAND_HELP)) return await pluginCommand(command, rest, values, io);
   if (values.help) {
     io.out(COMMAND_HELP[command]);
     return 0;
@@ -309,7 +316,7 @@ async function run(argv, io = defaultIO) {
       return 0;
     }
     if (command === "copy") return await copy(values.from, config, cwd, logger, io);
-    const schema = command === "create-admin" && process.env.NODE_ENV !== "production" ? "push" : "skip";
+    const schema = command === "admin:create" && process.env.NODE_ENV !== "production" ? "push" : "skip";
     const cms = await createEasyCMS2(config, {
       cwd,
       schema,
@@ -349,8 +356,9 @@ async function run(argv, io = defaultIO) {
           io.out(`Backed up the database to ${file}`);
           return 0;
         }
-        case "run-scheduled": {
-          const { ran, failed, webhooks, emails } = await cms.runJobs();
+        case "jobs:run": {
+          const { scheduled, webhooks, emails } = await cms.runJobs();
+          const { ran, failed } = scheduled;
           io.out(`Ran ${ran} scheduled job(s)${failed ? `, ${failed} failed` : ""}.`);
           if (webhooks.sent || webhooks.failed)
             io.out(
@@ -385,11 +393,11 @@ async function run(argv, io = defaultIO) {
           }
           return 0;
         }
-        case "create-admin": {
+        case "admin:create": {
           const email = values.email ?? (io.interactive && io.prompt ? await io.prompt("Email: ") : "");
           if (!email) {
             io.err("Missing --email.\n");
-            io.err(COMMAND_HELP["create-admin"]);
+            io.err(COMMAND_HELP["admin:create"]);
             return 1;
           }
           const password = process.env.EASY_CMS_ADMIN_PASSWORD ?? (io.interactive && io.prompt ? await io.prompt("Password (8+ characters): ", { hidden: true }) : "");
@@ -435,7 +443,9 @@ async function run(argv, io = defaultIO) {
   }
 }
 async function pluginCommand(command, args, values, io) {
-  const cwd = values.cwd ?? process.cwd();
+  const text = (value) => typeof value === "string" ? value : void 0;
+  const cwd = text(values.cwd) ?? process.cwd();
+  const configFile = text(values.config);
   loadDotEnv(cwd);
   const logger = { info: io.out, warn: (m) => io.err(`warning: ${m}`), error: io.err };
   const unknown = (note) => {
@@ -447,14 +457,14 @@ async function pluginCommand(command, args, values, io) {
   };
   let config;
   try {
-    config = await loadConfig({ cwd, ...values.config ? { configFile: values.config } : {} });
+    config = await loadConfig({ cwd, ...configFile ? { configFile } : {} });
   } catch (error) {
     return unknown(`(Commands from the config were not loaded: ${error.message})`);
   }
   try {
-    const found = config.commands.find((c) => c.name === command);
+    const found = config.cliCommands.find((c) => c.name === command);
     if (!found) {
-      const extra = config.commands.map((c) => `  ${c.name.padEnd(24)}${c.description}`);
+      const extra = config.cliCommands.map((c) => `  ${c.name.padEnd(24)}${c.description}`);
       return unknown(extra.length ? `Commands from your config:
 ${extra.join("\n")}
 ` : void 0);
@@ -474,7 +484,13 @@ ${found.description}
       scheduler: false
     });
     try {
-      return await found.run({ cms, args, log: io.out }) ?? 0;
+      const flags = Object.fromEntries(
+        Object.entries(values).filter(([key, value]) => !["config", "cwd", "help"].includes(key) && value !== void 0).map(([key, value]) => [
+          key.replace(/-([a-z])/g, (_, c) => c.toUpperCase()),
+          value
+        ])
+      );
+      return await found.run({ cms, args, flags, log: io.out }) ?? 0;
     } finally {
       await cms.destroy();
     }
@@ -490,25 +506,26 @@ ${found.description}
     return 1;
   }
 }
+var RENAMED_COMMANDS = {
+  "create-admin": "admin:create",
+  "run-scheduled": "jobs:run"
+};
+var OPTIONS = {
+  config: { type: "string" },
+  cwd: { type: "string" },
+  out: { type: "string" },
+  from: { type: "string" },
+  email: { type: "string" },
+  name: { type: "string" },
+  role: { type: "string" },
+  port: { type: "string" },
+  host: { type: "string" },
+  watch: { type: "boolean" },
+  "trust-proxy": { type: "boolean" },
+  help: { type: "boolean", short: "h" }
+};
 function parse(argv) {
-  return parseArgs({
-    args: [...argv],
-    allowPositionals: true,
-    options: {
-      config: { type: "string" },
-      cwd: { type: "string" },
-      out: { type: "string" },
-      from: { type: "string" },
-      email: { type: "string" },
-      name: { type: "string" },
-      role: { type: "string" },
-      port: { type: "string" },
-      host: { type: "string" },
-      watch: { type: "boolean" },
-      "trust-proxy": { type: "boolean" },
-      help: { type: "boolean", short: "h" }
-    }
-  });
+  return parseArgs({ args: [...argv], allowPositionals: true, options: OPTIONS });
 }
 async function serve(values, cwd, logger, load, io) {
   const port = Number(values.port ?? process.env.PORT ?? 4e3);

package/dist/index.js

@@ -2,7 +2,7 @@ import {
   createStandaloneHandler,
   run,
   startServer
-} from "./chunk-73JSCLZP.js";
+} from "./chunk-IP3UPED4.js";
 export {
   createStandaloneHandler,
   run,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy-cms",
-  "version": "0.47.4",
+  "version": "0.49.0",
   "description": "Command line tool for Easy CMS",
   "license": "MIT",
   "type": "module",
@@ -21,11 +21,11 @@
     "node": ">=22.12"
   },
   "dependencies": {
-    "@easy-cms/core": "^0.47.4",
-    "@easy-cms/admin": "^0.47.4"
+    "@easy-cms/core": "^0.49.0",
+    "@easy-cms/admin": "^0.49.0"
   },
   "devDependencies": {
-    "@easy-cms/db-sqlite": "^0.47.4"
+    "@easy-cms/db-sqlite": "^0.49.0"
   },
   "publishConfig": {
     "access": "public"