diff options
Diffstat (limited to 'runtime/js')
-rw-r--r-- | runtime/js/40_spawn.js | 9 | ||||
-rw-r--r-- | runtime/js/99_main.js | 75 |
2 files changed, 31 insertions, 53 deletions
diff --git a/runtime/js/40_spawn.js b/runtime/js/40_spawn.js index 863063e3f..ea6b409a3 100644 --- a/runtime/js/40_spawn.js +++ b/runtime/js/40_spawn.js @@ -60,7 +60,7 @@ function createSpawnChild(opFn) { return function spawnChild(command, options = {}) { - return spawnChildInner(opFn, command, "Deno.spawnChild()", options); + return spawnChildInner(opFn, command, "Deno.Command().spawn()", options); }; } @@ -219,10 +219,11 @@ return function spawn(command, options) { if (options?.stdin === "piped") { throw new TypeError( - "Piped stdin is not supported for this function, use 'Deno.spawnChild()' instead", + "Piped stdin is not supported for this function, use 'Deno.Command().spawn()' instead", ); } - return spawnChildInner(opFn, command, "Deno.spawn()", options).output(); + return spawnChildInner(opFn, command, "Deno.Command().output()", options) + .output(); }; } @@ -241,7 +242,7 @@ } = {}) { if (stdin === "piped") { throw new TypeError( - "Piped stdin is not supported for this function, use 'Deno.spawnChild()' instead", + "Piped stdin is not supported for this function, use 'Deno.Command().spawn()' instead", ); } const result = opFn({ diff --git a/runtime/js/99_main.js b/runtime/js/99_main.js index adfc0d360..1eb71339f 100644 --- a/runtime/js/99_main.js +++ b/runtime/js/99_main.js @@ -466,12 +466,14 @@ delete Intl.v8BreakIterator; // a snapshot ObjectAssign(internals, { nodeUnstable: { - spawnChild: __bootstrap.spawn.createSpawnChild( - ops.op_node_unstable_spawn_child, - ), - spawn: __bootstrap.spawn.createSpawn(ops.op_node_unstable_spawn_child), - spawnSync: __bootstrap.spawn.createSpawnSync( - ops.op_node_unstable_spawn_sync, + Command: __bootstrap.spawn.createCommand( + __bootstrap.spawn.createSpawn(ops.op_node_unstable_spawn_child), + __bootstrap.spawn.createSpawnSync( + ops.op_node_unstable_spawn_sync, + ), + __bootstrap.spawn.createSpawnChild( + ops.op_node_unstable_spawn_child, + ), ), serve: __bootstrap.flash.createServe(ops.op_node_unstable_flash_serve), upgradeHttpRaw: __bootstrap.flash.upgradeHttpRaw, @@ -482,14 +484,6 @@ delete Intl.v8BreakIterator; }, }); - ObjectAssign(internals.nodeUnstable, { - Command: __bootstrap.spawn.createCommand( - internals.nodeUnstable.spawn, - internals.nodeUnstable.spawnSync, - internals.nodeUnstable.spawnChild, - ), - }); - const finalDenoNs = { core, internal: internalSymbol, @@ -512,23 +506,17 @@ delete Intl.v8BreakIterator; // the op function that needs to be passed will be invalidated by creating // a snapshot ObjectAssign(finalDenoNs, { - spawnChild: __bootstrap.spawn.createSpawnChild(ops.op_spawn_child), - spawn: __bootstrap.spawn.createSpawn(ops.op_spawn_child), - spawnSync: __bootstrap.spawn.createSpawnSync(ops.op_spawn_sync), + Command: __bootstrap.spawn.createCommand( + __bootstrap.spawn.createSpawn(ops.op_spawn_child), + __bootstrap.spawn.createSpawnSync(ops.op_spawn_sync), + __bootstrap.spawn.createSpawnChild(ops.op_spawn_child), + ), serve: __bootstrap.flash.createServe(ops.op_flash_serve), listenDatagram: __bootstrap.net.createListenDatagram( ops.op_net_listen_udp, ops.op_net_listen_unixpacket, ), }); - - ObjectAssign(finalDenoNs, { - Command: __bootstrap.spawn.createCommand( - finalDenoNs.spawn, - finalDenoNs.spawnSync, - finalDenoNs.spawnChild, - ), - }); } // Setup `Deno` global - we're actually overriding already existing global @@ -617,12 +605,14 @@ delete Intl.v8BreakIterator; // a snapshot ObjectAssign(internals, { nodeUnstable: { - spawnChild: __bootstrap.spawn.createSpawnChild( - ops.op_node_unstable_spawn_child, - ), - spawn: __bootstrap.spawn.createSpawn(ops.op_node_unstable_spawn_child), - spawnSync: __bootstrap.spawn.createSpawnSync( - ops.op_node_unstable_spawn_sync, + Command: __bootstrap.spawn.createCommand( + __bootstrap.spawn.createSpawn(ops.op_node_unstable_spawn_child), + __bootstrap.spawn.createSpawnSync( + ops.op_node_unstable_spawn_sync, + ), + __bootstrap.spawn.createSpawnChild( + ops.op_node_unstable_spawn_child, + ), ), serve: __bootstrap.flash.createServe(ops.op_node_unstable_flash_serve), upgradeHttpRaw: __bootstrap.flash.upgradeHttpRaw, @@ -633,14 +623,6 @@ delete Intl.v8BreakIterator; }, }); - ObjectAssign(internals.nodeUnstable, { - Command: __bootstrap.spawn.createCommand( - internals.nodeUnstable.spawn, - internals.nodeUnstable.spawnSync, - internals.nodeUnstable.spawnChild, - ), - }); - const finalDenoNs = { core, internal: internalSymbol, @@ -655,22 +637,17 @@ delete Intl.v8BreakIterator; // the op function that needs to be passed will be invalidated by creating // a snapshot ObjectAssign(finalDenoNs, { - spawnChild: __bootstrap.spawn.createSpawnChild(ops.op_spawn_child), - spawn: __bootstrap.spawn.createSpawn(ops.op_spawn_child), - spawnSync: __bootstrap.spawn.createSpawnSync(ops.op_spawn_sync), + Command: __bootstrap.spawn.createCommand( + __bootstrap.spawn.createSpawn(ops.op_spawn_child), + __bootstrap.spawn.createSpawnSync(ops.op_spawn_sync), + __bootstrap.spawn.createSpawnChild(ops.op_spawn_child), + ), serve: __bootstrap.flash.createServe(ops.op_flash_serve), listenDatagram: __bootstrap.net.createListenDatagram( ops.op_net_listen_udp, ops.op_net_listen_unixpacket, ), }); - ObjectAssign(finalDenoNs, { - Command: __bootstrap.spawn.createCommand( - finalDenoNs.spawn, - finalDenoNs.spawnSync, - finalDenoNs.spawnChild, - ), - }); } ObjectDefineProperties(finalDenoNs, { pid: util.readOnly(runtimeOptions.pid), |