@vorplex/core 0.0.45 → 0.0.47

package/dist/index.d.ts

@@ -3,7 +3,6 @@ export * from './consts/unit.const';
 export * from './functions/debounce.function';
 export * from './functions/is-node-environment.function';
 export * from './functions/ok.function';
-export * from './functions/parse-path-selector.function';
 export * from './functions/parse-url.function';
 export * from './interfaces/group.interface';
 export * from './interfaces/key-value.interface';
@@ -41,6 +40,7 @@ export * from './modules/math/size';
 export * from './modules/number/number.util';
 export * from './modules/object/object.util';
 export * from './modules/path/path.util';
+export * from './modules/path-selector/path-selector.util';
 export * from './modules/random/random.util';
 export * from './modules/readable-stream/readable-stream.util';
 export * from './modules/reflection/interfaces/parameter.interface';

package/dist/index.js

@@ -4,7 +4,6 @@ export * from './consts/unit.const';
 export * from './functions/debounce.function';
 export * from './functions/is-node-environment.function';
 export * from './functions/ok.function';
-export * from './functions/parse-path-selector.function';
 export * from './functions/parse-url.function';
 export * from './interfaces/group.interface';
 export * from './interfaces/key-value.interface';
@@ -42,6 +41,7 @@ export * from './modules/math/size';
 export * from './modules/number/number.util';
 export * from './modules/object/object.util';
 export * from './modules/path/path.util';
+export * from './modules/path-selector/path-selector.util';
 export * from './modules/random/random.util';
 export * from './modules/readable-stream/readable-stream.util';
 export * from './modules/reflection/interfaces/parameter.interface';

package/dist/modules/path-selector/path-selector.util.d.ts

@@ -0,0 +1,4 @@
+export declare class $PathSelector {
+    static parse<T>(selector: string | ((value: T) => any)): string[];
+    static sanitize(...segments: string[]): string;
+}

package/dist/modules/path-selector/path-selector.util.js

@@ -0,0 +1,64 @@
+export class $PathSelector {
+    static parse(selector) {
+        if (typeof selector === 'function') {
+            const path = [];
+            const proxy = new Proxy({}, {
+                get: (target, key) => {
+                    if (typeof key === 'string')
+                        path.push(key);
+                    return proxy;
+                }
+            });
+            selector(proxy);
+            return path;
+        }
+        const segments = [];
+        let i = 0;
+        const length = selector.length;
+        function readToken(endDelimiters) {
+            let token = '';
+            while (i < length) {
+                if (selector[i] === '\\' && i + 1 < length) {
+                    i++;
+                    token += selector[i++];
+                }
+                else if (endDelimiters.includes(selector[i])) {
+                    break;
+                }
+                else {
+                    token += selector[i++];
+                }
+            }
+            return token;
+        }
+        while (i < length) {
+            if (selector[i] === '.') {
+                i++;
+                continue;
+            }
+            if (selector[i] === '[') {
+                i++;
+                const inner = readToken([']']);
+                if (i < length && selector[i] === ']')
+                    i++;
+                if (inner !== '')
+                    segments.push(inner);
+                continue;
+            }
+            const token = readToken(['.', '[']);
+            if (token !== '')
+                segments.push(token);
+        }
+        return segments;
+    }
+    static sanitize(...segments) {
+        return segments
+            .map(s => s
+            .replace(/\\/g, `\\\\`) // escape \
+            .replace(/\./g, `\\.`) // escape .
+            .replace(/\[/g, `\\[`) // escape [
+            .replace(/\]/g, `\\]`) // escape ]
+        )
+            .join('.');
+    }
+}

package/dist/modules/tson/schemas/array.js

