fix: pinia persist migration + add articles check details list

ietf-tools · Sep 17, 2024 · 9a241a2 · 9a241a2
1 parent 2d39696
commit 9a241a2
Show file tree

Hide file tree

Showing 9 changed files with 81 additions and 14 deletions.
diff --git a/index.html b/index.html
@@ -62,6 +62,10 @@
         font-weight: 500;
         font-size: 18px;
         color: #FFF;
+        font-family: "Roboto", "-apple-system", "Helvetica Neue", Helvetica, Arial, sans-serif;
+        -webkit-text-size-adjust: 100%;
+        -webkit-font-smoothing: antialiased;
+        line-height: 1.5;
         z-index: 2000000000;
       }
     </style>

diff --git a/quasar.config.js b/quasar.config.js
@@ -10,6 +10,7 @@
 
 import { configure } from 'quasar/wrappers'
 import { readFileSync } from 'node:fs'
+import { mergeConfig } from 'vite'
 
 export default configure((/* ctx */) => {
   const curYear = new Date().getFullYear()
@@ -72,16 +73,18 @@ export default configure((/* ctx */) => {
       // distDir
 
       extendViteConf (viteConf) {
-        viteConf.build.chunkSizeWarningLimit = 9999999
-        viteConf.build.rollupOptions = {
-          output: {
-            manualChunks: (id) => {
-              if (id.includes('.css') || id.includes('.scss') || id.includes('.sass')) {
-                return 'app'
+        viteConf.build = mergeConfig(viteConf.build, {
+          chunkSizeWarningLimit: 9999999,
+          rollupOptions: {
+            output: {
+              manualChunks: (id) => {
+                if (id.includes('.css') || id.includes('.scss') || id.includes('.sass')) {
+                  return 'app'
+                }
               }
             }
           }
-        }
+        })
         // viteConf.build.rollupOptions = {
         //   external: ['monaco-editor'],
         //   output: {

diff --git a/src-electron/auth.js b/src-electron/auth.js
@@ -75,6 +75,7 @@ export default {
       minimizable: false,
       maximizable: false,
       fullscreenable: false,
+      closable: true,
       title: 'Login',
       darkTheme: true,
       backgroundColor: '#000'

diff --git a/src-electron/electron-main.js b/src-electron/electron-main.js
@@ -84,7 +84,9 @@ function createWindow () {
   if (process.env.DEBUGGING) {
     // if on DEV or Production with debug enabled
     mainWindow.webContents.openDevTools({
-      activate: false
+      activate: false,
+      mode: 'detach',
+      title: 'DraftForge DevTools'
     })
     setTimeout(() => {
       mainWindow.moveTop()

diff --git a/src/components/DrawerChecks.vue b/src/components/DrawerChecks.vue
@@ -111,9 +111,10 @@ const valChecks = [
 // METHODS
 
 function articlesCheck (silent) {
-  const warnings = checkArticles(modelStore[docsStore.activeDocument.id].getValue())
-  if (warnings < 1) {
+  const results = checkArticles(modelStore[docsStore.activeDocument.id].getValue())
+  if (results.count < 1) {
     editorStore.setValidationCheckState('articles', 1)
+    editorStore.setValidationCheckDetails('articles', [])
     if (!silent) {
       $q.notify({
         message: 'Looks good!',
@@ -124,6 +125,7 @@ function articlesCheck (silent) {
     }
   } else {
     editorStore.setValidationCheckState('articles', -2)
+    editorStore.setValidationCheckDetails('articles', results.details)
   }
 }
 

diff --git a/src/stores/docs.js b/src/stores/docs.js
@@ -249,6 +249,6 @@ export const useDocsStore = defineStore('docs', {
     }
   },
   persist: {
-    paths: []
+    pick: []
   }
 })
diff --git a/src/stores/editor.js b/src/stores/editor.js
@@ -118,7 +118,7 @@ export const useEditorStore = defineStore('editor', {
     }
   },
   persist: {
-    paths: [
+    pick: [
       'animationEffects',
       'confirmExit',
       'cursorBlinking',

diff --git a/src/stores/user.js b/src/stores/user.js
@@ -13,6 +13,6 @@ export const useUserStore = defineStore('user', {
   },
   actions: { },
   persist: {
-    paths: []
+    pick: []
   }
 })
diff --git a/src/tools/articles.js b/src/tools/articles.js
@@ -1,4 +1,5 @@
 import { decorationsStore } from 'src/stores/models'
+import { sortBy } from 'lodash-es'
 
 export function checkArticles (text) {
   const partARgx = /(?<!(?:[aA]ppendix|[cC]onnection|[lL]ink|[nN]ode|Operator)) (?!(?:[aA] (?:AAA|Europe|[oO]ne|U[A-Z]|U-label|[uU]biquitous|[uU]nicast|[uU]nicode|[uU]nidir|[uU]nif|[uU]nion|[uU]nique|[uU]nit|[uU]nivers|[uU]sable|[uU]sability|[uU]sage|[uU]se|[uU]tility)|a uCDN|A and))[aA] [aeiouAEIOU]/g
@@ -9,6 +10,7 @@ export function checkArticles (text) {
   const textLines = text.split('\n')
 
   const decorations = []
+  const details = []
   for (const [lineIdx, line] of textLines.entries()) {
     for (const match of line.matchAll(partARgx)) {
       decorations.push({
@@ -29,6 +31,16 @@ export function checkArticles (text) {
           endColumn: match.index + match[0].length
         }
       })
+      details.push({
+        key: crypto.randomUUID(),
+        message: `Bad indefinite article: ${match[0]}`,
+        range: {
+          startLineNumber: lineIdx + 1,
+          startColumn: match.index + 2,
+          endLineNumber: lineIdx + 1,
+          endColumn: match.index + match[0].length
+        }
+      })
     }
     for (const match of line.matchAll(partARRgx)) {
       decorations.push({
@@ -49,6 +61,16 @@ export function checkArticles (text) {
           endColumn: match.index + 1 + match[0].length
         }
       })
+      details.push({
+        key: crypto.randomUUID(),
+        message: `Bad indefinite article: ${match[0]}`,
+        range: {
+          startLineNumber: lineIdx + 1,
+          startColumn: match.index + 2,
+          endLineNumber: lineIdx + 1,
+          endColumn: match.index + match[0].length
+        }
+      })
     }
     for (const match of line.matchAll(partBRgx)) {
       decorations.push({
@@ -69,6 +91,16 @@ export function checkArticles (text) {
           endColumn: match.index + 1 + match[0].length
         }
       })
+      details.push({
+        key: crypto.randomUUID(),
+        message: `Bad indefinite article: ${match[0]}`,
+        range: {
+          startLineNumber: lineIdx + 1,
+          startColumn: match.index + 2,
+          endLineNumber: lineIdx + 1,
+          endColumn: match.index + match[0].length
+        }
+      })
     }
     for (const match of line.matchAll(partCRgx)) {
       decorations.push({
@@ -89,6 +121,16 @@ export function checkArticles (text) {
           endColumn: match.index + 1 + match[0].length
         }
       })
+      details.push({
+        key: crypto.randomUUID(),
+        message: `Bad indefinite article: ${match[0]}`,
+        range: {
+          startLineNumber: lineIdx + 1,
+          startColumn: match.index + 2,
+          endLineNumber: lineIdx + 1,
+          endColumn: match.index + match[0].length
+        }
+      })
     }
     for (const match of line.matchAll(partCLFRgx)) {
       decorations.push({
@@ -109,10 +151,23 @@ export function checkArticles (text) {
           endColumn: match.index + match[0].length
         }
       })
+      details.push({
+        key: crypto.randomUUID(),
+        message: `Bad indefinite article: ${match[0]}`,
+        range: {
+          startLineNumber: lineIdx + 1,
+          startColumn: match.index + 2,
+          endLineNumber: lineIdx + 1,
+          endColumn: match.index + match[0].length
+        }
+      })
     }
   }
 
   decorationsStore.get('articles').set(decorations)
 
-  return decorations.length
+  return {
+    count: decorations.length,
+    details: sortBy(details, d => d.range.startLineNumber)
+  }
 }