@goodandready/dsh-goal 0.2.1 → 0.2.2

package/lib/card-form-state.js

@@ -1,33 +1,40 @@
 /**
- * Чистая логика состояния и валидации формы настроек dsh-goal.
- * Не зависит от DOM/React, полностью тестируема через node --test.
+ * Pure state and validation logic for dsh-goal settings form.
+ * Independent from DOM/React, 100% testable via node --test.
  */
 
 export const DEFAULT_SETTINGS = {
   maxIterations: 25,
   autoDrive: true,
   enableSound: true,
+  showQuickLaunchButton: true,
+  consecutiveToolFailureLimit: 3,
+  enableBrowserNotifications: true,
+  storagePath: '',
 };
 
 /**
- * Парсинг числового значения настроек:
- * - пустая строка / null / undefined -> undefined (сброс к базовому значению)
- * - валидное число >= 1 -> number
- * - иначе -> NaN (invalid)
+ * Parse numeric settings field:
+ * - empty string / null / undefined -> undefined (reset override)
+ * - valid integer >= min -> number
+ * - otherwise -> NaN (invalid)
+ * @param {any} raw
+ * @param {number} [min=1]
+ * @returns {number|undefined}
  */
-export function parseNumberField(raw) {
+export function parseNumberField(raw, min = 1) {
   if (raw === '' || raw === null || raw === undefined) {
     return undefined;
   }
   const n = Number(raw);
-  if (!Number.isFinite(n) || n < 1 || !Number.isInteger(n)) {
+  if (!Number.isFinite(n) || n < min || !Number.isInteger(n)) {
     return NaN;
   }
   return n;
 }
 
 /**
- * Вычисление состояния конкретного поля:
+ * Compute status for a specific setting field
  * @param {string} field
  * @param {any} draftValue
  * @param {Object} snap - { value, base, user }
@@ -46,11 +53,10 @@ export function getFieldStatus(field, draftValue, snap) {
   if (field === 'maxIterations') {
     if (draftValue !== undefined) {
       if (draftValue === '') {
-        // Пустая строка = сброс к базовому значению (не ошибка)
         invalid = false;
-        isDirty = userVal !== undefined; // dirty если было переопределено
+        isDirty = userVal !== undefined;
       } else {
-        const parsed = parseNumberField(draftValue);
+        const parsed = parseNumberField(draftValue, 1);
         if (Number.isNaN(parsed)) {
           invalid = true;
           isDirty = true;
@@ -59,10 +65,30 @@ export function getFieldStatus(field, draftValue, snap) {
         }
       }
     }
+  } else if (field === 'consecutiveToolFailureLimit') {
+    if (draftValue !== undefined) {
+      if (draftValue === '') {
+        invalid = false;
+        isDirty = userVal !== undefined;
+      } else {
+        const parsed = parseNumberField(draftValue, 0);
+        if (Number.isNaN(parsed)) {
+          invalid = true;
+          isDirty = true;
+        } else {
+          isDirty = parsed !== (userVal !== undefined ? userVal : baseVal);
+        }
+      }
+    }
+  } else if (field === 'storagePath') {
+    if (draftValue !== undefined) {
+      const cleanVal = typeof draftValue === 'string' ? draftValue.trim() : '';
+      isDirty = cleanVal !== (userVal !== undefined ? userVal : (baseVal || ''));
+    }
   } else {
-    // boolean fields (autoDrive, enableSound)
+    // boolean fields (autoDrive, enableSound, showQuickLaunchButton, enableBrowserNotifications)
     if (draftValue !== undefined) {
-      isDirty = draftValue !== (userVal !== undefined ? userVal : baseVal);
+      isDirty = Boolean(draftValue) !== (userVal !== undefined ? Boolean(userVal) : Boolean(baseVal));
     }
   }
 
@@ -77,7 +103,7 @@ export function getFieldStatus(field, draftValue, snap) {
 }
 
 /**
- * Вычисление списка операций записи (writes) для scope.set:
+ * Compute list of key-value writes for scope.set
  * @param {Object|null} draft
  * @param {Object} snap - { value, base, user }
  * @returns {Array<[string, any]>}
@@ -86,7 +112,15 @@ export function computeSavePlan(draft, snap) {
   if (!draft) return [];
 
   const writes = [];
-  const fields = ['maxIterations', 'autoDrive', 'enableSound'];
+  const fields = [
+    'maxIterations',
+    'autoDrive',
+    'enableSound',
+    'showQuickLaunchButton',
+    'consecutiveToolFailureLimit',
+    'enableBrowserNotifications',
+    'storagePath',
+  ];
 
   for (const f of fields) {
     if (draft[f] === undefined) continue;
@@ -95,11 +129,21 @@ export function computeSavePlan(draft, snap) {
     if (status.invalid) continue;
 
     if (status.isDirty) {
-      if (f === 'maxIterations' && draft[f] === '') {
-        // Сброс переопределения
-        writes.push([f, undefined]);
-      } else if (f === 'maxIterations') {
-        writes.push([f, parseNumberField(draft[f])]);
+      if (f === 'maxIterations') {
+        if (draft[f] === '') {
+          writes.push([f, undefined]);
+        } else {
+          writes.push([f, parseNumberField(draft[f], 1)]);
+        }
+      } else if (f === 'consecutiveToolFailureLimit') {
+        if (draft[f] === '') {
+          writes.push([f, undefined]);
+        } else {
+          writes.push([f, parseNumberField(draft[f], 0)]);
+        }
+      } else if (f === 'storagePath') {
+        const clean = typeof draft[f] === 'string' ? draft[f].trim() : '';
+        writes.push([f, clean ? clean : undefined]);
       } else {
         writes.push([f, Boolean(draft[f])]);
       }