path to array

Author: LukasBoll

packages/angular-material/src/layouts/array-layout.renderer.ts

@@ -129,8 +129,8 @@ export class ArrayLayoutRenderer
   removeTooltip: string;
   removeAriaLabel: string;
   noData: boolean;
-  addItem: (path: string, value: any) => () => void;
-  removeItems: (path: string, toDelete: number[]) => () => void;
+  addItem: (path: string[], value: any) => () => void;
+  removeItems: (path: string[], toDelete: number[]) => () => void;
   uischemas: {
     tester: UISchemaTester;
     uischema: UISchemaElement;

packages/angular-material/src/other/master-detail/master.ts

@@ -46,7 +46,7 @@ import {
 
 const keywords = ['#', 'properties', 'items'];
 
-export const removeSchemaKeywords = (path: string) => {
+export const removeSchemaKeywords = (path: string[]) => {
   return path
     .split('/')
     .filter(s => !some(keywords, key => key === s))
@@ -141,9 +141,9 @@ export class MasterListComponent extends JsonFormsArrayControl {
   masterItems: any[];
   selectedItem: any;
   selectedItemIdx: number;
-  addItem: (path: string, value: any) => () => void;
-  removeItems: (path: string, toDelete: number[]) => () => void;
-  propsPath: string;
+  addItem: (path: string[], value: any) => () => void;
+  removeItems: (path: string[], toDelete: number[]) => () => void;
+  propsPath: string[];
   highlightedIdx: number;
 
   constructor(jsonformsService: JsonFormsAngularService, private changeDetectorRef: ChangeDetectorRef) {

packages/angular-material/src/other/table.renderer.ts

@@ -97,7 +97,7 @@ export class TableRenderer extends JsonFormsArrayControl {
   }
   generateCells = (
     schema: JsonSchema,
-    rowPath: string
+    rowPath: string[]
   ): ColumnDescription[] => {
     if (schema.type === 'object') {
       return this.getValidColumnProps(schema).map(prop => {

packages/angular/src/abstract-control.ts

@@ -63,7 +63,7 @@ export abstract class JsonFormsAbstractControl<
   rootSchema: JsonSchema;
   enabled: boolean;
   hidden: boolean;
-  propsPath: string;
+  propsPath: string[];
 
   constructor(protected jsonFormsService: JsonFormsAngularService) {
     super();

packages/angular/src/base.renderer.ts

@@ -33,7 +33,7 @@ import {
 export class JsonFormsBaseRenderer<T extends UISchemaElement> {
   @Input() uischema: T;
   @Input() schema: JsonSchema;
-  @Input() path: string;
+  @Input() path: string[];
 
   protected getOwnProps(): OwnPropsOfRenderer {
     return {

packages/core/src/actions/actions.ts

@@ -71,7 +71,7 @@ export type CoreActions =
 
 export interface UpdateAction {
   type: 'jsonforms/UPDATE';
-  path: string;
+  path: string[];
   updater(existingData?: any): any;
 }
 
@@ -166,7 +166,7 @@ export const setAjv = (ajv: AJV) => ({
 });
 
 export const update = (
-  path: string,
+  path: string[],
   updater: (existingData: any) => any
 ): UpdateAction => ({
   type: UPDATE_DATA,

packages/core/src/reducers/core.ts

@@ -44,7 +44,7 @@ import {
   UPDATE_CORE,
   UpdateCoreAction
 } from '../actions';
-import { createAjv, Reducer } from '../util';
+import { contains, createAjv, Reducer } from '../util';
 import { JsonSchema, UISchemaElement } from '../models';
 
 export const validate = (validator: ValidateFunction | undefined, data: any): ErrorObject[] => {
@@ -230,7 +230,7 @@ export const coreReducer: Reducer<JsonFormsCore, CoreActions> = (
     case UPDATE_DATA: {
       if (action.path === undefined || action.path === null) {
         return state;
-      } else if (action.path === '') {
+      } else if (action.path === []) {
         // empty path is ok
         const result = action.updater(cloneDeep(state.data));
         const errors = validate(state.validator, result);
@@ -333,9 +333,9 @@ export const getControlPath = (error: ErrorObject) => {
 }
 
 export const errorsAt = (
-  instancePath: string,
+  instancePath: string[],
   schema: JsonSchema,
-  matchPath: (path: string) => boolean
+  matchPath: (path: string[]) => boolean
 ) => (errors: ErrorObject[]): ErrorObject[] => {
   // Get data paths of oneOf and anyOf errors to later determine whether an error occurred inside a subschema of oneOf or anyOf.
   const combinatorPaths = filter(
@@ -360,7 +360,7 @@ export const errorsAt = (
     // because the parent schema can never match the property schema (e.g. for 'required' checks).
     const parentSchema: JsonSchema | undefined = error.parentSchema;
     if (result && !isObjectSchema(parentSchema)
-      && combinatorPaths.findIndex(p => instancePath.startsWith(p)) !== -1) {
+      && combinatorPaths.findIndex(p => contains(instancePath,p)) !== -1) {
       result = result && isEqual(parentSchema, schema);
     }
     return result;
@@ -388,13 +388,13 @@ const isObjectSchema = (schema?: JsonSchema): boolean => {
 const filteredErrorKeywords = ['additionalProperties', 'allOf', 'anyOf', 'oneOf'];
 
 const getErrorsAt = (
-  instancePath: string,
+  instancePath: string[],
   schema: JsonSchema,
-  matchPath: (path: string) => boolean
+  matchPath: (path: string[]) => boolean
 ) => (state: JsonFormsCore): ErrorObject[] =>
   errorsAt(instancePath, schema, matchPath)(state.validationMode === 'ValidateAndHide' ? [] : state.errors);
 
-export const errorAt = (instancePath: string, schema: JsonSchema) =>
+export const errorAt = (instancePath: string[], schema: JsonSchema) =>
   getErrorsAt(instancePath, schema, path => path === instancePath);
-export const subErrorsAt = (instancePath: string, schema: JsonSchema) =>
-  getErrorsAt(instancePath, schema, path => path.startsWith(instancePath));
+export const subErrorsAt = (instancePath: string[], schema: JsonSchema) =>
+  getErrorsAt(instancePath, schema, path => contains(path,instancePath));

packages/core/src/reducers/reducers.ts

@@ -91,7 +91,7 @@ export const findUISchema = (
   uischemas: JsonFormsUISchemaRegistryEntry[],
   schema: JsonSchema,
   schemaPath: string,
-  path: string,
+  path: string[],
   fallbackLayoutType = 'VerticalLayout',
   control?: ControlElement,
   rootSchema?: JsonSchema
@@ -121,15 +121,15 @@ export const findUISchema = (
   return uiSchema;
 };
 
-export const getErrorAt = (instancePath: string, schema: JsonSchema) => (
+export const getErrorAt = (instancePath: string[], schema: JsonSchema) => (
   state: JsonFormsState
 ) => {
   return errorAt(instancePath, schema)(state.jsonforms.core);
 };
 
 export { errorsAt, getControlPath };
 
-export const getSubErrorsAt = (instancePath: string, schema: JsonSchema) => (
+export const getSubErrorsAt = (instancePath: string[], schema: JsonSchema) => (
   state: JsonFormsState
 ) => subErrorsAt(instancePath, schema)(state.jsonforms.core);
 

packages/core/src/reducers/uischemas.ts

@@ -33,7 +33,7 @@ import { Reducer } from '../util';
 export type UISchemaTester = (
   schema: JsonSchema,
   schemaPath: string,
-  path: string
+  path: string[]
 ) => number;
 
 export interface JsonFormsUISchemaRegistryEntry {
@@ -64,7 +64,7 @@ export const findMatchingUISchema = (
 ) => (
   jsonSchema: JsonSchema,
   schemaPath: string,
-  path: string
+  path: string[]
 ): UISchemaElement => {
   const match = maxBy(state, entry =>
     entry.tester(jsonSchema, schemaPath, path)

packages/core/src/testers/testers.ts

@@ -96,7 +96,7 @@ export const schemaMatches = (
 };
 
 export const schemaSubPathMatches = (
-  subPath: string,
+  subPath: string[],
   predicate: (schema: JsonSchema) => boolean
 ): Tester => (uischema: UISchemaElement, schema: JsonSchema): boolean => {
   if (isEmpty(uischema) || !isControl(uischema)) {
@@ -382,7 +382,7 @@ export const isObjectArray = and(
   schemaMatches(
     schema => hasType(schema, 'array') && !Array.isArray(schema.items) // we don't care about tuples
   ),
-  schemaSubPathMatches('items', schema => hasType(schema, 'object'))
+  schemaSubPathMatches(['items'], schema => hasType(schema, 'object'))
 );
 
 /**
@@ -481,7 +481,7 @@ export const isPrimitiveArrayControl = and(
   schemaMatches(
     schema => deriveTypes(schema).length !== 0 && !Array.isArray(schema.items) // we don't care about tuples
   ),
-  schemaSubPathMatches('items', schema => {
+  schemaSubPathMatches(['items'], schema => {
     const types = deriveTypes(schema);
     return (
       types.length === 1 &&