@valbuild/shared 0.150.20 → 0.152.0

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

@@ -1,110 +1,12 @@
-import { b as _asyncToGenerator, c as _regenerator, _ as _typeof, d as _objectSpread2, g as _defineProperty, a as _slicedToArray, f as _createForOfIteratorHelper, e as _toConsumableArray } from '../../dist/createForOfIteratorHelper-9b80f1a2.esm.js';
+import { p as publishApiOf, a as parseBuildTarget, b as parseDeclare, c as parseArtifacts, d as parseVerify, e as parsePromote, f as parseStatus, g as callJson, h as parseProjectSource, S as StudioPublishError, i as parseProblems, j as parsePress, k as parseRequestStatus, l as parseJob, m as parseRenew, n as parseCancel, o as parseDiscard, q as parseNewestCiRun, _ as _objectWithoutProperties } from '../../dist/projectSource-7f0ee83c.esm.js';
+export { S as StudioPublishError, g as callJson, r as isTransientPublishError, s as onPublishRefusal, p as publishApiOf } from '../../dist/projectSource-7f0ee83c.esm.js';
+import { g as _defineProperty, b as _asyncToGenerator, c as _regenerator, a as _slicedToArray, f as _createForOfIteratorHelper, _ as _typeof, d as _objectSpread2, e as _toConsumableArray } from '../../dist/createForOfIteratorHelper-9b80f1a2.esm.js';
 import { _ as _inherits, a as _createClass, b as _wrapNativeSuper, c as _classCallCheck, d as _callSuper } from '../../dist/wrapNativeSuper-639b12b7.esm.js';
-import { p as parseBuildTarget, a as parseDeclare, b as parseArtifacts, c as parseVerify, d as parsePromote, e as parseStatus, f as parseProjectSource, g as parseProblems, h as parsePress, i as parseRequestStatus, j as parseJob, k as parseRenew, l as parseCancel, m as parseDiscard, n as parseNewestCiRun, _ as _objectWithoutProperties } from '../../dist/protocol-55cfa3cf.esm.js';
 import { z } from 'zod';
 import { p as proposalProject } from '../../dist/proposalProject-5da177d5.esm.js';
 export { p as proposalProject } from '../../dist/proposalProject-5da177d5.esm.js';
 import 'zod-validation-error';
 
-/*
- * The one JSON call the Studio makes through its own origin's publish proxy,
- * and the errors it throws. Apart from `publishClient.ts` (which re-exports
- * all three) so that a worker can make the same call without importing the
- * publish client's parsers, and `@valbuild/shared` with them.
- */
-
-/**
- * Who hears of a refusal's body before it is thrown: the Studio's shell, which
- * says a refusal of the project's plan with the next step (`planRefusal.ts` in
- * `@valbuild/ui`). One listener; setting it again replaces it.
- */
-var refusalListener = null;
-function onPublishRefusal(listener) {
-  refusalListener = listener;
-}
-
-/** The publish API refused, and said why. */
-var StudioPublishError = /*#__PURE__*/function (_Error) {
-  function StudioPublishError(statusCode, message, body) {
-    var _this;
-    _classCallCheck(this, StudioPublishError);
-    _this = _callSuper(this, StudioPublishError, [message]);
-    _defineProperty(_this, "statusCode", void 0);
-    _defineProperty(_this, "body", void 0);
-    _this.name = "StudioPublishError";
-    _this.statusCode = statusCode;
-    _this.body = body;
-    return _this;
-  }
-  _inherits(StudioPublishError, _Error);
-  return _createClass(StudioPublishError);
-}(/*#__PURE__*/_wrapNativeSuper(Error));
-
-/**
- * Was this a failure that asking again could get past?
- *
- * No answer at all (the request never got through) and the answers that mean
- * "not now" -- a timeout, too many requests, a server or gateway error. Every
- * other status is content answering, and the same request gets the same
- * answer.
- */
-function isTransientPublishError(error) {
-  if (!(error instanceof StudioPublishError)) return true;
-  return error.statusCode >= 500 || error.statusCode === 408 || error.statusCode === 429;
-}
-
-/**
- * One JSON call through this origin, with the session cookie: its body, or a
- * `StudioPublishError` carrying the answer's own message.
- */
-function callJson(_x, _x2, _x3, _x4) {
-  return _callJson.apply(this, arguments);
-}
-function _callJson() {
-  _callJson = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(fetchImpl, url, method, body) {
-    var res, text, parsed, _refusalListener, message;
-    return _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
-        case 0:
-          _context.n = 1;
-          return fetchImpl(url, _objectSpread2({
-            method: method,
-            // The session cookie is the whole credential this end has.
-            credentials: "same-origin"
-          }, body === undefined ? {} : {
-            headers: {
-              "Content-Type": "application/json"
-            },
-            body: JSON.stringify(body)
-          }));
-        case 1:
-          res = _context.v;
-          _context.n = 2;
-          return res.text();
-        case 2:
-          text = _context.v;
-          try {
-            parsed = text === "" ? undefined : JSON.parse(text);
-          } catch (_unused) {
-            parsed = undefined;
-          }
-          if (res.ok) {
-            _context.n = 3;
-            break;
-          }
-          // A publish the plan does not allow (a trial's 3 publishes, a trial that
-          // ended): the shell says it, with the next step. See `planRefusal`.
-          (_refusalListener = refusalListener) === null || _refusalListener === void 0 || _refusalListener(parsed);
-          message = _typeof(parsed) === "object" && parsed !== null && "message" in parsed && typeof parsed.message === "string" ? parsed.message : "The publish API answered ".concat(res.status, ".");
-          throw new StudioPublishError(res.status, message, parsed);
-        case 3:
-          return _context.a(2, parsed);
-      }
-    }, _callee);
-  }));
-  return _callJson.apply(this, arguments);
-}
-
 /** An artifact the live build has and this publish re-declares by hash. */
 
 /** See {@link StudioPublishClient.publicFiles}. */
