@valbuild/core 0.97.7 → 0.99.1

package/dist/declarations/src/schema/array.d.ts

@@ -13,6 +13,16 @@ export type SerializedArraySchema = {
     hidden?: boolean;
     description?: string;
 };
+type ArrayRenderInput<T extends Schema<SelectorSource>> = {
+    as: "list";
+    select: (input: {
+        val: RenderSelector<T>;
+    }) => {
+        title: string;
+        subtitle?: string | null;
+        image?: ImageSource | null;
+    };
+};
 export declare class ArraySchema<T extends Schema<SelectorSource>, Src extends SelectorOfSchema<T>[] | null> extends Schema<Src> {
     private readonly item;
     private readonly opt;
@@ -20,7 +30,8 @@ export declare class ArraySchema<T extends Schema<SelectorSource>, Src extends S
     private readonly isReadonly;
     private readonly isHidden;
     private readonly description?;
-    constructor(item: T, opt?: boolean, customValidateFunctions?: ((src: Src) => false | string)[], isReadonly?: boolean, isHidden?: boolean, description?: string | undefined);
+    private readonly renderInput;
+    constructor(item: T, opt?: boolean, customValidateFunctions?: ((src: Src) => false | string)[], isReadonly?: boolean, isHidden?: boolean, description?: string | undefined, renderInput?: ArrayRenderInput<T> | null);
     describe(description: string | null): ArraySchema<T, Src>;
     validate(validationFunction: (src: Src) => false | string): ArraySchema<T, Src>;
     protected executeValidate(path: SourcePath, src: Src): ValidationErrors;
@@ -29,17 +40,8 @@ export declare class ArraySchema<T extends Schema<SelectorSource>, Src extends S
     readonly(): ArraySchema<T, Src>;
     hidden(): ArraySchema<T, Src>;
     protected executeSerialize(): SerializedArraySchema;
-    private renderInput;
     protected executeRender(sourcePath: SourcePath | ModuleFilePath, src: Src): ReifiedRender;
-    render(input: {
-        as: "list";
-        select: (input: {
-            val: RenderSelector<T>;
-        }) => {
-            title: string;
-            subtitle?: string | null;
-            image?: ImageSource | null;
-        };
-    }): this;
+    render(input: ArrayRenderInput<T>): ArraySchema<T, Src>;
 }
 export declare const array: <S extends Schema<SelectorSource>>(schema: S) => ArraySchema<S, SelectorOfSchema<S>[]>;
+export {};

package/dist/declarations/src/schema/record.d.ts

@@ -30,6 +30,17 @@ export type SerializedRecordSchema = {
     hidden?: boolean;
     description?: string;
 };
+type RecordRenderInput<T extends Schema<SelectorSource>> = {
+    layout: "list";
+    select: (input: {
+        key: string;
+        val: RenderSelector<T>;
+    }) => {
+        title: string;
+        subtitle?: string | null;
+        image?: ImageSource | RemoteSource<ImageMetadata> | null;
+    };
+};
 export declare class RecordSchema<T extends Schema<SelectorSource>, K extends Schema<string>, Src extends Record<SelectorOfSchema<K>, SelectorOfSchema<T>> | null> extends Schema<Src> {
     private readonly item;
     private readonly opt;
@@ -40,7 +51,8 @@ export declare class RecordSchema<T extends Schema<SelectorSource>, K extends Sc
     private readonly isReadonly;
     private readonly isHidden;
     private readonly description?;
-    constructor(item: T, opt?: boolean, customValidateFunctions?: CustomValidateFunction<Src>[], currentRouter?: ValRouter | null, keySchema?: Schema<string> | null, mediaOptions?: MediaOptions | undefined, isReadonly?: boolean, isHidden?: boolean, description?: string | undefined);
+    private readonly renderInput;
+    constructor(item: T, opt?: boolean, customValidateFunctions?: CustomValidateFunction<Src>[], currentRouter?: ValRouter | null, keySchema?: Schema<string> | null, mediaOptions?: MediaOptions | undefined, isReadonly?: boolean, isHidden?: boolean, description?: string | undefined, renderInput?: RecordRenderInput<T> | null);
     describe(description: string | null): RecordSchema<T, K, Src>;
     validate(validationFunction: (src: Src) => false | string): RecordSchema<T, K, Src>;
     protected executeValidate(path: SourcePath, src: Src): ValidationErrors;
@@ -58,7 +70,6 @@ export declare class RecordSchema<T extends Schema<SelectorSource>, K extends Sc
     remote(): RecordSchema<T, K, Src>;
     private getRouterValidations;
     protected executeSerialize(): SerializedRecordSchema;
-    private renderInput;
     protected executeRender(sourcePath: SourcePath | ModuleFilePath, src: Src): ReifiedRender;
     render(input: {
         as: "list";
@@ -70,7 +81,7 @@ export declare class RecordSchema<T extends Schema<SelectorSource>, K extends Sc
             subtitle?: string | null;
             image?: ImageSource | RemoteSource<ImageMetadata> | null;
         };
-    }): this;
+    }): RecordSchema<T, K, Src>;
 }
 export declare function record<K extends Schema<string>, S extends Schema<SelectorSource>>(key: K, schema: S): RecordSchema<S, K, Record<SelectorOfSchema<K>, SelectorOfSchema<S>>>;
 export declare function record<S extends Schema<SelectorSource>>(schema: S): RecordSchema<S, Schema<string>, Record<string, SelectorOfSchema<S>>>;

