@yrest/cli 0.7.0 → 0.8.1

package/dist/index.mjs

@@ -35,13 +35,13 @@ var yrestStorage_exports = {};
 __export(yrestStorage_exports, {
   createYrestStorage: () => createYrestStorage
 });
-import { readFileSync, writeFileSync, renameSync } from "fs";
-import { resolve, dirname } from "path";
+import { readFileSync as readFileSync2, writeFileSync, renameSync } from "fs";
+import { resolve, dirname as dirname2 } from "path";
 import { randomUUID as randomUUID2 } from "crypto";
 import { parse as parse2, stringify } from "yaml";
 function createYrestStorage(filePath) {
   const absPath = resolve(filePath);
-  const raw = parse2(readFileSync(absPath, "utf8")) ?? {};
+  const raw = parse2(readFileSync2(absPath, "utf8")) ?? {};
   const relations = raw["_rel"] ?? {};
   const routes = Array.isArray(raw["_routes"]) ? raw["_routes"] : [];
   const data = Object.fromEntries(
@@ -73,12 +73,12 @@ function createYrestStorage(filePath) {
       if (Object.keys(relations).length > 0) payload._rel = relations;
       if (routes.length > 0) payload._routes = routes;
       Object.assign(payload, data);
-      const tmp = resolve(dirname(absPath), `.yrest-${randomUUID2()}.tmp`);
+      const tmp = resolve(dirname2(absPath), `.yrest-${randomUUID2()}.tmp`);
       writeFileSync(tmp, stringify(payload), "utf8");
       renameSync(tmp, absPath);
     },
     reload() {
-      const fresh = parse2(readFileSync(absPath, "utf8")) ?? {};
+      const fresh = parse2(readFileSync2(absPath, "utf8")) ?? {};
       const freshRelations = fresh["_rel"] ?? {};
       const freshData = Object.fromEntries(
         Object.entries(fresh).filter(([key]) => key !== "_rel" && key !== "_routes")
@@ -168,8 +168,15 @@ import { resolve as resolve2 } from "path";
 // src/utils/handlers.ts
 init_esm_shims();
 import { existsSync } from "fs";
+var ALLOWED_EXTENSIONS = [".js", ".mjs", ".cjs"];
 async function loadHandlers(filePath) {
   if (!existsSync(filePath)) return /* @__PURE__ */ new Map();
+  if (!ALLOWED_EXTENSIONS.some((ext) => filePath.endsWith(ext))) {
+    console.error(
+      `  \x1B[31m[handlers] ${filePath} \u2014 only .js, .mjs and .cjs files are allowed\x1B[0m`
+    );
+    return /* @__PURE__ */ new Map();
+  }
   try {
     const mod = await import(filePath);
     const map = /* @__PURE__ */ new Map();
@@ -206,6 +213,9 @@ init_esm_shims();
 
 // src/router/templates/about.template.ts
 init_esm_shims();
+import { readFileSync } from "fs";
+import { dirname, join } from "path";
+import { fileURLToPath as fileURLToPath2 } from "url";
 
 // src/utils/interpolate.ts
 init_esm_shims();
@@ -255,6 +265,15 @@ function hasTemplates(value) {
 }
 
 // src/router/templates/about.template.ts
+var _dir = dirname(fileURLToPath2(import.meta.url));
+var LOGO_SRC = (() => {
+  try {
+    const buf = readFileSync(join(_dir, "../../assets/logo-color.png"));
+    return `data:image/png;base64,${buf.toString("base64")}`;
+  } catch {
+    return "";
+  }
+})();
 var METHOD_COLOR = {
   GET: "#3fb950",
   POST: "#58a6ff",
@@ -263,8 +282,11 @@ var METHOD_COLOR = {
   DELETE: "#f85149",
   fn: "#f0883e"
 };
+function escapeHtml(str) {
+  return str.replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;").replace(/'/g, "&#039;");
+}
 function badge(label, color, bg) {
-  return `<span class="badge" style="background:${bg};color:${color};border:1px solid ${color}40">${label}</span>`;
+  return `<span class="badge" style="background:${bg};color:${color};border:1px solid ${color}40">${escapeHtml(label)}</span>`;
 }
 function methodBadge(method) {
   const color = METHOD_COLOR[method] ?? "#7d8590";
@@ -274,7 +296,7 @@ function endpointRow(method, path2, desc) {
   return `
     <tr>
       <td class="method-cell">${methodBadge(method)}</td>
-      <td class="path-cell"><code>${path2}</code></td>
+      <td class="path-cell"><code>${escapeHtml(path2)}</code></td>
       <td class="desc-cell">${desc}</td>
     </tr>`;
 }
@@ -308,7 +330,7 @@ function resourceAccordion(name, base, isOpen) {
   return `
   <details class="resource-card" ${isOpen ? "open" : ""}>
     <summary>
-      <span class="resource-name">/${name}</span>
+      <span class="resource-name">/${escapeHtml(name)}</span>
       <span class="route-count">6 routes</span>
     </summary>
     <table>
@@ -392,7 +414,7 @@ curl -X POST ${host}/_snapshot/reset`
   }
   if (firstCustomRoute) {
     const method = firstCustomRoute.method?.toUpperCase() ?? "GET";
-    const fullPath = `${host}${base}${firstCustomRoute.path}`;
+    const fullPath = `${host}${base}${escapeHtml(firstCustomRoute.path ?? "")}`;
     const curlFlag = method === "GET" ? "" : `-X ${method} `;
     examples.push(`# Custom route
 curl ${curlFlag}${fullPath}`);
@@ -413,6 +435,8 @@ function generateAboutHtml(storage, options, handlers = /* @__PURE__ */ new Map(
     modes.push(badge(`pageable \xB7 limit ${options.pageable.limit}`, "#34d399", "#34d39918"));
   if (options.snapshot) modes.push(badge("snapshot", "#c084fc", "#c084fc18"));
   if (handlers.size > 0) modes.push(badge(`handlers \xB7 ${handlers.size}`, "#f0883e", "#f0883e18"));
+  if (options.idStrategy !== "increment")
+    modes.push(badge(`id \xB7 ${options.idStrategy}`, "#a371f7", "#a371f718"));
   const accordions = collections.map((col, i) => resourceAccordion(col, base, i === 0)).join("");
   const nestedRows = [];
   for (const [child, fields] of Object.entries(relations)) {
@@ -455,6 +479,9 @@ function generateAboutHtml(storage, options, handlers = /* @__PURE__ */ new Map(
       ${customRoutes.map((r) => {
     const fullPath = `${base}${r.path}`;
     const tags = [];
+    if (r.error) {
+      tags.push(`<span style="color:#f85149;font-size:11px">error\xB7${r.error}</span>`);
+    }
     if (r.delay && r.delay > 0) {
       tags.push(`<span style="color:#fb923c;font-size:11px">delay\xB7${r.delay}ms</span>`);
     }
@@ -468,9 +495,12 @@ function generateAboutHtml(storage, options, handlers = /* @__PURE__ */ new Map(
       tags.push(`<span style="color:var(--text-muted);font-size:11px">otherwise</span>`);
     }
     let desc;
-    if (r.handler) {
+    if (r.error) {
+      desc = `Error injection \u2014 <code>${r.error}</code>`;
+    } else if (r.handler) {
       const found = handlers.has(r.handler);
-      desc = found ? `Handler \u2014 <code>${r.handler}()</code>` : `Handler \u2014 <code>${r.handler}()</code> <span style="color:#f85149">(not loaded)</span>`;
+      const handlerName = escapeHtml(r.handler);
+      desc = found ? `Handler \u2014 <code>${handlerName}()</code>` : `Handler \u2014 <code>${handlerName}()</code> <span style="color:#f85149">(not loaded)</span>`;
     } else if (r.scenarios?.length) {
       const hasTemplateInScenarios = r.scenarios.some((s) => s.response.body != null && hasTemplates(s.response.body)) || r.otherwise?.body != null && hasTemplates(r.otherwise.body);
       desc = hasTemplateInScenarios ? `Scenarios \u2014 <code>{{\u2026}}</code>` : `Scenarios`;
@@ -632,7 +662,7 @@ function generateAboutHtml(storage, options, handlers = /* @__PURE__ */ new Map(
 
   <div class="banner">
     <div class="banner-inner">
-      <h1><span class="y">y</span><span class="rest">Rest</span></h1>
+      ${LOGO_SRC ? `<img src="${LOGO_SRC}" alt="yRest" height="68" style="display:block;margin-bottom:0px" />` : `<h1><span class="y">y</span><span class="rest">Rest</span></h1>`}
       <p>Zero-config REST API mock server</p>
       <div class="banner-meta">
         <span>URL <strong>${host}</strong></span>
@@ -719,6 +749,10 @@ function nextId(items) {
   const ids = items.map((i) => i["id"]).filter((id) => typeof id === "number");
   return ids.length > 0 ? Math.max(...ids) + 1 : 1;
 }
+function generateId(items, strategy) {
+  if (strategy === "uuid") return crypto.randomUUID();
+  return nextId(items);
+}
 function firstParam(value) {
   if (value === void 0) return void 0;
   return Array.isArray(value) ? value[0] : value;
@@ -744,6 +778,7 @@ function applyOperator(itemValue, op, filterValue) {
     case "_start":
       return strItem.toLowerCase().startsWith(filterValue.toLowerCase());
     case "_regex": {
+      if (filterValue.length > 200) return false;
       try {
         return new RegExp(filterValue, "i").test(strItem);
       } catch {
@@ -808,10 +843,10 @@ function findById(items, id) {
 function findIndexById(items, id) {
   return items.findIndex((i) => String(i["id"]) === id);
 }
-function createItem(storage, resource, body) {
+function createItem(storage, resource, body, idStrategy = "increment") {
   const collection = storage.getCollection(resource) ?? [];
   const item = {
-    id: body["id"] !== void 0 ? body["id"] : nextId(collection),
+    id: body["id"] !== void 0 ? body["id"] : generateId(collection, idStrategy),
     ...body
   };
   storage.setCollection(resource, [...collection, item]);
@@ -990,7 +1025,12 @@ var CollectionRouteCommand = class {
       if (!req.body || typeof req.body !== "object" || Array.isArray(req.body)) {
         return reply.status(400).send({ error: "Request body must be a JSON object" });
       }
-      const item = createItem(this.storage, this.resource, req.body);
+      const item = createItem(
+        this.storage,
+        this.resource,
+        req.body,
+        this.options.idStrategy
+      );
       return reply.status(201).send(expandItems(item, req.query, this.resource, this.storage));
     });
   }
@@ -1084,6 +1124,10 @@ var CustomRouteCommand = class {
           if (route.delay && route.delay > 0) {
             await new Promise((resolve3) => setTimeout(resolve3, route.delay));
           }
+          if (route.error) {
+            const body2 = route.errorBody ?? { error: `Forced error ${route.error}` };
+            return reply.status(route.error).send(body2);
+          }
           for (const [key, value] of Object.entries(headers)) {
             reply.header(key, value);
           }
@@ -1381,7 +1425,8 @@ function buildOptions(opts) {
     readonly: opts.readonly ?? false,
     delay: opts.delay ?? 0,
     handlers: opts.handlers,
-    pageable: typeof pageable === "number" ? { enabled: true, limit: pageable } : pageable ? { enabled: true, limit: 10 } : { enabled: false, limit: 10 }
+    pageable: typeof pageable === "number" ? { enabled: true, limit: pageable } : pageable ? { enabled: true, limit: 10 } : { enabled: false, limit: 10 },
+    idStrategy: "increment"
   };
 }
 function createInMemoryStorage(data) {
@@ -1465,7 +1510,14 @@ var yrestOptionsSchema = z.object({
   pageable: z.union([z.boolean(), z.coerce.number().int().positive()]).default(false).transform((v) => ({
     enabled: v !== false,
     limit: v === false || v === true ? 10 : v
-  }))
+  })),
+  /**
+   * Strategy used to generate `id` values for new items when no `id` is provided in the body.
+   *
+   * - `"increment"` (default) — next integer above the current max id in the collection.
+   * - `"uuid"` — a random UUID v4 string (`crypto.randomUUID()`).
+   */
+  idStrategy: z.enum(["increment", "uuid"]).default("increment")
 });
 export {
   createServer,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yrest/cli",
-  "version": "0.7.0",
+  "version": "0.8.1",
   "description": "YAML-powered json-server alternative. Zero-config REST API mock server with full CRUD, relations, filters and snapshots from a db.yml file.",
   "keywords": [
     "yrest",
@@ -52,7 +52,8 @@
     "yrest": "./dist/cli/index.js"
   },
   "files": [
-    "dist"
+    "dist",
+    "assets"
   ],
   "scripts": {
     "build": "tsup",
@@ -64,7 +65,8 @@
     "lint:fix": "eslint src tests --fix",
     "format": "prettier --write .",
     "format:check": "prettier --check .",
-    "prepublishOnly": "npm run test:run && npm run build"
+    "prepublishOnly": "npm run test:run && npm run build",
+    "version": "node scripts/update-version-badge.mjs && git add README.md"
   },
   "dependencies": {
     "@fastify/cors": "^10.0.0",
@@ -75,7 +77,7 @@
   },
   "devDependencies": {
     "@eslint/js": "^10.0.1",
-    "@types/node": "^22.19.20",
+    "@types/node": "^22.19.21",
     "eslint": "^10.4.1",
     "eslint-config-prettier": "^10.1.8",
     "prettier": "^3.8.3",
@@ -86,5 +88,11 @@
   },
   "engines": {
     "node": ">=20"
+  },
+  "socket": {
+    "allow": {
+      "filesystem": true,
+      "dynamic-require": true
+    }
   }
 }