@formspec/build 0.1.0-alpha.14 → 0.1.0-alpha.15

package/dist/internals.js

@@ -177,7 +177,7 @@ function canonicalizeArrayField(field) {
   const itemsType = {
     kind: "object",
     properties: itemProperties,
-    additionalProperties: false
+    additionalProperties: true
   };
   const type = { kind: "array", items: itemsType };
   const constraints = [];
@@ -212,7 +212,7 @@ function canonicalizeObjectField(field) {
   const type = {
     kind: "object",
     properties,
-    additionalProperties: false
+    additionalProperties: true
   };
   return buildFieldNode(field.name, type, field.required, buildAnnotations(field.label));
 }
@@ -460,11 +460,6 @@ import * as ts4 from "typescript";
 
 // src/analyzer/jsdoc-constraints.ts
 import * as ts3 from "typescript";
-import {
-  BUILTIN_CONSTRAINT_DEFINITIONS as BUILTIN_CONSTRAINT_DEFINITIONS2,
-  isBuiltinConstraintName as isBuiltinConstraintName2,
-  normalizeConstraintTagName as normalizeConstraintTagName2
-} from "@formspec/core";
 
 // src/analyzer/tsdoc-parser.ts
 import * as ts2 from "typescript";
@@ -518,6 +513,15 @@ function createFormSpecTSDocConfig() {
       })
     );
   }
+  for (const tagName of ["displayName", "description"]) {
+    config.addTagDefinition(
+      new TSDocTagDefinition({
+        tagName: "@" + tagName,
+        syntaxKind: TSDocTagSyntaxKind.BlockTag,
+        allowMultiple: true
+      })
+    );
+  }
   return config;
 }
 var sharedParser;
