update to use reverse strategy

Author: Logende

meta_configurator/src/schema/cleanupSchemaByType.ts

@@ -1,17 +1,13 @@
-import {SUPPORTED_KEYWORDS} from './supportedJsonSchemaTypeKeywords';
-import type {JsonSchemaType} from './supportedJsonSchemaTypeKeywords';
-export function cleanupSchemaByType(schema: Record<string, any>, type: JsonSchemaType | '$ref') {
-  let allowed: string[];
-
-  if (type === '$ref') {
-    allowed = ['$ref', 'title', 'description', 'default', 'examples'];
-  } else {
-    allowed = SUPPORTED_KEYWORDS[type];
-  }
+import {CONSTRAINED_KEYWORDS} from './supportedJsonSchemaTypeKeywords';
+import type {SchemaPropertyType} from '@/schema/jsonSchemaType.ts';
 
+export function cleanupSchemaByType(schema: Record<string, any>, type: SchemaPropertyType) {
   Object.keys(schema).forEach(key => {
-    if (!allowed.includes(key) && key !== 'type') {
-      delete schema[key];
+    if (key in CONSTRAINED_KEYWORDS) {
+      const supportedTypesForProperty = CONSTRAINED_KEYWORDS[key]!;
+      if (!supportedTypesForProperty.includes(type)) {
+        delete schema[key];
+      }
     }
   });
 }

meta_configurator/src/schema/supportedJsonSchemaTypeKeywords.ts

@@ -1,38 +1,26 @@
-export type JsonSchemaType =
-  | 'string'
-  | 'number'
-  | 'integer'
-  | 'object'
-  | 'array'
-  | 'boolean'
-  | 'null';
+import type {SchemaPropertyType} from '@/schema/jsonSchemaType.ts';
 
-const COMMON = ['title', 'description', 'default', 'examples', 'enum', 'const'];
 
-const GENERIC = ['allOf', 'anyOf', 'oneOf', 'not'];
-
-export const SUPPORTED_KEYWORDS: Record<JsonSchemaType, string[]> = {
-  string: [...COMMON, ...GENERIC, 'minLength', 'maxLength', 'pattern', 'format'],
-  number: [
-    ...COMMON,
-    ...GENERIC,
-    'minimum',
-    'maximum',
-    'exclusiveMinimum',
-    'exclusiveMaximum',
-    'multipleOf',
-  ],
-  integer: [
-    ...COMMON,
-    ...GENERIC,
-    'minimum',
-    'maximum',
-    'exclusiveMinimum',
-    'exclusiveMaximum',
-    'multipleOf',
-  ],
-  object: [...COMMON, ...GENERIC, 'properties', 'required', 'additionalProperties'],
-  array: [...COMMON, ...GENERIC, 'items', 'minItems', 'maxItems', 'uniqueItems'],
-  boolean: [...COMMON, ...GENERIC],
-  null: [...COMMON, ...GENERIC],
-};
+export const CONSTRAINED_KEYWORDS: Record<string, SchemaPropertyType[]> = {
+  minLength: ['string'],
+  maxLength: ['string'],
+  pattern: ['string'],
+  format: ['string'],
+  minimum: ['number', 'integer'],
+  maximum: ['number', 'integer'],
+  exclusiveMinimum: ['number', 'integer'],
+  exclusiveMaximum: ['number', 'integer'],
+  multipleOf: ['number', 'integer'],
+  properties: ['object'],
+  patternProperties: ['object'],
+  required: ['object'],
+  additionalProperties: ['object'],
+  propertyNames: ['object'],
+  items: ['array'],
+  minItems: ['array'],
+  maxItems: ['array'],
+  uniqueItems: ['array'],
+  contains: ['array'],
+  maxContains: ['array'],
+  minContains: ['array'],
+}