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

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();
@@ -2904,6 +3000,9 @@ var init_jsdoc_constraints = __esm({
 function isObjectType(type) {
   return !!(type.flags & ts3.TypeFlags.Object);
 }
+function isIntersectionType(type) {
+  return !!(type.flags & ts3.TypeFlags.Intersection);
+}
 function isTypeReference(type) {
   return !!(type.flags & ts3.TypeFlags.Object) && !!(type.objectFlags & ts3.ObjectFlags.Reference);
 }
@@ -2919,76 +3018,51 @@ 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, discriminator) {
+  return {
+    raw: input,
+    normalized: normalizeMetadataPolicy(input),
+    discriminator
   };
-  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,20 +3070,31 @@ 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,
     diagnostics: docResult.diagnostics
   };
 }
-function analyzeClassToIR(classDecl, checker, file = "", extensionRegistry, metadataPolicy) {
-  const normalizedMetadataPolicy = normalizeMetadataPolicy(metadataPolicy);
+function analyzeClassToIR(classDecl, checker, file = "", extensionRegistry, metadataPolicy, discriminatorOptions) {
+  const normalizedMetadataPolicy = createAnalyzerMetadataPolicy(
+    metadataPolicy,
+    discriminatorOptions
+  );
   const name = classDecl.name?.text ?? "AnonymousClass";
   const fields = [];
   const fieldLayouts = [];
@@ -3064,12 +3149,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 },
@@ -3082,8 +3175,11 @@ function analyzeClassToIR(classDecl, checker, file = "", extensionRegistry, meta
     staticMethods
   };
 }
-function analyzeInterfaceToIR(interfaceDecl, checker, file = "", extensionRegistry, metadataPolicy) {
-  const normalizedMetadataPolicy = normalizeMetadataPolicy(metadataPolicy);
+function analyzeInterfaceToIR(interfaceDecl, checker, file = "", extensionRegistry, metadataPolicy, discriminatorOptions) {
+  const normalizedMetadataPolicy = createAnalyzerMetadataPolicy(
+    metadataPolicy,
+    discriminatorOptions
+  );
   const name = interfaceDecl.name.text;
   const fields = [];
   const typeRegistry = {};
@@ -3125,12 +3221,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 },
@@ -3143,19 +3247,31 @@ function analyzeInterfaceToIR(interfaceDecl, checker, file = "", extensionRegist
     staticMethods: []
   };
 }
