feat(input_schema): Update sub-schema related types (#534)

Update input-schema types regarding the sub-schema features (new editor
value, `properties`, `required`, `additionalProperties`)

Author: mfori

packages/input_schema/src/input_schema.ts

@@ -68,7 +68,7 @@ export function parseAjvError(
     // If error is with keyword type, it means that type of input is incorrect
     // this can mean that provided value is null
     if (error.keyword === 'type') {
-        fieldKey = error.instancePath.split('/').pop()!;
+        fieldKey = cleanPropertyName(error.instancePath);
         // Check if value is null and field is nullable, if yes, then skip this error
         if (properties[fieldKey] && properties[fieldKey].nullable && input[fieldKey] === null) {
             return null;
@@ -167,7 +167,7 @@ function validateField(validator: Ajv, fieldSchema: Record<string, unknown>, fie
     if ((fieldSchema as StringFieldDefinition).enum) {
         const definition = matchingDefinitions.filter((item) => !!item.properties.enum).pop();
         if (!definition) throw new Error('Input schema validation failed to find "enum property" definition');
-        validateAgainstSchemaOrThrow(validator, fieldSchema, enhanceDefinition(definition), `schema.properties.${fieldKey}.enum`);
+        validateAgainstSchemaOrThrow(validator, fieldSchema, enhanceDefinition(definition), `schema.properties.${fieldKey}`);
         return;
     }
     // If the definition contains "resourceType" property then it's resource type.

packages/input_schema/src/types.ts

@@ -39,16 +39,19 @@ export type IntegerFieldDefinition = CommonFieldDefinition<number> & {
 
 export type ObjectFieldDefinition = CommonFieldDefinition<object> & {
     type: 'object'
-    editor: 'json' | 'proxy' | 'hidden';
+    editor: 'json' | 'proxy' | 'schemaBased' | 'hidden';
     patternKey?: string;
     patternValue?: string;
     maxProperties?: number;
     minProperties?: number;
+    properties?: Record<string, unknown>;
+    required?: string[];
+    additionalProperties?: boolean;
 }
 
 export type ArrayFieldDefinition = CommonFieldDefinition<unknown[]> & {
     type: 'array'
-    editor: 'json' | 'requestListSources' | 'pseudoUrls' | 'globs' | 'keyValue' | 'stringList' | 'select' | 'hidden';
+    editor: 'json' | 'requestListSources' | 'pseudoUrls' | 'globs' | 'keyValue' | 'stringList' | 'select' | 'schemaBased' | 'hidden';
     placeholderKey?: string;
     placeholderValue?: string;
     patternKey?: string;

test/input_schema.test.ts

@@ -246,7 +246,7 @@ describe('input_schema.json', () => {
             };
 
             expect(() => validateInputSchema(validator, schema)).toThrow(
-                'Input schema is not valid (Field schema.properties.myField.enum.enum must NOT have fewer than 1 items)',
+                'Input schema is not valid (Field schema.properties.myField.enum must NOT have fewer than 1 items)',
             );
         });
 
@@ -267,7 +267,7 @@ describe('input_schema.json', () => {
             };
 
             expect(() => validateInputSchema(validator, schema)).toThrow(
-                'Input schema is not valid (Field schema.properties.myField.enum.enumTitles must NOT have fewer than 1 items)',
+                'Input schema is not valid (Field schema.properties.myField.enumTitles must NOT have fewer than 1 items)',
             );
         });