@ditojs/utils 2.31.0 → 2.32.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ditojs/utils",
-  "version": "2.31.0",
+  "version": "2.32.0",
   "type": "module",
   "description": "Dito.js Utility Functions – Dito.js is a declarative and modern web framework, based on Objection.js, Koa.js and Vue.js",
   "repository": "https://github.com/ditojs/dito/tree/master/packages/utils",
@@ -32,8 +32,8 @@
     "punycode": "^2.3.1"
   },
   "devDependencies": {
-    "typescript": "^5.4.5"
+    "typescript": "^5.5.4"
   },
   "types": "types",
-  "gitHead": "65ab50e5cf1ca68cc7383963f16a8b73aa60a2ae"
+  "gitHead": "45c0b12508a3a80edfe91226a8c8fd1bb20d139a"
 }

package/src/dataPath/normalizeDataPath.js

@@ -12,10 +12,15 @@ export function normalizeDataPath(path) {
       path.splice(--i, 2)
       i--
     } else if (token === '') {
-      // The beginning of a concatenated absolute path:
-      // Start from scratch, see `parseDataPath.test.js`
-      path.splice(0, i + 1)
-      i = 0
+      if (i === path.length - 1) {
+        // Remove trailing slash
+        path.splice(i, 1)
+      } else {
+        // The beginning of a concatenated absolute path:
+        // Start from scratch, see `parseDataPath.test.js`
+        path.splice(0, i + 1)
+        i = 0
+      }
     }
   }
   return path.join('/')

package/src/dataPath/normalizeDataPath.test.js

@@ -16,8 +16,14 @@ describe('normalizeDataPath()', () => {
   })
 
   it('should normalize relative tokens', () => {
+    expect(normalizeDataPath('/object/property1/..'))
+      .toStrictEqual('object')
+    expect(normalizeDataPath('/object/property1/../'))
+      .toStrictEqual('object')
     expect(normalizeDataPath('/object/property1/../value'))
       .toStrictEqual('object/value')
+    expect(normalizeDataPath('/object/property1/../value/'))
+      .toStrictEqual('object/value')
     expect(normalizeDataPath('/object/property1/../property2/../value'))
       .toStrictEqual('object/value')
     expect(normalizeDataPath('/object/property1/property2/../../value'))

package/types/index.d.ts

@@ -671,7 +671,7 @@ export function toPromiseCallback<T, R>(
 
 /* -------------------------------- dataPath -------------------------------- */
 
-export function getDataPath(
+export function getValueAtDataPath(
   obj: any,
   path: OrArrayOf<string>,
   handleError?: (obj: any, part: string, index: number) => void
@@ -681,7 +681,11 @@ export function normalizeDataPath(path: OrArrayOf<string>): string
 
 export function parseDataPath(path: OrArrayOf<string>): string
 
-export function setDataPath<O>(obj: O, path: OrArrayOf<string>, value: any): O
+export function setValueAtDataPath<O>(
+  obj: O,
+  path: OrArrayOf<string>,
+  value: any
+): O
 
 /* ---------------------------------- html ---------------------------------- */