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

package/dist/index.js

@@ -944,20 +944,29 @@ function assertNoSerializedNameCollisions(ir) {
 }
 
 // src/json-schema/ir-generator.ts
+function parseEnumSerialization(value) {
+  switch (value) {
+    case void 0:
+    case "enum":
+      return "enum";
+    case "oneOf":
+      return "oneOf";
+    case "smart-size":
+      return "smart-size";
+    default:
+      throw new Error(
+        `Invalid enumSerialization "${String(value)}". Expected "enum", "oneOf", or "smart-size".`
+      );
+  }
+}
 function makeContext(options) {
   const vendorPrefix = options?.vendorPrefix ?? "x-formspec";
-  const rawEnumSerialization = options?.enumSerialization;
+  const enumSerialization = parseEnumSerialization(options?.enumSerialization);
   if (!vendorPrefix.startsWith("x-")) {
     throw new Error(
       `Invalid vendorPrefix "${vendorPrefix}". Extension JSON Schema keywords must start with "x-".`
     );
   }
-  if (rawEnumSerialization !== void 0 && rawEnumSerialization !== "enum" && rawEnumSerialization !== "oneOf") {
-    throw new Error(
-      `Invalid enumSerialization "${rawEnumSerialization}". Expected "enum" or "oneOf".`
-    );
-  }
-  const enumSerialization = rawEnumSerialization ?? "enum";
   return {
     defs: {},
     typeNameMap: {},
@@ -1165,7 +1174,7 @@ function generatePrimitiveType(type) {
   };
 }
 function generateEnumType(type, ctx) {
-  if (ctx.enumSerialization === "oneOf") {
+  if (ctx.enumSerialization === "oneOf" || ctx.enumSerialization === "smart-size" && shouldSerializeEnumAsOneOf(type)) {
     return {
       oneOf: type.members.map((m) => {
         const stringValue = String(m.value);
@@ -1175,12 +1184,21 @@ function generateEnumType(type, ctx) {
     };
   }
   const schema = { enum: type.members.map((m) => m.value) };
+  if (ctx.enumSerialization === "smart-size") {
+    return schema;
+  }
   const displayNames = buildEnumDisplayNameExtension(type);
   if (displayNames !== void 0) {
     schema[`${ctx.vendorPrefix}-display-names`] = displayNames;
   }
   return schema;
 }
+function shouldSerializeEnumAsOneOf(type) {
+  return type.members.some((member) => {
+    const title = member.displayName ?? String(member.value);
+    return title !== String(member.value);
+  });
+}
 function buildEnumDisplayNameExtension(type) {
   if (!type.members.some((member) => member.displayName !== void 0)) {
     return void 0;
@@ -2370,6 +2388,8 @@ import {
   getBuildLogger,
   getBroadeningLogger,
   getSyntheticLogger as getSyntheticLogger2,
+  getTypedParserLogger,
+  parseTagArgument,
   describeTypeKind,
   elapsedMicros,
   nowMicros,
@@ -2526,6 +2546,7 @@ function processConstraintTag(tagName, text, parsedTag, provenance, node, source
     sourceFile,
     tagName,
     parsedTag,
+    text,
     provenance,
     supportingDeclarations,
     options
@@ -2553,6 +2574,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);
@@ -2764,7 +2788,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 [];
   }
@@ -2785,8 +2809,10 @@ function buildCompilerBackedConstraintDiagnostics(node, sourceFile, tagName, par
   const log = getBuildLogger();
   const broadeningLog = getBroadeningLogger();
   const syntheticLog = getSyntheticLogger2();
+  const typedParserLog = getTypedParserLogger();
   const logsEnabled = log !== noopLogger3 || broadeningLog !== noopLogger3;
   const syntheticTraceEnabled = syntheticLog !== noopLogger3;
+  const typedParserTraceEnabled = typedParserLog !== noopLogger3;
   const logStart = logsEnabled ? nowMicros() : 0;
   const subjectTypeKind = logsEnabled ? describeTypeKind(subjectType, checker) : "";
   function emit(outcome, result2) {
@@ -2894,16 +2920,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);