@valbuild/shared 0.146.0 → 0.146.4

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';
@@ -1611,7 +1611,7 @@ var ValConfig = z.object({
   gitCommit: z.string().optional(),
   gitBranch: z.string().optional()
 });
-var ValidationFixZ = z.union([z.literal("image:add-metadata"), z.literal("image:check-metadata"), z.literal("image:check-remote"), z.literal("image:upload-remote"), z.literal("image:download-remote"), z.literal("images:check-remote"), z.literal("images:upload-remote"), z.literal("file:add-metadata"), z.literal("video:add-metadata"), z.literal("video:upload-remote"), z.literal("video:download-remote"), z.literal("videos:add-metadata"), z.literal("videos:check-remote"), z.literal("videos:upload-remote"), z.literal("file:check-metadata"), z.literal("file:check-remote"), z.literal("file:upload-remote"), z.literal("file:download-remote"), z.literal("files:check-remote"), z.literal("files:upload-remote"), z.literal("keyof:check-keys"), z.literal("router:check-route"), z.literal("locale:check-locale"), z.literal("record:fill-keys"), z.literal("images:check-unique-folder"), z.literal("files:check-unique-folder"), z.literal("images:check-all-files"), z.literal("files:check-all-files"), z.literal("videos:check-unique-folder"), z.literal("videos:check-all-files"), z.literal("jsonValues:extract-entry"), z.literal("view:check-module")]);
+var ValidationFixZ = z.union([z.literal("image:add-metadata"), z.literal("image:check-metadata"), z.literal("image:check-remote"), z.literal("image:upload-remote"), z.literal("image:download-remote"), z.literal("images:check-remote"), z.literal("images:upload-remote"), z.literal("file:add-metadata"), z.literal("video:add-metadata"), z.literal("video:upload-remote"), z.literal("video:download-remote"), z.literal("videos:add-metadata"), z.literal("videos:check-remote"), z.literal("videos:upload-remote"), z.literal("file:check-metadata"), z.literal("file:check-remote"), z.literal("file:upload-remote"), z.literal("file:download-remote"), z.literal("files:check-remote"), z.literal("files:upload-remote"), z.literal("keyof:check-keys"), z.literal("image:check-gallery"), z.literal("file:check-gallery"), z.literal("video:check-gallery"), z.literal("router:check-route"), z.literal("locale:check-locale"), z.literal("record:fill-keys"), z.literal("images:check-unique-folder"), z.literal("files:check-unique-folder"), z.literal("images:check-all-files"), z.literal("files:check-all-files"), z.literal("videos:check-unique-folder"), z.literal("videos:check-all-files"), z.literal("jsonValues:extract-entry"), z.literal("view:check-module")]);
 var ValidationError = z.object({
   message: z.string(),
   value: z.unknown().optional(),
@@ -2864,6 +2864,66 @@ var Api = {
       })])
     }
   },
