Some refactorings

.vscode/launch.json

@@ -8,7 +8,7 @@
 			"runtimeExecutable": "${execPath}",
 			"args": [
 				"--extensionDevelopmentPath=${workspaceFolder}/extension",
-				"S:\\dev\\vscode\\vscode-debug-visualizer2\\example-project"
+				"${workspaceFolder}\\example-project"
 			],
 			"outFiles": ["${workspaceFolder}/extension/out/**/*.js"],
 			"preLaunchTask": "npm: dev - extension"

example-project/.vscode/launch.json

@@ -8,7 +8,7 @@
 			"type": "node",
 			"request": "launch",
 			"name": "Launch Program",
-			"program": "${workspaceFolder}\\src\\index.ts",
+			"program": "${workspaceFolder}\\dist\\index.js",
 			"outFiles": ["${workspaceFolder}/dist/**/*.js"],
 			"preLaunchTask": "npm: dev"
 		}

example-project/package.json

@@ -3,8 +3,9 @@
 	"version": "1.0.0",
 	"license": "MIT",
 	"dependencies": {
-		"@hediet/std": "^0.4.0",
+		"@hediet/live-debug": "^0.5.2",
 		"@hediet/node-reload": "0.7.0",
+		"@hediet/std": "^0.4.0",
 		"typescript": "^3.5.3"
 	},
 	"scripts": {

example-project/src/index.ts

@@ -11,11 +11,19 @@ import {
 } from "@hediet/debug-visualizer-data-extraction";
 enableHotReload();
 import * as ts from "typescript";
+import { liveLogId, liveLog } from "@hediet/live-debug";
 
 registerUpdateReconciler(module);
 
 getDataExtractorApi().registerExtractor(new TypeScriptAstDataExtractor());
 
+let i = 0;
+setInterval(() => {
+	i++;
+	liveLog("bla" + i * 2);
+	liveLog("test" + i);
+}, 1000);
+
 @hotClass(module)
 class Main {
 	run() {
@@ -25,9 +33,9 @@ class Main {
 class Test {
     public test() {
 		console.log("aaa");
-		const x =  4 + 1;
+		const x =  ;
     }
-}        
+}
 `,
 			ts.ScriptTarget.Latest,
 			true
@@ -35,8 +43,10 @@ class Test {
 
 		console.log(sf);
 		//new TypeScriptAstDataExtractor().getExtractions(sf, );
+	}
 
-		debugger;
+	toString() {
+		return "hihi";
 	}
 }
 

example-project/yarn.lock

@@ -2,7 +2,7 @@
 # yarn lockfile v1
 
 
-"@hediet/live-debug@^0.5.1":
+"@hediet/live-debug@^0.5.1", "@hediet/live-debug@^0.5.2":
   version "0.5.2"
   resolved "https://registry.yarnpkg.com/@hediet/live-debug/-/live-debug-0.5.2.tgz#f2ee0034f014836bfd68e26c35a168ab42b15486"
   integrity sha512-HBqVbyFez1oQlIPO9dzkFi7/9Gvt6ZpssgURzYaVFREl9Oq03nPd6V7Ay4bW03xFHPo3YT2Yff9mFmGQUX7JEg==

extension/src/extension.ts

@@ -43,7 +43,7 @@ class WebView {
 const debugVisualizer = "debugVisualizer";
 
 function getHtml(server: Server) {
-	const isDev = true;
+	const isDev = false;
 	return `
         <html>
             <head>
@@ -168,7 +168,7 @@ class Server {
 
 	constructor(sources: Sources) {
 		const app = express();
-		app.use(serveStatic(join(__dirname, "../../ui/dist")));
+		app.use(serveStatic(join(__dirname, "../ui/dist")));
 
 		this.server = app.listen();
 
@@ -187,7 +187,7 @@ class Server {
 	}
 
 	public get mainBundle(): string {
-		return `http://localhost:${this.port}/main-efe6bdc4b62fdc7971ee.js`;
+		return `http://localhost:${this.port}/main.js`;
 	}
 
 	public get port(): number {

extension/ui/package.json

@@ -28,6 +28,7 @@
 		"@types/classnames": "^2.2.8",
 		"@types/react": "^16.8.21",
 		"@types/react-dom": "^16.8.4",
+		"clean-webpack-plugin": "^3.0.0",
 		"css-loader": "^3.0.0",
 		"file-loader": "^4.0.0",
 		"fork-ts-checker-webpack-plugin": "^1.4.2",

extension/ui/webpack.config.ts

@@ -3,6 +3,7 @@ import path = require("path");
 import HtmlWebpackPlugin = require("html-webpack-plugin");
 import MonacoWebpackPlugin = require("monaco-editor-webpack-plugin");
 import ForkTsCheckerWebpackPlugin = require("fork-ts-checker-webpack-plugin");
+import { CleanWebpackPlugin } from "clean-webpack-plugin";
 
 const r = (file: string) => path.resolve(__dirname, file);
 
@@ -10,7 +11,7 @@ module.exports = {
 	entry: [r("src/index.tsx")],
 	output: {
 		path: r("dist"),
-		filename: "[name]-[hash].js",
+		filename: "[name].js",
 		chunkFilename: "[name]-[hash].js",
 	},
 	resolve: {
@@ -36,5 +37,6 @@ module.exports = {
 		new HtmlWebpackPlugin(),
 		new MonacoWebpackPlugin(),
 		new ForkTsCheckerWebpackPlugin(),
+		new CleanWebpackPlugin(),
 	],
 } as webpack.Configuration;

package.json

@@ -4,6 +4,6 @@
 		"./shared",
 		"./data-extraction",
 		"./extension",
-		"./ui"
+		"./extension/ui"
 	]
 }

yarn.lock

@@ -147,6 +147,14 @@
   resolved "https://registry.yarnpkg.com/@types/anymatch/-/anymatch-1.3.1.tgz#336badc1beecb9dacc38bea2cf32adf627a8421a"
   integrity sha512-/+CRPXpBDpo2RK9C68N3b2cOvO0Cf5B9aPijHsoDQTHivnGSObdOF2BRQOYjojWTDy6nQvMjmqRXIxH55VjxxA==
 
+"@types/body-parser@*":
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.17.0.tgz#9f5c9d9bd04bb54be32d5eb9fc0d8c974e6cf58c"
+  integrity sha512-a2+YeUjPkztKJu5aIF2yArYFQQp8d51wZ7DavSHjFuY1mqVgidGyzEQ41JIVNy82fXj8yPgy2vJmfIywgESW6w==
+  dependencies:
+    "@types/connect" "*"
+    "@types/node" "*"
+
 "@types/chai@^4.1.7":
   version "4.1.7"
   resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.1.7.tgz#1b8e33b61a8c09cbe1f85133071baa0dbf9fa71a"
@@ -164,6 +172,13 @@
   dependencies:
     "@types/node" "*"
 
+"@types/connect@*":
+  version "3.4.32"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.32.tgz#aa0e9616b9435ccad02bc52b5b454ffc2c70ba28"
+  integrity sha512-4r8qa0quOvh7lGD0pre62CAb1oni1OO6ecJLGCezTmhQ8Fz50Arx9RUszryR8KlgK6avuSXvviL6yWyViQABOg==
+  dependencies:
+    "@types/node" "*"
+
 "@types/dom4@^2.0.1":
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/@types/dom4/-/dom4-2.0.1.tgz#506d5781b9bcab81bd9a878b198aec7dee2a6033"
@@ -174,6 +189,23 @@
   resolved "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz#2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"
   integrity sha512-EaObqwIvayI5a8dCzhFrjKzVwKLxjoG9T6Ppd5CEo07LRKfQ8Yokw54r5+Wq7FaBQ+yXRvQAYPrHwya1/UFt9g==
 
+"@types/express-serve-static-core@*":
+  version "4.16.7"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.16.7.tgz#50ba6f8a691c08a3dd9fa7fba25ef3133d298049"
+  integrity sha512-847KvL8Q1y3TtFLRTXcVakErLJQgdpFSaq+k043xefz9raEf0C7HalpSY7OW5PyjCnY8P7bPW5t/Co9qqp+USg==
+  dependencies:
+    "@types/node" "*"
+    "@types/range-parser" "*"
+
+"@types/express@^4.17.0":
+  version "4.17.0"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.0.tgz#49eaedb209582a86f12ed9b725160f12d04ef287"
+  integrity sha512-CjaMu57cjgjuZbh9DpkloeGxV45CnMGlVd+XpG7Gm9QgVrd7KFq+X4HY0vM+2v0bczS48Wg7bvnMY5TN+Xmcfw==
+  dependencies:
+    "@types/body-parser" "*"
+    "@types/express-serve-static-core" "*"
+    "@types/serve-static" "*"
+
 "@types/glob@^7.1.1":
   version "7.1.1"
   resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz#aa59a1c6e3fbc421e07ccd31a944c30eba521575"
@@ -201,6 +233,11 @@
     "@types/tapable" "*"
     "@types/webpack" "*"
 
+"@types/mime@*":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@types/mime/-/mime-2.0.1.tgz#dc488842312a7f075149312905b5e3c0b054c79d"
+  integrity sha512-FwI9gX75FgVBJ7ywgnq/P7tw+/o1GUbtP0KzbtusLigAOgIgNISRK0ZPl4qertvXSIE8YbsVJueQ90cDt9YYyw==
+
 "@types/minimatch@*":
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
@@ -221,6 +258,11 @@
   resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.1.tgz#f1a11e7babb0c3cad68100be381d1e064c68f1f6"
   integrity sha512-CFzn9idOEpHrgdw8JsoTkaDDyRWk1jrzIV8djzcgpq0y9tG4B4lFT+Nxh52DVpDXV+n4+NPNv7M1Dj5uMp6XFg==
 
+"@types/range-parser@*":
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"
+  integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
+
 "@types/react-dom@^16.8.4":
   version "16.8.5"
   resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.8.5.tgz#3e3f4d99199391a7fb40aa3a155c8dd99b899cbd"
@@ -255,6 +297,14 @@
   resolved "https://registry.yarnpkg.com/@types/relateurl/-/relateurl-0.2.28.tgz#6bda7db8653fa62643f5ee69e9f69c11a392e3a6"
   integrity sha1-a9p9uGU/piZD9e5p6facEaOS46Y=
 
+"@types/serve-static@*", "@types/serve-static@^1.13.2":
+  version "1.13.2"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.2.tgz#f5ac4d7a6420a99a6a45af4719f4dcd8cd907a48"
+  integrity sha512-/BZ4QRLpH/bNYgZgwhKEh+5AsboDBcUdlBYgzoLX0fpj3Y2gp6EApyOlM3bK53wQS/OE1SrdSYBAbux2D1528Q==
+  dependencies:
+    "@types/express-serve-static-core" "*"
+    "@types/mime" "*"
+
 "@types/sinon@^7.0.10":
   version "7.0.13"
   resolved "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.0.13.tgz#ca039c23a9e27ebea53e0901ef928ea2a1a6d313"
@@ -3962,6 +4012,13 @@ once@^1.3.0, once@^1.3.1, once@^1.4.0:
   dependencies:
     wrappy "1"
 
+open@^6.4.0:
+  version "6.4.0"
+  resolved "https://registry.yarnpkg.com/open/-/open-6.4.0.tgz#5c13e96d0dc894686164f18965ecfe889ecfc8a9"
+  integrity sha512-IFenVPgF70fSm1keSd2iDBIDIBZkroLeuffXq+wKTzTJlBpesFWojV9lb8mzOfaAzM1sr7HQHuO0vtV0zYekGg==
+  dependencies:
+    is-wsl "^1.1.0"
+
 opn@^5.5.0:
   version "5.5.0"
   resolved "https://registry.yarnpkg.com/opn/-/opn-5.5.0.tgz#fc7164fab56d235904c51c3b27da6758ca3b9bfc"
@@ -4958,7 +5015,7 @@ serve-index@^1.9.1:
     mime-types "~2.1.17"
     parseurl "~1.3.2"
 
-serve-static@1.14.1:
+serve-static@1.14.1, serve-static@^1.14.1:
   version "1.14.1"
   resolved "https://registry.yarnpkg.com/serve-static/-/serve-static-1.14.1.tgz#666e636dc4f010f7ef29970a88a674320898b2f9"
   integrity sha512-JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg==