From cb6700fa5aac03fb3e082f9ed2e01d74238e6a99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartek=20Iwa=C5=84czuk?= <biwanczuk@gmail.com>
Date: Fri, 9 Dec 2022 16:43:36 +0100
Subject: unstable: remove Deno.spawn, Deno.spawnSync, Deno.spawnChild APIs
 (#16893)

This commit removes three unstable Deno APIs:
- "Deno.spawn()"
- "Deno.spawnSync()"
- "Deno.spawnChild()"

These APIs were replaced by a unified "Deno.Command" API.
---
 runtime/js/99_main.js | 75 ++++++++++++++++++---------------------------------
 1 file changed, 26 insertions(+), 49 deletions(-)

(limited to 'runtime/js/99_main.js')

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),
-- 
cgit v1.2.3