diff options
| -rw-r--r-- | lib/parse.js | 3 | ||||
| -rw-r--r-- | test/compress/imports.js | 11 | ||||
| -rw-r--r-- | test/sandbox.js | 4 | ||||
| -rw-r--r-- | test/ufuzz/index.js | 6 |
4 files changed, 21 insertions, 3 deletions
diff --git a/lib/parse.js b/lib/parse.js index c3ae96d9..41b61b5a 100644 --- a/lib/parse.js +++ b/lib/parse.js @@ -854,7 +854,8 @@ function parse($TEXT, options) { next(); return export_(); case "import": - if (!is_token(peek(), "punc", "(")) { + var token = peek(); + if (!(token.type == "punc" && /^[(.]$/.test(token.value))) { next(); return import_(); } diff --git a/test/compress/imports.js b/test/compress/imports.js index dbffb161..d0e6af56 100644 --- a/test/compress/imports.js +++ b/test/compress/imports.js @@ -54,13 +54,22 @@ dynamic_nought: { expect_exact: "import(foo);" } -import_meta: { +import_meta_1: { input: { console.log(import.meta, import.meta.url); } expect_exact: "console.log(import.meta,import.meta.url);" } +import_meta_2: { + input: { + import.meta.url.split("/").forEach(function(part, index) { + console.log(index, part); + }); + } + expect_exact: 'import.meta.url.split("/").forEach(function(part,index){console.log(index,part)});' +} + same_quotes: { beautify = { beautify: true, diff --git a/test/sandbox.js b/test/sandbox.js index 630a605c..59b2a231 100644 --- a/test/sandbox.js +++ b/test/sandbox.js @@ -55,6 +55,8 @@ exports.patch_module_statements = function(code) { if (!header) return ""; if (header.length == 1) return "0, " + header; return header.slice(0, -1) + " _" + ++count + header.slice(-1); + }).replace(/\bimport\.meta\b/g, function() { + return '({ url: "https://example.com/path/index.html" })'; }).replace(/\bimport\b(?:\s*([^('"]+)\bfrom\b)?\s*(['"]).*?\2(?:$|\n|;)/g, function(match, symbols) { if (symbols) { if (!/^[{*]/.test(symbols)) symbols = "default:" + symbols; @@ -220,7 +222,7 @@ function setup(global, builtins, setup_log, setup_tty) { if (arg === global) return "[object global]"; if (/Error$/.test(arg.name)) return arg.toString(); if (typeof arg.then == "function") return "[object Promise]"; - arg.constructor.toString(); + if (arg.constructor) arg.constructor.toString(); var index = cache.original.indexOf(arg); if (index >= 0) return cache.replaced[index]; if (--cache.level < 0) return "[object Object]"; diff --git a/test/ufuzz/index.js b/test/ufuzz/index.js index 768009a9..7eadc9ab 100644 --- a/test/ufuzz/index.js +++ b/test/ufuzz/index.js @@ -204,12 +204,18 @@ var VALUES = [ '"function"', "this", ]; +VALUES = VALUES.concat(VALUES); +VALUES = VALUES.concat(VALUES); if (SUPPORT.bigint) VALUES = VALUES.concat([ "(!0o644n)", "([3n][0] > 2)", "(-42n).toString()", "Number(0XDEADn << 16n | 0xbeefn)", ]); +VALUES = VALUES.concat(VALUES); +VALUES = VALUES.concat(VALUES); +VALUES = VALUES.concat(VALUES); +VALUES.push("import.meta"); var BINARY_OPS = [ " + ", // spaces needed to disambiguate with ++ cases (could otherwise cause syntax errors) |