assign-gingerly 0.0.64 → 0.0.66

package/handlers/lazyLoad.ts

@@ -317,10 +317,10 @@ export class LazyLoadHandler implements AssignFromHandler {
             const len = Math.min(elements.length, assign.configs.length);
             for (let j = 0; j < len; j++) {
                 const cfg = assign.configs[j];
-                assignFrom(elements[j], cfg.assignToFragment ?? {}, { from, ...cfg.withOptions });
+                assignFrom(elements[j], cfg.toClone ?? {}, { from, ...cfg.withOptions });
             }
-        } else if (assign.assignToFragment) {
-            assignFrom(elements[0], assign.assignToFragment, { from, ...assign.withOptions });
+        } else if (assign.toClone) {
+            assignFrom(elements[0], assign.toClone, { from, ...assign.withOptions });
         }
     }
 

package/handlers/manageTemplateList.js

@@ -17,7 +17,7 @@
  *             instantiate: 'globalThis://country-ranking',
  *         },
  *         fromEachItem: {
- *             assignToFragment: { '?.querySelector?.tr?.ish': '?.' },
+ *             '?.querySelector?.tr?.ish': '?.',
  *             withOptions: { withMethods: ['querySelector'], infer: true },
  *             resolve: { key: '?.rank' }
  *         }
@@ -28,6 +28,24 @@ import { findMarkers, createMarkers } from '../markerUtils.js';
 import { resolveValue } from '../resolveValues.js';
 import { assignFrom } from '../assignFrom.js';
 import { processInferredAssignments } from '../inferredAssignments.js';
