quasar 2.18.7 → 2.19.0

package/src/plugins/storage/LocalStorage.test.js

@@ -6,14 +6,18 @@ import LocalStorage from './LocalStorage.js'
 const mountPlugin = () => mount({ template: '<div />' })
 
 // We override Quasar install so it installs this plugin
-const quasarVuePlugin = config.global.plugins.find(entry => entry.name === 'Quasar')
+const quasarVuePlugin = config.global.plugins.find(
+  entry => entry.name === 'Quasar'
+)
 const { install } = quasarVuePlugin
 quasarVuePlugin.install = app => install(app, { plugins: { LocalStorage } })
 
 describe('[LocalStorage API]', () => {
   describe('[Injection]', () => {
     test('is injected into $q', () => {
-      const { vm: { $q } } = mountPlugin()
+      const {
+        vm: { $q }
+      } = mountPlugin()
 
       expect($q.localStorage).toBeDefined()
       expect($q.localStorage).toBeTypeOf('object')
@@ -34,7 +38,9 @@ describe('[LocalStorage API]', () => {
       })
 
       test('matches $q API', () => {
-        const { vm: { $q } } = mountPlugin()
+        const {
+          vm: { $q }
+        } = mountPlugin()
         expect($q.localStorage.hasItem).toBe(LocalStorage.hasItem)
       })
     })
@@ -51,7 +57,9 @@ describe('[LocalStorage API]', () => {
       })
 
       test('matches $q API', () => {
-        const { vm: { $q } } = mountPlugin()
+        const {
+          vm: { $q }
+        } = mountPlugin()
         expect($q.localStorage.getLength).toBe(LocalStorage.getLength)
       })
     })
@@ -60,13 +68,13 @@ describe('[LocalStorage API]', () => {
       test('should be callable', () => {
         mountPlugin()
 
-        expect(
-          LocalStorage.getItem('getItem')
-        ).toBeNull()
+        expect(LocalStorage.getItem('getItem')).toBeNull()
       })
 
       test('matches $q API', () => {
-        const { vm: { $q } } = mountPlugin()
+        const {
+          vm: { $q }
+        } = mountPlugin()
         expect($q.localStorage.getItem).toBe(LocalStorage.getItem)
       })
     })
@@ -78,9 +86,7 @@ describe('[LocalStorage API]', () => {
         // ensure at least one element is defined
         LocalStorage.setItem('getIndex', 'rstoenescu')
 
-        expect(
-          LocalStorage.getIndex(0)
-        ).$any([
+        expect(LocalStorage.getIndex(0)).$any([
           expect.any(Number),
           expect.any(Boolean),
           expect.any(Date),
@@ -93,7 +99,9 @@ describe('[LocalStorage API]', () => {
       })
 
       test('matches $q API', () => {
-        const { vm: { $q } } = mountPlugin()
+        const {
+          vm: { $q }
+        } = mountPlugin()
         expect($q.localStorage.getIndex).toBe(LocalStorage.getIndex)
       })
     })
@@ -105,13 +113,13 @@ describe('[LocalStorage API]', () => {
         // ensure at least one element is defined
         LocalStorage.setItem('getKey', 'rstoenescu')
 
-        expect(
-          LocalStorage.getKey(0)
-        ).toBeTypeOf('string')
+        expect(LocalStorage.getKey(0)).toBeTypeOf('string')
       })
 
       test('matches $q API', () => {
-        const { vm: { $q } } = mountPlugin()
+        const {
+          vm: { $q }
+        } = mountPlugin()
         expect($q.localStorage.getKey).toBe(LocalStorage.getKey)
       })
     })
@@ -129,7 +137,9 @@ describe('[LocalStorage API]', () => {
       })
 
       test('matches $q API', () => {
-        const { vm: { $q } } = mountPlugin()
+        const {
+          vm: { $q }
+        } = mountPlugin()
         expect($q.localStorage.getAll).toBe(LocalStorage.getAll)
       })
     })
@@ -141,17 +151,15 @@ describe('[LocalStorage API]', () => {
         // ensure at least one element is defined
         LocalStorage.setItem('getAllKeys', 'rstoenescu')
 
-        expect(
-          Array.isArray(LocalStorage.getAllKeys())
-        ).toBe(true)
+        expect(Array.isArray(LocalStorage.getAllKeys())).toBe(true)
 
-        expect(
-          LocalStorage.getAllKeys()
-        ).toContain('getAllKeys')
+        expect(LocalStorage.getAllKeys()).toContain('getAllKeys')
       })
 
       test('matches $q API', () => {
-        const { vm: { $q } } = mountPlugin()
+        const {
+          vm: { $q }
+        } = mountPlugin()
         expect($q.localStorage.getAllKeys).toBe(LocalStorage.getAllKeys)
       })
     })
