quasar 2.19.3 → 2.20.1

package/src/plugins/cookies/Cookies.js

@@ -1,13 +1,7 @@
-function encode(string) {
-  return encodeURIComponent(string)
-}
-
-function decode(string) {
-  return decodeURIComponent(string)
-}
-
 function stringifyCookieValue(value) {
-  return encode(value === Object(value) ? JSON.stringify(value) : String(value))
+  return encodeURIComponent(
+    value === Object(value) ? JSON.stringify(value) : String(value)
+  )
 }
 
 function read(string) {
@@ -17,18 +11,21 @@ function read(string) {
 
   if (string.indexOf('"') === 0) {
     // This is a quoted cookie as according to RFC2068, unescape...
-    string = string.slice(1, -1).replace(/\\"/g, '"').replace(/\\\\/g, '\\')
+    string = string
+      .slice(1, -1)
+      .replaceAll(String.raw`\"`, '"')
+      .replaceAll(String.raw`\\`, '\\')
   }
 
   // Replace server-side written pluses with spaces.
   // If we can't decode the cookie, ignore it, it's unusable.
   // If we can't parse the cookie, ignore it, it's unusable.
-  string = decode(string.replace(/\+/g, ' '))
+  string = decodeURIComponent(string.replaceAll('+', ' '))
 
   try {
     const parsed = JSON.parse(string)
 
-    if (parsed === Object(parsed) || Array.isArray(parsed) === true) {
+    if (parsed === Object(parsed) || Array.isArray(parsed)) {
       string = parsed
     }
   } catch {}
@@ -36,71 +33,63 @@ function read(string) {
   return string
 }
 
-function getString(msOffset) {
-  const time = new Date()
-  time.setMilliseconds(time.getMilliseconds() + msOffset)
-  return time.toUTCString()
+const numberUnitRE = /(\d+)([dhms])/g
+const numberUnitMultiplierMap = {
+  d: 86_400,
+  h: 3600,
+  m: 60,
+  s: 1
 }
 
-function parseExpireString(str) {
-  let timestamp = 0
+function parseExpireToSeconds(str) {
+  let totalSeconds = 0
+  let hasMatch = false
 
-  const days = str.match(/(\d+)d/)
-  const hours = str.match(/(\d+)h/)
-  const minutes = str.match(/(\d+)m/)
-  const seconds = str.match(/(\d+)s/)
+  // "1d", "15m"
+  const matches = str.matchAll(numberUnitRE)
 
-  if (days) {
-    timestamp += days[1] * 864e5
-  }
-  if (hours) {
-    timestamp += hours[1] * 36e5
-  }
-  if (minutes) {
-    timestamp += minutes[1] * 6e4
-  }
-  if (seconds) {
-    timestamp += seconds[1] * 1000
+  for (const match of matches) {
+    hasMatch = true
+    const value = Number.parseInt(match[1], 10)
+    const unit = match[2]
+
+    totalSeconds += value * numberUnitMultiplierMap[unit]
   }
 
-  return timestamp === 0 ? str : getString(timestamp)
+  return hasMatch ? totalSeconds : void 0
 }
 
 // oxlint-disable-next-line default-param-last
 function set(key, val, opts = {}, ssr) {
-  let expire, expireValue
+  let maxAge
+  let isDeletion = false
 
   if (opts.expires !== void 0) {
-    // if it's a Date Object
-    if (Object.prototype.toString.call(opts.expires) === '[object Date]') {
-      expire = opts.expires.toUTCString()
+    // Number check (defined in days -> convert to seconds)
+    if (Number.isFinite(opts.expires)) {
+      maxAge = Math.round(opts.expires * 86_400) // 86400 seconds in a day
+    } else if (opts.expires instanceof Date) {
+      maxAge = Math.round((opts.expires.getTime() - Date.now()) / 1000)
     }
-    // if it's a String (eg. "15m", "1h", "13d", "1d 15m", "31s")
-    // possible units: d (days), h (hours), m (minutes), s (seconds)
+    // String check (eg. "15m", "1h" -> must return seconds)
     else if (typeof opts.expires === 'string') {
-      expire = parseExpireString(opts.expires)
-    }
-    // otherwise it must be a Number (defined in days)
-    else {
-      expireValue = parseFloat(opts.expires)
-      expire =
-        isNaN(expireValue) === false
-          ? getString(expireValue * 864e5)
-          : opts.expires
+      maxAge = parseExpireToSeconds(opts.expires)
     }
+
+    if (maxAge !== void 0) isDeletion = maxAge <= 0
   }
 
-  const keyValue = `${encode(key)}=${stringifyCookieValue(val)}`
+  const keyValue = `${encodeURIComponent(key)}=${stringifyCookieValue(val)}`
 
   const cookie = [
     keyValue,
-    expire !== void 0 ? '; Expires=' + expire : '', // use expires attribute, max-age is not supported by IE
-    opts.path ? '; Path=' + opts.path : '',
-    opts.domain ? '; Domain=' + opts.domain : '',
-    opts.sameSite ? '; SameSite=' + opts.sameSite : '',
+    maxAge !== void 0 ? `; Max-Age=${maxAge}` : '',
+    opts.path ? `; Path=${opts.path}` : '',
+    opts.domain ? `; Domain=${opts.domain}` : '',
+    opts.sameSite ? `; SameSite=${opts.sameSite}` : '',
     opts.httpOnly ? '; HttpOnly' : '',
     opts.secure ? '; Secure' : '',
-    opts.other ? '; ' + opts.other : ''
+    opts.other ? `; ${opts.other}` : ''
   ].join('')
 
   if (ssr) {
@@ -112,12 +101,9 @@ function set(key, val, opts = {}, ssr) {
 
     ssr.res.setHeader('Set-Cookie', ssr.req.qCookies)
 
-    // make temporary update so future get()
-    // within same SSR timeframe would return the set value
-
     let all = ssr.req.headers.cookie || ''
 
-    if (expire !== void 0 && expireValue < 0) {
+    if (maxAge !== void 0 && isDeletion) {
       const localVal = get(key, ssr)
       if (localVal !== void 0) {
         all = all
@@ -126,11 +112,12 @@ function set(key, val, opts = {}, ssr) {
           .replace(`${key}=${localVal}`, '')
       }
     } else {
-      all = all ? `${keyValue}; ${all}` : cookie
+      all = all ? `${keyValue}; ${all}` : keyValue
     }
 
     ssr.req.headers.cookie = all
   } else {
+    // oxlint-disable-next-line unicorn/no-document-cookie
     document.cookie = cookie
   }
 }
@@ -139,6 +126,7 @@ function get(key, ssr) {
   const cookieSource = ssr ? ssr.req.headers : document,
     cookies = cookieSource.cookie ? cookieSource.cookie.split('; ') : [],
     l = cookies.length
+
   let result = key ? null : {},
     i = 0,
     parts,
@@ -147,7 +135,7 @@ function get(key, ssr) {
 
   for (; i < l; i++) {
     parts = cookies[i].split('=')
-    name = decode(parts.shift())
+    name = decodeURIComponent(parts.shift())
     cookie = parts.join('=')
 
     if (!key) {
@@ -193,7 +181,7 @@ if (__QUASAR_SSR__) {
   }
 }
 
-if (__QUASAR_SSR_SERVER__ !== true) {
+if (!__QUASAR_SSR_SERVER__) {
   Object.assign(Plugin, getObject())
 }
 

package/src/plugins/dark/Dark.js

@@ -34,9 +34,7 @@ const Plugin = createReactivePlugin(
     },
 
     toggle() {
-      if (__QUASAR_SSR_SERVER__ !== true) {
-        Plugin.set(Plugin.isActive === false)
-      }
+      if (!__QUASAR_SSR_SERVER__) Plugin.set(!Plugin.isActive)
     },
 
     install({ $q, ssrContext }) {
@@ -61,7 +59,7 @@ const Plugin = createReactivePlugin(
             $q.dark.mode = val
           },
           toggle: () => {
-            $q.dark.set($q.dark.isActive === false)
+            $q.dark.set(!$q.dark.isActive)
           }
         }
 
@@ -71,7 +69,7 @@ const Plugin = createReactivePlugin(
 
       $q.dark = this
 
-      if (this.__installed !== true) {
+      if (!this.__installed) {
         this.set(dark !== void 0 ? dark : false)
       }
     }

package/src/plugins/dark/Dark.test.js

@@ -1,4 +1,4 @@
-import { describe, test, expect, vi } from 'vitest'
+import { describe, expect, test, vi } from 'vitest'
 import { mount } from '@vue/test-utils'
 
 import Dark from './Dark.js'

package/src/plugins/dialog/Dialog.js

@@ -1,8 +1,8 @@
 import DialogPlugin from './component/DialogPluginComponent.js'
-import globalDialog from '../../utils/private.dialog/create-dialog.js'
+import { createDialog } from '../../utils/private.dialog/create-dialog.js'
 
 export default {
   install({ $q, parentApp }) {
-    $q.dialog = this.create = globalDialog(DialogPlugin, true, parentApp)
+    $q.dialog = this.create = createDialog(DialogPlugin, true, parentApp)
   }
 }

package/src/plugins/dialog/component/DialogPluginComponent.js

@@ -1,4 +1,4 @@
-import { h, ref, computed, watch, toRaw, getCurrentInstance } from 'vue'
+import { computed, getCurrentInstance, h, ref, toRaw, watch } from 'vue'
 
 import QDialog from '../../../components/dialog/QDialog.js'
 import QBtn from '../../../components/btn/QBtn.js'
@@ -74,18 +74,18 @@ export default createComponent({
     const classes = computed(
       () =>
         'q-dialog-plugin' +
-        (isDark.value === true ? ' q-dialog-plugin--dark q-dark' : '') +
+        (isDark.value ? ' q-dialog-plugin--dark q-dark' : '') +
         (props.progress !== false ? ' q-dialog-plugin--progress' : '')
     )
 
     const vmColor = computed(
-      () => props.color || (isDark.value === true ? 'amber' : 'primary')
+      () => props.color || (isDark.value ? 'amber' : 'primary')
     )
 
     const spinner = computed(() =>
       props.progress === false
         ? null
-        : isObject(props.progress) === true
+        : isObject(props.progress)
           ? {
               component: props.progress.spinner || QSpinner,
               props: { color: props.progress.color || vmColor.value }
@@ -101,7 +101,7 @@ export default createComponent({
     )
 
     const formProps = computed(() => {
-      if (hasForm.value !== true) return {}
+      if (!hasForm.value) return {}
 
       // oxlint-disable-next-line no-shadow
       const { model, isValid, items, ...acc } =
@@ -111,7 +111,7 @@ export default createComponent({
     })
 
     const okLabel = computed(() =>
-      isObject(props.ok) === true
+      isObject(props.ok)
         ? $q.lang.label.ok
         : props.ok === true
           ? $q.lang.label.ok
@@ -119,7 +119,7 @@ export default createComponent({
     )
 
     const cancelLabel = computed(() =>
-      isObject(props.cancel) === true
+      isObject(props.cancel)
         ? $q.lang.label.cancel
         : props.cancel === true
           ? $q.lang.label.cancel
@@ -129,14 +129,13 @@ export default createComponent({
     const okDisabled = computed(() => {
       if (props.prompt !== void 0) {
         return (
-          props.prompt.isValid !== void 0 &&
-          props.prompt.isValid(model.value) !== true
+          props.prompt.isValid !== void 0 && !props.prompt.isValid(model.value)
         )
       }
       if (props.options !== void 0) {
         return (
           props.options.isValid !== void 0 &&
-          props.options.isValid(model.value) !== true
+          !props.options.isValid(model.value)
         )
       }
       return false
@@ -147,9 +146,8 @@ export default createComponent({
       label: okLabel.value,
       ripple: false,
       disable: okDisabled.value,
-      ...(isObject(props.ok) === true ? props.ok : { flat: true }),
-      'data-autofocus':
-        (props.focus === 'ok' && hasForm.value !== true) || void 0,
+      ...(isObject(props.ok) ? props.ok : { flat: true }),
+      'data-autofocus': (props.focus === 'ok' && !hasForm.value) || void 0,
       onClick: onOk
     }))
 
@@ -157,9 +155,8 @@ export default createComponent({
       color: vmColor.value,
       label: cancelLabel.value,
       ripple: false,
-      ...(isObject(props.cancel) === true ? props.cancel : { flat: true }),
-      'data-autofocus':
-        (props.focus === 'cancel' && hasForm.value !== true) || void 0,
+      ...(isObject(props.cancel) ? props.cancel : { flat: true }),
+      'data-autofocus': (props.focus === 'cancel' && !hasForm.value) || void 0,
       onClick: onCancel
     }))
 
@@ -194,16 +191,16 @@ export default createComponent({
     function onInputKeyup(evt) {
       // if ENTER key
       if (
-        okDisabled.value !== true &&
+        !okDisabled.value &&
         props.prompt.type !== 'textarea' &&
-        isKeyCode(evt, 13) === true
+        isKeyCode(evt, 13)
       ) {
         onOk()
       }
     }
 
     function getSection(sectionClass, text) {
-      return props.html === true
+      return props.html
         ? h(QCardSection, {
             class: sectionClass,
             innerHTML: text
@@ -248,7 +245,7 @@ export default createComponent({
       return h(
         QCardActions,
         {
-          class: props.stackButtons === true ? 'items-end' : '',
+          class: props.stackButtons ? 'items-end' : '',
           vertical: props.stackButtons,
           align: 'right'
         },

package/src/plugins/icon-set/IconSet.js

@@ -61,13 +61,11 @@ const Plugin = createReactivePlugin(
           }
         )
 
-        if (this.__installed === true) {
+        if (this.__installed) {
           if (iconSet !== void 0) this.set(iconSet)
         } else {
           this.props = new Proxy(this.__qIconSet, {
-            get() {
-              return Reflect.get(...arguments)
-            },
+            get: Reflect.get,
 
             ownKeys(target) {
               return Reflect.ownKeys(target).filter(key => key !== 'set')

package/src/plugins/icon-set/IconSet.test.js

@@ -1,4 +1,4 @@
-import { describe, test, expect } from 'vitest'
+import { describe, expect, test } from 'vitest'
 import { mount } from '@vue/test-utils'
 
 import IconSet from './IconSet.js'

package/src/plugins/lang/Lang.js

@@ -6,8 +6,7 @@ function getLocale() {
   if (__QUASAR_SSR_SERVER__) return
 
   const val =
-    Array.isArray(navigator.languages) === true &&
-    navigator.languages.length !== 0
+    Array.isArray(navigator.languages) && navigator.languages.length !== 0
       ? navigator.languages[0]
       : navigator.language
 
@@ -55,9 +54,9 @@ const Plugin = createReactivePlugin(
 
         if (
           ssrContext.$q.config.lang === void 0 ||
-          ssrContext.$q.config.lang.noHtmlAttrs !== true
+          !ssrContext.$q.config.lang.noHtmlAttrs
         ) {
-          const dir = lang.rtl === true ? 'rtl' : 'ltr'
+          const dir = lang.rtl ? 'rtl' : 'ltr'
           const attrs = `lang=${lang.isoName} dir=${dir}`
 
           ssrContext._meta.htmlAttrs =
@@ -77,10 +76,10 @@ const Plugin = createReactivePlugin(
 
         if (
           Plugin.__langConfig === void 0 ||
-          Plugin.__langConfig.noHtmlAttrs !== true
+          !Plugin.__langConfig.noHtmlAttrs
         ) {
           const el = document.documentElement
-          el.setAttribute('dir', lang.rtl === true ? 'rtl' : 'ltr')
+          el.setAttribute('dir', lang.rtl ? 'rtl' : 'ltr')
           el.setAttribute('lang', lang.isoName)
         }
 
@@ -110,13 +109,11 @@ const Plugin = createReactivePlugin(
         $q.lang = Plugin.__qLang
         Plugin.__langConfig = $q.config.lang
 
-        if (this.__installed === true) {
+        if (this.__installed) {
           if (lang !== void 0) this.set(lang)
         } else {
           this.props = new Proxy(this.__qLang, {
-            get() {
-              return Reflect.get(...arguments)
-            },
+            get: Reflect.get,
 
             ownKeys(target) {
               return Reflect.ownKeys(target).filter(

package/src/plugins/lang/Lang.json

@@ -266,7 +266,7 @@
                 "examples": ["'5-10 of 50'"]
               },
               "examples": [
-                "(start, end, total) => start + '-' + end + ' of ' + total"
+                "(start, end, total) => start + ' - ' + end + ' of ' + total"
               ]
             },
             "columns": {
@@ -807,7 +807,7 @@
                     "examples": ["'5-10 of 50'"]
                   },
                   "examples": [
-                    "(start, end, total) => start + '-' + end + ' of ' + total"
+                    "(start, end, total) => start + ' - ' + end + ' of ' + total"
                   ]
                 },
                 "columns": {

package/src/plugins/lang/Lang.test.js

@@ -1,4 +1,4 @@
-import { describe, test, expect } from 'vitest'
+import { describe, expect, test } from 'vitest'
 import { mount } from '@vue/test-utils'
 
 import Lang from './Lang.js'
@@ -227,7 +227,7 @@ describe('[Lang API]', () => {
               recordsPerPage: 'Records per page:',
               allRows: 'All',
               pagination: (start, end, total) =>
-                start + '-' + end + ' of ' + total,
+                start + ' - ' + end + ' of ' + total,
               columns: 'Columns'
             },
             pagination: {

package/src/plugins/loading/Loading.js

@@ -1,4 +1,4 @@
-import { h, Transition, onMounted } from 'vue'
+import { Transition, h, onMounted } from 'vue'
 
 import QSpinner from '../../components/spinner/QSpinner.js'
 
@@ -41,7 +41,7 @@ function registerProps(opts) {
   }
 
   const newProps =
-    isObject(opts) === true && opts.ignoreDefaults === true
+    isObject(opts) && opts.ignoreDefaults
       ? { ...originalDefaults, ...opts }
       : { ...defaults, ...opts }
 
@@ -86,7 +86,7 @@ const Plugin = createReactivePlugin(
                 function onAfterLeave() {
                   // might be called to finalize
                   // previous leave, even if it was cancelled
-                  if (Plugin.isActive !== true && app !== void 0) {
+                  if (!Plugin.isActive && app !== void 0) {
                     preventScroll(false)
                     app.unmount(el)
                     removeGlobalNode(el)
@@ -96,9 +96,7 @@ const Plugin = createReactivePlugin(
                 }
 
                 function getContent() {
-                  if (Plugin.isActive !== true) {
-                    return null
-                  }
+                  if (!Plugin.isActive) return null
 
                   const content = [
                     h(props.spinner, {
@@ -116,7 +114,7 @@ const Plugin = createReactivePlugin(
                           (props.messageColor
                             ? ` text-${props.messageColor}`
                             : ''),
-                        [props.html === true ? 'innerHTML' : 'textContent']:
+                        [props.html ? 'innerHTML' : 'textContent']:
                           props.message
                       })
                     )
@@ -184,7 +182,7 @@ const Plugin = createReactivePlugin(
     },
 
     hide(group) {
-      if (__QUASAR_SSR_SERVER__ !== true && Plugin.isActive === true) {
+      if (!__QUASAR_SSR_SERVER__ && Plugin.isActive) {
         if (group === void 0) {
           // clear out any active groups
           activeGroups = {}
@@ -201,7 +199,7 @@ const Plugin = createReactivePlugin(
           // show last registered one since that one is still active
           if (keys.length !== 0) {
             // get last registered group
-            const lastGroup = keys[keys.length - 1]
+            const lastGroup = keys.at(-1)
             Plugin.show({ group: lastGroup })
             return
           }
@@ -217,15 +215,15 @@ const Plugin = createReactivePlugin(
     },
 
     setDefaults(opts) {
-      if (__QUASAR_SSR_SERVER__ !== true) {
-        if (isObject(opts) === true) Object.assign(defaults, opts)
+      if (!__QUASAR_SSR_SERVER__ && isObject(opts)) {
+        Object.assign(defaults, opts)
       }
     },
 
     install({ $q, parentApp }) {
       $q.loading = this
 
-      if (__QUASAR_SSR_SERVER__ !== true) {
+      if (!__QUASAR_SSR_SERVER__) {
         Plugin.__parentApp = parentApp
 
         if ($q.config.loading !== void 0) {

package/src/plugins/loading-bar/LoadingBar.js

@@ -25,7 +25,7 @@ const Plugin = createReactivePlugin(
 
       if (__QUASAR_SSR_SERVER__) return
 
-      if (this.__installed === true) {
+      if (this.__installed) {
         if ($q.config.loadingBar !== void 0) {
           this.setDefaults($q.config.loadingBar)
         }
@@ -66,11 +66,11 @@ const Plugin = createReactivePlugin(
         stop() {
           barRef.value.stop()
         },
-        increment() {
-          barRef.value.increment.apply(null, arguments)
+        increment(...args) {
+          barRef.value.increment(...args)
         },
         setDefaults(opts) {
-          if (isObject(opts) === true) {
+          if (isObject(opts)) {
             Object.assign(props.value, opts)
           }
         }

package/src/plugins/meta/Meta.js

@@ -3,6 +3,7 @@ import extend from '../../utils/extend/extend.js'
 
 let updateId = null,
   currentClientMeta
+
 export const clientList = []
 
 function normalize(meta) {
@@ -39,6 +40,7 @@ function changed(old, def) {
   if (Object.keys(old).length !== Object.keys(def).length) {
     return true
   }
+
   for (const key in old) {
     if (old[key] !== def[key]) {
       return true
@@ -47,11 +49,11 @@ function changed(old, def) {
 }
 
 function bodyFilter(name) {
-  return ['class', 'style'].includes(name) === false
+  return !['class', 'style'].includes(name)
 }
 
 function htmlFilter(name) {
-  return ['lang', 'dir'].includes(name) === false
+  return !['lang', 'dir'].includes(name)
 }
 
 function diff(meta, other) {
@@ -79,14 +81,14 @@ function diff(meta, other) {
     add[type] = {}
 
     for (const key in old) {
-      if (cur.hasOwnProperty(key) === false) {
+      if (!Object.hasOwn(cur, key)) {
         remove[type].push(key)
       }
     }
     for (const key in cur) {
-      if (old.hasOwnProperty(key) === false) {
+      if (!Object.hasOwn(old, key)) {
         add[type][key] = cur[key]
-      } else if (changed(old[key], cur[key]) === true) {
+      } else if (changed(old[key], cur[key])) {
         remove[type].push(key)
         add[type][key] = cur[key]
       }
@@ -125,11 +127,11 @@ function apply({ add, remove }) {
           tag.setAttribute(att, metaType[name][att])
         }
       }
-      tag.setAttribute('data-qmeta', name)
+      tag.dataset.qmeta = name
       if (type === 'script') {
         tag.innerHTML = metaType[name].innerHTML || ''
       }
-      document.head.appendChild(tag)
+      document.head.append(tag)
     }
   })
   Object.keys(add.htmlAttr)
@@ -266,10 +268,7 @@ export default {
       ssrContext.onRendered(() => {
         injectServerMeta(ssrContext)
       })
-    } else if (
-      this.__installed !== true &&
-      isRuntimeSsrPreHydration.value === true
-    ) {
+    } else if (!this.__installed && isRuntimeSsrPreHydration.value) {
       currentClientMeta = window.__Q_META__
       document.getElementById('qmeta-init').remove()
     }