domma-cms 0.14.0 → 0.14.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "domma-cms",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "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/server/services/markdown.js

@@ -647,12 +647,14 @@ async function processCollectionBlocks(markdown) {
  */
 export function parseShortcodeAttrs(attrStr) {
   const attrs = {};
-  // Pass 1: quoted key="value" or key='value' pairs
-  for (const [, key, val] of attrStr.matchAll(/([\w-]+)=["']([^"']*)["']/g)) {
-    attrs[key] = val;
+  // Pass 1: quoted key="value" or key='value' pairs — proper disjunction so
+  // a double-quoted value can contain apostrophes (and vice versa) without
+  // the opposite quote terminating the match.
+  for (const [, key, dq, sq] of attrStr.matchAll(/([\w-]+)=(?:"([^"]*)"|'([^']*)')/g)) {
+    attrs[key] = dq ?? sq ?? '';
   }
   // Pass 2: standalone flag attributes (no value) — blank out key=value matches first
-  const stripped = attrStr.replace(/([\w-]+)=["'][^"']*["']/g, m => ' '.repeat(m.length));
+  const stripped = attrStr.replace(/([\w-]+)=(?:"[^"]*"|'[^']*')/g, m => ' '.repeat(m.length));
   for (const [, key] of stripped.matchAll(/\b([\w-]+)\b/g)) {
     if (!(key in attrs)) attrs[key] = true;
   }