Allow importing of the compiled in typescript

Fixes denoland#18.
gusha915 · May 30, 2018 · 0162eca · 0162eca
1 parent 4f00218
commit 0162eca
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 1 deletion.
diff --git a/Makefile b/Makefile
@@ -39,7 +39,7 @@ deno: msg.pb.go $(GO_FILES)
  go build -o deno ./cmd
 
 assets.go: dist/main.js
- cp node_modules/typescript/lib/lib.*d.ts dist/
+ cp node_modules/typescript/lib/*d.ts dist/
  cp deno.d.ts dist/
  go-bindata -pkg deno -o assets.go dist/
 

diff --git a/runtime.ts b/runtime.ts
@@ -130,6 +130,8 @@ export function makeDefine(fileName: string): AmdDefine {
  return localRequire;
  } else if (dep === "exports") {
  return localExports;
+ } else if (dep === "typescript") {
+ return ts;
  } else if (dep === "deno") {
  return deno;
  } else {
@@ -310,6 +312,8 @@ class TypeScriptHost implements ts.LanguageServiceHost {
  let resolvedFileName;
  if (name === "deno") {
  resolvedFileName = resolveModuleName("deno.d.ts", "/$asset$/");
+ } else if (name === "typescript") {
+ resolvedFileName = resolveModuleName("typescript.d.ts", "/$asset$/");
  } else {
  resolvedFileName = resolveModuleName(name, containingFile);
  }

diff --git a/testdata/import_typescript.ts b/testdata/import_typescript.ts
@@ -0,0 +1,3 @@
+import * as ts from "typescript";
+
+console.log("typescript version", ts.version);
diff --git a/testdata/import_typescript.ts.out b/testdata/import_typescript.ts.out
@@ -0,0 +1 @@
+typescript version 2.8.3