foster/denoland-deno
1
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2024-12-31 03:29:10 -05:00
Code Issues Packages 1 Wiki Activity

feat(cli): Add Deno.env.delete() (#5859)

Browse source
This commit is contained in:
Tuan Le 2020-06-09 08:58:30 -04:00 committed by GitHub
parent 44251ce8ea
commit 878f306a39
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 39 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
cli/js/lib.deno.ns.d.ts vendored
View file

@ -130,6 +130,16 @@ declare namespace Deno {
* Requires `allow-env` permission. */
set(key: string, value: string): void;
/** Delete the value of an environment variable.
*
* ```ts
* Deno.env.set("SOME_VAR", "Value"));
* Deno.env.delete("SOME_VAR"); // outputs "Undefined"
* ```
*
* Requires `allow-env` permission. */
delete(key: string): void;
/** Returns a snapshot of the environment variables at invocation.
*
* ```ts

5
cli/js/ops/os.ts
View file

@ -27,12 +27,17 @@ function getEnv(key: string): string | undefined {
return sendSync("op_get_env", { key })[0];
}
function deleteEnv(key: string): void {
sendSync("op_delete_env", { key });
}
export const env = {
get: getEnv,
toObject(): { [key: string]: string } {
return sendSync("op_env");
},
set: setEnv,
delete: deleteEnv,
};
type DirKind =

17
cli/ops/os.rs
View file

@ -15,6 +15,7 @@ pub fn init(i: &mut CoreIsolate, s: &State) {
i.register_op("op_exec_path", s.stateful_json_op(op_exec_path));
i.register_op("op_set_env", s.stateful_json_op(op_set_env));
i.register_op("op_get_env", s.stateful_json_op(op_get_env));
i.register_op("op_delete_env", s.stateful_json_op(op_delete_env));
i.register_op("op_get_dir", s.stateful_json_op(op_get_dir));
i.register_op("op_hostname", s.stateful_json_op(op_hostname));
i.register_op("op_loadavg", s.stateful_json_op(op_loadavg));
@ -137,6 +138,22 @@ fn op_get_env(
Ok(JsonOp::Sync(r))
}
#[derive(Deserialize)]
struct DeleteEnv {
key: String,
}
fn op_delete_env(
state: &State,
args: Value,
_zero_copy: &mut [ZeroCopyBuf],
) -> Result<JsonOp, OpError> {
let args: DeleteEnv = serde_json::from_value(args)?;
state.check_env()?;
env::remove_var(args.key);
Ok(JsonOp::Sync(json!({})))
}
#[derive(Deserialize)]
struct Exit {
code: i32,

7
cli/tests/unit/os_test.ts
View file

@ -20,6 +20,13 @@ unitTest({ perms: { env: true } }, function envNotFound(): void {
assertEquals(r, undefined);
});
unitTest({ perms: { env: true } }, function deleteEnv(): void {
Deno.env.set("TEST_VAR", "A");
assertEquals(Deno.env.get("TEST_VAR"), "A");
assertEquals(Deno.env.delete("TEST_VAR"), undefined);
assertEquals(Deno.env.get("TEST_VAR"), undefined);
});
unitTest(function envPermissionDenied1(): void {
let err;
try {