@formspec/build 0.1.0-alpha.57 → 0.1.0-alpha.58

package/dist/cli.js

@@ -2487,6 +2487,8 @@ import {
   getBuildLogger,
   getBroadeningLogger,
   getSyntheticLogger as getSyntheticLogger2,
+  getTypedParserLogger,
+  parseTagArgument,
   describeTypeKind,
   elapsedMicros,
   nowMicros,
@@ -2642,6 +2644,7 @@ function processConstraintTag(tagName, text, parsedTag, provenance, node, source
     sourceFile,
     tagName,
     parsedTag,
+    text,
     provenance,
     supportingDeclarations,
     options
@@ -2669,6 +2672,9 @@ function renderSyntheticArgumentExpression(valueKind, argumentText) {
     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);
@@ -2878,7 +2884,7 @@ 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, provenance, supportingDeclarations, options) {
+function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, parsedTag, rawText, provenance, supportingDeclarations, options) {
   if (!isBuiltinConstraintName(tagName)) {
     return [];
   }
@@ -2899,8 +2905,10 @@ function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, par
   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) {
@@ -3008,16 +3016,57 @@ function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, par
       ]);
     }
   }
-  const argumentExpression = renderSyntheticArgumentExpression(
-    definition.valueKind,
-    parsedTag?.argumentText ?? ""
-  );
-  if (definition.requiresArgument && argumentExpression === null) {
-    return emit("A-pass", []);
-  }
+  const effectiveArgumentText = parsedTag !== null ? parseTagSyntax(tagName, rawText).argumentText : rawText;
   if (hasBroadening) {
     return emit("bypass", []);
   }
+  const typedParseResult = parseTagArgument(tagName, effectiveArgumentText, "build");
+  if (!typedParseResult.ok) {
+    if (typedParserTraceEnabled) {
+      typedParserLog.trace("typed-parser C-reject", {
+        consumer: "build",
+        tag: tagName,
+        placement: nonNullPlacement,
+        subjectTypeKind: subjectTypeKind !== "" ? subjectTypeKind : "-",
+        roleOutcome: "C-reject",
+        diagnosticCode: typedParseResult.diagnostic.code
+      });
+    }
+    let mappedCode;
+    switch (typedParseResult.diagnostic.code) {
+      case "MISSING_TAG_ARGUMENT":
+        mappedCode = "MISSING_TAG_ARGUMENT";
+        break;
+      case "INVALID_TAG_ARGUMENT":
+        mappedCode = "INVALID_TAG_ARGUMENT";
+        break;
+      case "UNKNOWN_TAG":
+        throw new Error(
+          `Unexpected UNKNOWN_TAG from parseTagArgument("${tagName}") \u2014 tag was resolved via getTagDefinition.`
+        );
+      default: {
+        const _exhaustive = typedParseResult.diagnostic.code;
+        throw new Error(`Unknown diagnostic code: ${String(_exhaustive)}`);
+      }
+    }
+    return emit("C-reject", [
+      makeDiagnostic(mappedCode, typedParseResult.diagnostic.message, provenance)
+    ]);
+  }
+  if (typedParserTraceEnabled) {
+    typedParserLog.trace("typed-parser C-pass", {
+      consumer: "build",
+      tag: tagName,
+      placement: nonNullPlacement,
+      subjectTypeKind: subjectTypeKind !== "" ? subjectTypeKind : "-",
+      roleOutcome: "C-pass",
+      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);