@bobbykim/manguito-cms-cli 0.10.0 → 0.10.1

package/dist/index.js

@@ -25570,18 +25570,18 @@ async function runDev(options, deps) {
   await mkdir2(manguitoDir, { recursive: true });
   const drizzleConfigPath = resolve6(manguitoDir, "drizzle.config.ts");
   const needsSeed = !await db.tableExists("users");
-  const bootstrapRegistry = await parseAllSchemas(cwd, config2);
-  const crossRefErrors = validateCrossReferences(bootstrapRegistry, config2.api.media?.max_file_size);
-  if (crossRefErrors.length > 0) {
-    printValidationErrors(crossRefErrors, "Schema reference errors", "manguito validate");
+  const loaded = loadValidatedSchema(cwd, config2);
+  if (!loaded.ok) {
+    printValidationErrors(loaded.errors, "Schema errors", "manguito validate");
     process.exit(1);
   }
+  const { registry, versionModel } = loaded.value;
   await generateDrizzleConfig(config2, manguitoDir);
-  await writeFile9(join11(manguitoDir, "schema.ts"), generateSchemaFile(bootstrapRegistry), "utf8");
+  await writeFile9(join11(manguitoDir, "schema.ts"), generateSchemaFile(registry), "utf8");
   await runDevMigration(drizzleConfigPath);
   printSuccess(needsSeed ? "Schema tables created" : "Schema tables up to date");
   if (needsSeed) {
-    await seedSystemTables(db.getDb(), bootstrapRegistry);
+    await seedSystemTables(db.getDb(), registry);
     printSuccess("System tables seeded");
   }
   const adminCountResult = await db.getDb().execute(sql`
@@ -25614,7 +25614,6 @@ async function runDev(options, deps) {
     process.stdout.write("\n");
     printSuccess("Admin account created");
   }
-  const registry = bootstrapRegistry;
   const contentCount = Object.keys(registry.content_types).length;
   const paragraphCount = Object.keys(registry.paragraph_types).length;
   const taxonomyCount = Object.keys(registry.taxonomy_types).length;
@@ -25625,12 +25624,6 @@ async function runDev(options, deps) {
   await generateRoutes2(registry, manguitoDir);
   await generateForms(registry, join11(manguitoDir, "forms"));
   await generateNav(registry, manguitoDir);
-  const versionsResult = loadProjectVersionModel(resolveSchemaConfig(cwd, config2), registry);
-  if (!versionsResult.ok) {
-    printValidationErrors(versionsResult.errors, "Version model errors", "manguito validate");
-    process.exit(1);
-  }
-  const versionModel = reduceVersionModel(versionsResult.value.model);
   const resolverMap = await loadProgrammaticResolvers(cwd, config2.programmatic.dir);
   const adapter = createCmsApp({
     name: config2.name,
@@ -25718,7 +25711,7 @@ async function runDev(options, deps) {
   void (async () => {
     for await (const event of watcher) {
       if (event.filename && /\.(json|ya?ml)$/.test(event.filename)) {
-        await onSchemaFileChange({
+        await reloadSafely({
           cwd,
           config: config2,
           manguitoDir,
@@ -25738,7 +25731,7 @@ async function runDev(options, deps) {
     void (async () => {
       for await (const event of progWatcher) {
         if (event.filename && /\.(ts|mjs|js)$/.test(event.filename)) {
-          await onSchemaFileChange({
+          await reloadSafely({
             cwd,
             config: config2,
             manguitoDir,
@@ -25754,34 +25747,32 @@ async function runDev(options, deps) {
     })();
   }
 }
-async function onSchemaFileChange(args) {
-  const { cwd, config: config2, manguitoDir, drizzleConfigPath, db, updateFetch, getResolvers } = args;
-  let registry;
+async function reloadSafely(args) {
   try {
-    registry = await parseAllSchemas(cwd, config2);
-  } catch {
-    process.stderr.write("\u26A0 Schema parse error \u2014 changes not applied.\n");
-    return;
+    await onSchemaFileChange(args);
+  } catch (err) {
+    process.stderr.write(
+      `\u26A0 Reload failed: ${err instanceof Error ? err.message : String(err)}
+\u26A0 Still serving the previous version.
+`
+    );
   }
-  const crossRefErrors = validateCrossReferences(registry, config2.api.media?.max_file_size);
-  if (crossRefErrors.length > 0) {
-    printValidationErrors(crossRefErrors, "Schema reference errors", "manguito validate");
+}
+async function onSchemaFileChange(args) {
+  const { cwd, config: config2, manguitoDir, drizzleConfigPath, db, updateFetch, getResolvers } = args;
+  const loaded = loadValidatedSchema(cwd, config2);
+  if (!loaded.ok) {
+    printValidationErrors(loaded.errors, "Schema errors", "manguito validate");
     process.stderr.write("\u26A0 Changes not applied.\n");
     return;
   }
+  const { registry, versionModel } = loaded.value;
   await generateDrizzleConfig(config2, manguitoDir);
   await writeFile9(join11(manguitoDir, "schema.ts"), generateSchemaFile(registry), "utf8");
   await generateSchemaRegistry(registry, manguitoDir);
   await generateRoutes2(registry, manguitoDir);
   await generateForms(registry, join11(manguitoDir, "forms"));
   await generateNav(registry, manguitoDir);
-  const versionsResult = loadProjectVersionModel(resolveSchemaConfig(cwd, config2), registry);
-  if (!versionsResult.ok) {
-    printValidationErrors(versionsResult.errors, "Version model errors", "manguito validate");
-    process.stderr.write("\u26A0 Changes not applied.\n");
-    return;
-  }
-  const versionModel = reduceVersionModel(versionsResult.value.model);
   try {
     await runDevMigration(drizzleConfigPath);
   } catch (err) {
@@ -25806,46 +25797,40 @@ async function onSchemaFileChange(args) {
   updateFetch((req) => newAdapter.app.fetch(req));
   printSuccess("Schema updated");
 }
-async function parseAllSchemas(cwd, config2) {
+function loadValidatedSchema(cwd, config2) {
+  const parsed = parseAllSchemas(cwd, config2);
+  if (!parsed.ok) return parsed;
+  const registry = parsed.value;
+  const crossRefErrors = validateCrossReferences(registry, config2.api.media?.max_file_size);
+  if (crossRefErrors.length > 0) return { ok: false, errors: crossRefErrors };
+  const versions = loadProjectVersionModel(resolveSchemaConfig(cwd, config2), registry);
+  if (!versions.ok) return { ok: false, errors: versions.errors };
+  printSchemaDeprecations(findSchemaDeprecations(registry));
+  return { ok: true, value: { registry, versionModel: reduceVersionModel(versions.value.model) } };
+}
+function parseAllSchemas(cwd, config2) {
+  const errors = [];
   const parsedSchemas = [];
   const walkResult = walkSchemaDirectory(config2.schema);
   if (!walkResult.ok) {
-    printGuidedError("Schema directory errors \u2014 run `manguito validate` for details.");
-    process.exit(1);
-  }
-  for (const file of walkResult.value) {
-    const parseResult = parseSchema(file.raw, file.schema_type, file.path);
-    if (!parseResult.ok) {
-      printGuidedError("Schema parse errors \u2014 run `manguito validate` for details.");
-      process.exit(1);
+    errors.push(...walkResult.errors);
+  } else {
+    for (const file of walkResult.value) {
+      const parseResult = parseSchema(file.raw, file.schema_type, file.path);
+      if (parseResult.ok) parsedSchemas.push(parseResult.schema);
+      else errors.push(...parseResult.errors);
     }
-    parsedSchemas.push(parseResult.schema);
   }
   const rolesPath = resolve6(cwd, config2.schema.base_path, "roles.json");
   const rolesLoad = loadSchemaFile(rolesPath);
-  if (!rolesLoad.ok) {
-    printGuidedError("Could not read roles.json.");
-    process.exit(1);
-  }
-  const rolesResult = parseRoles(rolesLoad.value, rolesPath);
-  if (!rolesResult.ok) {
-    printGuidedError("roles.json parse errors \u2014 run `manguito validate` for details.");
-    process.exit(1);
-  }
+  const rolesResult = rolesLoad.ok ? parseRoles(rolesLoad.value, rolesPath) : rolesLoad;
+  if (!rolesResult.ok) errors.push(...rolesResult.errors);
   const routesPath = resolve6(cwd, config2.schema.base_path, "routes.json");
   const routesLoad = loadSchemaFile(routesPath);
-  if (!routesLoad.ok) {
-    printGuidedError("Could not read routes.json.");
-    process.exit(1);
-  }
-  const routesResult = parseRoutes(routesLoad.value, routesPath);
-  if (!routesResult.ok) {
-    printGuidedError("routes.json parse errors \u2014 run `manguito validate` for details.");
-    process.exit(1);
-  }
-  const registry = buildSchemaRegistry(parsedSchemas, routesResult.value, rolesResult.value);
-  printSchemaDeprecations(findSchemaDeprecations(registry));
-  return registry;
+  const routesResult = routesLoad.ok ? parseRoutes(routesLoad.value, routesPath) : routesLoad;
+  if (!routesResult.ok) errors.push(...routesResult.errors);
+  if (errors.length > 0 || !rolesResult.ok || !routesResult.ok) return { ok: false, errors };
+  return { ok: true, value: buildSchemaRegistry(parsedSchemas, routesResult.value, rolesResult.value) };
 }
 function resolveAdminRoot2(cwd) {
   const cwdRequire = createRequire2(join11(cwd, "package.json"));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobbykim/manguito-cms-cli",
-  "version": "0.10.0",
+  "version": "0.10.1",
   "license": "MIT",
   "author": "Bobby Kim <bobby.sihun.kim@gmail.com>",
   "homepage": "https://github.com/bobbykim89/manguito-cms",
@@ -31,8 +31,8 @@
     "vite": "^8.1.3",
     "@bobbykim/manguito-cms-admin": "0.5.3",
     "@bobbykim/manguito-cms-api": "0.8.4",
-    "@bobbykim/manguito-cms-core": "0.9.0",
-    "@bobbykim/manguito-cms-db": "0.1.9"
+    "@bobbykim/manguito-cms-db": "0.1.9",
+    "@bobbykim/manguito-cms-core": "0.9.0"
   },
   "devDependencies": {
     "@types/node": "^25.9.5",