From b7eb1f91543d7e7e1c4977ba415dfee829d7a16b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EA=B0=95=EB=8F=99=EC=9C=A4?= Date: Sat, 27 Mar 2021 00:45:51 +0900 Subject: [PATCH] fix(es/transforms/base): Fix fixer (#1496) swc_ecma_transforms_base: - Fix `('a' ?? 'b') || c`. --- .github/workflows/cargo.yml | 19 ++ deny.toml | 206 ++++++++++++++++++ ecmascript/transforms/base/src/fixer.rs | 6 + tests/fixture/issue-1309/case1/input/.swcrc | 25 +++ tests/fixture/issue-1309/case1/input/index.ts | 3 + .../fixture/issue-1309/case1/output/index.map | 1 + .../fixture/issue-1309/case1/output/index.ts | 7 + tests/projects.rs | 7 + 8 files changed, 274 insertions(+) create mode 100644 deny.toml create mode 100644 tests/fixture/issue-1309/case1/input/.swcrc create mode 100644 tests/fixture/issue-1309/case1/input/index.ts create mode 100644 tests/fixture/issue-1309/case1/output/index.map create mode 100644 tests/fixture/issue-1309/case1/output/index.ts diff --git a/.github/workflows/cargo.yml b/.github/workflows/cargo.yml index 03745fb5217f..181b8700d331 100644 --- a/.github/workflows/cargo.yml +++ b/.github/workflows/cargo.yml @@ -17,6 +17,25 @@ env: RUST_LOG: "debug" jobs: + check-license: + name: Check license + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + + - name: Install Rust + uses: actions-rs/toolchain@v1 + with: + profile: minimal + + - name: Install required tools + run: | + cargo install cargo-deny + + - name: Check licenses + run: | + cargo deny check + fmt: name: fmt runs-on: ubuntu-latest diff --git a/deny.toml b/deny.toml new file mode 100644 index 000000000000..89a4a3e74c14 --- /dev/null +++ b/deny.toml @@ -0,0 +1,206 @@ +# This template contains all of the possible sections and their default values + +# Note that all fields that take a lint level have these possible values: +# * deny - An error will be produced and the check will fail +# * warn - A warning will be produced, but the check will not fail +# * allow - No warning or error will be produced, though in some cases a note +# will be + +# The values provided in this template are the default values that will be used +# when any section or field is not specified in your own configuration + +# If 1 or more target triples (and optionally, target_features) are specified, +# only the specified targets will be checked when running `cargo deny check`. +# This means, if a particular package is only ever used as a target specific +# dependency, such as, for example, the `nix` crate only being used via the +# `target_family = "unix"` configuration, that only having windows targets in +# this list would mean the nix crate, as well as any of its exclusive +# dependencies not shared by any other crates, would be ignored, as the target +# list here is effectively saying which targets you are building for. +targets = [ + # The triple can be any string, but only the target triples built in to + # rustc (as of 1.40) can be checked against actual config expressions + #{ triple = "x86_64-unknown-linux-musl" }, + # You can also specify which target_features you promise are enabled for a + # particular target. target_features are currently not validated against + # the actual valid features supported by the target architecture. + #{ triple = "wasm32-unknown-unknown", features = ["atomics"] }, +] + +# This section is considered when running `cargo deny check advisories` +# More documentation for the advisories section can be found here: +# https://embarkstudios.github.io/cargo-deny/checks/advisories/cfg.html +[advisories] +# The path where the advisory database is cloned/fetched into +db-path = "~/.cargo/advisory-db" +# The url(s) of the advisory databases to use +db-urls = ["https://github.com/rustsec/advisory-db"] +# The lint level for security vulnerabilities +vulnerability = "deny" +# The lint level for unmaintained crates +unmaintained = "warn" +# The lint level for crates that have been yanked from their source registry +yanked = "warn" +# The lint level for crates with security notices. Note that as of +# 2019-12-17 there are no security notice advisories in +# https://github.com/rustsec/advisory-db +notice = "warn" +# A list of advisory IDs to ignore. Note that ignored advisories will still +# output a note when they are encountered. +ignore = [ + #"RUSTSEC-0000-0000", +] +# Threshold for security vulnerabilities, any vulnerability with a CVSS score +# lower than the range specified will be ignored. Note that ignored advisories +# will still output a note when they are encountered. +# * None - CVSS Score 0.0 +# * Low - CVSS Score 0.1 - 3.9 +# * Medium - CVSS Score 4.0 - 6.9 +# * High - CVSS Score 7.0 - 8.9 +# * Critical - CVSS Score 9.0 - 10.0 +#severity-threshold = + +# This section is considered when running `cargo deny check licenses` +# More documentation for the licenses section can be found here: +# https://embarkstudios.github.io/cargo-deny/checks/licenses/cfg.html +[licenses] +# The lint level for crates which do not have a detectable license +unlicensed = "deny" +# List of explictly allowed licenses +# See https://spdx.org/licenses/ for list of possible licenses +# [possible values: any SPDX 3.11 short identifier (+ optional exception)]. +allow = [ + "MIT", + "Apache-2.0", + "BSD-2-Clause", + "BSD-3-Clause", + "CC0-1.0", + "ISC", +] +# List of explictly disallowed licenses +# See https://spdx.org/licenses/ for list of possible licenses +# [possible values: any SPDX 3.11 short identifier (+ optional exception)]. +deny = [ + #"Nokia", +] +# Lint level for licenses considered copyleft +copyleft = "deny" +# Blanket approval or denial for OSI-approved or FSF Free/Libre licenses +# * both - The license will be approved if it is both OSI-approved *AND* FSF +# * either - The license will be approved if it is either OSI-approved *OR* FSF +# * osi-only - The license will be approved if is OSI-approved *AND NOT* FSF +# * fsf-only - The license will be approved if is FSF *AND NOT* OSI-approved +# * neither - This predicate is ignored and the default lint level is used +allow-osi-fsf-free = "neither" +# Lint level used when no other predicates are matched +# 1. License isn't in the allow or deny lists +# 2. License isn't copyleft +# 3. License isn't OSI/FSF, or allow-osi-fsf-free = "neither" +default = "deny" +# The confidence threshold for detecting a license from license text. +# The higher the value, the more closely the license text must be to the +# canonical license text of a valid SPDX license file. +# [possible values: any between 0.0 and 1.0]. +confidence-threshold = 0.8 +# Allow 1 or more licenses on a per-crate basis, so that particular licenses +# aren't accepted for every possible crate as with the normal allow list +exceptions = [ + # Each entry is the crate and version constraint, and its specific allow + # list + #{ allow = ["Zlib"], name = "adler32", version = "*" }, +] + +# Some crates don't have (easily) machine readable licensing information, +# adding a clarification entry for it allows you to manually specify the +# licensing information +#[[licenses.clarify]] +# The name of the crate the clarification applies to +#name = "ring" +# The optional version constraint for the crate +#version = "*" +# The SPDX expression for the license requirements of the crate +#expression = "MIT AND ISC AND OpenSSL" +# One or more files in the crate's source used as the "source of truth" for +# the license expression. If the contents match, the clarification will be used +# when running the license check, otherwise the clarification will be ignored +# and the crate will be checked normally, which may produce warnings or errors +# depending on the rest of your configuration +#license-files = [ +# Each entry is a crate relative path, and the (opaque) hash of its contents +#{ path = "LICENSE", hash = 0xbd0eed23 } +#] + +[licenses.private] +# If true, ignores workspace crates that aren't published, or are only +# published to private registries +ignore = false +# One or more private registries that you might publish crates to, if a crate +# is only published to private registries, and ignore is true, the crate will +# not have its license(s) checked +registries = [ + #"https://sekretz.com/registry +] + +# This section is considered when running `cargo deny check bans`. +# More documentation about the 'bans' section can be found here: +# https://embarkstudios.github.io/cargo-deny/checks/bans/cfg.html +[bans] +# Lint level for when multiple versions of the same crate are detected +multiple-versions = "allow" +# Lint level for when a crate version requirement is `*` +wildcards = "allow" +# The graph highlighting used when creating dotgraphs for crates +# with multiple versions +# * lowest-version - The path to the lowest versioned duplicate is highlighted +# * simplest-path - The path to the version with the fewest edges is highlighted +# * all - Both lowest-version and simplest-path are used +highlight = "all" +# List of crates that are allowed. Use with care! +allow = [ + #{ name = "ansi_term", version = "=0.11.0" }, +] +# List of crates to deny +deny = [ + # Each entry the name of a crate and a version range. If version is + # not specified, all versions will be matched. + #{ name = "ansi_term", version = "=0.11.0" }, + # + # Wrapper crates can optionally be specified to allow the crate when it + # is a direct dependency of the otherwise banned crate + #{ name = "ansi_term", version = "=0.11.0", wrappers = [] }, +] +# Certain crates/versions that will be skipped when doing duplicate detection. +skip = [ + #{ name = "ansi_term", version = "=0.11.0" }, +] +# Similarly to `skip` allows you to skip certain crates during duplicate +# detection. Unlike skip, it also includes the entire tree of transitive +# dependencies starting at the specified crate, up to a certain depth, which is +# by default infinite +skip-tree = [ + #{ name = "ansi_term", version = "=0.11.0", depth = 20 }, +] + +# This section is considered when running `cargo deny check sources`. +# More documentation about the 'sources' section can be found here: +# https://embarkstudios.github.io/cargo-deny/checks/sources/cfg.html +[sources] +# Lint level for what to happen when a crate from a crate registry that is not +# in the allow list is encountered +unknown-registry = "warn" +# Lint level for what to happen when a crate from a git repository that is not +# in the allow list is encountered +unknown-git = "warn" +# List of URLs for allowed crate registries. Defaults to the crates.io index +# if not specified. If it is specified but empty, no registries are allowed. +allow-registry = ["https://github.com/rust-lang/crates.io-index"] +# List of URLs for allowed Git repositories +allow-git = [] + +[sources.allow-org] +# 1 or more github.com organizations to allow git sources for +github = [] +# 1 or more gitlab.com organizations to allow git sources for +gitlab = [] +# 1 or more bitbucket.org organizations to allow git sources for +bitbucket = [] diff --git a/ecmascript/transforms/base/src/fixer.rs b/ecmascript/transforms/base/src/fixer.rs index 7472d929dc43..c4d150eb301c 100644 --- a/ecmascript/transforms/base/src/fixer.rs +++ b/ecmascript/transforms/base/src/fixer.rs @@ -171,6 +171,10 @@ impl VisitMut for Fixer<'_> { }; match &mut *expr.left { + Expr::Bin(BinExpr { op: op!("??"), .. }) => { + self.wrap(&mut expr.left); + } + // While simplifying, (1 + x) * Nan becomes `1 + x * Nan`. // But it should be `(1 + x) * Nan` Expr::Bin(BinExpr { op: op_of_lhs, .. }) => { @@ -1066,4 +1070,6 @@ var store = global[SHARED] || (global[SHARED] = {}); ); identical!(deno_9810, "await (bar = Promise.resolve(2));"); + + identical!(issue_1493, "('a' ?? 'b') || ''"); } diff --git a/tests/fixture/issue-1309/case1/input/.swcrc b/tests/fixture/issue-1309/case1/input/.swcrc new file mode 100644 index 000000000000..dcefe7fe23a9 --- /dev/null +++ b/tests/fixture/issue-1309/case1/input/.swcrc @@ -0,0 +1,25 @@ +{ + "jsc": { + "parser": { + "syntax": "typescript", + "tsx": true, + "dynamicImport": false, + "decorators": false + }, + "transform": { + "legacyDecorator": true, + "decoratorMetadata": true + }, + "target": "es2016", + "loose": false, + "externalHelpers": true + }, + "module": { + "type": "commonjs", + "strict": false, + "strictMode": true, + "lazy": false, + "noInterop": false + }, + "sourceMaps": true +} diff --git a/tests/fixture/issue-1309/case1/input/index.ts b/tests/fixture/issue-1309/case1/input/index.ts new file mode 100644 index 000000000000..693e566846a5 --- /dev/null +++ b/tests/fixture/issue-1309/case1/input/index.ts @@ -0,0 +1,3 @@ + + +export const foo = 1; \ No newline at end of file diff --git a/tests/fixture/issue-1309/case1/output/index.map b/tests/fixture/issue-1309/case1/output/index.map new file mode 100644 index 000000000000..1e6b445defcc --- /dev/null +++ b/tests/fixture/issue-1309/case1/output/index.map @@ -0,0 +1 @@ +{"version":3,"sources":["$DIR/tests/fixture/issue-1309/case1/input/index.ts"],"sourcesContent":["/n/nexport const foo = 1;"],"names":[],"mappings":";;;;;MAEa,GAAG,GAAG,CAAC;QAAP,GAAG,GAAH,GAAG"} diff --git a/tests/fixture/issue-1309/case1/output/index.ts b/tests/fixture/issue-1309/case1/output/index.ts new file mode 100644 index 000000000000..80b8bb6072b2 --- /dev/null +++ b/tests/fixture/issue-1309/case1/output/index.ts @@ -0,0 +1,7 @@ +"use strict"; +Object.defineProperty(exports, "__esModule", { + value: true +}); +exports.foo = void 0; +const foo = 1; +exports.foo = foo; diff --git a/tests/projects.rs b/tests/projects.rs index b8ff45ef14cc..c4f4e9b51701 100644 --- a/tests/projects.rs +++ b/tests/projects.rs @@ -631,6 +631,13 @@ fn tests(dir: PathBuf) { NormalizedOutput::from(v.code) .compare_to_file(output.join(entry.file_name())) .unwrap(); + + NormalizedOutput::from(v.map.unwrap_or_default()) + .compare_to_file( + output + .join(entry.path().with_extension("map").file_name().unwrap()), + ) + .unwrap(); } Err(ref err) if format!("{:?}", err).contains("not matched") => {} Err(err) => panic!("Error: {:?}", err),