+/**
+ * Reserved keys in fromEachItem config — not treated as shorthand patterns.
+ */
+const RESERVED_KEYS = new Set(['toClone', 'withOptions', 'resolve', 'get', 'configs']);
+/**
+ * Extract shorthand patterns from fromEachItem config (non-reserved keys → toClone).
+ */
+function extractToClone(config) {
+    if (!config)
+        return {};
+    const result = {};
+    for (const key of Object.keys(config)) {
+        if (!RESERVED_KEYS.has(key)) {
+            result[key] = config[key];
+        }
+    }
+    return result;
+}
 const listStateMap = new WeakMap();
 /**
  * ManageTemplateListHandler — clones a template per iterable item with keyed reconciliation.
@@ -46,20 +64,23 @@ export class ManageTemplateListHandler {
         if (!items || typeof items[Symbol.iterator] !== 'function') {
             return; // Nothing to iterate
         }
-        const fromEachItem = this.config.fromEachItem;
+        const { fromEachItem, fromHost: fromHostConfig, fromTarget: fromTargetConfig } = this.config;
         const configs = fromEachItem?.configs; // Array form for multi-element templates
-        const assignToFragment = fromEachItem?.assignToFragment ?? {};
         const withOptions = fromEachItem?.withOptions ?? {};
-        const perItemResolve = fromEachItem?.resolve ?? {};
-        const keyPath = perItemResolve.key; // e.g., '?.rank'
-        // fromSource config — assigns from the outer `from` (parent VM) to each clone
-        const fromSource = this.config.fromSource;
-        const sourceAssignToFragment = fromSource?.assignToFragment;
-        const sourceWithOptions = fromSource?.withOptions ?? {};
-        // Detect fast path: no assignToFragment patterns, just infer (only for non-configs mode)
-        const hasAssignPatterns = !configs && Object.keys(assignToFragment).length > 0;
+        const perItemResolve = fromEachItem?.resolve ?? fromEachItem?.get ?? {};
+        const { key: keyPath } = perItemResolve; // e.g., '?.rank'
+        // Resolve toClone patterns: explicit `toClone` key, or shorthand (non-reserved keys)
+        const toClone = fromEachItem?.toClone ?? extractToClone(fromEachItem);
+        // fromHost config — assigns from options.from (host/VM) to each clone
+        const hostToClone = fromHostConfig ? (fromHostConfig.toClone ?? extractToClone(fromHostConfig)) : undefined;
+        const hostWithOptions = fromHostConfig?.withOptions ?? {};
+        // fromTarget config — assigns from the target element to each clone
+        const targetToClone = fromTargetConfig ? (fromTargetConfig.toClone ?? extractToClone(fromTargetConfig)) : undefined;
+        const targetWithOptions = fromTargetConfig?.withOptions ?? {};
+        // Detect fast path: no toClone patterns, just infer (only for non-configs mode)
+        const hasAssignPatterns = !configs && Object.keys(toClone).length > 0;
         const inferredConfig = !configs && withOptions.infer;
-        const useFastPath = !configs && !hasAssignPatterns && inferredConfig && !sourceAssignToFragment;
+        const useFastPath = !configs && !hasAssignPatterns && inferredConfig && !hostToClone && !targetToClone;
         const name = markerName ?? getMarkerName(instantiate) ?? 'templateList';
         // Find or create markers
         let [startMarker, endMarker] = findMarkers(lhsTarget, name);
@@ -122,7 +143,7 @@ export class ManageTemplateListHandler {
                     const len = Math.min(elements.length, configs.length);
                     for (let j = 0; j < len; j++) {
                         const cfg = configs[j];
-                        assignFrom(elements[j], cfg.assignToFragment ?? {}, { from: item, ...cfg.withOptions });
+                        assignFrom(elements[j], cfg.toClone ?? {}, { from: item, ...cfg.withOptions });
                     }
                 }
                 else {
@@ -132,10 +153,13 @@ export class ManageTemplateListHandler {
                             processInferred(rootEl, item, inferredConfig === true ? { byItemprop: true } : inferredConfig);
                         }
                         else {
-                            assignFrom(rootEl, assignToFragment, { from: item, ...withOptions });
+                            assignFrom(rootEl, toClone, { from: item, ...withOptions });
                         }
-                        if (sourceAssignToFragment && options?.from) {
-                            assignFrom(rootEl, sourceAssignToFragment, { from: options.from, ...sourceWithOptions });
+                        if (hostToClone && options?.from) {
+                            assignFrom(rootEl, hostToClone, { from: options.from, ...hostWithOptions });
+                        }
+                        if (targetToClone) {
+                            assignFrom(rootEl, targetToClone, { from: lhsTarget, ...targetWithOptions });
                         }
                     }
                 }
@@ -149,7 +173,7 @@ export class ManageTemplateListHandler {
                 // New item — clone template
                 let content;
                 if (instantiate instanceof HTMLTemplateElement) {
-                    content = instantiate.content.cloneNode(true);
+                    content = (instantiate.remoteContent || instantiate.content).cloneNode(true);
                 }
                 else if (instantiate instanceof DocumentFragment) {
                     content = instantiate.cloneNode(true);
@@ -168,7 +192,7 @@ export class ManageTemplateListHandler {
                     const len = Math.min(elements.length, configs.length);
                     for (let j = 0; j < len; j++) {
                         const cfg = configs[j];
-                        assignFrom(elements[j], cfg.assignToFragment ?? {}, { from: item, ...cfg.withOptions });
+                        assignFrom(elements[j], cfg.toClone ?? {}, { from: item, ...cfg.withOptions });
                     }
                 }
                 else {
@@ -180,10 +204,13 @@ export class ManageTemplateListHandler {
                             processInferred(rootEl, item, inferredConfig === true ? { byItemprop: true } : inferredConfig);
                         }
                         else {
-                            assignFrom(rootEl, assignToFragment, { from: item, ...withOptions });
+                            assignFrom(rootEl, toClone, { from: item, ...withOptions });
+                        }
+                        if (hostToClone && options?.from) {
+                            assignFrom(rootEl, hostToClone, { from: options.from, ...hostWithOptions });
                         }
-                        if (sourceAssignToFragment && options?.from) {
-                            assignFrom(rootEl, sourceAssignToFragment, { from: options.from, ...sourceWithOptions });
+                        if (targetToClone) {
+                            assignFrom(rootEl, targetToClone, { from: lhsTarget, ...targetWithOptions });
                         }
                     }
                 }

package/handlers/manageTemplateList.ts

@@ -17,7 +17,7 @@
  *             instantiate: 'globalThis://country-ranking',
  *         },
  *         fromEachItem: {
- *             assignToFragment: { '?.querySelector?.tr?.ish': '?.' },
+ *             '?.querySelector?.tr?.ish': '?.',
  *             withOptions: { withMethods: ['querySelector'], infer: true },
  *             resolve: { key: '?.rank' }
  *         }
@@ -32,6 +32,25 @@ import { resolveValue } from '../resolveValues.js';
 import { assignFrom } from '../assignFrom.js';
 import { processInferredAssignments } from '../inferredAssignments.js';
 
+/**
+ * Reserved keys in fromEachItem config — not treated as shorthand patterns.
+ */
+const RESERVED_KEYS = new Set(['toClone', 'withOptions', 'resolve', 'get', 'configs']);
+
+/**
+ * Extract shorthand patterns from fromEachItem config (non-reserved keys → toClone).
+ */
+function extractToClone(config: any): Record<string, any> {
+    if (!config) return {};
+    const result: Record<string, any> = {};
+    for (const key of Object.keys(config)) {
+        if (!RESERVED_KEYS.has(key)) {
+            result[key] = config[key];
+        }
+    }
+    return result;
+}
+
 /**
  * State stored per list instance (keyed by start marker).
  * Tracks the mapping of keys to their cloned DOM nodes.
@@ -74,22 +93,27 @@ export class ManageTemplateListHandler implements AssignFromHandler {
             return; // Nothing to iterate
         }
 
-        const fromEachItem = this.config.fromEachItem;
+        const { fromEachItem, fromHost: fromHostConfig, fromTarget: fromTargetConfig } = this.config;
         const configs = fromEachItem?.configs; // Array form for multi-element templates
-        const assignToFragment = fromEachItem?.assignToFragment ?? {};
         const withOptions = fromEachItem?.withOptions ?? {};
-        const perItemResolve = fromEachItem?.resolve ?? {};
-        const keyPath = perItemResolve.key; // e.g., '?.rank'
+        const perItemResolve = fromEachItem?.resolve ?? fromEachItem?.get ?? {};
+        const { key: keyPath } = perItemResolve; // e.g., '?.rank'
+
+        // Resolve toClone patterns: explicit `toClone` key, or shorthand (non-reserved keys)
+        const toClone = fromEachItem?.toClone ?? extractToClone(fromEachItem);
 
-        // fromSource config — assigns from the outer `from` (parent VM) to each clone
-        const fromSource = this.config.fromSource;
-        const sourceAssignToFragment = fromSource?.assignToFragment;
-        const sourceWithOptions = fromSource?.withOptions ?? {};
+        // fromHost config — assigns from options.from (host/VM) to each clone
+        const hostToClone = fromHostConfig ? (fromHostConfig.toClone ?? extractToClone(fromHostConfig)) : undefined;
+        const hostWithOptions = fromHostConfig?.withOptions ?? {};
 
-        // Detect fast path: no assignToFragment patterns, just infer (only for non-configs mode)
-        const hasAssignPatterns = !configs && Object.keys(assignToFragment).length > 0;
+        // fromTarget config — assigns from the target element to each clone
+        const targetToClone = fromTargetConfig ? (fromTargetConfig.toClone ?? extractToClone(fromTargetConfig)) : undefined;
+        const targetWithOptions = fromTargetConfig?.withOptions ?? {};
+
+        // Detect fast path: no toClone patterns, just infer (only for non-configs mode)
+        const hasAssignPatterns = !configs && Object.keys(toClone).length > 0;
         const inferredConfig = !configs && withOptions.infer;
-        const useFastPath = !configs && !hasAssignPatterns && inferredConfig && !sourceAssignToFragment;
+        const useFastPath = !configs && !hasAssignPatterns && inferredConfig && !hostToClone && !targetToClone;
 
         const name = markerName ?? getMarkerName(instantiate) ?? 'templateList';
 
@@ -159,7 +183,7 @@ export class ManageTemplateListHandler implements AssignFromHandler {
                     const len = Math.min(elements.length, configs.length);
                     for (let j = 0; j < len; j++) {
                         const cfg = configs[j];
-                        assignFrom(elements[j], cfg.assignToFragment ?? {}, { from: item, ...cfg.withOptions });
+                        assignFrom(elements[j], cfg.toClone ?? {}, { from: item, ...cfg.withOptions });
                     }
                 } else {
                     const rootEl = existingNodes.find(n => n instanceof Element) as Element | undefined;
@@ -167,10 +191,13 @@ export class ManageTemplateListHandler implements AssignFromHandler {
                         if (processInferred) {
                             processInferred(rootEl, item, inferredConfig === true ? { byItemprop: true } : inferredConfig);
                         } else {
-                            assignFrom(rootEl, assignToFragment, { from: item, ...withOptions });
+                            assignFrom(rootEl, toClone, { from: item, ...withOptions });
+                        }
+                        if (hostToClone && options?.from) {
+                            assignFrom(rootEl, hostToClone, { from: options.from, ...hostWithOptions });
                         }
-                        if (sourceAssignToFragment && options?.from) {
-                            assignFrom(rootEl, sourceAssignToFragment, { from: options.from, ...sourceWithOptions });
+                        if (targetToClone) {
+                            assignFrom(rootEl, targetToClone, { from: lhsTarget, ...targetWithOptions });
                         }
                     }
                 }
@@ -182,7 +209,7 @@ export class ManageTemplateListHandler implements AssignFromHandler {
                 // New item — clone template
                 let content: DocumentFragment;
                 if (instantiate instanceof HTMLTemplateElement) {
-                    content = instantiate.content.cloneNode(true) as DocumentFragment;
+                    content = (instantiate.remoteContent ||instantiate.content).cloneNode(true) as DocumentFragment;
                 } else if (instantiate instanceof DocumentFragment) {
                     content = instantiate.cloneNode(true) as DocumentFragment;
                 } else {
@@ -201,7 +228,7 @@ export class ManageTemplateListHandler implements AssignFromHandler {
                     const len = Math.min(elements.length, configs.length);
                     for (let j = 0; j < len; j++) {
                         const cfg = configs[j];
-                        assignFrom(elements[j], cfg.assignToFragment ?? {}, { from: item, ...cfg.withOptions });
+                        assignFrom(elements[j], cfg.toClone ?? {}, { from: item, ...cfg.withOptions });
                     }
                 } else {
                     const rootEl = clonedNodes.find(n => n instanceof Element) as Element | undefined;
@@ -212,11 +239,14 @@ export class ManageTemplateListHandler implements AssignFromHandler {
                         if (processInferred) {
                             processInferred(rootEl, item, inferredConfig === true ? { byItemprop: true } : inferredConfig);
                         } else {
-                            assignFrom(rootEl, assignToFragment, { from: item, ...withOptions });
+                            assignFrom(rootEl, toClone, { from: item, ...withOptions });
                         }
 
-                        if (sourceAssignToFragment && options?.from) {
-                            assignFrom(rootEl, sourceAssignToFragment, { from: options.from, ...sourceWithOptions });
+                        if (hostToClone && options?.from) {
+                            assignFrom(rootEl, hostToClone, { from: options.from, ...hostWithOptions });
+                        }
+                        if (targetToClone) {
+                            assignFrom(rootEl, targetToClone, { from: lhsTarget, ...targetWithOptions });
                         }
                     }
                 }

package/handlers/nudge.js

@@ -0,0 +1,23 @@
+import { arr } from './arr.js';
+/**
+ * Decrement "disabled" counter, remove when reaches 0
+ * @param el
+ * Optional select the attribute or attributes to remove or decrement
+ * @param attr
+ */
+export function nudge(el, attr = 'disabled') {
+    const attrs = arr(attr);
+    for (const attr of attrs) {
+        const da = el.getAttribute(attr);
+        if (da !== null) {
+            if (da.length === 0 || da === "1") {
+                el.removeAttribute(attr);
+                if (attr === 'disabled')
+                    el.disabled = false;
+            }
+            else {
+                el.setAttribute(attr, (parseInt(da) - 1).toString());
+            }
+        }
+    }
+}

