domma-cms 0.77.2 → 0.78.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "domma-cms",
-  "version": "0.77.2",
+  "version": "0.78.0",
   "description": "File-based CMS powered by Domma and Fastify. Run npx domma-cms my-site to create a new project.",
   "type": "module",
   "main": "server/server.js",

package/scripts/promote-changelog.mjs

@@ -0,0 +1,71 @@
+/**
+ * Turn the CHANGELOG's `## [Unreleased]` heading into `## [X.Y.Z] - YYYY-MM-DD`.
+ *
+ * The release notes are the one part of a release a workflow cannot write, so
+ * they are written as the work lands, under `[Unreleased]`, and this is what
+ * the "Cut a release" workflow does with them. Refusing to run without them is
+ * the point: a release with no entry is a release nobody can read about.
+ *
+ * With `--print X.Y.Z` it instead prints an already-released section.
+ *
+ * The same script as domma-reactive/scripts/promote-changelog.mjs; both
+ * CHANGELOGs follow Keep a Changelog. Keep the two in step.
+ *
+ *     node scripts/promote-changelog.mjs 1.2.0 2026-10-01
+ *     node scripts/promote-changelog.mjs --print 1.2.0
+ */
+
+import {readFileSync, writeFileSync} from 'node:fs';
+import {fileURLToPath} from 'node:url';
+import path from 'node:path';
+
+const FILE = path.join(path.dirname(fileURLToPath(import.meta.url)), '..', 'CHANGELOG.md');
+
+const fail = (message) => {
+    console.error(`\n  promote-changelog: ${message}\n`);
+    process.exit(1);
+};
+
+const escape = (s) => s.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+
+/** The body under a `## [label]` heading, up to the next `## [` heading. */
+function section(source, label) {
+    const heading = new RegExp(`^## \\[${escape(label)}\\][^\\n]*\\n`, 'm');
+    const match = heading.exec(source);
+    if (!match) return null;
+
+    const start = match.index + match[0].length;
+    const next = source.slice(start).search(/^## \[/m);
+    const end = next === -1 ? source.length : start + next;
+    return {heading: match, start, end, body: source.slice(start, end).trim()};
+}
+
+const source = readFileSync(FILE, 'utf8');
+
+if (process.argv[2] === '--print') {
+    const version = process.argv[3];
+    const found = version && section(source, version);
+    if (!found) fail(`no '## [${version}]' section in CHANGELOG.md`);
+    console.log(found.body);
+    process.exit(0);
+}
+
+const [version, date] = process.argv.slice(2);
+if (!/^\d+\.\d+\.\d+$/.test(version || '')) fail('usage: promote-changelog.mjs X.Y.Z YYYY-MM-DD');
+if (!/^\d{4}-\d{2}-\d{2}$/.test(date || '')) fail(`"${date}" is not a YYYY-MM-DD date`);
+
+if (section(source, version)) fail(`CHANGELOG.md already has a '## [${version}]' section`);
+
+const pending = section(source, 'Unreleased');
+if (!pending) {
+    fail("no '## [Unreleased]' section - write the release notes there first, then cut the release");
+}
+if (pending.body === '') {
+    fail("'## [Unreleased]' is empty - write the release notes there first, then cut the release");
+}
+
+writeFileSync(
+    FILE,
+    source.slice(0, pending.heading.index) + `## [${version}] - ${date}\n` + source.slice(pending.start)
+);
+console.log(`\n  CHANGELOG.md: [Unreleased] → [${version}] - ${date}\n`);

package/server/services/collections.js

@@ -12,6 +12,7 @@ import {v4 as uuidv4} from 'uuid';
 import {config} from '../config.js';
 import {getAdapter, invalidate} from './adapterRegistry.js';
 import * as cache from './cache/index.js';
+import {typedEntryData} from './entryValues.js';
 import {toCsv} from '../../public/js/collection-export.mjs';
 
 const COLLECTIONS_DIR = path.resolve(config.content.collectionsDir);
@@ -388,6 +389,7 @@ export async function getEntry(slug, entryId) {
 export async function createEntry(slug, data, { createdBy = null, source = 'admin' } = {}) {
     const schema = await getCollection(slug);
     if (!schema) throw new Error(`Collection "${slug}" not found`);
+    data = typedEntryData(schema, data);
 
     const { valid, errors } = validateEntryData(schema, data);
     if (!valid) throw new Error(`Validation failed: ${errors.join('; ')}`);
@@ -420,6 +422,7 @@ export async function createEntry(slug, data, { createdBy = null, source = 'admi
 export async function updateEntry(slug, entryId, data) {
     const schema = await getCollection(slug);
     if (!schema) throw new Error(`Collection "${slug}" not found`);
+    data = typedEntryData(schema, data);
 
     const { valid, errors } = validateEntryData(schema, data);
     if (!valid) throw new Error(`Validation failed: ${errors.join('; ')}`);
@@ -526,7 +529,7 @@ export async function importEntries(slug, incoming, { createdBy = null } = {}) {
     const valid  = [];
 
     for (const item of incoming) {
-        const data = item.data || item;
+        const data = typedEntryData(schema, item.data || item);
         const { valid: ok, errors: valErrors } = validateEntryData(schema, data);
         if (!ok) {
             skipped++;

package/server/services/entryValues.js

@@ -0,0 +1,54 @@
+/**
+ * Entry values as their field types store them.
+ *
+ * Everything that writes entries through the collections service - the admin,
+ * the external /api/v1 API, form submissions, import, Actions - arrives here
+ * first, so a `number` field sent as text ("42", as HTML forms and CSV-minded
+ * clients send it) is stored as a number and sorts, filters and totals as one.
+ *
+ * Deliberately a conversion, not a check: text that is not a plain decimal
+ * number ("", "abc", "0x10", "Infinity") is stored as sent, exactly as before,
+ * so no existing client starts getting errors. Only top-level `number` fields.
+ */
+
+const DECIMAL = /^[+-]?(\d+\.?\d*|\.\d+)(e[+-]?\d+)?$/i;
+
+/** "42" -> 42; anything that is not plain decimal text is returned unchanged. */
+export function numberFromText(value) {
+    if (typeof value !== 'string') return value;
+    const t = value.trim();
+    if (!DECIMAL.test(t)) return value;
+    const n = Number(t);
+    return Number.isFinite(n) ? n : value;
+}
+
+/** The schema's number field names. */
+export function numberFieldNames(schema) {
+    return (schema?.fields || []).filter(f => f?.type === 'number' && f.name).map(f => f.name);
+}
+
+/**
+ * `data` with its number fields converted - a new object when anything changed,
+ * the same object when nothing did (the caller's object is never modified).
+ *
+ * @param {object} data
+ * @param {string[]} names - from numberFieldNames()
+ */
+export function withNumbers(data, names) {
+    if (!data || typeof data !== 'object' || Array.isArray(data) || !names?.length) return data;
+    let out = data;
+    for (const name of names) {
+        if (!Object.prototype.hasOwnProperty.call(data, name)) continue;
+        const next = numberFromText(data[name]);
+        if (next !== data[name]) {
+            if (out === data) out = {...data};
+            out[name] = next;
+        }
+    }
+    return out;
+}
+
+/** An entry's data typed for its collection's schema. */
+export function typedEntryData(schema, data) {
+    return withNumbers(data, numberFieldNames(schema));
+}

package/server/services/number-fields-migration.js

@@ -13,25 +13,18 @@
  * an edit.
  *
  * Runs ONCE per install: the marker (content/.migrations.json) is written only
- * when every collection was done. It is deliberately not a standing coercion -
- * what an API client writes after this is the client's business.
+ * when every collection was done. From 0.78.0 the collections service converts
+ * on every write (entryValues.js), so nothing new of this kind arrives - this
+ * only mends what was stored before.
  */
 import fs from 'fs/promises';
 import path from 'path';
 import {config} from '../config.js';
+import {numberFieldNames, numberFromText, withNumbers} from './entryValues.js';
 
 export const MIGRATION_ID = 'number-field-types';
 
-const DECIMAL = /^[+-]?(\d+\.?\d*|\.\d+)(e[+-]?\d+)?$/i;
-
-/** "42" -> 42; anything that is not plain decimal text is returned unchanged. */
-export function numberFromText(value) {
-    if (typeof value !== 'string') return value;
-    const t = value.trim();
-    if (!DECIMAL.test(t)) return value;
-    const n = Number(t);
-    return Number.isFinite(n) ? n : value;
-}
+export {numberFromText};
 
 /**
  * An entry with its number fields converted, or null when nothing changed.
@@ -42,13 +35,8 @@ export function numberFromText(value) {
 export function convertEntry(entry, names) {
     const data = entry?.data;
     if (!data || typeof data !== 'object') return null;
-    let changed = null;
-    for (const name of names) {
-        if (!(name in data)) continue;
-        const next = numberFromText(data[name]);
-        if (next !== data[name]) (changed ||= {...data})[name] = next;
-    }
-    return changed ? {...entry, data: changed} : null;
+    const next = withNumbers(data, names);
+    return next === data ? null : {...entry, data: next};
 }
 
 function defaultMarkerPath() {
@@ -79,7 +67,7 @@ export async function migrateNumberFields({markerPath = defaultMarkerPath(), for
     const converted = {};
     const pending = [];
     for (const schema of await listCollections()) {
-        const names = (schema.fields || []).filter(f => f?.type === 'number' && f.name).map(f => f.name);
+        const names = numberFieldNames(schema);
         if (!names.length) continue;
         try {
             const adapter = await getAdapter(schema.slug);