Rename flatbuffer base.msg to base.inner

This better disambiguates with the msg_generated.ts module, which in JS
we call "fbs", but would be better called "msg".

19 files changed, 103 insertions, 103 deletions

diff --git a/js/copy_file.ts b/js/copy_file.ts
index ff08cc00b..46d1ec18e 100644
--- a/js/copy_file.ts
+++ b/js/copy_file.ts
@@ -41,6 +41,6 @@ function req(
   fbs.CopyFile.startCopyFile(builder);
   fbs.CopyFile.addFrom(builder, from_);
   fbs.CopyFile.addTo(builder, to_);
-  const msg = fbs.CopyFile.endCopyFile(builder);
-  return [builder, fbs.Any.CopyFile, msg];
+  const inner = fbs.CopyFile.endCopyFile(builder);
+  return [builder, fbs.Any.CopyFile, inner];
 }
diff --git a/js/dispatch.ts b/js/dispatch.ts
index 56d280ff9..3f5d1453a 100644
--- a/js/dispatch.ts
+++ b/js/dispatch.ts
@@ -39,12 +39,12 @@ export function handleAsyncMsgFromRust(ui8: Uint8Array) {
 // @internal
 export function sendAsync(
   builder: flatbuffers.Builder,
-  msgType: fbs.Any,
-  msg: flatbuffers.Offset,
+  innerType: fbs.Any,
+  inner: flatbuffers.Offset,
   data?: ArrayBufferView
 ): Promise<fbs.Base> {
-  maybePushTrace(msgType, false); // add to trace if tracing
-  const [cmdId, resBuf] = sendInternal(builder, msgType, msg, data, false);
+  maybePushTrace(innerType, false); // add to trace if tracing
+  const [cmdId, resBuf] = sendInternal(builder, innerType, inner, data, false);
   util.assert(resBuf == null);
   const promise = util.createResolvable<fbs.Base>();
   promiseTable.set(cmdId, promise);
@@ -54,12 +54,12 @@ export function sendAsync(
 // @internal
 export function sendSync(
   builder: flatbuffers.Builder,
-  msgType: fbs.Any,
-  msg: flatbuffers.Offset,
+  innerType: fbs.Any,
+  inner: flatbuffers.Offset,
   data?: ArrayBufferView
 ): null | fbs.Base {
-  maybePushTrace(msgType, true); // add to trace if tracing
-  const [cmdId, resBuf] = sendInternal(builder, msgType, msg, data, true);
+  maybePushTrace(innerType, true); // add to trace if tracing
+  const [cmdId, resBuf] = sendInternal(builder, innerType, inner, data, true);
   util.assert(cmdId >= 0);
   if (resBuf == null) {
     return null;
@@ -74,15 +74,15 @@ export function sendSync(
 
 function sendInternal(
   builder: flatbuffers.Builder,
-  msgType: fbs.Any,
-  msg: flatbuffers.Offset,
+  innerType: fbs.Any,
+  inner: flatbuffers.Offset,
   data: undefined | ArrayBufferView,
   sync = true
 ): [number, null | Uint8Array] {
   const cmdId = nextCmdId++;
   fbs.Base.startBase(builder);
-  fbs.Base.addMsg(builder, msg);
-  fbs.Base.addMsgType(builder, msgType);
+  fbs.Base.addInner(builder, inner);
+  fbs.Base.addInnerType(builder, innerType);
   fbs.Base.addSync(builder, sync);
   fbs.Base.addCmdId(builder, cmdId);
   builder.finish(fbs.Base.endBase(builder));
diff --git a/js/fetch.ts b/js/fetch.ts
index 9cf117ed8..138454156 100644
--- a/js/fetch.ts
+++ b/js/fetch.ts
@@ -205,20 +205,20 @@ export async function fetch(
   );
 
   // Decode FetchRes
-  assert(fbs.Any.FetchRes === resBase.msgType());
-  const msg = new fbs.FetchRes();
-  assert(resBase.msg(msg) != null);
+  assert(fbs.Any.FetchRes === resBase.innerType());
+  const inner = new fbs.FetchRes();
+  assert(resBase.inner(inner) != null);
 
-  const status = msg.status();
-  const bodyArray = msg.bodyArray();
+  const status = inner.status();
+  const bodyArray = inner.bodyArray();
   assert(bodyArray != null);
   const body = typedArrayToArrayBuffer(bodyArray!);
 
   const headersList: Array<[string, string]> = [];
-  const len = msg.headerKeyLength();
+  const len = inner.headerKeyLength();
   for (let i = 0; i < len; ++i) {
-    const key = msg.headerKey(i);
-    const value = msg.headerValue(i);
+    const key = inner.headerKey(i);
+    const value = inner.headerValue(i);
     headersList.push([key, value]);
   }
 
diff --git a/js/fileinfo.ts b/js/fileinfo.ts
index 44668974e..102bafb91 100644
--- a/js/fileinfo.ts
+++ b/js/fileinfo.ts
@@ -73,18 +73,18 @@ export class FileInfoImpl implements FileInfo {
   path: string | null;
 
   /* @internal */
-  constructor(private _msg: fbs.StatRes) {
-    const modified = this._msg.modified().toFloat64();
-    const accessed = this._msg.accessed().toFloat64();
-    const created = this._msg.created().toFloat64();
-    const hasMode = this._msg.hasMode();
-    const mode = this._msg.mode(); // negative for invalid mode (Windows)
-    const name = this._msg.name();
-    const path = this._msg.path();
+  constructor(private _inner: fbs.StatRes) {
+    const modified = this._inner.modified().toFloat64();
+    const accessed = this._inner.accessed().toFloat64();
+    const created = this._inner.created().toFloat64();
+    const hasMode = this._inner.hasMode();
+    const mode = this._inner.mode(); // negative for invalid mode (Windows)
+    const name = this._inner.name();
+    const path = this._inner.path();
 
-    this._isFile = this._msg.isFile();
-    this._isSymlink = this._msg.isSymlink();
-    this.len = this._msg.len().toFloat64();
+    this._isFile = this._inner.isFile();
+    this._isSymlink = this._inner.isSymlink();
+    this.len = this._inner.len().toFloat64();
     this.modified = modified ? modified : null;
     this.accessed = accessed ? accessed : null;
     this.created = created ? created : null;
diff --git a/js/files.ts b/js/files.ts
index 16d3f11ab..e0c9a10ce 100644
--- a/js/files.ts
+++ b/js/files.ts
@@ -41,12 +41,12 @@ export async function open(
   const filename_ = builder.createString(filename);
   fbs.Open.startOpen(builder);
   fbs.Open.addFilename(builder, filename_);
-  const msg = fbs.Open.endOpen(builder);
-  const baseRes = await dispatch.sendAsync(builder, fbs.Any.Open, msg);
+  const inner = fbs.Open.endOpen(builder);
+  const baseRes = await dispatch.sendAsync(builder, fbs.Any.Open, inner);
   assert(baseRes != null);
-  assert(fbs.Any.OpenRes === baseRes!.msgType());
+  assert(fbs.Any.OpenRes === baseRes!.innerType());
   const res = new fbs.OpenRes();
-  assert(baseRes!.msg(res) != null);
+  assert(baseRes!.inner(res) != null);
   const fd = res.rid();
   return new File(fd);
 }
@@ -58,12 +58,12 @@ export async function read(
   const builder = new flatbuffers.Builder();
   fbs.Read.startRead(builder);
   fbs.Read.addRid(builder, fd);
-  const msg = fbs.Read.endRead(builder);
-  const baseRes = await dispatch.sendAsync(builder, fbs.Any.Read, msg, p);
+  const inner = fbs.Read.endRead(builder);
+  const baseRes = await dispatch.sendAsync(builder, fbs.Any.Read, inner, p);
   assert(baseRes != null);
-  assert(fbs.Any.ReadRes === baseRes!.msgType());
+  assert(fbs.Any.ReadRes === baseRes!.innerType());
   const res = new fbs.ReadRes();
-  assert(baseRes!.msg(res) != null);
+  assert(baseRes!.inner(res) != null);
   return { nread: res.nread(), eof: res.eof() };
 }
 
@@ -71,12 +71,12 @@ export async function write(fd: number, p: ArrayBufferView): Promise<number> {
   const builder = new flatbuffers.Builder();
   fbs.Write.startWrite(builder);
   fbs.Write.addRid(builder, fd);
-  const msg = fbs.Write.endWrite(builder);
-  const baseRes = await dispatch.sendAsync(builder, fbs.Any.Write, msg, p);
+  const inner = fbs.Write.endWrite(builder);
+  const baseRes = await dispatch.sendAsync(builder, fbs.Any.Write, inner, p);
   assert(baseRes != null);
-  assert(fbs.Any.WriteRes === baseRes!.msgType());
+  assert(fbs.Any.WriteRes === baseRes!.innerType());
   const res = new fbs.WriteRes();
-  assert(baseRes!.msg(res) != null);
+  assert(baseRes!.inner(res) != null);
   return res.nbyte();
 }
 
@@ -84,6 +84,6 @@ export function close(fd: number): void {
   const builder = new flatbuffers.Builder();
   fbs.Close.startClose(builder);
   fbs.Close.addRid(builder, fd);
-  const msg = fbs.Close.endClose(builder);
-  dispatch.sendSync(builder, fbs.Any.Close, msg);
+  const inner = fbs.Close.endClose(builder);
+  dispatch.sendSync(builder, fbs.Any.Close, inner);
 }
diff --git a/js/main.ts b/js/main.ts
index 63d72e87f..19e82c9d7 100644
--- a/js/main.ts
+++ b/js/main.ts
@@ -14,9 +14,9 @@ function sendStart(): fbs.StartRes {
   const startOffset = fbs.Start.endStart(builder);
   const baseRes = sendSync(builder, fbs.Any.Start, startOffset);
   assert(baseRes != null);
-  assert(fbs.Any.StartRes === baseRes!.msgType());
+  assert(fbs.Any.StartRes === baseRes!.innerType());
   const startRes = new fbs.StartRes();
-  assert(baseRes!.msg(startRes) != null);
+  assert(baseRes!.inner(startRes) != null);
   return startRes;
 }
 
diff --git a/js/make_temp_dir.ts b/js/make_temp_dir.ts
index b252be381..46a4e7c26 100644
--- a/js/make_temp_dir.ts
+++ b/js/make_temp_dir.ts
@@ -59,15 +59,15 @@ function req({
   if (suffix != null) {
     fbs.MakeTempDir.addSuffix(builder, fbSuffix);
   }
-  const msg = fbs.MakeTempDir.endMakeTempDir(builder);
-  return [builder, fbs.Any.MakeTempDir, msg];
+  const inner = fbs.MakeTempDir.endMakeTempDir(builder);
+  return [builder, fbs.Any.MakeTempDir, inner];
 }
 
 function res(baseRes: null | fbs.Base): string {
   assert(baseRes != null);
-  assert(fbs.Any.MakeTempDirRes === baseRes!.msgType());
+  assert(fbs.Any.MakeTempDirRes === baseRes!.innerType());
   const res = new fbs.MakeTempDirRes();
-  assert(baseRes!.msg(res) != null);
+  assert(baseRes!.inner(res) != null);
   const path = res.path();
   assert(path != null);
   return path!;
diff --git a/js/mkdir.ts b/js/mkdir.ts
index 8e76fc17e..1cab71d62 100644
--- a/js/mkdir.ts
+++ b/js/mkdir.ts
@@ -32,6 +32,6 @@ function req(
   fbs.Mkdir.startMkdir(builder);
   fbs.Mkdir.addPath(builder, path_);
   fbs.Mkdir.addMode(builder, mode);
-  const msg = fbs.Mkdir.endMkdir(builder);
-  return [builder, fbs.Any.Mkdir, msg];
+  const inner = fbs.Mkdir.endMkdir(builder);
+  return [builder, fbs.Any.Mkdir, inner];
 }
diff --git a/js/os.ts b/js/os.ts
index 020d834c6..4f34c38ed 100644
--- a/js/os.ts
+++ b/js/os.ts
@@ -10,8 +10,8 @@ export function exit(exitCode = 0): never {
   const builder = new flatbuffers.Builder();
   fbs.Exit.startExit(builder);
   fbs.Exit.addCode(builder, exitCode);
-  const msg = fbs.Exit.endExit(builder);
-  sendSync(builder, fbs.Any.Exit, msg);
+  const inner = fbs.Exit.endExit(builder);
+  sendSync(builder, fbs.Any.Exit, inner);
   return util.unreachable();
 }
 
@@ -27,15 +27,15 @@ export function codeFetch(
   fbs.CodeFetch.startCodeFetch(builder);
   fbs.CodeFetch.addModuleSpecifier(builder, moduleSpecifier_);
   fbs.CodeFetch.addContainingFile(builder, containingFile_);
-  const msg = fbs.CodeFetch.endCodeFetch(builder);
-  const baseRes = sendSync(builder, fbs.Any.CodeFetch, msg);
+  const inner = fbs.CodeFetch.endCodeFetch(builder);
+  const baseRes = sendSync(builder, fbs.Any.CodeFetch, inner);
   assert(baseRes != null);
   assert(
-    fbs.Any.CodeFetchRes === baseRes!.msgType(),
-    `base.msgType() unexpectedly is ${baseRes!.msgType()}`
+    fbs.Any.CodeFetchRes === baseRes!.innerType(),
+    `base.innerType() unexpectedly is ${baseRes!.innerType()}`
   );
   const codeFetchRes = new fbs.CodeFetchRes();
-  assert(baseRes!.msg(codeFetchRes) != null);
+  assert(baseRes!.inner(codeFetchRes) != null);
   return {
     moduleName: codeFetchRes.moduleName(),
     filename: codeFetchRes.filename(),
@@ -58,16 +58,16 @@ export function codeCache(
   fbs.CodeCache.addFilename(builder, filename_);
   fbs.CodeCache.addSourceCode(builder, sourceCode_);
   fbs.CodeCache.addOutputCode(builder, outputCode_);
-  const msg = fbs.CodeCache.endCodeCache(builder);
-  const baseRes = sendSync(builder, fbs.Any.CodeCache, msg);
+  const inner = fbs.CodeCache.endCodeCache(builder);
+  const baseRes = sendSync(builder, fbs.Any.CodeCache, inner);
   assert(baseRes == null); // Expect null or error.
 }
 
-function createEnv(_msg: fbs.EnvironRes): { [index: string]: string } {
+function createEnv(_inner: fbs.EnvironRes): { [index: string]: string } {
   const env: { [index: string]: string } = {};
 
-  for (let i = 0; i < _msg.mapLength(); i++) {
-    const item = _msg.map(i)!;
+  for (let i = 0; i < _inner.mapLength(); i++) {
+    const item = _inner.map(i)!;
 
     env[item.key()!] = item.value()!;
   }
@@ -87,8 +87,8 @@ function setEnv(key: string, value: string): void {
   fbs.SetEnv.startSetEnv(builder);
   fbs.SetEnv.addKey(builder, _key);
   fbs.SetEnv.addValue(builder, _value);
-  const msg = fbs.SetEnv.endSetEnv(builder);
-  sendSync(builder, fbs.Any.SetEnv, msg);
+  const inner = fbs.SetEnv.endSetEnv(builder);
+  sendSync(builder, fbs.Any.SetEnv, inner);
 }
 
 /**
@@ -112,11 +112,11 @@ export function env(): { [index: string]: string } {
   */
   const builder = new flatbuffers.Builder();
   fbs.Environ.startEnviron(builder);
-  const msg = fbs.Environ.endEnviron(builder);
-  const baseRes = sendSync(builder, fbs.Any.Environ, msg)!;
-  assert(fbs.Any.EnvironRes === baseRes.msgType());
+  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();
-  assert(baseRes.msg(res) != null);
+  assert(baseRes.inner(res) != null);
   // TypeScript cannot track assertion above, therefore not null assertion
   return createEnv(res);
 }
diff --git a/js/read_dir.ts b/js/read_dir.ts
index 822177aa8..591db7ee5 100644
--- a/js/read_dir.ts
+++ b/js/read_dir.ts
@@ -32,15 +32,15 @@ function req(path: string): [flatbuffers.Builder, fbs.Any, flatbuffers.Offset] {
   const path_ = builder.createString(path);
   fbs.ReadDir.startReadDir(builder);
   fbs.ReadDir.addPath(builder, path_);
-  const msg = fbs.ReadDir.endReadDir(builder);
-  return [builder, fbs.Any.ReadDir, msg];
+  const inner = fbs.ReadDir.endReadDir(builder);
+  return [builder, fbs.Any.ReadDir, inner];
 }
 
 function res(baseRes: null | fbs.Base): FileInfo[] {
   assert(baseRes != null);
-  assert(fbs.Any.ReadDirRes === baseRes!.msgType());
+  assert(fbs.Any.ReadDirRes === baseRes!.innerType());
   const res = new fbs.ReadDirRes();
-  assert(baseRes!.msg(res) != null);
+  assert(baseRes!.inner(res) != null);
   const fileInfos: FileInfo[] = [];
   for (let i = 0; i < res.entriesLength(); i++) {
     fileInfos.push(new FileInfoImpl(res.entries(i)!));
diff --git a/js/read_file.ts b/js/read_file.ts
index 2afea42f1..e27102a05 100644
--- a/js/read_file.ts
+++ b/js/read_file.ts
@@ -35,16 +35,16 @@ function req(
   const filename_ = builder.createString(filename);
   fbs.ReadFile.startReadFile(builder);
   fbs.ReadFile.addFilename(builder, filename_);
-  const msg = fbs.ReadFile.endReadFile(builder);
-  return [builder, fbs.Any.ReadFile, msg];
+  const inner = fbs.ReadFile.endReadFile(builder);
+  return [builder, fbs.Any.ReadFile, inner];
 }
 
 function res(baseRes: null | fbs.Base): Uint8Array {
   assert(baseRes != null);
-  assert(fbs.Any.ReadFileRes === baseRes!.msgType());
-  const msg = new fbs.ReadFileRes();
-  assert(baseRes!.msg(msg) != null);
-  const dataArray = msg.dataArray();
+  assert(fbs.Any.ReadFileRes === baseRes!.innerType());
+  const inner = new fbs.ReadFileRes();
+  assert(baseRes!.inner(inner) != null);
+  const dataArray = inner.dataArray();
   assert(dataArray != null);
   return new Uint8Array(dataArray!);
 }
diff --git a/js/read_link.ts b/js/read_link.ts
index 38db09d62..283f98dfe 100644
--- a/js/read_link.ts
+++ b/js/read_link.ts
@@ -29,15 +29,15 @@ function req(name: string): [flatbuffers.Builder, fbs.Any, flatbuffers.Offset] {
   const name_ = builder.createString(name);
   fbs.Readlink.startReadlink(builder);
   fbs.Readlink.addName(builder, name_);
-  const msg = fbs.Readlink.endReadlink(builder);
-  return [builder, fbs.Any.Readlink, msg];
+  const inner = fbs.Readlink.endReadlink(builder);
+  return [builder, fbs.Any.Readlink, inner];
 }
 
 function res(baseRes: null | fbs.Base): string {
   assert(baseRes !== null);
-  assert(fbs.Any.ReadlinkRes === baseRes!.msgType());
+  assert(fbs.Any.ReadlinkRes === baseRes!.innerType());
   const res = new fbs.ReadlinkRes();
-  assert(baseRes!.msg(res) !== null);
+  assert(baseRes!.inner(res) !== null);
   const path = res.path();
   assert(path !== null);
   return path!;
diff --git a/js/remove.ts b/js/remove.ts
index 921110789..75e752c44 100644
--- a/js/remove.ts
+++ b/js/remove.ts
@@ -58,6 +58,6 @@ function req(
   fbs.Remove.startRemove(builder);
   fbs.Remove.addPath(builder, path_);
   fbs.Remove.addRecursive(builder, recursive);
-  const msg = fbs.Remove.endRemove(builder);
-  return [builder, fbs.Any.Remove, msg];
+  const inner = fbs.Remove.endRemove(builder);
+  return [builder, fbs.Any.Remove, inner];
 }
diff --git a/js/rename.ts b/js/rename.ts
index 5917912f5..11e595c99 100644
--- a/js/rename.ts
+++ b/js/rename.ts
@@ -37,6 +37,6 @@ function req(
   fbs.Rename.startRename(builder);
   fbs.Rename.addOldpath(builder, oldpath_);
   fbs.Rename.addNewpath(builder, newpath_);
-  const msg = fbs.Rename.endRename(builder);
-  return [builder, fbs.Any.Rename, msg];
+  const inner = fbs.Rename.endRename(builder);
+  return [builder, fbs.Any.Rename, inner];
 }
diff --git a/js/stat.ts b/js/stat.ts
index 284679f84..db1af6974 100644
--- a/js/stat.ts
+++ b/js/stat.ts
@@ -64,14 +64,14 @@ function req(
   fbs.Stat.startStat(builder);
   fbs.Stat.addFilename(builder, filename_);
   fbs.Stat.addLstat(builder, lstat);
-  const msg = fbs.Stat.endStat(builder);
-  return [builder, fbs.Any.Stat, msg];
+  const inner = fbs.Stat.endStat(builder);
+  return [builder, fbs.Any.Stat, inner];
 }
 
 function res(baseRes: null | fbs.Base): FileInfo {
   assert(baseRes != null);
-  assert(fbs.Any.StatRes === baseRes!.msgType());
+  assert(fbs.Any.StatRes === baseRes!.innerType());
   const res = new fbs.StatRes();
-  assert(baseRes!.msg(res) != null);
+  assert(baseRes!.inner(res) != null);
   return new FileInfoImpl(res);
 }
diff --git a/js/symlink.ts b/js/symlink.ts
index 225dae5f0..e0f1490f6 100644
--- a/js/symlink.ts
+++ b/js/symlink.ts
@@ -51,6 +51,6 @@ function req(
   fbs.Symlink.startSymlink(builder);
   fbs.Symlink.addOldname(builder, oldname_);
   fbs.Symlink.addNewname(builder, newname_);
-  const msg = fbs.Symlink.endSymlink(builder);
-  return [builder, fbs.Any.Symlink, msg];
+  const inner = fbs.Symlink.endSymlink(builder);
+  return [builder, fbs.Any.Symlink, inner];
 }
diff --git a/js/timers.ts b/js/timers.ts
index 79aefb645..6c0b9814c 100644
--- a/js/timers.ts
+++ b/js/timers.ts
@@ -54,8 +54,8 @@ function setGlobalTimeout(due: number | null, now: number) {
   const builder = new flatbuffers.Builder();
   fbs.SetTimeout.startSetTimeout(builder);
   fbs.SetTimeout.addTimeout(builder, timeout);
-  const msg = fbs.SetTimeout.endSetTimeout(builder);
-  const res = sendSync(builder, fbs.Any.SetTimeout, msg);
+  const inner = fbs.SetTimeout.endSetTimeout(builder);
+  const res = sendSync(builder, fbs.Any.SetTimeout, inner);
   assert(res == null);
   // Remember when when the global timer will fire.
   globalTimeoutDue = due;
diff --git a/js/truncate.ts b/js/truncate.ts
index 05bee7168..c5cfbbf74 100644
--- a/js/truncate.ts
+++ b/js/truncate.ts
@@ -37,6 +37,6 @@ function req(
   fbs.Truncate.startTruncate(builder);
   fbs.Truncate.addName(builder, name_);
   fbs.Truncate.addLen(builder, len);
-  const msg = fbs.Truncate.endTruncate(builder);
-  return [builder, fbs.Any.Truncate, msg];
+  const inner = fbs.Truncate.endTruncate(builder);
+  return [builder, fbs.Any.Truncate, inner];
 }
diff --git a/js/write_file.ts b/js/write_file.ts
index f9810cb35..2c39babeb 100644
--- a/js/write_file.ts
+++ b/js/write_file.ts
@@ -47,6 +47,6 @@ function req(
   fbs.WriteFile.startWriteFile(builder);
   fbs.WriteFile.addFilename(builder, filename_);
   fbs.WriteFile.addPerm(builder, perm);
-  const msg = fbs.WriteFile.endWriteFile(builder);
-  return [builder, fbs.Any.WriteFile, msg, data];
+  const inner = fbs.WriteFile.endWriteFile(builder);
+  return [builder, fbs.Any.WriteFile, inner, data];
 }