changes to config classes

Author: mikecentola

src/util/configuration/config.ts

@@ -1,12 +1,103 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* ---------------------------------------------------------------------------------------------
  *  Copyright (c) Applied Eng & Design All rights reserved.
  *  Licensed under the MIT License. See License.md in the project root for license information.
  * -------------------------------------------------------------------------------------------- */
 'use strict';
-import { ConfigurationChangeEvent, ConfigurationScope, Event, EventEmitter, ExtensionContext, workspace } from 'vscode';
+import {
+    ConfigurationChangeEvent,
+    ConfigurationScope,
+    Event,
+    EventEmitter,
+    ExtensionContext,
+    extensions,
+    StatusBarAlignment,
+    workspace,
+} from 'vscode';
 import { constants } from '../constants';
-import { Logger } from '../logger';
+import { Logger, TraceLevel } from '../logger';
+import { LineNumberFrequency } from '../lineNumberer';
+
+import { GCodeUnits } from '../../gcodeUnits';
+
+export interface GCodeConfiguration {
+    general: {
+        machineType: 'Mill' | 'Lathe' | '3D Printer';
+
+        hovers: {
+            enabled: boolean;
+        };
+
+        statusBars: {
+            enabled: boolean;
+            alignment: StatusBarAlignment;
+        };
+
+        units: GCodeUnits;
+
+        outputLevel: TraceLevel;
+    };
+
+    lineNumberer: {
+        addSpaceAfter: boolean;
+        frequency: LineNumberFrequency;
+        ignoreBlank: boolean;
+        ignoreProgramNumbers: boolean;
+    };
+
+    views: {
+        maxAutoRefresh: number;
+
+        navTree: {
+            autoRefresh: boolean;
+        };
+
+        stats: {
+            autoRefresh: boolean;
+        };
+    };
+
+    webviews: {
+        enabled: boolean;
+    };
+}
+
+export const defaults: GCodeConfiguration = {
+    general: {
+        machineType: 'Mill',
+        hovers: {
+            enabled: true,
+        },
+        statusBars: {
+            enabled: true,
+            alignment: StatusBarAlignment.Left,
+        },
+        units: GCodeUnits.Auto,
+        outputLevel: TraceLevel.Verbose,
+    },
+    lineNumberer: {
+        addSpaceAfter: true,
+        frequency: LineNumberFrequency.EveryLine,
+        ignoreBlank: true,
+        ignoreProgramNumbers: true,
+    },
+    views: {
+        maxAutoRefresh: 10000,
+        navTree: {
+            autoRefresh: true,
+        },
+        stats: {
+            autoRefresh: false,
+        },
+    },
+    webviews: {
+        enabled: true,
+    },
+};
+
 export class Config {
+    private static _defaults: GCodeConfiguration;
     private _onDidChange = new EventEmitter<ConfigurationChangeEvent>();
     get onDidChange(): Event<ConfigurationChangeEvent> {
         return this._onDidChange.event;
@@ -22,7 +113,6 @@ export class Config {
         this._onDidChange.fire(e);
     }
 
-    // Get Parameter
     getParam<T>(param: string, scope?: ConfigurationScope, defaultValue?: T): T | undefined {
         return defaultValue === undefined
             ? workspace.getConfiguration(constants.configId, scope).get<T>(param)
@@ -44,6 +134,28 @@ export class Config {
     changed(e: ConfigurationChangeEvent, section: string, scope?: ConfigurationScope): boolean {
         return e.affectsConfiguration(`${constants.configId}.${section}`, scope) ?? true;
     }
+
+    static get defaults() {
+        return this._defaults;
+    }
+
+    private buildDefaults() {
+        const gcode = extensions.getExtension(constants.extensionQualifiedId);
+
+        if (gcode) {
+            const pkgCfg = gcode.packageJSON.contrubutes.configuration;
+        }
+    }
 }
 
 export const configuration = new Config();
+
+export const cfg = new Proxy(defaults, {
+    get: function (name: GCodeConfiguration, prop: string): string | undefined {
+        if (!(prop in name)) {
+            return undefined;
+        }
+    },
+});
+
+cfg.general.machineType;

src/util/configuration/defaults.ts

@@ -1,16 +1,19 @@
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
+/* eslint-disable @typescript-eslint/no-unsafe-assignment */
 /* ---------------------------------------------------------------------------------------------
  *  Copyright (c) Applied Eng & Design All rights reserved.
  *  Licensed under the MIT License. See License.md in the project root for license information.
  * -------------------------------------------------------------------------------------------- */
 
 'use strict';
 
-import { StatusBarAlignment } from 'vscode';
+import { extensions, StatusBarAlignment } from 'vscode';
 import { GCodeUnits } from '../../gcodeUnits';
+import { constants } from '../constants';
 import { LineNumberFrequency } from '../lineNumberer';
 import { TraceLevel } from '../logger';
 
-interface GCodeConfiguration {
+export interface GCodeConfiguration {
     general: {
         machineType: 'Mill' | 'Lathe' | '3D Printer';
 
@@ -52,6 +55,8 @@ interface GCodeConfiguration {
     };
 }
 
+const pkgCfg = extensions.getExtension(constants.extensionQualifiedId)!.packageJSON.contrubutes.configuration;
+
 export const defaults: GCodeConfiguration = {
     general: {
         machineType: 'Mill',