@jxsuite/studio 4.0.0 → 5.0.0

package/src/studio.ts

@@ -53,10 +53,12 @@ import {
 
 import { isEditing } from "./editor/inline-edit";
 import { applyTransform, registerCanvasViewCommands } from "./canvas/canvas-utils";
+import { diffCommands } from "./canvas/diff-toolbar";
 import type { CanvasSurface } from "./canvas/canvas-surface";
 import {
   initCanvasRender,
   registerSelectionSetCommand,
+  redefineElementOnCanvases,
   renderCanvas,
   renderOverlays,
   scheduleCanvasRender,
@@ -89,13 +91,22 @@ import {
 import { runInsertZoneAction } from "./editor/insert-zone-action";
 import { canvasSlashHandler } from "./editor/canvas-slash-bridge";
 import { makeCanvasContextMenuHandler } from "./editor/canvas-context-menu";
-import { mountStatusbar, renderStatusbar } from "./panels/statusbar";
+import { mountStatusbar, renderStatusbar } from "./surfaces/statusbar";
 import { mountJumpBar } from "./panels/jump-bar";
-import { cellForPane } from "./panels/pane-grid";
+import { cellForPane, paneGridReady } from "./panels/pane-grid";
 import { notify } from "./services/notify";
+import { createLiveSurfaceSaver } from "./services/live-surfaces";
 import { beginActivity } from "./panels/activity-panel";
-import { exportFile, parseSourceForPath, saveFile } from "./files/file-ops";
+import {
+  exportFile,
+  parseCollabSource,
+  parseSourceForPath,
+  saveFile,
+  setDocumentSavedListener,
+} from "./files/file-ops";
 import { serializeDocument } from "./files/serialize-document";
+import { parseJsonDocument } from "./files/json-layout";
+import type { JsonLayout } from "./files/json-layout";
 import {
   formatForPath,
   loadFormats,
@@ -105,7 +116,7 @@ import {
 import {
   loadProject as _loadProject,
   openProject as _openProject,
-  renderFilesTemplate as _renderFilesTemplate,
+  renderFilesTemplate,
   findHomePage,
   loadDirectory,
   openFileInPane,
@@ -146,16 +157,14 @@ import { mountResizeEdges } from "./resize-edges";
 import {
   defBadgeLabel,
   defCategory,
+  mountSignalsPanel,
   registerSignalsCommands,
-  renderSignalsTemplate,
 } from "./panels/signals-panel";
 import { loadComponentRegistry } from "./files/components";
 import { ensureDependenciesInstalled } from "./packages/ensure-deps";
 import { maybePromptJxsuiteUpdate } from "./packages/jxsuite-update";
 import { autoSyncProjectOnOpen } from "./packages/pull-package-sync";
 
-import { html, render as litRender } from "lit-html";
-
 import webdata from "../data/webdata.json";
 import { registerDataExplorerCommands } from "./panels/data-explorer";
 import {
@@ -164,12 +173,10 @@ import {
   loadDiffForLens,
   registerSourceControlCommands,
   renderGitPanel,
+  noteFileSaved,
 } from "./panels/git-panel";
 
-// ─── Spectrum Web Components ──────────────────────────────────────────────────
-// Explicit class imports + registration — bare side-effect imports are tree-shaken
-// By Bun's bundler despite sideEffects declarations in Spectrum's package.json.
-import { components as _swc } from "./ui/spectrum";
+import { registerKit } from "./ui/kit";
 import "./ui/panel-resize.js";
 // Built-in schema-form controls (schema-builder, secret) register on import
 import "./ui/form-controls.js";
@@ -181,8 +188,8 @@ import { chordsInScopes } from "./commands/keymap";
 import { FRAME_KEY_SCOPES } from "./canvas/iframe-keys";
 import { createLiveContext } from "./commands/live-context";
 import { hasAiCredentials } from "./services/ai-models";
-import { mount as mountActivityBar } from "./panels/activity-bar";
-import * as toolbarPanel from "./panels/toolbar";
+import { mount as mountActivityBar } from "./surfaces/rail";
+import * as toolbarPanel from "./surfaces/commandbar";
 import * as overlaysPanel from "./panels/overlays";
 import * as frontmatterPanelMod from "./panels/frontmatter-panel";
 import * as rightPanelMod from "./panels/right-panel";
@@ -220,7 +227,7 @@ import {
   settingsSettled,
   watchRemoteSettings,
 } from "./services/settings/kernel";
-import { initWelcome } from "./panels/welcome-screen";
+import { initWelcome } from "./surfaces/welcome";
 import {
   openAddRepoModal,
   openProjectPickerModal,
@@ -230,9 +237,13 @@ import { openNewProjectModal, registerNewProjectCommands } from "./new-project/n
 import { invalidatePageRouteCache, registerInspectorCommands } from "./panels/properties-panel";
 import { liveElementCommands, setContextMenuNavigate } from "./editor/context-menu";
 import { registerSeoCommands, renderSeoModal } from "./panels/seo-modal";
+import { ensurePopoverRevealWatch, setOpenPopover } from "./canvas/popover-state";
+import { setOpenDialog } from "./canvas/dialog-state";
 import { registerA11yCommands } from "./services/a11y-report";
+import { registerPopoverCommands } from "./services/popover-report";
 import { registerStyleCommands } from "./panels/style-panel";
 import { registerGridCommands } from "./grid/grid-open";
+import { registerExtensionCommands } from "./settings/extension-commands";
 import { registerSettingsCommands } from "./settings/settings-document";
 import { registerPreferencesCommands } from "./settings/preferences-dialog";
 import { registerAboutCommands } from "./about/about-modal";
@@ -247,7 +258,7 @@ import { registerI18nCommands } from "./i18n/i18n-commands";
 import { convertToComponent } from "./editor/convert-to-component";
 import type { GitDiffState } from "./types";
 import type { Tab } from "./tabs/tab";
-import type { JxMutableNode, ProjectConfig } from "@jxsuite/schema/types";
+import type { JxDocument, JxMutableNode, ProjectConfig } from "@jxsuite/schema/types";
 import { setBundleBase } from "./services/bundle-base";
 import { mountShellTree } from "./shell/tree";
 
@@ -267,8 +278,6 @@ import { mountShellTree } from "./shell/tree";
  */
 setBundleBase(import.meta.url);
 
-void _swc;
-
 /**
  * What the derivation's commands and follows need from the rest of Studio: an opener, and a reader
  * for the one preset whose subject is not a document at all.
@@ -406,35 +415,21 @@ async function navigateToComponent(componentPath: string) {
 // A drilled-in component is a real tab now, and `panels/tab-strip.ts` owns the prompt for closing
 // One. That prompt is two-way where this was three-way — see `showSaveDiscardDialog`'s ledger entry.
 
-// ─── Webdata: datalists for autocomplete ──────────────────────────────────────
-
-const datalistHost = document.createElement("div");
-datalistHost.style.display = "contents";
-document.body.append(datalistHost);
-litRender(
-  html`
-    <datalist id="tag-names">
-      ${webdata.allTags.map((tag: string) => html`<option value=${tag}></option>`)}
-    </datalist>
-    <datalist id="css-props"></datalist>
-  `,
-  datalistHost,
-);
-
-requestIdleCallback(() => {
-  const dl = document.querySelector("#css-props");
-  if (!dl) {
-    return;
-  }
-  const frag = document.createDocumentFragment();
-  for (const [name] of webdata.cssProps) {
-    const opt = document.createElement("option");
-    opt.value = name!;
-    frag.append(opt);
-  }
-  dl.append(frag);
-});
+// ─── Webdata ──────────────────────────────────────────────────────────────────
 
+/*
+ * The two `<datalist>`s that used to be built here — `#tag-names` from `webdata.allTags`, and
+ * `#css-props` filled with ~600 options in a `requestIdleCallback` — are GONE, and they were dead
+ * rather than convertible. A datalist is reached only through a `list="<id>"` on a control, and
+ * nothing in this package has carried one since the Inspector's inputs became documents: `grep -rn
+ * "tag-names" packages sites` found this file and the test that asserted this file. So the boot was
+ * appending a hidden host to `<body>`, painting six hundred elements into it a frame later, and
+ * reaching back for them with `document.querySelector` — for nothing to read.
+ *
+ * Converting them would have written a surface whose consumer does not exist. What survives is the
+ * half that had one: `initCssData` fills the CSS initial-value map the Style tab reads to decide
+ * whether a property is set or merely defaulted, and it takes `webdata` directly.
+ */
 initCssData(webdata);
 
 // ─── Module-level UI state (must be before render() call) ─────────────────────
@@ -450,11 +445,20 @@ if (!hasPlatform()) {
 
 mountResizeEdges();
 
+// The UI kit: every jx-* element defined from bundled JSON, and its theme adopted, before any
+// Surface can mount. Registration touches no network, so nothing here waits on it.
+void registerKit();
+
 // ─── Render loop ──────────────────────────────────────────────────────────────
 
 /* The application frame, before anything adopts a host out of it. index.html carries an empty body
-   and this is the only definition — see src/shell/tree.ts for what that fixed. */
-mountShellTree();
+   and this is the only definition — see src/shell/tree.ts for what that fixed.
+
+   AWAITED, and it has to be: the frame is a Jx document now, so it renders one microtask after
+   insertion and only once the kit's elements are defined. `initShellRefs()` on the next line reads
+   five of its cells with `querySelector`, and every module that holds one of those would otherwise
+   hold a null — silently, because a null host is only noticed by whatever renders into it later. */
+await mountShellTree();
 
 initShellRefs();
 // One effect projects the dock record onto the shell grid — collapse classes and column widths.
@@ -476,9 +480,12 @@ initLayers();
 initQuickSearch({ openRecentProject: (root: string) => openRecentProject(root) });
 
 /* The pane's four surfaces come from its CELL, not from `document.querySelector`.
-   `panels/pane-grid.ts` mounted through `mountShell()` above, so the primary's cell exists by now;
-   each of these three modules still holds one host, which is exactly right while the grid draws one
-   cell and is what `mountForPane` replaces when it draws two. */
+   AWAITED, for the reason `mountShellTree()` gives one line up: the grid is a Jx document now, and
+   the runtime waits for the kit to be defined before it renders — so `mountShell()` STARTING the
+   grid is not the same event as the grid existing, and the three mounts below read the primary
+   cell's boxes on the line after it. Each of those modules still holds one host, which is exactly
+   right while the grid draws one cell and is what `mountForPane` replaces when it draws two. */
+await paneGridReady();
 const primaryCell = cellForPane(PRIMARY_PANE);
 
 tabStrip.mount(primaryCell?.strip ?? document.createElement("div"));
@@ -517,7 +524,7 @@ setMediaChangedHandler(async (dir) => {
   await loadDirectory(dir);
   renderLeftPanel();
 });
-// The in-iframe "/" trigger drives the parent-realm Spectrum slash menu across the bridge.
+// The in-iframe "/" trigger drives the parent-realm slash menu across the bridge.
 setCanvasSlashHandler(canvasSlashHandler);
 // Canvas right-clicks show the parent-realm Jx element context menu across the bridge.
 setCanvasContextMenuHandler(makeCanvasContextMenuHandler());
@@ -852,7 +859,7 @@ leftPanelMod.mount({
   renderGitPanel,
   renderHeadTemplate,
   renderImportsTemplate,
-  renderSignalsTemplate,
+  mountSignalsPanel,
   setCanvasMode,
   setGitDiffState: (state: GitDiffState | null) => {
     shell.git.diffState = state;
@@ -893,13 +900,8 @@ function safeRenderRightPanel() {
 // Collab sessions serialize/parse through the format host when mirroring between the structure
 // Tree and the shared source text, and surface freezes via the status bar.
 configureCollabSerializer(serializeDocument);
-configureCollabParser(async (tab, text) => {
-  if (tab.documentPath && formatForPath(tab.documentPath)) {
-    const parsed = await parseSourceForPath(tab.documentPath, text);
-    return { document: parsed.document as JxMutableNode, frontmatter: parsed.frontmatter };
-  }
-  return { document: JSON.parse(text) as JxMutableNode };
-});
+// `parseCollabSource` also records a JSON text's layout on the tab — see its docstring.
+configureCollabParser(parseCollabSource);
 // The source-canonical freeze is a STATE the author is being held in, not an error: a toast that
 // Says so, keyed so a run of freezes is one message rather than a stack of identical ones.
 configureCollabNotifier((message) => {
@@ -1079,6 +1081,7 @@ if (_projectParam) {
           let frontmatter;
           let parsedDoc;
           let parsedMode;
+          let layout: JsonLayout | null = null;
           await loadFormats();
           const fileFormat = formatForPath(fileRelPath);
           if (fileFormat || !fileRelPath.endsWith(".json")) {
@@ -1089,7 +1092,8 @@ if (_projectParam) {
             ({ frontmatter } = result);
             parsedMode = result.mode;
           } else {
-            parsedDoc = JSON.parse(content) as JxMutableNode;
+            // With the file's layout, so a save writes it back as it was laid out (issue 308).
+            ({ document: parsedDoc, layout } = parseJsonDocument(content));
           }
 
           // Open in a tab
@@ -1098,6 +1102,7 @@ if (_projectParam) {
             documentPath: fileRelPath,
             document: parsedDoc as JxMutableNode,
             ...(frontmatter != null && { frontmatter }),
+            layout,
             sourceFormat: fileFormat?.name ?? null,
           });
 
@@ -1379,13 +1384,6 @@ async function openRecentProject(root: string) {
     activity.fail(`Could not open the project at ${root}.`, { path: root });
   }
 }
-function renderFilesTemplate() {
-  return _renderFilesTemplate({
-    openFileFromTree,
-    openProject,
-    renderLeftPanel,
-  });
-}
 function openFileFromTree(path: string) {
   return openFileInTab(path);
 }
@@ -1484,14 +1482,38 @@ registerCanvasViewCommands(commandRegistry, {
   getCanvasMode,
   renderPane: renderCanvas,
   setCanvasMode,
+  setOpenPopover,
+  setOpenDialog,
   setResolvingOpen: paneContext.setResolvingOpen,
 });
+/* A save moves the working tree under any comparison of that file, and nothing about a
+   comparison notices on its own — see `noteFileSaved`. Injected rather than imported: `file-ops`
+   must not pull the Source Control panel into its graph. */
+/* The second listener is the live chrome lane: a saved surface document or kit component re-mounts
+   the roots it draws in THIS shell (studio-ui-guidelines.md §9.3). Inert for every project but the
+   two the chrome comes from, by the saved path alone. */
+const liveChrome = createLiveSurfaceSaver({
+  notify,
+  redefineOnCanvases: redefineElementOnCanvases,
+  workspace,
+});
+setDocumentSavedListener((path, doc) => {
+  void noteFileSaved(path);
+  void liveChrome(path, doc as unknown as JxDocument);
+});
+/* Walking a comparison. No deps: the stepper reads the pane-keyed diff store directly and the
+   toolbar redraws itself, so there is nothing for the bootstrap to inject. */
+commandRegistry.registerAll(diffCommands());
+/* The one rule that opens a popover when the selection lands in one, from whichever surface made
+   the selection. Started here because it is app-lifetime state, like the canvas's own watches. */
+ensurePopoverRevealWatch();
 registerSelectionSetCommand(commandRegistry);
 registerInspectorCommands(commandRegistry);
 /* Search appearance, behind one record with two buttons: the Document Header card's and the Page
    panel's. A surface that IS the capability is one the palette cannot reach. */
 registerSeoCommands(commandRegistry);
 registerA11yCommands(commandRegistry);
+registerPopoverCommands(commandRegistry);
 /* The element menu's eight verbs, in the APP registry rather than only in the popover's own. They
    have always declared `menus: ["context/element", "palette"]`; the palette has never listed one,
    because the only registry holding them was the one `editor/context-menu.ts` builds for itself.
@@ -1507,6 +1529,7 @@ registerSignalsCommands(commandRegistry);
 registerFormulaEditorCommands(commandRegistry);
 registerGridCommands(commandRegistry);
 registerSettingsCommands(commandRegistry);
+registerExtensionCommands(commandRegistry);
 registerPreferencesCommands(commandRegistry);
 registerLibraryCommands(commandRegistry);
 registerFileFormatCommands(commandRegistry);

package/src/style/token-ref.ts

@@ -13,11 +13,7 @@
  * hop would report `var(--color-brand)` as a colour.
  */
 
-import { html } from "lit-html";
-import { tokenLabel } from "./project-styles";
-
 import type { JxStyle } from "@jxsuite/schema/types";
-import type { TemplateResult } from "lit-html";
 
 /** A value that is EXACTLY one `var()` reference — not `calc(var(--a) * 2)`, which is a value. */
 const TOKEN_REF_RE = /^var\(\s*(--[\w-]+)\s*\)$/;
@@ -86,38 +82,3 @@ export function resolveTokenValue(
   }
   return undefined;
 }
-
-/**
- * Render a bound value as a chip: the referenced token's name, and — for a colour — the swatch it
- * resolves to. The `title` carries the full reference and its resolution, because the chip is
- * deliberately short and a reader who needs the literal must still be able to get it.
- *
- * The chip is not a control. Following it somewhere would be a second navigation contract on a
- * surface that already lists every token a scroll away, and a chip that looks clickable and is not
- * is the defect §6.2 removed from the collapsed-section dot.
- *
- * @param {string} name — the referenced token
- * @param {string | number | undefined} resolved — {@link resolveTokenValue} of the reference
- * @param {{ swatch?: boolean }} [opts] — `swatch` renders the resolved value as a colour chip
- * @returns {TemplateResult}
- */
-export function renderTokenChip(
-  name: string,
-  resolved: string | number | undefined,
-  opts: { swatch?: boolean } = {},
-): TemplateResult {
-  const shown = resolved === undefined ? "unresolved" : String(resolved);
-  return html`
-    <span class="style-token-chip" title="${toTokenRef(name)} → ${shown}">
-      ${
-        opts.swatch && resolved !== undefined
-          ? html`<span
-              class="style-token-chip-swatch"
-              style="background:${String(resolved)}"
-            ></span>`
-          : ""
-      }
-      <span class="style-token-chip-label">${tokenLabel(name)}</span>
-    </span>
-  `;
-}

package/src/surfaces/about.json

@@ -0,0 +1,263 @@
+{
+  "$schema": "https://jxsuite.com/schema/v1",
+  "$id": "StudioAbout",
+  "$description": "The About dialog: the app's version and build metadata, its external links, and the resolved `@jxsuite/*` package versions. A `jx-dialog`, so the platform owns modality, Escape, focus restoration and the backdrop — which is what retired the `sp-underlay` this surface used to render itself, and with it the fixed-position box and scrolling body it drew by hand.",
+  "tagName": "jx-dialog",
+  "$props": {
+    "headline": {
+      "$ref": "#/state/headline"
+    },
+    "confirmLabel": "",
+    "cancelLabel": "Close",
+    "size": "sm"
+  },
+  "attributes": {
+    "part": "about"
+  },
+  "oncancel": {
+    "$prototype": "Function",
+    "body": [
+      {
+        "operator": "call",
+        "target": {
+          "$ref": "#/state/close"
+        },
+        "value": []
+      }
+    ]
+  },
+  "onclose": {
+    "$prototype": "Function",
+    "body": [
+      {
+        "operator": "call",
+        "target": {
+          "$ref": "#/state/closed"
+        },
+        "value": []
+      }
+    ]
+  },
+  "style": {
+    "$description": "The About dialog's own look. `.about-modal` and `.about-modal-body` are gone rather than moved: they positioned a fixed box, drew its panel and scrolled its body, and `jx-dialog` is all three — so converting this surface deleted two rules instead of transcribing them.",
+    "& [part=\"meta\"]": {
+      "margin": "0 0 16px",
+      "display": "flex",
+      "flexDirection": "column",
+      "gap": "6px"
+    },
+    "& [part=\"meta-row\"]": {
+      "display": "flex",
+      "gap": "12px",
+      "fontSize": "13px"
+    },
+    "& [part=\"meta-label\"]": {
+      "$description": "A fixed label column, so the values line up down the list rather than with each row's own text.",
+      "width": "96px",
+      "minWidth": "96px",
+      "margin": "0",
+      "color": "var(--fg-dim)"
+    },
+    "& [part=\"meta-value\"]": {
+      "margin": "0",
+      "color": "var(--fg)",
+      "wordBreak": "break-word"
+    },
+    "& [part=\"links\"]": {
+      "display": "flex",
+      "gap": "16px",
+      "padding": "12px 0",
+      "marginBottom": "12px",
+      "borderTop": "1px solid var(--border)",
+      "borderBottom": "1px solid var(--border)"
+    },
+    "& [part=\"links\"] a": {
+      "$description": "The accent, from the studio token layer. It read `--spectrum-accent-color-1000` with a hex fallback, which resolved only inside `<sp-theme>`; a document is mounted in the dialog layer, where that name is not in scope and every link would have fallen to the hex.",
+      "color": "var(--accent)",
+      "textDecoration": "none",
+      ":hover": {
+        "textDecoration": "underline"
+      }
+    },
+    "& [part=\"section-title\"]": {
+      "margin": "0 0 8px",
+      "fontSize": "13px",
+      "fontWeight": "600",
+      "color": "var(--fg)"
+    },
+    "& [part=\"muted\"]": {
+      "margin": "0",
+      "fontSize": "13px",
+      "color": "var(--fg-dim)"
+    },
+    "& [part=\"packages\"]": {
+      "listStyle": "none",
+      "margin": "0",
+      "padding": "0",
+      "display": "flex",
+      "flexDirection": "column",
+      "gap": "4px"
+    },
+    "& [part=\"package-row\"]": {
+      "display": "flex",
+      "justifyContent": "space-between",
+      "gap": "12px",
+      "fontSize": "var(--jx-text-md)"
+    },
+    "& [part=\"package-name\"]": {
+      "color": "var(--fg-dim)"
+    },
+    "& [part=\"package-version\"]": {
+      "$description": "Tabular figures, so a column of versions does not jitter as it loads.",
+      "color": "var(--fg)",
+      "fontVariantNumeric": "tabular-nums"
+    }
+  },
+  "children": [
+    {
+      "tagName": "dl",
+      "attributes": {
+        "part": "meta"
+      },
+      "children": [
+        {
+          "$prototype": "Array",
+          "items": {
+            "$ref": "#/state/rows"
+          },
+          "key": {
+            "$ref": "$map/item/label"
+          },
+          "map": {
+            "tagName": "div",
+            "attributes": {
+              "part": "meta-row"
+            },
+            "children": [
+              {
+                "tagName": "dt",
+                "attributes": {
+                  "part": "meta-label"
+                },
+                "textContent": "${$map.item.label}"
+              },
+              {
+                "tagName": "dd",
+                "attributes": {
+                  "part": "meta-value"
+                },
+                "textContent": "${$map.item.value}"
+              }
+            ]
+          }
+        }
+      ]
+    },
+    {
+      "tagName": "div",
+      "attributes": {
+        "part": "links"
+      },
+      "children": [
+        {
+          "$prototype": "Array",
+          "items": {
+            "$ref": "#/state/links"
+          },
+          "key": {
+            "$ref": "$map/item/href"
+          },
+          "map": {
+            "tagName": "a",
+            "attributes": {
+              "href": "${$map.item.href}",
+              "target": "_blank",
+              "rel": "noreferrer noopener"
+            },
+            "textContent": "${$map.item.label}"
+          }
+        }
+      ]
+    },
+    {
+      "tagName": "section",
+      "attributes": {
+        "part": "section"
+      },
+      "children": [
+        {
+          "tagName": "h3",
+          "attributes": {
+            "part": "section-title"
+          },
+          "textContent": "Packages"
+        },
+        {
+          "tagName": "div",
+          "attributes": {
+            "part": "packages-slot",
+            "role": "none"
+          },
+          "$switch": {
+            "$ref": "#/state/packagesState"
+          },
+          "cases": {
+            "loading": {
+              "tagName": "p",
+              "attributes": {
+                "part": "muted"
+              },
+              "textContent": "Loading packages…"
+            },
+            "empty": {
+              "tagName": "p",
+              "attributes": {
+                "part": "muted"
+              },
+              "textContent": "No packages reported."
+            },
+            "listed": {
+              "tagName": "ul",
+              "attributes": {
+                "part": "packages"
+              },
+              "children": [
+                {
+                  "$prototype": "Array",
+                  "items": {
+                    "$ref": "#/state/packages"
+                  },
+                  "key": {
+                    "$ref": "$map/item/name"
+                  },
+                  "map": {
+                    "tagName": "li",
+                    "attributes": {
+                      "part": "package-row"
+                    },
+                    "children": [
+                      {
+                        "tagName": "span",
+                        "attributes": {
+                          "part": "package-name"
+                        },
+                        "textContent": "${$map.item.name}"
+                      },
+                      {
+                        "tagName": "span",
+                        "attributes": {
+                          "part": "package-version"
+                        },
+                        "textContent": "${$map.item.version}"
+                      }
+                    ]
+                  }
+                }
+              ]
+            }
+          }
+        }
+      ]
+    }
+  ]
+}