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

package/dist/internals.js

@@ -325,6 +325,7 @@ function canonicalizeTSDoc(analysis, source) {
     irVersion: IR_VERSION2,
     elements,
     typeRegistry: analysis.typeRegistry,
+    ...analysis.annotations !== void 0 && analysis.annotations.length > 0 && { annotations: analysis.annotations },
     provenance
   };
 }
@@ -501,8 +502,8 @@ var LENGTH_CONSTRAINT_MAP = {
   minItems: "minItems",
   maxItems: "maxItems"
 };
-var TAGS_REQUIRING_RAW_TEXT = /* @__PURE__ */ new Set(["pattern", "enumOptions"]);
-function createFormSpecTSDocConfig() {
+var TAGS_REQUIRING_RAW_TEXT = /* @__PURE__ */ new Set(["pattern", "enumOptions", "defaultValue"]);
+function createFormSpecTSDocConfig(extensionTagNames = []) {
   const config = new TSDocConfiguration();
   for (const tagName of Object.keys(BUILTIN_CONSTRAINT_DEFINITIONS)) {
     config.addTagDefinition(
@@ -513,7 +514,16 @@ function createFormSpecTSDocConfig() {
       })
     );
   }
-  for (const tagName of ["displayName", "description"]) {
+  for (const tagName of ["displayName", "description", "format", "placeholder"]) {
+    config.addTagDefinition(
+      new TSDocTagDefinition({
+        tagName: "@" + tagName,
+        syntaxKind: TSDocTagSyntaxKind.BlockTag,
+        allowMultiple: true
+      })
+    );
+  }
+  for (const tagName of extensionTagNames) {
     config.addTagDefinition(
       new TSDocTagDefinition({
         tagName: "@" + tagName,
@@ -524,14 +534,31 @@ function createFormSpecTSDocConfig() {
   }
   return config;
 }
-var sharedParser;
-function getParser() {
-  sharedParser ??= new TSDocParser(createFormSpecTSDocConfig());
-  return sharedParser;
-}
-function parseTSDocTags(node, file = "") {
+var parserCache = /* @__PURE__ */ new Map();
+function getParser(options) {
+  const extensionTagNames = [
+    ...options?.extensionRegistry?.extensions.flatMap(
+      (extension) => (extension.constraintTags ?? []).map((tag) => tag.tagName)
+    ) ?? []
+  ].sort();
+  const cacheKey = extensionTagNames.join("|");
+  const existing = parserCache.get(cacheKey);
+  if (existing) {
+    return existing;
+  }
+  const parser = new TSDocParser(createFormSpecTSDocConfig(extensionTagNames));
+  parserCache.set(cacheKey, parser);
+  return parser;
+}
+function parseTSDocTags(node, file = "", options) {
   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());
@@ -544,52 +571,92 @@ function parseTSDocTags(node, file = "") {
       if (!commentText.startsWith("/**")) {
         continue;
       }
-      const parser = getParser();
+      const parser = getParser(options);
       const parserContext = parser.parseRange(
         TextRange.fromStringRange(sourceText, range.pos, range.end)
       );
       const docComment = parserContext.docComment;
       for (const block of docComment.customBlocks) {
         const tagName = normalizeConstraintTagName(block.blockTag.tagName.substring(1));
-        if (tagName === "displayName" || tagName === "description") {
+        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: "displayName",
+              annotationKind: "format",
               value: text2,
               provenance: provenance2
             });
           } else {
-            annotations.push({
-              kind: "annotation",
-              annotationKind: "description",
-              value: text2,
-              provenance: provenance2
-            });
+            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 = isBuiltinConstraintName(tagName) ? BUILTIN_CONSTRAINT_DEFINITIONS[tagName] : void 0;
+        if (text === "" && expectedType !== "boolean") continue;
         const provenance = provenanceForComment(range, sourceFile, file, tagName);
-        const constraintNode = parseConstraintValue(tagName, text, provenance);
+        const constraintNode = parseConstraintValue(tagName, text, provenance, options);
         if (constraintNode) {
           constraints.push(constraintNode);
         }
       }
       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 = normalizeConstraintTagName(tag.tagName.text);
@@ -598,13 +665,40 @@ function parseTSDocTags(node, file = "") {
     if (commentText === void 0 || commentText.trim() === "") continue;
     const text = commentText.trim();
     const provenance = provenanceForJSDocTag(tag, file);
-    const constraintNode = parseConstraintValue(tagName, text, provenance);
+    if (tagName === "defaultValue") {
+      const defaultValueNode = parseDefaultValueValue(text, provenance);
+      annotations.push(defaultValueNode);
+      continue;
+    }
+    const constraintNode = parseConstraintValue(tagName, text, provenance, options);
     if (constraintNode) {
       constraints.push(constraintNode);
     }
   }
   return { constraints, annotations };
 }
+function extractDisplayNameMetadata(node) {
+  let displayName;
+  const memberDisplayNames = /* @__PURE__ */ new Map();
+  for (const tag of ts2.getJSDocTags(node)) {
+    const tagName = normalizeConstraintTagName(tag.tagName.text);
+    if (tagName !== "displayName") continue;
+    const commentText = getTagCommentText(tag);
+    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;
+    }
+    displayName ??= text;
+  }
+  return {
+    ...displayName !== void 0 && { displayName },
+    memberDisplayNames
+  };
+}
 function extractPathTarget(text) {
   const trimmed = text.trimStart();
   const match = /^:([a-zA-Z_]\w*)\s+([\s\S]*)$/.exec(trimmed);
@@ -632,7 +726,11 @@ function extractPlainText(node) {
   }
   return result;
 }
-function parseConstraintValue(tagName, text, provenance) {
+function parseConstraintValue(tagName, text, provenance, options) {
+  const customConstraint = parseExtensionConstraintValue(tagName, text, provenance, options);
+  if (customConstraint) {
+    return customConstraint;
+  }
   if (!isBuiltinConstraintName(tagName)) {
     return null;
   }
@@ -667,7 +765,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;
@@ -699,6 +835,111 @@ function parseConstraintValue(tagName, text, provenance) {
     provenance
   };
 }
+function parseExtensionConstraintValue(tagName, text, provenance, options) {
+  const pathResult = extractPathTarget(text);
+  const effectiveText = pathResult ? pathResult.remainingText : text;
+  const path2 = pathResult?.path;
+  const registry = options?.extensionRegistry;
+  if (registry === void 0) {
+    return null;
+  }
+  const directTag = registry.findConstraintTag(tagName);
+  if (directTag !== void 0) {
+    return makeCustomConstraintNode(
+      directTag.extensionId,
+      directTag.registration.constraintName,
+      directTag.registration.parseValue(effectiveText),
+      provenance,
+      path2,
+      registry
+    );
+  }
+  if (!isBuiltinConstraintName(tagName)) {
+    return null;
+  }
+  const broadenedTypeId = getBroadenedCustomTypeId(options?.fieldType);
+  if (broadenedTypeId === void 0) {
+    return null;
+  }
+  const broadened = registry.findBuiltinConstraintBroadening(broadenedTypeId, tagName);
+  if (broadened === void 0) {
+    return null;
+  }
+  return makeCustomConstraintNode(
+    broadened.extensionId,
+    broadened.registration.constraintName,
+    broadened.registration.parseValue(effectiveText),
+    provenance,
+    path2,
+    registry
+  );
+}
+function getBroadenedCustomTypeId(fieldType) {
+  if (fieldType?.kind === "custom") {
+    return fieldType.typeId;
+  }
+  if (fieldType?.kind !== "union") {
+    return void 0;
+  }
+  const customMembers = fieldType.members.filter(
+    (member) => member.kind === "custom"
+  );
+  if (customMembers.length !== 1) {
+    return void 0;
+  }
+  const nonCustomMembers = fieldType.members.filter((member) => member.kind !== "custom");
+  const allOtherMembersAreNull = nonCustomMembers.every(
+    (member) => member.kind === "primitive" && member.primitiveKind === "null"
+  );
+  const customMember = customMembers[0];
+  return allOtherMembersAreNull && customMember !== void 0 ? customMember.typeId : void 0;
+}
+function makeCustomConstraintNode(extensionId, constraintName, payload, provenance, path2, registry) {
+  const constraintId = `${extensionId}/${constraintName}`;
+  const registration = registry.findConstraint(constraintId);
+  if (registration === void 0) {
+    throw new Error(
+      `Custom TSDoc tag resolved to unregistered constraint "${constraintId}". Register the constraint before using its tag.`
+    );
+  }
+  return {
+    kind: "constraint",
+    constraintKind: "custom",
+    constraintId,
+    payload,
+    compositionRule: registration.compositionRule,
+    ...path2 && { path: path2 },
+    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 {
@@ -731,12 +972,12 @@ function getTagCommentText(tag) {
 }
 
 // src/analyzer/jsdoc-constraints.ts
-function extractJSDocConstraintNodes(node, file = "") {
-  const result = parseTSDocTags(node, file);
+function extractJSDocConstraintNodes(node, file = "", options) {
+  const result = parseTSDocTags(node, file, options);
   return [...result.constraints];
 }
-function extractJSDocAnnotationNodes(node, file = "") {
-  const result = parseTSDocTags(node, file);
+function extractJSDocAnnotationNodes(node, file = "", options) {
+  const result = parseTSDocTags(node, file, options);
   return [...result.annotations];
 }
 function extractDefaultValueAnnotation(initializer, file = "") {
@@ -780,17 +1021,43 @@ function isObjectType(type) {
 function isTypeReference(type) {
   return !!(type.flags & ts4.TypeFlags.Object) && !!(type.objectFlags & ts4.ObjectFlags.Reference);
 }
-function analyzeClassToIR(classDecl, checker, file = "") {
+var RESOLVING_TYPE_PLACEHOLDER = {
+  kind: "object",
+  properties: [],
+  additionalProperties: true
+};
+function makeParseOptions(extensionRegistry, fieldType) {
+  if (extensionRegistry === void 0 && fieldType === void 0) {
+    return void 0;
+  }
+  return {
+    ...extensionRegistry !== void 0 && { extensionRegistry },
+    ...fieldType !== void 0 && { fieldType }
+  };
+}
+function analyzeClassToIR(classDecl, checker, file = "", extensionRegistry) {
   const name = classDecl.name?.text ?? "AnonymousClass";
   const fields = [];
   const fieldLayouts = [];
   const typeRegistry = {};
+  const annotations = extractJSDocAnnotationNodes(
+    classDecl,
+    file,
+    makeParseOptions(extensionRegistry)
+  );
   const visiting = /* @__PURE__ */ new Set();
   const instanceMethods = [];
   const staticMethods = [];
   for (const member of classDecl.members) {
     if (ts4.isPropertyDeclaration(member)) {
-      const fieldNode = analyzeFieldToIR(member, checker, file, typeRegistry, visiting);
+      const fieldNode = analyzeFieldToIR(
+        member,
+        checker,
+        file,
+        typeRegistry,
+        visiting,
+        extensionRegistry
+      );
       if (fieldNode) {
         fields.push(fieldNode);
         fieldLayouts.push({});
@@ -807,25 +1074,53 @@ 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 = "") {
+function analyzeInterfaceToIR(interfaceDecl, checker, file = "", extensionRegistry) {
   const name = interfaceDecl.name.text;
   const fields = [];
   const typeRegistry = {};
+  const annotations = extractJSDocAnnotationNodes(
+    interfaceDecl,
+    file,
+    makeParseOptions(extensionRegistry)
+  );
   const visiting = /* @__PURE__ */ new Set();
   for (const member of interfaceDecl.members) {
     if (ts4.isPropertySignature(member)) {
-      const fieldNode = analyzeInterfacePropertyToIR(member, checker, file, typeRegistry, visiting);
+      const fieldNode = analyzeInterfacePropertyToIR(
+        member,
+        checker,
+        file,
+        typeRegistry,
+        visiting,
+        extensionRegistry
+      );
       if (fieldNode) {
         fields.push(fieldNode);
       }
     }
   }
   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 = "") {
+function analyzeTypeAliasToIR(typeAlias, checker, file = "", extensionRegistry) {
   if (!ts4.isTypeLiteralNode(typeAlias.type)) {
     const sourceFile = typeAlias.getSourceFile();
     const { line } = sourceFile.getLineAndCharacterOfPosition(typeAlias.getStart());
@@ -838,10 +1133,22 @@ function analyzeTypeAliasToIR(typeAlias, checker, file = "") {
   const name = typeAlias.name.text;
   const fields = [];
   const typeRegistry = {};
+  const annotations = extractJSDocAnnotationNodes(
+    typeAlias,
+    file,
+    makeParseOptions(extensionRegistry)
+  );
   const visiting = /* @__PURE__ */ new Set();
   for (const member of typeAlias.type.members) {
     if (ts4.isPropertySignature(member)) {
-      const fieldNode = analyzeInterfacePropertyToIR(member, checker, file, typeRegistry, visiting);
+      const fieldNode = analyzeInterfacePropertyToIR(
+        member,
+        checker,
+        file,
+        typeRegistry,
+        visiting,
+        extensionRegistry
+      );
       if (fieldNode) {
         fields.push(fieldNode);
       }
@@ -854,12 +1161,13 @@ function analyzeTypeAliasToIR(typeAlias, checker, file = "") {
       fields,
       fieldLayouts: fields.map(() => ({})),
       typeRegistry,
+      ...annotations.length > 0 && { annotations },
       instanceMethods: [],
       staticMethods: []
     }
   };
 }
-function analyzeFieldToIR(prop, checker, file, typeRegistry, visiting) {
+function analyzeFieldToIR(prop, checker, file, typeRegistry, visiting, extensionRegistry) {
   if (!ts4.isIdentifier(prop.name)) {
     return null;
   }
@@ -867,16 +1175,28 @@ function analyzeFieldToIR(prop, checker, file, typeRegistry, visiting) {
   const tsType = checker.getTypeAtLocation(prop);
   const optional = prop.questionToken !== void 0;
   const provenance = provenanceForNode(prop, file);
-  let type = resolveTypeNode(tsType, checker, file, typeRegistry, visiting);
+  let type = resolveTypeNode(
+    tsType,
+    checker,
+    file,
+    typeRegistry,
+    visiting,
+    prop,
+    extensionRegistry
+  );
   const constraints = [];
   if (prop.type) {
-    constraints.push(...extractTypeAliasConstraintNodes(prop.type, checker, file));
+    constraints.push(
+      ...extractTypeAliasConstraintNodes(prop.type, checker, file, extensionRegistry)
+    );
   }
-  constraints.push(...extractJSDocConstraintNodes(prop, file));
+  constraints.push(...extractJSDocConstraintNodes(prop, file, makeParseOptions(extensionRegistry, type)));
   let annotations = [];
-  annotations.push(...extractJSDocAnnotationNodes(prop, file));
+  annotations.push(
+    ...extractJSDocAnnotationNodes(prop, file, makeParseOptions(extensionRegistry, type))
+  );
   const defaultAnnotation = extractDefaultValueAnnotation(prop.initializer, file);
-  if (defaultAnnotation) {
+  if (defaultAnnotation && !annotations.some((a) => a.annotationKind === "defaultValue")) {
     annotations.push(defaultAnnotation);
   }
   ({ type, annotations } = applyEnumMemberDisplayNames(type, annotations));
@@ -890,7 +1210,7 @@ function analyzeFieldToIR(prop, checker, file, typeRegistry, visiting) {
     provenance
   };
 }
-function analyzeInterfacePropertyToIR(prop, checker, file, typeRegistry, visiting) {
+function analyzeInterfacePropertyToIR(prop, checker, file, typeRegistry, visiting, extensionRegistry) {
   if (!ts4.isIdentifier(prop.name)) {
     return null;
   }
@@ -898,14 +1218,26 @@ function analyzeInterfacePropertyToIR(prop, checker, file, typeRegistry, visitin
   const tsType = checker.getTypeAtLocation(prop);
   const optional = prop.questionToken !== void 0;
   const provenance = provenanceForNode(prop, file);
-  let type = resolveTypeNode(tsType, checker, file, typeRegistry, visiting);
+  let type = resolveTypeNode(
+    tsType,
+    checker,
+    file,
+    typeRegistry,
+    visiting,
+    prop,
+    extensionRegistry
+  );
   const constraints = [];
   if (prop.type) {
-    constraints.push(...extractTypeAliasConstraintNodes(prop.type, checker, file));
+    constraints.push(
+      ...extractTypeAliasConstraintNodes(prop.type, checker, file, extensionRegistry)
+    );
   }
-  constraints.push(...extractJSDocConstraintNodes(prop, file));
+  constraints.push(...extractJSDocConstraintNodes(prop, file, makeParseOptions(extensionRegistry, type)));
   let annotations = [];
-  annotations.push(...extractJSDocAnnotationNodes(prop, file));
+  annotations.push(
+    ...extractJSDocAnnotationNodes(prop, file, makeParseOptions(extensionRegistry, type))
+  );
   ({ type, annotations } = applyEnumMemberDisplayNames(type, annotations));
   return {
     kind: "field",
@@ -979,7 +1311,66 @@ function parseEnumMemberDisplayName(value) {
   if (label === "") return null;
   return { value: match[1], label };
 }
-function resolveTypeNode(type, checker, file, typeRegistry, visiting) {
+function resolveRegisteredCustomType(sourceNode, extensionRegistry, checker) {
+  if (sourceNode === void 0 || extensionRegistry === void 0) {
+    return null;
+  }
+  const typeNode = extractTypeNodeFromSource(sourceNode);
+  if (typeNode === void 0) {
+    return null;
+  }
+  return resolveRegisteredCustomTypeFromTypeNode(typeNode, extensionRegistry, checker);
+}
+function resolveRegisteredCustomTypeFromTypeNode(typeNode, extensionRegistry, checker) {
+  if (ts4.isParenthesizedTypeNode(typeNode)) {
+    return resolveRegisteredCustomTypeFromTypeNode(typeNode.type, extensionRegistry, checker);
+  }
+  const typeName = getTypeNodeRegistrationName(typeNode);
+  if (typeName === null) {
+    return null;
+  }
+  const registration = extensionRegistry.findTypeByName(typeName);
+  if (registration !== void 0) {
+    return {
+      kind: "custom",
+      typeId: `${registration.extensionId}/${registration.registration.typeName}`,
+      payload: null
+    };
+  }
+  if (ts4.isTypeReferenceNode(typeNode) && ts4.isIdentifier(typeNode.typeName)) {
+    const aliasDecl = checker.getSymbolAtLocation(typeNode.typeName)?.declarations?.find(ts4.isTypeAliasDeclaration);
+    if (aliasDecl !== void 0) {
+      return resolveRegisteredCustomTypeFromTypeNode(aliasDecl.type, extensionRegistry, checker);
+    }
+  }
+  return null;
+}
+function extractTypeNodeFromSource(sourceNode) {
+  if (ts4.isPropertyDeclaration(sourceNode) || ts4.isPropertySignature(sourceNode) || ts4.isParameter(sourceNode) || ts4.isTypeAliasDeclaration(sourceNode)) {
+    return sourceNode.type;
+  }
+  if (ts4.isTypeNode(sourceNode)) {
+    return sourceNode;
+  }
+  return void 0;
+}
+function getTypeNodeRegistrationName(typeNode) {
+  if (ts4.isTypeReferenceNode(typeNode)) {
+    return ts4.isIdentifier(typeNode.typeName) ? typeNode.typeName.text : typeNode.typeName.right.text;
+  }
+  if (ts4.isParenthesizedTypeNode(typeNode)) {
+    return getTypeNodeRegistrationName(typeNode.type);
+  }
+  if (typeNode.kind === ts4.SyntaxKind.BigIntKeyword || typeNode.kind === ts4.SyntaxKind.StringKeyword || typeNode.kind === ts4.SyntaxKind.NumberKeyword || typeNode.kind === ts4.SyntaxKind.BooleanKeyword) {
+    return typeNode.getText();
+  }
+  return null;
+}
+function resolveTypeNode(type, checker, file, typeRegistry, visiting, sourceNode, extensionRegistry) {
+  const customType = resolveRegisteredCustomType(sourceNode, extensionRegistry, checker);
+  if (customType) {
+    return customType;
+  }
   if (type.flags & ts4.TypeFlags.String) {
     return { kind: "primitive", primitiveKind: "string" };
   }
@@ -1008,88 +1399,162 @@ 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,
+      extensionRegistry
+    );
   }
   if (checker.isArrayType(type)) {
-    return resolveArrayType(type, checker, file, typeRegistry, visiting);
+    return resolveArrayType(
+      type,
+      checker,
+      file,
+      typeRegistry,
+      visiting,
+      sourceNode,
+      extensionRegistry
+    );
   }
   if (isObjectType(type)) {
-    return resolveObjectType(type, checker, file, typeRegistry, visiting);
+    return resolveObjectType(type, checker, file, typeRegistry, visiting, extensionRegistry);
   }
   return { kind: "primitive", primitiveKind: "string" };
 }
-function resolveUnionType(type, checker, file, typeRegistry, visiting) {
+function resolveUnionType(type, checker, file, typeRegistry, visiting, sourceNode, extensionRegistry) {
+  const typeName = getNamedTypeName(type);
+  const namedDecl = getNamedTypeDeclaration(type);
+  if (typeName && typeName in typeRegistry) {
+    return { kind: "reference", name: typeName, typeArguments: [] };
+  }
   const allTypes = type.types;
+  const unionMemberTypeNodes = extractUnionMemberTypeNodes(sourceNode, checker);
+  const nonNullSourceNodes = unionMemberTypeNodes.filter(
+    (memberTypeNode) => !isNullishTypeNode(resolveAliasedTypeNode(memberTypeNode, checker))
+  );
   const nonNullTypes = allTypes.filter(
-    (t) => !(t.flags & (ts4.TypeFlags.Null | ts4.TypeFlags.Undefined))
+    (memberType) => !(memberType.flags & (ts4.TypeFlags.Null | ts4.TypeFlags.Undefined))
   );
+  const nonNullMembers = nonNullTypes.map((memberType, index) => ({
+    memberType,
+    sourceNode: nonNullSourceNodes.length === nonNullTypes.length ? nonNullSourceNodes[index] : void 0
+  }));
   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, makeParseOptions(extensionRegistry)) : 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;
-  }
-  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 members = nonNullTypes.map(
-    (t) => resolveTypeNode(t, checker, file, typeRegistry, visiting)
+    const result = hasNull ? {
+      kind: "union",
+      members: [enumNode, { kind: "primitive", primitiveKind: "null" }]
+    } : enumNode;
+    return registerNamed(result);
+  }
+  if (nonNullMembers.length === 1 && nonNullMembers[0]) {
+    const inner = resolveTypeNode(
+      nonNullMembers[0].memberType,
+      checker,
+      file,
+      typeRegistry,
+      visiting,
+      nonNullMembers[0].sourceNode ?? sourceNode,
+      extensionRegistry
+    );
+    const result = hasNull ? {
+      kind: "union",
+      members: [inner, { kind: "primitive", primitiveKind: "null" }]
+    } : inner;
+    return registerNamed(result);
+  }
+  const members = nonNullMembers.map(
+    ({ memberType, sourceNode: memberSourceNode }) => resolveTypeNode(
+      memberType,
+      checker,
+      file,
+      typeRegistry,
+      visiting,
+      memberSourceNode ?? sourceNode,
+      extensionRegistry
+    )
   );
   if (hasNull) {
     members.push({ kind: "primitive", primitiveKind: "null" });
   }
-  return { kind: "union", members };
+  return registerNamed({ kind: "union", members });
 }
-function resolveArrayType(type, checker, file, typeRegistry, visiting) {
+function resolveArrayType(type, checker, file, typeRegistry, visiting, sourceNode, extensionRegistry) {
   const typeArgs = isTypeReference(type) ? type.typeArguments : void 0;
   const elementType = typeArgs?.[0];
-  const items = elementType ? resolveTypeNode(elementType, checker, file, typeRegistry, visiting) : { kind: "primitive", primitiveKind: "string" };
+  const elementSourceNode = extractArrayElementTypeNode(sourceNode, checker);
+  const items = elementType ? resolveTypeNode(
+    elementType,
+    checker,
+    file,
+    typeRegistry,
+    visiting,
+    elementSourceNode,
+    extensionRegistry
+  ) : { kind: "primitive", primitiveKind: "string" };
   return { kind: "array", items };
 }
-function tryResolveRecordType(type, checker, file, typeRegistry, visiting) {
+function tryResolveRecordType(type, checker, file, typeRegistry, visiting, extensionRegistry) {
   if (type.getProperties().length > 0) {
     return null;
   }
@@ -1097,39 +1562,123 @@ function tryResolveRecordType(type, checker, file, typeRegistry, visiting) {
   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);
-  }
+  const valueType = resolveTypeNode(
+    indexInfo.type,
+    checker,
+    file,
+    typeRegistry,
+    visiting,
+    void 0,
+    extensionRegistry
+  );
+  return { kind: "record", valueType };
 }
-function resolveObjectType(type, checker, file, typeRegistry, visiting) {
-  const recordNode = tryResolveRecordType(type, checker, file, typeRegistry, visiting);
-  if (recordNode) {
-    return recordNode;
+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, extensionRegistry) {
+  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,
+    extensionRegistry
+  );
+  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, makeParseOptions(extensionRegistry)) : 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);
+  const fieldInfoMap = getNamedTypeFieldNodeInfoMap(
+    type,
+    checker,
+    file,
+    typeRegistry,
+    visiting,
+    extensionRegistry
+  );
   for (const prop of type.getProperties()) {
     const declaration = prop.valueDeclaration ?? prop.declarations?.[0];
     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,
+      extensionRegistry
+    );
     const fieldNodeInfo = fieldInfoMap?.get(prop.name);
     properties.push({
       name: prop.name,
@@ -1146,17 +1695,19 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting) {
     properties,
     additionalProperties: true
   };
-  if (typeName) {
-    typeRegistry[typeName] = {
-      name: typeName,
+  if (namedTypeName !== void 0 && shouldRegisterNamedType) {
+    const annotations = namedDecl ? extractJSDocAnnotationNodes(namedDecl, file, makeParseOptions(extensionRegistry)) : 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;
 }
-function getNamedTypeFieldNodeInfoMap(type, checker, file, typeRegistry, visiting) {
+function getNamedTypeFieldNodeInfoMap(type, checker, file, typeRegistry, visiting, extensionRegistry) {
   const symbols = [type.getSymbol(), type.aliasSymbol].filter(
     (s) => s?.declarations != null && s.declarations.length > 0
   );
@@ -1168,7 +1719,14 @@ function getNamedTypeFieldNodeInfoMap(type, checker, file, typeRegistry, visitin
       const map = /* @__PURE__ */ new Map();
       for (const member of classDecl.members) {
         if (ts4.isPropertyDeclaration(member) && ts4.isIdentifier(member.name)) {
-          const fieldNode = analyzeFieldToIR(member, checker, file, typeRegistry, visiting);
+          const fieldNode = analyzeFieldToIR(
+            member,
+            checker,
+            file,
+            typeRegistry,
+            visiting,
+            extensionRegistry
+          );
           if (fieldNode) {
             map.set(fieldNode.name, {
               constraints: [...fieldNode.constraints],
@@ -1182,7 +1740,14 @@ function getNamedTypeFieldNodeInfoMap(type, checker, file, typeRegistry, visitin
     }
     const interfaceDecl = declarations.find(ts4.isInterfaceDeclaration);
     if (interfaceDecl) {
-      return buildFieldNodeInfoMap(interfaceDecl.members, checker, file, typeRegistry, visiting);
+      return buildFieldNodeInfoMap(
+        interfaceDecl.members,
+        checker,
+        file,
+        typeRegistry,
+        visiting,
+        extensionRegistry
+      );
     }
     const typeAliasDecl = declarations.find(ts4.isTypeAliasDeclaration);
     if (typeAliasDecl && ts4.isTypeLiteralNode(typeAliasDecl.type)) {
@@ -1191,17 +1756,68 @@ function getNamedTypeFieldNodeInfoMap(type, checker, file, typeRegistry, visitin
         checker,
         file,
         typeRegistry,
-        visiting
+        visiting,
+        extensionRegistry
       );
     }
   }
   return null;
 }
-function buildFieldNodeInfoMap(members, checker, file, typeRegistry, visiting) {
+function extractArrayElementTypeNode(sourceNode, checker) {
+  const typeNode = sourceNode === void 0 ? void 0 : extractTypeNodeFromSource(sourceNode);
+  if (typeNode === void 0) {
+    return void 0;
+  }
+  const resolvedTypeNode = resolveAliasedTypeNode(typeNode, checker);
+  if (ts4.isArrayTypeNode(resolvedTypeNode)) {
+    return resolvedTypeNode.elementType;
+  }
+  if (ts4.isTypeReferenceNode(resolvedTypeNode) && ts4.isIdentifier(resolvedTypeNode.typeName) && resolvedTypeNode.typeName.text === "Array" && resolvedTypeNode.typeArguments?.[0]) {
+    return resolvedTypeNode.typeArguments[0];
+  }
+  return void 0;
+}
+function extractUnionMemberTypeNodes(sourceNode, checker) {
+  const typeNode = sourceNode === void 0 ? void 0 : extractTypeNodeFromSource(sourceNode);
+  if (!typeNode) {
+    return [];
+  }
+  const resolvedTypeNode = resolveAliasedTypeNode(typeNode, checker);
+  return ts4.isUnionTypeNode(resolvedTypeNode) ? [...resolvedTypeNode.types] : [];
+}
+function resolveAliasedTypeNode(typeNode, checker, visited = /* @__PURE__ */ new Set()) {
+  if (ts4.isParenthesizedTypeNode(typeNode)) {
+    return resolveAliasedTypeNode(typeNode.type, checker, visited);
+  }
+  if (!ts4.isTypeReferenceNode(typeNode) || !ts4.isIdentifier(typeNode.typeName)) {
+    return typeNode;
+  }
+  const symbol = checker.getSymbolAtLocation(typeNode.typeName);
+  const aliasDecl = symbol?.declarations?.find(ts4.isTypeAliasDeclaration);
+  if (aliasDecl === void 0 || visited.has(aliasDecl)) {
+    return typeNode;
+  }
+  visited.add(aliasDecl);
+  return resolveAliasedTypeNode(aliasDecl.type, checker, visited);
+}
+function isNullishTypeNode(typeNode) {
+  if (typeNode.kind === ts4.SyntaxKind.NullKeyword || typeNode.kind === ts4.SyntaxKind.UndefinedKeyword) {
+    return true;
+  }
+  return ts4.isLiteralTypeNode(typeNode) && (typeNode.literal.kind === ts4.SyntaxKind.NullKeyword || typeNode.literal.kind === ts4.SyntaxKind.UndefinedKeyword);
+}
+function buildFieldNodeInfoMap(members, checker, file, typeRegistry, visiting, extensionRegistry) {
   const map = /* @__PURE__ */ new Map();
   for (const member of members) {
     if (ts4.isPropertySignature(member)) {
-      const fieldNode = analyzeInterfacePropertyToIR(member, checker, file, typeRegistry, visiting);
+      const fieldNode = analyzeInterfacePropertyToIR(
+        member,
+        checker,
+        file,
+        typeRegistry,
+        visiting,
+        extensionRegistry
+      );
       if (fieldNode) {
         map.set(fieldNode.name, {
           constraints: [...fieldNode.constraints],
@@ -1214,7 +1830,7 @@ function buildFieldNodeInfoMap(members, checker, file, typeRegistry, visiting) {
   return map;
 }
 var MAX_ALIAS_CHAIN_DEPTH = 8;
-function extractTypeAliasConstraintNodes(typeNode, checker, file, depth = 0) {
+function extractTypeAliasConstraintNodes(typeNode, checker, file, extensionRegistry, depth = 0) {
   if (!ts4.isTypeReferenceNode(typeNode)) return [];
   if (depth >= MAX_ALIAS_CHAIN_DEPTH) {
     const aliasName = typeNode.typeName.getText();
@@ -1227,8 +1843,29 @@ function extractTypeAliasConstraintNodes(typeNode, checker, file, depth = 0) {
   const aliasDecl = symbol.declarations.find(ts4.isTypeAliasDeclaration);
   if (!aliasDecl) return [];
   if (ts4.isTypeLiteralNode(aliasDecl.type)) return [];
-  const constraints = extractJSDocConstraintNodes(aliasDecl, file);
-  constraints.push(...extractTypeAliasConstraintNodes(aliasDecl.type, checker, file, depth + 1));
+  const aliasFieldType = resolveTypeNode(
+    checker.getTypeAtLocation(aliasDecl.type),
+    checker,
+    file,
+    {},
+    /* @__PURE__ */ new Set(),
+    aliasDecl.type,
+    extensionRegistry
+  );
+  const constraints = extractJSDocConstraintNodes(
+    aliasDecl,
+    file,
+    makeParseOptions(extensionRegistry, aliasFieldType)
+  );
+  constraints.push(
+    ...extractTypeAliasConstraintNodes(
+      aliasDecl.type,
+      checker,
+      file,
+      extensionRegistry,
+      depth + 1
+    )
+  );
   return constraints;
 }
 function provenanceForNode(node, file) {
@@ -1244,6 +1881,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) {
@@ -1262,6 +1905,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;
@@ -1321,6 +1978,9 @@ 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 = [];
@@ -1332,6 +1992,9 @@ function generateJsonSchemaFromIR(ir, options) {
     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;
   }
@@ -1361,22 +2024,51 @@ 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, ctx);
-  applyAnnotations(schema, field.annotations, 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, ctx);
 }
+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, ctx);
@@ -1594,6 +2286,9 @@ function applyConstraints(schema, constraints, ctx) {
       case "uniqueItems":
         schema.uniqueItems = constraint.value;
         break;
+      case "const":
+        schema.const = constraint.value;
+        break;
       case "allowedMembers":
         break;
       case "custom":
@@ -1618,8 +2313,14 @@ function applyAnnotations(schema, annotations, ctx) {
       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;
@@ -1651,7 +2352,12 @@ function applyCustomConstraint(schema, constraint, ctx) {
       `Cannot generate JSON Schema for custom constraint "${constraint.constraintId}" without a matching extension registration`
     );
   }
-  Object.assign(schema, registration.toJsonSchema(constraint.payload, ctx.vendorPrefix));
+  assignVendorPrefixedExtensionKeywords(
+    schema,
+    registration.toJsonSchema(constraint.payload, ctx.vendorPrefix),
+    ctx.vendorPrefix,
+    `custom constraint "${constraint.constraintId}"`
+  );
 }
 function applyCustomAnnotation(schema, annotation, ctx) {
   const registration = ctx.extensionRegistry?.findAnnotation(annotation.annotationId);
@@ -1663,7 +2369,22 @@ function applyCustomAnnotation(schema, annotation, ctx) {
   if (registration.toJsonSchema === void 0) {
     return;
   }
-  Object.assign(schema, registration.toJsonSchema(annotation.value, ctx.vendorPrefix));
+  assignVendorPrefixedExtensionKeywords(
+    schema,
+    registration.toJsonSchema(annotation.value, ctx.vendorPrefix),
+    ctx.vendorPrefix,
+    `custom annotation "${annotation.annotationId}"`
+  );
+}
+function assignVendorPrefixedExtensionKeywords(schema, extensionSchema, vendorPrefix, source) {
+  for (const [key, value] of Object.entries(extensionSchema)) {
+    if (!key.startsWith(`${vendorPrefix}-`)) {
+      throw new Error(
+        `Cannot apply ${source}: extension hooks may only emit "${vendorPrefix}-*" JSON Schema keywords`
+      );
+    }
+    schema[key] = value;
+  }
 }
 
 // src/ui-schema/schema.ts
@@ -1801,25 +2522,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)
         ]
       }
     }
@@ -1827,10 +2554,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;
@@ -1880,15 +2611,16 @@ function generateUiSchemaFromIR(ir) {
 }
 
 // src/generators/class-schema.ts
-function generateClassSchemas(analysis, source) {
+function generateClassSchemas(analysis, source, options) {
   const ir = canonicalizeTSDoc(analysis, source);
   return {
-    jsonSchema: generateJsonSchemaFromIR(ir),
+    jsonSchema: generateJsonSchemaFromIR(ir, options),
     uiSchema: generateUiSchemaFromIR(ir)
   };
 }
 
 // src/validate/constraint-validator.ts
+import { normalizeConstraintTagName as normalizeConstraintTagName2 } from "@formspec/core";
 function addContradiction(ctx, message, primary, related) {
   ctx.diagnostics.push({
     code: "CONTRADICTING_CONSTRAINTS",
@@ -1916,6 +2648,15 @@ function addUnknownExtension(ctx, message, 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",
@@ -1925,6 +2666,13 @@ function addConstraintBroadening(ctx, message, primary, related) {
     relatedLocations: [related]
   });
 }
+function getExtensionIdFromConstraintId(constraintId) {
+  const separator = constraintId.lastIndexOf("/");
+  if (separator <= 0) {
+    return null;
+  }
+  return constraintId.slice(0, separator);
+}
 function findNumeric(constraints, constraintKind) {
   return constraints.find((c) => c.constraintKind === constraintKind);
 }
@@ -1936,6 +2684,45 @@ 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";
 }
@@ -2056,6 +2843,112 @@ function checkConstraintBroadening(ctx, fieldName, constraints) {
     strongestByKey.set(key, constraint);
   }
 }
+function compareCustomConstraintStrength(current, previous) {
+  const order = current.comparePayloads(current.constraint.payload, previous.constraint.payload);
+  const equalPayloadTiebreaker = order === 0 ? compareSemanticInclusivity(current.role.inclusive, previous.role.inclusive) : order;
+  switch (current.role.bound) {
+    case "lower":
+      return equalPayloadTiebreaker;
+    case "upper":
+      return equalPayloadTiebreaker === 0 ? 0 : -equalPayloadTiebreaker;
+    case "exact":
+      return order === 0 ? 0 : Number.NaN;
+    default: {
+      const _exhaustive = current.role.bound;
+      return _exhaustive;
+    }
+  }
+}
+function compareSemanticInclusivity(currentInclusive, previousInclusive) {
+  if (currentInclusive === previousInclusive) {
+    return 0;
+  }
+  return currentInclusive ? -1 : 1;
+}
+function customConstraintsContradict(lower, upper) {
+  const order = lower.comparePayloads(lower.constraint.payload, upper.constraint.payload);
+  if (order > 0) {
+    return true;
+  }
+  if (order < 0) {
+    return false;
+  }
+  return !lower.role.inclusive || !upper.role.inclusive;
+}
+function describeCustomConstraintTag(constraint) {
+  return constraint.provenance.tagName ?? constraint.constraintId;
+}
+function checkCustomConstraintSemantics(ctx, fieldName, constraints) {
+  if (ctx.extensionRegistry === void 0) {
+    return;
+  }
+  const strongestByKey = /* @__PURE__ */ new Map();
+  const lowerByFamily = /* @__PURE__ */ new Map();
+  const upperByFamily = /* @__PURE__ */ new Map();
+  for (const constraint of constraints) {
+    if (constraint.constraintKind !== "custom") {
+      continue;
+    }
+    const registration = ctx.extensionRegistry.findConstraint(constraint.constraintId);
+    if (registration?.comparePayloads === void 0 || registration.semanticRole === void 0) {
+      continue;
+    }
+    const entry = {
+      constraint,
+      comparePayloads: registration.comparePayloads,
+      role: registration.semanticRole
+    };
+    const familyKey = `${registration.semanticRole.family}:${pathKey(constraint)}`;
+    const boundKey = `${familyKey}:${registration.semanticRole.bound}`;
+    const previous = strongestByKey.get(boundKey);
+    if (previous !== void 0) {
+      const strength = compareCustomConstraintStrength(entry, previous);
+      if (Number.isNaN(strength)) {
+        addContradiction(
+          ctx,
+          `Field "${formatPathTargetFieldName(fieldName, constraint.path?.segments ?? [])}": ${describeCustomConstraintTag(constraint)} conflicts with ${describeCustomConstraintTag(previous.constraint)}`,
+          constraint.provenance,
+          previous.constraint.provenance
+        );
+        continue;
+      }
+      if (strength < 0) {
+        addConstraintBroadening(
+          ctx,
+          `Field "${formatPathTargetFieldName(fieldName, constraint.path?.segments ?? [])}": ${describeCustomConstraintTag(constraint)} is broader than earlier ${describeCustomConstraintTag(previous.constraint)}. Constraints can only narrow.`,
+          constraint.provenance,
+          previous.constraint.provenance
+        );
+        continue;
+      }
+      if (strength > 0) {
+        strongestByKey.set(boundKey, entry);
+      }
+    } else {
+      strongestByKey.set(boundKey, entry);
+    }
+    if (registration.semanticRole.bound === "lower") {
+      lowerByFamily.set(familyKey, strongestByKey.get(boundKey) ?? entry);
+    } else if (registration.semanticRole.bound === "upper") {
+      upperByFamily.set(familyKey, strongestByKey.get(boundKey) ?? entry);
+    }
+  }
+  for (const [familyKey, lower] of lowerByFamily) {
+    const upper = upperByFamily.get(familyKey);
+    if (upper === void 0) {
+      continue;
+    }
+    if (!customConstraintsContradict(lower, upper)) {
+      continue;
+    }
+    addContradiction(
+      ctx,
+      `Field "${formatPathTargetFieldName(fieldName, lower.constraint.path?.segments ?? [])}": ${describeCustomConstraintTag(lower.constraint)} contradicts ${describeCustomConstraintTag(upper.constraint)}`,
+      lower.constraint.provenance,
+      upper.constraint.provenance
+    );
+  }
+}
 function checkNumericContradictions(ctx, fieldName, constraints) {
   const min = findNumeric(constraints, "minimum");
   const max = findNumeric(constraints, "maximum");
@@ -2142,6 +3035,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":
@@ -2214,6 +3126,8 @@ function checkConstraintOnType(ctx, fieldName, type, constraint) {
   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) {
@@ -2234,10 +3148,10 @@ function checkConstraintOnType(ctx, fieldName, type, constraint) {
     case "minLength":
     case "maxLength":
     case "pattern": {
-      if (!isString) {
+      if (!isString && !isStringArray) {
         addTypeMismatch(
           ctx,
-          `Field "${fieldName}": constraint "${ck}" is only valid on string fields, but field type is "${label}"`,
+          `Field "${fieldName}": constraint "${ck}" is only valid on string fields or string array items, but field type is "${label}"`,
           constraint.provenance
         );
       }
@@ -2265,6 +3179,37 @@ function checkConstraintOnType(ctx, fieldName, type, constraint) {
       }
       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;
+      }
+      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}": @const value type "${valueType}" is incompatible with field type "${effectiveType.primitiveKind}"`,
+            constraint.provenance
+          );
+        }
+        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
+        );
+      }
+      break;
+    }
     case "custom": {
       checkCustomConstraint(ctx, fieldName, effectiveType, constraint);
       break;
@@ -2283,9 +3228,9 @@ function checkTypeApplicability(ctx, fieldName, type, constraints) {
       const resolution = resolvePathTargetType(ctx, type, constraint.path.segments);
       const targetFieldName = formatPathTargetFieldName(fieldName, constraint.path.segments);
       if (resolution.kind === "missing-property") {
-        addTypeMismatch(
+        addUnknownPathTarget(
           ctx,
-          `Field "${fieldName}": path-targeted constraint "${constraint.constraintKind}" references unknown path segment "${resolution.segment}"`,
+          `Field "${targetFieldName}": path-targeted constraint "${constraint.constraintKind}" references unknown path segment "${resolution.segment}"`,
           constraint.provenance
         );
         continue;
@@ -2315,8 +3260,30 @@ function checkCustomConstraint(ctx, fieldName, type, constraint) {
     );
     return;
   }
-  if (registration.applicableTypes === null) return;
-  if (!registration.applicableTypes.includes(type.kind)) {
+  const normalizedTagName = constraint.provenance.tagName === void 0 ? void 0 : normalizeConstraintTagName2(constraint.provenance.tagName.replace(/^@/, ""));
+  if (normalizedTagName !== void 0) {
+    const tagRegistration = ctx.extensionRegistry.findConstraintTag(normalizedTagName);
+    const extensionId = getExtensionIdFromConstraintId(constraint.constraintId);
+    if (extensionId !== null && tagRegistration?.extensionId === extensionId && tagRegistration.registration.constraintName === registration.constraintName && tagRegistration.registration.isApplicableToType?.(type) === false) {
+      addTypeMismatch(
+        ctx,
+        `Field "${fieldName}": custom constraint "${constraint.constraintId}" is not applicable to type "${typeLabel(type)}"`,
+        constraint.provenance
+      );
+      return;
+    }
+  }
+  if (registration.applicableTypes === null) {
+    if (registration.isApplicableToType?.(type) === false) {
+      addTypeMismatch(
+        ctx,
+        `Field "${fieldName}": custom constraint "${constraint.constraintId}" is not applicable to type "${typeLabel(type)}"`,
+        constraint.provenance
+      );
+    }
+    return;
+  }
+  if (!registration.applicableTypes.includes(type.kind) || registration.isApplicableToType?.(type) === false) {
     addTypeMismatch(
       ctx,
       `Field "${fieldName}": custom constraint "${constraint.constraintId}" is not applicable to type "${typeLabel(type)}"`,
@@ -2345,7 +3312,9 @@ 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);
+  checkCustomConstraintSemantics(ctx, name, constraints);
   checkTypeApplicability(ctx, name, type, constraints);
 }
 function validateElement(ctx, element) {
@@ -2387,7 +3356,10 @@ function validateIR(ir, options) {
 // src/extensions/registry.ts
 function createExtensionRegistry(extensions) {
   const typeMap = /* @__PURE__ */ new Map();
+  const typeNameMap = /* @__PURE__ */ new Map();
   const constraintMap = /* @__PURE__ */ new Map();
+  const constraintTagMap = /* @__PURE__ */ new Map();
+  const builtinBroadeningMap = /* @__PURE__ */ new Map();
   const annotationMap = /* @__PURE__ */ new Map();
   for (const ext of extensions) {
     if (ext.types !== void 0) {
@@ -2397,6 +3369,27 @@ function createExtensionRegistry(extensions) {
           throw new Error(`Duplicate custom type ID: "${qualifiedId}"`);
         }
         typeMap.set(qualifiedId, type);
+        for (const sourceTypeName of type.tsTypeNames ?? [type.typeName]) {
+          if (typeNameMap.has(sourceTypeName)) {
+            throw new Error(`Duplicate custom type source name: "${sourceTypeName}"`);
+          }
+          typeNameMap.set(sourceTypeName, {
+            extensionId: ext.extensionId,
+            registration: type
+          });
+        }
+        if (type.builtinConstraintBroadenings !== void 0) {
+          for (const broadening of type.builtinConstraintBroadenings) {
+            const key = `${qualifiedId}:${broadening.tagName}`;
+            if (builtinBroadeningMap.has(key)) {
+              throw new Error(`Duplicate built-in constraint broadening: "${key}"`);
+            }
+            builtinBroadeningMap.set(key, {
+              extensionId: ext.extensionId,
+              registration: broadening
+            });
+          }
+        }
       }
     }
     if (ext.constraints !== void 0) {
@@ -2408,6 +3401,17 @@ function createExtensionRegistry(extensions) {
         constraintMap.set(qualifiedId, constraint);
       }
     }
+    if (ext.constraintTags !== void 0) {
+      for (const tag of ext.constraintTags) {
+        if (constraintTagMap.has(tag.tagName)) {
+          throw new Error(`Duplicate custom constraint tag: "@${tag.tagName}"`);
+        }
+        constraintTagMap.set(tag.tagName, {
+          extensionId: ext.extensionId,
+          registration: tag
+        });
+      }
+    }
     if (ext.annotations !== void 0) {
       for (const annotation of ext.annotations) {
         const qualifiedId = `${ext.extensionId}/${annotation.annotationName}`;
@@ -2421,7 +3425,10 @@ function createExtensionRegistry(extensions) {
   return {
     extensions,
     findType: (typeId) => typeMap.get(typeId),
+    findTypeByName: (typeName) => typeNameMap.get(typeName),
     findConstraint: (constraintId) => constraintMap.get(constraintId),
+    findConstraintTag: (tagName) => constraintTagMap.get(tagName),
+    findBuiltinConstraintBroadening: (typeId, tagName) => builtinBroadeningMap.get(`${typeId}:${tagName}`),
     findAnnotation: (annotationId) => annotationMap.get(annotationId)
   };
 }