@valbuild/shared 0.125.0 → 0.126.0

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

@@ -989,19 +989,19 @@ var SerializedArraySchema = zod.z.lazy(function () {
     opt: zod.z["boolean"]()
   }));
 });
-var SerializedUnionSchema = zod.z.lazy(function () {
-  return zod.z.union([zod.z.object(getSitemapTree._objectSpread2(getSitemapTree._objectSpread2({}, commonSchemaFields), {}, {
-    type: zod.z.literal("union"),
-    key: SerializedLiteralSchema,
-    items: zod.z.array(SerializedLiteralSchema),
-    opt: zod.z["boolean"]()
-  })), zod.z.object(getSitemapTree._objectSpread2(getSitemapTree._objectSpread2({}, commonSchemaFields), {}, {
-    type: zod.z.literal("union"),
+var SerializedDiscriminatedUnionSchema = zod.z.lazy(function () {
+  return zod.z.object(getSitemapTree._objectSpread2(getSitemapTree._objectSpread2({}, commonSchemaFields), {}, {
+    type: zod.z.literal("discriminated-union"),
     key: zod.z.string(),
     items: zod.z.array(SerializedObjectSchema),
     opt: zod.z["boolean"]()
-  }))]);
+  }));
 });
+var SerializedEnumSchema = zod.z.object(getSitemapTree._objectSpread2(getSitemapTree._objectSpread2({}, commonSchemaFields), {}, {
+  type: zod.z.literal("enum"),
+  values: zod.z.array(zod.z.string()),
+  opt: zod.z["boolean"]()
+}));
 var ImageEncodeOption = zod.z.union([zod.z.literal(false), zod.z.object({
   type: zod.z.literal("webp"),
   quality: zod.z.number().optional(),
@@ -1153,7 +1153,7 @@ var SerializedSettingsSchema = zod.z.lazy(function () {
     opt: zod.z["boolean"]()
   }));
 });
-var SerializedSchema = zod.z.union([SerializedStringSchema, SerializedLiteralSchema, SerializedBooleanSchema, SerializedNumberSchema, SerializedObjectSchema, SerializedArraySchema, SerializedUnionSchema, SerializedRichTextSchema, SerializedRecordSchema, SerializedKeyOfSchema, SerializedRouteSchema, SerializedFileSchema, SerializedDateSchema, SerializedDateTimeSchema, SerializedColorSchema, SerializedCodeSchema, SerializedSettingsSchema, SerializedImageSchema]);
+var SerializedSchema = zod.z.union([SerializedStringSchema, SerializedLiteralSchema, SerializedBooleanSchema, SerializedNumberSchema, SerializedObjectSchema, SerializedArraySchema, SerializedDiscriminatedUnionSchema, SerializedEnumSchema, SerializedRichTextSchema, SerializedRecordSchema, SerializedKeyOfSchema, SerializedRouteSchema, SerializedFileSchema, SerializedDateSchema, SerializedDateTimeSchema, SerializedColorSchema, SerializedCodeSchema, SerializedSettingsSchema, SerializedImageSchema]);
 
 var ValCommit = zod.z.object({
   commitSha: zod.z.string(),
@@ -1165,6 +1165,31 @@ var ValCommit = zod.z.object({
   commitMessage: zod.z.string().nullable()
 });
 
+var ValDeployment = zod.z.object({
+  deploymentId: zod.z.string(),
+  deploymentState: zod.z.string(),
+  commitSha: zod.z.string(),
+  updatedAt: zod.z.string(),
+  createdAt: zod.z.string(),
+  /**
+   * The commit message, as the deployment's host reported it.
+   *
+   * Val's OWN publishes carry their message on the commit (`ValCommit`), and
+   * that is the one the Studio prefers — it is the message Val wrote. This is
+   * for every OTHER deployment: a developer's push, a merged pull request, a
+   * revert. Those have no Val commit at all, so without this the deploy feed
+   * could only name them by their short sha, and "what went out at 14:02?" had
+   * no answer inside the Studio.
+   *
+   * Optional AND nullable, and the two mean different things: absent is a
+   * content service that does not report messages (or an older one), null is
+   * one that reports having none. Both render as the short sha, so nothing
+   * depends on telling them apart — but a schema that demanded the field would
+   * reject the whole deployment feed of a service that does not send it.
+   */
+  commitMessage: zod.z.string().nullable().optional()
+});
+
 /**
  * The wire shapes for reading history.
  *
@@ -1757,6 +1782,21 @@ var Api = {
            */
           headCommitSha: zod.z.string().optional(),
           commits: zod.z.array(ValCommit),
+          /**
+           * The publishes the content service knows about.
+           *
+           * Declared, at last. `getStat` has always returned these in
+           * `http` mode and the Studio has always read them - the response
+           * validator strips unknown keys rather than rejecting them, and
+           * the raw json is what the client hands back, so they arrived
+           * while the contract said they could not. That was survivable
+           * until a deployment started carrying a commit MESSAGE: a field
+           * nobody has declared is a field the next person deletes.
+           *
+           * Optional, because a content service that reports no
+           * deployments sends none.
+           */
+          deployments: zod.z.array(ValDeployment).optional(),
           config: ValConfig,
           profileId: zod.z.string().nullable(),
           mode: zod.z.union([zod.z.literal("http"), zod.z.literal("fs")])
@@ -3249,19 +3289,9 @@ function explainIncompatible(reason) {
  * not a failure: it is what makes the caller return `unknown` rather than guess.
  */
 function variantOf(schema, value) {
-  if (schema.type !== "union") {
+  if (schema.type !== "discriminated-union") {
     return undefined;
   }
-  // String union: the value IS the discriminator.
-  if (typeof schema.key !== "string") {
-    if (typeof value !== "string") {
-      return undefined;
-    }
-    return schema.items.find(function (item) {
-      return item.type === "literal" && item.value === value;
-    });
-  }
-  // Object union: the discriminator is a literal at `key`.
   var discriminator = schema.key;
   if (!isJsonObject(value)) {
     return undefined;
@@ -3279,9 +3309,6 @@ function variantOf(schema, value) {
   });
 }
 function describeVariant(schema, key) {
-  if (schema.type === "literal") {
-    return schema.value;
-  }
   if (schema.type === "object") {
     var tag = schema.items[key];
     if ((tag === null || tag === void 0 ? void 0 : tag.type) === "literal") {
@@ -3299,11 +3326,24 @@ function checkCompatibility(from, to) {
     });
   }
 
+  // An enum's domain IS its schema, so the value decides: whatever the old
+  // schema was — an enum, a literal, a plain string — the only question is
+  // whether this string is still offered here.
+  if (to.schema.type === "enum") {
+    if (typeof from.value === "string" && to.schema.values.includes(from.value)) {
+      return compatible;
+    }
+    return incompatible({
+      kind: "no-matching-variant",
+      variants: to.schema.values
+    });
+  }
+
   // A changed union is not itself disqualifying. What matters is whether the
   // variant being restored still has somewhere to go — comparing the unions
   // wholesale would refuse a restore that is perfectly safe.
-  if (to.schema.type === "union") {
-    var key = typeof to.schema.key === "string" ? to.schema.key : "";
+  if (to.schema.type === "discriminated-union") {
+    var key = to.schema.key;
     var _iterator = getSitemapTree._createForOfIteratorHelper(to.schema.items),
       _step;
     try {
@@ -3328,9 +3368,9 @@ function checkCompatibility(from, to) {
     });
   }
 
-  // Coming FROM a union into something that is not one: only the variant this
-  // value actually is matters, so narrow before comparing.
-  if (from.schema.type === "union") {
+  // Coming FROM a discriminated union into something that is not one: only the
+  // variant this value actually is matters, so narrow before comparing.
+  if (from.schema.type === "discriminated-union") {
     var _variant = variantOf(from.schema, from.value);
     if (_variant === undefined) {
       return {
@@ -3343,6 +3383,25 @@ function checkCompatibility(from, to) {
       value: from.value
     }, to);
   }
+
+  // Coming FROM an enum into something that is not one: the value it holds is
+  // all the old schema contributes, so compare as that one value.
+  if (from.schema.type === "enum") {
+    if (typeof from.value !== "string") {
+      return {
+        status: "unknown",
+        message: "The old value is not one of the options it was stored as, so we cannot tell whether it fits here."
+      };
+    }
+    return checkCompatibility({
+      schema: {
+        type: "literal",
+        value: from.value,
+        opt: from.schema.opt
+      },
+      value: from.value
+    }, to);
+  }
   if (from.schema.type !== to.schema.type) {
     return incompatible({
       kind: "type-changed",
@@ -3576,14 +3635,6 @@ var SharedValConfig = zod.z.object({
  * Config that is shared between the client and server.
  */
 
-var ValDeployment = zod.z.object({
-  deploymentId: zod.z.string(),
-  deploymentState: zod.z.string(),
-  commitSha: zod.z.string(),
-  updatedAt: zod.z.string(),
-  createdAt: zod.z.string()
-});
-
 /**
  * Shared route validation utilities
  */
@@ -3756,6 +3807,16 @@ function findSimilar(key, targets) {
     return a.distance - b.distance;
   });
 }
+/**
+ * The record a `keyof:check-keys` error resolves against — the value and the
+ * schema at the error's `sourcePath`.
+ *
+ * Exported for the one consumer that has to know what a resolution DEPENDED
+ * on rather than what it concluded: `ValidationStore` re-reads the keys here
+ * to decide whether a change to the referenced module can have moved the
+ * answer. Keep this and {@link checkKeyIsValid} reading the same record, or the
+ * store will invalidate on one record and the resolution answer from another.
+ */
 function getKeyOfRecordAt(sourcePath, snapshot) {
   var _Internal$splitModule = core.Internal.splitModuleFilePathAndModulePath(sourcePath),
     _Internal$splitModule2 = _slicedToArray(_Internal$splitModule, 2),
@@ -3899,6 +3960,29 @@ function checkRouteIsValid(route, includePattern, excludePattern, snapshot) {
     error: false
   };
 }
+/**
+ * The record a `keyof:check-keys` error resolves against, or null for any other
+ * error — including a malformed marker, which
+ * {@link resolveSchemaSourceFixForError} reports and this has nothing to say
+ * about.
+ *
+ * For a consumer that needs to know what the resolution READS, not what it
+ * concludes: `ValidationStore` keeps this per validated module, so that a change
+ * to the referenced record can invalidate the module holding the reference.
+ */
+function keyOfRecordPath(error) {
+  var _error$fixes;
+  if (!((_error$fixes = error.fixes) !== null && _error$fixes !== void 0 ? _error$fixes : []).includes("keyof:check-keys")) {
+    return null;
+  }
+  var value = error.value;
+  if (!value || getSitemapTree._typeof(value) !== "object") {
+    return null;
+  }
+  var sourcePath = value.sourcePath;
+  return typeof sourcePath === "string" ? sourcePath : null;
+}
+
 /**
  * Resolves a single `keyof:check-keys` or `router:check-route` error against
  * the given schema/source snapshot. Returns:
@@ -3907,8 +3991,8 @@ function checkRouteIsValid(route, includePattern, excludePattern, snapshot) {
  *   - { status: "remaining"; error } if invalid (rewritten error to surface)
  */
 function resolveSchemaSourceFixForError(error, snapshot) {
-  var _error$fixes;
-  var fixes = (_error$fixes = error.fixes) !== null && _error$fixes !== void 0 ? _error$fixes : [];
+  var _error$fixes2;
+  var fixes = (_error$fixes2 = error.fixes) !== null && _error$fixes2 !== void 0 ? _error$fixes2 : [];
   if (fixes.includes("keyof:check-keys")) {
     if (!error.value) {
       return {
@@ -4137,11 +4221,20 @@ function emptyOf(schema) {
     return null; // returning null is the only thing we can do, however, it means that the patches cannot be applied yet since that might fail
   } else if (schema.type === "literal") {
     return schema.value;
-  } else if (schema.type === "union") {
-    if (typeof schema.key === "string") {
-      return emptyOf(schema.items[0]);
+  } else if (schema.type === "discriminated-union") {
+    // The first variant is what a new value starts as. `s.discriminatedUnion`
+    // requires one, so an empty `items` means a serialized schema that was not
+    // built by it — say so rather than returning `undefined`, which is not
+    // JSON and would be written into a patch as a missing key.
+    if (schema.items.length === 0) {
+      throw Error("Cannot create an empty value for a discriminated union with no variants");
     }
-    return schema.key.value;
+    return emptyOf(schema.items[0]);
+  } else if (schema.type === "enum") {
+    if (schema.values.length === 0) {
+      throw Error("Cannot create an empty value for an enum with no values");
+    }
+    return schema.values[0];
   } else if (schema.type === "date") {
     return clampDateString(formatLocalDate(new Date()), schema.options);
   } else if (schema.type === "dateTime") {
@@ -4229,24 +4322,19 @@ function resolveSerializedSchemaAtPath(schema, path) {
         schema: current,
         remainingPath: path.slice(i)
       };
-    } else if (current.type === "union") {
-      if (typeof current.key === "string") {
-        var _iterator2 = getSitemapTree._createForOfIteratorHelper(current.items),
-          _step2;
-        try {
-          for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-            var variant = _step2.value;
-            var resolved = resolveSerializedSchemaAtPath(variant, path.slice(i));
-            if (resolved.kind !== "unresolved") return resolved;
-          }
-        } catch (err) {
-          _iterator2.e(err);
-        } finally {
-          _iterator2.f();
+    } else if (current.type === "discriminated-union") {
+      var _iterator2 = getSitemapTree._createForOfIteratorHelper(current.items),
+        _step2;
+      try {
+        for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
+          var variant = _step2.value;
+          var resolved = resolveSerializedSchemaAtPath(variant, path.slice(i));
+          if (resolved.kind !== "unresolved") return resolved;
         }
-        return {
-          kind: "unresolved"
-        };
+      } catch (err) {
+        _iterator2.e(err);
+      } finally {
+        _iterator2.f();
       }
       return {
         kind: "unresolved"
@@ -5175,6 +5263,18 @@ function traverseSchemaSource(source, schema, path, callback) {
     return;
   }
 
+  // Handle enum: a leaf, like a literal with more than one allowed value
+  if (schema.type === "enum") {
+    if (typeof source === "string") {
+      callback({
+        source: source,
+        schema: schema,
+        path: path
+      });
+    }
+    return;
+  }
+
   // Handle route
   if (schema.type === "route") {
     if (typeof source === "string") {
@@ -5222,36 +5322,24 @@ function traverseSchemaSource(source, schema, path, callback) {
     return;
   }
 
-  // Handle union
-  if (schema.type === "union") {
+  // Handle discriminated union: descend through the variant the value takes
+  if (schema.type === "discriminated-union") {
     var schemaKey = schema.key;
-    if (typeof schemaKey === "string") {
-      // Tagged union - find matching sub-schema
-      if (source && getSitemapTree._typeof(source) === "object" && !Array.isArray(source) && schemaKey in source) {
-        var itemKey = source[schemaKey];
-        if (typeof itemKey === "string") {
-          var schemaOfItem = schema.items.filter(function (item) {
-            return item.type === "object";
-          }).find(function (item) {
-            var itemKeySchema = item.items[schemaKey];
-            if ((itemKeySchema === null || itemKeySchema === void 0 ? void 0 : itemKeySchema.type) === "literal") {
-              return itemKeySchema.value === itemKey;
-            }
-            return false;
-          });
-          if (schemaOfItem) {
-            traverseSchemaSource(source, schemaOfItem, path, callback);
+    if (source && getSitemapTree._typeof(source) === "object" && !Array.isArray(source) && schemaKey in source) {
+      var itemKey = source[schemaKey];
+      if (typeof itemKey === "string") {
+        var schemaOfItem = schema.items.filter(function (item) {
+          return item.type === "object";
+        }).find(function (item) {
+          var itemKeySchema = item.items[schemaKey];
+          if ((itemKeySchema === null || itemKeySchema === void 0 ? void 0 : itemKeySchema.type) === "literal") {
+            return itemKeySchema.value === itemKey;
           }
-        }
-      }
-    } else {
-      // Literal union - treat as primitive
-      if (typeof source === "string") {
-        callback({
-          source: source,
-          schema: schema,
-          path: path
+          return false;
         });
+        if (schemaOfItem) {
+          traverseSchemaSource(source, schemaOfItem, path, callback);
+        }
       }
     }
     return;
@@ -5411,7 +5499,11 @@ function indexModule(searchIndex, moduleFilePath, source, schema) {
     var label = "";
 
     // Handle primitives
-    if (schema.type === "string" || schema.type === "number" || schema.type === "boolean" || schema.type === "date" || schema.type === "dateTime" || schema.type === "color" || schema.type === "code" || schema.type === "keyOf" || schema.type === "route") {
+    if (schema.type === "string" || schema.type === "number" || schema.type === "boolean" || schema.type === "date" || schema.type === "dateTime" || schema.type === "color" || schema.type === "code" || schema.type === "keyOf" || schema.type === "route" ||
+    // An enum's value is a string the editor chose; it is as searchable as
+    // any other string leaf. The old string union was never indexed at all,
+    // which is the gap this closes.
+    schema.type === "enum") {
       var _source$toString, _source$toString2;
       searchText = (_source$toString = source === null || source === void 0 ? void 0 : source.toString()) !== null && _source$toString !== void 0 ? _source$toString : "";
       label = (_source$toString2 = source === null || source === void 0 ? void 0 : source.toString()) !== null && _source$toString2 !== void 0 ? _source$toString2 : "";
@@ -5612,6 +5704,8 @@ exports.SerializedCodeSchema = SerializedCodeSchema;
 exports.SerializedColorSchema = SerializedColorSchema;
 exports.SerializedDateSchema = SerializedDateSchema;
 exports.SerializedDateTimeSchema = SerializedDateTimeSchema;
+exports.SerializedDiscriminatedUnionSchema = SerializedDiscriminatedUnionSchema;
+exports.SerializedEnumSchema = SerializedEnumSchema;
 exports.SerializedFileSchema = SerializedFileSchema;
 exports.SerializedImageSchema = SerializedImageSchema;
 exports.SerializedKeyOfSchema = SerializedKeyOfSchema;
@@ -5624,7 +5718,6 @@ exports.SerializedRouteSchema = SerializedRouteSchema;
 exports.SerializedSchema = SerializedSchema;
 exports.SerializedSettingsSchema = SerializedSettingsSchema;
 exports.SerializedStringSchema = SerializedStringSchema;
-exports.SerializedUnionSchema = SerializedUnionSchema;
 exports.SharedValConfig = SharedValConfig;
 exports.VAL_ENABLE_COOKIE_NAME = VAL_ENABLE_COOKIE_NAME;
 exports.VAL_SESSION_COOKIE = VAL_SESSION_COOKIE;
@@ -5654,6 +5747,7 @@ exports.flattenRichText = flattenRichText;
 exports.getErrorMessageFromUnknownJson = getErrorMessageFromUnknownJson;
 exports.getFilenameFromRef = getFilenameFromRef;
 exports.getInlineImgInfo = getInlineImgInfo;
+exports.getKeyOfRecordAt = getKeyOfRecordAt;
 exports.getRefParts = getRefParts;
 exports.getRoutesOf = getRoutesOf;
 exports.getRoutesWithModulePaths = getRoutesWithModulePaths;
@@ -5662,6 +5756,7 @@ exports.indexModule = indexModule;
 exports.isMimeTypeAccepted = isMimeTypeAccepted;
 exports.isRemoteSchema = isRemoteSchema;
 exports.isSkippedSource = isSkippedSource;
+exports.keyOfRecordPath = keyOfRecordPath;
 exports.levenshtein = levenshtein;
 exports.newestCommitSha = newestCommitSha;
 exports.partitionValidationErrors = partitionValidationErrors;