@nuasite/cli 0.49.3 → 0.50.1

package/dist/index.js

@@ -22517,7 +22517,14 @@ function parseConfigSource(source, _sourcePath) {
     const loaderBase = loaderOptions.base;
     const cmsProperty = decl.properties.find((p) => p.type === "ObjectProperty" && propertyKeyName(p.key) === "cms");
     const layout = cmsProperty?.type === "ObjectProperty" ? parseCmsLayout(cmsProperty.value, bindings) : undefined;
-    const pathname = cmsProperty?.type === "ObjectProperty" ? parseCmsPathname(cmsProperty.value, bindings) : undefined;
+    const declaredPathname = cmsProperty?.type === "ObjectProperty" ? parseCmsPathname(cmsProperty.value, bindings) : undefined;
+    const titleField = cmsProperty?.type === "ObjectProperty" ? parseCmsTitleField(cmsProperty.value, bindings) : undefined;
+    const fragment = cmsProperty?.type === "ObjectProperty" ? parseCmsFragment(cmsProperty.value, bindings) : undefined;
+    const previewOf = cmsProperty?.type === "ObjectProperty" ? parseCmsPreviewOf(cmsProperty.value, bindings) : undefined;
+    if (fragment && declaredPathname) {
+      console.warn(`[cms] collection "${collectionName}": \`cms.fragment\` and \`cms.pathname\` are mutually exclusive \u2014 a fragment collection has no page of its own, so the \`pathname\` rule is ignored`);
+    }
+    const pathname = fragment ? undefined : declaredPathname;
     const schemaProperty = decl.properties.find((p) => p.type === "ObjectProperty" && propertyKeyName(p.key) === "schema");
     if (!schemaProperty || schemaProperty.type !== "ObjectProperty") {
       if (!loaderPattern)
@@ -22528,7 +22535,10 @@ function parseConfigSource(source, _sourcePath) {
         loaderPattern,
         loaderBase,
         layout,
-        pathname
+        pathname,
+        titleField,
+        fragment,
+        previewOf
       });
       continue;
     }
@@ -22542,7 +22552,10 @@ function parseConfigSource(source, _sourcePath) {
         loaderPattern,
         loaderBase,
         layout,
-        pathname
+        pathname,
+        titleField,
+        fragment,
+        previewOf
       });
       continue;
     }
@@ -22552,7 +22565,10 @@ function parseConfigSource(source, _sourcePath) {
       loaderPattern,
       loaderBase,
       layout,
-      pathname
+      pathname,
+      titleField,
+      fragment,
+      previewOf
     });
   }
   return result;
@@ -22635,6 +22651,40 @@ function parseCmsPathname(node, bindings) {
   }
   return spec.length > 0 ? spec : undefined;
 }
+function parseCmsTitleField(node, bindings) {
+  const resolved = resolveExpression(node, bindings);
+  if (resolved.type !== "ObjectExpression")
+    return;
+  const titleFieldProp = resolved.properties.find((p) => p.type === "ObjectProperty" && propertyKeyName(p.key) === "titleField");
+  if (!titleFieldProp || titleFieldProp.type !== "ObjectProperty")
+    return;
+  const value = resolveExpression(titleFieldProp.value, bindings);
+  if (value.type !== "StringLiteral" || value.value === "")
+    return;
+  return value.value;
+}
+function parseCmsFragment(node, bindings) {
+  const resolved = resolveExpression(node, bindings);
+  if (resolved.type !== "ObjectExpression")
+    return;
+  const fragmentProp = resolved.properties.find((p) => p.type === "ObjectProperty" && propertyKeyName(p.key) === "fragment");
+  if (!fragmentProp || fragmentProp.type !== "ObjectProperty")
+    return;
+  const value = resolveExpression(fragmentProp.value, bindings);
+  return value.type === "BooleanLiteral" && value.value ? true : undefined;
+}
+function parseCmsPreviewOf(node, bindings) {
+  const resolved = resolveExpression(node, bindings);
+  if (resolved.type !== "ObjectExpression")
+    return;
+  const previewOfProp = resolved.properties.find((p) => p.type === "ObjectProperty" && propertyKeyName(p.key) === "previewOf");
+  if (!previewOfProp || previewOfProp.type !== "ObjectProperty")
+    return;
+  const value = resolveExpression(previewOfProp.value, bindings);
+  if (value.type !== "StringLiteral" || value.value === "")
+    return;
+  return value.value;
+}
 function parsePathnameSegment(node) {
   if (node.type !== "ObjectExpression")
     return null;
@@ -22838,6 +22888,12 @@ function analyzeBaseCall(node, field, bindings) {
         field.options = options;
       }
     }
