@umbraco-cms/backoffice 15.3.0-rc2 → 15.3.1

package/dist-cms/assets/lang/da-dk.js

@@ -276,9 +276,6 @@ export default {
         removeTextBox: 'Fjern denne tekstboks',
         contentRoot: 'Indholdsrod',
         includeUnpublished: 'Inkluder ikke-udgivet indhold.',
-        forceRepublish: 'Udgiv uændrede elementer.',
-        forceRepublishWarning: 'ADVARSEL: Udgivelse af alle sider under denne i indholdstræet, uanset om de er ændret eller ej, kan være en ressourcekrævende og langvarig proces.',
-        forceRepublishAdvisory: 'Dette bør ikke være nødvendigt under normale omstændigheder, så fortsæt kun med denne handling, hvis du er sikker på, at det er nødvendigt.',
         isSensitiveValue: 'Denne værdi er skjult.Hvis du har brug for adgang til at se denne værdi, bedes du\n      kontakte din web-administrator.\n    ',
         isSensitiveValue_short: 'Denne værdi er skjult.',
         languagesToPublish: 'Hvilke sprog vil du gerne udgive?',

package/dist-cms/assets/lang/da-dk.ts

@@ -298,9 +298,6 @@ export default {
 		removeTextBox: 'Fjern denne tekstboks',
 		contentRoot: 'Indholdsrod',
 		includeUnpublished: 'Inkluder ikke-udgivet indhold.',
-		forceRepublish: 'Udgiv uændrede elementer.',
-		forceRepublishWarning: 'ADVARSEL: Udgivelse af alle sider under denne i indholdstræet, uanset om de er ændret eller ej, kan være en ressourcekrævende og langvarig proces.',
-		forceRepublishAdvisory: 'Dette bør ikke være nødvendigt under normale omstændigheder, så fortsæt kun med denne handling, hvis du er sikker på, at det er nødvendigt.',
 		isSensitiveValue:
 			'Denne værdi er skjult.Hvis du har brug for adgang til at se denne værdi, bedes du\n      kontakte din web-administrator.\n    ',
 		isSensitiveValue_short: 'Denne værdi er skjult.',

package/dist-cms/assets/lang/en-us.js

@@ -296,9 +296,6 @@ export default {
         removeTextBox: 'Remove this text box',
         contentRoot: 'Content root',
         includeUnpublished: 'Include unpublished content items.',
-        forceRepublish: 'Publish unchanged items.',
-        forceRepublishWarning: 'WARNING: Publishing all pages below this one in the content tree, whether or not they have changed, can be an expensive and long-running operation.',
-        forceRepublishAdvisory: 'This should not be necessary in normal circumstances so please only proceed with this option selected if you are certain it is required.',
         isSensitiveValue: 'This value is hidden. If you need access to view this value please contact your\n      website administrator.\n    ',
         isSensitiveValue_short: 'This value is hidden.',
         languagesToPublish: 'What languages would you like to publish?',

package/dist-cms/assets/lang/en-us.ts

@@ -320,9 +320,6 @@ export default {
 		removeTextBox: 'Remove this text box',
 		contentRoot: 'Content root',
 		includeUnpublished: 'Include unpublished content items.',
-		forceRepublish: 'Publish unchanged items.',
-		forceRepublishWarning: 'WARNING: Publishing all pages below this one in the content tree, whether or not they have changed, can be an expensive and long-running operation.',
-		forceRepublishAdvisory: 'This should not be necessary in normal circumstances so please only proceed with this option selected if you are certain it is required.',
 		isSensitiveValue:
 			'This value is hidden. If you need access to view this value please contact your\n      website administrator.\n    ',
 		isSensitiveValue_short: 'This value is hidden.',

package/dist-cms/assets/lang/en.js

@@ -293,9 +293,6 @@ export default {
         removeTextBox: 'Remove this text box',
         contentRoot: 'Content root',
         includeUnpublished: 'Include unpublished content items.',
-        forceRepublish: 'Publish unchanged items.',
-        forceRepublishWarning: 'WARNING: Publishing all pages below this one in the content tree, whether or not they have changed, can be an expensive and long-running operation.',
-        forceRepublishAdvisory: 'This should not be necessary in normal circumstances so please only proceed with this option selected if you are certain it is required.',
         isSensitiveValue: 'This value is hidden. If you need access to view this value please contact your\n      website administrator.\n    ',
         isSensitiveValue_short: 'This value is hidden.',
         languagesToPublish: 'What languages would you like to publish?',
@@ -350,7 +347,6 @@ export default {
         fileSecurityValidationFailure: 'One or more file security validations have failed',
         moveToSameFolderFailed: 'Parent and destination folders cannot be the same',
         uploadNotAllowed: 'Upload is not allowed in this location.',
-        noticeExtensionsServerOverride: 'Regardless of the allowed file types, the following limitations apply system-wide due to the server configuration:',
     },
     member: {
         '2fa': 'Two-Factor Authentication',
@@ -837,7 +833,6 @@ export default {
         retrieve: 'Retrieve',
         retry: 'Retry',
         rights: 'Permissions',
-        serverConfiguration: 'Server Configuration',
         scheduledPublishing: 'Scheduled Publishing',
         umbracoInfo: 'Umbraco info',
         search: 'Search',

package/dist-cms/assets/lang/en.ts

@@ -317,9 +317,6 @@ export default {
 		removeTextBox: 'Remove this text box',
 		contentRoot: 'Content root',
 		includeUnpublished: 'Include unpublished content items.',
-		forceRepublish: 'Publish unchanged items.',
-		forceRepublishWarning: 'WARNING: Publishing all pages below this one in the content tree, whether or not they have changed, can be an expensive and long-running operation.',
-		forceRepublishAdvisory: 'This should not be necessary in normal circumstances so please only proceed with this option selected if you are certain it is required.',
 		isSensitiveValue:
 			'This value is hidden. If you need access to view this value please contact your\n      website administrator.\n    ',
 		isSensitiveValue_short: 'This value is hidden.',
@@ -377,8 +374,6 @@ export default {
 		fileSecurityValidationFailure: 'One or more file security validations have failed',
 		moveToSameFolderFailed: 'Parent and destination folders cannot be the same',
 		uploadNotAllowed: 'Upload is not allowed in this location.',
-		noticeExtensionsServerOverride:
-			'Regardless of the allowed file types, the following limitations apply system-wide due to the server configuration:',
 	},
 	member: {
 		'2fa': 'Two-Factor Authentication',
@@ -902,7 +897,6 @@ export default {
 		retrieve: 'Retrieve',
 		retry: 'Retry',
 		rights: 'Permissions',
-		serverConfiguration: 'Server Configuration',
 		scheduledPublishing: 'Scheduled Publishing',
 		umbracoInfo: 'Umbraco info',
 		search: 'Search',

package/dist-cms/custom-elements.json

@@ -10566,11 +10566,6 @@
       "name": "umb-property-editor-ui-multi-url-picker",
       "path": "./../src/packages/multi-url-picker/property-editor/property-editor-ui-multi-url-picker.element.ts",
       "attributes": [
-        {
-          "name": "value",
-          "type": "UmbLinkPickerLink[]",
-          "default": "[]"
-        },
         {
           "name": "readonly",
           "description": "Sets the input to readonly mode, meaning value cannot be changed but still able to read and select its content.",
@@ -10579,12 +10574,6 @@
         }
       ],
       "properties": [
-        {
-          "name": "value",
-          "attribute": "value",
-          "type": "UmbLinkPickerLink[]",
-          "default": "[]"
-        },
         {
           "name": "config"
         },
@@ -10737,10 +10726,6 @@
       "name": "umb-property-editor-ui-accepted-upload-types",
       "path": "./../src/packages/property-editors/accepted-types/property-editor-ui-accepted-upload-types.element.ts",
       "attributes": [
-        {
-          "name": "value",
-          "type": "string[] | undefined"
-        },
         {
           "name": "disabled",
           "description": "Disables the Multiple Text String Property Editor UI",
@@ -10766,11 +10751,6 @@
           "type": "array",
           "default": "[null]"
         },
-        {
-          "name": "value",
-          "attribute": "value",
-          "type": "string[] | undefined"
-        },
         {
           "name": "config"
         },
@@ -11522,10 +11502,6 @@
       "name": "umb-property-editor-ui-multiple-text-string",
       "path": "./../src/packages/property-editors/multiple-text-string/property-editor-ui-multiple-text-string.element.ts",
       "attributes": [
-        {
-          "name": "value",
-          "type": "string[] | undefined"
-        },
         {
           "name": "disabled",
           "description": "Disables the Multiple Text String Property Editor UI",
@@ -11546,11 +11522,6 @@
         }
       ],
       "properties": [
-        {
-          "name": "value",
-          "attribute": "value",
-          "type": "string[] | undefined"
-        },
         {
           "name": "config"
         },

package/dist-cms/external/backend-api/src/types.gen.d.ts

@@ -1753,7 +1753,6 @@ export type PublishDocumentRequestModel = {
 };
 export type PublishDocumentWithDescendantsRequestModel = {
     includeUnpublishedDescendants: boolean;
-    forceRepublish: boolean;
     cultures: Array<(string)>;
 };
 export type PublishedDocumentResponseModel = {

package/dist-cms/libs/context-api/provide/context-provider.controller.js

@@ -25,8 +25,9 @@ export class UmbContextProviderController extends UmbContextProvider {
     }
     destroy() {
         if (this.#host) {
-            this.#host.removeUmbController(this);
+            const host = this.#host;
             this.#host = undefined;
+            host.removeUmbController(this);
         }
         super.destroy();
     }

package/dist-cms/libs/context-api/provide/context-provider.js

@@ -84,8 +84,7 @@ export class UmbContextProvider {
         // Note we are not removing the event listener in the hostDisconnected, therefor we do it here [NL].
         this.#eventTarget?.removeEventListener(UMB_CONTEXT_REQUEST_EVENT_TYPE, this.#handleContextRequest);
         this.#eventTarget?.removeEventListener(UMB_DEBUG_CONTEXT_EVENT_TYPE, this.#handleDebugContextRequest);
-        // We want to call a destroy method on the instance, if it has one.
-        this.#instance?.destroy?.();
+        // We do not want to call a destroy method on the instance, because maybe it should be re-provided later on. [NL]
         this.#instance = undefined;
         this.#eventTarget = undefined;
     }

package/dist-cms/packages/block/block/workspace/block-element-manager.js

@@ -135,7 +135,7 @@ export class UmbBlockElementManager extends UmbControllerBase {
         if (!editorAlias) {
             throw new Error(`Editor Alias of "${property.dataType.unique}" not found.`);
         }
-        const entry = { ...variantId.toObject(), alias, editorAlias, value };
+        const entry = { editorAlias, ...variantId.toObject(), alias, value };
         const currentData = this.getData();
         if (currentData) {
             const values = appendToFrozenArray(currentData.values ?? [], entry, (x) => x.alias === alias && variantId.compare(x));

package/dist-cms/packages/block/block-list/property-editors/block-list-editor/property-editor-ui-block-list.element.js

@@ -119,12 +119,13 @@ let UmbPropertyEditorUIBlockListElement = class UmbPropertyEditorUIBlockListElem
         });
         // Observe Blocks and clean up validation messages for content/settings that are not in the block list anymore:
         this.observe(this.#managerContext.layouts, (layouts) => {
+            const validationMessagesToRemove = [];
             const contentKeys = layouts.map((x) => x.contentKey);
             this.#validationContext.messages.getMessagesOfPathAndDescendant('$.contentData').forEach((message) => {
                 // get the KEY from this string: $.contentData[?(@.key == 'KEY')]
                 const key = extractJsonQueryProps(message.path).key;
                 if (key && contentKeys.indexOf(key) === -1) {
-                    this.#validationContext.messages.removeMessageByKey(message.key);
+                    validationMessagesToRemove.push(message.key);
                 }
             });
             const settingsKeys = layouts.map((x) => x.settingsKey).filter((x) => x !== undefined);
@@ -132,9 +133,11 @@ let UmbPropertyEditorUIBlockListElement = class UmbPropertyEditorUIBlockListElem
                 // get the key from this string: $.settingsData[?(@.key == 'KEY')]
                 const key = extractJsonQueryProps(message.path).key;
                 if (key && settingsKeys.indexOf(key) === -1) {
-                    this.#validationContext.messages.removeMessageByKey(message.key);
+                    validationMessagesToRemove.push(message.key);
                 }
             });
+            // Remove the messages after the loop to prevent changing the array while iterating over it.
+            this.#validationContext.messages.removeMessageByKeys(validationMessagesToRemove);
         }, null);
         this.consumeContext(UMB_PROPERTY_DATASET_CONTEXT, (context) => {
             this.#managerContext.setVariantId(context.getVariantId());

package/dist-cms/packages/core/content/workspace/content-detail-workspace-base.js

@@ -332,7 +332,7 @@ export class UmbContentDetailWorkspaceContextBase extends UmbEntityDetailWorkspa
             throw new Error(`Editor Alias of "${property.dataType.unique}" not found.`);
         }
         // Notice the order of the properties is important for our JSON String Compare function. [NL]
-        const entry = { editorAlias, alias, ...variantId.toObject(), value };
+        const entry = { editorAlias, ...variantId.toObject(), alias, value };
         const currentData = this.getData();
         if (currentData) {
             const values = appendToFrozenArray(currentData.values ?? [], entry, (x) => x.alias === alias && variantId.compare(x));

package/dist-cms/packages/core/localization/registry/localization.registry.js

@@ -69,7 +69,7 @@ export class UmbLocalizationRegistry {
             if (!translations.length)
                 return;
             if (diff.length) {
-                const filteredTranslations = translations.filter((t) => diff.some((ext) => ext.meta.culture === t.$code));
+                const filteredTranslations = translations.filter((t) => diff.some((ext) => ext.meta.culture.toLowerCase() === t.$code));
                 umbLocalizationManager.registerManyLocalizations(filteredTranslations);
             }
             // Set the document language

package/dist-cms/packages/core/validation/context/validation-messages.manager.d.ts

@@ -11,6 +11,9 @@ export declare class UmbValidationMessagesManager {
     #private;
     messages: Observable<UmbValidationMessage[]>;
     debug(logName: string): void;
+    getMessages(): Array<UmbValidationMessage>;
+    initiateChange(): void;
+    finishChange(): void;
     getHasAnyMessages(): boolean;
     getMessagesOfPathAndDescendant(path: string): Array<UmbValidationMessage>;
     messagesOfPathAndDescendant(path: string): Observable<Array<UmbValidationMessage>>;

package/dist-cms/packages/core/validation/context/validation-messages.manager.js

@@ -15,12 +15,31 @@ export class UmbValidationMessagesManager {
     constructor() {
         this.#messages = new UmbArrayState([], (x) => x.key);
         this.messages = this.#messages.asObservable();
+        this.#updateLock = 0;
         this.#translators = [];
     }
     #messages;
     debug(logName) {
         this.messages.subscribe((x) => console.log(logName, x));
     }
+    getMessages() {
+        return this.#messages.getValue();
+    }
+    #updateLock;
+    initiateChange() {
+        this.#updateLock++;
+        this.#messages.mute();
+        // TODO: When ready enable this code will enable handling a finish automatically by this implementation 'using myState.initiatePropertyValueChange()' (Relies on TS support of Using) [NL]
+        /*return {
+            [Symbol.dispose]: this.finishPropertyValueChange,
+        };*/
+    }
+    finishChange() {
+        this.#updateLock--;
+        if (this.#updateLock === 0) {
+            this.#messages.unmute();
+        }
+    }
     getHasAnyMessages() {
         return this.#messages.getValue().length !== 0;
     }
@@ -55,7 +74,9 @@ export class UmbValidationMessagesManager {
         if (this.#messages.getValue().find((x) => x.type === type && x.path === path && x.body === body)) {
             return;
         }
+        this.initiateChange();
         this.#messages.appendOne({ type, key, path, body: body });
+        this.finishChange();
     }
     addMessages(type, path, bodies) {
         //path = this.#translatePath(path.toLowerCase()) ?? path.toLowerCase();
@@ -63,26 +84,42 @@ export class UmbValidationMessagesManager {
         // filter out existing messages with the same path and type, and append the new messages: [NL]
         const existingMessages = this.#messages.getValue();
         const newBodies = bodies.filter((message) => existingMessages.find((x) => x.type === type && x.path === path && x.body === message) === undefined);
+        this.initiateChange();
         this.#messages.append(newBodies.map((body) => ({ type, key: UmbId.new(), path, body })));
+        this.finishChange();
     }
     removeMessageByKey(key) {
+        this.initiateChange();
         this.#messages.removeOne(key);
+        this.finishChange();
     }
     removeMessageByKeys(keys) {
+        if (keys.length === 0)
+            return;
+        this.initiateChange();
         this.#messages.filter((x) => keys.indexOf(x.key) === -1);
+        this.finishChange();
     }
     removeMessagesByType(type) {
+        this.initiateChange();
         this.#messages.filter((x) => x.type !== type);
+        this.finishChange();
     }
     removeMessagesByPath(path) {
+        this.initiateChange();
         this.#messages.filter((x) => x.path !== path);
+        this.finishChange();
     }
     removeMessagesAndDescendantsByPath(path) {
+        this.initiateChange();
         this.#messages.filter((x) => MatchPathOrDescendantPath(x.path, path));
+        this.finishChange();
     }
     removeMessagesByTypeAndPath(type, path) {
         //path = path.toLowerCase();
+        this.initiateChange();
         this.#messages.filter((x) => !(x.type === type && x.path === path));
+        this.finishChange();
     }
     #translatePath(path) {
         //path = path.toLowerCase();
@@ -98,6 +135,7 @@ export class UmbValidationMessagesManager {
     }
     #translators;
     addTranslator(translator) {
+        this.initiateChange();
         if (this.#translators.indexOf(translator) === -1) {
             this.#translators.push(translator);
         }
@@ -111,6 +149,7 @@ export class UmbValidationMessagesManager {
                 this.#messages.updateOne(msg.key, { path: newPath });
             }
         }
+        this.finishChange();
     }
     removeTranslator(translator) {
         const index = this.#translators.indexOf(translator);

package/dist-cms/packages/core/validation/controllers/form-control-validator.controller.js

@@ -27,8 +27,6 @@ export class UmbFormControlValidator extends UmbControllerBase {
             }
         });
         this.#control = formControl;
-        this.#control.addEventListener(UmbValidationInvalidEvent.TYPE, this.#setInvalid);
-        this.#control.addEventListener(UmbValidationValidEvent.TYPE, this.#setValid);
     }
     get isValid() {
         return this.#isValid;
@@ -68,12 +66,18 @@ export class UmbFormControlValidator extends UmbControllerBase {
     }
     hostConnected() {
         super.hostConnected();
+        this.#control.addEventListener(UmbValidationInvalidEvent.TYPE, this.#setInvalid);
+        this.#control.addEventListener(UmbValidationValidEvent.TYPE, this.#setValid);
         if (this.#context) {
             this.#context.addValidator(this);
         }
     }
     hostDisconnected() {
         super.hostDisconnected();
+        if (this.#control) {
+            this.#control.removeEventListener(UmbValidationInvalidEvent.TYPE, this.#setInvalid);
+            this.#control.removeEventListener(UmbValidationValidEvent.TYPE, this.#setValid);
+        }
         if (this.#context) {
             this.#context.removeValidator(this);
             // Remove any messages that this validator has added:
@@ -84,11 +88,9 @@ export class UmbFormControlValidator extends UmbControllerBase {
         }
     }
     destroy() {
+        super.destroy();
         if (this.#control) {
-            this.#control.removeEventListener(UmbValidationInvalidEvent.TYPE, this.#setInvalid);
-            this.#control.removeEventListener(UmbValidationValidEvent.TYPE, this.#setValid);
             this.#control = undefined;
         }
-        super.destroy();
     }
 }

package/dist-cms/packages/core/validation/controllers/validation.controller.d.ts

@@ -48,6 +48,8 @@ export declare class UmbValidationController extends UmbControllerBase implement
      * A message with the path: '$.values[?(@.alias == 'my-property')].value.innerProperty', will for above example become '$.innerProperty' for the local Validation Context.
      */
     setDataPath(dataPath: string): void;
+    hostConnected(): void;
+    hostDisconnected(): void;
     /**
      * Get if this context is valid.
      * Notice this does not verify the validity.

package/dist-cms/packages/core/validation/controllers/validation.controller.js

@@ -106,11 +106,12 @@ export class UmbValidationController extends UmbControllerBase {
                 this.setTranslationData(data);
             });
             this.observe(parent.messages.messagesOfPathAndDescendant(dataPath), (msgs) => {
+                this.messages.initiateChange();
                 //this.messages.appendMessages(msgs);
                 if (this.#parentMessages) {
                     // Remove the local messages that does not exist in the parent anymore:
                     const toRemove = this.#parentMessages.filter((msg) => !msgs.find((m) => m.key === msg.key));
-                    this.#parent.messages.removeMessageByKeys(toRemove.map((msg) => msg.key));
+                    this.messages.removeMessageByKeys(toRemove.map((msg) => msg.key));
                 }
                 this.#parentMessages = msgs;
                 msgs.forEach((msg) => {
@@ -121,10 +122,12 @@ export class UmbValidationController extends UmbControllerBase {
                     // Notice, the local message uses the same key. [NL]
                     this.messages.addMessage(msg.type, path, msg.body, msg.key);
                 });
+                this.messages.finishChange();
             }, 'observeParentMessages');
             this.observe(this.messages.messages, (msgs) => {
                 if (!this.#parent)
                     return;
+                this.#parent.messages.initiateChange();
                 //this.messages.appendMessages(msgs);
                 if (this.#localMessages) {
                     // Remove the parent messages that does not exist locally anymore:
@@ -141,10 +144,23 @@ export class UmbValidationController extends UmbControllerBase {
                     // Notice, the parent message uses the same key. [NL]
                     this.#parent.messages.addMessage(msg.type, path, msg.body, msg.key);
                 });
+                this.#parent.messages.finishChange();
             }, 'observeLocalMessages');
         }).skipHost();
         // Notice skipHost ^^, this is because we do not want it to consume it self, as this would be a match for this consumption, instead we will look at the parent and above. [NL]
     }
+    hostConnected() {
+        super.hostConnected();
+        if (this.#parent) {
+            this.#parent.addValidator(this);
+        }
+    }
+    hostDisconnected() {
+        super.hostDisconnected();
+        if (this.#parent) {
+            this.#parent.removeValidator(this);
+        }
+    }
     /**
      * Get if this context is valid.
      * Notice this does not verify the validity.
@@ -195,15 +211,22 @@ export class UmbValidationController extends UmbControllerBase {
         // TODO: clear server messages here?, well maybe only if we know we will get new server messages? Do the server messages hook into the system like another validator?
         this.#validationMode = true;
         const resultsStatus = await Promise.all(this.#validators.map((v) => v.validate())).then(() => true, () => false);
-        if (!this.messages) {
+        /*if (this.#validators.length === 0 && resultsStatus === false) {
+            throw new Error('No validators to validate, but validation failed');
+        }*/
+        if (this.messages === undefined) {
             // This Context has been destroyed while is was validating, so we should not continue.
             return Promise.reject();
         }
+        const hasMessages = this.messages.getHasAnyMessages();
         // If we have any messages then we are not valid, otherwise lets check the validation results: [NL]
         // This enables us to keep client validations though UI is not present anymore — because the client validations got defined as messages. [NL]
-        const isValid = this.messages.getHasAnyMessages() ? false : resultsStatus;
+        const isValid = hasMessages ? false : resultsStatus;
         this.#isValid = isValid;
         if (isValid === false) {
+            /*if (hasMessages === false && resultsStatus === false) {
+                throw new Error('Missing validation messages to represent why a child validation context is invalid.');
+            }*/
             // Focus first invalid element:
             this.focusFirstInvalidElement();
             return Promise.reject();
@@ -237,6 +260,7 @@ export class UmbValidationController extends UmbControllerBase {
         this.#validators = [];
     }
     destroy() {
+        this.#providerCtrl?.destroy();
         this.#providerCtrl = undefined;
         if (this.#parent) {
             this.#parent.removeValidator(this);

package/dist-cms/packages/core/validation/utils/json-path.function.d.ts

@@ -4,4 +4,4 @@
  * @param {string} path - the JSON path to the value that should be found
  * @returns {unknown} - the found value.
  */
-export declare function GetValueByJsonPath(data: unknown, path: string): unknown;
+export declare function GetValueByJsonPath<ReturnType = unknown>(data: unknown, path: string): ReturnType | undefined;

package/dist-cms/packages/core/validation/utils/json-path.function.js

@@ -5,7 +5,12 @@
  * @returns {unknown} - the found value.
  */
 export function GetValueByJsonPath(data, path) {
+    if (path === '$')
+        return data;
     // strip $ from the path:
+    if (path.startsWith('$[')) {
+        return _GetNextArrayEntryFromPath(data, path.slice(2));
+    }
     const strippedPath = path.startsWith('$.') ? path.slice(2) : path;
     // get value from the path:
     return GetNextPropertyValueFromPath(data, strippedPath);
@@ -36,48 +41,59 @@ function GetNextPropertyValueFromPath(data, path) {
         return value;
     // if the value is an array, get the value at the index:
     if (Array.isArray(value)) {
-        // get the value until the next ']', the value can be anything in between the brackets:
-        const lookupEnd = rest.match(/\]/);
-        if (!lookupEnd)
+        return _GetNextArrayEntryFromPath(value, rest);
+    }
+    else {
+        // continue with the rest of the path:
+        return GetNextPropertyValueFromPath(value, rest);
+    }
+}
+/**
+ * @private
+ * @param {object} array - object to traverse for the value.
+ * @param {string} path - the JSON path to the value that should be found, notice without the starting '['
+ * @returns {unknown} - the found value.
+ */
+function _GetNextArrayEntryFromPath(array, path) {
+    if (!array)
+        return undefined;
+    // get the value until the next ']', the value can be anything in between the brackets:
+    const lookupEnd = path.match(/\]/);
+    if (!lookupEnd)
+        return undefined;
+    // get everything before the match:
+    const entryPointer = path.slice(0, lookupEnd.index);
+    // check if the entryPointer is a JSON Path Filter ( starting with ?( and ending with ) ):
+    if (entryPointer.startsWith('?(') && entryPointer.endsWith(')')) {
+        // get the filter from the entryPointer:
+        // get the filter as a function:
+        const jsFilter = JsFilterFromJsonPathFilter(entryPointer);
+        // find the index of the value that matches the filter:
+        const index = array.findIndex(jsFilter[0]);
+        // if the index is -1, return undefined:
+        if (index === -1)
             return undefined;
-        // get everything before the match:
-        const entryPointer = rest.slice(0, lookupEnd.index);
-        // check if the entryPointer is a JSON Path Filter ( starting with ?( and ending with ) ):
-        if (entryPointer.startsWith('?(') && entryPointer.endsWith(')')) {
-            // get the filter from the entryPointer:
-            // get the filter as a function:
-            const jsFilter = JsFilterFromJsonPathFilter(entryPointer);
-            // find the index of the value that matches the filter:
-            const index = value.findIndex(jsFilter[0]);
-            // if the index is -1, return undefined:
-            if (index === -1)
-                return undefined;
-            // get the value at the index:
-            const data = value[index];
-            // Check for safety:
-            if (lookupEnd.index === undefined || lookupEnd.index + 1 >= rest.length) {
-                return data;
-            }
-            // continue with the rest of the path:
-            return GetNextPropertyValueFromPath(data, rest.slice(lookupEnd.index + 2)) ?? data;
-        }
-        else {
-            // get the value at the index:
-            const indexAsNumber = parseInt(entryPointer);
-            if (isNaN(indexAsNumber))
-                return undefined;
-            const data = value[indexAsNumber];
-            // Check for safety:
-            if (lookupEnd.index === undefined || lookupEnd.index + 1 >= rest.length) {
-                return data;
-            }
-            // continue with the rest of the path:
-            return GetNextPropertyValueFromPath(data, rest.slice(lookupEnd.index + 2)) ?? data;
+        // get the value at the index:
+        const entryData = array[index];
+        // Check for safety:
+        if (lookupEnd.index === undefined || lookupEnd.index + 1 >= path.length) {
+            return entryData;
         }
+        // continue with the rest of the path:
+        return GetNextPropertyValueFromPath(entryData, path.slice(lookupEnd.index + 2)) ?? entryData;
     }
     else {
+        // get the value at the index:
+        const indexAsNumber = parseInt(entryPointer);
+        if (isNaN(indexAsNumber))
+            return undefined;
+        const entryData = array[indexAsNumber];
+        // Check for safety:
+        if (lookupEnd.index === undefined || lookupEnd.index + 1 >= path.length) {
+            return entryData;
+        }
         // continue with the rest of the path:
-        return GetNextPropertyValueFromPath(value, rest);
+        return GetNextPropertyValueFromPath(entryData, path.slice(lookupEnd.index + 2)) ?? entryData;
     }
 }
 /**