@formspec/build 0.1.0-alpha.41 → 0.1.0-alpha.42

package/dist/cli.js

@@ -1600,12 +1600,25 @@ function applyCustomConstraint(schema, constraint, ctx) {
       `Cannot generate JSON Schema for custom constraint "${constraint.constraintId}" without a matching extension registration`
     );
   }
-  assignVendorPrefixedExtensionKeywords(
-    schema,
-    registration.toJsonSchema(constraint.payload, ctx.vendorPrefix),
-    ctx.vendorPrefix,
-    `custom constraint "${constraint.constraintId}"`
-  );
+  const extensionSchema = registration.toJsonSchema(constraint.payload, ctx.vendorPrefix);
+  if (registration.emitsVocabularyKeywords) {
+    const target = schema;
+    for (const [key, value] of Object.entries(extensionSchema)) {
+      if (JSON_SCHEMA_STRUCTURAL_KEYWORDS.has(key)) {
+        throw new Error(
+          `Custom constraint "${constraint.constraintId}" with emitsVocabularyKeywords must not overwrite standard JSON Schema keyword "${key}"`
+        );
+      }
+      target[key] = value;
+    }
+  } else {
+    assignVendorPrefixedExtensionKeywords(
+      schema,
+      extensionSchema,
+      ctx.vendorPrefix,
+      `custom constraint "${constraint.constraintId}"`
+    );
+  }
 }
 function applyCustomAnnotation(schema, annotation, ctx) {
   const registration = ctx.extensionRegistry?.findAnnotation(annotation.annotationId);
@@ -1634,11 +1647,72 @@ function assignVendorPrefixedExtensionKeywords(schema, extensionSchema, vendorPr
     schema[key] = value;
   }
 }
+var JSON_SCHEMA_STRUCTURAL_KEYWORDS;
 var init_ir_generator = __esm({
   "src/json-schema/ir-generator.ts"() {
     "use strict";
     init_metadata();
     init_collision_guards();
+    JSON_SCHEMA_STRUCTURAL_KEYWORDS = /* @__PURE__ */ new Set([
+      "$schema",
+      "$ref",
+      "$defs",
+      "$id",
+      "$anchor",
+      "$dynamicRef",
+      "$dynamicAnchor",
+      "$vocabulary",
+      "$comment",
+      "type",
+      "enum",
+      "const",
+      "properties",
+      "patternProperties",
+      "additionalProperties",
+      "required",
+      "items",
+      "prefixItems",
+      "additionalItems",
+      "contains",
+      "allOf",
+      "oneOf",
+      "anyOf",
+      "not",
+      "if",
+      "then",
+      "else",
+      "minimum",
+      "maximum",
+      "exclusiveMinimum",
+      "exclusiveMaximum",
+      "multipleOf",
+      "minLength",
+      "maxLength",
+      "pattern",
+      "minItems",
+      "maxItems",
+      "uniqueItems",
+      "minProperties",
+      "maxProperties",
+      "minContains",
+      "maxContains",
+      "format",
+      "title",
+      "description",
+      "default",
+      "deprecated",
+      "readOnly",
+      "writeOnly",
+      "examples",
+      "dependentRequired",
+      "dependentSchemas",
+      "propertyNames",
+      "unevaluatedItems",
+      "unevaluatedProperties",
+      "contentEncoding",
+      "contentMediaType",
+      "contentSchema"
+    ]);
   }
 });