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

package/dist/internals.cjs

@@ -2712,7 +2712,7 @@ function resolveRegisteredCustomTypeFromTypeNode(typeNode, extensionRegistry, ch
     };
   }
   if (ts3.isTypeReferenceNode(typeNode) && ts3.isIdentifier(typeNode.typeName)) {
-    const aliasDecl = checker.getSymbolAtLocation(typeNode.typeName)?.declarations?.find(ts3.isTypeAliasDeclaration);
+    const aliasDecl = getTypeAliasDeclarationFromTypeReference(typeNode, checker);
     if (aliasDecl !== void 0) {
       return resolveRegisteredCustomTypeFromTypeNode(aliasDecl.type, extensionRegistry, checker);
     }
@@ -2905,22 +2905,23 @@ function getReferencedTypeAliasDeclaration(sourceNode, checker) {
   if (!typeNode || !ts3.isTypeReferenceNode(typeNode)) {
     return void 0;
   }
-  return checker.getSymbolAtLocation(typeNode.typeName)?.declarations?.find(ts3.isTypeAliasDeclaration);
+  return getTypeAliasDeclarationFromTypeReference(typeNode, checker);
 }
 function shouldEmitPrimitiveAliasDefinition(typeNode, checker) {
   if (!ts3.isTypeReferenceNode(typeNode)) {
     return false;
   }
-  const aliasDecl = checker.getSymbolAtLocation(typeNode.typeName)?.declarations?.find(ts3.isTypeAliasDeclaration);
+  const aliasDecl = getTypeAliasDeclarationFromTypeReference(typeNode, checker);
   if (!aliasDecl) {
     return false;
   }
   const resolved = checker.getTypeFromTypeNode(aliasDecl.type);
   return !!(resolved.flags & (ts3.TypeFlags.String | ts3.TypeFlags.Number | ts3.TypeFlags.BigInt | ts3.TypeFlags.BigIntLiteral | ts3.TypeFlags.Boolean | ts3.TypeFlags.Null));
 }
-function resolveAliasedPrimitiveTarget(type, checker, file, typeRegistry, visiting, metadataPolicy = createAnalyzerMetadataPolicy(void 0), extensionRegistry, diagnostics) {
+function resolveAliasedPrimitiveTarget(type, checker, file, typeRegistry, visiting, metadataPolicy = createAnalyzerMetadataPolicy(void 0), extensionRegistry, diagnostics, visitedAliases = /* @__PURE__ */ new Set()) {
   const nestedAliasDecl = type.aliasSymbol?.declarations?.find(ts3.isTypeAliasDeclaration);
-  if (nestedAliasDecl !== void 0) {
+  if (nestedAliasDecl !== void 0 && !visitedAliases.has(nestedAliasDecl)) {
+    visitedAliases.add(nestedAliasDecl);
     return resolveAliasedPrimitiveTarget(
       checker.getTypeFromTypeNode(nestedAliasDecl.type),
       checker,
@@ -2929,9 +2930,25 @@ function resolveAliasedPrimitiveTarget(type, checker, file, typeRegistry, visiti
       visiting,
       metadataPolicy,
       extensionRegistry,
-      diagnostics
+      diagnostics,
+      visitedAliases
     );
   }
+  if (type.flags & ts3.TypeFlags.String) {
+    return { kind: "primitive", primitiveKind: "string" };
+  }
+  if (type.flags & ts3.TypeFlags.Number) {
+    return { kind: "primitive", primitiveKind: "number" };
+  }
+  if (type.flags & (ts3.TypeFlags.BigInt | ts3.TypeFlags.BigIntLiteral)) {
+    return { kind: "primitive", primitiveKind: "bigint" };
+  }
+  if (type.flags & ts3.TypeFlags.Boolean) {
+    return { kind: "primitive", primitiveKind: "boolean" };
+  }
+  if (type.flags & ts3.TypeFlags.Null) {
+    return { kind: "primitive", primitiveKind: "null" };
+  }
   return resolveTypeNode(
     type,
     checker,
@@ -3463,8 +3480,7 @@ function resolveAliasedTypeNode(typeNode, checker, visited = /* @__PURE__ */ new
   if (!ts3.isTypeReferenceNode(typeNode) || !ts3.isIdentifier(typeNode.typeName)) {
     return typeNode;
   }
-  const symbol = checker.getSymbolAtLocation(typeNode.typeName);
-  const aliasDecl = symbol?.declarations?.find(ts3.isTypeAliasDeclaration);
+  const aliasDecl = getTypeAliasDeclarationFromTypeReference(typeNode, checker);
   if (aliasDecl === void 0 || visited.has(aliasDecl)) {
     return typeNode;
   }
@@ -3514,8 +3530,7 @@ function extractTypeAliasConstraintNodes(typeNode, checker, file, extensionRegis
     );
   }
   const symbol = checker.getSymbolAtLocation(typeNode.typeName);
-  if (!symbol?.declarations) return [];
-  const aliasDecl = symbol.declarations.find(ts3.isTypeAliasDeclaration);
+  const aliasDecl = getAliasedTypeAliasDeclaration(symbol, checker);
   if (!aliasDecl) return [];
   if (ts3.isTypeLiteralNode(aliasDecl.type)) return [];
   const aliasFieldType = resolveTypeNode(
@@ -3538,6 +3553,18 @@ function extractTypeAliasConstraintNodes(typeNode, checker, file, extensionRegis
   );
   return constraints;
 }
+function getAliasedSymbol(symbol, checker) {
+  if (symbol === void 0) {
+    return void 0;
+  }
+  return symbol.flags & ts3.SymbolFlags.Alias ? checker.getAliasedSymbol(symbol) : symbol;
+}
+function getAliasedTypeAliasDeclaration(symbol, checker) {
+  return getAliasedSymbol(symbol, checker)?.declarations?.find(ts3.isTypeAliasDeclaration);
+}
+function getTypeAliasDeclarationFromTypeReference(typeNode, checker) {
+  return getAliasedTypeAliasDeclaration(checker.getSymbolAtLocation(typeNode.typeName), checker);
+}
 function provenanceForNode(node, file) {
   const sourceFile = node.getSourceFile();
   const { line, character } = sourceFile.getLineAndCharacterOfPosition(node.getStart());