@motifx/core 1.0.1 → 1.1.0

package/dist/devtools.cjs

@@ -1,6 +1,6 @@
 'use strict';
 
-var devtools = require('./chunks/core-DXGu4dNE.cjs');
+var devtools = require('./chunks/core-BI6Lk585.cjs');
 
 
 

package/dist/devtools.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"devtools.cjs","sources":[],"sourcesContent":null,"names":[],"mappings":";;;;;;;"}
+{"version":3,"file":"devtools.cjs","sources":[],"sourcesContent":[],"names":[],"mappings":";;;;;;;"}

package/dist/devtools.esm.js

@@ -1,2 +1,2 @@
-export { J as debugGetDepMap, I as debugGetDeps } from './chunks/core-BDvHkZLQ.esm.js';
+export { a3 as debugGetDepMap, a2 as debugGetDeps } from './chunks/core-BGdhUeHu.esm.js';
 //# sourceMappingURL=devtools.esm.js.map

package/dist/devtools.esm.js.map

@@ -1 +1 @@
-{"version":3,"file":"devtools.esm.js","sources":[],"sourcesContent":null,"names":[],"mappings":""}
+{"version":3,"file":"devtools.esm.js","sources":[],"sourcesContent":[],"names":[],"mappings":""}

package/dist/index.cjs

@@ -1,7 +1,6 @@
 'use strict';
 
