@panphora/clayjs 1.5.3 → 1.6.1

package/src/loader-logic.js

@@ -16,7 +16,7 @@ export const CORE_WAVES = {
     // transform registered after that made an untouched page read as unsaved.
     "core/persist.js", "core/admin-attrs.js",
     "core/save-core.js", "core/save.js",
-    "core/save-conflict-notice.js",
+    "core/conflict-notice.js",
     "core/unsaved-warning.js", "core/autosave.js",
     "attrs/save-freeze.js", "attrs/onaftersave.js", "attrs/refetch-on-save.js",
     "lib/cache-bust.js",
@@ -24,20 +24,21 @@ export const CORE_WAVES = {
 };
 
 export const PLUGIN_PATHS = {
-  richclay:  { path: "vendor/richclay.vendor.js",  editOnly: true,  default: true },
+  richclay:  { path: "plugins/richclay.js",        editOnly: true,  default: true },
   indicator: { path: "plugins/indicator.js",       editOnly: true,  default: false },
   sync:      { path: "sync/live-sync.js",          editOnly: false, default: false },
   sortable:  { path: "plugins/sortable.js",        editOnly: true,  default: false },
   undo:      { path: "plugins/undo.js",            editOnly: true,  default: false },
-  cms:       { path: "vendor/hypercms.vendor.js",  editOnly: false, default: false },
-  quickcrop: { path: "vendor/quickcrop.vendor.js", editOnly: false, default: false },
+  cms:       { path: "plugins/cms.js",             editOnly: false, default: false },
+  quickcrop: { path: "plugins/quickcrop.js",       editOnly: false, default: false },
   // editOnly, because a file picker only ever appears in edit mode: the cms
   // injects its own editing toggle there and clayjs's edit-mode signal is a
   // superset of the cms's, so the plugin is present exactly when it can be used.
   upload:    { path: "plugins/upload.js",          editOnly: true,  default: false },
   wire:      { path: "plugins/wire.js",            editOnly: false, default: false },
-  // Edit mode only: the AI comment box is an editing gesture, and the plugin is
-  // dormant anyway on any host that does not list a ready `ai-edit` helper.
+  // Edit mode only: the AI comment box is an editing gesture. Opt in with
+  // `plugins=ai-edit`; it stays dormant on any host that does not list a ready
+  // `ai-edit` helper.
   "ai-edit": { path: "plugins/ai-edit.js",         editOnly: true,  default: false },
   demo:      { path: "plugins/demo.js",            editOnly: false, default: false },
   // Saves the file's own bytes back instead of a fresh serialization of the DOM.
@@ -68,7 +69,7 @@ export const MODULES = {
   "core/snapshot.js":           () => import("./core/snapshot.js"),
   "core/save-core.js":          () => import("./core/save-core.js"),
   "core/save.js":               () => import("./core/save.js"),
-  "core/save-conflict-notice.js": () => import("./core/save-conflict-notice.js"),
+  "core/conflict-notice.js":     () => import("./core/conflict-notice.js"),
   "core/unsaved-warning.js":    () => import("./core/unsaved-warning.js"),
   "core/persist.js":            () => import("./core/persist.js"),
   "core/admin-attrs.js":        () => import("./core/admin-attrs.js"),
@@ -78,13 +79,13 @@ export const MODULES = {
   "attrs/refetch-on-save.js":   () => import("./attrs/refetch-on-save.js"),
   "lib/cache-bust.js":          () => import("./lib/cache-bust.js"),
   "vendor/hyper-morph.vendor.js": () => import("./vendor/hyper-morph.vendor.js"),
-  "vendor/richclay.vendor.js":  () => import("./vendor/richclay.vendor.js"),
+  "plugins/richclay.js":        () => import("./plugins/richclay.js"),
   "plugins/indicator.js":       () => import("./plugins/indicator.js"),
   "sync/live-sync.js":          () => import("./sync/live-sync.js"),
   "plugins/sortable.js":        () => import("./plugins/sortable.js"),
   "plugins/undo.js":            () => import("./plugins/undo.js"),
-  "vendor/hypercms.vendor.js":  () => import("./vendor/hypercms.vendor.js"),
-  "vendor/quickcrop.vendor.js": () => import("./vendor/quickcrop.vendor.js"),
+  "plugins/cms.js":             () => import("./plugins/cms.js"),
+  "plugins/quickcrop.js":       () => import("./plugins/quickcrop.js"),
   "plugins/upload.js":          () => import("./plugins/upload.js"),
   "plugins/wire.js":            () => import("./plugins/wire.js"),
   "plugins/ai-edit.js":         () => import("./plugins/ai-edit.js"),
@@ -114,6 +115,8 @@ const PLUGIN_ORDER = ["richclay", "indicator", "sortable", "undo", "quickcrop",
 // enables. Reverting it is reverting this line.
 // ai-edit reads `clay.wire.helpers()` and sends through `clay.wire.send`, so a page
 // that asks for it has to have the wire. The wire loads first in the order above.
+// It does not bring undo: hyper-undo takes Cmd+Z for the whole window, text fields
+// included, which a page that never asked for it should not get by default.
 const IMPLIES = { cms: ["quickcrop", "upload"], "ai-edit": ["wire"] };
 
 function parseCsv(params, key, enabled, apply) {
@@ -134,17 +137,25 @@ export function resolveModules(params, isEditMode) {
   const core = [...CORE_WAVES.always];
   if (isEditMode) core.push(...CORE_WAVES.editOnly);
 
-  const enabled = new Set();
+  const explicit = new Set();
+  parseCsv(params, "plugins", explicit, (set, name) => set.add(name));
+  const excluded = new Set();
+  parseCsv(params, "exclude", excluded, (set, name) => set.add(name));
+
+  const enabled = new Set(explicit);
   for (const [name, spec] of Object.entries(PLUGIN_PATHS)) {
     if (spec.default) enabled.add(name);
   }
-  parseCsv(params, "plugins", enabled, (set, name) => set.add(name));
-  // Between the two: exclude still wins, so `plugins=cms&exclude=quickcrop` opts
-  // back out of the cropper.
+  // ai-edit cannot run without the wire, so excluding the wire excludes it too.
+  if (excluded.has("wire")) enabled.delete("ai-edit");
+  // A default-on plugin that this mode drops brings nothing with it. An explicitly
+  // asked for plugin still brings what it implies.
   for (const name of [...enabled]) {
+    if (excluded.has(name)) continue;
+    if (!explicit.has(name) && PLUGIN_PATHS[name].editOnly && !isEditMode) continue;
     for (const implied of IMPLIES[name] || []) enabled.add(implied);
   }
-  parseCsv(params, "exclude", enabled, (set, name) => set.delete(name));
+  for (const name of excluded) enabled.delete(name);
 
   const plugins = [];
   for (const name of PLUGIN_ORDER) {

package/src/loader.js

@@ -88,8 +88,14 @@ function assembleCore(loaded, { isEditMode, isOwner }, regionPolicy) {
     const saveFn = save.savePage || save.default;
     saveFn.force = save.savePageForce;
     saveFn.overwrite = save.saveOverwritingConflict;
+    saveFn.flush = save.flushSave;
     clay.save = saveFn;
   }
+  // The close warning's own predicate, reachable without a capture. It falls back to
+  // false rather than to absent: the module is edit-only, and a document that cannot
+  // save has nothing unsaved. Older clayjs has no such member, and that is the answer
+  // a host feature-detects.
+  clay.hasUnsavedChanges = loaded["core/unsaved-warning.js"]?.hasUnsavedChanges ?? (() => false);
   if (snapshot) {
     clay.getHTML = snapshot.getPageContents;
     clay.addDocumentTransform = snapshot.addDocumentTransform;
@@ -108,7 +114,8 @@ function attachPluginMember(path, mod) {
     clay.undo = mod.undo || mod.default;
   } else if (path === "sync/live-sync.js") {
     clay.morph = mod.morph;
-  } else if (path === "vendor/hypercms.vendor.js") {
+    clay.conflicts = mod.conflicts;
+  } else if (path === "plugins/cms.js") {
     clay.cms = mod.cms || mod.default;
   } else if (path === "plugins/upload.js") {
     clay.upload = mod.upload || mod.default;
@@ -118,9 +125,9 @@ function attachPluginMember(path, mod) {
     clay.aiEdit = mod.aiEdit || mod.default;
   } else if (path === "plugins/demo.js") {
     clay.demo = mod.demo;
-  } else if (path === "vendor/richclay.vendor.js") {
+  } else if (path === "plugins/richclay.js") {
     clay.RichClay = mod.RichClay || mod.default;
-  } else if (path === "vendor/quickcrop.vendor.js") {
+  } else if (path === "plugins/quickcrop.js") {
     clay.quickcrop = mod.quickcrop || mod.default;
   } else if (path === "plugins/source.js") {
     clay.source = mod.source || mod.default;