@d-mok/quasar-app-extension-quasar-axe 3.1.30 → 3.1.32

package/package.json

@@ -1,25 +1,23 @@
 {
     "name": "@d-mok/quasar-app-extension-quasar-axe",
-    "version": "3.1.30",
+    "version": "3.1.32",
     "description": "A Quasar App Extension",
     "main": "src/index.js",
     "scripts": {
         "publish-package": "npm version patch --no-git-tag-version && npm publish --access public"
     },
     "dependencies": {
-        "@handsontable/vue3": "^14.0.0",
+        "@handsontable/vue3": "^15.2.0",
         "@supabase/supabase-js": "^2.39.1",
         "@types/lodash": "^4.14.195",
-        "@types/papaparse": "^5.3.7",
         "@types/webpack-env": "^1.18.1",
         "@vueuse/core": "^10.7.0",
         "@vueuse/integrations": "^10.7.0",
         "@vueuse/router": "^10.7.0",
-        "handsontable": "^14.0.0",
+        "handsontable": "^15.2.0",
         "jszip": "^3.10.1",
         "lodash": "^4.17.21",
-        "papaparse": "^5.4.1",
-        "sapphire-js": "^2.1.37",
+        "sapphire-js": "^2.1.39",
         "sortablejs": "^1.15.0",
         "valibot": "^1.0.0"
     },

package/src/templates/src/utils/dialog/advanced.ts

@@ -162,8 +162,7 @@ type FormFlat<T extends FormPrefill> = {
 }
 
 /**
- * Ask for an array of objects by CSV.
- * Input object must have the same keys as sample.
+ * Ask for an objects.
  */
 export async function askForm<T extends FormPrefill>(
     title: string,

package/src/templates/src/utils/dialog/custom/dialogTable.vue

@@ -7,7 +7,7 @@
         <q-card
             :style="{
                 'max-width': '100%',
-                width: Object.keys(sample).length * 200 + 200 + 'px',
+                width: TOTAL_WIDTH + 'px',
             }"
         >
             <q-card-section>
@@ -17,7 +17,7 @@
                     :style="{
                         height: '50vh',
                         'max-width': '100%',
-                        width: Object.keys(sample).length * 200 + 200 + 'px',
+                        width: TOTAL_WIDTH + 'px',
                     }"
                     flat
                 >
@@ -64,7 +64,6 @@ import handson from './handson.vue'
 import { useDialogPluginComponent } from 'quasar'
 import { ref } from 'vue'
 import { clone } from './schema'
-import { unparseCSV } from '../../csv'
 import { copyToClipboard } from 'quasar'
 import * as v from 'valibot'
 
@@ -105,43 +104,43 @@ setTimeout(() => {
 
 let dummy = ref(content.map($ => clone($, Object.keys(sample))))
 
+const StandardSchema = v.object(
+    Object.mapValues(sample, val => {
+        if (typeof val === 'string') return v.string()
+        if (typeof val === 'number') return v.number() // not accept NaN
+        if (typeof val === 'boolean') return v.boolean()
+        return v.never('Invalid type:' + val)
+    })
+)
+
+const EmptySchema = v.object(
+    Object.mapValues(sample, val => {
+        if (typeof val === 'string') return v.literal('')
+        if (typeof val === 'number') return v.nan()
+        if (typeof val === 'boolean') return v.literal(false)
+        return v.never('Invalid type:' + val)
+    })
+)
+
 function checkSpec(row: any): boolean {
-    return v.is(
-        v.union([
-            v.object(
-                Object.mapValues(sample, val => {
-                    if (typeof val === 'string') return v.string()
-                    if (typeof val === 'number') return v.number() // not accept NaN
-                    if (typeof val === 'boolean') return v.boolean()
-                    return v.never('Invalid type:' + val)
-                })
-            ),
-            v.object(
-                Object.mapValues(sample, val => {
-                    if (typeof val === 'string') return v.literal('')
-                    if (typeof val === 'number') return v.nan()
-                    if (typeof val === 'boolean') return v.literal(false)
-                    return v.never('Invalid type:' + val)
-                })
-            ),
-        ]),
-
-        row
-    )
+    return v.is(v.union([StandardSchema, EmptySchema]), row)
 }
 
 function err(): string | false {
     for (let i = 0; i < dummy.value.length; i++) {
         if (!checkSpec(dummy.value[i])) {
-            return `row ${
-                i + 1
-            }: spec error<br>spec sample:<br>${JSON.stringify(sample)}`
+            return [
+                `row ${i + 1}:`,
+                'spec error!',
+                'spec sample:',
+                JSON.stringify(sample),
+            ].join('<br>')
         }
     }
     for (let i = 0; i < dummy.value.length; i++) {
         for (let [f, msg] of validators) {
             if (!f(dummy.value[i])) {
-                return `row ${i + 1}: ${msg}`
+                return [`row ${i + 1}:`, msg].join('<br>')
             }
         }
     }
@@ -155,13 +154,25 @@ function err(): string | false {
 
 function filterBlank(rows: row[]): row[] {
     if (!allowAddRow) return rows
-    return rows.unmatch(r =>
-        Object.values(r).every(v => Number.isNaN(v) || v === '' || v === false)
-    )
+    return rows.unmatch(r => v.is(EmptySchema, r))
 }
 
 function copy() {
-    let csv = unparseCSV(dummy.value, '\t')
+    let csv = dummy.value.toCSV()
     copyToClipboard(csv)
 }
+
+const TOTAL_WIDTH =
+    200 +
+    Object.values(
+        [...content, Object.mapValues(sample, (v, k) => k)]
+            .map(r => Object.mapValues(r, v => v.toString().length))
+            .reduce((acc, obj) => {
+                for (const key in acc) {
+                    acc[key] += obj[key]
+                }
+                return acc
+            })
+    ).sum() *
+        13
 </script>

package/src/templates/src/utils/dialog/custom/handson.vue

@@ -17,7 +17,7 @@
         :contextMenu="
             allowAddRow ? ['row_above', 'row_below', 'remove_row'] : []
         "
-    ></hot-table>
+    />
 </template>
 
 <script lang="ts" setup>

package/src/templates/src/utils/index.ts

@@ -15,8 +15,6 @@ if (process.env.DEBUGGING) {
     globalThis.supabase = supabase
 }
 
-export { unparseCSV } from './csv'
-
 export { zipCreate, zipDownload } from './zip'
 export type { zipFolder } from './zip'
 

package/src/templates/src/utils/csv.ts

@@ -1,16 +0,0 @@
-import Papa from 'papaparse'
-
-export function unparseCSV(
-    arr: Record<string, any>[],
-    delimiter: string
-): string {
-    return Papa.unparse(arr, {
-        quotes: false, //or array of booleans
-        quoteChar: '"',
-        escapeChar: '"',
-        delimiter,
-        header: true,
-        newline: '\r\n',
-        skipEmptyLines: false, //other option is 'greedy', meaning skip delimiters, quotes, and whitespace.
-    })
-}