package the plugin for distribution

mattpocock · Feb 7, 2023 · fc27b02 · fc27b02
1 parent 128b67d
commit fc27b02
Show file tree

Hide file tree

Showing 8 changed files with 267 additions and 24 deletions.
diff --git a/packages/language-service-plugin/example/index.ts b/packages/language-service-plugin/example/index.ts
@@ -1,9 +1,19 @@
-let a;
-
 export function A(b: number): number {
-  if (true) {
-    return 1;
-  } {
-    3;
-  }
-}
+  return b;
+}
+A("test")
+
+
+let a: { m: number[] };
+let b = { m: [""] };
+a = b;
+
+// Extra Properties
+
+type A = { m: number };
+const w: A = { m: 10, n: "" };
+
+// Union Assignments
+
+type Thing = "none" | { name: string };
+const e: Thing = { name: 0 };
diff --git a/packages/language-service-plugin/example/package.json b/packages/language-service-plugin/example/package.json
@@ -3,6 +3,6 @@
   "version": "0.1.0",
   "dependencies": {
     "ts-error-translator-tssplugin": "file:..",
-    "typescript": "^4.8.3"
+    "typescript": "^4.5.3"
   }
 }
diff --git a/packages/language-service-plugin/package.json b/packages/language-service-plugin/package.json
@@ -4,13 +4,23 @@
   "license": "MIT",
   "main": "./out/index.js",
   "private": true,
-  "files": ["./out/**"],
+  "files": [
+    "./out/**"
+  ],
   "scripts": {
     "dev": "tsc --watch",
-    "build": "tsc"
+    "build": "rollup -c rollup.config.mjs"
   },
   "devDependencies": {
+    "@rollup/plugin-commonjs": "^24.0.1",
+    "@rollup/plugin-json": "^6.0.0",
+    "@rollup/plugin-node-resolve": "^15.0.1",
+    "@rollup/plugin-typescript": "^11.0.0",
+    "rollup": "^3.14.0",
     "tsconfig": "workspace:*",
     "typescript": "^4.5.3"
+  },
+  "dependencies": {
+    "@total-typescript/error-translation-engine": "workspace:*"
   }
 }
diff --git a/packages/language-service-plugin/rollup.config.mjs b/packages/language-service-plugin/rollup.config.mjs
@@ -0,0 +1,21 @@
+import { nodeResolve } from '@rollup/plugin-node-resolve';
+import typescript from '@rollup/plugin-typescript';
+import commonjs from '@rollup/plugin-commonjs';
+import json from '@rollup/plugin-json';
+
+export default {
+  input: 'src/index.ts',
+  output: {
+    file: 'out/index.js',
+    sourcemap: true,
+    format: 'cjs'
+  },
+  plugins: [
+    nodeResolve({
+      extensions: ['.mjs', '.js', '.json', '.node', '.ts']
+    }),
+    commonjs({ extensions: ['.js', '.ts'] }),
+    typescript(),
+    json()
+  ]
+};
diff --git a/packages/language-service-plugin/src/index.ts b/packages/language-service-plugin/src/index.ts
@@ -1,10 +1,31 @@
-function init(modules: { typescript: typeof import("typescript/lib/tsserverlibrary") }) {
+import { parseErrors } from '@total-typescript/error-translation-engine';
+
+export default function init(modules: { typescript: typeof import("typescript/lib/tsserverlibrary") }) {
   const ts = modules.typescript;
 
+  function withParsedError(messageText: string): string {
+    const parsed = parseErrors(messageText);
+    const allMessages = parsed.map(err => err.error).join('\n\n');
+    return `${messageText}\n\nIn other words,\n${allMessages}\n`;
+  }
+
   function enrichDiagnostic(diagnostic: ts.Diagnostic): ts.Diagnostic {
-    // diagnostic.code: number
-    // diagnostic.category === ts.DiagnosticCategory (Error, Message, Suggestion, Warning)
-    diagnostic.messageText = `${diagnostic.messageText}\n\nHello from plugin!\n`
+    if (typeof diagnostic.messageText === 'string') {
+      diagnostic.messageText = withParsedError(diagnostic.messageText);
+      return diagnostic;
+    }
+    if (diagnostic.messageText.category === ts.DiagnosticCategory.Error) {
+      const msg = withParsedError(diagnostic.messageText.messageText);
+      diagnostic.messageText.messageText = msg;
+
+      const nextMesgs = diagnostic.messageText.next;
+      if (nextMesgs) {
+        for (let i = 0; i < nextMesgs.length; i++) {
+          let nextMsg = nextMesgs[i];
+          nextMesgs[i].messageText = withParsedError(nextMsg.messageText);
+        }
+      }
+    }
     return diagnostic;
   }
 
@@ -29,4 +50,4 @@ function init(modules: { typescript: typeof import("typescript/lib/tsserverlibra
 
 }
 
-export = init;
+// export = init;
diff --git a/packages/language-service-plugin/tsconfig.json b/packages/language-service-plugin/tsconfig.json
@@ -1,19 +1,18 @@
 {
   "extends": "tsconfig/base.json",
   "compilerOptions": {
-    "module": "commonjs",
-    "target": "ES2019",
+    "module": "ESNext",
+    "target": "ESNext",
     "outDir": "./out",
     "rootDir": "src",
     "strict": true,
     "declaration": true,
-    "sourceMap": true,
-    "skipLibCheck": true
+    "sourceMap": true
   },
   "include": [
-    "src"
+    "src/**/*"
   ],
   "exclude": [
-    "node_modules"
+    "node_modules", "out"
   ]
 }