-function analyzeTypeAliasToIR(typeAlias, checker, file = "", extensionRegistry, metadataPolicy) {
-  if (!ts3.isTypeLiteralNode(typeAlias.type)) {
+function analyzeTypeAliasToIR(typeAlias, checker, file = "", extensionRegistry, metadataPolicy, discriminatorOptions) {
+  const members = getObjectLikeTypeAliasMembers(typeAlias.type);
+  if (members === null) {
     const sourceFile = typeAlias.getSourceFile();
     const { line } = sourceFile.getLineAndCharacterOfPosition(typeAlias.getStart());
     const kindDesc = ts3.SyntaxKind[typeAlias.type.kind] ?? "unknown";
     return {
       ok: false,
-      error: `Type alias "${typeAlias.name.text}" at line ${String(line + 1)} is not an object type literal (found ${kindDesc})`
+      error: `Type alias "${typeAlias.name.text}" at line ${String(line + 1)} is not an object-like type alias (found ${kindDesc})`
     };
   }
-  const typeLiteral = typeAlias.type;
-  const normalizedMetadataPolicy = normalizeMetadataPolicy(metadataPolicy);
+  const normalizedMetadataPolicy = createAnalyzerMetadataPolicy(
+    metadataPolicy,
+    discriminatorOptions
+  );
   const name = typeAlias.name.text;
+  const duplicatePropertyNames = findDuplicateObjectLikeTypeAliasPropertyNames(members);
+  if (duplicatePropertyNames.length > 0) {
+    const sourceFile = typeAlias.getSourceFile();
+    const { line } = sourceFile.getLineAndCharacterOfPosition(typeAlias.getStart());
+    return {
+      ok: false,
+      error: `Type alias "${name}" at line ${String(line + 1)} contains duplicate property names across object-like members: ${duplicatePropertyNames.join(", ")}`
+    };
+  }
   const fields = [];
   const typeRegistry = {};
   const diagnostics = [];
@@ -3168,7 +3284,7 @@ function analyzeTypeAliasToIR(typeAlias, checker, file = "", extensionRegistry,
   const annotations = [...typeAliasDoc.annotations];
   diagnostics.push(...typeAliasDoc.diagnostics);
   const visiting = /* @__PURE__ */ new Set();
-  for (const member of typeLiteral.members) {
+  for (const member of members) {
     if (ts3.isPropertySignature(member)) {
       const fieldNode = analyzeInterfacePropertyToIR(
         member,
@@ -3195,12 +3311,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 +3365,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;
 }
@@ -3269,15 +3393,43 @@ function isNullishSemanticType(type) {
   }
   return type.isUnion() && type.types.some((member) => isNullishSemanticType(member));
 }
-function isStringLikeSemanticType(type) {
+function isStringLikeSemanticType(type, checker, seen = /* @__PURE__ */ new Set()) {
+  if (seen.has(type)) {
+    return false;
+  }
+  seen.add(type);
   if (type.flags & ts3.TypeFlags.StringLike) {
     return true;
   }
   if (type.isUnion()) {
-    return type.types.length > 0 && type.types.every((member) => isStringLikeSemanticType(member));
+    return type.types.length > 0 && type.types.every((member) => isStringLikeSemanticType(member, checker, seen));
+  }
+  const baseConstraint = checker.getBaseConstraintOfType(type);
+  if (baseConstraint !== void 0 && baseConstraint !== type) {
+    return isStringLikeSemanticType(baseConstraint, checker, seen);
   }
   return false;
 }
+function getObjectLikeTypeAliasMembers(typeNode) {
+  if (ts3.isParenthesizedTypeNode(typeNode)) {
+    return getObjectLikeTypeAliasMembers(typeNode.type);
+  }
+  if (ts3.isTypeLiteralNode(typeNode)) {
+    return [...typeNode.members];
+  }
+  if (ts3.isIntersectionTypeNode(typeNode)) {
+    const members = [];
+    for (const intersectionMember of typeNode.types) {
+      const resolvedMembers = getObjectLikeTypeAliasMembers(intersectionMember);
+      if (resolvedMembers === null) {
+        return null;
+      }
+      members.push(...resolvedMembers);
+    }
+    return members;
+  }
+  return null;
+}
 function extractDiscriminatorDirective(node, file, diagnostics) {
   const discriminatorTags = getLeadingParsedTags(node).filter(
     (tag) => tag.normalizedTagName === "discriminator"
@@ -3384,7 +3536,7 @@ function validateDiscriminatorDirective(node, checker, file, diagnostics) {
     );
     return null;
   }
-  if (!isStringLikeSemanticType(property.type)) {
+  if (!isStringLikeSemanticType(property.type, checker)) {
     diagnostics.push(
       makeAnalysisDiagnostic(
         "TYPE_MISMATCH",
@@ -3411,8 +3563,8 @@ function getConcreteTypeArgumentForDiscriminator(node, subjectType, checker, typ
   const localTypeParameter = node.typeParameters?.[typeParameterIndex];
   return localTypeParameter === void 0 ? null : checker.getTypeAtLocation(localTypeParameter);
 }
-function resolveLiteralDiscriminatorPropertyValue(boundType, fieldName, checker, provenance, diagnostics) {
-  const propertySymbol = boundType.getProperty(fieldName);
+function resolveLiteralDiscriminatorPropertyValue(boundType, propertyName, checker, provenance, diagnostics) {
+  const propertySymbol = boundType.getProperty(propertyName);
   if (propertySymbol === void 0) {
     return void 0;
   }
@@ -3443,6 +3595,9 @@ function resolveLiteralDiscriminatorPropertyValue(boundType, fieldName, checker,
   }
   return void 0;
 }
+function getDiscriminatorIdentityPropertyNames(fieldName) {
+  return fieldName === "object" ? ["object"] : [fieldName, "object"];
+}
 function resolveDiscriminatorApiName(boundType, checker, metadataPolicy) {
   const declaration = resolveNamedDiscriminatorDeclaration(boundType, checker);
   if (declaration === null) {
@@ -3453,6 +3608,8 @@ function resolveDiscriminatorApiName(boundType, checker, metadataPolicy) {
     "type",
     getDiscriminatorLogicalName(boundType, declaration, checker),
     declaration,
+    checker,
+    void 0,
     {
       checker,
       declaration,
@@ -3461,6 +3618,10 @@ function resolveDiscriminatorApiName(boundType, checker, metadataPolicy) {
   );
   return metadata?.apiName;
 }
+function applyDiscriminatorApiNamePrefix(value, discriminatorOptions) {
+  const prefix = discriminatorOptions?.apiNamePrefix;
+  return prefix === void 0 || prefix === "" ? value : `${prefix}${value}`;
+}
 function resolveNamedDiscriminatorDeclaration(type, checker, seen = /* @__PURE__ */ new Set()) {
   if (seen.has(type)) {
     return null;
@@ -3515,22 +3676,27 @@ function resolveDiscriminatorValue(boundType, fieldName, checker, provenance, di
       return null;
     }
   }
-  const literalIdentityValue = resolveLiteralDiscriminatorPropertyValue(
-    boundType,
-    fieldName,
-    checker,
-    provenance,
-    diagnostics
-  );
-  if (literalIdentityValue !== void 0) {
-    return literalIdentityValue;
+  for (const identityPropertyName of getDiscriminatorIdentityPropertyNames(fieldName)) {
+    const literalIdentityValue = resolveLiteralDiscriminatorPropertyValue(
+      boundType,
+      identityPropertyName,
+      checker,
+      provenance,
+      diagnostics
+    );
+    if (literalIdentityValue === null) {
+      return null;
+    }
+    if (literalIdentityValue !== void 0) {
+      return literalIdentityValue;
+    }
   }
   const apiName = resolveDiscriminatorApiName(boundType, checker, metadataPolicy);
   if (apiName?.source === "explicit") {
-    return apiName.value;
+    return applyDiscriminatorApiNamePrefix(apiName.value, metadataPolicy.discriminator);
   }
   if (apiName?.source === "inferred") {
-    return apiName.value;
+    return applyDiscriminatorApiNamePrefix(apiName.value, metadataPolicy.discriminator);
   }
   diagnostics.push(
     makeAnalysisDiagnostic(
@@ -3593,15 +3759,20 @@ function buildInstantiatedReferenceName(baseName, typeArguments, checker) {
   return renderedArguments.length === 0 ? baseName : `${baseName}__${renderedArguments.join("__")}`;
 }
 function extractReferenceTypeArguments(type, checker, file, typeRegistry, visiting, sourceNode, metadataPolicy, extensionRegistry, diagnostics) {
-  const typeNode = sourceNode === void 0 ? void 0 : extractTypeNodeFromSource(sourceNode);
-  if (typeNode === void 0) {
+  const sourceTypeNode = sourceNode === void 0 ? void 0 : extractTypeNodeFromSource(sourceNode);
+  if (sourceTypeNode === void 0) {
     return [];
   }
-  const resolvedTypeNode = resolveAliasedTypeNode(typeNode, checker);
-  if (!ts3.isTypeReferenceNode(resolvedTypeNode) || resolvedTypeNode.typeArguments === void 0) {
+  const unwrapParentheses = (typeNode) => ts3.isParenthesizedTypeNode(typeNode) ? unwrapParentheses(typeNode.type) : typeNode;
+  const directTypeNode = unwrapParentheses(sourceTypeNode);
+  const referenceTypeNode = ts3.isTypeReferenceNode(directTypeNode) ? directTypeNode : (() => {
+    const resolvedTypeNode = resolveAliasedTypeNode(directTypeNode, checker);
+    return ts3.isTypeReferenceNode(resolvedTypeNode) ? resolvedTypeNode : null;
+  })();
+  if (referenceTypeNode?.typeArguments === void 0) {
     return [];
   }
-  return resolvedTypeNode.typeArguments.map((argumentNode) => {
+  return referenceTypeNode.typeArguments.map((argumentNode) => {
     const argumentType = checker.getTypeFromTypeNode(argumentNode);
     return {
       tsType: argumentType,
@@ -3689,12 +3860,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,
@@ -3707,10 +3886,10 @@ function analyzeFieldToIR(prop, checker, file, typeRegistry, visiting, diagnosti
   };
 }
 function analyzeInterfacePropertyToIR(prop, checker, file, typeRegistry, visiting, diagnostics, hostType, metadataPolicy, extensionRegistry) {
-  if (!ts3.isIdentifier(prop.name)) {
+  const name = getAnalyzableObjectLikePropertyName(prop.name);
+  if (name === null) {
     return null;
   }
-  const name = prop.name.text;
   const tsType = checker.getTypeAtLocation(prop);
   const optional = prop.questionToken !== void 0;
   const provenance = provenanceForNode(prop, file);
@@ -3741,12 +3920,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,
@@ -3758,6 +3945,31 @@ function analyzeInterfacePropertyToIR(prop, checker, file, typeRegistry, visitin
     provenance
   };
 }
+function findDuplicateObjectLikeTypeAliasPropertyNames(members) {
+  const seen = /* @__PURE__ */ new Set();
+  const duplicates = /* @__PURE__ */ new Set();
+  for (const member of members) {
+    if (!ts3.isPropertySignature(member)) {
+      continue;
+    }
+    const name = getAnalyzableObjectLikePropertyName(member.name);
+    if (name === null) {
+      continue;
+    }
+    if (seen.has(name)) {
+      duplicates.add(name);
+      continue;
+    }
+    seen.add(name);
+  }
+  return [...duplicates].sort();
+}
+function getAnalyzableObjectLikePropertyName(name) {
+  if (!ts3.isIdentifier(name)) {
+    return null;
+  }
+  return name.text;
+}
 function applyEnumMemberDisplayNames(type, annotations) {
   if (!annotations.some(
     (annotation) => annotation.annotationKind === "displayName" && annotation.value.trim().startsWith(":")
@@ -3875,7 +4087,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;
@@ -3950,6 +4162,23 @@ function resolveTypeNode(type, checker, file, typeRegistry, visiting, sourceNode
       diagnostics
     );
   }
+  if (isIntersectionType(type)) {
+    const sourceTypeNode = sourceNode === void 0 ? void 0 : extractTypeNodeFromSource(sourceNode);
+    const resolvedSourceTypeNode = sourceTypeNode === void 0 ? void 0 : resolveAliasedTypeNode(sourceTypeNode, checker);
+    if (resolvedSourceTypeNode !== void 0 && getObjectLikeTypeAliasMembers(resolvedSourceTypeNode) !== null) {
+      return resolveObjectType(
+        type,
+        checker,
+        file,
+        typeRegistry,
+        visiting,
+        sourceNode,
+        metadataPolicy,
+        extensionRegistry,
+        diagnostics
+      );
+    }
+  }
   if (isObjectType(type)) {
     return resolveObjectType(
       type,
@@ -3965,7 +4194,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 +4214,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 +4265,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 +4291,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 +4326,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 +4423,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 +4440,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 +4501,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;
@@ -4313,7 +4558,7 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting, sourceNo
       };
     }
   }
-  const recordNode = tryResolveRecordType(
+  const recordNode = isObjectType(type) ? tryResolveRecordType(
     type,
     checker,
     file,
@@ -4322,7 +4567,7 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting, sourceNo
     metadataPolicy,
     extensionRegistry,
     collectedDiagnostics
-  );
+  ) : null;
   if (recordNode) {
     visiting.delete(type);
     if (registryTypeName !== void 0 && shouldRegisterNamedType) {
@@ -4332,11 +4577,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 +4685,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 },
@@ -4503,9 +4764,10 @@ function getNamedTypeFieldNodeInfoMap(type, checker, file, typeRegistry, visitin
       );
     }
     const typeAliasDecl = declarations.find(ts3.isTypeAliasDeclaration);
-    if (typeAliasDecl && ts3.isTypeLiteralNode(typeAliasDecl.type)) {
+    const typeAliasMembers = typeAliasDecl === void 0 ? null : getObjectLikeTypeAliasMembers(typeAliasDecl.type);
+    if (typeAliasDecl && typeAliasMembers !== null) {
       return buildFieldNodeInfoMap(
-        typeAliasDecl.type.members,
+        typeAliasMembers,
         checker,
         file,
         typeRegistry,
@@ -4713,12 +4975,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();
@@ -4812,17 +5074,18 @@ function findInterfaceByName(sourceFile, interfaceName) {
 function findTypeAliasByName(sourceFile, aliasName) {
   return findNodeByName(sourceFile, aliasName, ts4.isTypeAliasDeclaration, (n) => n.name.text);
 }
-function analyzeNamedTypeToIR(filePath, typeName, extensionRegistry, metadataPolicy) {
+function analyzeNamedTypeToIR(filePath, typeName, extensionRegistry, metadataPolicy, discriminatorOptions) {
   const ctx = createProgramContext(filePath);
   return analyzeNamedTypeToIRFromProgramContext(
     ctx,
     filePath,
     typeName,
     extensionRegistry,
-    metadataPolicy
+    metadataPolicy,
+    discriminatorOptions
   );
 }
-function analyzeNamedTypeToIRFromProgramContext(ctx, filePath, typeName, extensionRegistry, metadataPolicy) {
+function analyzeNamedTypeToIRFromProgramContext(ctx, filePath, typeName, extensionRegistry, metadataPolicy, discriminatorOptions) {
   const analysisFilePath = path.resolve(filePath);
   const classDecl = findClassByName(ctx.sourceFile, typeName);
   if (classDecl !== null) {
@@ -4831,7 +5094,8 @@ function analyzeNamedTypeToIRFromProgramContext(ctx, filePath, typeName, extensi
       ctx.checker,
       analysisFilePath,
       extensionRegistry,
-      metadataPolicy
+      metadataPolicy,
+      discriminatorOptions
     );
   }
   const interfaceDecl = findInterfaceByName(ctx.sourceFile, typeName);
@@ -4841,7 +5105,8 @@ function analyzeNamedTypeToIRFromProgramContext(ctx, filePath, typeName, extensi
       ctx.checker,
       analysisFilePath,
       extensionRegistry,
-      metadataPolicy
+      metadataPolicy,
+      discriminatorOptions
     );
   }
   const typeAlias = findTypeAliasByName(ctx.sourceFile, typeName);
@@ -4851,7 +5116,8 @@ function analyzeNamedTypeToIRFromProgramContext(ctx, filePath, typeName, extensi
       ctx.checker,
       analysisFilePath,
       extensionRegistry,
-      metadataPolicy
+      metadataPolicy,
+      discriminatorOptions
     );
     if (result.ok) {
       return result.analysis;
@@ -4874,7 +5140,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 +5158,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 +5209,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");
   }
 });
 
@@ -5009,7 +5275,8 @@ function generateSchemasFromClass(options) {
     ctx.checker,
     options.filePath,
     options.extensionRegistry,
-    options.metadata
+    options.metadata,
+    options.discriminator
   );
   return generateClassSchemas(
     analysis,
@@ -5035,7 +5302,8 @@ function generateSchemasFromProgram(options) {
     options.filePath,
     options.typeName,
     options.extensionRegistry,
-    options.metadata
+    options.metadata,
+    options.discriminator
   );
   return generateClassSchemas(
     analysis,
@@ -5213,7 +5481,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 +5540,7 @@ function generateSchemasFromResolvedType(options, skipNamedDeclaration = false,
     typeRegistry,
     /* @__PURE__ */ new Set(),
     options.sourceNode,
-    normalizeMetadataPolicy(options.metadata),
+    createAnalyzerMetadataPolicy(options.metadata, options.discriminator),
     options.extensionRegistry,
     diagnostics
   );
@@ -5321,7 +5589,8 @@ function generateSchemasFromDeclaration(options) {
         options.context.checker,
         filePath,
         options.extensionRegistry,
-        options.metadata
+        options.metadata,
+        options.discriminator
       ),
       filePath,
       options
@@ -5334,7 +5603,8 @@ function generateSchemasFromDeclaration(options) {
         options.context.checker,
         filePath,
         options.extensionRegistry,
-        options.metadata
+        options.metadata,
+        options.discriminator
       ),
       filePath,
       options
@@ -5346,7 +5616,8 @@ function generateSchemasFromDeclaration(options) {
       options.context.checker,
       filePath,
       options.extensionRegistry,
-      options.metadata
+      options.metadata,
+      options.discriminator
     );
     if (analyzedAlias.ok) {
       return generateSchemasFromAnalysis(analyzedAlias.analysis, filePath, options);
@@ -5404,7 +5675,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 +5683,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();
   }
 });
@@ -5424,7 +5695,8 @@ function buildMixedAuthoringSchemas(options) {
     filePath,
     typeName,
     schemaOptions.extensionRegistry,
-    schemaOptions.metadata
+    schemaOptions.metadata,
+    schemaOptions.discriminator
   );
   const composedAnalysis = composeAnalysisWithOverlays(analysis, overlays, schemaOptions.metadata);
   const ir = canonicalizeTSDoc(