@@ -142,16 +44,6 @@ var StudioUploadError = /*#__PURE__*/function (_Error) {
 function isExpiredSlot(error) {
   return error instanceof StudioUploadError && error.statusCode === 403;
 }
-
-/**
- * Where content's publish API is reached: through Val's proxy on this origin
- * (`api`, the Studio), or directly (`publishApi`, `<content>/v1`: home's
- * upgrade page, whose `fetchImpl` adds the project token).
- */
-
-function publishApiOf(at) {
-  return "publishApi" in at ? at.publishApi.replace(/\/+$/, "") : "".concat(at.api.replace(/\/+$/, ""), "/publish-api");
-}
 function createStudioPublishClient(options) {
   var _options$fetchImpl;
   var fetchImpl = (_options$fetchImpl = options.fetchImpl) !== null && _options$fetchImpl !== void 0 ? _options$fetchImpl : fetch;
@@ -1575,25 +1467,27 @@ function createStudioJobClient(options) {
       return press;
     }(),
     pressMerge: function () {
-      var _pressMerge = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(proposal, requestId, tab, anyway) {
+      var _pressMerge = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(proposal, requestId, tab, anyway, commitMessage) {
         var _t2;
         return _regenerator().w(function (_context2) {
           while (1) switch (_context2.n) {
             case 0:
               _t2 = parsePress;
               _context2.n = 1;
-              return callJson(fetchImpl, "".concat(proposalsApi, "/").concat(encodeURIComponent(proposal), "/merge"), "POST", _objectSpread2({
+              return callJson(fetchImpl, "".concat(proposalsApi, "/").concat(encodeURIComponent(proposal), "/merge"), "POST", _objectSpread2(_objectSpread2({
                 requestId: requestId,
                 tab: tab
               }, anyway !== undefined && anyway.length > 0 ? {
                 anyway: anyway
+              } : {}), commitMessage !== undefined && commitMessage.trim() !== "" ? {
+                commitMessage: commitMessage
               } : {}));
             case 1:
               return _context2.a(2, _t2(_context2.v, "POST /v1/proposals/{name}/merge"));
           }
         }, _callee2);
       }));
-      function pressMerge(_x3, _x4, _x5, _x6) {
+      function pressMerge(_x3, _x4, _x5, _x6, _x7) {
         return _pressMerge.apply(this, arguments);
       }
       return pressMerge;
@@ -1615,7 +1509,7 @@ function createStudioJobClient(options) {
           }
         }, _callee3);
       }));
-      function tryAgain(_x7, _x8) {
+      function tryAgain(_x8, _x9) {
         return _tryAgain.apply(this, arguments);
       }
       return tryAgain;
@@ -1634,7 +1528,7 @@ function createStudioJobClient(options) {
           }
         }, _callee4);
       }));
-      function requestStatus(_x9) {
+      function requestStatus(_x0) {
         return _requestStatus.apply(this, arguments);
       }
       return requestStatus;
@@ -1655,7 +1549,7 @@ function createStudioJobClient(options) {
           }
         }, _callee5);
       }));
-      function next(_x0) {
+      function next(_x1) {
         return _next.apply(this, arguments);
       }
       return next;
@@ -1706,7 +1600,7 @@ function createStudioJobClient(options) {
           }
         }, _callee6);
       }));
-      function prepare(_x1, _x10) {
+      function prepare(_x10, _x11) {
         return _prepare.apply(this, arguments);
       }
       return prepare;
@@ -1725,7 +1619,7 @@ function createStudioJobClient(options) {
           }
         }, _callee7);
       }));
-      function step(_x11, _x12) {
+      function step(_x12, _x13) {
         return _step.apply(this, arguments);
       }
       return step;
@@ -1746,7 +1640,7 @@ function createStudioJobClient(options) {
           }
         }, _callee8);
       }));
-      function renew(_x13, _x14) {
+      function renew(_x14, _x15) {
         return _renew.apply(this, arguments);
       }
       return renew;
@@ -1765,7 +1659,7 @@ function createStudioJobClient(options) {
           }
         }, _callee9);
       }));
-      function cancel(_x15) {
+      function cancel(_x16) {
         return _cancel.apply(this, arguments);
       }
       return cancel;
@@ -1784,7 +1678,7 @@ function createStudioJobClient(options) {
           }
         }, _callee0);
       }));
