assign-gingerly 0.0.78 → 0.0.80

package/DX/paths.js

@@ -27,6 +27,9 @@
  * The sp tag function uses this to auto-extract path strings from proxies.
  */
 const PATH_SYMBOL = Symbol('assign-gingerly-path');
+function isPathProxy(value) {
+    return !!value && (typeof value === 'object' || typeof value === 'function') && PATH_SYMBOL in value;
+}
 /**
  * Create a proxy for id-ref paths (#[varName]).
  * After the initial #[varName], further property access chains with ?. from the resolved element.
@@ -34,6 +37,7 @@ const PATH_SYMBOL = Symbol('assign-gingerly-path');
  */
 function createIdRefProxy(idRef, options) {
     function handler() { }
+    Object.defineProperty(handler, PATH_SYMBOL, { value: idRef });
     return new Proxy(handler, {
         get(_, prop) {
             if (prop === 'path' || prop === PATH_SYMBOL) {
@@ -53,7 +57,7 @@ function createIdRefProxy(idRef, options) {
                     argStr = 'true';
                 else if (arg === false)
                     argStr = 'false';
-                else if (arg && typeof arg === 'object' && PATH_SYMBOL in arg) {
+                else if (isPathProxy(arg)) {
                     const fullPath = arg[PATH_SYMBOL];
                     argStr = fullPath.startsWith('?.') ? fullPath.substring(2) : fullPath;
                 }
@@ -77,6 +81,7 @@ function createPathProxy(prefix, options) {
     const aliasMap = options?.aka;
     // Use a function as the target to enable the apply trap
     function handler() { }
+    Object.defineProperty(handler, PATH_SYMBOL, { value: prefix.length > 0 ? `?.${prefix}` : '?.' });
     return new Proxy(handler, {
         get(_, prop) {
             if (prop === 'path' || prop === PATH_SYMBOL) {
@@ -114,7 +119,7 @@ function createPathProxy(prefix, options) {
                     argStr = 'true';
                 else if (arg === false)
                     argStr = 'false';
-                else if (arg && typeof arg === 'object' && PATH_SYMBOL in arg) {
+                else if (isPathProxy(arg)) {
                     // Proxy arg — extract path without '?.' prefix
                     const fullPath = arg[PATH_SYMBOL];
                     argStr = fullPath.startsWith('?.') ? fullPath.substring(2) : fullPath;
@@ -167,12 +172,12 @@ export function paths(options) {
  * }
  */
 export function set(lhs) {
-    const lhsStr = lhs && typeof lhs === 'object' && PATH_SYMBOL in lhs
+    const lhsStr = isPathProxy(lhs)
         ? lhs[PATH_SYMBOL]
         : String(lhs);
     return {
         to(rhs) {
-            const rhsStr = rhs && typeof rhs === 'object' && PATH_SYMBOL in rhs
+            const rhsStr = isPathProxy(rhs)
                 ? rhs[PATH_SYMBOL]
                 : rhs;
             return { [lhsStr]: rhsStr };
@@ -198,7 +203,7 @@ export function set(lhs) {
  * // { assign: { incrementButton: '?.clone?.q?..increment', ... } }
  */
 export function smoothOver(value) {
-    if (value && typeof value === 'object' && PATH_SYMBOL in value) {
+    if (isPathProxy(value)) {
         return value[PATH_SYMBOL];
     }
     if (Array.isArray(value)) {
@@ -294,13 +299,13 @@ export function sp(strings, ...values) {
             result.push(strings[i]);
         if (i < values.length) {
             const v = values[i];
-            if (v && typeof v === 'object' && PATH_SYMBOL in v) {
+            if (isPathProxy(v)) {
                 // Auto-extract path from proxy object
                 result.push(v[PATH_SYMBOL]);
             }
             else if (Array.isArray(v)) {
                 // Nested array — recursively extract paths from proxy elements
-                result.push(v.map(el => el && typeof el === 'object' && PATH_SYMBOL in el ? el[PATH_SYMBOL] : el));
+                result.push(v.map(el => isPathProxy(el) ? el[PATH_SYMBOL] : el));
             }
             else {
                 result.push(v);
@@ -349,7 +354,7 @@ export function md(strings, ...values) {
             result.push(strings[i]);
         if (i < values.length) {
             const v = values[i];
-            if (v && typeof v === 'object' && PATH_SYMBOL in v) {
+            if (isPathProxy(v)) {
                 // Proxy object → {prop, val}
                 const pathStr = v[PATH_SYMBOL];
                 result.push({ prop: extractPropName(pathStr), val: pathStr });
@@ -357,7 +362,7 @@ export function md(strings, ...values) {
             else if (Array.isArray(v)) {
                 // Nested array — recursively convert proxy elements to {prop, val}
                 result.push(v.map(el => {
-                    if (el && typeof el === 'object' && PATH_SYMBOL in el) {
+                    if (isPathProxy(el)) {
                         const pathStr = el[PATH_SYMBOL];
                         return { prop: extractPropName(pathStr), val: pathStr };
                     }
@@ -367,7 +372,7 @@ export function md(strings, ...values) {
             else if (v && typeof v === 'object' && 'prop' in v) {
                 // Developer override object — extract val from proxy if present
                 const processed = { ...v };
-                if (processed.val && typeof processed.val === 'object' && PATH_SYMBOL in processed.val) {
+                if (isPathProxy(processed.val)) {
                     processed.val = processed.val[PATH_SYMBOL];
                 }
                 result.push(processed);

package/DX/paths.ts

@@ -27,7 +27,11 @@
  * Symbol used internally to detect path proxy objects.
  * The sp tag function uses this to auto-extract path strings from proxies.
  */
-const PATH_SYMBOL = Symbol('assign-gingerly-path');
+const PATH_SYMBOL = Symbol('assign-gingerly-path');
+
+function isPathProxy(value: unknown): value is { [PATH_SYMBOL]: string } {
+    return !!value && (typeof value === 'object' || typeof value === 'function') && PATH_SYMBOL in value;
+}
 
 /**
  * Type that maps an object type to a proxy where every property access
@@ -58,13 +62,14 @@ export interface PathsOptions {
  * After the initial #[varName], further property access chains with ?. from the resolved element.
  * .path returns the #[varName] prefix (optionally with further ?. path).
  */
-function createIdRefProxy(idRef: string, options?: PathsOptions): any {
-    function handler() {}
-    return new Proxy(handler, {
-        get(_, prop: string | symbol) {
-            if (prop === 'path' || prop === PATH_SYMBOL) {
-                return idRef;
-            }
+function createIdRefProxy(idRef: string, options?: PathsOptions): any {
+    function handler() {}
+    Object.defineProperty(handler, PATH_SYMBOL, { value: idRef });
+    return new Proxy(handler, {
+        get(_, prop: string | symbol) {
+            if (prop === 'path' || prop === PATH_SYMBOL) {
+                return idRef;
+            }
             if (typeof prop === 'symbol') return undefined;
 
             // Chain further path segments after the id ref
@@ -73,15 +78,15 @@ function createIdRefProxy(idRef: string, options?: PathsOptions): any {
         },
         apply(_, __, args) {
             if (args.length > 0) {
-                const arg = args[0];
-                let argStr: string;
-                if (arg === true) argStr = 'true';
-                else if (arg === false) argStr = 'false';
-                else if (arg && typeof arg === 'object' && PATH_SYMBOL in arg) {
-                    const fullPath = arg[PATH_SYMBOL] as string;
-                    argStr = fullPath.startsWith('?.') ? fullPath.substring(2) : fullPath;
-                }
-                else argStr = String(arg);
+                const arg = args[0];
+                let argStr: string;
+                if (arg === true) argStr = 'true';
+                else if (arg === false) argStr = 'false';
+                else if (isPathProxy(arg)) {
+                    const fullPath = arg[PATH_SYMBOL] as string;
+                    argStr = fullPath.startsWith('?.') ? fullPath.substring(2) : fullPath;
+                }
+                else argStr = String(arg);
 
                 const chained = `${idRef}?.${argStr}`;
                 return createIdRefProxy(chained, options);
@@ -98,16 +103,17 @@ function createIdRefProxy(idRef: string, options?: PathsOptions): any {
  * When `aka` is provided, property names that match an alias *value* are output
  * using the alias *key* instead (reverse alias).
  */
-function createPathProxy(prefix: string, options?: PathsOptions): any {
-    const aliasMap = options?.aka;
-
-    // Use a function as the target to enable the apply trap
-    function handler() {}
-
-    return new Proxy(handler, {
-        get(_, prop: string | symbol) {
-            if (prop === 'path' || prop === PATH_SYMBOL) {
-                return prefix.length > 0 ? `?.${prefix}` : '?.';
+function createPathProxy(prefix: string, options?: PathsOptions): any {
+    const aliasMap = options?.aka;
+
+    // Use a function as the target to enable the apply trap
+    function handler() {}
+    Object.defineProperty(handler, PATH_SYMBOL, { value: prefix.length > 0 ? `?.${prefix}` : '?.' });
+
+    return new Proxy(handler, {
+        get(_, prop: string | symbol) {
+            if (prop === 'path' || prop === PATH_SYMBOL) {
+                return prefix.length > 0 ? `?.${prefix}` : '?.';
             }
             // Ignore symbol access (Symbol.iterator, Symbol.toPrimitive, etc.)
             if (typeof prop === 'symbol') return undefined;
@@ -135,16 +141,16 @@ function createPathProxy(prefix: string, options?: PathsOptions): any {
         apply(_, __, args) {
             // Method call syntax: $.querySelector('.username') → extends path with the argument
             if (args.length > 0) {
-                const arg = args[0];
-                let argStr: string;
-                if (arg === true) argStr = 'true';
-                else if (arg === false) argStr = 'false';
-                else if (arg && typeof arg === 'object' && PATH_SYMBOL in arg) {
-                    // Proxy arg — extract path without '?.' prefix
-                    const fullPath = arg[PATH_SYMBOL] as string;
-                    argStr = fullPath.startsWith('?.') ? fullPath.substring(2) : fullPath;
-                }
-                else argStr = String(arg);
+                const arg = args[0];
+                let argStr: string;
+                if (arg === true) argStr = 'true';
+                else if (arg === false) argStr = 'false';
+                else if (isPathProxy(arg)) {
+                    // Proxy arg — extract path without '?.' prefix
+                    const fullPath = arg[PATH_SYMBOL] as string;
+                    argStr = fullPath.startsWith('?.') ? fullPath.substring(2) : fullPath;
+                }
+                else argStr = String(arg);
 
                 const newPath = prefix ? `${prefix}?.${argStr}` : argStr;
                 return createPathProxy(newPath, options);
@@ -193,18 +199,18 @@ export function paths<T>(options?: PathsOptions): PathProxy<T> {
  *     count: 1
  * }
  */
-export function set(lhs: any): { to: (rhs: any) => Record<string, any> } {
-    const lhsStr = lhs && typeof lhs === 'object' && PATH_SYMBOL in lhs
-        ? lhs[PATH_SYMBOL]
-        : String(lhs);
-    return {
-        to(rhs: any): Record<string, any> {
-            const rhsStr = rhs && typeof rhs === 'object' && PATH_SYMBOL in rhs
-                ? rhs[PATH_SYMBOL]
-                : rhs;
-            return { [lhsStr]: rhsStr };
-        }
-    };
+export function set(lhs: any): { to: (rhs: any) => Record<string, any> } {
+    const lhsStr = isPathProxy(lhs)
+        ? lhs[PATH_SYMBOL]
+        : String(lhs);
+    return {
+        to(rhs: any): Record<string, any> {
+            const rhsStr = isPathProxy(rhs)
+                ? rhs[PATH_SYMBOL]
+                : rhs;
+            return { [lhsStr]: rhsStr };
+        }
+    };
 }
 
 /**
@@ -225,19 +231,19 @@ export function set(lhs: any): { to: (rhs: any) => Record<string, any> } {
  * });
  * // { assign: { incrementButton: '?.clone?.q?..increment', ... } }
  */
-export function smoothOver(value: any): any {
-    if (value && typeof value === 'object' && PATH_SYMBOL in value) {
-        return value[PATH_SYMBOL];
-    }
+export function smoothOver(value: any): any {
+    if (isPathProxy(value)) {
+        return value[PATH_SYMBOL];
+    }
     if (Array.isArray(value)) {
         return value.map(smoothOver);
     }
     if (value && typeof value === 'object') {
         const proto = Object.getPrototypeOf(value);
         if (proto === Object.prototype || proto === null) {
-            const result: Record<string, any> = {};
-            for (const [k, v] of Object.entries(value)) {
-                result[k] = smoothOver(v);
+            const result: Record<string, any> = {};
+            for (const [k, v] of Object.entries(value)) {
+                result[k] = smoothOver(v);
             }
             return result;
         }
@@ -322,23 +328,23 @@ export function forEachKeyIn<T>(
  * sp`${$.lastName}${[', ', $.middleName]}, ${$.firstName}`
  * // ['?.lastName', [', ', '?.middleName'], ', ', '?.firstName']
  */
-export function sp(strings: TemplateStringsArray, ...values: any[]): any[] {
+export function sp(strings: TemplateStringsArray, ...values: any[]): any[] {
     const result: any[] = [];
     for (let i = 0; i < strings.length; i++) {
         if (strings[i]) result.push(strings[i]);
         if (i < values.length) {
-            const v = values[i];
-            if (v && typeof v === 'object' && PATH_SYMBOL in v) {
-                // Auto-extract path from proxy object
-                result.push(v[PATH_SYMBOL]);
-            } else if (Array.isArray(v)) {
-                // Nested array — recursively extract paths from proxy elements
-                result.push(v.map(el =>
-                    el && typeof el === 'object' && PATH_SYMBOL in el ? el[PATH_SYMBOL] : el
-                ));
-            } else {
-                result.push(v);
-            }
+            const v = values[i];
+            if (isPathProxy(v)) {
+                // Auto-extract path from proxy object
+                result.push(v[PATH_SYMBOL]);
+            } else if (Array.isArray(v)) {
+                // Nested array — recursively extract paths from proxy elements
+                result.push(v.map(el =>
+                    isPathProxy(el) ? el[PATH_SYMBOL] : el
+                ));
+            } else {
+                result.push(v);
+            }
         }
     }
     return result;
@@ -383,27 +389,27 @@ export function md(strings: TemplateStringsArray, ...values: any[]): any[] {
     for (let i = 0; i < strings.length; i++) {
         if (strings[i]) result.push(strings[i]);
         if (i < values.length) {
-            const v = values[i];
-            if (v && typeof v === 'object' && PATH_SYMBOL in v) {
-                // Proxy object → {prop, val}
-                const pathStr = v[PATH_SYMBOL] as string;
-                result.push({ prop: extractPropName(pathStr), val: pathStr });
-            } else if (Array.isArray(v)) {
-                // Nested array — recursively convert proxy elements to {prop, val}
-                result.push(v.map(el => {
-                    if (el && typeof el === 'object' && PATH_SYMBOL in el) {
-                        const pathStr = el[PATH_SYMBOL] as string;
-                        return { prop: extractPropName(pathStr), val: pathStr };
-                    }
-                    return el;
-                }));
-            } else if (v && typeof v === 'object' && 'prop' in v) {
-                // Developer override object — extract val from proxy if present
-                const processed = { ...v };
-                if (processed.val && typeof processed.val === 'object' && PATH_SYMBOL in processed.val) {
-                    processed.val = processed.val[PATH_SYMBOL];
-                }
-                result.push(processed);
+            const v = values[i];
+            if (isPathProxy(v)) {
+                // Proxy object → {prop, val}
+                const pathStr = v[PATH_SYMBOL] as string;
+                result.push({ prop: extractPropName(pathStr), val: pathStr });
+            } else if (Array.isArray(v)) {
+                // Nested array — recursively convert proxy elements to {prop, val}
+                result.push(v.map(el => {
+                    if (isPathProxy(el)) {
+                        const pathStr = el[PATH_SYMBOL] as string;
+                        return { prop: extractPropName(pathStr), val: pathStr };
+                    }
+                    return el;
+                }));
+            } else if (v && typeof v === 'object' && 'prop' in v) {
+                // Developer override object — extract val from proxy if present
+                const processed = { ...v };
+                if (isPathProxy(processed.val)) {
+                    processed.val = processed.val[PATH_SYMBOL];
+                }
+                result.push(processed);
             } else {
                 result.push(v);
             }