@valbuild/shared 0.152.1 → 0.153.1

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

@@ -10,7 +10,7 @@ var wrapNativeSuper = require('../../dist/wrapNativeSuper-933f991e.cjs.dev.js');
 var zodValidationError = require('zod-validation-error');
 var fp = require('@valbuild/core/fp');
 var patch = require('@valbuild/core/patch');
-var getSitemapTree = require('../../dist/getSitemapTree-dc61b8b6.cjs.dev.js');
+var getSitemapTree = require('../../dist/getSitemapTree-09399379.cjs.dev.js');
 var FlexSearch = require('flexsearch');
 var utils = require('../../dist/utils-d3d8b4b5.cjs.dev.js');
 
@@ -1351,6 +1351,24 @@ function chainOf(ids) {
 function schemaVersionOf(serializedSchema) {
   return sha256Hex("".concat(ENGINE, "\n").concat(JSON.stringify(serializedSchema)));
 }
+var readerSchemaVersions = new WeakMap();
+
+/**
+ * The version of the schema a reader's own code has for a module: what the
+ * readers hold relayed or drafted content's version against (`layered`'s
+ * schema rule), so content is never read with a schema it was not made for.
+ * The server readers (`fetchVal`) and the page's hooks (`useVal`) alike.
+ * Hashed once per module object, which a build makes once: a load cost, not
+ * a read cost.
+ */
+function readerSchemaVersion(module) {
+  var cached = readerSchemaVersions.get(module);
+  if (cached !== undefined) return cached;
+  var schema = core.Internal.getSchema(module);
+  var version = schema === undefined ? null : schemaVersionOf(schema["executeSerialize"]());
+  readerSchemaVersions.set(module, version);
+  return version;
+}
 
 /**
  * A module's base version, from its base source: what the module evaluates
@@ -1879,6 +1897,70 @@ var SketchErrorZ = zod.z.object({
 });
 /** The most text a sketchpad holds, in UTF-8 bytes: a page, not a site. */
 var SKETCHPAD_MAX_TEXT_LENGTH = 256 * 1024;
+
+/**
+ * A manifest as the server answers it: what each module IS on the server
+ * (`GET /manifest`, and the same answer on `/stat` when the Studio asks for it
+ * there -- one function on the server answers both, `manifestAnswer`).
+ */
+var ManifestJson = zod.z.object({
+  project: ProjectVersionSchema,
+  modules: zod.z.record(ModuleFilePath, ModuleVersionSchema),
+  /** This answer's ETag, as the header has it. */
+  tag: zod.z.string().optional(),
+  /**
+   * Present on a delta only: the `seq` of the manifest it is
+   * relative to, whose modules that are not named here did not
+   * move. Absent: every module is named.
+   */
+  since: zod.z.number().optional(),
+  /**
+   * The build that answered is a previous build still answering
+   * (http mode: the content service counted a newer one live).
+   * Its versions are right for its own bases, which the site does
+   * not serve any more: a Studio does not move to them, and asks
+   * again. Optional: absent from a live build and a server of the
+   * release before.
+   */
+  superseded: zod.z["boolean"]().optional(),
+  /**
+   * The answering build's `val.modules` registry, as an entry a
+   * Studio can import (`valModulesEntryPath`), and the Val it
+   * runs: where a Studio opened on another build takes this
+   * build's code in without reloading the page. Only a build the
+   * platform made and names (`publishBuild`) has one. Optional
+   * both ways: absent from any other server (local development,
+   * where HMR brings the code; a self-hosted deploy) and from a
+   * server of the release before, and ignored by a Studio of the
+   * release before.
+   */
+  registry: zod.z.object({
+    entry: zod.z.string(),
+    core: zod.z.string()
+  }).optional()
+});
+/**
+ * The manifest a `/stat` answer carries, when the request said which one the
+ * Studio holds (`manifest` on the request): what `GET /manifest` would have
+ * answered for it, so another editor's keystroke costs no manifest request.
+ *
+ * - A manifest, whole or a delta. A delta names the ETag it is relative to
+ *   (`sinceTag`): a Studio uses it only while it holds exactly that one.
+ * - `unchanged`: the manifest the request named, at `seq`, is still the
+ *   one for this answer's `seq`. Decided by `seq` alone, and not read: a
+ *   Studio reads a manifest only for a stat whose `seq` moved. It keeps the
+ *   next request naming the same manifest.
+ *
+ * Optional: absent from a server of the release before, and from an answer
+ * to a request that did not ask, and then the Studio reads `GET /manifest`.
+ */
+var StatManifest = zod.z.union([ManifestJson.extend({
+  sinceTag: zod.z.string().optional()
+}), zod.z.object({
+  unchanged: zod.z.literal(true),
+  tag: zod.z.string(),
+  seq: zod.z.number()
+})]);
 var Api = {
   "/draft/enable": {
     GET: {
@@ -2265,42 +2347,7 @@ var Api = {
         json: GenericError
       }), zod.z.object({
         status: zod.z.literal(200),
-        json: zod.z.object({
-          project: ProjectVersionSchema,
-          modules: zod.z.record(ModuleFilePath, ModuleVersionSchema),
-          /** This answer's ETag, as the header has it. */
-          tag: zod.z.string().optional(),
-          /**
-           * Present on a delta only: the `seq` of the manifest it is
-           * relative to, whose modules that are not named here did not
-           * move. Absent: every module is named.
-           */
-          since: zod.z.number().optional(),
-          /**
-           * The build that answered is a previous build still answering
-           * (http mode: the content service counted a newer one live).
-           * Its versions are right for its own bases, which the site does
-           * not serve any more: a Studio does not move to them, and asks
-           * again. Optional: absent from a live build and a server of the
-           * release before.
-           */
-          superseded: zod.z["boolean"]().optional(),
-          /**
-           * The answering build's `val.modules` registry, as an entry a
-           * Studio can import (`valModulesEntryPath`), and the Val it
-           * runs: where a Studio opened on another build takes this
-           * build's code in without reloading the page. Only a build the
-           * platform made and names (`publishBuild`) has one. Optional
-           * both ways: absent from any other server (local development,
-           * where HMR brings the code; a self-hosted deploy) and from a
-           * server of the release before, and ignored by a Studio of the
-           * release before.
-           */
-          registry: zod.z.object({
-            entry: zod.z.string(),
-            core: zod.z.string()
-          }).optional()
-        })
+        json: ManifestJson
       }),
       /*
        * Nothing moved since the ETag the client sent. No body on the wire;
@@ -2317,23 +2364,24 @@ var Api = {
       req: {
         body: zod.z.object({
           /**
-           * @deprecated Echoed by the Studio, and compared by the fs and
-           * memory long poll to see that another build answers. This
-           * release's Studio reads each module's version from
-           * `GET /manifest`; goes once the long poll compares the echoed
-           * version instead (see "Release-delayed deletions" in
+           * @deprecated Echoed by a Studio of the release that shipped the
+           * one content model, whose fs and memory long poll compared it to
+           * see another build; a Studio of the release after echoes
+           * {@link version} instead, and this only when it was sent. The
+           * request field goes once no Studio sends it (see
+           * "Release-delayed deletions" in
            * `docs/plans/one-content-model.md`).
            */
-          sourcesSha: zod.z.string(),
+          sourcesSha: zod.z.string().optional(),
+          /** @deprecated As `sourcesSha`. */
+          schemaSha: zod.z.string().optional(),
           /**
-           * @deprecated Echoed by the Studio, and compared by the fs and
-           * memory long poll to see that another build answers. This
-           * release's Studio reads each module's version from
-           * `GET /manifest`; goes once the long poll compares the echoed
-           * version instead (see "Release-delayed deletions" in
-           * `docs/plans/one-content-model.md`).
+           * The `version` the last answer carried: what the fs and memory
+           * long poll compare to see another build (the build the chain is
+           * relative to, `ValOps.chainBuild`). Optional: a Studio of the
+           * release before echoes the shas.
            */
-          schemaSha: zod.z.string(),
+          version: ProjectVersionSchema.optional(),
           baseSha: zod.z.string(),
           patches: zod.z.array(zod.z.string()).optional(),
           /**
@@ -2342,7 +2390,17 @@ var Api = {
            * jsonValues module's source is markers and the content sits behind a
            * thunk that `JSON.stringify` drops.
            */
-          jsonEntriesSha: zod.z.string().optional()
+          jsonEntriesSha: zod.z.string().optional(),
+          /**
+           * The manifest the Studio holds, by its ETag and `seq`, so the
+           * answer can carry what moved since (`manifest` on the answer):
+           * `null` when it holds none and can take one. Absent from a
+           * Studio of the release before, which reads `GET /manifest`.
+           */
+          manifest: zod.z.object({
+            tag: zod.z.string(),
+            seq: zod.z.number()
+          }).nullable().optional()
         }).nullable(),
         cookies: {
           val_session: zod.z.string().optional()
@@ -2363,21 +2421,16 @@ var Api = {
           type: zod.z.union([zod.z.literal("request-again"), zod.z.literal("no-change"), zod.z.literal("did-change")]),
           baseSha: zod.z.string(),
           /**
-           * @deprecated Read by a Studio of the release before
-           * (`BaseAlignment`, `SchemaFreshnessWatch`); this release's
-           * only echoes it, and reads each module's version from
-           * `GET /manifest`. Goes in two steps (see "Release-delayed
-           * deletions" in `docs/plans/one-content-model.md`).
-           */
-          schemaSha: zod.z.string(),
-          /**
-           * @deprecated Read by a Studio of the release before
-           * (`BaseAlignment`, `SchemaFreshnessWatch`); this release's
-           * only echoes it, and reads each module's version from
-           * `GET /manifest`. Goes in two steps (see "Release-delayed
-           * deletions" in `docs/plans/one-content-model.md`).
+           * @deprecated Still sent, for a Studio of the release that
+           * shipped the one content model, which echoes it; a Studio of
+           * the release after reads it as optional and echoes `version`.
+           * The server stops sending it in the release after that (see
+           * "Release-delayed deletions" in
+           * `docs/plans/one-content-model.md`).
            */
-          sourcesSha: zod.z.string(),
+          schemaSha: zod.z.string().optional(),
+          /** @deprecated As `schemaSha`. */
+          sourcesSha: zod.z.string().optional(),
           patches: zod.z.array(PatchId),
           /**
            * Of `patches`, the ones that have already SHIPPED.
@@ -2481,28 +2534,25 @@ var Api = {
            * answers, the higher `seq` is the newer. Optional: a server
            * that predates versions sends none.
            */
-          version: ProjectVersionSchema.optional()
+          version: ProjectVersionSchema.optional(),
+          /** See {@link StatManifest}. */
+          manifest: StatManifest.optional()
         }), zod.z.object({
           type: zod.z.literal("use-websocket"),
           url: zod.z.string(),
           nonce: zod.z.string(),
           baseSha: zod.z.string(),
           /**
-           * @deprecated Read by a Studio of the release before
-           * (`BaseAlignment`, `SchemaFreshnessWatch`); this release's
-           * only echoes it, and reads each module's version from
-           * `GET /manifest`. Goes in two steps (see "Release-delayed
-           * deletions" in `docs/plans/one-content-model.md`).
-           */
-          schemaSha: zod.z.string(),
-          /**
-           * @deprecated Read by a Studio of the release before
-           * (`BaseAlignment`, `SchemaFreshnessWatch`); this release's
-           * only echoes it, and reads each module's version from
-           * `GET /manifest`. Goes in two steps (see "Release-delayed
-           * deletions" in `docs/plans/one-content-model.md`).
+           * @deprecated Still sent, for a Studio of the release that
+           * shipped the one content model, which echoes it; a Studio of
+           * the release after reads it as optional and echoes `version`.
+           * The server stops sending it in the release after that (see
+           * "Release-delayed deletions" in
+           * `docs/plans/one-content-model.md`).
            */
-          sourcesSha: zod.z.string(),
+          schemaSha: zod.z.string().optional(),
+          /** @deprecated As `schemaSha`. */
+          sourcesSha: zod.z.string().optional(),
           /**
            * The commit this deployment was built from.
            *
@@ -2630,7 +2680,9 @@ var Api = {
            * answers, the higher `seq` is the newer. Optional: a server
            * that predates versions sends none.
            */
-          version: ProjectVersionSchema.optional()
+          version: ProjectVersionSchema.optional(),
+          /** See {@link StatManifest}. */
+          manifest: StatManifest.optional()
         })])
       })])
     }
