assign-gingerly 0.0.74 → 0.0.76

package/assignGingerly.js

@@ -1,5 +1,4 @@
-import { buildRestrictedPropSet, checkRestrictedProp, redirectRestrictedProp } from './assignPermissions/restrictedProps.js';
-import { normalizeAliasOptions } from './getValues.js';
+import { normalizeAliasOptions } from './resolve/getValues.js';
 /**
  * GUID for global instance map storage to ensure uniqueness across package versions
  */
@@ -369,13 +368,21 @@ export function isClassInstance(value) {
     // Plain objects have Object.prototype or null as prototype
     return proto !== Object.prototype && proto !== null;
 }
+/**
+ * Check whether a method name is listed in withMethods and is not restricted
+ * by the permission processor. Restricted methods are treated as non-method
+ * property names so they fall through to normal access.
+ */
+export function isAllowedMethod(methodName, withMethods, permissionProcessor) {
+    return withMethods.has(methodName) && !permissionProcessor?.checkRestrictedMethod(methodName);
+}
 /**
  * Helper function to evaluate a nested path with method calls
  * Handles chained method calls where path segments can be methods
  *
  * Exported for use by eachTime.ts
  */
-export function evaluatePathWithMethods(target, pathParts, value, withMethods) {
+export function evaluatePathWithMethods(target, pathParts, value, withMethods, permissionProcessor) {
     let current = target;
     let i = 0;
     // Process all segments except the last one
@@ -384,10 +391,10 @@ export function evaluatePathWithMethods(target, pathParts, value, withMethods) {
         const nextPart = pathParts[i + 1];
         // A trailing | marks a zero-argument method call: 'deref|' calls deref()
         // without consuming the next segment. Only applies to names in withMethods.
-        const isZeroArgMethod = part.endsWith('|') && withMethods.has(part.slice(0, -1));
+        const isZeroArgMethod = part.endsWith('|') && isAllowedMethod(part.slice(0, -1), withMethods, permissionProcessor);
         const nextIsMethod = withMethods.has(nextPart)
             || (nextPart.endsWith('|') && withMethods.has(nextPart.slice(0, -1)));
-        if (withMethods.has(part) || isZeroArgMethod) {
+        if (isAllowedMethod(part, withMethods, permissionProcessor) || isZeroArgMethod) {
             const methodName = isZeroArgMethod ? part.slice(0, -1) : part;
             const method = current[methodName];
             if (typeof method === 'function') {
@@ -421,12 +428,12 @@ export function evaluatePathWithMethods(target, pathParts, value, withMethods) {
     // Strip a trailing | from the last segment only when it names a listed method;
     // otherwise it is a literal property name (e.g. an exotic key ending in |).
     const rawLastKey = pathParts[pathParts.length - 1];
-    const isZeroArg = rawLastKey.endsWith('|') && withMethods.has(rawLastKey.slice(0, -1));
+    const isZeroArg = rawLastKey.endsWith('|') && isAllowedMethod(rawLastKey.slice(0, -1), withMethods, permissionProcessor);
     const lastKey = isZeroArg ? rawLastKey.slice(0, -1) : rawLastKey;
     return {
         target: current,
         lastKey,
-        isMethod: withMethods.has(lastKey),
+        isMethod: isAllowedMethod(lastKey, withMethods, permissionProcessor),
         isZeroArg
     };
 }
@@ -474,7 +481,7 @@ function isReactiveForEachSymbol(segment, aliasMap) {
 /**
  * Apply a path to each item in an iterable
  */
-function applyToEach(iterable, remainingPath, value, withMethods, aliasMap, options, permissions, restrictedPropSet) {
+function applyToEach(iterable, remainingPath, value, withMethods, aliasMap, options, permissionProcessor) {
     // Convert to array for iteration
     const items = Array.isArray(iterable) ? iterable : Array.from(iterable);
     // Apply the remaining path to each item
@@ -494,8 +501,8 @@ function applyToEach(iterable, remainingPath, value, withMethods, aliasMap, opti
             let current = item;
             for (const part of pathToForEach) {
                 // A trailing | marks a zero-argument method call (only for names in withMethods)
-                const isZeroArgMethod = part.endsWith('|') && withMethods.has(part.slice(0, -1));
-                if (withMethods.has(part) || isZeroArgMethod) {
+                const isZeroArgMethod = part.endsWith('|') && isAllowedMethod(part.slice(0, -1), withMethods, permissionProcessor);
+                if (isAllowedMethod(part, withMethods, permissionProcessor) || isZeroArgMethod) {
                     const methodName = isZeroArgMethod ? part.slice(0, -1) : part;
                     const method = current[methodName];
                     if (typeof method === 'function') {
@@ -530,12 +537,12 @@ function applyToEach(iterable, remainingPath, value, withMethods, aliasMap, opti
             }
             // Recursively apply to the nested iterable
             if (isIterable(current)) {
-                applyToEach(current, pathAfterForEach, value, withMethods, aliasMap, options, permissions, restrictedPropSet);
+                applyToEach(current, pathAfterForEach, value, withMethods, aliasMap, options, permissionProcessor);
             }
         }
         else {
             // No nested @each, evaluate the remaining path normally
-            const result = evaluatePathWithMethods(item, remainingPath, value, withMethods);
+            const result = evaluatePathWithMethods(item, remainingPath, value, withMethods, permissionProcessor);
             if (result.isMethod) {
                 // Last segment is a method - call it
                 const method = result.target[result.lastKey];
@@ -556,7 +563,7 @@ function applyToEach(iterable, remainingPath, value, withMethods, aliasMap, opti
                 // Normal assignment
                 const lastKey = result.lastKey;
                 const parent = result.target;
-                if (redirectRestrictedProp(restrictedPropSet, parent, lastKey, value)) {
+                if (permissionProcessor?.redirectRestrictedProp(parent, lastKey, value)) {
                     // skip
                 }
                 else if (typeof value === 'object' && value !== null && !Array.isArray(value)) {
@@ -565,7 +572,7 @@ function applyToEach(iterable, remainingPath, value, withMethods, aliasMap, opti
                         if (typeof currentValue !== 'object' || currentValue === null) {
                             throw new Error(`Cannot merge object into readonly primitive property '${String(lastKey)}'`);
                         }
-                        assignGingerly(currentValue, value, options, permissions);
+                        assignGingerly(currentValue, value, options, permissionProcessor);
                     }
                     else {
                         parent[lastKey] = value;
@@ -602,13 +609,11 @@ function applyAliases(key, aliasMap) {
 /**
  * Main assignGingerly function
  */
-export function assignGingerly(target, source, options, permissions) {
+export function assignGingerly(target, source, options, permissionProcessor) {
     if (!target || typeof target !== 'object') {
         return target;
     }
     const { aliasMap, withMethods: withMethodsSet } = normalizeAliasOptions(options);
-    // Normalize restrictedPropSettings once per top-level call
-    const restrictedPropSet = buildRestrictedPropSet(permissions);
     // Convert withAsyncMethods array to Set for O(1) lookup
     const withAsyncMethodsSet = options?.withAsyncMethods
         ? options.withAsyncMethods instanceof Set
@@ -689,7 +694,7 @@ export function assignGingerly(target, source, options, permissions) {
                     let lhsParent;
                     let lhsKey;
                     if (withMethodsSet) {
-                        const result = evaluatePathWithMethods(target, pathParts, value, withMethodsSet);
+                        const result = evaluatePathWithMethods(target, pathParts, value, withMethodsSet, permissionProcessor);
                         lhsParent = result.target;
                         lhsKey = result.lastKey;
                         lhsValue = lhsParent[lhsKey];
@@ -700,7 +705,7 @@ export function assignGingerly(target, source, options, permissions) {
                         lhsValue = lhsParent[lhsKey];
                     }
                     //TODO:  this logic seems to occur twice at least.  Maybe make it a method?
-                    if (checkRestrictedProp(restrictedPropSet, lhsKey)) {
+                    if (permissionProcessor?.checkRestrictedProp(lhsKey)) {
                         continue;
                     }
                     // Event handler: Element LHS + object RHS with 'on' property
@@ -710,7 +715,7 @@ export function assignGingerly(target, source, options, permissions) {
                         const capturedTarget = target;
                         const capturedOptions = options;
                         import('./handlers/addEventListener.js').then(({ attachEventListener }) => {
-                            attachEventListener(capturedLhs, capturedValue, capturedTarget, capturedOptions?.from ?? capturedTarget, capturedOptions ?? {}, permissions);
+                            attachEventListener(capturedLhs, capturedValue, capturedTarget, capturedOptions?.from ?? capturedTarget, capturedOptions ?? {}, permissionProcessor);
                         });
                         continue;
                     }
@@ -723,7 +728,7 @@ export function assignGingerly(target, source, options, permissions) {
                 }
                 else {
                     // Plain key - direct operation on target
-                    if (checkRestrictedProp(restrictedPropSet, path)) {
+                    if (permissionProcessor?.checkRestrictedProp(path)) {
                         continue;
                     }
                     // Event handler: Element LHS + object RHS with 'on' property
@@ -733,7 +738,7 @@ export function assignGingerly(target, source, options, permissions) {
                         const capturedTarget = target;
                         const capturedOptions = options;
                         import('./handlers/addEventListener.js').then(({ attachEventListener }) => {
-                            attachEventListener(capturedLhs, capturedValue, capturedTarget, capturedOptions?.from ?? capturedTarget, capturedOptions ?? {}, permissions);
+                            attachEventListener(capturedLhs, capturedValue, capturedTarget, capturedOptions?.from ?? capturedTarget, capturedOptions ?? {}, permissionProcessor);
                         });
                         continue;
                     }
@@ -798,7 +803,7 @@ export function assignGingerly(target, source, options, permissions) {
                     }
                 }
                 // Apply negation to LHS — check restriction first
-                if (!checkRestrictedProp(restrictedPropSet, lhsLastKey)) {
+                if (!permissionProcessor?.checkRestrictedProp(lhsLastKey)) {
                     lhsParent[lhsLastKey] = !valueToNegate;
                 }
             }
@@ -855,14 +860,14 @@ export function assignGingerly(target, source, options, permissions) {
             if (path) {
                 const pathParts = isNestedPath(path) ? parsePath(path) : [path];
                 const lastKey = pathParts[pathParts.length - 1];
-                if (checkRestrictedProp(restrictedPropSet, lastKey)) {
+                if (permissionProcessor?.checkRestrictedProp(lastKey)) {
                     continue;
                 }
                 // Navigate to the target sub-object
                 let mergeTarget;
                 if (isNestedPath(path)) {
                     if (withMethodsSet) {
-                        const result = evaluatePathWithMethods(target, parsePath(path), value, withMethodsSet);
+                        const result = evaluatePathWithMethods(target, parsePath(path), value, withMethodsSet, permissionProcessor);
                         mergeTarget = result.target[result.lastKey];
                     }
                     else {
@@ -884,7 +889,7 @@ export function assignGingerly(target, source, options, permissions) {
                 }
                 // Recursively merge if target is a valid object
                 if (mergeTarget && typeof mergeTarget === 'object') {
-                    assignGingerly(mergeTarget, value, options, permissions);
+                    assignGingerly(mergeTarget, value, options, permissionProcessor);
                 }
             }
             continue;
@@ -901,7 +906,7 @@ export function assignGingerly(target, source, options, permissions) {
                     (async () => {
                         try {
                             const { handleEachTime } = await import('./eachTime.js');
-                            await handleEachTime(target, pathParts, forEachIndex, value, withMethodsSet, aliasMap, options, permissions, restrictedPropSet);
+                            await handleEachTime(target, pathParts, forEachIndex, value, withMethodsSet, aliasMap, options, permissionProcessor);
                         }
                         catch (error) {
                             console.error('Error in @eachTime:', error);
@@ -916,7 +921,7 @@ export function assignGingerly(target, source, options, permissions) {
                 let current = target;
                 if (pathToForEach.length > 0) {
                     if (withMethodsSet) {
-                        const result = evaluatePathWithMethods(target, pathToForEach, value, withMethodsSet);
+                        const result = evaluatePathWithMethods(target, pathToForEach, value, withMethodsSet, permissionProcessor);
                         // The result.target is the current position after evaluating the path
                         // This is already the iterable we want
                         current = result.target;
@@ -929,7 +934,7 @@ export function assignGingerly(target, source, options, permissions) {
                 }
                 // Apply to each item in the iterable
                 if (isIterable(current)) {
-                    applyToEach(current, pathAfterForEach, value, withMethodsSet || new Set(), aliasMap, options, permissions, restrictedPropSet);
+                    applyToEach(current, pathAfterForEach, value, withMethodsSet || new Set(), aliasMap, options, permissionProcessor);
                 }
                 // If not iterable, let JavaScript throw error naturally when trying to iterate
                 continue;
@@ -943,11 +948,10 @@ export function assignGingerly(target, source, options, permissions) {
                 const capturedValue = value;
                 const capturedWithMethodsSet = withMethodsSet || new Set();
                 const capturedOptions = options;
-                const capturedPermissions = permissions;
-                const capturedRestrictedPropSet = restrictedPropSet;
+                const capturedPermissionProcessor = permissionProcessor;
                 (async () => {
                     const { evaluatePathWithAsyncMethods } = await import('./evaluatePathWithAsyncMethods.js');
-                    const result = await evaluatePathWithAsyncMethods(capturedTarget, capturedPathParts, capturedValue, capturedWithMethodsSet, withAsyncMethodsSet);
+                    const result = await evaluatePathWithAsyncMethods(capturedTarget, capturedPathParts, capturedValue, capturedWithMethodsSet, withAsyncMethodsSet, capturedPermissionProcessor);
                     if (result.isMethod || result.isAsyncMethod) {
                         // Last segment is a method — call it
                         const method = result.target[result.lastKey];
@@ -967,7 +971,7 @@ export function assignGingerly(target, source, options, permissions) {
                         // Not a method — assign the value
                         const lastKey = result.lastKey;
                         const parent = result.target;
-                        if (redirectRestrictedProp(capturedRestrictedPropSet, parent, lastKey, capturedValue)) {
+                        if (capturedPermissionProcessor?.redirectRestrictedProp(parent, lastKey, capturedValue)) {
                             // skip
                         }
                         else if (typeof capturedValue === 'object' && capturedValue !== null && !Array.isArray(capturedValue)) {
@@ -976,7 +980,7 @@ export function assignGingerly(target, source, options, permissions) {
                                 if (typeof currentValue !== 'object' || currentValue === null) {
                                     throw new Error(`Cannot merge object into readonly primitive property '${String(lastKey)}'`);
                                 }
-                                assignGingerly(currentValue, capturedValue, capturedOptions, capturedPermissions);
+                                assignGingerly(currentValue, capturedValue, capturedOptions, capturedPermissionProcessor);
                             }
                             else {
                                 parent[lastKey] = capturedValue;
@@ -991,7 +995,7 @@ export function assignGingerly(target, source, options, permissions) {
             }
             // Check if we need to handle methods
             if (withMethodsSet) {
-                const result = evaluatePathWithMethods(target, pathParts, value, withMethodsSet);
+                const result = evaluatePathWithMethods(target, pathParts, value, withMethodsSet, permissionProcessor);
                 if (result.isMethod) {
                     // Last segment is a method - call it
                     const method = result.target[result.lastKey];
@@ -1013,7 +1017,7 @@ export function assignGingerly(target, source, options, permissions) {
                 // Not a method - proceed with normal assignment using evaluated target
                 const lastKey = result.lastKey;
                 const parent = result.target;
-                if (redirectRestrictedProp(restrictedPropSet, parent, lastKey, value)) {
+                if (permissionProcessor?.redirectRestrictedProp(parent, lastKey, value)) {
                     // skip
                     // Check for static assignTo protocol
                 }
@@ -1027,7 +1031,7 @@ export function assignGingerly(target, source, options, permissions) {
                         if (typeof currentValue !== 'object' || currentValue === null) {
                             throw new Error(`Cannot merge object into readonly primitive property '${String(lastKey)}'`);
                         }
-                        assignGingerly(currentValue, value, options, permissions);
+                        assignGingerly(currentValue, value, options, permissionProcessor);
                     }
                     else {
                         // Property is writable - replace it
@@ -1042,7 +1046,7 @@ export function assignGingerly(target, source, options, permissions) {
                 // No withMethods - use original logic
                 const lastKey = pathParts[pathParts.length - 1];
                 const parent = ensureNestedPath(target, pathParts);
-                if (redirectRestrictedProp(restrictedPropSet, parent, lastKey, value)) {
+                if (permissionProcessor?.redirectRestrictedProp(parent, lastKey, value)) {
                     // skip
                     // Check for static assignTo protocol
                 }
@@ -1058,7 +1062,7 @@ export function assignGingerly(target, source, options, permissions) {
                             throw new Error(`Cannot merge object into readonly primitive property '${String(lastKey)}'`);
                         }
                         // Recursively apply assignGingerly to the readonly object
-                        assignGingerly(currentValue, value, options, permissions);
+                        assignGingerly(currentValue, value, options, permissionProcessor);
                     }
                     else {
                         // Property is writable - replace it
@@ -1092,7 +1096,7 @@ export function assignGingerly(target, source, options, permissions) {
                 // Silently skip if not a function
                 continue;
             }
-            if (redirectRestrictedProp(restrictedPropSet, target, key, value)) {
+            if (permissionProcessor?.redirectRestrictedProp(target, key, value)) {
                 // skip
                 // Check for static assignTo protocol
             }
@@ -1108,7 +1112,7 @@ export function assignGingerly(target, source, options, permissions) {
                         throw new Error(`Cannot merge object into readonly primitive property '${String(key)}'`);
                     }
                     // Recursively apply assignGingerly to the readonly object
-                    assignGingerly(currentValue, value, options, permissions);
+                    assignGingerly(currentValue, value, options, permissionProcessor);
                 }
                 else {
                     // Property is writable - replace it
@@ -1235,7 +1239,7 @@ export function assignGingerly(target, source, options, permissions) {
     // Fire-and-forget bulk enhancements (async, non-blocking)
     if (options?.enhance && options.enhance.length > 0 && typeof target === 'object' && target instanceof Element) {
         import('./enhanceAll.js').then(({ enhanceAll }) => {
-            enhanceAll(target, options.enhance, permissions);
+            enhanceAll(target, options.enhance, permissionProcessor);
         });
     }
     return target;