summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorKitson Kelly <me@kitsonkelly.com>2018-09-06 07:05:14 -0700
committerRyan Dahl <ry@tinyclouds.org>2018-09-06 11:04:56 -0400
commit1e709aa3486ff0700f45c78c07fa57e2c0fd1985 (patch)
tree52189ffd080258689e24ee335639bded48232f2a /js
parentfcdfacc2de72e52b3f82dbce37746d371c3ad3ab (diff)
Fix TypeScript exports in bundle
Diffstat (limited to 'js')
-rw-r--r--js/compiler.ts15
-rw-r--r--js/compiler_test.ts17
2 files changed, 9 insertions, 23 deletions
diff --git a/js/compiler.ts b/js/compiler.ts
index d92838652..3c2e3e4d1 100644
--- a/js/compiler.ts
+++ b/js/compiler.ts
@@ -137,13 +137,6 @@ function throwResolutionError(
);
}
-// ts.ScriptKind is not available at runtime, so local enum definition
-enum ScriptKind {
- JS = 1,
- TS = 3,
- JSON = 6
-}
-
/**
* A singleton class that combines the TypeScript Language Service host API
* with Deno specific APIs to provide an interface for compiling and running
@@ -626,13 +619,13 @@ export class DenoCompiler implements ts.LanguageServiceHost {
const suffix = fileName.substr(fileName.lastIndexOf(".") + 1);
switch (suffix) {
case "ts":
- return ScriptKind.TS;
+ return ts.ScriptKind.TS;
case "js":
- return ScriptKind.JS;
+ return ts.ScriptKind.JS;
case "json":
- return ScriptKind.JSON;
+ return ts.ScriptKind.JSON;
default:
- return this._options.allowJs ? ScriptKind.JS : ScriptKind.TS;
+ return this._options.allowJs ? ts.ScriptKind.JS : ts.ScriptKind.TS;
}
}
diff --git a/js/compiler_test.ts b/js/compiler_test.ts
index c056cf932..fdb5fe03b 100644
--- a/js/compiler_test.ts
+++ b/js/compiler_test.ts
@@ -8,13 +8,6 @@ import * as ts from "typescript";
const { DenoCompiler } = compiler;
-// Enums like this don't exist at runtime, so local copy
-enum ScriptKind {
- JS = 1,
- TS = 3,
- JSON = 6
-}
-
interface ModuleInfo {
moduleName: string | null;
filename: string | null;
@@ -466,11 +459,11 @@ test(function compilerGetScriptFileNames() {
});
test(function compilerGetScriptKind() {
- assertEqual(compilerInstance.getScriptKind("foo.ts"), ScriptKind.TS);
- assertEqual(compilerInstance.getScriptKind("foo.d.ts"), ScriptKind.TS);
- assertEqual(compilerInstance.getScriptKind("foo.js"), ScriptKind.JS);
- assertEqual(compilerInstance.getScriptKind("foo.json"), ScriptKind.JSON);
- assertEqual(compilerInstance.getScriptKind("foo.txt"), ScriptKind.JS);
+ assertEqual(compilerInstance.getScriptKind("foo.ts"), ts.ScriptKind.TS);
+ assertEqual(compilerInstance.getScriptKind("foo.d.ts"), ts.ScriptKind.TS);
+ assertEqual(compilerInstance.getScriptKind("foo.js"), ts.ScriptKind.JS);
+ assertEqual(compilerInstance.getScriptKind("foo.json"), ts.ScriptKind.JSON);
+ assertEqual(compilerInstance.getScriptKind("foo.txt"), ts.ScriptKind.JS);
});
test(function compilerGetScriptVersion() {