@@ -160,17 +168,15 @@ describe('[LocalStorage API]', () => {
       test('should be callable', () => {
         mountPlugin()
 
-        expect(
-          LocalStorage.setItem('set', 'rstoenescu')
-        ).toBeUndefined()
+        expect(LocalStorage.setItem('set', 'rstoenescu')).toBeUndefined()
 
-        expect(
-          LocalStorage.getItem('set')
-        ).toBe('rstoenescu')
+        expect(LocalStorage.getItem('set')).toBe('rstoenescu')
       })
 
       test('matches $q API', () => {
-        const { vm: { $q } } = mountPlugin()
+        const {
+          vm: { $q }
+        } = mountPlugin()
         expect($q.localStorage.setItem).toBe(LocalStorage.setItem)
       })
 
@@ -203,27 +209,21 @@ describe('[LocalStorage API]', () => {
         const date = new Date()
 
         LocalStorage.setItem('Date', date)
-        expect(
-          LocalStorage.getItem('Date')
-        ).toStrictEqual(date)
+        expect(LocalStorage.getItem('Date')).toStrictEqual(date)
       })
 
       test('can encode + decode a String', () => {
         mountPlugin()
 
         LocalStorage.setItem('String', 'rstoenescu')
-        expect(
-          LocalStorage.getItem('String')
-        ).toBe('rstoenescu')
+        expect(LocalStorage.getItem('String')).toBe('rstoenescu')
       })
 
       test('can encode + decode a RegExp', () => {
         mountPlugin()
 
         LocalStorage.setItem('RegExp', /abc/)
-        expect(
-          LocalStorage.getItem('RegExp')
-        ).toStrictEqual(/abc/)
+        expect(LocalStorage.getItem('RegExp')).toStrictEqual(/abc/)
       })
 
       test('can encode + decode a Function', () => {
@@ -231,9 +231,7 @@ describe('[LocalStorage API]', () => {
         const fn = () => 5
 
         LocalStorage.setItem('Function', fn)
-        expect(
-          LocalStorage.getItem('Function')
-        ).toBe(fn.toString())
+        expect(LocalStorage.getItem('Function')).toBe(fn.toString())
       })
 
       test('can encode + decode an Object', () => {
@@ -241,19 +239,15 @@ describe('[LocalStorage API]', () => {
         const obj = { a: 1 }
 
         LocalStorage.setItem('Object', obj)
-        expect(
-          LocalStorage.getItem('Object')
-        ).toStrictEqual(obj)
+        expect(LocalStorage.getItem('Object')).toStrictEqual(obj)
       })
 
       test('can encode + decode an Array', () => {
         mountPlugin()
-        const arr = [ 1, 2, 3 ]
+        const arr = [1, 2, 3]
 
         LocalStorage.setItem('Array', arr)
-        expect(
-          LocalStorage.getItem('Array')
-        ).toStrictEqual(arr)
+        expect(LocalStorage.getItem('Array')).toStrictEqual(arr)
       })
     })
 
@@ -262,21 +256,17 @@ describe('[LocalStorage API]', () => {
         mountPlugin()
 
         LocalStorage.setItem('remove', 5)
-        expect(
-          LocalStorage.getItem('remove')
-        ).toBe(5)
+        expect(LocalStorage.getItem('remove')).toBe(5)
 
-        expect(
-          LocalStorage.removeItem('remove')
-        ).toBeUndefined()
+        expect(LocalStorage.removeItem('remove')).toBeUndefined()
 
-        expect(
-          LocalStorage.getItem('remove')
-        ).toBeNull()
+        expect(LocalStorage.getItem('remove')).toBeNull()
       })
 
       test('matches $q API', () => {
-        const { vm: { $q } } = mountPlugin()
+        const {
+          vm: { $q }
+        } = mountPlugin()
         expect($q.localStorage.removeItem).toBe(LocalStorage.removeItem)
       })
     })
@@ -295,7 +285,9 @@ describe('[LocalStorage API]', () => {
       })
 
       test('matches $q API', () => {
-        const { vm: { $q } } = mountPlugin()
+        const {
+          vm: { $q }
+        } = mountPlugin()
         expect($q.localStorage.clear).toBe(LocalStorage.clear)
       })
     })