+  /**
+   * Publish selected (`docs/plans/remove-patch-groups.md`, Phase 4), its first
+   * half, on the site's own server: the changes picked in Review, already
+   * closed into whole patch sets (`selectionClosure`), moved into a proposal
+   * of kind `publish` and saved there -- prepared over the site's head, which
+   * the proposal is based on, so a publish landing in between is refused
+   * rather than reverted. The second half is that proposal's Publish, pressed
+   * as any proposal's is (`publishProposal`); this server answers its checks
+   * and press with what the merge moves, as the proposal's own address would.
+   */
+  "/publish-selected": {
+    POST: {
+      req: {
+        body: z.object({
+          /** The changes to publish, whole patch sets, in any order: a move keeps the chain's. */
+          patchIds: z.array(PatchId).min(1),
+          /** What the merged proposal is listed as. */
+          displayName: z.string().min(1).max(200),
+          /** The press's own id: the same press sent again is the same proposal. */
+          requestId: z.string().regex(/^[A-Za-z0-9_-]{1,100}$/)
+        }),
+        cookies: {
+          val_session: z.string().optional()
+        }
+      },
+      res: z.union([unauthorizedResponse, z.object({
+        status: z.literal(400),
+        json: GenericError
+      }),
+      /**
+       * Refused: the site moved (`headMoved`: pressing again prepares over
+       * the new head), a change went, or this deployment cannot.
+       */
+      z.object({
+        status: z.literal(409),
+        json: GenericError.extend({
+          headMoved: z.literal(true).optional()
+        })
+      }), z.object({
+        status: z.literal(500),
+        json: GenericError
+      }),
+      /**
+       * The proposal was made and its changes moved into it, and the save
+       * there failed: they are safe in it, which `proposal` names.
+       */
+      z.object({
+        status: z.literal(502),
+        json: GenericError.extend({
+          proposal: z.string()
+        })
+      }), z.object({
+        status: z.literal(200),
+        json: z.object({
+          /** The proposal to publish next. */
+          proposal: z.string()
+        })
+      })])
+    }
+  },
   "/save": {
     POST: {
       req: {
@@ -4783,7 +4843,7 @@ function declaredLocales(snapshot) {
  * these has to resolve all of them, and the two that leaked did so by adding a
  * fix here and not to a condition somewhere else.
  */
-var SCHEMA_SOURCE_FIXES = ["keyof:check-keys", "router:check-route", "locale:check-locale", "record:fill-keys"];
+var SCHEMA_SOURCE_FIXES = ["keyof:check-keys", "image:check-gallery", "file:check-gallery", "video:check-gallery", "router:check-route", "locale:check-locale", "record:fill-keys"];
 
 /** Whether an error is a marker only the whole project can answer. */
 function isSchemaSourceFixError(error) {
@@ -4794,8 +4854,9 @@ function isSchemaSourceFixError(error) {
 }
 
 /**
- * The record a `keyof:check-keys` error resolves against, or null for any other
- * error — including a malformed marker, which
+ * The record a `keyof:check-keys` error resolves against -- or a gallery
+ * marker's (`image:check-gallery` and the rest): its gallery module -- or null
+ * for any other error, including a malformed marker, which
  * {@link resolveSchemaSourceFixForError} reports and this has nothing to say
  * about.
  *
@@ -4805,6 +4866,12 @@ function isSchemaSourceFixError(error) {
  */
 function keyOfRecordPath(error) {
   var _error$fixes2;
+  // A gallery-backed field's marker reads its gallery the same way: the
+  // record whose keys say whether the field's path is there.
+  var gallery = Internal.media.galleryMarkerOf(error);
+  if (gallery !== null) {
+    return gallery.gallery;
+  }
   if (!((_error$fixes2 = error.fixes) !== null && _error$fixes2 !== void 0 ? _error$fixes2 : []).includes("keyof:check-keys")) {
     return null;
   }
@@ -4826,6 +4893,37 @@ function keyOfRecordPath(error) {
 function resolveSchemaSourceFixForError(error, snapshot) {
   var _error$fixes3;
   var fixes = (_error$fixes3 = error.fixes) !== null && _error$fixes3 !== void 0 ? _error$fixes3 : [];
+  var gallery = Internal.media.galleryMarkerOf(error);
+  if (gallery !== null) {
+    // The gallery as it is now -- with what a pending change, a save in a
+    // proposal or a content-only publish added -- not as the schema was built.
+    var entries = getKeyOfRecordAt(gallery.gallery, snapshot).source;
+    var has = _typeof(entries) === "object" && entries !== null && !Array.isArray(entries) && Internal.media.galleryKeyOf(gallery.path, function (key) {
+      return key in entries;
+    }) !== null;
+    if (has) {
+      return {
+        status: "resolved"
+      };
+    }
+    return {
+      status: "remaining",
+      error: _objectSpread2(_objectSpread2({}, error), {}, {
+        value: gallery.source,
+        fixes: undefined
+      })
+    };
+  }
+  if (fixes.includes("image:check-gallery") || fixes.includes("file:check-gallery") || fixes.includes("video:check-gallery")) {
+    return {
+      status: "remaining",
+      error: _objectSpread2(_objectSpread2({}, error), {}, {
+        message: "".concat(error.message, " The gallery could not be read from this error. ").concat(TYPE_ERROR_MESSAGE),
+        typeError: true,
+        fixes: undefined
+      })
+    };
+  }
   if (fixes.includes("keyof:check-keys")) {
     if (!error.value) {
       return {
@@ -6117,6 +6215,9 @@ function isSkippableFixCode(fix) {
       // also took them off the publish gate, so a broken key published unseen.
       return false;
     case "keyof:check-keys":
+    case "image:check-gallery":
+    case "file:check-gallery":
+    case "video:check-gallery":
     case "router:check-route":
     case "locale:check-locale":
     case "record:fill-keys":
@@ -7750,7 +7851,12 @@ var requestStatus = z.union([z.object({
   kind: z.literal("failed"),
   message: z.string(),
   actions: z.array(z["enum"](["try-again", "discard", "re-run-build"])),
-  job: z.string()
+  job: z.string(),
+  movedTo: z.object({
+    proposal: z.string(),
+    displayName: z.string(),
+    changes: z.number()
+  }).optional()
 }), z.object({
   kind: z.literal("cancelled")
 }), z.object({
@@ -8269,6 +8375,126 @@ var PatchSets = /*#__PURE__*/function () {
   }]);
 }();
 
+/**
+ * Patch sets that share a change become one: a change is never split.
+ *
+ * Shared by the two places that move changes between branches a whole set at
+ * a time -- the merge moving the site's conflicting pending changes
+ * (`changesToMove` in `@valbuild/server`) and Publish selected
+ * ({@link selectionClosure}) -- so that they agree on what "a whole set" is.
+ */
+function joinSharedChanges(sets) {
+  var groups = [];
+  var _iterator = _createForOfIteratorHelper(sets),
+    _step;
+  try {
+    var _loop = function _loop() {
+      var set = _step.value;
+      var joined = new Set(set);
+      var _iterator2 = _createForOfIteratorHelper(groups.filter(function (g) {
+          return set.some(function (id) {
+            return g.has(id);
+          });
+        })),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var group = _step2.value;
+          var _iterator3 = _createForOfIteratorHelper(group),
+            _step3;
+          try {
+            for (_iterator3.s(); !(_step3 = _iterator3.n()).done;) {
+              var id = _step3.value;
+              joined.add(id);
+            }
+          } catch (err) {
+            _iterator3.e(err);
+          } finally {
+            _iterator3.f();
+          }
+          groups.splice(groups.indexOf(group), 1);
+        }
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
+      }
+      groups.push(joined);
+    };
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      _loop();
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return groups;
+}
+
+/**
+ * What publishing `selected` publishes: every change in every patch set a
+ * selected change is in, sets that share a change joined
+ * (valbuild/val `docs/plans/remove-patch-groups.md`, Phase 4, rule 2).
+ *
+ * A patch set is changes that do not apply without each other, so a selection
+ * of part of one cannot be published on its own. What it pulls in is someone
+ * else's as often as not; the caller says whose, before anything moves.
+ *
+ * In the order of `patchIds` -- the chain's -- with nothing that is not in it.
+ */
+function selectionClosure(patchSets, selected, patchIds) {
+  var wanted = new Set(selected);
+  var closed = new Set();
+  var _iterator4 = _createForOfIteratorHelper(joinSharedChanges(patchSets.map(function (set) {
+      return set.patches.map(function (patch) {
+        return patch.patchId;
+      });
+    }))),
+    _step4;
+  try {
+    for (_iterator4.s(); !(_step4 = _iterator4.n()).done;) {
+      var group = _step4.value;
+      if (_toConsumableArray(group).some(function (id) {
+        return wanted.has(id);
+      })) {
+        var _iterator6 = _createForOfIteratorHelper(group),
+          _step6;
+        try {
+          for (_iterator6.s(); !(_step6 = _iterator6.n()).done;) {
+            var id = _step6.value;
+            closed.add(id);
+          }
+        } catch (err) {
+          _iterator6.e(err);
+        } finally {
+          _iterator6.f();
+        }
+      }
+    }
+    // A selected change no patch set knows of is its own set.
+  } catch (err) {
+    _iterator4.e(err);
+  } finally {
+    _iterator4.f();
+  }
+  var _iterator5 = _createForOfIteratorHelper(wanted),
+    _step5;
+  try {
+    for (_iterator5.s(); !(_step5 = _iterator5.n()).done;) {
+      var _id = _step5.value;
+      closed.add(_id);
+    }
+  } catch (err) {
+    _iterator5.e(err);
+  } finally {
+    _iterator5.f();
+  }
+  return patchIds.filter(function (id) {
+    return closed.has(id);
+  });
+}
+
 /**
  * Update from the site, for a proposal with code (valbuild/home
  * `docs/hosted-publishing.md` step 8.2, slice 1b): what content hands over,
@@ -8344,4 +8570,4 @@ function schemaErrorsOf(schema, moduleFilePath, source) {
   return errors;
 }
 
-export { AA_LARGE, AA_TEXT, Api, BRAND_CONTRAST_PAIRS, BinaryFileRef, CodeOptions, ColorOptions, DEFAULT_ERROR_MESSAGE, DateOptions, ENCODE_DEFAULTS, ENCODE_MIME_TYPE_OF, FileOptions, HistoricalCommit, HistoricalModule, HistoricalPatchSet, HistoryError, ImageEncodeOption, ImageOptions, JSONValue, JSON_ENTRIES_BATCH_MAX, ModuleComparison, NEVER_ENCODED, ParentRef$1 as ParentRef, Patch, PatchBlock, PatchId, PatchJSON, PatchSets, PlanRefusalError, PublishProtocolError, RAMP_STEPS, RemirrorBr, RemirrorBulletList, RemirrorHeading, RemirrorImage, RemirrorJSON, RemirrorLinkMark, RemirrorListItem, RemirrorOrderedList, RemirrorParagraph, RemirrorText, RemirrorTextMark, RestoreVerdict, RichTextOptions, SCHEMA_SOURCE_FIXES, SerializedArraySchema, SerializedBooleanSchema, SerializedCodeSchema, SerializedColorSchema, SerializedDateSchema, SerializedDateTimeSchema, SerializedDiscriminatedUnionSchema, SerializedEnumSchema, SerializedFileSchema, SerializedImageSchema, SerializedKeyOfSchema, SerializedLiteralSchema, SerializedLocaleSchema, SerializedNumberSchema, SerializedObjectSchema, SerializedRecordSchema, SerializedRichTextSchema, SerializedRouteSchema, SerializedSchema, SerializedSettingsSchema, SerializedStringSchema, SerializedValViewSchema, SerializedVideoSchema, SharedValConfig, VAL_ENABLE_COOKIE_NAME, VAL_GREEN_RAMP, VAL_SESSION_COOKIE, VAL_STATE_COOKIE, VAL_STUDIO_HEADER, ValCommit, ValDeployment, VideoOptions, VideoStreamOption, accentRamp, buildDuplicatePatch, buildEmptyAtPathPatch, buildFileRefValue, buildImageGalleryPatch, buildRemoveImageGalleryEntryPatch, buildSearchIndex, chainHeadOf, checkCompatibility, chooseEncoded, concatModulePath, contrastRatio, createRegExpFromPattern, createSearchIndex, createValClient, declaredLocales, describeContainerAtPath, emptyOf, explainIncompatible, filterBlockingValidationErrors, filterRoutesByPatterns, findSimilar, fitWithin, flattenRichText, forEachRichTextImage, getErrorMessageFromUnknownJson, getFilenameFromRef, getInlineImgInfo, getKeyOfRecordAt, getRefParts, getRoutesOf, getRoutesWithModulePaths, getSourceAt, indexModule, isInsidePatchSetPath, isMimeTypeAccepted, isRemoteSchema, isSchemaSourceFixError, isSkippedSource, keyOfRecordPath, levenshtein, localeAt, memoizePerRequest, newestCommitSha, parseArtifacts, parseBuildTarget, parseCancel, parseDeclare, parseDiscard, parseJob, parseNewestCiRun, parsePress, parseProblems, parseProjectSource, parsePromote, parsePublishToken, parseRenew, parseRequestStatus, parseStatus, parseUpdateTarget, parseVerify, partitionValidationErrors, performSearch, relativeLuminance, remirrorToRichTextSource, removeModule, resolveEncodeSettings, resolvePairGround, resolveSchemaSourceFixForError, resolveSchemaSourceFixes, resolveSerializedSchemaAtPath, richTextImageSchema, richTextToRemirror, safeParsePatch, schemaErrorsOf, schemaTypesOfPath, sideFiles, sideSource, sourcePathOfChild, themeCustomProperties, toolNames, traverseSchemaSource, urlOf, validateRoutePatterns, withExtension };
+export { AA_LARGE, AA_TEXT, Api, BRAND_CONTRAST_PAIRS, BinaryFileRef, CodeOptions, ColorOptions, DEFAULT_ERROR_MESSAGE, DateOptions, ENCODE_DEFAULTS, ENCODE_MIME_TYPE_OF, FileOptions, HistoricalCommit, HistoricalModule, HistoricalPatchSet, HistoryError, ImageEncodeOption, ImageOptions, JSONValue, JSON_ENTRIES_BATCH_MAX, ModuleComparison, NEVER_ENCODED, ParentRef$1 as ParentRef, Patch, PatchBlock, PatchId, PatchJSON, PatchSets, PlanRefusalError, PublishProtocolError, RAMP_STEPS, RemirrorBr, RemirrorBulletList, RemirrorHeading, RemirrorImage, RemirrorJSON, RemirrorLinkMark, RemirrorListItem, RemirrorOrderedList, RemirrorParagraph, RemirrorText, RemirrorTextMark, RestoreVerdict, RichTextOptions, SCHEMA_SOURCE_FIXES, SerializedArraySchema, SerializedBooleanSchema, SerializedCodeSchema, SerializedColorSchema, SerializedDateSchema, SerializedDateTimeSchema, SerializedDiscriminatedUnionSchema, SerializedEnumSchema, SerializedFileSchema, SerializedImageSchema, SerializedKeyOfSchema, SerializedLiteralSchema, SerializedLocaleSchema, SerializedNumberSchema, SerializedObjectSchema, SerializedRecordSchema, SerializedRichTextSchema, SerializedRouteSchema, SerializedSchema, SerializedSettingsSchema, SerializedStringSchema, SerializedValViewSchema, SerializedVideoSchema, SharedValConfig, VAL_ENABLE_COOKIE_NAME, VAL_GREEN_RAMP, VAL_SESSION_COOKIE, VAL_STATE_COOKIE, VAL_STUDIO_HEADER, ValCommit, ValDeployment, VideoOptions, VideoStreamOption, accentRamp, buildDuplicatePatch, buildEmptyAtPathPatch, buildFileRefValue, buildImageGalleryPatch, buildRemoveImageGalleryEntryPatch, buildSearchIndex, chainHeadOf, checkCompatibility, chooseEncoded, concatModulePath, contrastRatio, createRegExpFromPattern, createSearchIndex, createValClient, declaredLocales, describeContainerAtPath, emptyOf, explainIncompatible, filterBlockingValidationErrors, filterRoutesByPatterns, findSimilar, fitWithin, flattenRichText, forEachRichTextImage, getErrorMessageFromUnknownJson, getFilenameFromRef, getInlineImgInfo, getKeyOfRecordAt, getRefParts, getRoutesOf, getRoutesWithModulePaths, getSourceAt, indexModule, isInsidePatchSetPath, isMimeTypeAccepted, isRemoteSchema, isSchemaSourceFixError, isSkippedSource, joinSharedChanges, keyOfRecordPath, levenshtein, localeAt, memoizePerRequest, newestCommitSha, parseArtifacts, parseBuildTarget, parseCancel, parseDeclare, parseDiscard, parseJob, parseNewestCiRun, parsePress, parseProblems, parseProjectSource, parsePromote, parsePublishToken, parseRenew, parseRequestStatus, parseStatus, parseUpdateTarget, parseVerify, partitionValidationErrors, performSearch, relativeLuminance, remirrorToRichTextSource, removeModule, resolveEncodeSettings, resolvePairGround, resolveSchemaSourceFixForError, resolveSchemaSourceFixes, resolveSerializedSchemaAtPath, richTextImageSchema, richTextToRemirror, safeParsePatch, schemaErrorsOf, schemaTypesOfPath, selectionClosure, sideFiles, sideSource, sourcePathOfChild, themeCustomProperties, toolNames, traverseSchemaSource, urlOf, validateRoutePatterns, withExtension };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valbuild/shared",
-  "version": "0.146.0",
+  "version": "0.146.4",
   "private": false,
   "description": "Val shared types and utilities",
   "repository": {
@@ -37,7 +37,7 @@
     "flexsearch": "^0.8.212",
     "zod": "^4.4.3",
     "zod-validation-error": "^5.0.0",
-    "@valbuild/core": "0.145.0"
+    "@valbuild/core": "0.146.2"
   },
   "files": [
     "CHANGELOG.md",