@@ -63,16 +63,16 @@ export class TsonArray extends TsonSchemaBase {
             throw new TsonError(`Array min length of ${this.definition.min} expected`, value, this);
         if (this.definition.max != null && value.length > this.definition.max)
             throw new TsonError(`Array max length of ${this.definition.max} expected`, value, this);
-        if (this.definition.itemDefinition) {
-            for (const [index, item] of value.entries()) {
-                try {
-                    result[index] = $Tson.parse(this.definition.itemDefinition).parse(item);
-                }
-                catch (error) {
-                    if (!(error instanceof TsonError))
-                        throw error;
-                    throw new TsonError(`Invalid item in array. ${error.message}`, item, this, `[${index}]${error.path}`);
-                }
+        if (!this.definition.itemDefinition)
+            return [...value];
+        for (const [index, item] of value.entries()) {
+            try {
+                result[index] = $Tson.parse(this.definition.itemDefinition).parse(item);
+            }
+            catch (error) {
+                if (!(error instanceof TsonError))
+                    throw error;
+                throw new TsonError(`Invalid item in array. ${error.message}`, item, this, `[${index}]${error.path}`);
             }
         }
         return result;

package/dist/modules/value/value.util.js

@@ -1,4 +1,4 @@
-import { parsePath, parsePathSelector } from '../../functions/parse-path-selector.function';
+import { $PathSelector } from '../path-selector/path-selector.util';
 import { State } from '../state/state.model';
 import { $String } from '../string/string.util';
 export class $Value {
@@ -12,7 +12,7 @@ export class $Value {
         return !isNaN(parseInt(value));
     }
     static update(target, pathSelector, update) {
-        const path = parsePathSelector(pathSelector);
+        const path = $PathSelector.parse(pathSelector);
         const isUnassigned = (value) => value == null || typeof value !== 'object';
         const updateAtPath = (value, pathIndex) => {
             if (pathIndex === path.length)
@@ -38,7 +38,7 @@ export class $Value {
     static set(target, path, value) {
         if ($String.isNullOrEmpty(path))
             return value;
-        const selectors = typeof path === 'string' ? parsePath(path) : parsePathSelector(path);
+        const selectors = typeof path === 'string' ? $PathSelector.parse(path) : $PathSelector.parse(path);
         const isUnassigned = (value) => value == null || typeof value !== 'object';
         if (isUnassigned(target))
             target = ($Value.isNumeric(selectors[0]) ? [] : {});
@@ -55,7 +55,7 @@ export class $Value {
         return target;
     }
     static unset(target, path) {
-        const selectors = parsePath(path);
+        const selectors = $PathSelector.parse(path);
         for (const [index, selector] of selectors.entries()) {
             if (index < selectors.length - 1) {
                 target = target?.[selector];
@@ -72,7 +72,7 @@ export class $Value {
         }
     }
     static get(value, path) {
-        const selectors = parsePath(path);
+        const selectors = $PathSelector.parse(path);
         for (const selector of selectors)
             value = value?.[selector];
         return value;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vorplex/core",
-  "version": "0.0.45",
+  "version": "0.0.47",
   "type": "module",
   "sideEffects": false,
   "files": [

package/dist/functions/parse-path-selector.function.d.ts

@@ -1,2 +0,0 @@
-export declare function parsePath(path: string): string[];
-export declare function parsePathSelector<T>(selector: (value: T) => any): string[];

package/dist/functions/parse-path-selector.function.js

@@ -1,17 +0,0 @@
-import { $String } from '../modules/string/string.util';
-export function parsePath(path) {
-    return $String.isNullOrEmpty(path) ? []
-        : Array.from(path.matchAll(new RegExp(`(?<property>[^.[\\]]+)|\\[(['"\`])(?<index>.*?)\\2\\]`, 'g')))
-            .map(match => match.groups.property ?? match.groups.index);
-}
-export function parsePathSelector(selector) {
-    const path = [];
-    const proxy = new Proxy({}, {
-        get: (target, key) => {
-            path.push(String(key));
-            return proxy;
-        }
-    });
-    selector(proxy);
-    return path;
-}