@@ -315,7 +307,9 @@ describe('[LocalStorage API]', () => {
       })
 
       test('matches $q API', () => {
-        const { vm: { $q } } = mountPlugin()
+        const {
+          vm: { $q }
+        } = mountPlugin()
         expect($q.localStorage.isEmpty).toBe(LocalStorage.isEmpty)
       })
     })

package/src/plugins/storage/SessionStorage.js

@@ -1,12 +1,13 @@
 import { client } from '../platform/Platform.js'
 import { getEmptyStorage, getStorage } from './engine/web-storage.js'
 
-const storage = __QUASAR_SSR_SERVER__ || client.has.webStorage === false
-  ? getEmptyStorage()
-  : getStorage('session')
+const storage =
+  __QUASAR_SSR_SERVER__ || client.has.webStorage === false
+    ? getEmptyStorage()
+    : getStorage('session')
 
 const Plugin = {
-  install ({ $q }) {
+  install({ $q }) {
     $q.sessionStorage = storage
   }
 }

package/src/plugins/storage/SessionStorage.json

@@ -1,5 +1,5 @@
 {
-  "mixins": [ "plugins/storage/engine/web-storage" ],
+  "mixins": ["plugins/storage/engine/web-storage"],
 
   "injection": "$q.sessionStorage"
 }

package/src/plugins/storage/SessionStorage.test.js

@@ -6,14 +6,18 @@ import SessionStorage from './SessionStorage.js'
 const mountPlugin = () => mount({ template: '<div />' })
 
 // We override Quasar install so it installs this plugin
-const quasarVuePlugin = config.global.plugins.find(entry => entry.name === 'Quasar')
+const quasarVuePlugin = config.global.plugins.find(
+  entry => entry.name === 'Quasar'
+)
 const { install } = quasarVuePlugin
 quasarVuePlugin.install = app => install(app, { plugins: { SessionStorage } })
 
 describe('[SessionStorage API]', () => {
   describe('[Injection]', () => {
     test('is injected into $q', () => {
-      const { vm: { $q } } = mountPlugin()
+      const {
+        vm: { $q }
+      } = mountPlugin()
 
       expect($q.sessionStorage).toBeDefined()
       expect($q.sessionStorage).toBeTypeOf('object')
@@ -34,7 +38,9 @@ describe('[SessionStorage API]', () => {
       })
 
       test('matches $q API', () => {
-        const { vm: { $q } } = mountPlugin()
+        const {
+          vm: { $q }
+        } = mountPlugin()
         expect($q.sessionStorage.hasItem).toBe(SessionStorage.hasItem)
       })
     })
@@ -51,7 +57,9 @@ describe('[SessionStorage API]', () => {
       })
 
       test('matches $q API', () => {
-        const { vm: { $q } } = mountPlugin()
+        const {
+          vm: { $q }
+        } = mountPlugin()
         expect($q.sessionStorage.getLength).toBe(SessionStorage.getLength)
       })
     })
@@ -60,13 +68,13 @@ describe('[SessionStorage API]', () => {
       test('should be callable', () => {
         mountPlugin()
 
-        expect(
-          SessionStorage.getItem('getItem')
-        ).toBeNull()
+        expect(SessionStorage.getItem('getItem')).toBeNull()
       })
 
       test('matches $q API', () => {
-        const { vm: { $q } } = mountPlugin()
+        const {
+          vm: { $q }
+        } = mountPlugin()
         expect($q.sessionStorage.getItem).toBe(SessionStorage.getItem)
       })
     })
@@ -78,9 +86,7 @@ describe('[SessionStorage API]', () => {
         // ensure at least one element is defined
         SessionStorage.setItem('getIndex', 'rstoenescu')
 
-        expect(
-          SessionStorage.getIndex(0)
-        ).$any([
+        expect(SessionStorage.getIndex(0)).$any([
           expect.any(Number),
           expect.any(Boolean),
           expect.any(Date),
@@ -93,7 +99,9 @@ describe('[SessionStorage API]', () => {
       })
 
       test('matches $q API', () => {
-        const { vm: { $q } } = mountPlugin()
+        const {
+          vm: { $q }
+        } = mountPlugin()
         expect($q.sessionStorage.getIndex).toBe(SessionStorage.getIndex)
       })
     })
@@ -105,13 +113,13 @@ describe('[SessionStorage API]', () => {
         // ensure at least one element is defined
         SessionStorage.setItem('getKey', 'rstoenescu')
 
-        expect(
-          SessionStorage.getKey(0)
-        ).toBeTypeOf('string')
+        expect(SessionStorage.getKey(0)).toBeTypeOf('string')
       })
 
       test('matches $q API', () => {
-        const { vm: { $q } } = mountPlugin()
+        const {
+          vm: { $q }
+        } = mountPlugin()
         expect($q.sessionStorage.getKey).toBe(SessionStorage.getKey)
       })
     })
@@ -129,7 +137,9 @@ describe('[SessionStorage API]', () => {
       })
 
       test('matches $q API', () => {
-        const { vm: { $q } } = mountPlugin()
+        const {
+          vm: { $q }
+        } = mountPlugin()
         expect($q.sessionStorage.getAll).toBe(SessionStorage.getAll)
       })
     })
@@ -141,17 +151,15 @@ describe('[SessionStorage API]', () => {
         // ensure at least one element is defined
         SessionStorage.setItem('getAllKeys', 'rstoenescu')
 
-        expect(
-          Array.isArray(SessionStorage.getAllKeys())
-        ).toBe(true)
+        expect(Array.isArray(SessionStorage.getAllKeys())).toBe(true)
 
-        expect(
-          SessionStorage.getAllKeys()
-        ).toContain('getAllKeys')
+        expect(SessionStorage.getAllKeys()).toContain('getAllKeys')
       })
 
       test('matches $q API', () => {
-        const { vm: { $q } } = mountPlugin()
+        const {
+          vm: { $q }
+        } = mountPlugin()
         expect($q.sessionStorage.getAllKeys).toBe(SessionStorage.getAllKeys)
       })
     })
@@ -160,17 +168,15 @@ describe('[SessionStorage API]', () => {
       test('should be callable', () => {
         mountPlugin()
 
-        expect(
-          SessionStorage.setItem('set', 'rstoenescu')
-        ).toBeUndefined()
+        expect(SessionStorage.setItem('set', 'rstoenescu')).toBeUndefined()
 
-        expect(
-          SessionStorage.getItem('set')
-        ).toBe('rstoenescu')
+        expect(SessionStorage.getItem('set')).toBe('rstoenescu')
       })
 
       test('matches $q API', () => {
-        const { vm: { $q } } = mountPlugin()
+        const {
+          vm: { $q }
+        } = mountPlugin()
         expect($q.sessionStorage.setItem).toBe(SessionStorage.setItem)
       })
 
@@ -203,27 +209,21 @@ describe('[SessionStorage API]', () => {
         const date = new Date()
 
         SessionStorage.setItem('Date', date)
-        expect(
-          SessionStorage.getItem('Date')
-        ).toStrictEqual(date)
+        expect(SessionStorage.getItem('Date')).toStrictEqual(date)
       })
 
       test('can encode + decode a String', () => {
         mountPlugin()
 
         SessionStorage.setItem('String', 'rstoenescu')
-        expect(
-          SessionStorage.getItem('String')
-        ).toBe('rstoenescu')
+        expect(SessionStorage.getItem('String')).toBe('rstoenescu')
       })
 
       test('can encode + decode a RegExp', () => {
         mountPlugin()
 
         SessionStorage.setItem('RegExp', /abc/)
-        expect(
-          SessionStorage.getItem('RegExp')
-        ).toStrictEqual(/abc/)
+        expect(SessionStorage.getItem('RegExp')).toStrictEqual(/abc/)
       })
 
       test('can encode + decode a Function', () => {
@@ -231,9 +231,7 @@ describe('[SessionStorage API]', () => {
         const fn = () => 5
 
         SessionStorage.setItem('Function', fn)
-        expect(
-          SessionStorage.getItem('Function')
-        ).toBe(fn.toString())
+        expect(SessionStorage.getItem('Function')).toBe(fn.toString())
       })
 
       test('can encode + decode an Object', () => {
@@ -241,19 +239,15 @@ describe('[SessionStorage API]', () => {
         const obj = { a: 1 }
 
         SessionStorage.setItem('Object', obj)
-        expect(
-          SessionStorage.getItem('Object')
-        ).toStrictEqual(obj)
+        expect(SessionStorage.getItem('Object')).toStrictEqual(obj)
       })
 
       test('can encode + decode an Array', () => {
         mountPlugin()
-        const arr = [ 1, 2, 3 ]
+        const arr = [1, 2, 3]
 
         SessionStorage.setItem('Array', arr)
-        expect(
-          SessionStorage.getItem('Array')
-        ).toStrictEqual(arr)
+        expect(SessionStorage.getItem('Array')).toStrictEqual(arr)
       })
     })
 
@@ -262,21 +256,17 @@ describe('[SessionStorage API]', () => {
         mountPlugin()
 
         SessionStorage.setItem('remove', 5)
-        expect(
-          SessionStorage.getItem('remove')
-        ).toBe(5)
+        expect(SessionStorage.getItem('remove')).toBe(5)
 
-        expect(
-          SessionStorage.removeItem('remove')
-        ).toBeUndefined()
+        expect(SessionStorage.removeItem('remove')).toBeUndefined()
 
-        expect(
-          SessionStorage.getItem('remove')
-        ).toBeNull()
+        expect(SessionStorage.getItem('remove')).toBeNull()
       })
 
       test('matches $q API', () => {
-        const { vm: { $q } } = mountPlugin()
+        const {
+          vm: { $q }
+        } = mountPlugin()
         expect($q.sessionStorage.removeItem).toBe(SessionStorage.removeItem)
       })
     })
@@ -295,7 +285,9 @@ describe('[SessionStorage API]', () => {
       })
 
       test('matches $q API', () => {
-        const { vm: { $q } } = mountPlugin()
+        const {
+          vm: { $q }
+        } = mountPlugin()
         expect($q.sessionStorage.clear).toBe(SessionStorage.clear)
       })
     })
@@ -315,7 +307,9 @@ describe('[SessionStorage API]', () => {
       })
 
       test('matches $q API', () => {
-        const { vm: { $q } } = mountPlugin()
+        const {
+          vm: { $q }
+        } = mountPlugin()
         expect($q.sessionStorage.isEmpty).toBe(SessionStorage.isEmpty)
       })
     })

