@skmtc/core 0.32.0 → 0.32.1

package/esm/parse/v3-1/schema/toSchemasV3.js

@@ -171,16 +171,79 @@ const normalizeContentFormat = (schema) => {
     const { contentMediaType: _contentMediaType, contentEncoding: _contentEncoding, ...rest } = view;
     return 'format' in rest ? rest : { ...rest, format: derivedFormat };
 };
+/**
+ * In-place applicators that evaluate keys `unevaluatedProperties` would
+ * otherwise see. `$ref` and `not` never reach `normalizeSchemaShape`.
+ */
+const inPlaceApplicators = [
+    'allOf',
+    'oneOf',
+    'anyOf',
+    'if',
+    'then',
+    'else',
+    'dependentSchemas',
+    '$dynamicRef'
+];
+/**
+ * With no in-place applicator on the same schema, `unevaluatedProperties`
+ * means the same as `additionalProperties` (JSON Schema 2020-12 §11.3,
+ * §10.3.2.3), so rename it. When `additionalProperties` is also present it
+ * evaluates every remaining key, so `unevaluatedProperties` is dropped.
+ */
+const normalizeUnevaluatedProperties = (schema) => {
+    if (!('unevaluatedProperties' in schema)) {
+        return schema;
+    }
+    if (inPlaceApplicators.some(keyword => keyword in schema)) {
+        return schema;
+    }
+    // `unevaluatedProperties` is a 3.1 keyword the 3.0-typed SchemaObject does
+    // not model; read it via an annotated destructure.
+    const { unevaluatedProperties, ...rest } = schema;
+    if ('additionalProperties' in rest) {
+        return rest;
+    }
+    if (!isAdditionalPropertiesValue(unevaluatedProperties)) {
+        return schema;
+    }
+    return { ...rest, additionalProperties: unevaluatedProperties };
+};
+/**
+ * Is this a value `additionalProperties` accepts: a boolean, or a schema or
+ * `$ref` object?
+ */
+const isAdditionalPropertiesValue = (value) => typeof value === 'boolean' ||
+    (typeof value === 'object' && value !== null && !Array.isArray(value));
+/**
+ * Remove `unevaluatedProperties` from an `allOf`/`oneOf`/`anyOf` wrapper and
+ * log it as skipped. Left in place, it would be renamed to
+ * `additionalProperties` when the merged or collapsed schema is dispatched
+ * again with no composition keyword left.
+ */
+const withoutWrapperUnevaluatedProperties = ({ schema, parentType, stackTrail, context }) => {
+    if (!('unevaluatedProperties' in schema)) {
+        return schema;
+    }
+    const { unevaluatedProperties, ...rest } = schema;
+    context.logSkippedFields({
+        skipped: { unevaluatedProperties },
+        parent: schema,
+        parentType,
+        stackTrail
+    });
+    return rest;
+};
 /**
  * Map the 3.1-only schema-shape encodings onto the shared IR shape before
- * dispatching: type arrays, `const`, `examples[]`, numeric exclusive bounds,
- * and binary/base64 content keywords. Each step returns its input unchanged
- * when it does not apply, so the composed result is referentially equal to
- * `schema` when nothing matched — letting the dispatcher re-dispatch only when
- * needed.
+ * dispatching: `unevaluatedProperties`, type arrays, `const`, `examples[]`,
+ * numeric exclusive bounds, and binary/base64 content keywords. Each step
+ * returns its input unchanged when it does not apply, so the composed result
+ * is referentially equal to `schema` when nothing matched — letting the
+ * dispatcher re-dispatch only when needed.
  */
 const normalizeSchemaShape = (schema) => {
-    return normalizeExclusiveBounds(normalizeExamples(normalizeConst(normalizeContentFormat(normalizeTypeArray(schema)))));
+    return normalizeExclusiveBounds(normalizeExamples(normalizeConst(normalizeContentFormat(normalizeTypeArray(normalizeUnevaluatedProperties(schema))))));
 };
 /**
  * Is this a 3.1 `{ type: 'null' }` schema member? (`'null'` is a 3.1 type
@@ -252,6 +315,12 @@ export const toSchemaV3 = ({ schema, stackTrail, context }) => {
         return toSchemaV3({ schema: normalized, stackTrail, context });
     }
     if ('allOf' in schema && Array.isArray(schema.allOf)) {
+        const wrapper = withoutWrapperUnevaluatedProperties({
+            schema,
+            parentType: 'allOf',
+            stackTrail,
+            context
+        });
         return stackTrail.trace('allOf', st => {
             // A single-member allOf collapses to its sole member — the value must
             // satisfy exactly that one schema. When the member is a `$ref`, keep it
@@ -261,7 +330,7 @@ export const toSchemaV3 = ({ schema, stackTrail, context }) => {
             // self-referential, and eagerly resolving it would not terminate. The
             // ref resolves at use time like every other ref. Mirrors the
             // single-member oneOf/anyOf handling below.
-            const { allOf, ...value } = schema;
+            const { allOf, ...value } = wrapper;
             const members = allOf ?? [];
             if (members.length === 1) {
                 const [member] = members;
@@ -281,20 +350,26 @@ export const toSchemaV3 = ({ schema, stackTrail, context }) => {
                 });
             }
             const merged = mergeIntersection({
-                schema,
+                schema: wrapper,
                 getRef: toGetRef(context.documentObject)
             });
             return toSchemaV3({ schema: merged, stackTrail: st, context });
         });
     }
     if ('oneOf' in schema && Array.isArray(schema.oneOf)) {
+        const wrapper = withoutWrapperUnevaluatedProperties({
+            schema,
+            parentType: 'oneOf',
+            stackTrail,
+            context
+        });
         return stackTrail.trace('oneOf', st => {
             // 3.1: a `{ type: 'null' }` member makes the union nullable. Fold it
             // into a `nullable` flag the collapse/union logic already understands.
-            const { members: oneOfWithoutNull, nullable: hasNullMember } = partitionNullMember(schema.oneOf ?? []);
+            const { members: oneOfWithoutNull, nullable: hasNullMember } = partitionNullMember(wrapper.oneOf ?? []);
             const withoutNull = hasNullMember
-                ? { ...schema, oneOf: oneOfWithoutNull, nullable: true }
-                : schema;
+                ? { ...wrapper, oneOf: oneOfWithoutNull, nullable: true }
+                : wrapper;
             const merged = mergeUnion({
                 schema: withoutNull,
                 getRef: toGetRef(context.documentObject),
@@ -337,19 +412,25 @@ export const toSchemaV3 = ({ schema, stackTrail, context }) => {
         });
     }
     if ('anyOf' in schema && Array.isArray(schema.anyOf)) {
+        const wrapper = withoutWrapperUnevaluatedProperties({
+            schema,
+            parentType: 'anyOf',
+            stackTrail,
+            context
+        });
         return stackTrail.trace('anyOf', st => {
             // deno-lint-ignore ban-ts-comment
             // @ts-expect-error
-            if (schema['x-expansionResources'] && Array.isArray(schema.anyOf)) {
-                const { anyOf, ...value } = schema;
+            if (wrapper['x-expansionResources'] && Array.isArray(wrapper.anyOf)) {
+                const { anyOf, ...value } = wrapper;
                 return toUnion({ value, members: anyOf, parentType: 'anyOf', stackTrail: st, context });
             }
             // 3.1: a `{ type: 'null' }` member makes the union nullable (mirrors
             // the oneOf branch above).
-            const { members: anyOfWithoutNull, nullable: hasNullMember } = partitionNullMember(schema.anyOf ?? []);
+            const { members: anyOfWithoutNull, nullable: hasNullMember } = partitionNullMember(wrapper.anyOf ?? []);
             const withoutNull = hasNullMember
-                ? { ...schema, anyOf: anyOfWithoutNull, nullable: true }
-                : schema;
+                ? { ...wrapper, anyOf: anyOfWithoutNull, nullable: true }
+                : wrapper;
             const merged = mergeUnion({
                 schema: withoutNull,
                 getRef: toGetRef(context.documentObject),

package/esm/parse/v3-2/schema/toSchemasV3.js

@@ -171,16 +171,79 @@ const normalizeContentFormat = (schema) => {
     const { contentMediaType: _contentMediaType, contentEncoding: _contentEncoding, ...rest } = view;
     return 'format' in rest ? rest : { ...rest, format: derivedFormat };
 };
+/**
+ * In-place applicators that evaluate keys `unevaluatedProperties` would
+ * otherwise see. `$ref` and `not` never reach `normalizeSchemaShape`.
+ */
+const inPlaceApplicators = [
+    'allOf',
+    'oneOf',
+    'anyOf',
+    'if',
+    'then',
+    'else',
+    'dependentSchemas',
+    '$dynamicRef'
+];
+/**
+ * With no in-place applicator on the same schema, `unevaluatedProperties`
+ * means the same as `additionalProperties` (JSON Schema 2020-12 §11.3,
+ * §10.3.2.3), so rename it. When `additionalProperties` is also present it
+ * evaluates every remaining key, so `unevaluatedProperties` is dropped.
+ */
+const normalizeUnevaluatedProperties = (schema) => {
+    if (!('unevaluatedProperties' in schema)) {
+        return schema;
+    }
+    if (inPlaceApplicators.some(keyword => keyword in schema)) {
+        return schema;
+    }
+    // `unevaluatedProperties` is a 3.1 keyword the 3.0-typed SchemaObject does
+    // not model; read it via an annotated destructure.
+    const { unevaluatedProperties, ...rest } = schema;
+    if ('additionalProperties' in rest) {
+        return rest;
+    }
+    if (!isAdditionalPropertiesValue(unevaluatedProperties)) {
+        return schema;
+    }
+    return { ...rest, additionalProperties: unevaluatedProperties };
+};
+/**
+ * Is this a value `additionalProperties` accepts: a boolean, or a schema or
+ * `$ref` object?
+ */
+const isAdditionalPropertiesValue = (value) => typeof value === 'boolean' ||
+    (typeof value === 'object' && value !== null && !Array.isArray(value));
+/**
+ * Remove `unevaluatedProperties` from an `allOf`/`oneOf`/`anyOf` wrapper and
+ * log it as skipped. Left in place, it would be renamed to
+ * `additionalProperties` when the merged or collapsed schema is dispatched
+ * again with no composition keyword left.
+ */
+const withoutWrapperUnevaluatedProperties = ({ schema, parentType, stackTrail, context }) => {
+    if (!('unevaluatedProperties' in schema)) {
+        return schema;
+    }
+    const { unevaluatedProperties, ...rest } = schema;
+    context.logSkippedFields({
+        skipped: { unevaluatedProperties },
+        parent: schema,
+        parentType,
+        stackTrail
+    });
+    return rest;
+};
 /**
  * Map the 3.1-only schema-shape encodings onto the shared IR shape before
- * dispatching: type arrays, `const`, `examples[]`, numeric exclusive bounds,
- * and binary/base64 content keywords. Each step returns its input unchanged
- * when it does not apply, so the composed result is referentially equal to
- * `schema` when nothing matched — letting the dispatcher re-dispatch only when
- * needed.
+ * dispatching: `unevaluatedProperties`, type arrays, `const`, `examples[]`,
+ * numeric exclusive bounds, and binary/base64 content keywords. Each step
+ * returns its input unchanged when it does not apply, so the composed result
+ * is referentially equal to `schema` when nothing matched — letting the
+ * dispatcher re-dispatch only when needed.
  */
 const normalizeSchemaShape = (schema) => {
-    return normalizeExclusiveBounds(normalizeExamples(normalizeConst(normalizeContentFormat(normalizeTypeArray(schema)))));
+    return normalizeExclusiveBounds(normalizeExamples(normalizeConst(normalizeContentFormat(normalizeTypeArray(normalizeUnevaluatedProperties(schema))))));
 };
 /**
  * Is this a 3.1 `{ type: 'null' }` schema member? (`'null'` is a 3.1 type
@@ -252,6 +315,12 @@ export const toSchemaV3 = ({ schema, stackTrail, context }) => {
         return toSchemaV3({ schema: normalized, stackTrail, context });
     }
     if ('allOf' in schema && Array.isArray(schema.allOf)) {
+        const wrapper = withoutWrapperUnevaluatedProperties({
+            schema,
+            parentType: 'allOf',
+            stackTrail,
+            context
+        });
         return stackTrail.trace('allOf', st => {
             // A single-member allOf collapses to its sole member — the value must
             // satisfy exactly that one schema. When the member is a `$ref`, keep it
@@ -261,7 +330,7 @@ export const toSchemaV3 = ({ schema, stackTrail, context }) => {
             // self-referential, and eagerly resolving it would not terminate. The
             // ref resolves at use time like every other ref. Mirrors the
             // single-member oneOf/anyOf handling below.
-            const { allOf, ...value } = schema;
+            const { allOf, ...value } = wrapper;
             const members = allOf ?? [];
             if (members.length === 1) {
                 const [member] = members;
@@ -281,20 +350,26 @@ export const toSchemaV3 = ({ schema, stackTrail, context }) => {
                 });
             }
             const merged = mergeIntersection({
-                schema,
+                schema: wrapper,
                 getRef: toGetRef(context.documentObject)
             });
             return toSchemaV3({ schema: merged, stackTrail: st, context });
         });
     }
     if ('oneOf' in schema && Array.isArray(schema.oneOf)) {
+        const wrapper = withoutWrapperUnevaluatedProperties({
+            schema,
+            parentType: 'oneOf',
+            stackTrail,
+            context
+        });
         return stackTrail.trace('oneOf', st => {
             // 3.1: a `{ type: 'null' }` member makes the union nullable. Fold it
             // into a `nullable` flag the collapse/union logic already understands.
-            const { members: oneOfWithoutNull, nullable: hasNullMember } = partitionNullMember(schema.oneOf ?? []);
+            const { members: oneOfWithoutNull, nullable: hasNullMember } = partitionNullMember(wrapper.oneOf ?? []);
             const withoutNull = hasNullMember
-                ? { ...schema, oneOf: oneOfWithoutNull, nullable: true }
-                : schema;
+                ? { ...wrapper, oneOf: oneOfWithoutNull, nullable: true }
+                : wrapper;
             const merged = mergeUnion({
                 schema: withoutNull,
                 getRef: toGetRef(context.documentObject),
@@ -337,19 +412,25 @@ export const toSchemaV3 = ({ schema, stackTrail, context }) => {
         });
     }
     if ('anyOf' in schema && Array.isArray(schema.anyOf)) {
+        const wrapper = withoutWrapperUnevaluatedProperties({
+            schema,
+            parentType: 'anyOf',
+            stackTrail,
+            context
+        });
         return stackTrail.trace('anyOf', st => {
             // deno-lint-ignore ban-ts-comment
             // @ts-expect-error
-            if (schema['x-expansionResources'] && Array.isArray(schema.anyOf)) {
-                const { anyOf, ...value } = schema;
+            if (wrapper['x-expansionResources'] && Array.isArray(wrapper.anyOf)) {
+                const { anyOf, ...value } = wrapper;
                 return toUnion({ value, members: anyOf, parentType: 'anyOf', stackTrail: st, context });
             }
             // 3.1: a `{ type: 'null' }` member makes the union nullable (mirrors
             // the oneOf branch above).
-            const { members: anyOfWithoutNull, nullable: hasNullMember } = partitionNullMember(schema.anyOf ?? []);
+            const { members: anyOfWithoutNull, nullable: hasNullMember } = partitionNullMember(wrapper.anyOf ?? []);
             const withoutNull = hasNullMember
-                ? { ...schema, anyOf: anyOfWithoutNull, nullable: true }
-                : schema;
+                ? { ...wrapper, anyOf: anyOfWithoutNull, nullable: true }
+                : wrapper;
             const merged = mergeUnion({
                 schema: withoutNull,
                 getRef: toGetRef(context.documentObject),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@skmtc/core",
-  "version": "0.32.0",
+  "version": "0.32.1",
   "description": "Skmtc is a declarative code generation framework",
   "keywords": [
     "openapi",

package/script/parse/v3-1/schema/toSchemasV3.js

@@ -176,16 +176,79 @@ const normalizeContentFormat = (schema) => {
     const { contentMediaType: _contentMediaType, contentEncoding: _contentEncoding, ...rest } = view;
     return 'format' in rest ? rest : { ...rest, format: derivedFormat };
 };
+/**
+ * In-place applicators that evaluate keys `unevaluatedProperties` would
+ * otherwise see. `$ref` and `not` never reach `normalizeSchemaShape`.
+ */
+const inPlaceApplicators = [
+    'allOf',
+    'oneOf',
+    'anyOf',
+    'if',
+    'then',
+    'else',
+    'dependentSchemas',
+    '$dynamicRef'
+];
+/**
+ * With no in-place applicator on the same schema, `unevaluatedProperties`
+ * means the same as `additionalProperties` (JSON Schema 2020-12 §11.3,
+ * §10.3.2.3), so rename it. When `additionalProperties` is also present it
+ * evaluates every remaining key, so `unevaluatedProperties` is dropped.
+ */
+const normalizeUnevaluatedProperties = (schema) => {
+    if (!('unevaluatedProperties' in schema)) {
+        return schema;
+    }
+    if (inPlaceApplicators.some(keyword => keyword in schema)) {
+        return schema;
+    }
+    // `unevaluatedProperties` is a 3.1 keyword the 3.0-typed SchemaObject does
+    // not model; read it via an annotated destructure.
+    const { unevaluatedProperties, ...rest } = schema;
+    if ('additionalProperties' in rest) {
+        return rest;
+    }
+    if (!isAdditionalPropertiesValue(unevaluatedProperties)) {
+        return schema;
+    }
+    return { ...rest, additionalProperties: unevaluatedProperties };
+};
+/**
+ * Is this a value `additionalProperties` accepts: a boolean, or a schema or
+ * `$ref` object?
+ */
+const isAdditionalPropertiesValue = (value) => typeof value === 'boolean' ||
+    (typeof value === 'object' && value !== null && !Array.isArray(value));
+/**
+ * Remove `unevaluatedProperties` from an `allOf`/`oneOf`/`anyOf` wrapper and
+ * log it as skipped. Left in place, it would be renamed to
+ * `additionalProperties` when the merged or collapsed schema is dispatched
+ * again with no composition keyword left.
+ */
+const withoutWrapperUnevaluatedProperties = ({ schema, parentType, stackTrail, context }) => {
+    if (!('unevaluatedProperties' in schema)) {
+        return schema;
+    }
+    const { unevaluatedProperties, ...rest } = schema;
+    context.logSkippedFields({
+        skipped: { unevaluatedProperties },
+        parent: schema,
+        parentType,
+        stackTrail
+    });
+    return rest;
+};
 /**
  * Map the 3.1-only schema-shape encodings onto the shared IR shape before
- * dispatching: type arrays, `const`, `examples[]`, numeric exclusive bounds,
- * and binary/base64 content keywords. Each step returns its input unchanged
- * when it does not apply, so the composed result is referentially equal to
- * `schema` when nothing matched — letting the dispatcher re-dispatch only when
- * needed.
+ * dispatching: `unevaluatedProperties`, type arrays, `const`, `examples[]`,
+ * numeric exclusive bounds, and binary/base64 content keywords. Each step
+ * returns its input unchanged when it does not apply, so the composed result
+ * is referentially equal to `schema` when nothing matched — letting the
+ * dispatcher re-dispatch only when needed.
  */
 const normalizeSchemaShape = (schema) => {
-    return normalizeExclusiveBounds(normalizeExamples(normalizeConst(normalizeContentFormat(normalizeTypeArray(schema)))));
+    return normalizeExclusiveBounds(normalizeExamples(normalizeConst(normalizeContentFormat(normalizeTypeArray(normalizeUnevaluatedProperties(schema))))));
 };
 /**
  * Is this a 3.1 `{ type: 'null' }` schema member? (`'null'` is a 3.1 type
@@ -257,6 +320,12 @@ const toSchemaV3 = ({ schema, stackTrail, context }) => {
         return (0, exports.toSchemaV3)({ schema: normalized, stackTrail, context });
     }
     if ('allOf' in schema && Array.isArray(schema.allOf)) {
+        const wrapper = withoutWrapperUnevaluatedProperties({
+            schema,
+            parentType: 'allOf',
+            stackTrail,
+            context
+        });
         return stackTrail.trace('allOf', st => {
             // A single-member allOf collapses to its sole member — the value must
             // satisfy exactly that one schema. When the member is a `$ref`, keep it
@@ -266,7 +335,7 @@ const toSchemaV3 = ({ schema, stackTrail, context }) => {
             // self-referential, and eagerly resolving it would not terminate. The
             // ref resolves at use time like every other ref. Mirrors the
             // single-member oneOf/anyOf handling below.
-            const { allOf, ...value } = schema;
+            const { allOf, ...value } = wrapper;
             const members = allOf ?? [];
             if (members.length === 1) {
                 const [member] = members;
@@ -286,20 +355,26 @@ const toSchemaV3 = ({ schema, stackTrail, context }) => {
                 });
             }
             const merged = (0, merge_intersection_js_1.mergeIntersection)({
-                schema,
+                schema: wrapper,
                 getRef: (0, refFns_js_2.toGetRef)(context.documentObject)
             });
             return (0, exports.toSchemaV3)({ schema: merged, stackTrail: st, context });
         });
     }
     if ('oneOf' in schema && Array.isArray(schema.oneOf)) {
+        const wrapper = withoutWrapperUnevaluatedProperties({
+            schema,
+            parentType: 'oneOf',
+            stackTrail,
+            context
+        });
         return stackTrail.trace('oneOf', st => {
             // 3.1: a `{ type: 'null' }` member makes the union nullable. Fold it
             // into a `nullable` flag the collapse/union logic already understands.
-            const { members: oneOfWithoutNull, nullable: hasNullMember } = partitionNullMember(schema.oneOf ?? []);
+            const { members: oneOfWithoutNull, nullable: hasNullMember } = partitionNullMember(wrapper.oneOf ?? []);
             const withoutNull = hasNullMember
-                ? { ...schema, oneOf: oneOfWithoutNull, nullable: true }
-                : schema;
+                ? { ...wrapper, oneOf: oneOfWithoutNull, nullable: true }
+                : wrapper;
             const merged = (0, merge_union_js_1.mergeUnion)({
                 schema: withoutNull,
                 getRef: (0, refFns_js_2.toGetRef)(context.documentObject),
@@ -342,19 +417,25 @@ const toSchemaV3 = ({ schema, stackTrail, context }) => {
         });
     }
     if ('anyOf' in schema && Array.isArray(schema.anyOf)) {
+        const wrapper = withoutWrapperUnevaluatedProperties({
+            schema,
+            parentType: 'anyOf',
+            stackTrail,
+            context
+        });
         return stackTrail.trace('anyOf', st => {
             // deno-lint-ignore ban-ts-comment
             // @ts-expect-error
-            if (schema['x-expansionResources'] && Array.isArray(schema.anyOf)) {
-                const { anyOf, ...value } = schema;
+            if (wrapper['x-expansionResources'] && Array.isArray(wrapper.anyOf)) {
+                const { anyOf, ...value } = wrapper;
                 return (0, toUnion_js_1.toUnion)({ value, members: anyOf, parentType: 'anyOf', stackTrail: st, context });
             }
             // 3.1: a `{ type: 'null' }` member makes the union nullable (mirrors
             // the oneOf branch above).
-            const { members: anyOfWithoutNull, nullable: hasNullMember } = partitionNullMember(schema.anyOf ?? []);
+            const { members: anyOfWithoutNull, nullable: hasNullMember } = partitionNullMember(wrapper.anyOf ?? []);
             const withoutNull = hasNullMember
-                ? { ...schema, anyOf: anyOfWithoutNull, nullable: true }
-                : schema;
+                ? { ...wrapper, anyOf: anyOfWithoutNull, nullable: true }
+                : wrapper;
             const merged = (0, merge_union_js_1.mergeUnion)({
                 schema: withoutNull,
                 getRef: (0, refFns_js_2.toGetRef)(context.documentObject),

package/script/parse/v3-2/schema/toSchemasV3.js

@@ -176,16 +176,79 @@ const normalizeContentFormat = (schema) => {
     const { contentMediaType: _contentMediaType, contentEncoding: _contentEncoding, ...rest } = view;
     return 'format' in rest ? rest : { ...rest, format: derivedFormat };
 };
+/**
+ * In-place applicators that evaluate keys `unevaluatedProperties` would
+ * otherwise see. `$ref` and `not` never reach `normalizeSchemaShape`.
+ */
+const inPlaceApplicators = [
+    'allOf',
+    'oneOf',
+    'anyOf',
+    'if',
+    'then',
+    'else',
+    'dependentSchemas',
+    '$dynamicRef'
+];
+/**
+ * With no in-place applicator on the same schema, `unevaluatedProperties`
+ * means the same as `additionalProperties` (JSON Schema 2020-12 §11.3,
+ * §10.3.2.3), so rename it. When `additionalProperties` is also present it
+ * evaluates every remaining key, so `unevaluatedProperties` is dropped.
+ */
+const normalizeUnevaluatedProperties = (schema) => {
+    if (!('unevaluatedProperties' in schema)) {
+        return schema;
+    }
+    if (inPlaceApplicators.some(keyword => keyword in schema)) {
+        return schema;
+    }
+    // `unevaluatedProperties` is a 3.1 keyword the 3.0-typed SchemaObject does
+    // not model; read it via an annotated destructure.
+    const { unevaluatedProperties, ...rest } = schema;
+    if ('additionalProperties' in rest) {
+        return rest;
+    }
+    if (!isAdditionalPropertiesValue(unevaluatedProperties)) {
+        return schema;
+    }
+    return { ...rest, additionalProperties: unevaluatedProperties };
+};
+/**
+ * Is this a value `additionalProperties` accepts: a boolean, or a schema or
+ * `$ref` object?
+ */
+const isAdditionalPropertiesValue = (value) => typeof value === 'boolean' ||
+    (typeof value === 'object' && value !== null && !Array.isArray(value));
+/**
+ * Remove `unevaluatedProperties` from an `allOf`/`oneOf`/`anyOf` wrapper and
+ * log it as skipped. Left in place, it would be renamed to
+ * `additionalProperties` when the merged or collapsed schema is dispatched
+ * again with no composition keyword left.
+ */
+const withoutWrapperUnevaluatedProperties = ({ schema, parentType, stackTrail, context }) => {
+    if (!('unevaluatedProperties' in schema)) {
+        return schema;
+    }
+    const { unevaluatedProperties, ...rest } = schema;
+    context.logSkippedFields({
+        skipped: { unevaluatedProperties },
+        parent: schema,
+        parentType,
+        stackTrail
+    });
+    return rest;
+};
 /**
  * Map the 3.1-only schema-shape encodings onto the shared IR shape before
- * dispatching: type arrays, `const`, `examples[]`, numeric exclusive bounds,
- * and binary/base64 content keywords. Each step returns its input unchanged
- * when it does not apply, so the composed result is referentially equal to
- * `schema` when nothing matched — letting the dispatcher re-dispatch only when
- * needed.
+ * dispatching: `unevaluatedProperties`, type arrays, `const`, `examples[]`,
+ * numeric exclusive bounds, and binary/base64 content keywords. Each step
+ * returns its input unchanged when it does not apply, so the composed result
+ * is referentially equal to `schema` when nothing matched — letting the
+ * dispatcher re-dispatch only when needed.
  */
 const normalizeSchemaShape = (schema) => {
-    return normalizeExclusiveBounds(normalizeExamples(normalizeConst(normalizeContentFormat(normalizeTypeArray(schema)))));
+    return normalizeExclusiveBounds(normalizeExamples(normalizeConst(normalizeContentFormat(normalizeTypeArray(normalizeUnevaluatedProperties(schema))))));
 };
 /**
  * Is this a 3.1 `{ type: 'null' }` schema member? (`'null'` is a 3.1 type
@@ -257,6 +320,12 @@ const toSchemaV3 = ({ schema, stackTrail, context }) => {
         return (0, exports.toSchemaV3)({ schema: normalized, stackTrail, context });
     }
     if ('allOf' in schema && Array.isArray(schema.allOf)) {
+        const wrapper = withoutWrapperUnevaluatedProperties({
+            schema,
+            parentType: 'allOf',
+            stackTrail,
+            context
+        });
         return stackTrail.trace('allOf', st => {
             // A single-member allOf collapses to its sole member — the value must
             // satisfy exactly that one schema. When the member is a `$ref`, keep it
@@ -266,7 +335,7 @@ const toSchemaV3 = ({ schema, stackTrail, context }) => {
             // self-referential, and eagerly resolving it would not terminate. The
             // ref resolves at use time like every other ref. Mirrors the
             // single-member oneOf/anyOf handling below.
-            const { allOf, ...value } = schema;
+            const { allOf, ...value } = wrapper;
             const members = allOf ?? [];
             if (members.length === 1) {
                 const [member] = members;
@@ -286,20 +355,26 @@ const toSchemaV3 = ({ schema, stackTrail, context }) => {
                 });
             }
             const merged = (0, merge_intersection_js_1.mergeIntersection)({
-                schema,
+                schema: wrapper,
                 getRef: (0, refFns_js_2.toGetRef)(context.documentObject)
             });
             return (0, exports.toSchemaV3)({ schema: merged, stackTrail: st, context });
         });
     }
     if ('oneOf' in schema && Array.isArray(schema.oneOf)) {
+        const wrapper = withoutWrapperUnevaluatedProperties({
+            schema,
+            parentType: 'oneOf',
+            stackTrail,
+            context
+        });
         return stackTrail.trace('oneOf', st => {
             // 3.1: a `{ type: 'null' }` member makes the union nullable. Fold it
             // into a `nullable` flag the collapse/union logic already understands.
-            const { members: oneOfWithoutNull, nullable: hasNullMember } = partitionNullMember(schema.oneOf ?? []);
+            const { members: oneOfWithoutNull, nullable: hasNullMember } = partitionNullMember(wrapper.oneOf ?? []);
             const withoutNull = hasNullMember
-                ? { ...schema, oneOf: oneOfWithoutNull, nullable: true }
-                : schema;
+                ? { ...wrapper, oneOf: oneOfWithoutNull, nullable: true }
+                : wrapper;
             const merged = (0, merge_union_js_1.mergeUnion)({
                 schema: withoutNull,
                 getRef: (0, refFns_js_2.toGetRef)(context.documentObject),
@@ -342,19 +417,25 @@ const toSchemaV3 = ({ schema, stackTrail, context }) => {
         });
     }
     if ('anyOf' in schema && Array.isArray(schema.anyOf)) {
+        const wrapper = withoutWrapperUnevaluatedProperties({
+            schema,
+            parentType: 'anyOf',
+            stackTrail,
+            context
+        });
         return stackTrail.trace('anyOf', st => {
             // deno-lint-ignore ban-ts-comment
             // @ts-expect-error
-            if (schema['x-expansionResources'] && Array.isArray(schema.anyOf)) {
-                const { anyOf, ...value } = schema;
+            if (wrapper['x-expansionResources'] && Array.isArray(wrapper.anyOf)) {
+                const { anyOf, ...value } = wrapper;
                 return (0, toUnion_js_1.toUnion)({ value, members: anyOf, parentType: 'anyOf', stackTrail: st, context });
             }
             // 3.1: a `{ type: 'null' }` member makes the union nullable (mirrors
             // the oneOf branch above).
-            const { members: anyOfWithoutNull, nullable: hasNullMember } = partitionNullMember(schema.anyOf ?? []);
+            const { members: anyOfWithoutNull, nullable: hasNullMember } = partitionNullMember(wrapper.anyOf ?? []);
             const withoutNull = hasNullMember
-                ? { ...schema, anyOf: anyOfWithoutNull, nullable: true }
-                : schema;
+                ? { ...wrapper, anyOf: anyOfWithoutNull, nullable: true }
+                : wrapper;
             const merged = (0, merge_union_js_1.mergeUnion)({
                 schema: withoutNull,
                 getRef: (0, refFns_js_2.toGetRef)(context.documentObject),