@maas/vue-equipment 0.7.6 → 0.7.8

package/dist/nuxt/module.json

@@ -1,5 +1,5 @@
 {
   "name": "@maas/vue-equipment",
   "configKey": "vueEquipment",
-  "version": "0.7.5"
+  "version": "0.7.7"
 }

package/dist/plugins/MagicModal/src/components/MagicModal.vue

@@ -60,13 +60,22 @@ import {
   type MaybeRef,
 } from 'vue'
 import { onKeyStroke } from '@vueuse/core'
-import { defu } from 'defu'
 import { defaultOptions } from './../utils/defaultOptions'
 import { useModalApi } from './../composables/useModalApi'
 import { useModalCallback } from '../composables/private/useModalCallback'
 
 import type { Options } from './../types/index'
 
+import { createDefu } from 'defu'
+
+// Prevent keys array from being merged with default
+const customDefu = createDefu((obj, key, value) => {
+  if (key === 'keys') {
+    obj[key] = value
+    return true
+  }
+})
+
 interface MagicModalProps {
   id: MaybeRef<string>
   component?: Component
@@ -80,7 +89,7 @@ const props = withDefaults(defineProps<MagicModalProps>(), {
 
 const modal = ref<HTMLElement | undefined>(undefined)
 const modalApi = useModalApi(props.id, { focusTarget: modal })
-const mappedOptions = defu(props.options, defaultOptions)
+const mappedOptions = customDefu(props.options, defaultOptions)
 
 const {
   isActive,
@@ -127,10 +136,14 @@ function onClose() {
   innerActive.value = false
 }
 
-onKeyStroke('Escape', (e) => {
-  e.preventDefault()
-  close()
-})
+if (mappedOptions.keys) {
+  for (const key of mappedOptions.keys) {
+    onKeyStroke(key, (e) => {
+      e.preventDefault()
+      close()
+    })
+  }
+}
 
 watch(isActive, async (value) => {
   if (value) {

package/dist/plugins/MagicModal/src/composables/useModalApi.mjs

@@ -1,4 +1,4 @@
-import { crypto } from "@maas/vue-equipment/utils";
+import { uuid } from "@maas/vue-equipment/utils";
 import { ref, computed, toValue } from "vue";
 import { defu } from "defu";
 import { useScrollLock } from "@vueuse/core";
@@ -10,7 +10,7 @@ const defaultOptions = {
 };
 export function useModalApi(id, options) {
   const positionFixedElements = ref([]);
-  const mappedId = computed(() => toValue(id) || crypto.randomUUID());
+  const mappedId = computed(() => toValue(id) || uuid());
   const mappedOptions = defu(options, defaultOptions);
   const focusTrap = mappedOptions.focusTarget ? useFocusTrap(mappedOptions.focusTarget) : void 0;
   const scrollLock = mappedOptions.scrollLock && typeof window !== "undefined" ? useScrollLock(document.body) : ref(false);

package/dist/plugins/MagicModal/src/types/index.d.ts

@@ -11,6 +11,7 @@ type Options = {
         content?: string;
         backdrop?: string;
     };
+    keys?: string[] | false;
 };
 type ModalEvents = {
     beforeEnter: string;

package/dist/plugins/MagicModal/src/utils/defaultOptions.mjs

@@ -10,6 +10,7 @@ const defaultOptions = {
   transitions: {
     content: "magic-modal--content",
     backdrop: "magic-modal--backdrop"
-  }
+  },
+  keys: ["Escape"]
 };
 export { defaultOptions };

package/dist/plugins/MagicToast/src/components/MagicToast.vue

@@ -43,7 +43,7 @@
 </template>
 
 <script setup lang="ts">
-import { crypto } from '@maas/vue-equipment/utils'
+import { uuid } from '@maas/vue-equipment/utils'
 import { defu } from 'defu'
 import { toValue, ref, watch, type MaybeRef } from 'vue'
 import { onClickOutside, type MaybeElement } from '@vueuse/core'
@@ -67,7 +67,7 @@ const { toasts, count, oldest } = useToastApi(props.id)
 
 const mappedOptions = defu(props.options, defaultOptions)
 const isExpanded = ref(mappedOptions.layout?.expand === true)
-const teleportKey = ref(crypto.randomUUID())
+const teleportKey = ref(uuid())
 const listRef = ref<MaybeElement>()
 
 const {
@@ -107,7 +107,7 @@ function outsideClickCallback() {
 onClickOutside(listRef, outsideClickCallback)
 watch(
   () => props.id,
-  () => (teleportKey.value = crypto.randomUUID()),
+  () => (teleportKey.value = uuid()),
 )
 </script>
 

package/dist/plugins/MagicToast/src/composables/private/useToastInternalApi.mjs

@@ -1,4 +1,4 @@
-import { crypto } from "@maas/vue-equipment/utils";
+import { uuid } from "@maas/vue-equipment/utils";
 export function useToastInternalApi() {
   function removeToastAfterTimeout(id, duration, ctx) {
     if (duration > 0) {
@@ -8,7 +8,7 @@ export function useToastInternalApi() {
     }
   }
   function addToast(args, ctx) {
-    const id = crypto.randomUUID();
+    const id = uuid();
     let { component, props, duration = 0 } = args;
     const toast = {
       component,

package/dist/plugins/MagicToast/src/composables/useToastApi.mjs

@@ -1,4 +1,4 @@
-import { crypto } from "@maas/vue-equipment/utils";
+import { uuid } from "@maas/vue-equipment/utils";
 import {
   computed,
   onUnmounted,
@@ -9,7 +9,7 @@ import {
 import { useToastStore } from "./private/useToastStore.mjs";
 export function useToastApi(id) {
   const { findInstance, addInstance, removeInstance } = useToastStore();
-  const mappedId = computed(() => toValue(id) || crypto.randomUUID());
+  const mappedId = computed(() => toValue(id) || uuid());
   const instance = computed(() => findInstance(toValue(mappedId)));
   function initialize() {
     const id2 = toValue(mappedId);

package/dist/utils/index.d.mts

@@ -4,6 +4,8 @@ declare function isIOS(): boolean;
 
 declare function mapValue(value: number, inMin: number, inMax: number, outMin: number, outMax: number): number;
 
-declare const crypto: any;
+declare function uuid(): `${string}-${string}-${string}-${string}-${string}`;
 
-export { clampValue, crypto, isIOS, mapValue };
+declare function uniq<T extends any[]>(a: T): any[];
+
+export { clampValue, isIOS, mapValue, uniq, uuid };

package/dist/utils/index.d.ts

@@ -4,6 +4,8 @@ declare function isIOS(): boolean;
 
 declare function mapValue(value: number, inMin: number, inMax: number, outMin: number, outMax: number): number;
 
-declare const crypto: any;
+declare function uuid(): `${string}-${string}-${string}-${string}-${string}`;
 
-export { clampValue, crypto, isIOS, mapValue };
+declare function uniq<T extends any[]>(a: T): any[];
+
+export { clampValue, isIOS, mapValue, uniq, uuid };

package/dist/utils/index.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,15 +17,24 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
 // index.ts
 var utils_exports = {};
 __export(utils_exports, {
   clampValue: () => clampValue,
-  crypto: () => crypto,
   isIOS: () => isIOS,
-  mapValue: () => mapValue
+  mapValue: () => mapValue,
+  uniq: () => uniq,
+  uuid: () => uuid
 });
 module.exports = __toCommonJS(utils_exports);
 
@@ -44,13 +55,23 @@ function mapValue(value, inMin, inMax, outMin, outMax) {
   return (value - inMin) * (outMax - outMin) / (inMax - inMin) + outMin;
 }
 
-// src/functions/crypto.ts
-var crypto = typeof window === "undefined" ? require("crypto") : window.crypto;
+// src/functions/uuid.ts
+var import_crypto = __toESM(require("crypto"));
+var isBrowser = typeof window !== "undefined";
+function uuid() {
+  return isBrowser ? window.crypto.randomUUID() : import_crypto.default.randomUUID();
+}
+
+// src/functions/uniq.ts
+function uniq(a) {
+  return Array.from(new Set(a));
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   clampValue,
-  crypto,
   isIOS,
-  mapValue
+  mapValue,
+  uniq,
+  uuid
 });
 //# sourceMappingURL=index.js.map

package/dist/utils/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../packages/utils/index.ts","../../packages/utils/src/functions/clampValue.ts","../../packages/utils/src/functions/isIOS.ts","../../packages/utils/src/functions/mapValue.ts","../../packages/utils/src/functions/crypto.ts"],"sourcesContent":["export * from './src/functions/clampValue'\nexport * from './src/functions/isIOS'\nexport * from './src/functions/mapValue'\nexport * from './src/functions/crypto'\n","export function clampValue(value: number, min: number, max: number) {\n  return value <= min ? min : value >= max ? max : value\n}\n","export function isIOS() {\n  if (typeof window === 'undefined') return false\n  return /iPad|iPhone|iPod/.test(navigator?.userAgent)\n}\n","export function mapValue(\n  value: number,\n  inMin: number,\n  inMax: number,\n  outMin: number,\n  outMax: number,\n) {\n  return ((value - inMin) * (outMax - outMin)) / (inMax - inMin) + outMin\n}\n","export const crypto =\n  typeof window === 'undefined' ? require('crypto') : window.crypto\n"],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAO,SAAS,WAAW,OAAe,KAAa,KAAa;AAClE,SAAO,SAAS,MAAM,MAAM,SAAS,MAAM,MAAM;AACnD;;;ACFO,SAAS,QAAQ;AACtB,MAAI,OAAO,WAAW;AAAa,WAAO;AAC1C,SAAO,mBAAmB,KAAK,WAAW,SAAS;AACrD;;;ACHO,SAAS,SACd,OACA,OACA,OACA,QACA,QACA;AACA,UAAS,QAAQ,UAAU,SAAS,WAAY,QAAQ,SAAS;AACnE;;;ACRO,IAAM,SACX,OAAO,WAAW,cAAc,QAAQ,QAAQ,IAAI,OAAO;","names":[]}
+{"version":3,"sources":["../../packages/utils/index.ts","../../packages/utils/src/functions/clampValue.ts","../../packages/utils/src/functions/isIOS.ts","../../packages/utils/src/functions/mapValue.ts","../../packages/utils/src/functions/uuid.ts","../../packages/utils/src/functions/uniq.ts"],"sourcesContent":["export * from './src/functions/clampValue'\nexport * from './src/functions/isIOS'\nexport * from './src/functions/mapValue'\nexport * from './src/functions/uuid'\nexport * from './src/functions/uniq'\n","export function clampValue(value: number, min: number, max: number) {\n  return value <= min ? min : value >= max ? max : value\n}\n","export function isIOS() {\n  if (typeof window === 'undefined') return false\n  return /iPad|iPhone|iPod/.test(navigator?.userAgent)\n}\n","export function mapValue(\n  value: number,\n  inMin: number,\n  inMax: number,\n  outMin: number,\n  outMax: number,\n) {\n  return ((value - inMin) * (outMax - outMin)) / (inMax - inMin) + outMin\n}\n","import crypto from 'crypto'\nconst isBrowser = typeof window !== 'undefined'\n\nexport function uuid() {\n  return isBrowser ? window.crypto.randomUUID() : crypto.randomUUID()\n}\n","export function uniq<T extends any[]>(a: T) {\n  return Array.from(new Set(a))\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;;;ACAO,SAAS,WAAW,OAAe,KAAa,KAAa;AAClE,SAAO,SAAS,MAAM,MAAM,SAAS,MAAM,MAAM;AACnD;;;ACFO,SAAS,QAAQ;AACtB,MAAI,OAAO,WAAW;AAAa,WAAO;AAC1C,SAAO,mBAAmB,KAAK,WAAW,SAAS;AACrD;;;ACHO,SAAS,SACd,OACA,OACA,OACA,QACA,QACA;AACA,UAAS,QAAQ,UAAU,SAAS,WAAY,QAAQ,SAAS;AACnE;;;ACRA,oBAAmB;AACnB,IAAM,YAAY,OAAO,WAAW;AAE7B,SAAS,OAAO;AACrB,SAAO,YAAY,OAAO,OAAO,WAAW,IAAI,cAAAA,QAAO,WAAW;AACpE;;;ACLO,SAAS,KAAsB,GAAM;AAC1C,SAAO,MAAM,KAAK,IAAI,IAAI,CAAC,CAAC;AAC9B;","names":["crypto"]}

package/dist/utils/index.mjs

@@ -1,11 +1,3 @@
-var __require = /* @__PURE__ */ ((x) => typeof require !== "undefined" ? require : typeof Proxy !== "undefined" ? new Proxy(x, {
-  get: (a, b) => (typeof require !== "undefined" ? require : a)[b]
-}) : x)(function(x) {
-  if (typeof require !== "undefined")
-    return require.apply(this, arguments);
-  throw Error('Dynamic require of "' + x + '" is not supported');
-});
-
 // src/functions/clampValue.ts
 function clampValue(value, min, max) {
   return value <= min ? min : value >= max ? max : value;
@@ -23,12 +15,22 @@ function mapValue(value, inMin, inMax, outMin, outMax) {
   return (value - inMin) * (outMax - outMin) / (inMax - inMin) + outMin;
 }
 
-// src/functions/crypto.ts
-var crypto = typeof window === "undefined" ? __require("crypto") : window.crypto;
+// src/functions/uuid.ts
+import crypto from "crypto";
+var isBrowser = typeof window !== "undefined";
+function uuid() {
+  return isBrowser ? window.crypto.randomUUID() : crypto.randomUUID();
+}
+
+// src/functions/uniq.ts
+function uniq(a) {
+  return Array.from(new Set(a));
+}
 export {
   clampValue,
-  crypto,
   isIOS,
-  mapValue
+  mapValue,
+  uniq,
+  uuid
 };
 //# sourceMappingURL=index.mjs.map

package/dist/utils/index.mjs.map

@@ -1 +1 @@
-{"version":3,"sources":["../../packages/utils/src/functions/clampValue.ts","../../packages/utils/src/functions/isIOS.ts","../../packages/utils/src/functions/mapValue.ts","../../packages/utils/src/functions/crypto.ts"],"sourcesContent":["export function clampValue(value: number, min: number, max: number) {\n  return value <= min ? min : value >= max ? max : value\n}\n","export function isIOS() {\n  if (typeof window === 'undefined') return false\n  return /iPad|iPhone|iPod/.test(navigator?.userAgent)\n}\n","export function mapValue(\n  value: number,\n  inMin: number,\n  inMax: number,\n  outMin: number,\n  outMax: number,\n) {\n  return ((value - inMin) * (outMax - outMin)) / (inMax - inMin) + outMin\n}\n","export const crypto =\n  typeof window === 'undefined' ? require('crypto') : window.crypto\n"],"mappings":";;;;;;;;;AAAO,SAAS,WAAW,OAAe,KAAa,KAAa;AAClE,SAAO,SAAS,MAAM,MAAM,SAAS,MAAM,MAAM;AACnD;;;ACFO,SAAS,QAAQ;AACtB,MAAI,OAAO,WAAW;AAAa,WAAO;AAC1C,SAAO,mBAAmB,KAAK,WAAW,SAAS;AACrD;;;ACHO,SAAS,SACd,OACA,OACA,OACA,QACA,QACA;AACA,UAAS,QAAQ,UAAU,SAAS,WAAY,QAAQ,SAAS;AACnE;;;ACRO,IAAM,SACX,OAAO,WAAW,cAAc,UAAQ,QAAQ,IAAI,OAAO;","names":[]}
+{"version":3,"sources":["../../packages/utils/src/functions/clampValue.ts","../../packages/utils/src/functions/isIOS.ts","../../packages/utils/src/functions/mapValue.ts","../../packages/utils/src/functions/uuid.ts","../../packages/utils/src/functions/uniq.ts"],"sourcesContent":["export function clampValue(value: number, min: number, max: number) {\n  return value <= min ? min : value >= max ? max : value\n}\n","export function isIOS() {\n  if (typeof window === 'undefined') return false\n  return /iPad|iPhone|iPod/.test(navigator?.userAgent)\n}\n","export function mapValue(\n  value: number,\n  inMin: number,\n  inMax: number,\n  outMin: number,\n  outMax: number,\n) {\n  return ((value - inMin) * (outMax - outMin)) / (inMax - inMin) + outMin\n}\n","import crypto from 'crypto'\nconst isBrowser = typeof window !== 'undefined'\n\nexport function uuid() {\n  return isBrowser ? window.crypto.randomUUID() : crypto.randomUUID()\n}\n","export function uniq<T extends any[]>(a: T) {\n  return Array.from(new Set(a))\n}\n"],"mappings":";AAAO,SAAS,WAAW,OAAe,KAAa,KAAa;AAClE,SAAO,SAAS,MAAM,MAAM,SAAS,MAAM,MAAM;AACnD;;;ACFO,SAAS,QAAQ;AACtB,MAAI,OAAO,WAAW;AAAa,WAAO;AAC1C,SAAO,mBAAmB,KAAK,WAAW,SAAS;AACrD;;;ACHO,SAAS,SACd,OACA,OACA,OACA,QACA,QACA;AACA,UAAS,QAAQ,UAAU,SAAS,WAAY,QAAQ,SAAS;AACnE;;;ACRA,OAAO,YAAY;AACnB,IAAM,YAAY,OAAO,WAAW;AAE7B,SAAS,OAAO;AACrB,SAAO,YAAY,OAAO,OAAO,WAAW,IAAI,OAAO,WAAW;AACpE;;;ACLO,SAAS,KAAsB,GAAM;AAC1C,SAAO,MAAM,KAAK,IAAI,IAAI,CAAC,CAAC;AAC9B;","names":[]}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@maas/vue-equipment",
   "description": "A magic collection of Vue composables, plugins, components and directives",
-  "version": "0.7.6",
+  "version": "0.7.8",
   "author": "Robin Scholz <https://github.com/robinscholz>, Christoph Jeworutzki <https://github.com/ChristophJeworutzki>",
   "devDependencies": {
     "@antfu/ni": "^0.21.5",
@@ -67,8 +67,7 @@
     "luxon": "^3.4.2",
     "mitt": "^3.0.1",
     "motion": "^10.16.2",
-    "nuxt": "^3.5.1",
-    "uuid": "^9.0.0"
+    "nuxt": "^3.5.1"
   },
   "peerDependenciesMeta": {
     "@maas/magic-timer": {
@@ -94,9 +93,6 @@
     },
     "nuxt": {
       "optional": false
-    },
-    "uuid": {
-      "optional": false
     }
   },
   "scripts": {