@formspec/build 0.1.0-alpha.58 → 0.1.0-alpha.61

package/dist/internals.js

@@ -791,25 +791,27 @@ function wrapInConditional(field, layout, provenance) {
 }
 
 // src/analyzer/program.ts
-import * as ts7 from "typescript";
+import * as ts6 from "typescript";
 import * as path from "path";
 
 // src/analyzer/class-analyzer.ts
-import * as ts6 from "typescript";
+import * as ts5 from "typescript";
 import {
   analyzeMetadataForNodeWithChecker,
   parseCommentBlock
 } from "@formspec/analysis/internal";
 
 // src/analyzer/jsdoc-constraints.ts
-import * as ts5 from "typescript";
+import * as ts4 from "typescript";
 
 // src/analyzer/tsdoc-parser.ts
-import * as ts4 from "typescript";
+import * as ts3 from "typescript";
 import {
-  checkSyntheticTagApplication,
+  _capabilityLabel,
+  _supportsConstraintCapability,
   choosePreferredPayloadText,
   extractPathTarget as extractSharedPathTarget,
+  getBroadenedCustomTypeId,
   getTagDefinition,
   hasTypeSemanticCapability,
   normalizeFormSpecTagName,
@@ -832,25 +834,10 @@ import { noopLogger } from "@formspec/core";
 
 // src/extensions/resolve-custom-type.ts
 import * as ts2 from "typescript";
-import { stripNullishUnion } from "@formspec/analysis/internal";
+import { _collectBrandIdentifiers, stripNullishUnion } from "@formspec/analysis/internal";
 
 // src/extensions/ts-type-utils.ts
 import * as ts from "typescript";
-function collectBrandIdentifiers(type) {
-  if (!type.isIntersection()) {
-    return [];
-  }
-  const brands = [];
-  for (const prop of type.getProperties()) {
-    const decl = prop.valueDeclaration ?? prop.declarations?.[0];
-    if (decl === void 0) continue;
-    if (!ts.isPropertySignature(decl) && !ts.isPropertyDeclaration(decl)) continue;
-    if (!ts.isComputedPropertyName(decl.name)) continue;
-    if (!ts.isIdentifier(decl.name.expression)) continue;
-    brands.push(decl.name.expression.text);
-  }
-  return brands;
-}
 function resolveCanonicalSymbol(type, checker) {
   const raw = type.aliasSymbol ?? type.getSymbol();
   if (raw === void 0) return void 0;
@@ -935,7 +922,7 @@ function resolveCustomTypeFromTsType(type, checker, registry, sourceNode) {
       return bySymbol;
     }
   }
-  for (const brand of collectBrandIdentifiers(stripped)) {
+  for (const brand of _collectBrandIdentifiers(stripped)) {
     const byBrand = registry.findTypeByBrand(brand);
     if (byBrand !== void 0) {
       return byBrand;
@@ -948,171 +935,51 @@ function customTypeIdFromLookup(result) {
 }
 
 // src/analyzer/builtin-brands.ts
-import * as ts3 from "typescript";
-function isIntegerBrandedType(type) {
-  if (!type.isIntersection()) return false;
-  if (!type.types.some((member) => !!(member.flags & ts3.TypeFlags.Number))) return false;
-  return collectBrandIdentifiers(type).includes("__integerBrand");
-}
+import { _isIntegerBrandedType } from "@formspec/analysis/internal";
 
 // src/analyzer/tsdoc-parser.ts
 import {
+  _emitSetupDiagnostics,
   getBuildLogger,
   getBroadeningLogger,
-  getSyntheticLogger,
   getTypedParserLogger,
+  extractEffectiveArgumentText,
+  mapTypedParserDiagnosticCode,
   parseTagArgument,
   describeTypeKind,
   elapsedMicros,
   nowMicros,
   logTagApplication
 } from "@formspec/analysis/internal";
-function sharedTagValueOptions(options) {
+function sharedTagValueOptions(options, pathResolvedCustomTypeId) {
   return {
     ...options?.extensionRegistry !== void 0 ? { registry: options.extensionRegistry } : {},
-    ...options?.fieldType !== void 0 ? { fieldType: options.fieldType } : {}
-  };
-}
-var SYNTHETIC_TYPE_FORMAT_FLAGS = ts4.TypeFormatFlags.NoTruncation | ts4.TypeFormatFlags.UseAliasDefinedOutsideCurrentScope;
-function getExtensionTypeNames(registry) {
-  if (registry === void 0) {
-    return /* @__PURE__ */ new Set();
-  }
-  return new Set(
-    registry.extensions.flatMap(
-      (ext) => (ext.types ?? []).flatMap((t) => t.tsTypeNames ?? [t.typeName])
-    )
-  );
-}
-function collectImportedNames(sourceFile) {
-  const importedNames = /* @__PURE__ */ new Set();
-  for (const statement of sourceFile.statements) {
-    if (ts4.isImportDeclaration(statement) && statement.importClause !== void 0) {
-      const clause = statement.importClause;
-      if (clause.name !== void 0) {
-        importedNames.add(clause.name.text);
-      }
-      if (clause.namedBindings !== void 0) {
-        if (ts4.isNamedImports(clause.namedBindings)) {
-          for (const specifier of clause.namedBindings.elements) {
-            importedNames.add(specifier.name.text);
-          }
-        } else if (ts4.isNamespaceImport(clause.namedBindings)) {
-          importedNames.add(clause.namedBindings.name.text);
-        }
-      }
-      continue;
-    }
-    if (ts4.isImportEqualsDeclaration(statement)) {
-      importedNames.add(statement.name.text);
-    }
-  }
-  return importedNames;
-}
-function isNonReferenceIdentifier(node) {
-  const parent = node.parent;
-  if ((ts4.isBindingElement(parent) || ts4.isClassDeclaration(parent) || ts4.isEnumDeclaration(parent) || ts4.isEnumMember(parent) || ts4.isFunctionDeclaration(parent) || ts4.isFunctionExpression(parent) || ts4.isImportClause(parent) || ts4.isImportEqualsDeclaration(parent) || ts4.isImportSpecifier(parent) || ts4.isInterfaceDeclaration(parent) || ts4.isMethodDeclaration(parent) || ts4.isMethodSignature(parent) || ts4.isModuleDeclaration(parent) || ts4.isNamespaceExport(parent) || ts4.isNamespaceImport(parent) || ts4.isParameter(parent) || ts4.isPropertyDeclaration(parent) || ts4.isPropertySignature(parent) || ts4.isSetAccessorDeclaration(parent) || ts4.isGetAccessorDeclaration(parent) || ts4.isTypeAliasDeclaration(parent) || ts4.isTypeParameterDeclaration(parent) || ts4.isVariableDeclaration(parent)) && parent.name === node) {
-    return true;
-  }
-  if ((ts4.isPropertyAssignment(parent) || ts4.isPropertyAccessExpression(parent)) && parent.name === node) {
-    return true;
-  }
-  if (ts4.isQualifiedName(parent) && parent.right === node) {
-    return true;
-  }
-  return false;
-}
-function astReferencesImportedName(root, importedNames) {
-  if (importedNames.size === 0) {
-    return false;
-  }
-  let found = false;
-  const visit = (node) => {
-    if (found) return;
-    if (ts4.isIdentifier(node) && importedNames.has(node.text) && !isNonReferenceIdentifier(node)) {
-      found = true;
-      return;
-    }
-    ts4.forEachChild(node, visit);
+    ...options?.fieldType !== void 0 ? { fieldType: options.fieldType } : {},
+    ...pathResolvedCustomTypeId !== void 0 ? { pathResolvedCustomTypeId } : {}
   };
-  visit(root);
-  return found;
 }
-function getObjectMembers(statement) {
-  if (ts4.isInterfaceDeclaration(statement)) {
-    return statement.members;
-  }
-  if (ts4.isTypeLiteralNode(statement.type)) {
-    return statement.type.members;
-  }
-  return void 0;
+function customTypeIdForResolvedType(resolvedType, checker, registry) {
+  if (registry === void 0) return void 0;
+  const lookup = resolveCustomTypeFromTsType(resolvedType, checker, registry);
+  return lookup === null ? void 0 : customTypeIdFromLookup(lookup);
 }
-function rewriteImportedMemberTypes(statement, sourceFile, importedNames) {
-  const members = getObjectMembers(statement);
-  if (members === void 0) {
-    return null;
-  }
-  const replacements = [];
-  for (const member of members) {
-    if (!ts4.isPropertySignature(member)) {
-      if (astReferencesImportedName(member, importedNames)) {
-        return null;
-      }
-      continue;
-    }
-    const typeAnnotation = member.type;
-    if (typeAnnotation === void 0) continue;
-    if (astReferencesImportedName(typeAnnotation, importedNames)) {
-      replacements.push({
-        start: typeAnnotation.getStart(sourceFile),
-        end: typeAnnotation.getEnd()
-      });
-    }
-  }
-  if (replacements.length === 0) {
-    return statement.getText(sourceFile);
-  }
-  const stmtStart = statement.getStart(sourceFile);
-  let result = statement.getText(sourceFile);
-  for (const { start, end } of [...replacements].reverse()) {
-    result = result.slice(0, start - stmtStart) + "unknown" + result.slice(end - stmtStart);
+function resolvePathTargetCustomTypeId(parsedTag, subjectType, checker, registry) {
+  if (parsedTag === null) return void 0;
+  const target = parsedTag.target;
+  if (target?.kind !== "path" || !target.valid || target.path === null) {
+    return void 0;
   }
-  return result;
-}
-function buildSupportingDeclarations(sourceFile, extensionTypeNames) {
-  const importedNames = collectImportedNames(sourceFile);
-  const importedNamesToSkip = new Set(
-    [...importedNames].filter((name) => !extensionTypeNames.has(name))
-  );
-  const result = [];
-  for (const statement of sourceFile.statements) {
-    if (ts4.isImportDeclaration(statement)) continue;
-    if (ts4.isImportEqualsDeclaration(statement)) continue;
-    if (ts4.isExportDeclaration(statement) && statement.moduleSpecifier !== void 0) continue;
-    if (!astReferencesImportedName(statement, importedNamesToSkip)) {
-      result.push(statement.getText(sourceFile));
-      continue;
-    }
-    if (ts4.isInterfaceDeclaration(statement) || ts4.isTypeAliasDeclaration(statement)) {
-      const rewritten = rewriteImportedMemberTypes(statement, sourceFile, importedNamesToSkip);
-      if (rewritten !== null) {
-        result.push(rewritten);
-      }
-    }
+  if (subjectType === void 0 || checker === void 0) {
+    return void 0;
   }
-  return result;
-}
-function pushUniqueCompilerDiagnostics(target, additions) {
-  for (const diagnostic of additions) {
-    if ((diagnostic.code === "UNSUPPORTED_CUSTOM_TYPE_OVERRIDE" || diagnostic.code === "SYNTHETIC_SETUP_FAILURE") && target.some(
-      (existing) => existing.code === diagnostic.code && existing.message === diagnostic.message
-    )) {
-      continue;
-    }
-    target.push(diagnostic);
+  const resolution = resolvePathTargetType(subjectType, checker, target.path.segments);
+  if (resolution.kind !== "resolved") {
+    return void 0;
   }
+  return customTypeIdForResolvedType(resolution.type, checker, registry);
 }
-function processConstraintTag(tagName, text, parsedTag, provenance, node, sourceFile, supportingDeclarations, options, constraints, diagnostics) {
+var TYPE_FORMAT_FLAGS = ts3.TypeFormatFlags.NoTruncation | ts3.TypeFormatFlags.UseAliasDefinedOutsideCurrentScope;
+function processConstraintTag(tagName, text, parsedTag, provenance, node, sourceFile, options, constraints, diagnostics) {
   const compilerDiagnostics = buildCompilerBackedConstraintDiagnostics(
     node,
     sourceFile,
@@ -1120,74 +987,30 @@ function processConstraintTag(tagName, text, parsedTag, provenance, node, source
     parsedTag,
     text,
     provenance,
-    supportingDeclarations,
     options
   );
   if (compilerDiagnostics.length > 0) {
-    pushUniqueCompilerDiagnostics(diagnostics, compilerDiagnostics);
+    diagnostics.push(...compilerDiagnostics);
     return;
   }
+  const pathResolvedCustomTypeId = resolvePathTargetCustomTypeId(
+    parsedTag,
+    options?.subjectType,
+    options?.checker,
+    options?.extensionRegistry
+  );
   const constraintNode = parseConstraintTagValue(
     tagName,
     text,
     provenance,
-    sharedTagValueOptions(options)
+    sharedTagValueOptions(options, pathResolvedCustomTypeId)
   );
   if (constraintNode) {
     constraints.push(constraintNode);
   }
 }
-function renderSyntheticArgumentExpression(valueKind, argumentText) {
-  const trimmed = argumentText.trim();
-  if (trimmed === "") {
-    return null;
-  }
-  switch (valueKind) {
-    case "number":
-    case "integer":
-    case "signedInteger":
-      if (trimmed === "Infinity" || trimmed === "-Infinity" || trimmed === "NaN") {
-        return trimmed;
-      }
-      return Number.isFinite(Number(trimmed)) ? trimmed : JSON.stringify(trimmed);
-    case "string":
-      return JSON.stringify(argumentText);
-    case "json":
-      try {
-        JSON.parse(trimmed);
-        return `(${trimmed})`;
-      } catch {
-        return JSON.stringify(trimmed);
-      }
-    case "boolean":
-      return trimmed === "true" || trimmed === "false" ? trimmed : JSON.stringify(trimmed);
-    case "condition":
-      return "undefined as unknown as FormSpecCondition";
-    case null:
-      return null;
-    default: {
-      return String(valueKind);
-    }
-  }
-}
-function getArrayElementType(type, checker) {
-  if (!checker.isArrayType(type)) {
-    return null;
-  }
-  return checker.getTypeArguments(type)[0] ?? null;
-}
 function supportsConstraintCapability(type, checker, capability) {
-  if (capability === void 0) {
-    return true;
-  }
-  if (hasTypeSemanticCapability(type, checker, capability)) {
-    return true;
-  }
-  if (capability === "string-like") {
-    const itemType = getArrayElementType(type, checker);
-    return itemType !== null && hasTypeSemanticCapability(itemType, checker, capability);
-  }
-  return false;
+  return _supportsConstraintCapability(capability, type, checker);
 }
 var MAX_HINT_CANDIDATES = 5;
 var MAX_HINT_DEPTH = 3;
@@ -1196,7 +1019,7 @@ function stripHintNullishUnion(type) {
     return type;
   }
   const nonNullish = type.types.filter(
-    (member) => (member.flags & (ts4.TypeFlags.Null | ts4.TypeFlags.Undefined)) === 0
+    (member) => (member.flags & (ts3.TypeFlags.Null | ts3.TypeFlags.Undefined)) === 0
   );
   if (nonNullish.length === 1 && nonNullish[0] !== void 0) {
     return nonNullish[0];
@@ -1212,10 +1035,10 @@ function isUserEmittableHintProperty(property, declaration) {
   }
   if ("name" in declaration && declaration.name !== void 0) {
     const name = declaration.name;
-    if (ts4.isComputedPropertyName(name) || ts4.isPrivateIdentifier(name)) {
+    if (ts3.isComputedPropertyName(name) || ts3.isPrivateIdentifier(name)) {
       return false;
     }
-    if (!ts4.isIdentifier(name) && !ts4.isStringLiteral(name) && !ts4.isNumericLiteral(name)) {
+    if (!ts3.isIdentifier(name) && !ts3.isStringLiteral(name) && !ts3.isNumericLiteral(name)) {
       return false;
     }
   }
@@ -1314,53 +1137,11 @@ function placementLabel(placement) {
     }
   }
 }
-function capabilityLabel(capability) {
-  switch (capability) {
-    case "numeric-comparable":
-      return "number";
-    case "string-like":
-      return "string";
-    case "array-like":
-      return "array";
-    case "enum-member-addressable":
-      return "enum";
-    case "json-like":
-      return "JSON-compatible";
-    case "object-like":
-      return "object";
-    case "condition-like":
-      return "conditional";
-    case void 0:
-      return "compatible";
-    default:
-      return capability;
-  }
-}
-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 hasBuiltinConstraintBroadening(tagName, options) {
   const broadenedTypeId = getBroadenedCustomTypeId(options?.fieldType);
   return broadenedTypeId !== void 0 && options?.extensionRegistry?.findBuiltinConstraintBroadening(broadenedTypeId, tagName) !== void 0;
 }
-function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, parsedTag, rawText, provenance, supportingDeclarations, options) {
+function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, parsedTag, rawText, provenance, options) {
   if (!isBuiltinConstraintName(tagName)) {
     return [];
   }
@@ -1380,16 +1161,14 @@ function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, par
   const nonNullPlacement = placement;
   const log = getBuildLogger();
   const broadeningLog = getBroadeningLogger();
-  const syntheticLog = getSyntheticLogger();
   const typedParserLog = getTypedParserLogger();
   const logsEnabled = log !== noopLogger || broadeningLog !== noopLogger;
-  const syntheticTraceEnabled = syntheticLog !== noopLogger;
   const typedParserTraceEnabled = typedParserLog !== noopLogger;
   const logStart = logsEnabled ? nowMicros() : 0;
   const subjectTypeKind = logsEnabled ? describeTypeKind(subjectType, checker) : "";
-  function emit(outcome, result2) {
+  function emit(outcome, result) {
     if (!logsEnabled) {
-      return result2;
+      return result;
     }
     const entry = {
       consumer: "build",
@@ -1403,7 +1182,7 @@ function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, par
     if (outcome === "bypass" || outcome === "D1" || outcome === "D2") {
       logTagApplication(broadeningLog, entry);
     }
-    return result2;
+    return result;
   }
   if (!definition.placements.includes(placement)) {
     return emit("A-reject", [
@@ -1447,7 +1226,7 @@ function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, par
       ]);
     }
     if (resolution.kind === "unresolvable") {
-      const actualType = checker.typeToString(resolution.type, node, SYNTHETIC_TYPE_FORMAT_FLAGS);
+      const actualType = checker.typeToString(resolution.type, node, TYPE_FORMAT_FLAGS);
       return emit("B-reject", [
         makeDiagnostic(
           "TYPE_MISMATCH",
@@ -1461,21 +1240,21 @@ function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, par
   }
   const hasBroadening = (() => {
     if (target === null) {
-      if (isIntegerBrandedType(stripNullishUnion2(subjectType)) && definition.capabilities.includes("numeric-comparable")) {
+      if (_isIntegerBrandedType(stripNullishUnion2(subjectType)) && definition.capabilities[0] === "numeric-comparable") {
         return true;
       }
       return hasBuiltinConstraintBroadening(tagName, options);
     }
     const registry = options?.extensionRegistry;
     if (registry === void 0) return false;
-    const resolved = resolveCustomTypeFromTsType(evaluatedType, checker, registry);
-    return resolved !== null && registry.findBuiltinConstraintBroadening(customTypeIdFromLookup(resolved), tagName) !== void 0;
+    const typeId = customTypeIdForResolvedType(evaluatedType, checker, registry);
+    return typeId !== void 0 && registry.findBuiltinConstraintBroadening(typeId, tagName) !== void 0;
   })();
   if (!hasBroadening) {
     const requiredCapability = definition.capabilities[0];
     if (requiredCapability !== void 0 && !supportsConstraintCapability(evaluatedType, checker, requiredCapability)) {
-      const actualType = checker.typeToString(evaluatedType, node, SYNTHETIC_TYPE_FORMAT_FLAGS);
-      const baseMessage = `Target "${targetLabel}": constraint "${tagName}" is only valid on ${capabilityLabel(requiredCapability)} targets, but field type is "${actualType}"`;
+      const actualType = checker.typeToString(evaluatedType, node, TYPE_FORMAT_FLAGS);
+      const baseMessage = `Target "${targetLabel}": constraint "${tagName}" is only valid on ${_capabilityLabel(requiredCapability)} targets, but field type is "${actualType}"`;
       const hint = target === null ? buildPathTargetHint(
         subjectType,
         checker,
@@ -1492,10 +1271,10 @@ function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, par
       ]);
     }
   }
-  const effectiveArgumentText = parsedTag !== null ? parseTagSyntax(tagName, rawText).argumentText : rawText;
   if (hasBroadening) {
     return emit("bypass", []);
   }
+  const effectiveArgumentText = extractEffectiveArgumentText(tagName, rawText, parsedTag);
   const typedParseResult = parseTagArgument(tagName, effectiveArgumentText, "build");
   if (!typedParseResult.ok) {
     if (typedParserTraceEnabled) {
@@ -1508,23 +1287,7 @@ function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, par
         diagnosticCode: typedParseResult.diagnostic.code
       });
     }
-    let mappedCode;
-    switch (typedParseResult.diagnostic.code) {
-      case "MISSING_TAG_ARGUMENT":
-        mappedCode = "MISSING_TAG_ARGUMENT";
-        break;
-      case "INVALID_TAG_ARGUMENT":
-        mappedCode = "INVALID_TAG_ARGUMENT";
-        break;
-      case "UNKNOWN_TAG":
-        throw new Error(
-          `Unexpected UNKNOWN_TAG from parseTagArgument("${tagName}") \u2014 tag was resolved via getTagDefinition.`
-        );
-      default: {
-        const _exhaustive = typedParseResult.diagnostic.code;
-        throw new Error(`Unknown diagnostic code: ${String(_exhaustive)}`);
-      }
-    }
+    const mappedCode = mapTypedParserDiagnosticCode(typedParseResult.diagnostic.code, tagName);
     return emit("C-reject", [
       makeDiagnostic(mappedCode, typedParseResult.diagnostic.message, provenance)
     ]);
@@ -1539,68 +1302,7 @@ function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, par
       valueKind: typedParseResult.value.kind
     });
   }
-  const argumentExpression = renderSyntheticArgumentExpression(
-    definition.valueKind,
-    effectiveArgumentText
-  );
-  const subjectTypeText = checker.typeToString(subjectType, node, SYNTHETIC_TYPE_FORMAT_FLAGS);
-  const hostType = options?.hostType ?? subjectType;
-  const hostTypeText = checker.typeToString(hostType, node, SYNTHETIC_TYPE_FORMAT_FLAGS);
-  if (syntheticTraceEnabled) {
-    syntheticLog.trace("invoking synthetic checker", {
-      consumer: "build",
-      tag: tagName,
-      placement,
-      subjectTypeKind,
-      subjectTypeText
-    });
-  }
-  const result = checkSyntheticTagApplication({
-    tagName,
-    placement,
-    hostType: hostTypeText,
-    subjectType: subjectTypeText,
-    ...target?.kind === "path" ? { target: { kind: "path", text: target.rawText } } : {},
-    ...argumentExpression !== null ? { argumentExpression } : {},
-    supportingDeclarations,
-    ...options?.extensionRegistry !== void 0 ? {
-      extensions: options.extensionRegistry.extensions.map((extension) => ({
-        extensionId: extension.extensionId,
-        ...extension.constraintTags !== void 0 ? {
-          constraintTags: extension.constraintTags.map((tag) => ({ tagName: tag.tagName }))
-        } : {},
-        ...extension.metadataSlots !== void 0 ? {
-          metadataSlots: extension.metadataSlots
-        } : {},
-        ...extension.types !== void 0 ? {
-          customTypes: extension.types.map((t) => ({
-            tsTypeNames: t.tsTypeNames ?? [t.typeName]
-          }))
-        } : {}
-      }))
-    } : {}
-  });
-  if (result.diagnostics.length === 0) {
-    return emit("C-pass", []);
-  }
-  const setupDiagnostic = result.diagnostics.find((diagnostic) => diagnostic.kind !== "typescript");
-  if (setupDiagnostic !== void 0) {
-    return emit("C-reject", [
-      makeDiagnostic(
-        setupDiagnostic.kind === "unsupported-custom-type-override" ? "UNSUPPORTED_CUSTOM_TYPE_OVERRIDE" : "SYNTHETIC_SETUP_FAILURE",
-        setupDiagnostic.message,
-        provenance
-      )
-    ]);
-  }
-  const expectedLabel = definition.valueKind === null ? "compatible argument" : capabilityLabel(definition.valueKind);
-  return emit("C-reject", [
-    makeDiagnostic(
-      "TYPE_MISMATCH",
-      `Tag "@${tagName}" received an invalid argument for ${expectedLabel}.`,
-      provenance
-    )
-  ]);
+  return emit("C-pass", []);
 }
 var parseResultCache = /* @__PURE__ */ new Map();
 function getExtensionTagNames(options) {
@@ -1644,8 +1346,8 @@ function getParseCacheKey(node, file, options) {
     start: node.getFullStart(),
     end: node.getEnd(),
     fieldType: options?.fieldType ?? null,
-    subjectType: checker !== void 0 && options?.subjectType !== void 0 ? checker.typeToString(options.subjectType, node, SYNTHETIC_TYPE_FORMAT_FLAGS) : null,
-    hostType: checker !== void 0 && options?.hostType !== void 0 ? checker.typeToString(options.hostType, node, SYNTHETIC_TYPE_FORMAT_FLAGS) : null,
+    subjectType: checker !== void 0 && options?.subjectType !== void 0 ? checker.typeToString(options.subjectType, node, TYPE_FORMAT_FLAGS) : null,
+    hostType: checker !== void 0 && options?.hostType !== void 0 ? checker.typeToString(options.hostType, node, TYPE_FORMAT_FLAGS) : null,
     extensions: getExtensionRegistryCacheKey(options?.extensionRegistry)
   });
 }
@@ -1655,6 +1357,16 @@ function parseTSDocTags(node, file = "", options) {
   if (cached !== void 0) {
     return cached;
   }
+  const setupDiags = options?.extensionRegistry?.setupDiagnostics;
+  if (setupDiags !== void 0 && setupDiags.length > 0) {
+    const result2 = {
+      constraints: [],
+      annotations: [],
+      diagnostics: _emitSetupDiagnostics(setupDiags, file)
+    };
+    parseResultCache.set(cacheKey, result2);
+    return result2;
+  }
   const constraints = [];
   const annotations = [];
   const diagnostics = [];
@@ -1664,14 +1376,12 @@ function parseTSDocTags(node, file = "", options) {
   let placeholderProvenance;
   const sourceFile = node.getSourceFile();
   const sourceText = sourceFile.getFullText();
-  const extensionTypeNames = getExtensionTypeNames(options?.extensionRegistry);
-  const supportingDeclarations = buildSupportingDeclarations(sourceFile, extensionTypeNames);
-  const commentRanges = ts4.getLeadingCommentRanges(sourceText, node.getFullStart());
+  const commentRanges = ts3.getLeadingCommentRanges(sourceText, node.getFullStart());
   const rawTextFallbacks = collectRawTextFallbacks(node, file);
   const extensionTagNames = getExtensionTagNames(options);
   if (commentRanges) {
     for (const range of commentRanges) {
-      if (range.kind !== ts4.SyntaxKind.MultiLineCommentTrivia) {
+      if (range.kind !== ts3.SyntaxKind.MultiLineCommentTrivia) {
         continue;
       }
       const commentText = sourceText.substring(range.pos, range.end);
@@ -1730,7 +1440,6 @@ function parseTSDocTags(node, file = "", options) {
             provenance2,
             node,
             sourceFile,
-            supportingDeclarations,
             options,
             constraints,
             diagnostics
@@ -1748,7 +1457,6 @@ function parseTSDocTags(node, file = "", options) {
           provenance,
           node,
           sourceFile,
-          supportingDeclarations,
           options,
           constraints,
           diagnostics
@@ -1812,7 +1520,6 @@ function parseTSDocTags(node, file = "", options) {
         provenance,
         node,
         sourceFile,
-        supportingDeclarations,
         options,
         constraints,
         diagnostics
@@ -1828,10 +1535,10 @@ function extractDisplayNameMetadata(node) {
   const memberDisplayNames = /* @__PURE__ */ new Map();
   const sourceFile = node.getSourceFile();
   const sourceText = sourceFile.getFullText();
-  const commentRanges = ts4.getLeadingCommentRanges(sourceText, node.getFullStart());
+  const commentRanges = ts3.getLeadingCommentRanges(sourceText, node.getFullStart());
   if (commentRanges) {
     for (const range of commentRanges) {
-      if (range.kind !== ts4.SyntaxKind.MultiLineCommentTrivia) continue;
+      if (range.kind !== ts3.SyntaxKind.MultiLineCommentTrivia) continue;
       const commentText = sourceText.substring(range.pos, range.end);
       if (!commentText.startsWith("/**")) continue;
       const unified = parseUnifiedComment(commentText);
@@ -1856,7 +1563,7 @@ function extractDisplayNameMetadata(node) {
 }
 function collectRawTextFallbacks(node, file) {
   const fallbacks = /* @__PURE__ */ new Map();
-  for (const tag of ts4.getJSDocTags(node)) {
+  for (const tag of ts3.getJSDocTags(node)) {
     const tagName = normalizeConstraintTagName(tag.tagName.text);
     if (!TAGS_REQUIRING_RAW_TEXT.has(tagName)) continue;
     const commentText = getTagCommentText(tag)?.trim() ?? "";
@@ -1911,7 +1618,7 @@ function getTagCommentText(tag) {
   if (typeof tag.comment === "string") {
     return tag.comment;
   }
-  return ts4.getTextOfJSDocComment(tag.comment);
+  return ts3.getTextOfJSDocComment(tag.comment);
 }
 
 // src/analyzer/jsdoc-constraints.ts
@@ -1929,18 +1636,18 @@ function extractJSDocAnnotationNodes(node, file = "", options) {
 function extractDefaultValueAnnotation(initializer, file = "") {
   if (!initializer) return null;
   let value;
-  if (ts5.isStringLiteral(initializer)) {
+  if (ts4.isStringLiteral(initializer)) {
     value = initializer.text;
-  } else if (ts5.isNumericLiteral(initializer)) {
+  } else if (ts4.isNumericLiteral(initializer)) {
     value = Number(initializer.text);
-  } else if (initializer.kind === ts5.SyntaxKind.TrueKeyword) {
+  } else if (initializer.kind === ts4.SyntaxKind.TrueKeyword) {
     value = true;
-  } else if (initializer.kind === ts5.SyntaxKind.FalseKeyword) {
+  } else if (initializer.kind === ts4.SyntaxKind.FalseKeyword) {
     value = false;
-  } else if (initializer.kind === ts5.SyntaxKind.NullKeyword) {
+  } else if (initializer.kind === ts4.SyntaxKind.NullKeyword) {
     value = null;
-  } else if (ts5.isPrefixUnaryExpression(initializer)) {
-    if (initializer.operator === ts5.SyntaxKind.MinusToken && ts5.isNumericLiteral(initializer.operand)) {
+  } else if (ts4.isPrefixUnaryExpression(initializer)) {
+    if (initializer.operator === ts4.SyntaxKind.MinusToken && ts4.isNumericLiteral(initializer.operand)) {
       value = -Number(initializer.operand.text);
     }
   }
@@ -1962,28 +1669,28 @@ function extractDefaultValueAnnotation(initializer, file = "") {
 
 // src/analyzer/class-analyzer.ts
 function isObjectType(type) {
-  return !!(type.flags & ts6.TypeFlags.Object);
+  return !!(type.flags & ts5.TypeFlags.Object);
 }
 function isIntersectionType(type) {
-  return !!(type.flags & ts6.TypeFlags.Intersection);
+  return !!(type.flags & ts5.TypeFlags.Intersection);
 }
 function isResolvableObjectLikeAliasTypeNode(typeNode) {
-  if (ts6.isParenthesizedTypeNode(typeNode)) {
+  if (ts5.isParenthesizedTypeNode(typeNode)) {
     return isResolvableObjectLikeAliasTypeNode(typeNode.type);
   }
-  if (ts6.isTypeLiteralNode(typeNode) || ts6.isTypeReferenceNode(typeNode)) {
+  if (ts5.isTypeLiteralNode(typeNode) || ts5.isTypeReferenceNode(typeNode)) {
     return true;
   }
-  return ts6.isIntersectionTypeNode(typeNode) && typeNode.types.length > 0 && typeNode.types.every((member) => isResolvableObjectLikeAliasTypeNode(member));
+  return ts5.isIntersectionTypeNode(typeNode) && typeNode.types.length > 0 && typeNode.types.every((member) => isResolvableObjectLikeAliasTypeNode(member));
 }
 function isSemanticallyPlainObjectLikeType(type, checker) {
   if (isIntersectionType(type)) {
     return type.types.length > 0 && type.types.every((member) => isSemanticallyPlainObjectLikeType(member, checker));
   }
-  return isObjectType(type) && checker.getSignaturesOfType(type, ts6.SignatureKind.Call).length === 0 && checker.getSignaturesOfType(type, ts6.SignatureKind.Construct).length === 0 && !checker.isArrayType(type) && !checker.isTupleType(type);
+  return isObjectType(type) && checker.getSignaturesOfType(type, ts5.SignatureKind.Call).length === 0 && checker.getSignaturesOfType(type, ts5.SignatureKind.Construct).length === 0 && !checker.isArrayType(type) && !checker.isTupleType(type);
 }
 function isTypeReference(type) {
-  return !!(type.flags & ts6.TypeFlags.Object) && !!(type.objectFlags & ts6.ObjectFlags.Reference);
+  return !!(type.flags & ts5.TypeFlags.Object) && !!(type.objectFlags & ts5.ObjectFlags.Reference);
 }
 var RESOLVING_TYPE_PLACEHOLDER = {
   kind: "object",
@@ -2009,6 +1716,21 @@ function createAnalyzerMetadataPolicy(input, discriminator) {
     discriminator
   };
 }
+var DEDUPLICATABLE_DIAGNOSTIC_CODES = /* @__PURE__ */ new Set([
+  "SYNTHETIC_SETUP_FAILURE",
+  "UNSUPPORTED_CUSTOM_TYPE_OVERRIDE"
+]);
+function deduplicateDiagnostics(diagnostics) {
+  if (diagnostics.length <= 1) return diagnostics;
+  const seen = /* @__PURE__ */ new Set();
+  return diagnostics.filter((d) => {
+    if (!DEDUPLICATABLE_DIAGNOSTIC_CODES.has(d.code)) return true;
+    const key = `${d.code}\0${d.message}`;
+    if (seen.has(key)) return false;
+    seen.add(key);
+    return true;
+  });
+}
 function resolveNodeMetadata(metadataPolicy, declarationKind, logicalName, node, checker, extensionRegistry, buildContext) {
   const analysis = analyzeMetadataForNodeWithChecker({
     checker,
@@ -2045,10 +1767,121 @@ function resolveNodeMetadata(metadataPolicy, declarationKind, logicalName, node,
   }
   return resolvedMetadata;
 }
+var INHERITABLE_TYPE_ANNOTATION_KINDS = /* @__PURE__ */ new Set(["format"]);
+function getInheritableAnnotationStringValue(annotation) {
+  if (annotation.annotationKind === "format") return annotation.value;
+  return void 0;
+}
+function isOverridingInheritableAnnotation(annotation) {
+  const value = getInheritableAnnotationStringValue(annotation);
+  if (value === void 0) return true;
+  return value.trim().length > 0;
+}
+function collectInheritedTypeAnnotations(derivedDecl, existingAnnotations, checker, extensionRegistry) {
+  const existingKinds = new Set(
+    existingAnnotations.filter(isOverridingInheritableAnnotation).map((a) => a.annotationKind)
+  );
+  const needed = /* @__PURE__ */ new Set();
+  for (const kind of INHERITABLE_TYPE_ANNOTATION_KINDS) {
+    if (!existingKinds.has(kind)) needed.add(kind);
+  }
+  if (needed.size === 0) return [];
+  const inherited = [];
+  const seen = /* @__PURE__ */ new Set([derivedDecl]);
+  const queue = [];
+  const resolveSymbolTarget = (sym) => {
+    if ((sym.flags & ts5.SymbolFlags.Alias) === 0) return sym;
+    try {
+      return checker.getAliasedSymbol(sym);
+    } catch {
+      return sym;
+    }
+  };
+  const isObjectShapedTypeAlias = (alias) => {
+    const type = checker.getTypeFromTypeNode(alias.type);
+    if ((type.flags & ts5.TypeFlags.Object) !== 0) return true;
+    if (type.isIntersection()) return true;
+    return false;
+  };
+  const enqueueCandidate = (baseDecl, fromTypeAliasRhs) => {
+    if (seen.has(baseDecl)) return;
+    if (ts5.isClassDeclaration(baseDecl) || ts5.isInterfaceDeclaration(baseDecl)) {
+      seen.add(baseDecl);
+      queue.push(baseDecl);
+      return;
+    }
+    if (ts5.isTypeAliasDeclaration(baseDecl)) {
+      if (!fromTypeAliasRhs && !isObjectShapedTypeAlias(baseDecl)) return;
+      seen.add(baseDecl);
+      queue.push(baseDecl);
+    }
+  };
+  const enqueueBasesOf = (decl) => {
+    if (ts5.isTypeAliasDeclaration(decl)) {
+      const rhs = decl.type;
+      if (!ts5.isTypeReferenceNode(rhs)) return;
+      const sym = checker.getSymbolAtLocation(rhs.typeName);
+      if (!sym) return;
+      const target = resolveSymbolTarget(sym);
+      for (const baseDecl of target.declarations ?? []) {
+        enqueueCandidate(
+          baseDecl,
+          /*fromTypeAliasRhs*/
+          true
+        );
+      }
+      return;
+    }
+    const heritageClauses = decl.heritageClauses;
+    if (!heritageClauses) return;
+    for (const clause of heritageClauses) {
+      if (clause.token !== ts5.SyntaxKind.ExtendsKeyword) continue;
+      for (const typeExpr of clause.types) {
+        const sym = checker.getSymbolAtLocation(typeExpr.expression);
+        if (!sym) continue;
+        const target = resolveSymbolTarget(sym);
+        for (const baseDecl of target.declarations ?? []) {
+          enqueueCandidate(
+            baseDecl,
+            /*fromTypeAliasRhs*/
+            false
+          );
+        }
+      }
+    }
+  };
+  enqueueBasesOf(derivedDecl);
+  for (let queueIndex = 0; queueIndex < queue.length && needed.size > 0; queueIndex++) {
+    const baseDecl = queue[queueIndex];
+    if (baseDecl === void 0) continue;
+    const baseFile = baseDecl.getSourceFile().fileName;
+    const baseAnnotations = extractJSDocAnnotationNodes(
+      baseDecl,
+      baseFile,
+      makeParseOptions(extensionRegistry)
+    );
+    for (const annotation of baseAnnotations) {
+      if (!needed.has(annotation.annotationKind)) continue;
+      if (!isOverridingInheritableAnnotation(annotation)) continue;
+      inherited.push(annotation);
+      needed.delete(annotation.annotationKind);
+    }
+    if (needed.size > 0) {
+      enqueueBasesOf(baseDecl);
+    }
+  }
+  return inherited;
+}
+function extractNamedTypeAnnotations(namedDecl, checker, file, extensionRegistry) {
+  const local = extractJSDocAnnotationNodes(namedDecl, file, makeParseOptions(extensionRegistry));
+  const inherited = collectInheritedTypeAnnotations(namedDecl, local, checker, extensionRegistry);
+  if (inherited.length === 0) return [...local];
+  return [...local, ...inherited];
+}
 function analyzeDeclarationRootInfo(declaration, checker, file = "", extensionRegistry, metadataPolicy) {
   const normalizedMetadataPolicy = createAnalyzerMetadataPolicy(metadataPolicy);
   const declarationType = checker.getTypeAtLocation(declaration);
-  const logicalName = ts6.isClassDeclaration(declaration) ? declaration.name?.text ?? "AnonymousClass" : declaration.name.text;
+  const logicalName = ts5.isClassDeclaration(declaration) ? declaration.name?.text ?? "AnonymousClass" : declaration.name.text;
   const docResult = extractJSDocParseResult(
     declaration,
     file,
@@ -2090,13 +1923,19 @@ function analyzeClassToIR(classDecl, checker, file = "", extensionRegistry, meta
     file,
     makeParseOptions(extensionRegistry, void 0, checker, classType, classType)
   );
-  const annotations = [...classDoc.annotations];
+  const inheritedClassAnnotations = collectInheritedTypeAnnotations(
+    classDecl,
+    classDoc.annotations,
+    checker,
+    extensionRegistry
+  );
+  const annotations = [...classDoc.annotations, ...inheritedClassAnnotations];
   diagnostics.push(...classDoc.diagnostics);
   const visiting = /* @__PURE__ */ new Set();
   const instanceMethods = [];
   const staticMethods = [];
   for (const member of classDecl.members) {
-    if (ts6.isPropertyDeclaration(member)) {
+    if (ts5.isPropertyDeclaration(member)) {
       const fieldNode = analyzeFieldToIR(
         member,
         checker,
@@ -2112,10 +1951,10 @@ function analyzeClassToIR(classDecl, checker, file = "", extensionRegistry, meta
         fields.push(fieldNode);
         fieldLayouts.push({});
       }
-    } else if (ts6.isMethodDeclaration(member)) {
+    } else if (ts5.isMethodDeclaration(member)) {
       const methodInfo = analyzeMethod(member, checker);
       if (methodInfo) {
-        const isStatic = member.modifiers?.some((m) => m.kind === ts6.SyntaxKind.StaticKeyword);
+        const isStatic = member.modifiers?.some((m) => m.kind === ts5.SyntaxKind.StaticKeyword);
         if (isStatic) {
           staticMethods.push(methodInfo);
         } else {
@@ -2147,6 +1986,7 @@ function analyzeClassToIR(classDecl, checker, file = "", extensionRegistry, meta
       hostType: classType
     }
   );
+  const deduplicatedDiagnostics = deduplicateDiagnostics(diagnostics);
   return {
     name,
     ...metadata !== void 0 && { metadata },
@@ -2154,7 +1994,7 @@ function analyzeClassToIR(classDecl, checker, file = "", extensionRegistry, meta
     fieldLayouts,
     typeRegistry,
     ...annotations.length > 0 && { annotations },
-    ...diagnostics.length > 0 && { diagnostics },
+    ...deduplicatedDiagnostics.length > 0 && { diagnostics: deduplicatedDiagnostics },
     instanceMethods,
     staticMethods
   };
@@ -2174,11 +2014,20 @@ function analyzeInterfaceToIR(interfaceDecl, checker, file = "", extensionRegist
     file,
     makeParseOptions(extensionRegistry, void 0, checker, interfaceType, interfaceType)
   );
-  const annotations = [...interfaceDoc.annotations];
+  const inheritedInterfaceAnnotations = collectInheritedTypeAnnotations(
+    interfaceDecl,
+    interfaceDoc.annotations,
+    checker,
+    extensionRegistry
+  );
+  const annotations = [
+    ...interfaceDoc.annotations,
+    ...inheritedInterfaceAnnotations
+  ];
   diagnostics.push(...interfaceDoc.diagnostics);
   const visiting = /* @__PURE__ */ new Set();
   for (const member of interfaceDecl.members) {
-    if (ts6.isPropertySignature(member)) {
+    if (ts5.isPropertySignature(member)) {
       const fieldNode = analyzeInterfacePropertyToIR(
         member,
         checker,
@@ -2219,6 +2068,7 @@ function analyzeInterfaceToIR(interfaceDecl, checker, file = "", extensionRegist
       hostType: interfaceType
     }
   );
+  const deduplicatedDiagnostics = deduplicateDiagnostics(diagnostics);
   return {
     name,
     ...metadata !== void 0 && { metadata },
@@ -2226,7 +2076,7 @@ function analyzeInterfaceToIR(interfaceDecl, checker, file = "", extensionRegist
     fieldLayouts,
     typeRegistry,
     ...annotations.length > 0 && { annotations },
-    ...diagnostics.length > 0 && { diagnostics },
+    ...deduplicatedDiagnostics.length > 0 && { diagnostics: deduplicatedDiagnostics },
     instanceMethods: [],
     staticMethods: []
   };
@@ -2236,7 +2086,7 @@ function analyzeTypeAliasToIR(typeAlias, checker, file = "", extensionRegistry,
   if (members === null) {
     const sourceFile = typeAlias.getSourceFile();
     const { line } = sourceFile.getLineAndCharacterOfPosition(typeAlias.getStart());
-    const kindDesc = ts6.SyntaxKind[typeAlias.type.kind] ?? "unknown";
+    const kindDesc = ts5.SyntaxKind[typeAlias.type.kind] ?? "unknown";
     return {
       ok: false,
       kind: "not-object-like",
@@ -2271,7 +2121,7 @@ function analyzeTypeAliasToIR(typeAlias, checker, file = "", extensionRegistry,
   diagnostics.push(...typeAliasDoc.diagnostics);
   const visiting = /* @__PURE__ */ new Set();
   for (const member of members) {
-    if (ts6.isPropertySignature(member)) {
+    if (ts5.isPropertySignature(member)) {
       const fieldNode = analyzeInterfacePropertyToIR(
         member,
         checker,
@@ -2311,6 +2161,7 @@ function analyzeTypeAliasToIR(typeAlias, checker, file = "", extensionRegistry,
       hostType: aliasType
     }
   );
+  const deduplicatedDiagnostics = deduplicateDiagnostics(diagnostics);
   return {
     ok: true,
     analysis: {
@@ -2320,7 +2171,7 @@ function analyzeTypeAliasToIR(typeAlias, checker, file = "", extensionRegistry,
       fieldLayouts: specializedFields.map(() => ({})),
       typeRegistry,
       ...annotations.length > 0 && { annotations },
-      ...diagnostics.length > 0 && { diagnostics },
+      ...deduplicatedDiagnostics.length > 0 && { diagnostics: deduplicatedDiagnostics },
       instanceMethods: [],
       staticMethods: []
     }
@@ -2338,13 +2189,13 @@ function makeAnalysisDiagnostic(code, message, primaryLocation, relatedLocations
 function getLeadingParsedTags(node) {
   const sourceFile = node.getSourceFile();
   const sourceText = sourceFile.getFullText();
-  const commentRanges = ts6.getLeadingCommentRanges(sourceText, node.getFullStart());
+  const commentRanges = ts5.getLeadingCommentRanges(sourceText, node.getFullStart());
   if (commentRanges === void 0) {
     return [];
   }
   const parsedTags = [];
   for (const range of commentRanges) {
-    if (range.kind !== ts6.SyntaxKind.MultiLineCommentTrivia) {
+    if (range.kind !== ts5.SyntaxKind.MultiLineCommentTrivia) {
       continue;
     }
     const commentText = sourceText.slice(range.pos, range.end);
@@ -2362,19 +2213,19 @@ function resolveDiscriminatorProperty(node, checker, fieldName) {
     return null;
   }
   const declaration = propertySymbol.valueDeclaration ?? propertySymbol.declarations?.find(
-    (candidate) => ts6.isPropertyDeclaration(candidate) || ts6.isPropertySignature(candidate)
+    (candidate) => ts5.isPropertyDeclaration(candidate) || ts5.isPropertySignature(candidate)
   ) ?? propertySymbol.declarations?.[0];
   return {
     declaration,
     type: checker.getTypeOfSymbolAtLocation(propertySymbol, declaration ?? node),
-    optional: !!(propertySymbol.flags & ts6.SymbolFlags.Optional) || declaration !== void 0 && "questionToken" in declaration && declaration.questionToken !== void 0
+    optional: !!(propertySymbol.flags & ts5.SymbolFlags.Optional) || declaration !== void 0 && "questionToken" in declaration && declaration.questionToken !== void 0
   };
 }
 function isLocalTypeParameterName(node, typeParameterName) {
   return node.typeParameters?.some((typeParameter) => typeParameter.name.text === typeParameterName) ?? false;
 }
 function isNullishSemanticType(type) {
-  if (type.flags & (ts6.TypeFlags.Null | ts6.TypeFlags.Undefined | ts6.TypeFlags.Void | ts6.TypeFlags.Unknown | ts6.TypeFlags.Any)) {
+  if (type.flags & (ts5.TypeFlags.Null | ts5.TypeFlags.Undefined | ts5.TypeFlags.Void | ts5.TypeFlags.Unknown | ts5.TypeFlags.Any)) {
     return true;
   }
   return type.isUnion() && type.types.some((member) => isNullishSemanticType(member));
@@ -2384,7 +2235,7 @@ function isStringLikeSemanticType(type, checker, seen = /* @__PURE__ */ new Set(
     return false;
   }
   seen.add(type);
-  if (type.flags & ts6.TypeFlags.StringLike) {
+  if (type.flags & ts5.TypeFlags.StringLike) {
     return true;
   }
   if (type.isUnion()) {
@@ -2397,13 +2248,13 @@ function isStringLikeSemanticType(type, checker, seen = /* @__PURE__ */ new Set(
   return false;
 }
 function getObjectLikeTypeAliasMembers(typeNode) {
-  if (ts6.isParenthesizedTypeNode(typeNode)) {
+  if (ts5.isParenthesizedTypeNode(typeNode)) {
     return getObjectLikeTypeAliasMembers(typeNode.type);
   }
-  if (ts6.isTypeLiteralNode(typeNode)) {
+  if (ts5.isTypeLiteralNode(typeNode)) {
     return [...typeNode.members];
   }
-  if (ts6.isIntersectionTypeNode(typeNode)) {
+  if (ts5.isIntersectionTypeNode(typeNode)) {
     const members = [];
     for (const intersectionMember of typeNode.types) {
       const resolvedMembers = getObjectLikeTypeAliasMembers(intersectionMember);
@@ -2566,7 +2417,7 @@ function resolveLiteralDiscriminatorPropertyValue(boundType, propertyName, check
   }
   if (propertyType.isUnion()) {
     const nonNullMembers = propertyType.types.filter(
-      (member) => !(member.flags & (ts6.TypeFlags.Null | ts6.TypeFlags.Undefined))
+      (member) => !(member.flags & (ts5.TypeFlags.Null | ts5.TypeFlags.Undefined))
     );
     if (nonNullMembers.length > 0 && nonNullMembers.every((member) => member.isStringLiteral())) {
       diagnostics.push(
@@ -2615,13 +2466,13 @@ function resolveNamedDiscriminatorDeclaration(type, checker, seen = /* @__PURE__
   seen.add(type);
   const symbol = type.aliasSymbol ?? type.getSymbol();
   if (symbol !== void 0) {
-    const aliased = symbol.flags & ts6.SymbolFlags.Alias ? checker.getAliasedSymbol(symbol) : void 0;
+    const aliased = symbol.flags & ts5.SymbolFlags.Alias ? checker.getAliasedSymbol(symbol) : void 0;
     const targetSymbol = aliased ?? symbol;
     const declaration = targetSymbol.declarations?.find(
-      (candidate) => ts6.isClassDeclaration(candidate) || ts6.isInterfaceDeclaration(candidate) || ts6.isTypeAliasDeclaration(candidate) || ts6.isEnumDeclaration(candidate)
+      (candidate) => ts5.isClassDeclaration(candidate) || ts5.isInterfaceDeclaration(candidate) || ts5.isTypeAliasDeclaration(candidate) || ts5.isEnumDeclaration(candidate)
     );
     if (declaration !== void 0) {
-      if (ts6.isTypeAliasDeclaration(declaration) && ts6.isTypeReferenceNode(declaration.type) && checker.getTypeFromTypeNode(declaration.type) !== type) {
+      if (ts5.isTypeAliasDeclaration(declaration) && ts5.isTypeReferenceNode(declaration.type) && checker.getTypeFromTypeNode(declaration.type) !== type) {
         return resolveNamedDiscriminatorDeclaration(
           checker.getTypeFromTypeNode(declaration.type),
           checker,
@@ -2649,7 +2500,7 @@ function resolveDiscriminatorValue(boundType, fieldName, checker, provenance, di
   }
   if (boundType.isUnion()) {
     const nonNullMembers = boundType.types.filter(
-      (member) => !(member.flags & (ts6.TypeFlags.Null | ts6.TypeFlags.Undefined))
+      (member) => !(member.flags & (ts5.TypeFlags.Null | ts5.TypeFlags.Undefined))
     );
     if (nonNullMembers.every((member) => member.isStringLiteral())) {
       diagnostics.push(
@@ -2694,7 +2545,7 @@ function resolveDiscriminatorValue(boundType, fieldName, checker, provenance, di
   return null;
 }
 function getDeclarationName(node) {
-  if (ts6.isClassDeclaration(node) || ts6.isInterfaceDeclaration(node) || ts6.isTypeAliasDeclaration(node) || ts6.isEnumDeclaration(node)) {
+  if (ts5.isClassDeclaration(node) || ts5.isInterfaceDeclaration(node) || ts5.isTypeAliasDeclaration(node) || ts5.isEnumDeclaration(node)) {
     return node.name?.text ?? "anonymous";
   }
   return "anonymous";
@@ -2749,11 +2600,11 @@ function extractReferenceTypeArguments(type, checker, file, typeRegistry, visiti
   if (sourceTypeNode === void 0) {
     return [];
   }
-  const unwrapParentheses = (typeNode) => ts6.isParenthesizedTypeNode(typeNode) ? unwrapParentheses(typeNode.type) : typeNode;
+  const unwrapParentheses = (typeNode) => ts5.isParenthesizedTypeNode(typeNode) ? unwrapParentheses(typeNode.type) : typeNode;
   const directTypeNode = unwrapParentheses(sourceTypeNode);
-  const referenceTypeNode = ts6.isTypeReferenceNode(directTypeNode) ? directTypeNode : (() => {
+  const referenceTypeNode = ts5.isTypeReferenceNode(directTypeNode) ? directTypeNode : (() => {
     const resolvedTypeNode = resolveAliasedTypeNode(directTypeNode, checker);
-    return ts6.isTypeReferenceNode(resolvedTypeNode) ? resolvedTypeNode : null;
+    return ts5.isTypeReferenceNode(resolvedTypeNode) ? resolvedTypeNode : null;
   })();
   if (referenceTypeNode?.typeArguments === void 0) {
     return [];
@@ -2761,7 +2612,7 @@ function extractReferenceTypeArguments(type, checker, file, typeRegistry, visiti
   return referenceTypeNode.typeArguments.map((argumentNode) => {
     const argumentType = checker.getTypeFromTypeNode(argumentNode);
     const baseSymbol = argumentType.aliasSymbol ?? argumentType.getSymbol();
-    const argumentSymbol = baseSymbol !== void 0 && baseSymbol.flags & ts6.SymbolFlags.Alias ? checker.getAliasedSymbol(baseSymbol) : baseSymbol;
+    const argumentSymbol = baseSymbol !== void 0 && baseSymbol.flags & ts5.SymbolFlags.Alias ? checker.getAliasedSymbol(baseSymbol) : baseSymbol;
     const argumentDecl = argumentSymbol?.declarations?.[0];
     if (argumentDecl !== void 0 && argumentDecl.getSourceFile().fileName !== file) {
       const argumentName = argumentSymbol?.getName() ?? baseSymbol?.getName();
@@ -2824,7 +2675,7 @@ function applyDiscriminatorToObjectProperties(properties, node, subjectType, che
   );
 }
 function analyzeFieldToIR(prop, checker, file, typeRegistry, visiting, diagnostics, hostType, metadataPolicy, extensionRegistry) {
-  if (!ts6.isIdentifier(prop.name)) {
+  if (!ts5.isIdentifier(prop.name)) {
     return null;
   }
   const name = prop.name.text;
@@ -2951,7 +2802,7 @@ function findDuplicateObjectLikeTypeAliasPropertyNames(members) {
   const seen = /* @__PURE__ */ new Set();
   const duplicates = /* @__PURE__ */ new Set();
   for (const member of members) {
-    if (!ts6.isPropertySignature(member)) {
+    if (!ts5.isPropertySignature(member)) {
       continue;
     }
     const name = getAnalyzableObjectLikePropertyName(member.name);
@@ -2967,7 +2818,7 @@ function findDuplicateObjectLikeTypeAliasPropertyNames(members) {
   return [...duplicates].sort();
 }
 function getAnalyzableObjectLikePropertyName(name) {
-  if (ts6.isIdentifier(name) || ts6.isStringLiteral(name) || ts6.isNumericLiteral(name)) {
+  if (ts5.isIdentifier(name) || ts5.isStringLiteral(name) || ts5.isNumericLiteral(name)) {
     return name.text;
   }
   return null;
@@ -3062,28 +2913,28 @@ function resolveTypeNode(type, checker, file, typeRegistry, visiting, sourceNode
   if (primitiveAlias) {
     return primitiveAlias;
   }
-  if (isIntegerBrandedType(type)) {
+  if (_isIntegerBrandedType(type)) {
     return { kind: "primitive", primitiveKind: "integer" };
   }
-  if (type.flags & ts6.TypeFlags.String) {
+  if (type.flags & ts5.TypeFlags.String) {
     return { kind: "primitive", primitiveKind: "string" };
   }
-  if (type.flags & ts6.TypeFlags.Number) {
+  if (type.flags & ts5.TypeFlags.Number) {
     return { kind: "primitive", primitiveKind: "number" };
   }
-  if (type.flags & (ts6.TypeFlags.BigInt | ts6.TypeFlags.BigIntLiteral)) {
+  if (type.flags & (ts5.TypeFlags.BigInt | ts5.TypeFlags.BigIntLiteral)) {
     return { kind: "primitive", primitiveKind: "bigint" };
   }
-  if (type.flags & ts6.TypeFlags.Boolean) {
+  if (type.flags & ts5.TypeFlags.Boolean) {
     return { kind: "primitive", primitiveKind: "boolean" };
   }
-  if (type.flags & ts6.TypeFlags.Null) {
+  if (type.flags & ts5.TypeFlags.Null) {
     return { kind: "primitive", primitiveKind: "null" };
   }
-  if (type.flags & ts6.TypeFlags.Undefined) {
+  if (type.flags & ts5.TypeFlags.Undefined) {
     return { kind: "primitive", primitiveKind: "null" };
   }
-  if (type.flags & ts6.TypeFlags.Void) {
+  if (type.flags & ts5.TypeFlags.Void) {
     return { kind: "primitive", primitiveKind: "null" };
   }
   if (type.isStringLiteral()) {
@@ -3170,10 +3021,10 @@ function resolveTypeNode(type, checker, file, typeRegistry, visiting, sourceNode
   return { kind: "primitive", primitiveKind: "string" };
 }
 function tryResolveNamedPrimitiveAlias(type, checker, file, typeRegistry, visiting, sourceNode, metadataPolicy = createAnalyzerMetadataPolicy(void 0), extensionRegistry, diagnostics) {
-  if (!(type.flags & (ts6.TypeFlags.String | ts6.TypeFlags.Number | ts6.TypeFlags.BigInt | ts6.TypeFlags.BigIntLiteral | ts6.TypeFlags.Boolean | ts6.TypeFlags.Null)) && !isIntegerBrandedType(type)) {
+  if (!(type.flags & (ts5.TypeFlags.String | ts5.TypeFlags.Number | ts5.TypeFlags.BigInt | ts5.TypeFlags.BigIntLiteral | ts5.TypeFlags.Boolean | ts5.TypeFlags.Null)) && !_isIntegerBrandedType(type)) {
     return null;
   }
-  const aliasDecl = type.aliasSymbol?.declarations?.find(ts6.isTypeAliasDeclaration) ?? getReferencedTypeAliasDeclaration(sourceNode, checker);
+  const aliasDecl = type.aliasSymbol?.declarations?.find(ts5.isTypeAliasDeclaration) ?? getReferencedTypeAliasDeclaration(sourceNode, checker);
   if (!aliasDecl) {
     return null;
   }
@@ -3184,11 +3035,18 @@ function tryResolveNamedPrimitiveAlias(type, checker, file, typeRegistry, visiti
       ...extractJSDocConstraintNodes(aliasDecl, file, makeParseOptions(extensionRegistry)),
       ...extractTypeAliasConstraintNodes(aliasDecl.type, checker, file, extensionRegistry)
     ];
-    const annotations = extractJSDocAnnotationNodes(
+    const localAnnotations = extractJSDocAnnotationNodes(
       aliasDecl,
       file,
       makeParseOptions(extensionRegistry)
     );
+    const inheritedAnnotations = collectInheritedTypeAnnotations(
+      aliasDecl,
+      localAnnotations,
+      checker,
+      extensionRegistry
+    );
+    const annotations = [...localAnnotations, ...inheritedAnnotations];
     const metadata = resolveNodeMetadata(
       metadataPolicy,
       "type",
@@ -3223,8 +3081,8 @@ function tryResolveNamedPrimitiveAlias(type, checker, file, typeRegistry, visiti
   return { kind: "reference", name: aliasName, typeArguments: [] };
 }
 function getReferencedTypeAliasDeclaration(sourceNode, checker) {
-  const typeNode = sourceNode && (ts6.isPropertyDeclaration(sourceNode) || ts6.isPropertySignature(sourceNode) || ts6.isParameter(sourceNode)) ? sourceNode.type : void 0;
-  if (!typeNode || !ts6.isTypeReferenceNode(typeNode)) {
+  const typeNode = sourceNode && (ts5.isPropertyDeclaration(sourceNode) || ts5.isPropertySignature(sourceNode) || ts5.isParameter(sourceNode)) ? sourceNode.type : void 0;
+  if (!typeNode || !ts5.isTypeReferenceNode(typeNode)) {
     return void 0;
   }
   return getTypeAliasDeclarationFromTypeReference(typeNode, checker);
@@ -3245,7 +3103,7 @@ function resolveNamedTypeWithSourceRecovery(type, sourceNode, checker) {
   return { typeName: refAliasDecl.name.text, namedDecl: refAliasDecl };
 }
 function shouldEmitPrimitiveAliasDefinition(typeNode, checker) {
-  if (!ts6.isTypeReferenceNode(typeNode)) {
+  if (!ts5.isTypeReferenceNode(typeNode)) {
     return false;
   }
   const aliasDecl = getTypeAliasDeclarationFromTypeReference(typeNode, checker);
@@ -3253,10 +3111,10 @@ function shouldEmitPrimitiveAliasDefinition(typeNode, checker) {
     return false;
   }
   const resolved = checker.getTypeFromTypeNode(aliasDecl.type);
-  return !!(resolved.flags & (ts6.TypeFlags.String | ts6.TypeFlags.Number | ts6.TypeFlags.BigInt | ts6.TypeFlags.BigIntLiteral | ts6.TypeFlags.Boolean | ts6.TypeFlags.Null));
+  return !!(resolved.flags & (ts5.TypeFlags.String | ts5.TypeFlags.Number | ts5.TypeFlags.BigInt | ts5.TypeFlags.BigIntLiteral | ts5.TypeFlags.Boolean | ts5.TypeFlags.Null));
 }
 function resolveAliasedPrimitiveTarget(type, checker, file, typeRegistry, visiting, metadataPolicy = createAnalyzerMetadataPolicy(void 0), extensionRegistry, diagnostics, visitedAliases = /* @__PURE__ */ new Set()) {
-  const nestedAliasDecl = type.aliasSymbol?.declarations?.find(ts6.isTypeAliasDeclaration);
+  const nestedAliasDecl = type.aliasSymbol?.declarations?.find(ts5.isTypeAliasDeclaration);
   if (nestedAliasDecl !== void 0 && !visitedAliases.has(nestedAliasDecl)) {
     visitedAliases.add(nestedAliasDecl);
     return resolveAliasedPrimitiveTarget(
@@ -3271,22 +3129,22 @@ function resolveAliasedPrimitiveTarget(type, checker, file, typeRegistry, visiti
       visitedAliases
     );
   }
-  if (isIntegerBrandedType(type)) {
+  if (_isIntegerBrandedType(type)) {
     return { kind: "primitive", primitiveKind: "integer" };
   }
-  if (type.flags & ts6.TypeFlags.String) {
+  if (type.flags & ts5.TypeFlags.String) {
     return { kind: "primitive", primitiveKind: "string" };
   }
-  if (type.flags & ts6.TypeFlags.Number) {
+  if (type.flags & ts5.TypeFlags.Number) {
     return { kind: "primitive", primitiveKind: "number" };
   }
-  if (type.flags & (ts6.TypeFlags.BigInt | ts6.TypeFlags.BigIntLiteral)) {
+  if (type.flags & (ts5.TypeFlags.BigInt | ts5.TypeFlags.BigIntLiteral)) {
     return { kind: "primitive", primitiveKind: "bigint" };
   }
-  if (type.flags & ts6.TypeFlags.Boolean) {
+  if (type.flags & ts5.TypeFlags.Boolean) {
     return { kind: "primitive", primitiveKind: "boolean" };
   }
-  if (type.flags & ts6.TypeFlags.Null) {
+  if (type.flags & ts5.TypeFlags.Null) {
     return { kind: "primitive", primitiveKind: "null" };
   }
   return resolveTypeNode(
@@ -3306,7 +3164,7 @@ function resolveUnionType(type, checker, file, typeRegistry, visiting, sourceNod
   let typeName = null;
   let namedDecl;
   if (recovered !== null) {
-    const recoveredAliasDecl = ts6.isTypeAliasDeclaration(recovered.namedDecl) ? recovered.namedDecl : void 0;
+    const recoveredAliasDecl = ts5.isTypeAliasDeclaration(recovered.namedDecl) ? recovered.namedDecl : void 0;
     if (recoveredAliasDecl !== void 0) {
       const aliasUnderlyingType = checker.getTypeFromTypeNode(recoveredAliasDecl.type);
       const isNonGeneric = recoveredAliasDecl.typeParameters === void 0 || recoveredAliasDecl.typeParameters.length === 0;
@@ -3328,13 +3186,13 @@ function resolveUnionType(type, checker, file, typeRegistry, visiting, sourceNod
     (memberTypeNode) => !isNullishTypeNode(resolveAliasedTypeNode(memberTypeNode, checker))
   );
   const nonNullTypes = allTypes.filter(
-    (memberType) => !(memberType.flags & (ts6.TypeFlags.Null | ts6.TypeFlags.Undefined))
+    (memberType) => !(memberType.flags & (ts5.TypeFlags.Null | ts5.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 & ts6.TypeFlags.Null);
+  const hasNull = allTypes.some((t) => t.flags & ts5.TypeFlags.Null);
   const memberDisplayNames = /* @__PURE__ */ new Map();
   if (namedDecl) {
     for (const [value, label] of extractDisplayNameMetadata(namedDecl).memberDisplayNames) {
@@ -3354,7 +3212,7 @@ function resolveUnionType(type, checker, file, typeRegistry, visiting, sourceNod
     if (existing !== void 0 && existing.type !== RESOLVING_TYPE_PLACEHOLDER) {
       return { kind: "reference", name: typeName, typeArguments: [] };
     }
-    const annotations = namedDecl ? extractJSDocAnnotationNodes(namedDecl, file, makeParseOptions(extensionRegistry)) : void 0;
+    const annotations = namedDecl ? extractNamedTypeAnnotations(namedDecl, checker, file, extensionRegistry) : void 0;
     const metadata = namedDecl !== void 0 ? resolveNodeMetadata(
       metadataPolicy,
       "type",
@@ -3381,7 +3239,7 @@ function resolveUnionType(type, checker, file, typeRegistry, visiting, sourceNod
     const displayName = memberDisplayNames.get(String(value));
     return displayName !== void 0 ? { value, displayName } : { value };
   });
-  const isBooleanUnion2 = nonNullTypes.length === 2 && nonNullTypes.every((t) => t.flags & ts6.TypeFlags.BooleanLiteral);
+  const isBooleanUnion2 = nonNullTypes.length === 2 && nonNullTypes.every((t) => t.flags & ts5.TypeFlags.BooleanLiteral);
   if (isBooleanUnion2) {
     const boolNode = { kind: "primitive", primitiveKind: "boolean" };
     const result = hasNull ? {
@@ -3473,7 +3331,7 @@ function tryResolveRecordType(type, checker, file, typeRegistry, visiting, metad
   if (type.getProperties().length > 0) {
     return null;
   }
-  const indexInfo = checker.getIndexInfoOfType(type, ts6.IndexKind.String);
+  const indexInfo = checker.getIndexInfoOfType(type, ts5.IndexKind.String);
   if (!indexInfo) {
     return null;
   }
@@ -3521,20 +3379,53 @@ function shouldEmitResolvedObjectProperty(property, declaration) {
   }
   if (declaration !== void 0 && "name" in declaration && declaration.name !== void 0) {
     const name = declaration.name;
-    if (ts6.isComputedPropertyName(name) || ts6.isPrivateIdentifier(name)) {
+    if (ts5.isComputedPropertyName(name) || ts5.isPrivateIdentifier(name)) {
       return false;
     }
-    if (!ts6.isIdentifier(name) && !ts6.isStringLiteral(name) && !ts6.isNumericLiteral(name)) {
+    if (!ts5.isIdentifier(name) && !ts5.isStringLiteral(name) && !ts5.isNumericLiteral(name)) {
       return false;
     }
   }
   return true;
 }
+function getPassThroughTypeAliasFromSourceNode(sourceNode, checker, extensionRegistry, resolvedTypeName) {
+  const aliasDecl = getReferencedTypeAliasDeclaration(sourceNode, checker);
+  if (!aliasDecl) return void 0;
+  const aliasName = aliasDecl.name.text;
+  if (aliasName === resolvedTypeName) return void 0;
+  if (!ts5.isTypeReferenceNode(aliasDecl.type)) return void 0;
+  if (!hasInheritableTypeAnnotation(aliasDecl, checker, extensionRegistry)) {
+    return void 0;
+  }
+  return { aliasName, aliasDecl };
+}
+function hasInheritableTypeAnnotation(aliasDecl, checker, extensionRegistry) {
+  const file = aliasDecl.getSourceFile().fileName;
+  const local = extractJSDocAnnotationNodes(aliasDecl, file, makeParseOptions(extensionRegistry));
+  for (const annotation of local) {
+    if (!INHERITABLE_TYPE_ANNOTATION_KINDS.has(annotation.annotationKind)) continue;
+    if (!isOverridingInheritableAnnotation(annotation)) continue;
+    return true;
+  }
+  const inherited = collectInheritedTypeAnnotations(aliasDecl, local, checker, extensionRegistry);
+  for (const annotation of inherited) {
+    if (INHERITABLE_TYPE_ANNOTATION_KINDS.has(annotation.annotationKind)) return true;
+  }
+  return false;
+}
 function resolveObjectType(type, checker, file, typeRegistry, visiting, sourceNode, metadataPolicy = createAnalyzerMetadataPolicy(void 0), extensionRegistry, diagnostics) {
   const collectedDiagnostics = diagnostics ?? [];
   const typeName = getNamedTypeName(type);
   const namedTypeName = typeName ?? void 0;
   const namedDecl = getNamedTypeDeclaration(type);
+  const passThroughAlias = getPassThroughTypeAliasFromSourceNode(
+    sourceNode,
+    checker,
+    extensionRegistry,
+    namedTypeName
+  );
+  const effectiveTypeName = passThroughAlias?.aliasName ?? namedTypeName;
+  const effectiveNamedDecl = passThroughAlias?.aliasDecl ?? namedDecl;
   const referenceTypeArguments = extractReferenceTypeArguments(
     type,
     checker,
@@ -3546,13 +3437,13 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting, sourceNo
     extensionRegistry,
     collectedDiagnostics
   );
-  const instantiatedTypeName = namedTypeName !== void 0 && referenceTypeArguments.length > 0 ? buildInstantiatedReferenceName(
-    namedTypeName,
+  const instantiatedTypeName = effectiveTypeName !== void 0 && referenceTypeArguments.length > 0 ? buildInstantiatedReferenceName(
+    effectiveTypeName,
     referenceTypeArguments.map((argument) => argument.tsType),
     checker
   ) : void 0;
-  const registryTypeName = instantiatedTypeName ?? namedTypeName;
-  const shouldRegisterNamedType = registryTypeName !== void 0 && !(registryTypeName === "Record" && namedDecl?.getSourceFile().fileName !== file);
+  const registryTypeName = instantiatedTypeName ?? effectiveTypeName;
+  const shouldRegisterNamedType = registryTypeName !== void 0 && !(registryTypeName === "Record" && effectiveNamedDecl?.getSourceFile().fileName !== file);
   const clearNamedTypeRegistration = () => {
     if (registryTypeName === void 0 || !shouldRegisterNamedType) {
       return;
@@ -3573,7 +3464,7 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting, sourceNo
     typeRegistry[registryTypeName] = {
       name: registryTypeName,
       type: RESOLVING_TYPE_PLACEHOLDER,
-      provenance: provenanceForDeclaration(namedDecl, file)
+      provenance: provenanceForDeclaration(effectiveNamedDecl, file)
     };
   }
   visiting.add(type);
@@ -3605,17 +3496,17 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting, sourceNo
         clearNamedTypeRegistration();
         return recordNode;
       }
-      const annotations = namedDecl ? extractJSDocAnnotationNodes(namedDecl, file, makeParseOptions(extensionRegistry)) : void 0;
-      const metadata = namedDecl !== void 0 ? resolveNodeMetadata(
+      const annotations = effectiveNamedDecl ? extractNamedTypeAnnotations(effectiveNamedDecl, checker, file, extensionRegistry) : void 0;
+      const metadata = effectiveNamedDecl !== void 0 ? resolveNodeMetadata(
         metadataPolicy,
         "type",
         registryTypeName,
-        namedDecl,
+        effectiveNamedDecl,
         checker,
         extensionRegistry,
         {
           checker,
-          declaration: namedDecl,
+          declaration: effectiveNamedDecl,
           subjectType: type
         }
       ) : void 0;
@@ -3624,7 +3515,7 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting, sourceNo
         ...metadata !== void 0 && { metadata },
         type: recordNode,
         ...annotations !== void 0 && annotations.length > 0 && { annotations },
-        provenance: provenanceForDeclaration(namedDecl, file)
+        provenance: provenanceForDeclaration(effectiveNamedDecl, file)
       };
       return {
         kind: "reference",
@@ -3650,7 +3541,7 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting, sourceNo
     if (!declaration) continue;
     if (!shouldEmitResolvedObjectProperty(prop, declaration)) continue;
     const propType = checker.getTypeOfSymbolAtLocation(prop, declaration);
-    const optional = !!(prop.flags & ts6.SymbolFlags.Optional);
+    const optional = !!(prop.flags & ts5.SymbolFlags.Optional);
     const propTypeNode = resolveTypeNode(
       propType,
       checker,
@@ -3663,7 +3554,7 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting, sourceNo
       collectedDiagnostics
     );
     const fieldNodeInfo = fieldInfoMap?.get(prop.name);
-    const inlineFieldNodeInfo = fieldNodeInfo === void 0 ? ts6.isPropertySignature(declaration) ? analyzeInterfacePropertyToIR(
+    const inlineFieldNodeInfo = fieldNodeInfo === void 0 ? ts5.isPropertySignature(declaration) ? analyzeInterfacePropertyToIR(
       declaration,
       checker,
       file,
@@ -3673,7 +3564,7 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting, sourceNo
       type,
       metadataPolicy,
       extensionRegistry
-    ) : ts6.isPropertyDeclaration(declaration) ? analyzeFieldToIR(
+    ) : ts5.isPropertyDeclaration(declaration) ? analyzeFieldToIR(
       declaration,
       checker,
       file,
@@ -3701,9 +3592,9 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting, sourceNo
   visiting.delete(type);
   const objectNode = {
     kind: "object",
-    properties: namedDecl !== void 0 && (ts6.isClassDeclaration(namedDecl) || ts6.isInterfaceDeclaration(namedDecl) || ts6.isTypeAliasDeclaration(namedDecl)) ? applyDiscriminatorToObjectProperties(
+    properties: effectiveNamedDecl !== void 0 && (ts5.isClassDeclaration(effectiveNamedDecl) || ts5.isInterfaceDeclaration(effectiveNamedDecl) || ts5.isTypeAliasDeclaration(effectiveNamedDecl)) ? applyDiscriminatorToObjectProperties(
       properties,
-      namedDecl,
+      effectiveNamedDecl,
       type,
       checker,
       file,
@@ -3713,17 +3604,17 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting, sourceNo
     additionalProperties: true
   };
   if (registryTypeName !== void 0 && shouldRegisterNamedType) {
-    const annotations = namedDecl ? extractJSDocAnnotationNodes(namedDecl, file, makeParseOptions(extensionRegistry)) : void 0;
-    const metadata = namedDecl !== void 0 ? resolveNodeMetadata(
+    const annotations = effectiveNamedDecl ? extractNamedTypeAnnotations(effectiveNamedDecl, checker, file, extensionRegistry) : void 0;
+    const metadata = effectiveNamedDecl !== void 0 ? resolveNodeMetadata(
       metadataPolicy,
       "type",
       registryTypeName,
-      namedDecl,
+      effectiveNamedDecl,
       checker,
       extensionRegistry,
       {
         checker,
-        declaration: namedDecl,
+        declaration: effectiveNamedDecl,
         subjectType: type
       }
     ) : void 0;
@@ -3732,7 +3623,7 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting, sourceNo
       ...metadata !== void 0 && { metadata },
       type: objectNode,
       ...annotations !== void 0 && annotations.length > 0 && { annotations },
-      provenance: provenanceForDeclaration(namedDecl, file)
+      provenance: provenanceForDeclaration(effectiveNamedDecl, file)
     };
     return {
       kind: "reference",
@@ -3749,12 +3640,12 @@ function getNamedTypeFieldNodeInfoMap(type, checker, file, typeRegistry, visitin
   for (const symbol of symbols) {
     const declarations = symbol.declarations;
     if (!declarations) continue;
-    const classDecl = declarations.find(ts6.isClassDeclaration);
+    const classDecl = declarations.find(ts5.isClassDeclaration);
     if (classDecl) {
       const map = /* @__PURE__ */ new Map();
       const hostType = checker.getTypeAtLocation(classDecl);
       for (const member of classDecl.members) {
-        if (ts6.isPropertyDeclaration(member) && ts6.isIdentifier(member.name)) {
+        if (ts5.isPropertyDeclaration(member) && ts5.isIdentifier(member.name)) {
           const fieldNode = analyzeFieldToIR(
             member,
             checker,
@@ -3778,7 +3669,7 @@ function getNamedTypeFieldNodeInfoMap(type, checker, file, typeRegistry, visitin
       }
       return map;
     }
-    const interfaceDecl = declarations.find(ts6.isInterfaceDeclaration);
+    const interfaceDecl = declarations.find(ts5.isInterfaceDeclaration);
     if (interfaceDecl) {
       return buildFieldNodeInfoMap(
         interfaceDecl.members,
@@ -3792,7 +3683,7 @@ function getNamedTypeFieldNodeInfoMap(type, checker, file, typeRegistry, visitin
         extensionRegistry
       );
     }
-    const typeAliasDecl = declarations.find(ts6.isTypeAliasDeclaration);
+    const typeAliasDecl = declarations.find(ts5.isTypeAliasDeclaration);
     const typeAliasMembers = typeAliasDecl === void 0 ? null : getObjectLikeTypeAliasMembers(typeAliasDecl.type);
     if (typeAliasDecl && typeAliasMembers !== null) {
       return buildFieldNodeInfoMap(
@@ -3816,10 +3707,10 @@ function extractArrayElementTypeNode(sourceNode, checker) {
     return void 0;
   }
   const resolvedTypeNode = resolveAliasedTypeNode(typeNode, checker);
-  if (ts6.isArrayTypeNode(resolvedTypeNode)) {
+  if (ts5.isArrayTypeNode(resolvedTypeNode)) {
     return resolvedTypeNode.elementType;
   }
-  if (ts6.isTypeReferenceNode(resolvedTypeNode) && ts6.isIdentifier(resolvedTypeNode.typeName) && resolvedTypeNode.typeName.text === "Array" && resolvedTypeNode.typeArguments?.[0]) {
+  if (ts5.isTypeReferenceNode(resolvedTypeNode) && ts5.isIdentifier(resolvedTypeNode.typeName) && resolvedTypeNode.typeName.text === "Array" && resolvedTypeNode.typeArguments?.[0]) {
     return resolvedTypeNode.typeArguments[0];
   }
   return void 0;
@@ -3830,13 +3721,13 @@ function extractUnionMemberTypeNodes(sourceNode, checker) {
     return [];
   }
   const resolvedTypeNode = resolveAliasedTypeNode(typeNode, checker);
-  return ts6.isUnionTypeNode(resolvedTypeNode) ? [...resolvedTypeNode.types] : [];
+  return ts5.isUnionTypeNode(resolvedTypeNode) ? [...resolvedTypeNode.types] : [];
 }
 function resolveAliasedTypeNode(typeNode, checker, visited = /* @__PURE__ */ new Set()) {
-  if (ts6.isParenthesizedTypeNode(typeNode)) {
+  if (ts5.isParenthesizedTypeNode(typeNode)) {
     return resolveAliasedTypeNode(typeNode.type, checker, visited);
   }
-  if (!ts6.isTypeReferenceNode(typeNode) || !ts6.isIdentifier(typeNode.typeName)) {
+  if (!ts5.isTypeReferenceNode(typeNode) || !ts5.isIdentifier(typeNode.typeName)) {
     return typeNode;
   }
   const aliasDecl = getTypeAliasDeclarationFromTypeReference(typeNode, checker);
@@ -3847,15 +3738,15 @@ function resolveAliasedTypeNode(typeNode, checker, visited = /* @__PURE__ */ new
   return resolveAliasedTypeNode(aliasDecl.type, checker, visited);
 }
 function isNullishTypeNode(typeNode) {
-  if (typeNode.kind === ts6.SyntaxKind.NullKeyword || typeNode.kind === ts6.SyntaxKind.UndefinedKeyword) {
+  if (typeNode.kind === ts5.SyntaxKind.NullKeyword || typeNode.kind === ts5.SyntaxKind.UndefinedKeyword) {
     return true;
   }
-  return ts6.isLiteralTypeNode(typeNode) && (typeNode.literal.kind === ts6.SyntaxKind.NullKeyword || typeNode.literal.kind === ts6.SyntaxKind.UndefinedKeyword);
+  return ts5.isLiteralTypeNode(typeNode) && (typeNode.literal.kind === ts5.SyntaxKind.NullKeyword || typeNode.literal.kind === ts5.SyntaxKind.UndefinedKeyword);
 }
 function buildFieldNodeInfoMap(members, checker, file, typeRegistry, visiting, metadataPolicy, hostType, diagnostics, extensionRegistry) {
   const map = /* @__PURE__ */ new Map();
   for (const member of members) {
-    if (ts6.isPropertySignature(member)) {
+    if (ts5.isPropertySignature(member)) {
       const fieldNode = analyzeInterfacePropertyToIR(
         member,
         checker,
@@ -3881,7 +3772,7 @@ function buildFieldNodeInfoMap(members, checker, file, typeRegistry, visiting, m
 }
 var MAX_ALIAS_CHAIN_DEPTH = 8;
 function extractTypeAliasConstraintNodes(typeNode, checker, file, extensionRegistry, depth = 0) {
-  if (!ts6.isTypeReferenceNode(typeNode)) return [];
+  if (!ts5.isTypeReferenceNode(typeNode)) return [];
   if (depth >= MAX_ALIAS_CHAIN_DEPTH) {
     const aliasName = typeNode.typeName.getText();
     throw new Error(
@@ -3890,7 +3781,7 @@ function extractTypeAliasConstraintNodes(typeNode, checker, file, extensionRegis
   }
   const aliasDecl = getTypeAliasDeclarationFromTypeReference(typeNode, checker);
   if (!aliasDecl) return [];
-  if (ts6.isTypeLiteralNode(aliasDecl.type)) return [];
+  if (ts5.isTypeLiteralNode(aliasDecl.type)) return [];
   const aliasFieldType = resolveTypeNode(
     checker.getTypeAtLocation(aliasDecl.type),
     checker,
@@ -3934,14 +3825,14 @@ function getNamedTypeName(type) {
   const symbol = type.getSymbol();
   if (symbol?.declarations) {
     const decl = symbol.declarations[0];
-    if (decl && (ts6.isClassDeclaration(decl) || ts6.isInterfaceDeclaration(decl) || ts6.isTypeAliasDeclaration(decl))) {
-      const name = ts6.isClassDeclaration(decl) ? decl.name?.text : decl.name.text;
+    if (decl && (ts5.isClassDeclaration(decl) || ts5.isInterfaceDeclaration(decl) || ts5.isTypeAliasDeclaration(decl))) {
+      const name = ts5.isClassDeclaration(decl) ? decl.name?.text : decl.name.text;
       if (name) return name;
     }
   }
   const aliasSymbol = type.aliasSymbol;
   if (aliasSymbol?.declarations) {
-    const aliasDecl = aliasSymbol.declarations.find(ts6.isTypeAliasDeclaration);
+    const aliasDecl = aliasSymbol.declarations.find(ts5.isTypeAliasDeclaration);
     if (aliasDecl) {
       return aliasDecl.name.text;
     }
@@ -3952,24 +3843,24 @@ function getNamedTypeDeclaration(type) {
   const symbol = type.getSymbol();
   if (symbol?.declarations) {
     const decl = symbol.declarations[0];
-    if (decl && (ts6.isClassDeclaration(decl) || ts6.isInterfaceDeclaration(decl) || ts6.isTypeAliasDeclaration(decl))) {
+    if (decl && (ts5.isClassDeclaration(decl) || ts5.isInterfaceDeclaration(decl) || ts5.isTypeAliasDeclaration(decl))) {
       return decl;
     }
   }
   const aliasSymbol = type.aliasSymbol;
   if (aliasSymbol?.declarations) {
-    return aliasSymbol.declarations.find(ts6.isTypeAliasDeclaration);
+    return aliasSymbol.declarations.find(ts5.isTypeAliasDeclaration);
   }
   return void 0;
 }
 function analyzeMethod(method, checker) {
-  if (!ts6.isIdentifier(method.name)) {
+  if (!ts5.isIdentifier(method.name)) {
     return null;
   }
   const name = method.name.text;
   const parameters = [];
   for (const param of method.parameters) {
-    if (ts6.isIdentifier(param.name)) {
+    if (ts5.isIdentifier(param.name)) {
       const paramInfo = analyzeParameter(param, checker);
       parameters.push(paramInfo);
     }
@@ -3980,7 +3871,7 @@ function analyzeMethod(method, checker) {
   return { name, parameters, returnTypeNode, returnType };
 }
 function analyzeParameter(param, checker) {
-  const name = ts6.isIdentifier(param.name) ? param.name.text : "param";
+  const name = ts5.isIdentifier(param.name) ? param.name.text : "param";
   const typeNode = param.type;
   const type = checker.getTypeAtLocation(param);
   const formSpecExportName = detectFormSpecReference(typeNode);
@@ -3989,15 +3880,15 @@ function analyzeParameter(param, checker) {
 }
 function detectFormSpecReference(typeNode) {
   if (!typeNode) return null;
-  if (!ts6.isTypeReferenceNode(typeNode)) return null;
-  const typeName = ts6.isIdentifier(typeNode.typeName) ? typeNode.typeName.text : ts6.isQualifiedName(typeNode.typeName) ? typeNode.typeName.right.text : null;
+  if (!ts5.isTypeReferenceNode(typeNode)) return null;
+  const typeName = ts5.isIdentifier(typeNode.typeName) ? typeNode.typeName.text : ts5.isQualifiedName(typeNode.typeName) ? typeNode.typeName.right.text : null;
   if (typeName !== "InferSchema" && typeName !== "InferFormSchema") return null;
   const typeArg = typeNode.typeArguments?.[0];
-  if (!typeArg || !ts6.isTypeQueryNode(typeArg)) return null;
-  if (ts6.isIdentifier(typeArg.exprName)) {
+  if (!typeArg || !ts5.isTypeQueryNode(typeArg)) return null;
+  if (ts5.isIdentifier(typeArg.exprName)) {
     return typeArg.exprName.text;
   }
-  if (ts6.isQualifiedName(typeArg.exprName)) {
+  if (ts5.isQualifiedName(typeArg.exprName)) {
     return typeArg.exprName.right.text;
   }
   return null;
@@ -4019,23 +3910,23 @@ function createProgramContextFromProgram(program, filePath) {
 function createProgramContext(filePath, additionalFiles) {
   const absolutePath = path.resolve(filePath);
   const fileDir = path.dirname(absolutePath);
-  const configPath = ts7.findConfigFile(fileDir, ts7.sys.fileExists.bind(ts7.sys), "tsconfig.json");
+  const configPath = ts6.findConfigFile(fileDir, ts6.sys.fileExists.bind(ts6.sys), "tsconfig.json");
   let compilerOptions;
   let fileNames;
   if (configPath) {
-    const configFile = ts7.readConfigFile(configPath, ts7.sys.readFile.bind(ts7.sys));
+    const configFile = ts6.readConfigFile(configPath, ts6.sys.readFile.bind(ts6.sys));
     if (configFile.error) {
       throw new Error(
-        `Error reading tsconfig.json: ${ts7.flattenDiagnosticMessageText(configFile.error.messageText, "\n")}`
+        `Error reading tsconfig.json: ${ts6.flattenDiagnosticMessageText(configFile.error.messageText, "\n")}`
       );
     }
-    const parsed = ts7.parseJsonConfigFileContent(
+    const parsed = ts6.parseJsonConfigFileContent(
       configFile.config,
-      ts7.sys,
+      ts6.sys,
       path.dirname(configPath)
     );
     if (parsed.errors.length > 0) {
-      const errorMessages = parsed.errors.map((e) => ts7.flattenDiagnosticMessageText(e.messageText, "\n")).join("\n");
+      const errorMessages = parsed.errors.map((e) => ts6.flattenDiagnosticMessageText(e.messageText, "\n")).join("\n");
       throw new Error(`Error parsing tsconfig.json: ${errorMessages}`);
     }
     compilerOptions = parsed.options;
@@ -4043,9 +3934,9 @@ function createProgramContext(filePath, additionalFiles) {
     fileNames = [.../* @__PURE__ */ new Set([...parsed.fileNames, absolutePath, ...normalizedAdditional])];
   } else {
     compilerOptions = {
-      target: ts7.ScriptTarget.ES2022,
-      module: ts7.ModuleKind.NodeNext,
-      moduleResolution: ts7.ModuleResolutionKind.NodeNext,
+      target: ts6.ScriptTarget.ES2022,
+      module: ts6.ModuleKind.NodeNext,
+      moduleResolution: ts6.ModuleResolutionKind.NodeNext,
       strict: true,
       skipLibCheck: true,
       declaration: true
@@ -4053,7 +3944,7 @@ function createProgramContext(filePath, additionalFiles) {
     const normalizedAdditional = (additionalFiles ?? []).map((f) => path.resolve(f));
     fileNames = [.../* @__PURE__ */ new Set([absolutePath, ...normalizedAdditional])];
   }
-  const program = ts7.createProgram(fileNames, compilerOptions);
+  const program = ts6.createProgram(fileNames, compilerOptions);
   const sourceFile = program.getSourceFile(absolutePath);
   if (!sourceFile) {
     throw new Error(`Could not find source file: ${absolutePath}`);
@@ -4072,19 +3963,19 @@ function findNodeByName(sourceFile, name, predicate, getName) {
       result = node;
       return;
     }
-    ts7.forEachChild(node, visit);
+    ts6.forEachChild(node, visit);
   }
   visit(sourceFile);
   return result;
 }
 function findClassByName(sourceFile, className) {
-  return findNodeByName(sourceFile, className, ts7.isClassDeclaration, (n) => n.name?.text);
+  return findNodeByName(sourceFile, className, ts6.isClassDeclaration, (n) => n.name?.text);
 }
 function findInterfaceByName(sourceFile, interfaceName) {
-  return findNodeByName(sourceFile, interfaceName, ts7.isInterfaceDeclaration, (n) => n.name.text);
+  return findNodeByName(sourceFile, interfaceName, ts6.isInterfaceDeclaration, (n) => n.name.text);
 }
 function findTypeAliasByName(sourceFile, aliasName) {
-  return findNodeByName(sourceFile, aliasName, ts7.isTypeAliasDeclaration, (n) => n.name.text);
+  return findNodeByName(sourceFile, aliasName, ts6.isTypeAliasDeclaration, (n) => n.name.text);
 }
 function getResolvedObjectRootType(rootType, typeRegistry) {
   if (rootType.kind === "object") {
@@ -4124,22 +4015,22 @@ function createResolvedObjectAliasAnalysis(name, rootType, typeRegistry, rootInf
   };
 }
 function containsTypeReferenceInObjectLikeAlias(typeNode) {
-  if (ts7.isParenthesizedTypeNode(typeNode)) {
+  if (ts6.isParenthesizedTypeNode(typeNode)) {
     return containsTypeReferenceInObjectLikeAlias(typeNode.type);
   }
-  if (ts7.isTypeReferenceNode(typeNode)) {
+  if (ts6.isTypeReferenceNode(typeNode)) {
     return true;
   }
-  return ts7.isIntersectionTypeNode(typeNode) && typeNode.types.some((member) => containsTypeReferenceInObjectLikeAlias(member));
+  return ts6.isIntersectionTypeNode(typeNode) && typeNode.types.some((member) => containsTypeReferenceInObjectLikeAlias(member));
 }
 function collectFallbackAliasMemberPropertyNames(typeNode, checker) {
-  if (ts7.isParenthesizedTypeNode(typeNode)) {
+  if (ts6.isParenthesizedTypeNode(typeNode)) {
     return collectFallbackAliasMemberPropertyNames(typeNode.type, checker);
   }
-  if (ts7.isTypeLiteralNode(typeNode)) {
+  if (ts6.isTypeLiteralNode(typeNode)) {
     const propertyNames = [];
     for (const member of typeNode.members) {
-      if (!ts7.isPropertySignature(member)) {
+      if (!ts6.isPropertySignature(member)) {
         continue;
       }
       const propertyName = getAnalyzableObjectLikePropertyName(member.name);
@@ -4149,13 +4040,13 @@ function collectFallbackAliasMemberPropertyNames(typeNode, checker) {
     }
     return propertyNames;
   }
-  if (ts7.isTypeReferenceNode(typeNode)) {
+  if (ts6.isTypeReferenceNode(typeNode)) {
     return checker.getTypeFromTypeNode(typeNode).getProperties().map((property) => property.getName());
   }
   return null;
 }
 function findFallbackAliasDuplicatePropertyNames(typeNode, checker) {
-  if (!ts7.isIntersectionTypeNode(typeNode)) {
+  if (!ts6.isIntersectionTypeNode(typeNode)) {
     return [];
   }
   const seen = /* @__PURE__ */ new Set();
@@ -4345,7 +4236,7 @@ function makeFileProvenance(filePath) {
 }
 
 // src/generators/class-schema.ts
-import * as ts9 from "typescript";
+import * as ts8 from "typescript";
 
 // src/metadata/collision-guards.ts
 function assertUniqueSerializedNames(entries, scope) {
@@ -4514,7 +4405,7 @@ function generateJsonSchemaFromIR(ir, options) {
       applyConstraints(ctx.defs[schemaName], typeDef.constraints, ctx);
     }
     if (typeDef.annotations && typeDef.annotations.length > 0) {
-      applyAnnotations(ctx.defs[schemaName], typeDef.annotations, ctx);
+      applyAnnotations(ctx.defs[schemaName], typeDef.annotations, ctx, typeDef.type);
     }
   }
   const properties = {};
@@ -4587,7 +4478,7 @@ function generateFieldSchema(field, ctx) {
     }
   }
   applyResolvedMetadata(schema, field.metadata);
-  applyAnnotations(schema, rootAnnotations, ctx);
+  applyAnnotations(schema, rootAnnotations, ctx, field.type);
   if (itemStringSchema !== void 0) {
     applyAnnotations(itemStringSchema, itemAnnotations, ctx);
   }
@@ -4630,32 +4521,36 @@ function applyPathTargetedConstraints(schema, pathConstraints, ctx, typeNode) {
     return schema;
   }
   if (schema.$ref) {
-    const { $ref, ...rest } = schema;
-    const refPart = { $ref };
-    const overridePart = {
-      properties: propertyOverrides,
-      ...rest
+    return {
+      ...schema,
+      properties: propertyOverrides
     };
-    return { allOf: [refPart, overridePart] };
   }
   if (schema.type === "object" && schema.properties) {
-    const missingOverrides = {};
     for (const [target, overrideSchema] of Object.entries(propertyOverrides)) {
-      if (schema.properties[target]) {
-        mergeSchemaOverride(schema.properties[target], overrideSchema);
-      } else {
-        missingOverrides[target] = overrideSchema;
+      if (Object.hasOwn(schema.properties, target)) {
+        const existing = schema.properties[target];
+        if (existing) {
+          mergeSchemaOverride(existing, overrideSchema);
+          continue;
+        }
       }
+      Object.defineProperty(schema.properties, target, {
+        value: overrideSchema,
+        writable: true,
+        enumerable: true,
+        configurable: true
+      });
     }
-    if (Object.keys(missingOverrides).length === 0) {
-      return schema;
-    }
-    return {
-      allOf: [schema, { properties: missingOverrides }]
-    };
+    return schema;
   }
   if (schema.allOf) {
-    schema.allOf = [...schema.allOf, { properties: propertyOverrides }];
+    const overrideMember = { properties: propertyOverrides };
+    const flattened = tryFlattenAllOfToSiblings(schema, overrideMember);
+    if (flattened !== void 0) {
+      return flattened;
+    }
+    schema.allOf = [...schema.allOf, overrideMember];
     return schema;
   }
   return schema;
@@ -4768,7 +4663,7 @@ function generatePropertySchema(prop, ctx) {
   const schema = generateTypeNode(prop.type, ctx);
   applyConstraints(schema, prop.constraints, ctx);
   applyResolvedMetadata(schema, prop.metadata);
-  applyAnnotations(schema, prop.annotations, ctx);
+  applyAnnotations(schema, prop.annotations, ctx, prop.type);
   return schema;
 }
 function generateUnionType(type, ctx) {
@@ -4871,13 +4766,20 @@ function buildPropertyOverrides(pathConstraints, typeNode, ctx) {
     grouped.push(constraint);
     byTarget.set(target, grouped);
   }
-  const overrides = {};
+  const overrides = /* @__PURE__ */ Object.create(null);
   for (const [target, constraints] of byTarget) {
-    overrides[resolveSerializedPropertyName(target, typeNode, ctx)] = buildPathOverrideSchema(
+    const resolvedName = resolveSerializedPropertyName(target, typeNode, ctx);
+    const schema = buildPathOverrideSchema(
       constraints.map(stripLeadingPathSegment),
       resolveTargetTypeNode(target, typeNode, ctx),
       ctx
     );
+    Object.defineProperty(overrides, resolvedName, {
+      value: schema,
+      writable: true,
+      enumerable: true,
+      configurable: true
+    });
   }
   return overrides;
 }
@@ -4904,6 +4806,34 @@ function buildPathOverrideSchema(constraints, typeNode, ctx) {
   schema.properties = buildPropertyOverrides(nestedConstraints, effectiveType, ctx);
   return schema;
 }
+function tryFlattenAllOfToSiblings(schema, overrideMember) {
+  if (schema.allOf?.length !== 1) {
+    return void 0;
+  }
+  const [soleMember] = schema.allOf;
+  if (soleMember === void 0) {
+    return void 0;
+  }
+  const { allOf: _allOf, ...outerRest } = schema;
+  const outerKeys = new Set(Object.keys(outerRest));
+  const memberKeys = new Set(Object.keys(soleMember));
+  const overrideKeys = new Set(Object.keys(overrideMember));
+  for (const key of memberKeys) {
+    if (outerKeys.has(key) || overrideKeys.has(key)) {
+      return void 0;
+    }
+  }
+  for (const key of overrideKeys) {
+    if (outerKeys.has(key)) {
+      return void 0;
+    }
+  }
+  return {
+    ...outerRest,
+    ...soleMember,
+    ...overrideMember
+  };
+}
 function mergeSchemaOverride(target, override) {
   const nullableValueBranch = getNullableUnionValueSchema(target);
   if (nullableValueBranch !== void 0) {
@@ -4911,11 +4841,16 @@ function mergeSchemaOverride(target, override) {
     return;
   }
   if (override.properties !== void 0) {
-    const mergedProperties = target.properties ?? {};
+    const mergedProperties = target.properties ?? /* @__PURE__ */ Object.create(null);
     for (const [name, propertyOverride] of Object.entries(override.properties)) {
-      const existing = mergedProperties[name];
+      const existing = Object.hasOwn(mergedProperties, name) ? mergedProperties[name] : void 0;
       if (existing === void 0) {
-        mergedProperties[name] = propertyOverride;
+        Object.defineProperty(mergedProperties, name, {
+          value: propertyOverride,
+          writable: true,
+          enumerable: true,
+          configurable: true
+        });
       } else {
         mergeSchemaOverride(existing, propertyOverride);
       }
@@ -4933,7 +4868,12 @@ function mergeSchemaOverride(target, override) {
     if (key === "properties" || key === "items") {
       continue;
     }
-    target[key] = value;
+    Object.defineProperty(target, key, {
+      value,
+      writable: true,
+      enumerable: true,
+      configurable: true
+    });
   }
 }
 function stripLeadingPathSegment(constraint) {
@@ -5033,7 +4973,7 @@ function applyConstraints(schema, constraints, ctx) {
     }
   }
 }
-function applyAnnotations(schema, annotations, ctx) {
+function applyAnnotations(schema, annotations, ctx, typeNode) {
   for (const annotation of annotations) {
     switch (annotation.annotationKind) {
       case "displayName":
@@ -5046,7 +4986,7 @@ function applyAnnotations(schema, annotations, ctx) {
         schema[`${ctx.vendorPrefix}-remarks`] = annotation.value;
         break;
       case "defaultValue":
-        schema.default = annotation.value;
+        schema.default = coerceDefaultValue(annotation.value, typeNode, schema, ctx);
         break;
       case "format":
         schema.format = annotation.value;
@@ -5071,6 +5011,34 @@ function applyAnnotations(schema, annotations, ctx) {
     }
   }
 }
+function coerceDefaultValue(value, typeNode, emittedSchema, ctx) {
+  if (typeNode?.kind !== "custom") {
+    return value;
+  }
+  const registration = ctx.extensionRegistry?.findType(typeNode.typeId);
+  if (registration === void 0) {
+    return value;
+  }
+  if (registration.serializeDefault !== void 0) {
+    return registration.serializeDefault(value, typeNode.payload);
+  }
+  const declaredType = emittedSchema["type"];
+  if (declaredType === "string" && typeof value !== "string") {
+    if (typeof value === "number") {
+      if (!Number.isFinite(value)) {
+        return value;
+      }
+      return String(value);
+    }
+    if (typeof value === "boolean") {
+      return String(value);
+    }
+    if (typeof value === "bigint") {
+      return value.toString();
+    }
+  }
+  return value;
+}
 function generateCustomType(type, ctx) {
   const registration = ctx.extensionRegistry?.findType(type.typeId);
   if (registration === void 0) {
@@ -5203,7 +5171,9 @@ import {
 import {
   getTagDefinition as getTagDefinition2,
   normalizeFormSpecTagName as normalizeFormSpecTagName2,
-  getSyntheticLogger as getSyntheticLogger2
+  getRegistryLogger,
+  _validateExtensionSetup,
+  logSetupDiagnostics
 } from "@formspec/analysis/internal";
 var BUILTIN_METADATA_TAGS = /* @__PURE__ */ new Set(["apiName", "displayName"]);
 function buildConstraintTagSources(extensions) {
@@ -5213,16 +5183,32 @@ function buildConstraintTagSources(extensions) {
       constraintTags: extension.constraintTags.map((tag) => ({
         tagName: normalizeFormSpecTagName2(tag.tagName)
       }))
+    } : {},
+    // Include customTypes so _validateExtensionSetup can check tsTypeNames for
+    // unsupported built-in overrides and invalid identifier patterns.
+    ...extension.types !== void 0 ? {
+      customTypes: extension.types.map((type) => ({
+        // tsTypeNames: deprecated in favour of symbol-based detection, but
+        // still required for name-based validation in _validateExtensionSetup
+        // until the bridge is fully retired (see §synthetic-checker-retirement §4C).
+        tsTypeNames: type.tsTypeNames ?? [type.typeName]
+      }))
     } : {}
   }));
 }
 function createExtensionRegistry(extensions) {
-  const registryLog = getSyntheticLogger2();
+  const registryLog = getRegistryLogger();
   registryLog.debug("createExtensionRegistry: constructing", {
     extensionCount: extensions.length,
     extensionIds: extensions.map((e) => e.extensionId)
   });
-  const reservedTagSources = buildConstraintTagSources(extensions);
+  const extensionTagSources = buildConstraintTagSources(extensions);
+  const setupDiagnostics = _validateExtensionSetup(extensionTagSources);
+  logSetupDiagnostics(registryLog, {
+    diagnosticCount: setupDiagnostics.length,
+    codes: setupDiagnostics.map((d) => d.kind)
+  });
+  const reservedTagSources = extensionTagSources;
   let symbolMap = /* @__PURE__ */ new Map();
   const typeMap = /* @__PURE__ */ new Map();
   const typeNameMap = /* @__PURE__ */ new Map();
@@ -5359,10 +5345,12 @@ function createExtensionRegistry(extensions) {
     constraintTagCount: constraintTagMap.size,
     broadeningCount: builtinBroadeningMap.size,
     annotationCount: annotationMap.size,
-    metadataSlotCount: metadataSlotMap.size
+    metadataSlotCount: metadataSlotMap.size,
+    setupDiagnosticCount: setupDiagnostics.length
   });
   return {
     extensions,
+    setupDiagnostics,
     findType: (typeId) => typeMap.get(typeId),
     findTypeByName: (typeName) => typeNameMap.get(typeName),
     findTypeByBrand: (brand) => brandMap.get(brand),
@@ -5378,7 +5366,7 @@ function createExtensionRegistry(extensions) {
 }
 
 // src/extensions/symbol-registry.ts
-import * as ts8 from "typescript";
+import * as ts7 from "typescript";
 import * as path2 from "path";
 
 // src/ui-schema/schema.ts
@@ -5771,7 +5759,7 @@ function formatLocation(location) {
 }
 function resolveStaticOptions(options) {
   const legacyRegistry = options.extensionRegistry;
-  const configRegistry = legacyRegistry === void 0 && options.config?.extensions !== void 0 ? createExtensionRegistry(options.config.extensions) : void 0;
+  const configRegistry = legacyRegistry === void 0 && options.config?.extensions !== void 0 && options.config.extensions.length > 0 ? createExtensionRegistry(options.config.extensions) : void 0;
   return {
     extensionRegistry: legacyRegistry ?? configRegistry,
     // eslint-disable-next-line @typescript-eslint/no-deprecated -- migration bridge reads deprecated fields