@xleddyl/nuxt-cms 0.1.43 → 0.1.46

package/dist/module.json

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

package/dist/module.mjs

@@ -1,5 +1,5 @@
 import { spawn } from 'node:child_process';
-import { existsSync, readdirSync } from 'node:fs';
+import { existsSync } from 'node:fs';
 import { createRequire } from 'node:module';
 import { join, isAbsolute, resolve, relative, dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -10,10 +10,11 @@ import { introspectionFromSchema, buildSchema } from 'graphql';
 import { minifyIntrospection, outputIntrospectionFile } from 'gql.tada/internal';
 import { createJiti } from 'jiti';
 import { typeName, blockTypeName, blocksFieldTypeName, renderGraphqlSdl } from '../dist/runtime/shared/graphql-sdl.js';
-import { isTranslatableField, isTranslatableMediaField, isMultiSelect, pageAllFields, PAGE_PATH_FIELD, pageRoutes, fieldConditions, isRequiredField, pageFields, isPrivateField, entryFieldsFor, pageLabelFromPath, pageKeyFromPath, mediaTypeFilter, DEFAULT_MEDIA_MAX_FILE_SIZE } from '../dist/runtime/shared/index.js';
+import { isTranslatableField, isTranslatableMediaField, isMultiSelect, pageAllFields, PAGE_PATH_FIELD, pageRoutes, fieldConditions, isRequiredField, pageFields, isPrivateField, entryFieldsFor, mediaTypeFilter, DEFAULT_MEDIA_MAX_FILE_SIZE } from '../dist/runtime/shared/index.js';
 import { scanMediaDirectory, readMediaFileMeta } from '../dist/runtime/server/utils/media-sync.js';
 import { createHash } from 'node:crypto';
 import { readFile } from 'node:fs/promises';
+import { routePathsFromDir, resolvePageRoutes } from '../dist/runtime/shared/page-routes.js';
 
 async function collectMediaManifest(root) {
   const files = await scanMediaDirectory(root);
@@ -154,16 +155,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(
@@ -592,45 +599,6 @@ function renderQueriesFile(config) {
   ].join("\n");
 }
 
-const DYNAMIC = /[[\]]/;
-function vueFiles(dir, prefix = "") {
-  if (!existsSync(dir)) return [];
-  const files = [];
-  for (const item of readdirSync(dir, { withFileTypes: true })) {
-    const name = `${prefix}${item.name}`;
-    if (item.isDirectory()) files.push(...vueFiles(join(dir, item.name), `${name}/`));
-    else if (item.name.endsWith(".vue")) files.push(name);
-  }
-  return files;
-}
-function routePathFromFile(file) {
-  if (DYNAMIC.test(file)) return null;
-  const segments = file.replace(/\.vue$/, "").split("/").filter((segment) => !/^\(.+\)$/.test(segment));
-  if (segments.at(-1) === "index") segments.pop();
-  const path = `/${segments.join("/")}`.replace(/\/$/, "");
-  return path || "/";
-}
-function routePathsFromDir(pagesDir) {
-  const paths = /* @__PURE__ */ new Set();
-  for (const file of vueFiles(pagesDir)) {
-    const path = routePathFromFile(file);
-    if (path) paths.add(path);
-  }
-  return [...paths];
-}
-function resolvePageRoutes(entry, discovered) {
-  const declared = Array.isArray(entry.routes) ? entry.routes : discovered;
-  const paths = /* @__PURE__ */ new Set([...declared, ...entry.include ?? []]);
-  for (const path of entry.exclude ?? []) paths.delete(path);
-  const rank = new Map((entry.order ?? []).map((path, index) => [path, index]));
-  const order = entry.order?.length ?? 0;
-  return [...paths].sort((a, b) => (rank.get(a) ?? order) - (rank.get(b) ?? order) || a.localeCompare(b)).map((path) => ({
-    path,
-    key: pageKeyFromPath(path),
-    label: entry.labels?.[path] ?? pageLabelFromPath(path)
-  }));
-}
-
 function mediaTsType(field) {
   const types = mediaTypeFilter(field.mediaType);
   return types ? `CmsMedia<${types.map((type) => `'${type}'`).join(" | ")}>` : "CmsMedia";

package/dist/runtime/seed.d.ts

@@ -1,5 +1,12 @@
+import type { CmsConfig, CmsPageRoute } from './shared/index.js';
 import { customId, ID_LENGTH } from './server/utils/custom-id.js';
 export { customId, ID_LENGTH };
+export type { CmsPageRoute };
+export interface ResolveCmsPagesOptions {
+    root?: string;
+    pagesDir?: string;
+}
+export declare function resolveCmsPages<T extends CmsConfig>(config: T, options?: ResolveCmsPagesOptions): T;
 export type SeedDriver = 'sqlite' | 'libsql' | 'postgres';
 export interface CmsSeederOptions {
     driver?: SeedDriver;

package/dist/runtime/seed.js

@@ -1,7 +1,17 @@
 import { mkdirSync } from "node:fs";
 import { dirname, isAbsolute, resolve } from "node:path";
+import { resolvePageRoutes, routePathsFromDir } from "./shared/page-routes.js";
 import { customId, ID_LENGTH } from "./server/utils/custom-id.js";
 export { customId, ID_LENGTH };
+export function resolveCmsPages(config, options = {}) {
+  const root = options.root ?? process.cwd();
+  const pagesDir = options.pagesDir ? isAbsolute(options.pagesDir) ? options.pagesDir : resolve(root, options.pagesDir) : resolve(root, "app/pages");
+  const discovered = routePathsFromDir(pagesDir);
+  for (const entry of Object.values(config)) {
+    if (entry.kind === "page") entry.pages = resolvePageRoutes(entry, discovered);
+  }
+  return config;
+}
 function inferDriver(url) {
   if (/^(libsql|wss?|https?):\/\//.test(url)) return "libsql";
   if (/^postgres(ql)?:\/\//.test(url)) return "postgres";

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/dist/runtime/shared/page-routes.d.ts

@@ -0,0 +1,4 @@
+import type { CmsEntry, CmsPageRoute } from './index.js';
+export declare function routePathFromFile(file: string): string | null;
+export declare function routePathsFromDir(pagesDir: string): string[];
+export declare function resolvePageRoutes(entry: CmsEntry, discovered: string[]): CmsPageRoute[];

package/dist/runtime/shared/page-routes.js

@@ -0,0 +1,41 @@
+import { existsSync, readdirSync } from "node:fs";
+import { join } from "node:path";
+import { pageKeyFromPath, pageLabelFromPath } from "./index.js";
+const DYNAMIC = /[[\]]/;
+function vueFiles(dir, prefix = "") {
+  if (!existsSync(dir)) return [];
+  const files = [];
+  for (const item of readdirSync(dir, { withFileTypes: true })) {
+    const name = `${prefix}${item.name}`;
+    if (item.isDirectory()) files.push(...vueFiles(join(dir, item.name), `${name}/`));
+    else if (item.name.endsWith(".vue")) files.push(name);
+  }
+  return files;
+}
+export function routePathFromFile(file) {
+  if (DYNAMIC.test(file)) return null;
+  const segments = file.replace(/\.vue$/, "").split("/").filter((segment) => !/^\(.+\)$/.test(segment));
+  if (segments.at(-1) === "index") segments.pop();
+  const path = `/${segments.join("/")}`.replace(/\/$/, "");
+  return path || "/";
+}
+export function routePathsFromDir(pagesDir) {
+  const paths = /* @__PURE__ */ new Set();
+  for (const file of vueFiles(pagesDir)) {
+    const path = routePathFromFile(file);
+    if (path) paths.add(path);
+  }
+  return [...paths];
+}
+export function resolvePageRoutes(entry, discovered) {
+  const declared = Array.isArray(entry.routes) ? entry.routes : discovered;
+  const paths = /* @__PURE__ */ new Set([...declared, ...entry.include ?? []]);
+  for (const path of entry.exclude ?? []) paths.delete(path);
+  const rank = new Map((entry.order ?? []).map((path, index) => [path, index]));
+  const order = entry.order?.length ?? 0;
+  return [...paths].sort((a, b) => (rank.get(a) ?? order) - (rank.get(b) ?? order) || a.localeCompare(b)).map((path) => ({
+    path,
+    key: pageKeyFromPath(path),
+    label: entry.labels?.[path] ?? pageLabelFromPath(path)
+  }));
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xleddyl/nuxt-cms",
-  "version": "0.1.43",
+  "version": "0.1.46",
   "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)",