package/src/plugins/storage/engine/web-storage.js

@@ -1,7 +1,7 @@
 import { noop } from '../../../utils/event/event.js'
 import { isDate, isRegexp } from '../../../utils/is/is.js'
 
-function encode (value) {
+function encode(value) {
   if (isDate(value) === true) {
     return '__q_date|' + value.getTime()
   }
@@ -29,7 +29,7 @@ function encode (value) {
   return value
 }
 
-function decode (value) {
+function decode(value) {
   const length = value.length
   if (length < 9) {
     // then it wasn't encoded by us
@@ -54,7 +54,7 @@ function decode (value) {
       return Boolean(source === '1')
 
     case '__q_strn':
-      return '' + source
+      return String(source)
 
     case '__q_objt':
       return JSON.parse(source)
@@ -67,7 +67,7 @@ function decode (value) {
   }
 }
 
-export function getEmptyStorage () {
+export function getEmptyStorage() {
   const getVal = () => null
 
   return {
@@ -88,48 +88,44 @@ export function getEmptyStorage () {
   }
 }
 
-export function getStorage (type) {
-  const
-    webStorage = window[ type + 'Storage' ],
+export function getStorage(type) {
+  const webStorage = window[type + 'Storage'],
     get = key => {
       const item = webStorage.getItem(key)
-      return item
-        ? decode(item)
-        : null
+      return item ? decode(item) : null
     }
 
   const hasItem = key => webStorage.getItem(key) !== null
-  const setItem = (key, value) => { webStorage.setItem(key, encode(value)) }
-  const removeItem = key => { webStorage.removeItem(key) }
+  const setItem = (key, value) => {
+    webStorage.setItem(key, encode(value))
+  }
+  const removeItem = key => {
+    webStorage.removeItem(key)
+  }
 
   return {
     has: hasItem, // TODO: remove in Qv3
     hasItem,
     getLength: () => webStorage.length,
     getItem: get,
-    getIndex: index => {
-      return index < webStorage.length
-        ? get(webStorage.key(index))
-        : null
-    },
-    getKey: index => {
-      return index < webStorage.length
-        ? webStorage.key(index)
-        : null
-    },
+    getIndex: index =>
+      index < webStorage.length ? get(webStorage.key(index)) : null,
+    getKey: index => (index < webStorage.length ? webStorage.key(index) : null),
     getAll: () => {
       let key
-      const result = {}, len = webStorage.length
+      const result = {},
+        len = webStorage.length
 
       for (let i = 0; i < len; i++) {
         key = webStorage.key(i)
-        result[ key ] = get(key)
+        result[key] = get(key)
       }
 
       return result
     },
     getAllKeys: () => {
-      const result = [], len = webStorage.length
+      const result = [],
+        len = webStorage.length
 
       for (let i = 0; i < len; i++) {
         result.push(webStorage.key(i))
@@ -141,7 +137,9 @@ export function getStorage (type) {
     setItem,
     remove: removeItem, // TODO: remove in Qv3
     removeItem,
-    clear: () => { webStorage.clear() },
+    clear: () => {
+      webStorage.clear()
+    },
     isEmpty: () => webStorage.length === 0
   }
 }