canopycms 0.8.2 → 0.9.0

package/dist/cli/configured-asset-store.js

@@ -4,11 +4,11 @@
  * site's own dependencies, which a release job given `--bucket` does not have.
  */
 import path from 'node:path';
-import { createJiti } from 'jiti';
 import { z } from 'zod';
 import { createAssetStore } from '../assets/factory.js';
 import { mediaSchema } from '../config/schemas/media.js';
 import { operatingStrategy } from '../operating-mode/index.js';
+import { importSiteServerConfig } from './site-config.js';
 const serverConfigSchema = z.object({
     mode: z.enum(['prod', 'dev']),
     media: mediaSchema.optional(),
@@ -19,13 +19,7 @@ const serverConfigSchema = z.object({
  * local store, prod never does.
  */
 export async function loadConfiguredAssetStore(projectDir) {
-    const configPath = path.join(projectDir, 'canopycms.config.ts');
-    const jiti = createJiti(import.meta.url);
-    const mod = (await jiti.import(configPath));
-    const configExport = mod.default ?? mod.config ?? mod;
-    const server = typeof configExport === 'object' && configExport !== null && 'server' in configExport
-        ? configExport.server
-        : configExport;
+    const { configPath, server } = await importSiteServerConfig(projectDir);
     const parsed = serverConfigSchema.safeParse(server);
     if (!parsed.success) {
         throw new Error(`Invalid CanopyCMS config at ${configPath}: ${parsed.error.message}`);

package/dist/cli/generate-ai-content.js

@@ -68,7 +68,7 @@ var init_atomic_write = __esm({
 
 // dist/validation/field-traversal.js
 function isPlainRecord(value) {
-  return typeof value === "object" && value !== null && !Array.isArray(value);
+  return typeof value === "object" && value !== null && !Array.isArray(value) && !(value instanceof Date);
 }
 function resolveBlockItem(blockField, item) {
   const templateName = typeof item.template === "string" ? item.template : typeof item._type === "string" ? item._type : void 0;
@@ -573,7 +573,7 @@ var scalarFieldTypes, markdownFieldTypes, primitiveFieldTypes, fieldTypes;
 var init_types2 = __esm({
   "dist/config/types.js"() {
     "use strict";
-    scalarFieldTypes = ["string", "number", "boolean", "datetime", "code"];
+    scalarFieldTypes = ["string", "number", "boolean", "date", "datetime", "code"];
     markdownFieldTypes = ["markdown", "mdx"];
     primitiveFieldTypes = [...scalarFieldTypes, ...markdownFieldTypes];
     fieldTypes = [
@@ -1640,6 +1640,70 @@ function isBlockStructuralKey(key) {
 // dist/utils/content-serialize.js
 init_item_keys();
 
+// dist/utils/calendar-day.js
+init_item_keys();
+init_field_traversal();
+var DAY = /^(\d{4})-(\d{2})-(\d{2})$/;
+var MS_PER_DAY = 864e5;
+var isRealDay = (year, month, day) => {
+  const lastOfMonth = /* @__PURE__ */ new Date(0);
+  lastOfMonth.setUTCFullYear(year, month, 0);
+  return month >= 1 && month <= 12 && day >= 1 && day <= lastOfMonth.getUTCDate();
+};
+var dayParts = (value) => {
+  const match = typeof value === "string" ? DAY.exec(value) : null;
+  if (!match)
+    return void 0;
+  const [year, month, day] = match.slice(1).map(Number);
+  return isRealDay(year, month, day) ? [year, month, day] : void 0;
+};
+var isCalendarDay = (value) => dayParts(value) !== void 0;
+var dayOfBareDate = (value) => value.getTime() % MS_PER_DAY === 0 ? value.toISOString().slice(0, 10) : void 0;
+var mapItems = (items, mapItem) => {
+  const next = items.map((item) => isPlainRecord(item) ? mapItem(item) : item);
+  return next.every((item, i) => item === items[i]) ? items : next;
+};
+var blockItemWithDays = (field, item) => {
+  const resolved = resolveBlockItem(field, item);
+  if (!resolved)
+    return item;
+  const data = withCalendarDays(resolved.fields, resolved.data);
+  if (data === resolved.data)
+    return item;
+  return resolved.data === item ? data : { ...item, value: data };
+};
+var valueWithDays = (field, value) => {
+  if (field.type === "date") {
+    return value instanceof Date ? dayOfBareDate(value) ?? value : value;
+  }
+  if (field.type === "object") {
+    const { fields, list } = field;
+    if (list) {
+      return Array.isArray(value) ? mapItems(value, (item) => withCalendarDays(fields ?? [], item)) : value;
+    }
+    return isPlainRecord(value) ? withCalendarDays(fields ?? [], value) : value;
+  }
+  if (field.type === "block" && Array.isArray(value)) {
+    return mapItems(value, (item) => blockItemWithDays(field, item));
+  }
+  return value;
+};
+function withCalendarDays(fields, data) {
+  let out = data;
+  for (const field of fields) {
+    if (field.type === "group") {
+      out = withCalendarDays(field.fields, out);
+      continue;
+    }
+    const value = out[field.name];
+    const next = valueWithDays(field, value);
+    if (next !== value)
+      out = { ...out, [field.name]: next };
+  }
+  return out;
+}
+var entryAsRead = (fields, data) => withItemKeys(fields, withCalendarDays(fields, data), "content");
+
 // dist/utils/debug.js
 var envFlag = (name) => typeof process !== "undefined" && process.env[name] === "true";
 var LOG_LEVELS = {
@@ -3235,9 +3299,9 @@ function asJson(value) {
   const key = identityKey(value);
   return key === void 0 || key === "undefined" ? void 0 : JSON.parse(key);
 }
-function frontmatterAsRead(raw) {
+function frontmatterAsRead(raw, fields) {
   try {
-    return asJson(matter(raw, {}).data);
+    return asJson(withCalendarDays(fields, matter(raw, {}).data));
   } catch {
     return void 0;
   }
@@ -3305,7 +3369,7 @@ ${asKey ? `${text}: v` : `v: ${text}`}
     return true;
   }
 }
-function serializeFrontmatter(editorBody, data, existingRaw, format) {
+function serializeFrontmatter(editorBody, data, existingRaw, format, fields = []) {
   const file = { content: bodyToWrite(editorBody, data, format, existingRaw) };
   if (existingRaw === void 0)
     return matter.stringify(file, data);
@@ -3313,7 +3377,7 @@ function serializeFrontmatter(editorBody, data, existingRaw, format) {
   if (existingFrontmatter === void 0)
     return matter.stringify(file, data);
   const onDisk = parseDocument2(existingFrontmatter);
-  const toReconcile = onDisk.errors.length === 0 ? withUnchangedAsOnDisk(data, frontmatterAsRead(existingRaw), onDisk.toJS()) : data;
+  const toReconcile = onDisk.errors.length === 0 ? withUnchangedAsOnDisk(data, frontmatterAsRead(existingRaw, fields), onDisk.toJS()) : data;
   const reconciled = reconcileYamlSource(existingFrontmatter, isPlainRecord2(toReconcile) ? toReconcile : data, { rootAtColumnZero: true, quote: readsAsAnotherValue });
   if (reconciled === void 0)
     return matter.stringify(file, data);
@@ -3325,7 +3389,7 @@ function serializeFrontmatter(editorBody, data, existingRaw, format) {
       }
     }
   });
-  if (isDeepStrictEqual2(frontmatterAsRead(written), asJson(data)))
+  if (isDeepStrictEqual2(frontmatterAsRead(written, fields), asJson(data)))
     return written;
   log2.debug("content-serialize", "reconciled frontmatter reads back differently; writing as gray-matter prints it");
   return matter.stringify(file, data);
@@ -3639,9 +3703,6 @@ function linkOnlyReferenceData(data, format, fields) {
   return rest;
 }
 
-// dist/content-store.js
-init_item_keys();
-
 // dist/static/seo.js
 var DEFAULT_SEO_FIELD_NAMES = {
   title: "metaTitle",
@@ -5834,7 +5895,7 @@ var ContentStore = class {
         absolutePath
       };
     }
-    doc.data = withItemKeys(fields, doc.data, "content");
+    doc.data = entryAsRead(fields, doc.data);
     if (options.resolveReferences !== false) {
       doc.data = await this.resolveReferencesInData(doc.data, fields, void 0, options.referenceAccess, {
         entry: slug ? entryLogicalPath(schemaItem.logicalPath, slug) : schemaItem.logicalPath,
@@ -5938,7 +5999,7 @@ var ContentStore = class {
           } else if (input.format === "yaml") {
             content = serializeYaml(input.data ?? {}, existingRaw);
           } else {
-            content = serializeFrontmatter(input.body, input.data ?? {}, existingRaw, input.format);
+            content = serializeFrontmatter(input.body, input.data ?? {}, existingRaw, input.format, fields);
           }
           await atomicWriteFile(absolutePath, content);
           const liveIndex = this._idIndex;
@@ -6830,6 +6891,7 @@ _${field.description}_` : "";
   switch (field.type) {
     case "string":
     case "number":
+    case "date":
     case "datetime":
       return `${heading} ${label}${descriptionLine}
 
@@ -6908,6 +6970,7 @@ ${items.map((item) => `- ${item}`).join("\n")}`;
 var FLAT_CELL_TYPES = /* @__PURE__ */ new Set([
   "string",
   "number",
+  "date",
   "datetime",
   "boolean",
   "select",
@@ -10937,6 +11000,9 @@ async function loadOrCreateBranchContext(options) {
   });
 }
 
+// dist/system-users.js
+var AI_USER_ID = "canopycms-ai";
+
 // dist/ai/resolve-branch.js
 async function resolveBranchRoot(config) {
   if (readsFromCheckout(config)) {
@@ -10955,7 +11021,7 @@ async function resolveBranchRoot(config) {
     config: resolved,
     branchName: activeBranch,
     mode: config.mode,
-    createdBy: "canopycms-ai",
+    createdBy: AI_USER_ID,
     remoteUrl: config.defaultRemoteUrl
   });
   return context.branchRoot;
@@ -10967,7 +11033,6 @@ import path24 from "node:path";
 import matter3 from "gray-matter";
 import { parse as yamlParse2 } from "yaml";
 init_error();
-init_item_keys();
 var log10 = createDebugLogger({ prefix: "ContentListing" });
 var normalizePath = (root, target) => {
   const result = validateAndNormalizePath(root, target);
@@ -11138,7 +11203,7 @@ var listCollectionEntries = async (root, collection, onSkip, readsId) => {
       fs20.stat(absolutePath),
       readEntryData(absolutePath, format, bodyField)
     ]);
-    const data = withItemKeys(entryType?.schema ?? [], rawData, "content");
+    const data = entryAsRead(entryType?.schema ?? [], rawData);
     const item = {
       logicalPath: entryLogicalPath(collection.logicalPath, slug),
       contentId,
@@ -11251,6 +11316,11 @@ function validateScalar(field, value, path27) {
         return [{ fieldPath: path27, message: "Expected true or false" }];
       }
       return [];
+    case "date":
+      if (value !== "" && !isCalendarDay(value)) {
+        return [{ fieldPath: path27, message: "Expected a real date, written YYYY-MM-DD" }];
+      }
+      return [];
     case "datetime":
       if (typeof value !== "string" || value !== "" && Number.isNaN(Date.parse(value))) {
         return [{ fieldPath: path27, message: "Expected a valid date/time string" }];
@@ -11405,7 +11475,7 @@ function findInvalidEntries(items) {
   for (const item of items) {
     if (!item.schema)
       continue;
-    const data = normalizeDatesDeep(item.data);
+    const data = normalizeDatesDeep(withCalendarDays(item.schema, item.data));
     const errors = validateEntryData(item.schema, data);
     if (errors.length > 0) {
       invalid.push({ entryPath: item.entryPath, errors });

package/dist/cli/init.js

@@ -26,7 +26,7 @@ var scalarFieldTypes, markdownFieldTypes, primitiveFieldTypes, fieldTypes;
 var init_types = __esm({
   "dist/config/types.js"() {
     "use strict";
-    scalarFieldTypes = ["string", "number", "boolean", "datetime", "code"];
+    scalarFieldTypes = ["string", "number", "boolean", "date", "datetime", "code"];
     markdownFieldTypes = ["markdown", "mdx"];
     primitiveFieldTypes = [...scalarFieldTypes, ...markdownFieldTypes];
     fieldTypes = [

package/dist/cli/site-config.d.ts

@@ -0,0 +1,9 @@
+/**
+ * Imports a site's `canopycms.config.ts` for CLI commands that need it (`sync`, and
+ * `configured-asset-store.ts`). Importing runs the site's config and loads its own dependencies.
+ */
+/** The site's server config export (`server` of a split config, else the export itself). */
+export declare function importSiteServerConfig(projectDir: string): Promise<{
+    configPath: string;
+    server: unknown;
+}>;

package/dist/cli/site-config.js

@@ -0,0 +1,17 @@
+/**
+ * Imports a site's `canopycms.config.ts` for CLI commands that need it (`sync`, and
+ * `configured-asset-store.ts`). Importing runs the site's config and loads its own dependencies.
+ */
+import path from 'node:path';
+import { createJiti } from 'jiti';
+/** The site's server config export (`server` of a split config, else the export itself). */
+export async function importSiteServerConfig(projectDir) {
+    const configPath = path.join(projectDir, 'canopycms.config.ts');
+    const jiti = createJiti(import.meta.url);
+    const mod = (await jiti.import(configPath));
+    const configExport = mod.default ?? mod.config ?? mod;
+    const server = typeof configExport === 'object' && configExport !== null && 'server' in configExport
+        ? configExport.server
+        : configExport;
+    return { configPath, server };
+}