@d-mok/quasar-app-extension-quasar-axe 4.1.7 → 4.1.8

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@d-mok/quasar-app-extension-quasar-axe",
-    "version": "4.1.7",
+    "version": "4.1.8",
     "description": "A Quasar App Extension",
     "main": "src/index.js",
     "scripts": {

package/src/templates/src/boot/axe/AutoRoute.ts

@@ -34,14 +34,14 @@ function parse(glob: Record<string, { default: any }>) {
 }
 
 const [layoutMaster] = parse(
-    import.meta.glob('src/boot/axe/LayoutMaster.vue', { eager: true })
+    import.meta.glob('src/boot/axe/LayoutMaster.vue', { eager: true }),
 )
 const layouts = parse(import.meta.glob('src/layouts/*.vue', { eager: true }))
 const pages = parse(import.meta.glob('src/pages/**/*.vue', { eager: true }))
 
 for (const layout of layouts) {
     layout.children = pages.filter($ =>
-        $.filepath.includes('pages/' + layout.filename)
+        $.filepath.includes('pages/' + layout.filename),
     )
 }
 
@@ -74,7 +74,7 @@ type QueryValueBasicType = string | number | boolean | undefined
 type QueryValueType = QueryValueBasicType | QueryValueBasicType[]
 
 function castBasicValue(
-    val: LocationQueryValue | undefined
+    val: LocationQueryValue | undefined,
 ): QueryValueBasicType {
     if (val === undefined) return undefined
     if (val === null) return undefined
@@ -85,17 +85,25 @@ function castBasicValue(
     return val
 }
 
-function castValue(
-    val: LocationQueryValue | LocationQueryValue[] | undefined
-): QueryValueType {
-    return Array.isArray(val) ? val.map(castBasicValue) : castBasicValue(val)
+function castBasicValueAsRawString(
+    val: LocationQueryValue | undefined,
+): string | undefined {
+    if (val === undefined) return undefined
+    if (val === null) return undefined
+    return val
 }
 
 function castQuery(query: LocationQuery): Record<string, QueryValueType> {
     const casted: Record<string, QueryValueType> = {}
     for (const k in query) {
         const v = query[k]
-        casted[k] = castValue(v)
+        casted[k] = Array.isArray(v) ? v.map(castBasicValue) : castBasicValue(v)
+    }
+    for (const k in query) {
+        const v = query[k]
+        casted[k + '_'] = Array.isArray(v)
+            ? v.map(castBasicValueAsRawString)
+            : castBasicValueAsRawString(v)
     }
     return casted
 }