@aduptive/strapi-blockscene 2.0.0-alpha.12 → 2.0.0-alpha.14

package/dist/server.cjs

@@ -108,8 +108,17 @@ var require_groups = __commonJS({
       const start = rows.findIndex((row) => blockKey(row) === String(key));
       if (start < 0 || !isOpener(rows[start], g)) return null;
       const [, end] = groupRange(rows, start, g);
+      if (end <= start || uidOf(rows[end]) !== g[uidOf(rows[start])]) return null;
       return [...rows.slice(0, start), ...rows.slice(end + 1)];
     }
+    function unwrapGroup(rows, key, g) {
+      if (!g) return null;
+      const start = rows.findIndex((row) => blockKey(row) === String(key));
+      if (start < 0 || !isOpener(rows[start], g)) return null;
+      const [, end] = groupRange(rows, start, g);
+      if (end <= start || uidOf(rows[end]) !== g[uidOf(rows[start])]) return null;
+      return [...rows.slice(0, start), ...rows.slice(start + 1, end), ...rows.slice(end + 1)];
+    }
     var MAX_COLUMNS = 12;
     var parseColumns = (value) => {
       const n = typeof value === "number" ? value : typeof value === "string" && /^\s*\d{1,3}\s*$/.test(value) ? Number(value) : NaN;
@@ -137,6 +146,7 @@ var require_groups = __commonJS({
       topLevelRanges,
       moveGroup,
       removeGroup,
+      unwrapGroup,
       blockKey,
       isOpener,
       isClose,
@@ -239,6 +249,13 @@ var require_settings = __commonJS({
     var TAG = /^[^<>\n]{1,24}$/;
     var cleanTags = (value) => Array.isArray(value) ? [...new Set(value.filter((tag) => typeof tag === "string" && TAG.test(tag.trim())).map((tag) => tag.trim()))].slice(0, 10) : [];
     var validTags = (value) => Array.isArray(value) && value.length <= 10 && value.every((tag) => typeof tag === "string" && TAG.test(tag.trim()));
+    var directComponentUids = (contentTypes, perType = {}) => [...new Set(Object.entries(contentTypes || {}).filter(([uid]) => perType?.[uid]?.enabled !== false).flatMap(([, schema]) => Object.values(schema?.attributes || {}).filter((attr) => attr?.type === "dynamiczone").flatMap((attr) => attr.components || [])))];
+    var COMPONENT_CATEGORY = /^[a-z0-9][a-z0-9_-]{0,49}$/;
+    var safeComponentCategories2 = (value) => value == null ? null : Array.isArray(value) && value.length > 0 && value.length <= 50 && value.every((category) => typeof category === "string" && COMPONENT_CATEGORY.test(category)) ? [...new Set(value)] : null;
+    var settingsComponentUids2 = (contentTypes, components, perType = {}, categories = null) => {
+      const allowed = safeComponentCategories2(categories);
+      return directComponentUids(contentTypes, perType).filter((uid) => !allowed || allowed.includes(components?.[uid]?.category || uid.split(".")[0]));
+    };
     var GUESSES = [
       ["hero", /hero|banner|cover/],
       ["text", /text|rich|quote|title/],
@@ -301,6 +318,7 @@ var require_settings = __commonJS({
           ["label", "description", "category", "keywords"].filter((key) => typeof entry[key] === "string").map((key) => [key, entry[key]])
         );
         entries[uid].image = safeUrl2(entry.image);
+        if (typeof entry.showRowThumbnail === "boolean") entries[uid].showRowThumbnail = entry.showRowThumbnail;
         if (TYPOLOGIES2.includes(entry.typology)) entries[uid].typology = entry.typology;
         const tags = cleanTags(entry.tags);
         if (tags.length || entries[uid].category) entries[uid].tags = tags.length ? tags : cleanTags([entries[uid].category]);
@@ -358,6 +376,9 @@ var require_settings = __commonJS({
           } else if (key === "mediaId") {
             if (!Number.isInteger(entry.mediaId) || entry.mediaId <= 0) fail2(`Invalid media for "${uid}"`);
             clean.mediaId = entry.mediaId;
+          } else if (key === "showRowThumbnail") {
+            if (typeof entry.showRowThumbnail !== "boolean") fail2(`Invalid row thumbnail setting for "${uid}"`);
+            clean.showRowThumbnail = entry.showRowThumbnail;
           } else if (key === "layout") {
             if (!validLayout(entry.layout, schemas && (schemas[uid]?.attributes || {}))) fail2(`Invalid layout for "${uid}": columnsField (and mobileColumnsField) must name a number, string or numeric enumeration attribute of the component; maxColumns 1 to 12`);
             clean.layout = structuredClone(entry.layout);
@@ -416,6 +437,7 @@ var require_settings = __commonJS({
           clean.tags = cleanTags(clean.tags);
           if (!clean.tags.length) delete clean.tags;
         }
+        if ("showRowThumbnail" in clean && typeof clean.showRowThumbnail !== "boolean") delete clean.showRowThumbnail;
         if ("layout" in clean && !validLayout(clean.layout, schemas && (schemas[uid]?.attributes || {}))) delete clean.layout;
         if (Object.keys(clean).length) out.components[uid] = clean;
       }
@@ -732,7 +754,7 @@ var require_settings = __commonJS({
       return out;
     }
     var mergePrefs2 = (saved, componentUids2) => Object.fromEntries(Object.entries(PREFS).map(([key, max]) => [key, Array.isArray(saved?.[key]) ? [...new Set(saved[key].filter((uid) => componentUids2.includes(uid)))].slice(0, max) : []]));
-    module2.exports = { PLUGIN: PLUGIN2, HIDDEN_MODES, TEMPLATES: TEMPLATES2, TYPOLOGIES: TYPOLOGIES2, guessTypology, facetsOf, validatePrefs: validatePrefs2, mergePrefs: mergePrefs2, ICONS, DEFAULTS: DEFAULTS2, catalog: catalog2, validateSettings: validateSettings2, validateFields: validateFields2, validateVariants: validateVariants2, validateKits: validateKits2, schemaMetadata: schemaMetadata2, mergeSaved: mergeSaved2, layer: layer2, overrides: overrides2, safeUrl: safeUrl2, fail: fail2 };
+    module2.exports = { PLUGIN: PLUGIN2, HIDDEN_MODES, TEMPLATES: TEMPLATES2, TYPOLOGIES: TYPOLOGIES2, guessTypology, facetsOf, directComponentUids, settingsComponentUids: settingsComponentUids2, safeComponentCategories: safeComponentCategories2, validatePrefs: validatePrefs2, mergePrefs: mergePrefs2, ICONS, DEFAULTS: DEFAULTS2, catalog: catalog2, validateSettings: validateSettings2, validateFields: validateFields2, validateVariants: validateVariants2, validateKits: validateKits2, schemaMetadata: schemaMetadata2, mergeSaved: mergeSaved2, layer: layer2, overrides: overrides2, safeUrl: safeUrl2, fail: fail2 };
   }
 });
 
@@ -1438,6 +1460,18 @@ var require_history = __commonJS({
     var hashOf = (text) => createHash("sha256").update(text).digest("hex");
     var covers2 = (history, uid) => Boolean(history?.enabled) && uid.startsWith("api::") && (history.contentTypes === "all" || Array.isArray(history.contentTypes) && history.contentTypes.includes(uid));
     var retention = ({ retentionDays, eventDays }, now = Date.now()) => ({ snapshotsBefore: new Date(now - retentionDays * DAY), eventsBefore: new Date(now - eventDays * DAY) });
+    var hasChanges = (summary) => Boolean(summary?.initial || summary?.fields?.length || ["added", "removed", "changed"].some((key) => summary?.blocks?.[key] > 0));
+    function collapseVersions(events) {
+      const versions = [];
+      for (const event of events) {
+        const previous = versions[versions.length - 1];
+        if (event.hash && previous?.hash === event.hash) {
+          if (!previous.actions.includes(event.action)) previous.actions.push(event.action);
+          if (!hasChanges(previous.summary) && hasChanges(event.summary)) previous.summary = event.summary;
+        } else versions.push({ ...event, actions: [event.action] });
+      }
+      return versions;
+    }
     function actorOf(strapi) {
       let ctx;
       try {
@@ -1539,12 +1573,14 @@ var require_history = __commonJS({
         async list({ uid, documentId, locale, actor = "", page = 1, pageSize = 25 }) {
           const scope2 = { contentType: uid, relatedDocumentId: documentId, locale: locale || null };
           const where = { ...scope2, ...actor && { actor } };
-          const [list, kept, total, people] = await Promise.all([
-            events().findMany({ select: ["id", "action", "actor", "actorName", "at", "summary", "hash", "size"], where, orderBy: [{ at: "desc" }, { id: "desc" }], offset: (page - 1) * pageSize, limit: pageSize }),
+          const [timeline, kept, people] = await Promise.all([
+            events().findMany({ select: ["id", "action", "actor", "actorName", "at", "summary", "hash", "size"], where, orderBy: [{ at: "desc" }, { id: "desc" }] }),
             events().findMany({ select: ["hash"], where: { ...scope2, size: { $gt: 0 } } }),
-            events().count({ where }),
             events().findMany({ select: ["actor", "actorName"], where: scope2, orderBy: [{ at: "desc" }, { id: "desc" }] })
           ]);
+          const versions = collapseVersions(timeline);
+          const total = versions.length;
+          const list = versions.slice((page - 1) * pageSize, page * pageSize);
           const hashes = new Set(kept.map((row) => row.hash));
           const actors2 = [...new Map(people.slice().reverse().map(({ actor: actor2, actorName }) => [actor2, { actor: actor2, actorName }])).values()];
           return {
@@ -1792,12 +1828,12 @@ var require_history = __commonJS({
         };
       }
     });
-    module2.exports = { EVENT_UID, ACTIONS, CAPTURED, CRON: CRON2, BATCH, eventContentType: eventContentType2, covers: covers2, retention, actorOf, refsOf, can, readableTypes, historyService: historyService2, registerHistory: registerHistory2, registerPurge: registerPurge2, historyController: historyController2 };
+    module2.exports = { EVENT_UID, ACTIONS, CAPTURED, CRON: CRON2, BATCH, eventContentType: eventContentType2, covers: covers2, retention, actorOf, refsOf, collapseVersions, can, readableTypes, historyService: historyService2, registerHistory: registerHistory2, registerPurge: registerPurge2, historyController: historyController2 };
   }
 });
 
 // server/index.js
-var { PLUGIN, TEMPLATES, TYPOLOGIES, DEFAULTS, catalog, validateSettings, validateFields, validateVariants, validateKits, schemaMetadata, mergeSaved, layer, overrides, validatePrefs, mergePrefs, safeUrl, fail } = require_settings();
+var { PLUGIN, TEMPLATES, TYPOLOGIES, DEFAULTS, catalog, settingsComponentUids, safeComponentCategories, validateSettings, validateFields, validateVariants, validateKits, schemaMetadata, mergeSaved, layer, overrides, validatePrefs, mergePrefs, safeUrl, fail } = require_settings();
 var { safeGroups, validateGroups, invalidComponents, layoutFields } = require_groups();
 var { hiddenName, injectHidden, hideFromBuilder, registerHiddenStrip } = require_hidden();
 var { CRON, covers, eventContentType, historyService, historyController, registerHistory, registerPurge } = require_history();
@@ -1945,6 +1981,9 @@ module.exports = {
       // Optional layout groups: OPEN component uid -> its CLOSE uid, e.g. { 'wrappers.join': 'wrappers.close' }.
       // Empty/absent: every Dynamic Zone component is an ordinary block. See README "Layout groups".
       groups: null,
+      // Optional Strapi component categories shown as configurable cards in Settings > Block gallery.
+      // This does not change the components allowed by each Dynamic Zone.
+      settingsComponentCategories: null,
       // Project defaults from code: same shape as the stored settings, e.g. require('./blockscene.json'). See README "Settings page".
       settings: null,
       // Edit view field texts from code (never stored): { uid: { attribute: { label, description, placeholder } } }. See README "Field labels".
@@ -1965,6 +2004,7 @@ module.exports = {
     const name = hiddenName(plugin.config("hiddenAttribute"));
     withHidden = [];
     if (name === null) strapi.log.warn(`[${PLUGIN}] "hiddenAttribute" config ignored: expected a name like "bsHidden" or false. Hiding blocks is off.`);
+    if (plugin.config("settingsComponentCategories") != null && !safeComponentCategories(plugin.config("settingsComponentCategories"))) strapi.log.warn(`[${PLUGIN}] "settingsComponentCategories" config ignored: expected 1 to 50 Strapi component category names.`);
     if (!name) return;
     const { added, skipped } = injectHidden(strapi.components, strapi.contentTypes, name);
     withHidden = added;
@@ -2100,7 +2140,8 @@ module.exports = {
             ...media[uid],
             template: entry.template,
             ...entry.typology && { typology: entry.typology },
-            ...entry.tags && { tags: entry.tags }
+            ...entry.tags && { tags: entry.tags },
+            ...typeof entry.showRowThumbnail === "boolean" && { showRowThumbnail: entry.showRowThumbnail }
           };
         }
         const hidden = hiddenName(plugin.config("hiddenAttribute")) || null;
@@ -2125,7 +2166,8 @@ module.exports = {
       async find(ctx) {
         const settings = await strapi.plugin(PLUGIN).service("settings").get();
         const auto = catalog({ components: strapi.plugin(PLUGIN).config("components"), schemas: strapi.components, blocks: strapi.plugin(PLUGIN).service("settings").schema().blocks }).components;
-        const components = Object.entries(strapi.components || {}).map(([uid, schema]) => ({
+        const visible = new Set(settingsComponentUids(strapi.contentTypes, strapi.components, settings.contentTypes, strapi.plugin(PLUGIN).config("settingsComponentCategories")));
+        const components = Object.entries(strapi.components || {}).filter(([uid]) => visible.has(uid)).map(([uid, schema]) => ({
           uid,
           displayName: schema.info?.displayName || uid,
           category: schema.category || uid.split(".")[0],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aduptive/strapi-blockscene",
-  "version": "2.0.0-alpha.12",
+  "version": "2.0.0-alpha.14",
   "description": "Visual component gallery for native Strapi dynamic zones.",
   "license": "MIT",
   "author": "Andrea Scarpello <aduptive@gmail.com>",