@formspec/build 0.1.0-alpha.32 → 0.1.0-alpha.33

package/dist/cli.cjs

@@ -1877,13 +1877,26 @@ var init_generator2 = __esm({
 });
 
 // src/extensions/registry.ts
+function buildConstraintTagSources(extensions) {
+  return extensions.map((extension) => ({
+    extensionId: extension.extensionId,
+    ...extension.constraintTags !== void 0 ? {
+      constraintTags: extension.constraintTags.map((tag) => ({
+        tagName: (0, import_internal.normalizeFormSpecTagName)(tag.tagName)
+      }))
+    } : {}
+  }));
+}
 function createExtensionRegistry(extensions) {
+  const reservedTagSources = buildConstraintTagSources(extensions);
   const typeMap = /* @__PURE__ */ new Map();
   const typeNameMap = /* @__PURE__ */ new Map();
   const constraintMap = /* @__PURE__ */ new Map();
   const constraintTagMap = /* @__PURE__ */ new Map();
   const builtinBroadeningMap = /* @__PURE__ */ new Map();
   const annotationMap = /* @__PURE__ */ new Map();
+  const metadataSlotMap = /* @__PURE__ */ new Map();
+  const metadataTagMap = /* @__PURE__ */ new Map();
   for (const ext of extensions) {
     if (ext.types !== void 0) {
       for (const type of ext.types) {
@@ -1926,10 +1939,11 @@ function createExtensionRegistry(extensions) {
     }
     if (ext.constraintTags !== void 0) {
       for (const tag of ext.constraintTags) {
-        if (constraintTagMap.has(tag.tagName)) {
-          throw new Error(`Duplicate custom constraint tag: "@${tag.tagName}"`);
+        const canonicalTagName = (0, import_internal.normalizeFormSpecTagName)(tag.tagName);
+        if (constraintTagMap.has(canonicalTagName)) {
+          throw new Error(`Duplicate custom constraint tag: "@${canonicalTagName}"`);
         }
-        constraintTagMap.set(tag.tagName, {
+        constraintTagMap.set(canonicalTagName, {
           extensionId: ext.extensionId,
           registration: tag
         });
@@ -1944,20 +1958,65 @@ function createExtensionRegistry(extensions) {
         annotationMap.set(qualifiedId, annotation);
       }
     }
+    if (ext.metadataSlots !== void 0) {
+      for (const slot of ext.metadataSlots) {
+        if (metadataSlotMap.has(slot.slotId)) {
+          throw new Error(`Duplicate metadata slot ID: "${slot.slotId}"`);
+        }
+        metadataSlotMap.set(slot.slotId, true);
+        const canonicalTagName = (0, import_internal.normalizeFormSpecTagName)(slot.tagName);
+        if (slot.allowBare === false && (slot.qualifiers?.length ?? 0) === 0) {
+          throw new Error(
+            `Metadata tag "@${canonicalTagName}" must allow bare usage or declare at least one qualifier.`
+          );
+        }
+        if (metadataTagMap.has(canonicalTagName)) {
+          throw new Error(`Duplicate metadata tag: "@${canonicalTagName}"`);
+        }
+        if (BUILTIN_METADATA_TAGS.has(canonicalTagName)) {
+          throw new Error(
+            `Metadata tag "@${canonicalTagName}" conflicts with built-in metadata tags.`
+          );
+        }
+        if (constraintTagMap.has(canonicalTagName)) {
+          throw new Error(
+            `Metadata tag "@${canonicalTagName}" conflicts with existing FormSpec tag "@${canonicalTagName}".`
+          );
+        }
+        if (Object.hasOwn(import_internals3.BUILTIN_CONSTRAINT_DEFINITIONS, (0, import_internals3.normalizeConstraintTagName)(canonicalTagName))) {
+          throw new Error(
+            `Metadata tag "@${canonicalTagName}" conflicts with existing FormSpec tag "@${(0, import_internals3.normalizeConstraintTagName)(canonicalTagName)}".`
+          );
+        }
+        const existingTag = (0, import_internal.getTagDefinition)(canonicalTagName, reservedTagSources);
+        if (existingTag !== null) {
+          throw BUILTIN_METADATA_TAGS.has(existingTag.canonicalName) ? new Error(
+            `Metadata tag "@${canonicalTagName}" conflicts with built-in metadata tags.`
+          ) : new Error(
+            `Metadata tag "@${canonicalTagName}" conflicts with existing FormSpec tag "@${existingTag.canonicalName}".`
+          );
+        }
+        metadataTagMap.set(canonicalTagName, true);
+      }
+    }
   }
   return {
     extensions,
     findType: (typeId) => typeMap.get(typeId),
     findTypeByName: (typeName) => typeNameMap.get(typeName),
     findConstraint: (constraintId) => constraintMap.get(constraintId),
-    findConstraintTag: (tagName) => constraintTagMap.get(tagName),
+    findConstraintTag: (tagName) => constraintTagMap.get((0, import_internal.normalizeFormSpecTagName)(tagName)),
     findBuiltinConstraintBroadening: (typeId, tagName) => builtinBroadeningMap.get(`${typeId}:${tagName}`),
     findAnnotation: (annotationId) => annotationMap.get(annotationId)
   };
 }
+var import_internals3, import_internal, BUILTIN_METADATA_TAGS;
 var init_registry = __esm({
   "src/extensions/registry.ts"() {
     "use strict";
+    import_internals3 = require("@formspec/core/internals");
+    import_internal = require("@formspec/analysis/internal");
+    BUILTIN_METADATA_TAGS = /* @__PURE__ */ new Set(["apiName", "displayName"]);
   }
 });
 
@@ -2040,7 +2099,7 @@ var init_schema2 = __esm({
 // src/analyzer/tsdoc-parser.ts
 function createFormSpecTSDocConfig(extensionTagNames = []) {
   const config = new import_tsdoc.TSDocConfiguration();
-  for (const tagName of Object.keys(import_internals3.BUILTIN_CONSTRAINT_DEFINITIONS)) {
+  for (const tagName of Object.keys(import_internals4.BUILTIN_CONSTRAINT_DEFINITIONS)) {
     config.addTagDefinition(
       new import_tsdoc.TSDocTagDefinition({
         tagName: "@" + tagName,
@@ -2049,7 +2108,7 @@ function createFormSpecTSDocConfig(extensionTagNames = []) {
       })
     );
   }
-  for (const tagName of ["displayName", "format", "placeholder"]) {
+  for (const tagName of ["apiName", "displayName", "format", "placeholder"]) {
     config.addTagDefinition(
       new import_tsdoc.TSDocTagDefinition({
         tagName: "@" + tagName,
@@ -2082,6 +2141,16 @@ function sharedTagValueOptions(options) {
     ...options?.fieldType !== void 0 ? { fieldType: options.fieldType } : {}
   };
 }
+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) {
@@ -2121,6 +2190,9 @@ function isNonReferenceIdentifier(node) {
   return false;
 }
 function statementReferencesImportedName(statement, importedNames) {
+  if (importedNames.size === 0) {
+    return false;
+  }
   let referencesImportedName = false;
   const visit = (node) => {
     if (referencesImportedName) {
@@ -2135,14 +2207,17 @@ function statementReferencesImportedName(statement, importedNames) {
   visit(statement);
   return referencesImportedName;
 }
-function buildSupportingDeclarations(sourceFile) {
+function buildSupportingDeclarations(sourceFile, extensionTypeNames) {
   const importedNames = collectImportedNames(sourceFile);
+  const importedNamesToSkip = new Set(
+    [...importedNames].filter((name) => !extensionTypeNames.has(name))
+  );
   return sourceFile.statements.filter((statement) => {
     if (ts.isImportDeclaration(statement)) return false;
     if (ts.isImportEqualsDeclaration(statement)) return false;
     if (ts.isExportDeclaration(statement) && statement.moduleSpecifier !== void 0)
       return false;
-    if (importedNames.size > 0 && statementReferencesImportedName(statement, importedNames)) {
+    if (statementReferencesImportedName(statement, importedNamesToSkip)) {
       return false;
     }
     return true;
@@ -2188,12 +2263,12 @@ function supportsConstraintCapability(type, checker, capability) {
   if (capability === void 0) {
     return true;
   }
-  if ((0, import_internal.hasTypeSemanticCapability)(type, checker, capability)) {
+  if ((0, import_internal2.hasTypeSemanticCapability)(type, checker, capability)) {
     return true;
   }
   if (capability === "string-like") {
     const itemType = getArrayElementType(type, checker);
-    return itemType !== null && (0, import_internal.hasTypeSemanticCapability)(itemType, checker, capability);
+    return itemType !== null && (0, import_internal2.hasTypeSemanticCapability)(itemType, checker, capability);
   }
   return false;
 }
@@ -2283,7 +2358,7 @@ function hasBuiltinConstraintBroadening(tagName, options) {
   return broadenedTypeId !== void 0 && options?.extensionRegistry?.findBuiltinConstraintBroadening(broadenedTypeId, tagName) !== void 0;
 }
 function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, parsedTag, provenance, supportingDeclarations, options) {
-  if (!(0, import_internals3.isBuiltinConstraintName)(tagName)) {
+  if (!(0, import_internals4.isBuiltinConstraintName)(tagName)) {
     return [];
   }
   const checker = options?.checker;
@@ -2291,11 +2366,11 @@ function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, par
   if (checker === void 0 || subjectType === void 0) {
     return [];
   }
-  const placement = (0, import_internal.resolveDeclarationPlacement)(node);
+  const placement = (0, import_internal2.resolveDeclarationPlacement)(node);
   if (placement === null) {
     return [];
   }
-  const definition = (0, import_internal.getTagDefinition)(tagName, options?.extensionRegistry?.extensions);
+  const definition = (0, import_internal2.getTagDefinition)(tagName, options?.extensionRegistry?.extensions);
   if (definition === null) {
     return [];
   }
@@ -2329,7 +2404,7 @@ function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, par
         )
       ];
     }
-    const resolution = (0, import_internal.resolvePathTargetType)(subjectType, checker, target.path.segments);
+    const resolution = (0, import_internal2.resolvePathTargetType)(subjectType, checker, target.path.segments);
     if (resolution.kind === "missing-property") {
       return [
         makeDiagnostic(
@@ -2386,7 +2461,7 @@ function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, par
   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);
-  const result = (0, import_internal.checkSyntheticTagApplication)({
+  const result = (0, import_internal2.checkSyntheticTagApplication)({
     tagName,
     placement,
     hostType: hostTypeText,
@@ -2399,6 +2474,14 @@ function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, par
         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]
+          }))
         } : {}
       }))
     } : {}
@@ -2418,7 +2501,10 @@ function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, par
 function getParser(options) {
   const extensionTagNames = [
     ...options?.extensionRegistry?.extensions.flatMap(
-      (extension) => (extension.constraintTags ?? []).map((tag) => tag.tagName)
+      (extension) => (extension.constraintTags ?? []).map((tag) => (0, import_internal2.normalizeFormSpecTagName)(tag.tagName))
+    ) ?? [],
+    ...options?.extensionRegistry?.extensions.flatMap(
+      (extension) => (extension.metadataSlots ?? []).map((slot) => (0, import_internal2.normalizeFormSpecTagName)(slot.tagName))
     ) ?? []
   ].sort();
   const cacheKey = extensionTagNames.join("|");
@@ -2438,7 +2524,16 @@ function getExtensionRegistryCacheKey(registry) {
     (extension) => JSON.stringify({
       extensionId: extension.extensionId,
       typeNames: extension.types?.map((type) => type.typeName) ?? [],
-      constraintTags: extension.constraintTags?.map((tag) => tag.tagName) ?? []
+      constraintTags: extension.constraintTags?.map((tag) => (0, import_internal2.normalizeFormSpecTagName)(tag.tagName)) ?? [],
+      metadataSlots: extension.metadataSlots?.map((slot) => ({
+        tagName: (0, import_internal2.normalizeFormSpecTagName)(slot.tagName),
+        declarationKinds: [...slot.declarationKinds].sort(),
+        allowBare: slot.allowBare !== false,
+        qualifiers: (slot.qualifiers ?? []).map((qualifier) => ({
+          qualifier: qualifier.qualifier,
+          ...qualifier.sourceQualifier !== void 0 ? { sourceQualifier: qualifier.sourceQualifier } : {}
+        })).sort((left, right) => left.qualifier.localeCompare(right.qualifier))
+      })) ?? []
     })
   ).join("|");
 }
@@ -2473,7 +2568,8 @@ function parseTSDocTags(node, file = "", options) {
   const rawTextTags = [];
   const sourceFile = node.getSourceFile();
   const sourceText = sourceFile.getFullText();
-  const supportingDeclarations = buildSupportingDeclarations(sourceFile);
+  const extensionTypeNames = getExtensionTypeNames(options?.extensionRegistry);
+  const supportingDeclarations = buildSupportingDeclarations(sourceFile, extensionTypeNames);
   const commentRanges = ts.getLeadingCommentRanges(sourceText, node.getFullStart());
   const rawTextFallbacks = collectRawTextFallbacks(node, file);
   if (commentRanges) {
@@ -2490,7 +2586,7 @@ function parseTSDocTags(node, file = "", options) {
         import_tsdoc.TextRange.fromStringRange(sourceText, range.pos, range.end)
       );
       const docComment = parserContext.docComment;
-      const parsedComment = (0, import_internal.parseCommentBlock)(
+      const parsedComment = (0, import_internal2.parseCommentBlock)(
         commentText,
         sharedCommentSyntaxOptions(options, range.pos)
       );
@@ -2511,7 +2607,7 @@ function parseTSDocTags(node, file = "", options) {
         }
       }
       for (const block of docComment.customBlocks) {
-        const tagName = (0, import_internals3.normalizeConstraintTagName)(block.blockTag.tagName.substring(1));
+        const tagName = (0, import_internals4.normalizeConstraintTagName)(block.blockTag.tagName.substring(1));
         const parsedTag = nextParsedTag(tagName);
         if (tagName === "displayName" || tagName === "format" || tagName === "placeholder") {
           const text2 = getBestBlockPayloadText(parsedTag, commentText, range.pos, block);
@@ -2543,7 +2639,7 @@ function parseTSDocTags(node, file = "", options) {
         }
         if (TAGS_REQUIRING_RAW_TEXT.has(tagName)) continue;
         const text = getBestBlockPayloadText(parsedTag, commentText, range.pos, block);
-        const expectedType = (0, import_internals3.isBuiltinConstraintName)(tagName) ? import_internals3.BUILTIN_CONSTRAINT_DEFINITIONS[tagName] : void 0;
+        const expectedType = (0, import_internals4.isBuiltinConstraintName)(tagName) ? import_internals4.BUILTIN_CONSTRAINT_DEFINITIONS[tagName] : void 0;
         if (text === "" && expectedType !== "boolean") continue;
         const provenance = parsedTag !== null ? provenanceForParsedTag(parsedTag, sourceFile, file) : provenanceForComment(range, sourceFile, file, tagName);
         const compilerDiagnostics = buildCompilerBackedConstraintDiagnostics(
@@ -2559,7 +2655,7 @@ function parseTSDocTags(node, file = "", options) {
           diagnostics.push(...compilerDiagnostics);
           continue;
         }
-        const constraintNode = (0, import_internal.parseConstraintTagValue)(
+        const constraintNode = (0, import_internal2.parseConstraintTagValue)(
           tagName,
           text,
           provenance,
@@ -2629,7 +2725,7 @@ function parseTSDocTags(node, file = "", options) {
       if (text === "") continue;
       const provenance = provenanceForParsedTag(rawTextTag.tag, sourceFile, file);
       if (rawTextTag.tag.normalizedTagName === "defaultValue") {
-        const defaultValueNode = (0, import_internal.parseDefaultValueTagValue)(text, provenance);
+        const defaultValueNode = (0, import_internal2.parseDefaultValueTagValue)(text, provenance);
         annotations.push(defaultValueNode);
         continue;
       }
@@ -2646,7 +2742,7 @@ function parseTSDocTags(node, file = "", options) {
         diagnostics.push(...compilerDiagnostics);
         continue;
       }
-      const constraintNode = (0, import_internal.parseConstraintTagValue)(
+      const constraintNode = (0, import_internal2.parseConstraintTagValue)(
         rawTextTag.tag.normalizedTagName,
         text,
         provenance,
@@ -2663,7 +2759,7 @@ function parseTSDocTags(node, file = "", options) {
       if (text === "") continue;
       const provenance = fallback.provenance;
       if (tagName === "defaultValue") {
-        const defaultValueNode = (0, import_internal.parseDefaultValueTagValue)(text, provenance);
+        const defaultValueNode = (0, import_internal2.parseDefaultValueTagValue)(text, provenance);
         annotations.push(defaultValueNode);
         continue;
       }
@@ -2680,7 +2776,7 @@ function parseTSDocTags(node, file = "", options) {
         diagnostics.push(...compilerDiagnostics);
         continue;
       }
-      const constraintNode = (0, import_internal.parseConstraintTagValue)(
+      const constraintNode = (0, import_internal2.parseConstraintTagValue)(
         tagName,
         text,
         provenance,
@@ -2706,7 +2802,7 @@ function extractDisplayNameMetadata(node) {
       if (range.kind !== ts.SyntaxKind.MultiLineCommentTrivia) continue;
       const commentText = sourceText.substring(range.pos, range.end);
       if (!commentText.startsWith("/**")) continue;
-      const parsed = (0, import_internal.parseCommentBlock)(commentText);
+      const parsed = (0, import_internal2.parseCommentBlock)(commentText);
       for (const tag of parsed.tags) {
         if (tag.normalizedTagName !== "displayName") {
           continue;
@@ -2762,7 +2858,7 @@ function getSharedPayloadText(tag, commentText, commentOffset) {
   if (tag.payloadSpan === null) {
     return "";
   }
-  return (0, import_internal.sliceCommentSpan)(commentText, tag.payloadSpan, {
+  return (0, import_internal2.sliceCommentSpan)(commentText, tag.payloadSpan, {
     offset: commentOffset
   }).trim();
 }
@@ -2774,7 +2870,7 @@ function getBestBlockPayloadText(tag, commentText, commentOffset, block) {
 function collectRawTextFallbacks(node, file) {
   const fallbacks = /* @__PURE__ */ new Map();
   for (const tag of ts.getJSDocTags(node)) {
-    const tagName = (0, import_internals3.normalizeConstraintTagName)(tag.tagName.text);
+    const tagName = (0, import_internals4.normalizeConstraintTagName)(tag.tagName.text);
     if (!TAGS_REQUIRING_RAW_TEXT.has(tagName)) continue;
     const commentText = getTagCommentText(tag)?.trim() ?? "";
     if (commentText === "") continue;
@@ -2788,7 +2884,7 @@ function collectRawTextFallbacks(node, file) {
   return fallbacks;
 }
 function isMemberTargetDisplayName(text) {
-  return (0, import_internal.parseTagSyntax)("displayName", text).target !== null;
+  return (0, import_internal2.parseTagSyntax)("displayName", text).target !== null;
 }
 function provenanceForComment(range, sourceFile, file, tagName) {
   const { line, character } = sourceFile.getLineAndCharacterOfPosition(range.pos);
@@ -2830,15 +2926,15 @@ function getTagCommentText(tag) {
   }
   return ts.getTextOfJSDocComment(tag.comment);
 }
-var ts, import_internal, import_tsdoc, import_internals3, import_internals4, TAGS_REQUIRING_RAW_TEXT, SYNTHETIC_TYPE_FORMAT_FLAGS, parserCache, parseResultCache;
+var ts, import_internal2, import_tsdoc, import_internals4, import_internals5, TAGS_REQUIRING_RAW_TEXT, SYNTHETIC_TYPE_FORMAT_FLAGS, parserCache, parseResultCache;
 var init_tsdoc_parser = __esm({
   "src/analyzer/tsdoc-parser.ts"() {
     "use strict";
     ts = __toESM(require("typescript"), 1);
-    import_internal = require("@formspec/analysis/internal");
+    import_internal2 = require("@formspec/analysis/internal");
     import_tsdoc = require("@microsoft/tsdoc");
-    import_internals3 = require("@formspec/core/internals");
     import_internals4 = require("@formspec/core/internals");
+    import_internals5 = require("@formspec/core/internals");
     TAGS_REQUIRING_RAW_TEXT = /* @__PURE__ */ new Set(["pattern", "enumOptions", "defaultValue"]);
     SYNTHETIC_TYPE_FORMAT_FLAGS = ts.TypeFormatFlags.NoTruncation | ts.TypeFormatFlags.UseAliasDefinedOutsideCurrentScope;
     parserCache = /* @__PURE__ */ new Map();
@@ -2919,76 +3015,50 @@ function makeParseOptions(extensionRegistry, fieldType, checker, subjectType, ho
     ...hostType !== void 0 && { hostType }
   };
 }
-function makeExplicitScalarMetadata(value) {
-  return value === void 0 || value === "" ? void 0 : { value, source: "explicit" };
-}
-function extractExplicitMetadata(node) {
-  let apiName;
-  let displayName;
-  let apiNamePlural;
-  let displayNamePlural;
-  for (const tag of getLeadingParsedTags(node)) {
-    const value = tag.argumentText.trim();
-    if (value === "") {
-      continue;
-    }
-    if (tag.normalizedTagName === "apiName") {
-      if (tag.target === null) {
-        apiName ??= value;
-      } else if (tag.target.kind === "variant") {
-        if (tag.target.rawText === "singular") {
-          apiName ??= value;
-        } else if (tag.target.rawText === "plural") {
-          apiNamePlural ??= value;
-        }
-      }
-      continue;
-    }
-    if (tag.normalizedTagName === "displayName") {
-      if (tag.target === null) {
-        displayName ??= value;
-      } else if (tag.target.kind === "variant") {
-        if (tag.target.rawText === "singular") {
-          displayName ??= value;
-        } else if (tag.target.rawText === "plural") {
-          displayNamePlural ??= value;
-        }
-      }
-    }
-  }
-  const resolvedApiName = makeExplicitScalarMetadata(apiName);
-  const resolvedDisplayName = makeExplicitScalarMetadata(displayName);
-  const resolvedApiNamePlural = makeExplicitScalarMetadata(apiNamePlural);
-  const resolvedDisplayNamePlural = makeExplicitScalarMetadata(displayNamePlural);
-  const metadata = {
-    ...resolvedApiName !== void 0 && { apiName: resolvedApiName },
-    ...resolvedDisplayName !== void 0 && { displayName: resolvedDisplayName },
-    ...resolvedApiNamePlural !== void 0 && { apiNamePlural: resolvedApiNamePlural },
-    ...resolvedDisplayNamePlural !== void 0 && {
-      displayNamePlural: resolvedDisplayNamePlural
-    }
+function createAnalyzerMetadataPolicy(input) {
+  return {
+    raw: input,
+    normalized: normalizeMetadataPolicy(input)
   };
-  return Object.keys(metadata).length === 0 ? void 0 : metadata;
 }
-function resolveNodeMetadata(metadataPolicy, declarationKind, logicalName, node, buildContext) {
-  const explicit = extractExplicitMetadata(node);
-  return resolveMetadata(
-    {
-      ...explicit?.apiName !== void 0 && { apiName: explicit.apiName.value },
-      ...explicit?.displayName !== void 0 && { displayName: explicit.displayName.value },
-      ...explicit?.apiNamePlural !== void 0 && {
-        apiNamePlural: explicit.apiNamePlural.value
-      },
-      ...explicit?.displayNamePlural !== void 0 && {
-        displayNamePlural: explicit.displayNamePlural.value
-      }
-    },
-    getDeclarationMetadataPolicy(metadataPolicy, declarationKind),
-    makeMetadataContext("tsdoc", declarationKind, logicalName, buildContext)
+function resolveNodeMetadata(metadataPolicy, declarationKind, logicalName, node, checker, extensionRegistry, buildContext) {
+  const analysis = (0, import_internal3.analyzeMetadataForNodeWithChecker)({
+    checker,
+    node,
+    logicalName,
+    metadata: metadataPolicy.raw,
+    extensions: extensionRegistry?.extensions,
+    ...buildContext !== void 0 && { buildContext }
+  });
+  const resolvedMetadata = analysis?.resolvedMetadata;
+  const declarationPolicy = getDeclarationMetadataPolicy(
+    metadataPolicy.normalized,
+    declarationKind
   );
+  if (resolvedMetadata?.apiName === void 0 && declarationPolicy.apiName.mode === "require-explicit") {
+    throw new Error(
+      `Metadata policy requires explicit apiName for ${declarationKind} "${logicalName}" on the tsdoc surface.`
+    );
+  }
+  if (resolvedMetadata?.displayName === void 0 && declarationPolicy.displayName.mode === "require-explicit") {
+    throw new Error(
+      `Metadata policy requires explicit displayName for ${declarationKind} "${logicalName}" on the tsdoc surface.`
+    );
+  }
+  if (resolvedMetadata?.apiNamePlural === void 0 && declarationPolicy.apiName.pluralization.mode === "require-explicit") {
+    throw new Error(
+      `Metadata policy requires explicit apiNamePlural for ${declarationKind} "${logicalName}" on the tsdoc surface.`
+    );
+  }
+  if (resolvedMetadata?.displayNamePlural === void 0 && declarationPolicy.displayName.pluralization.mode === "require-explicit") {
+    throw new Error(
+      `Metadata policy requires explicit displayNamePlural for ${declarationKind} "${logicalName}" on the tsdoc surface.`
+    );
+  }
+  return resolvedMetadata;
 }
 function analyzeDeclarationRootInfo(declaration, checker, file = "", extensionRegistry, metadataPolicy) {
-  const normalizedMetadataPolicy = normalizeMetadataPolicy(metadataPolicy);
+  const normalizedMetadataPolicy = createAnalyzerMetadataPolicy(metadataPolicy);
   const declarationType = checker.getTypeAtLocation(declaration);
   const logicalName = ts3.isClassDeclaration(declaration) ? declaration.name?.text ?? "AnonymousClass" : declaration.name.text;
   const docResult = extractJSDocParseResult(
@@ -2996,12 +3066,20 @@ function analyzeDeclarationRootInfo(declaration, checker, file = "", extensionRe
     file,
     makeParseOptions(extensionRegistry, void 0, checker, declarationType, declarationType)
   );
-  const metadata = resolveNodeMetadata(normalizedMetadataPolicy, "type", logicalName, declaration, {
-    checker,
+  const metadata = resolveNodeMetadata(
+    normalizedMetadataPolicy,
+    "type",
+    logicalName,
     declaration,
-    subjectType: declarationType,
-    hostType: declarationType
-  });
+    checker,
+    extensionRegistry,
+    {
+      checker,
+      declaration,
+      subjectType: declarationType,
+      hostType: declarationType
+    }
+  );
   return {
     ...metadata !== void 0 && { metadata },
     annotations: docResult.annotations,
@@ -3009,7 +3087,7 @@ function analyzeDeclarationRootInfo(declaration, checker, file = "", extensionRe
   };
 }
 function analyzeClassToIR(classDecl, checker, file = "", extensionRegistry, metadataPolicy) {
-  const normalizedMetadataPolicy = normalizeMetadataPolicy(metadataPolicy);
+  const normalizedMetadataPolicy = createAnalyzerMetadataPolicy(metadataPolicy);
   const name = classDecl.name?.text ?? "AnonymousClass";
   const fields = [];
   const fieldLayouts = [];
@@ -3064,12 +3142,20 @@ function analyzeClassToIR(classDecl, checker, file = "", extensionRegistry, meta
     diagnostics,
     normalizedMetadataPolicy
   );
-  const metadata = resolveNodeMetadata(normalizedMetadataPolicy, "type", name, classDecl, {
+  const metadata = resolveNodeMetadata(
+    normalizedMetadataPolicy,
+    "type",
+    name,
+    classDecl,
     checker,
-    declaration: classDecl,
-    subjectType: classType,
-    hostType: classType
-  });
+    extensionRegistry,
+    {
+      checker,
+      declaration: classDecl,
+      subjectType: classType,
+      hostType: classType
+    }
+  );
   return {
     name,
     ...metadata !== void 0 && { metadata },
@@ -3083,7 +3169,7 @@ function analyzeClassToIR(classDecl, checker, file = "", extensionRegistry, meta
   };
 }
 function analyzeInterfaceToIR(interfaceDecl, checker, file = "", extensionRegistry, metadataPolicy) {
-  const normalizedMetadataPolicy = normalizeMetadataPolicy(metadataPolicy);
+  const normalizedMetadataPolicy = createAnalyzerMetadataPolicy(metadataPolicy);
   const name = interfaceDecl.name.text;
   const fields = [];
   const typeRegistry = {};
@@ -3125,12 +3211,20 @@ function analyzeInterfaceToIR(interfaceDecl, checker, file = "", extensionRegist
     normalizedMetadataPolicy
   );
   const fieldLayouts = specializedFields.map(() => ({}));
-  const metadata = resolveNodeMetadata(normalizedMetadataPolicy, "type", name, interfaceDecl, {
+  const metadata = resolveNodeMetadata(
+    normalizedMetadataPolicy,
+    "type",
+    name,
+    interfaceDecl,
     checker,
-    declaration: interfaceDecl,
-    subjectType: interfaceType,
-    hostType: interfaceType
-  });
+    extensionRegistry,
+    {
+      checker,
+      declaration: interfaceDecl,
+      subjectType: interfaceType,
+      hostType: interfaceType
+    }
+  );
   return {
     name,
     ...metadata !== void 0 && { metadata },
@@ -3154,7 +3248,7 @@ function analyzeTypeAliasToIR(typeAlias, checker, file = "", extensionRegistry,
     };
   }
   const typeLiteral = typeAlias.type;
-  const normalizedMetadataPolicy = normalizeMetadataPolicy(metadataPolicy);
+  const normalizedMetadataPolicy = createAnalyzerMetadataPolicy(metadataPolicy);
   const name = typeAlias.name.text;
   const fields = [];
   const typeRegistry = {};
@@ -3195,12 +3289,20 @@ function analyzeTypeAliasToIR(typeAlias, checker, file = "", extensionRegistry,
     diagnostics,
     normalizedMetadataPolicy
   );
-  const metadata = resolveNodeMetadata(normalizedMetadataPolicy, "type", name, typeAlias, {
+  const metadata = resolveNodeMetadata(
+    normalizedMetadataPolicy,
+    "type",
+    name,
+    typeAlias,
     checker,
-    declaration: typeAlias,
-    subjectType: aliasType,
-    hostType: aliasType
-  });
+    extensionRegistry,
+    {
+      checker,
+      declaration: typeAlias,
+      subjectType: aliasType,
+      hostType: aliasType
+    }
+  );
   return {
     ok: true,
     analysis: {
@@ -3241,7 +3343,7 @@ function getLeadingParsedTags(node) {
     if (!commentText.startsWith("/**")) {
       continue;
     }
-    parsedTags.push(...(0, import_internal2.parseCommentBlock)(commentText, { offset: range.pos }).tags);
+    parsedTags.push(...(0, import_internal3.parseCommentBlock)(commentText, { offset: range.pos }).tags);
   }
   return parsedTags;
 }
@@ -3453,6 +3555,8 @@ function resolveDiscriminatorApiName(boundType, checker, metadataPolicy) {
     "type",
     getDiscriminatorLogicalName(boundType, declaration, checker),
     declaration,
+    checker,
+    void 0,
     {
       checker,
       declaration,
@@ -3689,12 +3793,20 @@ function analyzeFieldToIR(prop, checker, file, typeRegistry, visiting, diagnosti
     annotations.push(defaultAnnotation);
   }
   ({ type, annotations } = applyEnumMemberDisplayNames(type, annotations));
-  const metadata = resolveNodeMetadata(metadataPolicy, "field", name, prop, {
+  const metadata = resolveNodeMetadata(
+    metadataPolicy,
+    "field",
+    name,
+    prop,
     checker,
-    declaration: prop,
-    subjectType: tsType,
-    hostType
-  });
+    extensionRegistry,
+    {
+      checker,
+      declaration: prop,
+      subjectType: tsType,
+      hostType
+    }
+  );
   return {
     kind: "field",
     name,
@@ -3741,12 +3853,20 @@ function analyzeInterfacePropertyToIR(prop, checker, file, typeRegistry, visitin
   let annotations = [];
   annotations.push(...docResult.annotations);
   ({ type, annotations } = applyEnumMemberDisplayNames(type, annotations));
-  const metadata = resolveNodeMetadata(metadataPolicy, "field", name, prop, {
+  const metadata = resolveNodeMetadata(
+    metadataPolicy,
+    "field",
+    name,
+    prop,
     checker,
-    declaration: prop,
-    subjectType: tsType,
-    hostType
-  });
+    extensionRegistry,
+    {
+      checker,
+      declaration: prop,
+      subjectType: tsType,
+      hostType
+    }
+  );
   return {
     kind: "field",
     name,
@@ -3875,7 +3995,7 @@ function getTypeNodeRegistrationName(typeNode) {
   }
   return null;
 }
-function resolveTypeNode(type, checker, file, typeRegistry, visiting, sourceNode, metadataPolicy = normalizeMetadataPolicy(void 0), extensionRegistry, diagnostics) {
+function resolveTypeNode(type, checker, file, typeRegistry, visiting, sourceNode, metadataPolicy = createAnalyzerMetadataPolicy(void 0), extensionRegistry, diagnostics) {
   const customType = resolveRegisteredCustomType(sourceNode, extensionRegistry, checker);
   if (customType) {
     return customType;
@@ -3965,7 +4085,7 @@ function resolveTypeNode(type, checker, file, typeRegistry, visiting, sourceNode
   }
   return { kind: "primitive", primitiveKind: "string" };
 }
-function tryResolveNamedPrimitiveAlias(type, checker, file, typeRegistry, visiting, sourceNode, metadataPolicy = normalizeMetadataPolicy(void 0), extensionRegistry, diagnostics) {
+function tryResolveNamedPrimitiveAlias(type, checker, file, typeRegistry, visiting, sourceNode, metadataPolicy = createAnalyzerMetadataPolicy(void 0), extensionRegistry, diagnostics) {
   if (!(type.flags & (ts3.TypeFlags.String | ts3.TypeFlags.Number | ts3.TypeFlags.BigInt | ts3.TypeFlags.BigIntLiteral | ts3.TypeFlags.Boolean | ts3.TypeFlags.Null))) {
     return null;
   }
@@ -3985,11 +4105,19 @@ function tryResolveNamedPrimitiveAlias(type, checker, file, typeRegistry, visiti
       file,
       makeParseOptions(extensionRegistry)
     );
-    const metadata = resolveNodeMetadata(metadataPolicy, "type", aliasName, aliasDecl, {
+    const metadata = resolveNodeMetadata(
+      metadataPolicy,
+      "type",
+      aliasName,
+      aliasDecl,
       checker,
-      declaration: aliasDecl,
-      subjectType: aliasType
-    });
+      extensionRegistry,
+      {
+        checker,
+        declaration: aliasDecl,
+        subjectType: aliasType
+      }
+    );
     typeRegistry[aliasName] = {
       name: aliasName,
       ...metadata !== void 0 && { metadata },
@@ -4028,7 +4156,7 @@ function shouldEmitPrimitiveAliasDefinition(typeNode, checker) {
   const resolved = checker.getTypeFromTypeNode(aliasDecl.type);
   return !!(resolved.flags & (ts3.TypeFlags.String | ts3.TypeFlags.Number | ts3.TypeFlags.BigInt | ts3.TypeFlags.BigIntLiteral | ts3.TypeFlags.Boolean | ts3.TypeFlags.Null));
 }
-function resolveAliasedPrimitiveTarget(type, checker, file, typeRegistry, visiting, metadataPolicy = normalizeMetadataPolicy(void 0), extensionRegistry, diagnostics) {
+function resolveAliasedPrimitiveTarget(type, checker, file, typeRegistry, visiting, metadataPolicy = createAnalyzerMetadataPolicy(void 0), extensionRegistry, diagnostics) {
   const nestedAliasDecl = type.aliasSymbol?.declarations?.find(ts3.isTypeAliasDeclaration);
   if (nestedAliasDecl !== void 0) {
     return resolveAliasedPrimitiveTarget(
@@ -4054,7 +4182,7 @@ function resolveAliasedPrimitiveTarget(type, checker, file, typeRegistry, visiti
     diagnostics
   );
 }
-function resolveUnionType(type, checker, file, typeRegistry, visiting, sourceNode, metadataPolicy = normalizeMetadataPolicy(void 0), extensionRegistry, diagnostics) {
+function resolveUnionType(type, checker, file, typeRegistry, visiting, sourceNode, metadataPolicy = createAnalyzerMetadataPolicy(void 0), extensionRegistry, diagnostics) {
   const typeName = getNamedTypeName(type);
   const namedDecl = getNamedTypeDeclaration(type);
   if (typeName && typeName in typeRegistry) {
@@ -4089,11 +4217,19 @@ function resolveUnionType(type, checker, file, typeRegistry, visiting, sourceNod
       return result;
     }
     const annotations = namedDecl ? extractJSDocAnnotationNodes(namedDecl, file, makeParseOptions(extensionRegistry)) : void 0;
-    const metadata = namedDecl !== void 0 ? resolveNodeMetadata(metadataPolicy, "type", typeName, namedDecl, {
+    const metadata = namedDecl !== void 0 ? resolveNodeMetadata(
+      metadataPolicy,
+      "type",
+      typeName,
+      namedDecl,
       checker,
-      declaration: namedDecl,
-      subjectType: type
-    }) : void 0;
+      extensionRegistry,
+      {
+        checker,
+        declaration: namedDecl,
+        subjectType: type
+      }
+    ) : void 0;
     typeRegistry[typeName] = {
       name: typeName,
       ...metadata !== void 0 && { metadata },
@@ -4178,7 +4314,7 @@ function resolveUnionType(type, checker, file, typeRegistry, visiting, sourceNod
   }
   return registerNamed({ kind: "union", members });
 }
-function resolveArrayType(type, checker, file, typeRegistry, visiting, sourceNode, metadataPolicy = normalizeMetadataPolicy(void 0), extensionRegistry, diagnostics) {
+function resolveArrayType(type, checker, file, typeRegistry, visiting, sourceNode, metadataPolicy = createAnalyzerMetadataPolicy(void 0), extensionRegistry, diagnostics) {
   const typeArgs = isTypeReference(type) ? type.typeArguments : void 0;
   const elementType = typeArgs?.[0];
   const elementSourceNode = extractArrayElementTypeNode(sourceNode, checker);
@@ -4195,7 +4331,7 @@ function resolveArrayType(type, checker, file, typeRegistry, visiting, sourceNod
   ) : { kind: "primitive", primitiveKind: "string" };
   return { kind: "array", items };
 }
-function tryResolveRecordType(type, checker, file, typeRegistry, visiting, metadataPolicy = normalizeMetadataPolicy(void 0), extensionRegistry, diagnostics) {
+function tryResolveRecordType(type, checker, file, typeRegistry, visiting, metadataPolicy = createAnalyzerMetadataPolicy(void 0), extensionRegistry, diagnostics) {
   if (type.getProperties().length > 0) {
     return null;
   }
@@ -4256,7 +4392,7 @@ function shouldEmitResolvedObjectProperty(property, declaration) {
   }
   return true;
 }
-function resolveObjectType(type, checker, file, typeRegistry, visiting, sourceNode, metadataPolicy = normalizeMetadataPolicy(void 0), extensionRegistry, diagnostics) {
+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;
@@ -4332,11 +4468,19 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting, sourceNo
         return recordNode;
       }
       const annotations = namedDecl ? extractJSDocAnnotationNodes(namedDecl, file, makeParseOptions(extensionRegistry)) : void 0;
-      const metadata = namedDecl !== void 0 ? resolveNodeMetadata(metadataPolicy, "type", registryTypeName, namedDecl, {
+      const metadata = namedDecl !== void 0 ? resolveNodeMetadata(
+        metadataPolicy,
+        "type",
+        registryTypeName,
+        namedDecl,
         checker,
-        declaration: namedDecl,
-        subjectType: type
-      }) : void 0;
+        extensionRegistry,
+        {
+          checker,
+          declaration: namedDecl,
+          subjectType: type
+        }
+      ) : void 0;
       typeRegistry[registryTypeName] = {
         name: registryTypeName,
         ...metadata !== void 0 && { metadata },
@@ -4432,11 +4576,19 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting, sourceNo
   };
   if (registryTypeName !== void 0 && shouldRegisterNamedType) {
     const annotations = namedDecl ? extractJSDocAnnotationNodes(namedDecl, file, makeParseOptions(extensionRegistry)) : void 0;
-    const metadata = namedDecl !== void 0 ? resolveNodeMetadata(metadataPolicy, "type", registryTypeName, namedDecl, {
+    const metadata = namedDecl !== void 0 ? resolveNodeMetadata(
+      metadataPolicy,
+      "type",
+      registryTypeName,
+      namedDecl,
       checker,
-      declaration: namedDecl,
-      subjectType: type
-    }) : void 0;
+      extensionRegistry,
+      {
+        checker,
+        declaration: namedDecl,
+        subjectType: type
+      }
+    ) : void 0;
     typeRegistry[registryTypeName] = {
       name: registryTypeName,
       ...metadata !== void 0 && { metadata },
@@ -4713,12 +4865,12 @@ function detectFormSpecReference(typeNode) {
   }
   return null;
 }
-var ts3, import_internal2, RESOLVING_TYPE_PLACEHOLDER, MAX_ALIAS_CHAIN_DEPTH;
+var ts3, import_internal3, RESOLVING_TYPE_PLACEHOLDER, MAX_ALIAS_CHAIN_DEPTH;
 var init_class_analyzer = __esm({
   "src/analyzer/class-analyzer.ts"() {
     "use strict";
     ts3 = __toESM(require("typescript"), 1);
-    import_internal2 = require("@formspec/analysis/internal");
+    import_internal3 = require("@formspec/analysis/internal");
     init_jsdoc_constraints();
     init_tsdoc_parser();
     init_metadata();
@@ -4874,7 +5026,7 @@ var init_program = __esm({
 
 // src/validate/constraint-validator.ts
 function validateFieldNode(ctx, field) {
-  const analysis = (0, import_internal3.analyzeConstraintTargets)(
+  const analysis = (0, import_internal4.analyzeConstraintTargets)(
     field.name,
     field.type,
     field.constraints,
@@ -4892,7 +5044,7 @@ function validateFieldNode(ctx, field) {
 }
 function validateObjectProperty(ctx, parentName, property) {
   const qualifiedName = `${parentName}.${property.name}`;
-  const analysis = (0, import_internal3.analyzeConstraintTargets)(
+  const analysis = (0, import_internal4.analyzeConstraintTargets)(
     qualifiedName,
     property.type,
     property.constraints,
@@ -4943,11 +5095,11 @@ function validateIR(ir, options) {
     valid: ctx.diagnostics.every((diagnostic) => diagnostic.severity !== "error")
   };
 }
-var import_internal3;
+var import_internal4;
 var init_constraint_validator = __esm({
   "src/validate/constraint-validator.ts"() {
     "use strict";
-    import_internal3 = require("@formspec/analysis/internal");
+    import_internal4 = require("@formspec/analysis/internal");
   }
 });
 
@@ -5213,7 +5365,7 @@ function toStandaloneJsonSchema(root, typeRegistry, options) {
     {
       kind: "form-ir",
       name: root.name,
-      irVersion: import_internals5.IR_VERSION,
+      irVersion: import_internals6.IR_VERSION,
       elements: [syntheticField],
       ...root.metadata !== void 0 && { metadata: root.metadata },
       ...root.annotations !== void 0 && root.annotations.length > 0 && { rootAnnotations: root.annotations },
@@ -5272,7 +5424,7 @@ function generateSchemasFromResolvedType(options, skipNamedDeclaration = false,
     typeRegistry,
     /* @__PURE__ */ new Set(),
     options.sourceNode,
-    normalizeMetadataPolicy(options.metadata),
+    createAnalyzerMetadataPolicy(options.metadata),
     options.extensionRegistry,
     diagnostics
   );
@@ -5404,7 +5556,7 @@ function generateSchemasFromReturnType(options) {
     name: fallbackName
   });
 }
-var ts7, import_internals5;
+var ts7, import_internals6;
 var init_discovered_schema = __esm({
   "src/generators/discovered-schema.ts"() {
     "use strict";
@@ -5412,7 +5564,7 @@ var init_discovered_schema = __esm({
     init_class_analyzer();
     init_class_schema();
     init_ir_generator();
-    import_internals5 = require("@formspec/core/internals");
+    import_internals6 = require("@formspec/core/internals");
     init_metadata();
   }
 });