summaryrefslogtreecommitdiff
path: root/js
diff options
context:
space:
mode:
authorRyan Dahl <ry@tinyclouds.org>2019-01-03 22:11:01 -0500
committerGitHub <noreply@github.com>2019-01-03 22:11:01 -0500
commitea6c9f2f365698e8120177bb7a1344e83f859180 (patch)
tree3174c0cc4004063fb626255c82fbb4ffefad5d7a /js
parent6be1164d8917b1ee40d344151f387417352fc804 (diff)
Revert "use byte array instead of string for code fetch (#1307)" (#1455)
This reverts commit e976b3e0414dc768624b77e431ee7f55b03b76a4. There is nothing technically wrong with this commit, but it's adding complexity to a big refactor (native ES modules #975). Since it's not necessary and simply a philosophical preference, I will revert for now and try to bring it back later.
Diffstat (limited to 'js')
-rw-r--r--js/compiler.ts1
-rw-r--r--js/os.ts11
2 files changed, 3 insertions, 9 deletions
diff --git a/js/compiler.ts b/js/compiler.ts
index f8899135b..9656bf446 100644
--- a/js/compiler.ts
+++ b/js/compiler.ts
@@ -233,7 +233,6 @@ export class Compiler
// We query Rust with a CodeFetch message. It will load the sourceCode,
// and if there is any outputCode cached, will return that as well.
const fetchResponse = this._os.codeFetch(moduleSpecifier, containingFile);
- assert(fetchResponse != null, "fetchResponse is null");
moduleId = fetchResponse.moduleName;
fileName = fetchResponse.filename;
mediaType = fetchResponse.mediaType;
diff --git a/js/os.ts b/js/os.ts
index 7fc37e46a..e56aab574 100644
--- a/js/os.ts
+++ b/js/os.ts
@@ -4,7 +4,6 @@ import { assert } from "./util";
import * as util from "./util";
import * as flatbuffers from "./flatbuffers";
import { sendSync } from "./dispatch";
-import { TextDecoder } from "./text_encoding";
interface CodeInfo {
moduleName: string | undefined;
@@ -46,17 +45,13 @@ export function codeFetch(specifier: string, referrer: string): CodeInfo {
assert(baseRes!.inner(codeFetchRes) != null);
// flatbuffers returns `null` for an empty value, this does not fit well with
// idiomatic TypeScript under strict null checks, so converting to `undefined`
- const sourceCode = codeFetchRes.sourceCodeArray() || undefined;
- const outputCode = codeFetchRes.outputCodeArray() || undefined;
- const sourceMap = codeFetchRes.sourceMapArray() || undefined;
- const decoder = new TextDecoder();
return {
moduleName: codeFetchRes.moduleName() || undefined,
filename: codeFetchRes.filename() || undefined,
mediaType: codeFetchRes.mediaType(),
- sourceCode: sourceCode && decoder.decode(sourceCode),
- outputCode: outputCode && decoder.decode(outputCode),
- sourceMap: sourceMap && decoder.decode(sourceMap)
+ sourceCode: codeFetchRes.sourceCode() || undefined,
+ outputCode: codeFetchRes.outputCode() || undefined,
+ sourceMap: codeFetchRes.sourceMap() || undefined
};
}