Merge pull request #37 from VariableThe/fix/ts-build-errors

fix: resolve TS build errors related to expr-eval and vitest

Author: VariableThe

src/hooks/useVariables.ts

@@ -2,7 +2,7 @@ import { useEffect } from 'react'
 
 import { useAppStore } from '../store/useAppStore'
 import { useVariableStore } from '../store/useVariableStore'
-import { Parser } from 'expr-eval'
+import { Parser, type Values } from 'expr-eval'
 
 export function useVariables() {
   const notes = useAppStore((state) => state.notes)
@@ -21,7 +21,7 @@ export function useVariables() {
         while ((varMatch = reVar.exec(note.content)) !== null) {
           const name = varMatch[1]
           try {
-            globals[name] = parser.evaluate(varMatch[2], globals as Record<string, unknown>)
+            globals[name] = parser.evaluate(varMatch[2], globals as Values)
           } catch (e) {
             // eslint-disable-next-line no-console
             console.error(`useVariables evaluation error for ${name}:`, e)

src/lib/editor/MathEvaluator.ts

@@ -1,6 +1,6 @@
 import type { EditorView } from '@codemirror/view'
 import { getScope } from './VariableScope'
-import { Parser } from 'expr-eval'
+import { Parser, type Values } from 'expr-eval'
 
 export function evaluateMath(
   docStr: string,
@@ -20,7 +20,7 @@ export function evaluateMath(
       const expr = text.substring(0, text.lastIndexOf('=')).trim()
       if (expr && !expr.startsWith('/var') && !expr.startsWith('/globvar')) {
         try {
-          const result = String(parser.evaluate(expr, scope))
+          const result = String(parser.evaluate(expr, scope as Values))
           changes.push({
             from: offset + lineLen,
             to: offset + lineLen,
@@ -45,7 +45,7 @@ export function evaluateMath(
     const expr = exprPart.replace(/=\s*$/, '').trim()
     if (expr) {
       try {
-        const newResult = String(parser.evaluate(expr, scope))
+        const newResult = String(parser.evaluate(expr, scope as Values))
         if (newResult !== oldResult) {
           const startReplace = calcMatch.index + exprPart.length + 1 // +1 for \u200B
           const endReplace = calcMatch.index + calcMatch[0].length

src/lib/editor/VariableScope.ts

@@ -1,7 +1,7 @@
 import type { EditorView } from '@codemirror/view'
 import { StateEffect } from '@codemirror/state'
 import { useVariableStore } from '../../store/useVariableStore'
-import { Parser } from 'expr-eval'
+import { Parser, type Values } from 'expr-eval'
 import { MathEvaluator } from './MathEvaluator'
 
 export const scopeChangedEffect = StateEffect.define<void>()
@@ -30,7 +30,7 @@ export class VariableScope {
         const name = varMatch[1]
         try {
           const mergedScope = Object.assign({}, globalVars, newScope)
-          const val = parser.evaluate(varMatch[2], mergedScope as Record<string, unknown>)
+          const val = parser.evaluate(varMatch[2], mergedScope as Values)
           newScope[name] = val
         } catch (e) {
           // eslint-disable-next-line no-console

src/lib/safeStorage.test.ts

@@ -1,4 +1,4 @@
-import { describe, it, expect, beforeEach } from 'vitest'
+import { describe, it, expect, beforeEach, vi } from 'vitest'
 import { setSecure, getSecure } from './safeStorage'
 
 describe('safeStorage (Renderer Flow)', () => {