add configuration support (closes #44);bump version (#39)

Author: Claus Reinke

Makefile

@@ -14,7 +14,7 @@ bin/tss.js: tss.ts harness.ts $(TYPESCRIPT)/bin/typescript.d.ts $(TYPESCRIPT)/bi
 bin/lib.d.ts: $(TYPESCRIPT)/bin/lib.d.ts
 	cp $(TYPESCRIPT)/bin/lib.d.ts bin/lib.d.ts
 
-tests/script.out2: $(TEST_SCRIPTS) $(TEST_SOURCES) tests/script.js tests/script.out bin/tss.js bin/lib.d.ts
+tests/script.out2: $(TEST_SCRIPTS) $(TEST_SOURCES) tests/tsconfig.json tests/script.js tests/script.out bin/tss.js bin/lib.d.ts
 	cd tests;\
 	node script.js >script.out2;
 

README.md

@@ -29,6 +29,8 @@ or via the npm registry (the newest version isn't there yet, waiting for post-1.
   $ npm install -g typescript-tools
   ```
 
+From-source compilation should not be necessary, as a pre-compiled `bin/tss.js` is included, as well as a `bin/lib.d.ts`. But if you want to rebuild and test tss, you can run `make` in `typescript-tools`.
+
 The installation should give you a global `tss` command, which you can use directly, as in this sample session (note that the absolute paths will differ in your installation):
 
   ```
@@ -50,36 +52,11 @@ The installation should give you a global `tss` command, which you can use direc
 
 If you want to use tss from Vim, add the `typescript-tools` directory to your Vim's `rtp`. If you want to use this from other editors/IDEs, you will need to write some code, to communicate with `tss` as an asynchronous subprocess (please let me know how it goes, especially if you release a working plugin).
 
-From-source compilation should not be necessary, as a pre-compiled `bin/tss.js` is included, as well as a `bin/lib.d.ts`. You might want to modify `bin/defaultLibs.d.ts`, if you want other declaration files included by default. (TODO: get rid of defaultLibs)
-
-If you do want to compile from source:
-
-  ```
-  # install git and node/npm, then
-  $ git clone https://github.com/Microsoft/TypeScript.git
-  $ git clone git://github.com/clausreinke/typescript-tools.git
-  $ cd typescript-tools
-  $ npm install ../typescript
-  $ make
-  ```
-
-Alternatively, you can let npm handle the cloning of the typescript dependency:
-
-  ```
-  # install git and node/npm, then
-  $ git clone git://github.com/clausreinke/typescript-tools.git
-  $ cd typescript-tools
-  $ npm install
-  $ make
-  ```
-
-The latter works better at the moment since we currently depend directly on the github version of the typescript package. The former gives you control over where to put the typescript clone, and how much to clone (try --depth 1), once we can drop the github dependency again.
-
 TypeScript tools currently available:
 
 ## tss.ts: TypeScript Services Server
 
-  Simple commandline interface (commands in, info out) to TypeScript Services. Currently supported commands (with indication of purpose and output format) include:
+Simple commandline interface (commands in, info out) to TypeScript Services. Currently supported commands (with indication of purpose and output format) include:
 
   ```
   type <line> <pos> <file>
@@ -143,7 +120,7 @@ TypeScript tools currently available:
     [{ info: string
      , min:  { line: number, character: number }
      , lim:  { line: number, character: number }
-     , childItems: <recursive>
+     , childItems: <recursive structure>
      }]
 
   showErrors
@@ -165,11 +142,47 @@ TypeScript tools currently available:
     "TSS closing"
   ```
 
-  Start `tss` with project root file - may take several seconds to load
-  all dependencies; then enter commands and get JSON info or error messages
-  (NOTE: commands take absolute file paths, adjust example to your installation);
-  for a sample session, see `tests/` (commands in `test.script`, output in `script.out`).
-
+Start `tss` with project root file - may take several seconds to load all
+dependencies for larger projects; then enter commands and get JSON info or
+error messages.
+
+### configuration: tsconfig.json or commandline options
+
+tss can now be configured the same way as tsc, either via commandline options or
+via tsconfig.json files (since about TSv1.5). In both cases, only options that affect
+the language service have any effect. As a simple example, loading sources with 
+external modules generates errors
+
+```
+$ echo showErrors | bin/tss  tests/issue-17.ts
+"loaded c:/javascript/typescript/github/typescript-tools/tests/issue-17.ts, TSS
+listening.."
+showErrors
+[{"file":"c:/javascript/typescript/github/typescript-tools/tests/issue-17-import
+.ts","start":{"line":1,"character":14},"end":{"line":1,"character":18},"text":"C
+annot compile external modules unless the '--module' flag is provided.","code":1
+148,"phase":"Syntax","category":"Error"}]
+```
+
+unless a module system is selected:
+
+```
+$ echo showErrors | bin/tss --module commonjs tests/issue-17.ts
+"loaded c:/javascript/typescript/github/typescript-tools/tests/issue-17.ts, TSS
+listening.."
+showErrors
+[]
+
+$ echo showErrors | bin/tss --project tests/ tests/issue-17.ts
+"loaded c:/javascript/typescript/github/typescript-tools/tests/issue-17.ts, TSS
+listening.."
+showErrors
+[]
+
+$ cat tests/tsconfig.json
+{"compilerOptions": {"target":"ES5","module":"commonjs"} }
+
+```
 
 ## vim interface to tss.js
 

bin/harness.js

@@ -47,7 +47,9 @@ var ScriptInfo = (function () {
         this.setContent(content);
         this.editRanges.push({
             length: content.length,
-            textChangeRange: ts.createTextChangeRange(ts.createTextSpan(0, old_length), content.length)
+            textChangeRange: 
+            // NOTE: no shortcut for "update everything" (null only works in some places, #10)
+            ts.createTextChangeRange(ts.createTextSpan(0, old_length), content.length)
         });
         this.version++;
     };

bin/tss.js

@@ -136,12 +136,13 @@ var TSS = (function () {
         return errors;
     };
     /** load file and dependencies, prepare language service for queries */
-    TSS.prototype.setup = function (file) {
+    TSS.prototype.setup = function (file, options) {
         var _this = this;
         this.rootFile = this.resolveRelativePath(file);
-        this.compilerOptions = ts.getDefaultCompilerOptions();
-        this.compilerOptions.diagnostics = true;
-        this.compilerOptions.target = 1 /* ES5 */;
+        this.compilerOptions = options;
+        // this.compilerOptions.diagnostics = true;
+        // this.compilerOptions.target      = ts.ScriptTarget.ES5;
+        // this.compilerOptions.module      = ts.ModuleKind.CommonJS;
         this.fileNameToContent = {};
         // build program from root file,
         // chase dependencies (references and imports), normalize file names, ...
@@ -328,7 +329,8 @@ var TSS = (function () {
                                 var endLine = parseInt(m[5]);
                                 var maxLines = script.lineMap.length;
                                 var startPos = startLine <= maxLines ? (startLine < 1 ? 0 : _this.lineColToPosition(file, startLine, 1)) : script.content.length;
-                                var endPos = endLine < maxLines ? (endLine < 1 ? 0 : _this.lineColToPosition(file, endLine + 1, 0) - 1) : script.content.length;
+                                var endPos = endLine < maxLines ? (endLine < 1 ? 0 : _this.lineColToPosition(file, endLine + 1, 0) - 1) //??CHECK
+                                 : script.content.length;
                                 _this.editScript(file, startPos, endPos, lines.join(EOL));
                             }
                             var syn, sem;
@@ -393,7 +395,7 @@ var TSS = (function () {
                 }
                 else if (m = match(cmd, /^reload$/)) {
                     // TODO: keep updated (in-memory-only) files?
-                    _this.setup(_this.rootFile);
+                    _this.setup(_this.rootFile, _this.compilerOptions);
                     _this.outputJSON('"reloaded ' + _this.rootFile + ', TSS listening.."');
                 }
                 else if (m = match(cmd, /^quit$/)) {
@@ -421,10 +423,60 @@ var TSS = (function () {
     };
     return TSS;
 })();
-if (ts.sys.args.indexOf("--version") !== -1) {
+// from src/compiler/tsc.ts - not yet exported from there:-(
+function findConfigFile() {
+    var searchPath = ts.normalizePath(ts.sys.getCurrentDirectory());
+    var filename = "tsconfig.json";
+    while (true) {
+        if (ts.sys.fileExists(filename)) {
+            return filename;
+        }
+        var parentPath = ts.getDirectoryPath(searchPath);
+        if (parentPath === searchPath) {
+            break;
+        }
+        searchPath = parentPath;
+        filename = "../" + filename;
+    }
+    return undefined;
+}
+var arg;
+var configFile, configObject, configObjectParsed;
+// NOTE: partial options support only
+var commandLine = ts.parseCommandLine(ts.sys.args);
+if (commandLine.options.version) {
     console.log(require("../package.json").version);
     process.exit(0);
 }
+if (commandLine.options.project) {
+    configFile = ts.normalizePath(ts.combinePaths(commandLine.options.project, "tsconfig.json"));
+}
+else if (commandLine.filenames.length === 0) {
+    configFile = findConfigFile();
+    if (!configFile) {
+        console.error("can't find project root");
+        console.error("please specify root source file");
+        console.error("  or --project directory (containing a tsconfig.json)");
+        process.exit(1);
+    }
+}
+var options;
+if (configFile) {
+    configObject = ts.readConfigFile(configFile);
+    if (!configObject) {
+        console.error("can't read tsconfig.json at", configFile);
+        process.exit(1);
+    }
+    configObjectParsed = ts.parseConfigFile(configObject, ts.getDirectoryPath(configFile));
+    if (configObjectParsed.errors.length > 0) {
+        console.error(configObjectParsed.errors);
+        process.exit(1);
+    }
+    options = ts.extend(commandLine.options, configObjectParsed.options);
+}
+else {
+    options = ts.extend(commandLine.options, ts.getDefaultCompilerOptions());
+}
 var tss = new TSS();
-tss.setup(ts.sys.args[0]);
+tss.setup(commandLine.filenames[0], options);
 tss.listen();

package.json

@@ -1,6 +1,6 @@
 {
   "name": "typescript-tools",
-  "version": "v0.4.2-testing-ts1.4",
+  "version": "v0.4.3-testing-ts1.4",
   "description": "TypeScript Services commandline server",
   "bin": {
     "tss": "bin/tss"
@@ -18,5 +18,7 @@
   "preferGlobal": true,
   "author": "Claus Reinke",
   "license": "Apache License, Version 2.0",
-  "dependencies": "git+ssh://[email protected]:Microsoft/TypeScript.git"
+  "dependencies": {
+    "typescript": "git+ssh://[email protected]:Microsoft/TypeScript.git"
+  }
 }

tests/script.js

@@ -14,7 +14,7 @@ function test(scriptName,fileName) {
   var script = fs.readFileSync(scriptName,"utf8")
                  .replace(/PREFIX/g,PREFIX);
 
-  var cmd = "node "+tss_path+" "+fileName;
+  var cmd = "node "+tss_path+" --project ."+" "+fileName;
   tests.push(scriptName);
   log[scriptName] = ["// "+scriptName,cmd];
 

tests/script.out

@@ -1,5 +1,5 @@
 // test.script
-node ../bin/tss.js test.ts
+node ../bin/tss.js --project . test.ts
 // stdout
 "loaded PREFIX/test.ts, TSS listening.."
 [{"file":"PREFIX/test.ts"
@@ -525,7 +525,7 @@ var a = [];
 // stderr
 
 // issue-9.script
-node ../bin/tss.js empty.ts
+node ../bin/tss.js --project . empty.ts
 // stdout
 "loaded PREFIX/empty.ts, TSS listening.."
 "updated PREFIX/empty.ts, (1/0) errors"
@@ -555,7 +555,7 @@ node ../bin/tss.js empty.ts
 // stderr
 
 // issue-10.script
-node ../bin/tss.js empty.ts
+node ../bin/tss.js --project . empty.ts
 // stdout
 "loaded PREFIX/empty.ts, TSS listening.."
 "updated PREFIX/empty.ts, (0/0) errors"
@@ -576,7 +576,7 @@ node ../bin/tss.js empty.ts
 // stderr
 
 // issue-11.script
-node ../bin/tss.js empty.ts
+node ../bin/tss.js --project . empty.ts
 // stdout
 "loaded PREFIX/empty.ts, TSS listening.."
 "updated PREFIX/empty.ts, (1/1) errors"
@@ -603,7 +603,7 @@ node ../bin/tss.js empty.ts
 // stderr
 
 // issue-12.script
-node ../bin/tss.js empty.ts
+node ../bin/tss.js --project . empty.ts
 // stdout
 "loaded PREFIX/empty.ts, TSS listening.."
 "updated PREFIX/empty.ts, (0/0) errors"
@@ -613,7 +613,7 @@ null
 // stderr
 
 // issue-13.script
-node ../bin/tss.js empty.ts
+node ../bin/tss.js --project . empty.ts
 // stdout
 "loaded PREFIX/empty.ts, TSS listening.."
 "updated PREFIX/empty.ts, (0/1) errors"
@@ -677,7 +677,7 @@ node ../bin/tss.js empty.ts
 // stderr
 
 // partial-update.script
-node ../bin/tss.js empty.ts
+node ../bin/tss.js --project . empty.ts
 // stdout
 "loaded PREFIX/empty.ts, TSS listening.."
 "updated PREFIX/empty.ts, (0/0) errors"
@@ -732,7 +732,7 @@ bozo;
 // stderr
 
 // update-nocheck-completion-chain.script
-node ../bin/tss.js empty.ts
+node ../bin/tss.js --project . empty.ts
 // stdout
 "loaded PREFIX/empty.ts, TSS listening.."
 "updated PREFIX/empty.ts"
@@ -795,7 +795,7 @@ node ../bin/tss.js empty.ts
 // stderr
 
 // issue-15.script
-node ../bin/tss.js issue-15.ts
+node ../bin/tss.js --project . issue-15.ts
 // stdout
 "loaded PREFIX/issue-15.ts, TSS listening.."
 "updated PREFIX/issue-15.ts"
@@ -859,7 +859,7 @@ node ../bin/tss.js issue-15.ts
 // stderr
 
 // issue-17.script
-node ../bin/tss.js issue-17.ts
+node ../bin/tss.js --project . issue-17.ts
 // stdout
 "loaded PREFIX/issue-17.ts, TSS listening.."
 [{"ref":{"fileName":"PREFIX/issue-17-import.ts"
@@ -903,7 +903,7 @@ node ../bin/tss.js issue-17.ts
 // stderr
 
 // concat-map.script
-node ../bin/tss.js empty.ts
+node ../bin/tss.js --project . empty.ts
 // stdout
 "loaded PREFIX/empty.ts, TSS listening.."
 "updated PREFIX/empty.ts, (0/0) errors"

tests/tsconfig.json

@@ -0,0 +1 @@
+{"compilerOptions": {"target":"ES5","module":"commonjs"} }