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

package/dist/index.js

@@ -325,6 +325,7 @@ function canonicalizeTSDoc(analysis, source) {
     irVersion: IR_VERSION2,
     elements,
     typeRegistry: analysis.typeRegistry,
+    ...analysis.annotations !== void 0 && analysis.annotations.length > 0 && { annotations: analysis.annotations },
     provenance
   };
 }
@@ -401,6 +402,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 = [];
@@ -412,6 +416,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;
   }
@@ -441,22 +448,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);
@@ -674,6 +710,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":
@@ -698,8 +737,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;
@@ -887,25 +932,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)
         ]
       }
     }
@@ -913,10 +964,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;
@@ -1205,7 +1260,7 @@ var LENGTH_CONSTRAINT_MAP = {
   minItems: "minItems",
   maxItems: "maxItems"
 };
-var TAGS_REQUIRING_RAW_TEXT = /* @__PURE__ */ new Set(["pattern", "enumOptions"]);
+var TAGS_REQUIRING_RAW_TEXT = /* @__PURE__ */ new Set(["pattern", "enumOptions", "defaultValue"]);
 function createFormSpecTSDocConfig() {
   const config = new TSDocConfiguration();
   for (const tagName of Object.keys(BUILTIN_CONSTRAINT_DEFINITIONS)) {
@@ -1217,7 +1272,7 @@ function createFormSpecTSDocConfig() {
       })
     );
   }