package/handlers/nudge.ts

@@ -0,0 +1,23 @@
+import {arr} from './arr.js';
+/**
+ * Decrement "disabled" counter, remove when reaches 0
+ * @param el
+ * Optional select the attribute or attributes to remove or decrement
+ * @param attr 
+ */
+ export function nudge(el: Element, attr: string | Array<string> = 'disabled') { //TODO:  Share with be-observant
+    const attrs = arr(attr);
+    for(const attr of attrs){
+        const da = el.getAttribute(attr);
+        if (da !== null) {
+            if (da.length === 0 || da === "1") {
+                el.removeAttribute(attr);
+                if(attr === 'disabled') (<any>el).disabled = false;
+            }
+            else {
+                el.setAttribute(attr, (parseInt(da) - 1).toString());
+            }
+        }
+    }
+
+}

package/index.js

@@ -14,4 +14,6 @@ export { assignFeatures, FeaturesRegistry, captureFeatureInitVals, PropertyBag,
 export { installForwarding } from './installForwarding.js';
 export { defineWithFeatures } from './defineWithFeatures.js';
 export { resolveAndAssignFeatures } from './resolveAndAssignFeatures.js';
+export { nudge } from './handlers/nudge.js';
+export { arr } from './handlers/arr.js';
 import './object-extension.js';

package/index.ts

@@ -14,5 +14,7 @@ export {assignFeatures, FeaturesRegistry, captureFeatureInitVals, PropertyBag, s
 export {installForwarding} from './installForwarding.js';
 export {defineWithFeatures} from './defineWithFeatures.js';
 export {resolveAndAssignFeatures} from './resolveAndAssignFeatures.js';
+export {nudge} from './handlers/nudge.js';
+export {arr} from './handlers/arr.js';
 export {} from './handlers/manageTemplateList.js';
 import './object-extension.js';