Merge branch 'main' into haturatu/main

14 files changed, 102 insertions, 1 deletions

diff --git a/tests/specs/compile/include_data_files/__test__.jsonc b/tests/specs/compile/include_data_files/__test__.jsonc
new file mode 100644
index 000000000..5d5d967ca
--- /dev/null
+++ b/tests/specs/compile/include_data_files/__test__.jsonc
@@ -0,0 +1,41 @@
+{
+  "tempDir": true,
+  "tests": {
+    "success": {
+      "steps": [{
+        "if": "unix",
+        "args": "compile --allow-read=data-file.txt --include data-file.txt --output main main.js",
+        "output": "[WILDCARD]"
+      }, {
+        "if": "unix",
+        "commandName": "./main",
+        "args": [],
+        "output": "output.out",
+        "exitCode": 0
+      }, {
+        "if": "windows",
+        "args": "compile --allow-read=data-file.txt --include data-file.txt --output main.exe main.js",
+        "output": "[WILDCARD]"
+      }, {
+        "if": "windows",
+        "commandName": "./main.exe",
+        "args": [],
+        "output": "output.out",
+        "exitCode": 0
+      }]
+    },
+    "non_existent": {
+      "steps": [{
+        "if": "unix",
+        "args": "compile --include does_not_exist.txt --output main main.js",
+        "output": "non_existent.out",
+        "exitCode": 1
+      }, {
+        "if": "windows",
+        "args": "compile --include does_not_exist.txt --output main.exe main.js",
+        "output": "non_existent.out",
+        "exitCode": 1
+      }]
+    }
+  }
+}
diff --git a/tests/specs/compile/include_data_files/data-file.txt b/tests/specs/compile/include_data_files/data-file.txt
new file mode 100644
index 000000000..b14df6442
--- /dev/null
+++ b/tests/specs/compile/include_data_files/data-file.txt
@@ -0,0 +1 @@
+Hi
diff --git a/tests/specs/compile/include_data_files/main.js b/tests/specs/compile/include_data_files/main.js
new file mode 100644
index 000000000..4c1f1e98d
--- /dev/null
+++ b/tests/specs/compile/include_data_files/main.js
@@ -0,0 +1 @@
+console.log(Deno.readTextFileSync("./data-file.txt").trim());
diff --git a/tests/specs/compile/include_data_files/non_existent.out b/tests/specs/compile/include_data_files/non_existent.out
new file mode 100644
index 000000000..a88b441ba
--- /dev/null
+++ b/tests/specs/compile/include_data_files/non_existent.out
@@ -0,0 +1,6 @@
+Compile file:///[WILDLINE]/main.js to [WILDLINE]
+error: Writing deno compile executable to temporary file 'main[WILDLINE]'
+
+Caused by:
+    0: Including [WILDLINE]does_not_exist.txt
+    1: [WILDLINE]
diff --git a/tests/specs/compile/include_data_files/output.out b/tests/specs/compile/include_data_files/output.out
new file mode 100644
index 000000000..b14df6442
--- /dev/null
+++ b/tests/specs/compile/include_data_files/output.out
@@ -0,0 +1 @@
+Hi
diff --git a/tests/specs/doc/lint_html_success/lint_success_html.out b/tests/specs/doc/lint_html_success/lint_success_html.out
index 783dd5927..57b179e22 100644
--- a/tests/specs/doc/lint_html_success/lint_success_html.out
+++ b/tests/specs/doc/lint_html_success/lint_success_html.out
@@ -1 +1 @@
-Written 12 files to "./docs/"
+Written 15 files to "./docs/"
diff --git a/tests/specs/fmt/sql/__test__.jsonc b/tests/specs/fmt/sql/__test__.jsonc
new file mode 100644
index 000000000..a335e79c2
--- /dev/null
+++ b/tests/specs/fmt/sql/__test__.jsonc
@@ -0,0 +1,25 @@
+{
+  "tempDir": true,
+  "tests": {
+    "nothing": {
+      "args": "fmt",
+      "output": "Checked 7 files\n"
+    },
+    "flag": {
+      "args": "fmt --unstable-sql",
+      "output": "[UNORDERED_START]\n[WILDLINE]badly_formatted.sql\n[WILDLINE]well_formatted.sql\n[WILDLINE]wrong_file_ignore.sql\n[UNORDERED_END]\nChecked 7 files\n"
+    },
+    "config_file": {
+      "steps": [{
+        "args": [
+          "eval",
+          "Deno.writeTextFile('deno.json', '{\\n  \"unstable\": [\"fmt-sql\"]\\n}\\n')"
+        ],
+        "output": "[WILDCARD]"
+      }, {
+        "args": "fmt",
+        "output": "[UNORDERED_START]\n[WILDLINE]badly_formatted.sql\n[WILDLINE]well_formatted.sql\n[WILDLINE]wrong_file_ignore.sql\n[UNORDERED_END]\nChecked 8 files\n"
+      }]
+    }
+  }
+}
diff --git a/tests/specs/fmt/sql/badly_formatted.sql b/tests/specs/fmt/sql/badly_formatted.sql
new file mode 100644
index 000000000..619fc7afd
--- /dev/null
+++ b/tests/specs/fmt/sql/badly_formatted.sql
@@ -0,0 +1 @@
+select *;
\ No newline at end of file
diff --git a/tests/specs/fmt/sql/ignore_file.sql b/tests/specs/fmt/sql/ignore_file.sql
new file mode 100644
index 000000000..62418c611
--- /dev/null
+++ b/tests/specs/fmt/sql/ignore_file.sql
@@ -0,0 +1,3 @@
+-- deno-fmt-ignore-file
+
+foo%!
diff --git a/tests/specs/fmt/sql/ignore_file2.sql b/tests/specs/fmt/sql/ignore_file2.sql
new file mode 100644
index 000000000..fe9969f1d
--- /dev/null
+++ b/tests/specs/fmt/sql/ignore_file2.sql
@@ -0,0 +1,3 @@
+--deno-fmt-ignore-file
+
+foo%!
diff --git a/tests/specs/fmt/sql/ignore_file3.sql b/tests/specs/fmt/sql/ignore_file3.sql
new file mode 100644
index 000000000..c87da3e59
--- /dev/null
+++ b/tests/specs/fmt/sql/ignore_file3.sql
@@ -0,0 +1,6 @@
+-- Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor
+-- incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, 
+-- quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. 
+-- deno-fmt-ignore-file
+
+  foo%!
diff --git a/tests/specs/fmt/sql/ignore_file4.sql b/tests/specs/fmt/sql/ignore_file4.sql
new file mode 100644
index 000000000..2de65712a
--- /dev/null
+++ b/tests/specs/fmt/sql/ignore_file4.sql
@@ -0,0 +1,3 @@
+-- deno-fmt-ignore-file Foo bar biz
+
+  foo%!
diff --git a/tests/specs/fmt/sql/well_formatted.sql b/tests/specs/fmt/sql/well_formatted.sql
new file mode 100644
index 000000000..92ce98018
--- /dev/null
+++ b/tests/specs/fmt/sql/well_formatted.sql
@@ -0,0 +1,4 @@
+SELECT
+  *
+FROM
+  foo;
diff --git a/tests/specs/fmt/sql/wrong_file_ignore.sql b/tests/specs/fmt/sql/wrong_file_ignore.sql
new file mode 100644
index 000000000..c124855dc
--- /dev/null
+++ b/tests/specs/fmt/sql/wrong_file_ignore.sql
@@ -0,0 +1,6 @@
+-- File ignore directive only works if it's in the first cluster
+-- of comment, ie. there are no empty lines after the first n-leading lines.
+
+-- deno-fmt-ignore-file
+
+ foo
\ No newline at end of file