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

package/dist/internals.cjs

@@ -228,7 +228,7 @@ function canonicalizeArrayField(field) {
   const itemsType = {
     kind: "object",
     properties: itemProperties,
-    additionalProperties: false
+    additionalProperties: true
   };
   const type = { kind: "array", items: itemsType };
   const constraints = [];
@@ -263,7 +263,7 @@ function canonicalizeObjectField(field) {
   const type = {
     kind: "object",
     properties,
-    additionalProperties: false
+    additionalProperties: true
   };
   return buildFieldNode(field.name, type, field.required, buildAnnotations(field.label));
 }
@@ -376,6 +376,7 @@ function canonicalizeTSDoc(analysis, source) {
     irVersion: import_core2.IR_VERSION,
     elements,
     typeRegistry: analysis.typeRegistry,
+    ...analysis.annotations !== void 0 && analysis.annotations.length > 0 && { annotations: analysis.annotations },
     provenance
   };
 }
@@ -511,7 +512,6 @@ var ts4 = __toESM(require("typescript"), 1);
 
 // src/analyzer/jsdoc-constraints.ts
 var ts3 = __toESM(require("typescript"), 1);
-var import_core4 = require("@formspec/core");
 
 // src/analyzer/tsdoc-parser.ts
 var ts2 = __toESM(require("typescript"), 1);
@@ -541,7 +541,7 @@ var LENGTH_CONSTRAINT_MAP = {
   minItems: "minItems",
   maxItems: "maxItems"
 };
-var TAGS_REQUIRING_RAW_TEXT = /* @__PURE__ */ new Set(["pattern", "enumOptions"]);
+var TAGS_REQUIRING_RAW_TEXT = /* @__PURE__ */ new Set(["pattern", "enumOptions", "defaultValue"]);
 function createFormSpecTSDocConfig() {
   const config = new import_tsdoc.TSDocConfiguration();
   for (const tagName of Object.keys(import_core3.BUILTIN_CONSTRAINT_DEFINITIONS)) {
@@ -553,6 +553,15 @@ function createFormSpecTSDocConfig() {
       })
     );
   }
+  for (const tagName of ["displayName", "description", "format", "placeholder"]) {
+    config.addTagDefinition(
+      new import_tsdoc.TSDocTagDefinition({
+        tagName: "@" + tagName,
+        syntaxKind: import_tsdoc.TSDocTagSyntaxKind.BlockTag,
+        allowMultiple: true
+      })
+    );
+  }
   return config;
 }
 var sharedParser;
