@formspec/build 0.1.0-alpha.51 → 0.1.0-alpha.53

package/dist/cli.js

@@ -1719,11 +1719,16 @@ var init_ir_generator = __esm({
 });
 
 // src/json-schema/generator.ts
+import { noopLogger as noopLogger2 } from "@formspec/core";
 function generateJsonSchema(form, options) {
+  const logger = (options?.logger ?? noopLogger2).child({ stage: "ir" });
   const metadata = options?.metadata;
   const vendorPrefix = options?.vendorPrefix;
   const enumSerialization = options?.enumSerialization;
+  logger.debug("canonicalizing chain DSL to IR");
   const ir = canonicalizeChainDSL(form, metadata !== void 0 ? { metadata } : void 0);
+  const schemaLogger = (options?.logger ?? noopLogger2).child({ stage: "schema" });
+  schemaLogger.debug("generating JSON Schema from IR");
   const internalOptions = vendorPrefix === void 0 && enumSerialization === void 0 ? void 0 : {
     ...vendorPrefix !== void 0 && { vendorPrefix },
     ...enumSerialization !== void 0 && { enumSerialization }
@@ -2010,11 +2015,16 @@ var init_ir_generator2 = __esm({
 });
 
 // src/ui-schema/generator.ts
+import { noopLogger as noopLogger3 } from "@formspec/core";
 function generateUiSchema(form, options) {
+  const logger = (options?.logger ?? noopLogger3).child({ stage: "ir" });
+  logger.debug("canonicalizing chain DSL to IR for UI Schema generation");
   const ir = canonicalizeChainDSL(
     form,
     options?.metadata !== void 0 ? { metadata: options.metadata } : void 0
   );
+  const schemaLogger = (options?.logger ?? noopLogger3).child({ stage: "schema" });
+  schemaLogger.debug("generating UI Schema from IR");
   return generateUiSchemaFromIR(ir);
 }
 var init_generator2 = __esm({
@@ -2401,8 +2411,22 @@ var init_resolve_custom_type = __esm({
   }
 });
 
-// src/analyzer/tsdoc-parser.ts
+// src/analyzer/builtin-brands.ts
 import * as ts3 from "typescript";
+function isIntegerBrandedType(type) {
+  if (!type.isIntersection()) return false;
+  if (!type.types.some((member) => !!(member.flags & ts3.TypeFlags.Number))) return false;
+  return collectBrandIdentifiers(type).includes("__integerBrand");
+}
+var init_builtin_brands = __esm({
+  "src/analyzer/builtin-brands.ts"() {
+    "use strict";
+    init_ts_type_utils();
+  }
+});
+
+// src/analyzer/tsdoc-parser.ts
+import * as ts4 from "typescript";
 import {
   checkSyntheticTagApplication,
   choosePreferredPayloadText,
@@ -2410,6 +2434,7 @@ import {
   getTagDefinition as getTagDefinition2,
   hasTypeSemanticCapability,
   normalizeFormSpecTagName as normalizeFormSpecTagName2,
+  stripNullishUnion as stripNullishUnion2,
   parseConstraintTagValue,
   parseDefaultValueTagValue,
   parseTagSyntax,
@@ -2443,23 +2468,23 @@ function getExtensionTypeNames(registry) {
 function collectImportedNames(sourceFile) {
   const importedNames = /* @__PURE__ */ new Set();
   for (const statement of sourceFile.statements) {
-    if (ts3.isImportDeclaration(statement) && statement.importClause !== void 0) {
+    if (ts4.isImportDeclaration(statement) && statement.importClause !== void 0) {
       const clause = statement.importClause;
       if (clause.name !== void 0) {
         importedNames.add(clause.name.text);
       }
       if (clause.namedBindings !== void 0) {
-        if (ts3.isNamedImports(clause.namedBindings)) {
+        if (ts4.isNamedImports(clause.namedBindings)) {
           for (const specifier of clause.namedBindings.elements) {
             importedNames.add(specifier.name.text);
           }
-        } else if (ts3.isNamespaceImport(clause.namedBindings)) {
+        } else if (ts4.isNamespaceImport(clause.namedBindings)) {
           importedNames.add(clause.namedBindings.name.text);
         }
       }
       continue;
     }
-    if (ts3.isImportEqualsDeclaration(statement)) {
+    if (ts4.isImportEqualsDeclaration(statement)) {
       importedNames.add(statement.name.text);
     }
   }
@@ -2467,50 +2492,96 @@ function collectImportedNames(sourceFile) {
 }
 function isNonReferenceIdentifier(node) {
   const parent = node.parent;
-  if ((ts3.isBindingElement(parent) || ts3.isClassDeclaration(parent) || ts3.isEnumDeclaration(parent) || ts3.isEnumMember(parent) || ts3.isFunctionDeclaration(parent) || ts3.isFunctionExpression(parent) || ts3.isImportClause(parent) || ts3.isImportEqualsDeclaration(parent) || ts3.isImportSpecifier(parent) || ts3.isInterfaceDeclaration(parent) || ts3.isMethodDeclaration(parent) || ts3.isMethodSignature(parent) || ts3.isModuleDeclaration(parent) || ts3.isNamespaceExport(parent) || ts3.isNamespaceImport(parent) || ts3.isParameter(parent) || ts3.isPropertyDeclaration(parent) || ts3.isPropertySignature(parent) || ts3.isSetAccessorDeclaration(parent) || ts3.isGetAccessorDeclaration(parent) || ts3.isTypeAliasDeclaration(parent) || ts3.isTypeParameterDeclaration(parent) || ts3.isVariableDeclaration(parent)) && parent.name === node) {
+  if ((ts4.isBindingElement(parent) || ts4.isClassDeclaration(parent) || ts4.isEnumDeclaration(parent) || ts4.isEnumMember(parent) || ts4.isFunctionDeclaration(parent) || ts4.isFunctionExpression(parent) || ts4.isImportClause(parent) || ts4.isImportEqualsDeclaration(parent) || ts4.isImportSpecifier(parent) || ts4.isInterfaceDeclaration(parent) || ts4.isMethodDeclaration(parent) || ts4.isMethodSignature(parent) || ts4.isModuleDeclaration(parent) || ts4.isNamespaceExport(parent) || ts4.isNamespaceImport(parent) || ts4.isParameter(parent) || ts4.isPropertyDeclaration(parent) || ts4.isPropertySignature(parent) || ts4.isSetAccessorDeclaration(parent) || ts4.isGetAccessorDeclaration(parent) || ts4.isTypeAliasDeclaration(parent) || ts4.isTypeParameterDeclaration(parent) || ts4.isVariableDeclaration(parent)) && parent.name === node) {
     return true;
   }
-  if ((ts3.isPropertyAssignment(parent) || ts3.isPropertyAccessExpression(parent)) && parent.name === node) {
+  if ((ts4.isPropertyAssignment(parent) || ts4.isPropertyAccessExpression(parent)) && parent.name === node) {
     return true;
   }
-  if (ts3.isQualifiedName(parent) && parent.right === node) {
+  if (ts4.isQualifiedName(parent) && parent.right === node) {
     return true;
   }
   return false;
 }
-function statementReferencesImportedName(statement, importedNames) {
+function astReferencesImportedName(root, importedNames) {
   if (importedNames.size === 0) {
     return false;
   }
-  let referencesImportedName = false;
+  let found = false;
   const visit = (node) => {
-    if (referencesImportedName) {
-      return;
-    }
-    if (ts3.isIdentifier(node) && importedNames.has(node.text) && !isNonReferenceIdentifier(node)) {
-      referencesImportedName = true;
+    if (found) return;
+    if (ts4.isIdentifier(node) && importedNames.has(node.text) && !isNonReferenceIdentifier(node)) {
+      found = true;
       return;
     }
-    ts3.forEachChild(node, visit);
+    ts4.forEachChild(node, visit);
   };
-  visit(statement);
-  return referencesImportedName;
+  visit(root);
+  return found;
+}
+function getObjectMembers(statement) {
+  if (ts4.isInterfaceDeclaration(statement)) {
+    return statement.members;
+  }
+  if (ts4.isTypeLiteralNode(statement.type)) {
+    return statement.type.members;
+  }
+  return void 0;
+}
+function rewriteImportedMemberTypes(statement, sourceFile, importedNames) {
+  const members = getObjectMembers(statement);
+  if (members === void 0) {
+    return null;
+  }
+  const replacements = [];
+  for (const member of members) {
+    if (!ts4.isPropertySignature(member)) {
+      if (astReferencesImportedName(member, importedNames)) {
+        return null;
+      }
+      continue;
+    }
+    const typeAnnotation = member.type;
+    if (typeAnnotation === void 0) continue;
+    if (astReferencesImportedName(typeAnnotation, importedNames)) {
+      replacements.push({
+        start: typeAnnotation.getStart(sourceFile),
+        end: typeAnnotation.getEnd()
+      });
+    }
+  }
+  if (replacements.length === 0) {
+    return statement.getText(sourceFile);
+  }
+  const stmtStart = statement.getStart(sourceFile);
+  let result = statement.getText(sourceFile);
+  for (const { start, end } of [...replacements].reverse()) {
+    result = result.slice(0, start - stmtStart) + "unknown" + result.slice(end - stmtStart);
+  }
+  return result;
 }
 function buildSupportingDeclarations(sourceFile, extensionTypeNames) {
   const importedNames = collectImportedNames(sourceFile);
   const importedNamesToSkip = new Set(
     [...importedNames].filter((name) => !extensionTypeNames.has(name))
   );
-  return sourceFile.statements.filter((statement) => {
-    if (ts3.isImportDeclaration(statement)) return false;
-    if (ts3.isImportEqualsDeclaration(statement)) return false;
-    if (ts3.isExportDeclaration(statement) && statement.moduleSpecifier !== void 0)
-      return false;
-    if (statementReferencesImportedName(statement, importedNamesToSkip)) {
-      return false;
+  const result = [];
+  for (const statement of sourceFile.statements) {
+    if (ts4.isImportDeclaration(statement)) continue;
+    if (ts4.isImportEqualsDeclaration(statement)) continue;
+    if (ts4.isExportDeclaration(statement) && statement.moduleSpecifier !== void 0) continue;
+    if (!astReferencesImportedName(statement, importedNamesToSkip)) {
+      result.push(statement.getText(sourceFile));
+      continue;
     }
-    return true;
-  }).map((statement) => statement.getText(sourceFile));
+    if (ts4.isInterfaceDeclaration(statement) || ts4.isTypeAliasDeclaration(statement)) {
+      const rewritten = rewriteImportedMemberTypes(statement, sourceFile, importedNamesToSkip);
+      if (rewritten !== null) {
+        result.push(rewritten);
+      }
+    }
+  }
+  return result;
 }
 function pushUniqueCompilerDiagnostics(target, additions) {
   for (const diagnostic of additions) {
@@ -2600,7 +2671,7 @@ function stripHintNullishUnion(type) {
     return type;
   }
   const nonNullish = type.types.filter(
-    (member) => (member.flags & (ts3.TypeFlags.Null | ts3.TypeFlags.Undefined)) === 0
+    (member) => (member.flags & (ts4.TypeFlags.Null | ts4.TypeFlags.Undefined)) === 0
   );
   if (nonNullish.length === 1 && nonNullish[0] !== void 0) {
     return nonNullish[0];
@@ -2616,10 +2687,10 @@ function isUserEmittableHintProperty(property, declaration) {
   }
   if ("name" in declaration && declaration.name !== void 0) {
     const name = declaration.name;
-    if (ts3.isComputedPropertyName(name) || ts3.isPrivateIdentifier(name)) {
+    if (ts4.isComputedPropertyName(name) || ts4.isPrivateIdentifier(name)) {
       return false;
     }
-    if (!ts3.isIdentifier(name) && !ts3.isStringLiteral(name) && !ts3.isNumericLiteral(name)) {
+    if (!ts4.isIdentifier(name) && !ts4.isStringLiteral(name) && !ts4.isNumericLiteral(name)) {
       return false;
     }
   }
@@ -2837,6 +2908,9 @@ function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, par
   }
   const hasBroadening = (() => {
     if (target === null) {
+      if (isIntegerBrandedType(stripNullishUnion2(subjectType)) && definition.capabilities.includes("numeric-comparable")) {
+        return true;
+      }
       return hasBuiltinConstraintBroadening(tagName, options);
     }
     const registry = options?.extensionRegistry;
@@ -2988,12 +3062,12 @@ function parseTSDocTags(node, file = "", options) {
   const sourceText = sourceFile.getFullText();
   const extensionTypeNames = getExtensionTypeNames(options?.extensionRegistry);
   const supportingDeclarations = buildSupportingDeclarations(sourceFile, extensionTypeNames);
-  const commentRanges = ts3.getLeadingCommentRanges(sourceText, node.getFullStart());
+  const commentRanges = ts4.getLeadingCommentRanges(sourceText, node.getFullStart());
   const rawTextFallbacks = collectRawTextFallbacks(node, file);
   const extensionTagNames = getExtensionTagNames(options);
   if (commentRanges) {
     for (const range of commentRanges) {
-      if (range.kind !== ts3.SyntaxKind.MultiLineCommentTrivia) {
+      if (range.kind !== ts4.SyntaxKind.MultiLineCommentTrivia) {
         continue;
       }
       const commentText = sourceText.substring(range.pos, range.end);
@@ -3150,10 +3224,10 @@ function extractDisplayNameMetadata(node) {
   const memberDisplayNames = /* @__PURE__ */ new Map();
   const sourceFile = node.getSourceFile();
   const sourceText = sourceFile.getFullText();
-  const commentRanges = ts3.getLeadingCommentRanges(sourceText, node.getFullStart());
+  const commentRanges = ts4.getLeadingCommentRanges(sourceText, node.getFullStart());
   if (commentRanges) {
     for (const range of commentRanges) {
-      if (range.kind !== ts3.SyntaxKind.MultiLineCommentTrivia) continue;
+      if (range.kind !== ts4.SyntaxKind.MultiLineCommentTrivia) continue;
       const commentText = sourceText.substring(range.pos, range.end);
       if (!commentText.startsWith("/**")) continue;
       const unified = parseUnifiedComment(commentText);
@@ -3178,7 +3252,7 @@ function extractDisplayNameMetadata(node) {
 }
 function collectRawTextFallbacks(node, file) {
   const fallbacks = /* @__PURE__ */ new Map();
-  for (const tag of ts3.getJSDocTags(node)) {
+  for (const tag of ts4.getJSDocTags(node)) {
     const tagName = normalizeConstraintTagName2(tag.tagName.text);
     if (!TAGS_REQUIRING_RAW_TEXT.has(tagName)) continue;
     const commentText = getTagCommentText(tag)?.trim() ?? "";
@@ -3233,14 +3307,15 @@ function getTagCommentText(tag) {
   if (typeof tag.comment === "string") {
     return tag.comment;
   }
-  return ts3.getTextOfJSDocComment(tag.comment);
+  return ts4.getTextOfJSDocComment(tag.comment);
 }
 var SYNTHETIC_TYPE_FORMAT_FLAGS, MAX_HINT_CANDIDATES, MAX_HINT_DEPTH, parseResultCache;
 var init_tsdoc_parser = __esm({
   "src/analyzer/tsdoc-parser.ts"() {
     "use strict";
     init_resolve_custom_type();
-    SYNTHETIC_TYPE_FORMAT_FLAGS = ts3.TypeFormatFlags.NoTruncation | ts3.TypeFormatFlags.UseAliasDefinedOutsideCurrentScope;
+    init_builtin_brands();
+    SYNTHETIC_TYPE_FORMAT_FLAGS = ts4.TypeFormatFlags.NoTruncation | ts4.TypeFormatFlags.UseAliasDefinedOutsideCurrentScope;
     MAX_HINT_CANDIDATES = 5;
     MAX_HINT_DEPTH = 3;
     parseResultCache = /* @__PURE__ */ new Map();
@@ -3248,7 +3323,7 @@ var init_tsdoc_parser = __esm({
 });
 
 // src/analyzer/jsdoc-constraints.ts
-import * as ts4 from "typescript";
+import * as ts5 from "typescript";
 function extractJSDocParseResult(node, file = "", options) {
   return parseTSDocTags(node, file, options);
 }
@@ -3263,18 +3338,18 @@ function extractJSDocAnnotationNodes(node, file = "", options) {
 function extractDefaultValueAnnotation(initializer, file = "") {
   if (!initializer) return null;
   let value;
-  if (ts4.isStringLiteral(initializer)) {
+  if (ts5.isStringLiteral(initializer)) {
     value = initializer.text;
-  } else if (ts4.isNumericLiteral(initializer)) {
+  } else if (ts5.isNumericLiteral(initializer)) {
     value = Number(initializer.text);
-  } else if (initializer.kind === ts4.SyntaxKind.TrueKeyword) {
+  } else if (initializer.kind === ts5.SyntaxKind.TrueKeyword) {
     value = true;
-  } else if (initializer.kind === ts4.SyntaxKind.FalseKeyword) {
+  } else if (initializer.kind === ts5.SyntaxKind.FalseKeyword) {
     value = false;
-  } else if (initializer.kind === ts4.SyntaxKind.NullKeyword) {
+  } else if (initializer.kind === ts5.SyntaxKind.NullKeyword) {
     value = null;
-  } else if (ts4.isPrefixUnaryExpression(initializer)) {
-    if (initializer.operator === ts4.SyntaxKind.MinusToken && ts4.isNumericLiteral(initializer.operand)) {
+  } else if (ts5.isPrefixUnaryExpression(initializer)) {
+    if (initializer.operator === ts5.SyntaxKind.MinusToken && ts5.isNumericLiteral(initializer.operand)) {
       value = -Number(initializer.operand.text);
     }
   }
@@ -3301,44 +3376,34 @@ var init_jsdoc_constraints = __esm({
 });
 
 // src/analyzer/class-analyzer.ts
-import * as ts5 from "typescript";
+import * as ts6 from "typescript";
 import {
   analyzeMetadataForNodeWithChecker,
   parseCommentBlock
 } from "@formspec/analysis/internal";
 function isObjectType(type) {
-  return !!(type.flags & ts5.TypeFlags.Object);
+  return !!(type.flags & ts6.TypeFlags.Object);
 }
 function isIntersectionType(type) {
-  return !!(type.flags & ts5.TypeFlags.Intersection);
-}
-function isIntegerBrandedType(type) {
-  if (!type.isIntersection()) {
-    return false;
-  }
-  const hasNumberBase = type.types.some((member) => !!(member.flags & ts5.TypeFlags.Number));
-  if (!hasNumberBase) {
-    return false;
-  }
-  return collectBrandIdentifiers(type).includes("__integerBrand");
+  return !!(type.flags & ts6.TypeFlags.Intersection);
 }
 function isResolvableObjectLikeAliasTypeNode(typeNode) {
-  if (ts5.isParenthesizedTypeNode(typeNode)) {
+  if (ts6.isParenthesizedTypeNode(typeNode)) {
     return isResolvableObjectLikeAliasTypeNode(typeNode.type);
   }
-  if (ts5.isTypeLiteralNode(typeNode) || ts5.isTypeReferenceNode(typeNode)) {
+  if (ts6.isTypeLiteralNode(typeNode) || ts6.isTypeReferenceNode(typeNode)) {
     return true;
   }
-  return ts5.isIntersectionTypeNode(typeNode) && typeNode.types.length > 0 && typeNode.types.every((member) => isResolvableObjectLikeAliasTypeNode(member));
+  return ts6.isIntersectionTypeNode(typeNode) && typeNode.types.length > 0 && typeNode.types.every((member) => isResolvableObjectLikeAliasTypeNode(member));
 }
 function isSemanticallyPlainObjectLikeType(type, checker) {
   if (isIntersectionType(type)) {
     return type.types.length > 0 && type.types.every((member) => isSemanticallyPlainObjectLikeType(member, checker));
   }
-  return isObjectType(type) && checker.getSignaturesOfType(type, ts5.SignatureKind.Call).length === 0 && checker.getSignaturesOfType(type, ts5.SignatureKind.Construct).length === 0 && !checker.isArrayType(type) && !checker.isTupleType(type);
+  return isObjectType(type) && checker.getSignaturesOfType(type, ts6.SignatureKind.Call).length === 0 && checker.getSignaturesOfType(type, ts6.SignatureKind.Construct).length === 0 && !checker.isArrayType(type) && !checker.isTupleType(type);
 }
 function isTypeReference(type) {
-  return !!(type.flags & ts5.TypeFlags.Object) && !!(type.objectFlags & ts5.ObjectFlags.Reference);
+  return !!(type.flags & ts6.TypeFlags.Object) && !!(type.objectFlags & ts6.ObjectFlags.Reference);
 }
 function makeParseOptions(extensionRegistry, fieldType, checker, subjectType, hostType) {
   if (extensionRegistry === void 0 && fieldType === void 0 && checker === void 0 && subjectType === void 0 && hostType === void 0) {
@@ -3398,7 +3463,7 @@ function resolveNodeMetadata(metadataPolicy, declarationKind, logicalName, node,
 function analyzeDeclarationRootInfo(declaration, checker, file = "", extensionRegistry, metadataPolicy) {
   const normalizedMetadataPolicy = createAnalyzerMetadataPolicy(metadataPolicy);
   const declarationType = checker.getTypeAtLocation(declaration);
-  const logicalName = ts5.isClassDeclaration(declaration) ? declaration.name?.text ?? "AnonymousClass" : declaration.name.text;
+  const logicalName = ts6.isClassDeclaration(declaration) ? declaration.name?.text ?? "AnonymousClass" : declaration.name.text;
   const docResult = extractJSDocParseResult(
     declaration,
     file,
@@ -3446,7 +3511,7 @@ function analyzeClassToIR(classDecl, checker, file = "", extensionRegistry, meta
   const instanceMethods = [];
   const staticMethods = [];
   for (const member of classDecl.members) {
-    if (ts5.isPropertyDeclaration(member)) {
+    if (ts6.isPropertyDeclaration(member)) {
       const fieldNode = analyzeFieldToIR(
         member,
         checker,
@@ -3462,10 +3527,10 @@ function analyzeClassToIR(classDecl, checker, file = "", extensionRegistry, meta
         fields.push(fieldNode);
         fieldLayouts.push({});
       }
-    } else if (ts5.isMethodDeclaration(member)) {
+    } else if (ts6.isMethodDeclaration(member)) {
       const methodInfo = analyzeMethod(member, checker);
       if (methodInfo) {
-        const isStatic = member.modifiers?.some((m) => m.kind === ts5.SyntaxKind.StaticKeyword);
+        const isStatic = member.modifiers?.some((m) => m.kind === ts6.SyntaxKind.StaticKeyword);
         if (isStatic) {
           staticMethods.push(methodInfo);
         } else {
@@ -3528,7 +3593,7 @@ function analyzeInterfaceToIR(interfaceDecl, checker, file = "", extensionRegist
   diagnostics.push(...interfaceDoc.diagnostics);
   const visiting = /* @__PURE__ */ new Set();
   for (const member of interfaceDecl.members) {
-    if (ts5.isPropertySignature(member)) {
+    if (ts6.isPropertySignature(member)) {
       const fieldNode = analyzeInterfacePropertyToIR(
         member,
         checker,
@@ -3586,7 +3651,7 @@ function analyzeTypeAliasToIR(typeAlias, checker, file = "", extensionRegistry,
   if (members === null) {
     const sourceFile = typeAlias.getSourceFile();
     const { line } = sourceFile.getLineAndCharacterOfPosition(typeAlias.getStart());
-    const kindDesc = ts5.SyntaxKind[typeAlias.type.kind] ?? "unknown";
+    const kindDesc = ts6.SyntaxKind[typeAlias.type.kind] ?? "unknown";
     return {
       ok: false,
       kind: "not-object-like",
@@ -3621,7 +3686,7 @@ function analyzeTypeAliasToIR(typeAlias, checker, file = "", extensionRegistry,
   diagnostics.push(...typeAliasDoc.diagnostics);
   const visiting = /* @__PURE__ */ new Set();
   for (const member of members) {
-    if (ts5.isPropertySignature(member)) {
+    if (ts6.isPropertySignature(member)) {
       const fieldNode = analyzeInterfacePropertyToIR(
         member,
         checker,
@@ -3688,13 +3753,13 @@ function makeAnalysisDiagnostic(code, message, primaryLocation, relatedLocations
 function getLeadingParsedTags(node) {
   const sourceFile = node.getSourceFile();
   const sourceText = sourceFile.getFullText();
-  const commentRanges = ts5.getLeadingCommentRanges(sourceText, node.getFullStart());
+  const commentRanges = ts6.getLeadingCommentRanges(sourceText, node.getFullStart());
   if (commentRanges === void 0) {
     return [];
   }
   const parsedTags = [];
   for (const range of commentRanges) {
-    if (range.kind !== ts5.SyntaxKind.MultiLineCommentTrivia) {
+    if (range.kind !== ts6.SyntaxKind.MultiLineCommentTrivia) {
       continue;
     }
     const commentText = sourceText.slice(range.pos, range.end);
@@ -3712,19 +3777,19 @@ function resolveDiscriminatorProperty(node, checker, fieldName) {
     return null;
   }
   const declaration = propertySymbol.valueDeclaration ?? propertySymbol.declarations?.find(
-    (candidate) => ts5.isPropertyDeclaration(candidate) || ts5.isPropertySignature(candidate)
+    (candidate) => ts6.isPropertyDeclaration(candidate) || ts6.isPropertySignature(candidate)
   ) ?? propertySymbol.declarations?.[0];
   return {
     declaration,
     type: checker.getTypeOfSymbolAtLocation(propertySymbol, declaration ?? node),
-    optional: !!(propertySymbol.flags & ts5.SymbolFlags.Optional) || declaration !== void 0 && "questionToken" in declaration && declaration.questionToken !== void 0
+    optional: !!(propertySymbol.flags & ts6.SymbolFlags.Optional) || declaration !== void 0 && "questionToken" in declaration && declaration.questionToken !== void 0
   };
 }
 function isLocalTypeParameterName(node, typeParameterName) {
   return node.typeParameters?.some((typeParameter) => typeParameter.name.text === typeParameterName) ?? false;
 }
 function isNullishSemanticType(type) {
-  if (type.flags & (ts5.TypeFlags.Null | ts5.TypeFlags.Undefined | ts5.TypeFlags.Void | ts5.TypeFlags.Unknown | ts5.TypeFlags.Any)) {
+  if (type.flags & (ts6.TypeFlags.Null | ts6.TypeFlags.Undefined | ts6.TypeFlags.Void | ts6.TypeFlags.Unknown | ts6.TypeFlags.Any)) {
     return true;
   }
   return type.isUnion() && type.types.some((member) => isNullishSemanticType(member));
@@ -3734,7 +3799,7 @@ function isStringLikeSemanticType(type, checker, seen = /* @__PURE__ */ new Set(
     return false;
   }
   seen.add(type);
-  if (type.flags & ts5.TypeFlags.StringLike) {
+  if (type.flags & ts6.TypeFlags.StringLike) {
     return true;
   }
   if (type.isUnion()) {
@@ -3747,13 +3812,13 @@ function isStringLikeSemanticType(type, checker, seen = /* @__PURE__ */ new Set(
   return false;
 }
 function getObjectLikeTypeAliasMembers(typeNode) {
-  if (ts5.isParenthesizedTypeNode(typeNode)) {
+  if (ts6.isParenthesizedTypeNode(typeNode)) {
     return getObjectLikeTypeAliasMembers(typeNode.type);
   }
-  if (ts5.isTypeLiteralNode(typeNode)) {
+  if (ts6.isTypeLiteralNode(typeNode)) {
     return [...typeNode.members];
   }
-  if (ts5.isIntersectionTypeNode(typeNode)) {
+  if (ts6.isIntersectionTypeNode(typeNode)) {
     const members = [];
     for (const intersectionMember of typeNode.types) {
       const resolvedMembers = getObjectLikeTypeAliasMembers(intersectionMember);
@@ -3916,7 +3981,7 @@ function resolveLiteralDiscriminatorPropertyValue(boundType, propertyName, check
   }
   if (propertyType.isUnion()) {
     const nonNullMembers = propertyType.types.filter(
-      (member) => !(member.flags & (ts5.TypeFlags.Null | ts5.TypeFlags.Undefined))
+      (member) => !(member.flags & (ts6.TypeFlags.Null | ts6.TypeFlags.Undefined))
     );
     if (nonNullMembers.length > 0 && nonNullMembers.every((member) => member.isStringLiteral())) {
       diagnostics.push(
@@ -3965,13 +4030,13 @@ function resolveNamedDiscriminatorDeclaration(type, checker, seen = /* @__PURE__
   seen.add(type);
   const symbol = type.aliasSymbol ?? type.getSymbol();
   if (symbol !== void 0) {
-    const aliased = symbol.flags & ts5.SymbolFlags.Alias ? checker.getAliasedSymbol(symbol) : void 0;
+    const aliased = symbol.flags & ts6.SymbolFlags.Alias ? checker.getAliasedSymbol(symbol) : void 0;
     const targetSymbol = aliased ?? symbol;
     const declaration = targetSymbol.declarations?.find(
-      (candidate) => ts5.isClassDeclaration(candidate) || ts5.isInterfaceDeclaration(candidate) || ts5.isTypeAliasDeclaration(candidate) || ts5.isEnumDeclaration(candidate)
+      (candidate) => ts6.isClassDeclaration(candidate) || ts6.isInterfaceDeclaration(candidate) || ts6.isTypeAliasDeclaration(candidate) || ts6.isEnumDeclaration(candidate)
     );
     if (declaration !== void 0) {
-      if (ts5.isTypeAliasDeclaration(declaration) && ts5.isTypeReferenceNode(declaration.type) && checker.getTypeFromTypeNode(declaration.type) !== type) {
+      if (ts6.isTypeAliasDeclaration(declaration) && ts6.isTypeReferenceNode(declaration.type) && checker.getTypeFromTypeNode(declaration.type) !== type) {
         return resolveNamedDiscriminatorDeclaration(
           checker.getTypeFromTypeNode(declaration.type),
           checker,
@@ -3999,7 +4064,7 @@ function resolveDiscriminatorValue(boundType, fieldName, checker, provenance, di
   }
   if (boundType.isUnion()) {
     const nonNullMembers = boundType.types.filter(
-      (member) => !(member.flags & (ts5.TypeFlags.Null | ts5.TypeFlags.Undefined))
+      (member) => !(member.flags & (ts6.TypeFlags.Null | ts6.TypeFlags.Undefined))
     );
     if (nonNullMembers.every((member) => member.isStringLiteral())) {
       diagnostics.push(
@@ -4044,7 +4109,7 @@ function resolveDiscriminatorValue(boundType, fieldName, checker, provenance, di
   return null;
 }
 function getDeclarationName(node) {
-  if (ts5.isClassDeclaration(node) || ts5.isInterfaceDeclaration(node) || ts5.isTypeAliasDeclaration(node) || ts5.isEnumDeclaration(node)) {
+  if (ts6.isClassDeclaration(node) || ts6.isInterfaceDeclaration(node) || ts6.isTypeAliasDeclaration(node) || ts6.isEnumDeclaration(node)) {
     return node.name?.text ?? "anonymous";
   }
   return "anonymous";
@@ -4099,11 +4164,11 @@ function extractReferenceTypeArguments(type, checker, file, typeRegistry, visiti
   if (sourceTypeNode === void 0) {
     return [];
   }
-  const unwrapParentheses = (typeNode) => ts5.isParenthesizedTypeNode(typeNode) ? unwrapParentheses(typeNode.type) : typeNode;
+  const unwrapParentheses = (typeNode) => ts6.isParenthesizedTypeNode(typeNode) ? unwrapParentheses(typeNode.type) : typeNode;
   const directTypeNode = unwrapParentheses(sourceTypeNode);
-  const referenceTypeNode = ts5.isTypeReferenceNode(directTypeNode) ? directTypeNode : (() => {
+  const referenceTypeNode = ts6.isTypeReferenceNode(directTypeNode) ? directTypeNode : (() => {
     const resolvedTypeNode = resolveAliasedTypeNode(directTypeNode, checker);
-    return ts5.isTypeReferenceNode(resolvedTypeNode) ? resolvedTypeNode : null;
+    return ts6.isTypeReferenceNode(resolvedTypeNode) ? resolvedTypeNode : null;
   })();
   if (referenceTypeNode?.typeArguments === void 0) {
     return [];
@@ -4158,7 +4223,7 @@ function applyDiscriminatorToObjectProperties(properties, node, subjectType, che
   );
 }
 function analyzeFieldToIR(prop, checker, file, typeRegistry, visiting, diagnostics, hostType, metadataPolicy, extensionRegistry) {
-  if (!ts5.isIdentifier(prop.name)) {
+  if (!ts6.isIdentifier(prop.name)) {
     return null;
   }
   const name = prop.name.text;
@@ -4285,7 +4350,7 @@ function findDuplicateObjectLikeTypeAliasPropertyNames(members) {
   const seen = /* @__PURE__ */ new Set();
   const duplicates = /* @__PURE__ */ new Set();
   for (const member of members) {
-    if (!ts5.isPropertySignature(member)) {
+    if (!ts6.isPropertySignature(member)) {
       continue;
     }
     const name = getAnalyzableObjectLikePropertyName(member.name);
@@ -4301,7 +4366,7 @@ function findDuplicateObjectLikeTypeAliasPropertyNames(members) {
   return [...duplicates].sort();
 }
 function getAnalyzableObjectLikePropertyName(name) {
-  if (ts5.isIdentifier(name) || ts5.isStringLiteral(name) || ts5.isNumericLiteral(name)) {
+  if (ts6.isIdentifier(name) || ts6.isStringLiteral(name) || ts6.isNumericLiteral(name)) {
     return name.text;
   }
   return null;
@@ -4399,25 +4464,25 @@ function resolveTypeNode(type, checker, file, typeRegistry, visiting, sourceNode
   if (isIntegerBrandedType(type)) {
     return { kind: "primitive", primitiveKind: "integer" };
   }
-  if (type.flags & ts5.TypeFlags.String) {
+  if (type.flags & ts6.TypeFlags.String) {
     return { kind: "primitive", primitiveKind: "string" };
   }
-  if (type.flags & ts5.TypeFlags.Number) {
+  if (type.flags & ts6.TypeFlags.Number) {
     return { kind: "primitive", primitiveKind: "number" };
   }
-  if (type.flags & (ts5.TypeFlags.BigInt | ts5.TypeFlags.BigIntLiteral)) {
+  if (type.flags & (ts6.TypeFlags.BigInt | ts6.TypeFlags.BigIntLiteral)) {
     return { kind: "primitive", primitiveKind: "bigint" };
   }
-  if (type.flags & ts5.TypeFlags.Boolean) {
+  if (type.flags & ts6.TypeFlags.Boolean) {
     return { kind: "primitive", primitiveKind: "boolean" };
   }
-  if (type.flags & ts5.TypeFlags.Null) {
+  if (type.flags & ts6.TypeFlags.Null) {
     return { kind: "primitive", primitiveKind: "null" };
   }
-  if (type.flags & ts5.TypeFlags.Undefined) {
+  if (type.flags & ts6.TypeFlags.Undefined) {
     return { kind: "primitive", primitiveKind: "null" };
   }
-  if (type.flags & ts5.TypeFlags.Void) {
+  if (type.flags & ts6.TypeFlags.Void) {
     return { kind: "primitive", primitiveKind: "null" };
   }
   if (type.isStringLiteral()) {
@@ -4504,10 +4569,10 @@ function resolveTypeNode(type, checker, file, typeRegistry, visiting, sourceNode
   return { kind: "primitive", primitiveKind: "string" };
 }
 function tryResolveNamedPrimitiveAlias(type, checker, file, typeRegistry, visiting, sourceNode, metadataPolicy = createAnalyzerMetadataPolicy(void 0), extensionRegistry, diagnostics) {
-  if (!(type.flags & (ts5.TypeFlags.String | ts5.TypeFlags.Number | ts5.TypeFlags.BigInt | ts5.TypeFlags.BigIntLiteral | ts5.TypeFlags.Boolean | ts5.TypeFlags.Null)) && !isIntegerBrandedType(type)) {
+  if (!(type.flags & (ts6.TypeFlags.String | ts6.TypeFlags.Number | ts6.TypeFlags.BigInt | ts6.TypeFlags.BigIntLiteral | ts6.TypeFlags.Boolean | ts6.TypeFlags.Null)) && !isIntegerBrandedType(type)) {
     return null;
   }
-  const aliasDecl = type.aliasSymbol?.declarations?.find(ts5.isTypeAliasDeclaration) ?? getReferencedTypeAliasDeclaration(sourceNode, checker);
+  const aliasDecl = type.aliasSymbol?.declarations?.find(ts6.isTypeAliasDeclaration) ?? getReferencedTypeAliasDeclaration(sourceNode, checker);
   if (!aliasDecl) {
     return null;
   }
@@ -4557,14 +4622,14 @@ function tryResolveNamedPrimitiveAlias(type, checker, file, typeRegistry, visiti
   return { kind: "reference", name: aliasName, typeArguments: [] };
 }
 function getReferencedTypeAliasDeclaration(sourceNode, checker) {
-  const typeNode = sourceNode && (ts5.isPropertyDeclaration(sourceNode) || ts5.isPropertySignature(sourceNode) || ts5.isParameter(sourceNode)) ? sourceNode.type : void 0;
-  if (!typeNode || !ts5.isTypeReferenceNode(typeNode)) {
+  const typeNode = sourceNode && (ts6.isPropertyDeclaration(sourceNode) || ts6.isPropertySignature(sourceNode) || ts6.isParameter(sourceNode)) ? sourceNode.type : void 0;
+  if (!typeNode || !ts6.isTypeReferenceNode(typeNode)) {
     return void 0;
   }
   return getTypeAliasDeclarationFromTypeReference(typeNode, checker);
 }
 function shouldEmitPrimitiveAliasDefinition(typeNode, checker) {
-  if (!ts5.isTypeReferenceNode(typeNode)) {
+  if (!ts6.isTypeReferenceNode(typeNode)) {
     return false;
   }
   const aliasDecl = getTypeAliasDeclarationFromTypeReference(typeNode, checker);
@@ -4572,10 +4637,10 @@ function shouldEmitPrimitiveAliasDefinition(typeNode, checker) {
     return false;
   }
   const resolved = checker.getTypeFromTypeNode(aliasDecl.type);
-  return !!(resolved.flags & (ts5.TypeFlags.String | ts5.TypeFlags.Number | ts5.TypeFlags.BigInt | ts5.TypeFlags.BigIntLiteral | ts5.TypeFlags.Boolean | ts5.TypeFlags.Null));
+  return !!(resolved.flags & (ts6.TypeFlags.String | ts6.TypeFlags.Number | ts6.TypeFlags.BigInt | ts6.TypeFlags.BigIntLiteral | ts6.TypeFlags.Boolean | ts6.TypeFlags.Null));
 }
 function resolveAliasedPrimitiveTarget(type, checker, file, typeRegistry, visiting, metadataPolicy = createAnalyzerMetadataPolicy(void 0), extensionRegistry, diagnostics, visitedAliases = /* @__PURE__ */ new Set()) {
-  const nestedAliasDecl = type.aliasSymbol?.declarations?.find(ts5.isTypeAliasDeclaration);
+  const nestedAliasDecl = type.aliasSymbol?.declarations?.find(ts6.isTypeAliasDeclaration);
   if (nestedAliasDecl !== void 0 && !visitedAliases.has(nestedAliasDecl)) {
     visitedAliases.add(nestedAliasDecl);
     return resolveAliasedPrimitiveTarget(
@@ -4593,19 +4658,19 @@ function resolveAliasedPrimitiveTarget(type, checker, file, typeRegistry, visiti
   if (isIntegerBrandedType(type)) {
     return { kind: "primitive", primitiveKind: "integer" };
   }
-  if (type.flags & ts5.TypeFlags.String) {
+  if (type.flags & ts6.TypeFlags.String) {
     return { kind: "primitive", primitiveKind: "string" };
   }
-  if (type.flags & ts5.TypeFlags.Number) {
+  if (type.flags & ts6.TypeFlags.Number) {
     return { kind: "primitive", primitiveKind: "number" };
   }
-  if (type.flags & (ts5.TypeFlags.BigInt | ts5.TypeFlags.BigIntLiteral)) {
+  if (type.flags & (ts6.TypeFlags.BigInt | ts6.TypeFlags.BigIntLiteral)) {
     return { kind: "primitive", primitiveKind: "bigint" };
   }
-  if (type.flags & ts5.TypeFlags.Boolean) {
+  if (type.flags & ts6.TypeFlags.Boolean) {
     return { kind: "primitive", primitiveKind: "boolean" };
   }
-  if (type.flags & ts5.TypeFlags.Null) {
+  if (type.flags & ts6.TypeFlags.Null) {
     return { kind: "primitive", primitiveKind: "null" };
   }
   return resolveTypeNode(
@@ -4632,13 +4697,13 @@ function resolveUnionType(type, checker, file, typeRegistry, visiting, sourceNod
     (memberTypeNode) => !isNullishTypeNode(resolveAliasedTypeNode(memberTypeNode, checker))
   );
   const nonNullTypes = allTypes.filter(
-    (memberType) => !(memberType.flags & (ts5.TypeFlags.Null | ts5.TypeFlags.Undefined))
+    (memberType) => !(memberType.flags & (ts6.TypeFlags.Null | ts6.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 & ts5.TypeFlags.Null);
+  const hasNull = allTypes.some((t) => t.flags & ts6.TypeFlags.Null);
   const memberDisplayNames = /* @__PURE__ */ new Map();
   if (namedDecl) {
     for (const [value, label] of extractDisplayNameMetadata(namedDecl).memberDisplayNames) {
@@ -4681,7 +4746,7 @@ function resolveUnionType(type, checker, file, typeRegistry, visiting, sourceNod
     const displayName = memberDisplayNames.get(String(value));
     return displayName !== void 0 ? { value, displayName } : { value };
   });
-  const isBooleanUnion2 = nonNullTypes.length === 2 && nonNullTypes.every((t) => t.flags & ts5.TypeFlags.BooleanLiteral);
+  const isBooleanUnion2 = nonNullTypes.length === 2 && nonNullTypes.every((t) => t.flags & ts6.TypeFlags.BooleanLiteral);
   if (isBooleanUnion2) {
     const boolNode = { kind: "primitive", primitiveKind: "boolean" };
     const result = hasNull ? {
@@ -4773,7 +4838,7 @@ function tryResolveRecordType(type, checker, file, typeRegistry, visiting, metad
   if (type.getProperties().length > 0) {
     return null;
   }
-  const indexInfo = checker.getIndexInfoOfType(type, ts5.IndexKind.String);
+  const indexInfo = checker.getIndexInfoOfType(type, ts6.IndexKind.String);
   if (!indexInfo) {
     return null;
   }
@@ -4821,10 +4886,10 @@ function shouldEmitResolvedObjectProperty(property, declaration) {
   }
   if (declaration !== void 0 && "name" in declaration && declaration.name !== void 0) {
     const name = declaration.name;
-    if (ts5.isComputedPropertyName(name) || ts5.isPrivateIdentifier(name)) {
+    if (ts6.isComputedPropertyName(name) || ts6.isPrivateIdentifier(name)) {
       return false;
     }
-    if (!ts5.isIdentifier(name) && !ts5.isStringLiteral(name) && !ts5.isNumericLiteral(name)) {
+    if (!ts6.isIdentifier(name) && !ts6.isStringLiteral(name) && !ts6.isNumericLiteral(name)) {
       return false;
     }
   }
@@ -4950,7 +5015,7 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting, sourceNo
     if (!declaration) continue;
     if (!shouldEmitResolvedObjectProperty(prop, declaration)) continue;
     const propType = checker.getTypeOfSymbolAtLocation(prop, declaration);
-    const optional = !!(prop.flags & ts5.SymbolFlags.Optional);
+    const optional = !!(prop.flags & ts6.SymbolFlags.Optional);
     const propTypeNode = resolveTypeNode(
       propType,
       checker,
@@ -4963,7 +5028,7 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting, sourceNo
       collectedDiagnostics
     );
     const fieldNodeInfo = fieldInfoMap?.get(prop.name);
-    const inlineFieldNodeInfo = fieldNodeInfo === void 0 ? ts5.isPropertySignature(declaration) ? analyzeInterfacePropertyToIR(
+    const inlineFieldNodeInfo = fieldNodeInfo === void 0 ? ts6.isPropertySignature(declaration) ? analyzeInterfacePropertyToIR(
       declaration,
       checker,
       file,
@@ -4973,7 +5038,7 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting, sourceNo
       type,
       metadataPolicy,
       extensionRegistry
-    ) : ts5.isPropertyDeclaration(declaration) ? analyzeFieldToIR(
+    ) : ts6.isPropertyDeclaration(declaration) ? analyzeFieldToIR(
       declaration,
       checker,
       file,
@@ -5001,7 +5066,7 @@ function resolveObjectType(type, checker, file, typeRegistry, visiting, sourceNo
   visiting.delete(type);
   const objectNode = {
     kind: "object",
-    properties: namedDecl !== void 0 && (ts5.isClassDeclaration(namedDecl) || ts5.isInterfaceDeclaration(namedDecl) || ts5.isTypeAliasDeclaration(namedDecl)) ? applyDiscriminatorToObjectProperties(
+    properties: namedDecl !== void 0 && (ts6.isClassDeclaration(namedDecl) || ts6.isInterfaceDeclaration(namedDecl) || ts6.isTypeAliasDeclaration(namedDecl)) ? applyDiscriminatorToObjectProperties(
       properties,
       namedDecl,
       type,
@@ -5049,12 +5114,12 @@ function getNamedTypeFieldNodeInfoMap(type, checker, file, typeRegistry, visitin
   for (const symbol of symbols) {
     const declarations = symbol.declarations;
     if (!declarations) continue;
-    const classDecl = declarations.find(ts5.isClassDeclaration);
+    const classDecl = declarations.find(ts6.isClassDeclaration);
     if (classDecl) {
       const map = /* @__PURE__ */ new Map();
       const hostType = checker.getTypeAtLocation(classDecl);
       for (const member of classDecl.members) {
-        if (ts5.isPropertyDeclaration(member) && ts5.isIdentifier(member.name)) {
+        if (ts6.isPropertyDeclaration(member) && ts6.isIdentifier(member.name)) {
           const fieldNode = analyzeFieldToIR(
             member,
             checker,
@@ -5078,7 +5143,7 @@ function getNamedTypeFieldNodeInfoMap(type, checker, file, typeRegistry, visitin
       }
       return map;
     }
-    const interfaceDecl = declarations.find(ts5.isInterfaceDeclaration);
+    const interfaceDecl = declarations.find(ts6.isInterfaceDeclaration);
     if (interfaceDecl) {
       return buildFieldNodeInfoMap(
         interfaceDecl.members,
@@ -5092,7 +5157,7 @@ function getNamedTypeFieldNodeInfoMap(type, checker, file, typeRegistry, visitin
         extensionRegistry
       );
     }
-    const typeAliasDecl = declarations.find(ts5.isTypeAliasDeclaration);
+    const typeAliasDecl = declarations.find(ts6.isTypeAliasDeclaration);
     const typeAliasMembers = typeAliasDecl === void 0 ? null : getObjectLikeTypeAliasMembers(typeAliasDecl.type);
     if (typeAliasDecl && typeAliasMembers !== null) {
       return buildFieldNodeInfoMap(
@@ -5116,10 +5181,10 @@ function extractArrayElementTypeNode(sourceNode, checker) {
     return void 0;
   }
   const resolvedTypeNode = resolveAliasedTypeNode(typeNode, checker);
-  if (ts5.isArrayTypeNode(resolvedTypeNode)) {
+  if (ts6.isArrayTypeNode(resolvedTypeNode)) {
     return resolvedTypeNode.elementType;
   }
-  if (ts5.isTypeReferenceNode(resolvedTypeNode) && ts5.isIdentifier(resolvedTypeNode.typeName) && resolvedTypeNode.typeName.text === "Array" && resolvedTypeNode.typeArguments?.[0]) {
+  if (ts6.isTypeReferenceNode(resolvedTypeNode) && ts6.isIdentifier(resolvedTypeNode.typeName) && resolvedTypeNode.typeName.text === "Array" && resolvedTypeNode.typeArguments?.[0]) {
     return resolvedTypeNode.typeArguments[0];
   }
   return void 0;
@@ -5130,13 +5195,13 @@ function extractUnionMemberTypeNodes(sourceNode, checker) {
     return [];
   }
   const resolvedTypeNode = resolveAliasedTypeNode(typeNode, checker);
-  return ts5.isUnionTypeNode(resolvedTypeNode) ? [...resolvedTypeNode.types] : [];
+  return ts6.isUnionTypeNode(resolvedTypeNode) ? [...resolvedTypeNode.types] : [];
 }
 function resolveAliasedTypeNode(typeNode, checker, visited = /* @__PURE__ */ new Set()) {
-  if (ts5.isParenthesizedTypeNode(typeNode)) {
+  if (ts6.isParenthesizedTypeNode(typeNode)) {
     return resolveAliasedTypeNode(typeNode.type, checker, visited);
   }
-  if (!ts5.isTypeReferenceNode(typeNode) || !ts5.isIdentifier(typeNode.typeName)) {
+  if (!ts6.isTypeReferenceNode(typeNode) || !ts6.isIdentifier(typeNode.typeName)) {
     return typeNode;
   }
   const aliasDecl = getTypeAliasDeclarationFromTypeReference(typeNode, checker);
@@ -5147,15 +5212,15 @@ function resolveAliasedTypeNode(typeNode, checker, visited = /* @__PURE__ */ new
   return resolveAliasedTypeNode(aliasDecl.type, checker, visited);
 }
 function isNullishTypeNode(typeNode) {
-  if (typeNode.kind === ts5.SyntaxKind.NullKeyword || typeNode.kind === ts5.SyntaxKind.UndefinedKeyword) {
+  if (typeNode.kind === ts6.SyntaxKind.NullKeyword || typeNode.kind === ts6.SyntaxKind.UndefinedKeyword) {
     return true;
   }
-  return ts5.isLiteralTypeNode(typeNode) && (typeNode.literal.kind === ts5.SyntaxKind.NullKeyword || typeNode.literal.kind === ts5.SyntaxKind.UndefinedKeyword);
+  return ts6.isLiteralTypeNode(typeNode) && (typeNode.literal.kind === ts6.SyntaxKind.NullKeyword || typeNode.literal.kind === ts6.SyntaxKind.UndefinedKeyword);
 }
 function buildFieldNodeInfoMap(members, checker, file, typeRegistry, visiting, metadataPolicy, hostType, diagnostics, extensionRegistry) {
   const map = /* @__PURE__ */ new Map();
   for (const member of members) {
-    if (ts5.isPropertySignature(member)) {
+    if (ts6.isPropertySignature(member)) {
       const fieldNode = analyzeInterfacePropertyToIR(
         member,
         checker,
@@ -5180,7 +5245,7 @@ function buildFieldNodeInfoMap(members, checker, file, typeRegistry, visiting, m
   return map;
 }
 function extractTypeAliasConstraintNodes(typeNode, checker, file, extensionRegistry, depth = 0) {
-  if (!ts5.isTypeReferenceNode(typeNode)) return [];
+  if (!ts6.isTypeReferenceNode(typeNode)) return [];
   if (depth >= MAX_ALIAS_CHAIN_DEPTH) {
     const aliasName = typeNode.typeName.getText();
     throw new Error(
@@ -5189,7 +5254,7 @@ function extractTypeAliasConstraintNodes(typeNode, checker, file, extensionRegis
   }
   const aliasDecl = getTypeAliasDeclarationFromTypeReference(typeNode, checker);
   if (!aliasDecl) return [];
-  if (ts5.isTypeLiteralNode(aliasDecl.type)) return [];
+  if (ts6.isTypeLiteralNode(aliasDecl.type)) return [];
   const aliasFieldType = resolveTypeNode(
     checker.getTypeAtLocation(aliasDecl.type),
     checker,
@@ -5233,14 +5298,14 @@ function getNamedTypeName(type) {
   const symbol = type.getSymbol();
   if (symbol?.declarations) {
     const decl = symbol.declarations[0];
-    if (decl && (ts5.isClassDeclaration(decl) || ts5.isInterfaceDeclaration(decl) || ts5.isTypeAliasDeclaration(decl))) {
-      const name = ts5.isClassDeclaration(decl) ? decl.name?.text : decl.name.text;
+    if (decl && (ts6.isClassDeclaration(decl) || ts6.isInterfaceDeclaration(decl) || ts6.isTypeAliasDeclaration(decl))) {
+      const name = ts6.isClassDeclaration(decl) ? decl.name?.text : decl.name.text;
       if (name) return name;
     }
   }
   const aliasSymbol = type.aliasSymbol;
   if (aliasSymbol?.declarations) {
-    const aliasDecl = aliasSymbol.declarations.find(ts5.isTypeAliasDeclaration);
+    const aliasDecl = aliasSymbol.declarations.find(ts6.isTypeAliasDeclaration);
     if (aliasDecl) {
       return aliasDecl.name.text;
     }
@@ -5251,24 +5316,24 @@ function getNamedTypeDeclaration(type) {
   const symbol = type.getSymbol();
   if (symbol?.declarations) {
     const decl = symbol.declarations[0];
-    if (decl && (ts5.isClassDeclaration(decl) || ts5.isInterfaceDeclaration(decl) || ts5.isTypeAliasDeclaration(decl))) {
+    if (decl && (ts6.isClassDeclaration(decl) || ts6.isInterfaceDeclaration(decl) || ts6.isTypeAliasDeclaration(decl))) {
       return decl;
     }
   }
   const aliasSymbol = type.aliasSymbol;
   if (aliasSymbol?.declarations) {
-    return aliasSymbol.declarations.find(ts5.isTypeAliasDeclaration);
+    return aliasSymbol.declarations.find(ts6.isTypeAliasDeclaration);
   }
   return void 0;
 }
 function analyzeMethod(method, checker) {
-  if (!ts5.isIdentifier(method.name)) {
+  if (!ts6.isIdentifier(method.name)) {
     return null;
   }
   const name = method.name.text;
   const parameters = [];
   for (const param of method.parameters) {
-    if (ts5.isIdentifier(param.name)) {
+    if (ts6.isIdentifier(param.name)) {
       const paramInfo = analyzeParameter(param, checker);
       parameters.push(paramInfo);
     }
@@ -5279,7 +5344,7 @@ function analyzeMethod(method, checker) {
   return { name, parameters, returnTypeNode, returnType };
 }
 function analyzeParameter(param, checker) {
-  const name = ts5.isIdentifier(param.name) ? param.name.text : "param";
+  const name = ts6.isIdentifier(param.name) ? param.name.text : "param";
   const typeNode = param.type;
   const type = checker.getTypeAtLocation(param);
   const formSpecExportName = detectFormSpecReference(typeNode);
@@ -5288,15 +5353,15 @@ function analyzeParameter(param, checker) {
 }
 function detectFormSpecReference(typeNode) {
   if (!typeNode) return null;
-  if (!ts5.isTypeReferenceNode(typeNode)) return null;
-  const typeName = ts5.isIdentifier(typeNode.typeName) ? typeNode.typeName.text : ts5.isQualifiedName(typeNode.typeName) ? typeNode.typeName.right.text : null;
+  if (!ts6.isTypeReferenceNode(typeNode)) return null;
+  const typeName = ts6.isIdentifier(typeNode.typeName) ? typeNode.typeName.text : ts6.isQualifiedName(typeNode.typeName) ? typeNode.typeName.right.text : null;
   if (typeName !== "InferSchema" && typeName !== "InferFormSchema") return null;
   const typeArg = typeNode.typeArguments?.[0];
-  if (!typeArg || !ts5.isTypeQueryNode(typeArg)) return null;
-  if (ts5.isIdentifier(typeArg.exprName)) {
+  if (!typeArg || !ts6.isTypeQueryNode(typeArg)) return null;
+  if (ts6.isIdentifier(typeArg.exprName)) {
     return typeArg.exprName.text;
   }
-  if (ts5.isQualifiedName(typeArg.exprName)) {
+  if (ts6.isQualifiedName(typeArg.exprName)) {
     return typeArg.exprName.right.text;
   }
   return null;
@@ -5309,6 +5374,7 @@ var init_class_analyzer = __esm({
     init_tsdoc_parser();
     init_resolve_custom_type();
     init_ts_type_utils();
+    init_builtin_brands();
     init_metadata();
     RESOLVING_TYPE_PLACEHOLDER = {
       kind: "object",
@@ -5320,7 +5386,7 @@ var init_class_analyzer = __esm({
 });
 
 // src/analyzer/program.ts
-import * as ts6 from "typescript";
+import * as ts7 from "typescript";
 import * as path from "path";
 function createProgramContextFromProgram(program, filePath) {
   const absolutePath = path.resolve(filePath);
@@ -5337,23 +5403,23 @@ function createProgramContextFromProgram(program, filePath) {
 function createProgramContext(filePath, additionalFiles) {
   const absolutePath = path.resolve(filePath);
   const fileDir = path.dirname(absolutePath);
-  const configPath = ts6.findConfigFile(fileDir, ts6.sys.fileExists.bind(ts6.sys), "tsconfig.json");
+  const configPath = ts7.findConfigFile(fileDir, ts7.sys.fileExists.bind(ts7.sys), "tsconfig.json");
   let compilerOptions;
   let fileNames;
   if (configPath) {
-    const configFile = ts6.readConfigFile(configPath, ts6.sys.readFile.bind(ts6.sys));
+    const configFile = ts7.readConfigFile(configPath, ts7.sys.readFile.bind(ts7.sys));
     if (configFile.error) {
       throw new Error(
-        `Error reading tsconfig.json: ${ts6.flattenDiagnosticMessageText(configFile.error.messageText, "\n")}`
+        `Error reading tsconfig.json: ${ts7.flattenDiagnosticMessageText(configFile.error.messageText, "\n")}`
       );
     }
-    const parsed = ts6.parseJsonConfigFileContent(
+    const parsed = ts7.parseJsonConfigFileContent(
       configFile.config,
-      ts6.sys,
+      ts7.sys,
       path.dirname(configPath)
     );
     if (parsed.errors.length > 0) {
-      const errorMessages = parsed.errors.map((e) => ts6.flattenDiagnosticMessageText(e.messageText, "\n")).join("\n");
+      const errorMessages = parsed.errors.map((e) => ts7.flattenDiagnosticMessageText(e.messageText, "\n")).join("\n");
       throw new Error(`Error parsing tsconfig.json: ${errorMessages}`);
     }
     compilerOptions = parsed.options;
@@ -5361,9 +5427,9 @@ function createProgramContext(filePath, additionalFiles) {
     fileNames = [.../* @__PURE__ */ new Set([...parsed.fileNames, absolutePath, ...normalizedAdditional])];
   } else {
     compilerOptions = {
-      target: ts6.ScriptTarget.ES2022,
-      module: ts6.ModuleKind.NodeNext,
-      moduleResolution: ts6.ModuleResolutionKind.NodeNext,
+      target: ts7.ScriptTarget.ES2022,
+      module: ts7.ModuleKind.NodeNext,
+      moduleResolution: ts7.ModuleResolutionKind.NodeNext,
       strict: true,
       skipLibCheck: true,
       declaration: true
@@ -5371,7 +5437,7 @@ function createProgramContext(filePath, additionalFiles) {
     const normalizedAdditional = (additionalFiles ?? []).map((f) => path.resolve(f));
     fileNames = [.../* @__PURE__ */ new Set([absolutePath, ...normalizedAdditional])];
   }
-  const program = ts6.createProgram(fileNames, compilerOptions);
+  const program = ts7.createProgram(fileNames, compilerOptions);
   const sourceFile = program.getSourceFile(absolutePath);
   if (!sourceFile) {
     throw new Error(`Could not find source file: ${absolutePath}`);
@@ -5390,19 +5456,19 @@ function findNodeByName(sourceFile, name, predicate, getName) {
       result = node;
       return;
     }
-    ts6.forEachChild(node, visit);
+    ts7.forEachChild(node, visit);
   }
   visit(sourceFile);
   return result;
 }
 function findClassByName(sourceFile, className) {
-  return findNodeByName(sourceFile, className, ts6.isClassDeclaration, (n) => n.name?.text);
+  return findNodeByName(sourceFile, className, ts7.isClassDeclaration, (n) => n.name?.text);
 }
 function findInterfaceByName(sourceFile, interfaceName) {
-  return findNodeByName(sourceFile, interfaceName, ts6.isInterfaceDeclaration, (n) => n.name.text);
+  return findNodeByName(sourceFile, interfaceName, ts7.isInterfaceDeclaration, (n) => n.name.text);
 }
 function findTypeAliasByName(sourceFile, aliasName) {
-  return findNodeByName(sourceFile, aliasName, ts6.isTypeAliasDeclaration, (n) => n.name.text);
+  return findNodeByName(sourceFile, aliasName, ts7.isTypeAliasDeclaration, (n) => n.name.text);
 }
 function getResolvedObjectRootType(rootType, typeRegistry) {
   if (rootType.kind === "object") {
@@ -5442,22 +5508,22 @@ function createResolvedObjectAliasAnalysis(name, rootType, typeRegistry, rootInf
   };
 }
 function containsTypeReferenceInObjectLikeAlias(typeNode) {
-  if (ts6.isParenthesizedTypeNode(typeNode)) {
+  if (ts7.isParenthesizedTypeNode(typeNode)) {
     return containsTypeReferenceInObjectLikeAlias(typeNode.type);
   }
-  if (ts6.isTypeReferenceNode(typeNode)) {
+  if (ts7.isTypeReferenceNode(typeNode)) {
     return true;
   }
-  return ts6.isIntersectionTypeNode(typeNode) && typeNode.types.some((member) => containsTypeReferenceInObjectLikeAlias(member));
+  return ts7.isIntersectionTypeNode(typeNode) && typeNode.types.some((member) => containsTypeReferenceInObjectLikeAlias(member));
 }
 function collectFallbackAliasMemberPropertyNames(typeNode, checker) {
-  if (ts6.isParenthesizedTypeNode(typeNode)) {
+  if (ts7.isParenthesizedTypeNode(typeNode)) {
     return collectFallbackAliasMemberPropertyNames(typeNode.type, checker);
   }
-  if (ts6.isTypeLiteralNode(typeNode)) {
+  if (ts7.isTypeLiteralNode(typeNode)) {
     const propertyNames = [];
     for (const member of typeNode.members) {
-      if (!ts6.isPropertySignature(member)) {
+      if (!ts7.isPropertySignature(member)) {
         continue;
       }
       const propertyName = getAnalyzableObjectLikePropertyName(member.name);
@@ -5467,13 +5533,13 @@ function collectFallbackAliasMemberPropertyNames(typeNode, checker) {
     }
     return propertyNames;
   }
-  if (ts6.isTypeReferenceNode(typeNode)) {
+  if (ts7.isTypeReferenceNode(typeNode)) {
     return checker.getTypeFromTypeNode(typeNode).getProperties().map((property) => property.getName());
   }
   return null;
 }
 function findFallbackAliasDuplicatePropertyNames(typeNode, checker) {
-  if (!ts6.isIntersectionTypeNode(typeNode)) {
+  if (!ts7.isIntersectionTypeNode(typeNode)) {
     return [];
   }
   const seen = /* @__PURE__ */ new Set();
@@ -5680,7 +5746,7 @@ var init_program = __esm({
 });
 
 // src/extensions/symbol-registry.ts
-import * as ts7 from "typescript";
+import * as ts8 from "typescript";
 import * as path2 from "path";
 function buildSymbolMapFromConfig(configPath, program, checker, extensionRegistry) {
   const symbolMap = /* @__PURE__ */ new Map();
@@ -5690,10 +5756,10 @@ function buildSymbolMapFromConfig(configPath, program, checker, extensionRegistr
     return symbolMap;
   }
   function visit(node) {
-    if (ts7.isCallExpression(node) && isDefineCustomTypeCall(node, checker)) {
+    if (ts8.isCallExpression(node) && isDefineCustomTypeCall(node, checker)) {
       processDefineCustomTypeCall(node);
     }
-    ts7.forEachChild(node, visit);
+    ts8.forEachChild(node, visit);
   }
   function processDefineCustomTypeCall(call) {
     const typeArgNode = call.typeArguments?.[0];
@@ -5730,7 +5796,7 @@ function isDefineCustomTypeCall(node, checker) {
   if (node.typeArguments === void 0 || node.typeArguments.length === 0) return false;
   const callSymbol = checker.getSymbolAtLocation(node.expression);
   if (callSymbol !== void 0) {
-    const resolved = callSymbol.flags & ts7.SymbolFlags.Alias ? checker.getAliasedSymbol(callSymbol) : callSymbol;
+    const resolved = callSymbol.flags & ts8.SymbolFlags.Alias ? checker.getAliasedSymbol(callSymbol) : callSymbol;
     const decl = resolved.declarations?.[0];
     if (decl !== void 0) {
       const sourceFile = decl.getSourceFile().fileName.replace(/\\/g, "/");
@@ -5738,24 +5804,24 @@ function isDefineCustomTypeCall(node, checker) {
       (sourceFile.includes("@formspec/core") || sourceFile.includes("/packages/core/"));
     }
   }
-  return ts7.isIdentifier(node.expression) && node.expression.text === "defineCustomType";
+  return ts8.isIdentifier(node.expression) && node.expression.text === "defineCustomType";
 }
 function extractTypeNameFromCallArg(call) {
   const arg = call.arguments[0];
-  if (arg === void 0 || !ts7.isObjectLiteralExpression(arg)) {
+  if (arg === void 0 || !ts8.isObjectLiteralExpression(arg)) {
     return null;
   }
   const typeNameProp = arg.properties.find(
-    (p) => ts7.isPropertyAssignment(p) && ts7.isIdentifier(p.name) && p.name.text === "typeName"
+    (p) => ts8.isPropertyAssignment(p) && ts8.isIdentifier(p.name) && p.name.text === "typeName"
   );
-  if (typeNameProp === void 0 || !ts7.isStringLiteral(typeNameProp.initializer)) {
+  if (typeNameProp === void 0 || !ts8.isStringLiteral(typeNameProp.initializer)) {
     return null;
   }
   return typeNameProp.initializer.text;
 }
 function extractEnclosingExtensionId(call, checker) {
-  for (let node = call.parent; !ts7.isSourceFile(node); node = node.parent) {
-    if (ts7.isCallExpression(node) && isDefineExtensionCall(node, checker)) {
+  for (let node = call.parent; !ts8.isSourceFile(node); node = node.parent) {
+    if (ts8.isCallExpression(node) && isDefineExtensionCall(node, checker)) {
       return extractExtensionIdFromCallArg(node);
     }
   }
@@ -5764,24 +5830,24 @@ function extractEnclosingExtensionId(call, checker) {
 function isDefineExtensionCall(node, checker) {
   const callSymbol = checker.getSymbolAtLocation(node.expression);
   if (callSymbol !== void 0) {
-    const resolved = callSymbol.flags & ts7.SymbolFlags.Alias ? checker.getAliasedSymbol(callSymbol) : callSymbol;
+    const resolved = callSymbol.flags & ts8.SymbolFlags.Alias ? checker.getAliasedSymbol(callSymbol) : callSymbol;
     const decl = resolved.declarations?.[0];
     if (decl !== void 0) {
       const sourceFile = decl.getSourceFile().fileName.replace(/\\/g, "/");
       return resolved.name === "defineExtension" && (sourceFile.includes("@formspec/core") || sourceFile.includes("/packages/core/"));
     }
   }
-  return ts7.isIdentifier(node.expression) && node.expression.text === "defineExtension";
+  return ts8.isIdentifier(node.expression) && node.expression.text === "defineExtension";
 }
 function extractExtensionIdFromCallArg(call) {
   const arg = call.arguments[0];
-  if (arg === void 0 || !ts7.isObjectLiteralExpression(arg)) {
+  if (arg === void 0 || !ts8.isObjectLiteralExpression(arg)) {
     return null;
   }
   const prop = arg.properties.find(
-    (p) => ts7.isPropertyAssignment(p) && ts7.isIdentifier(p.name) && p.name.text === "extensionId"
+    (p) => ts8.isPropertyAssignment(p) && ts8.isIdentifier(p.name) && p.name.text === "extensionId"
   );
-  if (prop === void 0 || !ts7.isStringLiteral(prop.initializer)) {
+  if (prop === void 0 || !ts8.isStringLiteral(prop.initializer)) {
     return null;
   }
   return prop.initializer.text;
@@ -5893,7 +5959,7 @@ var init_validate = __esm({
 });
 
 // src/generators/class-schema.ts
-import * as ts8 from "typescript";
+import * as ts9 from "typescript";
 function generateClassSchemas(analysis, source, options) {
   const result = generateClassSchemasDetailed(analysis, source, options);
   if (!result.ok || result.jsonSchema === void 0 || result.uiSchema === void 0) {
@@ -6063,7 +6129,7 @@ function generateSchemasBatch(options) {
   return options.targets.map((target) => {
     let ctx;
     try {
-      const cacheKey = ts8.sys.useCaseSensitiveFileNames ? target.filePath : target.filePath.toLowerCase();
+      const cacheKey = ts9.sys.useCaseSensitiveFileNames ? target.filePath : target.filePath.toLowerCase();
       const cachedContext = contextCache.get(cacheKey);
       if (cachedContext === void 0) {
         const additionalFiles = options.configPath !== void 0 ? [options.configPath] : void 0;
@@ -6232,7 +6298,7 @@ var init_class_schema = __esm({
 });
 
 // src/static-build.ts
-import * as ts9 from "typescript";
+import * as ts10 from "typescript";
 function toStaticBuildContext(context) {
   return context;
 }
@@ -6247,7 +6313,7 @@ function getModuleSymbol(context) {
   return context.checker.getSymbolAtLocation(context.sourceFile) ?? sourceFileWithSymbol.symbol;
 }
 function isSchemaSourceDeclaration(declaration) {
-  return ts9.isClassDeclaration(declaration) || ts9.isInterfaceDeclaration(declaration) || ts9.isTypeAliasDeclaration(declaration);
+  return ts10.isClassDeclaration(declaration) || ts10.isInterfaceDeclaration(declaration) || ts10.isTypeAliasDeclaration(declaration);
 }
 function resolveModuleExport(context, exportName = "default") {
   const moduleSymbol = getModuleSymbol(context);
@@ -6258,7 +6324,7 @@ function resolveModuleExport(context, exportName = "default") {
   if (exportSymbol === null) {
     return null;
   }
-  return exportSymbol.flags & ts9.SymbolFlags.Alias ? context.checker.getAliasedSymbol(exportSymbol) : exportSymbol;
+  return exportSymbol.flags & ts10.SymbolFlags.Alias ? context.checker.getAliasedSymbol(exportSymbol) : exportSymbol;
 }
 function resolveModuleExportDeclaration(context, exportName = "default") {
   return resolveModuleExport(context, exportName)?.declarations?.find(isSchemaSourceDeclaration) ?? null;
@@ -6271,7 +6337,7 @@ var init_static_build = __esm({
 });
 
 // src/generators/discovered-schema.ts
-import * as ts10 from "typescript";
+import * as ts11 from "typescript";
 import { analyzeMetadataForNodeWithChecker as analyzeMetadataForNodeWithChecker2 } from "@formspec/analysis/internal";
 import { IR_VERSION as IR_VERSION3 } from "@formspec/core/internals";
 function toDiscoveredTypeSchemas(result, resolvedMetadata) {
@@ -6281,17 +6347,17 @@ function toDiscoveredTypeSchemas(result, resolvedMetadata) {
   };
 }
 function isNamedTypeDeclaration(declaration) {
-  return ts10.isClassDeclaration(declaration) || ts10.isInterfaceDeclaration(declaration) || ts10.isTypeAliasDeclaration(declaration);
+  return ts11.isClassDeclaration(declaration) || ts11.isInterfaceDeclaration(declaration) || ts11.isTypeAliasDeclaration(declaration);
 }
 function hasConcreteTypeArguments(type, checker) {
   if ("aliasTypeArguments" in type && Array.isArray(type.aliasTypeArguments) && type.aliasTypeArguments.length > 0) {
     return true;
   }
-  if ((type.flags & ts10.TypeFlags.Object) === 0) {
+  if ((type.flags & ts11.TypeFlags.Object) === 0) {
     return false;
   }
   const objectType = type;
-  if ((objectType.objectFlags & ts10.ObjectFlags.Reference) === 0) {
+  if ((objectType.objectFlags & ts11.ObjectFlags.Reference) === 0) {
     return false;
   }
   return checker.getTypeArguments(objectType).length > 0;
@@ -6304,13 +6370,13 @@ function getNamedTypeDeclaration2(type) {
       return declaration;
     }
   }
-  const aliasDeclaration = type.aliasSymbol?.declarations?.find(ts10.isTypeAliasDeclaration);
+  const aliasDeclaration = type.aliasSymbol?.declarations?.find(ts11.isTypeAliasDeclaration);
   return aliasDeclaration;
 }
 function getFallbackName(sourceNode, fallback = "AnonymousType") {
   if (sourceNode !== void 0 && "name" in sourceNode) {
     const namedNode = sourceNode;
-    if (namedNode.name !== void 0 && ts10.isIdentifier(namedNode.name)) {
+    if (namedNode.name !== void 0 && ts11.isIdentifier(namedNode.name)) {
       return namedNode.name.text;
     }
   }
@@ -6532,7 +6598,7 @@ function generateSchemasFromResolvedType(options, skipNamedDeclaration = false,
 function generateSchemasFromDeclaration(options) {
   const filePath = options.declaration.getSourceFile().fileName;
   const resolved = resolveStaticOptions(options);
-  if (ts10.isClassDeclaration(options.declaration)) {
+  if (ts11.isClassDeclaration(options.declaration)) {
     return generateSchemasFromAnalysis(
       analyzeClassToIR(
         options.declaration,
@@ -6546,7 +6612,7 @@ function generateSchemasFromDeclaration(options) {
       resolved
     );
   }
-  if (ts10.isInterfaceDeclaration(options.declaration)) {
+  if (ts11.isInterfaceDeclaration(options.declaration)) {
     return generateSchemasFromAnalysis(
       analyzeInterfaceToIR(
         options.declaration,
@@ -6560,7 +6626,7 @@ function generateSchemasFromDeclaration(options) {
       resolved
     );
   }
-  if (ts10.isTypeAliasDeclaration(options.declaration)) {
+  if (ts11.isTypeAliasDeclaration(options.declaration)) {
     const analyzedAlias = analyzeTypeAliasToIR(
       options.declaration,
       options.context.checker,
@@ -6619,7 +6685,7 @@ function generateSchemasFromReturnType(options) {
   const returnType = signature !== void 0 ? options.context.checker.getReturnTypeOfSignature(signature) : options.context.checker.getTypeAtLocation(options.declaration);
   const type = unwrapPromiseType(options.context.checker, returnType);
   const sourceNode = type !== returnType ? unwrapPromiseTypeNode(options.declaration.type) ?? options.declaration.type ?? options.declaration : options.declaration.type ?? options.declaration;
-  const fallbackName = options.declaration.name !== void 0 && ts10.isIdentifier(options.declaration.name) ? `${options.declaration.name.text}ReturnType` : "ReturnType";
+  const fallbackName = options.declaration.name !== void 0 && ts11.isIdentifier(options.declaration.name) ? `${options.declaration.name.text}ReturnType` : "ReturnType";
   return generateSchemasFromResolvedType({
     ...options,
     type,
@@ -6666,14 +6732,14 @@ function unwrapPromiseTypeNode(typeNode) {
   if (typeNode === void 0) {
     return void 0;
   }
-  if (ts10.isParenthesizedTypeNode(typeNode)) {
+  if (ts11.isParenthesizedTypeNode(typeNode)) {
     const unwrapped = unwrapPromiseTypeNode(typeNode.type);
     return unwrapped ?? typeNode;
   }
   return isPromiseTypeReferenceNode(typeNode) ? typeNode.typeArguments[0] : typeNode;
 }
 function isPromiseTypeReferenceNode(typeNode) {
-  return ts10.isTypeReferenceNode(typeNode) && ts10.isIdentifier(typeNode.typeName) && typeNode.typeName.text === "Promise" && typeNode.typeArguments !== void 0 && typeNode.typeArguments.length > 0;
+  return ts11.isTypeReferenceNode(typeNode) && ts11.isIdentifier(typeNode.typeName) && typeNode.typeName.text === "Promise" && typeNode.typeArguments !== void 0 && typeNode.typeArguments.length > 0;
 }
 var init_discovered_schema = __esm({
   "src/generators/discovered-schema.ts"() {
@@ -6917,9 +6983,12 @@ __export(index_exports, {
   uiSchemaSchema: () => uiSchema,
   writeSchemas: () => writeSchemas
 });
+import { noopLogger as noopLogger4 } from "@formspec/core";
 import * as fs from "fs";
 import * as path3 from "path";
 function buildFormSchemas(form, options) {
+  const logger = options?.logger ?? noopLogger4;
+  logger.debug("buildFormSchemas: starting schema generation");
   return {
     jsonSchema: generateJsonSchema(form, options),
     uiSchema: generateUiSchema(form, options)
@@ -6932,12 +7001,15 @@ function writeSchemas(form, options) {
     indent = 2,
     vendorPrefix,
     enumSerialization,
-    metadata
+    metadata,
+    logger: rawLogger
   } = options;
-  const buildOptions = vendorPrefix === void 0 && enumSerialization === void 0 && metadata === void 0 ? void 0 : {
+  const logger = (rawLogger ?? noopLogger4).child({ stage: "write" });
+  const buildOptions = vendorPrefix === void 0 && enumSerialization === void 0 && metadata === void 0 ? { logger: rawLogger } : {
     ...vendorPrefix !== void 0 && { vendorPrefix },
     ...enumSerialization !== void 0 && { enumSerialization },
-    ...metadata !== void 0 && { metadata }
+    ...metadata !== void 0 && { metadata },
+    logger: rawLogger
   };
   const { jsonSchema, uiSchema: uiSchema2 } = buildFormSchemas(form, buildOptions);
   if (!fs.existsSync(outDir)) {
@@ -6945,7 +7017,9 @@ function writeSchemas(form, options) {
   }
   const jsonSchemaPath = path3.join(outDir, `${name}-schema.json`);
   const uiSchemaPath = path3.join(outDir, `${name}-uischema.json`);
+  logger.debug("writing JSON Schema", { path: jsonSchemaPath });
   fs.writeFileSync(jsonSchemaPath, JSON.stringify(jsonSchema, null, indent));
+  logger.debug("writing UI Schema", { path: uiSchemaPath });
   fs.writeFileSync(uiSchemaPath, JSON.stringify(uiSchema2, null, indent));
   return { jsonSchemaPath, uiSchemaPath };
 }
@@ -6973,6 +7047,33 @@ var init_index = __esm({
 // src/cli.ts
 import * as path4 from "path";
 import { pathToFileURL } from "url";
+
+// src/cli/logger.ts
+import { createRequire } from "module";
+import { isNamespaceEnabled, noopLogger } from "@formspec/core";
+var require2 = createRequire(import.meta.url);
+function createLogger(namespace) {
+  const debugEnv = process.env["DEBUG"] ?? "";
+  if (!isNamespaceEnabled(debugEnv, namespace)) {
+    return noopLogger;
+  }
+  const pinoModule = require2("pino");
+  const pino = typeof pinoModule === "function" ? pinoModule : pinoModule.default;
+  const isTTY = process.stderr.isTTY;
+  if (isTTY) {
+    const pinoPretty = require2("pino-pretty");
+    const prettyTransport = pinoPretty.default ?? pinoPretty;
+    const stream = prettyTransport({ destination: 2, colorize: true, sync: true });
+    return pino({ name: namespace, level: "debug" }, stream);
+  }
+  return pino(
+    { name: namespace, level: "debug" },
+    pino.destination({ dest: 2, sync: true })
+  );
+}
+
+// src/cli.ts
+var log = createLogger("formspec:build");
 function printHelp() {
   console.log(`
 FormSpec Build CLI - Generate JSON Schema and UI Schema
@@ -7062,6 +7163,7 @@ function parseArgs(args) {
   if (!name) {
     name = path4.basename(inputFile, path4.extname(inputFile));
   }
+  log.debug("Arguments parsed", { inputFile, outDir, name, enumSerialization });
   return { inputFile, outDir, name, enumSerialization };
 }
 async function main() {
@@ -7072,11 +7174,14 @@ async function main() {
   }
   const { inputFile, outDir, name, enumSerialization } = options;
   const absoluteInput = path4.resolve(process.cwd(), inputFile);
+  log.debug("Resolved input file", { absoluteInput });
   try {
     const fileUrl = pathToFileURL(absoluteInput).href;
+    log.debug("Loading form module", { fileUrl });
     const module = await import(fileUrl);
     const form = module["default"] ?? module["form"];
     if (!form || typeof form !== "object" || !("elements" in form)) {
+      log.error("Input file does not export a valid FormSpec", { fileUrl });
       console.error("Error: Input file must export a FormSpec as default export or as 'form'");
       console.error("Example:");
       console.error('  export default formspec(field.text("name"));');
@@ -7084,18 +7189,22 @@ async function main() {
       console.error('  export const form = formspec(field.text("name"));');
       process.exit(1);
     }
+    log.debug("Form module loaded, generating schemas");
     const { writeSchemas: writeSchemas2 } = await Promise.resolve().then(() => (init_index(), index_exports));
     const { jsonSchemaPath, uiSchemaPath } = writeSchemas2(
       form,
       { outDir, name, enumSerialization }
     );
+    log.debug("Schemas written", { jsonSchemaPath, uiSchemaPath });
     console.log("Generated:");
     console.log(`  ${jsonSchemaPath}`);
     console.log(`  ${uiSchemaPath}`);
   } catch (error) {
     if (error instanceof Error) {
+      log.child({ err: error.message }).error("Schema generation failed");
       console.error(`Error: ${error.message}`);
     } else {
+      log.error("Schema generation failed with unknown error");
       console.error("Error:", error);
     }
     process.exit(1);