functional for demo

eclipse-cdt-cloud · Nov 25, 2024 · 1d326e5 · 1d326e5
1 parent 0caf057
commit 1d326e5
Show file tree

Hide file tree

Showing 12 changed files with 1,093 additions and 8 deletions.
diff --git a/vscode-trace-extension/package.json b/vscode-trace-extension/package.json
@@ -38,6 +38,10 @@
                 "command": "yourExtension.openJsonEditor",
                 "title": "Open JSON Configuration"
             },
+            {
+                "command": "yourExtension.openJsonEditorFromFile",
+                "title": "Open JSON Configuration from File"
+            },
             {
                 "command": "outputs.reset",
                 "title": "Reset",
@@ -200,7 +204,11 @@
                 {
                     "command": "yourExtension.openJsonEditor",
                     "group": "navigation@41"
-                  }
+                },
+                {
+                    "command": "yourExtension.openJsonEditorFromFile",
+                    "group": "navigation@42"
+                }
             ],
             "editor/title": [
                 {

diff --git a/vscode-trace-extension/src/exploration/json-editor.ts b/vscode-trace-extension/src/exploration/json-editor.ts
@@ -8,7 +8,7 @@ export class JsonConfigEditor {
     private readonly ajv: Ajv;
     private tempFilePath: string;
     private isEditing: boolean = false;
-    private baseUrl: string = 'http://localhost:3069';
+    private baseUrl: string = 'http://localhost:3002';
     private trackedEditor?: vscode.TextEditor;
     private closeSubscription?: vscode.Disposable;
 
@@ -53,7 +53,29 @@ export class JsonConfigEditor {
         });
     }
 
-    public async openJsonEditor(useDefaults: boolean = true) {
+    private async validateJsonFile(filePath: string, schema: any): Promise<{ isValid: boolean; content?: any; errors?: string[] }> {
+        try {
+            const fileContent = fs.readFileSync(filePath, 'utf-8');
+            const jsonContent = JSON.parse(fileContent);
+
+            const validate = this.ajv.compile(schema);
+            if (validate(jsonContent)) {
+                return { isValid: true, content: jsonContent };
+            } else {
+                const errors = validate.errors?.map(error => 
+                    `${error.instancePath} ${error.message}`
+                ) || [];
+                return { isValid: false, errors };
+            }
+        } catch (error) {
+            if (error instanceof Error) {
+                return { isValid: false, errors: [error.message] };
+            }
+            return { isValid: false, errors: ['Unknown error occurred while validating JSON file'] };
+        }
+    }
+
+    public async openJsonEditor(options: { useDefaults?: boolean; sourceFile?: vscode.Uri } = {}) {
         if (this.isEditing) {
             vscode.window.showInformationMessage('A config editing session is already active');
             return;
@@ -70,9 +92,32 @@ export class JsonConfigEditor {
                 // Always fetch schema
                 const schema = await this.fetchSchema();
 
-                // Get configuration based on useDefaults parameter
-                let config;
-                if (useDefaults) {
+                // Determine the configuration source
+                let config: any;
+
+                if (options.sourceFile) {
+                    // Validate the source file against the schema
+                    const validation = await this.validateJsonFile(options.sourceFile.fsPath, schema);
+
+                    if (!validation.isValid) {
+                        const viewDetails = 'View Details';
+                        const response = await vscode.window.showErrorMessage(
+                            'The selected file has validation errors and cannot be loaded.',
+                            viewDetails
+                        );
+
+                        if (response === viewDetails) {
+                            const errorDoc = await vscode.workspace.openTextDocument({
+                                content: `Validation Errors:\n\n${validation.errors?.join('\n')}`,
+                                language: 'text'
+                            });
+                            await vscode.window.showTextDocument(errorDoc);
+                        }
+                        return;
+                    }
+
+                    config = validation.content;
+                } else if (options.useDefaults) {
                     config = extractSchemaDefaults(schema);
                 } else {
                     config = await this.fetchConfig();
@@ -90,10 +135,8 @@ export class JsonConfigEditor {
 
                 await this.setJsonSchema(uri, schema);
 
-                // Improved editor close detection
                 this.closeSubscription = vscode.window.onDidChangeVisibleTextEditors(async (editors) => {
                     if (this.trackedEditor && !editors.some(e => e.document.uri.fsPath === this.tempFilePath)) {
-                        // Editor was closed
                         if (this.closeSubscription) {
                             this.closeSubscription.dispose();
                         }

diff --git a/vscode-trace-extension/src/exploration/test-server/.gitignore b/vscode-trace-extension/src/exploration/test-server/.gitignore
@@ -0,0 +1 @@
+node_modules
diff --git a/vscode-trace-extension/src/exploration/test-server/config.json b/vscode-trace-extension/src/exploration/test-server/config.json
@@ -0,0 +1,10 @@
+{
+  "serverUrl": "localhost:8080",
+  "maxConnections": 100,
+  "timeout": 5000,
+  "features": {
+    "enableLogging": false,
+    "enableCache": false
+  },
+  "wildcard": "I sent you this in an email."
+}
diff --git a/vscode-trace-extension/src/exploration/test-server/data/config.json b/vscode-trace-extension/src/exploration/test-server/data/config.json
@@ -0,0 +1,10 @@
+{
+  "serverUrl": "localhost:8080",
+  "maxConnections": 100,
+  "timeout": 5000,
+  "features": {
+    "enableLogging": false,
+    "enableCache": false
+  },
+  "wildcard": "I sent you this in an email."
+}
diff --git a/vscode-trace-extension/src/exploration/test-server/data/schema.json b/vscode-trace-extension/src/exploration/test-server/data/schema.json
@@ -0,0 +1,58 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "properties": {
+    "serverUrl": {
+      "enum": [
+        "localhost:3000",
+        "localhost:3002",
+        "localhost:8080"
+      ],
+      "description": "The server URL for the application \n  Type: string \n [ 'localhost:3000' 'localhost:8080' ]",
+      "default": "localhost:3000"
+    },
+    "maxConnections": {
+      "type": "integer",
+      "minimum": 1,
+      "maximum": 100,
+      "description": "Maximum number of concurrent connections",
+      "default": 10
+    },
+    "timeout": {
+      "type": "integer",
+      "minimum": 0,
+      "description": "Timeout in milliseconds",
+      "default": 5000
+    },
+    "features": {
+      "type": "object",
+      "properties": {
+        "enableLogging": {
+          "type": "boolean",
+          "description": "Enable detailed logging",
+          "default": false
+        },
+        "enableCache": {
+          "type": "boolean",
+          "description": "Enable response caching",
+          "default": false
+        }
+      },
+      "required": [
+        "enableLogging",
+        "enableCache"
+      ]
+    },
+    "wildcard": {
+      "type": "string",
+      "description": "Anything you want.",
+      "default": "Good Hearted Woman - Waylon Jennings"
+    }
+  },
+  "required": [
+    "serverUrl",
+    "maxConnections",
+    "timeout",
+    "features"
+  ]
+}
diff --git a/vscode-trace-extension/src/exploration/test-server/nodemon.json b/vscode-trace-extension/src/exploration/test-server/nodemon.json
@@ -0,0 +1,3 @@
+{
+    "ignore": ["data/*"]
+}
diff --git a/vscode-trace-extension/src/exploration/test-server/package.json b/vscode-trace-extension/src/exploration/test-server/package.json
@@ -0,0 +1,18 @@
+{
+    "name": null,
+    "version": "1.0.0",
+    "description": "Mock server for VS Code config editor testing",
+    "main": "server.js",
+    "scripts": {
+      "start": "node server.js",
+      "dev": "nodemon server.js"
+    },
+    "dependencies": {
+      "cors": "^2.8.5",
+      "express": "^4.18.2",
+      "body-parser": "^1.20.2"
+    },
+    "devDependencies": {
+      "nodemon": "^3.0.2"
+    }
+  }
diff --git a/vscode-trace-extension/src/exploration/test-server/schema.json b/vscode-trace-extension/src/exploration/test-server/schema.json
@@ -0,0 +1,58 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "type": "object",
+  "properties": {
+    "serverUrl": {
+      "enum": [
+        "localhost:3000",
+        "localhost:3002",
+        "localhost:8080"
+      ],
+      "description": "The server URL for the application \n  Type: string \n [ 'localhost:3000' 'localhost:8080' ]",
+      "default": "localhost:3000"
+    },
+    "maxConnections": {
+      "type": "integer",
+      "minimum": 1,
+      "maximum": 100,
+      "description": "Maximum number of concurrent connections",
+      "default": 10
+    },
+    "timeout": {
+      "type": "integer",
+      "minimum": 0,
+      "description": "Timeout in milliseconds",
+      "default": 5000
+    },
+    "features": {
+      "type": "object",
+      "properties": {
+        "enableLogging": {
+          "type": "boolean",
+          "description": "Enable detailed logging",
+          "default": false
+        },
+        "enableCache": {
+          "type": "boolean",
+          "description": "Enable response caching",
+          "default": false
+        }
+      },
+      "required": [
+        "enableLogging",
+        "enableCache"
+      ]
+    },
+    "wildcard": {
+      "type": "string",
+      "description": "Anything you want.",
+      "default": "Good Hearted Woman - Waylon Jennings"
+    }
+  },
+  "required": [
+    "serverUrl",
+    "maxConnections",
+    "timeout",
+    "features"
+  ]
+}