Rename fbs to msg.

This commit is contained in:
Ryan Dahl 2018-10-03 21:18:23 -04:00
parent f774953011
commit 818ad37678
22 changed files with 201 additions and 201 deletions

View file

@ -1,6 +1,6 @@
// Copyright 2018 the Deno authors. All rights reserved. MIT license.
import { ModuleInfo } from "./types";
import * as fbs from "gen/msg_generated";
import * as msg from "gen/msg_generated";
import { assert } from "./util";
import * as util from "./util";
import { flatbuffers } from "flatbuffers";
@ -8,10 +8,10 @@ import { sendSync } from "./dispatch";
export function exit(exitCode = 0): never {
const builder = new flatbuffers.Builder();
fbs.Exit.startExit(builder);
fbs.Exit.addCode(builder, exitCode);
const inner = fbs.Exit.endExit(builder);
sendSync(builder, fbs.Any.Exit, inner);
msg.Exit.startExit(builder);
msg.Exit.addCode(builder, exitCode);
const inner = msg.Exit.endExit(builder);
sendSync(builder, msg.Any.Exit, inner);
return util.unreachable();
}
@ -24,17 +24,17 @@ export function codeFetch(
const builder = new flatbuffers.Builder();
const moduleSpecifier_ = builder.createString(moduleSpecifier);
const containingFile_ = builder.createString(containingFile);
fbs.CodeFetch.startCodeFetch(builder);
fbs.CodeFetch.addModuleSpecifier(builder, moduleSpecifier_);
fbs.CodeFetch.addContainingFile(builder, containingFile_);
const inner = fbs.CodeFetch.endCodeFetch(builder);
const baseRes = sendSync(builder, fbs.Any.CodeFetch, inner);
msg.CodeFetch.startCodeFetch(builder);
msg.CodeFetch.addModuleSpecifier(builder, moduleSpecifier_);
msg.CodeFetch.addContainingFile(builder, containingFile_);
const inner = msg.CodeFetch.endCodeFetch(builder);
const baseRes = sendSync(builder, msg.Any.CodeFetch, inner);
assert(baseRes != null);
assert(
fbs.Any.CodeFetchRes === baseRes!.innerType(),
msg.Any.CodeFetchRes === baseRes!.innerType(),
`base.innerType() unexpectedly is ${baseRes!.innerType()}`
);
const codeFetchRes = new fbs.CodeFetchRes();
const codeFetchRes = new msg.CodeFetchRes();
assert(baseRes!.inner(codeFetchRes) != null);
return {
moduleName: codeFetchRes.moduleName(),
@ -54,16 +54,16 @@ export function codeCache(
const filename_ = builder.createString(filename);
const sourceCode_ = builder.createString(sourceCode);
const outputCode_ = builder.createString(outputCode);
fbs.CodeCache.startCodeCache(builder);
fbs.CodeCache.addFilename(builder, filename_);
fbs.CodeCache.addSourceCode(builder, sourceCode_);
fbs.CodeCache.addOutputCode(builder, outputCode_);
const inner = fbs.CodeCache.endCodeCache(builder);
const baseRes = sendSync(builder, fbs.Any.CodeCache, inner);
msg.CodeCache.startCodeCache(builder);
msg.CodeCache.addFilename(builder, filename_);
msg.CodeCache.addSourceCode(builder, sourceCode_);
msg.CodeCache.addOutputCode(builder, outputCode_);
const inner = msg.CodeCache.endCodeCache(builder);
const baseRes = sendSync(builder, msg.Any.CodeCache, inner);
assert(baseRes == null); // Expect null or error.
}
function createEnv(_inner: fbs.EnvironRes): { [index: string]: string } {
function createEnv(_inner: msg.EnvironRes): { [index: string]: string } {
const env: { [index: string]: string } = {};
for (let i = 0; i < _inner.mapLength(); i++) {
@ -84,11 +84,11 @@ function setEnv(key: string, value: string): void {
const builder = new flatbuffers.Builder();
const _key = builder.createString(key);
const _value = builder.createString(value);
fbs.SetEnv.startSetEnv(builder);
fbs.SetEnv.addKey(builder, _key);
fbs.SetEnv.addValue(builder, _value);
const inner = fbs.SetEnv.endSetEnv(builder);
sendSync(builder, fbs.Any.SetEnv, inner);
msg.SetEnv.startSetEnv(builder);
msg.SetEnv.addKey(builder, _key);
msg.SetEnv.addValue(builder, _value);
const inner = msg.SetEnv.endSetEnv(builder);
sendSync(builder, msg.Any.SetEnv, inner);
}
/**
@ -107,15 +107,15 @@ function setEnv(key: string, value: string): void {
export function env(): { [index: string]: string } {
/* Ideally we could write
const res = sendSync({
command: fbs.Command.ENV,
command: msg.Command.ENV,
});
*/
const builder = new flatbuffers.Builder();
fbs.Environ.startEnviron(builder);
const inner = fbs.Environ.endEnviron(builder);
const baseRes = sendSync(builder, fbs.Any.Environ, inner)!;
assert(fbs.Any.EnvironRes === baseRes.innerType());
const res = new fbs.EnvironRes();
msg.Environ.startEnviron(builder);
const inner = msg.Environ.endEnviron(builder);
const baseRes = sendSync(builder, msg.Any.Environ, inner)!;
assert(msg.Any.EnvironRes === baseRes.innerType());
const res = new msg.EnvironRes();
assert(baseRes.inner(res) != null);
// TypeScript cannot track assertion above, therefore not null assertion
return createEnv(res);