vue-mount-plugin 4.0.0-beta.5 → 4.0.0-beta.6

package/dist/index.cjs

@@ -10,9 +10,6 @@ function _arrayLikeToArray(r, a) {
 function _arrayWithHoles(r) {
   if (Array.isArray(r)) return r;
 }
-function _arrayWithoutHoles(r) {
-  if (Array.isArray(r)) return _arrayLikeToArray(r);
-}
 function _assertThisInitialized(e) {
   if (void 0 === e) throw new ReferenceError("this hasn't been initialised - super() hasn't been called");
   return e;
@@ -92,9 +89,6 @@ function _isNativeReflectConstruct() {
     return !!t;
   })();
 }
-function _iterableToArray(r) {
-  if ("undefined" != typeof Symbol && null != r[Symbol.iterator] || null != r["@@iterator"]) return Array.from(r);
-}
 function _iterableToArrayLimit(r, l) {
   var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"];
   if (null != t) {
@@ -122,9 +116,6 @@ function _iterableToArrayLimit(r, l) {
 function _nonIterableRest() {
   throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
 }
-function _nonIterableSpread() {
-  throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
 function ownKeys(e, r) {
   var t = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
@@ -159,9 +150,6 @@ function _setPrototypeOf(t, e) {
 function _slicedToArray(r, e) {
   return _arrayWithHoles(r) || _iterableToArrayLimit(r, e) || _unsupportedIterableToArray(r, e) || _nonIterableRest();
 }
-function _toConsumableArray(r) {
-  return _arrayWithoutHoles(r) || _iterableToArray(r) || _unsupportedIterableToArray(r) || _nonIterableSpread();
-}
 function _toPrimitive(t, r) {
   if ("object" != typeof t || !t) return t;
   var e = t[Symbol.toPrimitive];
@@ -184,6 +172,25 @@ function _unsupportedIterableToArray(r, a) {
   }
 }
 
+var globalConfig = {
+  installed: false
+};
+function setGlobalConfig(config) {
+  Object.assign(globalConfig, config);
+}
+function getGlobalConfig() {
+  return _objectSpread2({}, globalConfig);
+}
+function resetGlobalConfig() {
+  Object.keys(globalConfig).forEach(function (key) {
+    delete globalConfig[key];
+  });
+  globalConfig.installed = false;
+}
+function mergeWithGlobalConfig(options) {
+  return _objectSpread2(_objectSpread2({}, globalConfig), options);
+}
+
 var singletonInstances = new Map();
 var componentKeys = new WeakMap();
 function getComponentKey(component) {
@@ -220,36 +227,10 @@ function clearSingletons() {
 function hasSingleton(key) {
   return singletonInstances.has(key);
 }
-function getSingletonKeys() {
-  return Array.from(singletonInstances.keys());
-}
-
-var globalConfig = {
-  installed: false
-};
-function setGlobalConfig(config) {
-  Object.assign(globalConfig, config);
-}
-function getGlobalConfig() {
-  return _objectSpread2({}, globalConfig);
-}
-function resetGlobalConfig() {
-  Object.keys(globalConfig).forEach(function (key) {
-    delete globalConfig[key];
-  });
-  globalConfig.installed = false;
-}
-function mergeWithGlobalConfig(options) {
-  return _objectSpread2(_objectSpread2({}, globalConfig), options);
-}
 
 function isBrowser() {
   return typeof document !== 'undefined';
 }
-function isNodeEnv() {
-  var _process$versions;
-  return typeof process !== 'undefined' && !!((_process$versions = process.versions) !== null && _process$versions !== void 0 && _process$versions.node);
-}
 function resolveTarget(target) {
   if (!target) return null;
   if (typeof target === 'string') {
@@ -285,9 +266,8 @@ function appendTo(element, target) {
   }
 }
 function removeElement(element) {
-  if (element.parentNode) {
-    element.parentNode.removeChild(element);
-  }
+  var _element$parentNode;
+  (_element$parentNode = element.parentNode) === null || _element$parentNode === void 0 || _element$parentNode.removeChild(element);
 }
 function isInDOM(element) {
   return document.body.contains(element);
@@ -297,19 +277,8 @@ function setZIndex(element, zIndex) {
     element.style.zIndex = String(zIndex);
   }
 }
-function addClass(element, className) {
-  if (className) {
-    var _element$classList;
-    (_element$classList = element.classList).add.apply(_element$classList, _toConsumableArray(className.split(/\s+/).filter(Boolean)));
-  }
-}
-function removeClass(element, className) {
-  if (className) {
-    var _element$classList2;
-    (_element$classList2 = element.classList).remove.apply(_element$classList2, _toConsumableArray(className.split(/\s+/).filter(Boolean)));
-  }
-}
 
+var instanceCounter = 0;
 var EventEmitter = /*#__PURE__*/function () {
   function EventEmitter() {
     _classCallCheck(this, EventEmitter);
@@ -368,7 +337,6 @@ var EventEmitter = /*#__PURE__*/function () {
     }
   }]);
 }();
-var instanceCounter = 0;
 function createInstanceId() {
   return "mount-".concat(++instanceCounter, "-").concat(Date.now().toString(36));
 }
@@ -554,10 +522,8 @@ var MountBase = /*#__PURE__*/function () {
   }, {
     key: "_appendElementToDOM",
     value: function _appendElementToDOM() {
-      if (!this.el) return;
-      if (this._autoCreatedTarget) {
-        appendTo(this.el, null);
-      }
+      if (!this.el || !this._autoCreatedTarget) return;
+      appendTo(this.el, null);
     }
   }, {
     key: "_resolvePromise",
@@ -579,8 +545,7 @@ var MountBase = /*#__PURE__*/function () {
         var _ref2 = _slicedToArray(_ref, 2),
           event = _ref2[0],
           handler = _ref2[1];
-        var propName = eventToPropName(event);
-        result[propName] = function () {
+        result[eventToPropName(event)] = function () {
           if (typeof handler === 'function') {
             handler.apply(void 0, arguments);
           }
@@ -631,7 +596,7 @@ function inheritVue2Context(parent, options) {
   }
   return context;
 }
-function inheritVue3Context(app, _options) {
+function inheritVue3Context(app) {
   if (app !== null && app !== void 0 && app._context) {
     return {
       appContext: app._context,
@@ -680,15 +645,55 @@ var MountVue2 = /*#__PURE__*/function (_MountBase) {
         on = _this$options.on;
       var mergedListeners = _objectSpread2(_objectSpread2({}, listeners), on);
       var context = inheritVue2Context(parent, this.options);
-      var componentOptions = this._component;
-      if (this._component.options) {
-        componentOptions = this._component.options;
-      }
+      var componentOptions = this._component.options || this._component;
       var ComponentConstructor = VueConstructor.extend(componentOptions);
       var instance = new ComponentConstructor({
         propsData: props || {},
         parent: parent
       });
+      this._injectContext(instance, context);
+      this._bindListeners(instance, mergedListeners);
+      this._interceptEmit(instance);
+      instance.$on('close', function (value) {
+        _this2._resolvePromise(value);
+        _this2.unmount();
+      });
+      instance._mountId = this.id;
+      this._vue2Instance = instance;
+    }
+  }, {
+    key: "_mountVM",
+    value: function _mountVM() {
+      if (!this._vue2Instance) return;
+      this._ensureElement();
+      this._appendElementToDOM();
+      this._vue2Instance.$mount(this.el);
+      if (this._vue2Instance.$el) {
+        this.el = this._vue2Instance.$el;
+      }
+      this.vm = this._vue2Instance;
+      this.mounted = true;
+    }
+  }, {
+    key: "_unmountVM",
+    value: function _unmountVM() {
+      if (this._vue2Instance) {
+        this._vue2Instance.$destroy();
+        this._vue2Instance = null;
+      }
+      this.vm = null;
+      this.mounted = false;
+    }
+  }, {
+    key: "_updateVM",
+    value: function _updateVM() {
+      if (this._vue2Instance && this.options.props) {
+        Object.assign(this._vue2Instance.$props, this.options.props);
+      }
+    }
+  }, {
+    key: "_injectContext",
+    value: function _injectContext(instance, context) {
       if (context.router) {
         Object.defineProperty(instance, '$router', {
           get: function get() {
@@ -713,7 +718,11 @@ var MountVue2 = /*#__PURE__*/function (_MountBase) {
           configurable: true
         });
       }
-      Object.entries(mergedListeners).forEach(function (_ref) {
+    }
+  }, {
+    key: "_bindListeners",
+    value: function _bindListeners(instance, listeners) {
+      Object.entries(listeners).forEach(function (_ref) {
         var _ref2 = _slicedToArray(_ref, 2),
           event = _ref2[0],
           handler = _ref2[1];
@@ -725,51 +734,20 @@ var MountVue2 = /*#__PURE__*/function (_MountBase) {
           instance.$on(event, handler);
         }
       });
+    }
+  }, {
+    key: "_interceptEmit",
+    value: function _interceptEmit(instance) {
+      var _this3 = this;
       var originalEmit = instance.$emit.bind(instance);
       instance.$emit = function (event) {
-        var _this2$_eventEmitter;
+        var _this3$_eventEmitter;
         for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
           args[_key - 1] = arguments[_key];
         }
-        (_this2$_eventEmitter = _this2._eventEmitter).emit.apply(_this2$_eventEmitter, [event].concat(args));
+        (_this3$_eventEmitter = _this3._eventEmitter).emit.apply(_this3$_eventEmitter, [event].concat(args));
         return originalEmit.apply(void 0, [event].concat(args));
       };
-      instance.$on('close', function (value) {
-        _this2._resolvePromise(value);
-        _this2.unmount();
-      });
-      instance._mountId = this.id;
-      this._vue2Instance = instance;
-    }
-  }, {
-    key: "_mountVM",
-    value: function _mountVM() {
-      if (!this._vue2Instance) return;
-      this._ensureElement();
-      this._appendElementToDOM();
-      this._vue2Instance.$mount(this.el);
-      if (this._vue2Instance.$el) {
-        this.el = this._vue2Instance.$el;
-      }
-      this.vm = this._vue2Instance;
-      this.mounted = true;
-    }
-  }, {
-    key: "_unmountVM",
-    value: function _unmountVM() {
-      if (this._vue2Instance) {
-        this._vue2Instance.$destroy();
-        this._vue2Instance = null;
-      }
-      this.vm = null;
-      this.mounted = false;
-    }
-  }, {
-    key: "_updateVM",
-    value: function _updateVM() {
-      if (this._vue2Instance && this.options.props) {
-        Object.assign(this._vue2Instance.$props, this.options.props);
-      }
     }
   }]);
 }(MountBase);
@@ -840,23 +818,11 @@ var MountVue3 = /*#__PURE__*/function (_MountBase) {
       this._ensureElement();
       this._appendElementToDOM();
       getRender().then(function (render) {
-        if (render && _this3._vNode && _this3.el) {
-          var _this3$_vNode$compone, _this3$_vNode$compone2;
-          render(_this3._vNode, _this3.el);
-          _this3.vm = (_this3$_vNode$compone = (_this3$_vNode$compone2 = _this3._vNode.component) === null || _this3$_vNode$compone2 === void 0 ? void 0 : _this3$_vNode$compone2.proxy) !== null && _this3$_vNode$compone !== void 0 ? _this3$_vNode$compone : null;
-          var component = _this3._vNode.component;
-          if (component) {
-            var originalEmit = component.emit;
-            component.emit = function (event) {
-              var _this3$_eventEmitter;
-              for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-                args[_key - 1] = arguments[_key];
-              }
-              (_this3$_eventEmitter = _this3._eventEmitter).emit.apply(_this3$_eventEmitter, [event].concat(args));
-              return originalEmit.call.apply(originalEmit, [component, event].concat(args));
-            };
-          }
-        }
+        var _this3$_vNode$compone, _this3$_vNode$compone2;
+        if (!render || !_this3._vNode || !_this3.el) return;
+        render(_this3._vNode, _this3.el);
+        _this3.vm = (_this3$_vNode$compone = (_this3$_vNode$compone2 = _this3._vNode.component) === null || _this3$_vNode$compone2 === void 0 ? void 0 : _this3$_vNode$compone2.proxy) !== null && _this3$_vNode$compone !== void 0 ? _this3$_vNode$compone : null;
+        _this3._interceptEmit();
       });
       this.mounted = true;
     }
@@ -890,6 +856,23 @@ var MountVue3 = /*#__PURE__*/function (_MountBase) {
         });
       }
     }
+  }, {
+    key: "_interceptEmit",
+    value: function _interceptEmit() {
+      var _this$_vNode,
+        _this6 = this;
+      var component = (_this$_vNode = this._vNode) === null || _this$_vNode === void 0 ? void 0 : _this$_vNode.component;
+      if (!component) return;
+      var originalEmit = component.emit;
+      component.emit = function (event) {
+        var _this6$_eventEmitter;
+        for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+          args[_key - 1] = arguments[_key];
+        }
+        (_this6$_eventEmitter = _this6._eventEmitter).emit.apply(_this6$_eventEmitter, [event].concat(args));
+        return originalEmit.call.apply(originalEmit, [component, event].concat(args));
+      };
+    }
   }]);
 }(MountBase);
 
@@ -939,16 +922,14 @@ function useMount() {
 }
 function useSingleton() {
   var getOrCreate = function getOrCreate(key, component, options) {
-    var existingInstances = useMount().instances.value;
-    var existing = existingInstances.find(function (i) {
-      return i.id === key || i.options.singleton === key;
-    });
+    var existing = getSingleton(key);
     if (existing) {
       return existing;
     }
     var instance = createMount(component, _objectSpread2(_objectSpread2({}, options), {}, {
       singleton: key
     }));
+    setSingleton(key, instance);
     instance.show();
     return instance;
   };
@@ -999,7 +980,6 @@ exports.MountBase = MountBase;
 exports.MountPlugin = MountPlugin;
 exports.MountVue2 = MountVue2;
 exports.MountVue3 = MountVue3;
-exports.addClass = addClass;
 exports.appendTo = appendTo;
 exports.capitalize = capitalize;
 exports.clearSingletons = clearSingletons;
@@ -1014,7 +994,6 @@ exports.getInstanceById = getInstanceById;
 exports.getInstances = getInstances;
 exports.getSingleton = getSingleton;
 exports.getSingletonKey = getSingletonKey;
-exports.getSingletonKeys = getSingletonKeys;
 exports.globalConfig = globalConfig;
 exports.hasSingleton = hasSingleton;
 exports.inheritVue2Context = inheritVue2Context;
@@ -1022,10 +1001,8 @@ exports.inheritVue3Context = inheritVue3Context;
 exports.isBrowser = isBrowser;
 exports.isInDOM = isInDOM;
 exports.isMounted = isMounted;
-exports.isNodeEnv = isNodeEnv;
 exports.mergeWithGlobalConfig = mergeWithGlobalConfig;
 exports.mount = mount;
-exports.removeClass = removeClass;
 exports.removeElement = removeElement;
 exports.removeSingleton = removeSingleton;
 exports.resetGlobalConfig = resetGlobalConfig;

package/dist/index.d.ts

@@ -6,8 +6,6 @@ import { Ref } from 'vue-demi';
 import type { VNode } from 'vue-demi';
 import type { VNodeProps } from 'vue-demi';
 
-export declare function addClass(element: Element, className: string): void;
-
 export { App }
 
 export { AppContext }
@@ -63,8 +61,6 @@ export declare function getSingleton(key: string | symbol): MountInstance | unde
 
 export declare function getSingletonKey(component: any, singleton?: boolean | string): string | symbol | undefined;
 
-export declare function getSingletonKeys(): (string | symbol)[];
-
 export declare interface GlobalConfig extends Partial<MountOptions> {
     zIndex?: number;
     container?: string | Element | null;
@@ -79,7 +75,7 @@ export declare function hasSingleton(key: string | symbol): boolean;
 
 export declare function inheritVue2Context(parent: any, options: MountOptions): ContextOptions;
 
-export declare function inheritVue3Context(app: App | undefined, _options?: MountOptions): {
+export declare function inheritVue3Context(app: App | undefined): {
     appContext?: App['_context'];
     provides?: Record<string, unknown>;
 };
@@ -90,8 +86,6 @@ export declare function isInDOM(element: Element): boolean;
 
 export declare function isMounted(id: string): boolean;
 
-export declare function isNodeEnv(): boolean;
-
 export declare interface KeepAliveOptions {
     enabled?: boolean;
     include?: string | RegExp | string[];
@@ -216,6 +210,9 @@ export declare class MountVue2 extends MountBase {
     protected _mountVM(): void;
     protected _unmountVM(): void;
     protected _updateVM(): void;
+    private _injectContext;
+    private _bindListeners;
+    private _interceptEmit;
 }
 
 export declare class MountVue3 extends MountBase {
@@ -226,12 +223,11 @@ export declare class MountVue3 extends MountBase {
     protected _mountVM(): void;
     protected _unmountVM(): void;
     protected _updateVM(): void;
+    private _interceptEmit;
 }
 
 export { Ref }
 
-export declare function removeClass(element: Element, className: string): void;
-
 export declare function removeElement(element: Element): void;
 
 export declare function removeSingleton(key: string | symbol): void;