@valbuild/shared 0.149.7 → 0.150.2

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

@@ -819,6 +819,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 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee4(fetchImpl, url, init) {
     var res, text, parsed, message;
@@ -853,11 +854,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 = _objectSpread2({
     credentials: (_options$credentials = options.credentials) !== null && _options$credentials !== void 0 ? _options$credentials : "same-origin"
   }, options.headers ? {
@@ -887,71 +898,93 @@ function adeptSources(options) {
       return _ref.apply(this, arguments);
     };
   }();
+  var fetchCompiler = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2(url, version) {
+      var what, answer;
+      return _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 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 _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee2() {
+      return _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
         var what, query, answer, stubs;
-        return _regenerator().w(function (_context2) {
-          while (1) switch (_context2.n) {
+        return _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 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 _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee3() {
-        var what, answer;
-        return _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 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. */
@@ -999,78 +1032,95 @@ function runProposalTypecheck(_x) {
 
 /** New errors by file, each file's in order: how the dialog lists them. */
 function _runProposalTypecheck() {
-  _runProposalTypecheck = _asyncToGenerator(/*#__PURE__*/_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 _regenerator().w(function (_context) {
-      while (1) switch (_context.n) {
+  _runProposalTypecheck = _asyncToGenerator(/*#__PURE__*/_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 _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 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
+              var _ref6, _recorded$LOCKFILE, _deps$onStep2;
+              var lockfile, packageJson;
+              return _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 = _objectSpread2({}, files);
             delete out[LOCKFILE];
@@ -1093,34 +1143,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, _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);
 }