@formspec/build 0.1.0-alpha.43 → 0.1.0-alpha.44

package/dist/index.js

@@ -1535,7 +1535,7 @@ function generateCustomType(type, ctx) {
   }
   return registration.toJsonSchema(type.payload, ctx.vendorPrefix);
 }
-var JSON_SCHEMA_STRUCTURAL_KEYWORDS = /* @__PURE__ */ new Set([
+var VOCABULARY_MODE_BLOCKED_KEYWORDS = /* @__PURE__ */ new Set([
   "$schema",
   "$ref",
   "$defs",
@@ -1606,7 +1606,7 @@ function applyCustomConstraint(schema, constraint, ctx) {
   if (registration.emitsVocabularyKeywords) {
     const target = schema;
     for (const [key, value] of Object.entries(extensionSchema)) {
-      if (JSON_SCHEMA_STRUCTURAL_KEYWORDS.has(key)) {
+      if (VOCABULARY_MODE_BLOCKED_KEYWORDS.has(key)) {
         throw new Error(
           `Custom constraint "${constraint.constraintId}" with emitsVocabularyKeywords must not overwrite standard JSON Schema keyword "${key}"`
         );
@@ -2952,6 +2952,31 @@ function isObjectType(type) {
 function isIntersectionType(type) {
   return !!(type.flags & ts3.TypeFlags.Intersection);
 }
+function isIntegerBrandedType(type) {
+  if (!type.isIntersection()) {
+    return false;
+  }
+  const hasNumberBase = type.types.some(
+    (member) => !!(member.flags & ts3.TypeFlags.Number)
+  );
+  if (!hasNumberBase) {
+    return false;
+  }
+  return type.getProperties().some((prop) => {
+    const declaration = prop.valueDeclaration ?? prop.declarations?.[0];
+    if (declaration === void 0) {
+      return false;
+    }
+    if (!ts3.isPropertySignature(declaration) && !ts3.isPropertyDeclaration(declaration)) {
+      return false;
+    }
+    const name = declaration.name;
+    if (!ts3.isComputedPropertyName(name)) {
+      return false;
+    }
+    return ts3.isIdentifier(name.expression) && name.expression.text === "__integerBrand";
+  });
+}
 function isResolvableObjectLikeAliasTypeNode(typeNode) {
   if (ts3.isParenthesizedTypeNode(typeNode)) {
     return isResolvableObjectLikeAliasTypeNode(typeNode.type);
@@ -4077,6 +4102,9 @@ function resolveTypeNode(type, checker, file, typeRegistry, visiting, sourceNode
   if (primitiveAlias) {
     return primitiveAlias;
   }
+  if (isIntegerBrandedType(type)) {
+    return { kind: "primitive", primitiveKind: "integer" };
+  }
   if (type.flags & ts3.TypeFlags.String) {
     return { kind: "primitive", primitiveKind: "string" };
   }
@@ -4179,7 +4207,7 @@ 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 & (ts3.TypeFlags.String | ts3.TypeFlags.Number | ts3.TypeFlags.BigInt | ts3.TypeFlags.BigIntLiteral | ts3.TypeFlags.Boolean | ts3.TypeFlags.Null))) {
+  if (!(type.flags & (ts3.TypeFlags.String | ts3.TypeFlags.Number | ts3.TypeFlags.BigInt | ts3.TypeFlags.BigIntLiteral | ts3.TypeFlags.Boolean | ts3.TypeFlags.Null)) && !isIntegerBrandedType(type)) {
     return null;
   }
   const aliasDecl = type.aliasSymbol?.declarations?.find(ts3.isTypeAliasDeclaration) ?? getReferencedTypeAliasDeclaration(sourceNode, checker);
@@ -4265,6 +4293,9 @@ function resolveAliasedPrimitiveTarget(type, checker, file, typeRegistry, visiti
       visitedAliases
     );
   }
+  if (isIntegerBrandedType(type)) {
+    return { kind: "primitive", primitiveKind: "integer" };
+  }
   if (type.flags & ts3.TypeFlags.String) {
     return { kind: "primitive", primitiveKind: "string" };
   }