summaryrefslogtreecommitdiff
path: root/js/main.ts
diff options
context:
space:
mode:
authorRyan Dahl <ry@tinyclouds.org>2019-08-24 13:20:48 -0700
committerGitHub <noreply@github.com>2019-08-24 13:20:48 -0700
commit2235dd795d3cc6c24ff1bdd1bbdcd110b4b0bdfc (patch)
treea5811adc062cbb1c66f05c863c9be245cf4fd2d2 /js/main.ts
parentbdc0a13261deaa3748f51d9948b4e7b92864c324 (diff)
Revert json ops (#2814)
* Revert "port more ops to JSON (#2809)" This reverts commit 137f33733d365026903d40e7cde6e34ac6c36dcf. * Revert "port ops to JSON: compiler, errors, fetch, files (#2804)" This reverts commit 79f82cf10ed1dbf91346994250d7311a4d74377a. * Revert "Port rest of os ops to JSON (#2802)" This reverts commit 5b2baa5c990fbeae747e952c5dcd7a5369e950b1.
Diffstat (limited to 'js/main.ts')
-rw-r--r--js/main.ts24
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();
}
}