@valbuild/shared 0.150.1 → 0.150.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @valbuild/shared
 
+## 0.150.2
+
+### Patch Changes
+
+- [#949](https://github.com/valbuild/val/pull/949) [`36412b2`](https://github.com/valbuild/val/commit/36412b28bb009083f652b26462b76a74c80ff595) Thanks [@freekh](https://github.com/freekh)! - Val Studio now shows content analytics beside the content being edited, for a hosted project with content analytics switched on. Each field and list row shows how many page views it was seen in (hover for how many it was on the page in, and the share). The heading of what is open says the same for all of it, and lists what in it was seen most, by the names the Studio gives them everywhere else. Nothing is shown, and nothing is asked of Val Build, for a project with analytics off or a Studio not signed in to Val Build.
+
+- [#953](https://github.com/valbuild/val/pull/953) [`8f598b6`](https://github.com/valbuild/val/commit/8f598b618b794e59ef5b9c6ef94650be4ff006e7) Thanks [@freekh](https://github.com/freekh)! - A proposal's typecheck no longer downloads TypeScript again for its second check. The compiler (about 13 MB) is kept by the typecheck's worker once fetched, for every check that asks for the same version after it.
+
+- [#952](https://github.com/valbuild/val/pull/952) [`95d17e6`](https://github.com/valbuild/val/commit/95d17e6bbecceb2f09d6a6226808e9c60b2d4795) Thanks [@freekh](https://github.com/freekh)! - A proposal's typecheck (an upgrade, or a proposal with dependencies of its own) now checks the proposal first, and checks the site as it is only when the proposal has type errors, to tell the errors the site already had from the ones the proposal adds. A proposal that typechecks cleanly is done in one check instead of two, which is most of them. A site with no lockfile on record no longer has one worked out for it unless the second check needs it.
+- Updated dependencies [[`155a079`](https://github.com/valbuild/val/commit/155a0792c2a437a1cbcdd6342131999be70e0d70)]:
+  - @valbuild/core@0.150.2
+
 ## 0.150.1
 
 ### Patch Changes

package/dist/declarations/src/internal/ApiRoutes.d.ts

@@ -2348,6 +2348,9 @@ export type ClientOf<Api extends ApiGuard> = <Route extends keyof Api, Method ex
     query: Endpoint["req"]["query"] extends Record<string, z.ZodSchema<ValidQueryParamTypes>> ? {
         [key in keyof Endpoint["req"]["query"]]: z.infer<Endpoint["req"]["query"][key]>;
     } : undefined;
+    headers: Endpoint["req"]["headers"] extends Record<string, z.ZodSchema<string | undefined>> ? {
+        [key in keyof Endpoint["req"]["headers"]]: z.infer<Endpoint["req"]["headers"][key]>;
+    } : undefined;
 }>) => Promise<z.infer<Endpoint["res"]> | ClientFetchErrors>;
 export type ClientFetchErrors = {
     status: 404;

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

@@ -3755,7 +3755,7 @@ var createValClient = function createValClient(host, config, options) {
   return /*#__PURE__*/function () {
     var _ref = slicedToArray._asyncToGenerator(/*#__PURE__*/slicedToArray._regenerator().m(function _callee2(path, method, req) {
       var _anyApi$path, _apiEndpoint$req$body;
-      var anyReq, fullPath, params, _i, _Object$keys, _anyReq$query, key, _anyReq$query2, _iterator, _step, value, _anyReq$query3, _anyReq$query4, apiEndpoint, reqBodyResult, res, _t;
+      var anyReq, fullPath, params, _i, _Object$keys, _anyReq$query, key, _anyReq$query2, _iterator, _step, value, _anyReq$query3, _anyReq$query4, apiEndpoint, reqBodyResult, headers, _i2, _Object$entries, _Object$entries$_i, name, _value, res, _t;
       return slicedToArray._regenerator().w(function (_context2) {
         while (1) switch (_context2.p = _context2.n) {
           case 0:
@@ -3838,13 +3838,22 @@ var createValClient = function createValClient(host, config, options) {
               }
             });
           case 2:
-            _context2.p = 2;
-            _context2.n = 3;
+            headers = {
+              "Content-Type": "application/json"
+            };
+            if (anyReq !== null && anyReq !== void 0 && anyReq.headers) {
+              for (_i2 = 0, _Object$entries = Object.entries(anyReq.headers); _i2 < _Object$entries.length; _i2++) {
+                _Object$entries$_i = slicedToArray._slicedToArray(_Object$entries[_i2], 2), name = _Object$entries$_i[0], _value = _Object$entries$_i[1];
+                if (typeof _value === "string") {
+                  headers[name] = _value;
+                }
+              }
+            }
+            _context2.p = 3;
+            _context2.n = 4;
             return send("".concat(host).concat(fullPath), {
               method: method,
-              headers: {
-                "Content-Type": "application/json"
-              },
+              headers: headers,
               body: anyReq.body !== undefined ? JSON.stringify(anyReq.body) : undefined
             }).then(/*#__PURE__*/function () {
               var _ref2 = slicedToArray._asyncToGenerator(/*#__PURE__*/slicedToArray._regenerator().m(function _callee(res) {
@@ -3936,11 +3945,11 @@ var createValClient = function createValClient(host, config, options) {
                 return _ref2.apply(this, arguments);
               };
             }());
-          case 3:
+          case 4:
             res = _context2.v;
             return _context2.a(2, res);
-          case 4:
-            _context2.p = 4;
+          case 5:
+            _context2.p = 5;
             _t = _context2.v;
             return _context2.a(2, {
               status: null,
@@ -3952,7 +3961,7 @@ var createValClient = function createValClient(host, config, options) {
               }
             });
         }
-      }, _callee2, null, [[2, 4]]);
+      }, _callee2, null, [[3, 5]]);
     }));
     return function (_x, _x2, _x3) {
       return _ref.apply(this, arguments);

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

@@ -3755,7 +3755,7 @@ var createValClient = function createValClient(host, config, options) {
   return /*#__PURE__*/function () {
     var _ref = slicedToArray._asyncToGenerator(/*#__PURE__*/slicedToArray._regenerator().m(function _callee2(path, method, req) {
       var _anyApi$path, _apiEndpoint$req$body;
-      var anyReq, fullPath, params, _i, _Object$keys, _anyReq$query, key, _anyReq$query2, _iterator, _step, value, _anyReq$query3, _anyReq$query4, apiEndpoint, reqBodyResult, res, _t;
+      var anyReq, fullPath, params, _i, _Object$keys, _anyReq$query, key, _anyReq$query2, _iterator, _step, value, _anyReq$query3, _anyReq$query4, apiEndpoint, reqBodyResult, headers, _i2, _Object$entries, _Object$entries$_i, name, _value, res, _t;
       return slicedToArray._regenerator().w(function (_context2) {
         while (1) switch (_context2.p = _context2.n) {
           case 0:
@@ -3838,13 +3838,22 @@ var createValClient = function createValClient(host, config, options) {
               }
             });
           case 2:
-            _context2.p = 2;
-            _context2.n = 3;
+            headers = {
+              "Content-Type": "application/json"
+            };
+            if (anyReq !== null && anyReq !== void 0 && anyReq.headers) {
+              for (_i2 = 0, _Object$entries = Object.entries(anyReq.headers); _i2 < _Object$entries.length; _i2++) {
+                _Object$entries$_i = slicedToArray._slicedToArray(_Object$entries[_i2], 2), name = _Object$entries$_i[0], _value = _Object$entries$_i[1];
+                if (typeof _value === "string") {
+                  headers[name] = _value;
+                }
+              }
+            }
+            _context2.p = 3;
+            _context2.n = 4;
             return send("".concat(host).concat(fullPath), {
               method: method,
-              headers: {
-                "Content-Type": "application/json"
-              },
+              headers: headers,
               body: anyReq.body !== undefined ? JSON.stringify(anyReq.body) : undefined
             }).then(/*#__PURE__*/function () {
               var _ref2 = slicedToArray._asyncToGenerator(/*#__PURE__*/slicedToArray._regenerator().m(function _callee(res) {
@@ -3936,11 +3945,11 @@ var createValClient = function createValClient(host, config, options) {
                 return _ref2.apply(this, arguments);
               };
             }());
-          case 3:
+          case 4:
             res = _context2.v;
             return _context2.a(2, res);
-          case 4:
-            _context2.p = 4;
+          case 5:
+            _context2.p = 5;
             _t = _context2.v;
             return _context2.a(2, {
               status: null,
@@ -3952,7 +3961,7 @@ var createValClient = function createValClient(host, config, options) {
               }
             });
         }
-      }, _callee2, null, [[2, 4]]);
+      }, _callee2, null, [[3, 5]]);
     }));
     return function (_x, _x2, _x3) {
       return _ref.apply(this, arguments);

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

@@ -3748,7 +3748,7 @@ var createValClient = function createValClient(host, config, options) {
   return /*#__PURE__*/function () {
     var _ref = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(path, method, req) {
       var _anyApi$path, _apiEndpoint$req$body;
-      var anyReq, fullPath, params, _i, _Object$keys, _anyReq$query, key, _anyReq$query2, _iterator, _step, value, _anyReq$query3, _anyReq$query4, apiEndpoint, reqBodyResult, res, _t;
+      var anyReq, fullPath, params, _i, _Object$keys, _anyReq$query, key, _anyReq$query2, _iterator, _step, value, _anyReq$query3, _anyReq$query4, apiEndpoint, reqBodyResult, headers, _i2, _Object$entries, _Object$entries$_i, name, _value, res, _t;
       return _regenerator().w(function (_context2) {
         while (1) switch (_context2.p = _context2.n) {
           case 0:
@@ -3831,13 +3831,22 @@ var createValClient = function createValClient(host, config, options) {
               }
             });
           case 2:
-            _context2.p = 2;
-            _context2.n = 3;
+            headers = {
+              "Content-Type": "application/json"
+            };
+            if (anyReq !== null && anyReq !== void 0 && anyReq.headers) {
+              for (_i2 = 0, _Object$entries = Object.entries(anyReq.headers); _i2 < _Object$entries.length; _i2++) {
+                _Object$entries$_i = _slicedToArray(_Object$entries[_i2], 2), name = _Object$entries$_i[0], _value = _Object$entries$_i[1];
+                if (typeof _value === "string") {
+                  headers[name] = _value;
+                }
+              }
+            }
+            _context2.p = 3;
+            _context2.n = 4;
             return send("".concat(host).concat(fullPath), {
               method: method,
-              headers: {
-                "Content-Type": "application/json"
-              },
+              headers: headers,
               body: anyReq.body !== undefined ? JSON.stringify(anyReq.body) : undefined
             }).then(/*#__PURE__*/function () {
               var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(res) {
@@ -3929,11 +3938,11 @@ var createValClient = function createValClient(host, config, options) {
                 return _ref2.apply(this, arguments);
               };
             }());
-          case 3:
+          case 4:
             res = _context2.v;
             return _context2.a(2, res);
-          case 4:
-            _context2.p = 4;
+          case 5:
+            _context2.p = 5;
             _t = _context2.v;
             return _context2.a(2, {
               status: null,
@@ -3945,7 +3954,7 @@ var createValClient = function createValClient(host, config, options) {
               }
             });
         }
-      }, _callee2, null, [[2, 4]]);
+      }, _callee2, null, [[3, 5]]);
     }));
     return function (_x, _x2, _x3) {
       return _ref.apply(this, arguments);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@valbuild/shared",
-  "version": "0.150.1",
+  "version": "0.150.2",
   "private": false,
   "description": "Val shared types and utilities",
   "repository": {
@@ -53,7 +53,7 @@
     "yaml": "^2.9.0",
     "zod": "^4.4.3",
     "zod-validation-error": "^5.0.0",
-    "@valbuild/core": "0.150.1"
+    "@valbuild/core": "0.150.2"
   },
   "files": [
     "CHANGELOG.md",

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

@@ -822,6 +822,7 @@ function sourceErrorOf(error, what) {
 function getJson(_x, _x2, _x3) {
   return _getJson.apply(this, arguments);
 }
+/** `fetch` as the caller's global has it, when no other is given. */
 function _getJson() {
   _getJson = slicedToArray._asyncToGenerator(/*#__PURE__*/slicedToArray._regenerator().m(function _callee4(fetchImpl, url, init) {
     var res, text, parsed, message;
@@ -856,11 +857,21 @@ function _getJson() {
   }));
   return _getJson.apply(this, arguments);
 }
+var defaultFetch = function defaultFetch() {
+  return fetch.apply(void 0, arguments);
+};
+
+/**
+ * Compilers already fetched, by the `fetch` that fetched them and their URL.
+ * A worker that checks a proposal and then the site asks for the same 13 MB
+ * twice, with a new `adeptSources` for each check, and a version's compiler
+ * is the same every time. A fetch that failed is not kept, so asking again
+ * asks again.
+ */
+var compilers = new WeakMap();
 function adeptSources(options) {
   var _options$fetch, _options$credentials;
-  var fetchImpl = (_options$fetch = options.fetch) !== null && _options$fetch !== void 0 ? _options$fetch : function () {
-    return fetch.apply(void 0, arguments);
-  };
+  var fetchImpl = (_options$fetch = options.fetch) !== null && _options$fetch !== void 0 ? _options$fetch : defaultFetch;
   var init = createForOfIteratorHelper._objectSpread2({
     credentials: (_options$credentials = options.credentials) !== null && _options$credentials !== void 0 ? _options$credentials : "same-origin"
   }, options.headers ? {
@@ -890,71 +901,93 @@ function adeptSources(options) {
       return _ref.apply(this, arguments);
     };
   }();
+  var fetchCompiler = /*#__PURE__*/function () {
+    var _ref2 = slicedToArray._asyncToGenerator(/*#__PURE__*/slicedToArray._regenerator().m(function _callee2(url, version) {
+      var what, answer;
+      return slicedToArray._regenerator().w(function (_context2) {
+        while (1) switch (_context2.n) {
+          case 0:
+            what = "TypeScript ".concat(version);
+            _context2.n = 1;
+            return get(url, what);
+          case 1:
+            answer = _context2.v;
+            if (!(!isRecord(answer) || !isTextFiles(answer["files"]))) {
+              _context2.n = 2;
+              break;
+            }
+            throw new acquireTypes.SourceError("".concat(what, ": adept answered without the compiler's files."), "unexpected-answer", false);
+          case 2:
+            return _context2.a(2, {
+              version: typeof answer["version"] === "string" ? answer["version"] : version,
+              files: answer["files"]
+            });
+        }
+      }, _callee2);
+    }));
+    return function fetchCompiler(_x6, _x7) {
+      return _ref2.apply(this, arguments);
+    };
+  }();
   return {
     types: function types(pkg) {
-      return slicedToArray._asyncToGenerator(/*#__PURE__*/slicedToArray._regenerator().m(function _callee2() {
+      return slicedToArray._asyncToGenerator(/*#__PURE__*/slicedToArray._regenerator().m(function _callee3() {
         var what, query, answer, stubs;
-        return slicedToArray._regenerator().w(function (_context2) {
-          while (1) switch (_context2.n) {
+        return slicedToArray._regenerator().w(function (_context3) {
+          while (1) switch (_context3.n) {
             case 0:
               what = "The types of ".concat(pkg.name, "@").concat(pkg.version);
               query = pkg.integrity ? "?integrity=".concat(encodeURIComponent(pkg.integrity)) : "";
-              _context2.n = 1;
+              _context3.n = 1;
               return get("".concat(options.base, "/types/public/").concat(pkg.name, "@").concat(pkg.version).concat(query), what);
             case 1:
-              answer = _context2.v;
+              answer = _context3.v;
               if (!(!isRecord(answer) || !isTextFiles(answer["files"]))) {
-                _context2.n = 2;
+                _context3.n = 2;
                 break;
               }
               throw new acquireTypes.SourceError("".concat(what, ": adept answered without a bundle."), "unexpected-answer", false);
             case 2:
               stubs = answer["stubs"];
-              return _context2.a(2, {
+              return _context3.a(2, {
                 files: answer["files"],
                 stubs: Array.isArray(stubs) ? stubs.filter(function (stub) {
                   return typeof stub === "string";
                 }) : []
               });
           }
-        }, _callee2);
+        }, _callee3);
       }))();
     },
     compiler: function compiler(version) {
-      return slicedToArray._asyncToGenerator(/*#__PURE__*/slicedToArray._regenerator().m(function _callee3() {
-        var what, answer;
-        return slicedToArray._regenerator().w(function (_context3) {
-          while (1) switch (_context3.n) {
-            case 0:
-              what = "TypeScript ".concat(version);
-              _context3.n = 1;
-              return get("".concat(options.base, "/compiler/").concat(version), what);
-            case 1:
-              answer = _context3.v;
-              if (!(!isRecord(answer) || !isTextFiles(answer["files"]))) {
-                _context3.n = 2;
-                break;
-              }
-              throw new acquireTypes.SourceError("".concat(what, ": adept answered without the compiler's files."), "unexpected-answer", false);
-            case 2:
-              return _context3.a(2, {
-                version: typeof answer["version"] === "string" ? answer["version"] : version,
-                files: answer["files"]
-              });
-          }
-        }, _callee3);
-      }))();
+      var _compilers$get;
+      var url = "".concat(options.base, "/compiler/").concat(version);
+      var kept = (_compilers$get = compilers.get(fetchImpl)) !== null && _compilers$get !== void 0 ? _compilers$get : new Map();
+      compilers.set(fetchImpl, kept);
+      var held = kept.get(url);
+      if (held !== undefined) return held;
+      var fetching = fetchCompiler(url, version);
+      kept.set(url, fetching);
+      fetching["catch"](function () {
+        if (kept.get(url) === fetching) kept["delete"](url);
+      });
+      return fetching;
     }
   };
 }
 
 /*
  * The typecheck of a proposal whose dependencies are its own (valbuild/home
- * `docs/adept.md`, decision 20): the site's code with the site's lockfile --
- * the base -- and the proposal's code with its lockfile, each checked as it
- * would be after `pnpm install`, in the browser. Only the errors the base
- * does not have count, and content is told them: a proposal with dependencies
- * of its own is not published until a typecheck of what it stages has none.
+ * `docs/adept.md`, decision 20): the proposal's code with its lockfile and,
+ * only when that has errors, the site's code with the site's lockfile -- the
+ * base -- each checked as it would be after `pnpm install`, in the browser.
+ * Only the errors the base does not have count, and content is told them: a
+ * proposal with dependencies of its own is not published until a typecheck
+ * of what it stages has none.
+ *
+ * The proposal goes first because a proposal without errors adds none,
+ * whatever the base has, and that is most of them: the base is checked only
+ * to tell the errors the site already had from the ones the proposal adds.
  */
 
 /** At most this many of the new errors are sent; the count says how many. */
@@ -1002,78 +1035,95 @@ function runProposalTypecheck(_x) {
 
 /** New errors by file, each file's in order: how the dialog lists them. */
 function _runProposalTypecheck() {
-  _runProposalTypecheck = slicedToArray._asyncToGenerator(/*#__PURE__*/slicedToArray._regenerator().m(function _callee(deps) {
-    var _deps$onStep, _yield$deps$siteSourc, _ref5, _recorded$LOCKFILE, _ref6, _recorded$WORKSPACE, _project$LOCKFILE, _project$WORKSPACE;
-    var read, inputs, site, recorded, baseLockfile, _deps$onStep2, packageJson, baseWorkspace, withoutLockfile, project, checkOne, base, next, errors, typecheck, _t, _t2, _t3;
-    return slicedToArray._regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
+  _runProposalTypecheck = slicedToArray._asyncToGenerator(/*#__PURE__*/slicedToArray._regenerator().m(function _callee2(deps) {
+    var _deps$onStep, _yield$deps$siteSourc, _ref7, _recorded$WORKSPACE, _project$LOCKFILE, _project$WORKSPACE, _base$errors;
+    var read, inputs, site, recorded, computed, baseLockfile, baseWorkspace, withoutLockfile, project, checkOne, next, base, errors, typecheck, _t, _t2, _t3, _t4, _t5, _t6, _t7, _t8, _t9;
+    return slicedToArray._regenerator().w(function (_context2) {
+      while (1) switch (_context2.n) {
         case 0:
           (_deps$onStep = deps.onStep) === null || _deps$onStep === void 0 || _deps$onStep.call(deps, {
             step: "reading"
           });
-          _context.n = 1;
+          _context2.n = 1;
           return deps.client.files(deps.name);
         case 1:
-          read = _context.v;
+          read = _context2.v;
           inputs = read.staged.inputs;
           if (!(inputs === null)) {
-            _context.n = 2;
+            _context2.n = 2;
             break;
           }
-          return _context.a(2, {
+          return _context2.a(2, {
             status: "nothing-staged"
           });
         case 2:
-          _context.n = 3;
+          _context2.n = 3;
           return deps.siteSource();
         case 3:
-          _t2 = _yield$deps$siteSourc = _context.v;
+          _t2 = _yield$deps$siteSourc = _context2.v;
           _t = _t2 !== null;
           if (!_t) {
-            _context.n = 4;
+            _context2.n = 4;
             break;
           }
           _t = _yield$deps$siteSourc !== void 0;
         case 4:
           if (!_t) {
-            _context.n = 5;
+            _context2.n = 5;
             break;
           }
           _t3 = _yield$deps$siteSourc;
-          _context.n = 6;
+          _context2.n = 6;
           break;
         case 5:
           _t3 = {};
         case 6:
           site = _t3;
-          _context.n = 7;
+          _context2.n = 7;
           return deps.siteDependencyFiles();
         case 7:
-          recorded = _context.v;
-          baseLockfile = (_ref5 = (_recorded$LOCKFILE = recorded[LOCKFILE]) !== null && _recorded$LOCKFILE !== void 0 ? _recorded$LOCKFILE : site[LOCKFILE]) !== null && _ref5 !== void 0 ? _ref5 : null;
-          if (!(baseLockfile === null)) {
-            _context.n = 10;
-            break;
-          }
-          // A site made before proposals carried dependencies has no lockfile on
-          // record: the base is checked against one computed from its package.json,
-          // as `pnpm install` would make it.
-          packageJson = site["package.json"];
-          if (!(packageJson === undefined)) {
-            _context.n = 8;
-            break;
-          }
-          throw new Error("The site has no package.json, so there is nothing to check the proposal against.");
-        case 8:
-          (_deps$onStep2 = deps.onStep) === null || _deps$onStep2 === void 0 || _deps$onStep2.call(deps, {
-            step: "lockfile"
-          });
-          _context.n = 9;
-          return deps.computeLockfile(packageJson, deps.signal);
-        case 9:
-          baseLockfile = _context.v;
-        case 10:
-          baseWorkspace = (_ref6 = (_recorded$WORKSPACE = recorded[WORKSPACE]) !== null && _recorded$WORKSPACE !== void 0 ? _recorded$WORKSPACE : site[WORKSPACE]) !== null && _ref6 !== void 0 ? _ref6 : null;
+          recorded = _context2.v;
+          computed = null;
+          baseLockfile = /*#__PURE__*/function () {
+            var _ref5 = slicedToArray._asyncToGenerator(/*#__PURE__*/slicedToArray._regenerator().m(function _callee() {
+              var _ref6, _recorded$LOCKFILE, _deps$onStep2;
+              var lockfile, packageJson;
+              return slicedToArray._regenerator().w(function (_context) {
+                while (1) switch (_context.n) {
+                  case 0:
+                    lockfile = (_ref6 = (_recorded$LOCKFILE = recorded[LOCKFILE]) !== null && _recorded$LOCKFILE !== void 0 ? _recorded$LOCKFILE : site[LOCKFILE]) !== null && _ref6 !== void 0 ? _ref6 : computed;
+                    if (!(lockfile !== null)) {
+                      _context.n = 1;
+                      break;
+                    }
+                    return _context.a(2, lockfile);
+                  case 1:
+                    // A site made before proposals carried dependencies has no lockfile on
+                    // record: the base is checked against one computed from its package.json,
+                    // as `pnpm install` would make it.
+                    packageJson = site["package.json"];
+                    if (!(packageJson === undefined)) {
+                      _context.n = 2;
+                      break;
+                    }
+                    throw new Error("The site has no package.json, so there is nothing to check the proposal against.");
+                  case 2:
+                    (_deps$onStep2 = deps.onStep) === null || _deps$onStep2 === void 0 || _deps$onStep2.call(deps, {
+                      step: "lockfile"
+                    });
+                    _context.n = 3;
+                    return deps.computeLockfile(packageJson, deps.signal);
+                  case 3:
+                    computed = _context.v;
+                    return _context.a(2, computed);
+                }
+              }, _callee);
+            }));
+            return function baseLockfile() {
+              return _ref5.apply(this, arguments);
+            };
+          }();
+          baseWorkspace = (_ref7 = (_recorded$WORKSPACE = recorded[WORKSPACE]) !== null && _recorded$WORKSPACE !== void 0 ? _recorded$WORKSPACE : site[WORKSPACE]) !== null && _ref7 !== void 0 ? _ref7 : null;
           withoutLockfile = function withoutLockfile(files) {
             var out = createForOfIteratorHelper._objectSpread2({}, files);
             delete out[LOCKFILE];
@@ -1096,34 +1146,63 @@ function _runProposalTypecheck() {
                 });
               }
             });
-          }; // One after the other: the worker that loaded the compiler for the first
-          // reuses it for the second.
-          _context.n = 11;
-          return checkOne("site", site, baseLockfile, baseWorkspace);
+          };
+          _t4 = checkOne;
+          _t5 = project;
+          if (!((_project$LOCKFILE = project[LOCKFILE]) !== null && _project$LOCKFILE !== void 0)) {
+            _context2.n = 8;
+            break;
+          }
+          _t6 = _project$LOCKFILE;
+          _context2.n = 10;
+          break;
+        case 8:
+          _context2.n = 9;
+          return baseLockfile();
+        case 9:
+          _t6 = _context2.v;
+        case 10:
+          _context2.n = 11;
+          return _t4("proposal", _t5, _t6, (_project$WORKSPACE = project[WORKSPACE]) !== null && _project$WORKSPACE !== void 0 ? _project$WORKSPACE : baseWorkspace);
         case 11:
-          base = _context.v;
-          _context.n = 12;
-          return checkOne("proposal", project, (_project$LOCKFILE = project[LOCKFILE]) !== null && _project$LOCKFILE !== void 0 ? _project$LOCKFILE : baseLockfile, (_project$WORKSPACE = project[WORKSPACE]) !== null && _project$WORKSPACE !== void 0 ? _project$WORKSPACE : baseWorkspace);
+          next = _context2.v;
+          if (!(next.errors.length === 0)) {
+            _context2.n = 12;
+            break;
+          }
+          _t7 = null;
+          _context2.n = 15;
+          break;
         case 12:
-          next = _context.v;
-          errors = newErrors(base.errors, next.errors).map(reportedError);
-          _context.n = 13;
+          _t8 = checkOne;
+          _t9 = site;
+          _context2.n = 13;
+          return baseLockfile();
+        case 13:
+          _context2.n = 14;
+          return _t8("site", _t9, _context2.v, baseWorkspace);
+        case 14:
+          _t7 = _context2.v;
+        case 15:
+          base = _t7;
+          errors = newErrors((_base$errors = base === null || base === void 0 ? void 0 : base.errors) !== null && _base$errors !== void 0 ? _base$errors : [], next.errors).map(reportedError);
+          _context2.n = 16;
           return deps.client.reportTypecheck(deps.name, createForOfIteratorHelper._objectSpread2({
             inputs: inputs,
             newErrors: errors.slice(0, MAX_REPORTED_ERRORS)
           }, errors.length > MAX_REPORTED_ERRORS ? {
             count: errors.length
           } : {}));
-        case 13:
-          typecheck = _context.v;
-          return _context.a(2, {
+        case 16:
+          typecheck = _context2.v;
+          return _context2.a(2, {
             status: "checked",
             inputs: inputs,
             errors: errors,
             typecheck: typecheck
           });
       }
-    }, _callee);
+    }, _callee2);
   }));
   return _runProposalTypecheck.apply(this, arguments);
 }