@@ -3195,81 +3247,6 @@ var Api = {
       })])
     }
   },
-  /**
-   * @deprecated The whole tree. Nothing of this release asks it: the Studio
-   * reads modules by version (`GET /manifest`, `GET /modules/~`), the draft
-   * readers and MCP read the head in-process. Kept, with `exclude_patches`
-   * (`BaseAlignment`'s fetch) and the ignored `validate_sources` and
-   * `validate_binary_files`, for a Studio of the release before; goes in the
-   * release after the one that ships this (see "Release-delayed deletions"
-   * in `docs/plans/one-content-model.md`).
-   */
-  "/sources/~": {
-    PUT: {
-      req: {
-        path: zod.z.string().optional(),
-        query: {
-          validate_sources: onlyOneBooleanQueryParam.optional(),
-          validate_binary_files: onlyOneBooleanQueryParam.optional(),
-          exclude_patches: onlyOneBooleanQueryParam.optional(),
-          apply_patches: onlyOneBooleanQueryParam.optional()
-        },
-        cookies: {
-          val_session: zod.z.string().optional()
-        }
-      },
-      res: zod.z.union([unauthorizedResponse, zod.z.object({
-        status: zod.z.literal(401),
-        json: GenericError
-      }), zod.z.object({
-        status: zod.z.literal(500),
-        json: zod.z.object({
-          message: zod.z.string(),
-          details: zod.z.union([zod.z.array(ModulesError), GenericError])
-        })
-      }), zod.z.object({
-        status: zod.z.literal(409),
-        json: zod.z.object({
-          message: zod.z.string()
-        })
-      }), zod.z.object({
-        status: zod.z.literal(400),
-        json: zod.z.object({
-          message: zod.z.string(),
-          details: zod.z.array(ModulesError)
-        })
-      }), zod.z.object({
-        status: zod.z.literal(200),
-        json: zod.z.object({
-          schemaSha: zod.z.string(),
-          sourcesSha: zod.z.string(),
-          modules: zod.z.record(ModuleFilePath, zod.z.object({
-            preview: zod.z.any().optional(),
-            // TODO: improve this type
-            source: zod.z.any().optional(),
-            //.optional(), // TODO: Json zod type
-            baseSource: zod.z.any().optional(),
-            // pre-patch source for compare view; only set when the server applies patches (apply_patches=true) and the module has pending patches
-            patches: zod.z.object({
-              applied: zod.z.array(PatchId),
-              skipped: zod.z.array(PatchId).optional(),
-              errors: zod.z.record(PatchId, GenericError).optional()
-            }).optional(),
-            validationErrors: zod.z.record(zod.z.string(), zod.z.array(ValidationError)).optional(),
-            /**
-             * The version of `source` as answered: with the chain the
-             * server applied, or the empty chain when it applied none
-             * (`apply_patches=false`). Optional: an older server sends
-             * none.
-             */
-            version: ModuleVersionSchema.optional()
-          })),
-          /** The project version this tree was read at. See `/stat`. */
-          project: ProjectVersionSchema.optional()
-        })
-      })])
-    }
-  },
   /**
    * One module by version: phase 6 of `docs/plans/one-content-model.md`
    * ("The Studio loads everything from one place"). `GET /modules/~<path>`,
@@ -8270,8 +8247,6 @@ var toolNames = ["get_all_schema", "get_source", "search_content", "validate_con
  * --- /about                   a route: what follows is the page at /about
  * # Our people                 text (a heading: #, ## or ###)
  * We are 40 people in Oslo.    text (a paragraph)
- * ## Hi {field: /x.val.ts?p="t"}  text linked to a content field: typing
- *                              in it writes the field
  * [image: Team photo]          placeholder: [kind] or [kind: label]
  * [hero: Roof](image: /a.jpg)  a placeholder with an image (or video) in it
  * icon hero M3 5h18v14H3z      how every [hero] box is drawn: SVG path data
@@ -8427,27 +8402,7 @@ function parseSketch(source) {
     errors: errors
   };
 }
-
-/** The link to a content field at the end of a text line. */
-var FIELD = / \{field: (\/[^{}]*)\}$/;
-function parseContent(whole, line, errors) {
-  var link = FIELD.exec(whole);
-  if (link) {
-    var node = parseLine(whole.slice(0, link.index), line, errors);
-    if (node.type !== "text") {
-      errors.push({
-        line: line,
-        message: "Only a heading or a paragraph is linked to a field: put {field: ...} at the end of one."
-      });
-      return node;
-    }
-    return createForOfIteratorHelper._objectSpread2(createForOfIteratorHelper._objectSpread2({}, node), {}, {
-      field: link[1].trim()
-    });
-  }
-  return parseLine(whole, line, errors);
-}
-function parseLine(content, line, errors) {
+function parseContent(content, line, errors) {
   // A leading backslash keeps a line that looks like a keyword as text.
   if (content.startsWith("\\")) {
     return {
@@ -8554,19 +8509,13 @@ function parseLine(content, line, errors) {
  * The line a text block is written as. Line breaks become spaces, and a
  * paragraph that would read as something else is kept as text with `\`.
  */
-function formatSketchText(level, text, field) {
+function formatSketchText(level, text) {
   var flat = text.replace(/\s+/g, " ").trim();
-  var path = field === null || field === void 0 ? void 0 : field.replace(/\s+/g, " ").trim();
-  // A source path, and one the line can be read back with: no braces.
-  var link = path && /^\/[^{}]*$/.test(path) ? " {field: ".concat(path, "}") : "";
   if (level > 0) {
-    return "#".repeat(level) + " " + flat + link;
+    return "#".repeat(level) + " " + flat;
   }
-  // Read as the whole line will be, link and all: `icon x M` is text, and
-  // `icon x M {field: ...}` would be an icon.
-  var whole = flat + link;
-  var ambiguous = flat.startsWith("\\") || flat.startsWith("[") || CONTAINER.test(whole) || ROUTE.test(whole) || HEADING.test(whole) || ICON.test(whole);
-  return (ambiguous ? "\\" + flat : flat) + link;
+  var ambiguous = flat.startsWith("\\") || flat.startsWith("[") || CONTAINER.test(flat) || ROUTE.test(flat) || HEADING.test(flat) || ICON.test(flat);
+  return ambiguous ? "\\" + flat : flat;
 }
 
 /** The line a placeholder is written as. */
@@ -8591,18 +8540,12 @@ function formatSketchBox(placeholder) {
  */
 function formatSketch(blocks, icons) {
   var lines = [];
-  // One block per field: the first keeps the link.
-  var linked = new Set();
   var _walk = function walk(node, depth, inRow) {
     var indent = "  ".repeat(depth);
     switch (node.type) {
       case "text":
         if (node.text) {
-          var field = node.field && !linked.has(node.field) ? node.field : undefined;
-          if (field) {
-            linked.add(field);
-          }
-          lines.push(indent + formatSketchText(node.level, node.text, field));
+          lines.push(indent + formatSketchText(node.level, node.text));
         }
         return;
       case "placeholder":
@@ -8647,26 +8590,6 @@ function formatSketch(blocks, icons) {
   return all.length > 0 ? all.join("\n") + "\n" : "";
 }
 
-/**
- * The text of every block linked to a field, by field: what the Studio
- * writes to the content when a linked block changes. The first block wins,
- * as `formatSketch` keeps only its link.
- */
-function sketchFieldTexts(blocks) {
-  var texts = new Map();
-  var _walk2 = function walk(node) {
-    if (node.type === "text") {
-      if (node.field && node.text && !texts.has(node.field)) {
-        texts.set(node.field, node.text.replace(/\s+/g, " ").trim());
-      }
-    } else if (node.type === "row" || node.type === "col") {
-      node.children.forEach(_walk2);
-    }
-  };
-  blocks.forEach(_walk2);
-  return texts;
-}
-
 /** The pages a sketch is about, in the order it gives them. */
 function sketchRoutes(blocks) {
   return blocks.flatMap(function (block) {
@@ -11862,6 +11785,7 @@ exports.parseStatus = projectSource.parseStatus;
 exports.parseUpdateTarget = projectSource.parseUpdateTarget;
 exports.parseVerify = projectSource.parseVerify;
 exports.publishApiOf = projectSource.publishApiOf;
+exports.CODE_CHANGED_EVENT = getSitemapTree.CODE_CHANGED_EVENT;
 exports.DEFAULT_CANVAS_SELECTION = getSitemapTree.DEFAULT_CANVAS_SELECTION;
 exports.DEFAULT_CANVAS_SELECTION_SOFT = getSitemapTree.DEFAULT_CANVAS_SELECTION_SOFT;
 exports.QUICK_PREVIEW_PARAM = getSitemapTree.QUICK_PREVIEW_PARAM;
@@ -11885,6 +11809,8 @@ exports.getPageRouterSitemapTree = getSitemapTree.getPageRouterSitemapTree;
 exports.getPageRouterSourceFolder = getSitemapTree.getPageRouterSourceFolder;
 exports.getPatternFromModuleFilePath = getSitemapTree.getPatternFromModuleFilePath;
 exports.getTanStackRouterSourceFolder = getSitemapTree.getTanStackRouterSourceFolder;
+exports.isCanvasSelectionColor = getSitemapTree.isCanvasSelectionColor;
+exports.isCodeChangedDetail = getSitemapTree.isCodeChangedDetail;
 exports.isQuickPreviewFiles = getSitemapTree.isQuickPreviewFiles;
 exports.isTanStackRoutesFolder = getSitemapTree.isTanStackRoutesFolder;
 exports.isValCanvasFrame = getSitemapTree.isValCanvasFrame;
@@ -11928,6 +11854,7 @@ exports.JSONValue = JSONValue;
 exports.JSON_ENTRIES_BATCH_MAX = JSON_ENTRIES_BATCH_MAX;
 exports.LOCAL_FILE_IN_REMOTE_PROJECT_HINT = LOCAL_FILE_IN_REMOTE_PROJECT_HINT;
 exports.LOCAL_FILE_IN_REMOTE_PROJECT_WARNING = LOCAL_FILE_IN_REMOTE_PROJECT_WARNING;
+exports.ManifestJson = ManifestJson;
 exports.ModuleComparison = ModuleComparison;
 exports.ModuleVersionSchema = ModuleVersionSchema;
 exports.NEVER_ENCODED = NEVER_ENCODED;
@@ -11985,6 +11912,7 @@ exports.SerializedVideoSchema = SerializedVideoSchema;
 exports.SharedValConfig = SharedValConfig;
 exports.Sketchpad = Sketchpad;
 exports.SketchpadSummary = SketchpadSummary;
+exports.StatManifest = StatManifest;
 exports.VAL_CLIENT_HEADER = VAL_CLIENT_HEADER;
 exports.VAL_ENABLE_COOKIE_NAME = VAL_ENABLE_COOKIE_NAME;
 exports.VAL_GREEN_RAMP = VAL_GREEN_RAMP;
@@ -12083,6 +12011,7 @@ exports.partitionValidationErrors = partitionValidationErrors;
 exports.pathOfModuleKey = pathOfModuleKey;
 exports.performSearch = performSearch;
 exports.proposalCustomProperties = proposalCustomProperties;
+exports.readerSchemaVersion = readerSchemaVersion;
 exports.rebaseContentOp = rebaseContentOp;
 exports.relativeLuminance = relativeLuminance;
 exports.relocateForLocale = relocateForLocale;
@@ -12107,7 +12036,6 @@ exports.selfCheck = selfCheck;
 exports.shouldEncodeWithWasm = shouldEncodeWithWasm;
 exports.sideFiles = sideFiles;
 exports.sideSource = sideSource;
-exports.sketchFieldTexts = sketchFieldTexts;
 exports.sketchRoutes = sketchRoutes;
 exports.sketchTitle = sketchTitle;
 exports.sourcePathOfChild = sourcePathOfChild;