@valbuild/server 0.144.0 → 0.144.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @valbuild/server
 
+## 0.144.1
+
+### Patch Changes
+
+- [#824](https://github.com/valbuild/val/pull/824) [`a641bb0`](https://github.com/valbuild/val/commit/a641bb0286756339252c53e9230d766c23fcccc6) Thanks [@freekh](https://github.com/freekh)! - `.jsonValues()` entries saved in a proposal now show at the proposal's address. Before, the page kept showing the entry as it was when the site was last built, and the Studio there showed every entry of a saved `.jsonValues()` module as empty.
+
 ## 0.144.0
 
 ### Patch Changes

package/dist/declarations/src/ValOps.d.ts

@@ -51,6 +51,13 @@ export type ValOpsOptions = {
      * the next save's prepare -- starts from it, and the SHAs describe it.
      */
     snapshotSources?: Sources;
+    /**
+     * The `.jsonValues()` entries the same snapshot saved, by module and key:
+     * their content is in their own files, not in {@link snapshotSources}, which
+     * holds markers. The baseline those entries are read from, as a save in
+     * this instance would leave them (`proposalJsonEntries` in `./proposal`).
+     */
+    snapshotJsonEntries?: Map<ModuleFilePath, Map<string, JSONValue>>;
 };
 export declare abstract class ValOps {
     private readonly valModules;
@@ -101,7 +108,9 @@ export declare abstract class ValOps {
      * unlike a module source there is nothing to re-extract, because the memo was
      * never holding the content in the first place.
      *
-     * `null` for an entry the commit deleted.
+     * `deleted` for an entry the commit deleted: tagged, not `null`, because an
+     * entry's content may itself be JSON `null` (a nullable item), and a saved
+     * `null` read back as "deleted" would report the entry missing.
      *
      * Never cleared: it describes what is on disk. A host rebuild makes a new
      * instance, which is the right reset. Bounded by the project's entry count,

package/dist/declarations/src/index.d.ts

@@ -2,7 +2,7 @@ export { createService, Service } from "./Service.js";
 export { defineExternal, ok, err, isExternalResult, EXTERNAL_RESULT, } from "./externalRecords.js";
 export type { AdapterFor, BoundExternalRecord, ExternalAuthor, ExternalBuilder, ExternalCtx, ExternalDefinition, ExternalFile, ExternalIssue, ExternalKeyPage, ExternalRecords, ExternalResult, ExternalSearchHit, ExternalSearchPage, ExternalSort, ItemOfModule, ReadonlyRecordHasNoWrites, Returns, } from "./externalRecords.js";
 export { createValApiRouter, createValServer, safeReadGit } from "./ValRouter.js";
-export { proposalFromEnv, proposalSnapshot } from "./proposal.js";
+export { proposalFromEnv, proposalSnapshot, proposalSnapshotForReaders, } from "./proposal.js";
 export type { ValProposal } from "./proposal.js";
 export { initHandlerOptions, createValOps } from "./valServerConfig.js";
 export { resolveRemoteFileAuth } from "./valServerConfig.js";

package/dist/declarations/src/proposal.d.ts

@@ -1,4 +1,5 @@
 import type { Json, ModuleFilePath } from "@valbuild/core";
+import type { JSONValue } from "@valbuild/core/patch";
 /**
  * A proposal this server runs at the address of: an editor-managed branch of
  * the project's content, served from its own copy of the content the
@@ -70,3 +71,30 @@ export declare function proposalFromEnv(env: {
  * what the snapshot holds.
  */
 export declare function proposalSnapshot(proposal: Pick<ValProposal, "modules">): Record<ModuleFilePath, Json>;
+/**
+ * The `.jsonValues()` entries the proposal saved, by module and key.
+ *
+ * An entry's content is not in its module's Source -- that holds a marker per
+ * entry -- but in the entry's own `*.val.json`, and a save writes that file:
+ * it reaches the proposal's address as saved TEXT ({@link ValProposal.files}),
+ * not as Source. So the snapshot alone shows the build's entries. This is the
+ * other half: each saved `*.val.json`, read as the entry its module names.
+ *
+ * Which entry a file is comes from the module's `.val.ts`, whose
+ * `c.json(() => import("..."))` thunks name the files -- the saved text if
+ * the save rewrote it, else the build's own (`projectSource`). An entry whose
+ * module cannot be read that way is left to the build, as before: this adds
+ * what it can find and never fails the address.
+ */
+export declare function proposalJsonEntries(proposal: Pick<ValProposal, "modules" | "files">, projectSource?: Record<string, string>): Map<ModuleFilePath, Map<string, JSONValue>>;
+/**
+ * The snapshot as a page reads it: {@link proposalSnapshot}, with each saved
+ * `.jsonValues()` entry's content in place of its marker -- the shape a draft
+ * already has, where the entries it edits hold content and the rest are
+ * markers the readers resolve from the build. See {@link proposalJsonEntries}.
+ *
+ * For the readers only. Val's own server keeps the markers
+ * ({@link proposalSnapshot}): its patching works on them, and it takes the
+ * saved entries separately.
+ */
+export declare function proposalSnapshotForReaders(proposal: Pick<ValProposal, "modules" | "files">, projectSource?: Record<string, string>): Record<ModuleFilePath, Json>;

package/dist/valbuild-server.cjs.dev.js

@@ -3593,6 +3593,12 @@ function findNestedJsonValuesModuleErrors(schemas) {
   }
   return errors;
 }
+
+/**
+ * What a save told this instance a `.jsonValues()` entry holds: its content --
+ * JSON `null` included -- or that it was deleted. See `adoptedJsonEntries`.
+ */
+
 // #region ValOps
 class ValOps {
   /** Sources from val modules, immutable (without patches or anything)  */
@@ -3641,7 +3647,9 @@ class ValOps {
    * unlike a module source there is nothing to re-extract, because the memo was
    * never holding the content in the first place.
    *
-   * `null` for an entry the commit deleted.
+   * `deleted` for an entry the commit deleted: tagged, not `null`, because an
+   * entry's content may itself be JSON `null` (a nullable item), and a saved
+   * `null` read back as "deleted" would report the entry missing.
    *
    * Never cleared: it describes what is on disk. A host rebuild makes a new
    * instance, which is the right reset. Bounded by the project's entry count,
@@ -3660,6 +3668,16 @@ class ValOps {
     this.modulesErrors = null;
     this.shaEntries = null;
     this.shaModuleErrors = null;
+    for (const [moduleFilePath, entries] of (options === null || options === void 0 ? void 0 : options.snapshotJsonEntries) ?? []) {
+      const adopted = new Map();
+      for (const [entryKey, content] of entries) {
+        adopted.set(entryKey, {
+          kind: "content",
+          content
+        });
+      }
+      this.adoptedJsonEntries.set(moduleFilePath, adopted);
+    }
   }
 
   // #region stat
@@ -3801,7 +3819,13 @@ class ValOps {
       }
       const adopted = this.adoptedJsonEntries.get(moduleFilePath) ?? new Map();
       for (const [entryKey, content] of Object.entries(entries)) {
-        adopted.set(entryKey, content);
+        // A commit's `null` is a deleted entry: see `patchedJsonEntries`.
+        adopted.set(entryKey, content === null ? {
+          kind: "deleted"
+        } : {
+          kind: "content",
+          content
+        });
       }
       this.adoptedJsonEntries.set(moduleFilePath, adopted);
     }
@@ -4035,6 +4059,7 @@ class ValOps {
       }
     }
     const loaded = await Promise.all([...requestedKeys, ...sourceKeys].map(async entryKey => {
+      var _this$adoptedJsonEntr, _this$siteSourcesBefo;
       const marker = record[entryKey];
       if (marker !== undefined && !core.Internal.isJson(marker)) {
         // Not a jsonValues entry — return the inlined value as-is (defensive).
@@ -4069,15 +4094,20 @@ class ValOps {
        * The BASELINE only. Pending patches replay over it below exactly as
        * they do over the thunk's answer.
        */
-      const adopted = this.adoptedJsonEntries.get(moduleFilePath);
-      if (adopted !== undefined && adopted.has(entryKey)) {
-        const content = adopted.get(entryKey);
+      const adopted = (_this$adoptedJsonEntr = this.adoptedJsonEntries.get(moduleFilePath)) === null || _this$adoptedJsonEntr === void 0 ? void 0 : _this$adoptedJsonEntr.get(entryKey);
+      if (adopted !== undefined) {
         return {
           entryKey,
-          baseContent: content === null ? undefined : content
+          baseContent: adopted.kind === "deleted" ? undefined : adopted.content
         };
       }
-      const thunk = core.Internal.getJsonImport(marker);
+      /*
+       * A snapshot's marker came as JSON, with no import behind it: the
+       * entry the proposal did not save is the build's, behind the marker
+       * the module evaluated to.
+       */
+      const siteMarker = (_this$siteSourcesBefo = this.siteSourcesBeforeSnapshot) === null || _this$siteSourcesBefo === void 0 || (_this$siteSourcesBefo = _this$siteSourcesBefo[moduleFilePath]) === null || _this$siteSourcesBefo === void 0 ? void 0 : _this$siteSourcesBefo[entryKey];
+      const thunk = core.Internal.getJsonImport(marker) ?? (core.Internal.isJson(siteMarker) ? core.Internal.getJsonImport(siteMarker) : undefined);
       if (!thunk) {
         return {
           entryKey,
@@ -8988,6 +9018,116 @@ function proposalSnapshot(proposal) {
   }
   return snapshot;
 }
+
+/**
+ * The `.jsonValues()` entries the proposal saved, by module and key.
+ *
+ * An entry's content is not in its module's Source -- that holds a marker per
+ * entry -- but in the entry's own `*.val.json`, and a save writes that file:
+ * it reaches the proposal's address as saved TEXT ({@link ValProposal.files}),
+ * not as Source. So the snapshot alone shows the build's entries. This is the
+ * other half: each saved `*.val.json`, read as the entry its module names.
+ *
+ * Which entry a file is comes from the module's `.val.ts`, whose
+ * `c.json(() => import("..."))` thunks name the files -- the saved text if
+ * the save rewrote it, else the build's own (`projectSource`). An entry whose
+ * module cannot be read that way is left to the build, as before: this adds
+ * what it can find and never fails the address.
+ */
+function proposalJsonEntries(proposal, projectSource) {
+  const found = new Map();
+  const savedJson = Object.keys(proposal.files).filter(path => path.endsWith(".val.json"));
+  if (savedJson.length === 0) return found;
+  const savedJsonPaths = new Set(savedJson);
+  for (const [moduleFilePath, source] of Object.entries(proposal.modules)) {
+    if (!holdsJsonMarkers(source)) continue;
+    const relative = moduleFilePath.replace(/^\//, "");
+    const text = proposal.files[relative] ?? (projectSource === null || projectSource === void 0 ? void 0 : projectSource[relative]);
+    if (text === undefined) continue;
+    const entries = jsonEntryPaths(relative, text);
+    if (entries === null) continue;
+    const byKey = new Map();
+    for (const [key, importPath] of entries) {
+      const jsonPath = resolveExistingJsonPath(moduleFilePath, importPath).replace(/^\//, "");
+      if (!savedJsonPaths.has(jsonPath)) continue;
+      const content = parseJson(proposal.files[jsonPath]);
+      if (content !== undefined) byKey.set(key, content);
+    }
+    if (byKey.size > 0) found.set(moduleFilePath, byKey);
+  }
+  return found;
+}
+
+/**
+ * The snapshot as a page reads it: {@link proposalSnapshot}, with each saved
+ * `.jsonValues()` entry's content in place of its marker -- the shape a draft
+ * already has, where the entries it edits hold content and the rest are
+ * markers the readers resolve from the build. See {@link proposalJsonEntries}.
+ *
+ * For the readers only. Val's own server keeps the markers
+ * ({@link proposalSnapshot}): its patching works on them, and it takes the
+ * saved entries separately.
+ */
+function proposalSnapshotForReaders(proposal, projectSource) {
+  const snapshot = proposalSnapshot(proposal);
+  for (const [moduleFilePath, entries] of proposalJsonEntries(proposal, projectSource)) {
+    const source = snapshot[moduleFilePath];
+    if (!isObject$1(source)) continue;
+    const filled = {};
+    for (const [key, value] of Object.entries(source)) {
+      if (isJsonValue(value)) filled[key] = value;
+    }
+    for (const [key, content] of entries) {
+      // Own keys only: an entry may be named `toString`.
+      if (Object.prototype.hasOwnProperty.call(filled, key)) {
+        filled[key] = content;
+      }
+    }
+    snapshot[moduleFilePath] = filled;
+  }
+  return snapshot;
+}
+
+/** A record of `.jsonValues()` markers (`{ _type: "json" }`), at least one. */
+function holdsJsonMarkers(source) {
+  return isObject$1(source) && Object.values(source).some(value => isObject$1(value) && value["_type"] === "json");
+}
+
+/** Each entry key's import path, from a `.jsonValues()` module's text. */
+function jsonEntryPaths(fileName, text) {
+  try {
+    const analysis = analyzeValModule(ts__default["default"].createSourceFile(fileName, text, ts__default["default"].ScriptTarget.ES2015, true));
+    if (fp.result.isErr(analysis)) return null;
+    const paths = new Map();
+    for (const [key, entry] of analyzeJsonValuesEntries(analysis.value.source)) {
+      paths.set(key, entry.importPath);
+    }
+    return paths;
+  } catch {
+    // Not a module this can read: its entries stay the build's.
+    return null;
+  }
+}
+function parseJson(text) {
+  if (text === undefined) return undefined;
+  try {
+    const value = JSON.parse(text);
+    return isMutableJsonValue(value) ? value : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+/** {@link isJsonValue}, for the mutable JSON a server patches. */
+function isMutableJsonValue(value) {
+  if (value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+    return true;
+  }
+  if (Array.isArray(value)) {
+    return value.every(isMutableJsonValue);
+  }
+  return isObject$1(value) && Object.values(value).every(isMutableJsonValue);
+}
 function isObject$1(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -9432,7 +9572,8 @@ class ValOpsHttp extends ValOps {
   auth, valModules, options) {
     super(valModules, options !== null && options !== void 0 && options.proposal ? {
       ...options,
-      snapshotSources: proposalSnapshot(options.proposal)
+      snapshotSources: proposalSnapshot(options.proposal),
+      snapshotJsonEntries: proposalJsonEntries(options.proposal, options.projectSource)
     } : options);
     this.contentUrl = contentUrl;
     this.project = project;
@@ -24024,6 +24165,7 @@ exports.persistPersonalAccessToken = persistPersonalAccessToken;
 exports.planJsonValuesEntryExtraction = planJsonValuesEntryExtraction;
 exports.proposalFromEnv = proposalFromEnv;
 exports.proposalSnapshot = proposalSnapshot;
+exports.proposalSnapshotForReaders = proposalSnapshotForReaders;
 exports.readCapturedReport = readCapturedReport;
 exports.readPatchStore = readPatchStore;
 exports.rebaseContentOp = rebaseContentOp;

package/dist/valbuild-server.cjs.prod.js

@@ -3593,6 +3593,12 @@ function findNestedJsonValuesModuleErrors(schemas) {
   }
   return errors;
 }
+
+/**
+ * What a save told this instance a `.jsonValues()` entry holds: its content --
+ * JSON `null` included -- or that it was deleted. See `adoptedJsonEntries`.
+ */
+
 // #region ValOps
 class ValOps {
   /** Sources from val modules, immutable (without patches or anything)  */
@@ -3641,7 +3647,9 @@ class ValOps {
    * unlike a module source there is nothing to re-extract, because the memo was
    * never holding the content in the first place.
    *
-   * `null` for an entry the commit deleted.
+   * `deleted` for an entry the commit deleted: tagged, not `null`, because an
+   * entry's content may itself be JSON `null` (a nullable item), and a saved
+   * `null` read back as "deleted" would report the entry missing.
    *
    * Never cleared: it describes what is on disk. A host rebuild makes a new
    * instance, which is the right reset. Bounded by the project's entry count,
@@ -3660,6 +3668,16 @@ class ValOps {
     this.modulesErrors = null;
     this.shaEntries = null;
     this.shaModuleErrors = null;
+    for (const [moduleFilePath, entries] of (options === null || options === void 0 ? void 0 : options.snapshotJsonEntries) ?? []) {
+      const adopted = new Map();
+      for (const [entryKey, content] of entries) {
+        adopted.set(entryKey, {
+          kind: "content",
+          content
+        });
+      }
+      this.adoptedJsonEntries.set(moduleFilePath, adopted);
+    }
   }
 
   // #region stat
@@ -3801,7 +3819,13 @@ class ValOps {
       }
       const adopted = this.adoptedJsonEntries.get(moduleFilePath) ?? new Map();
       for (const [entryKey, content] of Object.entries(entries)) {
-        adopted.set(entryKey, content);
+        // A commit's `null` is a deleted entry: see `patchedJsonEntries`.
+        adopted.set(entryKey, content === null ? {
+          kind: "deleted"
+        } : {
+          kind: "content",
+          content
+        });
       }
       this.adoptedJsonEntries.set(moduleFilePath, adopted);
     }
@@ -4035,6 +4059,7 @@ class ValOps {
       }
     }
     const loaded = await Promise.all([...requestedKeys, ...sourceKeys].map(async entryKey => {
+      var _this$adoptedJsonEntr, _this$siteSourcesBefo;
       const marker = record[entryKey];
       if (marker !== undefined && !core.Internal.isJson(marker)) {
         // Not a jsonValues entry — return the inlined value as-is (defensive).
@@ -4069,15 +4094,20 @@ class ValOps {
        * The BASELINE only. Pending patches replay over it below exactly as
        * they do over the thunk's answer.
        */
-      const adopted = this.adoptedJsonEntries.get(moduleFilePath);
-      if (adopted !== undefined && adopted.has(entryKey)) {
-        const content = adopted.get(entryKey);
+      const adopted = (_this$adoptedJsonEntr = this.adoptedJsonEntries.get(moduleFilePath)) === null || _this$adoptedJsonEntr === void 0 ? void 0 : _this$adoptedJsonEntr.get(entryKey);
+      if (adopted !== undefined) {
         return {
           entryKey,
-          baseContent: content === null ? undefined : content
+          baseContent: adopted.kind === "deleted" ? undefined : adopted.content
         };
       }
-      const thunk = core.Internal.getJsonImport(marker);
+      /*
+       * A snapshot's marker came as JSON, with no import behind it: the
+       * entry the proposal did not save is the build's, behind the marker
+       * the module evaluated to.
+       */
+      const siteMarker = (_this$siteSourcesBefo = this.siteSourcesBeforeSnapshot) === null || _this$siteSourcesBefo === void 0 || (_this$siteSourcesBefo = _this$siteSourcesBefo[moduleFilePath]) === null || _this$siteSourcesBefo === void 0 ? void 0 : _this$siteSourcesBefo[entryKey];
+      const thunk = core.Internal.getJsonImport(marker) ?? (core.Internal.isJson(siteMarker) ? core.Internal.getJsonImport(siteMarker) : undefined);
       if (!thunk) {
         return {
           entryKey,
@@ -8988,6 +9018,116 @@ function proposalSnapshot(proposal) {
   }
   return snapshot;
 }
+
+/**
+ * The `.jsonValues()` entries the proposal saved, by module and key.
+ *
+ * An entry's content is not in its module's Source -- that holds a marker per
+ * entry -- but in the entry's own `*.val.json`, and a save writes that file:
+ * it reaches the proposal's address as saved TEXT ({@link ValProposal.files}),
+ * not as Source. So the snapshot alone shows the build's entries. This is the
+ * other half: each saved `*.val.json`, read as the entry its module names.
+ *
+ * Which entry a file is comes from the module's `.val.ts`, whose
+ * `c.json(() => import("..."))` thunks name the files -- the saved text if
+ * the save rewrote it, else the build's own (`projectSource`). An entry whose
+ * module cannot be read that way is left to the build, as before: this adds
+ * what it can find and never fails the address.
+ */
+function proposalJsonEntries(proposal, projectSource) {
+  const found = new Map();
+  const savedJson = Object.keys(proposal.files).filter(path => path.endsWith(".val.json"));
+  if (savedJson.length === 0) return found;
+  const savedJsonPaths = new Set(savedJson);
+  for (const [moduleFilePath, source] of Object.entries(proposal.modules)) {
+    if (!holdsJsonMarkers(source)) continue;
+    const relative = moduleFilePath.replace(/^\//, "");
+    const text = proposal.files[relative] ?? (projectSource === null || projectSource === void 0 ? void 0 : projectSource[relative]);
+    if (text === undefined) continue;
+    const entries = jsonEntryPaths(relative, text);
+    if (entries === null) continue;
+    const byKey = new Map();
+    for (const [key, importPath] of entries) {
+      const jsonPath = resolveExistingJsonPath(moduleFilePath, importPath).replace(/^\//, "");
+      if (!savedJsonPaths.has(jsonPath)) continue;
+      const content = parseJson(proposal.files[jsonPath]);
+      if (content !== undefined) byKey.set(key, content);
+    }
+    if (byKey.size > 0) found.set(moduleFilePath, byKey);
+  }
+  return found;
+}
+
+/**
+ * The snapshot as a page reads it: {@link proposalSnapshot}, with each saved
+ * `.jsonValues()` entry's content in place of its marker -- the shape a draft
+ * already has, where the entries it edits hold content and the rest are
+ * markers the readers resolve from the build. See {@link proposalJsonEntries}.
+ *
+ * For the readers only. Val's own server keeps the markers
+ * ({@link proposalSnapshot}): its patching works on them, and it takes the
+ * saved entries separately.
+ */
+function proposalSnapshotForReaders(proposal, projectSource) {
+  const snapshot = proposalSnapshot(proposal);
+  for (const [moduleFilePath, entries] of proposalJsonEntries(proposal, projectSource)) {
+    const source = snapshot[moduleFilePath];
+    if (!isObject$1(source)) continue;
+    const filled = {};
+    for (const [key, value] of Object.entries(source)) {
+      if (isJsonValue(value)) filled[key] = value;
+    }
+    for (const [key, content] of entries) {
+      // Own keys only: an entry may be named `toString`.
+      if (Object.prototype.hasOwnProperty.call(filled, key)) {
+        filled[key] = content;
+      }
+    }
+    snapshot[moduleFilePath] = filled;
+  }
+  return snapshot;
+}
+
+/** A record of `.jsonValues()` markers (`{ _type: "json" }`), at least one. */
+function holdsJsonMarkers(source) {
+  return isObject$1(source) && Object.values(source).some(value => isObject$1(value) && value["_type"] === "json");
+}
+
+/** Each entry key's import path, from a `.jsonValues()` module's text. */
+function jsonEntryPaths(fileName, text) {
+  try {
+    const analysis = analyzeValModule(ts__default["default"].createSourceFile(fileName, text, ts__default["default"].ScriptTarget.ES2015, true));
+    if (fp.result.isErr(analysis)) return null;
+    const paths = new Map();
+    for (const [key, entry] of analyzeJsonValuesEntries(analysis.value.source)) {
+      paths.set(key, entry.importPath);
+    }
+    return paths;
+  } catch {
+    // Not a module this can read: its entries stay the build's.
+    return null;
+  }
+}
+function parseJson(text) {
+  if (text === undefined) return undefined;
+  try {
+    const value = JSON.parse(text);
+    return isMutableJsonValue(value) ? value : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+/** {@link isJsonValue}, for the mutable JSON a server patches. */
+function isMutableJsonValue(value) {
+  if (value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+    return true;
+  }
+  if (Array.isArray(value)) {
+    return value.every(isMutableJsonValue);
+  }
+  return isObject$1(value) && Object.values(value).every(isMutableJsonValue);
+}
 function isObject$1(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -9432,7 +9572,8 @@ class ValOpsHttp extends ValOps {
   auth, valModules, options) {
     super(valModules, options !== null && options !== void 0 && options.proposal ? {
       ...options,
-      snapshotSources: proposalSnapshot(options.proposal)
+      snapshotSources: proposalSnapshot(options.proposal),
+      snapshotJsonEntries: proposalJsonEntries(options.proposal, options.projectSource)
     } : options);
     this.contentUrl = contentUrl;
     this.project = project;
@@ -24024,6 +24165,7 @@ exports.persistPersonalAccessToken = persistPersonalAccessToken;
 exports.planJsonValuesEntryExtraction = planJsonValuesEntryExtraction;
 exports.proposalFromEnv = proposalFromEnv;
 exports.proposalSnapshot = proposalSnapshot;
+exports.proposalSnapshotForReaders = proposalSnapshotForReaders;
 exports.readCapturedReport = readCapturedReport;
 exports.readPatchStore = readPatchStore;
 exports.rebaseContentOp = rebaseContentOp;

package/dist/valbuild-server.esm.js

@@ -3556,6 +3556,12 @@ function findNestedJsonValuesModuleErrors(schemas) {
   }
   return errors;
 }
+
+/**
+ * What a save told this instance a `.jsonValues()` entry holds: its content --
+ * JSON `null` included -- or that it was deleted. See `adoptedJsonEntries`.
+ */
+
 // #region ValOps
 class ValOps {
   /** Sources from val modules, immutable (without patches or anything)  */
@@ -3604,7 +3610,9 @@ class ValOps {
    * unlike a module source there is nothing to re-extract, because the memo was
    * never holding the content in the first place.
    *
-   * `null` for an entry the commit deleted.
+   * `deleted` for an entry the commit deleted: tagged, not `null`, because an
+   * entry's content may itself be JSON `null` (a nullable item), and a saved
+   * `null` read back as "deleted" would report the entry missing.
    *
    * Never cleared: it describes what is on disk. A host rebuild makes a new
    * instance, which is the right reset. Bounded by the project's entry count,
@@ -3623,6 +3631,16 @@ class ValOps {
     this.modulesErrors = null;
     this.shaEntries = null;
     this.shaModuleErrors = null;
+    for (const [moduleFilePath, entries] of (options === null || options === void 0 ? void 0 : options.snapshotJsonEntries) ?? []) {
+      const adopted = new Map();
+      for (const [entryKey, content] of entries) {
+        adopted.set(entryKey, {
+          kind: "content",
+          content
+        });
+      }
+      this.adoptedJsonEntries.set(moduleFilePath, adopted);
+    }
   }
 
   // #region stat
@@ -3764,7 +3782,13 @@ class ValOps {
       }
       const adopted = this.adoptedJsonEntries.get(moduleFilePath) ?? new Map();
       for (const [entryKey, content] of Object.entries(entries)) {
-        adopted.set(entryKey, content);
+        // A commit's `null` is a deleted entry: see `patchedJsonEntries`.
+        adopted.set(entryKey, content === null ? {
+          kind: "deleted"
+        } : {
+          kind: "content",
+          content
+        });
       }
       this.adoptedJsonEntries.set(moduleFilePath, adopted);
     }
@@ -3998,6 +4022,7 @@ class ValOps {
       }
     }
     const loaded = await Promise.all([...requestedKeys, ...sourceKeys].map(async entryKey => {
+      var _this$adoptedJsonEntr, _this$siteSourcesBefo;
       const marker = record[entryKey];
       if (marker !== undefined && !Internal.isJson(marker)) {
         // Not a jsonValues entry — return the inlined value as-is (defensive).
@@ -4032,15 +4057,20 @@ class ValOps {
        * The BASELINE only. Pending patches replay over it below exactly as
        * they do over the thunk's answer.
        */
-      const adopted = this.adoptedJsonEntries.get(moduleFilePath);
-      if (adopted !== undefined && adopted.has(entryKey)) {
-        const content = adopted.get(entryKey);
+      const adopted = (_this$adoptedJsonEntr = this.adoptedJsonEntries.get(moduleFilePath)) === null || _this$adoptedJsonEntr === void 0 ? void 0 : _this$adoptedJsonEntr.get(entryKey);
+      if (adopted !== undefined) {
         return {
           entryKey,
-          baseContent: content === null ? undefined : content
+          baseContent: adopted.kind === "deleted" ? undefined : adopted.content
         };
       }
-      const thunk = Internal.getJsonImport(marker);
+      /*
+       * A snapshot's marker came as JSON, with no import behind it: the
+       * entry the proposal did not save is the build's, behind the marker
+       * the module evaluated to.
+       */
+      const siteMarker = (_this$siteSourcesBefo = this.siteSourcesBeforeSnapshot) === null || _this$siteSourcesBefo === void 0 || (_this$siteSourcesBefo = _this$siteSourcesBefo[moduleFilePath]) === null || _this$siteSourcesBefo === void 0 ? void 0 : _this$siteSourcesBefo[entryKey];
+      const thunk = Internal.getJsonImport(marker) ?? (Internal.isJson(siteMarker) ? Internal.getJsonImport(siteMarker) : undefined);
       if (!thunk) {
         return {
           entryKey,
@@ -8951,6 +8981,116 @@ function proposalSnapshot(proposal) {
   }
   return snapshot;
 }
+
+/**
+ * The `.jsonValues()` entries the proposal saved, by module and key.
+ *
+ * An entry's content is not in its module's Source -- that holds a marker per
+ * entry -- but in the entry's own `*.val.json`, and a save writes that file:
+ * it reaches the proposal's address as saved TEXT ({@link ValProposal.files}),
+ * not as Source. So the snapshot alone shows the build's entries. This is the
+ * other half: each saved `*.val.json`, read as the entry its module names.
+ *
+ * Which entry a file is comes from the module's `.val.ts`, whose
+ * `c.json(() => import("..."))` thunks name the files -- the saved text if
+ * the save rewrote it, else the build's own (`projectSource`). An entry whose
+ * module cannot be read that way is left to the build, as before: this adds
+ * what it can find and never fails the address.
+ */
+function proposalJsonEntries(proposal, projectSource) {
+  const found = new Map();
+  const savedJson = Object.keys(proposal.files).filter(path => path.endsWith(".val.json"));
+  if (savedJson.length === 0) return found;
+  const savedJsonPaths = new Set(savedJson);
+  for (const [moduleFilePath, source] of Object.entries(proposal.modules)) {
+    if (!holdsJsonMarkers(source)) continue;
+    const relative = moduleFilePath.replace(/^\//, "");
+    const text = proposal.files[relative] ?? (projectSource === null || projectSource === void 0 ? void 0 : projectSource[relative]);
+    if (text === undefined) continue;
+    const entries = jsonEntryPaths(relative, text);
+    if (entries === null) continue;
+    const byKey = new Map();
+    for (const [key, importPath] of entries) {
+      const jsonPath = resolveExistingJsonPath(moduleFilePath, importPath).replace(/^\//, "");
+      if (!savedJsonPaths.has(jsonPath)) continue;
+      const content = parseJson(proposal.files[jsonPath]);
+      if (content !== undefined) byKey.set(key, content);
+    }
+    if (byKey.size > 0) found.set(moduleFilePath, byKey);
+  }
+  return found;
+}
+
+/**
+ * The snapshot as a page reads it: {@link proposalSnapshot}, with each saved
+ * `.jsonValues()` entry's content in place of its marker -- the shape a draft
+ * already has, where the entries it edits hold content and the rest are
+ * markers the readers resolve from the build. See {@link proposalJsonEntries}.
+ *
+ * For the readers only. Val's own server keeps the markers
+ * ({@link proposalSnapshot}): its patching works on them, and it takes the
+ * saved entries separately.
+ */
+function proposalSnapshotForReaders(proposal, projectSource) {
+  const snapshot = proposalSnapshot(proposal);
+  for (const [moduleFilePath, entries] of proposalJsonEntries(proposal, projectSource)) {
+    const source = snapshot[moduleFilePath];
+    if (!isObject$1(source)) continue;
+    const filled = {};
+    for (const [key, value] of Object.entries(source)) {
+      if (isJsonValue(value)) filled[key] = value;
+    }
+    for (const [key, content] of entries) {
+      // Own keys only: an entry may be named `toString`.
+      if (Object.prototype.hasOwnProperty.call(filled, key)) {
+        filled[key] = content;
+      }
+    }
+    snapshot[moduleFilePath] = filled;
+  }
+  return snapshot;
+}
+
+/** A record of `.jsonValues()` markers (`{ _type: "json" }`), at least one. */
+function holdsJsonMarkers(source) {
+  return isObject$1(source) && Object.values(source).some(value => isObject$1(value) && value["_type"] === "json");
+}
+
+/** Each entry key's import path, from a `.jsonValues()` module's text. */
+function jsonEntryPaths(fileName, text) {
+  try {
+    const analysis = analyzeValModule(ts.createSourceFile(fileName, text, ts.ScriptTarget.ES2015, true));
+    if (result.isErr(analysis)) return null;
+    const paths = new Map();
+    for (const [key, entry] of analyzeJsonValuesEntries(analysis.value.source)) {
+      paths.set(key, entry.importPath);
+    }
+    return paths;
+  } catch {
+    // Not a module this can read: its entries stay the build's.
+    return null;
+  }
+}
+function parseJson(text) {
+  if (text === undefined) return undefined;
+  try {
+    const value = JSON.parse(text);
+    return isMutableJsonValue(value) ? value : undefined;
+  } catch {
+    return undefined;
+  }
+}
+
+/** {@link isJsonValue}, for the mutable JSON a server patches. */
+function isMutableJsonValue(value) {
+  if (value === null || typeof value === "string" || typeof value === "number" || typeof value === "boolean") {
+    return true;
+  }
+  if (Array.isArray(value)) {
+    return value.every(isMutableJsonValue);
+  }
+  return isObject$1(value) && Object.values(value).every(isMutableJsonValue);
+}
 function isObject$1(value) {
   return typeof value === "object" && value !== null && !Array.isArray(value);
 }
@@ -9395,7 +9535,8 @@ class ValOpsHttp extends ValOps {
   auth, valModules, options) {
     super(valModules, options !== null && options !== void 0 && options.proposal ? {
       ...options,
-      snapshotSources: proposalSnapshot(options.proposal)
+      snapshotSources: proposalSnapshot(options.proposal),
+      snapshotJsonEntries: proposalJsonEntries(options.proposal, options.projectSource)
     } : options);
     this.contentUrl = contentUrl;
     this.project = project;
@@ -23901,4 +24042,4 @@ function readCapturedReport(snapshotDir) {
   return JSON.parse(fs.readFileSync(reportPath, "utf-8"));
 }
 
-export { APP_MODE_REQUIRES_REMOTE_FILES, DEFAULT_LOGIN_EXPIRES_IN_SECONDS, DEFAULT_LOGIN_HOST, DEFAULT_LOGIN_POLL_INTERVAL_SECONDS, EXTERNAL_RESULT, InMemoryPatchStore, Service, ValFSHost, ValLoginError, ValModuleLoader, ValOpsFS, ValOpsHttp, ValOpsMemory, ValSourceFileHandler, analyzeValModule, awaitValLoginConfirmation, checkRemoteRef, classifyJsonValuesOp, compareWithCapturedReport, createDefaultValFSHost, createFixPatch, createJsonEntryPathMap, createModulePathMap, createPrettierFormatter, createService, createValApiRouter, createValModuleFileInspector, createValOps, createValServer, currentFixHandlers, decodeJwtWithoutVerifying, defineExternal, describePatchStoreProblems, downloadFileFromRemote, encodeJwt, err, evalValConfigFile, extractFileMetadata, extractImageMetadata, extractJsonValuesEntry, extractVideoMetadata, extractVideoMetadataFromFile, filesOfVideo, filesOfVideosetEntry, findAndEvalValConfigFile, findDefaultExport, findJsonEntryFilePath, fixHandlers, formatPatchSourceError, formatSyntaxErrorTree, getCachedRemoteFileDir, getCachedRemoteFilePath, getCompilerOptions, getExpire, getFileExt, getModulePathRange, getPersonalAccessTokenPath, getSettings, getValidationErrorFileRef, handleCheckAllFiles, handleExternalUpload, handleFileMetadata, handleJsonValuesExtractEntry, handleRemoteFileCheck, handleRemoteFileDownload, handleRemoteFileUpload, handleRemoteGalleryFileUpload, handleUniqueFolderCheck, handleVideosetCheckAllFiles, handleVideosetCheckRemote, handleVideosetMetadata, handleVideosetUploadRemote, initHandlerOptions, isExternalResult, loadValModules, ok, parsePersonalAccessTokenFile, patchSourceFile, persistPersonalAccessToken, planJsonValuesEntryExtraction, proposalFromEnv, proposalSnapshot, readCapturedReport, readPatchStore, rebaseContentOp, replaySnapshot, resolveRemoteFileAuth, safeReadGit, startValLogin, uploadRemoteFile, validateMetadata, verifyJwt, videosetEntryVideoSchema };
+export { APP_MODE_REQUIRES_REMOTE_FILES, DEFAULT_LOGIN_EXPIRES_IN_SECONDS, DEFAULT_LOGIN_HOST, DEFAULT_LOGIN_POLL_INTERVAL_SECONDS, EXTERNAL_RESULT, InMemoryPatchStore, Service, ValFSHost, ValLoginError, ValModuleLoader, ValOpsFS, ValOpsHttp, ValOpsMemory, ValSourceFileHandler, analyzeValModule, awaitValLoginConfirmation, checkRemoteRef, classifyJsonValuesOp, compareWithCapturedReport, createDefaultValFSHost, createFixPatch, createJsonEntryPathMap, createModulePathMap, createPrettierFormatter, createService, createValApiRouter, createValModuleFileInspector, createValOps, createValServer, currentFixHandlers, decodeJwtWithoutVerifying, defineExternal, describePatchStoreProblems, downloadFileFromRemote, encodeJwt, err, evalValConfigFile, extractFileMetadata, extractImageMetadata, extractJsonValuesEntry, extractVideoMetadata, extractVideoMetadataFromFile, filesOfVideo, filesOfVideosetEntry, findAndEvalValConfigFile, findDefaultExport, findJsonEntryFilePath, fixHandlers, formatPatchSourceError, formatSyntaxErrorTree, getCachedRemoteFileDir, getCachedRemoteFilePath, getCompilerOptions, getExpire, getFileExt, getModulePathRange, getPersonalAccessTokenPath, getSettings, getValidationErrorFileRef, handleCheckAllFiles, handleExternalUpload, handleFileMetadata, handleJsonValuesExtractEntry, handleRemoteFileCheck, handleRemoteFileDownload, handleRemoteFileUpload, handleRemoteGalleryFileUpload, handleUniqueFolderCheck, handleVideosetCheckAllFiles, handleVideosetCheckRemote, handleVideosetMetadata, handleVideosetUploadRemote, initHandlerOptions, isExternalResult, loadValModules, ok, parsePersonalAccessTokenFile, patchSourceFile, persistPersonalAccessToken, planJsonValuesEntryExtraction, proposalFromEnv, proposalSnapshot, proposalSnapshotForReaders, readCapturedReport, readPatchStore, rebaseContentOp, replaySnapshot, resolveRemoteFileAuth, safeReadGit, startValLogin, uploadRemoteFile, validateMetadata, verifyJwt, videosetEntryVideoSchema };

package/package.json

@@ -16,7 +16,7 @@
     "./package.json": "./package.json"
   },
   "types": "dist/valbuild-server.cjs.d.ts",
-  "version": "0.144.0",
+  "version": "0.144.1",
   "devDependencies": {
     "@prettier/sync": "^0.6.1",
     "@types/jest": "^30.0.0",
@@ -30,9 +30,9 @@
     "typescript": "^6.0.3",
     "zod": "^4.4.3",
     "zod-validation-error": "^5.0.0",
-    "@valbuild/core": "0.144.0",
     "@valbuild/shared": "0.144.0",
-    "@valbuild/ui": "0.144.0"
+    "@valbuild/ui": "0.144.0",
+    "@valbuild/core": "0.144.0"
   },
   "engines": {
     "node": "^20.19.0 || >=22"