mirror of
https://github.com/denoland/deno.git
synced 2025-03-03 17:34:47 -05:00
feat: window.close() (#4474)
This commit is contained in:
parent
3938071e91
commit
5d7bcf86fd
6 changed files with 65 additions and 1 deletions
|
@ -179,6 +179,14 @@ export function readOnly(value: unknown): PropertyDescriptor {
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
||||||
|
export function getterOnly(getter: () => any): PropertyDescriptor {
|
||||||
|
return {
|
||||||
|
get: getter,
|
||||||
|
enumerable: true
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
// https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope
|
// https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope
|
||||||
export const windowOrWorkerGlobalScopeMethods = {
|
export const windowOrWorkerGlobalScopeMethods = {
|
||||||
atob: writable(textEncoding.atob),
|
atob: writable(textEncoding.atob),
|
||||||
|
|
2
cli/js/lib.deno.window.d.ts
vendored
2
cli/js/lib.deno.window.d.ts
vendored
|
@ -13,6 +13,8 @@ declare interface Window extends WindowOrWorkerGlobalScope {
|
||||||
onload: Function | undefined;
|
onload: Function | undefined;
|
||||||
onunload: Function | undefined;
|
onunload: Function | undefined;
|
||||||
crypto: Crypto;
|
crypto: Crypto;
|
||||||
|
close: () => void;
|
||||||
|
closed: boolean;
|
||||||
Deno: typeof Deno;
|
Deno: typeof Deno;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -10,8 +10,10 @@
|
||||||
import * as Deno from "./deno.ts";
|
import * as Deno from "./deno.ts";
|
||||||
import * as domTypes from "./web/dom_types.ts";
|
import * as domTypes from "./web/dom_types.ts";
|
||||||
import * as csprng from "./ops/get_random_values.ts";
|
import * as csprng from "./ops/get_random_values.ts";
|
||||||
|
import { exit } from "./ops/os.ts";
|
||||||
import {
|
import {
|
||||||
readOnly,
|
readOnly,
|
||||||
|
getterOnly,
|
||||||
writable,
|
writable,
|
||||||
windowOrWorkerGlobalScopeMethods,
|
windowOrWorkerGlobalScopeMethods,
|
||||||
windowOrWorkerGlobalScopeProperties,
|
windowOrWorkerGlobalScopeProperties,
|
||||||
|
@ -21,6 +23,7 @@ import { internalObject } from "./internals.ts";
|
||||||
import { setSignals } from "./signals.ts";
|
import { setSignals } from "./signals.ts";
|
||||||
import { replLoop } from "./repl.ts";
|
import { replLoop } from "./repl.ts";
|
||||||
import { LocationImpl } from "./web/location.ts";
|
import { LocationImpl } from "./web/location.ts";
|
||||||
|
import { setTimeout } from "./web/timers.ts";
|
||||||
import * as runtime from "./runtime.ts";
|
import * as runtime from "./runtime.ts";
|
||||||
import { symbols } from "./symbols.ts";
|
import { symbols } from "./symbols.ts";
|
||||||
import { log, immutableDefine } from "./util.ts";
|
import { log, immutableDefine } from "./util.ts";
|
||||||
|
@ -31,6 +34,26 @@ import { log, immutableDefine } from "./util.ts";
|
||||||
// @ts-ignore
|
// @ts-ignore
|
||||||
Deno[symbols.internal] = internalObject;
|
Deno[symbols.internal] = internalObject;
|
||||||
|
|
||||||
|
let windowIsClosing = false;
|
||||||
|
|
||||||
|
function windowClose(): void {
|
||||||
|
if (!windowIsClosing) {
|
||||||
|
windowIsClosing = true;
|
||||||
|
// Push a macrotask to exit after a promise resolve.
|
||||||
|
// This is not perfect, but should be fine for first pass.
|
||||||
|
Promise.resolve().then(() =>
|
||||||
|
setTimeout.call(
|
||||||
|
null,
|
||||||
|
() => {
|
||||||
|
// This should be fine, since only Window/MainWorker has .close()
|
||||||
|
exit(0);
|
||||||
|
},
|
||||||
|
0
|
||||||
|
)
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
export const mainRuntimeGlobalProperties = {
|
export const mainRuntimeGlobalProperties = {
|
||||||
window: readOnly(globalThis),
|
window: readOnly(globalThis),
|
||||||
self: readOnly(globalThis),
|
self: readOnly(globalThis),
|
||||||
|
@ -38,7 +61,9 @@ export const mainRuntimeGlobalProperties = {
|
||||||
// TODO(bartlomieju): from MDN docs (https://developer.mozilla.org/en-US/docs/Web/API/WorkerGlobalScope)
|
// TODO(bartlomieju): from MDN docs (https://developer.mozilla.org/en-US/docs/Web/API/WorkerGlobalScope)
|
||||||
// it seems those two properties should be availble to workers as well
|
// it seems those two properties should be availble to workers as well
|
||||||
onload: writable(undefined),
|
onload: writable(undefined),
|
||||||
onunload: writable(undefined)
|
onunload: writable(undefined),
|
||||||
|
close: writable(windowClose),
|
||||||
|
closed: getterOnly(() => windowIsClosing)
|
||||||
};
|
};
|
||||||
|
|
||||||
let hasBootstrapped = false;
|
let hasBootstrapped = false;
|
||||||
|
|
18
cli/tests/058_tasks_microtasks_close.ts
Normal file
18
cli/tests/058_tasks_microtasks_close.ts
Normal file
|
@ -0,0 +1,18 @@
|
||||||
|
console.log("sync 1");
|
||||||
|
setTimeout(() => {
|
||||||
|
console.log("setTimeout 1");
|
||||||
|
Promise.resolve().then(() => {
|
||||||
|
console.log("Promise resolve in setTimeout 1");
|
||||||
|
});
|
||||||
|
});
|
||||||
|
Promise.resolve().then(() => {
|
||||||
|
console.log("promise 1");
|
||||||
|
});
|
||||||
|
window.close();
|
||||||
|
console.log("sync 2");
|
||||||
|
setTimeout(() => {
|
||||||
|
console.log("setTimeout 2");
|
||||||
|
});
|
||||||
|
setTimeout(() => {
|
||||||
|
console.log("setTimeout 3");
|
||||||
|
}, 100);
|
6
cli/tests/058_tasks_microtasks_close.ts.out
Normal file
6
cli/tests/058_tasks_microtasks_close.ts.out
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
sync 1
|
||||||
|
sync 2
|
||||||
|
promise 1
|
||||||
|
setTimeout 1
|
||||||
|
Promise resolve in setTimeout 1
|
||||||
|
setTimeout 2
|
|
@ -1078,6 +1078,11 @@ itest!(_057_revoke_permissions {
|
||||||
output: "057_revoke_permissions.out",
|
output: "057_revoke_permissions.out",
|
||||||
});
|
});
|
||||||
|
|
||||||
|
itest!(_058_tasks_microtasks_close {
|
||||||
|
args: "run 058_tasks_microtasks_close.ts",
|
||||||
|
output: "058_tasks_microtasks_close.ts.out",
|
||||||
|
});
|
||||||
|
|
||||||
itest!(js_import_detect {
|
itest!(js_import_detect {
|
||||||
args: "run --reload js_import_detect.ts",
|
args: "run --reload js_import_detect.ts",
|
||||||
output: "js_import_detect.ts.out",
|
output: "js_import_detect.ts.out",
|
||||||
|
|
Loading…
Add table
Reference in a new issue