@workbench-kit/workbench-config 0.0.2-prototype.0.2.25 → 0.0.2-prototype.0.2.27

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@workbench-kit/workbench-config",
-  "version": "0.0.2-prototype.0.2.25",
+  "version": "0.0.2-prototype.0.2.27",
   "private": false,
   "type": "module",
   "exports": {

package/src/index.ts

@@ -1,4 +1,4 @@
-import { assertKnownKeys, assertRecord } from './parse-helpers.js';
+import { assertKnownKeys, assertRecord, parseConfigJson } from './parse-helpers.js';
 import { WorkbenchConfigValidationError } from './validation-error.js';
 
 export const WORKBENCH_KIT_WORKBENCH_CONFIG_VERSION = '0.0.0' as const;
@@ -85,15 +85,7 @@ export function parseWorkbenchExtensionsConfig(input: unknown): WorkbenchExtensi
 }
 
 export function parseWorkbenchExtensionsConfigJson(jsonText: string): WorkbenchExtensionsConfig {
-  try {
-    return parseWorkbenchExtensionsConfig(JSON.parse(jsonText) as unknown);
-  } catch (error) {
-    if (error instanceof WorkbenchConfigValidationError) {
-      throw error;
-    }
-
-    throw new WorkbenchConfigValidationError('Expected extensions config to be valid JSON.');
-  }
+  return parseConfigJson(jsonText, parseWorkbenchExtensionsConfig, 'extensions config');
 }
 
 export function parseWorkbenchExtensionsLock(input: unknown): WorkbenchExtensionsLock {
@@ -136,15 +128,7 @@ export function parseWorkbenchExtensionsLock(input: unknown): WorkbenchExtension
 }
 
 export function parseWorkbenchExtensionsLockJson(jsonText: string): WorkbenchExtensionsLock {
-  try {
-    return parseWorkbenchExtensionsLock(JSON.parse(jsonText) as unknown);
-  } catch (error) {
-    if (error instanceof WorkbenchConfigValidationError) {
-      throw error;
-    }
-
-    throw new WorkbenchConfigValidationError('Expected extensions lock to be valid JSON.');
-  }
+  return parseConfigJson(jsonText, parseWorkbenchExtensionsLock, 'extensions lock');
 }
 
 export function parseWorkbenchLayoutConfig(input: unknown): WorkbenchLayoutConfig {
@@ -204,15 +188,7 @@ export function parseWorkbenchLayoutConfig(input: unknown): WorkbenchLayoutConfi
 }
 
 export function parseWorkbenchLayoutConfigJson(jsonText: string): WorkbenchLayoutConfig {
-  try {
-    return parseWorkbenchLayoutConfig(JSON.parse(jsonText) as unknown);
-  } catch (error) {
-    if (error instanceof WorkbenchConfigValidationError) {
-      throw error;
-    }
-
-    throw new WorkbenchConfigValidationError('Expected layout config to be valid JSON.');
-  }
+  return parseConfigJson(jsonText, parseWorkbenchLayoutConfig, 'layout config');
 }
 
 export {

package/src/keybindings-config.ts

@@ -1,6 +1,7 @@
 import {
   assertKnownKeys,
   assertRecord,
+  parseConfigJson,
   readOptionalString,
   readRequiredString,
 } from './parse-helpers.js';
@@ -26,15 +27,7 @@ export function parseWorkbenchKeybindingsConfig(
 export function parseWorkbenchKeybindingsConfigJson(
   jsonText: string,
 ): readonly WorkbenchKeybindingDefinition[] {
-  try {
-    return parseWorkbenchKeybindingsConfig(JSON.parse(jsonText) as unknown);
-  } catch (error) {
-    if (error instanceof WorkbenchConfigValidationError) {
-      throw error;
-    }
-
-    throw new WorkbenchConfigValidationError('Expected keybindings config to be valid JSON.');
-  }
+  return parseConfigJson(jsonText, parseWorkbenchKeybindingsConfig, 'keybindings config');
 }
 
 function parseWorkbenchKeybindingDefinition(

package/src/parse-helpers.ts

@@ -8,6 +8,21 @@ export function assertRecord(value: unknown, label: string): Record<string, unkn
   return value as Record<string, unknown>;
 }
 
+export function parseConfigJson<T>(
+  jsonText: string,
+  parseConfig: (input: unknown) => T,
+  configLabel: string,
+): T {
+  try {
+    return parseConfig(JSON.parse(jsonText) as unknown);
+  } catch (error) {
+    if (error instanceof WorkbenchConfigValidationError) {
+      throw error;
+    }
+    throw new WorkbenchConfigValidationError(`Expected ${configLabel} to be valid JSON.`);
+  }
+}
+
 export function readRequiredString(record: Record<string, unknown>, key: string): string {
   const value = record[key];
   if (typeof value !== 'string' || value.trim().length === 0) {

package/src/settings-config.ts

@@ -1,3 +1,4 @@
+import { parseConfigJson } from './parse-helpers.js';
 import { WorkbenchConfigValidationError } from './validation-error.js';
 
 export type WorkbenchSettingsConfig = Readonly<Record<string, unknown>>;
@@ -7,17 +8,23 @@ export function parseWorkbenchSettingsConfig(input: unknown): WorkbenchSettingsC
     throw new WorkbenchConfigValidationError('Expected settings config to be an object.');
   }
 
-  return { ...(input as Record<string, unknown>) };
+  const settings = { ...(input as Record<string, unknown>) };
+  const colorTheme = settings['workbench.colorTheme'];
+  if (colorTheme !== undefined && typeof colorTheme !== 'string') {
+    throw new WorkbenchConfigValidationError('Expected workbench.colorTheme to be a string.');
+  }
+
+  const editorFontSize = settings['editor.fontSize'];
+  if (
+    editorFontSize !== undefined &&
+    (typeof editorFontSize !== 'number' || !Number.isFinite(editorFontSize) || editorFontSize < 1)
+  ) {
+    throw new WorkbenchConfigValidationError('Expected editor.fontSize to be a number >= 1.');
+  }
+
+  return settings;
 }
 
 export function parseWorkbenchSettingsConfigJson(jsonText: string): WorkbenchSettingsConfig {
-  try {
-    return parseWorkbenchSettingsConfig(JSON.parse(jsonText) as unknown);
-  } catch (error) {
-    if (error instanceof WorkbenchConfigValidationError) {
-      throw error;
-    }
-
-    throw new WorkbenchConfigValidationError('Expected settings config to be valid JSON.');
-  }
+  return parseConfigJson(jsonText, parseWorkbenchSettingsConfig, 'settings config');
 }

package/src/user-commands-config.ts

@@ -1,6 +1,7 @@
 import {
   assertKnownKeys,
   assertRecord,
+  parseConfigJson,
   readOptionalString,
   readRequiredString,
 } from './parse-helpers.js';
@@ -52,15 +53,7 @@ export function parseWorkbenchUserCommandsConfig(input: unknown): WorkbenchUserC
 export function parseWorkbenchUserCommandsConfigJson(
   jsonText: string,
 ): WorkbenchUserCommandsConfig {
-  try {
-    return parseWorkbenchUserCommandsConfig(JSON.parse(jsonText) as unknown);
-  } catch (error) {
-    if (error instanceof WorkbenchConfigValidationError) {
-      throw error;
-    }
-
-    throw new WorkbenchConfigValidationError('Expected user commands config to be valid JSON.');
-  }
+  return parseConfigJson(jsonText, parseWorkbenchUserCommandsConfig, 'user commands config');
 }
 
 function parseUserCommandDefinition(input: unknown, index: number): WorkbenchUserCommandDefinition {