@@ -547,6 +551,27 @@ function parseTSDocTags(node, file = "") {
       const docComment = parserContext.docComment;
       for (const block of docComment.customBlocks) {
         const tagName = normalizeConstraintTagName(block.blockTag.tagName.substring(1));
+        if (tagName === "displayName" || tagName === "description") {
+          const text2 = extractBlockText(block).trim();
+          if (text2 === "") continue;
+          const provenance2 = provenanceForComment(range, sourceFile, file, tagName);
+          if (tagName === "displayName") {
+            annotations.push({
+              kind: "annotation",
+              annotationKind: "displayName",
+              value: text2,
+              provenance: provenance2
+            });
+          } else {
+            annotations.push({
+              kind: "annotation",
+              annotationKind: "description",
+              value: text2,
+              provenance: provenance2
+            });
+          }
+          continue;
+        }
         if (TAGS_REQUIRING_RAW_TEXT.has(tagName)) continue;
         const text = extractBlockText(block).trim();
         if (text === "") continue;
@@ -578,41 +603,6 @@ function parseTSDocTags(node, file = "") {
       constraints.push(constraintNode);
     }
   }
-  let displayName;
-  let description;
-  let displayNameTag;
-  let descriptionTag;
-  for (const tag of jsDocTagsAll) {
-    const tagName = tag.tagName.text;
-    const commentText = getTagCommentText(tag);
-    if (commentText === void 0 || commentText.trim() === "") {
-      continue;
-    }
-    const trimmed = commentText.trim();
-    if (tagName === "Field_displayName") {
-      displayName = trimmed;
-      displayNameTag = tag;
-    } else if (tagName === "Field_description") {
-      description = trimmed;
-      descriptionTag = tag;
-    }
-  }
-  if (displayName !== void 0 && displayNameTag) {
-    annotations.push({
-      kind: "annotation",
-      annotationKind: "displayName",
-      value: displayName,
-      provenance: provenanceForJSDocTag(displayNameTag, file)
-    });
-  }
-  if (description !== void 0 && descriptionTag) {
-    annotations.push({
-      kind: "annotation",
-      annotationKind: "description",
-      value: description,
-      provenance: provenanceForJSDocTag(descriptionTag, file)
-    });
-  }
   return { constraints, annotations };
 }
 function extractPathTarget(text) {
@@ -877,18 +867,19 @@ function analyzeFieldToIR(prop, checker, file, typeRegistry, visiting) {
   const tsType = checker.getTypeAtLocation(prop);
   const optional = prop.questionToken !== void 0;
   const provenance = provenanceForNode(prop, file);
-  const type = resolveTypeNode(tsType, checker, file, typeRegistry, visiting);
+  let type = resolveTypeNode(tsType, checker, file, typeRegistry, visiting);
   const constraints = [];
   if (prop.type) {
     constraints.push(...extractTypeAliasConstraintNodes(prop.type, checker, file));
   }
   constraints.push(...extractJSDocConstraintNodes(prop, file));
-  const annotations = [];
+  let annotations = [];
   annotations.push(...extractJSDocAnnotationNodes(prop, file));
   const defaultAnnotation = extractDefaultValueAnnotation(prop.initializer, file);
   if (defaultAnnotation) {
     annotations.push(defaultAnnotation);
   }
+  ({ type, annotations } = applyEnumMemberDisplayNames(type, annotations));
   return {
     kind: "field",
     name,
@@ -907,14 +898,15 @@ function analyzeInterfacePropertyToIR(prop, checker, file, typeRegistry, visitin
   const tsType = checker.getTypeAtLocation(prop);
   const optional = prop.questionToken !== void 0;
   const provenance = provenanceForNode(prop, file);
-  const type = resolveTypeNode(tsType, checker, file, typeRegistry, visiting);
+  let type = resolveTypeNode(tsType, checker, file, typeRegistry, visiting);
   const constraints = [];
   if (prop.type) {
     constraints.push(...extractTypeAliasConstraintNodes(prop.type, checker, file));
   }
   constraints.push(...extractJSDocConstraintNodes(prop, file));
-  const annotations = [];
+  let annotations = [];
   annotations.push(...extractJSDocAnnotationNodes(prop, file));
+  ({ type, annotations } = applyEnumMemberDisplayNames(type, annotations));
   return {
     kind: "field",
     name,
@@ -925,6 +917,68 @@ function analyzeInterfacePropertyToIR(prop, checker, file, typeRegistry, visitin
     provenance
   };
 }
+function applyEnumMemberDisplayNames(type, annotations) {
+  if (!annotations.some(
+    (annotation) => annotation.annotationKind === "displayName" && annotation.value.trim().startsWith(":")
+  )) {
+    return { type, annotations: [...annotations] };
+  }
+  const consumed = /* @__PURE__ */ new Set();
+  const nextType = rewriteEnumDisplayNames(type, annotations, consumed);
+  if (consumed.size === 0) {
+    return { type, annotations: [...annotations] };
+  }
+  return {
+    type: nextType,
+    annotations: annotations.filter((annotation) => !consumed.has(annotation))
+  };
+}
+function rewriteEnumDisplayNames(type, annotations, consumed) {
+  switch (type.kind) {
+    case "enum":
+      return applyEnumMemberDisplayNamesToEnum(type, annotations, consumed);
+    case "union": {
+      return {
+        ...type,
+        members: type.members.map(
+          (member) => rewriteEnumDisplayNames(member, annotations, consumed)
+        )
+      };
+    }
+    default:
+      return type;
+  }
+}
+function applyEnumMemberDisplayNamesToEnum(type, annotations, consumed) {
+  const displayNames = /* @__PURE__ */ new Map();
+  for (const annotation of annotations) {
+    if (annotation.annotationKind !== "displayName") continue;
+    const parsed = parseEnumMemberDisplayName(annotation.value);
+    if (!parsed) continue;
+    consumed.add(annotation);
+    const member = type.members.find((m) => String(m.value) === parsed.value);
+    if (!member) continue;
+    displayNames.set(String(member.value), parsed.label);
+  }
+  if (displayNames.size === 0) {
+    return type;
+  }
+  return {
+    ...type,
+    members: type.members.map((member) => {
+      const displayName = displayNames.get(String(member.value));
+      return displayName !== void 0 ? { ...member, displayName } : member;
+    })
+  };
+}
+function parseEnumMemberDisplayName(value) {
+  const trimmed = value.trim();
+  const match = /^:([^\s]+)\s+([\s\S]+)$/.exec(trimmed);
+  if (!match?.[1] || !match[2]) return null;
+  const label = match[2].trim();
+  if (label === "") return null;
+  return { value: match[1], label };
+}
 function resolveTypeNode(type, checker, file, typeRegistry, visiting) {
   if (type.flags & ts4.TypeFlags.String) {
     return { kind: "primitive", primitiveKind: "string" };
@@ -1035,7 +1089,30 @@ function resolveArrayType(type, checker, file, typeRegistry, visiting) {
   const items = elementType ? resolveTypeNode(elementType, checker, file, typeRegistry, visiting) : { kind: "primitive", primitiveKind: "string" };
   return { kind: "array", items };
 }
+function tryResolveRecordType(type, checker, file, typeRegistry, visiting) {
+  if (type.getProperties().length > 0) {
+    return null;
+  }
+  const indexInfo = checker.getIndexInfoOfType(type, ts4.IndexKind.String);
+  if (!indexInfo) {
+    return null;
+  }
+  if (visiting.has(type)) {
+    return null;
+  }
+  visiting.add(type);
+  try {
+    const valueType = resolveTypeNode(indexInfo.type, checker, file, typeRegistry, visiting);
+    return { kind: "record", valueType };
+  } finally {
+    visiting.delete(type);
+  }
+}
 function resolveObjectType(type, checker, file, typeRegistry, visiting) {
+  const recordNode = tryResolveRecordType(type, checker, file, typeRegistry, visiting);
+  if (recordNode) {
+    return recordNode;
+  }
   if (visiting.has(type)) {
     return { kind: "object", properties: [], additionalProperties: false };
   }
@@ -1067,7 +1144,7 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting) {
   const objectNode = {
     kind: "object",
     properties,
-    additionalProperties: false
+    additionalProperties: true
   };
   if (typeName) {
     typeRegistry[typeName] = {
@@ -1227,11 +1304,21 @@ function detectFormSpecReference(typeNode) {
 }
 
 // src/json-schema/ir-generator.ts
-function makeContext() {
-  return { defs: {} };
+function makeContext(options) {
+  const vendorPrefix = options?.vendorPrefix ?? "x-formspec";
+  if (!vendorPrefix.startsWith("x-")) {
+    throw new Error(
+      `Invalid vendorPrefix "${vendorPrefix}". Extension JSON Schema keywords must start with "x-".`
+    );
+  }
+  return {
+    defs: {},
+    extensionRegistry: options?.extensionRegistry,
+    vendorPrefix
+  };
 }
-function generateJsonSchemaFromIR(ir) {
-  const ctx = makeContext();
+function generateJsonSchemaFromIR(ir, options) {
+  const ctx = makeContext(options);
   for (const [name, typeDef] of Object.entries(ir.typeRegistry)) {
     ctx.defs[name] = generateTypeNode(typeDef.type, ctx);
   }
@@ -1283,16 +1370,16 @@ function generateFieldSchema(field, ctx) {
       directConstraints.push(c);
     }
   }
-  applyConstraints(schema, directConstraints);
-  applyAnnotations(schema, field.annotations);
+  applyConstraints(schema, directConstraints, ctx);
+  applyAnnotations(schema, field.annotations, ctx);
   if (pathConstraints.length === 0) {
     return schema;
   }
-  return applyPathTargetedConstraints(schema, pathConstraints);
+  return applyPathTargetedConstraints(schema, pathConstraints, ctx);
 }
-function applyPathTargetedConstraints(schema, pathConstraints) {
+function applyPathTargetedConstraints(schema, pathConstraints, ctx) {
   if (schema.type === "array" && schema.items) {
-    schema.items = applyPathTargetedConstraints(schema.items, pathConstraints);
+    schema.items = applyPathTargetedConstraints(schema.items, pathConstraints, ctx);
     return schema;
   }
   const byTarget = /* @__PURE__ */ new Map();
@@ -1306,7 +1393,7 @@ function applyPathTargetedConstraints(schema, pathConstraints) {
   const propertyOverrides = {};
   for (const [target, constraints] of byTarget) {
     const subSchema = {};
-    applyConstraints(subSchema, constraints);
+    applyConstraints(subSchema, constraints, ctx);
     propertyOverrides[target] = subSchema;
   }
   if (schema.$ref) {
@@ -1350,6 +1437,8 @@ function generateTypeNode(type, ctx) {
       return generateArrayType(type, ctx);
     case "object":
       return generateObjectType(type, ctx);
+    case "record":
+      return generateRecordType(type, ctx);
     case "union":
       return generateUnionType(type, ctx);
     case "reference":
@@ -1357,7 +1446,7 @@ function generateTypeNode(type, ctx) {
     case "dynamic":
       return generateDynamicType(type);
     case "custom":
-      return generateCustomType(type);
+      return generateCustomType(type, ctx);
     default: {
       const _exhaustive = type;
       return _exhaustive;
@@ -1406,16 +1495,27 @@ function generateObjectType(type, ctx) {
   }
   return schema;
 }
+function generateRecordType(type, ctx) {
+  return {
+    type: "object",
+    additionalProperties: generateTypeNode(type.valueType, ctx)
+  };
+}
 function generatePropertySchema(prop, ctx) {
   const schema = generateTypeNode(prop.type, ctx);
-  applyConstraints(schema, prop.constraints);
-  applyAnnotations(schema, prop.annotations);
+  applyConstraints(schema, prop.constraints, ctx);
+  applyAnnotations(schema, prop.annotations, ctx);
   return schema;
 }
 function generateUnionType(type, ctx) {
   if (isBooleanUnion(type)) {
     return { type: "boolean" };
   }
+  if (isNullableUnion(type)) {
+    return {
+      oneOf: type.members.map((m) => generateTypeNode(m, ctx))
+    };
+  }
   return {
     anyOf: type.members.map((m) => generateTypeNode(m, ctx))
   };
@@ -1425,6 +1525,13 @@ function isBooleanUnion(type) {
   const kinds = type.members.map((m) => m.kind);
   return kinds.every((k) => k === "primitive") && type.members.every((m) => m.kind === "primitive" && m.primitiveKind === "boolean");
 }
+function isNullableUnion(type) {
+  if (type.members.length !== 2) return false;
+  const nullCount = type.members.filter(
+    (m) => m.kind === "primitive" && m.primitiveKind === "null"
+  ).length;
+  return nullCount === 1;
+}
 function generateReferenceType(type) {
   return { $ref: `#/$defs/${type.name}` };
 }
@@ -1445,10 +1552,7 @@ function generateDynamicType(type) {
     "x-formspec-schemaSource": type.sourceKey
   };
 }
-function generateCustomType(_type) {
-  return { type: "object" };
-}
-function applyConstraints(schema, constraints) {
+function applyConstraints(schema, constraints, ctx) {
   for (const constraint of constraints) {
     switch (constraint.constraintKind) {
       case "minimum":
@@ -1493,6 +1597,7 @@ function applyConstraints(schema, constraints) {
       case "allowedMembers":
         break;
       case "custom":
+        applyCustomConstraint(schema, constraint, ctx);
         break;
       default: {
         const _exhaustive = constraint;
@@ -1501,7 +1606,7 @@ function applyConstraints(schema, constraints) {
     }
   }
 }
-function applyAnnotations(schema, annotations) {
+function applyAnnotations(schema, annotations, ctx) {
   for (const annotation of annotations) {
     switch (annotation.annotationKind) {
       case "displayName":
@@ -1521,6 +1626,7 @@ function applyAnnotations(schema, annotations) {
       case "formatHint":
         break;
       case "custom":
+        applyCustomAnnotation(schema, annotation, ctx);
         break;
       default: {
         const _exhaustive = annotation;
@@ -1529,6 +1635,36 @@ function applyAnnotations(schema, annotations) {
     }
   }
 }
+function generateCustomType(type, ctx) {
+  const registration = ctx.extensionRegistry?.findType(type.typeId);
+  if (registration === void 0) {
+    throw new Error(
+      `Cannot generate JSON Schema for custom type "${type.typeId}" without a matching extension registration`
+    );
+  }
+  return registration.toJsonSchema(type.payload, ctx.vendorPrefix);
+}
+function applyCustomConstraint(schema, constraint, ctx) {
+  const registration = ctx.extensionRegistry?.findConstraint(constraint.constraintId);
+  if (registration === void 0) {
+    throw new Error(
+      `Cannot generate JSON Schema for custom constraint "${constraint.constraintId}" without a matching extension registration`
+    );
+  }
+  Object.assign(schema, registration.toJsonSchema(constraint.payload, ctx.vendorPrefix));
+}
+function applyCustomAnnotation(schema, annotation, ctx) {
+  const registration = ctx.extensionRegistry?.findAnnotation(annotation.annotationId);
+  if (registration === void 0) {
+    throw new Error(
+      `Cannot generate JSON Schema for custom annotation "${annotation.annotationId}" without a matching extension registration`
+    );
+  }
+  if (registration.toJsonSchema === void 0) {
+    return;
+  }
+  Object.assign(schema, registration.toJsonSchema(annotation.value, ctx.vendorPrefix));
+}
 
 // src/ui-schema/schema.ts
 import { z } from "zod";
@@ -1753,12 +1889,9 @@ function generateClassSchemas(analysis, source) {
 }
 
 // src/validate/constraint-validator.ts
-function makeCode(ctx, category, number) {
-  return `${ctx.vendorPrefix}-${category}-${String(number).padStart(3, "0")}`;
-}
 function addContradiction(ctx, message, primary, related) {
   ctx.diagnostics.push({
-    code: makeCode(ctx, "CONTRADICTION", 1),
+    code: "CONTRADICTING_CONSTRAINTS",
     message,
     severity: "error",
     primaryLocation: primary,
@@ -1767,7 +1900,7 @@ function addContradiction(ctx, message, primary, related) {
 }
 function addTypeMismatch(ctx, message, primary) {
   ctx.diagnostics.push({
-    code: makeCode(ctx, "TYPE_MISMATCH", 1),
+    code: "TYPE_MISMATCH",
     message,
     severity: "error",
     primaryLocation: primary,
@@ -1776,13 +1909,22 @@ function addTypeMismatch(ctx, message, primary) {
 }
 function addUnknownExtension(ctx, message, primary) {
   ctx.diagnostics.push({
-    code: makeCode(ctx, "UNKNOWN_EXTENSION", 1),
+    code: "UNKNOWN_EXTENSION",
     message,
     severity: "warning",
     primaryLocation: primary,
     relatedLocations: []
   });
 }
+function addConstraintBroadening(ctx, message, primary, related) {
+  ctx.diagnostics.push({
+    code: "CONSTRAINT_BROADENING",
+    message,
+    severity: "error",
+    primaryLocation: primary,
+    relatedLocations: [related]
+  });
+}
 function findNumeric(constraints, constraintKind) {
   return constraints.find((c) => c.constraintKind === constraintKind);
 }
@@ -1794,6 +1936,126 @@ function findAllowedMembers(constraints) {
     (c) => c.constraintKind === "allowedMembers"
   );
 }
+function isOrderedBoundConstraint(constraint) {
+  return constraint.constraintKind === "minimum" || constraint.constraintKind === "exclusiveMinimum" || constraint.constraintKind === "minLength" || constraint.constraintKind === "minItems" || constraint.constraintKind === "maximum" || constraint.constraintKind === "exclusiveMaximum" || constraint.constraintKind === "maxLength" || constraint.constraintKind === "maxItems";
+}
+function pathKey(constraint) {
+  return constraint.path?.segments.join(".") ?? "";
+}
+function orderedBoundFamily(kind) {
+  switch (kind) {
+    case "minimum":
+    case "exclusiveMinimum":
+      return "numeric-lower";
+    case "maximum":
+    case "exclusiveMaximum":
+      return "numeric-upper";
+    case "minLength":
+      return "minLength";
+    case "minItems":
+      return "minItems";
+    case "maxLength":
+      return "maxLength";
+    case "maxItems":
+      return "maxItems";
+    default: {
+      const _exhaustive = kind;
+      return _exhaustive;
+    }
+  }
+}
+function isNumericLowerKind(kind) {
+  return kind === "minimum" || kind === "exclusiveMinimum";
+}
+function isNumericUpperKind(kind) {
+  return kind === "maximum" || kind === "exclusiveMaximum";
+}
+function describeConstraintTag(constraint) {
+  return `@${constraint.constraintKind}`;
+}
+function compareConstraintStrength(current, previous) {
+  const family = orderedBoundFamily(current.constraintKind);
+  if (family === "numeric-lower") {
+    if (!isNumericLowerKind(current.constraintKind) || !isNumericLowerKind(previous.constraintKind)) {
+      throw new Error("numeric-lower family received non-numeric lower-bound constraint");
+    }
+    if (current.value !== previous.value) {
+      return current.value > previous.value ? 1 : -1;
+    }
+    if (current.constraintKind === "exclusiveMinimum" && previous.constraintKind === "minimum") {
+      return 1;
+    }
+    if (current.constraintKind === "minimum" && previous.constraintKind === "exclusiveMinimum") {
+      return -1;
+    }
+    return 0;
+  }
+  if (family === "numeric-upper") {
+    if (!isNumericUpperKind(current.constraintKind) || !isNumericUpperKind(previous.constraintKind)) {
+      throw new Error("numeric-upper family received non-numeric upper-bound constraint");
+    }
+    if (current.value !== previous.value) {
+      return current.value < previous.value ? 1 : -1;
+    }
+    if (current.constraintKind === "exclusiveMaximum" && previous.constraintKind === "maximum") {
+      return 1;
+    }
+    if (current.constraintKind === "maximum" && previous.constraintKind === "exclusiveMaximum") {
+      return -1;
+    }
+    return 0;
+  }
+  switch (family) {
+    case "minLength":
+    case "minItems":
+      if (current.value === previous.value) {
+        return 0;
+      }
+      return current.value > previous.value ? 1 : -1;
+    case "maxLength":
+    case "maxItems":
+      if (current.value === previous.value) {
+        return 0;
+      }
+      return current.value < previous.value ? 1 : -1;
+    default: {
+      const _exhaustive = family;
+      return _exhaustive;
+    }
+  }
+}
+function checkConstraintBroadening(ctx, fieldName, constraints) {
+  const strongestByKey = /* @__PURE__ */ new Map();
+  for (const constraint of constraints) {
+    if (!isOrderedBoundConstraint(constraint)) {
+      continue;
+    }
+    const key = `${orderedBoundFamily(constraint.constraintKind)}:${pathKey(constraint)}`;
+    const previous = strongestByKey.get(key);
+    if (previous === void 0) {
+      strongestByKey.set(key, constraint);
+      continue;
+    }
+    const strength = compareConstraintStrength(constraint, previous);
+    if (strength < 0) {
+      const displayFieldName = formatPathTargetFieldName(
+        fieldName,
+        constraint.path?.segments ?? []
+      );
+      addConstraintBroadening(
+        ctx,
+        `Field "${displayFieldName}": ${describeConstraintTag(constraint)} (${String(constraint.value)}) is broader than earlier ${describeConstraintTag(previous)} (${String(previous.value)}). Constraints can only narrow.`,
+        constraint.provenance,
+        previous.provenance
+      );
+      continue;
+    }
+    if (strength <= 0) {
+      continue;
+    }
+    strongestByKey.set(key, constraint);
+  }
+}
 function checkNumericContradictions(ctx, fieldName, constraints) {
   const min = findNumeric(constraints, "minimum");
   const max = findNumeric(constraints, "maximum");
@@ -1890,6 +2152,8 @@ function typeLabel(type) {
       return "array";
     case "object":
       return "object";
+    case "record":
+      return "record";
     case "union":
       return "union";
     case "reference":
@@ -1904,85 +2168,140 @@ function typeLabel(type) {
     }
   }
 }
-function checkTypeApplicability(ctx, fieldName, type, constraints) {
-  const isNumber = type.kind === "primitive" && type.primitiveKind === "number";
-  const isString = type.kind === "primitive" && type.primitiveKind === "string";
-  const isArray = type.kind === "array";
-  const isEnum = type.kind === "enum";
-  const label = typeLabel(type);
-  for (const constraint of constraints) {
-    if (constraint.path) {
-      const isTraversable = type.kind === "object" || type.kind === "array" || type.kind === "reference";
-      if (!isTraversable) {
+function dereferenceType(ctx, type) {
+  let current = type;
+  const seen = /* @__PURE__ */ new Set();
+  while (current.kind === "reference") {
+    if (seen.has(current.name)) {
+      return current;
+    }
+    seen.add(current.name);
+    const definition = ctx.typeRegistry[current.name];
+    if (definition === void 0) {
+      return current;
+    }
+    current = definition.type;
+  }
+  return current;
+}
+function resolvePathTargetType(ctx, type, segments) {
+  const effectiveType = dereferenceType(ctx, type);
+  if (segments.length === 0) {
+    return { kind: "resolved", type: effectiveType };
+  }
+  if (effectiveType.kind === "array") {
+    return resolvePathTargetType(ctx, effectiveType.items, segments);
+  }
+  if (effectiveType.kind === "object") {
+    const [segment, ...rest] = segments;
+    if (segment === void 0) {
+      throw new Error("Invariant violation: object path traversal requires a segment");
+    }
+    const property = effectiveType.properties.find((prop) => prop.name === segment);
+    if (property === void 0) {
+      return { kind: "missing-property", segment };
+    }
+    return resolvePathTargetType(ctx, property.type, rest);
+  }
+  return { kind: "unresolvable", type: effectiveType };
+}
+function formatPathTargetFieldName(fieldName, path2) {
+  return path2.length === 0 ? fieldName : `${fieldName}.${path2.join(".")}`;
+}
+function checkConstraintOnType(ctx, fieldName, type, constraint) {
+  const effectiveType = dereferenceType(ctx, type);
+  const isNumber = effectiveType.kind === "primitive" && effectiveType.primitiveKind === "number";
+  const isString = effectiveType.kind === "primitive" && effectiveType.primitiveKind === "string";
+  const isArray = effectiveType.kind === "array";
+  const isEnum = effectiveType.kind === "enum";
+  const label = typeLabel(effectiveType);
+  const ck = constraint.constraintKind;
+  switch (ck) {
+    case "minimum":
+    case "maximum":
+    case "exclusiveMinimum":
+    case "exclusiveMaximum":
+    case "multipleOf": {
+      if (!isNumber) {
         addTypeMismatch(
           ctx,
-          `Field "${fieldName}": path-targeted constraint "${constraint.constraintKind}" is invalid because type "${label}" cannot be traversed`,
+          `Field "${fieldName}": constraint "${ck}" is only valid on number fields, but field type is "${label}"`,
           constraint.provenance
         );
       }
-      continue;
+      break;
     }
-    const ck = constraint.constraintKind;
-    switch (ck) {
-      case "minimum":
-      case "maximum":
-      case "exclusiveMinimum":
-      case "exclusiveMaximum":
-      case "multipleOf": {
-        if (!isNumber) {
-          addTypeMismatch(
-            ctx,
-            `Field "${fieldName}": constraint "${ck}" is only valid on number fields, but field type is "${label}"`,
-            constraint.provenance
-          );
-        }
-        break;
-      }
-      case "minLength":
-      case "maxLength":
-      case "pattern": {
-        if (!isString) {
-          addTypeMismatch(
-            ctx,
-            `Field "${fieldName}": constraint "${ck}" is only valid on string fields, but field type is "${label}"`,
-            constraint.provenance
-          );
-        }
-        break;
+    case "minLength":
+    case "maxLength":
+    case "pattern": {
+      if (!isString) {
+        addTypeMismatch(
+          ctx,
+          `Field "${fieldName}": constraint "${ck}" is only valid on string fields, but field type is "${label}"`,
+          constraint.provenance
+        );
       }
-      case "minItems":
-      case "maxItems":
-      case "uniqueItems": {
-        if (!isArray) {
-          addTypeMismatch(
-            ctx,
-            `Field "${fieldName}": constraint "${ck}" is only valid on array fields, but field type is "${label}"`,
-            constraint.provenance
-          );
-        }
-        break;
+      break;
+    }
+    case "minItems":
+    case "maxItems":
+    case "uniqueItems": {
+      if (!isArray) {
+        addTypeMismatch(
+          ctx,
+          `Field "${fieldName}": constraint "${ck}" is only valid on array fields, but field type is "${label}"`,
+          constraint.provenance
+        );
       }
-      case "allowedMembers": {
-        if (!isEnum) {
-          addTypeMismatch(
-            ctx,
-            `Field "${fieldName}": constraint "allowedMembers" is only valid on enum fields, but field type is "${label}"`,
-            constraint.provenance
-          );
-        }
-        break;
+      break;
+    }
+    case "allowedMembers": {
+      if (!isEnum) {
+        addTypeMismatch(
+          ctx,
+          `Field "${fieldName}": constraint "allowedMembers" is only valid on enum fields, but field type is "${label}"`,
+          constraint.provenance
+        );
       }
-      case "custom": {
-        checkCustomConstraint(ctx, fieldName, type, constraint);
-        break;
+      break;
+    }
+    case "custom": {
+      checkCustomConstraint(ctx, fieldName, effectiveType, constraint);
+      break;
+    }
+    default: {
+      const _exhaustive = constraint;
+      throw new Error(
+        `Unhandled constraint kind: ${_exhaustive.constraintKind}`
+      );
+    }
+  }
+}
+function checkTypeApplicability(ctx, fieldName, type, constraints) {
+  for (const constraint of constraints) {
+    if (constraint.path) {
+      const resolution = resolvePathTargetType(ctx, type, constraint.path.segments);
+      const targetFieldName = formatPathTargetFieldName(fieldName, constraint.path.segments);
+      if (resolution.kind === "missing-property") {
+        addTypeMismatch(
+          ctx,
+          `Field "${fieldName}": path-targeted constraint "${constraint.constraintKind}" references unknown path segment "${resolution.segment}"`,
+          constraint.provenance
+        );
+        continue;
       }
-      default: {
-        const _exhaustive = constraint;
-        throw new Error(
-          `Unhandled constraint kind: ${_exhaustive.constraintKind}`
+      if (resolution.kind === "unresolvable") {
+        addTypeMismatch(
+          ctx,
+          `Field "${targetFieldName}": path-targeted constraint "${constraint.constraintKind}" is invalid because type "${typeLabel(resolution.type)}" cannot be traversed`,
+          constraint.provenance
         );
+        continue;
       }
+      checkConstraintOnType(ctx, targetFieldName, resolution.type, constraint);
+      continue;
     }
+    checkConstraintOnType(ctx, fieldName, type, constraint);
   }
 }
 function checkCustomConstraint(ctx, fieldName, type, constraint) {
@@ -2026,6 +2345,7 @@ function validateConstraints(ctx, name, type, constraints) {
   checkNumericContradictions(ctx, name, constraints);
   checkLengthContradictions(ctx, name, constraints);
   checkAllowedMembersContradiction(ctx, name, constraints);
+  checkConstraintBroadening(ctx, name, constraints);
   checkTypeApplicability(ctx, name, type, constraints);
 }
 function validateElement(ctx, element) {
@@ -2052,8 +2372,8 @@ function validateElement(ctx, element) {
 function validateIR(ir, options) {
   const ctx = {
     diagnostics: [],
-    vendorPrefix: options?.vendorPrefix ?? "FORMSPEC",
-    extensionRegistry: options?.extensionRegistry
+    extensionRegistry: options?.extensionRegistry,
+    typeRegistry: ir.typeRegistry
   };
   for (const element of ir.elements) {
     validateElement(ctx, element);