package/dist/declarations/src/schema/validation/ValidationFix.d.ts

@@ -1,2 +1,2 @@
-export declare const ValidationFix: readonly ["image:add-metadata", "image:check-metadata", "image:upload-remote", "image:download-remote", "image:check-remote", "images:check-remote", "file:add-metadata", "file:check-metadata", "file:upload-remote", "file:download-remote", "file:check-remote", "files:check-remote", "keyof:check-keys", "router:check-route", "images:check-unique-folder", "files:check-unique-folder", "images:check-all-files", "files:check-all-files"];
+export declare const ValidationFix: readonly ["image:add-metadata", "image:check-metadata", "image:upload-remote", "image:download-remote", "image:check-remote", "images:check-remote", "images:upload-remote", "file:add-metadata", "file:check-metadata", "file:upload-remote", "file:download-remote", "file:check-remote", "files:check-remote", "files:upload-remote", "keyof:check-keys", "router:check-route", "images:check-unique-folder", "files:check-unique-folder", "images:check-all-files", "files:check-all-files"];
 export type ValidationFix = (typeof ValidationFix)[number];

package/dist/{index-802570f7.esm.js → index-204b5d78.esm.js}

@@ -1175,27 +1175,28 @@ var ArraySchema = /*#__PURE__*/function (_Schema) {
     var isReadonly = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : false;
     var isHidden = arguments.length > 4 && arguments[4] !== undefined ? arguments[4] : false;
     var description = arguments.length > 5 ? arguments[5] : undefined;
+    var renderInput = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : null;
     _classCallCheck(this, ArraySchema);
     _this = _callSuper(this, ArraySchema);
-    _defineProperty(_this, "renderInput", null);
     _this.item = item;
     _this.opt = opt;
     _this.customValidateFunctions = customValidateFunctions;
     _this.isReadonly = isReadonly;
     _this.isHidden = isHidden;
     _this.description = description;
+    _this.renderInput = renderInput;
     return _this;
   }
   _inherits(ArraySchema, _Schema);
   return _createClass(ArraySchema, [{
     key: "describe",
     value: function describe(description) {
-      return new ArraySchema(this.item, this.opt, this.customValidateFunctions, this.isReadonly, this.isHidden, description !== null && description !== void 0 ? description : undefined);
+      return new ArraySchema(this.item, this.opt, this.customValidateFunctions, this.isReadonly, this.isHidden, description !== null && description !== void 0 ? description : undefined, this.renderInput);
     }
   }, {
     key: "validate",
     value: function validate(validationFunction) {
-      return new ArraySchema(this.item, this.opt, [].concat(_toConsumableArray(this.customValidateFunctions), [validationFunction]), this.isReadonly, this.isHidden, this.description);
+      return new ArraySchema(this.item, this.opt, [].concat(_toConsumableArray(this.customValidateFunctions), [validationFunction]), this.isReadonly, this.isHidden, this.description, this.renderInput);
     }
   }, {
     key: "executeValidate",
@@ -1262,17 +1263,17 @@ var ArraySchema = /*#__PURE__*/function (_Schema) {
   }, {
     key: "nullable",
     value: function nullable() {
-      return new ArraySchema(this.item, true, [], this.isReadonly, this.isHidden, this.description);
+      return new ArraySchema(this.item, true, [], this.isReadonly, this.isHidden, this.description, this.renderInput);
     }
   }, {
     key: "readonly",
     value: function readonly() {
-      return new ArraySchema(this.item, this.opt, this.customValidateFunctions, true, this.isHidden, this.description);
+      return new ArraySchema(this.item, this.opt, this.customValidateFunctions, true, this.isHidden, this.description, this.renderInput);
     }
   }, {
     key: "hidden",
     value: function hidden() {
-      return new ArraySchema(this.item, this.opt, this.customValidateFunctions, this.isReadonly, true, this.description);
+      return new ArraySchema(this.item, this.opt, this.customValidateFunctions, this.isReadonly, true, this.description, this.renderInput);
     }
   }, {
     key: "executeSerialize",
@@ -1352,8 +1353,7 @@ var ArraySchema = /*#__PURE__*/function (_Schema) {
   }, {
     key: "render",
     value: function render(input) {
-      this.renderInput = input;
-      return this;
+      return new ArraySchema(this.item, this.opt, this.customValidateFunctions, this.isReadonly, this.isHidden, this.description, input);
     }
   }]);
 }(Schema);
@@ -2946,9 +2946,9 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
     var isReadonly = arguments.length > 6 && arguments[6] !== undefined ? arguments[6] : false;
     var isHidden = arguments.length > 7 && arguments[7] !== undefined ? arguments[7] : false;
     var description = arguments.length > 8 ? arguments[8] : undefined;
+    var renderInput = arguments.length > 9 && arguments[9] !== undefined ? arguments[9] : null;
     _classCallCheck(this, RecordSchema);
     _this = _callSuper(this, RecordSchema);
-    _defineProperty(_this, "renderInput", null);
     _this.item = item;
     _this.opt = opt;
     _this.customValidateFunctions = customValidateFunctions;
@@ -2958,18 +2958,19 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
     _this.isReadonly = isReadonly;
     _this.isHidden = isHidden;
     _this.description = description;
+    _this.renderInput = renderInput;
     return _this;
   }
   _inherits(RecordSchema, _Schema);
   return _createClass(RecordSchema, [{
     key: "describe",
     value: function describe(description) {
-      return new RecordSchema(this.item, this.opt, this.customValidateFunctions, this.currentRouter, this.keySchema, this.mediaOptions, this.isReadonly, this.isHidden, description !== null && description !== void 0 ? description : undefined);
+      return new RecordSchema(this.item, this.opt, this.customValidateFunctions, this.currentRouter, this.keySchema, this.mediaOptions, this.isReadonly, this.isHidden, description !== null && description !== void 0 ? description : undefined, this.renderInput);
     }
   }, {
     key: "validate",
     value: function validate(validationFunction) {
-      return new RecordSchema(this.item, this.opt, [].concat(_toConsumableArray(this.customValidateFunctions), [validationFunction]), this.currentRouter, this.keySchema, this.mediaOptions, this.isReadonly, this.isHidden, this.description);
+      return new RecordSchema(this.item, this.opt, [].concat(_toConsumableArray(this.customValidateFunctions), [validationFunction]), this.currentRouter, this.keySchema, this.mediaOptions, this.isReadonly, this.isHidden, this.description, this.renderInput);
     }
   }, {
     key: "executeValidate",
@@ -3152,6 +3153,13 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
             value: key
           }]);
         }
