Revert "feat(flags): script arguments come after '--'" (denoland/deno#3681)

Due to complaints about ergonomics and because it breaks shebang on linux. This reverts commit 2d5457df15d8c4a81362bb2d185b5c6013faa1d8. BREAKING CHANGE
2024-11-21 20:50:22 +00:00 · 2020-01-15 19:21:35 -05:00 · 2020-01-15 19:21:35 -05:00 · 06059e0f22
commit 06059e0f22
parent cd5b3bd61d
8 changed files with 66 additions and 41 deletions
--- a/examples/test.ts
+++ b/examples/test.ts
@ -20,7 +20,6 @@ test(async function catSmoke(): Promise<void> {
      "run",
      "--allow-read",
      "examples/cat.ts",
-      "--",
      "README.md"
    ],
    stdout: "piped"
--- a/fs/empty_dir_test.ts
+++ b/fs/empty_dir_test.ts
@ -217,13 +217,12 @@ test(async function emptyDirPermission(): Promise<void> {
      args.push(
        path.join(testdataDir, s.async ? "empty_dir.ts" : "empty_dir_sync.ts")
      );
-      args.push("--");
      args.push("testfolder");

      const { stdout } = Deno.run({
        stdout: "piped",
        cwd: testdataDir,
-        args
+        args: args
      });

      const output = await Deno.readAll(stdout);
--- a/fs/exists_test.ts
+++ b/fs/exists_test.ts
@ -124,7 +124,6 @@ test(async function existsPermission(): Promise<void> {
    }

    args.push(path.join(testdataDir, s.async ? "exists.ts" : "exists_sync.ts"));
-    args.push("--");
    args.push(s.file);

    const { stdout } = Deno.run({
--- a/http/file_server_test.ts
+++ b/http/file_server_test.ts
@ -14,7 +14,6 @@ async function startFileServer(): Promise<void> {
      "--allow-read",
      "--allow-net",
      "http/file_server.ts",
-      "--",
      ".",
      "--cors"
    ],
@ -123,7 +122,7 @@ test(async function servePermissionDenied(): Promise<void> {

 test(async function printHelp(): Promise<void> {
  const helpProcess = Deno.run({
-    args: [Deno.execPath(), "run", "http/file_server.ts", "--", "--help"],
+    args: [Deno.execPath(), "run", "http/file_server.ts", "--help"],
    stdout: "piped"
  });
  const r = new TextProtoReader(new BufReader(helpProcess.stdout!));
--- a/installer/mod.ts
+++ b/installer/mod.ts
@ -255,7 +255,6 @@ export async function install(
    "run",
    ...grantedPermissions.map(getFlagFromPermission),
    moduleUrl,
-    "--",
    ...scriptArgs
  ];

--- a/installer/test.ts
+++ b/installer/test.ts
@ -1,5 +1,5 @@
 // Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-const { run, stat, makeTempDir, remove, env } = Deno;
+const { run, stat, makeTempDir, remove, env, readAll } = Deno;

 import { test, runIfMain, TestFunction } from "../testing/mod.ts";
 import { assert, assertEquals } from "../testing/asserts.ts";
@ -20,7 +20,6 @@ async function startFileServer(): Promise<void> {
      "--allow-read",
      "--allow-net",
      "http/file_server.ts",
-      "--",
      ".",
      "--cors"
    ],
@ -84,11 +83,11 @@ installerTest(async function installBasic(): Promise<void> {
      /* eslint-disable max-len */
      `% This executable is generated by Deno. Please don't modify it unless you know what it means. %
@IF EXIST "%~dp0\deno.exe" (
-  "%~dp0\deno.exe" "run" "http://localhost:4500/installer/testdata/echo.ts" "--" %*
+  "%~dp0\deno.exe" "run" "http://localhost:4500/installer/testdata/echo.ts" %*
 ) ELSE (
  @SETLOCAL
  @SET PATHEXT=%PATHEXT:;.TS;=;%
-  "deno" "run" "http://localhost:4500/installer/testdata/echo.ts" "--" %*
+  "deno" "run" "http://localhost:4500/installer/testdata/echo.ts" %*
 )
 `
      /* eslint-enable max-len */
@ -107,10 +106,10 @@ case \`uname\` in
 esac

 if [ -x "$basedir/deno" ]; then
-  "$basedir/deno" "run" "http://localhost:4500/installer/testdata/echo.ts" "--" "$@"
+  "$basedir/deno" "run" "http://localhost:4500/installer/testdata/echo.ts" "$@"
  ret=$?
 else
-  "deno" "run" "http://localhost:4500/installer/testdata/echo.ts" "--" "$@"
+  "deno" "run" "http://localhost:4500/installer/testdata/echo.ts" "$@"
  ret=$?
 fi
 exit $ret
@ -139,11 +138,11 @@ installerTest(async function installCustomDir(): Promise<void> {
      /* eslint-disable max-len */
      `% This executable is generated by Deno. Please don't modify it unless you know what it means. %
@IF EXIST "%~dp0\deno.exe" (
-  "%~dp0\deno.exe" "run" "http://localhost:4500/installer/testdata/echo.ts" "--" %*
+  "%~dp0\deno.exe" "run" "http://localhost:4500/installer/testdata/echo.ts" %*
 ) ELSE (
  @SETLOCAL
  @SET PATHEXT=%PATHEXT:;.TS;=;%
-  "deno" "run" "http://localhost:4500/installer/testdata/echo.ts" "--" %*
+  "deno" "run" "http://localhost:4500/installer/testdata/echo.ts" %*
 )
 `
      /* eslint-enable max-len */
@ -162,10 +161,10 @@ case \`uname\` in
 esac

 if [ -x "$basedir/deno" ]; then
-  "$basedir/deno" "run" "http://localhost:4500/installer/testdata/echo.ts" "--" "$@"
+  "$basedir/deno" "run" "http://localhost:4500/installer/testdata/echo.ts" "$@"
  ret=$?
 else
-  "deno" "run" "http://localhost:4500/installer/testdata/echo.ts" "--" "$@"
+  "deno" "run" "http://localhost:4500/installer/testdata/echo.ts" "$@"
  ret=$?
 fi
 exit $ret
@ -193,11 +192,11 @@ installerTest(async function installLocalModule(): Promise<void> {
      /* eslint-disable max-len */
      `% This executable is generated by Deno. Please don't modify it unless you know what it means. %
@IF EXIST "%~dp0\deno.exe" (
-  "%~dp0\deno.exe" "run" "${localModule}" "--" %*
+  "%~dp0\deno.exe" "run" "${localModule}" %*
 ) ELSE (
  @SETLOCAL
  @SET PATHEXT=%PATHEXT:;.TS;=;%
-  "deno" "run" "${localModule}" "--" %*
+  "deno" "run" "${localModule}" %*
 )
 `
      /* eslint-enable max-len */
@ -216,10 +215,10 @@ case \`uname\` in
 esac

 if [ -x "$basedir/deno" ]; then
-  "$basedir/deno" "run" "${localModule}" "--" "$@"
+  "$basedir/deno" "run" "${localModule}" "$@"
  ret=$?
 else
-  "deno" "run" "${localModule}" "--" "$@"
+  "deno" "run" "${localModule}" "$@"
  ret=$?
 fi
 exit $ret
@ -228,17 +227,57 @@ exit $ret
  );
 });

-/* TODO(ry) Re-enable this test
 installerTest(async function installWithFlags(): Promise<void> {
  await install(
    "echo_test",
    "http://localhost:4500/installer/testdata/echo.ts",
    ["--allow-net", "--allow-read", "--foobar"]
  );
-});
-*/

-/* TODO(ry) Re-enable this test
+  const { HOME } = env();
+  const filePath = path.resolve(HOME, ".deno/bin/echo_test");
+
+  if (path.isWindows) {
+    assertEquals(
+      await fs.readFileStr(filePath + ".cmd"),
+      /* eslint-disable max-len */
+      `% This executable is generated by Deno. Please don't modify it unless you know what it means. %
+@IF EXIST "%~dp0\deno.exe" (
+  "%~dp0\deno.exe" "run" "--allow-net" "--allow-read" "http://localhost:4500/installer/testdata/echo.ts" "--foobar" %*
+) ELSE (
+  @SETLOCAL
+  @SET PATHEXT=%PATHEXT:;.TS;=;%
+  "deno" "run" "--allow-net" "--allow-read" "http://localhost:4500/installer/testdata/echo.ts" "--foobar" %*
+)
+`
+      /* eslint-enable max-len */
+    );
+  }
+
+  assertEquals(
+    await fs.readFileStr(filePath),
+    /* eslint-disable max-len */
+    `#!/bin/sh
+# This executable is generated by Deno. Please don't modify it unless you know what it means.
+basedir=$(dirname "$(echo "$0" | sed -e 's,\\\\,/,g')")
+
+case \`uname\` in
+  *CYGWIN*) basedir=\`cygpath -w "$basedir"\`;;
+esac
+
+if [ -x "$basedir/deno" ]; then
+  "$basedir/deno" "run" "--allow-net" "--allow-read" "http://localhost:4500/installer/testdata/echo.ts" "--foobar" "$@"
+  ret=$?
+else
+  "deno" "run" "--allow-net" "--allow-read" "http://localhost:4500/installer/testdata/echo.ts" "--foobar" "$@"
+  ret=$?
+fi
+exit $ret
+`
+    /* eslint-enable max-len */
+  );
+});
+
 installerTest(async function installLocalModuleAndRun(): Promise<void> {
  const tempDir = await makeTempDir();
  const localModule = path.join(Deno.cwd(), "installer", "testdata", "echo.ts");
@ -276,9 +315,7 @@ installerTest(async function installLocalModuleAndRun(): Promise<void> {

  assert(!thrown, "It should not throw an error");
 }, true); // set true to install module in your real $HOME dir.
-*/

-/* TODO(ry) Re-enable this test
 installerTest(async function installAndMakesureItCanRun(): Promise<void> {
  const tempDir = await makeTempDir();
  await install(
@ -320,9 +357,7 @@ installerTest(async function installAndMakesureItCanRun(): Promise<void> {

  assert(!thrown, "It should not throw an error");
 }, true); // set true to install module in your real $HOME dir.
-*/

-/* TODO(ry) Re-enable this test
 installerTest(async function installAndMakesureArgsRight(): Promise<void> {
  const tempDir = await makeTempDir();
  await install(
@ -350,7 +385,9 @@ installerTest(async function installAndMakesureArgsRight(): Promise<void> {

  try {
    const b = await readAll(ps.stdout);
+
    const s = new TextDecoder("utf-8").decode(b);
+
    const obj = JSON.parse(s);

    assertEquals(obj[0], "arg1");
@ -367,7 +404,6 @@ installerTest(async function installAndMakesureArgsRight(): Promise<void> {

  assert(!thrown, "It should not throw an error");
 }, true); // set true to install module in your real $HOME dir.
- */

 installerTest(async function installWithoutHOMEVar(): Promise<void> {
  const { HOME } = env();
@ -391,11 +427,11 @@ installerTest(async function installWithoutHOMEVar(): Promise<void> {
      /* eslint-disable max-len */
      `% This executable is generated by Deno. Please don't modify it unless you know what it means. %
@IF EXIST "%~dp0\deno.exe" (
-  "%~dp0\deno.exe" "run" "http://localhost:4500/installer/testdata/echo.ts" "--" %*
+  "%~dp0\deno.exe" "run" "http://localhost:4500/installer/testdata/echo.ts" %*
 ) ELSE (
  @SETLOCAL
  @SET PATHEXT=%PATHEXT:;.TS;=;%
-  "deno" "run" "http://localhost:4500/installer/testdata/echo.ts" "--" %*
+  "deno" "run" "http://localhost:4500/installer/testdata/echo.ts" %*
 )
 `
      /* eslint-enable max-len */
@ -414,10 +450,10 @@ case \`uname\` in
 esac

 if [ -x "$basedir/deno" ]; then
-  "$basedir/deno" "run" "http://localhost:4500/installer/testdata/echo.ts" "--" "$@"
+  "$basedir/deno" "run" "http://localhost:4500/installer/testdata/echo.ts" "$@"
  ret=$?
 else
-  "deno" "run" "http://localhost:4500/installer/testdata/echo.ts" "--" "$@"
+  "deno" "run" "http://localhost:4500/installer/testdata/echo.ts" "$@"
  ret=$?
 fi
 exit $ret
--- a/manual.md
+++ b/manual.md
@ -394,7 +394,6 @@ const p = Deno.run({
    "run",
    "--allow-read",
    "https://deno.land/std/examples/cat.ts",
-    "--",
    ...fileNames
  ],
  stdout: "piped",
--- a/prettier/main_test.ts
+++ b/prettier/main_test.ts
@ -25,8 +25,7 @@ const cmd = [
  "--allow-run",
  "--allow-write",
  "--allow-read",
-  "./prettier/main.ts",
-  "--"
+  "./prettier/main.ts"
 ];

 const testdata = join("prettier", "testdata");
@ -403,7 +402,6 @@ test(async function testPrettierWithAutoConfig(): Promise<void> {
        "--allow-read",
        "--allow-env",
        prettierFile,
-        "--",
        "../5.ts",
        "--config",
        "auto"
@ -470,7 +468,6 @@ test(async function testPrettierWithSpecifiedConfig(): Promise<void> {
        "--allow-read",
        "--allow-env",
        prettierFile,
-        "--",
        "../5.ts",
        "--config",
        config.name
@ -506,7 +503,6 @@ test(async function testPrettierWithAutoIgnore(): Promise<void> {
      "--allow-read",
      "--allow-env",
      prettierFile,
-      "--",
      "**/*",
      "--ignore-path",
      "auto"
@ -535,7 +531,6 @@ test(async function testPrettierWithSpecifiedIgnore(): Promise<void> {
      "--allow-read",
      "--allow-env",
      prettierFile,
-      "--",
      "**/*",
      "--ignore-path",
      "typescript.prettierignore"