-var internal = require('./chunks/core-DfzGo_Ti.cjs');
-var devtools = require('./chunks/core-DXGu4dNE.cjs');
+var devtools = require('./chunks/core-BI6Lk585.cjs');
 
 class NameValuePair {
     Key;
@@ -56,10 +55,11 @@ class List {
     }
     ;
     remove(item) {
+        const index = this.__list.indexOf(item);
+        if (index === -1)
+            return [];
         this._map.delete(item);
-        this.__list.splice(this.__list.indexOf(item), 1);
-        item = null;
-        return [];
+        return this.__list.splice(index, 1);
     }
     ;
     indexOf(item) {
@@ -86,7 +86,7 @@ class List {
         this.__list?.forEach(callbackfn);
     }
     ReverseClone() {
-        return this.__list.reverse();
+        return this.__list.slice().reverse();
     }
     filter(callbackfn) {
         return this.__list.filter(callbackfn);
@@ -113,8 +113,7 @@ class Dictionary {
     }
     OnItemAdded;
     removeIndex(index) {
-        var i = this.__values.removeIndex(index - 1);
-        return i;
+        return this.__values.removeIndex(index);
     }
     ;
     remove(Key) {
@@ -236,7 +235,7 @@ function renderPreProcessing() {
 // const ContentBodyCollection = new Map<string, ContentBody>();
 const ContentBodyCollectionHandable = new Map();
 const changeBodyCollectionHandler = Symbol('changeBodyCollectionHandler');
-class ContentBlock extends internal.Component {
+class ContentBlock extends devtools.Component {
     constructor(props) {
         super(props);
         // var cb = ContentBodyCollectionHandable.get(props.target);
@@ -244,20 +243,16 @@ class ContentBlock extends internal.Component {
         // } else {
         //         var cb = ContentBodyCollectionHandable.get(props.target);
         //         if (cb) {
-        this.controls.onAdd = (control) => {
-            var cb = ContentBodyCollectionHandable.get(this.props.target);
-            if (cb) {
-                control.motif.options["ownerContentBlock"] = this;
-                cb.controls.add(control);
-            }
-        };
-        this.controls.onAddBeforeBuild = (control) => {
+        const forward = (control) => {
+            this.motif.trigger('controladded', { control });
             var cb = ContentBodyCollectionHandable.get(this.props.target);
             if (cb) {
                 control.motif.options["ownerContentBlock"] = this;
                 cb.controls.add(control);
             }
         };
+        this.controls.onAdd = forward;
+        this.controls.onAddBeforeBuild = forward;
         if (this.childs) {
             this.controls.add(...this.childs);
         }
@@ -294,14 +289,16 @@ class ContentBlock extends internal.Component {
         // if (cb) {
     }
 }
-class ContentBody extends internal.Component {
+class ContentBody extends devtools.Component {
     constructor(props) {
         super(props);
         ContentBodyCollectionHandable.set(this.props.name, this);
         this.context.fire(changeBodyCollectionHandler);
     }
     ondisposing(sender) {
-        ContentBodyCollectionHandable.delete(this.props.name);
+        if (ContentBodyCollectionHandable.get(this.props.name) === this) {
+            ContentBodyCollectionHandable.delete(this.props.name);
+        }
     }
 }
 
@@ -311,12 +308,12 @@ class TransportRegistry {
     static slots = new Map();
     static registerSlot(name, slot) {
         this.slots.set(name, slot);
-        internal.Application.main.fire(SLOT_REGISTERED_EVENT, { name, slot });
+        devtools.Application.main.fire(SLOT_REGISTERED_EVENT, { name, slot });
     }
     static unregisterSlot(name, slot) {
         if (this.slots.get(name) === slot) {
             this.slots.delete(name);
-            internal.Application.main.fire(SLOT_UNREGISTERED_EVENT, { name, slot });
+            devtools.Application.main.fire(SLOT_UNREGISTERED_EVENT, { name, slot });
         }
     }
     static getSlot(name) {
@@ -324,7 +321,7 @@ class TransportRegistry {
     }
 }
 
-class Transport extends internal.Component {
+class Transport extends devtools.Component {
     mode;
     constructor(props) {
         super(props);
@@ -333,7 +330,7 @@ class Transport extends internal.Component {
     initializeComponent(sender) {
         TransportRegistry.registerSlot(this.props.name, this);
         this.onDisposing = () => {
-            (this.controls.items || []).forEach(child => {
+            [...(this.controls.items || [])].forEach(child => {
                 this.controls.remove(child);
                 child.dispose?.();
             });
@@ -341,7 +338,7 @@ class Transport extends internal.Component {
         };
     }
     clearSlot() {
-        (this.controls.items || []).forEach(child => {
+        [...(this.controls.items || [])].forEach(child => {
             this.controls.remove(child);
             child.dispose?.();
         });
@@ -355,7 +352,7 @@ class Transporter {
         if (child.parent === newParent && newParent.controls.items.includes(child))
             return;
         if (child.parent && child.parent !== newParent) {
-            child.parent.controls.remove(child);
+            child.parent.controls.silentDetach(child, true);
         }
         if (options.owner) {
             child.motif.options.ownerTransporter = options.owner;
@@ -412,14 +409,17 @@ class Transporter {
     }
 }
 
-class TransportTo extends internal.Component {
+class TransportTo extends devtools.Component {
     _onAddRef;
     _onRemoveRef;
     _slotRegisteredListener;
     _slotUnregisteredListener;
     _transported = [];
+    _countedLive = false;
     constructor(props) {
         super('div', props);
+        devtools.contentBlocks.live++;
+        this._countedLive = true;
     }
     _handleSlotChange = (eventArgs) => {
         if (eventArgs.name === this.props.name) {
@@ -429,9 +429,17 @@ class TransportTo extends internal.Component {
             }
             const all = [...(this.childs || []), ...this.controls.items];
             Transporter.transportMany(all, slot);
-            this._transported = all;
+            this._rememberTransported(all);
         }
     };
+    _rememberTransported(children) {
+        const kept = this._transported.filter(c => !c.isDisposed);
+        for (const child of children) {
+            if (!kept.includes(child))
+                kept.push(child);
+        }
+        this._transported = kept;
+    }
     _clearChildrenFromSlot = (slot) => {
         (this.childs || []).forEach(child => {
             slot.controls.remove(child);
@@ -450,18 +458,20 @@ class TransportTo extends internal.Component {
             }
             const all = [...(this.childs || []), ...this.controls.items];
             Transporter.transportMany(all, slot);
-            this._transported = all;
+            this._rememberTransported(all);
         }
-        this._slotRegisteredListener = internal.Application.main.on(SLOT_REGISTERED_EVENT, this._handleSlotChange);
-        this._slotUnregisteredListener = internal.Application.main.on(SLOT_UNREGISTERED_EVENT, (eventArgs) => {
+        this._slotRegisteredListener = devtools.Application.main.on(SLOT_REGISTERED_EVENT, this._handleSlotChange);
+        this._slotUnregisteredListener = devtools.Application.main.on(SLOT_UNREGISTERED_EVENT, (eventArgs) => {
             if (eventArgs.name === this.props.name) {
                 this._clearChildrenFromSlot(eventArgs.slot);
             }
         });
         this._onAddRef = (child) => {
+            this.motif.trigger('controladded', { control: child });
             const currentSlot = TransportRegistry.getSlot(this.props.name);
             if (currentSlot) {
                 Transporter.transport(child, currentSlot);
+                this._rememberTransported([child]);
             }
         };
         this._onRemoveRef = (child) => {
@@ -469,24 +479,27 @@ class TransportTo extends internal.Component {
             if (currentSlot) {
                 currentSlot.controls.remove(child);
             }
+            this._transported = this._transported.filter(c => c !== child);
         };
         this.controls.onAdd = this._onAddRef;
         this.controls.onRemove = this._onRemoveRef;
     }
     onDisposing(sender, e) {
+        if (this._countedLive) {
+            this._countedLive = false;
+            devtools.contentBlocks.live--;
+        }
         const currentSlot = TransportRegistry.getSlot(this.props.name);
-        if (currentSlot) {
-            (this._transported || []).forEach(child => {
-                currentSlot.controls.remove(child);
-                child.dispose();
-            });
+        for (const child of this._transported || []) {
+            currentSlot?.controls.remove(child);
+            child.dispose();
         }
         if (this._slotRegisteredListener) {
-            internal.Application.main.off(SLOT_REGISTERED_EVENT, this._handleSlotChange);
+            devtools.Application.main.off(SLOT_REGISTERED_EVENT, this._handleSlotChange);
             this._slotRegisteredListener = undefined;
         }
         if (this._slotUnregisteredListener) {
-            internal.Application.main.off(SLOT_UNREGISTERED_EVENT, this._slotUnregisteredListener);
+            devtools.Application.main.off(SLOT_UNREGISTERED_EVENT, this._slotUnregisteredListener);
             this._slotUnregisteredListener = undefined;
         }
         if (this.controls.onAdd === this._onAddRef)
@@ -499,7 +512,7 @@ class TransportTo extends internal.Component {
     }
 }
 
-class Virtualization extends internal.Component {
+class Virtualization extends devtools.Component {
     _state;
     _virtualContent;
     _topSpacer;
@@ -534,20 +547,20 @@ class Virtualization extends internal.Component {
         this.renderViewport = this.renderViewport.bind(this);
         this._makeView();
     }
-    contentWrapper = new internal.Component();
+    contentWrapper = new devtools.Component();
     wrapper;
     _makeView() {
-        this._topSpacer = new internal.Component('div');
+        this._topSpacer = new devtools.Component('div');
         this._topSpacer.element.style.cssText = 'height: 0px;';
         this._topSpacer.class.add('motif-virtualization-top-spacer');
-        this._bottomSpacer = new internal.Component('div');
+        this._bottomSpacer = new devtools.Component('div');
         this._bottomSpacer.element.style.cssText = 'height: 0px;';
         this._bottomSpacer.class.add('motif-virtualization-bottom-spacer');
-        this._virtualContent = new internal.Component(document.createComment(''));
+        this._virtualContent = new devtools.Component(document.createComment(''));
         if (this.props.mainTemplate) {
             this.contentWrapper.controls.add(this._topSpacer, this._virtualContent, this._bottomSpacer);
             this.contentWrapper.onBuilding = ((s) => {
-                var el = internal.findAppendableComponent(s.parent);
+                var el = devtools.findAppendableComponent(s.parent);
                 if (el) {
                     this.wrapper = el;
                     this._loadInitial();
@@ -979,7 +992,7 @@ class Virtualization extends internal.Component {
             return component;
         }
         const rendered = this.props.itemTemplate(item, index);
-        component = rendered instanceof internal.ComponentBase ? rendered : new internal.Component(rendered);
+        component = rendered instanceof devtools.ComponentBase ? rendered : new devtools.Component(rendered);
         component.__listItemRef = item;
         this._cache.set(key, component);
         return component;
@@ -1003,7 +1016,7 @@ class Virtualization extends internal.Component {
                     break;
                 cur = next;
             }
-            internal.notifyDeactivated(c);
+            devtools.notifyDeactivated(c);
         }
         else {
             controls.silentDetach(c);
@@ -1087,7 +1100,7 @@ class Virtualization extends internal.Component {
     }
 }
 
-class RouterLink extends internal.Component {
+class RouterLink extends devtools.Component {
     constructor(props) {
         super(props.el ?? 'a', props);
         if (props.showHref !== false)
@@ -1102,7 +1115,7 @@ class RouterLink extends internal.Component {
             if (e.metaKey || e.ctrlKey || e.shiftKey || e.altKey)
                 return;
             e.preventDefault();
-            const router = internal.Application.main.router;
+            const router = devtools.Application.main.router;
             if (router)
                 router.navigate(props.to);
         });
@@ -1129,7 +1142,7 @@ class RouterLink extends internal.Component {
 
 function Injectable(options) {
     return (target) => {
-        internal.autoRegistry.set(target, {
+        devtools.autoRegistry.set(target, {
             lifetime: options?.lifetime ?? "transient",
             deps: options?.deps
         });
@@ -1137,7 +1150,7 @@ function Injectable(options) {
 }
 function FromService(token) {
     try {
-        return internal.Application.main.provider.get(token);
+        return devtools.Application.main.provider.get(token);
     }
     catch (error) {
         devtools.reportWarning('MJX414', [describeServiceToken(token), String(error?.message ?? error)], { token, error });
@@ -1343,7 +1356,7 @@ class RateLimiterPolicy extends Policy {
         super();
         this.tokensPerInterval = opts.tokensPerInterval ?? 1;
         this.intervalMs = opts.intervalMs ?? 1000;
-        this.capacity = opts.capacity ?? 1000;
+        this.capacity = opts.capacity ?? this.tokensPerInterval;
         this.tokens = this.capacity;
         this.lastRefill = Date.now();
     }
@@ -1445,32 +1458,21 @@ class Resilience {
     }
 }
 
-exports.Application = internal.Application;
-exports.ApplicationBuilder = internal.ApplicationBuilder;
-exports.Component = internal.Component;
-exports.ComponentBase = internal.ComponentBase;
-exports.ComponentMotif = internal.ComponentMotif;
-exports.ControlCollection = internal.ControlCollection;
-exports.Disposable = internal.Disposable;
-exports.DisposableStore = internal.DisposableStore;
-exports.Emitter = internal.Emitter;
-exports.FNComponent = internal.FNComponent;
-exports.FragmentNode = internal.FragmentNode;
-exports.Frame = internal.Frame;
-exports.Lazy = internal.Lazy;
-exports.RouterView = internal.RouterView;
-exports.ServiceCollection = internal.ServiceCollection;
-exports.ServiceProvider = internal.ServiceProvider;
-exports.disposableCore = internal.disposableCore;
-exports.inject = internal.inject;
-exports.motifCompiled = internal.motifCompiled;
-exports.motifComponent = internal.motifComponent;
-exports.motifFragment = internal.motifFragment;
-exports.toDisposable = internal.toDisposable;
-exports.useApplication = internal.useApplication;
-exports.useNavigation = internal.useNavigation;
+exports.Application = devtools.Application;
+exports.ApplicationBuilder = devtools.ApplicationBuilder;
+exports.Component = devtools.Component;
+exports.ComponentBase = devtools.ComponentBase;
+exports.ComponentMotif = devtools.ComponentMotif;
 exports.Computed = devtools.Computed;
+exports.ControlCollection = devtools.ControlCollection;
+exports.Disposable = devtools.Disposable;
+exports.DisposableStore = devtools.DisposableStore;
+exports.Emitter = devtools.Emitter;
 exports.ErrorHandler = devtools.ErrorHandler;
+exports.FNComponent = devtools.FNComponent;
+exports.FragmentNode = devtools.FragmentNode;
+exports.Frame = devtools.Frame;
+exports.Lazy = devtools.Lazy;
 exports.LazyComputed = devtools.LazyComputed;
 exports.LinkedList = devtools.LinkedList;
 exports.MotifError = devtools.MotifError;
@@ -1478,6 +1480,9 @@ Object.defineProperty(exports, "NodeTypes", {
     enumerable: true,
     get: function () { return devtools.NodeTypes; }
 });
+exports.RouterView = devtools.RouterView;
+exports.ServiceCollection = devtools.ServiceCollection;
+exports.ServiceProvider = devtools.ServiceProvider;
 exports.Signal = devtools.Signal;
 exports.asyncTracking = devtools.asyncTracking;
 exports.clearModel = devtools.clearModel;
@@ -1486,16 +1491,24 @@ exports.createComputed = devtools.createComputed;
 exports.createLazyComputed = devtools.createLazyComputed;
 exports.createSignal = devtools.createSignal;
 exports.deepClone = devtools.deepClone;
+exports.disposableCore = devtools.disposableCore;
 exports.dom = devtools.dom;
 exports.effect = devtools.effect;
 exports.errorHandler = devtools.errorHandler;
+exports.inject = devtools.inject;
+exports.motifCompiled = devtools.motifCompiled;
+exports.motifComponent = devtools.motifComponent;
+exports.motifFragment = devtools.motifFragment;
 exports.reactive = devtools.reactive;
 exports.safeCall = devtools.safeCall;
 exports.safeCallAsync = devtools.safeCallAsync;
 exports.safeCallSilent = devtools.safeCallSilent;
 exports.setUnexpectedErrorHandler = devtools.setUnexpectedErrorHandler;
+exports.toDisposable = devtools.toDisposable;
 exports.untracked = devtools.untracked;
+exports.useApplication = devtools.useApplication;
 exports.useModel = devtools.useModel;
+exports.useNavigation = devtools.useNavigation;
 exports.ContentBlock = ContentBlock;
 exports.ContentBody = ContentBody;
 exports.Dictionary = Dictionary;