@formspec/build 0.1.0-alpha.59 → 0.1.0-alpha.61

package/dist/cli.js

@@ -2139,7 +2139,7 @@ import {
 import {
   getTagDefinition,
   normalizeFormSpecTagName,
-  getSyntheticLogger,
+  getRegistryLogger,
   _validateExtensionSetup,
   logSetupDiagnostics
 } from "@formspec/analysis/internal";
@@ -2164,7 +2164,7 @@ function buildConstraintTagSources(extensions) {
   }));
 }
 function createExtensionRegistry(extensions) {
-  const registryLog = getSyntheticLogger();
+  const registryLog = getRegistryLogger();
   registryLog.debug("createExtensionRegistry: constructing", {
     extensionCount: extensions.length,
     extensionIds: extensions.map((e) => e.extensionId)
@@ -2537,9 +2537,11 @@ var init_builtin_brands = __esm({
 // src/analyzer/tsdoc-parser.ts
 import * as ts3 from "typescript";
 import {
-  checkSyntheticTagApplication,
+  _capabilityLabel,
+  _supportsConstraintCapability,
   choosePreferredPayloadText,
   extractPathTarget as extractSharedPathTarget,
+  getBroadenedCustomTypeId,
   getTagDefinition as getTagDefinition2,
   hasTypeSemanticCapability,
   normalizeFormSpecTagName as normalizeFormSpecTagName2,
@@ -2561,10 +2563,8 @@ import "@formspec/core/internals";
 import { noopLogger as noopLogger4 } from "@formspec/core";
 import {
   _emitSetupDiagnostics,
-  _mapSetupDiagnosticCode,
   getBuildLogger,
   getBroadeningLogger,
-  getSyntheticLogger as getSyntheticLogger2,
   getTypedParserLogger,
   extractEffectiveArgumentText,
   mapTypedParserDiagnosticCode,
@@ -2574,151 +2574,34 @@ import {
   nowMicros,
   logTagApplication
 } from "@formspec/analysis/internal";
-function sharedTagValueOptions(options) {
+function sharedTagValueOptions(options, pathResolvedCustomTypeId) {
   return {
     ...options?.extensionRegistry !== void 0 ? { registry: options.extensionRegistry } : {},
-    ...options?.fieldType !== void 0 ? { fieldType: options.fieldType } : {}
+    ...options?.fieldType !== void 0 ? { fieldType: options.fieldType } : {},
+    ...pathResolvedCustomTypeId !== void 0 ? { pathResolvedCustomTypeId } : {}
   };
 }
-function getExtensionTypeNames(registry) {
-  if (registry === void 0) {
-    return /* @__PURE__ */ new Set();
-  }
-  return new Set(
-    registry.extensions.flatMap(
-      (ext) => (ext.types ?? []).flatMap((t) => t.tsTypeNames ?? [t.typeName])
-    )
-  );
+function customTypeIdForResolvedType(resolvedType, checker, registry) {
+  if (registry === void 0) return void 0;
+  const lookup = resolveCustomTypeFromTsType(resolvedType, checker, registry);
+  return lookup === null ? void 0 : customTypeIdFromLookup(lookup);
 }
-function collectImportedNames(sourceFile) {
-  const importedNames = /* @__PURE__ */ new Set();
-  for (const statement of sourceFile.statements) {
-    if (ts3.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)) {
-          for (const specifier of clause.namedBindings.elements) {
-            importedNames.add(specifier.name.text);
-          }
-        } else if (ts3.isNamespaceImport(clause.namedBindings)) {
-          importedNames.add(clause.namedBindings.name.text);
-        }
-      }
-      continue;
-    }
-    if (ts3.isImportEqualsDeclaration(statement)) {
-      importedNames.add(statement.name.text);
-    }
-  }
-  return importedNames;
-}
-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) {
-    return true;
-  }
-  if ((ts3.isPropertyAssignment(parent) || ts3.isPropertyAccessExpression(parent)) && parent.name === node) {
-    return true;
-  }
-  if (ts3.isQualifiedName(parent) && parent.right === node) {
-    return true;
-  }
-  return false;
-}
-function astReferencesImportedName(root, importedNames) {
-  if (importedNames.size === 0) {
-    return false;
-  }
-  let found = false;
-  const visit = (node) => {
-    if (found) return;
-    if (ts3.isIdentifier(node) && importedNames.has(node.text) && !isNonReferenceIdentifier(node)) {
-      found = true;
-      return;
-    }
-    ts3.forEachChild(node, visit);
-  };
-  visit(root);
-  return found;
-}
-function getObjectMembers(statement) {
-  if (ts3.isInterfaceDeclaration(statement)) {
-    return statement.members;
-  }
-  if (ts3.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 (!ts3.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);
+function resolvePathTargetCustomTypeId(parsedTag, subjectType, checker, registry) {
+  if (parsedTag === null) return void 0;
+  const target = parsedTag.target;
+  if (target?.kind !== "path" || !target.valid || target.path === null) {
+    return void 0;
   }
-  return result;
-}
-function buildSupportingDeclarations(sourceFile, extensionTypeNames) {
-  const importedNames = collectImportedNames(sourceFile);
-  const importedNamesToSkip = new Set(
-    [...importedNames].filter((name) => !extensionTypeNames.has(name))
-  );
-  const result = [];
-  for (const statement of sourceFile.statements) {
-    if (ts3.isImportDeclaration(statement)) continue;
-    if (ts3.isImportEqualsDeclaration(statement)) continue;
-    if (ts3.isExportDeclaration(statement) && statement.moduleSpecifier !== void 0) continue;
-    if (!astReferencesImportedName(statement, importedNamesToSkip)) {
-      result.push(statement.getText(sourceFile));
-      continue;
-    }
-    if (ts3.isInterfaceDeclaration(statement) || ts3.isTypeAliasDeclaration(statement)) {
-      const rewritten = rewriteImportedMemberTypes(statement, sourceFile, importedNamesToSkip);
-      if (rewritten !== null) {
-        result.push(rewritten);
-      }
-    }
+  if (subjectType === void 0 || checker === void 0) {
+    return void 0;
   }
-  return result;
-}
-function pushUniqueCompilerDiagnostics(target, additions) {
-  for (const diagnostic of additions) {
-    if ((diagnostic.code === "UNSUPPORTED_CUSTOM_TYPE_OVERRIDE" || diagnostic.code === "SYNTHETIC_SETUP_FAILURE") && target.some(
-      (existing) => existing.code === diagnostic.code && existing.message === diagnostic.message
-    )) {
-      continue;
-    }
-    target.push(diagnostic);
+  const resolution = resolvePathTargetType(subjectType, checker, target.path.segments);
+  if (resolution.kind !== "resolved") {
+    return void 0;
   }
+  return customTypeIdForResolvedType(resolution.type, checker, registry);
 }
-function processConstraintTag(tagName, text, parsedTag, provenance, node, sourceFile, supportingDeclarations, options, constraints, diagnostics) {
+function processConstraintTag(tagName, text, parsedTag, provenance, node, sourceFile, options, constraints, diagnostics) {
   const compilerDiagnostics = buildCompilerBackedConstraintDiagnostics(
     node,
     sourceFile,
@@ -2726,74 +2609,30 @@ function processConstraintTag(tagName, text, parsedTag, provenance, node, source
     parsedTag,
     text,
     provenance,
-    supportingDeclarations,
     options
   );
   if (compilerDiagnostics.length > 0) {
-    pushUniqueCompilerDiagnostics(diagnostics, compilerDiagnostics);
+    diagnostics.push(...compilerDiagnostics);
     return;
   }
+  const pathResolvedCustomTypeId = resolvePathTargetCustomTypeId(
+    parsedTag,
+    options?.subjectType,
+    options?.checker,
+    options?.extensionRegistry
+  );
   const constraintNode = parseConstraintTagValue(
     tagName,
     text,
     provenance,
-    sharedTagValueOptions(options)
+    sharedTagValueOptions(options, pathResolvedCustomTypeId)
   );
   if (constraintNode) {
     constraints.push(constraintNode);
   }
 }
-function renderSyntheticArgumentExpression(valueKind, argumentText) {
-  const trimmed = argumentText.trim();
-  if (trimmed === "") {
-    return null;
-  }
-  switch (valueKind) {
-    case "number":
-    case "integer":
-    case "signedInteger":
-      if (trimmed === "Infinity" || trimmed === "-Infinity" || trimmed === "NaN") {
-        return trimmed;
-      }
-      return Number.isFinite(Number(trimmed)) ? trimmed : JSON.stringify(trimmed);
-    case "string":
-      return JSON.stringify(argumentText);
-    case "json":
-      try {
-        JSON.parse(trimmed);
-        return `(${trimmed})`;
-      } catch {
-        return JSON.stringify(trimmed);
-      }
-    case "boolean":
-      return trimmed === "true" || trimmed === "false" ? trimmed : JSON.stringify(trimmed);
-    case "condition":
-      return "undefined as unknown as FormSpecCondition";
-    case null:
-      return null;
-    default: {
-      return String(valueKind);
-    }
-  }
-}
-function getArrayElementType(type, checker) {
-  if (!checker.isArrayType(type)) {
-    return null;
-  }
-  return checker.getTypeArguments(type)[0] ?? null;
-}
 function supportsConstraintCapability(type, checker, capability) {
-  if (capability === void 0) {
-    return true;
-  }
-  if (hasTypeSemanticCapability(type, checker, capability)) {
-    return true;
-  }
-  if (capability === "string-like") {
-    const itemType = getArrayElementType(type, checker);
-    return itemType !== null && hasTypeSemanticCapability(itemType, checker, capability);
-  }
-  return false;
+  return _supportsConstraintCapability(capability, type, checker);
 }
 function stripHintNullishUnion(type) {
   if (!type.isUnion()) {
@@ -2918,53 +2757,11 @@ function placementLabel(placement) {
     }
   }
 }
-function capabilityLabel(capability) {
-  switch (capability) {
-    case "numeric-comparable":
-      return "number";
-    case "string-like":
-      return "string";
-    case "array-like":
-      return "array";
-    case "enum-member-addressable":
-      return "enum";
-    case "json-like":
-      return "JSON-compatible";
-    case "object-like":
-      return "object";
-    case "condition-like":
-      return "conditional";
-    case void 0:
-      return "compatible";
-    default:
-      return capability;
-  }
-}
-function getBroadenedCustomTypeId(fieldType) {
-  if (fieldType?.kind === "custom") {
-    return fieldType.typeId;
-  }
-  if (fieldType?.kind !== "union") {
-    return void 0;
-  }
-  const customMembers = fieldType.members.filter(
-    (member) => member.kind === "custom"
-  );
-  if (customMembers.length !== 1) {
-    return void 0;
-  }
-  const nonCustomMembers = fieldType.members.filter((member) => member.kind !== "custom");
-  const allOtherMembersAreNull = nonCustomMembers.every(
-    (member) => member.kind === "primitive" && member.primitiveKind === "null"
-  );
-  const customMember = customMembers[0];
-  return allOtherMembersAreNull && customMember !== void 0 ? customMember.typeId : void 0;
-}
 function hasBuiltinConstraintBroadening(tagName, options) {
   const broadenedTypeId = getBroadenedCustomTypeId(options?.fieldType);
   return broadenedTypeId !== void 0 && options?.extensionRegistry?.findBuiltinConstraintBroadening(broadenedTypeId, tagName) !== void 0;
 }
-function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, parsedTag, rawText, provenance, supportingDeclarations, options) {
+function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, parsedTag, rawText, provenance, options) {
   if (!isBuiltinConstraintName(tagName)) {
     return [];
   }
@@ -2984,16 +2781,14 @@ function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, par
   const nonNullPlacement = placement;
   const log2 = getBuildLogger();
   const broadeningLog = getBroadeningLogger();
-  const syntheticLog = getSyntheticLogger2();
   const typedParserLog = getTypedParserLogger();
   const logsEnabled = log2 !== noopLogger4 || broadeningLog !== noopLogger4;
-  const syntheticTraceEnabled = syntheticLog !== noopLogger4;
   const typedParserTraceEnabled = typedParserLog !== noopLogger4;
   const logStart = logsEnabled ? nowMicros() : 0;
   const subjectTypeKind = logsEnabled ? describeTypeKind(subjectType, checker) : "";
-  function emit(outcome, result2) {
+  function emit(outcome, result) {
     if (!logsEnabled) {
-      return result2;
+      return result;
     }
     const entry = {
       consumer: "build",
@@ -3007,7 +2802,7 @@ function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, par
     if (outcome === "bypass" || outcome === "D1" || outcome === "D2") {
       logTagApplication(broadeningLog, entry);
     }
-    return result2;
+    return result;
   }
   if (!definition.placements.includes(placement)) {
     return emit("A-reject", [
@@ -3051,7 +2846,7 @@ function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, par
       ]);
     }
     if (resolution.kind === "unresolvable") {
-      const actualType = checker.typeToString(resolution.type, node, SYNTHETIC_TYPE_FORMAT_FLAGS);
+      const actualType = checker.typeToString(resolution.type, node, TYPE_FORMAT_FLAGS);
       return emit("B-reject", [
         makeDiagnostic(
           "TYPE_MISMATCH",
@@ -3065,21 +2860,21 @@ function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, par
   }
   const hasBroadening = (() => {
     if (target === null) {
-      if (_isIntegerBrandedType(stripNullishUnion2(subjectType)) && definition.capabilities.includes("numeric-comparable")) {
+      if (_isIntegerBrandedType(stripNullishUnion2(subjectType)) && definition.capabilities[0] === "numeric-comparable") {
         return true;
       }
       return hasBuiltinConstraintBroadening(tagName, options);
     }
     const registry = options?.extensionRegistry;
     if (registry === void 0) return false;
-    const resolved = resolveCustomTypeFromTsType(evaluatedType, checker, registry);
-    return resolved !== null && registry.findBuiltinConstraintBroadening(customTypeIdFromLookup(resolved), tagName) !== void 0;
+    const typeId = customTypeIdForResolvedType(evaluatedType, checker, registry);
+    return typeId !== void 0 && registry.findBuiltinConstraintBroadening(typeId, tagName) !== void 0;
   })();
   if (!hasBroadening) {
     const requiredCapability = definition.capabilities[0];
     if (requiredCapability !== void 0 && !supportsConstraintCapability(evaluatedType, checker, requiredCapability)) {
-      const actualType = checker.typeToString(evaluatedType, node, SYNTHETIC_TYPE_FORMAT_FLAGS);
-      const baseMessage = `Target "${targetLabel}": constraint "${tagName}" is only valid on ${capabilityLabel(requiredCapability)} targets, but field type is "${actualType}"`;
+      const actualType = checker.typeToString(evaluatedType, node, TYPE_FORMAT_FLAGS);
+      const baseMessage = `Target "${targetLabel}": constraint "${tagName}" is only valid on ${_capabilityLabel(requiredCapability)} targets, but field type is "${actualType}"`;
       const hint = target === null ? buildPathTargetHint(
         subjectType,
         checker,
@@ -3127,68 +2922,7 @@ function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, par
       valueKind: typedParseResult.value.kind
     });
   }
-  const argumentExpression = renderSyntheticArgumentExpression(
-    definition.valueKind,
-    effectiveArgumentText
-  );
-  const subjectTypeText = checker.typeToString(subjectType, node, SYNTHETIC_TYPE_FORMAT_FLAGS);
-  const hostType = options?.hostType ?? subjectType;
-  const hostTypeText = checker.typeToString(hostType, node, SYNTHETIC_TYPE_FORMAT_FLAGS);
-  if (syntheticTraceEnabled) {
-    syntheticLog.trace("invoking synthetic checker", {
-      consumer: "build",
-      tag: tagName,
-      placement,
-      subjectTypeKind,
-      subjectTypeText
-    });
-  }
-  const result = checkSyntheticTagApplication({
-    tagName,
-    placement,
-    hostType: hostTypeText,
-    subjectType: subjectTypeText,
-    ...target?.kind === "path" ? { target: { kind: "path", text: target.rawText } } : {},
-    ...argumentExpression !== null ? { argumentExpression } : {},
-    supportingDeclarations,
-    ...options?.extensionRegistry !== void 0 ? {
-      extensions: options.extensionRegistry.extensions.map((extension) => ({
-        extensionId: extension.extensionId,
-        ...extension.constraintTags !== void 0 ? {
-          constraintTags: extension.constraintTags.map((tag) => ({ tagName: tag.tagName }))
-        } : {},
-        ...extension.metadataSlots !== void 0 ? {
-          metadataSlots: extension.metadataSlots
-        } : {},
-        ...extension.types !== void 0 ? {
-          customTypes: extension.types.map((t) => ({
-            tsTypeNames: t.tsTypeNames ?? [t.typeName]
-          }))
-        } : {}
-      }))
-    } : {}
-  });
-  if (result.diagnostics.length === 0) {
-    return emit("D-pass", []);
-  }
-  const setupDiagnostic = result.diagnostics.find((diagnostic) => diagnostic.kind !== "typescript");
-  if (setupDiagnostic !== void 0) {
-    return emit("C-reject", [
-      makeDiagnostic(
-        _mapSetupDiagnosticCode(setupDiagnostic.kind),
-        setupDiagnostic.message,
-        provenance
-      )
-    ]);
-  }
-  const expectedLabel = definition.valueKind === null ? "compatible argument" : capabilityLabel(definition.valueKind);
-  return emit("C-reject", [
-    makeDiagnostic(
-      "TYPE_MISMATCH",
-      `Tag "@${tagName}" received an invalid argument for ${expectedLabel}.`,
-      provenance
-    )
-  ]);
+  return emit("C-pass", []);
 }
 function getExtensionTagNames(options) {
   return [
@@ -3231,8 +2965,8 @@ function getParseCacheKey(node, file, options) {
     start: node.getFullStart(),
     end: node.getEnd(),
     fieldType: options?.fieldType ?? null,
-    subjectType: checker !== void 0 && options?.subjectType !== void 0 ? checker.typeToString(options.subjectType, node, SYNTHETIC_TYPE_FORMAT_FLAGS) : null,
-    hostType: checker !== void 0 && options?.hostType !== void 0 ? checker.typeToString(options.hostType, node, SYNTHETIC_TYPE_FORMAT_FLAGS) : null,
+    subjectType: checker !== void 0 && options?.subjectType !== void 0 ? checker.typeToString(options.subjectType, node, TYPE_FORMAT_FLAGS) : null,
+    hostType: checker !== void 0 && options?.hostType !== void 0 ? checker.typeToString(options.hostType, node, TYPE_FORMAT_FLAGS) : null,
     extensions: getExtensionRegistryCacheKey(options?.extensionRegistry)
   });
 }
@@ -3261,8 +2995,6 @@ function parseTSDocTags(node, file = "", options) {
   let placeholderProvenance;
   const sourceFile = node.getSourceFile();
   const sourceText = sourceFile.getFullText();
-  const extensionTypeNames = getExtensionTypeNames(options?.extensionRegistry);
-  const supportingDeclarations = buildSupportingDeclarations(sourceFile, extensionTypeNames);
   const commentRanges = ts3.getLeadingCommentRanges(sourceText, node.getFullStart());
   const rawTextFallbacks = collectRawTextFallbacks(node, file);
   const extensionTagNames = getExtensionTagNames(options);
@@ -3327,7 +3059,6 @@ function parseTSDocTags(node, file = "", options) {
             provenance2,
             node,
             sourceFile,
-            supportingDeclarations,
             options,
             constraints,
             diagnostics
@@ -3345,7 +3076,6 @@ function parseTSDocTags(node, file = "", options) {
           provenance,
           node,
           sourceFile,
-          supportingDeclarations,
           options,
           constraints,
           diagnostics
@@ -3409,7 +3139,6 @@ function parseTSDocTags(node, file = "", options) {
         provenance,
         node,
         sourceFile,
-        supportingDeclarations,
         options,
         constraints,
         diagnostics
@@ -3510,13 +3239,13 @@ function getTagCommentText(tag) {
   }
   return ts3.getTextOfJSDocComment(tag.comment);
 }
-var SYNTHETIC_TYPE_FORMAT_FLAGS, MAX_HINT_CANDIDATES, MAX_HINT_DEPTH, parseResultCache;
+var 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();
     init_builtin_brands();
-    SYNTHETIC_TYPE_FORMAT_FLAGS = ts3.TypeFormatFlags.NoTruncation | ts3.TypeFormatFlags.UseAliasDefinedOutsideCurrentScope;
+    TYPE_FORMAT_FLAGS = ts3.TypeFormatFlags.NoTruncation | ts3.TypeFormatFlags.UseAliasDefinedOutsideCurrentScope;
     MAX_HINT_CANDIDATES = 5;
     MAX_HINT_DEPTH = 3;
     parseResultCache = /* @__PURE__ */ new Map();