quasar 2.18.7 → 2.19.1

package/src/composables/use-form/private.use-form.test.js

@@ -3,7 +3,9 @@ import { computed } from 'vue'
 
 import {
   useFormProps,
-  useFormAttrs, useFormInject, useFormInputNameAttr
+  useFormAttrs,
+  useFormInject,
+  useFormInputNameAttr
 } from './private.use-form.js'
 
 describe('[useForm API]', () => {
@@ -42,13 +44,13 @@ describe('[useForm API]', () => {
 
         expect(acc).toHaveLength(2)
 
-        expect(acc[ 0 ].type).toBe('input')
-        expect(Object.keys(acc[ 0 ].props)).toHaveLength(1)
-        expect(acc[ 0 ].props.class).toBe('hidden')
+        expect(acc[0].type).toBe('input')
+        expect(Object.keys(acc[0].props)).toHaveLength(1)
+        expect(acc[0].props.class).toBe('hidden')
 
-        expect(acc[ 1 ].type).toBe('input')
-        expect(Object.keys(acc[ 1 ].props)).toHaveLength(1)
-        expect(acc[ 1 ].props.class).toBe('hidden MyClassName')
+        expect(acc[1].type).toBe('input')
+        expect(Object.keys(acc[1].props)).toHaveLength(1)
+        expect(acc[1].props.class).toBe('hidden MyClassName')
       })
 
       test('useFormInject(formAttrs)', () => {
@@ -65,15 +67,15 @@ describe('[useForm API]', () => {
 
         expect(acc).toHaveLength(2)
 
-        expect(acc[ 0 ].type).toBe('input')
-        expect(Object.keys(acc[ 0 ].props)).toHaveLength(2)
-        expect(acc[ 0 ].props.class).toBe('hidden')
-        expect(acc[ 0 ].props.myAttr).toBe('MyAttrValue')
+        expect(acc[0].type).toBe('input')
+        expect(Object.keys(acc[0].props)).toHaveLength(2)
+        expect(acc[0].props.class).toBe('hidden')
+        expect(acc[0].props.myAttr).toBe('MyAttrValue')
 
-        expect(acc[ 1 ].type).toBe('input')
-        expect(Object.keys(acc[ 1 ].props)).toHaveLength(2)
-        expect(acc[ 1 ].props.class).toBe('hidden MyClassName')
-        expect(acc[ 1 ].props.myAttr).toBe('MyAttrValue')
+        expect(acc[1].type).toBe('input')
+        expect(Object.keys(acc[1].props)).toHaveLength(2)
+        expect(acc[1].props.class).toBe('hidden MyClassName')
+        expect(acc[1].props.myAttr).toBe('MyAttrValue')
       })
     })
 

package/src/composables/use-form/use-form-child.js

@@ -1,8 +1,18 @@
-import { inject, watch, getCurrentInstance, onMounted, onBeforeUnmount } from 'vue'
+import {
+  inject,
+  watch,
+  getCurrentInstance,
+  onMounted,
+  onBeforeUnmount
+} from 'vue'
 
 import { formKey } from '../../utils/private.symbols/symbols.js'
 
-export default function ({ validate, resetValidation, requiresQForm }) {
+export default function useFormChild({
+  validate,
+  resetValidation,
+  requiresQForm
+}) {
   const $form = inject(formKey, false)
 
   if ($form !== false) {
@@ -11,27 +21,28 @@ export default function ({ validate, resetValidation, requiresQForm }) {
     // export public method (so it can be used in QForm)
     Object.assign(proxy, { validate, resetValidation })
 
-    watch(() => props.disable, val => {
-      if (val === true) {
-        typeof resetValidation === 'function' && resetValidation()
-        $form.unbindComponent(proxy)
+    watch(
+      () => props.disable,
+      val => {
+        if (val === true) {
+          if (typeof resetValidation === 'function') resetValidation()
+          $form.unbindComponent(proxy)
+        } else {
+          $form.bindComponent(proxy)
+        }
       }
-      else {
-        $form.bindComponent(proxy)
-      }
-    })
+    )
 
     onMounted(() => {
       // register to parent QForm
-      props.disable !== true && $form.bindComponent(proxy)
+      if (props.disable !== true) $form.bindComponent(proxy)
     })
 
     onBeforeUnmount(() => {
       // un-register from parent QForm
-      props.disable !== true && $form.unbindComponent(proxy)
+      if (props.disable !== true) $form.unbindComponent(proxy)
     })
-  }
-  else if (requiresQForm === true) {
+  } else if (requiresQForm === true) {
     console.error('Parent QForm not found on useFormChild()!')
   }
 }

package/src/composables/use-hydration/use-hydration.js

@@ -3,7 +3,7 @@ import { ref, onMounted } from 'vue'
 // using it to manage SSR rendering with best performance
 import { isRuntimeSsrPreHydration } from '../../plugins/platform/Platform.js'
 
-export default function () {
+export default function useHydration() {
   const isHydrated = ref(!isRuntimeSsrPreHydration.value)
 
   if (isHydrated.value === false) {

package/src/composables/use-hydration/use-hydration.test.js

@@ -11,16 +11,14 @@ describe('[useHydration API]', () => {
         const wrapper = mount(
           defineComponent({
             template: '<div />',
-            setup () {
+            setup() {
               const result = useHydration()
               return { result }
             }
           })
         )
 
-        expect(
-          wrapper.vm.result.isHydrated
-        ).$ref(true)
+        expect(wrapper.vm.result.isHydrated).$ref(true)
       })
     })
   })

package/src/composables/use-id/use-id.js

@@ -4,15 +4,15 @@ import uid from '../../utils/uid/uid.js'
 
 import { isRuntimeSsrPreHydration } from '../../plugins/platform/Platform.js'
 
-function parseValue (val) {
-  return val === void 0 || val === null
-    ? null
-    : val
+function parseValue(val) {
+  return val === void 0 || val === null ? null : val
 }
 
-function getId (val, required) {
+function getId(val, required) {
   return val === void 0 || val === null
-    ? (required === true ? `f_${ uid() }` : null)
+    ? required === true
+      ? `f_${uid()}`
+      : null
     : val
 }
 
@@ -23,15 +23,13 @@ function getId (val, required) {
  * On SSR, it takes care of generating the id on the client side (only) to
  * avoid hydration errors.
  */
-export default function ({ getValue, required = true } = {}) {
+export default function useId({ getValue, required = true } = {}) {
   if (isRuntimeSsrPreHydration.value === true) {
-    const id = getValue !== void 0
-      ? ref(parseValue(getValue()))
-      : ref(null)
+    const id = getValue !== void 0 ? ref(parseValue(getValue())) : ref(null)
 
     if (required === true && id.value === null) {
       onMounted(() => {
-        id.value = `f_${ uid() }` // getId(null, true)
+        id.value = `f_${uid()}` // getId(null, true)
       })
     }
 
@@ -46,5 +44,5 @@ export default function ({ getValue, required = true } = {}) {
 
   return getValue !== void 0
     ? computed(() => getId(getValue(), required))
-    : ref(`f_${ uid() }`) // getId(null, true)
+    : ref(`f_${uid()}`) // getId(null, true)
 }

package/src/composables/use-id/use-id.test.js

@@ -57,7 +57,7 @@ describe('[useId API]', () => {
         const wrapper = mount(
           defineComponent({
             template: '<div />',
-            setup () {
+            setup() {
               const result = useId()
               return { result }
             }

package/src/composables/use-interval/use-interval.js

@@ -8,11 +8,11 @@ import { vmIsDestroyed } from '../../utils/private.vm/vm.js'
  *    removeInterval()
  */
 
-export default function () {
+export default function useInterval() {
   let timer = null
   const vm = getCurrentInstance()
 
-  function removeInterval () {
+  function removeInterval() {
     if (timer !== null) {
       clearInterval(timer)
       timer = null
@@ -25,7 +25,7 @@ export default function () {
   return {
     removeInterval,
 
-    registerInterval (fn, delay) {
+    registerInterval(fn, delay) {
       removeInterval(timer)
 
       if (vmIsDestroyed(vm) === false) {

package/src/composables/use-interval/use-interval.test.js

@@ -29,7 +29,7 @@ describe('[useInterval API]', () => {
         wrapper = mount(
           defineComponent({
             template: '<div />',
-            setup () {
+            setup() {
               const { registerInterval } = useInterval()
 
               registerInterval(fn, 100)
@@ -55,7 +55,7 @@ describe('[useInterval API]', () => {
         wrapper = mount(
           defineComponent({
             template: '<div />',
-            setup () {
+            setup() {
               const { registerInterval } = useInterval()
 
               registerInterval(fn, '100')
@@ -81,11 +81,8 @@ describe('[useInterval API]', () => {
         wrapper = mount(
           defineComponent({
             template: '<div />',
-            setup () {
-              const {
-                registerInterval,
-                removeInterval
-              } = useInterval()
+            setup() {
+              const { registerInterval, removeInterval } = useInterval()
 
               registerInterval(fn, 100)
               return { registerInterval, removeInterval }
@@ -117,7 +114,7 @@ describe('[useInterval API]', () => {
         wrapper = mount(
           defineComponent({
             template: '<div />',
-            setup () {
+            setup() {
               const { registerInterval } = useInterval()
 
               registerInterval(fn, 100)
@@ -144,7 +141,7 @@ describe('[useInterval API]', () => {
         wrapper = mount(
           defineComponent({
             template: '<div />',
-            setup () {
+            setup() {
               const { registerInterval } = useInterval()
               return { registerInterval }
             }

package/src/composables/use-meta/use-meta.js

@@ -1,18 +1,22 @@
-import { computed, watch, onActivated, onDeactivated, onUnmounted, useSSRContext } from 'vue'
+import {
+  computed,
+  watch,
+  onActivated,
+  onDeactivated,
+  onUnmounted,
+  useSSRContext
+} from 'vue'
 
 import { clientList, planClientUpdate } from '../../plugins/meta/Meta.js'
 
-export default function (metaOptions) {
+export default function useMeta(metaOptions) {
   if (__QUASAR_SSR_SERVER__) {
     const ssrContext = useSSRContext()
 
     ssrContext.__qMetaList.push(
-      typeof metaOptions === 'function'
-        ? metaOptions()
-        : metaOptions
+      typeof metaOptions === 'function' ? metaOptions() : metaOptions
     )
-  }
-  else {
+  } else {
     const meta = { active: true }
 
     if (typeof metaOptions === 'function') {
@@ -21,10 +25,9 @@ export default function (metaOptions) {
 
       watch(content, val => {
         meta.val = val
-        meta.active === true && planClientUpdate()
+        if (meta.active === true) planClientUpdate()
       })
-    }
-    else {
+    } else {
       meta.val = metaOptions
     }
 

package/src/composables/use-quasar/use-quasar.js

@@ -6,6 +6,6 @@ import { quasarKey } from '../../utils/private.symbols/symbols.js'
  * Returns the $q instance.
  * Equivalent to `this.$q` inside templates.
  */
-export default function useQuasar () {
+export default function useQuasar() {
   return inject(quasarKey)
 }

package/src/composables/use-quasar/use-quasar.test.js

@@ -11,24 +11,18 @@ describe('[useQuasar API]', () => {
         const wrapper = mount(
           defineComponent({
             template: '<div />',
-            setup () {
+            setup() {
               const result = useQuasar()
               return { result }
             }
           })
         )
 
-        expect(
-          wrapper.vm.result
-        ).toBeTypeOf('object')
+        expect(wrapper.vm.result).toBeTypeOf('object')
 
-        expect(
-          Object.keys(wrapper.vm.result)
-        ).not.toHaveLength(0)
+        expect(Object.keys(wrapper.vm.result)).not.toHaveLength(0)
 
-        expect(
-          wrapper.vm.result.version
-        ).toMatch(/^\d+\.\d+\.\d+$/)
+        expect(wrapper.vm.result.version).toMatch(/^\d+\.\d+\.\d+$/)
       })
     })
   })

package/src/composables/use-render-cache/use-render-cache.js

@@ -1,38 +1,30 @@
-export default function () {
+export default function useRenderCache() {
   let cache = Object.create(null)
 
   return {
     getCache: __QUASAR_SSR_SERVER__
-      ? (_, defaultValue) => (
-          typeof defaultValue === 'function'
-            ? defaultValue()
-            : defaultValue
-        )
-      : (key, defaultValue) => (
-          cache[ key ] === void 0
-            ? (
-                cache[ key ] = (
-                  typeof defaultValue === 'function'
-                    ? defaultValue()
-                    : defaultValue
-                )
-              )
-            : cache[ key ]
-        ),
+      ? (_, defaultValue) =>
+          typeof defaultValue === 'function' ? defaultValue() : defaultValue
+      : (key, defaultValue) =>
+          cache[key] === void 0
+            ? (cache[key] =
+                typeof defaultValue === 'function'
+                  ? defaultValue()
+                  : defaultValue)
+            : cache[key],
 
-    setCache (key, obj) {
-      cache[ key ] = obj
+    setCache(key, obj) {
+      cache[key] = obj
     },
 
-    hasCache (key) {
+    hasCache(key) {
       return Object.hasOwnProperty.call(cache, key)
     },
 
-    clearCache (key) {
+    clearCache(key) {
       if (key !== void 0) {
-        delete cache[ key ]
-      }
-      else {
+        delete cache[key]
+      } else {
         cache = Object.create(null)
       }
     }

package/src/composables/use-split-attrs/use-split-attrs.js

@@ -2,7 +2,7 @@ import { ref, onBeforeUpdate, getCurrentInstance } from 'vue'
 
 const listenerRE = /^on[A-Z]/
 
-export default function () {
+export default function useSplitAttrs() {
   const { attrs, vnode } = getCurrentInstance()
 
   const acc = {
@@ -10,19 +10,23 @@ export default function () {
     attributes: ref({})
   }
 
-  function update () {
+  function update() {
     const attributes = {}
     const listeners = {}
 
     for (const key in attrs) {
-      if (key !== 'class' && key !== 'style' && listenerRE.test(key) === false) {
-        attributes[ key ] = attrs[ key ]
+      if (
+        key !== 'class' &&
+        key !== 'style' &&
+        listenerRE.test(key) === false
+      ) {
+        attributes[key] = attrs[key]
       }
     }
 
     for (const key in vnode.props) {
       if (listenerRE.test(key) === true) {
-        listeners[ key ] = vnode.props[ key ]
+        listeners[key] = vnode.props[key]
       }
     }
 

package/src/composables/use-split-attrs/use-split-attrs.test.js

@@ -8,27 +8,29 @@ describe('[useSplitAttrs API]', () => {
   describe('[Functions]', () => {
     describe('[(function)default]', () => {
       test.each([
-        [ 'no attrs', {}, [] ],
-        [ 'attrs', { a: '1' }, [] ],
-        [ 'listeners', {}, [ 'b' ] ],
-        [ 'attrs and listeners', { a: '1' }, [ 'b' ] ],
-        [ 'multiple attrs and listeners', { a: '1', b: '2' }, [ 'f1', 'f2' ] ]
+        ['no attrs', {}, []],
+        ['attrs', { a: '1' }, []],
+        ['listeners', {}, ['b']],
+        ['attrs and listeners', { a: '1' }, ['b']],
+        ['multiple attrs and listeners', { a: '1', b: '2' }, ['f1', 'f2']]
       ])('correctly splits: %s', (_, attrs, listeners) => {
-        const attrHtml = Object.keys(attrs).map(
-          key => `${ key }="${ attrs[ key ] }"`
-        ).join(' ')
+        const attrHtml = Object.keys(attrs)
+          .map(key => `${key}="${attrs[key]}"`)
+          .join(' ')
 
         const fn = () => {}
         const fnList = {}
-        const listenerHtml = listeners.map(key => {
-          fnList[ 'on' + key.toUpperCase() ] = fn
-          return `@${ key }="fn"`
-        }).join(' ')
+        const listenerHtml = listeners
+          .map(key => {
+            fnList['on' + key.toUpperCase()] = fn
+            return `@${key}="fn"`
+          })
+          .join(' ')
 
         const ChildComponent = {
           name: 'ChildComponent',
           template: '<div />',
-          setup () {
+          setup() {
             const result = useSplitAttrs()
             return { result }
           }
@@ -36,9 +38,9 @@ describe('[useSplitAttrs API]', () => {
 
         const wrapper = mount(
           defineComponent({
-            template: `<ChildComponent ${ attrHtml } ${ listenerHtml } />`,
+            template: `<ChildComponent ${attrHtml} ${listenerHtml} />`,
             components: { ChildComponent },
-            setup () {
+            setup() {
               return { fn }
             }
           })

package/src/composables/use-tick/use-tick.js

@@ -1,4 +1,9 @@
-import { nextTick, onDeactivated, onBeforeUnmount, getCurrentInstance } from 'vue'
+import {
+  nextTick,
+  onDeactivated,
+  onBeforeUnmount,
+  getCurrentInstance
+} from 'vue'
 
 import { vmIsDestroyed } from '../../utils/private.vm/vm.js'
 
@@ -8,11 +13,11 @@ import { vmIsDestroyed } from '../../utils/private.vm/vm.js'
  *    removeTick()
  */
 
-export default function () {
+export default function useTick() {
   let tickFn
   const vm = getCurrentInstance()
 
-  function removeTick () {
+  function removeTick() {
     tickFn = void 0
   }
 
@@ -22,14 +27,14 @@ export default function () {
   return {
     removeTick,
 
-    registerTick (fn) {
+    registerTick(fn) {
       tickFn = fn
 
       nextTick(() => {
         if (tickFn === fn) {
           // we also check if VM is destroyed, since if it
           // got to trigger one nextTick() we cannot stop it
-          vmIsDestroyed(vm) === false && tickFn()
+          if (vmIsDestroyed(vm) === false) tickFn()
           tickFn = void 0
         }
       })

package/src/composables/use-tick/use-tick.test.js

@@ -22,7 +22,7 @@ describe('[useTick API]', () => {
         wrapper = mount(
           defineComponent({
             template: '<div />',
-            setup () {
+            setup() {
               const { registerTick } = useTick()
 
               registerTick(fn)
@@ -42,11 +42,8 @@ describe('[useTick API]', () => {
         wrapper = mount(
           defineComponent({
             template: '<div />',
-            setup () {
-              const {
-                registerTick,
-                removeTick
-              } = useTick()
+            setup() {
+              const { registerTick, removeTick } = useTick()
 
               registerTick(fn)
               return { registerTick, removeTick }
@@ -67,7 +64,7 @@ describe('[useTick API]', () => {
         wrapper = mount(
           defineComponent({
             template: '<div />',
-            setup () {
+            setup() {
               const { registerTick } = useTick()
 
               registerTick(fn)
@@ -93,7 +90,7 @@ describe('[useTick API]', () => {
         wrapper = mount(
           defineComponent({
             template: '<div />',
-            setup () {
+            setup() {
               const { registerTick } = useTick()
               return { registerTick }
             }

package/src/composables/use-timeout/use-timeout.js

@@ -8,11 +8,11 @@ import { vmIsDestroyed } from '../../utils/private.vm/vm.js'
  *    removeTimeout()
  */
 
-export default function () {
+export default function useTimeout() {
   let timer = null
   const vm = getCurrentInstance()
 
-  function removeTimeout () {
+  function removeTimeout() {
     if (timer !== null) {
       clearTimeout(timer)
       timer = null
@@ -25,7 +25,7 @@ export default function () {
   return {
     removeTimeout,
 
-    registerTimeout (fn, delay) {
+    registerTimeout(fn, delay) {
       removeTimeout()
 
       if (vmIsDestroyed(vm) === false) {

package/src/composables/use-timeout/use-timeout.test.js

@@ -29,7 +29,7 @@ describe('[useTimeout API]', () => {
         wrapper = mount(
           defineComponent({
             template: '<div />',
-            setup () {
+            setup() {
               const { registerTimeout } = useTimeout()
 
               registerTimeout(fn, 100)
@@ -54,7 +54,7 @@ describe('[useTimeout API]', () => {
         wrapper = mount(
           defineComponent({
             template: '<div />',
-            setup () {
+            setup() {
               const { registerTimeout } = useTimeout()
 
               registerTimeout(fn, '100')
@@ -79,11 +79,8 @@ describe('[useTimeout API]', () => {
         wrapper = mount(
           defineComponent({
             template: '<div />',
-            setup () {
-              const {
-                registerTimeout,
-                removeTimeout
-              } = useTimeout()
+            setup() {
+              const { registerTimeout, removeTimeout } = useTimeout()
 
               registerTimeout(fn, 100)
               return { registerTimeout, removeTimeout }
@@ -114,7 +111,7 @@ describe('[useTimeout API]', () => {
         wrapper = mount(
           defineComponent({
             template: '<div />',
-            setup () {
+            setup() {
               const { registerTimeout } = useTimeout()
 
               registerTimeout(fn, 100)
@@ -140,7 +137,7 @@ describe('[useTimeout API]', () => {
         wrapper = mount(
           defineComponent({
             template: '<div />',
-            setup () {
+            setup() {
               const { registerTimeout } = useTimeout()
               return { registerTimeout }
             }

package/src/composables.js

@@ -16,7 +16,6 @@ export {
   useFormChild,
   useMeta,
   useQuasar,
-
   useHydration,
   useId,
   useInterval,