-  for (const tagName of ["displayName", "description"]) {
+  for (const tagName of ["displayName", "description", "format", "placeholder"]) {
     config.addTagDefinition(
       new TSDocTagDefinition({
         tagName: "@" + tagName,
@@ -1236,6 +1291,12 @@ function getParser() {
 function parseTSDocTags(node, file = "") {
   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());
@@ -1255,30 +1316,37 @@ function parseTSDocTags(node, file = "") {
       const docComment = parserContext.docComment;
       for (const block of docComment.customBlocks) {
         const tagName = normalizeConstraintTagName(block.blockTag.tagName.substring(1));
-        if (tagName === "displayName" || tagName === "description") {
+        if (tagName === "displayName" || tagName === "description" || tagName === "format" || tagName === "placeholder") {
           const text2 = extractBlockText(block).trim();
           if (text2 === "") continue;
           const provenance2 = provenanceForComment(range, sourceFile, file, tagName);
           if (tagName === "displayName") {
+            if (!isMemberTargetDisplayName(text2) && displayName === void 0) {
+              displayName = text2;
+              displayNameProvenance = provenance2;
+            }
+          } else if (tagName === "format") {
             annotations.push({
               kind: "annotation",
-              annotationKind: "displayName",
+              annotationKind: "format",
               value: text2,
               provenance: provenance2
             });
           } else {
-            annotations.push({
-              kind: "annotation",
-              annotationKind: "description",
-              value: text2,
-              provenance: provenance2
-            });
+            if (tagName === "description" && description === void 0) {
+              description = text2;
+              descriptionProvenance = provenance2;
+            } else if (tagName === "placeholder" && placeholder === void 0) {
+              placeholder = text2;
+              placeholderProvenance = provenance2;
+            }
           }
           continue;
         }
         if (TAGS_REQUIRING_RAW_TEXT.has(tagName)) continue;
         const text = extractBlockText(block).trim();
-        if (text === "") continue;
+        const expectedType = isBuiltinConstraintName(tagName) ? BUILTIN_CONSTRAINT_DEFINITIONS[tagName] : void 0;
+        if (text === "" && expectedType !== "boolean") continue;
         const provenance = provenanceForComment(range, sourceFile, file, tagName);
         const constraintNode = parseConstraintValue(tagName, text, provenance);
         if (constraintNode) {
@@ -1286,14 +1354,47 @@ function parseTSDocTags(node, file = "") {
         }
       }
       if (docComment.deprecatedBlock !== void 0) {
+        const message = extractBlockText(docComment.deprecatedBlock).trim();
         annotations.push({
           kind: "annotation",
           annotationKind: "deprecated",
+          ...message !== "" && { message },
           provenance: provenanceForComment(range, sourceFile, file, "deprecated")
         });
       }
+      if (description === void 0 && docComment.remarksBlock !== void 0) {
+        const remarks = extractBlockText(docComment.remarksBlock).trim();
+        if (remarks !== "") {
+          description = remarks;
+          descriptionProvenance = provenanceForComment(range, sourceFile, file, "remarks");
+        }
+      }
     }
   }
+  if (displayName !== void 0 && displayNameProvenance !== void 0) {
+    annotations.push({
+      kind: "annotation",
+      annotationKind: "displayName",
+      value: displayName,
+      provenance: displayNameProvenance
+    });
+  }
+  if (description !== void 0 && descriptionProvenance !== void 0) {
+    annotations.push({
+      kind: "annotation",
+      annotationKind: "description",
+      value: description,
+      provenance: descriptionProvenance
+    });
+  }
+  if (placeholder !== void 0 && placeholderProvenance !== void 0) {
+    annotations.push({
+      kind: "annotation",
+      annotationKind: "placeholder",
+      value: placeholder,
+      provenance: placeholderProvenance
+    });
+  }
   const jsDocTagsAll = ts2.getJSDocTags(node);
   for (const tag of jsDocTagsAll) {
     const tagName = normalizeConstraintTagName(tag.tagName.text);
@@ -1302,6 +1403,11 @@ function parseTSDocTags(node, file = "") {
     if (commentText === void 0 || commentText.trim() === "") continue;
     const text = commentText.trim();
     const provenance = provenanceForJSDocTag(tag, file);
+    if (tagName === "defaultValue") {
+      const defaultValueNode = parseDefaultValueValue(text, provenance);
+      annotations.push(defaultValueNode);
+      continue;
+    }
     const constraintNode = parseConstraintValue(tagName, text, provenance);
     if (constraintNode) {
       constraints.push(constraintNode);
@@ -1309,6 +1415,28 @@ function parseTSDocTags(node, file = "") {
   }
   return { constraints, annotations };
 }
+function extractDisplayNameMetadata(node) {
+  let displayName;
+  const memberDisplayNames = /* @__PURE__ */ new Map();
+  for (const tag of ts2.getJSDocTags(node)) {
+    const tagName = normalizeConstraintTagName(tag.tagName.text);
+    if (tagName !== "displayName") continue;
+    const commentText = getTagCommentText(tag);
+    if (commentText === void 0) continue;
+    const text = commentText.trim();
+    if (text === "") continue;
+    const memberTarget = parseMemberTargetDisplayName(text);
+    if (memberTarget) {
+      memberDisplayNames.set(memberTarget.target, memberTarget.label);
+      continue;
+    }
+    displayName ??= text;
+  }
+  return {
+    ...displayName !== void 0 && { displayName },
+    memberDisplayNames
+  };
+}
 function extractPathTarget(text) {
   const trimmed = text.trimStart();
   const match = /^:([a-zA-Z_]\w*)\s+([\s\S]*)$/.exec(trimmed);
@@ -1371,7 +1499,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;
@@ -1403,6 +1569,34 @@ function parseConstraintValue(tagName, text, provenance) {
     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,11 +1678,17 @@ function isObjectType(type) {
 function isTypeReference(type) {
   return !!(type.flags & ts4.TypeFlags.Object) && !!(type.objectFlags & ts4.ObjectFlags.Reference);
 }
+var RESOLVING_TYPE_PLACEHOLDER = {
+  kind: "object",
+  properties: [],
+  additionalProperties: true
+};
 function analyzeClassToIR(classDecl, checker, file = "") {
   const name = classDecl.name?.text ?? "AnonymousClass";
   const fields = [];
   const fieldLayouts = [];
   const typeRegistry = {};
+  const annotations = extractJSDocAnnotationNodes(classDecl, file);
   const visiting = /* @__PURE__ */ new Set();
   const instanceMethods = [];
   const staticMethods = [];
@@ -1511,12 +1711,21 @@ 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 = "") {
   const name = interfaceDecl.name.text;
   const fields = [];
   const typeRegistry = {};
+  const annotations = extractJSDocAnnotationNodes(interfaceDecl, file);
   const visiting = /* @__PURE__ */ new Set();
   for (const member of interfaceDecl.members) {
     if (ts4.isPropertySignature(member)) {
@@ -1527,7 +1736,15 @@ function analyzeInterfaceToIR(interfaceDecl, checker, file = "") {
     }
   }
   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 = "") {
   if (!ts4.isTypeLiteralNode(typeAlias.type)) {
@@ -1542,6 +1759,7 @@ function analyzeTypeAliasToIR(typeAlias, checker, file = "") {
   const name = typeAlias.name.text;
   const fields = [];
   const typeRegistry = {};
+  const annotations = extractJSDocAnnotationNodes(typeAlias, file);
   const visiting = /* @__PURE__ */ new Set();
   for (const member of typeAlias.type.members) {
     if (ts4.isPropertySignature(member)) {
@@ -1558,6 +1776,7 @@ function analyzeTypeAliasToIR(typeAlias, checker, file = "") {
       fields,
       fieldLayouts: fields.map(() => ({})),
       typeRegistry,
+      ...annotations.length > 0 && { annotations },
       instanceMethods: [],
       staticMethods: []
     }
@@ -1571,7 +1790,7 @@ 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);
   const constraints = [];
   if (prop.type) {
     constraints.push(...extractTypeAliasConstraintNodes(prop.type, checker, file));
@@ -1580,7 +1799,7 @@ function analyzeFieldToIR(prop, checker, file, typeRegistry, visiting) {
   let annotations = [];
   annotations.push(...extractJSDocAnnotationNodes(prop, file));
   const defaultAnnotation = extractDefaultValueAnnotation(prop.initializer, file);
-  if (defaultAnnotation) {
+  if (defaultAnnotation && !annotations.some((a) => a.annotationKind === "defaultValue")) {
     annotations.push(defaultAnnotation);
   }
   ({ type, annotations } = applyEnumMemberDisplayNames(type, annotations));
@@ -1602,7 +1821,7 @@ 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);
   const constraints = [];
   if (prop.type) {
     constraints.push(...extractTypeAliasConstraintNodes(prop.type, checker, file));
@@ -1683,7 +1902,7 @@ function parseEnumMemberDisplayName(value) {
   if (label === "") return null;
   return { value: match[1], label };
 }
-function resolveTypeNode(type, checker, file, typeRegistry, visiting) {
+function resolveTypeNode(type, checker, file, typeRegistry, visiting, sourceNode) {
   if (type.flags & ts4.TypeFlags.String) {
     return { kind: "primitive", primitiveKind: "string" };
   }
@@ -1712,7 +1931,7 @@ 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);
   }
   if (checker.isArrayType(type)) {
     return resolveArrayType(type, checker, file, typeRegistry, visiting);
@@ -1722,70 +1941,102 @@ function resolveTypeNode(type, checker, file, typeRegistry, visiting) {
   }
   return { kind: "primitive", primitiveKind: "string" };
 }
-function resolveUnionType(type, checker, file, typeRegistry, visiting) {
+function resolveUnionType(type, checker, file, typeRegistry, visiting, sourceNode) {
+  const typeName = getNamedTypeName(type);
+  const namedDecl = getNamedTypeDeclaration(type);
+  if (typeName && typeName in typeRegistry) {
+    return { kind: "reference", name: typeName, typeArguments: [] };
+  }
   const allTypes = type.types;
   const nonNullTypes = allTypes.filter(
     (t) => !(t.flags & (ts4.TypeFlags.Null | ts4.TypeFlags.Undefined))
   );
   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) : 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;
+    const result = hasNull ? {
+      kind: "union",
+      members: [enumNode, { kind: "primitive", primitiveKind: "null" }]
+    } : enumNode;
+    return registerNamed(result);
   }
   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 inner = resolveTypeNode(
+      nonNullTypes[0],
+      checker,
+      file,
+      typeRegistry,
+      visiting,
+      sourceNode
+    );
+    const result = hasNull ? {
+      kind: "union",
+      members: [inner, { kind: "primitive", primitiveKind: "null" }]
+    } : inner;
+    return registerNamed(result);
   }
   const members = nonNullTypes.map(
-    (t) => resolveTypeNode(t, checker, file, typeRegistry, visiting)
+    (t) => resolveTypeNode(t, checker, file, typeRegistry, visiting, sourceNode)
   );
   if (hasNull) {
     members.push({ kind: "primitive", primitiveKind: "null" });
   }
-  return { kind: "union", members };
+  return registerNamed({ kind: "union", members });
 }
 function resolveArrayType(type, checker, file, typeRegistry, visiting) {
   const typeArgs = isTypeReference(type) ? type.typeArguments : void 0;
@@ -1801,30 +2052,84 @@ 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);
+  return { kind: "record", valueType };
+}
+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) {
-  const recordNode = tryResolveRecordType(type, checker, file, typeRegistry, visiting);
-  if (recordNode) {
-    return recordNode;
-  }
+  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);
+  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) : 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);
@@ -1833,7 +2138,14 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting) {
     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
+    );
     const fieldNodeInfo = fieldInfoMap?.get(prop.name);
     properties.push({
       name: prop.name,
@@ -1850,13 +2162,15 @@ 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) : 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;
 }
@@ -1948,6 +2262,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) {
@@ -1966,6 +2286,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;
@@ -2050,6 +2384,205 @@ function generateSchemas(options) {
   );
 }
 
+// src/generators/mixed-authoring.ts
+function buildMixedAuthoringSchemas(options) {
+  const { filePath, typeName, overlays, ...schemaOptions } = options;
+  const analysis = analyzeNamedType(filePath, typeName);
+  const composedAnalysis = composeAnalysisWithOverlays(analysis, overlays);
+  const ir = canonicalizeTSDoc(composedAnalysis, { file: filePath });
+  return {
+    jsonSchema: generateJsonSchemaFromIR(ir, schemaOptions),
+    uiSchema: generateUiSchemaFromIR(ir)
+  };
+}
+function analyzeNamedType(filePath, typeName) {
+  const ctx = createProgramContext(filePath);
+  const source = { file: filePath };
+  const classDecl = findClassByName(ctx.sourceFile, typeName);
+  if (classDecl !== null) {
+    return analyzeClassToIR(classDecl, ctx.checker, source.file);
+  }
+  const interfaceDecl = findInterfaceByName(ctx.sourceFile, typeName);
+  if (interfaceDecl !== null) {
+    return analyzeInterfaceToIR(interfaceDecl, ctx.checker, source.file);
+  }
+  const typeAlias = findTypeAliasByName(ctx.sourceFile, typeName);
+  if (typeAlias !== null) {
+    const result = analyzeTypeAliasToIR(typeAlias, ctx.checker, source.file);
+    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) {
+    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 [...overlayOnly, ...baseAnnotations];
+}
+function annotationKey(annotation) {
+  return annotation.annotationKind === "custom" ? `${annotation.annotationKind}:${annotation.annotationId}` : annotation.annotationKind;
+}
+
 // src/index.ts
 function buildFormSchemas(form, options) {
   return {
@@ -2075,6 +2608,7 @@ function writeSchemas(form, options) {
 }
 export {
   buildFormSchemas,
+  buildMixedAuthoringSchemas,
   categorizationSchema,
   categorySchema,
   controlSchema,