summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cli/js/compiler_util.ts9
-rw-r--r--cli/tests/integration_tests.rs42
-rw-r--r--cli/tests/subdir/amd_like.js1
-rw-r--r--cli/tests/subdir/single_module.ts2
-rw-r--r--cli/tests/subdir/tla.ts1
-rw-r--r--deno_typescript/compiler_main.js38
-rw-r--r--deno_typescript/lib.rs2
m---------deno_typescript/typescript0
-rw-r--r--std/encoding/yaml/loader/loader.ts1
m---------third_party0
-rwxr-xr-xtools/lint.py4
11 files changed, 75 insertions, 25 deletions
diff --git a/cli/js/compiler_util.ts b/cli/js/compiler_util.ts
index 8a043d7d1..9dd245413 100644
--- a/cli/js/compiler_util.ts
+++ b/cli/js/compiler_util.ts
@@ -270,11 +270,16 @@ export function convertCompilerOptions(str: string): ts.CompilerOptions {
/** An array of TypeScript diagnostic types we ignore. */
export const ignoredDiagnostics = [
+ // TS2306: File 'file:///Users/rld/src/deno/cli/tests/subdir/amd_like.js' is
+ // not a module.
+ 2306,
+ // TS1375: 'await' expressions are only allowed at the top level of a file
+ // when that file is a module, but this file has no imports or exports.
+ // Consider adding an empty 'export {}' to make this file a module.
+ 1375,
// TS1103: 'for-await-of' statement is only allowed within an async function
// or async generator.
1103,
- // TS1308: 'await' expression is only allowed within an async function.
- 1308,
// TS2691: An import path cannot end with a '.ts' extension. Consider
// importing 'bad-module' instead.
2691,
diff --git a/cli/tests/integration_tests.rs b/cli/tests/integration_tests.rs
index 3e2c28980..20de4b030 100644
--- a/cli/tests/integration_tests.rs
+++ b/cli/tests/integration_tests.rs
@@ -327,6 +327,48 @@ fn bundle_single_module() {
}
#[test]
+fn bundle_tla() {
+ // First we have to generate a bundle of some module that has exports.
+ let tla_import = util::root_path().join("cli/tests/subdir/tla.ts");
+ assert!(tla_import.is_file());
+ let t = tempfile::TempDir::new().expect("tempdir fail");
+ let bundle = t.path().join("tla.bundle.js");
+ let mut deno = util::deno_cmd()
+ .current_dir(util::root_path())
+ .arg("bundle")
+ .arg(tla_import)
+ .arg(&bundle)
+ .spawn()
+ .expect("failed to spawn script");
+ let status = deno.wait().expect("failed to wait for the child process");
+ assert!(status.success());
+ assert!(bundle.is_file());
+
+ // Now we try to use that bundle from another module.
+ let test = t.path().join("test.js");
+ std::fs::write(
+ &test,
+ "
+ import { foo } from \"./tla.bundle.js\";
+ console.log(foo); ",
+ )
+ .expect("error writing file");
+
+ let output = util::deno_cmd()
+ .current_dir(util::root_path())
+ .arg("run")
+ .arg(&test)
+ .output()
+ .expect("failed to spawn script");
+ // check the output of the test.ts program.
+ assert!(std::str::from_utf8(&output.stdout)
+ .unwrap()
+ .trim()
+ .ends_with("Hello"));
+ assert_eq!(output.stderr, b"");
+}
+
+#[test]
fn repl_test_console_log() {
let (out, err, code) =
util::repl_process(vec!["console.log('hello')", "'world'"], None);
diff --git a/cli/tests/subdir/amd_like.js b/cli/tests/subdir/amd_like.js
index 23babc4db..f27e505e4 100644
--- a/cli/tests/subdir/amd_like.js
+++ b/cli/tests/subdir/amd_like.js
@@ -1,4 +1,3 @@
// looks like an AMD module, but isn't
const define = () => {};
define(["fake_module"], () => {});
-export {};
diff --git a/cli/tests/subdir/single_module.ts b/cli/tests/subdir/single_module.ts
index 1cd2cd781..f41b0a4b5 100644
--- a/cli/tests/subdir/single_module.ts
+++ b/cli/tests/subdir/single_module.ts
@@ -1,2 +1,2 @@
console.log("Hello world!");
-export {};
+export {}; // TODO(ry) This shouldn't be necessary.
diff --git a/cli/tests/subdir/tla.ts b/cli/tests/subdir/tla.ts
new file mode 100644
index 000000000..713dbfca0
--- /dev/null
+++ b/cli/tests/subdir/tla.ts
@@ -0,0 +1 @@
+export const foo = await Promise.resolve("Hello");
diff --git a/deno_typescript/compiler_main.js b/deno_typescript/compiler_main.js
index 0f8c5cc14..781550246 100644
--- a/deno_typescript/compiler_main.js
+++ b/deno_typescript/compiler_main.js
@@ -132,7 +132,6 @@ class Host {
*/
readFile(_fileName) {
unreachable();
- return undefined;
}
useCaseSensitiveFileNames() {
@@ -179,33 +178,22 @@ class Host {
}
// This looks up any modules that have been mapped to internal names
- if (moduleMap.has(fileName)) {
- fileName = moduleMap.get(fileName);
- }
+ const moduleUrl = moduleMap.has(fileName)
+ ? moduleMap.get(fileName)
+ : fileName;
- const { sourceCode, moduleName } = dispatch("op_load_module", {
- moduleUrl: fileName,
+ const { sourceCode } = dispatch("op_load_module", {
+ moduleUrl,
languageVersion,
shouldCreateNewSourceFile
});
- // If we match the external specifier regex, we will then create an internal
- // specifier and then use that when creating the source file
- let internalModuleName = moduleName;
- const result = externalSpecifierRegEx.exec(moduleName);
- if (result) {
- const [, specifier] = result;
- const internalSpecifier = `$deno$${specifier}`;
- moduleMap.set(internalSpecifier, moduleName);
- internalModuleName = internalSpecifier;
- }
-
const sourceFile = ts.createSourceFile(
- internalModuleName,
+ fileName,
sourceCode,
languageVersion
);
- sourceFile.moduleName = internalModuleName;
+ sourceFile.moduleName = fileName;
return sourceFile;
}
@@ -245,7 +233,6 @@ class Host {
_shouldCreateNewSourceFile
) {
unreachable();
- return undefined;
}
/**
@@ -278,6 +265,17 @@ class Host {
/** @type {ts.ResolvedModule[]} */
const r = resolvedNames.map(resolvedFileName => {
const extension = getExtension(resolvedFileName);
+ if (!moduleMap.has(resolvedFileName)) {
+ // If we match the external specifier regex, we will then create an internal
+ // specifier and then use that when creating the source file
+ const result = externalSpecifierRegEx.exec(resolvedFileName);
+ if (result) {
+ const [, specifier] = result;
+ const internalSpecifier = `$deno$${specifier}`;
+ moduleMap.set(internalSpecifier, resolvedFileName);
+ resolvedFileName = internalSpecifier;
+ }
+ }
return { resolvedFileName, extension };
});
return r;
diff --git a/deno_typescript/lib.rs b/deno_typescript/lib.rs
index b2e2166be..8ee2c2c01 100644
--- a/deno_typescript/lib.rs
+++ b/deno_typescript/lib.rs
@@ -292,6 +292,8 @@ pub fn get_asset(name: &str) -> Option<&'static str> {
"lib.es2019.object.d.ts" => inc!("lib.es2019.object.d.ts"),
"lib.es2019.string.d.ts" => inc!("lib.es2019.string.d.ts"),
"lib.es2019.symbol.d.ts" => inc!("lib.es2019.symbol.d.ts"),
+ "lib.es2020.bigint.d.ts" => inc!("lib.es2020.bigint.d.ts"),
+ "lib.es2020.promise.d.ts" => inc!("lib.es2020.promise.d.ts"),
"lib.es2020.string.d.ts" => inc!("lib.es2020.string.d.ts"),
"lib.es2020.symbol.wellknown.d.ts" => {
inc!("lib.es2020.symbol.wellknown.d.ts")
diff --git a/deno_typescript/typescript b/deno_typescript/typescript
-Subproject 7cf6c70d90b60e962db417d80290288eb786b5f
+Subproject af614ccea19e844142c8e6b0fdd70ccfdfcfa0d
diff --git a/std/encoding/yaml/loader/loader.ts b/std/encoding/yaml/loader/loader.ts
index 7db72a01d..1ab4fc7f5 100644
--- a/std/encoding/yaml/loader/loader.ts
+++ b/std/encoding/yaml/loader/loader.ts
@@ -3,7 +3,6 @@
// Copyright 2011-2015 by Vitaly Puzrin. All rights reserved. MIT license.
// Copyright 2018-2020 the Deno authors. All rights reserved. MIT license.
-/* eslint-disable no-conditional-assignment */
/* eslint-disable max-len */
import { YAMLError } from "../error.ts";
diff --git a/third_party b/third_party
-Subproject 9ab7948049d96bdd3af67323f758b81a9e4cbc2
+Subproject b1103a02e8112a20126c84d2d4751ed1302c8ad
diff --git a/tools/lint.py b/tools/lint.py
index 3ce4d7b02..6adbf0b69 100755
--- a/tools/lint.py
+++ b/tools/lint.py
@@ -29,8 +29,12 @@ def eslint():
# Within the source dirs, eslint does its own globbing, taking into account
# the exclusion rules listed in '.eslintignore'.
source_globs = ["%s/*.{js,ts}" % d for d in source_dirs]
+ # Set NODE_PATH so we don't have to maintain a symlink in root_path.
+ env = os.environ.copy()
+ env["NODE_PATH"] = os.path.join(root_path, "third_party", "node_modules")
run(["node", script, "--max-warnings=0", "--"] + source_globs,
shell=False,
+ env=env,
quiet=True)
generated by cgit v1.2.3 (git 2.25.1) at 2025-08-02 05:37:41 +0000