@valbuild/shared 0.146.2 → 0.146.4

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @valbuild/shared
 
+## 0.146.4
+
+### Patch Changes
+
+- [#870](https://github.com/valbuild/val/pull/870) [`81f2e80`](https://github.com/valbuild/val/commit/81f2e803c4cefdf58bbe6856c06e98ace95a8e0b) Thanks [@freekh](https://github.com/freekh)! - The canvas works on a page behind your site's own login.
+
+  A site with its own sign-in (a dashboard, an intranet, a members' area) can be edited in the canvas. The canvas is a frame on the same origin as the Studio, so it sends your site's cookies like any other tab: if you are signed in to the site, the canvas shows the page signed in as you.
+
+  If you were not signed in, the site redirected the canvas to its login page, and the canvas then broke. That page mounted Val's whole overlay inside the canvas, a Studio inside the Studio. The canvas stayed on "Preview is not ready yet" through the sign-in and after it, until you pressed Reload. Now a page shown in the Studio's canvas counts as the canvas wherever it navigated to, so you can sign in inside the canvas and keep editing.
+
 ## 0.146.2
 
 ### Patch Changes

package/client/dist/valbuild-shared-client.cjs.dev.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var getSitemapTree = require('../../dist/getSitemapTree-c732e09a.cjs.dev.js');
+var getSitemapTree = require('../../dist/getSitemapTree-95b00d3f.cjs.dev.js');
 require('@valbuild/core');
 
 

package/client/dist/valbuild-shared-client.cjs.prod.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var getSitemapTree = require('../../dist/getSitemapTree-0ed3deac.cjs.prod.js');
+var getSitemapTree = require('../../dist/getSitemapTree-b8dce0e2.cjs.prod.js');
 require('@valbuild/core');
 
 

package/client/dist/valbuild-shared-client.esm.js

@@ -1,2 +1,2 @@
-export { D as DEFAULT_CANVAS_SELECTION, e as DEFAULT_CANVAS_SELECTION_SOFT, b as VAL_AI_SESSION_STORAGE_KEY, d as VAL_CANVAS_MESSAGE, c as VAL_CANVAS_PARAM, V as VAL_CONFIG_SESSION_STORAGE_KEY, a as VAL_THEME_SESSION_STORAGE_KEY, h as getNextAppRouterSourceFolder, m as getPageRouterSitemapTree, k as getPageRouterSourceFolder, n as getPatternFromModuleFilePath, j as getTanStackRouterSourceFolder, l as isTanStackRoutesFolder, g as isValCanvasFrame, i as isValCanvasPageMessage, f as isValCanvasStudioMessage, p as parseRoutePattern, w as withValCanvasParam } from '../../dist/getSitemapTree-6fcdf745.esm.js';
+export { D as DEFAULT_CANVAS_SELECTION, e as DEFAULT_CANVAS_SELECTION_SOFT, b as VAL_AI_SESSION_STORAGE_KEY, d as VAL_CANVAS_MESSAGE, c as VAL_CANVAS_PARAM, V as VAL_CONFIG_SESSION_STORAGE_KEY, a as VAL_THEME_SESSION_STORAGE_KEY, h as getNextAppRouterSourceFolder, m as getPageRouterSitemapTree, k as getPageRouterSourceFolder, n as getPatternFromModuleFilePath, j as getTanStackRouterSourceFolder, l as isTanStackRoutesFolder, g as isValCanvasFrame, i as isValCanvasPageMessage, f as isValCanvasStudioMessage, p as parseRoutePattern, w as withValCanvasParam } from '../../dist/getSitemapTree-e65acefe.esm.js';
 import '@valbuild/core';

package/dist/declarations/src/internal/valCanvasProtocol.d.ts

@@ -261,12 +261,21 @@ export declare function isValCanvasPageMessage(data: unknown): data is ValCanvas
 /** Narrow an unknown `event.data` to a message from the studio. */
 export declare function isValCanvasStudioMessage(data: unknown): data is ValCanvasStudioMessage;
 /**
- * Whether this document was loaded as the studio's canvas frame.
+ * Whether this document is showing in the studio's canvas frame.
  *
- * Reads the location directly rather than taking it as an argument, because
- * every caller wants the answer for the document it is running in, and passing
- * it around is how one of them ends up asking about the wrong one.
+ * The parameter marks the document the studio LOADED, and that is not always
+ * the document the frame ends up holding. A frame navigates on its own: a site
+ * with a login of its own redirects a signed-out canvas to its sign-in page,
+ * and the sign-in sends it back to wherever the site chooses. Each of those is
+ * a new document without the parameter, and it used to render Val's whole
+ * overlay inside the canvas — a studio in the studio, which never told the
+ * canvas it was there, so the canvas never went live again until reloaded.
+ *
+ * So where the frame SITS answers too: a document whose parent is the studio
+ * is in the canvas, whatever its own address says. `parentPathname` is that
+ * parent's path: `null` for a top-level document, and for a parent on another
+ * origin, whose `location` cannot be read and which is not the studio anyway.
  */
-export declare function isValCanvasFrame(search: string): boolean;
+export declare function isValCanvasFrame(search: string, parentPathname?: string | null): boolean;
 /** Add the canvas marker to a page URL. */
 export declare function withValCanvasParam(url: string): string;

package/dist/{getSitemapTree-0ed3deac.cjs.prod.js → getSitemapTree-95b00d3f.cjs.dev.js}

@@ -121,13 +121,26 @@ function isValCanvasStudioMessage(data) {
 }
 
 /**
- * Whether this document was loaded as the studio's canvas frame.
+ * Whether this document is showing in the studio's canvas frame.
  *
- * Reads the location directly rather than taking it as an argument, because
- * every caller wants the answer for the document it is running in, and passing
- * it around is how one of them ends up asking about the wrong one.
+ * The parameter marks the document the studio LOADED, and that is not always
+ * the document the frame ends up holding. A frame navigates on its own: a site
+ * with a login of its own redirects a signed-out canvas to its sign-in page,
+ * and the sign-in sends it back to wherever the site chooses. Each of those is
+ * a new document without the parameter, and it used to render Val's whole
+ * overlay inside the canvas — a studio in the studio, which never told the
+ * canvas it was there, so the canvas never went live again until reloaded.
+ *
+ * So where the frame SITS answers too: a document whose parent is the studio
+ * is in the canvas, whatever its own address says. `parentPathname` is that
+ * parent's path: `null` for a top-level document, and for a parent on another
+ * origin, whose `location` cannot be read and which is not the studio anyway.
  */
 function isValCanvasFrame(search) {
+  var parentPathname = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+  if (parentPathname !== null && isValStudioPathname(parentPathname)) {
+    return true;
+  }
   try {
     return new URLSearchParams(search).get(VAL_CANVAS_PARAM) !== null;
   } catch (_unused) {
@@ -135,6 +148,11 @@ function isValCanvasFrame(search) {
   }
 }
 
+/** Whether a path is the studio's own route, where the canvas lives. */
+function isValStudioPathname(pathname) {
+  return pathname === "/val" || pathname.startsWith("/val/");
+}
+
 /** Add the canvas marker to a page URL. */
 function withValCanvasParam(url) {
   var separator = url.includes("?") ? "&" : "?";

package/dist/{getSitemapTree-c732e09a.cjs.dev.js → getSitemapTree-b8dce0e2.cjs.prod.js}

@@ -121,13 +121,26 @@ function isValCanvasStudioMessage(data) {
 }
 
 /**
- * Whether this document was loaded as the studio's canvas frame.
+ * Whether this document is showing in the studio's canvas frame.
  *
- * Reads the location directly rather than taking it as an argument, because
- * every caller wants the answer for the document it is running in, and passing
- * it around is how one of them ends up asking about the wrong one.
+ * The parameter marks the document the studio LOADED, and that is not always
+ * the document the frame ends up holding. A frame navigates on its own: a site
+ * with a login of its own redirects a signed-out canvas to its sign-in page,
+ * and the sign-in sends it back to wherever the site chooses. Each of those is
+ * a new document without the parameter, and it used to render Val's whole
+ * overlay inside the canvas — a studio in the studio, which never told the
+ * canvas it was there, so the canvas never went live again until reloaded.
+ *
+ * So where the frame SITS answers too: a document whose parent is the studio
+ * is in the canvas, whatever its own address says. `parentPathname` is that
+ * parent's path: `null` for a top-level document, and for a parent on another
+ * origin, whose `location` cannot be read and which is not the studio anyway.
  */
 function isValCanvasFrame(search) {
+  var parentPathname = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+  if (parentPathname !== null && isValStudioPathname(parentPathname)) {
+    return true;
+  }
   try {
     return new URLSearchParams(search).get(VAL_CANVAS_PARAM) !== null;
   } catch (_unused) {
@@ -135,6 +148,11 @@ function isValCanvasFrame(search) {
   }
 }
 
+/** Whether a path is the studio's own route, where the canvas lives. */
+function isValStudioPathname(pathname) {
+  return pathname === "/val" || pathname.startsWith("/val/");
+}
+
 /** Add the canvas marker to a page URL. */
 function withValCanvasParam(url) {
   var separator = url.includes("?") ? "&" : "?";

package/dist/{getSitemapTree-6fcdf745.esm.js → getSitemapTree-e65acefe.esm.js}

@@ -119,13 +119,26 @@ function isValCanvasStudioMessage(data) {
 }
 
 /**
- * Whether this document was loaded as the studio's canvas frame.
+ * Whether this document is showing in the studio's canvas frame.
  *
- * Reads the location directly rather than taking it as an argument, because
- * every caller wants the answer for the document it is running in, and passing
- * it around is how one of them ends up asking about the wrong one.
+ * The parameter marks the document the studio LOADED, and that is not always
+ * the document the frame ends up holding. A frame navigates on its own: a site
+ * with a login of its own redirects a signed-out canvas to its sign-in page,
+ * and the sign-in sends it back to wherever the site chooses. Each of those is
+ * a new document without the parameter, and it used to render Val's whole
+ * overlay inside the canvas — a studio in the studio, which never told the
+ * canvas it was there, so the canvas never went live again until reloaded.
+ *
+ * So where the frame SITS answers too: a document whose parent is the studio
+ * is in the canvas, whatever its own address says. `parentPathname` is that
+ * parent's path: `null` for a top-level document, and for a parent on another
+ * origin, whose `location` cannot be read and which is not the studio anyway.
  */
 function isValCanvasFrame(search) {
+  var parentPathname = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : null;
+  if (parentPathname !== null && isValStudioPathname(parentPathname)) {
+    return true;
+  }
   try {
     return new URLSearchParams(search).get(VAL_CANVAS_PARAM) !== null;
   } catch (_unused) {
@@ -133,6 +146,11 @@ function isValCanvasFrame(search) {
   }
 }
 
+/** Whether a path is the studio's own route, where the canvas lives. */
+function isValStudioPathname(pathname) {
+  return pathname === "/val" || pathname.startsWith("/val/");
+}
+
 /** Add the canvas marker to a page URL. */
 function withValCanvasParam(url) {
   var separator = url.includes("?") ? "&" : "?";

package/internal/dist/valbuild-shared-internal.cjs.dev.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var getSitemapTree = require('../../dist/getSitemapTree-c732e09a.cjs.dev.js');
+var getSitemapTree = require('../../dist/getSitemapTree-95b00d3f.cjs.dev.js');
 var core = require('@valbuild/core');
 var zod = require('zod');
 var zodValidationError = require('zod-validation-error');

package/internal/dist/valbuild-shared-internal.cjs.prod.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
-var getSitemapTree = require('../../dist/getSitemapTree-0ed3deac.cjs.prod.js');
+var getSitemapTree = require('../../dist/getSitemapTree-b8dce0e2.cjs.prod.js');
 var core = require('@valbuild/core');
 var zod = require('zod');
 var zodValidationError = require('zod-validation-error');

package/internal/dist/valbuild-shared-internal.esm.js

@@ -1,5 +1,5 @@
-import { _ as _createForOfIteratorHelper, o as _objectSpread2, q as _arrayLikeToArray, r as _unsupportedIterableToArray, s as _typeof, t as _defineProperty, u as _toPropertyKey } from '../../dist/getSitemapTree-6fcdf745.esm.js';
-export { D as DEFAULT_CANVAS_SELECTION, e as DEFAULT_CANVAS_SELECTION_SOFT, b as VAL_AI_SESSION_STORAGE_KEY, d as VAL_CANVAS_MESSAGE, c as VAL_CANVAS_PARAM, V as VAL_CONFIG_SESSION_STORAGE_KEY, a as VAL_THEME_SESSION_STORAGE_KEY, h as getNextAppRouterSourceFolder, m as getPageRouterSitemapTree, k as getPageRouterSourceFolder, n as getPatternFromModuleFilePath, j as getTanStackRouterSourceFolder, l as isTanStackRoutesFolder, g as isValCanvasFrame, i as isValCanvasPageMessage, f as isValCanvasStudioMessage, p as parseRoutePattern, w as withValCanvasParam } from '../../dist/getSitemapTree-6fcdf745.esm.js';
+import { _ as _createForOfIteratorHelper, o as _objectSpread2, q as _arrayLikeToArray, r as _unsupportedIterableToArray, s as _typeof, t as _defineProperty, u as _toPropertyKey } from '../../dist/getSitemapTree-e65acefe.esm.js';
+export { D as DEFAULT_CANVAS_SELECTION, e as DEFAULT_CANVAS_SELECTION_SOFT, b as VAL_AI_SESSION_STORAGE_KEY, d as VAL_CANVAS_MESSAGE, c as VAL_CANVAS_PARAM, V as VAL_CONFIG_SESSION_STORAGE_KEY, a as VAL_THEME_SESSION_STORAGE_KEY, h as getNextAppRouterSourceFolder, m as getPageRouterSitemapTree, k as getPageRouterSourceFolder, n as getPatternFromModuleFilePath, j as getTanStackRouterSourceFolder, l as isTanStackRoutesFolder, g as isValCanvasFrame, i as isValCanvasPageMessage, f as isValCanvasStudioMessage, p as parseRoutePattern, w as withValCanvasParam } from '../../dist/getSitemapTree-e65acefe.esm.js';
 import { Internal, CODE_LANGUAGES, resolveSettingsModule, missingDeclaredKeys, localeOfValue, discriminatedUnionBranchOf, DEFAULT_COLOR_FORMAT, declaredKeySetOf } from '@valbuild/core';
 import { z } from 'zod';
 import { fromError } from 'zod-validation-error';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valbuild/shared",
-  "version": "0.146.2",
+  "version": "0.146.4",
   "private": false,
   "description": "Val shared types and utilities",
   "repository": {