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

package/dist/index.cjs

@@ -31,6 +31,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var index_exports = {};
 __export(index_exports, {
   buildFormSchemas: () => buildFormSchemas,
+  buildMixedAuthoringSchemas: () => buildMixedAuthoringSchemas,
   categorizationSchema: () => categorizationSchema,
   categorySchema: () => categorySchema,
   controlSchema: () => controlSchema,
@@ -386,6 +387,7 @@ function canonicalizeTSDoc(analysis, source) {
     irVersion: import_core2.IR_VERSION,
     elements,
     typeRegistry: analysis.typeRegistry,
+    ...analysis.annotations !== void 0 && analysis.annotations.length > 0 && { annotations: analysis.annotations },
     provenance
   };
 }
@@ -462,6 +464,9 @@ function generateJsonSchemaFromIR(ir, options) {
   const ctx = makeContext(options);
   for (const [name, typeDef] of Object.entries(ir.typeRegistry)) {
     ctx.defs[name] = generateTypeNode(typeDef.type, ctx);
+    if (typeDef.annotations && typeDef.annotations.length > 0) {
+      applyAnnotations(ctx.defs[name], typeDef.annotations, ctx);
+    }
   }
   const properties = {};
   const required = [];
@@ -473,6 +478,9 @@ function generateJsonSchemaFromIR(ir, options) {
     properties,
     ...uniqueRequired.length > 0 && { required: uniqueRequired }
   };
+  if (ir.annotations && ir.annotations.length > 0) {
+    applyAnnotations(result, ir.annotations, ctx);
+  }
   if (Object.keys(ctx.defs).length > 0) {
     result.$defs = ctx.defs;
   }
@@ -502,22 +510,51 @@ function collectFields(elements, properties, required, ctx) {
 }
 function generateFieldSchema(field, ctx) {
   const schema = generateTypeNode(field.type, ctx);
+  const itemStringSchema = schema.type === "array" && schema.items?.type === "string" ? schema.items : void 0;
   const directConstraints = [];
+  const itemConstraints = [];
   const pathConstraints = [];
   for (const c of field.constraints) {
     if (c.path) {
       pathConstraints.push(c);
+    } else if (itemStringSchema !== void 0 && isStringItemConstraint(c)) {
+      itemConstraints.push(c);
     } else {
       directConstraints.push(c);
     }
   }
   applyConstraints(schema, directConstraints, ctx);
-  applyAnnotations(schema, field.annotations, ctx);
+  if (itemStringSchema !== void 0) {
+    applyConstraints(itemStringSchema, itemConstraints, ctx);
+  }
+  const rootAnnotations = [];
+  const itemAnnotations = [];
+  for (const annotation of field.annotations) {
+    if (itemStringSchema !== void 0 && annotation.annotationKind === "format") {
+      itemAnnotations.push(annotation);
+    } else {
+      rootAnnotations.push(annotation);
+    }
+  }
+  applyAnnotations(schema, rootAnnotations, ctx);
+  if (itemStringSchema !== void 0) {
+    applyAnnotations(itemStringSchema, itemAnnotations, ctx);
+  }
   if (pathConstraints.length === 0) {
     return schema;
   }
   return applyPathTargetedConstraints(schema, pathConstraints, ctx);
 }
+function isStringItemConstraint(constraint) {
+  switch (constraint.constraintKind) {
+    case "minLength":
+    case "maxLength":
+    case "pattern":
+      return true;
+    default:
+      return false;
+  }
+}
 function applyPathTargetedConstraints(schema, pathConstraints, ctx) {
   if (schema.type === "array" && schema.items) {
     schema.items = applyPathTargetedConstraints(schema.items, pathConstraints, ctx);
@@ -735,6 +772,9 @@ function applyConstraints(schema, constraints, ctx) {
       case "uniqueItems":
         schema.uniqueItems = constraint.value;
         break;
+      case "const":
+        schema.const = constraint.value;
+        break;
       case "allowedMembers":
         break;
       case "custom":
@@ -759,8 +799,14 @@ function applyAnnotations(schema, annotations, ctx) {
       case "defaultValue":
         schema.default = annotation.value;
         break;
+      case "format":
+        schema.format = annotation.value;
+        break;
       case "deprecated":
         schema.deprecated = true;
+        if (annotation.message !== void 0 && annotation.message !== "") {
+          schema["x-formspec-deprecation-description"] = annotation.message;
+        }
         break;
       case "placeholder":
         break;
@@ -792,7 +838,12 @@ function applyCustomConstraint(schema, constraint, ctx) {
       `Cannot generate JSON Schema for custom constraint "${constraint.constraintId}" without a matching extension registration`
     );
   }
-  Object.assign(schema, registration.toJsonSchema(constraint.payload, ctx.vendorPrefix));
+  assignVendorPrefixedExtensionKeywords(
+    schema,
+    registration.toJsonSchema(constraint.payload, ctx.vendorPrefix),
+    ctx.vendorPrefix,
+    `custom constraint "${constraint.constraintId}"`
+  );
 }
 function applyCustomAnnotation(schema, annotation, ctx) {
   const registration = ctx.extensionRegistry?.findAnnotation(annotation.annotationId);
@@ -804,7 +855,22 @@ function applyCustomAnnotation(schema, annotation, ctx) {
   if (registration.toJsonSchema === void 0) {
     return;
   }
-  Object.assign(schema, registration.toJsonSchema(annotation.value, ctx.vendorPrefix));
+  assignVendorPrefixedExtensionKeywords(
+    schema,
+    registration.toJsonSchema(annotation.value, ctx.vendorPrefix),
+    ctx.vendorPrefix,
+    `custom annotation "${annotation.annotationId}"`
+  );
+}
+function assignVendorPrefixedExtensionKeywords(schema, extensionSchema, vendorPrefix, source) {
+  for (const [key, value] of Object.entries(extensionSchema)) {
+    if (!key.startsWith(`${vendorPrefix}-`)) {
+      throw new Error(
+        `Cannot apply ${source}: extension hooks may only emit "${vendorPrefix}-*" JSON Schema keywords`
+      );
+    }
+    schema[key] = value;
+  }
 }
 
 // src/json-schema/generator.ts
@@ -948,25 +1014,31 @@ function createShowRule(fieldName, value) {
     }
   };
 }
+function flattenConditionSchema(scope, schema) {
+  if (schema.allOf === void 0) {
+    if (scope === "#") {
+      return [schema];
+    }
+    const fieldName = scope.replace("#/properties/", "");
+    return [
+      {
+        properties: {
+          [fieldName]: schema
+        }
+      }
+    ];
+  }
+  return schema.allOf.flatMap((member) => flattenConditionSchema(scope, member));
+}
 function combineRules(parentRule, childRule) {
-  const parentCondition = parentRule.condition;
-  const childCondition = childRule.condition;
   return {
     effect: "SHOW",
     condition: {
       scope: "#",
       schema: {
         allOf: [
-          {
-            properties: {
-              [parentCondition.scope.replace("#/properties/", "")]: parentCondition.schema
-            }
-          },
-          {
-            properties: {
-              [childCondition.scope.replace("#/properties/", "")]: childCondition.schema
-            }
-          }
+          ...flattenConditionSchema(parentRule.condition.scope, parentRule.condition.schema),
+          ...flattenConditionSchema(childRule.condition.scope, childRule.condition.schema)
         ]
       }
     }
@@ -974,10 +1046,14 @@ function combineRules(parentRule, childRule) {
 }
 function fieldNodeToControl(field, parentRule) {
   const displayNameAnnotation = field.annotations.find((a) => a.annotationKind === "displayName");
+  const placeholderAnnotation = field.annotations.find((a) => a.annotationKind === "placeholder");
   const control = {
     type: "Control",
     scope: fieldToScope(field.name),
     ...displayNameAnnotation !== void 0 && { label: displayNameAnnotation.value },
+    ...placeholderAnnotation !== void 0 && {
+      options: { placeholder: placeholderAnnotation.value }
+    },
     ...parentRule !== void 0 && { rule: parentRule }
   };
   return control;
@@ -1047,7 +1123,10 @@ function getSchemaExtension(schema, key) {
 // src/extensions/registry.ts
 function createExtensionRegistry(extensions) {
   const typeMap = /* @__PURE__ */ new Map();
+  const typeNameMap = /* @__PURE__ */ new Map();
   const constraintMap = /* @__PURE__ */ new Map();
+  const constraintTagMap = /* @__PURE__ */ new Map();
+  const builtinBroadeningMap = /* @__PURE__ */ new Map();
   const annotationMap = /* @__PURE__ */ new Map();
   for (const ext of extensions) {
     if (ext.types !== void 0) {
@@ -1057,6 +1136,27 @@ function createExtensionRegistry(extensions) {
           throw new Error(`Duplicate custom type ID: "${qualifiedId}"`);
         }
         typeMap.set(qualifiedId, type);
+        for (const sourceTypeName of type.tsTypeNames ?? [type.typeName]) {
+          if (typeNameMap.has(sourceTypeName)) {
+            throw new Error(`Duplicate custom type source name: "${sourceTypeName}"`);
+          }
+          typeNameMap.set(sourceTypeName, {
+            extensionId: ext.extensionId,
+            registration: type
+          });
+        }
+        if (type.builtinConstraintBroadenings !== void 0) {
+          for (const broadening of type.builtinConstraintBroadenings) {
+            const key = `${qualifiedId}:${broadening.tagName}`;
+            if (builtinBroadeningMap.has(key)) {
+              throw new Error(`Duplicate built-in constraint broadening: "${key}"`);
+            }
+            builtinBroadeningMap.set(key, {
+              extensionId: ext.extensionId,
+              registration: broadening
+            });
+          }
+        }
       }
     }
     if (ext.constraints !== void 0) {
@@ -1068,6 +1168,17 @@ function createExtensionRegistry(extensions) {
         constraintMap.set(qualifiedId, constraint);
       }
     }
+    if (ext.constraintTags !== void 0) {
+      for (const tag of ext.constraintTags) {
+        if (constraintTagMap.has(tag.tagName)) {
+          throw new Error(`Duplicate custom constraint tag: "@${tag.tagName}"`);
+        }
+        constraintTagMap.set(tag.tagName, {
+          extensionId: ext.extensionId,
+          registration: tag
+        });
+      }
+    }
     if (ext.annotations !== void 0) {
       for (const annotation of ext.annotations) {
         const qualifiedId = `${ext.extensionId}/${annotation.annotationName}`;
@@ -1081,7 +1192,10 @@ function createExtensionRegistry(extensions) {
   return {
     extensions,
     findType: (typeId) => typeMap.get(typeId),
+    findTypeByName: (typeName) => typeNameMap.get(typeName),
     findConstraint: (constraintId) => constraintMap.get(constraintId),
+    findConstraintTag: (tagName) => constraintTagMap.get(tagName),
+    findBuiltinConstraintBroadening: (typeId, tagName) => builtinBroadeningMap.get(`${typeId}:${tagName}`),
     findAnnotation: (annotationId) => annotationMap.get(annotationId)
   };
 }
@@ -1254,8 +1368,8 @@ var LENGTH_CONSTRAINT_MAP = {
   minItems: "minItems",
   maxItems: "maxItems"
 };
-var TAGS_REQUIRING_RAW_TEXT = /* @__PURE__ */ new Set(["pattern", "enumOptions"]);
-function createFormSpecTSDocConfig() {
+var TAGS_REQUIRING_RAW_TEXT = /* @__PURE__ */ new Set(["pattern", "enumOptions", "defaultValue"]);
+function createFormSpecTSDocConfig(extensionTagNames = []) {
   const config = new import_tsdoc.TSDocConfiguration();
   for (const tagName of Object.keys(import_core3.BUILTIN_CONSTRAINT_DEFINITIONS)) {
     config.addTagDefinition(
@@ -1266,7 +1380,16 @@ function createFormSpecTSDocConfig() {
       })
     );
   }
-  for (const tagName of ["displayName", "description"]) {
+  for (const tagName of ["displayName", "description", "format", "placeholder"]) {
+    config.addTagDefinition(
+      new import_tsdoc.TSDocTagDefinition({
+        tagName: "@" + tagName,
+        syntaxKind: import_tsdoc.TSDocTagSyntaxKind.BlockTag,
+        allowMultiple: true
+      })
+    );
+  }
+  for (const tagName of extensionTagNames) {
     config.addTagDefinition(
       new import_tsdoc.TSDocTagDefinition({
         tagName: "@" + tagName,
@@ -1277,14 +1400,31 @@ function createFormSpecTSDocConfig() {
   }
   return config;
 }
-var sharedParser;
-function getParser() {
-  sharedParser ??= new import_tsdoc.TSDocParser(createFormSpecTSDocConfig());
-  return sharedParser;
-}
-function parseTSDocTags(node, file = "") {
+var parserCache = /* @__PURE__ */ new Map();
+function getParser(options) {
+  const extensionTagNames = [
+    ...options?.extensionRegistry?.extensions.flatMap(
+      (extension) => (extension.constraintTags ?? []).map((tag) => tag.tagName)
+    ) ?? []
+  ].sort();
+  const cacheKey = extensionTagNames.join("|");
+  const existing = parserCache.get(cacheKey);
+  if (existing) {
+    return existing;
+  }
+  const parser = new import_tsdoc.TSDocParser(createFormSpecTSDocConfig(extensionTagNames));
+  parserCache.set(cacheKey, parser);
+  return parser;
+}
+function parseTSDocTags(node, file = "", options) {
   const constraints = [];
   const annotations = [];
+  let displayName;
+  let description;
+  let placeholder;
+  let displayNameProvenance;
+  let descriptionProvenance;
+  let placeholderProvenance;
   const sourceFile = node.getSourceFile();
   const sourceText = sourceFile.getFullText();
   const commentRanges = ts2.getLeadingCommentRanges(sourceText, node.getFullStart());
@@ -1297,52 +1437,92 @@ function parseTSDocTags(node, file = "") {
       if (!commentText.startsWith("/**")) {
         continue;
       }
-      const parser = getParser();
+      const parser = getParser(options);
       const parserContext = parser.parseRange(
         import_tsdoc.TextRange.fromStringRange(sourceText, range.pos, range.end)
       );
       const docComment = parserContext.docComment;
       for (const block of docComment.customBlocks) {
         const tagName = (0, import_core3.normalizeConstraintTagName)(block.blockTag.tagName.substring(1));
-        if (tagName === "displayName" || tagName === "description") {
+        if (tagName === "displayName" || tagName === "description" || tagName === "format" || tagName === "placeholder") {
           const text2 = extractBlockText(block).trim();
           if (text2 === "") continue;
           const provenance2 = provenanceForComment(range, sourceFile, file, tagName);
           if (tagName === "displayName") {
+            if (!isMemberTargetDisplayName(text2) && displayName === void 0) {
+              displayName = text2;
+              displayNameProvenance = provenance2;
+            }
+          } else if (tagName === "format") {
             annotations.push({
               kind: "annotation",
-              annotationKind: "displayName",
+              annotationKind: "format",
               value: text2,
               provenance: provenance2
             });
           } else {
-            annotations.push({
-              kind: "annotation",
-              annotationKind: "description",
-              value: text2,
-              provenance: provenance2
-            });
+            if (tagName === "description" && description === void 0) {
+              description = text2;
+              descriptionProvenance = provenance2;
+            } else if (tagName === "placeholder" && placeholder === void 0) {
+              placeholder = text2;
+              placeholderProvenance = provenance2;
+            }
           }
           continue;
         }
         if (TAGS_REQUIRING_RAW_TEXT.has(tagName)) continue;
         const text = extractBlockText(block).trim();
-        if (text === "") continue;
+        const expectedType = (0, import_core3.isBuiltinConstraintName)(tagName) ? import_core3.BUILTIN_CONSTRAINT_DEFINITIONS[tagName] : void 0;
+        if (text === "" && expectedType !== "boolean") continue;
         const provenance = provenanceForComment(range, sourceFile, file, tagName);
-        const constraintNode = parseConstraintValue(tagName, text, provenance);
+        const constraintNode = parseConstraintValue(tagName, text, provenance, options);
         if (constraintNode) {
           constraints.push(constraintNode);
         }
       }
       if (docComment.deprecatedBlock !== void 0) {
+        const message = extractBlockText(docComment.deprecatedBlock).trim();
         annotations.push({
           kind: "annotation",
           annotationKind: "deprecated",
+          ...message !== "" && { message },
           provenance: provenanceForComment(range, sourceFile, file, "deprecated")
         });
       }
+      if (description === void 0 && docComment.remarksBlock !== void 0) {
+        const remarks = extractBlockText(docComment.remarksBlock).trim();
+        if (remarks !== "") {
+          description = remarks;
+          descriptionProvenance = provenanceForComment(range, sourceFile, file, "remarks");
+        }
+      }
     }
   }
+  if (displayName !== void 0 && displayNameProvenance !== void 0) {
+    annotations.push({
+      kind: "annotation",
+      annotationKind: "displayName",
+      value: displayName,
+      provenance: displayNameProvenance
+    });
+  }
+  if (description !== void 0 && descriptionProvenance !== void 0) {
+    annotations.push({
+      kind: "annotation",
+      annotationKind: "description",
+      value: description,
+      provenance: descriptionProvenance
+    });
+  }
+  if (placeholder !== void 0 && placeholderProvenance !== void 0) {
+    annotations.push({
+      kind: "annotation",
+      annotationKind: "placeholder",
+      value: placeholder,
+      provenance: placeholderProvenance
+    });
+  }
   const jsDocTagsAll = ts2.getJSDocTags(node);
   for (const tag of jsDocTagsAll) {
     const tagName = (0, import_core3.normalizeConstraintTagName)(tag.tagName.text);
@@ -1351,13 +1531,40 @@ function parseTSDocTags(node, file = "") {
     if (commentText === void 0 || commentText.trim() === "") continue;
     const text = commentText.trim();
     const provenance = provenanceForJSDocTag(tag, file);
-    const constraintNode = parseConstraintValue(tagName, text, provenance);
+    if (tagName === "defaultValue") {
+      const defaultValueNode = parseDefaultValueValue(text, provenance);
+      annotations.push(defaultValueNode);
+      continue;
+    }
+    const constraintNode = parseConstraintValue(tagName, text, provenance, options);
     if (constraintNode) {
       constraints.push(constraintNode);
     }
   }
   return { constraints, annotations };
 }
+function extractDisplayNameMetadata(node) {
+  let displayName;
+  const memberDisplayNames = /* @__PURE__ */ new Map();
+  for (const tag of ts2.getJSDocTags(node)) {
+    const tagName = (0, import_core3.normalizeConstraintTagName)(tag.tagName.text);
+    if (tagName !== "displayName") continue;
+    const commentText = getTagCommentText(tag);
+    if (commentText === void 0) continue;
+    const text = commentText.trim();
+    if (text === "") continue;
+    const memberTarget = parseMemberTargetDisplayName(text);
+    if (memberTarget) {
+      memberDisplayNames.set(memberTarget.target, memberTarget.label);
+      continue;
+    }
+    displayName ??= text;
+  }
+  return {
+    ...displayName !== void 0 && { displayName },
+    memberDisplayNames
+  };
+}
 function extractPathTarget(text) {
   const trimmed = text.trimStart();
   const match = /^:([a-zA-Z_]\w*)\s+([\s\S]*)$/.exec(trimmed);
@@ -1385,7 +1592,11 @@ function extractPlainText(node) {
   }
   return result;
 }
-function parseConstraintValue(tagName, text, provenance) {
+function parseConstraintValue(tagName, text, provenance, options) {
+  const customConstraint = parseExtensionConstraintValue(tagName, text, provenance, options);
+  if (customConstraint) {
+    return customConstraint;
+  }
   if (!(0, import_core3.isBuiltinConstraintName)(tagName)) {
     return null;
   }
@@ -1420,7 +1631,45 @@ function parseConstraintValue(tagName, text, provenance) {
     }
     return null;
   }
+  if (expectedType === "boolean") {
+    const trimmed = effectiveText.trim();
+    if (trimmed !== "" && trimmed !== "true") {
+      return null;
+    }
+    if (tagName === "uniqueItems") {
+      return {
+        kind: "constraint",
+        constraintKind: "uniqueItems",
+        value: true,
+        ...path3 && { path: path3 },
+        provenance
+      };
+    }
+    return null;
+  }
   if (expectedType === "json") {
+    if (tagName === "const") {
+      const trimmedText = effectiveText.trim();
+      if (trimmedText === "") return null;
+      try {
+        const parsed2 = JSON.parse(trimmedText);
+        return {
+          kind: "constraint",
+          constraintKind: "const",
+          value: parsed2,
+          ...path3 && { path: path3 },
+          provenance
+        };
+      } catch {
+        return {
+          kind: "constraint",
+          constraintKind: "const",
+          value: trimmedText,
+          ...path3 && { path: path3 },
+          provenance
+        };
+      }
+    }
     const parsed = tryParseJson(effectiveText);
     if (!Array.isArray(parsed)) {
       return null;
@@ -1452,6 +1701,111 @@ function parseConstraintValue(tagName, text, provenance) {
     provenance
   };
 }
+function parseExtensionConstraintValue(tagName, text, provenance, options) {
+  const pathResult = extractPathTarget(text);
+  const effectiveText = pathResult ? pathResult.remainingText : text;
+  const path3 = pathResult?.path;
+  const registry = options?.extensionRegistry;
+  if (registry === void 0) {
+    return null;
+  }
+  const directTag = registry.findConstraintTag(tagName);
+  if (directTag !== void 0) {
+    return makeCustomConstraintNode(
+      directTag.extensionId,
+      directTag.registration.constraintName,
+      directTag.registration.parseValue(effectiveText),
+      provenance,
+      path3,
+      registry
+    );
+  }
+  if (!(0, import_core3.isBuiltinConstraintName)(tagName)) {
+    return null;
+  }
+  const broadenedTypeId = getBroadenedCustomTypeId(options?.fieldType);
+  if (broadenedTypeId === void 0) {
+    return null;
+  }
+  const broadened = registry.findBuiltinConstraintBroadening(broadenedTypeId, tagName);
+  if (broadened === void 0) {
+    return null;
+  }
+  return makeCustomConstraintNode(
+    broadened.extensionId,
+    broadened.registration.constraintName,
+    broadened.registration.parseValue(effectiveText),
+    provenance,
+    path3,
+    registry
+  );
+}
+function getBroadenedCustomTypeId(fieldType) {
+  if (fieldType?.kind === "custom") {
+    return fieldType.typeId;
+  }
+  if (fieldType?.kind !== "union") {
+    return void 0;
+  }
+  const customMembers = fieldType.members.filter(
+    (member) => member.kind === "custom"
+  );
+  if (customMembers.length !== 1) {
+    return void 0;
+  }
+  const nonCustomMembers = fieldType.members.filter((member) => member.kind !== "custom");
+  const allOtherMembersAreNull = nonCustomMembers.every(
+    (member) => member.kind === "primitive" && member.primitiveKind === "null"
+  );
+  const customMember = customMembers[0];
+  return allOtherMembersAreNull && customMember !== void 0 ? customMember.typeId : void 0;
+}
+function makeCustomConstraintNode(extensionId, constraintName, payload, provenance, path3, registry) {
+  const constraintId = `${extensionId}/${constraintName}`;
+  const registration = registry.findConstraint(constraintId);
+  if (registration === void 0) {
+    throw new Error(
+      `Custom TSDoc tag resolved to unregistered constraint "${constraintId}". Register the constraint before using its tag.`
+    );
+  }
+  return {
+    kind: "constraint",
+    constraintKind: "custom",
+    constraintId,
+    payload,
+    compositionRule: registration.compositionRule,
+    ...path3 && { path: path3 },
+    provenance
+  };
+}
+function parseDefaultValueValue(text, provenance) {
+  const trimmed = text.trim();
+  let value;
+  if (trimmed === "null") {
+    value = null;
+  } else if (trimmed === "true") {
+    value = true;
+  } else if (trimmed === "false") {
+    value = false;
+  } else {
+    const parsed = tryParseJson(trimmed);
+    value = parsed !== null ? parsed : trimmed;
+  }
+  return {
+    kind: "annotation",
+    annotationKind: "defaultValue",
+    value,
+    provenance
+  };
+}
+function isMemberTargetDisplayName(text) {
+  return parseMemberTargetDisplayName(text) !== null;
+}
+function parseMemberTargetDisplayName(text) {
+  const match = /^:([^\s]+)\s+([\s\S]+)$/.exec(text);
+  if (!match?.[1] || !match[2]) return null;
+  return { target: match[1], label: match[2].trim() };
+}
 function provenanceForComment(range, sourceFile, file, tagName) {
   const { line, character } = sourceFile.getLineAndCharacterOfPosition(range.pos);
   return {
@@ -1484,12 +1838,12 @@ function getTagCommentText(tag) {
 }
 
 // src/analyzer/jsdoc-constraints.ts
-function extractJSDocConstraintNodes(node, file = "") {
-  const result = parseTSDocTags(node, file);
+function extractJSDocConstraintNodes(node, file = "", options) {
+  const result = parseTSDocTags(node, file, options);
   return [...result.constraints];
 }
-function extractJSDocAnnotationNodes(node, file = "") {
-  const result = parseTSDocTags(node, file);
+function extractJSDocAnnotationNodes(node, file = "", options) {
+  const result = parseTSDocTags(node, file, options);
   return [...result.annotations];
 }
 function extractDefaultValueAnnotation(initializer, file = "") {
@@ -1533,17 +1887,43 @@ function isObjectType(type) {
 function isTypeReference(type) {
   return !!(type.flags & ts4.TypeFlags.Object) && !!(type.objectFlags & ts4.ObjectFlags.Reference);
 }
-function analyzeClassToIR(classDecl, checker, file = "") {
+var RESOLVING_TYPE_PLACEHOLDER = {
+  kind: "object",
+  properties: [],
+  additionalProperties: true
+};
+function makeParseOptions(extensionRegistry, fieldType) {
+  if (extensionRegistry === void 0 && fieldType === void 0) {
+    return void 0;
+  }
+  return {
+    ...extensionRegistry !== void 0 && { extensionRegistry },
+    ...fieldType !== void 0 && { fieldType }
+  };
+}
+function analyzeClassToIR(classDecl, checker, file = "", extensionRegistry) {
   const name = classDecl.name?.text ?? "AnonymousClass";
   const fields = [];
   const fieldLayouts = [];
   const typeRegistry = {};
+  const annotations = extractJSDocAnnotationNodes(
+    classDecl,
+    file,
+    makeParseOptions(extensionRegistry)
+  );
   const visiting = /* @__PURE__ */ new Set();
   const instanceMethods = [];
   const staticMethods = [];
   for (const member of classDecl.members) {
     if (ts4.isPropertyDeclaration(member)) {
-      const fieldNode = analyzeFieldToIR(member, checker, file, typeRegistry, visiting);
+      const fieldNode = analyzeFieldToIR(
+        member,
+        checker,
+        file,
+        typeRegistry,
+        visiting,
+        extensionRegistry
+      );
       if (fieldNode) {
         fields.push(fieldNode);
         fieldLayouts.push({});
@@ -1560,25 +1940,53 @@ function analyzeClassToIR(classDecl, checker, file = "") {
       }
     }
   }
-  return { name, fields, fieldLayouts, typeRegistry, instanceMethods, staticMethods };
+  return {
+    name,
+    fields,
+    fieldLayouts,
+    typeRegistry,
+    ...annotations.length > 0 && { annotations },
+    instanceMethods,
+    staticMethods
+  };
 }
-function analyzeInterfaceToIR(interfaceDecl, checker, file = "") {
+function analyzeInterfaceToIR(interfaceDecl, checker, file = "", extensionRegistry) {
   const name = interfaceDecl.name.text;
   const fields = [];
   const typeRegistry = {};
+  const annotations = extractJSDocAnnotationNodes(
+    interfaceDecl,
+    file,
+    makeParseOptions(extensionRegistry)
+  );
   const visiting = /* @__PURE__ */ new Set();
   for (const member of interfaceDecl.members) {
     if (ts4.isPropertySignature(member)) {
-      const fieldNode = analyzeInterfacePropertyToIR(member, checker, file, typeRegistry, visiting);
+      const fieldNode = analyzeInterfacePropertyToIR(
+        member,
+        checker,
+        file,
+        typeRegistry,
+        visiting,
+        extensionRegistry
+      );
       if (fieldNode) {
         fields.push(fieldNode);
       }
     }
   }
   const fieldLayouts = fields.map(() => ({}));
-  return { name, fields, fieldLayouts, typeRegistry, instanceMethods: [], staticMethods: [] };
+  return {
+    name,
+    fields,
+    fieldLayouts,
+    typeRegistry,
+    ...annotations.length > 0 && { annotations },
+    instanceMethods: [],
+    staticMethods: []
+  };
 }
-function analyzeTypeAliasToIR(typeAlias, checker, file = "") {
+function analyzeTypeAliasToIR(typeAlias, checker, file = "", extensionRegistry) {
   if (!ts4.isTypeLiteralNode(typeAlias.type)) {
     const sourceFile = typeAlias.getSourceFile();
     const { line } = sourceFile.getLineAndCharacterOfPosition(typeAlias.getStart());
@@ -1591,10 +1999,22 @@ function analyzeTypeAliasToIR(typeAlias, checker, file = "") {
   const name = typeAlias.name.text;
   const fields = [];
   const typeRegistry = {};
+  const annotations = extractJSDocAnnotationNodes(
+    typeAlias,
+    file,
+    makeParseOptions(extensionRegistry)
+  );
   const visiting = /* @__PURE__ */ new Set();
   for (const member of typeAlias.type.members) {
     if (ts4.isPropertySignature(member)) {
-      const fieldNode = analyzeInterfacePropertyToIR(member, checker, file, typeRegistry, visiting);
+      const fieldNode = analyzeInterfacePropertyToIR(
+        member,
+        checker,
+        file,
+        typeRegistry,
+        visiting,
+        extensionRegistry
+      );
       if (fieldNode) {
         fields.push(fieldNode);
       }
@@ -1607,12 +2027,13 @@ function analyzeTypeAliasToIR(typeAlias, checker, file = "") {
       fields,
       fieldLayouts: fields.map(() => ({})),
       typeRegistry,
+      ...annotations.length > 0 && { annotations },
       instanceMethods: [],
       staticMethods: []
     }
   };
 }
-function analyzeFieldToIR(prop, checker, file, typeRegistry, visiting) {
+function analyzeFieldToIR(prop, checker, file, typeRegistry, visiting, extensionRegistry) {
   if (!ts4.isIdentifier(prop.name)) {
     return null;
   }
@@ -1620,16 +2041,28 @@ function analyzeFieldToIR(prop, checker, file, typeRegistry, visiting) {
   const tsType = checker.getTypeAtLocation(prop);
   const optional = prop.questionToken !== void 0;
   const provenance = provenanceForNode(prop, file);
-  let type = resolveTypeNode(tsType, checker, file, typeRegistry, visiting);
+  let type = resolveTypeNode(
+    tsType,
+    checker,
+    file,
+    typeRegistry,
+    visiting,
+    prop,
+    extensionRegistry
+  );
   const constraints = [];
   if (prop.type) {
-    constraints.push(...extractTypeAliasConstraintNodes(prop.type, checker, file));
+    constraints.push(
+      ...extractTypeAliasConstraintNodes(prop.type, checker, file, extensionRegistry)
+    );
   }
-  constraints.push(...extractJSDocConstraintNodes(prop, file));
+  constraints.push(...extractJSDocConstraintNodes(prop, file, makeParseOptions(extensionRegistry, type)));
   let annotations = [];
-  annotations.push(...extractJSDocAnnotationNodes(prop, file));
+  annotations.push(
+    ...extractJSDocAnnotationNodes(prop, file, makeParseOptions(extensionRegistry, type))
+  );
   const defaultAnnotation = extractDefaultValueAnnotation(prop.initializer, file);
-  if (defaultAnnotation) {
+  if (defaultAnnotation && !annotations.some((a) => a.annotationKind === "defaultValue")) {
     annotations.push(defaultAnnotation);
   }
   ({ type, annotations } = applyEnumMemberDisplayNames(type, annotations));
@@ -1643,7 +2076,7 @@ function analyzeFieldToIR(prop, checker, file, typeRegistry, visiting) {
     provenance
   };
 }
-function analyzeInterfacePropertyToIR(prop, checker, file, typeRegistry, visiting) {
+function analyzeInterfacePropertyToIR(prop, checker, file, typeRegistry, visiting, extensionRegistry) {
   if (!ts4.isIdentifier(prop.name)) {
     return null;
   }
@@ -1651,14 +2084,26 @@ function analyzeInterfacePropertyToIR(prop, checker, file, typeRegistry, visitin
   const tsType = checker.getTypeAtLocation(prop);
   const optional = prop.questionToken !== void 0;
   const provenance = provenanceForNode(prop, file);
-  let type = resolveTypeNode(tsType, checker, file, typeRegistry, visiting);
+  let type = resolveTypeNode(
+    tsType,
+    checker,
+    file,
+    typeRegistry,
+    visiting,
+    prop,
+    extensionRegistry
+  );
   const constraints = [];
   if (prop.type) {
-    constraints.push(...extractTypeAliasConstraintNodes(prop.type, checker, file));
+    constraints.push(
+      ...extractTypeAliasConstraintNodes(prop.type, checker, file, extensionRegistry)
+    );
   }
-  constraints.push(...extractJSDocConstraintNodes(prop, file));
+  constraints.push(...extractJSDocConstraintNodes(prop, file, makeParseOptions(extensionRegistry, type)));
   let annotations = [];
-  annotations.push(...extractJSDocAnnotationNodes(prop, file));
+  annotations.push(
+    ...extractJSDocAnnotationNodes(prop, file, makeParseOptions(extensionRegistry, type))
+  );
   ({ type, annotations } = applyEnumMemberDisplayNames(type, annotations));
   return {
     kind: "field",
@@ -1732,7 +2177,66 @@ function parseEnumMemberDisplayName(value) {
   if (label === "") return null;
   return { value: match[1], label };
 }
-function resolveTypeNode(type, checker, file, typeRegistry, visiting) {
+function resolveRegisteredCustomType(sourceNode, extensionRegistry, checker) {
+  if (sourceNode === void 0 || extensionRegistry === void 0) {
+    return null;
+  }
+  const typeNode = extractTypeNodeFromSource(sourceNode);
+  if (typeNode === void 0) {
+    return null;
+  }
+  return resolveRegisteredCustomTypeFromTypeNode(typeNode, extensionRegistry, checker);
+}
+function resolveRegisteredCustomTypeFromTypeNode(typeNode, extensionRegistry, checker) {
+  if (ts4.isParenthesizedTypeNode(typeNode)) {
+    return resolveRegisteredCustomTypeFromTypeNode(typeNode.type, extensionRegistry, checker);
+  }
+  const typeName = getTypeNodeRegistrationName(typeNode);
+  if (typeName === null) {
+    return null;
+  }
+  const registration = extensionRegistry.findTypeByName(typeName);
+  if (registration !== void 0) {
+    return {
+      kind: "custom",
+      typeId: `${registration.extensionId}/${registration.registration.typeName}`,
+      payload: null
+    };
+  }
+  if (ts4.isTypeReferenceNode(typeNode) && ts4.isIdentifier(typeNode.typeName)) {
+    const aliasDecl = checker.getSymbolAtLocation(typeNode.typeName)?.declarations?.find(ts4.isTypeAliasDeclaration);
+    if (aliasDecl !== void 0) {
+      return resolveRegisteredCustomTypeFromTypeNode(aliasDecl.type, extensionRegistry, checker);
+    }
+  }
+  return null;
+}
+function extractTypeNodeFromSource(sourceNode) {
+  if (ts4.isPropertyDeclaration(sourceNode) || ts4.isPropertySignature(sourceNode) || ts4.isParameter(sourceNode) || ts4.isTypeAliasDeclaration(sourceNode)) {
+    return sourceNode.type;
+  }
+  if (ts4.isTypeNode(sourceNode)) {
+    return sourceNode;
+  }
+  return void 0;
+}
+function getTypeNodeRegistrationName(typeNode) {
+  if (ts4.isTypeReferenceNode(typeNode)) {
+    return ts4.isIdentifier(typeNode.typeName) ? typeNode.typeName.text : typeNode.typeName.right.text;
+  }
+  if (ts4.isParenthesizedTypeNode(typeNode)) {
+    return getTypeNodeRegistrationName(typeNode.type);
+  }
+  if (typeNode.kind === ts4.SyntaxKind.BigIntKeyword || typeNode.kind === ts4.SyntaxKind.StringKeyword || typeNode.kind === ts4.SyntaxKind.NumberKeyword || typeNode.kind === ts4.SyntaxKind.BooleanKeyword) {
+    return typeNode.getText();
+  }
+  return null;
+}
+function resolveTypeNode(type, checker, file, typeRegistry, visiting, sourceNode, extensionRegistry) {
+  const customType = resolveRegisteredCustomType(sourceNode, extensionRegistry, checker);
+  if (customType) {
+    return customType;
+  }
   if (type.flags & ts4.TypeFlags.String) {
     return { kind: "primitive", primitiveKind: "string" };
   }
@@ -1761,88 +2265,162 @@ function resolveTypeNode(type, checker, file, typeRegistry, visiting) {
     };
   }
   if (type.isUnion()) {
-    return resolveUnionType(type, checker, file, typeRegistry, visiting);
+    return resolveUnionType(
+      type,
+      checker,
+      file,
+      typeRegistry,
+      visiting,
+      sourceNode,
+      extensionRegistry
+    );
   }
   if (checker.isArrayType(type)) {
-    return resolveArrayType(type, checker, file, typeRegistry, visiting);
+    return resolveArrayType(
+      type,
+      checker,
+      file,
+      typeRegistry,
+      visiting,
+      sourceNode,
+      extensionRegistry
+    );
   }
   if (isObjectType(type)) {
-    return resolveObjectType(type, checker, file, typeRegistry, visiting);
+    return resolveObjectType(type, checker, file, typeRegistry, visiting, extensionRegistry);
   }
   return { kind: "primitive", primitiveKind: "string" };
 }
-function resolveUnionType(type, checker, file, typeRegistry, visiting) {
+function resolveUnionType(type, checker, file, typeRegistry, visiting, sourceNode, extensionRegistry) {
+  const typeName = getNamedTypeName(type);
+  const namedDecl = getNamedTypeDeclaration(type);
+  if (typeName && typeName in typeRegistry) {
+    return { kind: "reference", name: typeName, typeArguments: [] };
+  }
   const allTypes = type.types;
+  const unionMemberTypeNodes = extractUnionMemberTypeNodes(sourceNode, checker);
+  const nonNullSourceNodes = unionMemberTypeNodes.filter(
+    (memberTypeNode) => !isNullishTypeNode(resolveAliasedTypeNode(memberTypeNode, checker))
+  );
   const nonNullTypes = allTypes.filter(
-    (t) => !(t.flags & (ts4.TypeFlags.Null | ts4.TypeFlags.Undefined))
+    (memberType) => !(memberType.flags & (ts4.TypeFlags.Null | ts4.TypeFlags.Undefined))
   );
+  const nonNullMembers = nonNullTypes.map((memberType, index) => ({
+    memberType,
+    sourceNode: nonNullSourceNodes.length === nonNullTypes.length ? nonNullSourceNodes[index] : void 0
+  }));
   const hasNull = allTypes.some((t) => t.flags & ts4.TypeFlags.Null);
+  const memberDisplayNames = /* @__PURE__ */ new Map();
+  if (namedDecl) {
+    for (const [value, label] of extractDisplayNameMetadata(namedDecl).memberDisplayNames) {
+      memberDisplayNames.set(value, label);
+    }
+  }
+  if (sourceNode) {
+    for (const [value, label] of extractDisplayNameMetadata(sourceNode).memberDisplayNames) {
+      memberDisplayNames.set(value, label);
+    }
+  }
+  const registerNamed = (result) => {
+    if (!typeName) {
+      return result;
+    }
+    const annotations = namedDecl ? extractJSDocAnnotationNodes(namedDecl, file, makeParseOptions(extensionRegistry)) : void 0;
+    typeRegistry[typeName] = {
+      name: typeName,
+      type: result,
+      ...annotations !== void 0 && annotations.length > 0 && { annotations },
+      provenance: provenanceForDeclaration(namedDecl ?? sourceNode, file)
+    };
+    return { kind: "reference", name: typeName, typeArguments: [] };
+  };
+  const applyMemberLabels = (members2) => members2.map((value) => {
+    const displayName = memberDisplayNames.get(String(value));
+    return displayName !== void 0 ? { value, displayName } : { value };
+  });
   const isBooleanUnion2 = nonNullTypes.length === 2 && nonNullTypes.every((t) => t.flags & ts4.TypeFlags.BooleanLiteral);
   if (isBooleanUnion2) {
     const boolNode = { kind: "primitive", primitiveKind: "boolean" };
-    if (hasNull) {
-      return {
-        kind: "union",
-        members: [boolNode, { kind: "primitive", primitiveKind: "null" }]
-      };
-    }
-    return boolNode;
+    const result = hasNull ? {
+      kind: "union",
+      members: [boolNode, { kind: "primitive", primitiveKind: "null" }]
+    } : boolNode;
+    return registerNamed(result);
   }
   const allStringLiterals = nonNullTypes.every((t) => t.isStringLiteral());
   if (allStringLiterals && nonNullTypes.length > 0) {
     const stringTypes = nonNullTypes.filter((t) => t.isStringLiteral());
     const enumNode = {
       kind: "enum",
-      members: stringTypes.map((t) => ({ value: t.value }))
+      members: applyMemberLabels(stringTypes.map((t) => t.value))
     };
-    if (hasNull) {
-      return {
-        kind: "union",
-        members: [enumNode, { kind: "primitive", primitiveKind: "null" }]
-      };
-    }
-    return enumNode;
+    const result = hasNull ? {
+      kind: "union",
+      members: [enumNode, { kind: "primitive", primitiveKind: "null" }]
+    } : enumNode;
+    return registerNamed(result);
   }
   const allNumberLiterals = nonNullTypes.every((t) => t.isNumberLiteral());
   if (allNumberLiterals && nonNullTypes.length > 0) {
     const numberTypes = nonNullTypes.filter((t) => t.isNumberLiteral());
     const enumNode = {
       kind: "enum",
-      members: numberTypes.map((t) => ({ value: t.value }))
+      members: applyMemberLabels(numberTypes.map((t) => t.value))
     };
-    if (hasNull) {
-      return {
-        kind: "union",
-        members: [enumNode, { kind: "primitive", primitiveKind: "null" }]
-      };
-    }
-    return enumNode;
-  }
-  if (nonNullTypes.length === 1 && nonNullTypes[0]) {
-    const inner = resolveTypeNode(nonNullTypes[0], checker, file, typeRegistry, visiting);
-    if (hasNull) {
-      return {
-        kind: "union",
-        members: [inner, { kind: "primitive", primitiveKind: "null" }]
-      };
-    }
-    return inner;
-  }
-  const members = nonNullTypes.map(
-    (t) => resolveTypeNode(t, checker, file, typeRegistry, visiting)
+    const result = hasNull ? {
+      kind: "union",
+      members: [enumNode, { kind: "primitive", primitiveKind: "null" }]
+    } : enumNode;
+    return registerNamed(result);
+  }
+  if (nonNullMembers.length === 1 && nonNullMembers[0]) {
+    const inner = resolveTypeNode(
+      nonNullMembers[0].memberType,
+      checker,
+      file,
+      typeRegistry,
+      visiting,
+      nonNullMembers[0].sourceNode ?? sourceNode,
+      extensionRegistry
+    );
+    const result = hasNull ? {
+      kind: "union",
+      members: [inner, { kind: "primitive", primitiveKind: "null" }]
+    } : inner;
+    return registerNamed(result);
+  }
+  const members = nonNullMembers.map(
+    ({ memberType, sourceNode: memberSourceNode }) => resolveTypeNode(
+      memberType,
+      checker,
+      file,
+      typeRegistry,
+      visiting,
+      memberSourceNode ?? sourceNode,
+      extensionRegistry
+    )
   );
   if (hasNull) {
     members.push({ kind: "primitive", primitiveKind: "null" });
   }
-  return { kind: "union", members };
+  return registerNamed({ kind: "union", members });
 }
-function resolveArrayType(type, checker, file, typeRegistry, visiting) {
+function resolveArrayType(type, checker, file, typeRegistry, visiting, sourceNode, extensionRegistry) {
   const typeArgs = isTypeReference(type) ? type.typeArguments : void 0;
   const elementType = typeArgs?.[0];
-  const items = elementType ? resolveTypeNode(elementType, checker, file, typeRegistry, visiting) : { kind: "primitive", primitiveKind: "string" };
+  const elementSourceNode = extractArrayElementTypeNode(sourceNode, checker);
+  const items = elementType ? resolveTypeNode(
+    elementType,
+    checker,
+    file,
+    typeRegistry,
+    visiting,
+    elementSourceNode,
+    extensionRegistry
+  ) : { kind: "primitive", primitiveKind: "string" };
   return { kind: "array", items };
 }
-function tryResolveRecordType(type, checker, file, typeRegistry, visiting) {
+function tryResolveRecordType(type, checker, file, typeRegistry, visiting, extensionRegistry) {
   if (type.getProperties().length > 0) {
     return null;
   }
@@ -1850,39 +2428,123 @@ function tryResolveRecordType(type, checker, file, typeRegistry, visiting) {
   if (!indexInfo) {
     return null;
   }
-  if (visiting.has(type)) {
-    return null;
-  }
-  visiting.add(type);
-  try {
-    const valueType = resolveTypeNode(indexInfo.type, checker, file, typeRegistry, visiting);
-    return { kind: "record", valueType };
-  } finally {
-    visiting.delete(type);
-  }
+  const valueType = resolveTypeNode(
+    indexInfo.type,
+    checker,
+    file,
+    typeRegistry,
+    visiting,
+    void 0,
+    extensionRegistry
+  );
+  return { kind: "record", valueType };
 }
-function resolveObjectType(type, checker, file, typeRegistry, visiting) {
-  const recordNode = tryResolveRecordType(type, checker, file, typeRegistry, visiting);
-  if (recordNode) {
-    return recordNode;
+function typeNodeContainsReference(type, targetName) {
+  switch (type.kind) {
+    case "reference":
+      return type.name === targetName;
+    case "array":
+      return typeNodeContainsReference(type.items, targetName);
+    case "record":
+      return typeNodeContainsReference(type.valueType, targetName);
+    case "union":
+      return type.members.some((member) => typeNodeContainsReference(member, targetName));
+    case "object":
+      return type.properties.some(
+        (property) => typeNodeContainsReference(property.type, targetName)
+      );
+    case "primitive":
+    case "enum":
+    case "dynamic":
+    case "custom":
+      return false;
+    default: {
+      const _exhaustive = type;
+      return _exhaustive;
+    }
   }
+}
+function resolveObjectType(type, checker, file, typeRegistry, visiting, extensionRegistry) {
+  const typeName = getNamedTypeName(type);
+  const namedTypeName = typeName ?? void 0;
+  const namedDecl = getNamedTypeDeclaration(type);
+  const shouldRegisterNamedType = namedTypeName !== void 0 && !(namedTypeName === "Record" && namedDecl?.getSourceFile().fileName !== file);
+  const clearNamedTypeRegistration = () => {
+    if (namedTypeName === void 0 || !shouldRegisterNamedType) {
+      return;
+    }
+    Reflect.deleteProperty(typeRegistry, namedTypeName);
+  };
   if (visiting.has(type)) {
+    if (namedTypeName !== void 0 && shouldRegisterNamedType) {
+      return { kind: "reference", name: namedTypeName, typeArguments: [] };
+    }
     return { kind: "object", properties: [], additionalProperties: false };
   }
+  if (namedTypeName !== void 0 && shouldRegisterNamedType && !typeRegistry[namedTypeName]) {
+    typeRegistry[namedTypeName] = {
+      name: namedTypeName,
+      type: RESOLVING_TYPE_PLACEHOLDER,
+      provenance: provenanceForDeclaration(namedDecl, file)
+    };
+  }
   visiting.add(type);
-  const typeName = getNamedTypeName(type);
-  if (typeName && typeName in typeRegistry) {
+  if (namedTypeName !== void 0 && shouldRegisterNamedType && typeRegistry[namedTypeName]?.type !== void 0) {
+    if (typeRegistry[namedTypeName].type !== RESOLVING_TYPE_PLACEHOLDER) {
+      visiting.delete(type);
+      return { kind: "reference", name: namedTypeName, typeArguments: [] };
+    }
+  }
+  const recordNode = tryResolveRecordType(
+    type,
+    checker,
+    file,
+    typeRegistry,
+    visiting,
+    extensionRegistry
+  );
+  if (recordNode) {
     visiting.delete(type);
-    return { kind: "reference", name: typeName, typeArguments: [] };
+    if (namedTypeName !== void 0 && shouldRegisterNamedType) {
+      const isRecursiveRecord = typeNodeContainsReference(recordNode.valueType, namedTypeName);
+      if (!isRecursiveRecord) {
+        clearNamedTypeRegistration();
+        return recordNode;
+      }
+      const annotations = namedDecl ? extractJSDocAnnotationNodes(namedDecl, file, makeParseOptions(extensionRegistry)) : void 0;
+      typeRegistry[namedTypeName] = {
+        name: namedTypeName,
+        type: recordNode,
+        ...annotations !== void 0 && annotations.length > 0 && { annotations },
+        provenance: provenanceForDeclaration(namedDecl, file)
+      };
+      return { kind: "reference", name: namedTypeName, typeArguments: [] };
+    }
+    return recordNode;
   }
   const properties = [];
-  const fieldInfoMap = getNamedTypeFieldNodeInfoMap(type, checker, file, typeRegistry, visiting);
+  const fieldInfoMap = getNamedTypeFieldNodeInfoMap(
+    type,
+    checker,
+    file,
+    typeRegistry,
+    visiting,
+    extensionRegistry
+  );
   for (const prop of type.getProperties()) {
     const declaration = prop.valueDeclaration ?? prop.declarations?.[0];
     if (!declaration) continue;
     const propType = checker.getTypeOfSymbolAtLocation(prop, declaration);
     const optional = !!(prop.flags & ts4.SymbolFlags.Optional);
-    const propTypeNode = resolveTypeNode(propType, checker, file, typeRegistry, visiting);
+    const propTypeNode = resolveTypeNode(
+      propType,
+      checker,
+      file,
+      typeRegistry,
+      visiting,
+      declaration,
+      extensionRegistry
+    );
     const fieldNodeInfo = fieldInfoMap?.get(prop.name);
     properties.push({
       name: prop.name,
@@ -1899,17 +2561,19 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting) {
     properties,
     additionalProperties: true
   };
-  if (typeName) {
-    typeRegistry[typeName] = {
-      name: typeName,
+  if (namedTypeName !== void 0 && shouldRegisterNamedType) {
+    const annotations = namedDecl ? extractJSDocAnnotationNodes(namedDecl, file, makeParseOptions(extensionRegistry)) : void 0;
+    typeRegistry[namedTypeName] = {
+      name: namedTypeName,
       type: objectNode,
-      provenance: provenanceForFile(file)
+      ...annotations !== void 0 && annotations.length > 0 && { annotations },
+      provenance: provenanceForDeclaration(namedDecl, file)
     };
-    return { kind: "reference", name: typeName, typeArguments: [] };
+    return { kind: "reference", name: namedTypeName, typeArguments: [] };
   }
   return objectNode;
 }
-function getNamedTypeFieldNodeInfoMap(type, checker, file, typeRegistry, visiting) {
+function getNamedTypeFieldNodeInfoMap(type, checker, file, typeRegistry, visiting, extensionRegistry) {
   const symbols = [type.getSymbol(), type.aliasSymbol].filter(
     (s) => s?.declarations != null && s.declarations.length > 0
   );
@@ -1921,7 +2585,14 @@ function getNamedTypeFieldNodeInfoMap(type, checker, file, typeRegistry, visitin
       const map = /* @__PURE__ */ new Map();
       for (const member of classDecl.members) {
         if (ts4.isPropertyDeclaration(member) && ts4.isIdentifier(member.name)) {
-          const fieldNode = analyzeFieldToIR(member, checker, file, typeRegistry, visiting);
+          const fieldNode = analyzeFieldToIR(
+            member,
+            checker,
+            file,
+            typeRegistry,
+            visiting,
+            extensionRegistry
+          );
           if (fieldNode) {
             map.set(fieldNode.name, {
               constraints: [...fieldNode.constraints],
@@ -1935,7 +2606,14 @@ function getNamedTypeFieldNodeInfoMap(type, checker, file, typeRegistry, visitin
     }
     const interfaceDecl = declarations.find(ts4.isInterfaceDeclaration);
     if (interfaceDecl) {
-      return buildFieldNodeInfoMap(interfaceDecl.members, checker, file, typeRegistry, visiting);
+      return buildFieldNodeInfoMap(
+        interfaceDecl.members,
+        checker,
+        file,
+        typeRegistry,
+        visiting,
+        extensionRegistry
+      );
     }
     const typeAliasDecl = declarations.find(ts4.isTypeAliasDeclaration);
     if (typeAliasDecl && ts4.isTypeLiteralNode(typeAliasDecl.type)) {
@@ -1944,17 +2622,68 @@ function getNamedTypeFieldNodeInfoMap(type, checker, file, typeRegistry, visitin
         checker,
         file,
         typeRegistry,
-        visiting
+        visiting,
+        extensionRegistry
       );
     }
   }
   return null;
 }
-function buildFieldNodeInfoMap(members, checker, file, typeRegistry, visiting) {
+function extractArrayElementTypeNode(sourceNode, checker) {
+  const typeNode = sourceNode === void 0 ? void 0 : extractTypeNodeFromSource(sourceNode);
+  if (typeNode === void 0) {
+    return void 0;
+  }
+  const resolvedTypeNode = resolveAliasedTypeNode(typeNode, checker);
+  if (ts4.isArrayTypeNode(resolvedTypeNode)) {
+    return resolvedTypeNode.elementType;
+  }
+  if (ts4.isTypeReferenceNode(resolvedTypeNode) && ts4.isIdentifier(resolvedTypeNode.typeName) && resolvedTypeNode.typeName.text === "Array" && resolvedTypeNode.typeArguments?.[0]) {
+    return resolvedTypeNode.typeArguments[0];
+  }
+  return void 0;
+}
+function extractUnionMemberTypeNodes(sourceNode, checker) {
+  const typeNode = sourceNode === void 0 ? void 0 : extractTypeNodeFromSource(sourceNode);
+  if (!typeNode) {
+    return [];
+  }
+  const resolvedTypeNode = resolveAliasedTypeNode(typeNode, checker);
+  return ts4.isUnionTypeNode(resolvedTypeNode) ? [...resolvedTypeNode.types] : [];
+}
+function resolveAliasedTypeNode(typeNode, checker, visited = /* @__PURE__ */ new Set()) {
+  if (ts4.isParenthesizedTypeNode(typeNode)) {
+    return resolveAliasedTypeNode(typeNode.type, checker, visited);
+  }
+  if (!ts4.isTypeReferenceNode(typeNode) || !ts4.isIdentifier(typeNode.typeName)) {
+    return typeNode;
+  }
+  const symbol = checker.getSymbolAtLocation(typeNode.typeName);
+  const aliasDecl = symbol?.declarations?.find(ts4.isTypeAliasDeclaration);
+  if (aliasDecl === void 0 || visited.has(aliasDecl)) {
+    return typeNode;
+  }
+  visited.add(aliasDecl);
+  return resolveAliasedTypeNode(aliasDecl.type, checker, visited);
+}
+function isNullishTypeNode(typeNode) {
+  if (typeNode.kind === ts4.SyntaxKind.NullKeyword || typeNode.kind === ts4.SyntaxKind.UndefinedKeyword) {
+    return true;
+  }
+  return ts4.isLiteralTypeNode(typeNode) && (typeNode.literal.kind === ts4.SyntaxKind.NullKeyword || typeNode.literal.kind === ts4.SyntaxKind.UndefinedKeyword);
+}
+function buildFieldNodeInfoMap(members, checker, file, typeRegistry, visiting, extensionRegistry) {
   const map = /* @__PURE__ */ new Map();
   for (const member of members) {
     if (ts4.isPropertySignature(member)) {
-      const fieldNode = analyzeInterfacePropertyToIR(member, checker, file, typeRegistry, visiting);
+      const fieldNode = analyzeInterfacePropertyToIR(
+        member,
+        checker,
+        file,
+        typeRegistry,
+        visiting,
+        extensionRegistry
+      );
       if (fieldNode) {
         map.set(fieldNode.name, {
           constraints: [...fieldNode.constraints],
@@ -1967,7 +2696,7 @@ function buildFieldNodeInfoMap(members, checker, file, typeRegistry, visiting) {
   return map;
 }
 var MAX_ALIAS_CHAIN_DEPTH = 8;
-function extractTypeAliasConstraintNodes(typeNode, checker, file, depth = 0) {
+function extractTypeAliasConstraintNodes(typeNode, checker, file, extensionRegistry, depth = 0) {
   if (!ts4.isTypeReferenceNode(typeNode)) return [];
   if (depth >= MAX_ALIAS_CHAIN_DEPTH) {
     const aliasName = typeNode.typeName.getText();
@@ -1980,8 +2709,29 @@ function extractTypeAliasConstraintNodes(typeNode, checker, file, depth = 0) {
   const aliasDecl = symbol.declarations.find(ts4.isTypeAliasDeclaration);
   if (!aliasDecl) return [];
   if (ts4.isTypeLiteralNode(aliasDecl.type)) return [];
-  const constraints = extractJSDocConstraintNodes(aliasDecl, file);
-  constraints.push(...extractTypeAliasConstraintNodes(aliasDecl.type, checker, file, depth + 1));
+  const aliasFieldType = resolveTypeNode(
+    checker.getTypeAtLocation(aliasDecl.type),
+    checker,
+    file,
+    {},
+    /* @__PURE__ */ new Set(),
+    aliasDecl.type,
+    extensionRegistry
+  );
+  const constraints = extractJSDocConstraintNodes(
+    aliasDecl,
+    file,
+    makeParseOptions(extensionRegistry, aliasFieldType)
+  );
+  constraints.push(
+    ...extractTypeAliasConstraintNodes(
+      aliasDecl.type,
+      checker,
+      file,
+      extensionRegistry,
+      depth + 1
+    )
+  );
   return constraints;
 }
 function provenanceForNode(node, file) {
@@ -1997,6 +2747,12 @@ function provenanceForNode(node, file) {
 function provenanceForFile(file) {
   return { surface: "tsdoc", file, line: 0, column: 0 };
 }
+function provenanceForDeclaration(node, file) {
+  if (!node) {
+    return provenanceForFile(file);
+  }
+  return provenanceForNode(node, file);
+}
 function getNamedTypeName(type) {
   const symbol = type.getSymbol();
   if (symbol?.declarations) {
@@ -2015,6 +2771,20 @@ function getNamedTypeName(type) {
   }
   return null;
 }
+function getNamedTypeDeclaration(type) {
+  const symbol = type.getSymbol();
+  if (symbol?.declarations) {
+    const decl = symbol.declarations[0];
+    if (decl && (ts4.isClassDeclaration(decl) || ts4.isInterfaceDeclaration(decl) || ts4.isTypeAliasDeclaration(decl))) {
+      return decl;
+    }
+  }
+  const aliasSymbol = type.aliasSymbol;
+  if (aliasSymbol?.declarations) {
+    return aliasSymbol.declarations.find(ts4.isTypeAliasDeclaration);
+  }
+  return void 0;
+}
 function analyzeMethod(method, checker) {
   if (!ts4.isIdentifier(method.name)) {
     return null;
@@ -2057,10 +2827,10 @@ function detectFormSpecReference(typeNode) {
 }
 
 // src/generators/class-schema.ts
-function generateClassSchemas(analysis, source) {
+function generateClassSchemas(analysis, source, options) {
   const ir = canonicalizeTSDoc(analysis, source);
   return {
-    jsonSchema: generateJsonSchemaFromIR(ir),
+    jsonSchema: generateJsonSchemaFromIR(ir, options),
     uiSchema: generateUiSchemaFromIR(ir)
   };
 }
@@ -2070,27 +2840,54 @@ function generateSchemasFromClass(options) {
   if (!classDecl) {
     throw new Error(`Class "${options.className}" not found in ${options.filePath}`);
   }
-  const analysis = analyzeClassToIR(classDecl, ctx.checker, options.filePath);
-  return generateClassSchemas(analysis, { file: options.filePath });
+  const analysis = analyzeClassToIR(
+    classDecl,
+    ctx.checker,
+    options.filePath,
+    options.extensionRegistry
+  );
+  return generateClassSchemas(
+    analysis,
+    { file: options.filePath },
+    {
+      extensionRegistry: options.extensionRegistry,
+      vendorPrefix: options.vendorPrefix
+    }
+  );
 }
 function generateSchemas(options) {
   const ctx = createProgramContext(options.filePath);
   const source = { file: options.filePath };
   const classDecl = findClassByName(ctx.sourceFile, options.typeName);
   if (classDecl) {
-    const analysis = analyzeClassToIR(classDecl, ctx.checker, options.filePath);
-    return generateClassSchemas(analysis, source);
+    const analysis = analyzeClassToIR(
+      classDecl,
+      ctx.checker,
+      options.filePath,
+      options.extensionRegistry
+    );
+    return generateClassSchemas(analysis, source, options);
   }
   const interfaceDecl = findInterfaceByName(ctx.sourceFile, options.typeName);
   if (interfaceDecl) {
-    const analysis = analyzeInterfaceToIR(interfaceDecl, ctx.checker, options.filePath);
-    return generateClassSchemas(analysis, source);
+    const analysis = analyzeInterfaceToIR(
+      interfaceDecl,
+      ctx.checker,
+      options.filePath,
+      options.extensionRegistry
+    );
+    return generateClassSchemas(analysis, source, options);
   }
   const typeAlias = findTypeAliasByName(ctx.sourceFile, options.typeName);
   if (typeAlias) {
-    const result = analyzeTypeAliasToIR(typeAlias, ctx.checker, options.filePath);
+    const result = analyzeTypeAliasToIR(
+      typeAlias,
+      ctx.checker,
+      options.filePath,
+      options.extensionRegistry
+    );
     if (result.ok) {
-      return generateClassSchemas(result.analysis, source);
+      return generateClassSchemas(result.analysis, source, options);
     }
     throw new Error(result.error);
   }
@@ -2099,6 +2896,205 @@ function generateSchemas(options) {
   );
 }
 
+// src/generators/mixed-authoring.ts
+function buildMixedAuthoringSchemas(options) {
+  const { filePath, typeName, overlays, ...schemaOptions } = options;
+  const analysis = analyzeNamedType(filePath, typeName, schemaOptions.extensionRegistry);
+  const composedAnalysis = composeAnalysisWithOverlays(analysis, overlays);
+  const ir = canonicalizeTSDoc(composedAnalysis, { file: filePath });
+  return {
+    jsonSchema: generateJsonSchemaFromIR(ir, schemaOptions),
+    uiSchema: generateUiSchemaFromIR(ir)
+  };
+}
+function analyzeNamedType(filePath, typeName, extensionRegistry) {
+  const ctx = createProgramContext(filePath);
+  const source = { file: filePath };
+  const classDecl = findClassByName(ctx.sourceFile, typeName);
+  if (classDecl !== null) {
+    return analyzeClassToIR(classDecl, ctx.checker, source.file, extensionRegistry);
+  }
+  const interfaceDecl = findInterfaceByName(ctx.sourceFile, typeName);
+  if (interfaceDecl !== null) {
+    return analyzeInterfaceToIR(interfaceDecl, ctx.checker, source.file, extensionRegistry);
+  }
+  const typeAlias = findTypeAliasByName(ctx.sourceFile, typeName);
+  if (typeAlias !== null) {
+    const result = analyzeTypeAliasToIR(typeAlias, ctx.checker, source.file, extensionRegistry);
+    if (result.ok) {
+      return result.analysis;
+    }
+    throw new Error(result.error);
+  }
+  throw new Error(
+    `Type "${typeName}" not found as a class, interface, or type alias in ${filePath}`
+  );
+}
+function composeAnalysisWithOverlays(analysis, overlays) {
+  const overlayIR = canonicalizeChainDSL(overlays);
+  const overlayFields = collectOverlayFields(overlayIR.elements);
+  if (overlayFields.length === 0) {
+    return analysis;
+  }
+  const overlayByName = /* @__PURE__ */ new Map();
+  for (const field of overlayFields) {
+    if (overlayByName.has(field.name)) {
+      throw new Error(`Mixed-authoring overlays define "${field.name}" more than once`);
+    }
+    overlayByName.set(field.name, field);
+  }
+  const mergedFields = [];
+  for (const baseField of analysis.fields) {
+    const overlayField = overlayByName.get(baseField.name);
+    if (overlayField === void 0) {
+      mergedFields.push(baseField);
+      continue;
+    }
+    mergedFields.push(mergeFieldOverlay(baseField, overlayField, analysis.typeRegistry));
+    overlayByName.delete(baseField.name);
+  }
+  if (overlayByName.size > 0) {
+    const unknownFields = [...overlayByName.keys()].sort().join(", ");
+    throw new Error(
+      `Mixed-authoring overlays reference fields that are not present in the static model: ${unknownFields}`
+    );
+  }
+  return {
+    ...analysis,
+    fields: mergedFields
+  };
+}
+function collectOverlayFields(elements) {
+  const fields = [];
+  for (const element of elements) {
+    switch (element.kind) {
+      case "field":
+        fields.push(element);
+        break;
+      case "group":
+        fields.push(...collectOverlayFields(element.elements));
+        break;
+      case "conditional":
+        fields.push(...collectOverlayFields(element.elements));
+        break;
+      default: {
+        const _exhaustive = element;
+        void _exhaustive;
+      }
+    }
+  }
+  return fields;
+}
+function mergeFieldOverlay(baseField, overlayField, typeRegistry) {
+  assertSupportedOverlayField(baseField, overlayField);
+  return {
+    ...baseField,
+    type: mergeFieldType(baseField, overlayField, typeRegistry),
+    annotations: mergeAnnotations(baseField.annotations, overlayField.annotations)
+  };
+}
+function assertSupportedOverlayField(baseField, overlayField) {
+  if (overlayField.constraints.length > 0) {
+    throw new Error(
+      `Mixed-authoring overlay for "${baseField.name}" cannot define constraints; keep constraints on the static model`
+    );
+  }
+  if (overlayField.required && !baseField.required) {
+    throw new Error(
+      `Mixed-authoring overlay for "${baseField.name}" cannot change requiredness; keep requiredness on the static model`
+    );
+  }
+}
+function mergeFieldType(baseField, overlayField, typeRegistry) {
+  const { type: baseType } = baseField;
+  const { type: overlayType } = overlayField;
+  if (overlayType.kind === "object" || overlayType.kind === "array") {
+    throw new Error(
+      `Mixed-authoring overlays do not support nested object or array overlays for "${baseField.name}"`
+    );
+  }
+  if (overlayType.kind === "dynamic") {
+    if (!isCompatibleDynamicOverlay(baseField, overlayField, typeRegistry)) {
+      throw new Error(
+        `Mixed-authoring overlay for "${baseField.name}" is incompatible with the static field type`
+      );
+    }
+    return overlayType;
+  }
+  if (!isSameStaticTypeShape(baseType, overlayType)) {
+    throw new Error(
+      `Mixed-authoring overlay for "${baseField.name}" must preserve the static field type`
+    );
+  }
+  return baseType;
+}
+function isCompatibleDynamicOverlay(baseField, overlayField, typeRegistry) {
+  const overlayType = overlayField.type;
+  if (overlayType.kind !== "dynamic") {
+    return false;
+  }
+  const resolvedBaseType = resolveReferenceType(baseField.type, typeRegistry);
+  if (resolvedBaseType === null) {
+    return false;
+  }
+  if (overlayType.dynamicKind === "enum") {
+    return resolvedBaseType.kind === "primitive" ? resolvedBaseType.primitiveKind === "string" : resolvedBaseType.kind === "enum";
+  }
+  return resolvedBaseType.kind === "object" || resolvedBaseType.kind === "record";
+}
+function resolveReferenceType(type, typeRegistry, seen = /* @__PURE__ */ new Set()) {
+  if (type.kind !== "reference") {
+    return type;
+  }
+  if (seen.has(type.name)) {
+    return null;
+  }
+  const definition = typeRegistry[type.name];
+  if (definition === void 0) {
+    return null;
+  }
+  seen.add(type.name);
+  return resolveReferenceType(definition.type, typeRegistry, seen);
+}
+function isSameStaticTypeShape(baseType, overlayType) {
+  if (baseType.kind !== overlayType.kind) {
+    return false;
+  }
+  switch (baseType.kind) {
+    case "primitive":
+      return overlayType.kind === "primitive" && baseType.primitiveKind === overlayType.primitiveKind;
+    case "enum":
+      return overlayType.kind === "enum";
+    case "dynamic":
+      return overlayType.kind === "dynamic" && baseType.dynamicKind === overlayType.dynamicKind && baseType.sourceKey === overlayType.sourceKey;
+    case "record":
+      return overlayType.kind === "record";
+    case "reference":
+      return overlayType.kind === "reference" && baseType.name === overlayType.name;
+    case "union":
+      return overlayType.kind === "union";
+    case "custom":
+      return overlayType.kind === "custom" && baseType.typeId === overlayType.typeId;
+    case "object":
+    case "array":
+      return true;
+    default: {
+      const _exhaustive = baseType;
+      return _exhaustive;
+    }
+  }
+}
+function mergeAnnotations(baseAnnotations, overlayAnnotations) {
+  const baseKeys = new Set(baseAnnotations.map(annotationKey));
+  const overlayOnly = overlayAnnotations.filter(
+    (annotation) => !baseKeys.has(annotationKey(annotation))
+  );
+  return [...baseAnnotations, ...overlayOnly];
+}
+function annotationKey(annotation) {
+  return annotation.annotationKind === "custom" ? `${annotation.annotationKind}:${annotation.annotationId}` : annotation.annotationKind;
+}
+
 // src/index.ts
 function buildFormSchemas(form, options) {
   return {
@@ -2125,6 +3121,7 @@ function writeSchemas(form, options) {
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   buildFormSchemas,
+  buildMixedAuthoringSchemas,
   categorizationSchema,
   categorySchema,
   controlSchema,