fexapi 0.2.4 → 0.2.5

package/dist/cli/help.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../../src/cli/help.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,SAAS,YAiErB,CAAC"}
+{"version":3,"file":"help.d.ts","sourceRoot":"","sources":["../../src/cli/help.ts"],"names":[],"mappings":"AAQA,eAAO,MAAM,SAAS,YAgErB,CAAC"}

package/dist/cli/help.js

@@ -16,6 +16,7 @@ const printHelp = () => {
     console.log(`  ${(0, ui_1.formatCommand)("fexapi run [--host <host>] [--port <number>] [--log]")}`);
     console.log(`  ${(0, ui_1.formatCommand)("fexapi [--host <host>] [--port <number>] [--log]")}`);
     console.log(`  ${(0, ui_1.formatCommand)("fexapi --version")}`);
+    console.log(`  ${(0, ui_1.formatCommand)("fexapi version")}`);
     console.log(`  ${(0, ui_1.formatCommand)("fexapi --help")}`);
     (0, ui_1.printSpacer)();
     console.log(ui_1.ui.bold("Examples"));
@@ -37,12 +38,10 @@ const printHelp = () => {
     console.log(ui_1.ui.bold("fexapi init creates"));
     console.log(`  ${ui_1.ui.dim("fexapi.config.js")}`);
     console.log(`  ${ui_1.ui.dim("fexapi/schema.fexapi")}`);
-    console.log(`  ${ui_1.ui.dim("fexapi/schemas/*.yaml (optional, via wizard)")}`);
     (0, ui_1.printSpacer)();
     console.log(ui_1.ui.bold("Init wizard asks"));
     console.log(`  ${ui_1.ui.dim("What port? (default: 4000)")}`);
     console.log(`  ${ui_1.ui.dim("Enable CORS? (Y/n)")}`);
-    console.log(`  ${ui_1.ui.dim("Generate sample schemas? (Y/n)")}`);
     (0, ui_1.printSpacer)();
     console.log(ui_1.ui.bold("Then run"));
     console.log(`  ${ui_1.ui.dim("# edit fexapi/schema.fexapi")}`);

package/dist/commands/dev.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":"AA8BA,eAAO,MAAM,aAAa,GAAI,2CAK3B;IACD,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;CACrB,KAAG,MAmHH,CAAC"}
+{"version":3,"file":"dev.d.ts","sourceRoot":"","sources":["../../src/commands/dev.ts"],"names":[],"mappings":"AA0EA,eAAO,MAAM,aAAa,GAAI,2CAK3B;IACD,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,OAAO,CAAC;IACtB,UAAU,EAAE,OAAO,CAAC;CACrB,KAAG,MAuNH,CAAC"}

package/dist/commands/dev.js

@@ -5,21 +5,53 @@ const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const ui_1 = require("../cli/ui");
 const paths_1 = require("../project/paths");
+const generate_1 = require("./generate");
 const serve_1 = require("./serve");
 const WATCH_DEBOUNCE_MS = 150;
+const GENERATED_SPEC_PATH = "fexapi/generated.api.json";
+const GENERATED_SPEC_SUPPRESS_MS = 1200;
 const normalizePath = (pathValue) => {
     return pathValue.replace(/\\/g, "/").toLowerCase();
 };
-const isWatchedPath = (projectRoot, changedPath) => {
+const getWatchReaction = (projectRoot, changedPath) => {
     const relativePath = normalizePath((0, node_path_1.relative)(projectRoot, changedPath));
     if (relativePath === "fexapi.config.js") {
-        return true;
+        return {
+            shouldRestart: true,
+            shouldRegenerate: false,
+            reason: "fexapi.config.js changed",
+        };
+    }
+    if (relativePath === "fexapi/schema.fexapi") {
+        return {
+            shouldRestart: true,
+            shouldRegenerate: true,
+            reason: "schema.fexapi changed",
+        };
+    }
+    if (relativePath.startsWith("fexapi/schemas/") &&
+        (relativePath.endsWith(".yaml") || relativePath.endsWith(".yml"))) {
+        return {
+            shouldRestart: true,
+            shouldRegenerate: true,
+            reason: "custom schema definition changed",
+        };
+    }
+    if (relativePath === GENERATED_SPEC_PATH) {
+        return {
+            shouldRestart: true,
+            shouldRegenerate: false,
+            reason: "generated.api.json changed",
+        };
     }
     if (relativePath.startsWith("fexapi/")) {
-        return true;
+        return {
+            shouldRestart: true,
+            shouldRegenerate: false,
+            reason: `file changed (${relativePath})`,
+        };
     }
-    return (relativePath.startsWith("fexapi/schemas/") &&
-        (relativePath.endsWith(".yaml") || relativePath.endsWith(".yml")));
+    return undefined;
 };
 const runDevCommand = ({ host, port, watchEnabled, logEnabled, }) => {
     if (!watchEnabled) {
@@ -38,34 +70,87 @@ const runDevCommand = ({ host, port, watchEnabled, logEnabled, }) => {
     let restartTimer;
     let restartQueued = false;
     let restartInProgress = false;
-    const restartServer = async (reason) => {
-        if (!currentServer) {
-            return;
+    let pendingReasons = new Set();
+    let pendingRegeneration = false;
+    let suppressGeneratedSpecUntilMs = 0;
+    const collectPendingWatchChanges = ({ reason, shouldRegenerate, }) => {
+        pendingReasons.add(reason);
+        if (shouldRegenerate) {
+            pendingRegeneration = true;
         }
+    };
+    const restartServer = async ({ reason, shouldRegenerate, }) => {
         if (restartInProgress) {
             restartQueued = true;
+            collectPendingWatchChanges({ reason, shouldRegenerate });
             return;
         }
         restartInProgress = true;
         (0, ui_1.logInfo)(`[watch] change detected (${reason})`);
-        await new Promise((resolve) => {
-            currentServer?.close(() => {
-                resolve();
+        if (shouldRegenerate) {
+            (0, ui_1.printSpacer)();
+            (0, ui_1.logInfo)("[watch] regenerating generated.api.json from schema changes...");
+            const generationExitCode = (0, generate_1.generateFromSchema)();
+            if (generationExitCode !== 0) {
+                (0, ui_1.logError)("[watch] generation failed; keeping previous server state.");
+                (0, ui_1.logWarn)("Fix schema errors and save again. Watch mode will retry automatically.");
+                restartInProgress = false;
+                if (restartQueued) {
+                    restartQueued = false;
+                    const queuedReasons = Array.from(pendingReasons);
+                    const queuedRegeneration = pendingRegeneration;
+                    pendingReasons = new Set();
+                    pendingRegeneration = false;
+                    await restartServer({
+                        reason: queuedReasons.join(", ") || "queued changes",
+                        shouldRegenerate: queuedRegeneration,
+                    });
+                }
+                return;
+            }
+            suppressGeneratedSpecUntilMs = Date.now() + GENERATED_SPEC_SUPPRESS_MS;
+        }
+        if (currentServer) {
+            await new Promise((resolve) => {
+                currentServer?.close(() => {
+                    resolve();
+                });
             });
-        });
+        }
         currentServer = (0, serve_1.createProjectServer)({ host, port, logEnabled });
+        if (currentServer) {
+            (0, ui_1.logSuccess)("[watch] server reloaded");
+        }
+        else {
+            (0, ui_1.logError)("[watch] server reload failed; waiting for next change to retry.");
+        }
         restartInProgress = false;
         if (restartQueued) {
             restartQueued = false;
-            await restartServer("queued changes");
+            const queuedReasons = Array.from(pendingReasons);
+            const queuedRegeneration = pendingRegeneration;
+            pendingReasons = new Set();
+            pendingRegeneration = false;
+            await restartServer({
+                reason: queuedReasons.join(", ") || "queued changes",
+                shouldRegenerate: queuedRegeneration,
+            });
         }
     };
-    const scheduleRestart = (reason) => {
+    const scheduleRestart = ({ reason, shouldRegenerate, }) => {
+        collectPendingWatchChanges({ reason, shouldRegenerate });
         if (restartTimer) {
             clearTimeout(restartTimer);
         }
         restartTimer = setTimeout(() => {
-            void restartServer(reason);
+            const reasons = Array.from(pendingReasons);
+            const requiresRegeneration = pendingRegeneration;
+            pendingReasons = new Set();
+            pendingRegeneration = false;
+            void restartServer({
+                reason: reasons.join(", ") || reason,
+                shouldRegenerate: requiresRegeneration,
+            });
         }, WATCH_DEBOUNCE_MS);
     };
     const activeWatchers = [];
@@ -76,12 +161,21 @@ const runDevCommand = ({ host, port, watchEnabled, logEnabled, }) => {
         }
         const watcher = (0, node_fs_1.watch)(watchTarget, { recursive: true }, (_event, file) => {
             if (!file) {
-                scheduleRestart("unknown file");
+                scheduleRestart({ reason: "unknown file", shouldRegenerate: false });
                 return;
             }
             const changedPath = (0, node_path_1.join)(watchTarget, file.toString());
-            if (isWatchedPath(projectRoot, changedPath)) {
-                scheduleRestart((0, node_path_1.relative)(projectRoot, changedPath));
+            const normalizedRelativePath = normalizePath((0, node_path_1.relative)(projectRoot, changedPath));
+            if (normalizedRelativePath === GENERATED_SPEC_PATH &&
+                Date.now() < suppressGeneratedSpecUntilMs) {
+                return;
+            }
+            const watchReaction = getWatchReaction(projectRoot, changedPath);
+            if (watchReaction?.shouldRestart) {
+                scheduleRestart({
+                    reason: watchReaction.reason,
+                    shouldRegenerate: watchReaction.shouldRegenerate,
+                });
             }
         });
         activeWatchers.push(watcher);
@@ -94,9 +188,11 @@ const runDevCommand = ({ host, port, watchEnabled, logEnabled, }) => {
         for (const watcher of activeWatchers) {
             watcher.close();
         }
-        await new Promise((resolve) => {
-            currentServer?.close(() => resolve());
-        });
+        if (currentServer) {
+            await new Promise((resolve) => {
+                currentServer?.close(() => resolve());
+            });
+        }
         process.exit(0);
     };
     process.on("SIGINT", () => {

package/dist/commands/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AAgOA,eAAO,MAAM,iBAAiB,GAAU,YAErC;IACD,KAAK,EAAE,OAAO,CAAC;CAChB,KAAG,OAAO,CAAC,MAAM,CA8KjB,CAAC"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../src/commands/init.ts"],"names":[],"mappings":"AA2JA,eAAO,MAAM,iBAAiB,GAAU,YAErC;IACD,KAAK,EAAE,OAAO,CAAC;CAChB,KAAG,OAAO,CAAC,MAAM,CAsHjB,CAAC"}

package/dist/commands/init.js

@@ -27,11 +27,10 @@ const askInitWizardQuestions = async () => {
         return {
             port: DEFAULT_INIT_PORT,
             cors: true,
-            generateSampleSchemas: true,
         };
     }
     const questionInterface = (0, promises_1.createInterface)({ input: node_process_1.stdin, output: node_process_1.stdout });
-    const totalSteps = 3;
+    const totalSteps = 2;
     const formatWizardPrompt = (step, question, hint, defaultValue) => {
         return `${ui_1.ui.cyan("?")} ${ui_1.ui.bold(`[${step}/${totalSteps}]`)} ${ui_1.ui.white(question)} ${ui_1.ui.gray(`(${hint})`)} ${ui_1.ui.dim(`default: ${defaultValue}`)} ${ui_1.ui.gray("› ")}`;
     };
@@ -69,23 +68,10 @@ const askInitWizardQuestions = async () => {
             (0, ui_1.printSpacer)();
         }
         console.log(`${ui_1.ui.green("✓")} ${ui_1.ui.dim("CORS")}: ${cors ? ui_1.ui.green("enabled") : ui_1.ui.gray("disabled")}`);
-        let generateSampleSchemas = true;
-        while (true) {
-            const answer = await questionInterface.question(formatWizardPrompt(3, "Generate sample schemas?", "Y/n", "Y"));
-            const parsed = parseYesNo(answer, true);
-            if (parsed !== undefined) {
-                generateSampleSchemas = parsed;
-                break;
-            }
-            console.log(`${ui_1.ui.red("✕")} ${ui_1.ui.white("Please answer with Y/Yes or N/No.")}`);
-            (0, ui_1.printSpacer)();
-        }
-        console.log(`${ui_1.ui.green("✓")} ${ui_1.ui.dim("Sample schemas")}: ${generateSampleSchemas ? ui_1.ui.green("enabled") : ui_1.ui.gray("disabled")}`);
         (0, ui_1.printSpacer)();
         return {
             port,
             cors,
-            generateSampleSchemas,
         };
     }
     finally {
@@ -101,49 +87,6 @@ const getRuntimeConfigTemplate = ({ port, cors, }) => {
         "};",
     ].join("\n");
 };
-const SAMPLE_USER_SCHEMA = [
-    "id:",
-    "  type: uuid",
-    "fullName:",
-    "  type: name",
-    "  faker: person.fullName",
-    "username:",
-    "  type: string",
-    "  faker: internet.username",
-    "email:",
-    "  type: email",
-    "  faker: internet.email",
-    "avatarUrl:",
-    "  type: url",
-    "  faker: image.avatar",
-    "bio:",
-    "  type: string",
-    "  faker: lorem.sentence",
-    "isActive:",
-    "  type: boolean",
-    "joinedAt:",
-    "  type: date",
-].join("\n");
-const SAMPLE_POST_SCHEMA = [
-    "id:",
-    "  type: uuid",
-    "title:",
-    "  type: string",
-    "  faker: lorem.sentence",
-    "body:",
-    "  type: string",
-    "  faker: lorem.paragraphs",
-    "authorId:",
-    "  type: uuid",
-    "published:",
-    "  type: boolean",
-    "likes:",
-    "  type: number",
-    "  min: 0",
-    "  max: 500",
-    "createdAt:",
-    "  type: date",
-].join("\n");
 const initializeProject = async ({ force, }) => {
     const initStartedAtMs = (0, ui_1.nowMs)();
     const packageJsonPath = (0, paths_1.findClosestPackageJson)(process.cwd());
@@ -156,9 +99,6 @@ const initializeProject = async ({ force, }) => {
     const fexapiDirectoryPath = (0, node_path_1.join)(projectRoot, "fexapi");
     const schemaPath = (0, node_path_1.join)(fexapiDirectoryPath, "schema.fexapi");
     const runtimeConfigPath = (0, node_path_1.join)(projectRoot, "fexapi.config.js");
-    const schemasDirectoryPath = (0, node_path_1.join)(projectRoot, "fexapi", "schemas");
-    const userSchemaPath = (0, node_path_1.join)(schemasDirectoryPath, "user.yaml");
-    const postSchemaPath = (0, node_path_1.join)(schemasDirectoryPath, "post.yaml");
     const wizardAnswers = await askInitWizardQuestions();
     (0, ui_1.printGroupHeader)("Init");
     const initSpinner = (0, ui_1.startSpinner)("Scaffolding fexapi project files");
@@ -176,29 +116,6 @@ const initializeProject = async ({ force, }) => {
             cors: wizardAnswers.cors,
         })}\n`, "utf-8");
     }
-    let userSchemaStatus = "skipped";
-    let postSchemaStatus = "skipped";
-    if (wizardAnswers.generateSampleSchemas) {
-        (0, node_fs_1.mkdirSync)(schemasDirectoryPath, { recursive: true });
-        const userSchemaExists = (0, node_fs_1.existsSync)(userSchemaPath);
-        if (!userSchemaExists || force) {
-            initSpinner.update("Writing sample user schema");
-            (0, node_fs_1.writeFileSync)(userSchemaPath, `${SAMPLE_USER_SCHEMA}\n`, "utf-8");
-            userSchemaStatus = userSchemaExists ? "overwritten" : "created";
-        }
-        else {
-            userSchemaStatus = "exists";
-        }
-        const postSchemaExists = (0, node_fs_1.existsSync)(postSchemaPath);
-        if (!postSchemaExists || force) {
-            initSpinner.update("Writing sample post schema");
-            (0, node_fs_1.writeFileSync)(postSchemaPath, `${SAMPLE_POST_SCHEMA}\n`, "utf-8");
-            postSchemaStatus = postSchemaExists ? "overwritten" : "created";
-        }
-        else {
-            postSchemaStatus = "exists";
-        }
-    }
     initSpinner.succeed("Project scaffolding complete");
     (0, ui_1.logSuccess)(`Initialized fexapi in ${projectRoot}`);
     (0, ui_1.logInfo)(`Detected framework: ${detectedProject.primaryFramework}`);
@@ -226,29 +143,6 @@ const initializeProject = async ({ force, }) => {
     else {
         (0, ui_1.logSuccess)(`Created ${runtimeConfigPath}`);
     }
-    if (wizardAnswers.generateSampleSchemas) {
-        if (userSchemaStatus === "exists") {
-            (0, ui_1.logWarn)(`Exists ${userSchemaPath}`);
-        }
-        else if (userSchemaStatus === "overwritten") {
-            (0, ui_1.logSuccess)(`Overwritten ${userSchemaPath}`);
-        }
-        else if (userSchemaStatus === "created") {
-            (0, ui_1.logSuccess)(`Created ${userSchemaPath}`);
-        }
-        if (postSchemaStatus === "exists") {
-            (0, ui_1.logWarn)(`Exists ${postSchemaPath}`);
-        }
-        else if (postSchemaStatus === "overwritten") {
-            (0, ui_1.logSuccess)(`Overwritten ${postSchemaPath}`);
-        }
-        else if (postSchemaStatus === "created") {
-            (0, ui_1.logSuccess)(`Created ${postSchemaPath}`);
-        }
-    }
-    else {
-        (0, ui_1.logWarn)("Sample schemas were skipped.");
-    }
     if (detectedProject.primaryFramework === "unknown") {
         (0, ui_1.logWarn)("No known framework dependency found. Update fexapi.config.js and schema.fexapi if needed.");
     }
@@ -257,8 +151,6 @@ const initializeProject = async ({ force, }) => {
     const createdFiles = [
         !schemaExists || force,
         !runtimeConfigExists || force,
-        userSchemaStatus === "created" || userSchemaStatus === "overwritten",
-        postSchemaStatus === "created" || postSchemaStatus === "overwritten",
     ].filter(Boolean).length;
     (0, ui_1.printSummaryCard)("Init Summary", [
         {
@@ -273,10 +165,6 @@ const initializeProject = async ({ force, }) => {
             label: "cors",
             value: wizardAnswers.cors ? "enabled" : "disabled",
         },
-        {
-            label: "sample schemas",
-            value: wizardAnswers.generateSampleSchemas ? "enabled" : "disabled",
-        },
         {
             label: "files changed",
             value: String(createdFiles),

package/dist/index.js

@@ -13,8 +13,6 @@ const args = process.argv.slice(2);
 const [firstArg, ...restArgs] = args;
 const main = async () => {
     if (firstArg === "--version" || firstArg === "-v" || firstArg === "version") {
-        (0, ui_1.printBanner)();
-        (0, ui_1.printSpacer)();
         console.log((0, ui_1.getCliVersion)());
         process.exit(0);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fexapi",
-  "version": "0.2.4",
+  "version": "0.2.5",
   "description": "Mock API generation CLI tool for local development and testing",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",