+    const hintsArg = node.arguments[1];
+    if (hintsArg?.type === "ObjectExpression") {
+      const layout = parseFieldLayoutFromObject(hintsArg);
+      if (layout)
+        field.layout = layout;
+    }
     return;
   }
   if ((ns === "z" || ns === "n") && fn === "object") {
@@ -23030,6 +23086,18 @@ import path from "path";
 function normalizeFieldName(name) {
   return name.toLowerCase().replace(/[_-]/g, "");
 }
+function deriveEntryTitle(data, titleField) {
+  if (titleField) {
+    const declared = data[titleField];
+    return typeof declared === "string" && declared !== "" ? declared : undefined;
+  }
+  for (const key of TITLE_FALLBACK_FIELDS) {
+    const value = data[key];
+    if (typeof value === "string" && value !== "")
+      return value;
+  }
+  return;
+}
 function extractFrontmatterBlock(content) {
   const match = content.match(FRONTMATTER_PATTERN);
   return match?.[1] ?? null;
@@ -23263,8 +23331,9 @@ async function buildCollectionDefinition(fs, basePath, sources, collectionName,
       sourcePath: path.join(sourceBasePath, source.relPath)
     };
     if (frontmatter) {
-      if (typeof frontmatter.title === "string") {
-        entryInfo.title = frontmatter.title;
+      const title = deriveEntryTitle(frontmatter);
+      if (title !== undefined) {
+        entryInfo.title = title;
       }
       if (typeof frontmatter.draft === "boolean" && frontmatter.draft) {
         entryInfo.draft = true;
@@ -23307,7 +23376,7 @@ async function buildDataCollectionDefinition(fs, basePath, sources, collectionNa
     }
     if (!data || typeof data !== "object")
       continue;
-    const title = typeof data.name === "string" ? data.name : typeof data.title === "string" ? data.title : undefined;
+    const title = deriveEntryTitle(data);
     entryInfos.push({
       slug: source.slug,
       title,
@@ -23389,8 +23458,25 @@ function applyParsedConfig(collections, parsed) {
       def.layout = parsedColl.layout;
     if (parsedColl.pathname)
       def.pathname = parsedColl.pathname;
+    if (parsedColl.fragment) {
+      def.fragment = parsedColl.fragment;
+      if (parsedColl.previewOf)
+        def.previewOf = parsedColl.previewOf;
+    }
+    if (parsedColl.titleField) {
+      def.titleField = parsedColl.titleField;
+      applyCollectionTitleField(def, parsedColl.titleField);
+    }
   }
 }
+function applyCollectionTitleField(def, titleField) {
+  if (!def.entries)
+    return;
+  for (const entry of def.entries) {
+    entry.title = entry.data ? deriveEntryTitle(entry.data, titleField) : undefined;
+  }
+  def.entries.sort((a, b) => (a.title ?? a.slug).localeCompare(b.title ?? b.slug));
+}
 function applyParsedFieldLayout(field, pf) {
   const layout = pf.layout;
   if (!layout)
@@ -23413,8 +23499,10 @@ function applyParsedFieldLayout(field, pf) {
 function applyParsedFieldOverrides(field, pf) {
   if (pf.type) {
     field.type = pf.type;
-    if (pf.options)
+    if (pf.options) {
       field.options = pf.options;
+      field.optionsClosed = true;
+    }
   }
   if (pf.itemType)
     field.itemType = pf.itemType;
@@ -23442,8 +23530,10 @@ function parsedFieldToFieldDefinition(pf) {
     type: pf.type ?? (pf.fields ? "object" : "text"),
     required: pf.required
   };
-  if (pf.options)
+  if (pf.options) {
     fd.options = pf.options;
+    fd.optionsClosed = true;
+  }
   if (pf.itemType)
     fd.itemType = pf.itemType;
   if (pf.hints)
@@ -23679,6 +23769,26 @@ async function scanDataCollection(fs, collectionPath, collectionName, contentDir
   }
   return await buildDataCollectionDefinition(fs, collectionPath, sources, collectionName, contentDir);
 }
+function normalizeBasePath(basePath) {
+  return path.normalize(basePath.replace(/^\.[/\\]+/, "")).replace(/[/\\]+$/, "");
+}
+function patternCoversWholeCollection(pattern, definition) {
+  const match = pattern.trim().replace(/^\.[/\\]+/, "").match(WHOLE_DIRECTORY_PATTERN);
+  if (!match)
+    return false;
+  const [, braceGroup, singleExtension] = match;
+  if (braceGroup === undefined && singleExtension === undefined)
+    return true;
+  const patternExtensions = new Set((braceGroup !== undefined ? braceGroup.split(",") : [singleExtension]).map((ext) => ext.trim().replace(/^\./, "").toLowerCase()).filter(Boolean));
+  const scannedExtensions = new Set((definition.entries ?? []).map((entry) => path.extname(entry.sourcePath).slice(1).toLowerCase()).filter(Boolean));
+  if (scannedExtensions.size === 0)
+    return false;
+  for (const ext of scannedExtensions) {
+    if (!patternExtensions.has(ext))
+      return false;
+  }
+  return true;
+}
 async function scanCollections(fs, contentDir = "src/content", parseCache = new Map) {
   const collections = {};
   const entries = await fs.list(contentDir);
@@ -23695,11 +23805,29 @@ async function scanCollections(fs, contentDir = "src/content", parseCache = new
   });
   await Promise.all(scanPromises);
   const parsed = await parseContentConfig(fs, parseCache);
+  const scannedNameByBasePath = new Map;
+  for (const [name, definition] of Object.entries(collections)) {
+    scannedNameByBasePath.set(normalizeBasePath(definition.path), name);
+  }
+  const rekeyedScannedNames = new Map;
   for (const [collectionName, parsedCollection] of parsed) {
     if (collections[collectionName])
       continue;
     if (!parsedCollection.loaderBase || !parsedCollection.loaderPattern)
       continue;
+    const scannedName = scannedNameByBasePath.get(normalizeBasePath(parsedCollection.loaderBase));
+    const scannedDefinition = scannedName ? collections[scannedName] : undefined;
+    if (scannedName && scannedDefinition && patternCoversWholeCollection(parsedCollection.loaderPattern, scannedDefinition)) {
+      delete collections[scannedName];
+      scannedDefinition.name = collectionName;
+      for (const other of Object.values(collections)) {
+        if (other.parentCollection === scannedName)
+          other.parentCollection = collectionName;
+      }
+      collections[collectionName] = scannedDefinition;
+      rekeyedScannedNames.set(scannedName, collectionName);
+      continue;
+    }
     let definition;
     try {
       definition = await scanGlobCollection(fs, collectionName, parsedCollection.loaderBase, parsedCollection.loaderPattern, contentDir);
@@ -23710,8 +23838,9 @@ async function scanCollections(fs, contentDir = "src/content", parseCache = new
     if (!definition)
       continue;
     const baseName = parsedCollection.loaderBase.replace(/[/\\]+$/, "").split(/[/\\]/).pop();
-    if (baseName && baseName !== collectionName && collections[baseName]) {
-      definition.parentCollection = baseName;
+    const parentName = !baseName ? undefined : collections[baseName] ? baseName : rekeyedScannedNames.get(baseName);
+    if (parentName && parentName !== collectionName) {
+      definition.parentCollection = parentName;
     }
     collections[collectionName] = definition;
   }
@@ -23741,7 +23870,7 @@ function warnOnPathnameCollisions(collections) {
     }
   }
 }
-var import_yaml, DATE_PATTERN, URL_PATTERN, IMAGE_EXTENSIONS, MAX_SELECT_OPTIONS = 10, TEXTAREA_MIN_LENGTH = 200, SIDEBAR_FIELD_NAMES, DIRECTIVE_PATTERN, FREE_TEXT_FIELD_NAMES, PUBLISH_TOGGLE_NAMES, PUBLISH_DATE_NAMES, FRONTMATTER_PATTERN, MAX_NESTED_FIELD_DEPTH = 16, HREF_SUFFIXES;
+var import_yaml, DATE_PATTERN, URL_PATTERN, IMAGE_EXTENSIONS, MAX_SELECT_OPTIONS = 10, TEXTAREA_MIN_LENGTH = 200, SIDEBAR_FIELD_NAMES, DIRECTIVE_PATTERN, FREE_TEXT_FIELD_NAMES, PUBLISH_TOGGLE_NAMES, PUBLISH_DATE_NAMES, TITLE_FALLBACK_FIELDS, FRONTMATTER_PATTERN, MAX_NESTED_FIELD_DEPTH = 16, HREF_SUFFIXES, WHOLE_DIRECTORY_PATTERN;
 var init_collection_scanner = __esm(() => {
   init_content_config_ast();
   import_yaml = __toESM(require_dist(), 1);
@@ -23785,8 +23914,10 @@ var init_collection_scanner = __esm(() => {
     "publishedat",
     "datepublished"
   ]);
+  TITLE_FALLBACK_FIELDS = ["title", "name", "label"];
   FRONTMATTER_PATTERN = /^---\r?\n([\s\S]*?)\r?\n---/;
   HREF_SUFFIXES = ["href", "url", "link", "slug", "path"];
+  WHOLE_DIRECTORY_PATTERN = /^(?:\*\*[/\\])*\*(?:\.(?:\{([^{}/\\]*)\}|([A-Za-z0-9]+)))?$/;
 });
 
 // ../cms-core/src/component-registry.ts
@@ -24368,7 +24499,7 @@ var init_scan_cache = __esm(() => {
 
 // ../cms/src/shared.ts
 function slugify2(text) {
-  return text.toLowerCase().trim().replace(/[^\w\s\-/]/g, "").replace(/[\s_]+/g, "-").replace(/^[-/]+|[-/]+$/g, "");
+  return text.normalize("NFD").replace(/[\u0300-\u036f]/g, "").toLowerCase().trim().replace(/[^\w\s\-/]/g, "").replace(/[\s_]+/g, "-").replace(/^[-/]+|[-/]+$/g, "");
 }
 
 // ../cms/src/utils.ts