@jxsuite/studio 0.9.0 → 0.10.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jxsuite/studio",
-  "version": "0.9.0",
+  "version": "0.10.2",
   "description": "Jx Studio — visual builder for Jx documents",
   "license": "MIT",
   "repository": {
@@ -30,35 +30,35 @@
   "dependencies": {
     "@atlaskit/pragmatic-drag-and-drop": "^1.8.1",
     "@atlaskit/pragmatic-drag-and-drop-hitbox": "^1.1.0",
-    "@jxsuite/runtime": "^0.7.0",
-    "@spectrum-web-components/accordion": "^1.12.0",
-    "@spectrum-web-components/action-bar": "1.12.0",
-    "@spectrum-web-components/action-button": "^1.12.0",
-    "@spectrum-web-components/action-group": "^1.12.0",
-    "@spectrum-web-components/checkbox": "^1.12.0",
-    "@spectrum-web-components/color-area": "^1.12.0",
-    "@spectrum-web-components/color-handle": "^1.12.0",
-    "@spectrum-web-components/color-slider": "^1.12.0",
-    "@spectrum-web-components/combobox": "^1.12.0",
-    "@spectrum-web-components/dialog": "^1.12.0",
-    "@spectrum-web-components/divider": "^1.12.0",
-    "@spectrum-web-components/icon": "^1.12.0",
-    "@spectrum-web-components/icons-workflow": "^1.12.0",
-    "@spectrum-web-components/menu": "^1.12.0",
-    "@spectrum-web-components/number-field": "^1.12.0",
-    "@spectrum-web-components/overlay": "^1.12.0",
+    "@jxsuite/runtime": "^0.10.1",
+    "@spectrum-web-components/accordion": "^1.12.1",
+    "@spectrum-web-components/action-bar": "1.12.1",
+    "@spectrum-web-components/action-button": "^1.12.1",
+    "@spectrum-web-components/action-group": "^1.12.1",
+    "@spectrum-web-components/checkbox": "^1.12.1",
+    "@spectrum-web-components/color-area": "^1.12.1",
+    "@spectrum-web-components/color-handle": "^1.12.1",
+    "@spectrum-web-components/color-slider": "^1.12.1",
+    "@spectrum-web-components/combobox": "^1.12.1",
+    "@spectrum-web-components/dialog": "^1.12.1",
+    "@spectrum-web-components/divider": "^1.12.1",
+    "@spectrum-web-components/icon": "^1.12.1",
+    "@spectrum-web-components/icons-workflow": "^1.12.1",
+    "@spectrum-web-components/menu": "^1.12.1",
+    "@spectrum-web-components/number-field": "^1.12.1",
+    "@spectrum-web-components/overlay": "^1.12.1",
     "@spectrum-web-components/overlay-trigger": "^0.1.7",
-    "@spectrum-web-components/picker": "^1.12.0",
-    "@spectrum-web-components/picker-button": "^1.12.0",
-    "@spectrum-web-components/popover": "^1.12.0",
-    "@spectrum-web-components/search": "^1.12.0",
-    "@spectrum-web-components/swatch": "^1.12.0",
-    "@spectrum-web-components/switch": "^1.12.0",
-    "@spectrum-web-components/table": "^1.12.0",
-    "@spectrum-web-components/tabs": "^1.12.0",
-    "@spectrum-web-components/textfield": "^1.12.0",
-    "@spectrum-web-components/theme": "^1.12.0",
-    "@spectrum-web-components/tooltip": "^1.12.0",
+    "@spectrum-web-components/picker": "^1.12.1",
+    "@spectrum-web-components/picker-button": "^1.12.1",
+    "@spectrum-web-components/popover": "^1.12.1",
+    "@spectrum-web-components/search": "^1.12.1",
+    "@spectrum-web-components/swatch": "^1.12.1",
+    "@spectrum-web-components/switch": "^1.12.1",
+    "@spectrum-web-components/table": "^1.12.1",
+    "@spectrum-web-components/tabs": "^1.12.1",
+    "@spectrum-web-components/textfield": "^1.12.1",
+    "@spectrum-web-components/theme": "^1.12.1",
+    "@spectrum-web-components/tooltip": "^1.12.1",
     "lit-html": "^3.3.3",
     "monaco-editor": "^0.55.1",
     "remark-directive": "^4.0.0",

package/src/browse/browse.js

@@ -3,7 +3,7 @@
  *
  * Displays pages, layouts, components, content, and media in a filterable table grid. Fills the
  * center canvas area as a parallel state to Edit/Design/Preview/Code/Settings. Includes a "New +"
- * button with type-aware entity creation (including collections from project.json).
+ * button with type-aware entity creation (including content types from project.json).
  */
 
 import { html, render as litRender } from "lit-html";
@@ -153,14 +153,14 @@ const ENTITY_TYPES = [
 ];
 
 /**
- * Build frontmatter YAML from a collection's schema properties.
+ * Build frontmatter YAML from a content type's schema properties.
  *
- * @param {string} collectionName
+ * @param {string} contentTypeName
  * @returns {string}
  */
-function buildFrontmatterYaml(collectionName) {
+function buildFrontmatterYaml(contentTypeName) {
   const config = projectState?.projectConfig;
-  const col = config?.collections?.[collectionName];
+  const col = config?.contentTypes?.[contentTypeName];
   if (!col?.schema?.properties) return "title: Untitled\n";
 
   let yaml = "";
@@ -172,22 +172,22 @@ function buildFrontmatterYaml(collectionName) {
 }
 
 /**
- * Get collection-derived entity types from project config.
+ * Get content-type-derived entity types from project config.
  *
- * @returns {{ key: string; label: string; dir: string; ext: string; collectionName: string }[]}
+ * @returns {{ key: string; label: string; dir: string; ext: string; contentTypeName: string }[]}
  */
-function getCollectionTypes() {
+function getContentTypeTypes() {
   const config = projectState?.projectConfig;
-  if (!config?.collections) return [];
-  return Object.entries(config.collections).map(([name, def]) => {
+  if (!config?.contentTypes) return [];
+  return Object.entries(config.contentTypes).map(([name, def]) => {
     const d = /** @type {any} */ (def);
     const dir = d.source ? d.source.replace(/^\.\//, "").split("/")[0] : name;
     return {
-      key: `collection:${name}`,
+      key: `contentType:${name}`,
       label: name.charAt(0).toUpperCase() + name.slice(1),
       dir,
       ext: ".md",
-      collectionName: name,
+      contentTypeName: name,
     };
   });
 }
@@ -200,9 +200,9 @@ function getCollectionTypes() {
  * @param {{ openFile: (path: string) => void }} ctx
  */
 async function handleNewEntity(typeKey, container, ctx) {
-  const isCollection = typeKey.startsWith("collection:");
-  const collectionName = isCollection ? typeKey.slice("collection:".length) : null;
-  const allTypes = [...ENTITY_TYPES, ...getCollectionTypes()];
+  const isContentType = typeKey.startsWith("contentType:");
+  const contentTypeName = isContentType ? typeKey.slice("contentType:".length) : null;
+  const allTypes = [...ENTITY_TYPES, ...getContentTypeTypes()];
   const typeInfo = allTypes.find((t) => t.key === typeKey);
   if (!typeInfo) return;
 
@@ -217,7 +217,9 @@ async function handleNewEntity(typeKey, container, ctx) {
 
   let content;
   if (typeInfo.ext === ".md") {
-    const frontmatter = collectionName ? buildFrontmatterYaml(collectionName) : "title: Untitled\n";
+    const frontmatter = contentTypeName
+      ? buildFrontmatterYaml(contentTypeName)
+      : "title: Untitled\n";
     content = `---\n${frontmatter}---\n\n`;
   } else {
     content = JSON.stringify({ tagName: "div", children: [] }, null, "\t");
@@ -278,7 +280,7 @@ export async function renderBrowse(container, ctx) {
 
   const files = filteredFiles();
 
-  const collectionTypes = getCollectionTypes();
+  const contentTypeTypes = getContentTypeTypes();
 
   const filterBar = html`
     <div class="browse-filter-bar">
@@ -317,8 +319,8 @@ export async function renderBrowse(container, ctx) {
             @change=${(/** @type {any} */ e) => handleNewEntity(e.target.value, container, ctx)}
           >
             ${ENTITY_TYPES.map((t) => html`<sp-menu-item value=${t.key}>${t.label}</sp-menu-item>`)}
-            ${collectionTypes.length
-              ? html`<sp-menu-divider></sp-menu-divider> ${collectionTypes.map(
+            ${contentTypeTypes.length
+              ? html`<sp-menu-divider></sp-menu-divider> ${contentTypeTypes.map(
                     (t) => html`<sp-menu-item value=${t.key}>${t.label}</sp-menu-item>`,
                   )}`
               : ""}

package/src/canvas/canvas-helpers.js

@@ -0,0 +1,121 @@
+/**
+ * Canvas helpers — extracted from studio.js (Phase 4n). Shared query/utility functions used by
+ * multiple canvas-related modules: element lookup, zoom, panel resolution, inline bubbling.
+ */
+
+import {
+  getState,
+  canvasPanels,
+  elToPath,
+  pathsEqual,
+  getNodeAtPath,
+  parentElementPath,
+} from "../store.js";
+import { isInlineInContext } from "../editor/inline-edit.js";
+
+/** @type {any} */
+let _ctx = null;
+
+/**
+ * Initialize the canvas helpers module.
+ *
+ * @param {{ getCanvasMode: () => string }} ctx
+ */
+export function initCanvasHelpers(ctx) {
+  _ctx = ctx;
+}
+
+/** Effective zoom scale — always 1 in edit (content) mode, S.ui.zoom otherwise. */
+export function effectiveZoom() {
+  return _ctx.getCanvasMode() === "edit" ? 1 : getState().ui.zoom;
+}
+
+/** Return the active canvas panel based on the current activeMedia setting. */
+export function getActivePanel() {
+  if (canvasPanels.length === 0) return null;
+  if (canvasPanels.length === 1) return canvasPanels[0];
+  const S = getState();
+  for (const p of canvasPanels) {
+    if (S.ui.activeMedia === null && (p.mediaName === "base" || p.mediaName === null)) return p;
+    if (p.mediaName === S.ui.activeMedia) return p;
+  }
+  return canvasPanels[0];
+}
+
+/**
+ * Walk up the tree from a path, bubbling past inline elements until we find the nearest non-inline
+ * ancestor. Returns the original path if already non-inline.
+ *
+ * @param {any} doc
+ * @param {any} path
+ */
+export function bubbleInlinePath(doc, path) {
+  let currentPath = path;
+  while (currentPath.length >= 2) {
+    const node = getNodeAtPath(doc, currentPath);
+    const pPath = parentElementPath(currentPath);
+    const parentNode = pPath ? getNodeAtPath(doc, pPath) : null;
+    if (!node || !parentNode) break;
+    const childTag = (node.tagName ?? "div").toLowerCase();
+    const parentTag = (parentNode.tagName ?? "div").toLowerCase();
+    if (!isInlineInContext(childTag, parentTag)) break;
+    currentPath = pPath;
+  }
+  return currentPath;
+}
+
+/**
+ * Find a canvas DOM element by its document path.
+ *
+ * @param {any} path
+ * @param {any} canvasEl
+ */
+export function findCanvasElement(path, canvasEl) {
+  let el = canvasEl.firstElementChild;
+  if (!el) return null;
+  if (path.length === 0) return el;
+
+  for (let i = 0; i < path.length; i += 2) {
+    if (path[i] !== "children" && path[i] !== "cases") return null;
+    const idx = path[i + 1];
+    if (idx === undefined) {
+      el = el.children[0];
+    } else if (idx === "map") {
+      el = el.children[0]?.children[0];
+    } else {
+      el = el.children[idx];
+    }
+    if (!el) break;
+  }
+
+  if (el) {
+    const elPath = elToPath.get(el);
+    if (elPath && pathsEqual(elPath, path)) return el;
+  }
+
+  for (const candidate of canvasEl.querySelectorAll("*")) {
+    const p = elToPath.get(candidate);
+    if (p && pathsEqual(p, path)) return candidate;
+  }
+  return null;
+}
+
+/**
+ * Build an overlay box descriptor (no DOM creation).
+ *
+ * @param {any} el
+ * @param {any} type
+ * @param {any} panel
+ */
+export function overlayBoxDescriptor(el, type, panel) {
+  const vpRect = panel.viewport.getBoundingClientRect();
+  const elRect = el.getBoundingClientRect();
+  const scale = effectiveZoom();
+  return {
+    cls: `overlay-box overlay-${type}`,
+    top: `${(elRect.top - vpRect.top + panel.viewport.scrollTop) / scale}px`,
+    left: `${(elRect.left - vpRect.left + panel.viewport.scrollLeft) / scale}px`,
+    width: `${elRect.width / scale}px`,
+    height: `${elRect.height / scale}px`,
+  };
+}

package/src/canvas/canvas-live-render.js

@@ -0,0 +1,292 @@
+/**
+ * Canvas live render — extracted from studio.js (Phase 4p). Async runtime rendering pipeline that
+ * builds live canvas DOM using @jxsuite/runtime. Handles element registration, scope building, path
+ * mapping ($map remapping), site-level style injection, and $head element injection.
+ */
+
+import { elToPath, stripEventHandlers, projectState } from "../store.js";
+import { view } from "../view.js";
+import { renderNode as runtimeRenderNode, buildScope, defineElement } from "@jxsuite/runtime";
+import {
+  getEffectiveElements,
+  getEffectiveImports,
+  getEffectiveMedia,
+  getEffectiveHead,
+} from "../site-context.js";
+import { componentRegistry, computeRelativePath } from "../files/components.js";
+import { prepareForEditMode } from "../utils/edit-display.js";
+import { getActiveElement } from "../editor/inline-edit.js";
+
+/** @type {any} */
+let _ctx = null;
+
+/**
+ * Initialize the canvas live render module.
+ *
+ * @param {{
+ *   getState: () => any;
+ *   getCanvasMode: () => string;
+ * }} ctx
+ */
+export function initCanvasLiveRender(ctx) {
+  _ctx = ctx;
+}
+
+/**
+ * Render a Jx document into a canvas element using the real runtime. Populates elToPath for each
+ * created element via onNodeCreated callback. Returns the live state scope on success, null on
+ * failure.
+ *
+ * @param {number} gen - Render generation for staleness detection
+ * @param {any} doc
+ * @param {any} canvasEl
+ */
+export async function renderCanvasLive(gen, doc, canvasEl) {
+  const S = _ctx.getState();
+  const canvasMode = _ctx.getCanvasMode();
+
+  const renderDoc =
+    canvasMode === "preview" ? structuredClone(doc) : prepareForEditMode(stripEventHandlers(doc));
+
+  // In edit mode, collect paths where $map templates were inlined as children[0]
+  // so we can remap runtime paths (children,0,...) → (children,map,...)
+  const mapParentPaths = new Set();
+  if (canvasMode === "design" || canvasMode === "edit") {
+    (function findMapParents(/** @type {any} */ node, /** @type {any[]} */ path) {
+      if (!node || typeof node !== "object") return;
+      if (
+        node.children &&
+        typeof node.children === "object" &&
+        node.children.$prototype === "Array"
+      ) {
+        mapParentPaths.add(path.join("/"));
+      }
+      if (Array.isArray(node.children)) {
+        for (let i = 0; i < node.children.length; i++) {
+          findMapParents(node.children[i], [...path, "children", i]);
+        }
+      }
+      if (node.$switch && node.cases) {
+        for (const [k, v] of Object.entries(node.cases)) {
+          findMapParents(v, [...path, "cases", k]);
+        }
+      }
+    })(doc, []);
+  }
+
+  try {
+    const root = projectState?.projectRoot || "";
+    const docPrefix = root ? `${root}/` : "";
+    const docBase = S.documentPath ? `${location.origin}/${docPrefix}${S.documentPath}` : undefined;
+
+    // Register custom elements so the runtime can render them
+    let effectiveElements = getEffectiveElements(renderDoc.$elements);
+
+    // In content mode (markdown), auto-discover components for directive-based
+    // custom elements that have no explicit $elements registration.
+    if (S.mode === "content" && componentRegistry.length > 0) {
+      const existingRefs = new Set(
+        effectiveElements.map((/** @type {any} */ e) => (typeof e === "string" ? e : e?.$ref)),
+      );
+      /** @param {any} node */
+      const collectTags = (node) => {
+        /** @type {Set<string>} */
+        const tags = new Set();
+        if (!node || typeof node !== "object") return tags;
+        if (node.tagName) tags.add(node.tagName);
+        if (Array.isArray(node.children)) {
+          for (const child of node.children) {
+            for (const t of collectTags(child)) tags.add(t);
+          }
+        }
+        return tags;
+      };
+      for (const tag of collectTags(renderDoc)) {
+        const comp = componentRegistry.find((/** @type {any} */ c) => c.tagName === tag);
+        if (comp && comp.source !== "npm") {
+          const relPath = computeRelativePath(S.documentPath, comp.path);
+          if (!existingRefs.has(relPath)) {
+            effectiveElements.push({ $ref: relPath });
+            existingRefs.add(relPath);
+          }
+        }
+      }
+    }
+
+    if (effectiveElements.length) {
+      renderDoc.$elements = effectiveElements;
+      for (const entry of effectiveElements) {
+        if (typeof entry === "string") {
+          try {
+            const specifier =
+              entry.startsWith("/") || entry.startsWith(".")
+                ? entry
+                : `/${projectState?.projectRoot || ""}/node_modules/${entry}`.replace(/\/+/g, "/");
+            await import(specifier);
+          } catch (/** @type {any} */ e) {
+            console.warn("Studio: failed to import package", entry, e);
+          }
+        } else if (entry?.$ref) {
+          let href;
+          try {
+            href = new URL(entry.$ref, docBase).href;
+          } catch (/** @type {any} */ urlErr) {
+            console.warn("Studio: invalid element URL", { ref: entry.$ref, docBase }, urlErr);
+            continue;
+          }
+          try {
+            await defineElement(href);
+          } catch (/** @type {any} */ e) {
+            console.warn("Studio: failed to register element", entry.$ref, e);
+          }
+        }
+      }
+    }
+
+    // Bail out if a newer render started while we were importing elements
+    if (gen !== view.renderGeneration) return null;
+
+    // Inject site-level imports so buildScope can resolve $prototype names
+    renderDoc.imports = getEffectiveImports(renderDoc.imports);
+
+    // Apply project-level styles mirroring the compiler convention:
+    //   viewport ≈ :root  → CSS custom properties (they inherit down)
+    //   canvasEl ≈ body   → regular CSS properties (inline beats CSS defaults)
+    // This ensures project font-family, color, etc. override the
+    // content-mode fallback typography rules in the stylesheet.
+    // In edit mode, propagate to the .content-edit-canvas wrapper for seamless appearance.
+    const viewport = canvasEl.closest(".canvas-panel-viewport");
+    const editSurface = canvasMode === "edit" ? canvasEl.closest(".content-edit-canvas") : null;
+    const siteStyle = projectState?.projectConfig?.style;
+    if (viewport) {
+      viewport.style.cssText = "";
+      if (siteStyle && typeof siteStyle === "object") {
+        for (const [k, v] of Object.entries(siteStyle)) {
+          if (k.startsWith("--")) {
+            viewport.style.setProperty(k, String(v));
+          } else {
+            /** @type {any} */ (viewport.style)[k] = v;
+          }
+        }
+      }
+    }
+    if (editSurface) {
+      if (siteStyle && typeof siteStyle === "object") {
+        for (const [k, v] of Object.entries(siteStyle)) {
+          if (k.startsWith("--")) {
+            /** @type {any} */ (editSurface).style.setProperty(k, String(v));
+          } else {
+            /** @type {any} */ (editSurface.style)[k] = v;
+          }
+        }
+      }
+    }
+    if (siteStyle && typeof siteStyle === "object") {
+      for (const [k, v] of Object.entries(siteStyle)) {
+        if (!k.startsWith("--")) {
+          /** @type {any} */ (canvasEl.style)[k] = v;
+        }
+      }
+    }
+
+    // Inject site-level $media so runtime can resolve media queries in styles
+    renderDoc.$media = getEffectiveMedia(renderDoc.$media);
+
+    // Inject $head elements (link/meta/script) into document.head
+    const effectiveHead = getEffectiveHead(renderDoc.$head);
+    if (effectiveHead.length) {
+      for (const entry of effectiveHead) {
+        if (!entry?.tagName) continue;
+        const tag = entry.tagName.toLowerCase();
+        const attrs = { ...entry.attributes };
+        const headRoot = projectState?.projectRoot || "";
+        for (const key of ["href", "src"]) {
+          if (
+            attrs[key] &&
+            !attrs[key].startsWith("/") &&
+            !attrs[key].startsWith(".") &&
+            !attrs[key].startsWith("http")
+          ) {
+            attrs[key] = `/${headRoot}/node_modules/${attrs[key]}`.replace(/\/+/g, "/");
+          }
+        }
+        const selector = `${tag}${attrs.href ? `[href="${attrs.href}"]` : ""}${attrs.src ? `[src="${attrs.src}"]` : ""}`;
+        if (selector !== tag && document.head.querySelector(selector)) continue;
+        const el = document.createElement(tag);
+        for (const [k, v] of Object.entries(attrs)) el.setAttribute(k, /** @type {string} */ (v));
+        if (entry.textContent) el.textContent = entry.textContent;
+        document.head.appendChild(el);
+      }
+    }
+
+    const $defs = await buildScope(renderDoc, {}, docBase);
+    // Bail out if a newer render started while buildScope was running
+    if (gen !== view.renderGeneration) return null;
+    const el = /** @type {HTMLElement} */ (
+      runtimeRenderNode(renderDoc, $defs, {
+        onNodeCreated(/** @type {any} */ el, /** @type {any} */ path) {
+          // Remap $map paths: wrapper and template children → real document paths
+          // prepareForEditMode wraps $map template in: children[0] (wrapper) > children[0] (template)
+          // Real paths: wrapper → ['children'] ($map container), template → ['children', 'map']
+          let mappedPath = path;
+          if ((canvasMode === "design" || canvasMode === "edit") && mapParentPaths.size > 0) {
+            for (let i = 0; i < path.length - 1; i++) {
+              if (path[i] === "children" && path[i + 1] === 0) {
+                const parentKey = path.slice(0, i).join("/");
+                if (mapParentPaths.has(parentKey)) {
+                  if (path.length === i + 2) {
+                    // Wrapper div itself → $map container path
+                    mappedPath = path.slice(0, i + 1);
+                  } else if (
+                    path.length >= i + 4 &&
+                    path[i + 2] === "children" &&
+                    path[i + 3] === 0
+                  ) {
+                    // Template or its descendants → children/map/...rest
+                    mappedPath = [...path.slice(0, i), "children", "map", ...path.slice(i + 4)];
+                  }
+                  break;
+                }
+              }
+            }
+          }
+          elToPath.set(el, mappedPath);
+        },
+        _path: [],
+      })
+    );
+    if (canvasMode === "design" || canvasMode === "edit") {
+      // Disable pointer events on all rendered elements for edit mode
+      el.style.pointerEvents = "none";
+      for (const child of el.querySelectorAll("*")) {
+        /** @type {any} */ (child).style.pointerEvents = "none";
+      }
+    }
+    // Clear and append atomically — ensures the canvas is never left empty if a
+    // newer render starts and this one would have bailed after clearing.
+    canvasEl.innerHTML = "";
+    if (S.mode === "content") {
+      canvasEl.setAttribute("data-content-mode", "");
+    } else {
+      canvasEl.removeAttribute("data-content-mode");
+    }
+    canvasEl.appendChild(el);
+    if (canvasMode === "design" || canvasMode === "edit") {
+      // Custom element connectedCallbacks render children asynchronously —
+      // sweep again after they've had a chance to run
+      requestAnimationFrame(() => {
+        const editingEl = getActiveElement();
+        for (const child of canvasEl.querySelectorAll("*")) {
+          // Preserve pointer-events on the actively-edited element
+          if (view.componentInlineEdit && child === view.componentInlineEdit.el) continue;
+          if (editingEl && child === editingEl) continue;
+          /** @type {any} */ (child).style.pointerEvents = "none";
+        }
+      });
+    }
+    return $defs;
+  } catch (/** @type {any} */ err) {
+    console.warn("renderCanvasLive failed:", err.message, err);
+    return null;
+  }
+}