1 files changed, 13 insertions, 11 deletions
diff --git a/js/main.ts b/js/main.ts
index 25e27b69f..769f522a6 100644
--- a/js/main.ts
+++ b/js/main.ts
@@ -22,12 +22,12 @@ export default function denoMain(
   preserveDenoNamespace: boolean = true,
   name?: string
 ): void {
-  const s = os.start(preserveDenoNamespace, name);
+  const startResMsg = os.start(preserveDenoNamespace, name);
 
-  setVersions(s.denoVersion, s.v8Version);
+  setVersions(startResMsg.denoVersion()!, startResMsg.v8Version()!);
 
   // handle `--version`
-  if (s.versionFlag) {
+  if (startResMsg.versionFlag()) {
     console.log("deno:", deno.version.deno);
     console.log("v8:", deno.version.v8);
     console.log("typescript:", deno.version.typescript);
@@ -36,22 +36,24 @@ export default function denoMain(
 
   setPrepareStackTrace(Error);
 
-  if (s.mainModule) {
-    assert(s.mainModule.length > 0);
-    setLocation(s.mainModule);
+  const mainModule = startResMsg.mainModule();
+  if (mainModule) {
+    assert(mainModule.length > 0);
+    setLocation(mainModule);
   }
 
-  log("cwd", s.cwd);
+  const cwd = startResMsg.cwd();
+  log("cwd", cwd);
 
-  for (let i = 1; i < s.argv.length; i++) {
-    args.push(s.argv[i]);
+  for (let i = 1; i < startResMsg.argvLength(); i++) {
+    args.push(startResMsg.argv(i));
   }
   log("args", args);
   Object.freeze(args);
 
   if (window["_xevalWrapper"] !== undefined) {
-    xevalMain(window["_xevalWrapper"] as XevalFunc, s.xevalDelim);
-  } else if (!s.mainModule) {
+    xevalMain(window["_xevalWrapper"] as XevalFunc, startResMsg.xevalDelim());
+  } else if (!mainModule) {
     replLoop();
   }
 }