@xleddyl/nuxt-cms 0.1.43 → 0.1.44

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "@xleddyl/nuxt-cms",
   "configKey": "cms",
-  "version": "0.1.43",
+  "version": "0.1.44",
   "builder": {
     "@nuxt/module-builder": "1.0.2",
     "unbuild": "unknown"

package/dist/module.mjs

@@ -154,16 +154,22 @@ function validateConfig(config, i18n) {
       for (const [path, override] of Object.entries(entry.overrides ?? {})) {
         const oat = `${at}, override '${path}'`;
         if (known.size && !known.has(path)) errors.push(`${oat}: '${path}' is not a page path`);
-        for (const key of Object.keys(override)) {
-          if (Object.hasOwn(entry.fields ?? {}, key))
+        for (const [key, field] of Object.entries(override)) {
+          const shared = Object.hasOwn(entry.fields ?? {}, key);
+          if (field && shared)
             errors.push(`${oat}: field '${key}' is already declared for every page`);
+          if (!field && !shared)
+            errors.push(
+              `${oat}: field '${key}' is not declared for every page, nothing to remove`
+            );
           if (key === PAGE_PATH_FIELD)
             errors.push(`${oat}: '${PAGE_PATH_FIELD}' is a reserved field name on pages`);
         }
       }
       const declared = /* @__PURE__ */ new Map();
-      for (const [path, override] of Object.entries(entry.overrides ?? {})) {
+      for (const override of Object.values(entry.overrides ?? {})) {
         for (const [key, field] of Object.entries(override)) {
+          if (!field) continue;
           const seen = declared.get(key);
           if (seen && seen !== field.type) {
             errors.push(

package/dist/runtime/shared/index.d.ts

@@ -106,7 +106,7 @@ export interface CmsEntry {
     exclude?: string[];
     order?: string[];
     labels?: Record<string, string>;
-    overrides?: Record<string, Record<string, FieldConfig>>;
+    overrides?: Record<string, Record<string, FieldConfig | null>>;
     pages?: CmsPageRoute[];
     table?: CmsTable;
 }
@@ -119,7 +119,7 @@ export declare function pageLabelFromPath(path: string): string;
 export declare function pageParentPath(path: string): string | undefined;
 export declare function pageRoutes(entry: CmsEntry): CmsPageRoute[];
 export declare function pageRouteOf(entry: CmsEntry, key: string): CmsPageRoute | undefined;
-export declare function pageOverrideFields(entry: CmsEntry, path: string): Record<string, FieldConfig>;
+export declare function pageOverrideFields(entry: CmsEntry, path: string): Record<string, FieldConfig | null>;
 export declare function pageFields(entry: CmsEntry, path: string): Record<string, FieldConfig>;
 export declare function pageAllFields(entry: CmsEntry): Record<string, FieldConfig>;
 type EntryLike = Pick<CmsEntry, 'fields'> & Partial<Pick<CmsEntry, 'kind' | 'overrides'>>;
@@ -213,7 +213,7 @@ export interface CmsPageInput extends CmsEntryInputBase {
     exclude?: string[];
     order?: string[];
     labels?: Record<string, string>;
-    overrides?: Record<string, Record<string, CmsFieldInput>>;
+    overrides?: Record<string, Record<string, CmsFieldInput | null>>;
 }
 export type CmsEntryInput = CmsCollectionInput | CmsSingleInput | CmsPageInput;
 export type CmsConfigInput = Record<string, CmsEntryInput>;

package/dist/runtime/shared/index.js

@@ -216,13 +216,18 @@ export function pageOverrideFields(entry, path) {
   return entry.overrides?.[path] ?? {};
 }
 export function pageFields(entry, path) {
-  return { ...entry.fields, ...pageOverrideFields(entry, path) };
+  const fields = { ...entry.fields };
+  for (const [key, field] of Object.entries(pageOverrideFields(entry, path))) {
+    if (field) fields[key] = field;
+    else delete fields[key];
+  }
+  return fields;
 }
 export function pageAllFields(entry) {
   const fields = { ...entry.fields };
   for (const override of Object.values(entry.overrides ?? {})) {
     for (const [key, field] of Object.entries(override)) {
-      if (!fields[key]) fields[key] = field;
+      if (field && !fields[key]) fields[key] = field;
     }
   }
   return fields;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xleddyl/nuxt-cms",
-  "version": "0.1.43",
+  "version": "0.1.44",
   "description": "Lightweight CMS that ships with your Nuxt app: runs on the Nitro server, content types defined in code, /cms admin panel, GraphQL API, SQLite or Postgres. No external CMS needed!",
   "license": "MIT",
   "author": "Edoardo Alberti (https://github.com/xleddyl)",