Deep merge (#12)

* set `printWidth` to 100

* deep merge both project and plugin's config

* remove examples

* release v1.2.5

* fix lint

Author: justjavac

.prettierrc

@@ -0,0 +1,10 @@
+{
+  "trailingComma": "all",
+  "printWidth": 100,
+  "overrides": [
+    {
+      "files": ".prettierrc",
+      "options": { "parser": "json" }
+    }
+  ]
+}

CHANGELOG.md

@@ -1,5 +1,9 @@
 # Changelog
 
+## 1.2.5 - 2019-06-05
+
+- deep merge `compilerOptions` [#34](https://github.com/justjavac/vscode-deno/issues/34)
+
 ## 1.2.2 - 1.2.3 - 2019-04-19
 
 - fix typescript not found bug

examples/.vscode/settings.json

@@ -1,6 +1,6 @@
 {
   "name": "typescript-deno-plugin",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "description": "Deno language service plugin for TypeScript",
   "main": "out/index.js",
   "scripts": {
@@ -19,6 +19,7 @@
     "url": "https://github.com/justjavac/typescript-deno-plugin.git"
   },
   "dependencies": {
+    "merge-deep": "^3.0.2",
     "mock-require": "^3.0.3"
   },
   "devDependencies": {

examples/package.json

@@ -2,15 +2,16 @@
 import * as fs from "fs";
 import * as path from "path";
 
-import * as mockRequire from "mock-require";
-import * as ts_module from "typescript/lib/tsserverlibrary";
+import merge from "merge-deep";
+import mockRequire from "mock-require";
+import ts_module from "typescript/lib/tsserverlibrary";
 
 import { Logger } from "./logger";
 import { getDenoDir } from "./shared";
 
 let logger: Logger;
 
-export = function init({ typescript }: { typescript: typeof ts_module }) {
+module.exports = function init({ typescript }: { typescript: typeof ts_module }) {
   // Make sure Deno imports the correct version of TS
   mockRequire("typescript", typescript);
 
@@ -27,7 +28,7 @@ export = function init({ typescript }: { typescript: typeof ts_module }) {
     resolveJsonModule: true,
     sourceMap: true,
     target: typescript.ScriptTarget.ESNext,
-    typeRoots: []
+    typeRoots: [],
   };
 
   return {
@@ -47,36 +48,34 @@ export = function init({ typescript }: { typescript: typeof ts_module }) {
         moduleNames: string[],
         containingFile: string,
         reusedNames?: string[],
-        redirectedReference?: ts_module.ResolvedProjectReference
+        redirectedReference?: ts_module.ResolvedProjectReference,
       ) => {
-        moduleNames = moduleNames
-          .map(stripExtNameDotTs)
-          .map(convertRemoteToLocalCache);
+        moduleNames = moduleNames.map(stripExtNameDotTs).map(convertRemoteToLocalCache);
 
         return resolveModuleNames.call(
           info.languageServiceHost,
           moduleNames,
           containingFile,
           reusedNames,
-          redirectedReference
+          redirectedReference,
         );
       };
 
-      const projectSetting = info.project.getCompilationSettings();
+      const getCompilationSettings = info.languageServiceHost.getCompilationSettings;
+
       info.languageServiceHost.getCompilationSettings = () => {
-        return { ...OPTIONS, ...projectSetting };
+        const projectConfig = getCompilationSettings.call(info.languageServiceHost);
+        const compilationSettings = merge(OPTIONS, projectConfig);
+        logger.info(`compilationSettings:${JSON.stringify(compilationSettings)}`);
+        return compilationSettings;
       };
 
       const getScriptFileNames = info.languageServiceHost.getScriptFileNames!;
       info.languageServiceHost.getScriptFileNames = () => {
-        const scriptFileNames = getScriptFileNames.call(
-          info.languageServiceHost
-        );
+        const scriptFileNames = getScriptFileNames.call(info.languageServiceHost);
 
         const denoDtsPath =
-          getDtsPathForVscode(info) ||
-          getGlobalDtsPath() ||
-          getLocalDtsPath(info);
+          getDtsPathForVscode(info) || getGlobalDtsPath() || getLocalDtsPath(info);
 
         if (denoDtsPath) {
           scriptFileNames.push(denoDtsPath);
@@ -94,16 +93,16 @@ export = function init({ typescript }: { typescript: typeof ts_module }) {
         name: string,
         formatOptions?: ts_module.FormatCodeOptions | ts_module.FormatCodeSettings,
         source?: string,
-        preferences?: ts_module.UserPreferences) => {
-
+        preferences?: ts_module.UserPreferences,
+      ) => {
         const details = getCompletionEntryDetails.call(
           info.languageService,
           fileName,
           position,
           name,
           formatOptions,
           source,
-          preferences
+          preferences,
         );
 
         if (details) {
@@ -112,7 +111,10 @@ export = function init({ typescript }: { typescript: typeof ts_module }) {
               for (const change of ca.changes) {
                 if (!change.isNewFile) {
                   for (const tc of change.textChanges) {
-                    tc.newText = tc.newText.replace(/^(import .* from ['"])(\..*)(['"];\n)/i, "$1$2.ts$3");
+                    tc.newText = tc.newText.replace(
+                      /^(import .* from ['"])(\..*)(['"];\n)/i,
+                      "$1$2.ts$3",
+                    );
                   }
                 }
               }
@@ -128,7 +130,7 @@ export = function init({ typescript }: { typescript: typeof ts_module }) {
 
     onConfigurationChanged(config: any) {
       logger.info(`onConfigurationChanged: ${JSON.stringify(config)}`);
-    }
+    },
   };
 };
 
@@ -166,17 +168,15 @@ interface IDenoModuleHeaders {
  * If moduleName is not found, recursively search for headers and "redirect_to" property.
  */
 function fallbackHeader(modulePath: string): string {
-  const validPath = modulePath.endsWith(".ts")
-    ? modulePath
-    : `${modulePath}.ts`;
+  const validPath = modulePath.endsWith(".ts") ? modulePath : `${modulePath}.ts`;
   if (fs.existsSync(validPath)) {
     return modulePath;
   }
 
   const headersPath = `${validPath}.headers.json`;
   if (fs.existsSync(headersPath)) {
     const headers: IDenoModuleHeaders = JSON.parse(
-      fs.readFileSync(headersPath, { encoding: "utf-8" })
+      fs.readFileSync(headersPath, { encoding: "utf-8" }),
     );
     logger.info(`redirect "${modulePath}" to "${headers.redirect_to}".`);
     // TODO: avoid Circular
@@ -185,9 +185,7 @@ function fallbackHeader(modulePath: string): string {
   return modulePath;
 }
 
-function getDtsPathForVscode(
-  info: ts_module.server.PluginCreateInfo
-): string | undefined {
+function getDtsPathForVscode(info: ts_module.server.PluginCreateInfo): string | undefined {
   const bundledDtsPath = info.config.dtsPath;
 
   if (bundledDtsPath && fs.existsSync(bundledDtsPath)) {
@@ -214,7 +212,7 @@ function getLocalDtsPath(info: ts.server.PluginCreateInfo): string | undefined {
     "node_modules",
     "typescript-deno-plugin",
     "lib",
-    "lib.deno_runtime.d.ts"
+    "lib.deno_runtime.d.ts",
   );
 
   if (fs.existsSync(localDtsPath)) {

examples/src/deno.ts

@@ -7,9 +7,11 @@
     "noImplicitAny": true,
     "noUnusedParameters": true,
     "noUnusedLocals": true,
+    "esModuleInterop": true,
+    "allowSyntheticDefaultImports": true,
     "lib": ["es6"],
     "strict": true,
     "baseUrl": "./src"
   },
-  "include": ["./src/**/*.ts"]
+  "include": ["./src/**/*.ts", "types/**/*.d.ts"]
 }

examples/src/hello.ts

@@ -0,0 +1,3 @@
+declare module "merge-deep" {
+  export default function merge<T>(value1: T, value2: T): T;
+}