summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cli/tests/020_json_modules.ts.out4
-rw-r--r--cli/tests/error_004_missing_module.ts.out8
-rw-r--r--cli/tests/error_005_missing_dynamic_import.ts.out8
-rw-r--r--cli/tests/error_006_import_ext_failure.ts.out8
-rw-r--r--cli/tests/error_011_bad_module_specifier.ts.out14
-rw-r--r--cli/tests/error_012_bad_dynamic_import_specifier.ts.out14
-rw-r--r--cli/tests/error_local_static_import_from_remote.ts.out4
-rw-r--r--cli/tests/error_type_definitions.ts.out18
-rw-r--r--deno_typescript/compiler_main.js17
9 files changed, 53 insertions, 42 deletions
diff --git a/cli/tests/020_json_modules.ts.out b/cli/tests/020_json_modules.ts.out
index 02106dafc..cb923561b 100644
--- a/cli/tests/020_json_modules.ts.out
+++ b/cli/tests/020_json_modules.ts.out
@@ -4,6 +4,6 @@ error: Uncaught TypeError: Cannot resolve extension for "[WILDCARD]config.json"
at new SourceFile ($deno$/compiler/sourcefile.ts:[WILDCARD])
at processImports ($deno$/compiler/imports.ts:[WILDCARD])
at async Object.processImports ($deno$/compiler/imports.ts:[WILDCARD])
- at async compile ([WILDCARD]compiler.ts:[WILDCARD])
- at async tsCompilerOnMessage ([WILDCARD]compiler.ts:[WILDCARD])
+ at async compile ($deno$/compiler.ts:[WILDCARD])
+ at async tsCompilerOnMessage ($deno$/compiler.ts:[WILDCARD])
at async workerMessageRecvCallback ($deno$/runtime_worker.ts:[WILDCARD])
diff --git a/cli/tests/error_004_missing_module.ts.out b/cli/tests/error_004_missing_module.ts.out
index 87db14026..1c77c0626 100644
--- a/cli/tests/error_004_missing_module.ts.out
+++ b/cli/tests/error_004_missing_module.ts.out
@@ -1,8 +1,8 @@
[WILDCARD]error: Uncaught NotFound: Cannot resolve module "[WILDCARD]/bad-module.ts" from "[WILDCARD]/error_004_missing_module.ts"
at unwrapResponse ([WILDCARD]dispatch_json.ts:[WILDCARD])
at Object.sendAsync ([WILDCARD]dispatch_json.ts:[WILDCARD])
- at async processImports ([WILDCARD]compiler/imports.ts:[WILDCARD])
- at async Object.processImports ([WILDCARD]compiler/imports.ts:[WILDCARD])
- at async compile ([WILDCARD]compiler.ts:[WILDCARD])
- at async tsCompilerOnMessage ([WILDCARD]compiler.ts:[WILDCARD])
+ at async processImports ($deno$/compiler/imports.ts:[WILDCARD])
+ at async Object.processImports ($deno$/compiler/imports.ts:[WILDCARD])
+ at async compile ($deno$/compiler.ts:[WILDCARD])
+ at async tsCompilerOnMessage ($deno$/compiler.ts:[WILDCARD])
at async workerMessageRecvCallback ([WILDCARD]runtime_worker.ts:[WILDCARD])
diff --git a/cli/tests/error_005_missing_dynamic_import.ts.out b/cli/tests/error_005_missing_dynamic_import.ts.out
index 0ec1dcb97..b05038a86 100644
--- a/cli/tests/error_005_missing_dynamic_import.ts.out
+++ b/cli/tests/error_005_missing_dynamic_import.ts.out
@@ -1,8 +1,8 @@
[WILDCARD]error: Uncaught NotFound: Cannot resolve module "[WILDCARD]/bad-module.ts" from "[WILDCARD]/error_005_missing_dynamic_import.ts"
at unwrapResponse ([WILDCARD]dispatch_json.ts:[WILDCARD])
at Object.sendAsync ([WILDCARD]dispatch_json.ts:[WILDCARD])
- at async processImports ([WILDCARD]compiler/imports.ts:[WILDCARD])
- at async Object.processImports ([WILDCARD]compiler/imports.ts:[WILDCARD])
- at async compile ([WILDCARD]compiler.ts:[WILDCARD])
- at async tsCompilerOnMessage ([WILDCARD]compiler.ts:[WILDCARD])
+ at async processImports ($deno$/compiler/imports.ts:[WILDCARD])
+ at async Object.processImports ($deno$/compiler/imports.ts:[WILDCARD])
+ at async compile ($deno$/compiler.ts:[WILDCARD])
+ at async tsCompilerOnMessage ($deno$/compiler.ts:[WILDCARD])
at async workerMessageRecvCallback ([WILDCARD]runtime_worker.ts:[WILDCARD])
diff --git a/cli/tests/error_006_import_ext_failure.ts.out b/cli/tests/error_006_import_ext_failure.ts.out
index 2cac6c76a..25e772a05 100644
--- a/cli/tests/error_006_import_ext_failure.ts.out
+++ b/cli/tests/error_006_import_ext_failure.ts.out
@@ -1,8 +1,8 @@
[WILDCARD]error: Uncaught NotFound: Cannot resolve module "[WILDCARD]/non-existent" from "[WILDCARD]/error_006_import_ext_failure.ts"
at unwrapResponse ([WILDCARD]dispatch_json.ts:[WILDCARD])
at Object.sendAsync ([WILDCARD]dispatch_json.ts:[WILDCARD])
- at async processImports ([WILDCARD]compiler/imports.ts:[WILDCARD])
- at async Object.processImports ([WILDCARD]compiler/imports.ts:[WILDCARD])
- at async compile ([WILDCARD]compiler.ts:[WILDCARD])
- at async tsCompilerOnMessage ([WILDCARD]compiler.ts:[WILDCARD])
+ at async processImports ($deno$/compiler/imports.ts:[WILDCARD])
+ at async Object.processImports ($deno$/compiler/imports.ts:[WILDCARD])
+ at async compile ($deno$/compiler.ts:[WILDCARD])
+ at async tsCompilerOnMessage ($deno$/compiler.ts:[WILDCARD])
at async workerMessageRecvCallback ([WILDCARD]runtime_worker.ts:[WILDCARD])
diff --git a/cli/tests/error_011_bad_module_specifier.ts.out b/cli/tests/error_011_bad_module_specifier.ts.out
index 23421b135..984a1e4af 100644
--- a/cli/tests/error_011_bad_module_specifier.ts.out
+++ b/cli/tests/error_011_bad_module_specifier.ts.out
@@ -1,9 +1,9 @@
[WILDCARD]error: Uncaught URIError: relative import path "bad-module.ts" not prefixed with / or ./ or ../ Imported from "[WILDCARD]/error_011_bad_module_specifier.ts"
- at unwrapResponse ([WILDCARD]ops/dispatch_json.ts:[WILDCARD])
- at Object.sendSync ([WILDCARD]ops/dispatch_json.ts:[WILDCARD])
- at resolveModules ([WILDCARD]compiler/imports.ts:[WILDCARD])
- at processImports ([WILDCARD]compiler/imports.ts:[WILDCARD])
- at Object.processImports ([WILDCARD]compiler/imports.ts:[WILDCARD])
- at async compile ([WILDCARD]compiler.ts:[WILDCARD])
- at async tsCompilerOnMessage ([WILDCARD]compiler.ts:[WILDCARD])
+ at unwrapResponse ($deno$/ops/dispatch_json.ts:[WILDCARD])
+ at Object.sendSync ($deno$/ops/dispatch_json.ts:[WILDCARD])
+ at resolveModules ($deno$/compiler/imports.ts:[WILDCARD])
+ at processImports ($deno$/compiler/imports.ts:[WILDCARD])
+ at Object.processImports ($deno$/compiler/imports.ts:[WILDCARD])
+ at async compile ($deno$/compiler.ts:[WILDCARD])
+ at async tsCompilerOnMessage ($deno$/compiler.ts:[WILDCARD])
at async workerMessageRecvCallback ([WILDCARD]runtime_worker.ts:[WILDCARD])
diff --git a/cli/tests/error_012_bad_dynamic_import_specifier.ts.out b/cli/tests/error_012_bad_dynamic_import_specifier.ts.out
index 57ca909ca..6058e1c5a 100644
--- a/cli/tests/error_012_bad_dynamic_import_specifier.ts.out
+++ b/cli/tests/error_012_bad_dynamic_import_specifier.ts.out
@@ -1,9 +1,9 @@
[WILDCARD]error: Uncaught URIError: relative import path "bad-module.ts" not prefixed with / or ./ or ../ Imported from "[WILDCARD]/error_012_bad_dynamic_import_specifier.ts"
- at unwrapResponse ([WILDCARD]ops/dispatch_json.ts:[WILDCARD])
- at Object.sendSync ([WILDCARD]ops/dispatch_json.ts:[WILDCARD])
- at resolveModules ([WILDCARD]compiler/imports.ts:[WILDCARD])
- at processImports ([WILDCARD]compiler/imports.ts:[WILDCARD])
- at Object.processImports ([WILDCARD]compiler/imports.ts:[WILDCARD])
- at async compile ([WILDCARD]compiler.ts:[WILDCARD])
- at async tsCompilerOnMessage ([WILDCARD]compiler.ts:[WILDCARD])
+ at unwrapResponse ($deno$/ops/dispatch_json.ts:[WILDCARD])
+ at Object.sendSync ($deno$/ops/dispatch_json.ts:[WILDCARD])
+ at resolveModules ($deno$/compiler/imports.ts:[WILDCARD])
+ at processImports ($deno$/compiler/imports.ts:[WILDCARD])
+ at Object.processImports ($deno$/compiler/imports.ts:[WILDCARD])
+ at async compile ($deno$/compiler.ts:[WILDCARD])
+ at async tsCompilerOnMessage ($deno$/compiler.ts:[WILDCARD])
at async workerMessageRecvCallback ([WILDCARD]runtime_worker.ts:[WILDCARD])
diff --git a/cli/tests/error_local_static_import_from_remote.ts.out b/cli/tests/error_local_static_import_from_remote.ts.out
index de20b9d81..841fdb6e3 100644
--- a/cli/tests/error_local_static_import_from_remote.ts.out
+++ b/cli/tests/error_local_static_import_from_remote.ts.out
@@ -4,6 +4,6 @@ error: Uncaught PermissionDenied: Remote module are not allowed to statically im
at Object.sendAsync ($deno$/ops/dispatch_json.ts:[WILDCARD])
at async processImports ($deno$/compiler/imports.ts:[WILDCARD])
at async Object.processImports ($deno$/compiler/imports.ts:[WILDCARD])
- at async compile ([WILDCARD]compiler.ts:[WILDCARD])
- at async tsCompilerOnMessage ([WILDCARD]compiler.ts:[WILDCARD])
+ at async compile ($deno$/compiler.ts:[WILDCARD])
+ at async tsCompilerOnMessage ($deno$/compiler.ts:[WILDCARD])
at async workerMessageRecvCallback ($deno$/runtime_worker.ts:[WILDCARD])
diff --git a/cli/tests/error_type_definitions.ts.out b/cli/tests/error_type_definitions.ts.out
index 7fcbb9592..e2791a6c0 100644
--- a/cli/tests/error_type_definitions.ts.out
+++ b/cli/tests/error_type_definitions.ts.out
@@ -1,11 +1,11 @@
[WILDCARD]error: Uncaught URIError: relative import path "baz" not prefixed with / or ./ or ../ Imported from "[WILDCARD]/type_definitions/bar.d.ts"
- at unwrapResponse ([WILDCARD]ops/dispatch_json.ts:[WILDCARD])
- at Object.sendSync ([WILDCARD]ops/dispatch_json.ts:[WILDCARD])
- at Object.resolveModules ([WILDCARD]ops/compiler.ts:[WILDCARD])
- at resolveModules ([WILDCARD]compiler/imports.ts:[WILDCARD])
- at processImports ([WILDCARD]compiler/imports.ts:[WILDCARD])
- at processImports ([WILDCARD]compiler/imports.ts:[WILDCARD])
- at async Object.processImports ([WILDCARD]compiler/imports.ts:[WILDCARD])
- at async compile ([WILDCARD]compiler.ts:[WILDCARD])
- at async tsCompilerOnMessage ([WILDCARD]compiler.ts:[WILDCARD])
+ at unwrapResponse ($deno$/ops/dispatch_json.ts:[WILDCARD])
+ at Object.sendSync ($deno$/ops/dispatch_json.ts:[WILDCARD])
+ at Object.resolveModules ($deno$/ops/compiler.ts:[WILDCARD])
+ at resolveModules ($deno$/compiler/imports.ts:[WILDCARD])
+ at processImports ($deno$/compiler/imports.ts:[WILDCARD])
+ at processImports ($deno$/compiler/imports.ts:[WILDCARD])
+ at async Object.processImports ($deno$/compiler/imports.ts:[WILDCARD])
+ at async compile ($deno$/compiler.ts:[WILDCARD])
+ at async tsCompilerOnMessage ($deno$/compiler.ts:[WILDCARD])
at async workerMessageRecvCallback ([WILDCARD]runtime_worker.ts:[WILDCARD])
diff --git a/deno_typescript/compiler_main.js b/deno_typescript/compiler_main.js
index 234ed6002..31f539a27 100644
--- a/deno_typescript/compiler_main.js
+++ b/deno_typescript/compiler_main.js
@@ -19,14 +19,25 @@ function main(configText, rootNames) {
const host = new Host();
- assert(rootNames.length > 0);
-
+ assert(rootNames.length === 1);
+ // If root file is external file, ie. URL with "file://"
+ // then create an internal name - in case of bundling
+ // cli runtime this is always true.
+ const rootFile = rootNames[0];
+ const result = externalSpecifierRegEx.exec(rootFile);
+ let rootSpecifier = rootFile;
+ if (result) {
+ const [, specifier] = result;
+ const internalSpecifier = `$deno$${specifier}`;
+ moduleMap.set(internalSpecifier, rootFile);
+ rootSpecifier = internalSpecifier;
+ }
const { options, diagnostics } = configure(configText);
handleDiagnostics(host, diagnostics);
println(`>>> TS config: ${JSON.stringify(options)}`);
- const program = ts.createProgram(rootNames, options, host);
+ const program = ts.createProgram([rootSpecifier], options, host);
handleDiagnostics(
host,
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-27 16:03:57 +0000