-      function discard(_x16) {
+      function discard(_x17) {
         return _discard.apply(this, arguments);
       }
       return discard;
@@ -3027,4 +2921,4 @@ function contentTypeOf(name) {
   return (_CONTENT_TYPES$extens = CONTENT_TYPES[extension]) !== null && _CONTENT_TYPES$extens !== void 0 ? _CONTENT_TYPES$extens : "application/octet-stream";
 }
 
-export { BUILD_CANCELLED_MESSAGE, DEPLOY_STOPPED_MESSAGE, MergePrepareAnswer, RENEW_EVERY_MS, SERVER_BUILDS_OFF, SERVER_BUILD_POLL_MS, SERVER_BUILD_WAIT_MS, SERVE_POLL_MS, SERVE_WAIT_MS, STUDIO_OUT_OF_DATE, STUDIO_OUT_OF_DATE_MESSAGE, StudioPublishError, StudioUploadError, buildProposal, buildProposalOnServer, buildQuickPreview, callJson, carriedInto, clientFilesOf, createStudioJobClient, createStudioPublishClient, isExpiredSlot, isMergeChange, isTransientPublishError, layerMoved, loadedLayer, markStudioOutOfDate, onPublishRefusal, publishApiOf, readLiveLayer, rememberLoadedLayer, resetLoadedLayerForTests, runJobToEnd, runStudioDeploy, runStudioJob, runStudioPublish, siteMovedSinceLoad, splitBinaryFiles, studioOutOfDateRefusals, subscribeStudioOutOfDate, withCommittedFiles, withoutLockfiles };
+export { BUILD_CANCELLED_MESSAGE, DEPLOY_STOPPED_MESSAGE, MergePrepareAnswer, RENEW_EVERY_MS, SERVER_BUILDS_OFF, SERVER_BUILD_POLL_MS, SERVER_BUILD_WAIT_MS, SERVE_POLL_MS, SERVE_WAIT_MS, STUDIO_OUT_OF_DATE, STUDIO_OUT_OF_DATE_MESSAGE, StudioUploadError, buildProposal, buildProposalOnServer, buildQuickPreview, carriedInto, clientFilesOf, createStudioJobClient, createStudioPublishClient, isExpiredSlot, isMergeChange, layerMoved, loadedLayer, markStudioOutOfDate, readLiveLayer, rememberLoadedLayer, resetLoadedLayerForTests, runJobToEnd, runStudioDeploy, runStudioJob, runStudioPublish, siteMovedSinceLoad, splitBinaryFiles, studioOutOfDateRefusals, subscribeStudioOutOfDate, withCommittedFiles, withoutLockfiles };

package/dist/declarations/src/internal/server/requestScopedMemo.d.ts

@@ -1,49 +0,0 @@
-/**
- * One value, computed once per REQUEST.
- *
- * `fetchVal` in draft mode reads the whole module tree out of `/sources/~`, and
- * a page that calls it three times used to ask three times — the answer being
- * byte-identical each time, because the query and the session are fixed for the
- * length of a request. This is what makes the second and third call free.
- *
- * ## Why the scope is the REQUEST
- *
- * The memoised response is a DRAFT -- unpublished work, read with the caller's
- * session cookie. Every caller allowed to read drafts gets the same draft (patch
- * groups, which made it per author, are gone), but whether a caller is allowed
- * at all is decided per session. A memo that outlived the request would hand
- * the draft to the next visitor without asking, and it would be invisible: the
- * page would simply render somebody's half-finished sentence. Sharing it across
- * requests is possible now, keyed on the chain's head, and would be its own
- * measured change.
- *
- * So this module holds NO state of its own. The caller supplies the box, and
- * the box has to come from something the framework already scopes to the
- * request — React's `cache()` in an RSC, a `WeakMap` keyed on the `Request` in
- * TanStack Start. `null` means "no request scope available", and that is not an
- * error: it falls back to computing every time, which is what the code did
- * before this existed. Ineffective is a safe failure here; leaking is not.
- *
- * The `key` is the second half of that guarantee. It carries whatever the
- * answer depends on — the session — so a box that somehow outlived its request,
- * or is shared by two sessions, MISSES rather than serving the wrong draft.
- *
- * ## The promise is cached, not the value
- *
- * React renders siblings concurrently, so three `fetchVal` calls in one page
- * are usually in flight at the same time rather than one after another.
- * Caching the resolved value would dedupe none of them; caching the promise
- * dedupes both orderings.
- */
-export type RequestScopedMemo<T> = {
-    key?: string;
-    promise?: Promise<T>;
-};
-/**
- * Returns the memoised promise for `key`, computing it only on a miss.
- *
- * A rejection is memoised along with everything else, on purpose: one failed
- * read per request is the same answer for every caller in it, and retrying it
- * two more times only makes a broken draft slower to render.
- */
-export declare function memoizePerRequest<T>(box: RequestScopedMemo<T> | null, key: string, compute: () => Promise<T>): Promise<T>;