+        // Local path in a remote gallery: needs to be uploaded to remote.
+        var uploadRemoteFix = type === "images" ? "images:upload-remote" : "files:upload-remote";
+        return _defineProperty({}, path, [{
+          message: "Expected a remote ".concat(type === "images" ? "image" : "file", ", but got a local path. Use Val tooling (CLI --fix, VS Code extension, or Val Studio) to upload it. Got: ").concat(key),
+          value: key,
+          fixes: [uploadRemoteFix]
+        }]);
       } else {
         // When remote is disabled, only accept local paths
         if (isRemoteUrl) {
@@ -3318,29 +3326,29 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
   }, {
     key: "nullable",
     value: function nullable() {
-      return new RecordSchema(this.item, true, this.customValidateFunctions, this.currentRouter, this.keySchema, this.mediaOptions, this.isReadonly, this.isHidden, this.description);
+      return new RecordSchema(this.item, true, this.customValidateFunctions, this.currentRouter, this.keySchema, this.mediaOptions, this.isReadonly, this.isHidden, this.description, this.renderInput);
     }
   }, {
     key: "readonly",
     value: function readonly() {
-      return new RecordSchema(this.item, this.opt, this.customValidateFunctions, this.currentRouter, this.keySchema, this.mediaOptions, true, this.isHidden, this.description);
+      return new RecordSchema(this.item, this.opt, this.customValidateFunctions, this.currentRouter, this.keySchema, this.mediaOptions, true, this.isHidden, this.description, this.renderInput);
     }
   }, {
     key: "hidden",
     value: function hidden() {
-      return new RecordSchema(this.item, this.opt, this.customValidateFunctions, this.currentRouter, this.keySchema, this.mediaOptions, this.isReadonly, true, this.description);
+      return new RecordSchema(this.item, this.opt, this.customValidateFunctions, this.currentRouter, this.keySchema, this.mediaOptions, this.isReadonly, true, this.description, this.renderInput);
     }
   }, {
     key: "router",
     value: function router(_router) {
-      return new RecordSchema(this.item, this.opt, this.customValidateFunctions, _router, this.keySchema, this.mediaOptions, this.isReadonly, this.isHidden, this.description);
+      return new RecordSchema(this.item, this.opt, this.customValidateFunctions, _router, this.keySchema, this.mediaOptions, this.isReadonly, this.isHidden, this.description, this.renderInput);
     }
   }, {
     key: "remote",
     value: function remote() {
       return new RecordSchema(this.item, this.opt, this.customValidateFunctions, this.currentRouter, this.keySchema, this.mediaOptions ? _objectSpread2(_objectSpread2({}, this.mediaOptions), {}, {
         remote: true
-      }) : undefined, this.isReadonly, this.isHidden, this.description);
+      }) : undefined, this.isReadonly, this.isHidden, this.description, this.renderInput);
     }
   }, {
     key: "getRouterValidations",
@@ -3445,10 +3453,10 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
             data: {
               layout: "list",
               parent: "record",
-              items: Object.entries(src).map(function (_ref13) {
-                var _ref14 = _slicedToArray(_ref13, 2),
-                  key = _ref14[0],
-                  val = _ref14[1];
+              items: Object.entries(src).map(function (_ref14) {
+                var _ref15 = _slicedToArray(_ref14, 2),
+                  key = _ref15[0],
+                  val = _ref15[1];
                 // NB NB: display is actually defined by the user
                 var _prepare = prepare({
                     key: key,
@@ -3477,11 +3485,10 @@ var RecordSchema = /*#__PURE__*/function (_Schema) {
   }, {
     key: "render",
     value: function render(input) {
-      this.renderInput = {
+      return new RecordSchema(this.item, this.opt, this.customValidateFunctions, this.currentRouter, this.keySchema, this.mediaOptions, this.isReadonly, this.isHidden, this.description, {
         layout: input.as,
         select: input.select
-      };
-      return this;
+      });
     }
   }]);
 }(Schema);
@@ -5153,24 +5160,6 @@ function modules(config, modules) {
   };
 }
 
-function _regeneratorValues(e) {
-  if (null != e) {
-    var t = e["function" == typeof Symbol && Symbol.iterator || "@@iterator"],
-      r = 0;
-    if (t) return t.call(e);
-    if ("function" == typeof e.next) return e;
-    if (!isNaN(e.length)) return {
-      next: function () {
-        return e && r >= e.length && (e = void 0), {
-          value: e && e[r++],
-          done: !e
-        };
-      }
-    };
-  }
-  throw new TypeError(typeof e + " is not iterable");
-}
-
 function _regeneratorDefine(e, r, n, t) {
   var i = Object.defineProperty;
   try {
@@ -5640,10 +5629,11 @@ var getSHA256Hash = function getSHA256Hash(bits) {
   return createHash().update(bits).digest("hex");
 };
 
-// Lazily constructed: this module is also evaluated inside the QuickJS
-// sandbox (when user val modules import @valbuild/core), and that sandbox
-// has no `TextEncoder` global. `hash()` is never called from inside the
-// sandbox, so deferring construction avoids a ReferenceError at import time.
+// Lazily constructed: this module is also evaluated inside the `vm` sandbox
+// used by loadValModules (when user val modules import @valbuild/core), and
+// that sandbox has no `TextEncoder` global. `hash()` is never called from
+// inside the sandbox, so deferring construction avoids a ReferenceError at
+// import time.
 var textEncoder;
 function getTextEncoder() {
   if (!textEncoder) {
@@ -5651,6 +5641,29 @@ function getTextEncoder() {
   }
   return textEncoder;
 }
+function errorMessage(e) {
+  // NOT `e instanceof Error`. Val modules are evaluated inside a `node:vm`
+  // context, so an error thrown from inside the sandbox is built from THAT
+  // realm's Error constructor and fails the instanceof check - and
+  // JSON.stringify flattens it to "{}", throwing away the only useful part.
+  // Duck-type the message instead (the same reason the schema check below
+  // avoids `instanceof Schema`).
+  if (_typeof(e) === "object" && e !== null && "message" in e) {
+    var message = e.message;
+    if (typeof message === "string") {
+      return message;
+    }
+  }
+  if (typeof e === "string") {
+    return e;
+  }
+  try {
+    var _JSON$stringify;
+    return (_JSON$stringify = JSON.stringify(e)) !== null && _JSON$stringify !== void 0 ? _JSON$stringify : String(e);
+  } catch (_unused) {
+    return String(e);
+  }
+}
 function hash(input) {
   if (_typeof(input) === "object") {
     return hashObject(input);
@@ -5705,127 +5718,159 @@ function extractValModules(_x) {
 }
 function _extractValModules() {
   _extractValModules = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(valModules) {
-    var moduleErrors, addModuleError, sources, schemas, serializedSchemas, configSha, sourcesSha, baseSha, schemaSha, _loop, _ret, moduleIdx;
-    return _regenerator().w(function (_context2) {
-      while (1) switch (_context2.n) {
+    var moduleErrors, addModuleError, sources, schemas, serializedSchemas, configSha, sourcesSha, baseSha, schemaSha, moduleIdx, module, at, value, path, schema, source, serializedSchema, pathM, _t, _t2;
+    return _regenerator().w(function (_context) {
+      while (1) switch (_context.p = _context.n) {
         case 0:
-          moduleErrors = [];
-          addModuleError = function addModuleError(message, index, path) {
-            moduleErrors[index] = {
+          moduleErrors = []; // NOTE: push (not index assignment) - a sparse array makes consumers that
+          // use Array.prototype.find (which visits holes) crash on undefined entries.
+          addModuleError = function addModuleError(message, path) {
+            moduleErrors.push({
               message: message,
               path: path
-            };
+            });
           };
           sources = {};
           schemas = {};
           serializedSchemas = {};
           configSha = hash(JSON.stringify(valModules.config));
           sourcesSha = "";
-          baseSha = configSha;
-          schemaSha = configSha;
-          _loop = /*#__PURE__*/_regenerator().m(function _loop(moduleIdx) {
-            var module;
-            return _regenerator().w(function (_context) {
-              while (1) switch (_context.n) {
-                case 0:
-                  module = valModules.modules[moduleIdx];
-                  if (module.def) {
-                    _context.n = 1;
-                    break;
-                  }
-                  addModuleError("val.modules is missing 'def' property", moduleIdx);
-                  return _context.a(2, 0);
-                case 1:
-                  if (!(typeof module.def !== "function")) {
-                    _context.n = 2;
-                    break;
-                  }
-                  addModuleError("val.modules 'def' property is not a function", moduleIdx);
-                  return _context.a(2, 0);
-                case 2:
-                  _context.n = 3;
-                  return module.def().then(function (value) {
-                    if (!value) {
-                      addModuleError("val.modules 'def' did not return a value", moduleIdx);
-                      return;
-                    }
-                    if (!value["default"]) {
-                      addModuleError("val.modules 'def' did not return a default export", moduleIdx);
-                      return;
-                    }
-                    var path = getValPath(value["default"]);
-                    if (path === undefined) {
-                      addModuleError("path is undefined", moduleIdx);
-                      return;
-                    }
-                    var schema = getSchema(value["default"]);
-                    if (schema === undefined) {
-                      addModuleError("schema in path '".concat(path, "' is undefined"), moduleIdx, path);
-                      return;
-                    }
-                    // Avoid `schema instanceof Schema` — the editor SPA and the host
-                    // Next.js bundle each ship their own copy of @valbuild/core, so the
-                    // `Schema` class identity differs between them and the instanceof
-                    // check would fail for cross-bundle modules. The executeSerialize
-                    // check below is the actual contract we depend on.
-                    if (typeof schema["executeSerialize"] !== "function") {
-                      addModuleError("schema.serialize in path '".concat(path, "' is not a function"), moduleIdx, path);
-                      return;
-                    }
-                    var source = getSource(value["default"]);
-                    if (source === undefined) {
-                      addModuleError("source in ".concat(path, " is undefined"), moduleIdx, path);
-                      return;
-                    }
-                    var serializedSchema;
-                    try {
-                      serializedSchema = schema["executeSerialize"]();
-                    } catch (e) {
-                      var message = e instanceof Error ? e.message : JSON.stringify(e);
-                      addModuleError("Could not serialize module: '".concat(path, "'. Error: ").concat(message), moduleIdx, path);
-                      return;
-                    }
-                    var pathM = path;
-                    sources[pathM] = source;
-                    schemas[pathM] = schema;
-                    serializedSchemas[pathM] = serializedSchema;
-                    sourcesSha = hash(sourcesSha + JSON.stringify({
-                      path: path,
-                      source: source
-                    }));
-                    baseSha = hash(baseSha + JSON.stringify({
-                      path: path,
-                      schema: serializedSchema,
-                      source: source,
-                      modulesErrors: moduleErrors
-                    }));
-                    schemaSha = hash(schemaSha + JSON.stringify(serializedSchema));
-                  });
-                case 3:
-                  return _context.a(2);
-              }
-            }, _loop);
-          });
+          baseSha = configSha; // NOTE: schemaSha is deliberately NOT seeded with configSha. It is compared
+          // across bundles (the server extracts from the Node bundle, the editor SPA
+          // from the browser bundle) to detect that a new version has been deployed.
+          // The config contains values that are not part of the schema and that differ
+          // between those two bundles - most notably the documented
+          // `gitCommit: process.env.VERCEL_GIT_COMMIT_SHA` / `gitBranch`, which are
+          // server-only env vars and therefore `undefined` in the browser. Seeding with
+          // them made the two sides disagree on every production load.
+          schemaSha = "";
           moduleIdx = 0;
         case 1:
           if (!(moduleIdx < valModules.modules.length)) {
-            _context2.n = 4;
+            _context.n = 18;
+            break;
+          }
+          module = valModules.modules[moduleIdx]; // NOTE: `at index N` refers to the module's position in the val.modules
+          // array, which is all we can name when the module never loaded.
+          at = "at index ".concat(moduleIdx);
+          if (module.def) {
+            _context.n = 2;
             break;
           }
-          return _context2.d(_regeneratorValues(_loop(moduleIdx)), 2);
+          addModuleError("val.modules ".concat(at, " is missing 'def' property"));
+          return _context.a(3, 17);
         case 2:
-          _ret = _context2.v;
-          if (!(_ret === 0)) {
-            _context2.n = 3;
+          if (!(typeof module.def !== "function")) {
+            _context.n = 3;
             break;
           }
-          return _context2.a(3, 3);
+          addModuleError("val.modules ".concat(at, " 'def' property is not a function"));
+          return _context.a(3, 17);
         case 3:
+          value = void 0;
+          _context.p = 4;
+          _context.n = 5;
+          return module.def();
+        case 5:
+          value = _context.v;
+          _context.n = 7;
+          break;
+        case 6:
+          _context.p = 6;
+          _t = _context.v;
+          // A module that throws while importing (a syntax error, a throwing
+          // top-level statement, a missing file) has to be reported like any other
+          // module error. Letting it reject aborts the whole extraction, which on
+          // the server means ValOps.initSources rejects and /stat, /schema and
+          // /sources/~ all fail opaquely instead of naming the broken module.
+          addModuleError("val.modules 'def' ".concat(at, " could not be loaded. Error: ").concat(errorMessage(_t)));
+          return _context.a(3, 17);
+        case 7:
+          if (value) {
+            _context.n = 8;
+            break;
+          }
+          addModuleError("val.modules 'def' ".concat(at, " did not return a value"));
+          return _context.a(3, 17);
+        case 8:
+          if (value["default"]) {
+            _context.n = 9;
+            break;
+          }
+          addModuleError("val.modules 'def' ".concat(at, " did not return a default export"));
+          return _context.a(3, 17);
+        case 9:
+          path = getValPath(value["default"]);
+          if (!(path === undefined)) {
+            _context.n = 10;
+            break;
+          }
+          addModuleError("path is undefined for val.modules 'def' ".concat(at));
+          return _context.a(3, 17);
+        case 10:
+          schema = getSchema(value["default"]);
+          if (!(schema === undefined)) {
+            _context.n = 11;
+            break;
+          }
+          addModuleError("schema in path '".concat(path, "' is undefined"), path);
+          return _context.a(3, 17);
+        case 11:
+          if (!(typeof schema["executeSerialize"] !== "function")) {
+            _context.n = 12;
+            break;
+          }
+          addModuleError("schema.serialize in path '".concat(path, "' is not a function"), path);
+          return _context.a(3, 17);
+        case 12:
+          source = getSource(value["default"]);
+          if (!(source === undefined)) {
+            _context.n = 13;
+            break;
+          }
+          addModuleError("source in ".concat(path, " is undefined"), path);
+          return _context.a(3, 17);
+        case 13:
+          serializedSchema = void 0;
+          _context.p = 14;
+          serializedSchema = schema["executeSerialize"]();
+          _context.n = 16;
+          break;
+        case 15:
+          _context.p = 15;
+          _t2 = _context.v;
+          addModuleError("Could not serialize module: '".concat(path, "'. Error: ").concat(errorMessage(_t2)), path);
+          return _context.a(3, 17);
+        case 16:
+          pathM = path;
+          sources[pathM] = source;
+          schemas[pathM] = schema;
+          serializedSchemas[pathM] = serializedSchema;
+          sourcesSha = hash(sourcesSha + JSON.stringify({
+            path: path,
+            source: source
+          }));
+          baseSha = hash(baseSha + JSON.stringify({
+            path: path,
+            schema: serializedSchema,
+            source: source,
+            modulesErrors: moduleErrors
+          }));
+          // The PATH is part of the schema set, not just the schema: renaming a
+          // module while leaving its schema byte-identical still changes which paths
+          // exist, and an open client keyed its schema cache by the old path. Hashing
+          // the schema alone left this SHA unchanged, so with no commitSha to fall
+          // back on the client never refetched /schema.
+          schemaSha = hash(schemaSha + JSON.stringify({
+            path: path,
+            schema: serializedSchema
+          }));
+        case 17:
           moduleIdx++;
-          _context2.n = 1;
+          _context.n = 1;
           break;
-        case 4:
-          return _context2.a(2, {
+        case 18:
+          return _context.a(2, {
             sources: sources,
             schemas: schemas,
             serializedSchemas: serializedSchemas,
@@ -5836,7 +5881,7 @@ function _extractValModules() {
             moduleErrors: moduleErrors
           });
       }
-    }, _callee);
+    }, _callee, null, [[14, 15], [4, 6]]);
   }));
   return _extractValModules.apply(this, arguments);
 }