@@ -563,6 +572,12 @@ function getParser() {
 function parseTSDocTags(node, file = "") {
   const constraints = [];
   const annotations = [];
+  let displayName;
+  let description;
+  let placeholder;
+  let displayNameProvenance;
+  let descriptionProvenance;
+  let placeholderProvenance;
   const sourceFile = node.getSourceFile();
   const sourceText = sourceFile.getFullText();
   const commentRanges = ts2.getLeadingCommentRanges(sourceText, node.getFullStart());
@@ -582,9 +597,37 @@ function parseTSDocTags(node, file = "") {
       const docComment = parserContext.docComment;
       for (const block of docComment.customBlocks) {
         const tagName = (0, import_core3.normalizeConstraintTagName)(block.blockTag.tagName.substring(1));
+        if (tagName === "displayName" || tagName === "description" || tagName === "format" || tagName === "placeholder") {
+          const text2 = extractBlockText(block).trim();
+          if (text2 === "") continue;
+          const provenance2 = provenanceForComment(range, sourceFile, file, tagName);
+          if (tagName === "displayName") {
+            if (!isMemberTargetDisplayName(text2) && displayName === void 0) {
+              displayName = text2;
+              displayNameProvenance = provenance2;
+            }
+          } else if (tagName === "format") {
+            annotations.push({
+              kind: "annotation",
+              annotationKind: "format",
+              value: text2,
+              provenance: provenance2
+            });
+          } else {
+            if (tagName === "description" && description === void 0) {
+              description = text2;
+              descriptionProvenance = provenance2;
+            } else if (tagName === "placeholder" && placeholder === void 0) {
+              placeholder = text2;
+              placeholderProvenance = provenance2;
+            }
+          }
+          continue;
+        }
         if (TAGS_REQUIRING_RAW_TEXT.has(tagName)) continue;
         const text = extractBlockText(block).trim();
-        if (text === "") continue;
+        const expectedType = (0, import_core3.isBuiltinConstraintName)(tagName) ? import_core3.BUILTIN_CONSTRAINT_DEFINITIONS[tagName] : void 0;
+        if (text === "" && expectedType !== "boolean") continue;
         const provenance = provenanceForComment(range, sourceFile, file, tagName);
         const constraintNode = parseConstraintValue(tagName, text, provenance);
         if (constraintNode) {
@@ -592,14 +635,47 @@ function parseTSDocTags(node, file = "") {
         }
       }
       if (docComment.deprecatedBlock !== void 0) {
+        const message = extractBlockText(docComment.deprecatedBlock).trim();
         annotations.push({
           kind: "annotation",
           annotationKind: "deprecated",
+          ...message !== "" && { message },
           provenance: provenanceForComment(range, sourceFile, file, "deprecated")
         });
       }
+      if (description === void 0 && docComment.remarksBlock !== void 0) {
+        const remarks = extractBlockText(docComment.remarksBlock).trim();
+        if (remarks !== "") {
+          description = remarks;
+          descriptionProvenance = provenanceForComment(range, sourceFile, file, "remarks");
+        }
+      }
     }
   }
+  if (displayName !== void 0 && displayNameProvenance !== void 0) {
+    annotations.push({
+      kind: "annotation",
+      annotationKind: "displayName",
+      value: displayName,
+      provenance: displayNameProvenance
+    });
+  }
+  if (description !== void 0 && descriptionProvenance !== void 0) {
+    annotations.push({
+      kind: "annotation",
+      annotationKind: "description",
+      value: description,
+      provenance: descriptionProvenance
+    });
+  }
+  if (placeholder !== void 0 && placeholderProvenance !== void 0) {
+    annotations.push({
+      kind: "annotation",
+      annotationKind: "placeholder",
+      value: placeholder,
+      provenance: placeholderProvenance
+    });
+  }
   const jsDocTagsAll = ts2.getJSDocTags(node);
   for (const tag of jsDocTagsAll) {
     const tagName = (0, import_core3.normalizeConstraintTagName)(tag.tagName.text);
@@ -608,47 +684,39 @@ function parseTSDocTags(node, file = "") {
     if (commentText === void 0 || commentText.trim() === "") continue;
     const text = commentText.trim();
     const provenance = provenanceForJSDocTag(tag, file);
+    if (tagName === "defaultValue") {
+      const defaultValueNode = parseDefaultValueValue(text, provenance);
+      annotations.push(defaultValueNode);
+      continue;
+    }
     const constraintNode = parseConstraintValue(tagName, text, provenance);
     if (constraintNode) {
       constraints.push(constraintNode);
     }
   }
+  return { constraints, annotations };
+}
+function extractDisplayNameMetadata(node) {
   let displayName;
-  let description;
-  let displayNameTag;
-  let descriptionTag;
-  for (const tag of jsDocTagsAll) {
-    const tagName = tag.tagName.text;
+  const memberDisplayNames = /* @__PURE__ */ new Map();
+  for (const tag of ts2.getJSDocTags(node)) {
+    const tagName = (0, import_core3.normalizeConstraintTagName)(tag.tagName.text);
+    if (tagName !== "displayName") continue;
     const commentText = getTagCommentText(tag);
-    if (commentText === void 0 || commentText.trim() === "") {
+    if (commentText === void 0) continue;
+    const text = commentText.trim();
+    if (text === "") continue;
+    const memberTarget = parseMemberTargetDisplayName(text);
+    if (memberTarget) {
+      memberDisplayNames.set(memberTarget.target, memberTarget.label);
       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)
-    });
+    displayName ??= text;
   }
-  return { constraints, annotations };
+  return {
+    ...displayName !== void 0 && { displayName },
+    memberDisplayNames
+  };
 }
 function extractPathTarget(text) {
   const trimmed = text.trimStart();
@@ -712,7 +780,45 @@ function parseConstraintValue(tagName, text, provenance) {
     }
     return null;
   }
+  if (expectedType === "boolean") {
+    const trimmed = effectiveText.trim();
+    if (trimmed !== "" && trimmed !== "true") {
+      return null;
+    }
+    if (tagName === "uniqueItems") {
+      return {
+        kind: "constraint",
+        constraintKind: "uniqueItems",
+        value: true,
+        ...path2 && { path: path2 },
+        provenance
+      };
+    }
+    return null;
+  }
   if (expectedType === "json") {
+    if (tagName === "const") {
+      const trimmedText = effectiveText.trim();
+      if (trimmedText === "") return null;
+      try {
+        const parsed2 = JSON.parse(trimmedText);
+        return {
+          kind: "constraint",
+          constraintKind: "const",
+          value: parsed2,
+          ...path2 && { path: path2 },
+          provenance
+        };
+      } catch {
+        return {
+          kind: "constraint",
+          constraintKind: "const",
+          value: trimmedText,
+          ...path2 && { path: path2 },
+          provenance
+        };
+      }
+    }
     const parsed = tryParseJson(effectiveText);
     if (!Array.isArray(parsed)) {
       return null;
@@ -744,6 +850,34 @@ function parseConstraintValue(tagName, text, provenance) {
     provenance
   };
 }
+function parseDefaultValueValue(text, provenance) {
+  const trimmed = text.trim();
+  let value;
+  if (trimmed === "null") {
+    value = null;
+  } else if (trimmed === "true") {
+    value = true;
+  } else if (trimmed === "false") {
+    value = false;
+  } else {
+    const parsed = tryParseJson(trimmed);
+    value = parsed !== null ? parsed : trimmed;
+  }
+  return {
+    kind: "annotation",
+    annotationKind: "defaultValue",
+    value,
+    provenance
+  };
+}
+function isMemberTargetDisplayName(text) {
+  return parseMemberTargetDisplayName(text) !== null;
+}
+function parseMemberTargetDisplayName(text) {
+  const match = /^:([^\s]+)\s+([\s\S]+)$/.exec(text);
+  if (!match?.[1] || !match[2]) return null;
+  return { target: match[1], label: match[2].trim() };
+}
 function provenanceForComment(range, sourceFile, file, tagName) {
   const { line, character } = sourceFile.getLineAndCharacterOfPosition(range.pos);
   return {
@@ -825,11 +959,17 @@ function isObjectType(type) {
 function isTypeReference(type) {
   return !!(type.flags & ts4.TypeFlags.Object) && !!(type.objectFlags & ts4.ObjectFlags.Reference);
 }
+var RESOLVING_TYPE_PLACEHOLDER = {
+  kind: "object",
+  properties: [],
+  additionalProperties: true
+};
 function analyzeClassToIR(classDecl, checker, file = "") {
   const name = classDecl.name?.text ?? "AnonymousClass";
   const fields = [];
   const fieldLayouts = [];
   const typeRegistry = {};
+  const annotations = extractJSDocAnnotationNodes(classDecl, file);
   const visiting = /* @__PURE__ */ new Set();
   const instanceMethods = [];
   const staticMethods = [];
@@ -852,12 +992,21 @@ function analyzeClassToIR(classDecl, checker, file = "") {
       }
     }
   }
-  return { name, fields, fieldLayouts, typeRegistry, instanceMethods, staticMethods };
+  return {
+    name,
+    fields,
+    fieldLayouts,
+    typeRegistry,
+    ...annotations.length > 0 && { annotations },
+    instanceMethods,
+    staticMethods
+  };
 }
 function analyzeInterfaceToIR(interfaceDecl, checker, file = "") {
   const name = interfaceDecl.name.text;
   const fields = [];
   const typeRegistry = {};
+  const annotations = extractJSDocAnnotationNodes(interfaceDecl, file);
   const visiting = /* @__PURE__ */ new Set();
   for (const member of interfaceDecl.members) {
     if (ts4.isPropertySignature(member)) {
@@ -868,7 +1017,15 @@ function analyzeInterfaceToIR(interfaceDecl, checker, file = "") {
     }
   }
   const fieldLayouts = fields.map(() => ({}));
-  return { name, fields, fieldLayouts, typeRegistry, instanceMethods: [], staticMethods: [] };
+  return {
+    name,
+    fields,
+    fieldLayouts,
+    typeRegistry,
+    ...annotations.length > 0 && { annotations },
+    instanceMethods: [],
+    staticMethods: []
+  };
 }
 function analyzeTypeAliasToIR(typeAlias, checker, file = "") {
   if (!ts4.isTypeLiteralNode(typeAlias.type)) {
@@ -883,6 +1040,7 @@ function analyzeTypeAliasToIR(typeAlias, checker, file = "") {
   const name = typeAlias.name.text;
   const fields = [];
   const typeRegistry = {};
+  const annotations = extractJSDocAnnotationNodes(typeAlias, file);
   const visiting = /* @__PURE__ */ new Set();
   for (const member of typeAlias.type.members) {
     if (ts4.isPropertySignature(member)) {
@@ -899,6 +1057,7 @@ function analyzeTypeAliasToIR(typeAlias, checker, file = "") {
       fields,
       fieldLayouts: fields.map(() => ({})),
       typeRegistry,
+      ...annotations.length > 0 && { annotations },
       instanceMethods: [],
       staticMethods: []
     }
@@ -912,18 +1071,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, prop);
   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) {
+  if (defaultAnnotation && !annotations.some((a) => a.annotationKind === "defaultValue")) {
     annotations.push(defaultAnnotation);
   }
+  ({ type, annotations } = applyEnumMemberDisplayNames(type, annotations));
   return {
     kind: "field",
     name,
@@ -942,14 +1102,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, prop);
   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,
@@ -960,7 +1121,69 @@ function analyzeInterfacePropertyToIR(prop, checker, file, typeRegistry, visitin
     provenance
   };
 }
-function resolveTypeNode(type, checker, file, typeRegistry, visiting) {
+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, sourceNode) {
   if (type.flags & ts4.TypeFlags.String) {
     return { kind: "primitive", primitiveKind: "string" };
   }
@@ -989,7 +1212,7 @@ function resolveTypeNode(type, checker, file, typeRegistry, visiting) {
     };
   }
   if (type.isUnion()) {
-    return resolveUnionType(type, checker, file, typeRegistry, visiting);
+    return resolveUnionType(type, checker, file, typeRegistry, visiting, sourceNode);
   }
   if (checker.isArrayType(type)) {
     return resolveArrayType(type, checker, file, typeRegistry, visiting);
@@ -999,70 +1222,102 @@ function resolveTypeNode(type, checker, file, typeRegistry, visiting) {
   }
   return { kind: "primitive", primitiveKind: "string" };
 }
-function resolveUnionType(type, checker, file, typeRegistry, visiting) {
+function resolveUnionType(type, checker, file, typeRegistry, visiting, sourceNode) {
+  const typeName = getNamedTypeName(type);
+  const namedDecl = getNamedTypeDeclaration(type);
+  if (typeName && typeName in typeRegistry) {
+    return { kind: "reference", name: typeName, typeArguments: [] };
+  }
   const allTypes = type.types;
   const nonNullTypes = allTypes.filter(
     (t) => !(t.flags & (ts4.TypeFlags.Null | ts4.TypeFlags.Undefined))
   );
   const hasNull = allTypes.some((t) => t.flags & ts4.TypeFlags.Null);
+  const memberDisplayNames = /* @__PURE__ */ new Map();
+  if (namedDecl) {
+    for (const [value, label] of extractDisplayNameMetadata(namedDecl).memberDisplayNames) {
+      memberDisplayNames.set(value, label);
+    }
+  }
+  if (sourceNode) {
+    for (const [value, label] of extractDisplayNameMetadata(sourceNode).memberDisplayNames) {
+      memberDisplayNames.set(value, label);
+    }
+  }
+  const registerNamed = (result) => {
+    if (!typeName) {
+      return result;
+    }
+    const annotations = namedDecl ? extractJSDocAnnotationNodes(namedDecl, file) : void 0;
+    typeRegistry[typeName] = {
+      name: typeName,
+      type: result,
+      ...annotations !== void 0 && annotations.length > 0 && { annotations },
+      provenance: provenanceForDeclaration(namedDecl ?? sourceNode, file)
+    };
+    return { kind: "reference", name: typeName, typeArguments: [] };
+  };
+  const applyMemberLabels = (members2) => members2.map((value) => {
+    const displayName = memberDisplayNames.get(String(value));
+    return displayName !== void 0 ? { value, displayName } : { value };
+  });
   const isBooleanUnion2 = nonNullTypes.length === 2 && nonNullTypes.every((t) => t.flags & ts4.TypeFlags.BooleanLiteral);
   if (isBooleanUnion2) {
     const boolNode = { kind: "primitive", primitiveKind: "boolean" };
-    if (hasNull) {
-      return {
-        kind: "union",
-        members: [boolNode, { kind: "primitive", primitiveKind: "null" }]
-      };
-    }
-    return boolNode;
+    const result = hasNull ? {
+      kind: "union",
+      members: [boolNode, { kind: "primitive", primitiveKind: "null" }]
+    } : boolNode;
+    return registerNamed(result);
   }
   const allStringLiterals = nonNullTypes.every((t) => t.isStringLiteral());
   if (allStringLiterals && nonNullTypes.length > 0) {
     const stringTypes = nonNullTypes.filter((t) => t.isStringLiteral());
     const enumNode = {
       kind: "enum",
-      members: stringTypes.map((t) => ({ value: t.value }))
+      members: applyMemberLabels(stringTypes.map((t) => t.value))
     };
-    if (hasNull) {
-      return {
-        kind: "union",
-        members: [enumNode, { kind: "primitive", primitiveKind: "null" }]
-      };
-    }
-    return enumNode;
+    const result = hasNull ? {
+      kind: "union",
+      members: [enumNode, { kind: "primitive", primitiveKind: "null" }]
+    } : enumNode;
+    return registerNamed(result);
   }
   const allNumberLiterals = nonNullTypes.every((t) => t.isNumberLiteral());
   if (allNumberLiterals && nonNullTypes.length > 0) {
     const numberTypes = nonNullTypes.filter((t) => t.isNumberLiteral());
     const enumNode = {
       kind: "enum",
-      members: numberTypes.map((t) => ({ value: t.value }))
+      members: applyMemberLabels(numberTypes.map((t) => t.value))
     };
-    if (hasNull) {
-      return {
-        kind: "union",
-        members: [enumNode, { kind: "primitive", primitiveKind: "null" }]
-      };
-    }
-    return enumNode;
+    const result = hasNull ? {
+      kind: "union",
+      members: [enumNode, { kind: "primitive", primitiveKind: "null" }]
+    } : enumNode;
+    return registerNamed(result);
   }
   if (nonNullTypes.length === 1 && nonNullTypes[0]) {
-    const inner = resolveTypeNode(nonNullTypes[0], checker, file, typeRegistry, visiting);
-    if (hasNull) {
-      return {
-        kind: "union",
-        members: [inner, { kind: "primitive", primitiveKind: "null" }]
-      };
-    }
-    return inner;
+    const inner = resolveTypeNode(
+      nonNullTypes[0],
+      checker,
+      file,
+      typeRegistry,
+      visiting,
+      sourceNode
+    );
+    const result = hasNull ? {
+      kind: "union",
+      members: [inner, { kind: "primitive", primitiveKind: "null" }]
+    } : inner;
+    return registerNamed(result);
   }
   const members = nonNullTypes.map(
-    (t) => resolveTypeNode(t, checker, file, typeRegistry, visiting)
+    (t) => resolveTypeNode(t, checker, file, typeRegistry, visiting, sourceNode)
   );
   if (hasNull) {
     members.push({ kind: "primitive", primitiveKind: "null" });
   }
-  return { kind: "union", members };
+  return registerNamed({ kind: "union", members });
 }
 function resolveArrayType(type, checker, file, typeRegistry, visiting) {
   const typeArgs = isTypeReference(type) ? type.typeArguments : void 0;
@@ -1070,15 +1325,92 @@ 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;
+  }
+  const valueType = resolveTypeNode(indexInfo.type, checker, file, typeRegistry, visiting);
+  return { kind: "record", valueType };
+}
+function typeNodeContainsReference(type, targetName) {
+  switch (type.kind) {
+    case "reference":
+      return type.name === targetName;
+    case "array":
+      return typeNodeContainsReference(type.items, targetName);
+    case "record":
+      return typeNodeContainsReference(type.valueType, targetName);
+    case "union":
+      return type.members.some((member) => typeNodeContainsReference(member, targetName));
+    case "object":
+      return type.properties.some(
+        (property) => typeNodeContainsReference(property.type, targetName)
+      );
+    case "primitive":
+    case "enum":
+    case "dynamic":
+    case "custom":
+      return false;
+    default: {
+      const _exhaustive = type;
+      return _exhaustive;
+    }
+  }
+}
 function resolveObjectType(type, checker, file, typeRegistry, visiting) {
+  const typeName = getNamedTypeName(type);
+  const namedTypeName = typeName ?? void 0;
+  const namedDecl = getNamedTypeDeclaration(type);
+  const shouldRegisterNamedType = namedTypeName !== void 0 && !(namedTypeName === "Record" && namedDecl?.getSourceFile().fileName !== file);
+  const clearNamedTypeRegistration = () => {
+    if (namedTypeName === void 0 || !shouldRegisterNamedType) {
+      return;
+    }
+    Reflect.deleteProperty(typeRegistry, namedTypeName);
+  };
   if (visiting.has(type)) {
+    if (namedTypeName !== void 0 && shouldRegisterNamedType) {
+      return { kind: "reference", name: namedTypeName, typeArguments: [] };
+    }
     return { kind: "object", properties: [], additionalProperties: false };
   }
+  if (namedTypeName !== void 0 && shouldRegisterNamedType && !typeRegistry[namedTypeName]) {
+    typeRegistry[namedTypeName] = {
+      name: namedTypeName,
+      type: RESOLVING_TYPE_PLACEHOLDER,
+      provenance: provenanceForDeclaration(namedDecl, file)
+    };
+  }
   visiting.add(type);
-  const typeName = getNamedTypeName(type);
-  if (typeName && typeName in typeRegistry) {
+  if (namedTypeName !== void 0 && shouldRegisterNamedType && typeRegistry[namedTypeName]?.type !== void 0) {
+    if (typeRegistry[namedTypeName].type !== RESOLVING_TYPE_PLACEHOLDER) {
+      visiting.delete(type);
+      return { kind: "reference", name: namedTypeName, typeArguments: [] };
+    }
+  }
+  const recordNode = tryResolveRecordType(type, checker, file, typeRegistry, visiting);
+  if (recordNode) {
     visiting.delete(type);
-    return { kind: "reference", name: typeName, typeArguments: [] };
+    if (namedTypeName !== void 0 && shouldRegisterNamedType) {
+      const isRecursiveRecord = typeNodeContainsReference(recordNode.valueType, namedTypeName);
+      if (!isRecursiveRecord) {
+        clearNamedTypeRegistration();
+        return recordNode;
+      }
+      const annotations = namedDecl ? extractJSDocAnnotationNodes(namedDecl, file) : void 0;
+      typeRegistry[namedTypeName] = {
+        name: namedTypeName,
+        type: recordNode,
+        ...annotations !== void 0 && annotations.length > 0 && { annotations },
+        provenance: provenanceForDeclaration(namedDecl, file)
+      };
+      return { kind: "reference", name: namedTypeName, typeArguments: [] };
+    }
+    return recordNode;
   }
   const properties = [];
   const fieldInfoMap = getNamedTypeFieldNodeInfoMap(type, checker, file, typeRegistry, visiting);
@@ -1087,7 +1419,14 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting) {
     if (!declaration) continue;
     const propType = checker.getTypeOfSymbolAtLocation(prop, declaration);
     const optional = !!(prop.flags & ts4.SymbolFlags.Optional);
-    const propTypeNode = resolveTypeNode(propType, checker, file, typeRegistry, visiting);
+    const propTypeNode = resolveTypeNode(
+      propType,
+      checker,
+      file,
+      typeRegistry,
+      visiting,
+      declaration
+    );
     const fieldNodeInfo = fieldInfoMap?.get(prop.name);
     properties.push({
       name: prop.name,
@@ -1102,15 +1441,17 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting) {
   const objectNode = {
     kind: "object",
     properties,
-    additionalProperties: false
+    additionalProperties: true
   };
-  if (typeName) {
-    typeRegistry[typeName] = {
-      name: typeName,
+  if (namedTypeName !== void 0 && shouldRegisterNamedType) {
+    const annotations = namedDecl ? extractJSDocAnnotationNodes(namedDecl, file) : void 0;
+    typeRegistry[namedTypeName] = {
+      name: namedTypeName,
       type: objectNode,
-      provenance: provenanceForFile(file)
+      ...annotations !== void 0 && annotations.length > 0 && { annotations },
+      provenance: provenanceForDeclaration(namedDecl, file)
     };
-    return { kind: "reference", name: typeName, typeArguments: [] };
+    return { kind: "reference", name: namedTypeName, typeArguments: [] };
   }
   return objectNode;
 }
@@ -1202,6 +1543,12 @@ function provenanceForNode(node, file) {
 function provenanceForFile(file) {
   return { surface: "tsdoc", file, line: 0, column: 0 };
 }
+function provenanceForDeclaration(node, file) {
+  if (!node) {
+    return provenanceForFile(file);
+  }
+  return provenanceForNode(node, file);
+}
 function getNamedTypeName(type) {
   const symbol = type.getSymbol();
   if (symbol?.declarations) {
@@ -1220,6 +1567,20 @@ function getNamedTypeName(type) {
   }
   return null;
 }
+function getNamedTypeDeclaration(type) {
+  const symbol = type.getSymbol();
+  if (symbol?.declarations) {
+    const decl = symbol.declarations[0];
+    if (decl && (ts4.isClassDeclaration(decl) || ts4.isInterfaceDeclaration(decl) || ts4.isTypeAliasDeclaration(decl))) {
+      return decl;
+    }
+  }
+  const aliasSymbol = type.aliasSymbol;
+  if (aliasSymbol?.declarations) {
+    return aliasSymbol.declarations.find(ts4.isTypeAliasDeclaration);
+  }
+  return void 0;
+}
 function analyzeMethod(method, checker) {
   if (!ts4.isIdentifier(method.name)) {
     return null;
@@ -1262,13 +1623,26 @@ 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);
+    if (typeDef.annotations && typeDef.annotations.length > 0) {
+      applyAnnotations(ctx.defs[name], typeDef.annotations, ctx);
+    }
   }
   const properties = {};
   const required = [];
@@ -1280,6 +1654,9 @@ function generateJsonSchemaFromIR(ir) {
     properties,
     ...uniqueRequired.length > 0 && { required: uniqueRequired }
   };
+  if (ir.annotations && ir.annotations.length > 0) {
+    applyAnnotations(result, ir.annotations, ctx);
+  }
   if (Object.keys(ctx.defs).length > 0) {
     result.$defs = ctx.defs;
   }
@@ -1309,25 +1686,54 @@ function collectFields(elements, properties, required, ctx) {
 }
 function generateFieldSchema(field, ctx) {
   const schema = generateTypeNode(field.type, ctx);
+  const itemStringSchema = schema.type === "array" && schema.items?.type === "string" ? schema.items : void 0;
   const directConstraints = [];
+  const itemConstraints = [];
   const pathConstraints = [];
   for (const c of field.constraints) {
     if (c.path) {
       pathConstraints.push(c);
+    } else if (itemStringSchema !== void 0 && isStringItemConstraint(c)) {
+      itemConstraints.push(c);
     } else {
       directConstraints.push(c);
     }
   }
-  applyConstraints(schema, directConstraints);
-  applyAnnotations(schema, field.annotations);
+  applyConstraints(schema, directConstraints, ctx);
+  if (itemStringSchema !== void 0) {
+    applyConstraints(itemStringSchema, itemConstraints, ctx);
+  }
+  const rootAnnotations = [];
+  const itemAnnotations = [];
+  for (const annotation of field.annotations) {
+    if (itemStringSchema !== void 0 && annotation.annotationKind === "format") {
+      itemAnnotations.push(annotation);
+    } else {
+      rootAnnotations.push(annotation);
+    }
+  }
+  applyAnnotations(schema, rootAnnotations, ctx);
+  if (itemStringSchema !== void 0) {
+    applyAnnotations(itemStringSchema, itemAnnotations, ctx);
+  }
   if (pathConstraints.length === 0) {
     return schema;
   }
-  return applyPathTargetedConstraints(schema, pathConstraints);
+  return applyPathTargetedConstraints(schema, pathConstraints, ctx);
 }
-function applyPathTargetedConstraints(schema, pathConstraints) {
+function isStringItemConstraint(constraint) {
+  switch (constraint.constraintKind) {
+    case "minLength":
+    case "maxLength":
+    case "pattern":
+      return true;
+    default:
+      return false;
+  }
+}
+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();
@@ -1341,7 +1747,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) {
@@ -1385,6 +1791,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":
@@ -1392,7 +1800,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;
@@ -1441,16 +1849,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))
   };
@@ -1460,6 +1879,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}` };
 }
@@ -1480,10 +1906,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":
@@ -1525,9 +1948,13 @@ function applyConstraints(schema, constraints) {
       case "uniqueItems":
         schema.uniqueItems = constraint.value;
         break;
+      case "const":
+        schema.const = constraint.value;
+        break;
       case "allowedMembers":
         break;
       case "custom":
+        applyCustomConstraint(schema, constraint, ctx);
         break;
       default: {
         const _exhaustive = constraint;
@@ -1536,7 +1963,7 @@ function applyConstraints(schema, constraints) {
     }
   }
 }
-function applyAnnotations(schema, annotations) {
+function applyAnnotations(schema, annotations, ctx) {
   for (const annotation of annotations) {
     switch (annotation.annotationKind) {
       case "displayName":
@@ -1548,14 +1975,21 @@ function applyAnnotations(schema, annotations) {
       case "defaultValue":
         schema.default = annotation.value;
         break;
+      case "format":
+        schema.format = annotation.value;
+        break;
       case "deprecated":
         schema.deprecated = true;
+        if (annotation.message !== void 0 && annotation.message !== "") {
+          schema["x-formspec-deprecation-description"] = annotation.message;
+        }
         break;
       case "placeholder":
         break;
       case "formatHint":
         break;
       case "custom":
+        applyCustomAnnotation(schema, annotation, ctx);
         break;
       default: {
         const _exhaustive = annotation;
@@ -1564,6 +1998,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
 var import_zod = require("zod");
@@ -1700,25 +2164,31 @@ function createShowRule(fieldName, value) {
     }
   };
 }
+function flattenConditionSchema(scope, schema) {
+  if (schema.allOf === void 0) {
+    if (scope === "#") {
+      return [schema];
+    }
+    const fieldName = scope.replace("#/properties/", "");
+    return [
+      {
+        properties: {
+          [fieldName]: schema
+        }
+      }
+    ];
+  }
+  return schema.allOf.flatMap((member) => flattenConditionSchema(scope, member));
+}
 function combineRules(parentRule, childRule) {
-  const parentCondition = parentRule.condition;
-  const childCondition = childRule.condition;
   return {
     effect: "SHOW",
     condition: {
       scope: "#",
       schema: {
         allOf: [
-          {
-            properties: {
-              [parentCondition.scope.replace("#/properties/", "")]: parentCondition.schema
-            }
-          },
-          {
-            properties: {
-              [childCondition.scope.replace("#/properties/", "")]: childCondition.schema
-            }
-          }
+          ...flattenConditionSchema(parentRule.condition.scope, parentRule.condition.schema),
+          ...flattenConditionSchema(childRule.condition.scope, childRule.condition.schema)
         ]
       }
     }
@@ -1726,10 +2196,14 @@ function combineRules(parentRule, childRule) {
 }
 function fieldNodeToControl(field, parentRule) {
   const displayNameAnnotation = field.annotations.find((a) => a.annotationKind === "displayName");
+  const placeholderAnnotation = field.annotations.find((a) => a.annotationKind === "placeholder");
   const control = {
     type: "Control",
     scope: fieldToScope(field.name),
     ...displayNameAnnotation !== void 0 && { label: displayNameAnnotation.value },
+    ...placeholderAnnotation !== void 0 && {
+      options: { placeholder: placeholderAnnotation.value }
+    },
     ...parentRule !== void 0 && { rule: parentRule }
   };
   return control;
@@ -1788,12 +2262,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,
@@ -1802,7 +2273,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,
@@ -1811,13 +2282,31 @@ 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 addUnknownPathTarget(ctx, message, primary) {
+  ctx.diagnostics.push({
+    code: "UNKNOWN_PATH_TARGET",
+    message,
+    severity: "error",
+    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);
 }
@@ -1829,6 +2318,165 @@ function findAllowedMembers(constraints) {
     (c) => c.constraintKind === "allowedMembers"
   );
 }
+function findConstConstraints(constraints) {
+  return constraints.filter(
+    (c) => c.constraintKind === "const"
+  );
+}
+function jsonValueEquals(left, right) {
+  if (left === right) {
+    return true;
+  }
+  if (Array.isArray(left) || Array.isArray(right)) {
+    if (!Array.isArray(left) || !Array.isArray(right) || left.length !== right.length) {
+      return false;
+    }
+    return left.every((item, index) => jsonValueEquals(item, right[index]));
+  }
+  if (isJsonObject(left) || isJsonObject(right)) {
+    if (!isJsonObject(left) || !isJsonObject(right)) {
+      return false;
+    }
+    const leftKeys = Object.keys(left).sort();
+    const rightKeys = Object.keys(right).sort();
+    if (leftKeys.length !== rightKeys.length) {
+      return false;
+    }
+    return leftKeys.every((key, index) => {
+      const rightKey = rightKeys[index];
+      if (rightKey !== key) {
+        return false;
+      }
+      const leftValue = left[key];
+      const rightValue = right[rightKey];
+      return leftValue !== void 0 && rightValue !== void 0 && jsonValueEquals(leftValue, rightValue);
+    });
+  }
+  return false;
+}
+function isJsonObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+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");
@@ -1915,6 +2563,25 @@ function checkAllowedMembersContradiction(ctx, fieldName, constraints) {
     }
   }
 }
+function checkConstContradictions(ctx, fieldName, constraints) {
+  const constConstraints = findConstConstraints(constraints);
+  if (constConstraints.length < 2) return;
+  const first = constConstraints[0];
+  if (first === void 0) return;
+  for (let i = 1; i < constConstraints.length; i++) {
+    const current = constConstraints[i];
+    if (current === void 0) continue;
+    if (jsonValueEquals(first.value, current.value)) {
+      continue;
+    }
+    addContradiction(
+      ctx,
+      `Field "${fieldName}": conflicting @const constraints require both ${JSON.stringify(first.value)} and ${JSON.stringify(current.value)}`,
+      first.provenance,
+      current.provenance
+    );
+  }
+}
 function typeLabel(type) {
   switch (type.kind) {
     case "primitive":
@@ -1925,6 +2592,8 @@ function typeLabel(type) {
       return "array";
     case "object":
       return "object";
+    case "record":
+      return "record";
     case "union":
       return "union";
     case "reference":
@@ -1939,85 +2608,173 @@ 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 arrayItemType = effectiveType.kind === "array" ? dereferenceType(ctx, effectiveType.items) : void 0;
+  const isStringArray = arrayItemType?.kind === "primitive" && arrayItemType.primitiveKind === "string";
+  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 && !isStringArray) {
+        addTypeMismatch(
+          ctx,
+          `Field "${fieldName}": constraint "${ck}" is only valid on string fields or string array items, but field type is "${label}"`,
+          constraint.provenance
+        );
       }
-      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;
+      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 "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;
+    }
+    case "allowedMembers": {
+      if (!isEnum) {
+        addTypeMismatch(
+          ctx,
+          `Field "${fieldName}": constraint "allowedMembers" is only valid on enum fields, but field type is "${label}"`,
+          constraint.provenance
+        );
+      }
+      break;
+    }
+    case "const": {
+      const isPrimitiveConstType = effectiveType.kind === "primitive" && ["string", "number", "boolean", "null"].includes(effectiveType.primitiveKind) || effectiveType.kind === "enum";
+      if (!isPrimitiveConstType) {
+        addTypeMismatch(
+          ctx,
+          `Field "${fieldName}": constraint "const" is only valid on primitive or enum fields, but field type is "${label}"`,
+          constraint.provenance
+        );
         break;
       }
-      case "allowedMembers": {
-        if (!isEnum) {
+      if (effectiveType.kind === "primitive") {
+        const valueType = constraint.value === null ? "null" : Array.isArray(constraint.value) ? "array" : typeof constraint.value;
+        if (valueType !== effectiveType.primitiveKind) {
           addTypeMismatch(
             ctx,
-            `Field "${fieldName}": constraint "allowedMembers" is only valid on enum fields, but field type is "${label}"`,
+            `Field "${fieldName}": @const value type "${valueType}" is incompatible with field type "${effectiveType.primitiveKind}"`,
             constraint.provenance
           );
         }
         break;
       }
-      case "custom": {
-        checkCustomConstraint(ctx, fieldName, type, constraint);
-        break;
+      const memberValues = effectiveType.members.map((member) => member.value);
+      if (!memberValues.some((member) => jsonValueEquals(member, constraint.value))) {
+        addTypeMismatch(
+          ctx,
+          `Field "${fieldName}": @const value ${JSON.stringify(constraint.value)} is not one of the enum members`,
+          constraint.provenance
+        );
       }
-      default: {
-        const _exhaustive = constraint;
-        throw new Error(
-          `Unhandled constraint kind: ${_exhaustive.constraintKind}`
+      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") {
+        addUnknownPathTarget(
+          ctx,
+          `Field "${targetFieldName}": path-targeted constraint "${constraint.constraintKind}" references unknown path segment "${resolution.segment}"`,
+          constraint.provenance
         );
+        continue;
       }
+      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) {
@@ -2061,6 +2818,8 @@ function validateConstraints(ctx, name, type, constraints) {
   checkNumericContradictions(ctx, name, constraints);
   checkLengthContradictions(ctx, name, constraints);
   checkAllowedMembersContradiction(ctx, name, constraints);
+  checkConstContradictions(ctx, name, constraints);
+  checkConstraintBroadening(ctx, name, constraints);
   checkTypeApplicability(ctx, name, type, constraints);
 }
 function validateElement(ctx, element) {
@@ -2087,8 +2846,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);
@@ -2142,7 +2901,7 @@ function createExtensionRegistry(extensions) {
 }
 
 // src/generators/method-schema.ts
-var import_core5 = require("@formspec/core");
+var import_core4 = require("@formspec/core");
 function typeToJsonSchema(type, checker) {
   const typeRegistry = {};
   const visiting = /* @__PURE__ */ new Set();
@@ -2150,7 +2909,7 @@ function typeToJsonSchema(type, checker) {
   const fieldProvenance = { surface: "tsdoc", file: "", line: 0, column: 0 };
   const ir = {
     kind: "form-ir",
-    irVersion: import_core5.IR_VERSION,
+    irVersion: import_core4.IR_VERSION,
     elements: [
       {
         kind: "field",