@valbuild/shared 0.150.20 → 0.151.0

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

@@ -2,112 +2,13 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+var projectSource = require('../../dist/projectSource-ed6aec39.cjs.prod.js');
 var createForOfIteratorHelper = require('../../dist/createForOfIteratorHelper-9ca2078d.cjs.prod.js');
 var wrapNativeSuper = require('../../dist/wrapNativeSuper-8673414f.cjs.prod.js');
-var protocol = require('../../dist/protocol-b1055ef0.cjs.prod.js');
 var zod = require('zod');
 var proposalProject = require('../../dist/proposalProject-76caa377.cjs.prod.js');
 require('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;
-    wrapNativeSuper._classCallCheck(this, StudioPublishError);
-    _this = wrapNativeSuper._callSuper(this, StudioPublishError, [message]);
-    createForOfIteratorHelper._defineProperty(_this, "statusCode", void 0);
-    createForOfIteratorHelper._defineProperty(_this, "body", void 0);
-    _this.name = "StudioPublishError";
-    _this.statusCode = statusCode;
-    _this.body = body;
-    return _this;
-  }
-  wrapNativeSuper._inherits(StudioPublishError, _Error);
-  return wrapNativeSuper._createClass(StudioPublishError);
-}(/*#__PURE__*/wrapNativeSuper._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 = createForOfIteratorHelper._asyncToGenerator(/*#__PURE__*/createForOfIteratorHelper._regenerator().m(function _callee(fetchImpl, url, method, body) {
-    var res, text, parsed, _refusalListener, message;
-    return createForOfIteratorHelper._regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
-        case 0:
-          _context.n = 1;
-          return fetchImpl(url, createForOfIteratorHelper._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 = createForOfIteratorHelper._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}. */
@@ -145,26 +46,16 @@ 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;
-  var proxy = publishApiOf(options);
+  var proxy = projectSource.publishApiOf(options);
   var call = function call(path, method, body) {
-    return callJson(fetchImpl, "".concat(proxy).concat(path), method, body);
+    return projectSource.callJson(fetchImpl, "".concat(proxy).concat(path), method, body);
   };
   var source = null;
   var readSource = function readSource() {
-    return source !== null && source !== void 0 ? source : source = call("/project-source", "GET").then(protocol.parseProjectSource);
+    return source !== null && source !== void 0 ? source : source = call("/project-source", "GET").then(projectSource.parseProjectSource);
   };
   return {
     buildTarget: function () {
@@ -173,7 +64,7 @@ function createStudioPublishClient(options) {
         return createForOfIteratorHelper._regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
-              _t = protocol.parseBuildTarget;
+              _t = projectSource.parseBuildTarget;
               _context.n = 1;
               return call("/build-target", "GET");
             case 1:
@@ -246,7 +137,7 @@ function createStudioPublishClient(options) {
         return createForOfIteratorHelper._regenerator().w(function (_context4) {
           while (1) switch (_context4.n) {
             case 0:
-              _t2 = protocol.parseDeclare;
+              _t2 = projectSource.parseDeclare;
               _context4.n = 1;
               return call("/publish", "POST", body);
             case 1:
@@ -265,7 +156,7 @@ function createStudioPublishClient(options) {
         return createForOfIteratorHelper._regenerator().w(function (_context5) {
           while (1) switch (_context5.n) {
             case 0:
-              _t3 = protocol.parseArtifacts;
+              _t3 = projectSource.parseArtifacts;
               _context5.n = 1;
               return call(publishStep(publishId, "artifacts"), "POST");
             case 1:
@@ -284,7 +175,7 @@ function createStudioPublishClient(options) {
         return createForOfIteratorHelper._regenerator().w(function (_context6) {
           while (1) switch (_context6.n) {
             case 0:
-              _t4 = protocol.parseVerify;
+              _t4 = projectSource.parseVerify;
               _context6.n = 1;
               return call(publishStep(publishId, "verify"), "POST");
             case 1:
@@ -303,7 +194,7 @@ function createStudioPublishClient(options) {
         return createForOfIteratorHelper._regenerator().w(function (_context7) {
           while (1) switch (_context7.n) {
             case 0:
-              _t5 = protocol.parsePromote;
+              _t5 = projectSource.parsePromote;
               _context7.n = 1;
               return call(publishStep(publishId, "promote"), "POST");
             case 1:
@@ -322,7 +213,7 @@ function createStudioPublishClient(options) {
         return createForOfIteratorHelper._regenerator().w(function (_context8) {
           while (1) switch (_context8.n) {
             case 0:
-              _t6 = protocol.parseStatus;
+              _t6 = projectSource.parseStatus;
               _context8.n = 1;
               return call(publishStep(publishId), "GET");
             case 1:
@@ -626,13 +517,13 @@ function _runStudioPublish() {
           return _context.a(2, {
             status: "failed",
             publishId: publishId,
-            message: _t3 instanceof StudioPublishError || _t3 instanceof Error ? _t3.message : String(_t3),
+            message: _t3 instanceof projectSource.StudioPublishError || _t3 instanceof Error ? _t3.message : String(_t3),
             /*
              * Content refuses with `{ statusCode, message, details }`, and the
              * publish routes put EVERY problem in `details`. Without them the editor
              * reads "This publish cannot be declared" and nothing about why.
              */
-            problems: _t3 instanceof StudioPublishError ? problemsOf(_t3.body) : []
+            problems: _t3 instanceof projectSource.StudioPublishError ? problemsOf(_t3.body) : []
           });
       }
     }, _callee, null, [[8, 10], [6, 14, 15, 16], [1, 30]]);
@@ -640,7 +531,7 @@ function _runStudioPublish() {
   return _runStudioPublish.apply(this, arguments);
 }
 var problemsOf = function problemsOf(body) {
-  return createForOfIteratorHelper._typeof(body) === "object" && body !== null && "details" in body ? protocol.parseProblems(body.details) : [];
+  return createForOfIteratorHelper._typeof(body) === "object" && body !== null && "details" in body ? projectSource.parseProblems(body.details) : [];
 };
 
 /**
@@ -1546,10 +1437,10 @@ var _excluded = ["buildable"];
 function createStudioJobClient(options) {
   var _options$fetchImpl;
   var fetchImpl = (_options$fetchImpl = options.fetchImpl) !== null && _options$fetchImpl !== void 0 ? _options$fetchImpl : fetch;
-  var publishApi = publishApiOf(options);
+  var publishApi = projectSource.publishApiOf(options);
   var proposalsApi = "proposalsApi" in options ? options.proposalsApi.replace(/\/+$/, "") : "".concat(options.api.replace(/\/+$/, ""), "/proposals-api");
   var proxy = function proxy(path, method, body) {
-    return callJson(fetchImpl, "".concat(publishApi).concat(path), method, body);
+    return projectSource.callJson(fetchImpl, "".concat(publishApi).concat(path), method, body);
   };
   var job = function job(jobId, step) {
     return "/publish-jobs/".concat(encodeURIComponent(jobId), "/").concat(step);
@@ -1561,7 +1452,7 @@ function createStudioJobClient(options) {
         return createForOfIteratorHelper._regenerator().w(function (_context) {
           while (1) switch (_context.n) {
             case 0:
-              _t = protocol.parsePress;
+              _t = projectSource.parsePress;
               _context.n = 1;
               return proxy("/publish-requests", "POST", {
                 requestId: requestId,
@@ -1578,25 +1469,27 @@ function createStudioJobClient(options) {
       return press;
     }(),
     pressMerge: function () {
-      var _pressMerge = createForOfIteratorHelper._asyncToGenerator(/*#__PURE__*/createForOfIteratorHelper._regenerator().m(function _callee2(proposal, requestId, tab, anyway) {
+      var _pressMerge = createForOfIteratorHelper._asyncToGenerator(/*#__PURE__*/createForOfIteratorHelper._regenerator().m(function _callee2(proposal, requestId, tab, anyway, commitMessage) {
         var _t2;
         return createForOfIteratorHelper._regenerator().w(function (_context2) {
           while (1) switch (_context2.n) {
             case 0:
-              _t2 = protocol.parsePress;
+              _t2 = projectSource.parsePress;
               _context2.n = 1;
-              return callJson(fetchImpl, "".concat(proposalsApi, "/").concat(encodeURIComponent(proposal), "/merge"), "POST", createForOfIteratorHelper._objectSpread2({
+              return projectSource.callJson(fetchImpl, "".concat(proposalsApi, "/").concat(encodeURIComponent(proposal), "/merge"), "POST", createForOfIteratorHelper._objectSpread2(createForOfIteratorHelper._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;
@@ -1607,7 +1500,7 @@ function createStudioJobClient(options) {
         return createForOfIteratorHelper._regenerator().w(function (_context3) {
           while (1) switch (_context3.n) {
             case 0:
-              _t3 = protocol.parsePress;
+              _t3 = projectSource.parsePress;
               _context3.n = 1;
               return proxy("/publish-requests/try-again", "POST", {
                 requestId: requestId,
@@ -1618,7 +1511,7 @@ function createStudioJobClient(options) {
           }
         }, _callee3);
       }));
-      function tryAgain(_x7, _x8) {
+      function tryAgain(_x8, _x9) {
         return _tryAgain.apply(this, arguments);
       }
       return tryAgain;
@@ -1629,7 +1522,7 @@ function createStudioJobClient(options) {
         return createForOfIteratorHelper._regenerator().w(function (_context4) {
           while (1) switch (_context4.n) {
             case 0:
-              _t4 = protocol.parseRequestStatus;
+              _t4 = projectSource.parseRequestStatus;
               _context4.n = 1;
               return proxy("/publish-requests/".concat(encodeURIComponent(requestId)), "GET");
             case 1:
@@ -1637,7 +1530,7 @@ function createStudioJobClient(options) {
           }
         }, _callee4);
       }));
-      function requestStatus(_x9) {
+      function requestStatus(_x0) {
         return _requestStatus.apply(this, arguments);
       }
       return requestStatus;
@@ -1648,7 +1541,7 @@ function createStudioJobClient(options) {
         return createForOfIteratorHelper._regenerator().w(function (_context5) {
           while (1) switch (_context5.n) {
             case 0:
-              _t5 = protocol.parseJob;
+              _t5 = projectSource.parseJob;
               _context5.n = 1;
               return proxy("/publish-jobs/next", "POST", {
                 tab: tab
@@ -1658,7 +1551,7 @@ function createStudioJobClient(options) {
           }
         }, _callee5);
       }));
-      function next(_x0) {
+      function next(_x1) {
         return _next.apply(this, arguments);
       }
       return next;
@@ -1688,7 +1581,7 @@ function createStudioJobClient(options) {
                 branch: null,
                 buildable: true
               }, merged.target !== undefined ? {
-                target: protocol.parseBuildTarget(merged.target)
+                target: projectSource.parseBuildTarget(merged.target)
               } : {}));
             case 2:
               if ("api" in options) {
@@ -1698,7 +1591,7 @@ function createStudioJobClient(options) {
               throw new Error("Only a merge's job can be run here: a site change's job needs the Studio.");
             case 3:
               _context6.n = 4;
-              return callJson(fetchImpl, "".concat(options.api.replace(/\/+$/, ""), "/publish-job-prepare"), "POST", {
+              return projectSource.callJson(fetchImpl, "".concat(options.api.replace(/\/+$/, ""), "/publish-job-prepare"), "POST", {
                 jobId: tabJob.id,
                 tab: tab,
                 patchIds: tabJob.patches
@@ -1709,7 +1602,7 @@ function createStudioJobClient(options) {
           }
         }, _callee6);
       }));
-      function prepare(_x1, _x10) {
+      function prepare(_x10, _x11) {
         return _prepare.apply(this, arguments);
       }
       return prepare;
@@ -1720,7 +1613,7 @@ function createStudioJobClient(options) {
         return createForOfIteratorHelper._regenerator().w(function (_context7) {
           while (1) switch (_context7.n) {
             case 0:
-              _t7 = protocol.parseJob;
+              _t7 = projectSource.parseJob;
               _context7.n = 1;
               return proxy(job(jobId, "steps"), "POST", body);
             case 1:
@@ -1728,7 +1621,7 @@ function createStudioJobClient(options) {
           }
         }, _callee7);
       }));
-      function step(_x11, _x12) {
+      function step(_x12, _x13) {
         return _step.apply(this, arguments);
       }
       return step;
@@ -1739,7 +1632,7 @@ function createStudioJobClient(options) {
         return createForOfIteratorHelper._regenerator().w(function (_context8) {
           while (1) switch (_context8.n) {
             case 0:
-              _t8 = protocol.parseRenew;
+              _t8 = projectSource.parseRenew;
               _context8.n = 1;
               return proxy(job(jobId, "renew"), "POST", {
                 tab: tab
@@ -1749,7 +1642,7 @@ function createStudioJobClient(options) {
           }
         }, _callee8);
       }));
-      function renew(_x13, _x14) {
+      function renew(_x14, _x15) {
         return _renew.apply(this, arguments);
       }
       return renew;
@@ -1760,7 +1653,7 @@ function createStudioJobClient(options) {
         return createForOfIteratorHelper._regenerator().w(function (_context9) {
           while (1) switch (_context9.n) {
             case 0:
-              _t9 = protocol.parseCancel;
+              _t9 = projectSource.parseCancel;
               _context9.n = 1;
               return proxy(job(jobId, "cancel"), "POST", {});
             case 1:
@@ -1768,7 +1661,7 @@ function createStudioJobClient(options) {
           }
         }, _callee9);
       }));
-      function cancel(_x15) {
+      function cancel(_x16) {
         return _cancel.apply(this, arguments);
       }
       return cancel;
@@ -1779,7 +1672,7 @@ function createStudioJobClient(options) {
         return createForOfIteratorHelper._regenerator().w(function (_context0) {
           while (1) switch (_context0.n) {
             case 0:
-              _t0 = protocol.parseDiscard;
+              _t0 = projectSource.parseDiscard;
               _context0.n = 1;
               return proxy(job(jobId, "discard"), "POST", {});
             case 1:
@@ -1787,7 +1680,7 @@ function createStudioJobClient(options) {
           }
         }, _callee0);
       }));
-      function discard(_x16) {
+      function discard(_x17) {
         return _discard.apply(this, arguments);
       }
       return discard;
@@ -1798,7 +1691,7 @@ function createStudioJobClient(options) {
         return createForOfIteratorHelper._regenerator().w(function (_context1) {
           while (1) switch (_context1.n) {
             case 0:
-              _t1 = protocol.parseNewestCiRun;
+              _t1 = projectSource.parseNewestCiRun;
               _context1.n = 1;
               return proxy("/ci-runs/newest", "GET");
             case 1:
@@ -1851,12 +1744,12 @@ var preparedJob = zod.z.object({
   buildable: zod.z["boolean"]().optional()
 });
 function parsePreparedJob(body) {
-  var job = protocol.parseJob(body, "POST /api/val/publish-job-prepare").job;
+  var job = projectSource.parseJob(body, "POST /api/val/publish-job-prepare").job;
   var parsed = preparedJob.safeParse(body);
   if (!parsed.success) throw new Error("The server's publish prepare answered with something this Studio cannot read.");
   var _parsed$data = parsed.data,
     buildable = _parsed$data.buildable,
-    rest = protocol._objectWithoutProperties(_parsed$data, _excluded);
+    rest = projectSource._objectWithoutProperties(_parsed$data, _excluded);
   return createForOfIteratorHelper._objectSpread2(createForOfIteratorHelper._objectSpread2({
     job: job
   }, rest), {}, {
@@ -1926,7 +1819,7 @@ function _runStudioJob() {
            * reached it, so the tab reports it.
            */
           message = messageOf$1(_t);
-          if (_t instanceof StudioPublishError && _t.statusCode === 502) {
+          if (_t instanceof projectSource.StudioPublishError && _t.statusCode === 502) {
             _context.n = 5;
             break;
           }
@@ -3030,6 +2923,11 @@ function contentTypeOf(name) {
   return (_CONTENT_TYPES$extens = CONTENT_TYPES[extension]) !== null && _CONTENT_TYPES$extens !== void 0 ? _CONTENT_TYPES$extens : "application/octet-stream";
 }
 
+exports.StudioPublishError = projectSource.StudioPublishError;
+exports.callJson = projectSource.callJson;
+exports.isTransientPublishError = projectSource.isTransientPublishError;
+exports.onPublishRefusal = projectSource.onPublishRefusal;
+exports.publishApiOf = projectSource.publishApiOf;
 exports.proposalProject = proposalProject.proposalProject;
 exports.BUILD_CANCELLED_MESSAGE = BUILD_CANCELLED_MESSAGE;
 exports.DEPLOY_STOPPED_MESSAGE = DEPLOY_STOPPED_MESSAGE;
@@ -3042,24 +2940,19 @@ exports.SERVE_POLL_MS = SERVE_POLL_MS;
 exports.SERVE_WAIT_MS = SERVE_WAIT_MS;
 exports.STUDIO_OUT_OF_DATE = STUDIO_OUT_OF_DATE;
 exports.STUDIO_OUT_OF_DATE_MESSAGE = STUDIO_OUT_OF_DATE_MESSAGE;
-exports.StudioPublishError = StudioPublishError;
 exports.StudioUploadError = StudioUploadError;
 exports.buildProposal = buildProposal;
 exports.buildProposalOnServer = buildProposalOnServer;
 exports.buildQuickPreview = buildQuickPreview;
-exports.callJson = callJson;
 exports.carriedInto = carriedInto;
 exports.clientFilesOf = clientFilesOf;
 exports.createStudioJobClient = createStudioJobClient;
 exports.createStudioPublishClient = createStudioPublishClient;
 exports.isExpiredSlot = isExpiredSlot;
 exports.isMergeChange = isMergeChange;
-exports.isTransientPublishError = isTransientPublishError;
 exports.layerMoved = layerMoved;
 exports.loadedLayer = loadedLayer;
 exports.markStudioOutOfDate = markStudioOutOfDate;
-exports.onPublishRefusal = onPublishRefusal;
-exports.publishApiOf = publishApiOf;
 exports.readLiveLayer = readLiveLayer;
 exports.rememberLoadedLayer = rememberLoadedLayer;
 exports.resetLoadedLayerForTests = resetLoadedLayerForTests;