From ea6a43831550488fa137b4e3de7ed0c7653bb641 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=B2=20Ribaudo?= Date: Fri, 26 Feb 2021 23:33:26 +0100 Subject: [PATCH] Enable `external-helpers` by default in tests (#12911) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Huáng Jùnliàng Co-authored-by: Babel Bot --- CONTRIBUTING.md | 49 +++++++--- .../fixtures/transformation/misc/options.json | 3 - .../misc/regression-1155/options.json | 6 +- .../misc/regression-2765/options.json | 6 +- .../misc/regression-2892/output.js | 21 +--- .../misc/regression-4855/options.json | 5 +- .../source-maps/class/options.json | 6 +- .../transformation/source-maps/options.json | 3 - .../output.js | 7 +- .../recursive-class-property-type/output.js | 4 +- .../ignore-abstract-methods/output.js | 34 +------ .../loose-true/output.js | 6 +- .../fixtures/replace-supers/method/output.js | 8 +- .../loose-false/output.js | 4 +- packages/babel-helper-fixtures/src/index.js | 2 + .../src/index.js | 9 ++ .../babel-helpers/test/fixtures/options.json | 3 + .../test/fixtures/opts/whitelist/options.json | 1 + .../class-private-method/options.json | 2 +- .../fixtures/async-generators/options.json | 2 +- .../async-generators/yield-exec/options.json | 1 - .../async-function-no-transform/options.json | 2 +- .../async-generator-exec/options.json | 1 - .../test/fixtures/for-await/options.json | 1 - .../test/fixtures/nested/options.json | 1 - .../fixtures/regression/5880/options.json | 6 +- .../yield-star-polyfill-corejs3/options.json | 1 + .../test/fixtures/yield-star/options.json | 1 - .../output.js | 88 ++++++++--------- .../options.json | 2 +- .../foobar/options.json | 5 +- .../options.json | 6 +- .../regression-T7364/options.json | 6 +- .../static-super-loose/options.json | 1 - .../output.js | 4 +- .../output.js | 7 +- .../local-define-property/output.js | 25 ++--- .../decorators-legacy-interop/loose/output.js | 21 +--- .../strict/output.js | 25 ++--- .../test/fixtures/nested-class/options.json | 6 +- .../options.json | 6 -- .../logical-assignment/output.js | 22 ++--- .../private-loose/native-classes/options.json | 6 -- .../non-block-arrow-func/options.json | 6 -- .../output.js | 92 ++++++++--------- .../output.js | 92 ++++++++--------- .../output.js | 88 ++++++++--------- .../optional-chain-before-property/output.js | 88 ++++++++--------- .../options.json | 2 +- .../output.js | 72 +++++++------- .../optional-chain-delete-property/output.js | 72 +++++++------- .../output.js | 26 ++--- .../output.js | 24 ++--- .../output.js | 14 +-- .../output.js | 98 +++++++++---------- .../output.js | 98 +++++++++---------- .../output.js | 98 +++++++++---------- .../output.js | 98 +++++++++---------- .../output.js | 94 +++++++++--------- .../output.js | 94 +++++++++--------- .../test/fixtures/private-loose/options.json | 1 - .../options.json | 1 - .../options.json | 5 +- .../private-loose/reevaluated/options.json | 6 -- .../private-loose/static-export/options.json | 6 -- .../static-infer-name/options.json | 6 -- .../static-inherited/options.json | 6 -- .../static-undefined/options.json | 6 -- .../private-loose/static/options.json | 6 -- .../options.json | 6 -- .../fixtures/private/instance/options.json | 6 -- .../private/logical-assignment/output.js | 12 +-- .../private/native-classes/options.json | 6 -- .../private/non-block-arrow-func/options.json | 6 -- .../output.js | 88 ++++++++--------- .../output.js | 88 ++++++++--------- .../output.js | 86 ++++++++-------- .../optional-chain-before-property/output.js | 86 ++++++++-------- .../options.json | 2 +- .../output.js | 72 +++++++------- .../optional-chain-delete-property/output.js | 70 ++++++------- .../output.js | 22 ++--- .../output.js | 22 ++--- .../output.js | 10 +- .../output.js | 94 +++++++++--------- .../output.js | 94 +++++++++--------- .../output.js | 94 +++++++++--------- .../output.js | 94 +++++++++--------- .../output.js | 92 ++++++++--------- .../output.js | 92 ++++++++--------- .../test/fixtures/private/options.json | 1 - .../options.json | 6 +- .../options.json | 5 +- .../fixtures/private/reevaluated/options.json | 6 -- .../private/regression-T2983/options.json | 6 -- .../private/regression-T6719/options.json | 6 -- .../private/regression-T7364/options.json | 6 -- .../private/static-export/options.json | 6 -- .../private/static-infer-name/options.json | 6 -- .../private/static-inherited/options.json | 6 -- .../private/static-undefined/options.json | 6 -- .../test/fixtures/private/static/options.json | 6 -- .../options.json | 6 +- .../arrow-this-without-transform/options.json | 6 +- .../fixtures/public-loose/foobar/options.json | 5 +- .../test/fixtures/public-loose/options.json | 1 - .../regression-T7364/options.json | 1 - .../options.json | 6 +- .../arrow-this-without-transform/options.json | 6 +- .../options.json | 5 +- .../options.json | 5 +- .../options.json | 5 +- .../test/fixtures/public/foobar/options.json | 2 +- .../test/fixtures/public/foobar/output.js | 6 +- .../public/native-classes/options.json | 1 - .../test/fixtures/public/options.json | 1 - .../public/regression-T7364/options.json | 6 +- .../options.json | 1 - .../options.json | 1 - .../options.json | 1 - .../options.json | 1 - .../fixtures/regression/6153/options.json | 6 +- .../test/fixtures/regression/6154/output.js | 42 ++------ .../fixtures/regression/7371/options.json | 6 +- .../fixtures/regression/7951/options.json | 2 +- .../fixtures/regression/8110/options.json | 2 +- .../fixtures/regression/8882/options.json | 2 +- .../fixtures/regression/T2983/options.json | 1 - .../fixtures/regression/T6719/options.json | 1 - .../fixtures/regression/T7364/options.json | 1 - .../decorator-interop/output.js | 22 +---- .../static-property-tdz/edgest-case/output.js | 12 +-- .../static-property-tdz/general/output.js | 12 +-- .../static-property-tdz/loose/output.js | 4 +- .../fixtures/integration-loose/options.json | 3 +- .../integration/name-conflict/output.js | 4 +- .../test/fixtures/integration/options.json | 3 +- .../fixtures/duplicated-keys/options.json | 8 +- .../fixtures/element-descriptors/options.json | 8 +- .../test/fixtures/finishers/options.json | 8 +- .../method-decorators/output.mjs | 6 +- .../fixtures/legacy-regression/7030/output.js | 25 +---- .../legacy-regression/8041/output.mjs | 4 +- .../test/fixtures/misc/options.json | 8 +- .../test/fixtures/ordering/options.json | 8 +- .../async-generator-method/options.json | 3 +- .../class-decorators-yield-await/options.json | 8 +- .../test/fixtures/transformation/options.json | 8 +- .../fixtures/amd/missing-plugin/options.json | 5 +- .../test/fixtures/amd/no-interop/options.json | 3 +- .../test/fixtures/amd/options.json | 6 +- .../commonjs/missing-plugin/options.json | 5 +- .../fixtures/commonjs/no-interop/options.json | 3 +- .../test/fixtures/commonjs/options.json | 6 +- .../missing-plugin-babel-7/options.json | 5 +- .../systemjs/missing-plugin/options.json | 5 +- .../test/fixtures/systemjs/options.json | 6 +- .../test/fixtures/export-default/options.json | 2 +- .../namespace-string/options.json | 6 +- .../fixtures/export-namespace/options.json | 2 +- .../test/fixtures/regression/6458/output.js | 4 +- .../test/fixtures/regression/T6984/output.js | 11 +-- .../fixtures/function-sent/basic/output.js | 4 +- .../fixtures/function-sent/multiple/output.js | 4 +- .../yield-function-sent/output.js | 4 +- .../generator-kinds/async-generator/output.js | 22 +---- .../generator-kinds/class-method/output.js | 4 +- .../export-default-anonymous/output.mjs | 4 +- .../export-default-named/output.mjs | 4 +- .../generator-kinds/export/output.mjs | 4 +- .../expression-anonymous/output.js | 4 +- .../expression-named/output.js | 4 +- .../generator-kinds/object-method/output.js | 4 +- .../generator-kinds/statement/output.js | 4 +- .../output.js | 8 +- .../options.json | 5 +- .../assumption-pureGetters/options.json | 5 +- .../options.json | 5 +- .../options.json | 5 +- .../duplicate-decl-bug/options.json | 6 +- .../test/fixtures/object-rest/options.json | 5 +- .../options.json | 5 +- .../object-spread-loose/assignment/output.js | 6 +- .../object-spread-loose/expression/output.js | 17 +--- .../output.js | 8 +- .../object-spread-loose/side-effect/output.js | 11 +-- .../variable-declaration/output.js | 4 +- .../object-spread/assignment/output.js | 10 +- .../object-spread/expression/output.js | 21 +--- .../object-spread/side-effect/output.js | 15 +-- .../variable-declaration/output.js | 8 +- .../fixtures/regression/T7178/options.json | 3 +- .../fixtures/regression/gh-7304/options.json | 3 +- .../fixtures/regression/gh-7304/output.js | 2 +- .../fixtures/regression/gh-8323/output.js | 5 +- .../test/fixtures/regression/options.json | 2 +- .../general/function-call-spread/options.json | 6 +- .../fixtures/accessors-loose/options.json | 6 -- .../options.json | 6 +- .../test/fixtures/accessors/options.json | 6 -- .../assumption-constantSuper/options.json | 6 -- .../fixtures/duplicated-names/options.json | 6 -- .../private-method-loose/async/options.json | 1 - .../generator/options.json | 1 - .../private-method-loose/options.json | 6 -- .../async/options.json | 6 +- .../options.json | 6 +- .../private-method/async/options.json | 6 +- .../private-method/generator/options.json | 6 +- .../test/fixtures/private-method/options.json | 6 -- .../async/options.json | 6 -- .../private-static-method-loose/options.json | 6 -- .../async/options.json | 6 +- .../options.json | 6 +- .../private-static-method/async/options.json | 6 -- .../private-static-method/options.json | 6 -- .../static-accessors-loose/options.json | 6 -- .../options.json | 6 +- .../fixtures/static-accessors/options.json | 6 -- .../compiled-classes/options.json | 1 - .../options.json | 1 - .../private-loose/native-classes/options.json | 1 - .../test/fixtures/private-loose/options.json | 1 - .../private/native-classes/options.json | 1 - .../test/fixtures/private/options.json | 1 - .../self-referential/options.json | 1 - .../arrow-functions/spec/options.json | 5 +- .../options.json | 2 +- .../newableArrowFunction-default/options.json | 5 +- .../options.json | 5 +- .../options.json | 5 +- .../basic/options.json | 2 +- .../bluebird/options.json | 1 - .../options.json | 3 +- .../async-iife-with-regenerator/options.json | 3 +- .../function-arity/options.json | 2 +- .../object-method-with-super/options.json | 2 +- .../fixtures/async-to-generator/options.json | 6 +- .../shadowed-promise-import/output.mjs | 10 +- .../shadowed-promise-nested/output.js | 10 +- .../shadowed-promise/output.js | 10 +- .../fixtures/bluebird-coroutines/options.json | 1 - .../test/fixtures/export-async/options.json | 6 +- .../test/fixtures/regression/4943/output.js | 6 +- .../fixtures/regression/7178/options.json | 1 - .../test/fixtures/regression/8783/output.js | 6 +- .../fixtures/regression/T6882/options.json | 1 - .../fixtures/regression/T7194/options.json | 6 +- .../test/fixtures/regression/options.json | 2 +- .../deadcode-violation/output.js | 4 +- .../destructuring-assignment/output.js | 4 +- .../fixtures/const-violations/loop/output.js | 4 +- .../nested-update-expressions/output.js | 4 +- .../const-violations/no-assignment/output.js | 4 +- .../const-violations/no-for-in/output.js | 5 +- .../update-expression-prefix/output.js | 4 +- .../update-expression/output.js | 4 +- .../fixtures/general/hoisting/options.json | 3 +- .../general/issue-10046-async/output.js | 6 +- .../fixtures/general/issue-10339/output.js | 4 +- .../test/fixtures/tdz/options.json | 5 +- .../options.json | 1 - .../assumption-constantSuper/options.json | 1 - .../assumption-noCallClass/options.json | 1 - .../options.json | 1 - .../assumption-setClassMethods/options.json | 1 - .../options.json | 1 - .../fixtures/extend-builtins/loose/output.js | 18 +--- .../extend-builtins/shadowed/options.json | 2 +- .../extend-builtins/shadowed/output.js | 6 +- .../fixtures/extend-builtins/spec/output.js | 31 +----- .../wrap-native-super/options.json | 6 +- .../output.js | 6 +- .../output.js | 13 +-- .../output.js | 6 +- .../output.js | 13 +-- .../output.js | 6 +- .../output.js | 13 +-- .../output.js | 6 +- .../output.js | 13 +-- .../get-set-loose/memoized-assign/output.js | 6 +- .../get-set-loose/memoized-update/output.js | 6 +- .../output.js | 6 +- .../output.js | 13 +-- .../output.js | 6 +- .../output.js | 13 +-- .../output.js | 6 +- .../output.js | 13 +-- .../output.js | 13 +-- .../output.js | 50 ++-------- .../output.js | 50 ++-------- .../output.js | 38 ++----- .../output.js | 41 ++------ .../get-set/change-computed-key/output.js | 11 +-- .../output.js | 38 ++----- .../output.js | 41 ++------ .../output.js | 38 ++----- .../output.js | 41 ++------ .../get-set/memoized-assign/output.js | 46 ++------- .../get-set/memoized-update/output.js | 46 ++------- .../get-set/method-conflict/output.js | 11 +-- .../fixtures/get-set/numeric-keys/output.js | 11 +-- .../output.js | 42 ++------ .../output.js | 45 ++------- .../output.js | 42 ++------ .../output.js | 42 ++------ .../output.js | 42 ++------ .../output.js | 42 ++------ .../output.js | 45 ++------- .../with-superClass/output.js | 10 +- .../options.json | 1 - .../options.json | 1 - .../test/fixtures/loose/options.json | 1 - .../test/fixtures/regression/2663/output.js | 6 +- .../fixtures/regression/2694/options.json | 1 - .../test/fixtures/regression/2694/output.js | 6 +- .../test/fixtures/regression/2775/output.js | 6 +- .../test/fixtures/regression/3028/output.js | 8 +- .../test/fixtures/regression/5769/output.js | 6 +- .../test/fixtures/regression/5817/output.js | 6 +- .../test/fixtures/regression/8499/output.js | 6 +- .../test/fixtures/regression/T2494/output.js | 6 +- .../test/fixtures/regression/T2997/output.js | 6 +- .../test/fixtures/regression/T6755/output.js | 6 +- .../fixtures/regression/T7010/options.json | 2 +- .../test/fixtures/regression/T7537/output.js | 29 +----- .../test/fixtures/regression/options.json | 2 +- .../options.json | 1 - .../options.json | 1 - .../spec/name-method-collision/options.json | 1 - .../test/fixtures/spec/options.json | 1 - .../options.json | 1 - .../options.json | 1 - .../options.json | 1 - .../options.json | 1 - .../output.js | 30 +----- .../output.js | 30 +----- .../options.json | 6 +- .../options.json | 6 +- .../options.json | 6 +- .../options.json | 5 +- .../test/fixtures/loose/options.json | 5 +- .../fixtures/regression/7144/options.json | 2 +- .../test/fixtures/spec/options.json | 2 +- .../spec/proto-shorthand/options.json | 6 +- .../allowArrayLike/holes/options.json | 5 +- .../length-cropped/options.json | 5 +- .../allowArrayLike/simple/options.json | 5 +- .../options.json | 5 +- .../assumption-iterableIsArray/options.json | 5 +- .../options.json | 5 +- .../es7-object-rest-builtins/options.json | 1 - .../es7-object-rest-loose/options.json | 3 +- .../destructuring/issue-5628/options.json | 1 - .../test/fixtures/destructuring/options.json | 1 - .../test/fixtures/regression/11210/output.mjs | 4 +- .../test/fixtures/combination/options.json | 6 +- .../test/fixtures/regression/4349/output.js | 14 +-- .../options.json | 2 +- .../options.json | 2 +- .../options.json | 6 +- .../class-fields-uninitialized/options.json | 6 +- .../options.json | 2 +- .../options.json | 2 +- .../allowArrayLike/holes/options.json | 5 +- .../length-cropped/options.json | 5 +- .../allowArrayLike/simple/options.json | 5 +- .../options.json | 5 +- .../options.json | 5 +- .../loose-allowArrayLike/holes/options.json | 5 +- .../length-cropped/options.json | 5 +- .../loose-allowArrayLike/simple/options.json | 5 +- .../test/fixtures/loose-exec/options.json | 5 +- .../test/fixtures/loose/options.json | 5 +- .../test/fixtures/opt/options.json | 6 +- .../test/fixtures/regression/options.json | 5 +- .../test/fixtures/spec-exec/options.json | 5 +- .../test/fixtures/spec/options.json | 5 +- .../function-name/modules-2/options.json | 1 - .../function-name/modules-3/options.json | 1 - .../function-name/modules-3/output.js | 6 +- .../function-name/modules/options.json | 1 - .../test/fixtures/function-name/options.json | 1 - .../options.json | 1 - .../options.json | 6 +- .../test/fixtures/issues/5004/options.json | 2 +- .../test/fixtures/issues/7199/options.json | 2 +- .../instanceof/instanceof/options.json | 2 +- .../test/fixtures/jscript/options.json | 1 - .../amd/get-module-name-option/options.json | 12 ++- .../fixtures/amd/module-name/options.json | 5 +- .../amd/noInterop-export-from/options.json | 5 +- .../options.json | 5 +- .../test/fixtures/amd/options.json | 2 +- .../assumption-constantReexports/options.json | 2 +- .../options.json | 2 +- .../options.json | 1 - .../interop-module-string-names/options.json | 6 +- .../options.json | 2 +- .../loose/get-module-name-option/options.json | 14 +-- .../loose/module-name-compat/options.json | 2 +- .../fixtures/loose/module-name/options.json | 12 ++- .../loose/noInterop-export-from/options.json | 1 - .../options.json | 1 - .../test/fixtures/loose/options.json | 2 +- .../fixtures/regression/4192/options.json | 6 +- .../assumption-constantReexports/options.json | 2 +- .../options.json | 2 +- .../fixtures/auxiliary-comment/options.json | 2 +- .../fixtures/disable-strict-mode/options.json | 5 +- .../imports-hoisting/options.json | 1 + .../interop-loose/multi-load/options.json | 1 + .../test/fixtures/interop-loose/options.json | 6 +- .../options.json | 1 - .../interop-module-string-names/options.json | 6 +- .../interop/imports-hoisting/options.json | 1 + .../fixtures/interop/multi-load/options.json | 1 + .../test/fixtures/interop/options.json | 3 +- .../test/fixtures/lazy-dep/options.json | 5 +- .../test/fixtures/lazy-local/options.json | 5 +- .../test/fixtures/lazy-whitelist/options.json | 5 +- .../test/fixtures/misc/options.json | 1 + .../misc/reference-source-map/options.json | 3 +- .../options.json | 6 +- .../options.json | 6 +- .../options.json | 6 +- .../options.json | 6 +- .../test/fixtures/noInterop/options.json | 5 +- .../test/fixtures/options.json | 3 + .../regression/lazy-7176/options.json | 6 +- .../test/fixtures/source-map/options.json | 2 +- .../test/fixtures/strict/options.json | 1 - .../fixtures/update-expression/options.json | 2 +- .../test/fixtures/import-meta/options.json | 2 +- .../interop-module-string-names/options.json | 6 +- .../regression/issue-12329/output.mjs | 4 +- .../options.json | 5 +- .../get-module-name-option/options.json | 12 ++- .../test/fixtures/systemjs/options.json | 2 +- .../test/fixtures/tla/options.json | 2 +- .../assumption-constantReexports/options.json | 2 +- .../options.json | 2 +- .../options.json | 1 - .../interop-module-string-names/options.json | 6 +- .../options.json | 2 +- .../loose/get-module-name-option/options.json | 14 +-- .../options.json | 1 - .../options.json | 1 - .../imports-exact-globals-true/options.json | 1 - .../options.json | 1 - .../options.json | 1 - .../options.json | 1 - .../fixtures/loose/module-id/options.json | 2 +- .../loose/module-name-compat/options.json | 2 +- .../options.json | 1 - .../options.json | 1 - .../fixtures/loose/module-name/options.json | 12 ++- .../test/fixtures/loose/options.json | 2 +- .../loose/override-export-name/options.json | 1 - .../loose/override-import-name/options.json | 1 - .../fixtures/regression/4192/options.json | 6 +- .../umd/get-module-name-option/options.json | 12 ++- .../options.json | 1 - .../options.json | 1 - .../imports-exact-globals-true/options.json | 1 - .../options.json | 1 - .../options.json | 1 - .../options.json | 1 - .../options.json | 1 - .../options.json | 1 - .../fixtures/umd/module-name/options.json | 10 +- .../test/fixtures/umd/options.json | 2 +- .../umd/override-export-name/options.json | 1 - .../umd/override-import-name/options.json | 1 - .../test/fixtures/syntax/basic/options.json | 5 +- .../test/fixtures/syntax/options.json | 5 +- .../looks-like-a-group-unicode/options.json | 1 - .../test/fixtures/wrapper/options.json | 5 +- .../output.js | 8 +- .../output.js | 8 +- .../output.js | 8 +- .../output.js | 8 +- .../output.js | 12 +-- .../output.js | 12 +-- .../output.js | 12 +-- .../output.js | 12 +-- .../output.js | 12 +-- .../output.js | 12 +-- .../output.js | 12 +-- .../output.js | 12 +-- .../output.js | 12 +-- .../output.js | 12 +-- .../test/fixtures/object-super/options.json | 6 +- .../options.json | 6 +- .../options.json | 6 +- .../options.json | 6 +- .../options.json | 6 +- .../super-exponentiation/output.js | 14 +-- .../options.json | 1 - .../parameters/iife-this-9385/output.js | 11 +-- .../test/fixtures/parameters/options.json | 1 - .../rest-arrow-functions/options.json | 1 - .../rest-async-arrow-functions/options.json | 1 - .../fixtures/regression/11256/options.json | 3 +- .../test/fixtures/regression/4209/output.js | 11 +-- .../regression/6057-expanded/output.js | 41 ++------ .../fixtures/proto-to-assign/options.json | 2 +- .../async-function/output.mjs | 6 +- .../inline-elements/output.js | 8 +- .../parameter-destructure-rest/options.json | 3 +- .../options.json | 3 +- .../with-jsx-plugin-automatic/options.json | 1 - .../fixtures/with-jsx-plugin/options.json | 1 - .../lowercase-member-expression/options.json | 1 - .../member-expression/options.json | 1 - .../test/fixtures/options.json | 1 - .../linux/classic-runtime-babel-7/output.js | 5 +- .../test/fixtures/linux/options.json | 1 - .../classic-runtime-windows-babel-7/output.js | 5 +- .../test/fixtures/windows/options.json | 1 - .../after-polyfills-compiled-to-cjs/output.js | 4 +- .../options.json | 1 - .../fixtures/react-automatic/options.json | 1 - .../options.json | 1 - .../output.js | 6 +- .../test/fixtures/react/options.json | 1 - .../transform-to-babel-extend/options.json | 3 +- .../test/fixtures/regression/4219/output.js | 6 +- .../fixtures/absoluteRuntime/options.json | 1 + .../true-corejs3-proposals/options.json | 7 +- .../true-corejs3-stable/options.json | 10 +- .../fixtures/dual-babel-runtime/options.json | 1 + .../test/fixtures/options.json | 3 + .../windows/absoluteRuntime/options.json | 1 + .../allowArrayLike/holes/options.json | 5 +- .../length-cropped/options.json | 5 +- .../allowArrayLike/simple/options.json | 5 +- .../options.json | 5 +- .../assumption-iterableIsArray/options.json | 2 +- .../call-context/flow-type-cast/options.json | 2 +- .../test/fixtures/call-context/options.json | 2 +- .../call-context/ts-type-cast/options.json | 2 +- .../fixtures/regression/6647/options.json | 6 +- .../test/fixtures/regression/options.json | 2 +- .../test/fixtures/spread/options.json | 2 +- .../super-classes-plugin-after/options.json | 6 +- .../super-classes-plugin-before/options.json | 6 +- .../super-no-classes-plugin/options.json | 5 +- .../tag/output.js | 4 +- .../tag/output.js | 8 +- .../template-revision/output.js | 18 ++-- .../fixtures/default/cache-revision/output.js | 6 +- .../fixtures/default/simple-tag/output.js | 6 +- .../output.js | 4 +- .../tag-with-unicode-escapes/output.js | 4 +- .../test/fixtures/default/tag/output.js | 8 +- .../default/template-revision/output.js | 18 ++-- .../loose/mutableTemplateObject/output.js | 4 +- .../symbols/builtin-global/output.mjs | 4 +- .../symbols/default-export/output.mjs | 4 +- .../test/fixtures/symbols/shadow/output.js | 4 +- .../test/fixtures/symbols/typeof/options.json | 2 +- .../output.mjs | 4 +- .../output.mjs | 8 +- .../decorated-declare-properties/output.js | 12 +-- .../output.js | 23 +---- .../parameter-properties-with-class/output.js | 5 +- .../test/fixtures/regression/11061/output.js | 5 +- .../tagged-template-transformed/output.js | 12 +-- .../entry-shippedProposals/options.json | 4 +- .../test/fixtures/corejs2/options.json | 3 + .../test/fixtures/corejs3/options.json | 3 + .../test/fixtures/dynamic-import/options.json | 3 - .../export-namespace-from/options.json | 3 - .../methods-loose-preset-not-loose/output.js | 6 +- .../preset-loose-no-plugins/output.js | 6 +- .../preset-not-loose-no-plugins/output.js | 4 +- .../output.js | 6 +- .../output.js | 4 +- .../properties-loose-preset-loose/output.js | 6 +- .../output.js | 6 +- .../output.js | 4 +- .../test/fixtures/modules/options.json | 3 - .../plugins-integration/issue-10662/output.js | 5 +- .../issue-11278/options.json | 3 +- .../plugins-integration/issue-7527/output.js | 33 +------ .../plugins-integration/issue-9935/output.js | 6 +- .../test/fixtures/preset-options/options.json | 3 - .../sanity/block-scoping-for-of/options.json | 3 +- .../sanity/transform-duplicate-keys/output.js | 4 +- .../shipped-proposals/node-12/options.json | 14 +-- 591 files changed, 1859 insertions(+), 4233 deletions(-) delete mode 100644 packages/babel-core/test/fixtures/transformation/misc/options.json delete mode 100644 packages/babel-core/test/fixtures/transformation/source-maps/options.json create mode 100644 packages/babel-helpers/test/fixtures/options.json create mode 100644 packages/babel-plugin-transform-modules-commonjs/test/fixtures/options.json create mode 100644 packages/babel-plugin-transform-runtime/test/fixtures/options.json create mode 100644 packages/babel-preset-env/test/fixtures/corejs2/options.json create mode 100644 packages/babel-preset-env/test/fixtures/corejs3/options.json delete mode 100644 packages/babel-preset-env/test/fixtures/dynamic-import/options.json delete mode 100644 packages/babel-preset-env/test/fixtures/export-namespace-from/options.json delete mode 100644 packages/babel-preset-env/test/fixtures/modules/options.json delete mode 100644 packages/babel-preset-env/test/fixtures/preset-options/options.json diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 45131f18ab..ddaf920a0f 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -213,24 +213,43 @@ expect(2 ** 3).toBe(8); expect(3 * 2 ** 3).toBe(24); ``` -If you need to check for an error that is thrown you can add to the `options.json` +##### `options.json` settings -```js -// options.json example -{ - "plugins": [["@babel/plugin-proposal-object-rest-spread", { "useBuiltIns": "invalidOption" }]], - "throws": "@babel/plugin-proposal-object-rest-spread currently only accepts a boolean option for useBuiltIns (defaults to false)" -} -``` +Other than normal Babel options, `options.json` can contain other properties to configure the test behavior: -If the test requires a minimum Node version, you can add `minNodeVersion` (must be in semver format). +- **`throws`** (string) -```js -// options.json example -{ - "minNodeVersion": "5.0.0" -} -``` + If you need to check for an error that is thrown you can add to the `options.json` + + ```jsonc + // options.json example + { + "plugins": [["@babel/plugin-proposal-object-rest-spread", { "useBuiltIns": "invalidOption" }]], + "throws": "@babel/plugin-proposal-object-rest-spread currently only accepts a boolean option for useBuiltIns (defaults to false)" + } + ``` + +- **`minNodeVersion`** (string) + + If the test requires a minimum Node version, you can add `minNodeVersion` (must be in semver format). + + ```jsonc + // options.json example + { + "minNodeVersion": "5.0.0" + } + ``` + +- **`externalHelpers`** (boolean) + + By default, all the tests run with the [`@babel/plugin-external-helpers`](https://babel.dev/docs/en/babel-plugin-external-helpers) enabled. You can disable this behavior with + + ```jsonc + // options.json example + { + "externalHelpers": false + } + ``` #### `@babel/parser` (babylon) diff --git a/packages/babel-core/test/fixtures/transformation/misc/options.json b/packages/babel-core/test/fixtures/transformation/misc/options.json deleted file mode 100644 index 019532b4f9..0000000000 --- a/packages/babel-core/test/fixtures/transformation/misc/options.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "plugins": ["external-helpers"] -} diff --git a/packages/babel-core/test/fixtures/transformation/misc/regression-1155/options.json b/packages/babel-core/test/fixtures/transformation/misc/regression-1155/options.json index d650f3fb41..5d03380e6f 100644 --- a/packages/babel-core/test/fixtures/transformation/misc/regression-1155/options.json +++ b/packages/babel-core/test/fixtures/transformation/misc/regression-1155/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "transform-classes", - ["external-helpers", { "helperVersion": "7.100.0" }], - "transform-block-scoping" - ] + "plugins": ["transform-classes", "transform-block-scoping"] } diff --git a/packages/babel-core/test/fixtures/transformation/misc/regression-2765/options.json b/packages/babel-core/test/fixtures/transformation/misc/regression-2765/options.json index 12832f77b0..0fa48d5615 100644 --- a/packages/babel-core/test/fixtures/transformation/misc/regression-2765/options.json +++ b/packages/babel-core/test/fixtures/transformation/misc/regression-2765/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "transform-arrow-functions", - "transform-async-to-generator", - "external-helpers" - ] + "plugins": ["transform-arrow-functions", "transform-async-to-generator"] } diff --git a/packages/babel-core/test/fixtures/transformation/misc/regression-2892/output.js b/packages/babel-core/test/fixtures/transformation/misc/regression-2892/output.js index b440ec1ed5..0e93187867 100644 --- a/packages/babel-core/test/fixtures/transformation/misc/regression-2892/output.js +++ b/packages/babel-core/test/fixtures/transformation/misc/regression-2892/output.js @@ -5,25 +5,15 @@ Object.defineProperty(exports, "__esModule", { }); exports["default"] = void 0; -function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } - -function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - var Foo = /*#__PURE__*/function () { function Foo() { - _classCallCheck(this, Foo); + babelHelpers.classCallCheck(this, Foo); } - _createClass(Foo, [{ + babelHelpers.createClass(Foo, [{ key: "bar", value: function () { - var _bar = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() { + var _bar = babelHelpers.asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() { var baz; return regeneratorRuntime.wrap(function _callee$(_context) { while (1) { @@ -46,7 +36,6 @@ var Foo = /*#__PURE__*/function () { return bar; }() }]); - return Foo; }(); @@ -57,7 +46,7 @@ function foo() { } function _foo() { - _foo = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() { + _foo = babelHelpers.asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee3() { var bar, _bar2; return regeneratorRuntime.wrap(function _callee3$(_context3) { @@ -65,7 +54,7 @@ function _foo() { switch (_context3.prev = _context3.next) { case 0: _bar2 = function _bar4() { - _bar2 = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() { + _bar2 = babelHelpers.asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() { var baz; return regeneratorRuntime.wrap(function _callee2$(_context2) { while (1) { diff --git a/packages/babel-core/test/fixtures/transformation/misc/regression-4855/options.json b/packages/babel-core/test/fixtures/transformation/misc/regression-4855/options.json index 489d3a868c..607b005f5e 100644 --- a/packages/babel-core/test/fixtures/transformation/misc/regression-4855/options.json +++ b/packages/babel-core/test/fixtures/transformation/misc/regression-4855/options.json @@ -1,8 +1,5 @@ { "compact": false, "presets": ["env"], - "plugins": [ - ["external-helpers", { "helperVersion": "7.1.5" }], - "proposal-object-rest-spread" - ] + "plugins": ["proposal-object-rest-spread"] } diff --git a/packages/babel-core/test/fixtures/transformation/source-maps/class/options.json b/packages/babel-core/test/fixtures/transformation/source-maps/class/options.json index 93725c3c0e..5d03380e6f 100644 --- a/packages/babel-core/test/fixtures/transformation/source-maps/class/options.json +++ b/packages/babel-core/test/fixtures/transformation/source-maps/class/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "transform-classes", - "transform-block-scoping" - ] + "plugins": ["transform-classes", "transform-block-scoping"] } diff --git a/packages/babel-core/test/fixtures/transformation/source-maps/options.json b/packages/babel-core/test/fixtures/transformation/source-maps/options.json deleted file mode 100644 index 019532b4f9..0000000000 --- a/packages/babel-core/test/fixtures/transformation/source-maps/options.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "plugins": ["external-helpers"] -} diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type-challenge/output.js b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type-challenge/output.js index fd32a2ea96..68456b331a 100644 --- a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type-challenge/output.js +++ b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type-challenge/output.js @@ -1,13 +1,10 @@ -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - const sym = Symbol(); const sym1 = Symbol(); class A { constructor() { - _defineProperty(this, sym, void 0); - - _defineProperty(this, sym1, void 0); + babelHelpers.defineProperty(this, sym, void 0); + babelHelpers.defineProperty(this, sym1, void 0); } } diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type/output.js b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type/output.js index bfd8df8eda..a048d4bab9 100644 --- a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type/output.js +++ b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-class-properties/recursive-class-property-type/output.js @@ -1,10 +1,8 @@ -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - const sym = Symbol(); class A { constructor() { - _defineProperty(this, sym, void 0); + babelHelpers.defineProperty(this, sym, void 0); } } diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-decorators/ignore-abstract-methods/output.js b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-decorators/ignore-abstract-methods/output.js index 72350c9679..bbfc344758 100644 --- a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-decorators/ignore-abstract-methods/output.js +++ b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-decorators/ignore-abstract-methods/output.js @@ -1,40 +1,8 @@ -function _decorate(decorators, factory, superClass, mixins) { var api = _getDecoratorsApi(); if (mixins) { for (var i = 0; i < mixins.length; i++) { api = mixins[i](api); } } var r = factory(function initialize(O) { api.initializeInstanceElements(O, decorated.elements); }, superClass); var decorated = api.decorateClass(_coalesceClassElements(r.d.map(_createElementDescriptor)), decorators); api.initializeClassElements(r.F, decorated.elements); return api.runClassFinishers(r.F, decorated.finishers); } - -function _getDecoratorsApi() { _getDecoratorsApi = function () { return api; }; var api = { elementsDefinitionOrder: [["method"], ["field"]], initializeInstanceElements: function (O, elements) { ["method", "field"].forEach(function (kind) { elements.forEach(function (element) { if (element.kind === kind && element.placement === "own") { this.defineClassElement(O, element); } }, this); }, this); }, initializeClassElements: function (F, elements) { var proto = F.prototype; ["method", "field"].forEach(function (kind) { elements.forEach(function (element) { var placement = element.placement; if (element.kind === kind && (placement === "static" || placement === "prototype")) { var receiver = placement === "static" ? F : proto; this.defineClassElement(receiver, element); } }, this); }, this); }, defineClassElement: function (receiver, element) { var descriptor = element.descriptor; if (element.kind === "field") { var initializer = element.initializer; descriptor = { enumerable: descriptor.enumerable, writable: descriptor.writable, configurable: descriptor.configurable, value: initializer === void 0 ? void 0 : initializer.call(receiver) }; } Object.defineProperty(receiver, element.key, descriptor); }, decorateClass: function (elements, decorators) { var newElements = []; var finishers = []; var placements = { static: [], prototype: [], own: [] }; elements.forEach(function (element) { this.addElementPlacement(element, placements); }, this); elements.forEach(function (element) { if (!_hasDecorators(element)) return newElements.push(element); var elementFinishersExtras = this.decorateElement(element, placements); newElements.push(elementFinishersExtras.element); newElements.push.apply(newElements, elementFinishersExtras.extras); finishers.push.apply(finishers, elementFinishersExtras.finishers); }, this); if (!decorators) { return { elements: newElements, finishers: finishers }; } var result = this.decorateConstructor(newElements, decorators); finishers.push.apply(finishers, result.finishers); result.finishers = finishers; return result; }, addElementPlacement: function (element, placements, silent) { var keys = placements[element.placement]; if (!silent && keys.indexOf(element.key) !== -1) { throw new TypeError("Duplicated element (" + element.key + ")"); } keys.push(element.key); }, decorateElement: function (element, placements) { var extras = []; var finishers = []; for (var decorators = element.decorators, i = decorators.length - 1; i >= 0; i--) { var keys = placements[element.placement]; keys.splice(keys.indexOf(element.key), 1); var elementObject = this.fromElementDescriptor(element); var elementFinisherExtras = this.toElementFinisherExtras((0, decorators[i])(elementObject) || elementObject); element = elementFinisherExtras.element; this.addElementPlacement(element, placements); if (elementFinisherExtras.finisher) { finishers.push(elementFinisherExtras.finisher); } var newExtras = elementFinisherExtras.extras; if (newExtras) { for (var j = 0; j < newExtras.length; j++) { this.addElementPlacement(newExtras[j], placements); } extras.push.apply(extras, newExtras); } } return { element: element, finishers: finishers, extras: extras }; }, decorateConstructor: function (elements, decorators) { var finishers = []; for (var i = decorators.length - 1; i >= 0; i--) { var obj = this.fromClassDescriptor(elements); var elementsAndFinisher = this.toClassDescriptor((0, decorators[i])(obj) || obj); if (elementsAndFinisher.finisher !== undefined) { finishers.push(elementsAndFinisher.finisher); } if (elementsAndFinisher.elements !== undefined) { elements = elementsAndFinisher.elements; for (var j = 0; j < elements.length - 1; j++) { for (var k = j + 1; k < elements.length; k++) { if (elements[j].key === elements[k].key && elements[j].placement === elements[k].placement) { throw new TypeError("Duplicated element (" + elements[j].key + ")"); } } } } } return { elements: elements, finishers: finishers }; }, fromElementDescriptor: function (element) { var obj = { kind: element.kind, key: element.key, placement: element.placement, descriptor: element.descriptor }; var desc = { value: "Descriptor", configurable: true }; Object.defineProperty(obj, Symbol.toStringTag, desc); if (element.kind === "field") obj.initializer = element.initializer; return obj; }, toElementDescriptors: function (elementObjects) { if (elementObjects === undefined) return; return _toArray(elementObjects).map(function (elementObject) { var element = this.toElementDescriptor(elementObject); this.disallowProperty(elementObject, "finisher", "An element descriptor"); this.disallowProperty(elementObject, "extras", "An element descriptor"); return element; }, this); }, toElementDescriptor: function (elementObject) { var kind = String(elementObject.kind); if (kind !== "method" && kind !== "field") { throw new TypeError('An element descriptor\'s .kind property must be either "method" or' + ' "field", but a decorator created an element descriptor with' + ' .kind "' + kind + '"'); } var key = _toPropertyKey(elementObject.key); var placement = String(elementObject.placement); if (placement !== "static" && placement !== "prototype" && placement !== "own") { throw new TypeError('An element descriptor\'s .placement property must be one of "static",' + ' "prototype" or "own", but a decorator created an element descriptor' + ' with .placement "' + placement + '"'); } var descriptor = elementObject.descriptor; this.disallowProperty(elementObject, "elements", "An element descriptor"); var element = { kind: kind, key: key, placement: placement, descriptor: Object.assign({}, descriptor) }; if (kind !== "field") { this.disallowProperty(elementObject, "initializer", "A method descriptor"); } else { this.disallowProperty(descriptor, "get", "The property descriptor of a field descriptor"); this.disallowProperty(descriptor, "set", "The property descriptor of a field descriptor"); this.disallowProperty(descriptor, "value", "The property descriptor of a field descriptor"); element.initializer = elementObject.initializer; } return element; }, toElementFinisherExtras: function (elementObject) { var element = this.toElementDescriptor(elementObject); var finisher = _optionalCallableProperty(elementObject, "finisher"); var extras = this.toElementDescriptors(elementObject.extras); return { element: element, finisher: finisher, extras: extras }; }, fromClassDescriptor: function (elements) { var obj = { kind: "class", elements: elements.map(this.fromElementDescriptor, this) }; var desc = { value: "Descriptor", configurable: true }; Object.defineProperty(obj, Symbol.toStringTag, desc); return obj; }, toClassDescriptor: function (obj) { var kind = String(obj.kind); if (kind !== "class") { throw new TypeError('A class descriptor\'s .kind property must be "class", but a decorator' + ' created a class descriptor with .kind "' + kind + '"'); } this.disallowProperty(obj, "key", "A class descriptor"); this.disallowProperty(obj, "placement", "A class descriptor"); this.disallowProperty(obj, "descriptor", "A class descriptor"); this.disallowProperty(obj, "initializer", "A class descriptor"); this.disallowProperty(obj, "extras", "A class descriptor"); var finisher = _optionalCallableProperty(obj, "finisher"); var elements = this.toElementDescriptors(obj.elements); return { elements: elements, finisher: finisher }; }, runClassFinishers: function (constructor, finishers) { for (var i = 0; i < finishers.length; i++) { var newConstructor = (0, finishers[i])(constructor); if (newConstructor !== undefined) { if (typeof newConstructor !== "function") { throw new TypeError("Finishers must return a constructor."); } constructor = newConstructor; } } return constructor; }, disallowProperty: function (obj, name, objectType) { if (obj[name] !== undefined) { throw new TypeError(objectType + " can't have a ." + name + " property."); } } }; return api; } - -function _createElementDescriptor(def) { var key = _toPropertyKey(def.key); var descriptor; if (def.kind === "method") { descriptor = { value: def.value, writable: true, configurable: true, enumerable: false }; } else if (def.kind === "get") { descriptor = { get: def.value, configurable: true, enumerable: false }; } else if (def.kind === "set") { descriptor = { set: def.value, configurable: true, enumerable: false }; } else if (def.kind === "field") { descriptor = { configurable: true, writable: true, enumerable: true }; } var element = { kind: def.kind === "field" ? "field" : "method", key: key, placement: def.static ? "static" : def.kind === "field" ? "own" : "prototype", descriptor: descriptor }; if (def.decorators) element.decorators = def.decorators; if (def.kind === "field") element.initializer = def.value; return element; } - -function _coalesceGetterSetter(element, other) { if (element.descriptor.get !== undefined) { other.descriptor.get = element.descriptor.get; } else { other.descriptor.set = element.descriptor.set; } } - -function _coalesceClassElements(elements) { var newElements = []; var isSameElement = function (other) { return other.kind === "method" && other.key === element.key && other.placement === element.placement; }; for (var i = 0; i < elements.length; i++) { var element = elements[i]; var other; if (element.kind === "method" && (other = newElements.find(isSameElement))) { if (_isDataDescriptor(element.descriptor) || _isDataDescriptor(other.descriptor)) { if (_hasDecorators(element) || _hasDecorators(other)) { throw new ReferenceError("Duplicated methods (" + element.key + ") can't be decorated."); } other.descriptor = element.descriptor; } else { if (_hasDecorators(element)) { if (_hasDecorators(other)) { throw new ReferenceError("Decorators can't be placed on different accessors with for " + "the same property (" + element.key + ")."); } other.decorators = element.decorators; } _coalesceGetterSetter(element, other); } } else { newElements.push(element); } } return newElements; } - -function _hasDecorators(element) { return element.decorators && element.decorators.length; } - -function _isDataDescriptor(desc) { return desc !== undefined && !(desc.value === undefined && desc.writable === undefined); } - -function _optionalCallableProperty(obj, name) { var value = obj[name]; if (value !== undefined && typeof value !== "function") { throw new TypeError("Expected '" + name + "' to be a function"); } return value; } - -function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return typeof key === "symbol" ? key : String(key); } - -function _toPrimitive(input, hint) { if (typeof input !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (typeof res !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); } - -function _toArray(arr) { return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest(); } - -function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } - -function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); } - -function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; } - -function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && Symbol.iterator in Object(iter)) return Array.from(iter); } - -function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; } - function decorate(value) { return function (target, propertyKey, descriptor) {}; } -let A = _decorate(null, function (_initialize) { +let A = babelHelpers.decorate(null, function (_initialize) { "use strict"; class A { diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-true/output.js b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-true/output.js index eee320382b..5e71555c1e 100644 --- a/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-true/output.js +++ b/packages/babel-helper-create-class-features-plugin/test/fixtures/plugin-proposal-private-methods/loose-true/output.js @@ -1,8 +1,4 @@ -var id = 0; - -function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; } - -var _privateMethod = _classPrivateFieldLooseKey("privateMethod"); +var _privateMethod = babelHelpers.classPrivateFieldLooseKey("privateMethod"); class X { constructor() { diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/replace-supers/method/output.js b/packages/babel-helper-create-class-features-plugin/test/fixtures/replace-supers/method/output.js index cfdeda66e5..a897d25593 100644 --- a/packages/babel-helper-create-class-features-plugin/test/fixtures/replace-supers/method/output.js +++ b/packages/babel-helper-create-class-features-plugin/test/fixtures/replace-supers/method/output.js @@ -1,9 +1,3 @@ -function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - var _foo = new WeakSet(); class A extends B { @@ -18,5 +12,5 @@ class A extends B { var _foo2 = function _foo2() { let _A; - _get(_getPrototypeOf(A.prototype), "x", this); + babelHelpers.get(babelHelpers.getPrototypeOf(A.prototype), "x", this); }; diff --git a/packages/babel-helper-create-class-features-plugin/test/fixtures/tdz-error-computed-prototypes/loose-false/output.js b/packages/babel-helper-create-class-features-plugin/test/fixtures/tdz-error-computed-prototypes/loose-false/output.js index b4a5e95cfb..d45be8fe43 100644 --- a/packages/babel-helper-create-class-features-plugin/test/fixtures/tdz-error-computed-prototypes/loose-false/output.js +++ b/packages/babel-helper-create-class-features-plugin/test/fixtures/tdz-error-computed-prototypes/loose-false/output.js @@ -1,5 +1,3 @@ -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - class Foo { ['HELLO']() { console.log('>>>>', Foo); @@ -7,4 +5,4 @@ class Foo { } -_defineProperty(Foo, "nickname", 'Tom'); +babelHelpers.defineProperty(Foo, "nickname", 'Tom'); diff --git a/packages/babel-helper-fixtures/src/index.js b/packages/babel-helper-fixtures/src/index.js index 72f7daab37..6179414ba1 100644 --- a/packages/babel-helper-fixtures/src/index.js +++ b/packages/babel-helper-fixtures/src/index.js @@ -128,6 +128,7 @@ function pushTask(taskName, taskDir, suite, suiteName) { ? taskOpts.BABEL_8_BREAKING === false : taskOpts.BABEL_8_BREAKING === true), options: taskOpts, + externalHelpers: taskOpts.externalHelpers ?? true, validateLogs: taskOpts.validateLogs, ignoreOutput: taskOpts.ignoreOutput, stdout: { loc: stdoutLoc, code: readFile(stdoutLoc) }, @@ -254,6 +255,7 @@ function pushTask(taskName, taskDir, suite, suiteName) { // Delete to avoid option validation error delete test.options.validateLogs; delete test.options.ignoreOutput; + delete test.options.externalHelpers; } function wrapPackagesArray(type, names, optionsDir) { diff --git a/packages/babel-helper-transform-fixture-test-runner/src/index.js b/packages/babel-helper-transform-fixture-test-runner/src/index.js index 92db61e95e..1383253880 100644 --- a/packages/babel-helper-transform-fixture-test-runner/src/index.js +++ b/packages/babel-helper-transform-fixture-test-runner/src/index.js @@ -17,6 +17,8 @@ import checkDuplicatedNodes from "babel-check-duplicated-nodes"; import QuickLRU from "quick-lru"; import escapeRegExp from "./escape-regexp.cjs"; +const EXTERNAL_HELPERS_VERSION = "7.100.0"; + const cachedScripts = new QuickLRU({ maxSize: 10 }); const contextModuleCache = new WeakMap(); const sharedTestContext = createContext(); @@ -418,6 +420,13 @@ export default function ( if (dynamicOpts) dynamicOpts(task.options, task); + if (task.externalHelpers) { + (task.options.plugins ??= []).push([ + "external-helpers", + { helperVersion: EXTERNAL_HELPERS_VERSION }, + ]); + } + const throwMsg = task.options.throws; if (throwMsg) { // internal api doesn't have this option but it's best not to pollute diff --git a/packages/babel-helpers/test/fixtures/options.json b/packages/babel-helpers/test/fixtures/options.json new file mode 100644 index 0000000000..8da9fa5b3d --- /dev/null +++ b/packages/babel-helpers/test/fixtures/options.json @@ -0,0 +1,3 @@ +{ + "externalHelpers": false +} diff --git a/packages/babel-plugin-external-helpers/test/fixtures/opts/whitelist/options.json b/packages/babel-plugin-external-helpers/test/fixtures/opts/whitelist/options.json index 9b2aa21198..b81f47f3b2 100644 --- a/packages/babel-plugin-external-helpers/test/fixtures/opts/whitelist/options.json +++ b/packages/babel-plugin-external-helpers/test/fixtures/opts/whitelist/options.json @@ -1,4 +1,5 @@ { + "externalHelpers": false, "plugins": [ [ "external-helpers", diff --git a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/async-generators/class-private-method/options.json b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/async-generators/class-private-method/options.json index b1d145063a..90e268203f 100644 --- a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/async-generators/class-private-method/options.json +++ b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/async-generators/class-private-method/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "proposal-private-methods", "proposal-async-generator-functions"] + "plugins": ["proposal-private-methods", "proposal-async-generator-functions"] } diff --git a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/async-generators/options.json b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/async-generators/options.json index 7812af170d..51c73ff0ad 100644 --- a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/async-generators/options.json +++ b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/async-generators/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "proposal-async-generator-functions"] + "plugins": ["proposal-async-generator-functions"] } diff --git a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/async-generators/yield-exec/options.json b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/async-generators/yield-exec/options.json index bd5647f079..3545e7af69 100644 --- a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/async-generators/yield-exec/options.json +++ b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/async-generators/yield-exec/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-async-to-generator", "proposal-async-generator-functions" ], diff --git a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/async-function-no-transform/options.json b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/async-function-no-transform/options.json index 7812af170d..51c73ff0ad 100644 --- a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/async-function-no-transform/options.json +++ b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/async-function-no-transform/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "proposal-async-generator-functions"] + "plugins": ["proposal-async-generator-functions"] } diff --git a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/async-generator-exec/options.json b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/async-generator-exec/options.json index bd5647f079..3545e7af69 100644 --- a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/async-generator-exec/options.json +++ b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/async-generator-exec/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-async-to-generator", "proposal-async-generator-functions" ], diff --git a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/options.json b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/options.json index 13111918a1..5ca81f1fe7 100644 --- a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/options.json +++ b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/for-await/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-async-to-generator", "proposal-async-generator-functions" ] diff --git a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/nested/options.json b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/nested/options.json index 13111918a1..5ca81f1fe7 100644 --- a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/nested/options.json +++ b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/nested/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-async-to-generator", "proposal-async-generator-functions" ] diff --git a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/regression/5880/options.json b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/regression/5880/options.json index 94063e0c4f..f5772b7638 100644 --- a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/regression/5880/options.json +++ b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/regression/5880/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "proposal-async-generator-functions", - "transform-destructuring" - ] + "plugins": ["proposal-async-generator-functions", "transform-destructuring"] } diff --git a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/yield-star-polyfill-corejs3/options.json b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/yield-star-polyfill-corejs3/options.json index 9dbdf5b775..5f1870f39f 100644 --- a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/yield-star-polyfill-corejs3/options.json +++ b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/yield-star-polyfill-corejs3/options.json @@ -1,4 +1,5 @@ { + "externalHelpers": false, "parserOpts": { "allowReturnOutsideFunction": true }, diff --git a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/yield-star/options.json b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/yield-star/options.json index e5b6ea9ed0..858d9c7324 100644 --- a/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/yield-star/options.json +++ b/packages/babel-plugin-proposal-async-generator-functions/test/fixtures/yield-star/options.json @@ -3,7 +3,6 @@ "allowReturnOutsideFunction": true }, "plugins": [ - "external-helpers", "transform-async-to-generator", "proposal-async-generator-functions" ], diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/assumption-noDocumentAll/optional-chain-before-member-call/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/assumption-noDocumentAll/optional-chain-before-member-call/output.js index 71a4277d00..9f5c5d0dbf 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/assumption-noDocumentAll/optional-chain-before-member-call/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/assumption-noDocumentAll/optional-chain-before-member-call/output.js @@ -1,14 +1,10 @@ -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _classStaticPrivateFieldSpecGet(receiver, classConstructor, descriptor) { if (receiver !== classConstructor) { throw new TypeError("Private static access of wrong provenance"); } if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; } - class Foo { static getSelf() { return this; } static test() { - var _o$Foo, _o$Foo2, _o$Foo3, _deep$very$o, _deep$very$o$Foo, _deep$very$o2, _deep$very$o2$Foo, _deep$very$o3, _deep$very$o3$Foo, _classStaticPrivateFi, _classStaticPrivateFi2, _ref, _ref$self, _ref2, _ref2$self, _self2, _self2$self, _classStaticPrivateFi3, _classStaticPrivateFi4, _ref3, _ref3$call, _ref4, _ref4$getSelf, _getSelf, _ref5, _getSelf$call, _ref6, _ref6$self, _classStaticPrivateFi5, _call, _call$self, _getSelf2, _getSelf2$self, _getSelf3, _getSelf3$self, _fn$Foo, _fn$Foo2, _fn$Foo3, _fnDeep$very$o, _fnDeep$very$o$Foo, _fnDeep$very$o2, _fnDeep$very$o2$Foo, _fnDeep$very$o3, _fnDeep$very$o3$Foo, _classStaticPrivateFi6, _classStaticPrivateFi7, _ref7, _ref7$self, _ref8, _ref8$self, _self3, _self3$self, _classStaticPrivateFi8, _classStaticPrivateFi9, _ref9, _ref9$call, _ref10, _ref10$getSelf, _getSelf4, _ref11, _getSelf4$call, _ref12, _ref12$self, _classStaticPrivateFi10, _call2, _call2$self, _getSelf5, _getSelf5$self, _getSelf6, _getSelf6$self; + var _o$Foo, _o$Foo2, _o$Foo3, _deep$very$o, _deep$very$o$Foo, _deep$very$o2, _deep$very$o2$Foo, _deep$very$o3, _deep$very$o3$Foo, _babelHelpers$classSt, _babelHelpers$classSt2, _ref, _ref$self, _ref2, _ref2$self, _self2, _self2$self, _babelHelpers$classSt3, _babelHelpers$classSt4, _ref3, _ref3$call, _ref4, _ref4$getSelf, _getSelf, _ref5, _getSelf$call, _ref6, _ref6$self, _babelHelpers$classSt5, _call, _call$self, _getSelf2, _getSelf2$self, _getSelf3, _getSelf3$self, _fn$Foo, _fn$Foo2, _fn$Foo3, _fnDeep$very$o, _fnDeep$very$o$Foo, _fnDeep$very$o2, _fnDeep$very$o2$Foo, _fnDeep$very$o3, _fnDeep$very$o3$Foo, _babelHelpers$classSt6, _babelHelpers$classSt7, _ref7, _ref7$self, _ref8, _ref8$self, _self3, _self3$self, _babelHelpers$classSt8, _babelHelpers$classSt9, _ref9, _ref9$call, _ref10, _ref10$getSelf, _getSelf4, _ref11, _getSelf4$call, _ref12, _ref12$self, _babelHelpers$classSt10, _call2, _call2$self, _getSelf5, _getSelf5$self, _getSelf6, _getSelf6$self; const o = { Foo: Foo @@ -27,44 +23,44 @@ class Foo { return deep; } - o == null ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo = o.Foo, Foo, _m).call(_o$Foo); - o == null ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo2 = o.Foo, Foo, _m).call(_o$Foo2).toString; - o == null ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo3 = o.Foo, Foo, _m).call(_o$Foo3).toString(); - (_deep$very$o = deep?.very.o) == null ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o$Foo = _deep$very$o.Foo, Foo, _m).call(_deep$very$o$Foo); - (_deep$very$o2 = deep?.very.o) == null ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o2$Foo = _deep$very$o2.Foo, Foo, _m).call(_deep$very$o2$Foo).toString; - (_deep$very$o3 = deep?.very.o) == null ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o3$Foo = _deep$very$o3.Foo, Foo, _m).call(_deep$very$o3$Foo).toString(); - o == null ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self), Foo, _m).call(_classStaticPrivateFi); - o == null ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi2 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self, Foo, _m).call(_classStaticPrivateFi2); - (_ref = o == null ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) == null ? void 0 : _classStaticPrivateFieldSpecGet(_ref$self = _ref.self, Foo, _m).call(_ref$self); - (_ref2 = o == null ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) == null ? void 0 : _classStaticPrivateFieldSpecGet(_ref2$self = _ref2.self, Foo, _m).call(_ref2$self); - (_self2 = (o == null ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.self) == null ? void 0 : _classStaticPrivateFieldSpecGet(_self2$self = _self2.self, Foo, _m).call(_self2$self); - o == null ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi3 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf(), Foo, _m).call(_classStaticPrivateFi3); - (_ref3 = o == null ? void 0 : (_classStaticPrivateFi4 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) == null ? void 0 : _classStaticPrivateFieldSpecGet(_ref3$call = _ref3.call(_classStaticPrivateFi4), Foo, _m).call(_ref3$call); - (_ref4 = o == null ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) == null ? void 0 : _classStaticPrivateFieldSpecGet(_ref4$getSelf = _ref4.getSelf(), Foo, _m).call(_ref4$getSelf); - (_getSelf = (_ref5 = o == null ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf) == null ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf$call = _getSelf.call(_ref5), Foo, _m).call(_getSelf$call); - (_ref6 = o == null ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) == null ? void 0 : _classStaticPrivateFieldSpecGet(_ref6$self = _ref6.self, Foo, _m).call(_ref6$self); - (_call = (o == null ? void 0 : (_classStaticPrivateFi5 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf)?.call(_classStaticPrivateFi5)) == null ? void 0 : _classStaticPrivateFieldSpecGet(_call$self = _call.self, Foo, _m).call(_call$self); - (_getSelf2 = (o == null ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf()) == null ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf2$self = _getSelf2.self, Foo, _m).call(_getSelf2$self); - (_getSelf3 = (o == null ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf?.()) == null ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf3$self = _getSelf3.self, Foo, _m).call(_getSelf3$self); - fn == null ? void 0 : _classStaticPrivateFieldSpecGet(_fn$Foo = fn().Foo, Foo, _m).call(_fn$Foo); - fn == null ? void 0 : _classStaticPrivateFieldSpecGet(_fn$Foo2 = fn().Foo, Foo, _m).call(_fn$Foo2).toString; - fn == null ? void 0 : _classStaticPrivateFieldSpecGet(_fn$Foo3 = fn().Foo, Foo, _m).call(_fn$Foo3).toString(); - (_fnDeep$very$o = fnDeep?.().very.o) == null ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo = _fnDeep$very$o.Foo, Foo, _m).call(_fnDeep$very$o$Foo); - (_fnDeep$very$o2 = fnDeep?.().very.o) == null ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o2$Foo = _fnDeep$very$o2.Foo, Foo, _m).call(_fnDeep$very$o2$Foo).toString; - (_fnDeep$very$o3 = fnDeep?.().very.o) == null ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o3$Foo = _fnDeep$very$o3.Foo, Foo, _m).call(_fnDeep$very$o3$Foo).toString(); - fn == null ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi6 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self), Foo, _m).call(_classStaticPrivateFi6); - fn == null ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi7 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self, Foo, _m).call(_classStaticPrivateFi7); - (_ref7 = fn == null ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) == null ? void 0 : _classStaticPrivateFieldSpecGet(_ref7$self = _ref7.self, Foo, _m).call(_ref7$self); - (_ref8 = fn == null ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) == null ? void 0 : _classStaticPrivateFieldSpecGet(_ref8$self = _ref8.self, Foo, _m).call(_ref8$self); - (_self3 = (fn == null ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.self) == null ? void 0 : _classStaticPrivateFieldSpecGet(_self3$self = _self3.self, Foo, _m).call(_self3$self); - fn == null ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi8 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf(), Foo, _m).call(_classStaticPrivateFi8); - (_ref9 = fn == null ? void 0 : (_classStaticPrivateFi9 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) == null ? void 0 : _classStaticPrivateFieldSpecGet(_ref9$call = _ref9.call(_classStaticPrivateFi9), Foo, _m).call(_ref9$call); - (_ref10 = fn == null ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) == null ? void 0 : _classStaticPrivateFieldSpecGet(_ref10$getSelf = _ref10.getSelf(), Foo, _m).call(_ref10$getSelf); - (_getSelf4 = (_ref11 = fn == null ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf) == null ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf4$call = _getSelf4.call(_ref11), Foo, _m).call(_getSelf4$call); - (_ref12 = fn == null ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) == null ? void 0 : _classStaticPrivateFieldSpecGet(_ref12$self = _ref12.self, Foo, _m).call(_ref12$self); - (_call2 = (fn == null ? void 0 : (_classStaticPrivateFi10 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf)?.call(_classStaticPrivateFi10)) == null ? void 0 : _classStaticPrivateFieldSpecGet(_call2$self = _call2.self, Foo, _m).call(_call2$self); - (_getSelf5 = (fn == null ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf()) == null ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf5$self = _getSelf5.self, Foo, _m).call(_getSelf5$self); - (_getSelf6 = (fn == null ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf?.()) == null ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf6$self = _getSelf6.self, Foo, _m).call(_getSelf6$self); + o == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo = o.Foo, Foo, _m).call(_o$Foo); + o == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo2 = o.Foo, Foo, _m).call(_o$Foo2).toString; + o == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo3 = o.Foo, Foo, _m).call(_o$Foo3).toString(); + (_deep$very$o = deep?.very.o) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o$Foo = _deep$very$o.Foo, Foo, _m).call(_deep$very$o$Foo); + (_deep$very$o2 = deep?.very.o) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o2$Foo = _deep$very$o2.Foo, Foo, _m).call(_deep$very$o2$Foo).toString; + (_deep$very$o3 = deep?.very.o) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o3$Foo = _deep$very$o3.Foo, Foo, _m).call(_deep$very$o3$Foo).toString(); + o == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self), Foo, _m).call(_babelHelpers$classSt); + o == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt2 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self, Foo, _m).call(_babelHelpers$classSt2); + (_ref = o == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref$self = _ref.self, Foo, _m).call(_ref$self); + (_ref2 = o == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref2$self = _ref2.self, Foo, _m).call(_ref2$self); + (_self2 = (o == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.self) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self2$self = _self2.self, Foo, _m).call(_self2$self); + o == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt3 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf(), Foo, _m).call(_babelHelpers$classSt3); + (_ref3 = o == null ? void 0 : (_babelHelpers$classSt4 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref3$call = _ref3.call(_babelHelpers$classSt4), Foo, _m).call(_ref3$call); + (_ref4 = o == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref4$getSelf = _ref4.getSelf(), Foo, _m).call(_ref4$getSelf); + (_getSelf = (_ref5 = o == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf$call = _getSelf.call(_ref5), Foo, _m).call(_getSelf$call); + (_ref6 = o == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref6$self = _ref6.self, Foo, _m).call(_ref6$self); + (_call = (o == null ? void 0 : (_babelHelpers$classSt5 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf)?.call(_babelHelpers$classSt5)) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call$self = _call.self, Foo, _m).call(_call$self); + (_getSelf2 = (o == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf()) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf2$self = _getSelf2.self, Foo, _m).call(_getSelf2$self); + (_getSelf3 = (o == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf?.()) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf3$self = _getSelf3.self, Foo, _m).call(_getSelf3$self); + fn == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo = fn().Foo, Foo, _m).call(_fn$Foo); + fn == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo2 = fn().Foo, Foo, _m).call(_fn$Foo2).toString; + fn == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo3 = fn().Foo, Foo, _m).call(_fn$Foo3).toString(); + (_fnDeep$very$o = fnDeep?.().very.o) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo = _fnDeep$very$o.Foo, Foo, _m).call(_fnDeep$very$o$Foo); + (_fnDeep$very$o2 = fnDeep?.().very.o) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o2$Foo = _fnDeep$very$o2.Foo, Foo, _m).call(_fnDeep$very$o2$Foo).toString; + (_fnDeep$very$o3 = fnDeep?.().very.o) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o3$Foo = _fnDeep$very$o3.Foo, Foo, _m).call(_fnDeep$very$o3$Foo).toString(); + fn == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt6 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self), Foo, _m).call(_babelHelpers$classSt6); + fn == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt7 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self, Foo, _m).call(_babelHelpers$classSt7); + (_ref7 = fn == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref7$self = _ref7.self, Foo, _m).call(_ref7$self); + (_ref8 = fn == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref8$self = _ref8.self, Foo, _m).call(_ref8$self); + (_self3 = (fn == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.self) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self3$self = _self3.self, Foo, _m).call(_self3$self); + fn == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt8 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf(), Foo, _m).call(_babelHelpers$classSt8); + (_ref9 = fn == null ? void 0 : (_babelHelpers$classSt9 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref9$call = _ref9.call(_babelHelpers$classSt9), Foo, _m).call(_ref9$call); + (_ref10 = fn == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref10$getSelf = _ref10.getSelf(), Foo, _m).call(_ref10$getSelf); + (_getSelf4 = (_ref11 = fn == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf4$call = _getSelf4.call(_ref11), Foo, _m).call(_getSelf4$call); + (_ref12 = fn == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref12$self = _ref12.self, Foo, _m).call(_ref12$self); + (_call2 = (fn == null ? void 0 : (_babelHelpers$classSt10 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf)?.call(_babelHelpers$classSt10)) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call2$self = _call2.self, Foo, _m).call(_call2$self); + (_getSelf5 = (fn == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf()) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf5$self = _getSelf5.self, Foo, _m).call(_getSelf5$self); + (_getSelf6 = (fn == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf?.()) == null ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf6$self = _getSelf6.self, Foo, _m).call(_getSelf6$self); } } @@ -76,14 +72,12 @@ var _x = { var _m = { writable: true, value: function () { - return _classStaticPrivateFieldSpecGet(this, Foo, _x); + return babelHelpers.classStaticPrivateFieldSpecGet(this, Foo, _x); } }; var _self = { writable: true, value: Foo }; - -_defineProperty(Foo, "self", Foo); - +babelHelpers.defineProperty(Foo, "self", Foo); Foo.test(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/assumption-noDocumentAll/optional-chain-cast-to-boolean/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/assumption-noDocumentAll/optional-chain-cast-to-boolean/options.json index e7e7eecfe8..3b59e1bbfc 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/assumption-noDocumentAll/optional-chain-cast-to-boolean/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/assumption-noDocumentAll/optional-chain-cast-to-boolean/options.json @@ -1,4 +1,4 @@ { - "plugins": [["external-helpers", { "helperVersion": "7.100.0" }], "proposal-class-properties"], + "plugins": ["proposal-class-properties"], "minNodeVersion": "14.0.0" } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/assumption-setPublicClassFields/foobar/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/assumption-setPublicClassFields/foobar/options.json index a56954a5e7..b72ac79409 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/assumption-setPublicClassFields/foobar/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/assumption-setPublicClassFields/foobar/options.json @@ -1,8 +1,5 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - "proposal-class-properties" - ], + "plugins": ["proposal-class-properties"], "presets": ["env"], "assumptions": { "setPublicClassFields": true diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/assumption-setPublicClassFields/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/assumption-setPublicClassFields/options.json index 018ebbb8d5..330f1659f8 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/assumption-setPublicClassFields/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/assumption-setPublicClassFields/options.json @@ -1,9 +1,5 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - "proposal-class-properties", - "syntax-class-properties" - ], + "plugins": ["proposal-class-properties", "syntax-class-properties"], "assumptions": { "setPublicClassFields": true } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/assumption-setPublicClassFields/regression-T7364/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/assumption-setPublicClassFields/regression-T7364/options.json index 7e57d1f03f..844ba3fa4e 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/assumption-setPublicClassFields/regression-T7364/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/assumption-setPublicClassFields/regression-T7364/options.json @@ -1,9 +1,5 @@ { - "plugins": [ - "external-helpers", - "transform-async-to-generator", - "proposal-class-properties" - ], + "plugins": ["transform-async-to-generator", "proposal-class-properties"], "assumptions": { "setPublicClassFields": true } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/assumption-setPublicClassFields/static-super-loose/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/assumption-setPublicClassFields/static-super-loose/options.json index 7558194469..96c2b15531 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/assumption-setPublicClassFields/static-super-loose/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/assumption-setPublicClassFields/static-super-loose/options.json @@ -1,7 +1,6 @@ { "validateLogs": true, "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], ["proposal-class-properties", { "loose": true }], "syntax-class-properties" ], diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/compile-to-class/constructor-collision-ignores-types-babel-7/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/compile-to-class/constructor-collision-ignores-types-babel-7/output.js index c85b2477ed..a6ce8d4c7e 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/compile-to-class/constructor-collision-ignores-types-babel-7/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/compile-to-class/constructor-collision-ignores-types-babel-7/output.js @@ -1,9 +1,7 @@ -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - class C { // Output should not use `_initialiseProps` constructor(T) { - _defineProperty(this, "y", 0); + babelHelpers.defineProperty(this, "y", 0); } } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/compile-to-class/constructor-collision-ignores-types/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/compile-to-class/constructor-collision-ignores-types/output.js index e6d715c07a..7a40043448 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/compile-to-class/constructor-collision-ignores-types/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/compile-to-class/constructor-collision-ignores-types/output.js @@ -1,11 +1,8 @@ -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - class C { // Output should not use `_initialiseProps` constructor(T) { - _defineProperty(this, "x", void 0); - - _defineProperty(this, "y", 0); + babelHelpers.defineProperty(this, "x", void 0); + babelHelpers.defineProperty(this, "y", 0); } } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/local-define-property/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/local-define-property/output.js index 641307b44d..989d968638 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/local-define-property/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/local-define-property/output.js @@ -1,15 +1,5 @@ var _class, _descriptor, _descriptor2, _temp; -function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _defineProperty2(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; } - -function _initializerWarningHelper(descriptor, context) { throw new Error('Decorating class property failed. Please ensure that ' + 'proposal-class-properties is enabled and runs after the decorators transform.'); } - function dec() {} // Create a local function binding so babel has to change the name of the helper @@ -18,19 +8,16 @@ function _defineProperty() {} let A = (_class = (_temp = function A() { "use strict"; - _classCallCheck(this, A); - - _initializerDefineProperty(this, "a", _descriptor, this); - - _initializerDefineProperty(this, "b", _descriptor2, this); - - _defineProperty2(this, "c", 456); -}, _temp), (_descriptor = _applyDecoratedDescriptor(_class.prototype, "a", [dec], { + babelHelpers.classCallCheck(this, A); + babelHelpers.initializerDefineProperty(this, "a", _descriptor, this); + babelHelpers.initializerDefineProperty(this, "b", _descriptor2, this); + babelHelpers.defineProperty(this, "c", 456); +}, _temp), (_descriptor = babelHelpers.applyDecoratedDescriptor(_class.prototype, "a", [dec], { configurable: true, enumerable: true, writable: true, initializer: null -}), _descriptor2 = _applyDecoratedDescriptor(_class.prototype, "b", [dec], { +}), _descriptor2 = babelHelpers.applyDecoratedDescriptor(_class.prototype, "b", [dec], { configurable: true, enumerable: true, writable: true, diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/loose/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/loose/output.js index 0a25e2b102..9487447b01 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/loose/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/loose/output.js @@ -1,31 +1,20 @@ var _class, _descriptor, _descriptor2, _temp; -function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; } - -function _initializerWarningHelper(descriptor, context) { throw new Error('Decorating class property failed. Please ensure that ' + 'proposal-class-properties is enabled and runs after the decorators transform.'); } - function dec() {} let A = (_class = (_temp = function A() { "use strict"; - _classCallCheck(this, A); - - _initializerDefineProperty(this, "a", _descriptor, this); - - _initializerDefineProperty(this, "b", _descriptor2, this); - + babelHelpers.classCallCheck(this, A); + babelHelpers.initializerDefineProperty(this, "a", _descriptor, this); + babelHelpers.initializerDefineProperty(this, "b", _descriptor2, this); this.c = 456; -}, _temp), (_descriptor = _applyDecoratedDescriptor(_class.prototype, "a", [dec], { +}, _temp), (_descriptor = babelHelpers.applyDecoratedDescriptor(_class.prototype, "a", [dec], { configurable: true, enumerable: true, writable: true, initializer: null -}), _descriptor2 = _applyDecoratedDescriptor(_class.prototype, "b", [dec], { +}), _descriptor2 = babelHelpers.applyDecoratedDescriptor(_class.prototype, "b", [dec], { configurable: true, enumerable: true, writable: true, diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/strict/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/strict/output.js index 11cce4ac92..0d1d71eabe 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/strict/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/decorators-legacy-interop/strict/output.js @@ -1,33 +1,20 @@ var _class, _descriptor, _descriptor2, _temp; -function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; } - -function _initializerWarningHelper(descriptor, context) { throw new Error('Decorating class property failed. Please ensure that ' + 'proposal-class-properties is enabled and runs after the decorators transform.'); } - function dec() {} let A = (_class = (_temp = function A() { "use strict"; - _classCallCheck(this, A); - - _initializerDefineProperty(this, "a", _descriptor, this); - - _initializerDefineProperty(this, "b", _descriptor2, this); - - _defineProperty(this, "c", 456); -}, _temp), (_descriptor = _applyDecoratedDescriptor(_class.prototype, "a", [dec], { + babelHelpers.classCallCheck(this, A); + babelHelpers.initializerDefineProperty(this, "a", _descriptor, this); + babelHelpers.initializerDefineProperty(this, "b", _descriptor2, this); + babelHelpers.defineProperty(this, "c", 456); +}, _temp), (_descriptor = babelHelpers.applyDecoratedDescriptor(_class.prototype, "a", [dec], { configurable: true, enumerable: true, writable: true, initializer: null -}), _descriptor2 = _applyDecoratedDescriptor(_class.prototype, "b", [dec], { +}), _descriptor2 = babelHelpers.applyDecoratedDescriptor(_class.prototype, "b", [dec], { configurable: true, enumerable: true, writable: true, diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/options.json index c67f29027e..4db9330e8b 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/nested-class/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - "proposal-class-properties", - "transform-classes" - ] + "plugins": ["proposal-class-properties", "transform-classes"] } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-2-exec/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-2-exec/options.json index 4a36349a04..6b2a3bd326 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-2-exec/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/destructuring-object-pattern-2-exec/options.json @@ -1,12 +1,6 @@ { "plugins": [ "transform-destructuring", - [ - "external-helpers", - { - "helperVersion": "7.4.4" - } - ], "proposal-class-properties", "transform-classes", "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/logical-assignment/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/logical-assignment/output.js index e7d19cbdcd..af8f46e40d 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/logical-assignment/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/logical-assignment/output.js @@ -1,14 +1,8 @@ -function _classPrivateFieldLooseBase(receiver, privateKey) { if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) { throw new TypeError("attempted to use private field on non-instance"); } return receiver; } +var _nullish = babelHelpers.classPrivateFieldLooseKey("nullish"); -var id = 0; +var _and = babelHelpers.classPrivateFieldLooseKey("and"); -function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; } - -var _nullish = _classPrivateFieldLooseKey("nullish"); - -var _and = _classPrivateFieldLooseKey("and"); - -var _or = _classPrivateFieldLooseKey("or"); +var _or = babelHelpers.classPrivateFieldLooseKey("or"); class Foo { constructor() { @@ -31,12 +25,12 @@ class Foo { } test() { - var _classPrivateFieldLoo, _classPrivateFieldLoo2, _classPrivateFieldLoo3, _classPrivateFieldLoo4; + var _babelHelpers$classPr, _babelHelpers$classPr2, _babelHelpers$classPr3, _babelHelpers$classPr4; - (_classPrivateFieldLoo = _classPrivateFieldLooseBase(this, _nullish))[_nullish] ?? (_classPrivateFieldLoo[_nullish] = 42); - (_classPrivateFieldLoo2 = _classPrivateFieldLooseBase(this, _and))[_and] && (_classPrivateFieldLoo2[_and] = 0); - (_classPrivateFieldLoo3 = _classPrivateFieldLooseBase(this, _or))[_or] || (_classPrivateFieldLoo3[_or] = 0); - (_classPrivateFieldLoo4 = _classPrivateFieldLooseBase(this.self(), _nullish))[_nullish] ?? (_classPrivateFieldLoo4[_nullish] = 42); + (_babelHelpers$classPr = babelHelpers.classPrivateFieldLooseBase(this, _nullish))[_nullish] ?? (_babelHelpers$classPr[_nullish] = 42); + (_babelHelpers$classPr2 = babelHelpers.classPrivateFieldLooseBase(this, _and))[_and] && (_babelHelpers$classPr2[_and] = 0); + (_babelHelpers$classPr3 = babelHelpers.classPrivateFieldLooseBase(this, _or))[_or] || (_babelHelpers$classPr3[_or] = 0); + (_babelHelpers$classPr4 = babelHelpers.classPrivateFieldLooseBase(this.self(), _nullish))[_nullish] ?? (_babelHelpers$classPr4[_nullish] = 42); } } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/native-classes/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/native-classes/options.json index a9b6f71fec..02a7e666a9 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/native-classes/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/native-classes/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.0.2" - } - ], ["proposal-class-properties", { "loose": true }], "transform-block-scoping", "syntax-class-properties" diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/non-block-arrow-func/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/non-block-arrow-func/options.json index a9b6f71fec..02a7e666a9 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/non-block-arrow-func/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/non-block-arrow-func/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.0.2" - } - ], ["proposal-class-properties", { "loose": true }], "transform-block-scoping", "syntax-class-properties" diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-before-member-call-with-transform/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-before-member-call-with-transform/output.js index 8ad401151d..ab0dd5413c 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-before-member-call-with-transform/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-before-member-call-with-transform/output.js @@ -1,14 +1,8 @@ -function _classPrivateFieldLooseBase(receiver, privateKey) { if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) { throw new TypeError("attempted to use private field on non-instance"); } return receiver; } +var _x = babelHelpers.classPrivateFieldLooseKey("x"); -var id = 0; +var _m = babelHelpers.classPrivateFieldLooseKey("m"); -function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; } - -var _x = _classPrivateFieldLooseKey("x"); - -var _m = _classPrivateFieldLooseKey("m"); - -var _self = _classPrivateFieldLooseKey("self"); +var _self = babelHelpers.classPrivateFieldLooseKey("self"); class Foo { static getSelf() { @@ -16,7 +10,7 @@ class Foo { } static test() { - var _deep$very$o, _deep$very$o2, _deep$very$o3, _ref, _ref2, _self2, _classPrivateFieldLoo, _ref3, _ref4, _getSelf, _ref5, _ref6, _classPrivateFieldLoo2, _call, _getSelf2, _getSelf3, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _ref7, _ref8, _self3, _classPrivateFieldLoo3, _ref9, _ref10, _getSelf4, _ref11, _ref12, _classPrivateFieldLoo4, _call2, _getSelf5, _getSelf6, _ref13, _ref14, _ref15, _ref16, _ref17, _ref18, _ref19, _ref20, _ref21, _ref22; + var _deep$very$o, _deep$very$o2, _deep$very$o3, _ref, _ref2, _self2, _babelHelpers$classPr, _ref3, _ref4, _getSelf, _ref5, _ref6, _babelHelpers$classPr2, _call, _getSelf2, _getSelf3, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _ref7, _ref8, _self3, _babelHelpers$classPr3, _ref9, _ref10, _getSelf4, _ref11, _ref12, _babelHelpers$classPr4, _call2, _getSelf5, _getSelf6, _ref13, _ref14, _ref15, _ref16, _ref17, _ref18, _ref19, _ref20, _ref21, _ref22; const o = { Foo: Foo @@ -35,44 +29,44 @@ class Foo { return deep; } - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _m)[_m](); - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _m)[_m]().toString; - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _m)[_m]().toString(); - (_deep$very$o = deep == null ? void 0 : deep.very.o) === null || _deep$very$o === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o.Foo, _m)[_m](); - (_deep$very$o2 = deep == null ? void 0 : deep.very.o) === null || _deep$very$o2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o2.Foo, _m)[_m]().toString; - (_deep$very$o3 = deep == null ? void 0 : deep.very.o) === null || _deep$very$o3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o3.Foo, _m)[_m]().toString(); - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(o.Foo, _self)[_self], _m)[_m](); - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(o.Foo, _self)[_self].self, _m)[_m](); - (_ref = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref.self, _m)[_m](); - (_ref2 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].self) === null || _ref2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref2.self, _m)[_m](); - (_self2 = (_ref13 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref13.self) === null || _self2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self2.self, _m)[_m](); - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf(), _m)[_m](); - (_ref3 = o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) === null || _ref3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref3.call(_classPrivateFieldLoo), _m)[_m](); - (_ref4 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref4 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref4.getSelf(), _m)[_m](); - (_getSelf = (_ref14 = _ref5 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref14.getSelf) === null || _getSelf === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf.call(_ref5), _m)[_m](); - (_ref6 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) === null || _ref6 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref6.self, _m)[_m](); - (_call = (_ref15 = o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo2 = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) == null ? void 0 : _ref15.call(_classPrivateFieldLoo2)) === null || _call === void 0 ? void 0 : _classPrivateFieldLooseBase(_call.self, _m)[_m](); - (_getSelf2 = (_ref16 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref16.getSelf()) === null || _getSelf2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf2.self, _m)[_m](); - (_getSelf3 = (_ref17 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref17.getSelf == null ? void 0 : _ref17.getSelf()) === null || _getSelf3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf3.self, _m)[_m](); - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _m)[_m](); - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _m)[_m]().toString; - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _m)[_m]().toString(); - (_fnDeep$very$o = fnDeep == null ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o.Foo, _m)[_m](); - (_fnDeep$very$o2 = fnDeep == null ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o2.Foo, _m)[_m]().toString; - (_fnDeep$very$o3 = fnDeep == null ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o3.Foo, _m)[_m]().toString(); - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(fn().Foo, _self)[_self], _m)[_m](); - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(fn().Foo, _self)[_self].self, _m)[_m](); - (_ref7 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref7 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref7.self, _m)[_m](); - (_ref8 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) === null || _ref8 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref8.self, _m)[_m](); - (_self3 = (_ref18 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref18.self) === null || _self3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self3.self, _m)[_m](); - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf(), _m)[_m](); - (_ref9 = fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo3 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) === null || _ref9 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref9.call(_classPrivateFieldLoo3), _m)[_m](); - (_ref10 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref10 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref10.getSelf(), _m)[_m](); - (_getSelf4 = (_ref19 = _ref11 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref19.getSelf) === null || _getSelf4 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf4.call(_ref11), _m)[_m](); - (_ref12 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) === null || _ref12 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref12.self, _m)[_m](); - (_call2 = (_ref20 = fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo4 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) == null ? void 0 : _ref20.call(_classPrivateFieldLoo4)) === null || _call2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_call2.self, _m)[_m](); - (_getSelf5 = (_ref21 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref21.getSelf()) === null || _getSelf5 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf5.self, _m)[_m](); - (_getSelf6 = (_ref22 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref22.getSelf == null ? void 0 : _ref22.getSelf()) === null || _getSelf6 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf6.self, _m)[_m](); + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _m)[_m](); + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _m)[_m]().toString; + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _m)[_m]().toString(); + (_deep$very$o = deep == null ? void 0 : deep.very.o) === null || _deep$very$o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o.Foo, _m)[_m](); + (_deep$very$o2 = deep == null ? void 0 : deep.very.o) === null || _deep$very$o2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o2.Foo, _m)[_m]().toString; + (_deep$very$o3 = deep == null ? void 0 : deep.very.o) === null || _deep$very$o3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o3.Foo, _m)[_m]().toString(); + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self], _m)[_m](); + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self, _m)[_m](); + (_ref = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref.self, _m)[_m](); + (_ref2 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self) === null || _ref2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref2.self, _m)[_m](); + (_self2 = (_ref13 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref13.self) === null || _self2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self2.self, _m)[_m](); + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf(), _m)[_m](); + (_ref3 = o === null || o === void 0 ? void 0 : (_babelHelpers$classPr = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) === null || _ref3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref3.call(_babelHelpers$classPr), _m)[_m](); + (_ref4 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref4 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref4.getSelf(), _m)[_m](); + (_getSelf = (_ref14 = _ref5 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref14.getSelf) === null || _getSelf === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf.call(_ref5), _m)[_m](); + (_ref6 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) === null || _ref6 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref6.self, _m)[_m](); + (_call = (_ref15 = o === null || o === void 0 ? void 0 : (_babelHelpers$classPr2 = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) == null ? void 0 : _ref15.call(_babelHelpers$classPr2)) === null || _call === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_call.self, _m)[_m](); + (_getSelf2 = (_ref16 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref16.getSelf()) === null || _getSelf2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf2.self, _m)[_m](); + (_getSelf3 = (_ref17 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref17.getSelf == null ? void 0 : _ref17.getSelf()) === null || _getSelf3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf3.self, _m)[_m](); + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _m)[_m](); + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _m)[_m]().toString; + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _m)[_m]().toString(); + (_fnDeep$very$o = fnDeep == null ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o.Foo, _m)[_m](); + (_fnDeep$very$o2 = fnDeep == null ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o2.Foo, _m)[_m]().toString; + (_fnDeep$very$o3 = fnDeep == null ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o3.Foo, _m)[_m]().toString(); + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self], _m)[_m](); + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self, _m)[_m](); + (_ref7 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref7 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref7.self, _m)[_m](); + (_ref8 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) === null || _ref8 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref8.self, _m)[_m](); + (_self3 = (_ref18 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref18.self) === null || _self3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self3.self, _m)[_m](); + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf(), _m)[_m](); + (_ref9 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr3 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) === null || _ref9 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref9.call(_babelHelpers$classPr3), _m)[_m](); + (_ref10 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref10 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref10.getSelf(), _m)[_m](); + (_getSelf4 = (_ref19 = _ref11 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref19.getSelf) === null || _getSelf4 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf4.call(_ref11), _m)[_m](); + (_ref12 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) === null || _ref12 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref12.self, _m)[_m](); + (_call2 = (_ref20 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr4 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) == null ? void 0 : _ref20.call(_babelHelpers$classPr4)) === null || _call2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_call2.self, _m)[_m](); + (_getSelf5 = (_ref21 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref21.getSelf()) === null || _getSelf5 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf5.self, _m)[_m](); + (_getSelf6 = (_ref22 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref22.getSelf == null ? void 0 : _ref22.getSelf()) === null || _getSelf6 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf6.self, _m)[_m](); } } @@ -84,7 +78,7 @@ Object.defineProperty(Foo, _x, { Object.defineProperty(Foo, _m, { writable: true, value: function () { - return _classPrivateFieldLooseBase(this, _x)[_x]; + return babelHelpers.classPrivateFieldLooseBase(this, _x)[_x]; } }); Object.defineProperty(Foo, _self, { diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-before-member-call/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-before-member-call/output.js index 0ac9dbf280..1f631a119a 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-before-member-call/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-before-member-call/output.js @@ -1,14 +1,8 @@ -function _classPrivateFieldLooseBase(receiver, privateKey) { if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) { throw new TypeError("attempted to use private field on non-instance"); } return receiver; } +var _x = babelHelpers.classPrivateFieldLooseKey("x"); -var id = 0; +var _m = babelHelpers.classPrivateFieldLooseKey("m"); -function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; } - -var _x = _classPrivateFieldLooseKey("x"); - -var _m = _classPrivateFieldLooseKey("m"); - -var _self = _classPrivateFieldLooseKey("self"); +var _self = babelHelpers.classPrivateFieldLooseKey("self"); class Foo { static getSelf() { @@ -16,7 +10,7 @@ class Foo { } static test() { - var _deep$very$o, _deep$very$o2, _deep$very$o3, _ref, _ref2, _self2, _classPrivateFieldLoo, _ref3, _ref4, _getSelf, _ref5, _ref6, _classPrivateFieldLoo2, _call, _getSelf2, _getSelf3, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _ref7, _ref8, _self3, _classPrivateFieldLoo3, _ref9, _ref10, _getSelf4, _ref11, _ref12, _classPrivateFieldLoo4, _call2, _getSelf5, _getSelf6; + var _deep$very$o, _deep$very$o2, _deep$very$o3, _ref, _ref2, _self2, _babelHelpers$classPr, _ref3, _ref4, _getSelf, _ref5, _ref6, _babelHelpers$classPr2, _call, _getSelf2, _getSelf3, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _ref7, _ref8, _self3, _babelHelpers$classPr3, _ref9, _ref10, _getSelf4, _ref11, _ref12, _babelHelpers$classPr4, _call2, _getSelf5, _getSelf6; const o = { Foo: Foo @@ -35,44 +29,44 @@ class Foo { return deep; } - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _m)[_m](); - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _m)[_m]().toString; - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _m)[_m]().toString(); - (_deep$very$o = deep?.very.o) === null || _deep$very$o === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o.Foo, _m)[_m](); - (_deep$very$o2 = deep?.very.o) === null || _deep$very$o2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o2.Foo, _m)[_m]().toString; - (_deep$very$o3 = deep?.very.o) === null || _deep$very$o3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o3.Foo, _m)[_m]().toString(); - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(o.Foo, _self)[_self], _m)[_m](); - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(o.Foo, _self)[_self].self, _m)[_m](); - (_ref = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref.self, _m)[_m](); - (_ref2 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].self) === null || _ref2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref2.self, _m)[_m](); - (_self2 = (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.self) === null || _self2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self2.self, _m)[_m](); - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf(), _m)[_m](); - (_ref3 = o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) === null || _ref3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref3.call(_classPrivateFieldLoo), _m)[_m](); - (_ref4 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref4 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref4.getSelf(), _m)[_m](); - (_getSelf = (_ref5 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf) === null || _getSelf === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf.call(_ref5), _m)[_m](); - (_ref6 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) === null || _ref6 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref6.self, _m)[_m](); - (_call = (o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo2 = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf)?.call(_classPrivateFieldLoo2)) === null || _call === void 0 ? void 0 : _classPrivateFieldLooseBase(_call.self, _m)[_m](); - (_getSelf2 = (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf()) === null || _getSelf2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf2.self, _m)[_m](); - (_getSelf3 = (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf?.()) === null || _getSelf3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf3.self, _m)[_m](); - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _m)[_m](); - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _m)[_m]().toString; - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _m)[_m]().toString(); - (_fnDeep$very$o = fnDeep?.().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o.Foo, _m)[_m](); - (_fnDeep$very$o2 = fnDeep?.().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o2.Foo, _m)[_m]().toString; - (_fnDeep$very$o3 = fnDeep?.().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o3.Foo, _m)[_m]().toString(); - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(fn().Foo, _self)[_self], _m)[_m](); - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(fn().Foo, _self)[_self].self, _m)[_m](); - (_ref7 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref7 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref7.self, _m)[_m](); - (_ref8 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) === null || _ref8 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref8.self, _m)[_m](); - (_self3 = (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.self) === null || _self3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self3.self, _m)[_m](); - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf(), _m)[_m](); - (_ref9 = fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo3 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) === null || _ref9 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref9.call(_classPrivateFieldLoo3), _m)[_m](); - (_ref10 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref10 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref10.getSelf(), _m)[_m](); - (_getSelf4 = (_ref11 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf) === null || _getSelf4 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf4.call(_ref11), _m)[_m](); - (_ref12 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) === null || _ref12 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref12.self, _m)[_m](); - (_call2 = (fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo4 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf)?.call(_classPrivateFieldLoo4)) === null || _call2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_call2.self, _m)[_m](); - (_getSelf5 = (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf()) === null || _getSelf5 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf5.self, _m)[_m](); - (_getSelf6 = (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf?.()) === null || _getSelf6 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf6.self, _m)[_m](); + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _m)[_m](); + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _m)[_m]().toString; + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _m)[_m]().toString(); + (_deep$very$o = deep?.very.o) === null || _deep$very$o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o.Foo, _m)[_m](); + (_deep$very$o2 = deep?.very.o) === null || _deep$very$o2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o2.Foo, _m)[_m]().toString; + (_deep$very$o3 = deep?.very.o) === null || _deep$very$o3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o3.Foo, _m)[_m]().toString(); + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self], _m)[_m](); + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self, _m)[_m](); + (_ref = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref.self, _m)[_m](); + (_ref2 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self) === null || _ref2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref2.self, _m)[_m](); + (_self2 = (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.self) === null || _self2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self2.self, _m)[_m](); + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf(), _m)[_m](); + (_ref3 = o === null || o === void 0 ? void 0 : (_babelHelpers$classPr = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) === null || _ref3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref3.call(_babelHelpers$classPr), _m)[_m](); + (_ref4 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref4 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref4.getSelf(), _m)[_m](); + (_getSelf = (_ref5 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf) === null || _getSelf === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf.call(_ref5), _m)[_m](); + (_ref6 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) === null || _ref6 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref6.self, _m)[_m](); + (_call = (o === null || o === void 0 ? void 0 : (_babelHelpers$classPr2 = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf)?.call(_babelHelpers$classPr2)) === null || _call === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_call.self, _m)[_m](); + (_getSelf2 = (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf()) === null || _getSelf2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf2.self, _m)[_m](); + (_getSelf3 = (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf?.()) === null || _getSelf3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf3.self, _m)[_m](); + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _m)[_m](); + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _m)[_m]().toString; + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _m)[_m]().toString(); + (_fnDeep$very$o = fnDeep?.().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o.Foo, _m)[_m](); + (_fnDeep$very$o2 = fnDeep?.().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o2.Foo, _m)[_m]().toString; + (_fnDeep$very$o3 = fnDeep?.().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o3.Foo, _m)[_m]().toString(); + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self], _m)[_m](); + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self, _m)[_m](); + (_ref7 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref7 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref7.self, _m)[_m](); + (_ref8 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) === null || _ref8 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref8.self, _m)[_m](); + (_self3 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.self) === null || _self3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self3.self, _m)[_m](); + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf(), _m)[_m](); + (_ref9 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr3 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) === null || _ref9 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref9.call(_babelHelpers$classPr3), _m)[_m](); + (_ref10 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref10 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref10.getSelf(), _m)[_m](); + (_getSelf4 = (_ref11 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf) === null || _getSelf4 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf4.call(_ref11), _m)[_m](); + (_ref12 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) === null || _ref12 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref12.self, _m)[_m](); + (_call2 = (fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr4 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf)?.call(_babelHelpers$classPr4)) === null || _call2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_call2.self, _m)[_m](); + (_getSelf5 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf()) === null || _getSelf5 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf5.self, _m)[_m](); + (_getSelf6 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf?.()) === null || _getSelf6 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf6.self, _m)[_m](); } } @@ -84,7 +78,7 @@ Object.defineProperty(Foo, _x, { Object.defineProperty(Foo, _m, { writable: true, value: function () { - return _classPrivateFieldLooseBase(this, _x)[_x]; + return babelHelpers.classPrivateFieldLooseBase(this, _x)[_x]; } }); Object.defineProperty(Foo, _self, { diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-before-property-with-transform/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-before-property-with-transform/output.js index 8292f129dd..facdbb24d3 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-before-property-with-transform/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-before-property-with-transform/output.js @@ -1,12 +1,6 @@ -function _classPrivateFieldLooseBase(receiver, privateKey) { if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) { throw new TypeError("attempted to use private field on non-instance"); } return receiver; } +var _x = babelHelpers.classPrivateFieldLooseKey("x"); -var id = 0; - -function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; } - -var _x = _classPrivateFieldLooseKey("x"); - -var _self = _classPrivateFieldLooseKey("self"); +var _self = babelHelpers.classPrivateFieldLooseKey("self"); class Foo { static getSelf() { @@ -14,7 +8,7 @@ class Foo { } static test() { - var _deep$very$o, _deep$very$o2, _deep$very$o3, _ref, _ref2, _self2, _classPrivateFieldLoo, _ref3, _ref4, _getSelf, _ref5, _ref6, _classPrivateFieldLoo2, _call, _getSelf2, _getSelf3, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _ref7, _ref8, _self3, _classPrivateFieldLoo3, _ref9, _ref10, _getSelf4, _ref11, _ref12, _classPrivateFieldLoo4, _call2, _getSelf5, _getSelf6, _ref13, _ref14, _ref15, _ref16, _ref17, _ref18, _ref19, _ref20, _ref21, _ref22; + var _deep$very$o, _deep$very$o2, _deep$very$o3, _ref, _ref2, _self2, _babelHelpers$classPr, _ref3, _ref4, _getSelf, _ref5, _ref6, _babelHelpers$classPr2, _call, _getSelf2, _getSelf3, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _ref7, _ref8, _self3, _babelHelpers$classPr3, _ref9, _ref10, _getSelf4, _ref11, _ref12, _babelHelpers$classPr4, _call2, _getSelf5, _getSelf6, _ref13, _ref14, _ref15, _ref16, _ref17, _ref18, _ref19, _ref20, _ref21, _ref22; const o = { Foo: Foo @@ -33,44 +27,44 @@ class Foo { return deep; } - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _x)[_x]; - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _x)[_x].toString; - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _x)[_x].toString(); - (_deep$very$o = deep == null ? void 0 : deep.very.o) === null || _deep$very$o === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o.Foo, _x)[_x]; - (_deep$very$o2 = deep == null ? void 0 : deep.very.o) === null || _deep$very$o2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o2.Foo, _x)[_x].toString; - (_deep$very$o3 = deep == null ? void 0 : deep.very.o) === null || _deep$very$o3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o3.Foo, _x)[_x].toString(); - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(o.Foo, _self)[_self], _x)[_x]; - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(o.Foo, _self)[_self].self, _x)[_x]; - (_ref = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref.self, _x)[_x]; - (_ref2 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].self) === null || _ref2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref2.self, _x)[_x]; - (_self2 = (_ref13 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref13.self) === null || _self2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self2.self, _x)[_x]; - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf(), _x)[_x]; - (_ref3 = o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) === null || _ref3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref3.call(_classPrivateFieldLoo), _x)[_x]; - (_ref4 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref4 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref4.getSelf(), _x)[_x]; - (_getSelf = (_ref14 = _ref5 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref14.getSelf) === null || _getSelf === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf.call(_ref5), _x)[_x]; - (_ref6 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) === null || _ref6 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref6.self, _x)[_x]; - (_call = (_ref15 = o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo2 = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) == null ? void 0 : _ref15.call(_classPrivateFieldLoo2)) === null || _call === void 0 ? void 0 : _classPrivateFieldLooseBase(_call.self, _x)[_x]; - (_getSelf2 = (_ref16 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref16.getSelf()) === null || _getSelf2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf2.self, _x)[_x]; - (_getSelf3 = (_ref17 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref17.getSelf == null ? void 0 : _ref17.getSelf()) === null || _getSelf3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf3.self, _x)[_x]; - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _x)[_x]; - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _x)[_x].toString; - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _x)[_x].toString(); - (_fnDeep$very$o = fnDeep == null ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o.Foo, _x)[_x]; - (_fnDeep$very$o2 = fnDeep == null ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o2.Foo, _x)[_x].toString; - (_fnDeep$very$o3 = fnDeep == null ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o3.Foo, _x)[_x].toString(); - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(fn().Foo, _self)[_self], _x)[_x]; - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(fn().Foo, _self)[_self].self, _x)[_x]; - (_ref7 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref7 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref7.self, _x)[_x]; - (_ref8 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) === null || _ref8 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref8.self, _x)[_x]; - (_self3 = (_ref18 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref18.self) === null || _self3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self3.self, _x)[_x]; - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf(), _x)[_x]; - (_ref9 = fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo3 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) === null || _ref9 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref9.call(_classPrivateFieldLoo3), _x)[_x]; - (_ref10 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref10 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref10.getSelf(), _x)[_x]; - (_getSelf4 = (_ref19 = _ref11 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref19.getSelf) === null || _getSelf4 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf4.call(_ref11), _x)[_x]; - (_ref12 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) === null || _ref12 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref12.self, _x)[_x]; - (_call2 = (_ref20 = fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo4 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) == null ? void 0 : _ref20.call(_classPrivateFieldLoo4)) === null || _call2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_call2.self, _x)[_x]; - (_getSelf5 = (_ref21 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref21.getSelf()) === null || _getSelf5 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf5.self, _x)[_x]; - (_getSelf6 = (_ref22 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref22.getSelf == null ? void 0 : _ref22.getSelf()) === null || _getSelf6 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf6.self, _x)[_x]; + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _x)[_x]; + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _x)[_x].toString; + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _x)[_x].toString(); + (_deep$very$o = deep == null ? void 0 : deep.very.o) === null || _deep$very$o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o.Foo, _x)[_x]; + (_deep$very$o2 = deep == null ? void 0 : deep.very.o) === null || _deep$very$o2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o2.Foo, _x)[_x].toString; + (_deep$very$o3 = deep == null ? void 0 : deep.very.o) === null || _deep$very$o3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o3.Foo, _x)[_x].toString(); + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self], _x)[_x]; + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self, _x)[_x]; + (_ref = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref.self, _x)[_x]; + (_ref2 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self) === null || _ref2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref2.self, _x)[_x]; + (_self2 = (_ref13 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref13.self) === null || _self2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self2.self, _x)[_x]; + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf(), _x)[_x]; + (_ref3 = o === null || o === void 0 ? void 0 : (_babelHelpers$classPr = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) === null || _ref3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref3.call(_babelHelpers$classPr), _x)[_x]; + (_ref4 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref4 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref4.getSelf(), _x)[_x]; + (_getSelf = (_ref14 = _ref5 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref14.getSelf) === null || _getSelf === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf.call(_ref5), _x)[_x]; + (_ref6 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) === null || _ref6 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref6.self, _x)[_x]; + (_call = (_ref15 = o === null || o === void 0 ? void 0 : (_babelHelpers$classPr2 = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) == null ? void 0 : _ref15.call(_babelHelpers$classPr2)) === null || _call === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_call.self, _x)[_x]; + (_getSelf2 = (_ref16 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref16.getSelf()) === null || _getSelf2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf2.self, _x)[_x]; + (_getSelf3 = (_ref17 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref17.getSelf == null ? void 0 : _ref17.getSelf()) === null || _getSelf3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf3.self, _x)[_x]; + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _x)[_x]; + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _x)[_x].toString; + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _x)[_x].toString(); + (_fnDeep$very$o = fnDeep == null ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o.Foo, _x)[_x]; + (_fnDeep$very$o2 = fnDeep == null ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o2.Foo, _x)[_x].toString; + (_fnDeep$very$o3 = fnDeep == null ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o3.Foo, _x)[_x].toString(); + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self], _x)[_x]; + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self, _x)[_x]; + (_ref7 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref7 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref7.self, _x)[_x]; + (_ref8 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) === null || _ref8 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref8.self, _x)[_x]; + (_self3 = (_ref18 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref18.self) === null || _self3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self3.self, _x)[_x]; + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf(), _x)[_x]; + (_ref9 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr3 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) === null || _ref9 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref9.call(_babelHelpers$classPr3), _x)[_x]; + (_ref10 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref10 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref10.getSelf(), _x)[_x]; + (_getSelf4 = (_ref19 = _ref11 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref19.getSelf) === null || _getSelf4 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf4.call(_ref11), _x)[_x]; + (_ref12 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) === null || _ref12 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref12.self, _x)[_x]; + (_call2 = (_ref20 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr4 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) == null ? void 0 : _ref20.call(_babelHelpers$classPr4)) === null || _call2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_call2.self, _x)[_x]; + (_getSelf5 = (_ref21 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref21.getSelf()) === null || _getSelf5 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf5.self, _x)[_x]; + (_getSelf6 = (_ref22 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref22.getSelf == null ? void 0 : _ref22.getSelf()) === null || _getSelf6 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf6.self, _x)[_x]; } } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-before-property/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-before-property/output.js index e46e45c50a..237a49a8c3 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-before-property/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-before-property/output.js @@ -1,12 +1,6 @@ -function _classPrivateFieldLooseBase(receiver, privateKey) { if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) { throw new TypeError("attempted to use private field on non-instance"); } return receiver; } +var _x = babelHelpers.classPrivateFieldLooseKey("x"); -var id = 0; - -function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; } - -var _x = _classPrivateFieldLooseKey("x"); - -var _self = _classPrivateFieldLooseKey("self"); +var _self = babelHelpers.classPrivateFieldLooseKey("self"); class Foo { static getSelf() { @@ -14,7 +8,7 @@ class Foo { } static test() { - var _deep$very$o, _deep$very$o2, _deep$very$o3, _ref, _ref2, _self2, _classPrivateFieldLoo, _ref3, _ref4, _getSelf, _ref5, _ref6, _classPrivateFieldLoo2, _call, _getSelf2, _getSelf3, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _ref7, _ref8, _self3, _classPrivateFieldLoo3, _ref9, _ref10, _getSelf4, _ref11, _ref12, _classPrivateFieldLoo4, _call2, _getSelf5, _getSelf6; + var _deep$very$o, _deep$very$o2, _deep$very$o3, _ref, _ref2, _self2, _babelHelpers$classPr, _ref3, _ref4, _getSelf, _ref5, _ref6, _babelHelpers$classPr2, _call, _getSelf2, _getSelf3, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _ref7, _ref8, _self3, _babelHelpers$classPr3, _ref9, _ref10, _getSelf4, _ref11, _ref12, _babelHelpers$classPr4, _call2, _getSelf5, _getSelf6; const o = { Foo: Foo @@ -33,44 +27,44 @@ class Foo { return deep; } - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _x)[_x]; - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _x)[_x].toString; - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _x)[_x].toString(); - (_deep$very$o = deep?.very.o) === null || _deep$very$o === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o.Foo, _x)[_x]; - (_deep$very$o2 = deep?.very.o) === null || _deep$very$o2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o2.Foo, _x)[_x].toString; - (_deep$very$o3 = deep?.very.o) === null || _deep$very$o3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o3.Foo, _x)[_x].toString(); - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(o.Foo, _self)[_self], _x)[_x]; - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(o.Foo, _self)[_self].self, _x)[_x]; - (_ref = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref.self, _x)[_x]; - (_ref2 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].self) === null || _ref2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref2.self, _x)[_x]; - (_self2 = (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.self) === null || _self2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self2.self, _x)[_x]; - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf(), _x)[_x]; - (_ref3 = o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) === null || _ref3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref3.call(_classPrivateFieldLoo), _x)[_x]; - (_ref4 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref4 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref4.getSelf(), _x)[_x]; - (_getSelf = (_ref5 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf) === null || _getSelf === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf.call(_ref5), _x)[_x]; - (_ref6 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) === null || _ref6 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref6.self, _x)[_x]; - (_call = (o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo2 = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf)?.call(_classPrivateFieldLoo2)) === null || _call === void 0 ? void 0 : _classPrivateFieldLooseBase(_call.self, _x)[_x]; - (_getSelf2 = (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf()) === null || _getSelf2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf2.self, _x)[_x]; - (_getSelf3 = (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf?.()) === null || _getSelf3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf3.self, _x)[_x]; - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _x)[_x]; - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _x)[_x].toString; - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _x)[_x].toString(); - (_fnDeep$very$o = fnDeep?.().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o.Foo, _x)[_x]; - (_fnDeep$very$o2 = fnDeep?.().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o2.Foo, _x)[_x].toString; - (_fnDeep$very$o3 = fnDeep?.().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o3.Foo, _x)[_x].toString(); - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(fn().Foo, _self)[_self], _x)[_x]; - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(fn().Foo, _self)[_self].self, _x)[_x]; - (_ref7 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref7 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref7.self, _x)[_x]; - (_ref8 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) === null || _ref8 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref8.self, _x)[_x]; - (_self3 = (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.self) === null || _self3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self3.self, _x)[_x]; - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf(), _x)[_x]; - (_ref9 = fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo3 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) === null || _ref9 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref9.call(_classPrivateFieldLoo3), _x)[_x]; - (_ref10 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref10 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref10.getSelf(), _x)[_x]; - (_getSelf4 = (_ref11 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf) === null || _getSelf4 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf4.call(_ref11), _x)[_x]; - (_ref12 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) === null || _ref12 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref12.self, _x)[_x]; - (_call2 = (fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo4 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf)?.call(_classPrivateFieldLoo4)) === null || _call2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_call2.self, _x)[_x]; - (_getSelf5 = (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf()) === null || _getSelf5 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf5.self, _x)[_x]; - (_getSelf6 = (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf?.()) === null || _getSelf6 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf6.self, _x)[_x]; + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _x)[_x]; + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _x)[_x].toString; + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _x)[_x].toString(); + (_deep$very$o = deep?.very.o) === null || _deep$very$o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o.Foo, _x)[_x]; + (_deep$very$o2 = deep?.very.o) === null || _deep$very$o2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o2.Foo, _x)[_x].toString; + (_deep$very$o3 = deep?.very.o) === null || _deep$very$o3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o3.Foo, _x)[_x].toString(); + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self], _x)[_x]; + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self, _x)[_x]; + (_ref = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref.self, _x)[_x]; + (_ref2 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self) === null || _ref2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref2.self, _x)[_x]; + (_self2 = (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.self) === null || _self2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self2.self, _x)[_x]; + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf(), _x)[_x]; + (_ref3 = o === null || o === void 0 ? void 0 : (_babelHelpers$classPr = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) === null || _ref3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref3.call(_babelHelpers$classPr), _x)[_x]; + (_ref4 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref4 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref4.getSelf(), _x)[_x]; + (_getSelf = (_ref5 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf) === null || _getSelf === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf.call(_ref5), _x)[_x]; + (_ref6 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) === null || _ref6 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref6.self, _x)[_x]; + (_call = (o === null || o === void 0 ? void 0 : (_babelHelpers$classPr2 = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf)?.call(_babelHelpers$classPr2)) === null || _call === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_call.self, _x)[_x]; + (_getSelf2 = (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf()) === null || _getSelf2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf2.self, _x)[_x]; + (_getSelf3 = (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf?.()) === null || _getSelf3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf3.self, _x)[_x]; + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _x)[_x]; + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _x)[_x].toString; + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _x)[_x].toString(); + (_fnDeep$very$o = fnDeep?.().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o.Foo, _x)[_x]; + (_fnDeep$very$o2 = fnDeep?.().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o2.Foo, _x)[_x].toString; + (_fnDeep$very$o3 = fnDeep?.().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o3.Foo, _x)[_x].toString(); + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self], _x)[_x]; + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self, _x)[_x]; + (_ref7 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref7 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref7.self, _x)[_x]; + (_ref8 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) === null || _ref8 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref8.self, _x)[_x]; + (_self3 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.self) === null || _self3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self3.self, _x)[_x]; + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf(), _x)[_x]; + (_ref9 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr3 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) === null || _ref9 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref9.call(_babelHelpers$classPr3), _x)[_x]; + (_ref10 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref10 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref10.getSelf(), _x)[_x]; + (_getSelf4 = (_ref11 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf) === null || _getSelf4 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf4.call(_ref11), _x)[_x]; + (_ref12 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) === null || _ref12 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref12.self, _x)[_x]; + (_call2 = (fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr4 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf)?.call(_babelHelpers$classPr4)) === null || _call2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_call2.self, _x)[_x]; + (_getSelf5 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf()) === null || _getSelf5 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf5.self, _x)[_x]; + (_getSelf6 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf?.()) === null || _getSelf6 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf6.self, _x)[_x]; } } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-cast-to-boolean/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-cast-to-boolean/options.json index ee8a5dac8c..2d5cfe8e80 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-cast-to-boolean/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-cast-to-boolean/options.json @@ -1,4 +1,4 @@ { - "plugins": [["external-helpers", { "helperVersion": "7.100.0" }], ["proposal-class-properties", {"loose": true }]], + "plugins": [["proposal-class-properties", { "loose": true }]], "minNodeVersion": "14.0.0" } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-delete-property-with-transform/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-delete-property-with-transform/output.js index 9770ba43cf..a81b1844ef 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-delete-property-with-transform/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-delete-property-with-transform/output.js @@ -1,12 +1,6 @@ -function _classPrivateFieldLooseBase(receiver, privateKey) { if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) { throw new TypeError("attempted to use private field on non-instance"); } return receiver; } +var _x = babelHelpers.classPrivateFieldLooseKey("x"); -var id = 0; - -function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; } - -var _x = _classPrivateFieldLooseKey("x"); - -var _self = _classPrivateFieldLooseKey("self"); +var _self = babelHelpers.classPrivateFieldLooseKey("self"); class Foo { static getSelf() { @@ -14,7 +8,7 @@ class Foo { } static test() { - var _deep$very$o, _classPrivateFieldLoo, _classPrivateFieldLoo2, _fnDeep$very$o, _classPrivateFieldLoo3, _classPrivateFieldLoo4, _ref, _ref2, _ref3, _ref3$self, _ref4, _ref5, _ref6, _ref7, _ref8, _ref8$call, _ref9, _ref9$getSelf, _ref10, _ref10$getSelf, _ref11, _ref12, _ref13, _ref13$self, _ref14, _ref15, _ref16, _ref17, _ref18, _ref18$call, _ref19, _ref19$getSelf, _ref20, _ref20$getSelf; + var _deep$very$o, _babelHelpers$classPr, _babelHelpers$classPr2, _fnDeep$very$o, _babelHelpers$classPr3, _babelHelpers$classPr4, _ref, _ref2, _ref3, _ref3$self, _ref4, _ref5, _ref6, _ref7, _ref8, _ref8$call, _ref9, _ref9$getSelf, _ref10, _ref10$getSelf, _ref11, _ref12, _ref13, _ref13$self, _ref14, _ref15, _ref16, _ref17, _ref18, _ref18$call, _ref19, _ref19$getSelf, _ref20, _ref20$getSelf; const o = { Foo: Foo @@ -33,36 +27,36 @@ class Foo { return deep; } - Foo === null || Foo === void 0 ? true : delete _classPrivateFieldLooseBase(Foo, _self)[_self].unicorn; - (_deep$very$o = deep == null ? void 0 : deep.very.o) === null || _deep$very$o === void 0 ? true : delete _classPrivateFieldLooseBase(_deep$very$o.Foo, _self)[_self].unicorn; - o === null || o === void 0 ? true : delete _classPrivateFieldLooseBase(o.Foo, _self)[_self].unicorn; - o === null || o === void 0 ? true : delete _classPrivateFieldLooseBase(o.Foo, _self)[_self].self.unicorn; - (_ref = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? true : delete _ref.self.unicorn; - (_ref2 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].self) == null ? true : delete _ref2.self.unicorn; - (_ref3 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? true : (_ref3$self = _ref3.self) == null ? true : delete _ref3$self.self.unicorn; - o === null || o === void 0 ? true : delete _classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf().unicorn; - (_ref4 = o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) == null ? true : delete _ref4.call(_classPrivateFieldLoo).unicorn; - (_ref5 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? true : delete _ref5.getSelf().unicorn; - (_ref6 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? true : _ref6.getSelf == null ? true : delete _ref6.getSelf().unicorn; - (_ref7 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) == null ? true : delete _ref7.self.unicorn; - (_ref8 = o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo2 = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) == null ? true : (_ref8$call = _ref8.call(_classPrivateFieldLoo2)) == null ? true : delete _ref8$call.self.unicorn; - (_ref9 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? true : (_ref9$getSelf = _ref9.getSelf()) == null ? true : delete _ref9$getSelf.self.unicorn; - (_ref10 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? true : _ref10.getSelf == null ? true : (_ref10$getSelf = _ref10.getSelf()) == null ? true : delete _ref10$getSelf.self.unicorn; - fn === null || fn === void 0 ? true : delete _classPrivateFieldLooseBase(fn().Foo, _self)[_self].unicorn; - (_fnDeep$very$o = fnDeep == null ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o === void 0 ? true : delete _classPrivateFieldLooseBase(_fnDeep$very$o.Foo, _self)[_self].unicorn; - fn === null || fn === void 0 ? true : delete _classPrivateFieldLooseBase(fn().Foo, _self)[_self].unicorn; - fn === null || fn === void 0 ? true : delete _classPrivateFieldLooseBase(fn().Foo, _self)[_self].self.unicorn; - (_ref11 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? true : delete _ref11.self.unicorn; - (_ref12 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) == null ? true : delete _ref12.self.unicorn; - (_ref13 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? true : (_ref13$self = _ref13.self) == null ? true : delete _ref13$self.self.unicorn; - fn === null || fn === void 0 ? true : delete _classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf().unicorn; - (_ref14 = fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo3 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) == null ? true : delete _ref14.call(_classPrivateFieldLoo3).unicorn; - (_ref15 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? true : delete _ref15.getSelf().unicorn; - (_ref16 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? true : _ref16.getSelf == null ? true : delete _ref16.getSelf().unicorn; - (_ref17 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) == null ? true : delete _ref17.self.unicorn; - (_ref18 = fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo4 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) == null ? true : (_ref18$call = _ref18.call(_classPrivateFieldLoo4)) == null ? true : delete _ref18$call.self.unicorn; - (_ref19 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? true : (_ref19$getSelf = _ref19.getSelf()) == null ? true : delete _ref19$getSelf.self.unicorn; - (_ref20 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? true : _ref20.getSelf == null ? true : (_ref20$getSelf = _ref20.getSelf()) == null ? true : delete _ref20$getSelf.self.unicorn; + Foo === null || Foo === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(Foo, _self)[_self].unicorn; + (_deep$very$o = deep == null ? void 0 : deep.very.o) === null || _deep$very$o === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(_deep$very$o.Foo, _self)[_self].unicorn; + o === null || o === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].unicorn; + o === null || o === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self.unicorn; + (_ref = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? true : delete _ref.self.unicorn; + (_ref2 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self) == null ? true : delete _ref2.self.unicorn; + (_ref3 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? true : (_ref3$self = _ref3.self) == null ? true : delete _ref3$self.self.unicorn; + o === null || o === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf().unicorn; + (_ref4 = o === null || o === void 0 ? void 0 : (_babelHelpers$classPr = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) == null ? true : delete _ref4.call(_babelHelpers$classPr).unicorn; + (_ref5 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? true : delete _ref5.getSelf().unicorn; + (_ref6 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? true : _ref6.getSelf == null ? true : delete _ref6.getSelf().unicorn; + (_ref7 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) == null ? true : delete _ref7.self.unicorn; + (_ref8 = o === null || o === void 0 ? void 0 : (_babelHelpers$classPr2 = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) == null ? true : (_ref8$call = _ref8.call(_babelHelpers$classPr2)) == null ? true : delete _ref8$call.self.unicorn; + (_ref9 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? true : (_ref9$getSelf = _ref9.getSelf()) == null ? true : delete _ref9$getSelf.self.unicorn; + (_ref10 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? true : _ref10.getSelf == null ? true : (_ref10$getSelf = _ref10.getSelf()) == null ? true : delete _ref10$getSelf.self.unicorn; + fn === null || fn === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].unicorn; + (_fnDeep$very$o = fnDeep == null ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o.Foo, _self)[_self].unicorn; + fn === null || fn === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].unicorn; + fn === null || fn === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self.unicorn; + (_ref11 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? true : delete _ref11.self.unicorn; + (_ref12 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) == null ? true : delete _ref12.self.unicorn; + (_ref13 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? true : (_ref13$self = _ref13.self) == null ? true : delete _ref13$self.self.unicorn; + fn === null || fn === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf().unicorn; + (_ref14 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr3 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) == null ? true : delete _ref14.call(_babelHelpers$classPr3).unicorn; + (_ref15 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? true : delete _ref15.getSelf().unicorn; + (_ref16 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? true : _ref16.getSelf == null ? true : delete _ref16.getSelf().unicorn; + (_ref17 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) == null ? true : delete _ref17.self.unicorn; + (_ref18 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr4 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) == null ? true : (_ref18$call = _ref18.call(_babelHelpers$classPr4)) == null ? true : delete _ref18$call.self.unicorn; + (_ref19 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? true : (_ref19$getSelf = _ref19.getSelf()) == null ? true : delete _ref19$getSelf.self.unicorn; + (_ref20 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? true : _ref20.getSelf == null ? true : (_ref20$getSelf = _ref20.getSelf()) == null ? true : delete _ref20$getSelf.self.unicorn; } } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-delete-property/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-delete-property/output.js index 62d562129d..b79081a2a2 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-delete-property/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-delete-property/output.js @@ -1,12 +1,6 @@ -function _classPrivateFieldLooseBase(receiver, privateKey) { if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) { throw new TypeError("attempted to use private field on non-instance"); } return receiver; } +var _x = babelHelpers.classPrivateFieldLooseKey("x"); -var id = 0; - -function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; } - -var _x = _classPrivateFieldLooseKey("x"); - -var _self = _classPrivateFieldLooseKey("self"); +var _self = babelHelpers.classPrivateFieldLooseKey("self"); class Foo { static getSelf() { @@ -14,7 +8,7 @@ class Foo { } static test() { - var _deep$very$o, _classPrivateFieldLoo, _classPrivateFieldLoo2, _fnDeep$very$o, _classPrivateFieldLoo3, _classPrivateFieldLoo4; + var _deep$very$o, _babelHelpers$classPr, _babelHelpers$classPr2, _fnDeep$very$o, _babelHelpers$classPr3, _babelHelpers$classPr4; const o = { Foo: Foo @@ -33,36 +27,36 @@ class Foo { return deep; } - Foo === null || Foo === void 0 ? true : delete _classPrivateFieldLooseBase(Foo, _self)[_self].unicorn; - (_deep$very$o = deep?.very.o) === null || _deep$very$o === void 0 ? true : delete _classPrivateFieldLooseBase(_deep$very$o.Foo, _self)[_self].unicorn; - o === null || o === void 0 ? true : delete _classPrivateFieldLooseBase(o.Foo, _self)[_self].unicorn; - o === null || o === void 0 ? true : delete _classPrivateFieldLooseBase(o.Foo, _self)[_self].self.unicorn; - delete (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.self.unicorn; - delete (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].self)?.self.unicorn; - delete (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.self?.self.unicorn; - o === null || o === void 0 ? true : delete _classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf().unicorn; - delete (o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf)?.call(_classPrivateFieldLoo).unicorn; - delete (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf().unicorn; - delete (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf?.().unicorn; - delete (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf())?.self.unicorn; - delete (o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo2 = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf)?.call(_classPrivateFieldLoo2)?.self.unicorn; - delete (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf()?.self.unicorn; - delete (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf?.()?.self.unicorn; - fn === null || fn === void 0 ? true : delete _classPrivateFieldLooseBase(fn().Foo, _self)[_self].unicorn; - (_fnDeep$very$o = fnDeep?.().very.o) === null || _fnDeep$very$o === void 0 ? true : delete _classPrivateFieldLooseBase(_fnDeep$very$o.Foo, _self)[_self].unicorn; - fn === null || fn === void 0 ? true : delete _classPrivateFieldLooseBase(fn().Foo, _self)[_self].unicorn; - fn === null || fn === void 0 ? true : delete _classPrivateFieldLooseBase(fn().Foo, _self)[_self].self.unicorn; - delete (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.self.unicorn; - delete (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].self)?.self.unicorn; - delete (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.self?.self.unicorn; - fn === null || fn === void 0 ? true : delete _classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf().unicorn; - delete (fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo3 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf)?.call(_classPrivateFieldLoo3).unicorn; - delete (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf().unicorn; - delete (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf?.().unicorn; - delete (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf())?.self.unicorn; - delete (fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo4 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf)?.call(_classPrivateFieldLoo4)?.self.unicorn; - delete (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf()?.self.unicorn; - delete (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf?.()?.self.unicorn; + Foo === null || Foo === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(Foo, _self)[_self].unicorn; + (_deep$very$o = deep?.very.o) === null || _deep$very$o === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(_deep$very$o.Foo, _self)[_self].unicorn; + o === null || o === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].unicorn; + o === null || o === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self.unicorn; + delete (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.self.unicorn; + delete (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self)?.self.unicorn; + delete (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.self?.self.unicorn; + o === null || o === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf().unicorn; + delete (o === null || o === void 0 ? void 0 : (_babelHelpers$classPr = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf)?.call(_babelHelpers$classPr).unicorn; + delete (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf().unicorn; + delete (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf?.().unicorn; + delete (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf())?.self.unicorn; + delete (o === null || o === void 0 ? void 0 : (_babelHelpers$classPr2 = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf)?.call(_babelHelpers$classPr2)?.self.unicorn; + delete (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf()?.self.unicorn; + delete (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf?.()?.self.unicorn; + fn === null || fn === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].unicorn; + (_fnDeep$very$o = fnDeep?.().very.o) === null || _fnDeep$very$o === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o.Foo, _self)[_self].unicorn; + fn === null || fn === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].unicorn; + fn === null || fn === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self.unicorn; + delete (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.self.unicorn; + delete (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self)?.self.unicorn; + delete (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.self?.self.unicorn; + fn === null || fn === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf().unicorn; + delete (fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr3 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf)?.call(_babelHelpers$classPr3).unicorn; + delete (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf().unicorn; + delete (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf?.().unicorn; + delete (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf())?.self.unicorn; + delete (fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr4 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf)?.call(_babelHelpers$classPr4)?.self.unicorn; + delete (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf()?.self.unicorn; + delete (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf?.()?.self.unicorn; } } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-in-function-param-with-transform/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-in-function-param-with-transform/output.js index fb3516c4b8..e25db066a6 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-in-function-param-with-transform/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-in-function-param-with-transform/output.js @@ -1,14 +1,8 @@ -function _classPrivateFieldLooseBase(receiver, privateKey) { if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) { throw new TypeError("attempted to use private field on non-instance"); } return receiver; } +var _x = babelHelpers.classPrivateFieldLooseKey("x"); -var id = 0; +var _m = babelHelpers.classPrivateFieldLooseKey("m"); -function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; } - -var _x = _classPrivateFieldLooseKey("x"); - -var _m = _classPrivateFieldLooseKey("m"); - -var _self = _classPrivateFieldLooseKey("self"); +var _self = babelHelpers.classPrivateFieldLooseKey("self"); class Foo { static getSelf() { @@ -33,14 +27,14 @@ class Foo { return deep; } - function f(o, r = (() => o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _m)[_m]())()) { + function f(o, r = (() => o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _m)[_m]())()) { return r; } function g(o, r = (() => { var _ref; - return (_ref = (() => o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf(), _m)[_m])()) == null ? void 0 : _ref(); + return (_ref = (() => o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf(), _m)[_m])()) == null ? void 0 : _ref(); })()) { return r; } @@ -48,7 +42,7 @@ class Foo { function h(fnDeep, r = (() => { var _fnDeep$very$o$Foo, _fnDeep$very$o; - return (_fnDeep$very$o$Foo = fnDeep == null ? void 0 : (_fnDeep$very$o = fnDeep().very.o) == null ? void 0 : _fnDeep$very$o.Foo) === null || _fnDeep$very$o$Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o$Foo, _m)[_m](); + return (_fnDeep$very$o$Foo = fnDeep == null ? void 0 : (_fnDeep$very$o = fnDeep().very.o) == null ? void 0 : _fnDeep$very$o.Foo) === null || _fnDeep$very$o$Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o$Foo, _m)[_m](); })()) { return r; } @@ -56,15 +50,15 @@ class Foo { function i(fn, r = (() => { var _getSelf, _ref2; - return (_getSelf = (_ref2 = (() => fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])()) == null ? void 0 : _ref2.getSelf()) === null || _getSelf === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf.self, _m)[_m](); + return (_getSelf = (_ref2 = (() => fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])()) == null ? void 0 : _ref2.getSelf()) === null || _getSelf === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf.self, _m)[_m](); })()) { return r; } function j(fn, r = (() => { - var _classPrivateFieldLoo, _classPrivateFieldLoo2; + var _babelHelpers$classPr, _babelHelpers$classPr2; - return (_classPrivateFieldLoo = (_classPrivateFieldLoo2 = _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf().self, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo.call(_classPrivateFieldLoo2); + return (_babelHelpers$classPr = (_babelHelpers$classPr2 = babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf().self, _m))[_m]) == null ? void 0 : _babelHelpers$classPr.call(_babelHelpers$classPr2); })()) { return r; } @@ -85,7 +79,7 @@ Object.defineProperty(Foo, _x, { Object.defineProperty(Foo, _m, { writable: true, value: function () { - return _classPrivateFieldLooseBase(this, _x)[_x]; + return babelHelpers.classPrivateFieldLooseBase(this, _x)[_x]; } }); Object.defineProperty(Foo, _self, { diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-in-function-param/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-in-function-param/output.js index 2b7d864e3b..b02c5c4909 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-in-function-param/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-in-function-param/output.js @@ -1,14 +1,8 @@ -function _classPrivateFieldLooseBase(receiver, privateKey) { if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) { throw new TypeError("attempted to use private field on non-instance"); } return receiver; } +var _x = babelHelpers.classPrivateFieldLooseKey("x"); -var id = 0; +var _m = babelHelpers.classPrivateFieldLooseKey("m"); -function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; } - -var _x = _classPrivateFieldLooseKey("x"); - -var _m = _classPrivateFieldLooseKey("m"); - -var _self = _classPrivateFieldLooseKey("self"); +var _self = babelHelpers.classPrivateFieldLooseKey("self"); class Foo { static getSelf() { @@ -33,18 +27,18 @@ class Foo { return deep; } - function f(o, r = (() => o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _m)[_m]())()) { + function f(o, r = (() => o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _m)[_m]())()) { return r; } - function g(o, r = (() => o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf(), _m)[_m])()?.()) { + function g(o, r = (() => o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf(), _m)[_m])()?.()) { return r; } function h(fnDeep, r = (() => { var _fnDeep$very$o$Foo; - return (_fnDeep$very$o$Foo = fnDeep?.().very.o?.Foo) === null || _fnDeep$very$o$Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o$Foo, _m)[_m](); + return (_fnDeep$very$o$Foo = fnDeep?.().very.o?.Foo) === null || _fnDeep$very$o$Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o$Foo, _m)[_m](); })()) { return r; } @@ -52,12 +46,12 @@ class Foo { function i(fn, r = (() => { var _getSelf; - return (_getSelf = (() => fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])()?.getSelf()) === null || _getSelf === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf.self, _m)[_m](); + return (_getSelf = (() => fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])()?.getSelf()) === null || _getSelf === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf.self, _m)[_m](); })()) { return r; } - function j(fn, r = (() => _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf().self, _m)[_m]?.())()) { + function j(fn, r = (() => babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf().self, _m)[_m]?.())()) { return r; } @@ -77,7 +71,7 @@ Object.defineProperty(Foo, _x, { Object.defineProperty(Foo, _m, { writable: true, value: function () { - return _classPrivateFieldLooseBase(this, _x)[_x]; + return babelHelpers.classPrivateFieldLooseBase(this, _x)[_x]; } }); Object.defineProperty(Foo, _self, { diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-member-optional-call-spread-arguments/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-member-optional-call-spread-arguments/output.js index 938752d7e1..2747157820 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-member-optional-call-spread-arguments/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-member-optional-call-spread-arguments/output.js @@ -1,10 +1,4 @@ -function _classPrivateFieldLooseBase(receiver, privateKey) { if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) { throw new TypeError("attempted to use private field on non-instance"); } return receiver; } - -var id = 0; - -function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; } - -var _m = _classPrivateFieldLooseKey("m"); +var _m = babelHelpers.classPrivateFieldLooseKey("m"); class Foo { constructor() { @@ -15,18 +9,18 @@ class Foo { } init() { - _classPrivateFieldLooseBase(this, _m)[_m] = (...args) => args; + babelHelpers.classPrivateFieldLooseBase(this, _m)[_m] = (...args) => args; } static test() { const f = new Foo(); f.init(); - return _classPrivateFieldLooseBase(f, _m)[_m]?.(...arguments); + return babelHelpers.classPrivateFieldLooseBase(f, _m)[_m]?.(...arguments); } static testNull() { const f = new Foo(); - return _classPrivateFieldLooseBase(f, _m)[_m]?.(...arguments); + return babelHelpers.classPrivateFieldLooseBase(f, _m)[_m]?.(...arguments); } } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-member-optional-call-with-transform/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-member-optional-call-with-transform/output.js index 5135137867..e18cf8da52 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-member-optional-call-with-transform/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-member-optional-call-with-transform/output.js @@ -1,14 +1,8 @@ -function _classPrivateFieldLooseBase(receiver, privateKey) { if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) { throw new TypeError("attempted to use private field on non-instance"); } return receiver; } +var _x = babelHelpers.classPrivateFieldLooseKey("x"); -var id = 0; +var _m = babelHelpers.classPrivateFieldLooseKey("m"); -function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; } - -var _x = _classPrivateFieldLooseKey("x"); - -var _m = _classPrivateFieldLooseKey("m"); - -var _self = _classPrivateFieldLooseKey("self"); +var _self = babelHelpers.classPrivateFieldLooseKey("self"); class Foo { static getSelf() { @@ -16,7 +10,7 @@ class Foo { } static test() { - var _deep$very$o, _deep$very$o2, _deep$very$o3, _classPrivateFieldLoo, _classPrivateFieldLoo2, _ref, _ref2, _self2, _classPrivateFieldLoo3, _classPrivateFieldLoo4, _ref3, _ref4, _getSelf, _ref5, _ref6, _classPrivateFieldLoo5, _call, _getSelf2, _getSelf3, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _classPrivateFieldLoo6, _classPrivateFieldLoo7, _ref7, _ref8, _self3, _classPrivateFieldLoo8, _classPrivateFieldLoo9, _ref9, _ref10, _getSelf4, _ref11, _ref12, _classPrivateFieldLoo10, _call2, _getSelf5, _getSelf6, _classPrivateFieldLoo11, _classPrivateFieldLoo12, _classPrivateFieldLoo13, _classPrivateFieldLoo14, _classPrivateFieldLoo15, _classPrivateFieldLoo16, _classPrivateFieldLoo17, _classPrivateFieldLoo18, _classPrivateFieldLoo19, _classPrivateFieldLoo20, _classPrivateFieldLoo21, _classPrivateFieldLoo22, _classPrivateFieldLoo23, _classPrivateFieldLoo24, _classPrivateFieldLoo25, _classPrivateFieldLoo26, _classPrivateFieldLoo27, _classPrivateFieldLoo28, _ref13, _ref14, _classPrivateFieldLoo29, _classPrivateFieldLoo30, _classPrivateFieldLoo31, _classPrivateFieldLoo32, _ref15, _classPrivateFieldLoo33, _classPrivateFieldLoo34, _ref16, _classPrivateFieldLoo35, _classPrivateFieldLoo36, _classPrivateFieldLoo37, _classPrivateFieldLoo38, _ref17, _classPrivateFieldLoo39, _classPrivateFieldLoo40, _classPrivateFieldLoo41, _classPrivateFieldLoo42, _ref18, _classPrivateFieldLoo43, _classPrivateFieldLoo44, _ref19, _classPrivateFieldLoo45, _classPrivateFieldLoo46, _ref20, _classPrivateFieldLoo47, _classPrivateFieldLoo48, _classPrivateFieldLoo49, _classPrivateFieldLoo50, _classPrivateFieldLoo51, _classPrivateFieldLoo52, _classPrivateFieldLoo53, _classPrivateFieldLoo54, _classPrivateFieldLoo55, _classPrivateFieldLoo56, _classPrivateFieldLoo57, _classPrivateFieldLoo58, _classPrivateFieldLoo59, _classPrivateFieldLoo60, _ref21, _ref22, _classPrivateFieldLoo61, _classPrivateFieldLoo62, _classPrivateFieldLoo63, _classPrivateFieldLoo64, _ref23, _classPrivateFieldLoo65, _classPrivateFieldLoo66, _ref24, _classPrivateFieldLoo67, _classPrivateFieldLoo68, _classPrivateFieldLoo69, _classPrivateFieldLoo70, _ref25, _classPrivateFieldLoo71, _classPrivateFieldLoo72, _classPrivateFieldLoo73, _classPrivateFieldLoo74, _ref26, _classPrivateFieldLoo75, _classPrivateFieldLoo76, _ref27, _classPrivateFieldLoo77, _classPrivateFieldLoo78, _ref28, _classPrivateFieldLoo79, _classPrivateFieldLoo80; + var _deep$very$o, _deep$very$o2, _deep$very$o3, _babelHelpers$classPr, _babelHelpers$classPr2, _ref, _ref2, _self2, _babelHelpers$classPr3, _babelHelpers$classPr4, _ref3, _ref4, _getSelf, _ref5, _ref6, _babelHelpers$classPr5, _call, _getSelf2, _getSelf3, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _babelHelpers$classPr6, _babelHelpers$classPr7, _ref7, _ref8, _self3, _babelHelpers$classPr8, _babelHelpers$classPr9, _ref9, _ref10, _getSelf4, _ref11, _ref12, _babelHelpers$classPr10, _call2, _getSelf5, _getSelf6, _babelHelpers$classPr11, _babelHelpers$classPr12, _babelHelpers$classPr13, _babelHelpers$classPr14, _babelHelpers$classPr15, _babelHelpers$classPr16, _babelHelpers$classPr17, _babelHelpers$classPr18, _babelHelpers$classPr19, _babelHelpers$classPr20, _babelHelpers$classPr21, _babelHelpers$classPr22, _babelHelpers$classPr23, _babelHelpers$classPr24, _babelHelpers$classPr25, _babelHelpers$classPr26, _babelHelpers$classPr27, _babelHelpers$classPr28, _ref13, _ref14, _babelHelpers$classPr29, _babelHelpers$classPr30, _babelHelpers$classPr31, _babelHelpers$classPr32, _ref15, _babelHelpers$classPr33, _babelHelpers$classPr34, _ref16, _babelHelpers$classPr35, _babelHelpers$classPr36, _babelHelpers$classPr37, _babelHelpers$classPr38, _ref17, _babelHelpers$classPr39, _babelHelpers$classPr40, _babelHelpers$classPr41, _babelHelpers$classPr42, _ref18, _babelHelpers$classPr43, _babelHelpers$classPr44, _ref19, _babelHelpers$classPr45, _babelHelpers$classPr46, _ref20, _babelHelpers$classPr47, _babelHelpers$classPr48, _babelHelpers$classPr49, _babelHelpers$classPr50, _babelHelpers$classPr51, _babelHelpers$classPr52, _babelHelpers$classPr53, _babelHelpers$classPr54, _babelHelpers$classPr55, _babelHelpers$classPr56, _babelHelpers$classPr57, _babelHelpers$classPr58, _babelHelpers$classPr59, _babelHelpers$classPr60, _ref21, _ref22, _babelHelpers$classPr61, _babelHelpers$classPr62, _babelHelpers$classPr63, _babelHelpers$classPr64, _ref23, _babelHelpers$classPr65, _babelHelpers$classPr66, _ref24, _babelHelpers$classPr67, _babelHelpers$classPr68, _babelHelpers$classPr69, _babelHelpers$classPr70, _ref25, _babelHelpers$classPr71, _babelHelpers$classPr72, _babelHelpers$classPr73, _babelHelpers$classPr74, _ref26, _babelHelpers$classPr75, _babelHelpers$classPr76, _ref27, _babelHelpers$classPr77, _babelHelpers$classPr78, _ref28, _babelHelpers$classPr79, _babelHelpers$classPr80; const o = { Foo: Foo @@ -35,47 +29,47 @@ class Foo { return deep; } - (_classPrivateFieldLoo11 = (_classPrivateFieldLoo12 = _classPrivateFieldLooseBase(Foo, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo11.call(_classPrivateFieldLoo12); - (_classPrivateFieldLoo13 = (_classPrivateFieldLoo14 = _classPrivateFieldLooseBase(Foo, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo13.call(_classPrivateFieldLoo14).toString; - (_classPrivateFieldLoo15 = (_classPrivateFieldLoo16 = _classPrivateFieldLooseBase(Foo, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo15.call(_classPrivateFieldLoo16).toString(); - o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo17 = (_classPrivateFieldLoo18 = _classPrivateFieldLooseBase(o.Foo, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo17.call(_classPrivateFieldLoo18); - o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo19 = (_classPrivateFieldLoo20 = _classPrivateFieldLooseBase(o.Foo, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo19.call(_classPrivateFieldLoo20).toString; - o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo21 = (_classPrivateFieldLoo22 = _classPrivateFieldLooseBase(o.Foo, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo21.call(_classPrivateFieldLoo22).toString(); - (_deep$very$o = deep == null ? void 0 : deep.very.o) === null || _deep$very$o === void 0 ? void 0 : (_classPrivateFieldLoo23 = (_classPrivateFieldLoo24 = _classPrivateFieldLooseBase(_deep$very$o.Foo, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo23.call(_classPrivateFieldLoo24); - (_deep$very$o2 = deep == null ? void 0 : deep.very.o) === null || _deep$very$o2 === void 0 ? void 0 : (_classPrivateFieldLoo25 = (_classPrivateFieldLoo26 = _classPrivateFieldLooseBase(_deep$very$o2.Foo, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo25.call(_classPrivateFieldLoo26).toString; - (_deep$very$o3 = deep == null ? void 0 : deep.very.o) === null || _deep$very$o3 === void 0 ? void 0 : (_classPrivateFieldLoo27 = (_classPrivateFieldLoo28 = _classPrivateFieldLooseBase(_deep$very$o3.Foo, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo27.call(_classPrivateFieldLoo28).toString(); - (_ref13 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLoo = _classPrivateFieldLooseBase(o.Foo, _self)[_self], _m)[_m]) == null ? void 0 : _ref13.call(_classPrivateFieldLoo); - (_ref14 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLoo2 = _classPrivateFieldLooseBase(o.Foo, _self)[_self].self, _m)[_m]) == null ? void 0 : _ref14.call(_classPrivateFieldLoo2); - (_ref = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref === void 0 ? void 0 : (_classPrivateFieldLoo29 = (_classPrivateFieldLoo30 = _classPrivateFieldLooseBase(_ref.self, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo29.call(_classPrivateFieldLoo30); - (_ref2 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].self) === null || _ref2 === void 0 ? void 0 : (_classPrivateFieldLoo31 = (_classPrivateFieldLoo32 = _classPrivateFieldLooseBase(_ref2.self, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo31.call(_classPrivateFieldLoo32); - (_self2 = (_ref15 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref15.self) === null || _self2 === void 0 ? void 0 : (_classPrivateFieldLoo33 = (_classPrivateFieldLoo34 = _classPrivateFieldLooseBase(_self2.self, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo33.call(_classPrivateFieldLoo34); - (_ref16 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLoo3 = _classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf(), _m)[_m]) == null ? void 0 : _ref16.call(_classPrivateFieldLoo3); - (_ref3 = o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo4 = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) === null || _ref3 === void 0 ? void 0 : (_classPrivateFieldLoo35 = (_classPrivateFieldLoo36 = _classPrivateFieldLooseBase(_ref3.call(_classPrivateFieldLoo4), _m))[_m]) == null ? void 0 : _classPrivateFieldLoo35.call(_classPrivateFieldLoo36); - (_ref4 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref4 === void 0 ? void 0 : (_classPrivateFieldLoo37 = (_classPrivateFieldLoo38 = _classPrivateFieldLooseBase(_ref4.getSelf(), _m))[_m]) == null ? void 0 : _classPrivateFieldLoo37.call(_classPrivateFieldLoo38); - (_getSelf = (_ref17 = _ref5 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref17.getSelf) === null || _getSelf === void 0 ? void 0 : (_classPrivateFieldLoo39 = (_classPrivateFieldLoo40 = _classPrivateFieldLooseBase(_getSelf.call(_ref5), _m))[_m]) == null ? void 0 : _classPrivateFieldLoo39.call(_classPrivateFieldLoo40); - (_ref6 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) === null || _ref6 === void 0 ? void 0 : (_classPrivateFieldLoo41 = (_classPrivateFieldLoo42 = _classPrivateFieldLooseBase(_ref6.self, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo41.call(_classPrivateFieldLoo42); - (_call = (_ref18 = o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo5 = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) == null ? void 0 : _ref18.call(_classPrivateFieldLoo5)) === null || _call === void 0 ? void 0 : (_classPrivateFieldLoo43 = (_classPrivateFieldLoo44 = _classPrivateFieldLooseBase(_call.self, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo43.call(_classPrivateFieldLoo44); - (_getSelf2 = (_ref19 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref19.getSelf()) === null || _getSelf2 === void 0 ? void 0 : (_classPrivateFieldLoo45 = (_classPrivateFieldLoo46 = _classPrivateFieldLooseBase(_getSelf2.self, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo45.call(_classPrivateFieldLoo46); - (_getSelf3 = (_ref20 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref20.getSelf == null ? void 0 : _ref20.getSelf()) === null || _getSelf3 === void 0 ? void 0 : (_classPrivateFieldLoo47 = (_classPrivateFieldLoo48 = _classPrivateFieldLooseBase(_getSelf3.self, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo47.call(_classPrivateFieldLoo48); - fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo49 = (_classPrivateFieldLoo50 = _classPrivateFieldLooseBase(fn().Foo, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo49.call(_classPrivateFieldLoo50); - fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo51 = (_classPrivateFieldLoo52 = _classPrivateFieldLooseBase(fn().Foo, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo51.call(_classPrivateFieldLoo52).toString; - fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo53 = (_classPrivateFieldLoo54 = _classPrivateFieldLooseBase(fn().Foo, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo53.call(_classPrivateFieldLoo54).toString(); - (_fnDeep$very$o = fnDeep == null ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : (_classPrivateFieldLoo55 = (_classPrivateFieldLoo56 = _classPrivateFieldLooseBase(_fnDeep$very$o.Foo, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo55.call(_classPrivateFieldLoo56); - (_fnDeep$very$o2 = fnDeep == null ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : (_classPrivateFieldLoo57 = (_classPrivateFieldLoo58 = _classPrivateFieldLooseBase(_fnDeep$very$o2.Foo, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo57.call(_classPrivateFieldLoo58).toString; - (_fnDeep$very$o3 = fnDeep == null ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : (_classPrivateFieldLoo59 = (_classPrivateFieldLoo60 = _classPrivateFieldLooseBase(_fnDeep$very$o3.Foo, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo59.call(_classPrivateFieldLoo60).toString(); - (_ref21 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLoo6 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self], _m)[_m]) == null ? void 0 : _ref21.call(_classPrivateFieldLoo6); - (_ref22 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLoo7 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self].self, _m)[_m]) == null ? void 0 : _ref22.call(_classPrivateFieldLoo7); - (_ref7 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref7 === void 0 ? void 0 : (_classPrivateFieldLoo61 = (_classPrivateFieldLoo62 = _classPrivateFieldLooseBase(_ref7.self, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo61.call(_classPrivateFieldLoo62); - (_ref8 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) === null || _ref8 === void 0 ? void 0 : (_classPrivateFieldLoo63 = (_classPrivateFieldLoo64 = _classPrivateFieldLooseBase(_ref8.self, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo63.call(_classPrivateFieldLoo64); - (_self3 = (_ref23 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref23.self) === null || _self3 === void 0 ? void 0 : (_classPrivateFieldLoo65 = (_classPrivateFieldLoo66 = _classPrivateFieldLooseBase(_self3.self, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo65.call(_classPrivateFieldLoo66); - (_ref24 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLoo8 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf(), _m)[_m]) == null ? void 0 : _ref24.call(_classPrivateFieldLoo8); - (_ref9 = fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo9 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) === null || _ref9 === void 0 ? void 0 : (_classPrivateFieldLoo67 = (_classPrivateFieldLoo68 = _classPrivateFieldLooseBase(_ref9.call(_classPrivateFieldLoo9), _m))[_m]) == null ? void 0 : _classPrivateFieldLoo67.call(_classPrivateFieldLoo68); - (_ref10 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref10 === void 0 ? void 0 : (_classPrivateFieldLoo69 = (_classPrivateFieldLoo70 = _classPrivateFieldLooseBase(_ref10.getSelf(), _m))[_m]) == null ? void 0 : _classPrivateFieldLoo69.call(_classPrivateFieldLoo70); - (_getSelf4 = (_ref25 = _ref11 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref25.getSelf) === null || _getSelf4 === void 0 ? void 0 : (_classPrivateFieldLoo71 = (_classPrivateFieldLoo72 = _classPrivateFieldLooseBase(_getSelf4.call(_ref11), _m))[_m]) == null ? void 0 : _classPrivateFieldLoo71.call(_classPrivateFieldLoo72); - (_ref12 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) === null || _ref12 === void 0 ? void 0 : (_classPrivateFieldLoo73 = (_classPrivateFieldLoo74 = _classPrivateFieldLooseBase(_ref12.self, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo73.call(_classPrivateFieldLoo74); - (_call2 = (_ref26 = fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo10 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) == null ? void 0 : _ref26.call(_classPrivateFieldLoo10)) === null || _call2 === void 0 ? void 0 : (_classPrivateFieldLoo75 = (_classPrivateFieldLoo76 = _classPrivateFieldLooseBase(_call2.self, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo75.call(_classPrivateFieldLoo76); - (_getSelf5 = (_ref27 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref27.getSelf()) === null || _getSelf5 === void 0 ? void 0 : (_classPrivateFieldLoo77 = (_classPrivateFieldLoo78 = _classPrivateFieldLooseBase(_getSelf5.self, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo77.call(_classPrivateFieldLoo78); - (_getSelf6 = (_ref28 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref28.getSelf == null ? void 0 : _ref28.getSelf()) === null || _getSelf6 === void 0 ? void 0 : (_classPrivateFieldLoo79 = (_classPrivateFieldLoo80 = _classPrivateFieldLooseBase(_getSelf6.self, _m))[_m]) == null ? void 0 : _classPrivateFieldLoo79.call(_classPrivateFieldLoo80); + (_babelHelpers$classPr11 = (_babelHelpers$classPr12 = babelHelpers.classPrivateFieldLooseBase(Foo, _m))[_m]) == null ? void 0 : _babelHelpers$classPr11.call(_babelHelpers$classPr12); + (_babelHelpers$classPr13 = (_babelHelpers$classPr14 = babelHelpers.classPrivateFieldLooseBase(Foo, _m))[_m]) == null ? void 0 : _babelHelpers$classPr13.call(_babelHelpers$classPr14).toString; + (_babelHelpers$classPr15 = (_babelHelpers$classPr16 = babelHelpers.classPrivateFieldLooseBase(Foo, _m))[_m]) == null ? void 0 : _babelHelpers$classPr15.call(_babelHelpers$classPr16).toString(); + o === null || o === void 0 ? void 0 : (_babelHelpers$classPr17 = (_babelHelpers$classPr18 = babelHelpers.classPrivateFieldLooseBase(o.Foo, _m))[_m]) == null ? void 0 : _babelHelpers$classPr17.call(_babelHelpers$classPr18); + o === null || o === void 0 ? void 0 : (_babelHelpers$classPr19 = (_babelHelpers$classPr20 = babelHelpers.classPrivateFieldLooseBase(o.Foo, _m))[_m]) == null ? void 0 : _babelHelpers$classPr19.call(_babelHelpers$classPr20).toString; + o === null || o === void 0 ? void 0 : (_babelHelpers$classPr21 = (_babelHelpers$classPr22 = babelHelpers.classPrivateFieldLooseBase(o.Foo, _m))[_m]) == null ? void 0 : _babelHelpers$classPr21.call(_babelHelpers$classPr22).toString(); + (_deep$very$o = deep == null ? void 0 : deep.very.o) === null || _deep$very$o === void 0 ? void 0 : (_babelHelpers$classPr23 = (_babelHelpers$classPr24 = babelHelpers.classPrivateFieldLooseBase(_deep$very$o.Foo, _m))[_m]) == null ? void 0 : _babelHelpers$classPr23.call(_babelHelpers$classPr24); + (_deep$very$o2 = deep == null ? void 0 : deep.very.o) === null || _deep$very$o2 === void 0 ? void 0 : (_babelHelpers$classPr25 = (_babelHelpers$classPr26 = babelHelpers.classPrivateFieldLooseBase(_deep$very$o2.Foo, _m))[_m]) == null ? void 0 : _babelHelpers$classPr25.call(_babelHelpers$classPr26).toString; + (_deep$very$o3 = deep == null ? void 0 : deep.very.o) === null || _deep$very$o3 === void 0 ? void 0 : (_babelHelpers$classPr27 = (_babelHelpers$classPr28 = babelHelpers.classPrivateFieldLooseBase(_deep$very$o3.Foo, _m))[_m]) == null ? void 0 : _babelHelpers$classPr27.call(_babelHelpers$classPr28).toString(); + (_ref13 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_babelHelpers$classPr = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self], _m)[_m]) == null ? void 0 : _ref13.call(_babelHelpers$classPr); + (_ref14 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_babelHelpers$classPr2 = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self, _m)[_m]) == null ? void 0 : _ref14.call(_babelHelpers$classPr2); + (_ref = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref === void 0 ? void 0 : (_babelHelpers$classPr29 = (_babelHelpers$classPr30 = babelHelpers.classPrivateFieldLooseBase(_ref.self, _m))[_m]) == null ? void 0 : _babelHelpers$classPr29.call(_babelHelpers$classPr30); + (_ref2 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self) === null || _ref2 === void 0 ? void 0 : (_babelHelpers$classPr31 = (_babelHelpers$classPr32 = babelHelpers.classPrivateFieldLooseBase(_ref2.self, _m))[_m]) == null ? void 0 : _babelHelpers$classPr31.call(_babelHelpers$classPr32); + (_self2 = (_ref15 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref15.self) === null || _self2 === void 0 ? void 0 : (_babelHelpers$classPr33 = (_babelHelpers$classPr34 = babelHelpers.classPrivateFieldLooseBase(_self2.self, _m))[_m]) == null ? void 0 : _babelHelpers$classPr33.call(_babelHelpers$classPr34); + (_ref16 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_babelHelpers$classPr3 = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf(), _m)[_m]) == null ? void 0 : _ref16.call(_babelHelpers$classPr3); + (_ref3 = o === null || o === void 0 ? void 0 : (_babelHelpers$classPr4 = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) === null || _ref3 === void 0 ? void 0 : (_babelHelpers$classPr35 = (_babelHelpers$classPr36 = babelHelpers.classPrivateFieldLooseBase(_ref3.call(_babelHelpers$classPr4), _m))[_m]) == null ? void 0 : _babelHelpers$classPr35.call(_babelHelpers$classPr36); + (_ref4 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref4 === void 0 ? void 0 : (_babelHelpers$classPr37 = (_babelHelpers$classPr38 = babelHelpers.classPrivateFieldLooseBase(_ref4.getSelf(), _m))[_m]) == null ? void 0 : _babelHelpers$classPr37.call(_babelHelpers$classPr38); + (_getSelf = (_ref17 = _ref5 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref17.getSelf) === null || _getSelf === void 0 ? void 0 : (_babelHelpers$classPr39 = (_babelHelpers$classPr40 = babelHelpers.classPrivateFieldLooseBase(_getSelf.call(_ref5), _m))[_m]) == null ? void 0 : _babelHelpers$classPr39.call(_babelHelpers$classPr40); + (_ref6 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) === null || _ref6 === void 0 ? void 0 : (_babelHelpers$classPr41 = (_babelHelpers$classPr42 = babelHelpers.classPrivateFieldLooseBase(_ref6.self, _m))[_m]) == null ? void 0 : _babelHelpers$classPr41.call(_babelHelpers$classPr42); + (_call = (_ref18 = o === null || o === void 0 ? void 0 : (_babelHelpers$classPr5 = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) == null ? void 0 : _ref18.call(_babelHelpers$classPr5)) === null || _call === void 0 ? void 0 : (_babelHelpers$classPr43 = (_babelHelpers$classPr44 = babelHelpers.classPrivateFieldLooseBase(_call.self, _m))[_m]) == null ? void 0 : _babelHelpers$classPr43.call(_babelHelpers$classPr44); + (_getSelf2 = (_ref19 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref19.getSelf()) === null || _getSelf2 === void 0 ? void 0 : (_babelHelpers$classPr45 = (_babelHelpers$classPr46 = babelHelpers.classPrivateFieldLooseBase(_getSelf2.self, _m))[_m]) == null ? void 0 : _babelHelpers$classPr45.call(_babelHelpers$classPr46); + (_getSelf3 = (_ref20 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref20.getSelf == null ? void 0 : _ref20.getSelf()) === null || _getSelf3 === void 0 ? void 0 : (_babelHelpers$classPr47 = (_babelHelpers$classPr48 = babelHelpers.classPrivateFieldLooseBase(_getSelf3.self, _m))[_m]) == null ? void 0 : _babelHelpers$classPr47.call(_babelHelpers$classPr48); + fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr49 = (_babelHelpers$classPr50 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _m))[_m]) == null ? void 0 : _babelHelpers$classPr49.call(_babelHelpers$classPr50); + fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr51 = (_babelHelpers$classPr52 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _m))[_m]) == null ? void 0 : _babelHelpers$classPr51.call(_babelHelpers$classPr52).toString; + fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr53 = (_babelHelpers$classPr54 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _m))[_m]) == null ? void 0 : _babelHelpers$classPr53.call(_babelHelpers$classPr54).toString(); + (_fnDeep$very$o = fnDeep == null ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : (_babelHelpers$classPr55 = (_babelHelpers$classPr56 = babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o.Foo, _m))[_m]) == null ? void 0 : _babelHelpers$classPr55.call(_babelHelpers$classPr56); + (_fnDeep$very$o2 = fnDeep == null ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : (_babelHelpers$classPr57 = (_babelHelpers$classPr58 = babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o2.Foo, _m))[_m]) == null ? void 0 : _babelHelpers$classPr57.call(_babelHelpers$classPr58).toString; + (_fnDeep$very$o3 = fnDeep == null ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : (_babelHelpers$classPr59 = (_babelHelpers$classPr60 = babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o3.Foo, _m))[_m]) == null ? void 0 : _babelHelpers$classPr59.call(_babelHelpers$classPr60).toString(); + (_ref21 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_babelHelpers$classPr6 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self], _m)[_m]) == null ? void 0 : _ref21.call(_babelHelpers$classPr6); + (_ref22 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_babelHelpers$classPr7 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self, _m)[_m]) == null ? void 0 : _ref22.call(_babelHelpers$classPr7); + (_ref7 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref7 === void 0 ? void 0 : (_babelHelpers$classPr61 = (_babelHelpers$classPr62 = babelHelpers.classPrivateFieldLooseBase(_ref7.self, _m))[_m]) == null ? void 0 : _babelHelpers$classPr61.call(_babelHelpers$classPr62); + (_ref8 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) === null || _ref8 === void 0 ? void 0 : (_babelHelpers$classPr63 = (_babelHelpers$classPr64 = babelHelpers.classPrivateFieldLooseBase(_ref8.self, _m))[_m]) == null ? void 0 : _babelHelpers$classPr63.call(_babelHelpers$classPr64); + (_self3 = (_ref23 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref23.self) === null || _self3 === void 0 ? void 0 : (_babelHelpers$classPr65 = (_babelHelpers$classPr66 = babelHelpers.classPrivateFieldLooseBase(_self3.self, _m))[_m]) == null ? void 0 : _babelHelpers$classPr65.call(_babelHelpers$classPr66); + (_ref24 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_babelHelpers$classPr8 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf(), _m)[_m]) == null ? void 0 : _ref24.call(_babelHelpers$classPr8); + (_ref9 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr9 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) === null || _ref9 === void 0 ? void 0 : (_babelHelpers$classPr67 = (_babelHelpers$classPr68 = babelHelpers.classPrivateFieldLooseBase(_ref9.call(_babelHelpers$classPr9), _m))[_m]) == null ? void 0 : _babelHelpers$classPr67.call(_babelHelpers$classPr68); + (_ref10 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref10 === void 0 ? void 0 : (_babelHelpers$classPr69 = (_babelHelpers$classPr70 = babelHelpers.classPrivateFieldLooseBase(_ref10.getSelf(), _m))[_m]) == null ? void 0 : _babelHelpers$classPr69.call(_babelHelpers$classPr70); + (_getSelf4 = (_ref25 = _ref11 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref25.getSelf) === null || _getSelf4 === void 0 ? void 0 : (_babelHelpers$classPr71 = (_babelHelpers$classPr72 = babelHelpers.classPrivateFieldLooseBase(_getSelf4.call(_ref11), _m))[_m]) == null ? void 0 : _babelHelpers$classPr71.call(_babelHelpers$classPr72); + (_ref12 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) === null || _ref12 === void 0 ? void 0 : (_babelHelpers$classPr73 = (_babelHelpers$classPr74 = babelHelpers.classPrivateFieldLooseBase(_ref12.self, _m))[_m]) == null ? void 0 : _babelHelpers$classPr73.call(_babelHelpers$classPr74); + (_call2 = (_ref26 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr10 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) == null ? void 0 : _ref26.call(_babelHelpers$classPr10)) === null || _call2 === void 0 ? void 0 : (_babelHelpers$classPr75 = (_babelHelpers$classPr76 = babelHelpers.classPrivateFieldLooseBase(_call2.self, _m))[_m]) == null ? void 0 : _babelHelpers$classPr75.call(_babelHelpers$classPr76); + (_getSelf5 = (_ref27 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref27.getSelf()) === null || _getSelf5 === void 0 ? void 0 : (_babelHelpers$classPr77 = (_babelHelpers$classPr78 = babelHelpers.classPrivateFieldLooseBase(_getSelf5.self, _m))[_m]) == null ? void 0 : _babelHelpers$classPr77.call(_babelHelpers$classPr78); + (_getSelf6 = (_ref28 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref28.getSelf == null ? void 0 : _ref28.getSelf()) === null || _getSelf6 === void 0 ? void 0 : (_babelHelpers$classPr79 = (_babelHelpers$classPr80 = babelHelpers.classPrivateFieldLooseBase(_getSelf6.self, _m))[_m]) == null ? void 0 : _babelHelpers$classPr79.call(_babelHelpers$classPr80); } } @@ -87,7 +81,7 @@ Object.defineProperty(Foo, _x, { Object.defineProperty(Foo, _m, { writable: true, value: function () { - return _classPrivateFieldLooseBase(this, _x)[_x]; + return babelHelpers.classPrivateFieldLooseBase(this, _x)[_x]; } }); Object.defineProperty(Foo, _self, { diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-member-optional-call/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-member-optional-call/output.js index b2d249e638..39df9809c9 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-member-optional-call/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-member-optional-call/output.js @@ -1,14 +1,8 @@ -function _classPrivateFieldLooseBase(receiver, privateKey) { if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) { throw new TypeError("attempted to use private field on non-instance"); } return receiver; } +var _x = babelHelpers.classPrivateFieldLooseKey("x"); -var id = 0; +var _m = babelHelpers.classPrivateFieldLooseKey("m"); -function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; } - -var _x = _classPrivateFieldLooseKey("x"); - -var _m = _classPrivateFieldLooseKey("m"); - -var _self = _classPrivateFieldLooseKey("self"); +var _self = babelHelpers.classPrivateFieldLooseKey("self"); class Foo { static getSelf() { @@ -16,7 +10,7 @@ class Foo { } static test() { - var _deep$very$o, _deep$very$o2, _deep$very$o3, _classPrivateFieldLoo, _classPrivateFieldLoo2, _ref, _ref2, _self2, _classPrivateFieldLoo3, _classPrivateFieldLoo4, _ref3, _ref4, _getSelf, _ref5, _ref6, _classPrivateFieldLoo5, _call, _getSelf2, _getSelf3, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _classPrivateFieldLoo6, _classPrivateFieldLoo7, _ref7, _ref8, _self3, _classPrivateFieldLoo8, _classPrivateFieldLoo9, _ref9, _ref10, _getSelf4, _ref11, _ref12, _classPrivateFieldLoo10, _call2, _getSelf5, _getSelf6; + var _deep$very$o, _deep$very$o2, _deep$very$o3, _babelHelpers$classPr, _babelHelpers$classPr2, _ref, _ref2, _self2, _babelHelpers$classPr3, _babelHelpers$classPr4, _ref3, _ref4, _getSelf, _ref5, _ref6, _babelHelpers$classPr5, _call, _getSelf2, _getSelf3, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _babelHelpers$classPr6, _babelHelpers$classPr7, _ref7, _ref8, _self3, _babelHelpers$classPr8, _babelHelpers$classPr9, _ref9, _ref10, _getSelf4, _ref11, _ref12, _babelHelpers$classPr10, _call2, _getSelf5, _getSelf6; const o = { Foo: Foo @@ -35,47 +29,47 @@ class Foo { return deep; } - _classPrivateFieldLooseBase(Foo, _m)[_m]?.(); - _classPrivateFieldLooseBase(Foo, _m)[_m]?.().toString; - _classPrivateFieldLooseBase(Foo, _m)[_m]?.().toString(); - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _m)[_m]?.(); - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _m)[_m]?.().toString; - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _m)[_m]?.().toString(); - (_deep$very$o = deep?.very.o) === null || _deep$very$o === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o.Foo, _m)[_m]?.(); - (_deep$very$o2 = deep?.very.o) === null || _deep$very$o2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o2.Foo, _m)[_m]?.().toString; - (_deep$very$o3 = deep?.very.o) === null || _deep$very$o3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o3.Foo, _m)[_m]?.().toString(); - (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLoo = _classPrivateFieldLooseBase(o.Foo, _self)[_self], _m)[_m])?.call(_classPrivateFieldLoo); - (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLoo2 = _classPrivateFieldLooseBase(o.Foo, _self)[_self].self, _m)[_m])?.call(_classPrivateFieldLoo2); - (_ref = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref.self, _m)[_m]?.(); - (_ref2 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].self) === null || _ref2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref2.self, _m)[_m]?.(); - (_self2 = (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.self) === null || _self2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self2.self, _m)[_m]?.(); - (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLoo3 = _classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf(), _m)[_m])?.call(_classPrivateFieldLoo3); - (_ref3 = o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo4 = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) === null || _ref3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref3.call(_classPrivateFieldLoo4), _m)[_m]?.(); - (_ref4 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref4 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref4.getSelf(), _m)[_m]?.(); - (_getSelf = (_ref5 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf) === null || _getSelf === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf.call(_ref5), _m)[_m]?.(); - (_ref6 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) === null || _ref6 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref6.self, _m)[_m]?.(); - (_call = (o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo5 = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf)?.call(_classPrivateFieldLoo5)) === null || _call === void 0 ? void 0 : _classPrivateFieldLooseBase(_call.self, _m)[_m]?.(); - (_getSelf2 = (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf()) === null || _getSelf2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf2.self, _m)[_m]?.(); - (_getSelf3 = (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf?.()) === null || _getSelf3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf3.self, _m)[_m]?.(); - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _m)[_m]?.(); - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _m)[_m]?.().toString; - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _m)[_m]?.().toString(); - (_fnDeep$very$o = fnDeep?.().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o.Foo, _m)[_m]?.(); - (_fnDeep$very$o2 = fnDeep?.().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o2.Foo, _m)[_m]?.().toString; - (_fnDeep$very$o3 = fnDeep?.().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o3.Foo, _m)[_m]?.().toString(); - (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLoo6 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self], _m)[_m])?.call(_classPrivateFieldLoo6); - (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLoo7 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self].self, _m)[_m])?.call(_classPrivateFieldLoo7); - (_ref7 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref7 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref7.self, _m)[_m]?.(); - (_ref8 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) === null || _ref8 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref8.self, _m)[_m]?.(); - (_self3 = (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.self) === null || _self3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self3.self, _m)[_m]?.(); - (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLoo8 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf(), _m)[_m])?.call(_classPrivateFieldLoo8); - (_ref9 = fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo9 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) === null || _ref9 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref9.call(_classPrivateFieldLoo9), _m)[_m]?.(); - (_ref10 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref10 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref10.getSelf(), _m)[_m]?.(); - (_getSelf4 = (_ref11 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf) === null || _getSelf4 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf4.call(_ref11), _m)[_m]?.(); - (_ref12 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) === null || _ref12 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref12.self, _m)[_m]?.(); - (_call2 = (fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo10 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf)?.call(_classPrivateFieldLoo10)) === null || _call2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_call2.self, _m)[_m]?.(); - (_getSelf5 = (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf()) === null || _getSelf5 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf5.self, _m)[_m]?.(); - (_getSelf6 = (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf?.()) === null || _getSelf6 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf6.self, _m)[_m]?.(); + babelHelpers.classPrivateFieldLooseBase(Foo, _m)[_m]?.(); + babelHelpers.classPrivateFieldLooseBase(Foo, _m)[_m]?.().toString; + babelHelpers.classPrivateFieldLooseBase(Foo, _m)[_m]?.().toString(); + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _m)[_m]?.(); + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _m)[_m]?.().toString; + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _m)[_m]?.().toString(); + (_deep$very$o = deep?.very.o) === null || _deep$very$o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o.Foo, _m)[_m]?.(); + (_deep$very$o2 = deep?.very.o) === null || _deep$very$o2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o2.Foo, _m)[_m]?.().toString; + (_deep$very$o3 = deep?.very.o) === null || _deep$very$o3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o3.Foo, _m)[_m]?.().toString(); + (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_babelHelpers$classPr = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self], _m)[_m])?.call(_babelHelpers$classPr); + (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_babelHelpers$classPr2 = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self, _m)[_m])?.call(_babelHelpers$classPr2); + (_ref = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref.self, _m)[_m]?.(); + (_ref2 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self) === null || _ref2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref2.self, _m)[_m]?.(); + (_self2 = (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.self) === null || _self2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self2.self, _m)[_m]?.(); + (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_babelHelpers$classPr3 = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf(), _m)[_m])?.call(_babelHelpers$classPr3); + (_ref3 = o === null || o === void 0 ? void 0 : (_babelHelpers$classPr4 = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) === null || _ref3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref3.call(_babelHelpers$classPr4), _m)[_m]?.(); + (_ref4 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref4 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref4.getSelf(), _m)[_m]?.(); + (_getSelf = (_ref5 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf) === null || _getSelf === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf.call(_ref5), _m)[_m]?.(); + (_ref6 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) === null || _ref6 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref6.self, _m)[_m]?.(); + (_call = (o === null || o === void 0 ? void 0 : (_babelHelpers$classPr5 = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf)?.call(_babelHelpers$classPr5)) === null || _call === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_call.self, _m)[_m]?.(); + (_getSelf2 = (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf()) === null || _getSelf2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf2.self, _m)[_m]?.(); + (_getSelf3 = (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf?.()) === null || _getSelf3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf3.self, _m)[_m]?.(); + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _m)[_m]?.(); + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _m)[_m]?.().toString; + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _m)[_m]?.().toString(); + (_fnDeep$very$o = fnDeep?.().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o.Foo, _m)[_m]?.(); + (_fnDeep$very$o2 = fnDeep?.().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o2.Foo, _m)[_m]?.().toString; + (_fnDeep$very$o3 = fnDeep?.().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o3.Foo, _m)[_m]?.().toString(); + (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_babelHelpers$classPr6 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self], _m)[_m])?.call(_babelHelpers$classPr6); + (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_babelHelpers$classPr7 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self, _m)[_m])?.call(_babelHelpers$classPr7); + (_ref7 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref7 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref7.self, _m)[_m]?.(); + (_ref8 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) === null || _ref8 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref8.self, _m)[_m]?.(); + (_self3 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.self) === null || _self3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self3.self, _m)[_m]?.(); + (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_babelHelpers$classPr8 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf(), _m)[_m])?.call(_babelHelpers$classPr8); + (_ref9 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr9 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) === null || _ref9 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref9.call(_babelHelpers$classPr9), _m)[_m]?.(); + (_ref10 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref10 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref10.getSelf(), _m)[_m]?.(); + (_getSelf4 = (_ref11 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf) === null || _getSelf4 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf4.call(_ref11), _m)[_m]?.(); + (_ref12 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) === null || _ref12 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref12.self, _m)[_m]?.(); + (_call2 = (fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr10 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf)?.call(_babelHelpers$classPr10)) === null || _call2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_call2.self, _m)[_m]?.(); + (_getSelf5 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf()) === null || _getSelf5 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf5.self, _m)[_m]?.(); + (_getSelf6 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf?.()) === null || _getSelf6 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf6.self, _m)[_m]?.(); } } @@ -87,7 +81,7 @@ Object.defineProperty(Foo, _x, { Object.defineProperty(Foo, _m, { writable: true, value: function () { - return _classPrivateFieldLooseBase(this, _x)[_x]; + return babelHelpers.classPrivateFieldLooseBase(this, _x)[_x]; } }); Object.defineProperty(Foo, _self, { diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-optional-member-call-with-transform/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-optional-member-call-with-transform/output.js index 5fb34be579..13f281b1ab 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-optional-member-call-with-transform/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-optional-member-call-with-transform/output.js @@ -1,14 +1,8 @@ -function _classPrivateFieldLooseBase(receiver, privateKey) { if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) { throw new TypeError("attempted to use private field on non-instance"); } return receiver; } +var _x = babelHelpers.classPrivateFieldLooseKey("x"); -var id = 0; +var _m = babelHelpers.classPrivateFieldLooseKey("m"); -function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; } - -var _x = _classPrivateFieldLooseKey("x"); - -var _m = _classPrivateFieldLooseKey("m"); - -var _self = _classPrivateFieldLooseKey("self"); +var _self = babelHelpers.classPrivateFieldLooseKey("self"); class Foo { static getSelf() { @@ -16,7 +10,7 @@ class Foo { } static test() { - var _o$Foo, _o$Foo2, _o$Foo3, _deep$very$o$Foo, _deep$very$o$Foo2, _deep$very$o$Foo3, _ref, _ref2, _self2, _self3, _self$self, _ref3, _classPrivateFieldLoo, _call, _getSelf, _getSelf2, _self4, _classPrivateFieldLoo2, _call$self, _getSelf$self, _getSelf$self2, _fn$Foo, _fn$Foo2, _fn$Foo3, _fnDeep$very$o$Foo, _fnDeep$very$o$Foo2, _fnDeep$very$o$Foo3, _ref4, _ref5, _self5, _self6, _self$self2, _ref6, _classPrivateFieldLoo3, _call2, _getSelf3, _getSelf4, _self7, _classPrivateFieldLoo4, _call$self2, _getSelf$self3, _getSelf$self4, _deep$very$o, _deep$very$o2, _deep$very$o3, _ref7, _ref8, _ref9, _ref9$self, _ref10, _ref11, _ref12, _ref13, _ref14, _ref14$call, _ref15, _ref15$getSelf, _ref16, _ref16$getSelf, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _ref17, _ref18, _ref19, _ref19$self, _ref20, _ref21, _ref22, _ref23, _ref24, _ref24$call, _ref25, _ref25$getSelf, _ref26, _ref26$getSelf; + var _o$Foo, _o$Foo2, _o$Foo3, _deep$very$o$Foo, _deep$very$o$Foo2, _deep$very$o$Foo3, _ref, _ref2, _self2, _self3, _self$self, _ref3, _babelHelpers$classPr, _call, _getSelf, _getSelf2, _self4, _babelHelpers$classPr2, _call$self, _getSelf$self, _getSelf$self2, _fn$Foo, _fn$Foo2, _fn$Foo3, _fnDeep$very$o$Foo, _fnDeep$very$o$Foo2, _fnDeep$very$o$Foo3, _ref4, _ref5, _self5, _self6, _self$self2, _ref6, _babelHelpers$classPr3, _call2, _getSelf3, _getSelf4, _self7, _babelHelpers$classPr4, _call$self2, _getSelf$self3, _getSelf$self4, _deep$very$o, _deep$very$o2, _deep$very$o3, _ref7, _ref8, _ref9, _ref9$self, _ref10, _ref11, _ref12, _ref13, _ref14, _ref14$call, _ref15, _ref15$getSelf, _ref16, _ref16$getSelf, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _ref17, _ref18, _ref19, _ref19$self, _ref20, _ref21, _ref22, _ref23, _ref24, _ref24$call, _ref25, _ref25$getSelf, _ref26, _ref26$getSelf; const o = { Foo: Foo @@ -35,47 +29,47 @@ class Foo { return deep; } - Foo === null || Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(Foo, _m)[_m](); - Foo === null || Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(Foo, _m)[_m]().toString; - Foo === null || Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(Foo, _m)[_m]().toString(); - (_o$Foo = o == null ? void 0 : o.Foo) === null || _o$Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(_o$Foo, _m)[_m](); - (_o$Foo2 = o == null ? void 0 : o.Foo) === null || _o$Foo2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_o$Foo2, _m)[_m]().toString; - (_o$Foo3 = o == null ? void 0 : o.Foo) === null || _o$Foo3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_o$Foo3, _m)[_m]().toString(); - (_deep$very$o$Foo = deep == null ? void 0 : (_deep$very$o = deep.very.o) == null ? void 0 : _deep$very$o.Foo) === null || _deep$very$o$Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o$Foo, _m)[_m](); - (_deep$very$o$Foo2 = deep == null ? void 0 : (_deep$very$o2 = deep.very.o) == null ? void 0 : _deep$very$o2.Foo) === null || _deep$very$o$Foo2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o$Foo2, _m)[_m]().toString; - (_deep$very$o$Foo3 = deep == null ? void 0 : (_deep$very$o3 = deep.very.o) == null ? void 0 : _deep$very$o3.Foo) === null || _deep$very$o$Foo3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o$Foo3, _m)[_m]().toString(); - (_ref = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref, _m)[_m](); - (_ref2 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].self) === null || _ref2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref2, _m)[_m](); - (_self2 = (_ref7 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref7.self) === null || _self2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self2, _m)[_m](); - (_self3 = (_ref8 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].self) == null ? void 0 : _ref8.self) === null || _self3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self3, _m)[_m](); - (_self$self = (_ref9 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : (_ref9$self = _ref9.self) == null ? void 0 : _ref9$self.self) === null || _self$self === void 0 ? void 0 : _classPrivateFieldLooseBase(_self$self, _m)[_m](); - (_ref3 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) === null || _ref3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref3, _m)[_m](); - (_call = (_ref10 = o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) == null ? void 0 : _ref10.call(_classPrivateFieldLoo)) === null || _call === void 0 ? void 0 : _classPrivateFieldLooseBase(_call, _m)[_m](); - (_getSelf = (_ref11 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref11.getSelf()) === null || _getSelf === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf, _m)[_m](); - (_getSelf2 = (_ref12 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref12.getSelf == null ? void 0 : _ref12.getSelf()) === null || _getSelf2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf2, _m)[_m](); - (_self4 = (_ref13 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) == null ? void 0 : _ref13.self) === null || _self4 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self4, _m)[_m](); - (_call$self = (_ref14 = o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo2 = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) == null ? void 0 : (_ref14$call = _ref14.call(_classPrivateFieldLoo2)) == null ? void 0 : _ref14$call.self) === null || _call$self === void 0 ? void 0 : _classPrivateFieldLooseBase(_call$self, _m)[_m](); - (_getSelf$self = (_ref15 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : (_ref15$getSelf = _ref15.getSelf()) == null ? void 0 : _ref15$getSelf.self) === null || _getSelf$self === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf$self, _m)[_m](); - (_getSelf$self2 = (_ref16 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref16.getSelf == null ? void 0 : (_ref16$getSelf = _ref16.getSelf()) == null ? void 0 : _ref16$getSelf.self) === null || _getSelf$self2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf$self2, _m)[_m](); - (_fn$Foo = fn == null ? void 0 : fn().Foo) === null || _fn$Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(_fn$Foo, _m)[_m](); - (_fn$Foo2 = fn == null ? void 0 : fn().Foo) === null || _fn$Foo2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_fn$Foo2, _m)[_m]().toString; - (_fn$Foo3 = fn == null ? void 0 : fn().Foo) === null || _fn$Foo3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_fn$Foo3, _m)[_m]().toString(); - (_fnDeep$very$o$Foo = fnDeep == null ? void 0 : (_fnDeep$very$o = fnDeep().very.o) == null ? void 0 : _fnDeep$very$o.Foo) === null || _fnDeep$very$o$Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o$Foo, _m)[_m](); - (_fnDeep$very$o$Foo2 = fnDeep == null ? void 0 : (_fnDeep$very$o2 = fnDeep().very.o) == null ? void 0 : _fnDeep$very$o2.Foo) === null || _fnDeep$very$o$Foo2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o$Foo2, _m)[_m]().toString; - (_fnDeep$very$o$Foo3 = fnDeep == null ? void 0 : (_fnDeep$very$o3 = fnDeep().very.o) == null ? void 0 : _fnDeep$very$o3.Foo) === null || _fnDeep$very$o$Foo3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o$Foo3, _m)[_m]().toString(); - (_ref4 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref4 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref4, _m)[_m](); - (_ref5 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) === null || _ref5 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref5, _m)[_m](); - (_self5 = (_ref17 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref17.self) === null || _self5 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self5, _m)[_m](); - (_self6 = (_ref18 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) == null ? void 0 : _ref18.self) === null || _self6 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self6, _m)[_m](); - (_self$self2 = (_ref19 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : (_ref19$self = _ref19.self) == null ? void 0 : _ref19$self.self) === null || _self$self2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self$self2, _m)[_m](); - (_ref6 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) === null || _ref6 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref6, _m)[_m](); - (_call2 = (_ref20 = fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo3 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) == null ? void 0 : _ref20.call(_classPrivateFieldLoo3)) === null || _call2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_call2, _m)[_m](); - (_getSelf3 = (_ref21 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref21.getSelf()) === null || _getSelf3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf3, _m)[_m](); - (_getSelf4 = (_ref22 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref22.getSelf == null ? void 0 : _ref22.getSelf()) === null || _getSelf4 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf4, _m)[_m](); - (_self7 = (_ref23 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) == null ? void 0 : _ref23.self) === null || _self7 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self7, _m)[_m](); - (_call$self2 = (_ref24 = fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo4 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) == null ? void 0 : (_ref24$call = _ref24.call(_classPrivateFieldLoo4)) == null ? void 0 : _ref24$call.self) === null || _call$self2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_call$self2, _m)[_m](); - (_getSelf$self3 = (_ref25 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : (_ref25$getSelf = _ref25.getSelf()) == null ? void 0 : _ref25$getSelf.self) === null || _getSelf$self3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf$self3, _m)[_m](); - (_getSelf$self4 = (_ref26 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref26.getSelf == null ? void 0 : (_ref26$getSelf = _ref26.getSelf()) == null ? void 0 : _ref26$getSelf.self) === null || _getSelf$self4 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf$self4, _m)[_m](); + Foo === null || Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(Foo, _m)[_m](); + Foo === null || Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(Foo, _m)[_m]().toString; + Foo === null || Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(Foo, _m)[_m]().toString(); + (_o$Foo = o == null ? void 0 : o.Foo) === null || _o$Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_o$Foo, _m)[_m](); + (_o$Foo2 = o == null ? void 0 : o.Foo) === null || _o$Foo2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_o$Foo2, _m)[_m]().toString; + (_o$Foo3 = o == null ? void 0 : o.Foo) === null || _o$Foo3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_o$Foo3, _m)[_m]().toString(); + (_deep$very$o$Foo = deep == null ? void 0 : (_deep$very$o = deep.very.o) == null ? void 0 : _deep$very$o.Foo) === null || _deep$very$o$Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o$Foo, _m)[_m](); + (_deep$very$o$Foo2 = deep == null ? void 0 : (_deep$very$o2 = deep.very.o) == null ? void 0 : _deep$very$o2.Foo) === null || _deep$very$o$Foo2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o$Foo2, _m)[_m]().toString; + (_deep$very$o$Foo3 = deep == null ? void 0 : (_deep$very$o3 = deep.very.o) == null ? void 0 : _deep$very$o3.Foo) === null || _deep$very$o$Foo3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o$Foo3, _m)[_m]().toString(); + (_ref = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref, _m)[_m](); + (_ref2 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self) === null || _ref2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref2, _m)[_m](); + (_self2 = (_ref7 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref7.self) === null || _self2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self2, _m)[_m](); + (_self3 = (_ref8 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self) == null ? void 0 : _ref8.self) === null || _self3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self3, _m)[_m](); + (_self$self = (_ref9 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : (_ref9$self = _ref9.self) == null ? void 0 : _ref9$self.self) === null || _self$self === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self$self, _m)[_m](); + (_ref3 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) === null || _ref3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref3, _m)[_m](); + (_call = (_ref10 = o === null || o === void 0 ? void 0 : (_babelHelpers$classPr = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) == null ? void 0 : _ref10.call(_babelHelpers$classPr)) === null || _call === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_call, _m)[_m](); + (_getSelf = (_ref11 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref11.getSelf()) === null || _getSelf === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf, _m)[_m](); + (_getSelf2 = (_ref12 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref12.getSelf == null ? void 0 : _ref12.getSelf()) === null || _getSelf2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf2, _m)[_m](); + (_self4 = (_ref13 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) == null ? void 0 : _ref13.self) === null || _self4 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self4, _m)[_m](); + (_call$self = (_ref14 = o === null || o === void 0 ? void 0 : (_babelHelpers$classPr2 = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) == null ? void 0 : (_ref14$call = _ref14.call(_babelHelpers$classPr2)) == null ? void 0 : _ref14$call.self) === null || _call$self === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_call$self, _m)[_m](); + (_getSelf$self = (_ref15 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : (_ref15$getSelf = _ref15.getSelf()) == null ? void 0 : _ref15$getSelf.self) === null || _getSelf$self === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf$self, _m)[_m](); + (_getSelf$self2 = (_ref16 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref16.getSelf == null ? void 0 : (_ref16$getSelf = _ref16.getSelf()) == null ? void 0 : _ref16$getSelf.self) === null || _getSelf$self2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf$self2, _m)[_m](); + (_fn$Foo = fn == null ? void 0 : fn().Foo) === null || _fn$Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fn$Foo, _m)[_m](); + (_fn$Foo2 = fn == null ? void 0 : fn().Foo) === null || _fn$Foo2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fn$Foo2, _m)[_m]().toString; + (_fn$Foo3 = fn == null ? void 0 : fn().Foo) === null || _fn$Foo3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fn$Foo3, _m)[_m]().toString(); + (_fnDeep$very$o$Foo = fnDeep == null ? void 0 : (_fnDeep$very$o = fnDeep().very.o) == null ? void 0 : _fnDeep$very$o.Foo) === null || _fnDeep$very$o$Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o$Foo, _m)[_m](); + (_fnDeep$very$o$Foo2 = fnDeep == null ? void 0 : (_fnDeep$very$o2 = fnDeep().very.o) == null ? void 0 : _fnDeep$very$o2.Foo) === null || _fnDeep$very$o$Foo2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o$Foo2, _m)[_m]().toString; + (_fnDeep$very$o$Foo3 = fnDeep == null ? void 0 : (_fnDeep$very$o3 = fnDeep().very.o) == null ? void 0 : _fnDeep$very$o3.Foo) === null || _fnDeep$very$o$Foo3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o$Foo3, _m)[_m]().toString(); + (_ref4 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref4 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref4, _m)[_m](); + (_ref5 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) === null || _ref5 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref5, _m)[_m](); + (_self5 = (_ref17 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref17.self) === null || _self5 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self5, _m)[_m](); + (_self6 = (_ref18 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) == null ? void 0 : _ref18.self) === null || _self6 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self6, _m)[_m](); + (_self$self2 = (_ref19 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : (_ref19$self = _ref19.self) == null ? void 0 : _ref19$self.self) === null || _self$self2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self$self2, _m)[_m](); + (_ref6 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) === null || _ref6 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref6, _m)[_m](); + (_call2 = (_ref20 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr3 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) == null ? void 0 : _ref20.call(_babelHelpers$classPr3)) === null || _call2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_call2, _m)[_m](); + (_getSelf3 = (_ref21 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref21.getSelf()) === null || _getSelf3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf3, _m)[_m](); + (_getSelf4 = (_ref22 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref22.getSelf == null ? void 0 : _ref22.getSelf()) === null || _getSelf4 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf4, _m)[_m](); + (_self7 = (_ref23 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) == null ? void 0 : _ref23.self) === null || _self7 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self7, _m)[_m](); + (_call$self2 = (_ref24 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr4 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) == null ? void 0 : (_ref24$call = _ref24.call(_babelHelpers$classPr4)) == null ? void 0 : _ref24$call.self) === null || _call$self2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_call$self2, _m)[_m](); + (_getSelf$self3 = (_ref25 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : (_ref25$getSelf = _ref25.getSelf()) == null ? void 0 : _ref25$getSelf.self) === null || _getSelf$self3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf$self3, _m)[_m](); + (_getSelf$self4 = (_ref26 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref26.getSelf == null ? void 0 : (_ref26$getSelf = _ref26.getSelf()) == null ? void 0 : _ref26$getSelf.self) === null || _getSelf$self4 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf$self4, _m)[_m](); } } @@ -87,7 +81,7 @@ Object.defineProperty(Foo, _x, { Object.defineProperty(Foo, _m, { writable: true, value: function () { - return _classPrivateFieldLooseBase(this, _x)[_x]; + return babelHelpers.classPrivateFieldLooseBase(this, _x)[_x]; } }); Object.defineProperty(Foo, _self, { diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-optional-member-call/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-optional-member-call/output.js index 4548d6ebc0..69a63de4ad 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-optional-member-call/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-optional-member-call/output.js @@ -1,14 +1,8 @@ -function _classPrivateFieldLooseBase(receiver, privateKey) { if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) { throw new TypeError("attempted to use private field on non-instance"); } return receiver; } +var _x = babelHelpers.classPrivateFieldLooseKey("x"); -var id = 0; +var _m = babelHelpers.classPrivateFieldLooseKey("m"); -function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; } - -var _x = _classPrivateFieldLooseKey("x"); - -var _m = _classPrivateFieldLooseKey("m"); - -var _self = _classPrivateFieldLooseKey("self"); +var _self = babelHelpers.classPrivateFieldLooseKey("self"); class Foo { static getSelf() { @@ -16,7 +10,7 @@ class Foo { } static test() { - var _deep$very$o, _deep$very$o2, _deep$very$o3, _ref, _ref2, _self2, _classPrivateFieldLoo, _ref3, _ref4, _getSelf, _ref5, _ref6, _classPrivateFieldLoo2, _call, _getSelf2, _getSelf3, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _ref7, _ref8, _self3, _classPrivateFieldLoo3, _ref9, _ref10, _getSelf4, _ref11, _ref12, _classPrivateFieldLoo4, _call2, _getSelf5, _getSelf6; + var _deep$very$o, _deep$very$o2, _deep$very$o3, _ref, _ref2, _self2, _babelHelpers$classPr, _ref3, _ref4, _getSelf, _ref5, _ref6, _babelHelpers$classPr2, _call, _getSelf2, _getSelf3, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _ref7, _ref8, _self3, _babelHelpers$classPr3, _ref9, _ref10, _getSelf4, _ref11, _ref12, _babelHelpers$classPr4, _call2, _getSelf5, _getSelf6; const o = { Foo: Foo @@ -35,47 +29,47 @@ class Foo { return deep; } - Foo === null || Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(Foo, _m)[_m](); - Foo === null || Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(Foo, _m)[_m]().toString; - Foo === null || Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(Foo, _m)[_m]().toString(); - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _m)[_m](); - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _m)[_m]().toString; - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _m)[_m]().toString(); - (_deep$very$o = deep?.very.o) === null || _deep$very$o === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o.Foo, _m)[_m](); - (_deep$very$o2 = deep?.very.o) === null || _deep$very$o2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o2.Foo, _m)[_m]().toString; - (_deep$very$o3 = deep?.very.o) === null || _deep$very$o3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o3.Foo, _m)[_m]().toString(); - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(o.Foo, _self)[_self], _m)[_m](); - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(o.Foo, _self)[_self].self, _m)[_m](); - (_ref = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref.self, _m)[_m](); - (_ref2 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].self) === null || _ref2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref2.self, _m)[_m](); - (_self2 = (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.self) === null || _self2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self2.self, _m)[_m](); - o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf(), _m)[_m](); - (_ref3 = o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) === null || _ref3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref3.call(_classPrivateFieldLoo), _m)[_m](); - (_ref4 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref4 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref4.getSelf(), _m)[_m](); - (_getSelf = (_ref5 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf) === null || _getSelf === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf.call(_ref5), _m)[_m](); - (_ref6 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) === null || _ref6 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref6.self, _m)[_m](); - (_call = (o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo2 = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf)?.call(_classPrivateFieldLoo2)) === null || _call === void 0 ? void 0 : _classPrivateFieldLooseBase(_call.self, _m)[_m](); - (_getSelf2 = (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf()) === null || _getSelf2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf2.self, _m)[_m](); - (_getSelf3 = (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf?.()) === null || _getSelf3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf3.self, _m)[_m](); - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _m)[_m](); - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _m)[_m]().toString; - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _m)[_m]().toString(); - (_fnDeep$very$o = fnDeep?.().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o.Foo, _m)[_m](); - (_fnDeep$very$o2 = fnDeep?.().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o2.Foo, _m)[_m]().toString; - (_fnDeep$very$o3 = fnDeep?.().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o3.Foo, _m)[_m]().toString(); - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(fn().Foo, _self)[_self], _m)[_m](); - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(fn().Foo, _self)[_self].self, _m)[_m](); - (_ref7 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref7 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref7.self, _m)[_m](); - (_ref8 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) === null || _ref8 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref8.self, _m)[_m](); - (_self3 = (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.self) === null || _self3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self3.self, _m)[_m](); - fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(_classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf(), _m)[_m](); - (_ref9 = fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo3 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) === null || _ref9 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref9.call(_classPrivateFieldLoo3), _m)[_m](); - (_ref10 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref10 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref10.getSelf(), _m)[_m](); - (_getSelf4 = (_ref11 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf) === null || _getSelf4 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf4.call(_ref11), _m)[_m](); - (_ref12 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) === null || _ref12 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref12.self, _m)[_m](); - (_call2 = (fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo4 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf)?.call(_classPrivateFieldLoo4)) === null || _call2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_call2.self, _m)[_m](); - (_getSelf5 = (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf()) === null || _getSelf5 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf5.self, _m)[_m](); - (_getSelf6 = (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf?.()) === null || _getSelf6 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf6.self, _m)[_m](); + Foo === null || Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(Foo, _m)[_m](); + Foo === null || Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(Foo, _m)[_m]().toString; + Foo === null || Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(Foo, _m)[_m]().toString(); + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _m)[_m](); + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _m)[_m]().toString; + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _m)[_m]().toString(); + (_deep$very$o = deep?.very.o) === null || _deep$very$o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o.Foo, _m)[_m](); + (_deep$very$o2 = deep?.very.o) === null || _deep$very$o2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o2.Foo, _m)[_m]().toString; + (_deep$very$o3 = deep?.very.o) === null || _deep$very$o3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o3.Foo, _m)[_m]().toString(); + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self], _m)[_m](); + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self, _m)[_m](); + (_ref = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref.self, _m)[_m](); + (_ref2 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self) === null || _ref2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref2.self, _m)[_m](); + (_self2 = (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.self) === null || _self2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self2.self, _m)[_m](); + o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf(), _m)[_m](); + (_ref3 = o === null || o === void 0 ? void 0 : (_babelHelpers$classPr = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) === null || _ref3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref3.call(_babelHelpers$classPr), _m)[_m](); + (_ref4 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref4 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref4.getSelf(), _m)[_m](); + (_getSelf = (_ref5 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf) === null || _getSelf === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf.call(_ref5), _m)[_m](); + (_ref6 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) === null || _ref6 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref6.self, _m)[_m](); + (_call = (o === null || o === void 0 ? void 0 : (_babelHelpers$classPr2 = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf)?.call(_babelHelpers$classPr2)) === null || _call === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_call.self, _m)[_m](); + (_getSelf2 = (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf()) === null || _getSelf2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf2.self, _m)[_m](); + (_getSelf3 = (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf?.()) === null || _getSelf3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf3.self, _m)[_m](); + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _m)[_m](); + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _m)[_m]().toString; + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _m)[_m]().toString(); + (_fnDeep$very$o = fnDeep?.().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o.Foo, _m)[_m](); + (_fnDeep$very$o2 = fnDeep?.().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o2.Foo, _m)[_m]().toString; + (_fnDeep$very$o3 = fnDeep?.().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o3.Foo, _m)[_m]().toString(); + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self], _m)[_m](); + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self, _m)[_m](); + (_ref7 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref7 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref7.self, _m)[_m](); + (_ref8 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) === null || _ref8 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref8.self, _m)[_m](); + (_self3 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.self) === null || _self3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self3.self, _m)[_m](); + fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf(), _m)[_m](); + (_ref9 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr3 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) === null || _ref9 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref9.call(_babelHelpers$classPr3), _m)[_m](); + (_ref10 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref10 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref10.getSelf(), _m)[_m](); + (_getSelf4 = (_ref11 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf) === null || _getSelf4 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf4.call(_ref11), _m)[_m](); + (_ref12 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) === null || _ref12 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref12.self, _m)[_m](); + (_call2 = (fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr4 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf)?.call(_babelHelpers$classPr4)) === null || _call2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_call2.self, _m)[_m](); + (_getSelf5 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf()) === null || _getSelf5 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf5.self, _m)[_m](); + (_getSelf6 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf?.()) === null || _getSelf6 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf6.self, _m)[_m](); } } @@ -87,7 +81,7 @@ Object.defineProperty(Foo, _x, { Object.defineProperty(Foo, _m, { writable: true, value: function () { - return _classPrivateFieldLooseBase(this, _x)[_x]; + return babelHelpers.classPrivateFieldLooseBase(this, _x)[_x]; } }); Object.defineProperty(Foo, _self, { diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-optional-property-with-transform/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-optional-property-with-transform/output.js index 908687563a..08c3400263 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-optional-property-with-transform/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-optional-property-with-transform/output.js @@ -1,12 +1,6 @@ -function _classPrivateFieldLooseBase(receiver, privateKey) { if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) { throw new TypeError("attempted to use private field on non-instance"); } return receiver; } +var _x = babelHelpers.classPrivateFieldLooseKey("x"); -var id = 0; - -function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; } - -var _x = _classPrivateFieldLooseKey("x"); - -var _self = _classPrivateFieldLooseKey("self"); +var _self = babelHelpers.classPrivateFieldLooseKey("self"); class Foo { static getSelf() { @@ -14,7 +8,7 @@ class Foo { } static test() { - var _o$Foo, _o$Foo2, _o$Foo3, _deep$very$o$Foo, _deep$very$o$Foo2, _deep$very$o$Foo3, _ref, _ref2, _self2, _self3, _self$self, _ref3, _classPrivateFieldLoo, _call, _getSelf, _getSelf2, _self4, _classPrivateFieldLoo2, _call$self, _getSelf$self, _getSelf$self2, _fn$Foo, _fn$Foo2, _fn$Foo3, _fnDeep$very$o$Foo, _fnDeep$very$o$Foo2, _fnDeep$very$o$Foo3, _ref4, _ref5, _self5, _self6, _self$self2, _ref6, _classPrivateFieldLoo3, _call2, _getSelf3, _getSelf4, _self7, _classPrivateFieldLoo4, _call$self2, _getSelf$self3, _getSelf$self4, _deep$very$o, _deep$very$o2, _deep$very$o3, _ref7, _ref8, _ref9, _ref9$self, _ref10, _ref11, _ref12, _ref13, _ref14, _ref14$call, _ref15, _ref15$getSelf, _ref16, _ref16$getSelf, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _ref17, _ref18, _ref19, _ref19$self, _ref20, _ref21, _ref22, _ref23, _ref24, _ref24$call, _ref25, _ref25$getSelf, _ref26, _ref26$getSelf; + var _o$Foo, _o$Foo2, _o$Foo3, _deep$very$o$Foo, _deep$very$o$Foo2, _deep$very$o$Foo3, _ref, _ref2, _self2, _self3, _self$self, _ref3, _babelHelpers$classPr, _call, _getSelf, _getSelf2, _self4, _babelHelpers$classPr2, _call$self, _getSelf$self, _getSelf$self2, _fn$Foo, _fn$Foo2, _fn$Foo3, _fnDeep$very$o$Foo, _fnDeep$very$o$Foo2, _fnDeep$very$o$Foo3, _ref4, _ref5, _self5, _self6, _self$self2, _ref6, _babelHelpers$classPr3, _call2, _getSelf3, _getSelf4, _self7, _babelHelpers$classPr4, _call$self2, _getSelf$self3, _getSelf$self4, _deep$very$o, _deep$very$o2, _deep$very$o3, _ref7, _ref8, _ref9, _ref9$self, _ref10, _ref11, _ref12, _ref13, _ref14, _ref14$call, _ref15, _ref15$getSelf, _ref16, _ref16$getSelf, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _ref17, _ref18, _ref19, _ref19$self, _ref20, _ref21, _ref22, _ref23, _ref24, _ref24$call, _ref25, _ref25$getSelf, _ref26, _ref26$getSelf; const o = { Foo: Foo @@ -33,47 +27,47 @@ class Foo { return deep; } - Foo === null || Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(Foo, _x)[_x]; - Foo === null || Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(Foo, _x)[_x].toString; - Foo === null || Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(Foo, _x)[_x].toString(); - (_o$Foo = o == null ? void 0 : o.Foo) === null || _o$Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(_o$Foo, _x)[_x]; - (_o$Foo2 = o == null ? void 0 : o.Foo) === null || _o$Foo2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_o$Foo2, _x)[_x].toString; - (_o$Foo3 = o == null ? void 0 : o.Foo) === null || _o$Foo3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_o$Foo3, _x)[_x].toString(); - (_deep$very$o$Foo = deep == null ? void 0 : (_deep$very$o = deep.very.o) == null ? void 0 : _deep$very$o.Foo) === null || _deep$very$o$Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o$Foo, _x)[_x]; - (_deep$very$o$Foo2 = deep == null ? void 0 : (_deep$very$o2 = deep.very.o) == null ? void 0 : _deep$very$o2.Foo) === null || _deep$very$o$Foo2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o$Foo2, _x)[_x].toString; - (_deep$very$o$Foo3 = deep == null ? void 0 : (_deep$very$o3 = deep.very.o) == null ? void 0 : _deep$very$o3.Foo) === null || _deep$very$o$Foo3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o$Foo3, _x)[_x].toString(); - (_ref = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref, _x)[_x]; - (_ref2 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].self) === null || _ref2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref2, _x)[_x]; - (_self2 = (_ref7 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref7.self) === null || _self2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self2, _x)[_x]; - (_self3 = (_ref8 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].self) == null ? void 0 : _ref8.self) === null || _self3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self3, _x)[_x]; - (_self$self = (_ref9 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : (_ref9$self = _ref9.self) == null ? void 0 : _ref9$self.self) === null || _self$self === void 0 ? void 0 : _classPrivateFieldLooseBase(_self$self, _x)[_x]; - (_ref3 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) === null || _ref3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref3, _x)[_x]; - (_call = (_ref10 = o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) == null ? void 0 : _ref10.call(_classPrivateFieldLoo)) === null || _call === void 0 ? void 0 : _classPrivateFieldLooseBase(_call, _x)[_x]; - (_getSelf = (_ref11 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref11.getSelf()) === null || _getSelf === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf, _x)[_x]; - (_getSelf2 = (_ref12 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref12.getSelf == null ? void 0 : _ref12.getSelf()) === null || _getSelf2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf2, _x)[_x]; - (_self4 = (_ref13 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) == null ? void 0 : _ref13.self) === null || _self4 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self4, _x)[_x]; - (_call$self = (_ref14 = o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo2 = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) == null ? void 0 : (_ref14$call = _ref14.call(_classPrivateFieldLoo2)) == null ? void 0 : _ref14$call.self) === null || _call$self === void 0 ? void 0 : _classPrivateFieldLooseBase(_call$self, _x)[_x]; - (_getSelf$self = (_ref15 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : (_ref15$getSelf = _ref15.getSelf()) == null ? void 0 : _ref15$getSelf.self) === null || _getSelf$self === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf$self, _x)[_x]; - (_getSelf$self2 = (_ref16 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref16.getSelf == null ? void 0 : (_ref16$getSelf = _ref16.getSelf()) == null ? void 0 : _ref16$getSelf.self) === null || _getSelf$self2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf$self2, _x)[_x]; - (_fn$Foo = fn == null ? void 0 : fn().Foo) === null || _fn$Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(_fn$Foo, _x)[_x]; - (_fn$Foo2 = fn == null ? void 0 : fn().Foo) === null || _fn$Foo2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_fn$Foo2, _x)[_x].toString; - (_fn$Foo3 = fn == null ? void 0 : fn().Foo) === null || _fn$Foo3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_fn$Foo3, _x)[_x].toString(); - (_fnDeep$very$o$Foo = fnDeep == null ? void 0 : (_fnDeep$very$o = fnDeep().very.o) == null ? void 0 : _fnDeep$very$o.Foo) === null || _fnDeep$very$o$Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o$Foo, _x)[_x]; - (_fnDeep$very$o$Foo2 = fnDeep == null ? void 0 : (_fnDeep$very$o2 = fnDeep().very.o) == null ? void 0 : _fnDeep$very$o2.Foo) === null || _fnDeep$very$o$Foo2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o$Foo2, _x)[_x].toString; - (_fnDeep$very$o$Foo3 = fnDeep == null ? void 0 : (_fnDeep$very$o3 = fnDeep().very.o) == null ? void 0 : _fnDeep$very$o3.Foo) === null || _fnDeep$very$o$Foo3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o$Foo3, _x)[_x].toString(); - (_ref4 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref4 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref4, _x)[_x]; - (_ref5 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) === null || _ref5 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref5, _x)[_x]; - (_self5 = (_ref17 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref17.self) === null || _self5 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self5, _x)[_x]; - (_self6 = (_ref18 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) == null ? void 0 : _ref18.self) === null || _self6 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self6, _x)[_x]; - (_self$self2 = (_ref19 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : (_ref19$self = _ref19.self) == null ? void 0 : _ref19$self.self) === null || _self$self2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self$self2, _x)[_x]; - (_ref6 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) === null || _ref6 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref6, _x)[_x]; - (_call2 = (_ref20 = fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo3 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) == null ? void 0 : _ref20.call(_classPrivateFieldLoo3)) === null || _call2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_call2, _x)[_x]; - (_getSelf3 = (_ref21 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref21.getSelf()) === null || _getSelf3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf3, _x)[_x]; - (_getSelf4 = (_ref22 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref22.getSelf == null ? void 0 : _ref22.getSelf()) === null || _getSelf4 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf4, _x)[_x]; - (_self7 = (_ref23 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) == null ? void 0 : _ref23.self) === null || _self7 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self7, _x)[_x]; - (_call$self2 = (_ref24 = fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo4 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) == null ? void 0 : (_ref24$call = _ref24.call(_classPrivateFieldLoo4)) == null ? void 0 : _ref24$call.self) === null || _call$self2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_call$self2, _x)[_x]; - (_getSelf$self3 = (_ref25 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : (_ref25$getSelf = _ref25.getSelf()) == null ? void 0 : _ref25$getSelf.self) === null || _getSelf$self3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf$self3, _x)[_x]; - (_getSelf$self4 = (_ref26 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref26.getSelf == null ? void 0 : (_ref26$getSelf = _ref26.getSelf()) == null ? void 0 : _ref26$getSelf.self) === null || _getSelf$self4 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf$self4, _x)[_x]; + Foo === null || Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(Foo, _x)[_x]; + Foo === null || Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(Foo, _x)[_x].toString; + Foo === null || Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(Foo, _x)[_x].toString(); + (_o$Foo = o == null ? void 0 : o.Foo) === null || _o$Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_o$Foo, _x)[_x]; + (_o$Foo2 = o == null ? void 0 : o.Foo) === null || _o$Foo2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_o$Foo2, _x)[_x].toString; + (_o$Foo3 = o == null ? void 0 : o.Foo) === null || _o$Foo3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_o$Foo3, _x)[_x].toString(); + (_deep$very$o$Foo = deep == null ? void 0 : (_deep$very$o = deep.very.o) == null ? void 0 : _deep$very$o.Foo) === null || _deep$very$o$Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o$Foo, _x)[_x]; + (_deep$very$o$Foo2 = deep == null ? void 0 : (_deep$very$o2 = deep.very.o) == null ? void 0 : _deep$very$o2.Foo) === null || _deep$very$o$Foo2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o$Foo2, _x)[_x].toString; + (_deep$very$o$Foo3 = deep == null ? void 0 : (_deep$very$o3 = deep.very.o) == null ? void 0 : _deep$very$o3.Foo) === null || _deep$very$o$Foo3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o$Foo3, _x)[_x].toString(); + (_ref = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref, _x)[_x]; + (_ref2 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self) === null || _ref2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref2, _x)[_x]; + (_self2 = (_ref7 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref7.self) === null || _self2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self2, _x)[_x]; + (_self3 = (_ref8 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self) == null ? void 0 : _ref8.self) === null || _self3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self3, _x)[_x]; + (_self$self = (_ref9 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : (_ref9$self = _ref9.self) == null ? void 0 : _ref9$self.self) === null || _self$self === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self$self, _x)[_x]; + (_ref3 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) === null || _ref3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref3, _x)[_x]; + (_call = (_ref10 = o === null || o === void 0 ? void 0 : (_babelHelpers$classPr = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) == null ? void 0 : _ref10.call(_babelHelpers$classPr)) === null || _call === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_call, _x)[_x]; + (_getSelf = (_ref11 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref11.getSelf()) === null || _getSelf === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf, _x)[_x]; + (_getSelf2 = (_ref12 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref12.getSelf == null ? void 0 : _ref12.getSelf()) === null || _getSelf2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf2, _x)[_x]; + (_self4 = (_ref13 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) == null ? void 0 : _ref13.self) === null || _self4 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self4, _x)[_x]; + (_call$self = (_ref14 = o === null || o === void 0 ? void 0 : (_babelHelpers$classPr2 = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) == null ? void 0 : (_ref14$call = _ref14.call(_babelHelpers$classPr2)) == null ? void 0 : _ref14$call.self) === null || _call$self === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_call$self, _x)[_x]; + (_getSelf$self = (_ref15 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : (_ref15$getSelf = _ref15.getSelf()) == null ? void 0 : _ref15$getSelf.self) === null || _getSelf$self === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf$self, _x)[_x]; + (_getSelf$self2 = (_ref16 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? void 0 : _ref16.getSelf == null ? void 0 : (_ref16$getSelf = _ref16.getSelf()) == null ? void 0 : _ref16$getSelf.self) === null || _getSelf$self2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf$self2, _x)[_x]; + (_fn$Foo = fn == null ? void 0 : fn().Foo) === null || _fn$Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fn$Foo, _x)[_x]; + (_fn$Foo2 = fn == null ? void 0 : fn().Foo) === null || _fn$Foo2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fn$Foo2, _x)[_x].toString; + (_fn$Foo3 = fn == null ? void 0 : fn().Foo) === null || _fn$Foo3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fn$Foo3, _x)[_x].toString(); + (_fnDeep$very$o$Foo = fnDeep == null ? void 0 : (_fnDeep$very$o = fnDeep().very.o) == null ? void 0 : _fnDeep$very$o.Foo) === null || _fnDeep$very$o$Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o$Foo, _x)[_x]; + (_fnDeep$very$o$Foo2 = fnDeep == null ? void 0 : (_fnDeep$very$o2 = fnDeep().very.o) == null ? void 0 : _fnDeep$very$o2.Foo) === null || _fnDeep$very$o$Foo2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o$Foo2, _x)[_x].toString; + (_fnDeep$very$o$Foo3 = fnDeep == null ? void 0 : (_fnDeep$very$o3 = fnDeep().very.o) == null ? void 0 : _fnDeep$very$o3.Foo) === null || _fnDeep$very$o$Foo3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o$Foo3, _x)[_x].toString(); + (_ref4 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref4 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref4, _x)[_x]; + (_ref5 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) === null || _ref5 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref5, _x)[_x]; + (_self5 = (_ref17 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref17.self) === null || _self5 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self5, _x)[_x]; + (_self6 = (_ref18 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) == null ? void 0 : _ref18.self) === null || _self6 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self6, _x)[_x]; + (_self$self2 = (_ref19 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : (_ref19$self = _ref19.self) == null ? void 0 : _ref19$self.self) === null || _self$self2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self$self2, _x)[_x]; + (_ref6 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) === null || _ref6 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref6, _x)[_x]; + (_call2 = (_ref20 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr3 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) == null ? void 0 : _ref20.call(_babelHelpers$classPr3)) === null || _call2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_call2, _x)[_x]; + (_getSelf3 = (_ref21 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref21.getSelf()) === null || _getSelf3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf3, _x)[_x]; + (_getSelf4 = (_ref22 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref22.getSelf == null ? void 0 : _ref22.getSelf()) === null || _getSelf4 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf4, _x)[_x]; + (_self7 = (_ref23 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) == null ? void 0 : _ref23.self) === null || _self7 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self7, _x)[_x]; + (_call$self2 = (_ref24 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr4 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) == null ? void 0 : (_ref24$call = _ref24.call(_babelHelpers$classPr4)) == null ? void 0 : _ref24$call.self) === null || _call$self2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_call$self2, _x)[_x]; + (_getSelf$self3 = (_ref25 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : (_ref25$getSelf = _ref25.getSelf()) == null ? void 0 : _ref25$getSelf.self) === null || _getSelf$self3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf$self3, _x)[_x]; + (_getSelf$self4 = (_ref26 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? void 0 : _ref26.getSelf == null ? void 0 : (_ref26$getSelf = _ref26.getSelf()) == null ? void 0 : _ref26$getSelf.self) === null || _getSelf$self4 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf$self4, _x)[_x]; } } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-optional-property/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-optional-property/output.js index 3496be8f76..0f0af5abe7 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-optional-property/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/optional-chain-optional-property/output.js @@ -1,12 +1,6 @@ -function _classPrivateFieldLooseBase(receiver, privateKey) { if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) { throw new TypeError("attempted to use private field on non-instance"); } return receiver; } +var _x = babelHelpers.classPrivateFieldLooseKey("x"); -var id = 0; - -function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; } - -var _x = _classPrivateFieldLooseKey("x"); - -var _self = _classPrivateFieldLooseKey("self"); +var _self = babelHelpers.classPrivateFieldLooseKey("self"); class Foo { static getSelf() { @@ -14,7 +8,7 @@ class Foo { } static test() { - var _o$Foo, _o$Foo2, _o$Foo3, _deep$very$o$Foo, _deep$very$o$Foo2, _deep$very$o$Foo3, _ref, _ref2, _self2, _self3, _self$self, _ref3, _classPrivateFieldLoo, _call, _getSelf, _getSelf2, _self4, _classPrivateFieldLoo2, _call$self, _getSelf$self, _getSelf$self2, _fn$Foo, _fn$Foo2, _fn$Foo3, _fnDeep$very$o$Foo, _fnDeep$very$o$Foo2, _fnDeep$very$o$Foo3, _ref4, _ref5, _self5, _self6, _self$self2, _ref6, _classPrivateFieldLoo3, _call2, _getSelf3, _getSelf4, _self7, _classPrivateFieldLoo4, _call$self2, _getSelf$self3, _getSelf$self4; + var _o$Foo, _o$Foo2, _o$Foo3, _deep$very$o$Foo, _deep$very$o$Foo2, _deep$very$o$Foo3, _ref, _ref2, _self2, _self3, _self$self, _ref3, _babelHelpers$classPr, _call, _getSelf, _getSelf2, _self4, _babelHelpers$classPr2, _call$self, _getSelf$self, _getSelf$self2, _fn$Foo, _fn$Foo2, _fn$Foo3, _fnDeep$very$o$Foo, _fnDeep$very$o$Foo2, _fnDeep$very$o$Foo3, _ref4, _ref5, _self5, _self6, _self$self2, _ref6, _babelHelpers$classPr3, _call2, _getSelf3, _getSelf4, _self7, _babelHelpers$classPr4, _call$self2, _getSelf$self3, _getSelf$self4; const o = { Foo: Foo @@ -33,47 +27,47 @@ class Foo { return deep; } - Foo === null || Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(Foo, _x)[_x]; - Foo === null || Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(Foo, _x)[_x].toString; - Foo === null || Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(Foo, _x)[_x].toString(); - (_o$Foo = o?.Foo) === null || _o$Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(_o$Foo, _x)[_x]; - (_o$Foo2 = o?.Foo) === null || _o$Foo2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_o$Foo2, _x)[_x].toString; - (_o$Foo3 = o?.Foo) === null || _o$Foo3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_o$Foo3, _x)[_x].toString(); - (_deep$very$o$Foo = deep?.very.o?.Foo) === null || _deep$very$o$Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o$Foo, _x)[_x]; - (_deep$very$o$Foo2 = deep?.very.o?.Foo) === null || _deep$very$o$Foo2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o$Foo2, _x)[_x].toString; - (_deep$very$o$Foo3 = deep?.very.o?.Foo) === null || _deep$very$o$Foo3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_deep$very$o$Foo3, _x)[_x].toString(); - (_ref = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref, _x)[_x]; - (_ref2 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].self) === null || _ref2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref2, _x)[_x]; - (_self2 = (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.self) === null || _self2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self2, _x)[_x]; - (_self3 = (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].self)?.self) === null || _self3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self3, _x)[_x]; - (_self$self = (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.self?.self) === null || _self$self === void 0 ? void 0 : _classPrivateFieldLooseBase(_self$self, _x)[_x]; - (_ref3 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) === null || _ref3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref3, _x)[_x]; - (_call = (o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf)?.call(_classPrivateFieldLoo)) === null || _call === void 0 ? void 0 : _classPrivateFieldLooseBase(_call, _x)[_x]; - (_getSelf = (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf()) === null || _getSelf === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf, _x)[_x]; - (_getSelf2 = (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf?.()) === null || _getSelf2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf2, _x)[_x]; - (_self4 = (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf())?.self) === null || _self4 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self4, _x)[_x]; - (_call$self = (o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo2 = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf)?.call(_classPrivateFieldLoo2)?.self) === null || _call$self === void 0 ? void 0 : _classPrivateFieldLooseBase(_call$self, _x)[_x]; - (_getSelf$self = (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf()?.self) === null || _getSelf$self === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf$self, _x)[_x]; - (_getSelf$self2 = (o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf?.()?.self) === null || _getSelf$self2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf$self2, _x)[_x]; - (_fn$Foo = fn?.().Foo) === null || _fn$Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(_fn$Foo, _x)[_x]; - (_fn$Foo2 = fn?.().Foo) === null || _fn$Foo2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_fn$Foo2, _x)[_x].toString; - (_fn$Foo3 = fn?.().Foo) === null || _fn$Foo3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_fn$Foo3, _x)[_x].toString(); - (_fnDeep$very$o$Foo = fnDeep?.().very.o?.Foo) === null || _fnDeep$very$o$Foo === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o$Foo, _x)[_x]; - (_fnDeep$very$o$Foo2 = fnDeep?.().very.o?.Foo) === null || _fnDeep$very$o$Foo2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o$Foo2, _x)[_x].toString; - (_fnDeep$very$o$Foo3 = fnDeep?.().very.o?.Foo) === null || _fnDeep$very$o$Foo3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_fnDeep$very$o$Foo3, _x)[_x].toString(); - (_ref4 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref4 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref4, _x)[_x]; - (_ref5 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) === null || _ref5 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref5, _x)[_x]; - (_self5 = (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.self) === null || _self5 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self5, _x)[_x]; - (_self6 = (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].self)?.self) === null || _self6 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self6, _x)[_x]; - (_self$self2 = (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.self?.self) === null || _self$self2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self$self2, _x)[_x]; - (_ref6 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) === null || _ref6 === void 0 ? void 0 : _classPrivateFieldLooseBase(_ref6, _x)[_x]; - (_call2 = (fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo3 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf)?.call(_classPrivateFieldLoo3)) === null || _call2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_call2, _x)[_x]; - (_getSelf3 = (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf()) === null || _getSelf3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf3, _x)[_x]; - (_getSelf4 = (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf?.()) === null || _getSelf4 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf4, _x)[_x]; - (_self7 = (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf())?.self) === null || _self7 === void 0 ? void 0 : _classPrivateFieldLooseBase(_self7, _x)[_x]; - (_call$self2 = (fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo4 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf)?.call(_classPrivateFieldLoo4)?.self) === null || _call$self2 === void 0 ? void 0 : _classPrivateFieldLooseBase(_call$self2, _x)[_x]; - (_getSelf$self3 = (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf()?.self) === null || _getSelf$self3 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf$self3, _x)[_x]; - (_getSelf$self4 = (fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf?.()?.self) === null || _getSelf$self4 === void 0 ? void 0 : _classPrivateFieldLooseBase(_getSelf$self4, _x)[_x]; + Foo === null || Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(Foo, _x)[_x]; + Foo === null || Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(Foo, _x)[_x].toString; + Foo === null || Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(Foo, _x)[_x].toString(); + (_o$Foo = o?.Foo) === null || _o$Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_o$Foo, _x)[_x]; + (_o$Foo2 = o?.Foo) === null || _o$Foo2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_o$Foo2, _x)[_x].toString; + (_o$Foo3 = o?.Foo) === null || _o$Foo3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_o$Foo3, _x)[_x].toString(); + (_deep$very$o$Foo = deep?.very.o?.Foo) === null || _deep$very$o$Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o$Foo, _x)[_x]; + (_deep$very$o$Foo2 = deep?.very.o?.Foo) === null || _deep$very$o$Foo2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o$Foo2, _x)[_x].toString; + (_deep$very$o$Foo3 = deep?.very.o?.Foo) === null || _deep$very$o$Foo3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_deep$very$o$Foo3, _x)[_x].toString(); + (_ref = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) === null || _ref === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref, _x)[_x]; + (_ref2 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self) === null || _ref2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref2, _x)[_x]; + (_self2 = (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.self) === null || _self2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self2, _x)[_x]; + (_self3 = (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self)?.self) === null || _self3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self3, _x)[_x]; + (_self$self = (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.self?.self) === null || _self$self === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self$self, _x)[_x]; + (_ref3 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) === null || _ref3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref3, _x)[_x]; + (_call = (o === null || o === void 0 ? void 0 : (_babelHelpers$classPr = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf)?.call(_babelHelpers$classPr)) === null || _call === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_call, _x)[_x]; + (_getSelf = (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf()) === null || _getSelf === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf, _x)[_x]; + (_getSelf2 = (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf?.()) === null || _getSelf2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf2, _x)[_x]; + (_self4 = (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf())?.self) === null || _self4 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self4, _x)[_x]; + (_call$self = (o === null || o === void 0 ? void 0 : (_babelHelpers$classPr2 = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf)?.call(_babelHelpers$classPr2)?.self) === null || _call$self === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_call$self, _x)[_x]; + (_getSelf$self = (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf()?.self) === null || _getSelf$self === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf$self, _x)[_x]; + (_getSelf$self2 = (o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self])?.getSelf?.()?.self) === null || _getSelf$self2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf$self2, _x)[_x]; + (_fn$Foo = fn?.().Foo) === null || _fn$Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fn$Foo, _x)[_x]; + (_fn$Foo2 = fn?.().Foo) === null || _fn$Foo2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fn$Foo2, _x)[_x].toString; + (_fn$Foo3 = fn?.().Foo) === null || _fn$Foo3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fn$Foo3, _x)[_x].toString(); + (_fnDeep$very$o$Foo = fnDeep?.().very.o?.Foo) === null || _fnDeep$very$o$Foo === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o$Foo, _x)[_x]; + (_fnDeep$very$o$Foo2 = fnDeep?.().very.o?.Foo) === null || _fnDeep$very$o$Foo2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o$Foo2, _x)[_x].toString; + (_fnDeep$very$o$Foo3 = fnDeep?.().very.o?.Foo) === null || _fnDeep$very$o$Foo3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o$Foo3, _x)[_x].toString(); + (_ref4 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) === null || _ref4 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref4, _x)[_x]; + (_ref5 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) === null || _ref5 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref5, _x)[_x]; + (_self5 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.self) === null || _self5 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self5, _x)[_x]; + (_self6 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self)?.self) === null || _self6 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self6, _x)[_x]; + (_self$self2 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.self?.self) === null || _self$self2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self$self2, _x)[_x]; + (_ref6 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) === null || _ref6 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_ref6, _x)[_x]; + (_call2 = (fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr3 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf)?.call(_babelHelpers$classPr3)) === null || _call2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_call2, _x)[_x]; + (_getSelf3 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf()) === null || _getSelf3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf3, _x)[_x]; + (_getSelf4 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf?.()) === null || _getSelf4 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf4, _x)[_x]; + (_self7 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf())?.self) === null || _self7 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_self7, _x)[_x]; + (_call$self2 = (fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr4 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf)?.call(_babelHelpers$classPr4)?.self) === null || _call$self2 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_call$self2, _x)[_x]; + (_getSelf$self3 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf()?.self) === null || _getSelf$self3 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf$self3, _x)[_x]; + (_getSelf$self4 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self])?.getSelf?.()?.self) === null || _getSelf$self4 === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(_getSelf$self4, _x)[_x]; } } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/options.json index d0b48e0906..c2c1a42409 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], ["proposal-class-properties", { "loose": true }], "transform-classes", "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/parenthesized-optional-member-call-with-transform/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/parenthesized-optional-member-call-with-transform/options.json index 14f4e86be5..2e81883cad 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/parenthesized-optional-member-call-with-transform/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/parenthesized-optional-member-call-with-transform/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], ["proposal-class-properties", { "loose": true }], ["proposal-optional-chaining", { "loose": true }] ] diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/parenthesized-optional-member-call/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/parenthesized-optional-member-call/options.json index 88c37f66ee..3b59e1bbfc 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/parenthesized-optional-member-call/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/parenthesized-optional-member-call/options.json @@ -1,7 +1,4 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - "proposal-class-properties" - ], + "plugins": ["proposal-class-properties"], "minNodeVersion": "14.0.0" } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/reevaluated/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/reevaluated/options.json index a9b6f71fec..02a7e666a9 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/reevaluated/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/reevaluated/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.0.2" - } - ], ["proposal-class-properties", { "loose": true }], "transform-block-scoping", "syntax-class-properties" diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-export/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-export/options.json index a9b6f71fec..02a7e666a9 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-export/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-export/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.0.2" - } - ], ["proposal-class-properties", { "loose": true }], "transform-block-scoping", "syntax-class-properties" diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-infer-name/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-infer-name/options.json index a9b6f71fec..02a7e666a9 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-infer-name/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-infer-name/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.0.2" - } - ], ["proposal-class-properties", { "loose": true }], "transform-block-scoping", "syntax-class-properties" diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-inherited/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-inherited/options.json index a9b6f71fec..02a7e666a9 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-inherited/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-inherited/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.0.2" - } - ], ["proposal-class-properties", { "loose": true }], "transform-block-scoping", "syntax-class-properties" diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-undefined/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-undefined/options.json index a9b6f71fec..02a7e666a9 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-undefined/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static-undefined/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.0.2" - } - ], ["proposal-class-properties", { "loose": true }], "transform-block-scoping", "syntax-class-properties" diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static/options.json index a9b6f71fec..02a7e666a9 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private-loose/static/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.0.2" - } - ], ["proposal-class-properties", { "loose": true }], "transform-block-scoping", "syntax-class-properties" diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-2-exec/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-2-exec/options.json index 4a36349a04..6b2a3bd326 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-2-exec/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/destructuring-object-pattern-2-exec/options.json @@ -1,12 +1,6 @@ { "plugins": [ "transform-destructuring", - [ - "external-helpers", - { - "helperVersion": "7.4.4" - } - ], "proposal-class-properties", "transform-classes", "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/instance/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/instance/options.json index d19c321985..a24c753a01 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/instance/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/instance/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.0.2" - } - ], "proposal-class-properties", "transform-classes", "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/logical-assignment/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/logical-assignment/output.js index 0ae51ebc80..973697c962 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/logical-assignment/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/logical-assignment/output.js @@ -1,7 +1,3 @@ -function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = privateMap.get(receiver); if (!descriptor) { throw new TypeError("attempted to set private field on non-instance"); } if (descriptor.set) { descriptor.set.call(receiver, value); } else { if (!descriptor.writable) { throw new TypeError("attempted to set read only private field"); } descriptor.value = value; } return value; } - -function _classPrivateFieldGet(receiver, privateMap) { var descriptor = privateMap.get(receiver); if (!descriptor) { throw new TypeError("attempted to get private field on non-instance"); } if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; } - var _nullish = new WeakMap(); var _and = new WeakMap(); @@ -33,10 +29,10 @@ class Foo { test() { var _this$self; - _classPrivateFieldGet(this, _nullish) ?? _classPrivateFieldSet(this, _nullish, 42); - _classPrivateFieldGet(this, _and) && _classPrivateFieldSet(this, _and, 0); - _classPrivateFieldGet(this, _or) || _classPrivateFieldSet(this, _or, 0); - _classPrivateFieldGet(_this$self = this.self(), _nullish) ?? _classPrivateFieldSet(_this$self, _nullish, 42); + babelHelpers.classPrivateFieldGet(this, _nullish) ?? babelHelpers.classPrivateFieldSet(this, _nullish, 42); + babelHelpers.classPrivateFieldGet(this, _and) && babelHelpers.classPrivateFieldSet(this, _and, 0); + babelHelpers.classPrivateFieldGet(this, _or) || babelHelpers.classPrivateFieldSet(this, _or, 0); + babelHelpers.classPrivateFieldGet(_this$self = this.self(), _nullish) ?? babelHelpers.classPrivateFieldSet(_this$self, _nullish, 42); } } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/native-classes/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/native-classes/options.json index 668d1445ba..7440c2aa70 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/native-classes/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/native-classes/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.0.2" - } - ], "proposal-class-properties", "transform-block-scoping", "syntax-class-properties" diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/non-block-arrow-func/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/non-block-arrow-func/options.json index 668d1445ba..7440c2aa70 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/non-block-arrow-func/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/non-block-arrow-func/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.0.2" - } - ], "proposal-class-properties", "transform-block-scoping", "syntax-class-properties" diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-before-member-call-with-transform/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-before-member-call-with-transform/output.js index e754115aea..5b884dc96a 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-before-member-call-with-transform/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-before-member-call-with-transform/output.js @@ -1,14 +1,10 @@ -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _classStaticPrivateFieldSpecGet(receiver, classConstructor, descriptor) { if (receiver !== classConstructor) { throw new TypeError("Private static access of wrong provenance"); } if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; } - class Foo { static getSelf() { return this; } static test() { - var _o$Foo, _o$Foo2, _o$Foo3, _deep$very$o, _deep$very$o$Foo, _deep$very$o2, _deep$very$o2$Foo, _deep$very$o3, _deep$very$o3$Foo, _classStaticPrivateFi, _classStaticPrivateFi2, _ref, _ref$self, _ref2, _ref2$self, _self2, _self2$self, _classStaticPrivateFi3, _classStaticPrivateFi4, _ref3, _ref3$call, _ref4, _ref4$getSelf, _getSelf, _ref5, _getSelf$call, _ref6, _ref6$self, _classStaticPrivateFi5, _call, _call$self, _getSelf2, _getSelf2$self, _getSelf3, _getSelf3$self, _fn$Foo, _fn$Foo2, _fn$Foo3, _fnDeep$very$o, _fnDeep$very$o$Foo, _fnDeep$very$o2, _fnDeep$very$o2$Foo, _fnDeep$very$o3, _fnDeep$very$o3$Foo, _classStaticPrivateFi6, _classStaticPrivateFi7, _ref7, _ref7$self, _ref8, _ref8$self, _self3, _self3$self, _classStaticPrivateFi8, _classStaticPrivateFi9, _ref9, _ref9$call, _ref10, _ref10$getSelf, _getSelf4, _ref11, _getSelf4$call, _ref12, _ref12$self, _classStaticPrivateFi10, _call2, _call2$self, _getSelf5, _getSelf5$self, _getSelf6, _getSelf6$self, _ref13, _ref14, _ref15, _ref16, _ref17, _ref17$getSelf, _ref18, _ref19, _ref20, _ref21, _ref22, _ref22$getSelf; + var _o$Foo, _o$Foo2, _o$Foo3, _deep$very$o, _deep$very$o$Foo, _deep$very$o2, _deep$very$o2$Foo, _deep$very$o3, _deep$very$o3$Foo, _babelHelpers$classSt, _babelHelpers$classSt2, _ref, _ref$self, _ref2, _ref2$self, _self2, _self2$self, _babelHelpers$classSt3, _babelHelpers$classSt4, _ref3, _ref3$call, _ref4, _ref4$getSelf, _getSelf, _ref5, _getSelf$call, _ref6, _ref6$self, _babelHelpers$classSt5, _call, _call$self, _getSelf2, _getSelf2$self, _getSelf3, _getSelf3$self, _fn$Foo, _fn$Foo2, _fn$Foo3, _fnDeep$very$o, _fnDeep$very$o$Foo, _fnDeep$very$o2, _fnDeep$very$o2$Foo, _fnDeep$very$o3, _fnDeep$very$o3$Foo, _babelHelpers$classSt6, _babelHelpers$classSt7, _ref7, _ref7$self, _ref8, _ref8$self, _self3, _self3$self, _babelHelpers$classSt8, _babelHelpers$classSt9, _ref9, _ref9$call, _ref10, _ref10$getSelf, _getSelf4, _ref11, _getSelf4$call, _ref12, _ref12$self, _babelHelpers$classSt10, _call2, _call2$self, _getSelf5, _getSelf5$self, _getSelf6, _getSelf6$self, _ref13, _ref14, _ref15, _ref16, _ref17, _ref17$getSelf, _ref18, _ref19, _ref20, _ref21, _ref22, _ref22$getSelf; const o = { Foo: Foo @@ -27,44 +23,44 @@ class Foo { return deep; } - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo = o.Foo, Foo, _m).call(_o$Foo); - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo2 = o.Foo, Foo, _m).call(_o$Foo2).toString; - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo3 = o.Foo, Foo, _m).call(_o$Foo3).toString(); - (_deep$very$o = deep === null || deep === void 0 ? void 0 : deep.very.o) === null || _deep$very$o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o$Foo = _deep$very$o.Foo, Foo, _m).call(_deep$very$o$Foo); - (_deep$very$o2 = deep === null || deep === void 0 ? void 0 : deep.very.o) === null || _deep$very$o2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o2$Foo = _deep$very$o2.Foo, Foo, _m).call(_deep$very$o2$Foo).toString; - (_deep$very$o3 = deep === null || deep === void 0 ? void 0 : deep.very.o) === null || _deep$very$o3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o3$Foo = _deep$very$o3.Foo, Foo, _m).call(_deep$very$o3$Foo).toString(); - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self), Foo, _m).call(_classStaticPrivateFi); - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi2 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self, Foo, _m).call(_classStaticPrivateFi2); - (_ref = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref$self = _ref.self, Foo, _m).call(_ref$self); - (_ref2 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) === null || _ref2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref2$self = _ref2.self, Foo, _m).call(_ref2$self); - (_self2 = (_ref13 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref13 === void 0 ? void 0 : _ref13.self) === null || _self2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self2$self = _self2.self, Foo, _m).call(_self2$self); - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi3 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf(), Foo, _m).call(_classStaticPrivateFi3); - (_ref3 = o === null || o === void 0 ? void 0 : (_classStaticPrivateFi4 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref3$call = _ref3.call(_classStaticPrivateFi4), Foo, _m).call(_ref3$call); - (_ref4 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref4 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref4$getSelf = _ref4.getSelf(), Foo, _m).call(_ref4$getSelf); - (_getSelf = (_ref14 = _ref5 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref14 === void 0 ? void 0 : _ref14.getSelf) === null || _getSelf === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf$call = _getSelf.call(_ref5), Foo, _m).call(_getSelf$call); - (_ref6 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) === null || _ref6 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref6$self = _ref6.self, Foo, _m).call(_ref6$self); - (_call = (_ref15 = o === null || o === void 0 ? void 0 : (_classStaticPrivateFi5 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref15 === void 0 ? void 0 : _ref15.call(_classStaticPrivateFi5)) === null || _call === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_call$self = _call.self, Foo, _m).call(_call$self); - (_getSelf2 = (_ref16 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref16 === void 0 ? void 0 : _ref16.getSelf()) === null || _getSelf2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf2$self = _getSelf2.self, Foo, _m).call(_getSelf2$self); - (_getSelf3 = (_ref17 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref17 === void 0 ? void 0 : (_ref17$getSelf = _ref17.getSelf) === null || _ref17$getSelf === void 0 ? void 0 : _ref17$getSelf.call(_ref17)) === null || _getSelf3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf3$self = _getSelf3.self, Foo, _m).call(_getSelf3$self); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fn$Foo = fn().Foo, Foo, _m).call(_fn$Foo); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fn$Foo2 = fn().Foo, Foo, _m).call(_fn$Foo2).toString; - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fn$Foo3 = fn().Foo, Foo, _m).call(_fn$Foo3).toString(); - (_fnDeep$very$o = fnDeep === null || fnDeep === void 0 ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo = _fnDeep$very$o.Foo, Foo, _m).call(_fnDeep$very$o$Foo); - (_fnDeep$very$o2 = fnDeep === null || fnDeep === void 0 ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o2$Foo = _fnDeep$very$o2.Foo, Foo, _m).call(_fnDeep$very$o2$Foo).toString; - (_fnDeep$very$o3 = fnDeep === null || fnDeep === void 0 ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o3$Foo = _fnDeep$very$o3.Foo, Foo, _m).call(_fnDeep$very$o3$Foo).toString(); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi6 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self), Foo, _m).call(_classStaticPrivateFi6); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi7 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self, Foo, _m).call(_classStaticPrivateFi7); - (_ref7 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref7 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref7$self = _ref7.self, Foo, _m).call(_ref7$self); - (_ref8 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) === null || _ref8 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref8$self = _ref8.self, Foo, _m).call(_ref8$self); - (_self3 = (_ref18 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref18 === void 0 ? void 0 : _ref18.self) === null || _self3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self3$self = _self3.self, Foo, _m).call(_self3$self); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi8 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf(), Foo, _m).call(_classStaticPrivateFi8); - (_ref9 = fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi9 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref9 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref9$call = _ref9.call(_classStaticPrivateFi9), Foo, _m).call(_ref9$call); - (_ref10 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref10 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref10$getSelf = _ref10.getSelf(), Foo, _m).call(_ref10$getSelf); - (_getSelf4 = (_ref19 = _ref11 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref19 === void 0 ? void 0 : _ref19.getSelf) === null || _getSelf4 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf4$call = _getSelf4.call(_ref11), Foo, _m).call(_getSelf4$call); - (_ref12 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) === null || _ref12 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref12$self = _ref12.self, Foo, _m).call(_ref12$self); - (_call2 = (_ref20 = fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi10 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref20 === void 0 ? void 0 : _ref20.call(_classStaticPrivateFi10)) === null || _call2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_call2$self = _call2.self, Foo, _m).call(_call2$self); - (_getSelf5 = (_ref21 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref21 === void 0 ? void 0 : _ref21.getSelf()) === null || _getSelf5 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf5$self = _getSelf5.self, Foo, _m).call(_getSelf5$self); - (_getSelf6 = (_ref22 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref22 === void 0 ? void 0 : (_ref22$getSelf = _ref22.getSelf) === null || _ref22$getSelf === void 0 ? void 0 : _ref22$getSelf.call(_ref22)) === null || _getSelf6 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf6$self = _getSelf6.self, Foo, _m).call(_getSelf6$self); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo = o.Foo, Foo, _m).call(_o$Foo); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo2 = o.Foo, Foo, _m).call(_o$Foo2).toString; + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo3 = o.Foo, Foo, _m).call(_o$Foo3).toString(); + (_deep$very$o = deep === null || deep === void 0 ? void 0 : deep.very.o) === null || _deep$very$o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o$Foo = _deep$very$o.Foo, Foo, _m).call(_deep$very$o$Foo); + (_deep$very$o2 = deep === null || deep === void 0 ? void 0 : deep.very.o) === null || _deep$very$o2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o2$Foo = _deep$very$o2.Foo, Foo, _m).call(_deep$very$o2$Foo).toString; + (_deep$very$o3 = deep === null || deep === void 0 ? void 0 : deep.very.o) === null || _deep$very$o3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o3$Foo = _deep$very$o3.Foo, Foo, _m).call(_deep$very$o3$Foo).toString(); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self), Foo, _m).call(_babelHelpers$classSt); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt2 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self, Foo, _m).call(_babelHelpers$classSt2); + (_ref = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref$self = _ref.self, Foo, _m).call(_ref$self); + (_ref2 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) === null || _ref2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref2$self = _ref2.self, Foo, _m).call(_ref2$self); + (_self2 = (_ref13 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref13 === void 0 ? void 0 : _ref13.self) === null || _self2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self2$self = _self2.self, Foo, _m).call(_self2$self); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt3 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf(), Foo, _m).call(_babelHelpers$classSt3); + (_ref3 = o === null || o === void 0 ? void 0 : (_babelHelpers$classSt4 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref3$call = _ref3.call(_babelHelpers$classSt4), Foo, _m).call(_ref3$call); + (_ref4 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref4 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref4$getSelf = _ref4.getSelf(), Foo, _m).call(_ref4$getSelf); + (_getSelf = (_ref14 = _ref5 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref14 === void 0 ? void 0 : _ref14.getSelf) === null || _getSelf === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf$call = _getSelf.call(_ref5), Foo, _m).call(_getSelf$call); + (_ref6 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) === null || _ref6 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref6$self = _ref6.self, Foo, _m).call(_ref6$self); + (_call = (_ref15 = o === null || o === void 0 ? void 0 : (_babelHelpers$classSt5 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref15 === void 0 ? void 0 : _ref15.call(_babelHelpers$classSt5)) === null || _call === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call$self = _call.self, Foo, _m).call(_call$self); + (_getSelf2 = (_ref16 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref16 === void 0 ? void 0 : _ref16.getSelf()) === null || _getSelf2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf2$self = _getSelf2.self, Foo, _m).call(_getSelf2$self); + (_getSelf3 = (_ref17 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref17 === void 0 ? void 0 : (_ref17$getSelf = _ref17.getSelf) === null || _ref17$getSelf === void 0 ? void 0 : _ref17$getSelf.call(_ref17)) === null || _getSelf3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf3$self = _getSelf3.self, Foo, _m).call(_getSelf3$self); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo = fn().Foo, Foo, _m).call(_fn$Foo); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo2 = fn().Foo, Foo, _m).call(_fn$Foo2).toString; + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo3 = fn().Foo, Foo, _m).call(_fn$Foo3).toString(); + (_fnDeep$very$o = fnDeep === null || fnDeep === void 0 ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo = _fnDeep$very$o.Foo, Foo, _m).call(_fnDeep$very$o$Foo); + (_fnDeep$very$o2 = fnDeep === null || fnDeep === void 0 ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o2$Foo = _fnDeep$very$o2.Foo, Foo, _m).call(_fnDeep$very$o2$Foo).toString; + (_fnDeep$very$o3 = fnDeep === null || fnDeep === void 0 ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o3$Foo = _fnDeep$very$o3.Foo, Foo, _m).call(_fnDeep$very$o3$Foo).toString(); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt6 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self), Foo, _m).call(_babelHelpers$classSt6); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt7 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self, Foo, _m).call(_babelHelpers$classSt7); + (_ref7 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref7 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref7$self = _ref7.self, Foo, _m).call(_ref7$self); + (_ref8 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) === null || _ref8 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref8$self = _ref8.self, Foo, _m).call(_ref8$self); + (_self3 = (_ref18 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref18 === void 0 ? void 0 : _ref18.self) === null || _self3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self3$self = _self3.self, Foo, _m).call(_self3$self); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt8 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf(), Foo, _m).call(_babelHelpers$classSt8); + (_ref9 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt9 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref9 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref9$call = _ref9.call(_babelHelpers$classSt9), Foo, _m).call(_ref9$call); + (_ref10 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref10 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref10$getSelf = _ref10.getSelf(), Foo, _m).call(_ref10$getSelf); + (_getSelf4 = (_ref19 = _ref11 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref19 === void 0 ? void 0 : _ref19.getSelf) === null || _getSelf4 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf4$call = _getSelf4.call(_ref11), Foo, _m).call(_getSelf4$call); + (_ref12 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) === null || _ref12 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref12$self = _ref12.self, Foo, _m).call(_ref12$self); + (_call2 = (_ref20 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt10 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref20 === void 0 ? void 0 : _ref20.call(_babelHelpers$classSt10)) === null || _call2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call2$self = _call2.self, Foo, _m).call(_call2$self); + (_getSelf5 = (_ref21 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref21 === void 0 ? void 0 : _ref21.getSelf()) === null || _getSelf5 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf5$self = _getSelf5.self, Foo, _m).call(_getSelf5$self); + (_getSelf6 = (_ref22 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref22 === void 0 ? void 0 : (_ref22$getSelf = _ref22.getSelf) === null || _ref22$getSelf === void 0 ? void 0 : _ref22$getSelf.call(_ref22)) === null || _getSelf6 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf6$self = _getSelf6.self, Foo, _m).call(_getSelf6$self); } } @@ -76,14 +72,12 @@ var _x = { var _m = { writable: true, value: function () { - return _classStaticPrivateFieldSpecGet(this, Foo, _x); + return babelHelpers.classStaticPrivateFieldSpecGet(this, Foo, _x); } }; var _self = { writable: true, value: Foo }; - -_defineProperty(Foo, "self", Foo); - +babelHelpers.defineProperty(Foo, "self", Foo); Foo.test(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-before-member-call/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-before-member-call/output.js index f3282ff89c..46324a5b5a 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-before-member-call/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-before-member-call/output.js @@ -1,14 +1,10 @@ -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _classStaticPrivateFieldSpecGet(receiver, classConstructor, descriptor) { if (receiver !== classConstructor) { throw new TypeError("Private static access of wrong provenance"); } if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; } - class Foo { static getSelf() { return this; } static test() { - var _o$Foo, _o$Foo2, _o$Foo3, _deep$very$o, _deep$very$o$Foo, _deep$very$o2, _deep$very$o2$Foo, _deep$very$o3, _deep$very$o3$Foo, _classStaticPrivateFi, _classStaticPrivateFi2, _ref, _ref$self, _ref2, _ref2$self, _self2, _self2$self, _classStaticPrivateFi3, _classStaticPrivateFi4, _ref3, _ref3$call, _ref4, _ref4$getSelf, _getSelf, _ref5, _getSelf$call, _ref6, _ref6$self, _classStaticPrivateFi5, _call, _call$self, _getSelf2, _getSelf2$self, _getSelf3, _getSelf3$self, _fn$Foo, _fn$Foo2, _fn$Foo3, _fnDeep$very$o, _fnDeep$very$o$Foo, _fnDeep$very$o2, _fnDeep$very$o2$Foo, _fnDeep$very$o3, _fnDeep$very$o3$Foo, _classStaticPrivateFi6, _classStaticPrivateFi7, _ref7, _ref7$self, _ref8, _ref8$self, _self3, _self3$self, _classStaticPrivateFi8, _classStaticPrivateFi9, _ref9, _ref9$call, _ref10, _ref10$getSelf, _getSelf4, _ref11, _getSelf4$call, _ref12, _ref12$self, _classStaticPrivateFi10, _call2, _call2$self, _getSelf5, _getSelf5$self, _getSelf6, _getSelf6$self; + var _o$Foo, _o$Foo2, _o$Foo3, _deep$very$o, _deep$very$o$Foo, _deep$very$o2, _deep$very$o2$Foo, _deep$very$o3, _deep$very$o3$Foo, _babelHelpers$classSt, _babelHelpers$classSt2, _ref, _ref$self, _ref2, _ref2$self, _self2, _self2$self, _babelHelpers$classSt3, _babelHelpers$classSt4, _ref3, _ref3$call, _ref4, _ref4$getSelf, _getSelf, _ref5, _getSelf$call, _ref6, _ref6$self, _babelHelpers$classSt5, _call, _call$self, _getSelf2, _getSelf2$self, _getSelf3, _getSelf3$self, _fn$Foo, _fn$Foo2, _fn$Foo3, _fnDeep$very$o, _fnDeep$very$o$Foo, _fnDeep$very$o2, _fnDeep$very$o2$Foo, _fnDeep$very$o3, _fnDeep$very$o3$Foo, _babelHelpers$classSt6, _babelHelpers$classSt7, _ref7, _ref7$self, _ref8, _ref8$self, _self3, _self3$self, _babelHelpers$classSt8, _babelHelpers$classSt9, _ref9, _ref9$call, _ref10, _ref10$getSelf, _getSelf4, _ref11, _getSelf4$call, _ref12, _ref12$self, _babelHelpers$classSt10, _call2, _call2$self, _getSelf5, _getSelf5$self, _getSelf6, _getSelf6$self; const o = { Foo: Foo @@ -27,44 +23,44 @@ class Foo { return deep; } - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo = o.Foo, Foo, _m).call(_o$Foo); - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo2 = o.Foo, Foo, _m).call(_o$Foo2).toString; - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo3 = o.Foo, Foo, _m).call(_o$Foo3).toString(); - (_deep$very$o = deep?.very.o) === null || _deep$very$o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o$Foo = _deep$very$o.Foo, Foo, _m).call(_deep$very$o$Foo); - (_deep$very$o2 = deep?.very.o) === null || _deep$very$o2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o2$Foo = _deep$very$o2.Foo, Foo, _m).call(_deep$very$o2$Foo).toString; - (_deep$very$o3 = deep?.very.o) === null || _deep$very$o3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o3$Foo = _deep$very$o3.Foo, Foo, _m).call(_deep$very$o3$Foo).toString(); - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self), Foo, _m).call(_classStaticPrivateFi); - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi2 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self, Foo, _m).call(_classStaticPrivateFi2); - (_ref = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref$self = _ref.self, Foo, _m).call(_ref$self); - (_ref2 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) === null || _ref2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref2$self = _ref2.self, Foo, _m).call(_ref2$self); - (_self2 = (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.self) === null || _self2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self2$self = _self2.self, Foo, _m).call(_self2$self); - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi3 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf(), Foo, _m).call(_classStaticPrivateFi3); - (_ref3 = o === null || o === void 0 ? void 0 : (_classStaticPrivateFi4 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref3$call = _ref3.call(_classStaticPrivateFi4), Foo, _m).call(_ref3$call); - (_ref4 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref4 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref4$getSelf = _ref4.getSelf(), Foo, _m).call(_ref4$getSelf); - (_getSelf = (_ref5 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf) === null || _getSelf === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf$call = _getSelf.call(_ref5), Foo, _m).call(_getSelf$call); - (_ref6 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) === null || _ref6 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref6$self = _ref6.self, Foo, _m).call(_ref6$self); - (_call = (o === null || o === void 0 ? void 0 : (_classStaticPrivateFi5 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf)?.call(_classStaticPrivateFi5)) === null || _call === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_call$self = _call.self, Foo, _m).call(_call$self); - (_getSelf2 = (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf()) === null || _getSelf2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf2$self = _getSelf2.self, Foo, _m).call(_getSelf2$self); - (_getSelf3 = (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf?.()) === null || _getSelf3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf3$self = _getSelf3.self, Foo, _m).call(_getSelf3$self); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fn$Foo = fn().Foo, Foo, _m).call(_fn$Foo); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fn$Foo2 = fn().Foo, Foo, _m).call(_fn$Foo2).toString; - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fn$Foo3 = fn().Foo, Foo, _m).call(_fn$Foo3).toString(); - (_fnDeep$very$o = fnDeep?.().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo = _fnDeep$very$o.Foo, Foo, _m).call(_fnDeep$very$o$Foo); - (_fnDeep$very$o2 = fnDeep?.().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o2$Foo = _fnDeep$very$o2.Foo, Foo, _m).call(_fnDeep$very$o2$Foo).toString; - (_fnDeep$very$o3 = fnDeep?.().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o3$Foo = _fnDeep$very$o3.Foo, Foo, _m).call(_fnDeep$very$o3$Foo).toString(); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi6 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self), Foo, _m).call(_classStaticPrivateFi6); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi7 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self, Foo, _m).call(_classStaticPrivateFi7); - (_ref7 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref7 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref7$self = _ref7.self, Foo, _m).call(_ref7$self); - (_ref8 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) === null || _ref8 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref8$self = _ref8.self, Foo, _m).call(_ref8$self); - (_self3 = (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.self) === null || _self3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self3$self = _self3.self, Foo, _m).call(_self3$self); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi8 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf(), Foo, _m).call(_classStaticPrivateFi8); - (_ref9 = fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi9 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref9 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref9$call = _ref9.call(_classStaticPrivateFi9), Foo, _m).call(_ref9$call); - (_ref10 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref10 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref10$getSelf = _ref10.getSelf(), Foo, _m).call(_ref10$getSelf); - (_getSelf4 = (_ref11 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf) === null || _getSelf4 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf4$call = _getSelf4.call(_ref11), Foo, _m).call(_getSelf4$call); - (_ref12 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) === null || _ref12 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref12$self = _ref12.self, Foo, _m).call(_ref12$self); - (_call2 = (fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi10 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf)?.call(_classStaticPrivateFi10)) === null || _call2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_call2$self = _call2.self, Foo, _m).call(_call2$self); - (_getSelf5 = (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf()) === null || _getSelf5 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf5$self = _getSelf5.self, Foo, _m).call(_getSelf5$self); - (_getSelf6 = (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf?.()) === null || _getSelf6 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf6$self = _getSelf6.self, Foo, _m).call(_getSelf6$self); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo = o.Foo, Foo, _m).call(_o$Foo); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo2 = o.Foo, Foo, _m).call(_o$Foo2).toString; + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo3 = o.Foo, Foo, _m).call(_o$Foo3).toString(); + (_deep$very$o = deep?.very.o) === null || _deep$very$o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o$Foo = _deep$very$o.Foo, Foo, _m).call(_deep$very$o$Foo); + (_deep$very$o2 = deep?.very.o) === null || _deep$very$o2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o2$Foo = _deep$very$o2.Foo, Foo, _m).call(_deep$very$o2$Foo).toString; + (_deep$very$o3 = deep?.very.o) === null || _deep$very$o3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o3$Foo = _deep$very$o3.Foo, Foo, _m).call(_deep$very$o3$Foo).toString(); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self), Foo, _m).call(_babelHelpers$classSt); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt2 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self, Foo, _m).call(_babelHelpers$classSt2); + (_ref = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref$self = _ref.self, Foo, _m).call(_ref$self); + (_ref2 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) === null || _ref2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref2$self = _ref2.self, Foo, _m).call(_ref2$self); + (_self2 = (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.self) === null || _self2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self2$self = _self2.self, Foo, _m).call(_self2$self); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt3 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf(), Foo, _m).call(_babelHelpers$classSt3); + (_ref3 = o === null || o === void 0 ? void 0 : (_babelHelpers$classSt4 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref3$call = _ref3.call(_babelHelpers$classSt4), Foo, _m).call(_ref3$call); + (_ref4 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref4 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref4$getSelf = _ref4.getSelf(), Foo, _m).call(_ref4$getSelf); + (_getSelf = (_ref5 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf) === null || _getSelf === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf$call = _getSelf.call(_ref5), Foo, _m).call(_getSelf$call); + (_ref6 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) === null || _ref6 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref6$self = _ref6.self, Foo, _m).call(_ref6$self); + (_call = (o === null || o === void 0 ? void 0 : (_babelHelpers$classSt5 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf)?.call(_babelHelpers$classSt5)) === null || _call === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call$self = _call.self, Foo, _m).call(_call$self); + (_getSelf2 = (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf()) === null || _getSelf2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf2$self = _getSelf2.self, Foo, _m).call(_getSelf2$self); + (_getSelf3 = (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf?.()) === null || _getSelf3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf3$self = _getSelf3.self, Foo, _m).call(_getSelf3$self); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo = fn().Foo, Foo, _m).call(_fn$Foo); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo2 = fn().Foo, Foo, _m).call(_fn$Foo2).toString; + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo3 = fn().Foo, Foo, _m).call(_fn$Foo3).toString(); + (_fnDeep$very$o = fnDeep?.().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo = _fnDeep$very$o.Foo, Foo, _m).call(_fnDeep$very$o$Foo); + (_fnDeep$very$o2 = fnDeep?.().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o2$Foo = _fnDeep$very$o2.Foo, Foo, _m).call(_fnDeep$very$o2$Foo).toString; + (_fnDeep$very$o3 = fnDeep?.().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o3$Foo = _fnDeep$very$o3.Foo, Foo, _m).call(_fnDeep$very$o3$Foo).toString(); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt6 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self), Foo, _m).call(_babelHelpers$classSt6); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt7 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self, Foo, _m).call(_babelHelpers$classSt7); + (_ref7 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref7 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref7$self = _ref7.self, Foo, _m).call(_ref7$self); + (_ref8 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) === null || _ref8 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref8$self = _ref8.self, Foo, _m).call(_ref8$self); + (_self3 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.self) === null || _self3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self3$self = _self3.self, Foo, _m).call(_self3$self); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt8 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf(), Foo, _m).call(_babelHelpers$classSt8); + (_ref9 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt9 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref9 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref9$call = _ref9.call(_babelHelpers$classSt9), Foo, _m).call(_ref9$call); + (_ref10 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref10 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref10$getSelf = _ref10.getSelf(), Foo, _m).call(_ref10$getSelf); + (_getSelf4 = (_ref11 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf) === null || _getSelf4 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf4$call = _getSelf4.call(_ref11), Foo, _m).call(_getSelf4$call); + (_ref12 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) === null || _ref12 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref12$self = _ref12.self, Foo, _m).call(_ref12$self); + (_call2 = (fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt10 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf)?.call(_babelHelpers$classSt10)) === null || _call2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call2$self = _call2.self, Foo, _m).call(_call2$self); + (_getSelf5 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf()) === null || _getSelf5 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf5$self = _getSelf5.self, Foo, _m).call(_getSelf5$self); + (_getSelf6 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf?.()) === null || _getSelf6 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf6$self = _getSelf6.self, Foo, _m).call(_getSelf6$self); } } @@ -76,14 +72,12 @@ var _x = { var _m = { writable: true, value: function () { - return _classStaticPrivateFieldSpecGet(this, Foo, _x); + return babelHelpers.classStaticPrivateFieldSpecGet(this, Foo, _x); } }; var _self = { writable: true, value: Foo }; - -_defineProperty(Foo, "self", Foo); - +babelHelpers.defineProperty(Foo, "self", Foo); Foo.test(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-before-property-with-transform/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-before-property-with-transform/output.js index 1f754b0750..6ab45ea5c9 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-before-property-with-transform/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-before-property-with-transform/output.js @@ -1,14 +1,10 @@ -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _classStaticPrivateFieldSpecGet(receiver, classConstructor, descriptor) { if (receiver !== classConstructor) { throw new TypeError("Private static access of wrong provenance"); } if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; } - class Foo { static getSelf() { return this; } static test() { - var _deep$very$o, _deep$very$o2, _deep$very$o3, _ref, _ref2, _self2, _classStaticPrivateFi, _ref3, _ref4, _getSelf, _ref5, _ref6, _classStaticPrivateFi2, _call, _getSelf2, _getSelf3, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _ref7, _ref8, _self3, _classStaticPrivateFi3, _ref9, _ref10, _getSelf4, _ref11, _ref12, _classStaticPrivateFi4, _call2, _getSelf5, _getSelf6, _ref13, _ref14, _ref15, _ref16, _ref17, _ref17$getSelf, _ref18, _ref19, _ref20, _ref21, _ref22, _ref22$getSelf; + var _deep$very$o, _deep$very$o2, _deep$very$o3, _ref, _ref2, _self2, _babelHelpers$classSt, _ref3, _ref4, _getSelf, _ref5, _ref6, _babelHelpers$classSt2, _call, _getSelf2, _getSelf3, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _ref7, _ref8, _self3, _babelHelpers$classSt3, _ref9, _ref10, _getSelf4, _ref11, _ref12, _babelHelpers$classSt4, _call2, _getSelf5, _getSelf6, _ref13, _ref14, _ref15, _ref16, _ref17, _ref17$getSelf, _ref18, _ref19, _ref20, _ref21, _ref22, _ref22$getSelf; const o = { Foo: Foo @@ -27,44 +23,44 @@ class Foo { return deep; } - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _x); - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _x).toString; - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _x).toString(); - (_deep$very$o = deep === null || deep === void 0 ? void 0 : deep.very.o) === null || _deep$very$o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o.Foo, Foo, _x); - (_deep$very$o2 = deep === null || deep === void 0 ? void 0 : deep.very.o) === null || _deep$very$o2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o2.Foo, Foo, _x).toString; - (_deep$very$o3 = deep === null || deep === void 0 ? void 0 : deep.very.o) === null || _deep$very$o3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o3.Foo, Foo, _x).toString(); - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFieldSpecGet(o.Foo, Foo, _self), Foo, _x); - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self, Foo, _x); - (_ref = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref.self, Foo, _x); - (_ref2 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) === null || _ref2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref2.self, Foo, _x); - (_self2 = (_ref13 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref13 === void 0 ? void 0 : _ref13.self) === null || _self2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self2.self, Foo, _x); - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf(), Foo, _x); - (_ref3 = o === null || o === void 0 ? void 0 : (_classStaticPrivateFi = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref3.call(_classStaticPrivateFi), Foo, _x); - (_ref4 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref4 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref4.getSelf(), Foo, _x); - (_getSelf = (_ref14 = _ref5 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref14 === void 0 ? void 0 : _ref14.getSelf) === null || _getSelf === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf.call(_ref5), Foo, _x); - (_ref6 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) === null || _ref6 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref6.self, Foo, _x); - (_call = (_ref15 = o === null || o === void 0 ? void 0 : (_classStaticPrivateFi2 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref15 === void 0 ? void 0 : _ref15.call(_classStaticPrivateFi2)) === null || _call === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_call.self, Foo, _x); - (_getSelf2 = (_ref16 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref16 === void 0 ? void 0 : _ref16.getSelf()) === null || _getSelf2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf2.self, Foo, _x); - (_getSelf3 = (_ref17 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref17 === void 0 ? void 0 : (_ref17$getSelf = _ref17.getSelf) === null || _ref17$getSelf === void 0 ? void 0 : _ref17$getSelf.call(_ref17)) === null || _getSelf3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf3.self, Foo, _x); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _x); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _x).toString; - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _x).toString(); - (_fnDeep$very$o = fnDeep === null || fnDeep === void 0 ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o.Foo, Foo, _x); - (_fnDeep$very$o2 = fnDeep === null || fnDeep === void 0 ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o2.Foo, Foo, _x).toString; - (_fnDeep$very$o3 = fnDeep === null || fnDeep === void 0 ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o3.Foo, Foo, _x).toString(); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self), Foo, _x); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self, Foo, _x); - (_ref7 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref7 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref7.self, Foo, _x); - (_ref8 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) === null || _ref8 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref8.self, Foo, _x); - (_self3 = (_ref18 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref18 === void 0 ? void 0 : _ref18.self) === null || _self3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self3.self, Foo, _x); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf(), Foo, _x); - (_ref9 = fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi3 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref9 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref9.call(_classStaticPrivateFi3), Foo, _x); - (_ref10 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref10 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref10.getSelf(), Foo, _x); - (_getSelf4 = (_ref19 = _ref11 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref19 === void 0 ? void 0 : _ref19.getSelf) === null || _getSelf4 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf4.call(_ref11), Foo, _x); - (_ref12 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) === null || _ref12 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref12.self, Foo, _x); - (_call2 = (_ref20 = fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi4 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref20 === void 0 ? void 0 : _ref20.call(_classStaticPrivateFi4)) === null || _call2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_call2.self, Foo, _x); - (_getSelf5 = (_ref21 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref21 === void 0 ? void 0 : _ref21.getSelf()) === null || _getSelf5 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf5.self, Foo, _x); - (_getSelf6 = (_ref22 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref22 === void 0 ? void 0 : (_ref22$getSelf = _ref22.getSelf) === null || _ref22$getSelf === void 0 ? void 0 : _ref22$getSelf.call(_ref22)) === null || _getSelf6 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf6.self, Foo, _x); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _x); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _x).toString; + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _x).toString(); + (_deep$very$o = deep === null || deep === void 0 ? void 0 : deep.very.o) === null || _deep$very$o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o.Foo, Foo, _x); + (_deep$very$o2 = deep === null || deep === void 0 ? void 0 : deep.very.o) === null || _deep$very$o2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o2.Foo, Foo, _x).toString; + (_deep$very$o3 = deep === null || deep === void 0 ? void 0 : deep.very.o) === null || _deep$very$o3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o3.Foo, Foo, _x).toString(); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self), Foo, _x); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self, Foo, _x); + (_ref = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref.self, Foo, _x); + (_ref2 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) === null || _ref2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref2.self, Foo, _x); + (_self2 = (_ref13 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref13 === void 0 ? void 0 : _ref13.self) === null || _self2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self2.self, Foo, _x); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf(), Foo, _x); + (_ref3 = o === null || o === void 0 ? void 0 : (_babelHelpers$classSt = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref3.call(_babelHelpers$classSt), Foo, _x); + (_ref4 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref4 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref4.getSelf(), Foo, _x); + (_getSelf = (_ref14 = _ref5 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref14 === void 0 ? void 0 : _ref14.getSelf) === null || _getSelf === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf.call(_ref5), Foo, _x); + (_ref6 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) === null || _ref6 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref6.self, Foo, _x); + (_call = (_ref15 = o === null || o === void 0 ? void 0 : (_babelHelpers$classSt2 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref15 === void 0 ? void 0 : _ref15.call(_babelHelpers$classSt2)) === null || _call === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call.self, Foo, _x); + (_getSelf2 = (_ref16 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref16 === void 0 ? void 0 : _ref16.getSelf()) === null || _getSelf2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf2.self, Foo, _x); + (_getSelf3 = (_ref17 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref17 === void 0 ? void 0 : (_ref17$getSelf = _ref17.getSelf) === null || _ref17$getSelf === void 0 ? void 0 : _ref17$getSelf.call(_ref17)) === null || _getSelf3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf3.self, Foo, _x); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _x); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _x).toString; + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _x).toString(); + (_fnDeep$very$o = fnDeep === null || fnDeep === void 0 ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o.Foo, Foo, _x); + (_fnDeep$very$o2 = fnDeep === null || fnDeep === void 0 ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o2.Foo, Foo, _x).toString; + (_fnDeep$very$o3 = fnDeep === null || fnDeep === void 0 ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o3.Foo, Foo, _x).toString(); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self), Foo, _x); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self, Foo, _x); + (_ref7 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref7 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref7.self, Foo, _x); + (_ref8 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) === null || _ref8 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref8.self, Foo, _x); + (_self3 = (_ref18 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref18 === void 0 ? void 0 : _ref18.self) === null || _self3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self3.self, Foo, _x); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf(), Foo, _x); + (_ref9 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt3 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref9 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref9.call(_babelHelpers$classSt3), Foo, _x); + (_ref10 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref10 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref10.getSelf(), Foo, _x); + (_getSelf4 = (_ref19 = _ref11 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref19 === void 0 ? void 0 : _ref19.getSelf) === null || _getSelf4 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf4.call(_ref11), Foo, _x); + (_ref12 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) === null || _ref12 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref12.self, Foo, _x); + (_call2 = (_ref20 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt4 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref20 === void 0 ? void 0 : _ref20.call(_babelHelpers$classSt4)) === null || _call2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call2.self, Foo, _x); + (_getSelf5 = (_ref21 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref21 === void 0 ? void 0 : _ref21.getSelf()) === null || _getSelf5 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf5.self, Foo, _x); + (_getSelf6 = (_ref22 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref22 === void 0 ? void 0 : (_ref22$getSelf = _ref22.getSelf) === null || _ref22$getSelf === void 0 ? void 0 : _ref22$getSelf.call(_ref22)) === null || _getSelf6 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf6.self, Foo, _x); } } @@ -77,7 +73,5 @@ var _self = { writable: true, value: Foo }; - -_defineProperty(Foo, "self", Foo); - +babelHelpers.defineProperty(Foo, "self", Foo); Foo.test(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-before-property/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-before-property/output.js index 0ba37b422f..a651462e08 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-before-property/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-before-property/output.js @@ -1,14 +1,10 @@ -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _classStaticPrivateFieldSpecGet(receiver, classConstructor, descriptor) { if (receiver !== classConstructor) { throw new TypeError("Private static access of wrong provenance"); } if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; } - class Foo { static getSelf() { return this; } static test() { - var _deep$very$o, _deep$very$o2, _deep$very$o3, _ref, _ref2, _self2, _classStaticPrivateFi, _ref3, _ref4, _getSelf, _ref5, _ref6, _classStaticPrivateFi2, _call, _getSelf2, _getSelf3, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _ref7, _ref8, _self3, _classStaticPrivateFi3, _ref9, _ref10, _getSelf4, _ref11, _ref12, _classStaticPrivateFi4, _call2, _getSelf5, _getSelf6; + var _deep$very$o, _deep$very$o2, _deep$very$o3, _ref, _ref2, _self2, _babelHelpers$classSt, _ref3, _ref4, _getSelf, _ref5, _ref6, _babelHelpers$classSt2, _call, _getSelf2, _getSelf3, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _ref7, _ref8, _self3, _babelHelpers$classSt3, _ref9, _ref10, _getSelf4, _ref11, _ref12, _babelHelpers$classSt4, _call2, _getSelf5, _getSelf6; const o = { Foo: Foo @@ -27,44 +23,44 @@ class Foo { return deep; } - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _x); - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _x).toString; - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _x).toString(); - (_deep$very$o = deep?.very.o) === null || _deep$very$o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o.Foo, Foo, _x); - (_deep$very$o2 = deep?.very.o) === null || _deep$very$o2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o2.Foo, Foo, _x).toString; - (_deep$very$o3 = deep?.very.o) === null || _deep$very$o3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o3.Foo, Foo, _x).toString(); - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFieldSpecGet(o.Foo, Foo, _self), Foo, _x); - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self, Foo, _x); - (_ref = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref.self, Foo, _x); - (_ref2 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) === null || _ref2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref2.self, Foo, _x); - (_self2 = (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.self) === null || _self2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self2.self, Foo, _x); - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf(), Foo, _x); - (_ref3 = o === null || o === void 0 ? void 0 : (_classStaticPrivateFi = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref3.call(_classStaticPrivateFi), Foo, _x); - (_ref4 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref4 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref4.getSelf(), Foo, _x); - (_getSelf = (_ref5 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf) === null || _getSelf === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf.call(_ref5), Foo, _x); - (_ref6 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) === null || _ref6 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref6.self, Foo, _x); - (_call = (o === null || o === void 0 ? void 0 : (_classStaticPrivateFi2 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf)?.call(_classStaticPrivateFi2)) === null || _call === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_call.self, Foo, _x); - (_getSelf2 = (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf()) === null || _getSelf2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf2.self, Foo, _x); - (_getSelf3 = (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf?.()) === null || _getSelf3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf3.self, Foo, _x); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _x); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _x).toString; - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _x).toString(); - (_fnDeep$very$o = fnDeep?.().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o.Foo, Foo, _x); - (_fnDeep$very$o2 = fnDeep?.().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o2.Foo, Foo, _x).toString; - (_fnDeep$very$o3 = fnDeep?.().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o3.Foo, Foo, _x).toString(); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self), Foo, _x); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self, Foo, _x); - (_ref7 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref7 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref7.self, Foo, _x); - (_ref8 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) === null || _ref8 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref8.self, Foo, _x); - (_self3 = (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.self) === null || _self3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self3.self, Foo, _x); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf(), Foo, _x); - (_ref9 = fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi3 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref9 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref9.call(_classStaticPrivateFi3), Foo, _x); - (_ref10 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref10 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref10.getSelf(), Foo, _x); - (_getSelf4 = (_ref11 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf) === null || _getSelf4 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf4.call(_ref11), Foo, _x); - (_ref12 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) === null || _ref12 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref12.self, Foo, _x); - (_call2 = (fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi4 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf)?.call(_classStaticPrivateFi4)) === null || _call2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_call2.self, Foo, _x); - (_getSelf5 = (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf()) === null || _getSelf5 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf5.self, Foo, _x); - (_getSelf6 = (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf?.()) === null || _getSelf6 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf6.self, Foo, _x); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _x); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _x).toString; + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _x).toString(); + (_deep$very$o = deep?.very.o) === null || _deep$very$o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o.Foo, Foo, _x); + (_deep$very$o2 = deep?.very.o) === null || _deep$very$o2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o2.Foo, Foo, _x).toString; + (_deep$very$o3 = deep?.very.o) === null || _deep$very$o3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o3.Foo, Foo, _x).toString(); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self), Foo, _x); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self, Foo, _x); + (_ref = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref.self, Foo, _x); + (_ref2 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) === null || _ref2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref2.self, Foo, _x); + (_self2 = (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.self) === null || _self2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self2.self, Foo, _x); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf(), Foo, _x); + (_ref3 = o === null || o === void 0 ? void 0 : (_babelHelpers$classSt = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref3.call(_babelHelpers$classSt), Foo, _x); + (_ref4 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref4 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref4.getSelf(), Foo, _x); + (_getSelf = (_ref5 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf) === null || _getSelf === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf.call(_ref5), Foo, _x); + (_ref6 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) === null || _ref6 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref6.self, Foo, _x); + (_call = (o === null || o === void 0 ? void 0 : (_babelHelpers$classSt2 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf)?.call(_babelHelpers$classSt2)) === null || _call === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call.self, Foo, _x); + (_getSelf2 = (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf()) === null || _getSelf2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf2.self, Foo, _x); + (_getSelf3 = (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf?.()) === null || _getSelf3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf3.self, Foo, _x); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _x); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _x).toString; + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _x).toString(); + (_fnDeep$very$o = fnDeep?.().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o.Foo, Foo, _x); + (_fnDeep$very$o2 = fnDeep?.().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o2.Foo, Foo, _x).toString; + (_fnDeep$very$o3 = fnDeep?.().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o3.Foo, Foo, _x).toString(); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self), Foo, _x); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self, Foo, _x); + (_ref7 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref7 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref7.self, Foo, _x); + (_ref8 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) === null || _ref8 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref8.self, Foo, _x); + (_self3 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.self) === null || _self3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self3.self, Foo, _x); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf(), Foo, _x); + (_ref9 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt3 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref9 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref9.call(_babelHelpers$classSt3), Foo, _x); + (_ref10 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref10 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref10.getSelf(), Foo, _x); + (_getSelf4 = (_ref11 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf) === null || _getSelf4 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf4.call(_ref11), Foo, _x); + (_ref12 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) === null || _ref12 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref12.self, Foo, _x); + (_call2 = (fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt4 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf)?.call(_babelHelpers$classSt4)) === null || _call2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call2.self, Foo, _x); + (_getSelf5 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf()) === null || _getSelf5 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf5.self, Foo, _x); + (_getSelf6 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf?.()) === null || _getSelf6 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf6.self, Foo, _x); } } @@ -77,7 +73,5 @@ var _self = { writable: true, value: Foo }; - -_defineProperty(Foo, "self", Foo); - +babelHelpers.defineProperty(Foo, "self", Foo); Foo.test(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-cast-to-boolean/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-cast-to-boolean/options.json index e7e7eecfe8..3b59e1bbfc 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-cast-to-boolean/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-cast-to-boolean/options.json @@ -1,4 +1,4 @@ { - "plugins": [["external-helpers", { "helperVersion": "7.100.0" }], "proposal-class-properties"], + "plugins": ["proposal-class-properties"], "minNodeVersion": "14.0.0" } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-delete-property-with-transform/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-delete-property-with-transform/output.js index 9770ba43cf..a81b1844ef 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-delete-property-with-transform/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-delete-property-with-transform/output.js @@ -1,12 +1,6 @@ -function _classPrivateFieldLooseBase(receiver, privateKey) { if (!Object.prototype.hasOwnProperty.call(receiver, privateKey)) { throw new TypeError("attempted to use private field on non-instance"); } return receiver; } +var _x = babelHelpers.classPrivateFieldLooseKey("x"); -var id = 0; - -function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; } - -var _x = _classPrivateFieldLooseKey("x"); - -var _self = _classPrivateFieldLooseKey("self"); +var _self = babelHelpers.classPrivateFieldLooseKey("self"); class Foo { static getSelf() { @@ -14,7 +8,7 @@ class Foo { } static test() { - var _deep$very$o, _classPrivateFieldLoo, _classPrivateFieldLoo2, _fnDeep$very$o, _classPrivateFieldLoo3, _classPrivateFieldLoo4, _ref, _ref2, _ref3, _ref3$self, _ref4, _ref5, _ref6, _ref7, _ref8, _ref8$call, _ref9, _ref9$getSelf, _ref10, _ref10$getSelf, _ref11, _ref12, _ref13, _ref13$self, _ref14, _ref15, _ref16, _ref17, _ref18, _ref18$call, _ref19, _ref19$getSelf, _ref20, _ref20$getSelf; + var _deep$very$o, _babelHelpers$classPr, _babelHelpers$classPr2, _fnDeep$very$o, _babelHelpers$classPr3, _babelHelpers$classPr4, _ref, _ref2, _ref3, _ref3$self, _ref4, _ref5, _ref6, _ref7, _ref8, _ref8$call, _ref9, _ref9$getSelf, _ref10, _ref10$getSelf, _ref11, _ref12, _ref13, _ref13$self, _ref14, _ref15, _ref16, _ref17, _ref18, _ref18$call, _ref19, _ref19$getSelf, _ref20, _ref20$getSelf; const o = { Foo: Foo @@ -33,36 +27,36 @@ class Foo { return deep; } - Foo === null || Foo === void 0 ? true : delete _classPrivateFieldLooseBase(Foo, _self)[_self].unicorn; - (_deep$very$o = deep == null ? void 0 : deep.very.o) === null || _deep$very$o === void 0 ? true : delete _classPrivateFieldLooseBase(_deep$very$o.Foo, _self)[_self].unicorn; - o === null || o === void 0 ? true : delete _classPrivateFieldLooseBase(o.Foo, _self)[_self].unicorn; - o === null || o === void 0 ? true : delete _classPrivateFieldLooseBase(o.Foo, _self)[_self].self.unicorn; - (_ref = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? true : delete _ref.self.unicorn; - (_ref2 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].self) == null ? true : delete _ref2.self.unicorn; - (_ref3 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? true : (_ref3$self = _ref3.self) == null ? true : delete _ref3$self.self.unicorn; - o === null || o === void 0 ? true : delete _classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf().unicorn; - (_ref4 = o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) == null ? true : delete _ref4.call(_classPrivateFieldLoo).unicorn; - (_ref5 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? true : delete _ref5.getSelf().unicorn; - (_ref6 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? true : _ref6.getSelf == null ? true : delete _ref6.getSelf().unicorn; - (_ref7 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) == null ? true : delete _ref7.self.unicorn; - (_ref8 = o === null || o === void 0 ? void 0 : (_classPrivateFieldLoo2 = _classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) == null ? true : (_ref8$call = _ref8.call(_classPrivateFieldLoo2)) == null ? true : delete _ref8$call.self.unicorn; - (_ref9 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? true : (_ref9$getSelf = _ref9.getSelf()) == null ? true : delete _ref9$getSelf.self.unicorn; - (_ref10 = o === null || o === void 0 ? void 0 : _classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? true : _ref10.getSelf == null ? true : (_ref10$getSelf = _ref10.getSelf()) == null ? true : delete _ref10$getSelf.self.unicorn; - fn === null || fn === void 0 ? true : delete _classPrivateFieldLooseBase(fn().Foo, _self)[_self].unicorn; - (_fnDeep$very$o = fnDeep == null ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o === void 0 ? true : delete _classPrivateFieldLooseBase(_fnDeep$very$o.Foo, _self)[_self].unicorn; - fn === null || fn === void 0 ? true : delete _classPrivateFieldLooseBase(fn().Foo, _self)[_self].unicorn; - fn === null || fn === void 0 ? true : delete _classPrivateFieldLooseBase(fn().Foo, _self)[_self].self.unicorn; - (_ref11 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? true : delete _ref11.self.unicorn; - (_ref12 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) == null ? true : delete _ref12.self.unicorn; - (_ref13 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? true : (_ref13$self = _ref13.self) == null ? true : delete _ref13$self.self.unicorn; - fn === null || fn === void 0 ? true : delete _classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf().unicorn; - (_ref14 = fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo3 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) == null ? true : delete _ref14.call(_classPrivateFieldLoo3).unicorn; - (_ref15 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? true : delete _ref15.getSelf().unicorn; - (_ref16 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? true : _ref16.getSelf == null ? true : delete _ref16.getSelf().unicorn; - (_ref17 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) == null ? true : delete _ref17.self.unicorn; - (_ref18 = fn === null || fn === void 0 ? void 0 : (_classPrivateFieldLoo4 = _classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) == null ? true : (_ref18$call = _ref18.call(_classPrivateFieldLoo4)) == null ? true : delete _ref18$call.self.unicorn; - (_ref19 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? true : (_ref19$getSelf = _ref19.getSelf()) == null ? true : delete _ref19$getSelf.self.unicorn; - (_ref20 = fn === null || fn === void 0 ? void 0 : _classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? true : _ref20.getSelf == null ? true : (_ref20$getSelf = _ref20.getSelf()) == null ? true : delete _ref20$getSelf.self.unicorn; + Foo === null || Foo === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(Foo, _self)[_self].unicorn; + (_deep$very$o = deep == null ? void 0 : deep.very.o) === null || _deep$very$o === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(_deep$very$o.Foo, _self)[_self].unicorn; + o === null || o === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].unicorn; + o === null || o === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self.unicorn; + (_ref = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? true : delete _ref.self.unicorn; + (_ref2 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].self) == null ? true : delete _ref2.self.unicorn; + (_ref3 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? true : (_ref3$self = _ref3.self) == null ? true : delete _ref3$self.self.unicorn; + o === null || o === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf().unicorn; + (_ref4 = o === null || o === void 0 ? void 0 : (_babelHelpers$classPr = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) == null ? true : delete _ref4.call(_babelHelpers$classPr).unicorn; + (_ref5 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? true : delete _ref5.getSelf().unicorn; + (_ref6 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? true : _ref6.getSelf == null ? true : delete _ref6.getSelf().unicorn; + (_ref7 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self].getSelf()) == null ? true : delete _ref7.self.unicorn; + (_ref8 = o === null || o === void 0 ? void 0 : (_babelHelpers$classPr2 = babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]).getSelf) == null ? true : (_ref8$call = _ref8.call(_babelHelpers$classPr2)) == null ? true : delete _ref8$call.self.unicorn; + (_ref9 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? true : (_ref9$getSelf = _ref9.getSelf()) == null ? true : delete _ref9$getSelf.self.unicorn; + (_ref10 = o === null || o === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(o.Foo, _self)[_self]) == null ? true : _ref10.getSelf == null ? true : (_ref10$getSelf = _ref10.getSelf()) == null ? true : delete _ref10$getSelf.self.unicorn; + fn === null || fn === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].unicorn; + (_fnDeep$very$o = fnDeep == null ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(_fnDeep$very$o.Foo, _self)[_self].unicorn; + fn === null || fn === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].unicorn; + fn === null || fn === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self.unicorn; + (_ref11 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? true : delete _ref11.self.unicorn; + (_ref12 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].self) == null ? true : delete _ref12.self.unicorn; + (_ref13 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? true : (_ref13$self = _ref13.self) == null ? true : delete _ref13$self.self.unicorn; + fn === null || fn === void 0 ? true : delete babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf().unicorn; + (_ref14 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr3 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) == null ? true : delete _ref14.call(_babelHelpers$classPr3).unicorn; + (_ref15 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? true : delete _ref15.getSelf().unicorn; + (_ref16 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? true : _ref16.getSelf == null ? true : delete _ref16.getSelf().unicorn; + (_ref17 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self].getSelf()) == null ? true : delete _ref17.self.unicorn; + (_ref18 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classPr4 = babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]).getSelf) == null ? true : (_ref18$call = _ref18.call(_babelHelpers$classPr4)) == null ? true : delete _ref18$call.self.unicorn; + (_ref19 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? true : (_ref19$getSelf = _ref19.getSelf()) == null ? true : delete _ref19$getSelf.self.unicorn; + (_ref20 = fn === null || fn === void 0 ? void 0 : babelHelpers.classPrivateFieldLooseBase(fn().Foo, _self)[_self]) == null ? true : _ref20.getSelf == null ? true : (_ref20$getSelf = _ref20.getSelf()) == null ? true : delete _ref20$getSelf.self.unicorn; } } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-delete-property/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-delete-property/output.js index f7a3fc21af..01fcf05036 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-delete-property/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-delete-property/output.js @@ -1,14 +1,10 @@ -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _classStaticPrivateFieldSpecGet(receiver, classConstructor, descriptor) { if (receiver !== classConstructor) { throw new TypeError("Private static access of wrong provenance"); } if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; } - class Foo { static getSelf() { return this; } static test() { - var _deep$very$o, _classStaticPrivateFi, _classStaticPrivateFi2, _fnDeep$very$o, _classStaticPrivateFi3, _classStaticPrivateFi4; + var _deep$very$o, _babelHelpers$classSt, _babelHelpers$classSt2, _fnDeep$very$o, _babelHelpers$classSt3, _babelHelpers$classSt4; const o = { Foo: Foo @@ -27,36 +23,36 @@ class Foo { return deep; } - Foo === null || Foo === void 0 ? true : delete _classStaticPrivateFieldSpecGet(Foo, Foo, _self).unicorn; - (_deep$very$o = deep?.very.o) === null || _deep$very$o === void 0 ? true : delete _classStaticPrivateFieldSpecGet(_deep$very$o.Foo, Foo, _self).unicorn; - o === null || o === void 0 ? true : delete _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).unicorn; - o === null || o === void 0 ? true : delete _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self.unicorn; - delete (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.self.unicorn; - delete (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self)?.self.unicorn; - delete (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.self?.self.unicorn; - o === null || o === void 0 ? true : delete _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf().unicorn; - delete (o === null || o === void 0 ? void 0 : (_classStaticPrivateFi = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf)?.call(_classStaticPrivateFi).unicorn; - delete (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf().unicorn; - delete (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf?.().unicorn; - delete (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf())?.self.unicorn; - delete (o === null || o === void 0 ? void 0 : (_classStaticPrivateFi2 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf)?.call(_classStaticPrivateFi2)?.self.unicorn; - delete (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf()?.self.unicorn; - delete (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf?.()?.self.unicorn; - fn === null || fn === void 0 ? true : delete _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).unicorn; - (_fnDeep$very$o = fnDeep?.().very.o) === null || _fnDeep$very$o === void 0 ? true : delete _classStaticPrivateFieldSpecGet(_fnDeep$very$o.Foo, Foo, _self).unicorn; - fn === null || fn === void 0 ? true : delete _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).unicorn; - fn === null || fn === void 0 ? true : delete _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self.unicorn; - delete (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.self.unicorn; - delete (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self)?.self.unicorn; - delete (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.self?.self.unicorn; - fn === null || fn === void 0 ? true : delete _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf().unicorn; - delete (fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi3 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf)?.call(_classStaticPrivateFi3).unicorn; - delete (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf().unicorn; - delete (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf?.().unicorn; - delete (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf())?.self.unicorn; - delete (fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi4 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf)?.call(_classStaticPrivateFi4)?.self.unicorn; - delete (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf()?.self.unicorn; - delete (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf?.()?.self.unicorn; + Foo === null || Foo === void 0 ? true : delete babelHelpers.classStaticPrivateFieldSpecGet(Foo, Foo, _self).unicorn; + (_deep$very$o = deep?.very.o) === null || _deep$very$o === void 0 ? true : delete babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o.Foo, Foo, _self).unicorn; + o === null || o === void 0 ? true : delete babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).unicorn; + o === null || o === void 0 ? true : delete babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self.unicorn; + delete (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.self.unicorn; + delete (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self)?.self.unicorn; + delete (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.self?.self.unicorn; + o === null || o === void 0 ? true : delete babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf().unicorn; + delete (o === null || o === void 0 ? void 0 : (_babelHelpers$classSt = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf)?.call(_babelHelpers$classSt).unicorn; + delete (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf().unicorn; + delete (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf?.().unicorn; + delete (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf())?.self.unicorn; + delete (o === null || o === void 0 ? void 0 : (_babelHelpers$classSt2 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf)?.call(_babelHelpers$classSt2)?.self.unicorn; + delete (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf()?.self.unicorn; + delete (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf?.()?.self.unicorn; + fn === null || fn === void 0 ? true : delete babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).unicorn; + (_fnDeep$very$o = fnDeep?.().very.o) === null || _fnDeep$very$o === void 0 ? true : delete babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o.Foo, Foo, _self).unicorn; + fn === null || fn === void 0 ? true : delete babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).unicorn; + fn === null || fn === void 0 ? true : delete babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self.unicorn; + delete (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.self.unicorn; + delete (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self)?.self.unicorn; + delete (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.self?.self.unicorn; + fn === null || fn === void 0 ? true : delete babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf().unicorn; + delete (fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt3 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf)?.call(_babelHelpers$classSt3).unicorn; + delete (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf().unicorn; + delete (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf?.().unicorn; + delete (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf())?.self.unicorn; + delete (fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt4 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf)?.call(_babelHelpers$classSt4)?.self.unicorn; + delete (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf()?.self.unicorn; + delete (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf?.()?.self.unicorn; } } @@ -69,7 +65,5 @@ var _self = { writable: true, value: Foo }; - -_defineProperty(Foo, "self", Foo); - +babelHelpers.defineProperty(Foo, "self", Foo); Foo.test(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-in-function-param-with-transform/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-in-function-param-with-transform/output.js index 1c52675c30..6b12ae2d9c 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-in-function-param-with-transform/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-in-function-param-with-transform/output.js @@ -1,7 +1,3 @@ -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _classStaticPrivateFieldSpecGet(receiver, classConstructor, descriptor) { if (receiver !== classConstructor) { throw new TypeError("Private static access of wrong provenance"); } if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; } - class Foo { static getSelf() { return this; @@ -28,7 +24,7 @@ class Foo { function f(o, r = (() => { var _o$Foo; - return o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo = o.Foo, Foo, _m).call(_o$Foo); + return o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo = o.Foo, Foo, _m).call(_o$Foo); })()) { return r; } @@ -36,7 +32,7 @@ class Foo { function g(o, r = (() => { var _ref; - return (_ref = (() => o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf(), Foo, _m))()) === null || _ref === void 0 ? void 0 : _ref(); + return (_ref = (() => o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf(), Foo, _m))()) === null || _ref === void 0 ? void 0 : _ref(); })()) { return r; } @@ -44,7 +40,7 @@ class Foo { function h(fnDeep, r = (() => { var _fnDeep$very$o$Foo, _fnDeep$very$o; - return (_fnDeep$very$o$Foo = fnDeep === null || fnDeep === void 0 ? void 0 : (_fnDeep$very$o = fnDeep().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : _fnDeep$very$o.Foo) === null || _fnDeep$very$o$Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo, Foo, _m).call(_fnDeep$very$o$Foo); + return (_fnDeep$very$o$Foo = fnDeep === null || fnDeep === void 0 ? void 0 : (_fnDeep$very$o = fnDeep().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : _fnDeep$very$o.Foo) === null || _fnDeep$very$o$Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo, Foo, _m).call(_fnDeep$very$o$Foo); })()) { return r; } @@ -52,15 +48,15 @@ class Foo { function i(fn, r = (() => { var _getSelf, _getSelf$self, _ref2; - return (_getSelf = (_ref2 = (() => fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))()) === null || _ref2 === void 0 ? void 0 : _ref2.getSelf()) === null || _getSelf === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf$self = _getSelf.self, Foo, _m).call(_getSelf$self); + return (_getSelf = (_ref2 = (() => fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))()) === null || _ref2 === void 0 ? void 0 : _ref2.getSelf()) === null || _getSelf === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf$self = _getSelf.self, Foo, _m).call(_getSelf$self); })()) { return r; } function j(fn, r = (() => { - var _classStaticPrivateFi, _classStaticPrivateFi2; + var _babelHelpers$classSt, _babelHelpers$classSt2; - return (_classStaticPrivateFi2 = _classStaticPrivateFieldSpecGet(_classStaticPrivateFi = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf().self, Foo, _m)) === null || _classStaticPrivateFi2 === void 0 ? void 0 : _classStaticPrivateFi2.call(_classStaticPrivateFi); + return (_babelHelpers$classSt2 = babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf().self, Foo, _m)) === null || _babelHelpers$classSt2 === void 0 ? void 0 : _babelHelpers$classSt2.call(_babelHelpers$classSt); })()) { return r; } @@ -81,14 +77,12 @@ var _x = { var _m = { writable: true, value: function () { - return _classStaticPrivateFieldSpecGet(this, Foo, _x); + return babelHelpers.classStaticPrivateFieldSpecGet(this, Foo, _x); } }; var _self = { writable: true, value: Foo }; - -_defineProperty(Foo, "self", Foo); - +babelHelpers.defineProperty(Foo, "self", Foo); Foo.test(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-in-function-param/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-in-function-param/output.js index 782d93a579..776e8ccc78 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-in-function-param/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-in-function-param/output.js @@ -1,7 +1,3 @@ -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _classStaticPrivateFieldSpecGet(receiver, classConstructor, descriptor) { if (receiver !== classConstructor) { throw new TypeError("Private static access of wrong provenance"); } if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; } - class Foo { static getSelf() { return this; @@ -28,19 +24,19 @@ class Foo { function f(o, r = (() => { var _o$Foo; - return o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo = o.Foo, Foo, _m).call(_o$Foo); + return o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo = o.Foo, Foo, _m).call(_o$Foo); })()) { return r; } - function g(o, r = (() => o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf(), Foo, _m))()?.()) { + function g(o, r = (() => o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf(), Foo, _m))()?.()) { return r; } function h(fnDeep, r = (() => { var _fnDeep$very$o$Foo; - return (_fnDeep$very$o$Foo = fnDeep?.().very.o?.Foo) === null || _fnDeep$very$o$Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo, Foo, _m).call(_fnDeep$very$o$Foo); + return (_fnDeep$very$o$Foo = fnDeep?.().very.o?.Foo) === null || _fnDeep$very$o$Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo, Foo, _m).call(_fnDeep$very$o$Foo); })()) { return r; } @@ -48,15 +44,15 @@ class Foo { function i(fn, r = (() => { var _getSelf, _getSelf$self; - return (_getSelf = (() => fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))()?.getSelf()) === null || _getSelf === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf$self = _getSelf.self, Foo, _m).call(_getSelf$self); + return (_getSelf = (() => fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))()?.getSelf()) === null || _getSelf === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf$self = _getSelf.self, Foo, _m).call(_getSelf$self); })()) { return r; } function j(fn, r = (() => { - var _classStaticPrivateFi; + var _babelHelpers$classSt; - return _classStaticPrivateFieldSpecGet(_classStaticPrivateFi = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf().self, Foo, _m)?.call(_classStaticPrivateFi); + return babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf().self, Foo, _m)?.call(_babelHelpers$classSt); })()) { return r; } @@ -77,14 +73,12 @@ var _x = { var _m = { writable: true, value: function () { - return _classStaticPrivateFieldSpecGet(this, Foo, _x); + return babelHelpers.classStaticPrivateFieldSpecGet(this, Foo, _x); } }; var _self = { writable: true, value: Foo }; - -_defineProperty(Foo, "self", Foo); - +babelHelpers.defineProperty(Foo, "self", Foo); Foo.test(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-member-optional-call-spread-arguments/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-member-optional-call-spread-arguments/output.js index d3912187f4..f9d16a2b45 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-member-optional-call-spread-arguments/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-member-optional-call-spread-arguments/output.js @@ -1,7 +1,3 @@ -function _classPrivateFieldGet(receiver, privateMap) { var descriptor = privateMap.get(receiver); if (!descriptor) { throw new TypeError("attempted to get private field on non-instance"); } if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; } - -function _classPrivateFieldSet(receiver, privateMap, value) { var descriptor = privateMap.get(receiver); if (!descriptor) { throw new TypeError("attempted to set private field on non-instance"); } if (descriptor.set) { descriptor.set.call(receiver, value); } else { if (!descriptor.writable) { throw new TypeError("attempted to set read only private field"); } descriptor.value = value; } return value; } - var _m = new WeakMap(); class Foo { @@ -13,18 +9,18 @@ class Foo { } init() { - _classPrivateFieldSet(this, _m, (...args) => args); + babelHelpers.classPrivateFieldSet(this, _m, (...args) => args); } static test() { const f = new Foo(); f.init(); - return _classPrivateFieldGet(f, _m)?.apply(f, arguments); + return babelHelpers.classPrivateFieldGet(f, _m)?.apply(f, arguments); } static testNull() { const f = new Foo(); - return _classPrivateFieldGet(f, _m)?.apply(f, arguments); + return babelHelpers.classPrivateFieldGet(f, _m)?.apply(f, arguments); } } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-member-optional-call-with-transform/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-member-optional-call-with-transform/output.js index 349cb4e9e2..4c9575d8b1 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-member-optional-call-with-transform/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-member-optional-call-with-transform/output.js @@ -1,14 +1,10 @@ -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _classStaticPrivateFieldSpecGet(receiver, classConstructor, descriptor) { if (receiver !== classConstructor) { throw new TypeError("Private static access of wrong provenance"); } if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; } - class Foo { static getSelf() { return this; } static test() { - var _o$Foo, _o$Foo2, _o$Foo3, _deep$very$o, _deep$very$o$Foo, _deep$very$o2, _deep$very$o2$Foo, _deep$very$o3, _deep$very$o3$Foo, _classStaticPrivateFi, _classStaticPrivateFi2, _ref, _ref$self, _ref2, _ref2$self, _self2, _self2$self, _classStaticPrivateFi3, _classStaticPrivateFi4, _ref3, _ref3$call, _ref4, _ref4$getSelf, _getSelf, _ref5, _getSelf$call, _ref6, _ref6$self, _classStaticPrivateFi5, _call, _call$self, _getSelf2, _getSelf2$self, _getSelf3, _getSelf3$self, _fn$Foo, _fn$Foo2, _fn$Foo3, _fnDeep$very$o, _fnDeep$very$o$Foo, _fnDeep$very$o2, _fnDeep$very$o2$Foo, _fnDeep$very$o3, _fnDeep$very$o3$Foo, _classStaticPrivateFi6, _classStaticPrivateFi7, _ref7, _ref7$self, _ref8, _ref8$self, _self3, _self3$self, _classStaticPrivateFi8, _classStaticPrivateFi9, _ref9, _ref9$call, _ref10, _ref10$getSelf, _getSelf4, _ref11, _getSelf4$call, _ref12, _ref12$self, _classStaticPrivateFi10, _call2, _call2$self, _getSelf5, _getSelf5$self, _getSelf6, _getSelf6$self, _classStaticPrivateFi11, _classStaticPrivateFi12, _classStaticPrivateFi13, _classStaticPrivateFi14, _classStaticPrivateFi15, _classStaticPrivateFi16, _classStaticPrivateFi17, _classStaticPrivateFi18, _classStaticPrivateFi19, _ref13, _ref14, _classStaticPrivateFi20, _classStaticPrivateFi21, _ref15, _classStaticPrivateFi22, _ref16, _classStaticPrivateFi23, _classStaticPrivateFi24, _ref17, _classStaticPrivateFi25, _classStaticPrivateFi26, _ref18, _classStaticPrivateFi27, _ref19, _classStaticPrivateFi28, _ref20, _ref20$getSelf, _classStaticPrivateFi29, _classStaticPrivateFi30, _classStaticPrivateFi31, _classStaticPrivateFi32, _classStaticPrivateFi33, _classStaticPrivateFi34, _classStaticPrivateFi35, _ref21, _ref22, _classStaticPrivateFi36, _classStaticPrivateFi37, _ref23, _classStaticPrivateFi38, _ref24, _classStaticPrivateFi39, _classStaticPrivateFi40, _ref25, _classStaticPrivateFi41, _classStaticPrivateFi42, _ref26, _classStaticPrivateFi43, _ref27, _classStaticPrivateFi44, _ref28, _ref28$getSelf, _classStaticPrivateFi45; + var _o$Foo, _o$Foo2, _o$Foo3, _deep$very$o, _deep$very$o$Foo, _deep$very$o2, _deep$very$o2$Foo, _deep$very$o3, _deep$very$o3$Foo, _babelHelpers$classSt, _babelHelpers$classSt2, _ref, _ref$self, _ref2, _ref2$self, _self2, _self2$self, _babelHelpers$classSt3, _babelHelpers$classSt4, _ref3, _ref3$call, _ref4, _ref4$getSelf, _getSelf, _ref5, _getSelf$call, _ref6, _ref6$self, _babelHelpers$classSt5, _call, _call$self, _getSelf2, _getSelf2$self, _getSelf3, _getSelf3$self, _fn$Foo, _fn$Foo2, _fn$Foo3, _fnDeep$very$o, _fnDeep$very$o$Foo, _fnDeep$very$o2, _fnDeep$very$o2$Foo, _fnDeep$very$o3, _fnDeep$very$o3$Foo, _babelHelpers$classSt6, _babelHelpers$classSt7, _ref7, _ref7$self, _ref8, _ref8$self, _self3, _self3$self, _babelHelpers$classSt8, _babelHelpers$classSt9, _ref9, _ref9$call, _ref10, _ref10$getSelf, _getSelf4, _ref11, _getSelf4$call, _ref12, _ref12$self, _babelHelpers$classSt10, _call2, _call2$self, _getSelf5, _getSelf5$self, _getSelf6, _getSelf6$self, _babelHelpers$classSt11, _babelHelpers$classSt12, _babelHelpers$classSt13, _babelHelpers$classSt14, _babelHelpers$classSt15, _babelHelpers$classSt16, _babelHelpers$classSt17, _babelHelpers$classSt18, _babelHelpers$classSt19, _ref13, _ref14, _babelHelpers$classSt20, _babelHelpers$classSt21, _ref15, _babelHelpers$classSt22, _ref16, _babelHelpers$classSt23, _babelHelpers$classSt24, _ref17, _babelHelpers$classSt25, _babelHelpers$classSt26, _ref18, _babelHelpers$classSt27, _ref19, _babelHelpers$classSt28, _ref20, _ref20$getSelf, _babelHelpers$classSt29, _babelHelpers$classSt30, _babelHelpers$classSt31, _babelHelpers$classSt32, _babelHelpers$classSt33, _babelHelpers$classSt34, _babelHelpers$classSt35, _ref21, _ref22, _babelHelpers$classSt36, _babelHelpers$classSt37, _ref23, _babelHelpers$classSt38, _ref24, _babelHelpers$classSt39, _babelHelpers$classSt40, _ref25, _babelHelpers$classSt41, _babelHelpers$classSt42, _ref26, _babelHelpers$classSt43, _ref27, _babelHelpers$classSt44, _ref28, _ref28$getSelf, _babelHelpers$classSt45; const o = { Foo: Foo @@ -27,47 +23,47 @@ class Foo { return deep; } - (_classStaticPrivateFi11 = _classStaticPrivateFieldSpecGet(Foo, Foo, _m)) === null || _classStaticPrivateFi11 === void 0 ? void 0 : _classStaticPrivateFi11.call(Foo); - (_classStaticPrivateFi12 = _classStaticPrivateFieldSpecGet(Foo, Foo, _m)) === null || _classStaticPrivateFi12 === void 0 ? void 0 : _classStaticPrivateFi12.call(Foo).toString; - (_classStaticPrivateFi13 = _classStaticPrivateFieldSpecGet(Foo, Foo, _m)) === null || _classStaticPrivateFi13 === void 0 ? void 0 : _classStaticPrivateFi13.call(Foo).toString(); - o === null || o === void 0 ? void 0 : (_classStaticPrivateFi14 = _classStaticPrivateFieldSpecGet(_o$Foo = o.Foo, Foo, _m)) === null || _classStaticPrivateFi14 === void 0 ? void 0 : _classStaticPrivateFi14.call(_o$Foo); - o === null || o === void 0 ? void 0 : (_classStaticPrivateFi15 = _classStaticPrivateFieldSpecGet(_o$Foo2 = o.Foo, Foo, _m)) === null || _classStaticPrivateFi15 === void 0 ? void 0 : _classStaticPrivateFi15.call(_o$Foo2).toString; - o === null || o === void 0 ? void 0 : (_classStaticPrivateFi16 = _classStaticPrivateFieldSpecGet(_o$Foo3 = o.Foo, Foo, _m)) === null || _classStaticPrivateFi16 === void 0 ? void 0 : _classStaticPrivateFi16.call(_o$Foo3).toString(); - (_deep$very$o = deep === null || deep === void 0 ? void 0 : deep.very.o) === null || _deep$very$o === void 0 ? void 0 : (_classStaticPrivateFi17 = _classStaticPrivateFieldSpecGet(_deep$very$o$Foo = _deep$very$o.Foo, Foo, _m)) === null || _classStaticPrivateFi17 === void 0 ? void 0 : _classStaticPrivateFi17.call(_deep$very$o$Foo); - (_deep$very$o2 = deep === null || deep === void 0 ? void 0 : deep.very.o) === null || _deep$very$o2 === void 0 ? void 0 : (_classStaticPrivateFi18 = _classStaticPrivateFieldSpecGet(_deep$very$o2$Foo = _deep$very$o2.Foo, Foo, _m)) === null || _classStaticPrivateFi18 === void 0 ? void 0 : _classStaticPrivateFi18.call(_deep$very$o2$Foo).toString; - (_deep$very$o3 = deep === null || deep === void 0 ? void 0 : deep.very.o) === null || _deep$very$o3 === void 0 ? void 0 : (_classStaticPrivateFi19 = _classStaticPrivateFieldSpecGet(_deep$very$o3$Foo = _deep$very$o3.Foo, Foo, _m)) === null || _classStaticPrivateFi19 === void 0 ? void 0 : _classStaticPrivateFi19.call(_deep$very$o3$Foo).toString(); - (_ref13 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self), Foo, _m)) === null || _ref13 === void 0 ? void 0 : _ref13.call(_classStaticPrivateFi); - (_ref14 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi2 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self, Foo, _m)) === null || _ref14 === void 0 ? void 0 : _ref14.call(_classStaticPrivateFi2); - (_ref = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref === void 0 ? void 0 : (_classStaticPrivateFi20 = _classStaticPrivateFieldSpecGet(_ref$self = _ref.self, Foo, _m)) === null || _classStaticPrivateFi20 === void 0 ? void 0 : _classStaticPrivateFi20.call(_ref$self); - (_ref2 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) === null || _ref2 === void 0 ? void 0 : (_classStaticPrivateFi21 = _classStaticPrivateFieldSpecGet(_ref2$self = _ref2.self, Foo, _m)) === null || _classStaticPrivateFi21 === void 0 ? void 0 : _classStaticPrivateFi21.call(_ref2$self); - (_self2 = (_ref15 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref15 === void 0 ? void 0 : _ref15.self) === null || _self2 === void 0 ? void 0 : (_classStaticPrivateFi22 = _classStaticPrivateFieldSpecGet(_self2$self = _self2.self, Foo, _m)) === null || _classStaticPrivateFi22 === void 0 ? void 0 : _classStaticPrivateFi22.call(_self2$self); - (_ref16 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi3 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf(), Foo, _m)) === null || _ref16 === void 0 ? void 0 : _ref16.call(_classStaticPrivateFi3); - (_ref3 = o === null || o === void 0 ? void 0 : (_classStaticPrivateFi4 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref3 === void 0 ? void 0 : (_classStaticPrivateFi23 = _classStaticPrivateFieldSpecGet(_ref3$call = _ref3.call(_classStaticPrivateFi4), Foo, _m)) === null || _classStaticPrivateFi23 === void 0 ? void 0 : _classStaticPrivateFi23.call(_ref3$call); - (_ref4 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref4 === void 0 ? void 0 : (_classStaticPrivateFi24 = _classStaticPrivateFieldSpecGet(_ref4$getSelf = _ref4.getSelf(), Foo, _m)) === null || _classStaticPrivateFi24 === void 0 ? void 0 : _classStaticPrivateFi24.call(_ref4$getSelf); - (_getSelf = (_ref17 = _ref5 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref17 === void 0 ? void 0 : _ref17.getSelf) === null || _getSelf === void 0 ? void 0 : (_classStaticPrivateFi25 = _classStaticPrivateFieldSpecGet(_getSelf$call = _getSelf.call(_ref5), Foo, _m)) === null || _classStaticPrivateFi25 === void 0 ? void 0 : _classStaticPrivateFi25.call(_getSelf$call); - (_ref6 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) === null || _ref6 === void 0 ? void 0 : (_classStaticPrivateFi26 = _classStaticPrivateFieldSpecGet(_ref6$self = _ref6.self, Foo, _m)) === null || _classStaticPrivateFi26 === void 0 ? void 0 : _classStaticPrivateFi26.call(_ref6$self); - (_call = (_ref18 = o === null || o === void 0 ? void 0 : (_classStaticPrivateFi5 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref18 === void 0 ? void 0 : _ref18.call(_classStaticPrivateFi5)) === null || _call === void 0 ? void 0 : (_classStaticPrivateFi27 = _classStaticPrivateFieldSpecGet(_call$self = _call.self, Foo, _m)) === null || _classStaticPrivateFi27 === void 0 ? void 0 : _classStaticPrivateFi27.call(_call$self); - (_getSelf2 = (_ref19 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref19 === void 0 ? void 0 : _ref19.getSelf()) === null || _getSelf2 === void 0 ? void 0 : (_classStaticPrivateFi28 = _classStaticPrivateFieldSpecGet(_getSelf2$self = _getSelf2.self, Foo, _m)) === null || _classStaticPrivateFi28 === void 0 ? void 0 : _classStaticPrivateFi28.call(_getSelf2$self); - (_getSelf3 = (_ref20 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref20 === void 0 ? void 0 : (_ref20$getSelf = _ref20.getSelf) === null || _ref20$getSelf === void 0 ? void 0 : _ref20$getSelf.call(_ref20)) === null || _getSelf3 === void 0 ? void 0 : (_classStaticPrivateFi29 = _classStaticPrivateFieldSpecGet(_getSelf3$self = _getSelf3.self, Foo, _m)) === null || _classStaticPrivateFi29 === void 0 ? void 0 : _classStaticPrivateFi29.call(_getSelf3$self); - fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi30 = _classStaticPrivateFieldSpecGet(_fn$Foo = fn().Foo, Foo, _m)) === null || _classStaticPrivateFi30 === void 0 ? void 0 : _classStaticPrivateFi30.call(_fn$Foo); - fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi31 = _classStaticPrivateFieldSpecGet(_fn$Foo2 = fn().Foo, Foo, _m)) === null || _classStaticPrivateFi31 === void 0 ? void 0 : _classStaticPrivateFi31.call(_fn$Foo2).toString; - fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi32 = _classStaticPrivateFieldSpecGet(_fn$Foo3 = fn().Foo, Foo, _m)) === null || _classStaticPrivateFi32 === void 0 ? void 0 : _classStaticPrivateFi32.call(_fn$Foo3).toString(); - (_fnDeep$very$o = fnDeep === null || fnDeep === void 0 ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : (_classStaticPrivateFi33 = _classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo = _fnDeep$very$o.Foo, Foo, _m)) === null || _classStaticPrivateFi33 === void 0 ? void 0 : _classStaticPrivateFi33.call(_fnDeep$very$o$Foo); - (_fnDeep$very$o2 = fnDeep === null || fnDeep === void 0 ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : (_classStaticPrivateFi34 = _classStaticPrivateFieldSpecGet(_fnDeep$very$o2$Foo = _fnDeep$very$o2.Foo, Foo, _m)) === null || _classStaticPrivateFi34 === void 0 ? void 0 : _classStaticPrivateFi34.call(_fnDeep$very$o2$Foo).toString; - (_fnDeep$very$o3 = fnDeep === null || fnDeep === void 0 ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : (_classStaticPrivateFi35 = _classStaticPrivateFieldSpecGet(_fnDeep$very$o3$Foo = _fnDeep$very$o3.Foo, Foo, _m)) === null || _classStaticPrivateFi35 === void 0 ? void 0 : _classStaticPrivateFi35.call(_fnDeep$very$o3$Foo).toString(); - (_ref21 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi6 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self), Foo, _m)) === null || _ref21 === void 0 ? void 0 : _ref21.call(_classStaticPrivateFi6); - (_ref22 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi7 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self, Foo, _m)) === null || _ref22 === void 0 ? void 0 : _ref22.call(_classStaticPrivateFi7); - (_ref7 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref7 === void 0 ? void 0 : (_classStaticPrivateFi36 = _classStaticPrivateFieldSpecGet(_ref7$self = _ref7.self, Foo, _m)) === null || _classStaticPrivateFi36 === void 0 ? void 0 : _classStaticPrivateFi36.call(_ref7$self); - (_ref8 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) === null || _ref8 === void 0 ? void 0 : (_classStaticPrivateFi37 = _classStaticPrivateFieldSpecGet(_ref8$self = _ref8.self, Foo, _m)) === null || _classStaticPrivateFi37 === void 0 ? void 0 : _classStaticPrivateFi37.call(_ref8$self); - (_self3 = (_ref23 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref23 === void 0 ? void 0 : _ref23.self) === null || _self3 === void 0 ? void 0 : (_classStaticPrivateFi38 = _classStaticPrivateFieldSpecGet(_self3$self = _self3.self, Foo, _m)) === null || _classStaticPrivateFi38 === void 0 ? void 0 : _classStaticPrivateFi38.call(_self3$self); - (_ref24 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi8 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf(), Foo, _m)) === null || _ref24 === void 0 ? void 0 : _ref24.call(_classStaticPrivateFi8); - (_ref9 = fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi9 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref9 === void 0 ? void 0 : (_classStaticPrivateFi39 = _classStaticPrivateFieldSpecGet(_ref9$call = _ref9.call(_classStaticPrivateFi9), Foo, _m)) === null || _classStaticPrivateFi39 === void 0 ? void 0 : _classStaticPrivateFi39.call(_ref9$call); - (_ref10 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref10 === void 0 ? void 0 : (_classStaticPrivateFi40 = _classStaticPrivateFieldSpecGet(_ref10$getSelf = _ref10.getSelf(), Foo, _m)) === null || _classStaticPrivateFi40 === void 0 ? void 0 : _classStaticPrivateFi40.call(_ref10$getSelf); - (_getSelf4 = (_ref25 = _ref11 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref25 === void 0 ? void 0 : _ref25.getSelf) === null || _getSelf4 === void 0 ? void 0 : (_classStaticPrivateFi41 = _classStaticPrivateFieldSpecGet(_getSelf4$call = _getSelf4.call(_ref11), Foo, _m)) === null || _classStaticPrivateFi41 === void 0 ? void 0 : _classStaticPrivateFi41.call(_getSelf4$call); - (_ref12 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) === null || _ref12 === void 0 ? void 0 : (_classStaticPrivateFi42 = _classStaticPrivateFieldSpecGet(_ref12$self = _ref12.self, Foo, _m)) === null || _classStaticPrivateFi42 === void 0 ? void 0 : _classStaticPrivateFi42.call(_ref12$self); - (_call2 = (_ref26 = fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi10 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref26 === void 0 ? void 0 : _ref26.call(_classStaticPrivateFi10)) === null || _call2 === void 0 ? void 0 : (_classStaticPrivateFi43 = _classStaticPrivateFieldSpecGet(_call2$self = _call2.self, Foo, _m)) === null || _classStaticPrivateFi43 === void 0 ? void 0 : _classStaticPrivateFi43.call(_call2$self); - (_getSelf5 = (_ref27 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref27 === void 0 ? void 0 : _ref27.getSelf()) === null || _getSelf5 === void 0 ? void 0 : (_classStaticPrivateFi44 = _classStaticPrivateFieldSpecGet(_getSelf5$self = _getSelf5.self, Foo, _m)) === null || _classStaticPrivateFi44 === void 0 ? void 0 : _classStaticPrivateFi44.call(_getSelf5$self); - (_getSelf6 = (_ref28 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref28 === void 0 ? void 0 : (_ref28$getSelf = _ref28.getSelf) === null || _ref28$getSelf === void 0 ? void 0 : _ref28$getSelf.call(_ref28)) === null || _getSelf6 === void 0 ? void 0 : (_classStaticPrivateFi45 = _classStaticPrivateFieldSpecGet(_getSelf6$self = _getSelf6.self, Foo, _m)) === null || _classStaticPrivateFi45 === void 0 ? void 0 : _classStaticPrivateFi45.call(_getSelf6$self); + (_babelHelpers$classSt11 = babelHelpers.classStaticPrivateFieldSpecGet(Foo, Foo, _m)) === null || _babelHelpers$classSt11 === void 0 ? void 0 : _babelHelpers$classSt11.call(Foo); + (_babelHelpers$classSt12 = babelHelpers.classStaticPrivateFieldSpecGet(Foo, Foo, _m)) === null || _babelHelpers$classSt12 === void 0 ? void 0 : _babelHelpers$classSt12.call(Foo).toString; + (_babelHelpers$classSt13 = babelHelpers.classStaticPrivateFieldSpecGet(Foo, Foo, _m)) === null || _babelHelpers$classSt13 === void 0 ? void 0 : _babelHelpers$classSt13.call(Foo).toString(); + o === null || o === void 0 ? void 0 : (_babelHelpers$classSt14 = babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo = o.Foo, Foo, _m)) === null || _babelHelpers$classSt14 === void 0 ? void 0 : _babelHelpers$classSt14.call(_o$Foo); + o === null || o === void 0 ? void 0 : (_babelHelpers$classSt15 = babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo2 = o.Foo, Foo, _m)) === null || _babelHelpers$classSt15 === void 0 ? void 0 : _babelHelpers$classSt15.call(_o$Foo2).toString; + o === null || o === void 0 ? void 0 : (_babelHelpers$classSt16 = babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo3 = o.Foo, Foo, _m)) === null || _babelHelpers$classSt16 === void 0 ? void 0 : _babelHelpers$classSt16.call(_o$Foo3).toString(); + (_deep$very$o = deep === null || deep === void 0 ? void 0 : deep.very.o) === null || _deep$very$o === void 0 ? void 0 : (_babelHelpers$classSt17 = babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o$Foo = _deep$very$o.Foo, Foo, _m)) === null || _babelHelpers$classSt17 === void 0 ? void 0 : _babelHelpers$classSt17.call(_deep$very$o$Foo); + (_deep$very$o2 = deep === null || deep === void 0 ? void 0 : deep.very.o) === null || _deep$very$o2 === void 0 ? void 0 : (_babelHelpers$classSt18 = babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o2$Foo = _deep$very$o2.Foo, Foo, _m)) === null || _babelHelpers$classSt18 === void 0 ? void 0 : _babelHelpers$classSt18.call(_deep$very$o2$Foo).toString; + (_deep$very$o3 = deep === null || deep === void 0 ? void 0 : deep.very.o) === null || _deep$very$o3 === void 0 ? void 0 : (_babelHelpers$classSt19 = babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o3$Foo = _deep$very$o3.Foo, Foo, _m)) === null || _babelHelpers$classSt19 === void 0 ? void 0 : _babelHelpers$classSt19.call(_deep$very$o3$Foo).toString(); + (_ref13 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self), Foo, _m)) === null || _ref13 === void 0 ? void 0 : _ref13.call(_babelHelpers$classSt); + (_ref14 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt2 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self, Foo, _m)) === null || _ref14 === void 0 ? void 0 : _ref14.call(_babelHelpers$classSt2); + (_ref = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref === void 0 ? void 0 : (_babelHelpers$classSt20 = babelHelpers.classStaticPrivateFieldSpecGet(_ref$self = _ref.self, Foo, _m)) === null || _babelHelpers$classSt20 === void 0 ? void 0 : _babelHelpers$classSt20.call(_ref$self); + (_ref2 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) === null || _ref2 === void 0 ? void 0 : (_babelHelpers$classSt21 = babelHelpers.classStaticPrivateFieldSpecGet(_ref2$self = _ref2.self, Foo, _m)) === null || _babelHelpers$classSt21 === void 0 ? void 0 : _babelHelpers$classSt21.call(_ref2$self); + (_self2 = (_ref15 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref15 === void 0 ? void 0 : _ref15.self) === null || _self2 === void 0 ? void 0 : (_babelHelpers$classSt22 = babelHelpers.classStaticPrivateFieldSpecGet(_self2$self = _self2.self, Foo, _m)) === null || _babelHelpers$classSt22 === void 0 ? void 0 : _babelHelpers$classSt22.call(_self2$self); + (_ref16 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt3 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf(), Foo, _m)) === null || _ref16 === void 0 ? void 0 : _ref16.call(_babelHelpers$classSt3); + (_ref3 = o === null || o === void 0 ? void 0 : (_babelHelpers$classSt4 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref3 === void 0 ? void 0 : (_babelHelpers$classSt23 = babelHelpers.classStaticPrivateFieldSpecGet(_ref3$call = _ref3.call(_babelHelpers$classSt4), Foo, _m)) === null || _babelHelpers$classSt23 === void 0 ? void 0 : _babelHelpers$classSt23.call(_ref3$call); + (_ref4 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref4 === void 0 ? void 0 : (_babelHelpers$classSt24 = babelHelpers.classStaticPrivateFieldSpecGet(_ref4$getSelf = _ref4.getSelf(), Foo, _m)) === null || _babelHelpers$classSt24 === void 0 ? void 0 : _babelHelpers$classSt24.call(_ref4$getSelf); + (_getSelf = (_ref17 = _ref5 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref17 === void 0 ? void 0 : _ref17.getSelf) === null || _getSelf === void 0 ? void 0 : (_babelHelpers$classSt25 = babelHelpers.classStaticPrivateFieldSpecGet(_getSelf$call = _getSelf.call(_ref5), Foo, _m)) === null || _babelHelpers$classSt25 === void 0 ? void 0 : _babelHelpers$classSt25.call(_getSelf$call); + (_ref6 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) === null || _ref6 === void 0 ? void 0 : (_babelHelpers$classSt26 = babelHelpers.classStaticPrivateFieldSpecGet(_ref6$self = _ref6.self, Foo, _m)) === null || _babelHelpers$classSt26 === void 0 ? void 0 : _babelHelpers$classSt26.call(_ref6$self); + (_call = (_ref18 = o === null || o === void 0 ? void 0 : (_babelHelpers$classSt5 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref18 === void 0 ? void 0 : _ref18.call(_babelHelpers$classSt5)) === null || _call === void 0 ? void 0 : (_babelHelpers$classSt27 = babelHelpers.classStaticPrivateFieldSpecGet(_call$self = _call.self, Foo, _m)) === null || _babelHelpers$classSt27 === void 0 ? void 0 : _babelHelpers$classSt27.call(_call$self); + (_getSelf2 = (_ref19 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref19 === void 0 ? void 0 : _ref19.getSelf()) === null || _getSelf2 === void 0 ? void 0 : (_babelHelpers$classSt28 = babelHelpers.classStaticPrivateFieldSpecGet(_getSelf2$self = _getSelf2.self, Foo, _m)) === null || _babelHelpers$classSt28 === void 0 ? void 0 : _babelHelpers$classSt28.call(_getSelf2$self); + (_getSelf3 = (_ref20 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref20 === void 0 ? void 0 : (_ref20$getSelf = _ref20.getSelf) === null || _ref20$getSelf === void 0 ? void 0 : _ref20$getSelf.call(_ref20)) === null || _getSelf3 === void 0 ? void 0 : (_babelHelpers$classSt29 = babelHelpers.classStaticPrivateFieldSpecGet(_getSelf3$self = _getSelf3.self, Foo, _m)) === null || _babelHelpers$classSt29 === void 0 ? void 0 : _babelHelpers$classSt29.call(_getSelf3$self); + fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt30 = babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo = fn().Foo, Foo, _m)) === null || _babelHelpers$classSt30 === void 0 ? void 0 : _babelHelpers$classSt30.call(_fn$Foo); + fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt31 = babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo2 = fn().Foo, Foo, _m)) === null || _babelHelpers$classSt31 === void 0 ? void 0 : _babelHelpers$classSt31.call(_fn$Foo2).toString; + fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt32 = babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo3 = fn().Foo, Foo, _m)) === null || _babelHelpers$classSt32 === void 0 ? void 0 : _babelHelpers$classSt32.call(_fn$Foo3).toString(); + (_fnDeep$very$o = fnDeep === null || fnDeep === void 0 ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : (_babelHelpers$classSt33 = babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo = _fnDeep$very$o.Foo, Foo, _m)) === null || _babelHelpers$classSt33 === void 0 ? void 0 : _babelHelpers$classSt33.call(_fnDeep$very$o$Foo); + (_fnDeep$very$o2 = fnDeep === null || fnDeep === void 0 ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : (_babelHelpers$classSt34 = babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o2$Foo = _fnDeep$very$o2.Foo, Foo, _m)) === null || _babelHelpers$classSt34 === void 0 ? void 0 : _babelHelpers$classSt34.call(_fnDeep$very$o2$Foo).toString; + (_fnDeep$very$o3 = fnDeep === null || fnDeep === void 0 ? void 0 : fnDeep().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : (_babelHelpers$classSt35 = babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o3$Foo = _fnDeep$very$o3.Foo, Foo, _m)) === null || _babelHelpers$classSt35 === void 0 ? void 0 : _babelHelpers$classSt35.call(_fnDeep$very$o3$Foo).toString(); + (_ref21 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt6 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self), Foo, _m)) === null || _ref21 === void 0 ? void 0 : _ref21.call(_babelHelpers$classSt6); + (_ref22 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt7 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self, Foo, _m)) === null || _ref22 === void 0 ? void 0 : _ref22.call(_babelHelpers$classSt7); + (_ref7 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref7 === void 0 ? void 0 : (_babelHelpers$classSt36 = babelHelpers.classStaticPrivateFieldSpecGet(_ref7$self = _ref7.self, Foo, _m)) === null || _babelHelpers$classSt36 === void 0 ? void 0 : _babelHelpers$classSt36.call(_ref7$self); + (_ref8 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) === null || _ref8 === void 0 ? void 0 : (_babelHelpers$classSt37 = babelHelpers.classStaticPrivateFieldSpecGet(_ref8$self = _ref8.self, Foo, _m)) === null || _babelHelpers$classSt37 === void 0 ? void 0 : _babelHelpers$classSt37.call(_ref8$self); + (_self3 = (_ref23 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref23 === void 0 ? void 0 : _ref23.self) === null || _self3 === void 0 ? void 0 : (_babelHelpers$classSt38 = babelHelpers.classStaticPrivateFieldSpecGet(_self3$self = _self3.self, Foo, _m)) === null || _babelHelpers$classSt38 === void 0 ? void 0 : _babelHelpers$classSt38.call(_self3$self); + (_ref24 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt8 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf(), Foo, _m)) === null || _ref24 === void 0 ? void 0 : _ref24.call(_babelHelpers$classSt8); + (_ref9 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt9 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref9 === void 0 ? void 0 : (_babelHelpers$classSt39 = babelHelpers.classStaticPrivateFieldSpecGet(_ref9$call = _ref9.call(_babelHelpers$classSt9), Foo, _m)) === null || _babelHelpers$classSt39 === void 0 ? void 0 : _babelHelpers$classSt39.call(_ref9$call); + (_ref10 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref10 === void 0 ? void 0 : (_babelHelpers$classSt40 = babelHelpers.classStaticPrivateFieldSpecGet(_ref10$getSelf = _ref10.getSelf(), Foo, _m)) === null || _babelHelpers$classSt40 === void 0 ? void 0 : _babelHelpers$classSt40.call(_ref10$getSelf); + (_getSelf4 = (_ref25 = _ref11 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref25 === void 0 ? void 0 : _ref25.getSelf) === null || _getSelf4 === void 0 ? void 0 : (_babelHelpers$classSt41 = babelHelpers.classStaticPrivateFieldSpecGet(_getSelf4$call = _getSelf4.call(_ref11), Foo, _m)) === null || _babelHelpers$classSt41 === void 0 ? void 0 : _babelHelpers$classSt41.call(_getSelf4$call); + (_ref12 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) === null || _ref12 === void 0 ? void 0 : (_babelHelpers$classSt42 = babelHelpers.classStaticPrivateFieldSpecGet(_ref12$self = _ref12.self, Foo, _m)) === null || _babelHelpers$classSt42 === void 0 ? void 0 : _babelHelpers$classSt42.call(_ref12$self); + (_call2 = (_ref26 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt10 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref26 === void 0 ? void 0 : _ref26.call(_babelHelpers$classSt10)) === null || _call2 === void 0 ? void 0 : (_babelHelpers$classSt43 = babelHelpers.classStaticPrivateFieldSpecGet(_call2$self = _call2.self, Foo, _m)) === null || _babelHelpers$classSt43 === void 0 ? void 0 : _babelHelpers$classSt43.call(_call2$self); + (_getSelf5 = (_ref27 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref27 === void 0 ? void 0 : _ref27.getSelf()) === null || _getSelf5 === void 0 ? void 0 : (_babelHelpers$classSt44 = babelHelpers.classStaticPrivateFieldSpecGet(_getSelf5$self = _getSelf5.self, Foo, _m)) === null || _babelHelpers$classSt44 === void 0 ? void 0 : _babelHelpers$classSt44.call(_getSelf5$self); + (_getSelf6 = (_ref28 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref28 === void 0 ? void 0 : (_ref28$getSelf = _ref28.getSelf) === null || _ref28$getSelf === void 0 ? void 0 : _ref28$getSelf.call(_ref28)) === null || _getSelf6 === void 0 ? void 0 : (_babelHelpers$classSt45 = babelHelpers.classStaticPrivateFieldSpecGet(_getSelf6$self = _getSelf6.self, Foo, _m)) === null || _babelHelpers$classSt45 === void 0 ? void 0 : _babelHelpers$classSt45.call(_getSelf6$self); } } @@ -79,14 +75,12 @@ var _x = { var _m = { writable: true, value: function () { - return _classStaticPrivateFieldSpecGet(this, Foo, _x); + return babelHelpers.classStaticPrivateFieldSpecGet(this, Foo, _x); } }; var _self = { writable: true, value: Foo }; - -_defineProperty(Foo, "self", Foo); - +babelHelpers.defineProperty(Foo, "self", Foo); Foo.test(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-member-optional-call/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-member-optional-call/output.js index c9e4dcb46a..4573533dff 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-member-optional-call/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-member-optional-call/output.js @@ -1,14 +1,10 @@ -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _classStaticPrivateFieldSpecGet(receiver, classConstructor, descriptor) { if (receiver !== classConstructor) { throw new TypeError("Private static access of wrong provenance"); } if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; } - class Foo { static getSelf() { return this; } static test() { - var _o$Foo, _o$Foo2, _o$Foo3, _deep$very$o, _deep$very$o$Foo, _deep$very$o2, _deep$very$o2$Foo, _deep$very$o3, _deep$very$o3$Foo, _classStaticPrivateFi, _classStaticPrivateFi2, _ref, _ref$self, _ref2, _ref2$self, _self2, _self2$self, _classStaticPrivateFi3, _classStaticPrivateFi4, _ref3, _ref3$call, _ref4, _ref4$getSelf, _getSelf, _ref5, _getSelf$call, _ref6, _ref6$self, _classStaticPrivateFi5, _call, _call$self, _getSelf2, _getSelf2$self, _getSelf3, _getSelf3$self, _fn$Foo, _fn$Foo2, _fn$Foo3, _fnDeep$very$o, _fnDeep$very$o$Foo, _fnDeep$very$o2, _fnDeep$very$o2$Foo, _fnDeep$very$o3, _fnDeep$very$o3$Foo, _classStaticPrivateFi6, _classStaticPrivateFi7, _ref7, _ref7$self, _ref8, _ref8$self, _self3, _self3$self, _classStaticPrivateFi8, _classStaticPrivateFi9, _ref9, _ref9$call, _ref10, _ref10$getSelf, _getSelf4, _ref11, _getSelf4$call, _ref12, _ref12$self, _classStaticPrivateFi10, _call2, _call2$self, _getSelf5, _getSelf5$self, _getSelf6, _getSelf6$self; + var _o$Foo, _o$Foo2, _o$Foo3, _deep$very$o, _deep$very$o$Foo, _deep$very$o2, _deep$very$o2$Foo, _deep$very$o3, _deep$very$o3$Foo, _babelHelpers$classSt, _babelHelpers$classSt2, _ref, _ref$self, _ref2, _ref2$self, _self2, _self2$self, _babelHelpers$classSt3, _babelHelpers$classSt4, _ref3, _ref3$call, _ref4, _ref4$getSelf, _getSelf, _ref5, _getSelf$call, _ref6, _ref6$self, _babelHelpers$classSt5, _call, _call$self, _getSelf2, _getSelf2$self, _getSelf3, _getSelf3$self, _fn$Foo, _fn$Foo2, _fn$Foo3, _fnDeep$very$o, _fnDeep$very$o$Foo, _fnDeep$very$o2, _fnDeep$very$o2$Foo, _fnDeep$very$o3, _fnDeep$very$o3$Foo, _babelHelpers$classSt6, _babelHelpers$classSt7, _ref7, _ref7$self, _ref8, _ref8$self, _self3, _self3$self, _babelHelpers$classSt8, _babelHelpers$classSt9, _ref9, _ref9$call, _ref10, _ref10$getSelf, _getSelf4, _ref11, _getSelf4$call, _ref12, _ref12$self, _babelHelpers$classSt10, _call2, _call2$self, _getSelf5, _getSelf5$self, _getSelf6, _getSelf6$self; const o = { Foo: Foo @@ -27,47 +23,47 @@ class Foo { return deep; } - _classStaticPrivateFieldSpecGet(Foo, Foo, _m)?.call(Foo); - _classStaticPrivateFieldSpecGet(Foo, Foo, _m)?.call(Foo).toString; - _classStaticPrivateFieldSpecGet(Foo, Foo, _m)?.call(Foo).toString(); - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo = o.Foo, Foo, _m)?.call(_o$Foo); - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo2 = o.Foo, Foo, _m)?.call(_o$Foo2).toString; - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo3 = o.Foo, Foo, _m)?.call(_o$Foo3).toString(); - (_deep$very$o = deep?.very.o) === null || _deep$very$o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o$Foo = _deep$very$o.Foo, Foo, _m)?.call(_deep$very$o$Foo); - (_deep$very$o2 = deep?.very.o) === null || _deep$very$o2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o2$Foo = _deep$very$o2.Foo, Foo, _m)?.call(_deep$very$o2$Foo).toString; - (_deep$very$o3 = deep?.very.o) === null || _deep$very$o3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o3$Foo = _deep$very$o3.Foo, Foo, _m)?.call(_deep$very$o3$Foo).toString(); - (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self), Foo, _m))?.call(_classStaticPrivateFi); - (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi2 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self, Foo, _m))?.call(_classStaticPrivateFi2); - (_ref = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref$self = _ref.self, Foo, _m)?.call(_ref$self); - (_ref2 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) === null || _ref2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref2$self = _ref2.self, Foo, _m)?.call(_ref2$self); - (_self2 = (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.self) === null || _self2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self2$self = _self2.self, Foo, _m)?.call(_self2$self); - (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi3 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf(), Foo, _m))?.call(_classStaticPrivateFi3); - (_ref3 = o === null || o === void 0 ? void 0 : (_classStaticPrivateFi4 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref3$call = _ref3.call(_classStaticPrivateFi4), Foo, _m)?.call(_ref3$call); - (_ref4 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref4 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref4$getSelf = _ref4.getSelf(), Foo, _m)?.call(_ref4$getSelf); - (_getSelf = (_ref5 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf) === null || _getSelf === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf$call = _getSelf.call(_ref5), Foo, _m)?.call(_getSelf$call); - (_ref6 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) === null || _ref6 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref6$self = _ref6.self, Foo, _m)?.call(_ref6$self); - (_call = (o === null || o === void 0 ? void 0 : (_classStaticPrivateFi5 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf)?.call(_classStaticPrivateFi5)) === null || _call === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_call$self = _call.self, Foo, _m)?.call(_call$self); - (_getSelf2 = (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf()) === null || _getSelf2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf2$self = _getSelf2.self, Foo, _m)?.call(_getSelf2$self); - (_getSelf3 = (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf?.()) === null || _getSelf3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf3$self = _getSelf3.self, Foo, _m)?.call(_getSelf3$self); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fn$Foo = fn().Foo, Foo, _m)?.call(_fn$Foo); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fn$Foo2 = fn().Foo, Foo, _m)?.call(_fn$Foo2).toString; - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fn$Foo3 = fn().Foo, Foo, _m)?.call(_fn$Foo3).toString(); - (_fnDeep$very$o = fnDeep?.().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo = _fnDeep$very$o.Foo, Foo, _m)?.call(_fnDeep$very$o$Foo); - (_fnDeep$very$o2 = fnDeep?.().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o2$Foo = _fnDeep$very$o2.Foo, Foo, _m)?.call(_fnDeep$very$o2$Foo).toString; - (_fnDeep$very$o3 = fnDeep?.().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o3$Foo = _fnDeep$very$o3.Foo, Foo, _m)?.call(_fnDeep$very$o3$Foo).toString(); - (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi6 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self), Foo, _m))?.call(_classStaticPrivateFi6); - (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi7 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self, Foo, _m))?.call(_classStaticPrivateFi7); - (_ref7 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref7 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref7$self = _ref7.self, Foo, _m)?.call(_ref7$self); - (_ref8 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) === null || _ref8 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref8$self = _ref8.self, Foo, _m)?.call(_ref8$self); - (_self3 = (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.self) === null || _self3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self3$self = _self3.self, Foo, _m)?.call(_self3$self); - (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi8 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf(), Foo, _m))?.call(_classStaticPrivateFi8); - (_ref9 = fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi9 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref9 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref9$call = _ref9.call(_classStaticPrivateFi9), Foo, _m)?.call(_ref9$call); - (_ref10 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref10 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref10$getSelf = _ref10.getSelf(), Foo, _m)?.call(_ref10$getSelf); - (_getSelf4 = (_ref11 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf) === null || _getSelf4 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf4$call = _getSelf4.call(_ref11), Foo, _m)?.call(_getSelf4$call); - (_ref12 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) === null || _ref12 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref12$self = _ref12.self, Foo, _m)?.call(_ref12$self); - (_call2 = (fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi10 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf)?.call(_classStaticPrivateFi10)) === null || _call2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_call2$self = _call2.self, Foo, _m)?.call(_call2$self); - (_getSelf5 = (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf()) === null || _getSelf5 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf5$self = _getSelf5.self, Foo, _m)?.call(_getSelf5$self); - (_getSelf6 = (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf?.()) === null || _getSelf6 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf6$self = _getSelf6.self, Foo, _m)?.call(_getSelf6$self); + babelHelpers.classStaticPrivateFieldSpecGet(Foo, Foo, _m)?.call(Foo); + babelHelpers.classStaticPrivateFieldSpecGet(Foo, Foo, _m)?.call(Foo).toString; + babelHelpers.classStaticPrivateFieldSpecGet(Foo, Foo, _m)?.call(Foo).toString(); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo = o.Foo, Foo, _m)?.call(_o$Foo); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo2 = o.Foo, Foo, _m)?.call(_o$Foo2).toString; + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo3 = o.Foo, Foo, _m)?.call(_o$Foo3).toString(); + (_deep$very$o = deep?.very.o) === null || _deep$very$o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o$Foo = _deep$very$o.Foo, Foo, _m)?.call(_deep$very$o$Foo); + (_deep$very$o2 = deep?.very.o) === null || _deep$very$o2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o2$Foo = _deep$very$o2.Foo, Foo, _m)?.call(_deep$very$o2$Foo).toString; + (_deep$very$o3 = deep?.very.o) === null || _deep$very$o3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o3$Foo = _deep$very$o3.Foo, Foo, _m)?.call(_deep$very$o3$Foo).toString(); + (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self), Foo, _m))?.call(_babelHelpers$classSt); + (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt2 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self, Foo, _m))?.call(_babelHelpers$classSt2); + (_ref = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref$self = _ref.self, Foo, _m)?.call(_ref$self); + (_ref2 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) === null || _ref2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref2$self = _ref2.self, Foo, _m)?.call(_ref2$self); + (_self2 = (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.self) === null || _self2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self2$self = _self2.self, Foo, _m)?.call(_self2$self); + (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt3 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf(), Foo, _m))?.call(_babelHelpers$classSt3); + (_ref3 = o === null || o === void 0 ? void 0 : (_babelHelpers$classSt4 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref3$call = _ref3.call(_babelHelpers$classSt4), Foo, _m)?.call(_ref3$call); + (_ref4 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref4 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref4$getSelf = _ref4.getSelf(), Foo, _m)?.call(_ref4$getSelf); + (_getSelf = (_ref5 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf) === null || _getSelf === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf$call = _getSelf.call(_ref5), Foo, _m)?.call(_getSelf$call); + (_ref6 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) === null || _ref6 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref6$self = _ref6.self, Foo, _m)?.call(_ref6$self); + (_call = (o === null || o === void 0 ? void 0 : (_babelHelpers$classSt5 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf)?.call(_babelHelpers$classSt5)) === null || _call === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call$self = _call.self, Foo, _m)?.call(_call$self); + (_getSelf2 = (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf()) === null || _getSelf2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf2$self = _getSelf2.self, Foo, _m)?.call(_getSelf2$self); + (_getSelf3 = (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf?.()) === null || _getSelf3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf3$self = _getSelf3.self, Foo, _m)?.call(_getSelf3$self); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo = fn().Foo, Foo, _m)?.call(_fn$Foo); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo2 = fn().Foo, Foo, _m)?.call(_fn$Foo2).toString; + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo3 = fn().Foo, Foo, _m)?.call(_fn$Foo3).toString(); + (_fnDeep$very$o = fnDeep?.().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo = _fnDeep$very$o.Foo, Foo, _m)?.call(_fnDeep$very$o$Foo); + (_fnDeep$very$o2 = fnDeep?.().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o2$Foo = _fnDeep$very$o2.Foo, Foo, _m)?.call(_fnDeep$very$o2$Foo).toString; + (_fnDeep$very$o3 = fnDeep?.().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o3$Foo = _fnDeep$very$o3.Foo, Foo, _m)?.call(_fnDeep$very$o3$Foo).toString(); + (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt6 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self), Foo, _m))?.call(_babelHelpers$classSt6); + (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt7 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self, Foo, _m))?.call(_babelHelpers$classSt7); + (_ref7 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref7 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref7$self = _ref7.self, Foo, _m)?.call(_ref7$self); + (_ref8 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) === null || _ref8 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref8$self = _ref8.self, Foo, _m)?.call(_ref8$self); + (_self3 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.self) === null || _self3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self3$self = _self3.self, Foo, _m)?.call(_self3$self); + (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt8 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf(), Foo, _m))?.call(_babelHelpers$classSt8); + (_ref9 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt9 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref9 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref9$call = _ref9.call(_babelHelpers$classSt9), Foo, _m)?.call(_ref9$call); + (_ref10 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref10 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref10$getSelf = _ref10.getSelf(), Foo, _m)?.call(_ref10$getSelf); + (_getSelf4 = (_ref11 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf) === null || _getSelf4 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf4$call = _getSelf4.call(_ref11), Foo, _m)?.call(_getSelf4$call); + (_ref12 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) === null || _ref12 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref12$self = _ref12.self, Foo, _m)?.call(_ref12$self); + (_call2 = (fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt10 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf)?.call(_babelHelpers$classSt10)) === null || _call2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call2$self = _call2.self, Foo, _m)?.call(_call2$self); + (_getSelf5 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf()) === null || _getSelf5 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf5$self = _getSelf5.self, Foo, _m)?.call(_getSelf5$self); + (_getSelf6 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf?.()) === null || _getSelf6 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf6$self = _getSelf6.self, Foo, _m)?.call(_getSelf6$self); } } @@ -79,14 +75,12 @@ var _x = { var _m = { writable: true, value: function () { - return _classStaticPrivateFieldSpecGet(this, Foo, _x); + return babelHelpers.classStaticPrivateFieldSpecGet(this, Foo, _x); } }; var _self = { writable: true, value: Foo }; - -_defineProperty(Foo, "self", Foo); - +babelHelpers.defineProperty(Foo, "self", Foo); Foo.test(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-optional-member-call-with-transform/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-optional-member-call-with-transform/output.js index a2c6eae6d3..af32874a5f 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-optional-member-call-with-transform/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-optional-member-call-with-transform/output.js @@ -1,14 +1,10 @@ -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _classStaticPrivateFieldSpecGet(receiver, classConstructor, descriptor) { if (receiver !== classConstructor) { throw new TypeError("Private static access of wrong provenance"); } if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; } - class Foo { static getSelf() { return this; } static test() { - var _o$Foo, _o$Foo2, _o$Foo3, _deep$very$o$Foo, _deep$very$o$Foo2, _deep$very$o$Foo3, _ref, _ref2, _self2, _self3, _self$self, _ref3, _classStaticPrivateFi, _call, _getSelf, _getSelf2, _self4, _classStaticPrivateFi2, _call$self, _getSelf$self, _getSelf$self2, _fn$Foo, _fn$Foo2, _fn$Foo3, _fnDeep$very$o$Foo, _fnDeep$very$o$Foo2, _fnDeep$very$o$Foo3, _ref4, _ref5, _self5, _self6, _self$self2, _ref6, _classStaticPrivateFi3, _call2, _getSelf3, _getSelf4, _self7, _classStaticPrivateFi4, _call$self2, _getSelf$self3, _getSelf$self4, _deep$very$o, _deep$very$o2, _deep$very$o3, _ref7, _ref8, _ref9, _ref9$self, _ref10, _ref11, _ref12, _ref12$getSelf, _ref13, _ref14, _ref14$call, _ref15, _ref15$getSelf, _ref16, _ref16$getSelf, _ref16$getSelf$call, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _ref17, _ref18, _ref19, _ref19$self, _ref20, _ref21, _ref22, _ref22$getSelf, _ref23, _ref24, _ref24$call, _ref25, _ref25$getSelf, _ref26, _ref26$getSelf, _ref26$getSelf$call; + var _o$Foo, _o$Foo2, _o$Foo3, _deep$very$o$Foo, _deep$very$o$Foo2, _deep$very$o$Foo3, _ref, _ref2, _self2, _self3, _self$self, _ref3, _babelHelpers$classSt, _call, _getSelf, _getSelf2, _self4, _babelHelpers$classSt2, _call$self, _getSelf$self, _getSelf$self2, _fn$Foo, _fn$Foo2, _fn$Foo3, _fnDeep$very$o$Foo, _fnDeep$very$o$Foo2, _fnDeep$very$o$Foo3, _ref4, _ref5, _self5, _self6, _self$self2, _ref6, _babelHelpers$classSt3, _call2, _getSelf3, _getSelf4, _self7, _babelHelpers$classSt4, _call$self2, _getSelf$self3, _getSelf$self4, _deep$very$o, _deep$very$o2, _deep$very$o3, _ref7, _ref8, _ref9, _ref9$self, _ref10, _ref11, _ref12, _ref12$getSelf, _ref13, _ref14, _ref14$call, _ref15, _ref15$getSelf, _ref16, _ref16$getSelf, _ref16$getSelf$call, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _ref17, _ref18, _ref19, _ref19$self, _ref20, _ref21, _ref22, _ref22$getSelf, _ref23, _ref24, _ref24$call, _ref25, _ref25$getSelf, _ref26, _ref26$getSelf, _ref26$getSelf$call; const o = { Foo: Foo @@ -27,47 +23,47 @@ class Foo { return deep; } - Foo === null || Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(Foo, Foo, _m).call(Foo); - Foo === null || Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(Foo, Foo, _m).call(Foo).toString; - Foo === null || Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(Foo, Foo, _m).call(Foo).toString(); - (_o$Foo = o === null || o === void 0 ? void 0 : o.Foo) === null || _o$Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo, Foo, _m).call(_o$Foo); - (_o$Foo2 = o === null || o === void 0 ? void 0 : o.Foo) === null || _o$Foo2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo2, Foo, _m).call(_o$Foo2).toString; - (_o$Foo3 = o === null || o === void 0 ? void 0 : o.Foo) === null || _o$Foo3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo3, Foo, _m).call(_o$Foo3).toString(); - (_deep$very$o$Foo = deep === null || deep === void 0 ? void 0 : (_deep$very$o = deep.very.o) === null || _deep$very$o === void 0 ? void 0 : _deep$very$o.Foo) === null || _deep$very$o$Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o$Foo, Foo, _m).call(_deep$very$o$Foo); - (_deep$very$o$Foo2 = deep === null || deep === void 0 ? void 0 : (_deep$very$o2 = deep.very.o) === null || _deep$very$o2 === void 0 ? void 0 : _deep$very$o2.Foo) === null || _deep$very$o$Foo2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o$Foo2, Foo, _m).call(_deep$very$o$Foo2).toString; - (_deep$very$o$Foo3 = deep === null || deep === void 0 ? void 0 : (_deep$very$o3 = deep.very.o) === null || _deep$very$o3 === void 0 ? void 0 : _deep$very$o3.Foo) === null || _deep$very$o$Foo3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o$Foo3, Foo, _m).call(_deep$very$o$Foo3).toString(); - (_ref = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref, Foo, _m).call(_ref); - (_ref2 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) === null || _ref2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref2, Foo, _m).call(_ref2); - (_self2 = (_ref7 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref7 === void 0 ? void 0 : _ref7.self) === null || _self2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self2, Foo, _m).call(_self2); - (_self3 = (_ref8 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) === null || _ref8 === void 0 ? void 0 : _ref8.self) === null || _self3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self3, Foo, _m).call(_self3); - (_self$self = (_ref9 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref9 === void 0 ? void 0 : (_ref9$self = _ref9.self) === null || _ref9$self === void 0 ? void 0 : _ref9$self.self) === null || _self$self === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self$self, Foo, _m).call(_self$self); - (_ref3 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) === null || _ref3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref3, Foo, _m).call(_ref3); - (_call = (_ref10 = o === null || o === void 0 ? void 0 : (_classStaticPrivateFi = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref10 === void 0 ? void 0 : _ref10.call(_classStaticPrivateFi)) === null || _call === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_call, Foo, _m).call(_call); - (_getSelf = (_ref11 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref11 === void 0 ? void 0 : _ref11.getSelf()) === null || _getSelf === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf, Foo, _m).call(_getSelf); - (_getSelf2 = (_ref12 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref12 === void 0 ? void 0 : (_ref12$getSelf = _ref12.getSelf) === null || _ref12$getSelf === void 0 ? void 0 : _ref12$getSelf.call(_ref12)) === null || _getSelf2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf2, Foo, _m).call(_getSelf2); - (_self4 = (_ref13 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) === null || _ref13 === void 0 ? void 0 : _ref13.self) === null || _self4 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self4, Foo, _m).call(_self4); - (_call$self = (_ref14 = o === null || o === void 0 ? void 0 : (_classStaticPrivateFi2 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref14 === void 0 ? void 0 : (_ref14$call = _ref14.call(_classStaticPrivateFi2)) === null || _ref14$call === void 0 ? void 0 : _ref14$call.self) === null || _call$self === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_call$self, Foo, _m).call(_call$self); - (_getSelf$self = (_ref15 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref15 === void 0 ? void 0 : (_ref15$getSelf = _ref15.getSelf()) === null || _ref15$getSelf === void 0 ? void 0 : _ref15$getSelf.self) === null || _getSelf$self === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf$self, Foo, _m).call(_getSelf$self); - (_getSelf$self2 = (_ref16 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref16 === void 0 ? void 0 : (_ref16$getSelf = _ref16.getSelf) === null || _ref16$getSelf === void 0 ? void 0 : (_ref16$getSelf$call = _ref16$getSelf.call(_ref16)) === null || _ref16$getSelf$call === void 0 ? void 0 : _ref16$getSelf$call.self) === null || _getSelf$self2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf$self2, Foo, _m).call(_getSelf$self2); - (_fn$Foo = fn === null || fn === void 0 ? void 0 : fn().Foo) === null || _fn$Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fn$Foo, Foo, _m).call(_fn$Foo); - (_fn$Foo2 = fn === null || fn === void 0 ? void 0 : fn().Foo) === null || _fn$Foo2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fn$Foo2, Foo, _m).call(_fn$Foo2).toString; - (_fn$Foo3 = fn === null || fn === void 0 ? void 0 : fn().Foo) === null || _fn$Foo3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fn$Foo3, Foo, _m).call(_fn$Foo3).toString(); - (_fnDeep$very$o$Foo = fnDeep === null || fnDeep === void 0 ? void 0 : (_fnDeep$very$o = fnDeep().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : _fnDeep$very$o.Foo) === null || _fnDeep$very$o$Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo, Foo, _m).call(_fnDeep$very$o$Foo); - (_fnDeep$very$o$Foo2 = fnDeep === null || fnDeep === void 0 ? void 0 : (_fnDeep$very$o2 = fnDeep().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : _fnDeep$very$o2.Foo) === null || _fnDeep$very$o$Foo2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo2, Foo, _m).call(_fnDeep$very$o$Foo2).toString; - (_fnDeep$very$o$Foo3 = fnDeep === null || fnDeep === void 0 ? void 0 : (_fnDeep$very$o3 = fnDeep().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : _fnDeep$very$o3.Foo) === null || _fnDeep$very$o$Foo3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo3, Foo, _m).call(_fnDeep$very$o$Foo3).toString(); - (_ref4 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref4 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref4, Foo, _m).call(_ref4); - (_ref5 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) === null || _ref5 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref5, Foo, _m).call(_ref5); - (_self5 = (_ref17 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref17 === void 0 ? void 0 : _ref17.self) === null || _self5 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self5, Foo, _m).call(_self5); - (_self6 = (_ref18 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) === null || _ref18 === void 0 ? void 0 : _ref18.self) === null || _self6 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self6, Foo, _m).call(_self6); - (_self$self2 = (_ref19 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref19 === void 0 ? void 0 : (_ref19$self = _ref19.self) === null || _ref19$self === void 0 ? void 0 : _ref19$self.self) === null || _self$self2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self$self2, Foo, _m).call(_self$self2); - (_ref6 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) === null || _ref6 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref6, Foo, _m).call(_ref6); - (_call2 = (_ref20 = fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi3 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref20 === void 0 ? void 0 : _ref20.call(_classStaticPrivateFi3)) === null || _call2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_call2, Foo, _m).call(_call2); - (_getSelf3 = (_ref21 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref21 === void 0 ? void 0 : _ref21.getSelf()) === null || _getSelf3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf3, Foo, _m).call(_getSelf3); - (_getSelf4 = (_ref22 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref22 === void 0 ? void 0 : (_ref22$getSelf = _ref22.getSelf) === null || _ref22$getSelf === void 0 ? void 0 : _ref22$getSelf.call(_ref22)) === null || _getSelf4 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf4, Foo, _m).call(_getSelf4); - (_self7 = (_ref23 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) === null || _ref23 === void 0 ? void 0 : _ref23.self) === null || _self7 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self7, Foo, _m).call(_self7); - (_call$self2 = (_ref24 = fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi4 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref24 === void 0 ? void 0 : (_ref24$call = _ref24.call(_classStaticPrivateFi4)) === null || _ref24$call === void 0 ? void 0 : _ref24$call.self) === null || _call$self2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_call$self2, Foo, _m).call(_call$self2); - (_getSelf$self3 = (_ref25 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref25 === void 0 ? void 0 : (_ref25$getSelf = _ref25.getSelf()) === null || _ref25$getSelf === void 0 ? void 0 : _ref25$getSelf.self) === null || _getSelf$self3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf$self3, Foo, _m).call(_getSelf$self3); - (_getSelf$self4 = (_ref26 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref26 === void 0 ? void 0 : (_ref26$getSelf = _ref26.getSelf) === null || _ref26$getSelf === void 0 ? void 0 : (_ref26$getSelf$call = _ref26$getSelf.call(_ref26)) === null || _ref26$getSelf$call === void 0 ? void 0 : _ref26$getSelf$call.self) === null || _getSelf$self4 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf$self4, Foo, _m).call(_getSelf$self4); + Foo === null || Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(Foo, Foo, _m).call(Foo); + Foo === null || Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(Foo, Foo, _m).call(Foo).toString; + Foo === null || Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(Foo, Foo, _m).call(Foo).toString(); + (_o$Foo = o === null || o === void 0 ? void 0 : o.Foo) === null || _o$Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo, Foo, _m).call(_o$Foo); + (_o$Foo2 = o === null || o === void 0 ? void 0 : o.Foo) === null || _o$Foo2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo2, Foo, _m).call(_o$Foo2).toString; + (_o$Foo3 = o === null || o === void 0 ? void 0 : o.Foo) === null || _o$Foo3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo3, Foo, _m).call(_o$Foo3).toString(); + (_deep$very$o$Foo = deep === null || deep === void 0 ? void 0 : (_deep$very$o = deep.very.o) === null || _deep$very$o === void 0 ? void 0 : _deep$very$o.Foo) === null || _deep$very$o$Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o$Foo, Foo, _m).call(_deep$very$o$Foo); + (_deep$very$o$Foo2 = deep === null || deep === void 0 ? void 0 : (_deep$very$o2 = deep.very.o) === null || _deep$very$o2 === void 0 ? void 0 : _deep$very$o2.Foo) === null || _deep$very$o$Foo2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o$Foo2, Foo, _m).call(_deep$very$o$Foo2).toString; + (_deep$very$o$Foo3 = deep === null || deep === void 0 ? void 0 : (_deep$very$o3 = deep.very.o) === null || _deep$very$o3 === void 0 ? void 0 : _deep$very$o3.Foo) === null || _deep$very$o$Foo3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o$Foo3, Foo, _m).call(_deep$very$o$Foo3).toString(); + (_ref = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref, Foo, _m).call(_ref); + (_ref2 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) === null || _ref2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref2, Foo, _m).call(_ref2); + (_self2 = (_ref7 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref7 === void 0 ? void 0 : _ref7.self) === null || _self2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self2, Foo, _m).call(_self2); + (_self3 = (_ref8 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) === null || _ref8 === void 0 ? void 0 : _ref8.self) === null || _self3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self3, Foo, _m).call(_self3); + (_self$self = (_ref9 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref9 === void 0 ? void 0 : (_ref9$self = _ref9.self) === null || _ref9$self === void 0 ? void 0 : _ref9$self.self) === null || _self$self === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self$self, Foo, _m).call(_self$self); + (_ref3 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) === null || _ref3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref3, Foo, _m).call(_ref3); + (_call = (_ref10 = o === null || o === void 0 ? void 0 : (_babelHelpers$classSt = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref10 === void 0 ? void 0 : _ref10.call(_babelHelpers$classSt)) === null || _call === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call, Foo, _m).call(_call); + (_getSelf = (_ref11 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref11 === void 0 ? void 0 : _ref11.getSelf()) === null || _getSelf === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf, Foo, _m).call(_getSelf); + (_getSelf2 = (_ref12 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref12 === void 0 ? void 0 : (_ref12$getSelf = _ref12.getSelf) === null || _ref12$getSelf === void 0 ? void 0 : _ref12$getSelf.call(_ref12)) === null || _getSelf2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf2, Foo, _m).call(_getSelf2); + (_self4 = (_ref13 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) === null || _ref13 === void 0 ? void 0 : _ref13.self) === null || _self4 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self4, Foo, _m).call(_self4); + (_call$self = (_ref14 = o === null || o === void 0 ? void 0 : (_babelHelpers$classSt2 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref14 === void 0 ? void 0 : (_ref14$call = _ref14.call(_babelHelpers$classSt2)) === null || _ref14$call === void 0 ? void 0 : _ref14$call.self) === null || _call$self === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call$self, Foo, _m).call(_call$self); + (_getSelf$self = (_ref15 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref15 === void 0 ? void 0 : (_ref15$getSelf = _ref15.getSelf()) === null || _ref15$getSelf === void 0 ? void 0 : _ref15$getSelf.self) === null || _getSelf$self === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf$self, Foo, _m).call(_getSelf$self); + (_getSelf$self2 = (_ref16 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref16 === void 0 ? void 0 : (_ref16$getSelf = _ref16.getSelf) === null || _ref16$getSelf === void 0 ? void 0 : (_ref16$getSelf$call = _ref16$getSelf.call(_ref16)) === null || _ref16$getSelf$call === void 0 ? void 0 : _ref16$getSelf$call.self) === null || _getSelf$self2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf$self2, Foo, _m).call(_getSelf$self2); + (_fn$Foo = fn === null || fn === void 0 ? void 0 : fn().Foo) === null || _fn$Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo, Foo, _m).call(_fn$Foo); + (_fn$Foo2 = fn === null || fn === void 0 ? void 0 : fn().Foo) === null || _fn$Foo2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo2, Foo, _m).call(_fn$Foo2).toString; + (_fn$Foo3 = fn === null || fn === void 0 ? void 0 : fn().Foo) === null || _fn$Foo3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo3, Foo, _m).call(_fn$Foo3).toString(); + (_fnDeep$very$o$Foo = fnDeep === null || fnDeep === void 0 ? void 0 : (_fnDeep$very$o = fnDeep().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : _fnDeep$very$o.Foo) === null || _fnDeep$very$o$Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo, Foo, _m).call(_fnDeep$very$o$Foo); + (_fnDeep$very$o$Foo2 = fnDeep === null || fnDeep === void 0 ? void 0 : (_fnDeep$very$o2 = fnDeep().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : _fnDeep$very$o2.Foo) === null || _fnDeep$very$o$Foo2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo2, Foo, _m).call(_fnDeep$very$o$Foo2).toString; + (_fnDeep$very$o$Foo3 = fnDeep === null || fnDeep === void 0 ? void 0 : (_fnDeep$very$o3 = fnDeep().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : _fnDeep$very$o3.Foo) === null || _fnDeep$very$o$Foo3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo3, Foo, _m).call(_fnDeep$very$o$Foo3).toString(); + (_ref4 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref4 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref4, Foo, _m).call(_ref4); + (_ref5 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) === null || _ref5 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref5, Foo, _m).call(_ref5); + (_self5 = (_ref17 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref17 === void 0 ? void 0 : _ref17.self) === null || _self5 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self5, Foo, _m).call(_self5); + (_self6 = (_ref18 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) === null || _ref18 === void 0 ? void 0 : _ref18.self) === null || _self6 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self6, Foo, _m).call(_self6); + (_self$self2 = (_ref19 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref19 === void 0 ? void 0 : (_ref19$self = _ref19.self) === null || _ref19$self === void 0 ? void 0 : _ref19$self.self) === null || _self$self2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self$self2, Foo, _m).call(_self$self2); + (_ref6 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) === null || _ref6 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref6, Foo, _m).call(_ref6); + (_call2 = (_ref20 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt3 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref20 === void 0 ? void 0 : _ref20.call(_babelHelpers$classSt3)) === null || _call2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call2, Foo, _m).call(_call2); + (_getSelf3 = (_ref21 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref21 === void 0 ? void 0 : _ref21.getSelf()) === null || _getSelf3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf3, Foo, _m).call(_getSelf3); + (_getSelf4 = (_ref22 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref22 === void 0 ? void 0 : (_ref22$getSelf = _ref22.getSelf) === null || _ref22$getSelf === void 0 ? void 0 : _ref22$getSelf.call(_ref22)) === null || _getSelf4 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf4, Foo, _m).call(_getSelf4); + (_self7 = (_ref23 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) === null || _ref23 === void 0 ? void 0 : _ref23.self) === null || _self7 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self7, Foo, _m).call(_self7); + (_call$self2 = (_ref24 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt4 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref24 === void 0 ? void 0 : (_ref24$call = _ref24.call(_babelHelpers$classSt4)) === null || _ref24$call === void 0 ? void 0 : _ref24$call.self) === null || _call$self2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call$self2, Foo, _m).call(_call$self2); + (_getSelf$self3 = (_ref25 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref25 === void 0 ? void 0 : (_ref25$getSelf = _ref25.getSelf()) === null || _ref25$getSelf === void 0 ? void 0 : _ref25$getSelf.self) === null || _getSelf$self3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf$self3, Foo, _m).call(_getSelf$self3); + (_getSelf$self4 = (_ref26 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref26 === void 0 ? void 0 : (_ref26$getSelf = _ref26.getSelf) === null || _ref26$getSelf === void 0 ? void 0 : (_ref26$getSelf$call = _ref26$getSelf.call(_ref26)) === null || _ref26$getSelf$call === void 0 ? void 0 : _ref26$getSelf$call.self) === null || _getSelf$self4 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf$self4, Foo, _m).call(_getSelf$self4); } } @@ -79,14 +75,12 @@ var _x = { var _m = { writable: true, value: function () { - return _classStaticPrivateFieldSpecGet(this, Foo, _x); + return babelHelpers.classStaticPrivateFieldSpecGet(this, Foo, _x); } }; var _self = { writable: true, value: Foo }; - -_defineProperty(Foo, "self", Foo); - +babelHelpers.defineProperty(Foo, "self", Foo); Foo.test(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-optional-member-call/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-optional-member-call/output.js index c5d75bcaca..8832def509 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-optional-member-call/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-optional-member-call/output.js @@ -1,14 +1,10 @@ -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _classStaticPrivateFieldSpecGet(receiver, classConstructor, descriptor) { if (receiver !== classConstructor) { throw new TypeError("Private static access of wrong provenance"); } if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; } - class Foo { static getSelf() { return this; } static test() { - var _o$Foo, _o$Foo2, _o$Foo3, _deep$very$o, _deep$very$o$Foo, _deep$very$o2, _deep$very$o2$Foo, _deep$very$o3, _deep$very$o3$Foo, _classStaticPrivateFi, _classStaticPrivateFi2, _ref, _ref$self, _ref2, _ref2$self, _self2, _self2$self, _classStaticPrivateFi3, _classStaticPrivateFi4, _ref3, _ref3$call, _ref4, _ref4$getSelf, _getSelf, _ref5, _getSelf$call, _ref6, _ref6$self, _classStaticPrivateFi5, _call, _call$self, _getSelf2, _getSelf2$self, _getSelf3, _getSelf3$self, _fn$Foo, _fn$Foo2, _fn$Foo3, _fnDeep$very$o, _fnDeep$very$o$Foo, _fnDeep$very$o2, _fnDeep$very$o2$Foo, _fnDeep$very$o3, _fnDeep$very$o3$Foo, _classStaticPrivateFi6, _classStaticPrivateFi7, _ref7, _ref7$self, _ref8, _ref8$self, _self3, _self3$self, _classStaticPrivateFi8, _classStaticPrivateFi9, _ref9, _ref9$call, _ref10, _ref10$getSelf, _getSelf4, _ref11, _getSelf4$call, _ref12, _ref12$self, _classStaticPrivateFi10, _call2, _call2$self, _getSelf5, _getSelf5$self, _getSelf6, _getSelf6$self; + var _o$Foo, _o$Foo2, _o$Foo3, _deep$very$o, _deep$very$o$Foo, _deep$very$o2, _deep$very$o2$Foo, _deep$very$o3, _deep$very$o3$Foo, _babelHelpers$classSt, _babelHelpers$classSt2, _ref, _ref$self, _ref2, _ref2$self, _self2, _self2$self, _babelHelpers$classSt3, _babelHelpers$classSt4, _ref3, _ref3$call, _ref4, _ref4$getSelf, _getSelf, _ref5, _getSelf$call, _ref6, _ref6$self, _babelHelpers$classSt5, _call, _call$self, _getSelf2, _getSelf2$self, _getSelf3, _getSelf3$self, _fn$Foo, _fn$Foo2, _fn$Foo3, _fnDeep$very$o, _fnDeep$very$o$Foo, _fnDeep$very$o2, _fnDeep$very$o2$Foo, _fnDeep$very$o3, _fnDeep$very$o3$Foo, _babelHelpers$classSt6, _babelHelpers$classSt7, _ref7, _ref7$self, _ref8, _ref8$self, _self3, _self3$self, _babelHelpers$classSt8, _babelHelpers$classSt9, _ref9, _ref9$call, _ref10, _ref10$getSelf, _getSelf4, _ref11, _getSelf4$call, _ref12, _ref12$self, _babelHelpers$classSt10, _call2, _call2$self, _getSelf5, _getSelf5$self, _getSelf6, _getSelf6$self; const o = { Foo: Foo @@ -27,47 +23,47 @@ class Foo { return deep; } - Foo === null || Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(Foo, Foo, _m).call(Foo); - Foo === null || Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(Foo, Foo, _m).call(Foo).toString; - Foo === null || Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(Foo, Foo, _m).call(Foo).toString(); - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo = o.Foo, Foo, _m).call(_o$Foo); - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo2 = o.Foo, Foo, _m).call(_o$Foo2).toString; - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo3 = o.Foo, Foo, _m).call(_o$Foo3).toString(); - (_deep$very$o = deep?.very.o) === null || _deep$very$o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o$Foo = _deep$very$o.Foo, Foo, _m).call(_deep$very$o$Foo); - (_deep$very$o2 = deep?.very.o) === null || _deep$very$o2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o2$Foo = _deep$very$o2.Foo, Foo, _m).call(_deep$very$o2$Foo).toString; - (_deep$very$o3 = deep?.very.o) === null || _deep$very$o3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o3$Foo = _deep$very$o3.Foo, Foo, _m).call(_deep$very$o3$Foo).toString(); - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self), Foo, _m).call(_classStaticPrivateFi); - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi2 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self, Foo, _m).call(_classStaticPrivateFi2); - (_ref = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref$self = _ref.self, Foo, _m).call(_ref$self); - (_ref2 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) === null || _ref2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref2$self = _ref2.self, Foo, _m).call(_ref2$self); - (_self2 = (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.self) === null || _self2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self2$self = _self2.self, Foo, _m).call(_self2$self); - o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi3 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf(), Foo, _m).call(_classStaticPrivateFi3); - (_ref3 = o === null || o === void 0 ? void 0 : (_classStaticPrivateFi4 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref3$call = _ref3.call(_classStaticPrivateFi4), Foo, _m).call(_ref3$call); - (_ref4 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref4 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref4$getSelf = _ref4.getSelf(), Foo, _m).call(_ref4$getSelf); - (_getSelf = (_ref5 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf) === null || _getSelf === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf$call = _getSelf.call(_ref5), Foo, _m).call(_getSelf$call); - (_ref6 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) === null || _ref6 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref6$self = _ref6.self, Foo, _m).call(_ref6$self); - (_call = (o === null || o === void 0 ? void 0 : (_classStaticPrivateFi5 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf)?.call(_classStaticPrivateFi5)) === null || _call === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_call$self = _call.self, Foo, _m).call(_call$self); - (_getSelf2 = (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf()) === null || _getSelf2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf2$self = _getSelf2.self, Foo, _m).call(_getSelf2$self); - (_getSelf3 = (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf?.()) === null || _getSelf3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf3$self = _getSelf3.self, Foo, _m).call(_getSelf3$self); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fn$Foo = fn().Foo, Foo, _m).call(_fn$Foo); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fn$Foo2 = fn().Foo, Foo, _m).call(_fn$Foo2).toString; - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fn$Foo3 = fn().Foo, Foo, _m).call(_fn$Foo3).toString(); - (_fnDeep$very$o = fnDeep?.().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo = _fnDeep$very$o.Foo, Foo, _m).call(_fnDeep$very$o$Foo); - (_fnDeep$very$o2 = fnDeep?.().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o2$Foo = _fnDeep$very$o2.Foo, Foo, _m).call(_fnDeep$very$o2$Foo).toString; - (_fnDeep$very$o3 = fnDeep?.().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o3$Foo = _fnDeep$very$o3.Foo, Foo, _m).call(_fnDeep$very$o3$Foo).toString(); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi6 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self), Foo, _m).call(_classStaticPrivateFi6); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi7 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self, Foo, _m).call(_classStaticPrivateFi7); - (_ref7 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref7 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref7$self = _ref7.self, Foo, _m).call(_ref7$self); - (_ref8 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) === null || _ref8 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref8$self = _ref8.self, Foo, _m).call(_ref8$self); - (_self3 = (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.self) === null || _self3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self3$self = _self3.self, Foo, _m).call(_self3$self); - fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_classStaticPrivateFi8 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf(), Foo, _m).call(_classStaticPrivateFi8); - (_ref9 = fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi9 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref9 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref9$call = _ref9.call(_classStaticPrivateFi9), Foo, _m).call(_ref9$call); - (_ref10 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref10 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref10$getSelf = _ref10.getSelf(), Foo, _m).call(_ref10$getSelf); - (_getSelf4 = (_ref11 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf) === null || _getSelf4 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf4$call = _getSelf4.call(_ref11), Foo, _m).call(_getSelf4$call); - (_ref12 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) === null || _ref12 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref12$self = _ref12.self, Foo, _m).call(_ref12$self); - (_call2 = (fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi10 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf)?.call(_classStaticPrivateFi10)) === null || _call2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_call2$self = _call2.self, Foo, _m).call(_call2$self); - (_getSelf5 = (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf()) === null || _getSelf5 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf5$self = _getSelf5.self, Foo, _m).call(_getSelf5$self); - (_getSelf6 = (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf?.()) === null || _getSelf6 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf6$self = _getSelf6.self, Foo, _m).call(_getSelf6$self); + Foo === null || Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(Foo, Foo, _m).call(Foo); + Foo === null || Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(Foo, Foo, _m).call(Foo).toString; + Foo === null || Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(Foo, Foo, _m).call(Foo).toString(); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo = o.Foo, Foo, _m).call(_o$Foo); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo2 = o.Foo, Foo, _m).call(_o$Foo2).toString; + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo3 = o.Foo, Foo, _m).call(_o$Foo3).toString(); + (_deep$very$o = deep?.very.o) === null || _deep$very$o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o$Foo = _deep$very$o.Foo, Foo, _m).call(_deep$very$o$Foo); + (_deep$very$o2 = deep?.very.o) === null || _deep$very$o2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o2$Foo = _deep$very$o2.Foo, Foo, _m).call(_deep$very$o2$Foo).toString; + (_deep$very$o3 = deep?.very.o) === null || _deep$very$o3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o3$Foo = _deep$very$o3.Foo, Foo, _m).call(_deep$very$o3$Foo).toString(); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self), Foo, _m).call(_babelHelpers$classSt); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt2 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self, Foo, _m).call(_babelHelpers$classSt2); + (_ref = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref$self = _ref.self, Foo, _m).call(_ref$self); + (_ref2 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) === null || _ref2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref2$self = _ref2.self, Foo, _m).call(_ref2$self); + (_self2 = (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.self) === null || _self2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self2$self = _self2.self, Foo, _m).call(_self2$self); + o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt3 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf(), Foo, _m).call(_babelHelpers$classSt3); + (_ref3 = o === null || o === void 0 ? void 0 : (_babelHelpers$classSt4 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref3$call = _ref3.call(_babelHelpers$classSt4), Foo, _m).call(_ref3$call); + (_ref4 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref4 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref4$getSelf = _ref4.getSelf(), Foo, _m).call(_ref4$getSelf); + (_getSelf = (_ref5 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf) === null || _getSelf === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf$call = _getSelf.call(_ref5), Foo, _m).call(_getSelf$call); + (_ref6 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) === null || _ref6 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref6$self = _ref6.self, Foo, _m).call(_ref6$self); + (_call = (o === null || o === void 0 ? void 0 : (_babelHelpers$classSt5 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf)?.call(_babelHelpers$classSt5)) === null || _call === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call$self = _call.self, Foo, _m).call(_call$self); + (_getSelf2 = (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf()) === null || _getSelf2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf2$self = _getSelf2.self, Foo, _m).call(_getSelf2$self); + (_getSelf3 = (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf?.()) === null || _getSelf3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf3$self = _getSelf3.self, Foo, _m).call(_getSelf3$self); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo = fn().Foo, Foo, _m).call(_fn$Foo); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo2 = fn().Foo, Foo, _m).call(_fn$Foo2).toString; + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo3 = fn().Foo, Foo, _m).call(_fn$Foo3).toString(); + (_fnDeep$very$o = fnDeep?.().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo = _fnDeep$very$o.Foo, Foo, _m).call(_fnDeep$very$o$Foo); + (_fnDeep$very$o2 = fnDeep?.().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o2$Foo = _fnDeep$very$o2.Foo, Foo, _m).call(_fnDeep$very$o2$Foo).toString; + (_fnDeep$very$o3 = fnDeep?.().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o3$Foo = _fnDeep$very$o3.Foo, Foo, _m).call(_fnDeep$very$o3$Foo).toString(); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt6 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self), Foo, _m).call(_babelHelpers$classSt6); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt7 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self, Foo, _m).call(_babelHelpers$classSt7); + (_ref7 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref7 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref7$self = _ref7.self, Foo, _m).call(_ref7$self); + (_ref8 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) === null || _ref8 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref8$self = _ref8.self, Foo, _m).call(_ref8$self); + (_self3 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.self) === null || _self3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self3$self = _self3.self, Foo, _m).call(_self3$self); + fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_babelHelpers$classSt8 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf(), Foo, _m).call(_babelHelpers$classSt8); + (_ref9 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt9 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref9 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref9$call = _ref9.call(_babelHelpers$classSt9), Foo, _m).call(_ref9$call); + (_ref10 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref10 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref10$getSelf = _ref10.getSelf(), Foo, _m).call(_ref10$getSelf); + (_getSelf4 = (_ref11 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf) === null || _getSelf4 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf4$call = _getSelf4.call(_ref11), Foo, _m).call(_getSelf4$call); + (_ref12 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) === null || _ref12 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref12$self = _ref12.self, Foo, _m).call(_ref12$self); + (_call2 = (fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt10 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf)?.call(_babelHelpers$classSt10)) === null || _call2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call2$self = _call2.self, Foo, _m).call(_call2$self); + (_getSelf5 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf()) === null || _getSelf5 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf5$self = _getSelf5.self, Foo, _m).call(_getSelf5$self); + (_getSelf6 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf?.()) === null || _getSelf6 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf6$self = _getSelf6.self, Foo, _m).call(_getSelf6$self); } } @@ -79,14 +75,12 @@ var _x = { var _m = { writable: true, value: function () { - return _classStaticPrivateFieldSpecGet(this, Foo, _x); + return babelHelpers.classStaticPrivateFieldSpecGet(this, Foo, _x); } }; var _self = { writable: true, value: Foo }; - -_defineProperty(Foo, "self", Foo); - +babelHelpers.defineProperty(Foo, "self", Foo); Foo.test(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-optional-property-with-transform/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-optional-property-with-transform/output.js index be682ce43b..d68c1d785d 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-optional-property-with-transform/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-optional-property-with-transform/output.js @@ -1,14 +1,10 @@ -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _classStaticPrivateFieldSpecGet(receiver, classConstructor, descriptor) { if (receiver !== classConstructor) { throw new TypeError("Private static access of wrong provenance"); } if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; } - class Foo { static getSelf() { return this; } static test() { - var _o$Foo, _o$Foo2, _o$Foo3, _deep$very$o$Foo, _deep$very$o$Foo2, _deep$very$o$Foo3, _ref, _ref2, _self2, _self3, _self$self, _ref3, _classStaticPrivateFi, _call, _getSelf, _getSelf2, _self4, _classStaticPrivateFi2, _call$self, _getSelf$self, _getSelf$self2, _fn$Foo, _fn$Foo2, _fn$Foo3, _fnDeep$very$o$Foo, _fnDeep$very$o$Foo2, _fnDeep$very$o$Foo3, _ref4, _ref5, _self5, _self6, _self$self2, _ref6, _classStaticPrivateFi3, _call2, _getSelf3, _getSelf4, _self7, _classStaticPrivateFi4, _call$self2, _getSelf$self3, _getSelf$self4, _deep$very$o, _deep$very$o2, _deep$very$o3, _ref7, _ref8, _ref9, _ref9$self, _ref10, _ref11, _ref12, _ref12$getSelf, _ref13, _ref14, _ref14$call, _ref15, _ref15$getSelf, _ref16, _ref16$getSelf, _ref16$getSelf$call, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _ref17, _ref18, _ref19, _ref19$self, _ref20, _ref21, _ref22, _ref22$getSelf, _ref23, _ref24, _ref24$call, _ref25, _ref25$getSelf, _ref26, _ref26$getSelf, _ref26$getSelf$call; + var _o$Foo, _o$Foo2, _o$Foo3, _deep$very$o$Foo, _deep$very$o$Foo2, _deep$very$o$Foo3, _ref, _ref2, _self2, _self3, _self$self, _ref3, _babelHelpers$classSt, _call, _getSelf, _getSelf2, _self4, _babelHelpers$classSt2, _call$self, _getSelf$self, _getSelf$self2, _fn$Foo, _fn$Foo2, _fn$Foo3, _fnDeep$very$o$Foo, _fnDeep$very$o$Foo2, _fnDeep$very$o$Foo3, _ref4, _ref5, _self5, _self6, _self$self2, _ref6, _babelHelpers$classSt3, _call2, _getSelf3, _getSelf4, _self7, _babelHelpers$classSt4, _call$self2, _getSelf$self3, _getSelf$self4, _deep$very$o, _deep$very$o2, _deep$very$o3, _ref7, _ref8, _ref9, _ref9$self, _ref10, _ref11, _ref12, _ref12$getSelf, _ref13, _ref14, _ref14$call, _ref15, _ref15$getSelf, _ref16, _ref16$getSelf, _ref16$getSelf$call, _fnDeep$very$o, _fnDeep$very$o2, _fnDeep$very$o3, _ref17, _ref18, _ref19, _ref19$self, _ref20, _ref21, _ref22, _ref22$getSelf, _ref23, _ref24, _ref24$call, _ref25, _ref25$getSelf, _ref26, _ref26$getSelf, _ref26$getSelf$call; const o = { Foo: Foo @@ -27,47 +23,47 @@ class Foo { return deep; } - Foo === null || Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(Foo, Foo, _x); - Foo === null || Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(Foo, Foo, _x).toString; - Foo === null || Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(Foo, Foo, _x).toString(); - (_o$Foo = o === null || o === void 0 ? void 0 : o.Foo) === null || _o$Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo, Foo, _x); - (_o$Foo2 = o === null || o === void 0 ? void 0 : o.Foo) === null || _o$Foo2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo2, Foo, _x).toString; - (_o$Foo3 = o === null || o === void 0 ? void 0 : o.Foo) === null || _o$Foo3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo3, Foo, _x).toString(); - (_deep$very$o$Foo = deep === null || deep === void 0 ? void 0 : (_deep$very$o = deep.very.o) === null || _deep$very$o === void 0 ? void 0 : _deep$very$o.Foo) === null || _deep$very$o$Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o$Foo, Foo, _x); - (_deep$very$o$Foo2 = deep === null || deep === void 0 ? void 0 : (_deep$very$o2 = deep.very.o) === null || _deep$very$o2 === void 0 ? void 0 : _deep$very$o2.Foo) === null || _deep$very$o$Foo2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o$Foo2, Foo, _x).toString; - (_deep$very$o$Foo3 = deep === null || deep === void 0 ? void 0 : (_deep$very$o3 = deep.very.o) === null || _deep$very$o3 === void 0 ? void 0 : _deep$very$o3.Foo) === null || _deep$very$o$Foo3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o$Foo3, Foo, _x).toString(); - (_ref = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref, Foo, _x); - (_ref2 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) === null || _ref2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref2, Foo, _x); - (_self2 = (_ref7 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref7 === void 0 ? void 0 : _ref7.self) === null || _self2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self2, Foo, _x); - (_self3 = (_ref8 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) === null || _ref8 === void 0 ? void 0 : _ref8.self) === null || _self3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self3, Foo, _x); - (_self$self = (_ref9 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref9 === void 0 ? void 0 : (_ref9$self = _ref9.self) === null || _ref9$self === void 0 ? void 0 : _ref9$self.self) === null || _self$self === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self$self, Foo, _x); - (_ref3 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) === null || _ref3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref3, Foo, _x); - (_call = (_ref10 = o === null || o === void 0 ? void 0 : (_classStaticPrivateFi = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref10 === void 0 ? void 0 : _ref10.call(_classStaticPrivateFi)) === null || _call === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_call, Foo, _x); - (_getSelf = (_ref11 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref11 === void 0 ? void 0 : _ref11.getSelf()) === null || _getSelf === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf, Foo, _x); - (_getSelf2 = (_ref12 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref12 === void 0 ? void 0 : (_ref12$getSelf = _ref12.getSelf) === null || _ref12$getSelf === void 0 ? void 0 : _ref12$getSelf.call(_ref12)) === null || _getSelf2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf2, Foo, _x); - (_self4 = (_ref13 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) === null || _ref13 === void 0 ? void 0 : _ref13.self) === null || _self4 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self4, Foo, _x); - (_call$self = (_ref14 = o === null || o === void 0 ? void 0 : (_classStaticPrivateFi2 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref14 === void 0 ? void 0 : (_ref14$call = _ref14.call(_classStaticPrivateFi2)) === null || _ref14$call === void 0 ? void 0 : _ref14$call.self) === null || _call$self === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_call$self, Foo, _x); - (_getSelf$self = (_ref15 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref15 === void 0 ? void 0 : (_ref15$getSelf = _ref15.getSelf()) === null || _ref15$getSelf === void 0 ? void 0 : _ref15$getSelf.self) === null || _getSelf$self === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf$self, Foo, _x); - (_getSelf$self2 = (_ref16 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref16 === void 0 ? void 0 : (_ref16$getSelf = _ref16.getSelf) === null || _ref16$getSelf === void 0 ? void 0 : (_ref16$getSelf$call = _ref16$getSelf.call(_ref16)) === null || _ref16$getSelf$call === void 0 ? void 0 : _ref16$getSelf$call.self) === null || _getSelf$self2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf$self2, Foo, _x); - (_fn$Foo = fn === null || fn === void 0 ? void 0 : fn().Foo) === null || _fn$Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fn$Foo, Foo, _x); - (_fn$Foo2 = fn === null || fn === void 0 ? void 0 : fn().Foo) === null || _fn$Foo2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fn$Foo2, Foo, _x).toString; - (_fn$Foo3 = fn === null || fn === void 0 ? void 0 : fn().Foo) === null || _fn$Foo3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fn$Foo3, Foo, _x).toString(); - (_fnDeep$very$o$Foo = fnDeep === null || fnDeep === void 0 ? void 0 : (_fnDeep$very$o = fnDeep().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : _fnDeep$very$o.Foo) === null || _fnDeep$very$o$Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo, Foo, _x); - (_fnDeep$very$o$Foo2 = fnDeep === null || fnDeep === void 0 ? void 0 : (_fnDeep$very$o2 = fnDeep().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : _fnDeep$very$o2.Foo) === null || _fnDeep$very$o$Foo2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo2, Foo, _x).toString; - (_fnDeep$very$o$Foo3 = fnDeep === null || fnDeep === void 0 ? void 0 : (_fnDeep$very$o3 = fnDeep().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : _fnDeep$very$o3.Foo) === null || _fnDeep$very$o$Foo3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo3, Foo, _x).toString(); - (_ref4 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref4 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref4, Foo, _x); - (_ref5 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) === null || _ref5 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref5, Foo, _x); - (_self5 = (_ref17 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref17 === void 0 ? void 0 : _ref17.self) === null || _self5 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self5, Foo, _x); - (_self6 = (_ref18 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) === null || _ref18 === void 0 ? void 0 : _ref18.self) === null || _self6 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self6, Foo, _x); - (_self$self2 = (_ref19 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref19 === void 0 ? void 0 : (_ref19$self = _ref19.self) === null || _ref19$self === void 0 ? void 0 : _ref19$self.self) === null || _self$self2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self$self2, Foo, _x); - (_ref6 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) === null || _ref6 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref6, Foo, _x); - (_call2 = (_ref20 = fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi3 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref20 === void 0 ? void 0 : _ref20.call(_classStaticPrivateFi3)) === null || _call2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_call2, Foo, _x); - (_getSelf3 = (_ref21 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref21 === void 0 ? void 0 : _ref21.getSelf()) === null || _getSelf3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf3, Foo, _x); - (_getSelf4 = (_ref22 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref22 === void 0 ? void 0 : (_ref22$getSelf = _ref22.getSelf) === null || _ref22$getSelf === void 0 ? void 0 : _ref22$getSelf.call(_ref22)) === null || _getSelf4 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf4, Foo, _x); - (_self7 = (_ref23 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) === null || _ref23 === void 0 ? void 0 : _ref23.self) === null || _self7 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self7, Foo, _x); - (_call$self2 = (_ref24 = fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi4 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref24 === void 0 ? void 0 : (_ref24$call = _ref24.call(_classStaticPrivateFi4)) === null || _ref24$call === void 0 ? void 0 : _ref24$call.self) === null || _call$self2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_call$self2, Foo, _x); - (_getSelf$self3 = (_ref25 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref25 === void 0 ? void 0 : (_ref25$getSelf = _ref25.getSelf()) === null || _ref25$getSelf === void 0 ? void 0 : _ref25$getSelf.self) === null || _getSelf$self3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf$self3, Foo, _x); - (_getSelf$self4 = (_ref26 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref26 === void 0 ? void 0 : (_ref26$getSelf = _ref26.getSelf) === null || _ref26$getSelf === void 0 ? void 0 : (_ref26$getSelf$call = _ref26$getSelf.call(_ref26)) === null || _ref26$getSelf$call === void 0 ? void 0 : _ref26$getSelf$call.self) === null || _getSelf$self4 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf$self4, Foo, _x); + Foo === null || Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(Foo, Foo, _x); + Foo === null || Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(Foo, Foo, _x).toString; + Foo === null || Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(Foo, Foo, _x).toString(); + (_o$Foo = o === null || o === void 0 ? void 0 : o.Foo) === null || _o$Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo, Foo, _x); + (_o$Foo2 = o === null || o === void 0 ? void 0 : o.Foo) === null || _o$Foo2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo2, Foo, _x).toString; + (_o$Foo3 = o === null || o === void 0 ? void 0 : o.Foo) === null || _o$Foo3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo3, Foo, _x).toString(); + (_deep$very$o$Foo = deep === null || deep === void 0 ? void 0 : (_deep$very$o = deep.very.o) === null || _deep$very$o === void 0 ? void 0 : _deep$very$o.Foo) === null || _deep$very$o$Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o$Foo, Foo, _x); + (_deep$very$o$Foo2 = deep === null || deep === void 0 ? void 0 : (_deep$very$o2 = deep.very.o) === null || _deep$very$o2 === void 0 ? void 0 : _deep$very$o2.Foo) === null || _deep$very$o$Foo2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o$Foo2, Foo, _x).toString; + (_deep$very$o$Foo3 = deep === null || deep === void 0 ? void 0 : (_deep$very$o3 = deep.very.o) === null || _deep$very$o3 === void 0 ? void 0 : _deep$very$o3.Foo) === null || _deep$very$o$Foo3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o$Foo3, Foo, _x).toString(); + (_ref = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref, Foo, _x); + (_ref2 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) === null || _ref2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref2, Foo, _x); + (_self2 = (_ref7 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref7 === void 0 ? void 0 : _ref7.self) === null || _self2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self2, Foo, _x); + (_self3 = (_ref8 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) === null || _ref8 === void 0 ? void 0 : _ref8.self) === null || _self3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self3, Foo, _x); + (_self$self = (_ref9 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref9 === void 0 ? void 0 : (_ref9$self = _ref9.self) === null || _ref9$self === void 0 ? void 0 : _ref9$self.self) === null || _self$self === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self$self, Foo, _x); + (_ref3 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) === null || _ref3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref3, Foo, _x); + (_call = (_ref10 = o === null || o === void 0 ? void 0 : (_babelHelpers$classSt = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref10 === void 0 ? void 0 : _ref10.call(_babelHelpers$classSt)) === null || _call === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call, Foo, _x); + (_getSelf = (_ref11 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref11 === void 0 ? void 0 : _ref11.getSelf()) === null || _getSelf === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf, Foo, _x); + (_getSelf2 = (_ref12 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref12 === void 0 ? void 0 : (_ref12$getSelf = _ref12.getSelf) === null || _ref12$getSelf === void 0 ? void 0 : _ref12$getSelf.call(_ref12)) === null || _getSelf2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf2, Foo, _x); + (_self4 = (_ref13 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) === null || _ref13 === void 0 ? void 0 : _ref13.self) === null || _self4 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self4, Foo, _x); + (_call$self = (_ref14 = o === null || o === void 0 ? void 0 : (_babelHelpers$classSt2 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf) === null || _ref14 === void 0 ? void 0 : (_ref14$call = _ref14.call(_babelHelpers$classSt2)) === null || _ref14$call === void 0 ? void 0 : _ref14$call.self) === null || _call$self === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call$self, Foo, _x); + (_getSelf$self = (_ref15 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref15 === void 0 ? void 0 : (_ref15$getSelf = _ref15.getSelf()) === null || _ref15$getSelf === void 0 ? void 0 : _ref15$getSelf.self) === null || _getSelf$self === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf$self, Foo, _x); + (_getSelf$self2 = (_ref16 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref16 === void 0 ? void 0 : (_ref16$getSelf = _ref16.getSelf) === null || _ref16$getSelf === void 0 ? void 0 : (_ref16$getSelf$call = _ref16$getSelf.call(_ref16)) === null || _ref16$getSelf$call === void 0 ? void 0 : _ref16$getSelf$call.self) === null || _getSelf$self2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf$self2, Foo, _x); + (_fn$Foo = fn === null || fn === void 0 ? void 0 : fn().Foo) === null || _fn$Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo, Foo, _x); + (_fn$Foo2 = fn === null || fn === void 0 ? void 0 : fn().Foo) === null || _fn$Foo2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo2, Foo, _x).toString; + (_fn$Foo3 = fn === null || fn === void 0 ? void 0 : fn().Foo) === null || _fn$Foo3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo3, Foo, _x).toString(); + (_fnDeep$very$o$Foo = fnDeep === null || fnDeep === void 0 ? void 0 : (_fnDeep$very$o = fnDeep().very.o) === null || _fnDeep$very$o === void 0 ? void 0 : _fnDeep$very$o.Foo) === null || _fnDeep$very$o$Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo, Foo, _x); + (_fnDeep$very$o$Foo2 = fnDeep === null || fnDeep === void 0 ? void 0 : (_fnDeep$very$o2 = fnDeep().very.o) === null || _fnDeep$very$o2 === void 0 ? void 0 : _fnDeep$very$o2.Foo) === null || _fnDeep$very$o$Foo2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo2, Foo, _x).toString; + (_fnDeep$very$o$Foo3 = fnDeep === null || fnDeep === void 0 ? void 0 : (_fnDeep$very$o3 = fnDeep().very.o) === null || _fnDeep$very$o3 === void 0 ? void 0 : _fnDeep$very$o3.Foo) === null || _fnDeep$very$o$Foo3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo3, Foo, _x).toString(); + (_ref4 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref4 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref4, Foo, _x); + (_ref5 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) === null || _ref5 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref5, Foo, _x); + (_self5 = (_ref17 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref17 === void 0 ? void 0 : _ref17.self) === null || _self5 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self5, Foo, _x); + (_self6 = (_ref18 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) === null || _ref18 === void 0 ? void 0 : _ref18.self) === null || _self6 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self6, Foo, _x); + (_self$self2 = (_ref19 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref19 === void 0 ? void 0 : (_ref19$self = _ref19.self) === null || _ref19$self === void 0 ? void 0 : _ref19$self.self) === null || _self$self2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self$self2, Foo, _x); + (_ref6 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) === null || _ref6 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref6, Foo, _x); + (_call2 = (_ref20 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt3 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref20 === void 0 ? void 0 : _ref20.call(_babelHelpers$classSt3)) === null || _call2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call2, Foo, _x); + (_getSelf3 = (_ref21 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref21 === void 0 ? void 0 : _ref21.getSelf()) === null || _getSelf3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf3, Foo, _x); + (_getSelf4 = (_ref22 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref22 === void 0 ? void 0 : (_ref22$getSelf = _ref22.getSelf) === null || _ref22$getSelf === void 0 ? void 0 : _ref22$getSelf.call(_ref22)) === null || _getSelf4 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf4, Foo, _x); + (_self7 = (_ref23 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) === null || _ref23 === void 0 ? void 0 : _ref23.self) === null || _self7 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self7, Foo, _x); + (_call$self2 = (_ref24 = fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt4 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf) === null || _ref24 === void 0 ? void 0 : (_ref24$call = _ref24.call(_babelHelpers$classSt4)) === null || _ref24$call === void 0 ? void 0 : _ref24$call.self) === null || _call$self2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call$self2, Foo, _x); + (_getSelf$self3 = (_ref25 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref25 === void 0 ? void 0 : (_ref25$getSelf = _ref25.getSelf()) === null || _ref25$getSelf === void 0 ? void 0 : _ref25$getSelf.self) === null || _getSelf$self3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf$self3, Foo, _x); + (_getSelf$self4 = (_ref26 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref26 === void 0 ? void 0 : (_ref26$getSelf = _ref26.getSelf) === null || _ref26$getSelf === void 0 ? void 0 : (_ref26$getSelf$call = _ref26$getSelf.call(_ref26)) === null || _ref26$getSelf$call === void 0 ? void 0 : _ref26$getSelf$call.self) === null || _getSelf$self4 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf$self4, Foo, _x); } } @@ -80,7 +76,5 @@ var _self = { writable: true, value: Foo }; - -_defineProperty(Foo, "self", Foo); - +babelHelpers.defineProperty(Foo, "self", Foo); Foo.test(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-optional-property/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-optional-property/output.js index de6a92dd23..a7c2df8415 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-optional-property/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/optional-chain-optional-property/output.js @@ -1,14 +1,10 @@ -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _classStaticPrivateFieldSpecGet(receiver, classConstructor, descriptor) { if (receiver !== classConstructor) { throw new TypeError("Private static access of wrong provenance"); } if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; } - class Foo { static getSelf() { return this; } static test() { - var _o$Foo, _o$Foo2, _o$Foo3, _deep$very$o$Foo, _deep$very$o$Foo2, _deep$very$o$Foo3, _ref, _ref2, _self2, _self3, _self$self, _ref3, _classStaticPrivateFi, _call, _getSelf, _getSelf2, _self4, _classStaticPrivateFi2, _call$self, _getSelf$self, _getSelf$self2, _fn$Foo, _fn$Foo2, _fn$Foo3, _fnDeep$very$o$Foo, _fnDeep$very$o$Foo2, _fnDeep$very$o$Foo3, _ref4, _ref5, _self5, _self6, _self$self2, _ref6, _classStaticPrivateFi3, _call2, _getSelf3, _getSelf4, _self7, _classStaticPrivateFi4, _call$self2, _getSelf$self3, _getSelf$self4; + var _o$Foo, _o$Foo2, _o$Foo3, _deep$very$o$Foo, _deep$very$o$Foo2, _deep$very$o$Foo3, _ref, _ref2, _self2, _self3, _self$self, _ref3, _babelHelpers$classSt, _call, _getSelf, _getSelf2, _self4, _babelHelpers$classSt2, _call$self, _getSelf$self, _getSelf$self2, _fn$Foo, _fn$Foo2, _fn$Foo3, _fnDeep$very$o$Foo, _fnDeep$very$o$Foo2, _fnDeep$very$o$Foo3, _ref4, _ref5, _self5, _self6, _self$self2, _ref6, _babelHelpers$classSt3, _call2, _getSelf3, _getSelf4, _self7, _babelHelpers$classSt4, _call$self2, _getSelf$self3, _getSelf$self4; const o = { Foo: Foo @@ -27,47 +23,47 @@ class Foo { return deep; } - Foo === null || Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(Foo, Foo, _x); - Foo === null || Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(Foo, Foo, _x).toString; - Foo === null || Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(Foo, Foo, _x).toString(); - (_o$Foo = o?.Foo) === null || _o$Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo, Foo, _x); - (_o$Foo2 = o?.Foo) === null || _o$Foo2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo2, Foo, _x).toString; - (_o$Foo3 = o?.Foo) === null || _o$Foo3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_o$Foo3, Foo, _x).toString(); - (_deep$very$o$Foo = deep?.very.o?.Foo) === null || _deep$very$o$Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o$Foo, Foo, _x); - (_deep$very$o$Foo2 = deep?.very.o?.Foo) === null || _deep$very$o$Foo2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o$Foo2, Foo, _x).toString; - (_deep$very$o$Foo3 = deep?.very.o?.Foo) === null || _deep$very$o$Foo3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_deep$very$o$Foo3, Foo, _x).toString(); - (_ref = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref, Foo, _x); - (_ref2 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) === null || _ref2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref2, Foo, _x); - (_self2 = (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.self) === null || _self2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self2, Foo, _x); - (_self3 = (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self)?.self) === null || _self3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self3, Foo, _x); - (_self$self = (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.self?.self) === null || _self$self === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self$self, Foo, _x); - (_ref3 = o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) === null || _ref3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref3, Foo, _x); - (_call = (o === null || o === void 0 ? void 0 : (_classStaticPrivateFi = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf)?.call(_classStaticPrivateFi)) === null || _call === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_call, Foo, _x); - (_getSelf = (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf()) === null || _getSelf === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf, Foo, _x); - (_getSelf2 = (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf?.()) === null || _getSelf2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf2, Foo, _x); - (_self4 = (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf())?.self) === null || _self4 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self4, Foo, _x); - (_call$self = (o === null || o === void 0 ? void 0 : (_classStaticPrivateFi2 = _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf)?.call(_classStaticPrivateFi2)?.self) === null || _call$self === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_call$self, Foo, _x); - (_getSelf$self = (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf()?.self) === null || _getSelf$self === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf$self, Foo, _x); - (_getSelf$self2 = (o === null || o === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf?.()?.self) === null || _getSelf$self2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf$self2, Foo, _x); - (_fn$Foo = fn?.().Foo) === null || _fn$Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fn$Foo, Foo, _x); - (_fn$Foo2 = fn?.().Foo) === null || _fn$Foo2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fn$Foo2, Foo, _x).toString; - (_fn$Foo3 = fn?.().Foo) === null || _fn$Foo3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fn$Foo3, Foo, _x).toString(); - (_fnDeep$very$o$Foo = fnDeep?.().very.o?.Foo) === null || _fnDeep$very$o$Foo === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo, Foo, _x); - (_fnDeep$very$o$Foo2 = fnDeep?.().very.o?.Foo) === null || _fnDeep$very$o$Foo2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo2, Foo, _x).toString; - (_fnDeep$very$o$Foo3 = fnDeep?.().very.o?.Foo) === null || _fnDeep$very$o$Foo3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo3, Foo, _x).toString(); - (_ref4 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref4 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref4, Foo, _x); - (_ref5 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) === null || _ref5 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref5, Foo, _x); - (_self5 = (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.self) === null || _self5 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self5, Foo, _x); - (_self6 = (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self)?.self) === null || _self6 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self6, Foo, _x); - (_self$self2 = (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.self?.self) === null || _self$self2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self$self2, Foo, _x); - (_ref6 = fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) === null || _ref6 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_ref6, Foo, _x); - (_call2 = (fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi3 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf)?.call(_classStaticPrivateFi3)) === null || _call2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_call2, Foo, _x); - (_getSelf3 = (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf()) === null || _getSelf3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf3, Foo, _x); - (_getSelf4 = (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf?.()) === null || _getSelf4 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf4, Foo, _x); - (_self7 = (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf())?.self) === null || _self7 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_self7, Foo, _x); - (_call$self2 = (fn === null || fn === void 0 ? void 0 : (_classStaticPrivateFi4 = _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf)?.call(_classStaticPrivateFi4)?.self) === null || _call$self2 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_call$self2, Foo, _x); - (_getSelf$self3 = (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf()?.self) === null || _getSelf$self3 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf$self3, Foo, _x); - (_getSelf$self4 = (fn === null || fn === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf?.()?.self) === null || _getSelf$self4 === void 0 ? void 0 : _classStaticPrivateFieldSpecGet(_getSelf$self4, Foo, _x); + Foo === null || Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(Foo, Foo, _x); + Foo === null || Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(Foo, Foo, _x).toString; + Foo === null || Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(Foo, Foo, _x).toString(); + (_o$Foo = o?.Foo) === null || _o$Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo, Foo, _x); + (_o$Foo2 = o?.Foo) === null || _o$Foo2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo2, Foo, _x).toString; + (_o$Foo3 = o?.Foo) === null || _o$Foo3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_o$Foo3, Foo, _x).toString(); + (_deep$very$o$Foo = deep?.very.o?.Foo) === null || _deep$very$o$Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o$Foo, Foo, _x); + (_deep$very$o$Foo2 = deep?.very.o?.Foo) === null || _deep$very$o$Foo2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o$Foo2, Foo, _x).toString; + (_deep$very$o$Foo3 = deep?.very.o?.Foo) === null || _deep$very$o$Foo3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_deep$very$o$Foo3, Foo, _x).toString(); + (_ref = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)) === null || _ref === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref, Foo, _x); + (_ref2 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self) === null || _ref2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref2, Foo, _x); + (_self2 = (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.self) === null || _self2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self2, Foo, _x); + (_self3 = (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).self)?.self) === null || _self3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self3, Foo, _x); + (_self$self = (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.self?.self) === null || _self$self === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self$self, Foo, _x); + (_ref3 = o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf()) === null || _ref3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref3, Foo, _x); + (_call = (o === null || o === void 0 ? void 0 : (_babelHelpers$classSt = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf)?.call(_babelHelpers$classSt)) === null || _call === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call, Foo, _x); + (_getSelf = (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf()) === null || _getSelf === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf, Foo, _x); + (_getSelf2 = (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf?.()) === null || _getSelf2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf2, Foo, _x); + (_self4 = (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self).getSelf())?.self) === null || _self4 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self4, Foo, _x); + (_call$self = (o === null || o === void 0 ? void 0 : (_babelHelpers$classSt2 = babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self)).getSelf)?.call(_babelHelpers$classSt2)?.self) === null || _call$self === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call$self, Foo, _x); + (_getSelf$self = (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf()?.self) === null || _getSelf$self === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf$self, Foo, _x); + (_getSelf$self2 = (o === null || o === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(o.Foo, Foo, _self))?.getSelf?.()?.self) === null || _getSelf$self2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf$self2, Foo, _x); + (_fn$Foo = fn?.().Foo) === null || _fn$Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo, Foo, _x); + (_fn$Foo2 = fn?.().Foo) === null || _fn$Foo2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo2, Foo, _x).toString; + (_fn$Foo3 = fn?.().Foo) === null || _fn$Foo3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fn$Foo3, Foo, _x).toString(); + (_fnDeep$very$o$Foo = fnDeep?.().very.o?.Foo) === null || _fnDeep$very$o$Foo === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo, Foo, _x); + (_fnDeep$very$o$Foo2 = fnDeep?.().very.o?.Foo) === null || _fnDeep$very$o$Foo2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo2, Foo, _x).toString; + (_fnDeep$very$o$Foo3 = fnDeep?.().very.o?.Foo) === null || _fnDeep$very$o$Foo3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_fnDeep$very$o$Foo3, Foo, _x).toString(); + (_ref4 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)) === null || _ref4 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref4, Foo, _x); + (_ref5 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self) === null || _ref5 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref5, Foo, _x); + (_self5 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.self) === null || _self5 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self5, Foo, _x); + (_self6 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).self)?.self) === null || _self6 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self6, Foo, _x); + (_self$self2 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.self?.self) === null || _self$self2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self$self2, Foo, _x); + (_ref6 = fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf()) === null || _ref6 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_ref6, Foo, _x); + (_call2 = (fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt3 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf)?.call(_babelHelpers$classSt3)) === null || _call2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call2, Foo, _x); + (_getSelf3 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf()) === null || _getSelf3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf3, Foo, _x); + (_getSelf4 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf?.()) === null || _getSelf4 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf4, Foo, _x); + (_self7 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self).getSelf())?.self) === null || _self7 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_self7, Foo, _x); + (_call$self2 = (fn === null || fn === void 0 ? void 0 : (_babelHelpers$classSt4 = babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self)).getSelf)?.call(_babelHelpers$classSt4)?.self) === null || _call$self2 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_call$self2, Foo, _x); + (_getSelf$self3 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf()?.self) === null || _getSelf$self3 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf$self3, Foo, _x); + (_getSelf$self4 = (fn === null || fn === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(fn().Foo, Foo, _self))?.getSelf?.()?.self) === null || _getSelf$self4 === void 0 ? void 0 : babelHelpers.classStaticPrivateFieldSpecGet(_getSelf$self4, Foo, _x); } } @@ -80,7 +76,5 @@ var _self = { writable: true, value: Foo }; - -_defineProperty(Foo, "self", Foo); - +babelHelpers.defineProperty(Foo, "self", Foo); Foo.test(); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/options.json index 1b96399c59..b3ebb3f37f 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], "proposal-class-properties", "transform-classes", "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/parenthesized-optional-member-call-with-transform/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/parenthesized-optional-member-call-with-transform/options.json index 6dbfa5c4c8..f69346c2f1 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/parenthesized-optional-member-call-with-transform/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/parenthesized-optional-member-call-with-transform/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - "proposal-class-properties", - "proposal-optional-chaining" - ] + "plugins": ["proposal-class-properties", "proposal-optional-chaining"] } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/parenthesized-optional-member-call/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/parenthesized-optional-member-call/options.json index 88c37f66ee..3b59e1bbfc 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/parenthesized-optional-member-call/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/parenthesized-optional-member-call/options.json @@ -1,7 +1,4 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - "proposal-class-properties" - ], + "plugins": ["proposal-class-properties"], "minNodeVersion": "14.0.0" } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/reevaluated/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/reevaluated/options.json index 668d1445ba..7440c2aa70 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/reevaluated/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/reevaluated/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.0.2" - } - ], "proposal-class-properties", "transform-block-scoping", "syntax-class-properties" diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/regression-T2983/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/regression-T2983/options.json index 668d1445ba..7440c2aa70 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/regression-T2983/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/regression-T2983/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.0.2" - } - ], "proposal-class-properties", "transform-block-scoping", "syntax-class-properties" diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/regression-T6719/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/regression-T6719/options.json index 668d1445ba..7440c2aa70 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/regression-T6719/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/regression-T6719/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.0.2" - } - ], "proposal-class-properties", "transform-block-scoping", "syntax-class-properties" diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/regression-T7364/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/regression-T7364/options.json index 1a8c5001e5..564a256815 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/regression-T7364/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/regression-T7364/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.0.2" - } - ], "proposal-class-properties", "transform-block-scoping", "syntax-class-properties", diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-export/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-export/options.json index 668d1445ba..7440c2aa70 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-export/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-export/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.0.2" - } - ], "proposal-class-properties", "transform-block-scoping", "syntax-class-properties" diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-infer-name/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-infer-name/options.json index 668d1445ba..7440c2aa70 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-infer-name/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-infer-name/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.0.2" - } - ], "proposal-class-properties", "transform-block-scoping", "syntax-class-properties" diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-inherited/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-inherited/options.json index 668d1445ba..7440c2aa70 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-inherited/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-inherited/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.0.2" - } - ], "proposal-class-properties", "transform-block-scoping", "syntax-class-properties" diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-undefined/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-undefined/options.json index 668d1445ba..7440c2aa70 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-undefined/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static-undefined/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.0.2" - } - ], "proposal-class-properties", "transform-block-scoping", "syntax-class-properties" diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static/options.json index 668d1445ba..7440c2aa70 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/private/static/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.0.2" - } - ], "proposal-class-properties", "transform-block-scoping", "syntax-class-properties" diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/arrow-static-this-without-transform/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/arrow-static-this-without-transform/options.json index 49c2c86404..a5206b767d 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/arrow-static-this-without-transform/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/arrow-static-this-without-transform/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "transform-arrow-functions", - "syntax-class-properties" - ] + "plugins": ["transform-arrow-functions", "syntax-class-properties"] } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/arrow-this-without-transform/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/arrow-this-without-transform/options.json index 451abead87..101e1eb934 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/arrow-this-without-transform/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/arrow-this-without-transform/options.json @@ -1,8 +1,4 @@ { - "plugins": [ - "external-helpers", - "transform-arrow-functions", - "syntax-class-properties" - ], + "plugins": ["transform-arrow-functions", "syntax-class-properties"], "throws": "Unable to transform arrow inside class property" } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/foobar/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/foobar/options.json index 2abcedf61c..5f6a3f8f76 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/foobar/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/foobar/options.json @@ -1,7 +1,4 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - ["proposal-class-properties", { "loose": true }] - ], + "plugins": [["proposal-class-properties", { "loose": true }]], "presets": ["env"] } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/options.json index d0b48e0906..c2c1a42409 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], ["proposal-class-properties", { "loose": true }], "transform-classes", "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/regression-T7364/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/regression-T7364/options.json index e53ef86354..c8fa4eb3d1 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/regression-T7364/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public-loose/regression-T7364/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-async-to-generator", ["proposal-class-properties", { "loose": true }] ] diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/arrow-static-this-without-transform/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/arrow-static-this-without-transform/options.json index 49c2c86404..a5206b767d 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/arrow-static-this-without-transform/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/arrow-static-this-without-transform/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "transform-arrow-functions", - "syntax-class-properties" - ] + "plugins": ["transform-arrow-functions", "syntax-class-properties"] } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/arrow-this-without-transform/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/arrow-this-without-transform/options.json index 451abead87..101e1eb934 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/arrow-this-without-transform/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/arrow-this-without-transform/options.json @@ -1,8 +1,4 @@ { - "plugins": [ - "external-helpers", - "transform-arrow-functions", - "syntax-class-properties" - ], + "plugins": ["transform-arrow-functions", "syntax-class-properties"], "throws": "Unable to transform arrow inside class property" } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived-super-in-default-params-complex/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived-super-in-default-params-complex/options.json index 0f6348c0ad..19ed5174f5 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived-super-in-default-params-complex/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived-super-in-default-params-complex/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - "proposal-class-properties" - ] + "plugins": ["proposal-class-properties"] } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived-super-in-default-params-in-arrow/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived-super-in-default-params-in-arrow/options.json index 0f6348c0ad..19ed5174f5 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived-super-in-default-params-in-arrow/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived-super-in-default-params-in-arrow/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - "proposal-class-properties" - ] + "plugins": ["proposal-class-properties"] } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived-super-in-default-params/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived-super-in-default-params/options.json index 0f6348c0ad..19ed5174f5 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived-super-in-default-params/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/derived-super-in-default-params/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - "proposal-class-properties" - ] + "plugins": ["proposal-class-properties"] } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/foobar/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/foobar/options.json index 5d764ec745..6cf84dea42 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/foobar/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/foobar/options.json @@ -1,4 +1,4 @@ { - "plugins": ["external-helpers", "proposal-class-properties"], + "plugins": ["proposal-class-properties"], "presets": ["env"] } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/foobar/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/foobar/output.js index 24455bd66a..62ea34bd55 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/foobar/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/foobar/output.js @@ -1,13 +1,9 @@ -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = babelHelpers.getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = babelHelpers.getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return babelHelpers.possibleConstructorReturn(this, result); }; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - var Child = /*#__PURE__*/function (_Parent) { "use strict"; babelHelpers.inherits(Child, _Parent); - var _super = _createSuper(Child); + var _super = babelHelpers.createSuper(Child); function Child() { var _this; diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/native-classes/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/native-classes/options.json index 89a37faa03..c06186a850 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/native-classes/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/native-classes/options.json @@ -1,7 +1,6 @@ { "minNodeVersion": "6.0.0", "plugins": [ - "external-helpers", "proposal-class-properties", "transform-block-scoping", "syntax-class-properties" diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/options.json index 1b96399c59..b3ebb3f37f 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], "proposal-class-properties", "transform-classes", "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/regression-T7364/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/regression-T7364/options.json index 4c39c05aff..b23ebd0710 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/regression-T7364/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/regression-T7364/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "transform-async-to-generator", - ["proposal-class-properties"] - ] + "plugins": ["transform-async-to-generator", ["proposal-class-properties"]] } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-array-pattern-1/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-array-pattern-1/options.json index d9d73e4276..6fb7fcc8af 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-array-pattern-1/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-array-pattern-1/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "proposal-class-properties", "transform-classes", "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-array-pattern/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-array-pattern/options.json index d9d73e4276..6fb7fcc8af 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-array-pattern/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-array-pattern/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "proposal-class-properties", "transform-classes", "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-object-pattern-1/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-object-pattern-1/options.json index d9d73e4276..6fb7fcc8af 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-object-pattern-1/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-object-pattern-1/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "proposal-class-properties", "transform-classes", "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-object-pattern/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-object-pattern/options.json index d9d73e4276..6fb7fcc8af 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-object-pattern/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/public/super-destructuring-object-pattern/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "proposal-class-properties", "transform-classes", "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/6153/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/6153/options.json index 0f5988fe52..a133874aaa 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/6153/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/6153/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "proposal-class-properties", - "transform-arrow-functions" - ] + "plugins": ["proposal-class-properties", "transform-arrow-functions"] } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/6154/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/6154/output.js index f833d3491a..382dc6b58d 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/6154/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/6154/output.js @@ -1,59 +1,33 @@ -function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - var Test = function Test() { "use strict"; - _classCallCheck(this, Test); + babelHelpers.classCallCheck(this, Test); var Other = /*#__PURE__*/function (_Test) { - _inherits(Other, _Test); + babelHelpers.inherits(Other, _Test); - var _super = _createSuper(Other); + var _super = babelHelpers.createSuper(Other); function Other() { var _thisSuper, _this; - _classCallCheck(this, Other); + babelHelpers.classCallCheck(this, Other); for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) { args[_key] = arguments[_key]; } _this = _super.call.apply(_super, [this].concat(args)); - - _defineProperty(_assertThisInitialized(_this), "a", function () { - return _get((_thisSuper = _assertThisInitialized(_this), _getPrototypeOf(Other.prototype)), "test", _thisSuper); + babelHelpers.defineProperty(babelHelpers.assertThisInitialized(_this), "a", function () { + return babelHelpers.get((_thisSuper = babelHelpers.assertThisInitialized(_this), babelHelpers.getPrototypeOf(Other.prototype)), "test", _thisSuper); }); - return _this; } return Other; }(Test); - _defineProperty(Other, "a", function () { - return _get(_getPrototypeOf(Other), "test", Other); + babelHelpers.defineProperty(Other, "a", function () { + return babelHelpers.get(babelHelpers.getPrototypeOf(Other), "test", Other); }); }; diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/7371/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/7371/options.json index 0f5988fe52..a133874aaa 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/7371/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/7371/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "proposal-class-properties", - "transform-arrow-functions" - ] + "plugins": ["proposal-class-properties", "transform-arrow-functions"] } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/7951/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/7951/options.json index 9d30185b9b..19ed5174f5 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/7951/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/7951/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "proposal-class-properties"] + "plugins": ["proposal-class-properties"] } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/8110/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/8110/options.json index 9d30185b9b..19ed5174f5 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/8110/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/8110/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "proposal-class-properties"] + "plugins": ["proposal-class-properties"] } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/8882/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/8882/options.json index 9d30185b9b..19ed5174f5 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/8882/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/8882/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "proposal-class-properties"] + "plugins": ["proposal-class-properties"] } diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/T2983/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/T2983/options.json index 524cdc3142..c2c1a42409 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/T2983/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/T2983/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", ["proposal-class-properties", { "loose": true }], "transform-classes", "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/T6719/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/T6719/options.json index d0b48e0906..c2c1a42409 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/T6719/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/T6719/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], ["proposal-class-properties", { "loose": true }], "transform-classes", "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/T7364/options.json b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/T7364/options.json index e53ef86354..c8fa4eb3d1 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/T7364/options.json +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/regression/T7364/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-async-to-generator", ["proposal-class-properties", { "loose": true }] ] diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/decorator-interop/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/decorator-interop/output.js index 83a51c0681..e020b504c9 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/decorator-interop/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/decorator-interop/output.js @@ -2,36 +2,22 @@ let _Symbol$search; var _class, _descriptor, _temp; -function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - -function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; } - -function _initializerWarningHelper(descriptor, context) { throw new Error('Decorating class property failed. Please ensure that ' + 'proposal-class-properties is enabled and runs after the decorators transform.'); } - function dec() {} let A = (_class = (_temp = (_Symbol$search = Symbol.search, /*#__PURE__*/function () { "use strict"; function A() { - _classCallCheck(this, A); - - _initializerDefineProperty(this, "a", _descriptor, this); + babelHelpers.classCallCheck(this, A); + babelHelpers.initializerDefineProperty(this, "a", _descriptor, this); } - _createClass(A, [{ + babelHelpers.createClass(A, [{ key: _Symbol$search, value: function () {} }]); - return A; -}()), _temp), (_descriptor = _applyDecoratedDescriptor(_class.prototype, "a", [dec], { +}()), _temp), (_descriptor = babelHelpers.applyDecoratedDescriptor(_class.prototype, "a", [dec], { configurable: true, enumerable: true, writable: true, diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/edgest-case/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/edgest-case/output.js index f87ef987e6..aa5bb251d7 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/edgest-case/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/edgest-case/output.js @@ -1,19 +1,13 @@ let _x$x; -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _classNameTDZError(name) { throw new Error("Class \"" + name + "\" cannot be referenced in computed property keys."); } - _x$x = { - x: (_classNameTDZError("A"), A) || 0 + x: (babelHelpers.classNameTDZError("A"), A) || 0 }.x; let A = function A() { "use strict"; - _classCallCheck(this, A); + babelHelpers.classCallCheck(this, A); }; -_defineProperty(A, _x$x, void 0); +babelHelpers.defineProperty(A, _x$x, void 0); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/general/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/general/output.js index 024a824172..77c42e6156 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/general/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/general/output.js @@ -1,17 +1,11 @@ let _ref; -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _classNameTDZError(name) { throw new Error("Class \"" + name + "\" cannot be referenced in computed property keys."); } - -_ref = (_classNameTDZError("C"), C) + 3; +_ref = (babelHelpers.classNameTDZError("C"), C) + 3; let C = function C() { "use strict"; - _classCallCheck(this, C); + babelHelpers.classCallCheck(this, C); }; -_defineProperty(C, _ref, 3); +babelHelpers.defineProperty(C, _ref, 3); diff --git a/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/loose/output.js b/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/loose/output.js index 9ab3df7368..fda6324cfa 100644 --- a/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/loose/output.js +++ b/packages/babel-plugin-proposal-class-properties/test/fixtures/static-property-tdz/loose/output.js @@ -1,8 +1,6 @@ let _ref; -function _classNameTDZError(name) { throw new Error("Class \"" + name + "\" cannot be referenced in computed property keys."); } - -_ref = (_classNameTDZError("C"), C) + 3; +_ref = (babelHelpers.classNameTDZError("C"), C) + 3; class C {} diff --git a/packages/babel-plugin-proposal-class-static-block/test/fixtures/integration-loose/options.json b/packages/babel-plugin-proposal-class-static-block/test/fixtures/integration-loose/options.json index 0c80ad46dc..77a9d03624 100644 --- a/packages/babel-plugin-proposal-class-static-block/test/fixtures/integration-loose/options.json +++ b/packages/babel-plugin-proposal-class-static-block/test/fixtures/integration-loose/options.json @@ -3,7 +3,6 @@ "proposal-class-static-block", ["proposal-private-property-in-object", { "loose": true }], ["proposal-private-methods", { "loose": true }], - ["proposal-class-properties", { "loose": true }], - "external-helpers" + ["proposal-class-properties", { "loose": true }] ] } diff --git a/packages/babel-plugin-proposal-class-static-block/test/fixtures/integration/name-conflict/output.js b/packages/babel-plugin-proposal-class-static-block/test/fixtures/integration/name-conflict/output.js index afd3341659..910fb0ba8a 100644 --- a/packages/babel-plugin-proposal-class-static-block/test/fixtures/integration/name-conflict/output.js +++ b/packages/babel-plugin-proposal-class-static-block/test/fixtures/integration/name-conflict/output.js @@ -1,5 +1,3 @@ -function _classStaticPrivateFieldSpecGet(receiver, classConstructor, descriptor) { if (receiver !== classConstructor) { throw new TypeError("Private static access of wrong provenance"); } if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; } - class Foo {} var _ = { @@ -9,7 +7,7 @@ var _ = { var _2 = { writable: true, value: (() => { - Foo.foo = _classStaticPrivateFieldSpecGet(Foo, Foo, _); + Foo.foo = babelHelpers.classStaticPrivateFieldSpecGet(Foo, Foo, _); })() }; expect(Foo.foo).toBe(42); diff --git a/packages/babel-plugin-proposal-class-static-block/test/fixtures/integration/options.json b/packages/babel-plugin-proposal-class-static-block/test/fixtures/integration/options.json index 6acec4a94e..aa0d2e46de 100644 --- a/packages/babel-plugin-proposal-class-static-block/test/fixtures/integration/options.json +++ b/packages/babel-plugin-proposal-class-static-block/test/fixtures/integration/options.json @@ -3,7 +3,6 @@ "proposal-class-static-block", "proposal-private-property-in-object", "proposal-private-methods", - "proposal-class-properties", - "external-helpers" + "proposal-class-properties" ] } diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/duplicated-keys/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/duplicated-keys/options.json index 0fbe73eecd..57fadf0954 100644 --- a/packages/babel-plugin-proposal-decorators/test/fixtures/duplicated-keys/options.json +++ b/packages/babel-plugin-proposal-decorators/test/fixtures/duplicated-keys/options.json @@ -1,12 +1,6 @@ { "plugins": [ ["proposal-decorators", { "decoratorsBeforeExport": false }], - "proposal-class-properties", - [ - "external-helpers", - { - "helperVersion": "7.1.5" - } - ] + "proposal-class-properties" ] } diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/element-descriptors/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/element-descriptors/options.json index 0fbe73eecd..57fadf0954 100644 --- a/packages/babel-plugin-proposal-decorators/test/fixtures/element-descriptors/options.json +++ b/packages/babel-plugin-proposal-decorators/test/fixtures/element-descriptors/options.json @@ -1,12 +1,6 @@ { "plugins": [ ["proposal-decorators", { "decoratorsBeforeExport": false }], - "proposal-class-properties", - [ - "external-helpers", - { - "helperVersion": "7.1.5" - } - ] + "proposal-class-properties" ] } diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/finishers/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/finishers/options.json index 0fbe73eecd..57fadf0954 100644 --- a/packages/babel-plugin-proposal-decorators/test/fixtures/finishers/options.json +++ b/packages/babel-plugin-proposal-decorators/test/fixtures/finishers/options.json @@ -1,12 +1,6 @@ { "plugins": [ ["proposal-decorators", { "decoratorsBeforeExport": false }], - "proposal-class-properties", - [ - "external-helpers", - { - "helperVersion": "7.1.5" - } - ] + "proposal-class-properties" ] } diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-decl-to-expression/method-decorators/output.mjs b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-decl-to-expression/method-decorators/output.mjs index 4db262f67a..df9393f713 100644 --- a/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-decl-to-expression/method-decorators/output.mjs +++ b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-decl-to-expression/method-decorators/output.mjs @@ -1,13 +1,11 @@ var _class, _class2; -function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; } - let A = (_class2 = class A { foo() {} -}, (_applyDecoratedDescriptor(_class2.prototype, "foo", [dec], Object.getOwnPropertyDescriptor(_class2.prototype, "foo"), _class2.prototype)), _class2); +}, (babelHelpers.applyDecoratedDescriptor(_class2.prototype, "foo", [dec], Object.getOwnPropertyDescriptor(_class2.prototype, "foo"), _class2.prototype)), _class2); export { A as default }; let B = (_class = class B { foo() {} -}, (_applyDecoratedDescriptor(_class.prototype, "foo", [dec], Object.getOwnPropertyDescriptor(_class.prototype, "foo"), _class.prototype)), _class); +}, (babelHelpers.applyDecoratedDescriptor(_class.prototype, "foo", [dec], Object.getOwnPropertyDescriptor(_class.prototype, "foo"), _class.prototype)), _class); diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-regression/7030/output.js b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-regression/7030/output.js index 2cfd6bb72c..10c75f81ac 100644 --- a/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-regression/7030/output.js +++ b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-regression/7030/output.js @@ -1,21 +1,3 @@ -function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - function generateAsyncAction(type) { type = type.toUpperCase(); var request = createAction(type + '_REQUEST', undefined, requestMetaCreator); @@ -32,15 +14,14 @@ function generateAsyncAction(type) { var A = /*#__PURE__*/function (_B) { "use strict"; - _inherits(A, _B); + babelHelpers.inherits(A, _B); - var _super = _createSuper(A); + var _super = babelHelpers.createSuper(A); function A(timestamp) { var _this; - _classCallCheck(this, A); - + babelHelpers.classCallCheck(this, A); _this = _super.call(this); _this.timestamp = timestamp; _this.moment = moment(timestamp); diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-regression/8041/output.mjs b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-regression/8041/output.mjs index 592f7a40d4..12a4939ef5 100644 --- a/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-regression/8041/output.mjs +++ b/packages/babel-plugin-proposal-decorators/test/fixtures/legacy-regression/8041/output.mjs @@ -1,10 +1,8 @@ var _class2; -function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; } - let _class = (_class2 = class { bar() {} -}, (_applyDecoratedDescriptor(_class2.prototype, "bar", [foo], Object.getOwnPropertyDescriptor(_class2.prototype, "bar"), _class2.prototype)), _class2); +}, (babelHelpers.applyDecoratedDescriptor(_class2.prototype, "bar", [foo], Object.getOwnPropertyDescriptor(_class2.prototype, "bar"), _class2.prototype)), _class2); export { _class as default }; diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/misc/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/misc/options.json index 0fbe73eecd..57fadf0954 100644 --- a/packages/babel-plugin-proposal-decorators/test/fixtures/misc/options.json +++ b/packages/babel-plugin-proposal-decorators/test/fixtures/misc/options.json @@ -1,12 +1,6 @@ { "plugins": [ ["proposal-decorators", { "decoratorsBeforeExport": false }], - "proposal-class-properties", - [ - "external-helpers", - { - "helperVersion": "7.1.5" - } - ] + "proposal-class-properties" ] } diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/ordering/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/ordering/options.json index 0fbe73eecd..57fadf0954 100644 --- a/packages/babel-plugin-proposal-decorators/test/fixtures/ordering/options.json +++ b/packages/babel-plugin-proposal-decorators/test/fixtures/ordering/options.json @@ -1,12 +1,6 @@ { "plugins": [ ["proposal-decorators", { "decoratorsBeforeExport": false }], - "proposal-class-properties", - [ - "external-helpers", - { - "helperVersion": "7.1.5" - } - ] + "proposal-class-properties" ] } diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/async-generator-method/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/async-generator-method/options.json index 0c2c9bd205..57fadf0954 100644 --- a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/async-generator-method/options.json +++ b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/async-generator-method/options.json @@ -1,7 +1,6 @@ { "plugins": [ ["proposal-decorators", { "decoratorsBeforeExport": false }], - "proposal-class-properties", - ["external-helpers", { "helperVersion": "7.1.5" }] + "proposal-class-properties" ] } diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/class-decorators-yield-await/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/class-decorators-yield-await/options.json index 0fbe73eecd..57fadf0954 100644 --- a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/class-decorators-yield-await/options.json +++ b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/class-decorators-yield-await/options.json @@ -1,12 +1,6 @@ { "plugins": [ ["proposal-decorators", { "decoratorsBeforeExport": false }], - "proposal-class-properties", - [ - "external-helpers", - { - "helperVersion": "7.1.5" - } - ] + "proposal-class-properties" ] } diff --git a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/options.json b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/options.json index 0fbe73eecd..57fadf0954 100644 --- a/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/options.json +++ b/packages/babel-plugin-proposal-decorators/test/fixtures/transformation/options.json @@ -1,12 +1,6 @@ { "plugins": [ ["proposal-decorators", { "decoratorsBeforeExport": false }], - "proposal-class-properties", - [ - "external-helpers", - { - "helperVersion": "7.1.5" - } - ] + "proposal-class-properties" ] } diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/missing-plugin/options.json b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/missing-plugin/options.json index 2a0c361b68..8cbc099aab 100644 --- a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/missing-plugin/options.json +++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/missing-plugin/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - "transform-modules-amd", - "external-helpers" - ] + "plugins": ["transform-modules-amd"] } diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/no-interop/options.json b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/no-interop/options.json index a836fa1647..58af4a0958 100644 --- a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/no-interop/options.json +++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/no-interop/options.json @@ -1,7 +1,6 @@ { "plugins": [ "proposal-dynamic-import", - ["transform-modules-amd", { "noInterop": true }], - "external-helpers" + ["transform-modules-amd", { "noInterop": true }] ] } diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/options.json b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/options.json index 48abb31ad8..796af8f32b 100644 --- a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/options.json +++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/amd/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "proposal-dynamic-import", - "transform-modules-amd", - "external-helpers" - ] + "plugins": ["proposal-dynamic-import", "transform-modules-amd"] } diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/missing-plugin/options.json b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/missing-plugin/options.json index 46b55e8254..81e5ce1243 100644 --- a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/missing-plugin/options.json +++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/missing-plugin/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - "transform-modules-commonjs", - "external-helpers" - ] + "plugins": ["transform-modules-commonjs"] } diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/no-interop/options.json b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/no-interop/options.json index 31f00509da..4ab0ca746d 100644 --- a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/no-interop/options.json +++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/no-interop/options.json @@ -1,7 +1,6 @@ { "plugins": [ "proposal-dynamic-import", - ["transform-modules-commonjs", { "noInterop": true }], - "external-helpers" + ["transform-modules-commonjs", { "noInterop": true }] ] } diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/options.json b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/options.json index 4c26a69200..a7aef0f20b 100644 --- a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/options.json +++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/commonjs/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "proposal-dynamic-import", - "transform-modules-commonjs", - "external-helpers" - ] + "plugins": ["proposal-dynamic-import", "transform-modules-commonjs"] } diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/missing-plugin-babel-7/options.json b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/missing-plugin-babel-7/options.json index 1ab6800bf0..80f1bd3106 100644 --- a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/missing-plugin-babel-7/options.json +++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/missing-plugin-babel-7/options.json @@ -1,8 +1,5 @@ { "validateLogs": true, - "plugins": [ - "transform-modules-systemjs", - "external-helpers" - ], + "plugins": ["transform-modules-systemjs"], "BABEL_8_BREAKING": false } diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/missing-plugin/options.json b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/missing-plugin/options.json index a32b8cee58..21d8fd3e76 100644 --- a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/missing-plugin/options.json +++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/missing-plugin/options.json @@ -1,8 +1,5 @@ { - "plugins": [ - "transform-modules-systemjs", - "external-helpers" - ], + "plugins": ["transform-modules-systemjs"], "BABEL_8_BREAKING": true, "throws": "ERROR: Dynamic import() transformation must be enabled using the\n @babel/plugin-proposal-dynamic-import plugin. Babel 8\n no longer transforms import() without using that plugin." } diff --git a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/options.json b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/options.json index 8a06445e13..ce0d9ff1a9 100644 --- a/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/options.json +++ b/packages/babel-plugin-proposal-dynamic-import/test/fixtures/systemjs/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "proposal-dynamic-import", - "transform-modules-systemjs", - "external-helpers" - ] + "plugins": ["proposal-dynamic-import", "transform-modules-systemjs"] } diff --git a/packages/babel-plugin-proposal-export-default-from/test/fixtures/export-default/options.json b/packages/babel-plugin-proposal-export-default-from/test/fixtures/export-default/options.json index 4eef72c161..14450cbd8b 100644 --- a/packages/babel-plugin-proposal-export-default-from/test/fixtures/export-default/options.json +++ b/packages/babel-plugin-proposal-export-default-from/test/fixtures/export-default/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "proposal-export-default-from"] + "plugins": ["proposal-export-default-from"] } diff --git a/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-string/options.json b/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-string/options.json index fe3d1d2159..d4ee857f53 100644 --- a/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-string/options.json +++ b/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/namespace-string/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "proposal-export-namespace-from", - "syntax-module-string-names" - ] + "plugins": ["proposal-export-namespace-from", "syntax-module-string-names"] } diff --git a/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/options.json b/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/options.json index 2c7ea3c8e6..6ee6f2f0ee 100644 --- a/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/options.json +++ b/packages/babel-plugin-proposal-export-namespace-from/test/fixtures/export-namespace/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "proposal-export-namespace-from"] + "plugins": ["proposal-export-namespace-from"] } diff --git a/packages/babel-plugin-proposal-function-bind/test/fixtures/regression/6458/output.js b/packages/babel-plugin-proposal-function-bind/test/fixtures/regression/6458/output.js index c0989f25cd..5a9ea368c8 100644 --- a/packages/babel-plugin-proposal-function-bind/test/fixtures/regression/6458/output.js +++ b/packages/babel-plugin-proposal-function-bind/test/fixtures/regression/6458/output.js @@ -1,7 +1,5 @@ "use strict"; -var _file = _interopRequireDefault(require("./file")); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } +var _file = babelHelpers.interopRequireDefault(require("./file")); console.log(_file.default.method.bind(_file.default)); diff --git a/packages/babel-plugin-proposal-function-bind/test/fixtures/regression/T6984/output.js b/packages/babel-plugin-proposal-function-bind/test/fixtures/regression/T6984/output.js index c65c709559..efe3786aba 100644 --- a/packages/babel-plugin-proposal-function-bind/test/fixtures/regression/T6984/output.js +++ b/packages/babel-plugin-proposal-function-bind/test/fixtures/regression/T6984/output.js @@ -1,9 +1,3 @@ -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - function _one() {} function _two() {} @@ -12,10 +6,10 @@ let Test1 = /*#__PURE__*/function () { "use strict"; function Test1() { - _classCallCheck(this, Test1); + babelHelpers.classCallCheck(this, Test1); } - _createClass(Test1, [{ + babelHelpers.createClass(Test1, [{ key: "one", value: function one() { _two.call(_one, 1, 2); @@ -26,6 +20,5 @@ let Test1 = /*#__PURE__*/function () { _two.call(_one, 1, 2); } }]); - return Test1; }(); diff --git a/packages/babel-plugin-proposal-function-sent/test/fixtures/function-sent/basic/output.js b/packages/babel-plugin-proposal-function-sent/test/fixtures/function-sent/basic/output.js index adf0e13cce..5d46904766 100644 --- a/packages/babel-plugin-proposal-function-sent/test/fixtures/function-sent/basic/output.js +++ b/packages/babel-plugin-proposal-function-sent/test/fixtures/function-sent/basic/output.js @@ -1,11 +1,9 @@ -function _skipFirstGeneratorNext(fn) { return function () { var it = fn.apply(this, arguments); it.next(); return it; }; } - function gen() { return _gen.apply(this, arguments); } function _gen() { - _gen = _skipFirstGeneratorNext(function* () { + _gen = babelHelpers.skipFirstGeneratorNext(function* () { let _functionSent = yield; let sent = _functionSent; diff --git a/packages/babel-plugin-proposal-function-sent/test/fixtures/function-sent/multiple/output.js b/packages/babel-plugin-proposal-function-sent/test/fixtures/function-sent/multiple/output.js index 8d62b2b382..8d56843b46 100644 --- a/packages/babel-plugin-proposal-function-sent/test/fixtures/function-sent/multiple/output.js +++ b/packages/babel-plugin-proposal-function-sent/test/fixtures/function-sent/multiple/output.js @@ -1,6 +1,4 @@ -function _skipFirstGeneratorNext(fn) { return function () { var it = fn.apply(this, arguments); it.next(); return it; }; } - -_skipFirstGeneratorNext(function* () { +babelHelpers.skipFirstGeneratorNext(function* () { let _functionSent = yield; const a = _functionSent; diff --git a/packages/babel-plugin-proposal-function-sent/test/fixtures/function-sent/yield-function-sent/output.js b/packages/babel-plugin-proposal-function-sent/test/fixtures/function-sent/yield-function-sent/output.js index 7271b6fa0d..0b8c5495e4 100644 --- a/packages/babel-plugin-proposal-function-sent/test/fixtures/function-sent/yield-function-sent/output.js +++ b/packages/babel-plugin-proposal-function-sent/test/fixtures/function-sent/yield-function-sent/output.js @@ -1,6 +1,4 @@ -function _skipFirstGeneratorNext(fn) { return function () { var it = fn.apply(this, arguments); it.next(); return it; }; } - -_skipFirstGeneratorNext(function* () { +babelHelpers.skipFirstGeneratorNext(function* () { let _functionSent = yield; _functionSent = yield _functionSent; diff --git a/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/async-generator/output.js b/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/async-generator/output.js index 8bccb5d80c..839232467b 100644 --- a/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/async-generator/output.js +++ b/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/async-generator/output.js @@ -1,30 +1,12 @@ -function _skipFirstGeneratorNext(fn) { return function () { var it = fn.apply(this, arguments); it.next(); return it; }; } - -function _awaitAsyncGenerator(value) { return new _AwaitValue(value); } - -function _wrapAsyncGenerator(fn) { return function () { return new _AsyncGenerator(fn.apply(this, arguments)); }; } - -function _AsyncGenerator(gen) { var front, back; function send(key, arg) { return new Promise(function (resolve, reject) { var request = { key: key, arg: arg, resolve: resolve, reject: reject, next: null }; if (back) { back = back.next = request; } else { front = back = request; resume(key, arg); } }); } function resume(key, arg) { try { var result = gen[key](arg); var value = result.value; var wrappedAwait = value instanceof _AwaitValue; Promise.resolve(wrappedAwait ? value.wrapped : value).then(function (arg) { if (wrappedAwait) { resume(key === "return" ? "return" : "next", arg); return; } settle(result.done ? "return" : "normal", arg); }, function (err) { resume("throw", err); }); } catch (err) { settle("throw", err); } } function settle(type, value) { switch (type) { case "return": front.resolve({ value: value, done: true }); break; case "throw": front.reject(value); break; default: front.resolve({ value: value, done: false }); break; } front = front.next; if (front) { resume(front.key, front.arg); } else { back = null; } } this._invoke = send; if (typeof gen.return !== "function") { this.return = undefined; } } - -if (typeof Symbol === "function" && Symbol.asyncIterator) { _AsyncGenerator.prototype[Symbol.asyncIterator] = function () { return this; }; } - -_AsyncGenerator.prototype.next = function (arg) { return this._invoke("next", arg); }; - -_AsyncGenerator.prototype.throw = function (arg) { return this._invoke("throw", arg); }; - -_AsyncGenerator.prototype.return = function (arg) { return this._invoke("return", arg); }; - -function _AwaitValue(value) { this.wrapped = value; } - function foo() { return _foo.apply(this, arguments); } function _foo() { - _foo = _wrapAsyncGenerator(_skipFirstGeneratorNext(function* () { + _foo = babelHelpers.wrapAsyncGenerator(babelHelpers.skipFirstGeneratorNext(function* () { let _functionSent = yield; - _functionSent = yield _awaitAsyncGenerator(_functionSent); + _functionSent = yield babelHelpers.awaitAsyncGenerator(_functionSent); })); return _foo.apply(this, arguments); } diff --git a/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/class-method/output.js b/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/class-method/output.js index 872a7386c5..aff02a0d87 100644 --- a/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/class-method/output.js +++ b/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/class-method/output.js @@ -1,8 +1,6 @@ -function _skipFirstGeneratorNext(fn) { return function () { var it = fn.apply(this, arguments); it.next(); return it; }; } - class Foo { gen() { - return _skipFirstGeneratorNext(function* () { + return babelHelpers.skipFirstGeneratorNext(function* () { let _functionSent = yield; return _functionSent; diff --git a/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/export-default-anonymous/output.mjs b/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/export-default-anonymous/output.mjs index 1d024eca09..0f6e630699 100644 --- a/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/export-default-anonymous/output.mjs +++ b/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/export-default-anonymous/output.mjs @@ -1,11 +1,9 @@ -function _skipFirstGeneratorNext(fn) { return function () { var it = fn.apply(this, arguments); it.next(); return it; }; } - export default function () { return _ref.apply(this, arguments); } function _ref() { - _ref = _skipFirstGeneratorNext(function* () { + _ref = babelHelpers.skipFirstGeneratorNext(function* () { let _functionSent = yield; return _functionSent; diff --git a/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/export-default-named/output.mjs b/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/export-default-named/output.mjs index 878337e887..94e73fb7d0 100644 --- a/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/export-default-named/output.mjs +++ b/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/export-default-named/output.mjs @@ -1,11 +1,9 @@ -function _skipFirstGeneratorNext(fn) { return function () { var it = fn.apply(this, arguments); it.next(); return it; }; } - export default function gen() { return _gen.apply(this, arguments); } function _gen() { - _gen = _skipFirstGeneratorNext(function* () { + _gen = babelHelpers.skipFirstGeneratorNext(function* () { let _functionSent = yield; return _functionSent; diff --git a/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/export/output.mjs b/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/export/output.mjs index 9dc30c4b5e..78fb4769c0 100644 --- a/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/export/output.mjs +++ b/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/export/output.mjs @@ -1,11 +1,9 @@ -function _skipFirstGeneratorNext(fn) { return function () { var it = fn.apply(this, arguments); it.next(); return it; }; } - export function gen() { return _gen.apply(this, arguments); } function _gen() { - _gen = _skipFirstGeneratorNext(function* () { + _gen = babelHelpers.skipFirstGeneratorNext(function* () { let _functionSent = yield; return _functionSent; diff --git a/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/expression-anonymous/output.js b/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/expression-anonymous/output.js index 52a48b33de..87f6d0e692 100644 --- a/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/expression-anonymous/output.js +++ b/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/expression-anonymous/output.js @@ -1,6 +1,4 @@ -function _skipFirstGeneratorNext(fn) { return function () { var it = fn.apply(this, arguments); it.next(); return it; }; } - -_skipFirstGeneratorNext(function* () { +babelHelpers.skipFirstGeneratorNext(function* () { let _functionSent = yield; return _functionSent; diff --git a/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/expression-named/output.js b/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/expression-named/output.js index 206aa55c31..fe4a630e2b 100644 --- a/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/expression-named/output.js +++ b/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/expression-named/output.js @@ -1,7 +1,5 @@ -function _skipFirstGeneratorNext(fn) { return function () { var it = fn.apply(this, arguments); it.next(); return it; }; } - const foo = function () { - var _gen = _skipFirstGeneratorNext(function* () { + var _gen = babelHelpers.skipFirstGeneratorNext(function* () { let _functionSent = yield; return _functionSent; diff --git a/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/object-method/output.js b/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/object-method/output.js index 19bb2dc667..13daad18e6 100644 --- a/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/object-method/output.js +++ b/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/object-method/output.js @@ -1,8 +1,6 @@ -function _skipFirstGeneratorNext(fn) { return function () { var it = fn.apply(this, arguments); it.next(); return it; }; } - const obj = { gen() { - return _skipFirstGeneratorNext(function* () { + return babelHelpers.skipFirstGeneratorNext(function* () { let _functionSent = yield; return _functionSent; diff --git a/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/statement/output.js b/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/statement/output.js index f6e62c2b93..3837e9b72e 100644 --- a/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/statement/output.js +++ b/packages/babel-plugin-proposal-function-sent/test/fixtures/generator-kinds/statement/output.js @@ -1,11 +1,9 @@ -function _skipFirstGeneratorNext(fn) { return function () { var it = fn.apply(this, arguments); it.next(); return it; }; } - function gen() { return _gen.apply(this, arguments); } function _gen() { - _gen = _skipFirstGeneratorNext(function* () { + _gen = babelHelpers.skipFirstGeneratorNext(function* () { let _functionSent = yield; return _functionSent; diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/assumption-ignoreFunctionLength/parameters-object-rest-used-in-default/output.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/assumption-ignoreFunctionLength/parameters-object-rest-used-in-default/output.js index 84e28e863e..d0d7cb40e9 100644 --- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/assumption-ignoreFunctionLength/parameters-object-rest-used-in-default/output.js +++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/assumption-ignoreFunctionLength/parameters-object-rest-used-in-default/output.js @@ -1,7 +1,5 @@ -function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); } - (_ref, a) => { - let R = _extends({}, _ref); + let R = babelHelpers.extends({}, _ref); if (a === void 0) { a = R; @@ -9,7 +7,7 @@ function _extends() { _extends = Object.assign || function (target) { for (var i }; (_ref2, e, c = 2, a, f) => { - let R = _extends({}, _ref2); + let R = babelHelpers.extends({}, _ref2); if (a === void 0) { a = R; @@ -25,7 +23,7 @@ function _extends() { _extends = Object.assign || function (target) { for (var i }; (_ref3, a) => { - let R = _extends({}, _ref3); + let R = babelHelpers.extends({}, _ref3); if (a === void 0) { a = f(R); diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/assumption-objectRestNoSymbols/options.json b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/assumption-objectRestNoSymbols/options.json index 0640a8088a..de779c9c8e 100644 --- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/assumption-objectRestNoSymbols/options.json +++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/assumption-objectRestNoSymbols/options.json @@ -1,8 +1,5 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0"}], - "proposal-object-rest-spread" - ], + "plugins": ["proposal-object-rest-spread"], "assumptions": { "objectRestNoSymbols": true } diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/assumption-pureGetters/options.json b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/assumption-pureGetters/options.json index 63724ae130..0b68867c40 100644 --- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/assumption-pureGetters/options.json +++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/assumption-pureGetters/options.json @@ -1,8 +1,5 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0"}], - "proposal-object-rest-spread" - ], + "plugins": ["proposal-object-rest-spread"], "assumptions": { "pureGetters": true } diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/assumption-setSpreadProperties-with-useBuiltIns/options.json b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/assumption-setSpreadProperties-with-useBuiltIns/options.json index d9e80e0395..4bdbbc0de1 100644 --- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/assumption-setSpreadProperties-with-useBuiltIns/options.json +++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/assumption-setSpreadProperties-with-useBuiltIns/options.json @@ -1,8 +1,5 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0"}], - ["proposal-object-rest-spread", { "useBuiltIns": true }] - ], + "plugins": [["proposal-object-rest-spread", { "useBuiltIns": true }]], "assumptions": { "setSpreadProperties": true } diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/assumption-setSpreadProperties/options.json b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/assumption-setSpreadProperties/options.json index 2ac8b8a6e8..554a8be11b 100644 --- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/assumption-setSpreadProperties/options.json +++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/assumption-setSpreadProperties/options.json @@ -1,8 +1,5 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0"}], - "proposal-object-rest-spread" - ], + "plugins": ["proposal-object-rest-spread"], "assumptions": { "setSpreadProperties": true } diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/duplicate-decl-bug/options.json b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/duplicate-decl-bug/options.json index fcf57f7be5..de23b2ba51 100644 --- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/duplicate-decl-bug/options.json +++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/duplicate-decl-bug/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "./plugin-clear-scope", - "proposal-object-rest-spread", - "external-helpers" - ] + "plugins": ["./plugin-clear-scope", "proposal-object-rest-spread"] } diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/options.json b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/options.json index 6f9add3661..5f1948cd56 100644 --- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/options.json +++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - "proposal-object-rest-spread", - ["external-helpers", { "helperVersion": "7.1.5" }] - ] + "plugins": ["proposal-object-rest-spread"] } diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/remove-unused-excluded-keys-loose/options.json b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/remove-unused-excluded-keys-loose/options.json index 3211139d6e..036ba18ea6 100644 --- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/remove-unused-excluded-keys-loose/options.json +++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-rest/remove-unused-excluded-keys-loose/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - "external-helpers", - ["proposal-object-rest-spread", { "loose": true }] - ] + "plugins": [["proposal-object-rest-spread", { "loose": true }]] } diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread-loose/assignment/output.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread-loose/assignment/output.js index 4db6d9f352..3e34747bd9 100644 --- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread-loose/assignment/output.js +++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread-loose/assignment/output.js @@ -1,12 +1,10 @@ -function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); } - var x; var y; var z; -z = _extends({ +z = babelHelpers.extends({ x }, y); z = { x, - w: _extends({}, y) + w: babelHelpers.extends({}, y) }; diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread-loose/expression/output.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread-loose/expression/output.js index bc98a8d781..b2f68cd60b 100644 --- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread-loose/expression/output.js +++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread-loose/expression/output.js @@ -1,33 +1,26 @@ -function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); } - var a; var b; var c; var d; var x; var y; - -_extends({ +babelHelpers.extends({ x }, y, { a }, b, { c }); - -_extends({}, Object.prototype); - -_extends({}, { +babelHelpers.extends({}, Object.prototype); +babelHelpers.extends({}, { foo: 'bar' }); - -_extends({}, { +babelHelpers.extends({}, { foo: 'bar' }, { bar: 'baz' }); - -_extends({}, { +babelHelpers.extends({}, { get foo() { return 'foo'; } diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread-loose/parameters-object-rest-used-in-default/output.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread-loose/parameters-object-rest-used-in-default/output.js index 84e28e863e..d0d7cb40e9 100644 --- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread-loose/parameters-object-rest-used-in-default/output.js +++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread-loose/parameters-object-rest-used-in-default/output.js @@ -1,7 +1,5 @@ -function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); } - (_ref, a) => { - let R = _extends({}, _ref); + let R = babelHelpers.extends({}, _ref); if (a === void 0) { a = R; @@ -9,7 +7,7 @@ function _extends() { _extends = Object.assign || function (target) { for (var i }; (_ref2, e, c = 2, a, f) => { - let R = _extends({}, _ref2); + let R = babelHelpers.extends({}, _ref2); if (a === void 0) { a = R; @@ -25,7 +23,7 @@ function _extends() { _extends = Object.assign || function (target) { for (var i }; (_ref3, a) => { - let R = _extends({}, _ref3); + let R = babelHelpers.extends({}, _ref3); if (a === void 0) { a = f(R); diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread-loose/side-effect/output.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread-loose/side-effect/output.js index 2d90421154..59fd85cc9e 100644 --- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread-loose/side-effect/output.js +++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread-loose/side-effect/output.js @@ -1,16 +1,12 @@ -function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); } - var k = { a: 1, b: 2 }; - -var o = _extends({ +var o = babelHelpers.extends({ a: 3 }, k, { b: k.a++ }); - var pureA = {}; var pureB = {}; var pureC = {}; @@ -21,7 +17,7 @@ function impureFunc() { console.log('hello'); } -var output = _extends({}, pureA, { +var output = babelHelpers.extends({}, pureA, { get foo() {}, get bar() {} @@ -29,7 +25,6 @@ var output = _extends({}, pureA, { }, pureB, pureC, impureFunc(), pureD, { pureD }); - -var simpleOutput = _extends({}, pureA, { +var simpleOutput = babelHelpers.extends({}, pureA, { test: '1' }, pureB); diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread-loose/variable-declaration/output.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread-loose/variable-declaration/output.js index 73be92643e..e7405ebef2 100644 --- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread-loose/variable-declaration/output.js +++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread-loose/variable-declaration/output.js @@ -1,3 +1 @@ -function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); } - -var z = _extends({}, x); +var z = babelHelpers.extends({}, x); diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/assignment/output.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/assignment/output.js index 9f13316b86..bc240f8418 100644 --- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/assignment/output.js +++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/assignment/output.js @@ -1,16 +1,10 @@ -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - var x; var y; var z; -z = _objectSpread({ +z = babelHelpers.objectSpread2({ x }, y); z = { x, - w: _objectSpread({}, y) + w: babelHelpers.objectSpread2({}, y) }; diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/expression/output.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/expression/output.js index da325b840a..c5035a1820 100644 --- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/expression/output.js +++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/expression/output.js @@ -1,37 +1,26 @@ -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - var a; var b; var c; var d; var x; var y; - -_objectSpread(_objectSpread(_objectSpread({ +babelHelpers.objectSpread2(babelHelpers.objectSpread2(babelHelpers.objectSpread2({ x }, y), {}, { a }, b), {}, { c }); - -_objectSpread({}, Object.prototype); - -_objectSpread({}, { +babelHelpers.objectSpread2({}, Object.prototype); +babelHelpers.objectSpread2({}, { foo: 'bar' }); - -_objectSpread(_objectSpread({}, { +babelHelpers.objectSpread2(babelHelpers.objectSpread2({}, { foo: 'bar' }), { bar: 'baz' }); - -_objectSpread({}, { +babelHelpers.objectSpread2({}, { get foo() { return 'foo'; } diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/side-effect/output.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/side-effect/output.js index a06b7aceb4..8ded00ae34 100644 --- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/side-effect/output.js +++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/side-effect/output.js @@ -1,20 +1,12 @@ -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - var k = { a: 1, b: 2 }; - -var o = _objectSpread(_objectSpread({ +var o = babelHelpers.objectSpread2(babelHelpers.objectSpread2({ a: 3 }, k), {}, { b: k.a++ }); - var pureA = {}; var pureB = {}; var pureC = {}; @@ -25,7 +17,7 @@ function impureFunc() { console.log('hello'); } -var output = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, pureA), {}, { +var output = babelHelpers.objectSpread2(babelHelpers.objectSpread2(babelHelpers.objectSpread2(babelHelpers.objectSpread2(babelHelpers.objectSpread2(babelHelpers.objectSpread2({}, pureA), {}, { get foo() {}, get bar() {} @@ -33,7 +25,6 @@ var output = _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpre }, pureB), pureC), impureFunc()), pureD), {}, { pureD }); - -var simpleOutput = _objectSpread(_objectSpread({}, pureA), {}, { +var simpleOutput = babelHelpers.objectSpread2(babelHelpers.objectSpread2({}, pureA), {}, { test: '1' }, pureB); diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/variable-declaration/output.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/variable-declaration/output.js index 9fabf3047b..0932c4d404 100644 --- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/variable-declaration/output.js +++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/object-spread/variable-declaration/output.js @@ -1,7 +1 @@ -function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; } - -function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -var z = _objectSpread({}, x); +var z = babelHelpers.objectSpread2({}, x); diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/regression/T7178/options.json b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/regression/T7178/options.json index 00ffcce399..413c204391 100644 --- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/regression/T7178/options.json +++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/regression/T7178/options.json @@ -2,7 +2,6 @@ "plugins": [ "transform-modules-commonjs", "transform-destructuring", - "proposal-object-rest-spread", - "external-helpers" + "proposal-object-rest-spread" ] } diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/regression/gh-7304/options.json b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/regression/gh-7304/options.json index a960185fcd..2c40ce9f12 100644 --- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/regression/gh-7304/options.json +++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/regression/gh-7304/options.json @@ -11,6 +11,5 @@ "corejs": 3 } ] - ], - "plugins": ["external-helpers"] + ] } diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/regression/gh-7304/output.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/regression/gh-7304/output.js index f162415e91..9c283086ce 100644 --- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/regression/gh-7304/output.js +++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/regression/gh-7304/output.js @@ -7,7 +7,7 @@ exports.default = void 0; class _default { method(_ref) { - let object = Object.assign({}, _ref); + let object = babelHelpers.extends({}, _ref); } } diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/regression/gh-8323/output.js b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/regression/gh-8323/output.js index 62b6e704ab..b2596090f6 100644 --- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/regression/gh-8323/output.js +++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/regression/gh-8323/output.js @@ -1,5 +1,3 @@ -function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; } - const get = () => { fireTheMissiles(); return 3; @@ -10,7 +8,6 @@ const f = (_ref) => { a = get(), b } = _ref, - z = _objectWithoutPropertiesLoose(_ref, ["a", "b", "c"]); - + z = babelHelpers.objectWithoutPropertiesLoose(_ref, ["a", "b", "c"]); const v = b + 3; }; diff --git a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/regression/options.json b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/regression/options.json index ba364f44b0..5f1948cd56 100644 --- a/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/regression/options.json +++ b/packages/babel-plugin-proposal-object-rest-spread/test/fixtures/regression/options.json @@ -1,3 +1,3 @@ { - "plugins": ["proposal-object-rest-spread", "external-helpers"] + "plugins": ["proposal-object-rest-spread"] } diff --git a/packages/babel-plugin-proposal-optional-chaining/test/fixtures/general/function-call-spread/options.json b/packages/babel-plugin-proposal-optional-chaining/test/fixtures/general/function-call-spread/options.json index e2efd1fae6..a0da7befcf 100644 --- a/packages/babel-plugin-proposal-optional-chaining/test/fixtures/general/function-call-spread/options.json +++ b/packages/babel-plugin-proposal-optional-chaining/test/fixtures/general/function-call-spread/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "proposal-optional-chaining", - "transform-spread" - ] + "plugins": ["proposal-optional-chaining", "transform-spread"] } diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/options.json index 50c7612f83..455fa4d378 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/options.json +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-loose/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.1000.0" - } - ], ["proposal-private-methods", { "loose": true }], ["proposal-class-properties", { "loose": true }], "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-privateFieldsAsProperties/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-privateFieldsAsProperties/options.json index 8db8526496..29f0191ae2 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-privateFieldsAsProperties/options.json +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors-privateFieldsAsProperties/options.json @@ -1,9 +1,5 @@ { - "plugins": [ - ["external-helpers",{ "helperVersion": "7.1000.0" }], - "proposal-private-methods", - "proposal-class-properties" - ], + "plugins": ["proposal-private-methods", "proposal-class-properties"], "assumptions": { "privateFieldsAsProperties": true } diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/options.json index c5e6649e4e..6d2613581f 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/options.json +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/accessors/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.1000.0" - } - ], "proposal-private-methods", "proposal-class-properties", "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/assumption-constantSuper/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/assumption-constantSuper/options.json index 4ada272a1b..3ac5f914d8 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/assumption-constantSuper/options.json +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/assumption-constantSuper/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.1000.0" - } - ], "proposal-private-methods", "proposal-class-properties", "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/options.json index c5e6649e4e..6d2613581f 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/options.json +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/duplicated-names/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.1000.0" - } - ], "proposal-private-methods", "proposal-class-properties", "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/async/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/async/options.json index 580349bcb7..78f0d620a4 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/async/options.json +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/async/options.json @@ -1,7 +1,6 @@ { "minNodeVersion": "8.0.0", "plugins": [ - ["external-helpers", { "helperVersion": "7.1000.0" }], ["proposal-private-methods", { "loose": true }], ["proposal-class-properties", { "loose": true }] ], diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/generator/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/generator/options.json index d497a940ac..efe732ed15 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/generator/options.json +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/generator/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.1000.0" }], ["proposal-private-methods", { "loose": true }], ["proposal-class-properties", { "loose": true }] ] diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/options.json index 50c7612f83..455fa4d378 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/options.json +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-loose/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.1000.0" - } - ], ["proposal-private-methods", { "loose": true }], ["proposal-class-properties", { "loose": true }], "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-privateFieldsAsProperties/async/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-privateFieldsAsProperties/async/options.json index 95ab365853..5496a04a7e 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-privateFieldsAsProperties/async/options.json +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-privateFieldsAsProperties/async/options.json @@ -1,10 +1,6 @@ { "minNodeVersion": "8.0.0", - "plugins": [ - ["external-helpers",{ "helperVersion": "7.1000.0" }], - "proposal-private-methods", - "proposal-class-properties" - ], + "plugins": ["proposal-private-methods", "proposal-class-properties"], "assumptions": { "privateFieldsAsProperties": true }, diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-privateFieldsAsProperties/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-privateFieldsAsProperties/options.json index 8db8526496..29f0191ae2 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-privateFieldsAsProperties/options.json +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method-privateFieldsAsProperties/options.json @@ -1,9 +1,5 @@ { - "plugins": [ - ["external-helpers",{ "helperVersion": "7.1000.0" }], - "proposal-private-methods", - "proposal-class-properties" - ], + "plugins": ["proposal-private-methods", "proposal-class-properties"], "assumptions": { "privateFieldsAsProperties": true } diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/async/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/async/options.json index d102004d87..c13dd773a8 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/async/options.json +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/async/options.json @@ -1,10 +1,6 @@ { "minNodeVersion": "8.0.0", - "plugins": [ - ["external-helpers", { "helperVersion": "7.1000.0" }], - "proposal-private-methods", - "proposal-class-properties" - ], + "plugins": ["proposal-private-methods", "proposal-class-properties"], "parserOpts": { "allowReturnOutsideFunction": true } diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/generator/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/generator/options.json index df92baa99f..0e3784b3db 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/generator/options.json +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/generator/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.1000.0" }], - "proposal-private-methods", - "proposal-class-properties" - ] + "plugins": ["proposal-private-methods", "proposal-class-properties"] } diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/options.json index c5e6649e4e..6d2613581f 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/options.json +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-method/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.1000.0" - } - ], "proposal-private-methods", "proposal-class-properties", "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/async/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/async/options.json index a34201ad4f..351419817b 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/async/options.json +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/async/options.json @@ -1,12 +1,6 @@ { "minNodeVersion": "8.0.0", "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.1000.0" - } - ], "proposal-private-methods", "proposal-class-properties", "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/options.json index 50c7612f83..455fa4d378 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/options.json +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-loose/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.1000.0" - } - ], ["proposal-private-methods", { "loose": true }], ["proposal-class-properties", { "loose": true }], "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-privateFieldsAsProperties/async/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-privateFieldsAsProperties/async/options.json index 95ab365853..5496a04a7e 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-privateFieldsAsProperties/async/options.json +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-privateFieldsAsProperties/async/options.json @@ -1,10 +1,6 @@ { "minNodeVersion": "8.0.0", - "plugins": [ - ["external-helpers",{ "helperVersion": "7.1000.0" }], - "proposal-private-methods", - "proposal-class-properties" - ], + "plugins": ["proposal-private-methods", "proposal-class-properties"], "assumptions": { "privateFieldsAsProperties": true }, diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-privateFieldsAsProperties/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-privateFieldsAsProperties/options.json index 8db8526496..29f0191ae2 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-privateFieldsAsProperties/options.json +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method-privateFieldsAsProperties/options.json @@ -1,9 +1,5 @@ { - "plugins": [ - ["external-helpers",{ "helperVersion": "7.1000.0" }], - "proposal-private-methods", - "proposal-class-properties" - ], + "plugins": ["proposal-private-methods", "proposal-class-properties"], "assumptions": { "privateFieldsAsProperties": true } diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/async/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/async/options.json index a34201ad4f..351419817b 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/async/options.json +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/async/options.json @@ -1,12 +1,6 @@ { "minNodeVersion": "8.0.0", "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.1000.0" - } - ], "proposal-private-methods", "proposal-class-properties", "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/options.json index c5e6649e4e..6d2613581f 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/options.json +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/private-static-method/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.1000.0" - } - ], "proposal-private-methods", "proposal-class-properties", "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors-loose/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors-loose/options.json index 50c7612f83..455fa4d378 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors-loose/options.json +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors-loose/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.1000.0" - } - ], ["proposal-private-methods", { "loose": true }], ["proposal-class-properties", { "loose": true }], "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors-privateFieldsAsProperties/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors-privateFieldsAsProperties/options.json index 8db8526496..29f0191ae2 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors-privateFieldsAsProperties/options.json +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors-privateFieldsAsProperties/options.json @@ -1,9 +1,5 @@ { - "plugins": [ - ["external-helpers",{ "helperVersion": "7.1000.0" }], - "proposal-private-methods", - "proposal-class-properties" - ], + "plugins": ["proposal-private-methods", "proposal-class-properties"], "assumptions": { "privateFieldsAsProperties": true } diff --git a/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors/options.json b/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors/options.json index c5e6649e4e..6d2613581f 100644 --- a/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors/options.json +++ b/packages/babel-plugin-proposal-private-methods/test/fixtures/static-accessors/options.json @@ -1,11 +1,5 @@ { "plugins": [ - [ - "external-helpers", - { - "helperVersion": "7.1000.0" - } - ], "proposal-private-methods", "proposal-class-properties", "transform-block-scoping", diff --git a/packages/babel-plugin-proposal-private-property-in-object/test/fixtures/assumption-privateFieldsAsProperties/compiled-classes/options.json b/packages/babel-plugin-proposal-private-property-in-object/test/fixtures/assumption-privateFieldsAsProperties/compiled-classes/options.json index 9d27af601e..83069bfb94 100644 --- a/packages/babel-plugin-proposal-private-property-in-object/test/fixtures/assumption-privateFieldsAsProperties/compiled-classes/options.json +++ b/packages/babel-plugin-proposal-private-property-in-object/test/fixtures/assumption-privateFieldsAsProperties/compiled-classes/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], "proposal-private-property-in-object", "proposal-class-properties", "proposal-private-methods", diff --git a/packages/babel-plugin-proposal-private-property-in-object/test/fixtures/assumption-privateFieldsAsProperties/options.json b/packages/babel-plugin-proposal-private-property-in-object/test/fixtures/assumption-privateFieldsAsProperties/options.json index 27edc061ba..5004aaa7fe 100644 --- a/packages/babel-plugin-proposal-private-property-in-object/test/fixtures/assumption-privateFieldsAsProperties/options.json +++ b/packages/babel-plugin-proposal-private-property-in-object/test/fixtures/assumption-privateFieldsAsProperties/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers",{ "helperVersion": "7.1000.0" }], "proposal-private-property-in-object", "proposal-private-methods", "proposal-class-properties" diff --git a/packages/babel-plugin-proposal-private-property-in-object/test/fixtures/private-loose/native-classes/options.json b/packages/babel-plugin-proposal-private-property-in-object/test/fixtures/private-loose/native-classes/options.json index b669b8ab51..caa287fb27 100644 --- a/packages/babel-plugin-proposal-private-property-in-object/test/fixtures/private-loose/native-classes/options.json +++ b/packages/babel-plugin-proposal-private-property-in-object/test/fixtures/private-loose/native-classes/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], "proposal-private-property-in-object", "proposal-class-properties", "proposal-private-methods" diff --git a/packages/babel-plugin-proposal-private-property-in-object/test/fixtures/private-loose/options.json b/packages/babel-plugin-proposal-private-property-in-object/test/fixtures/private-loose/options.json index 39f3b895b3..1656538358 100644 --- a/packages/babel-plugin-proposal-private-property-in-object/test/fixtures/private-loose/options.json +++ b/packages/babel-plugin-proposal-private-property-in-object/test/fixtures/private-loose/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], ["proposal-private-property-in-object", { "loose": true }], ["proposal-class-properties", { "loose": true }], ["proposal-private-methods", { "loose": true }], diff --git a/packages/babel-plugin-proposal-private-property-in-object/test/fixtures/private/native-classes/options.json b/packages/babel-plugin-proposal-private-property-in-object/test/fixtures/private/native-classes/options.json index b669b8ab51..caa287fb27 100644 --- a/packages/babel-plugin-proposal-private-property-in-object/test/fixtures/private/native-classes/options.json +++ b/packages/babel-plugin-proposal-private-property-in-object/test/fixtures/private/native-classes/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], "proposal-private-property-in-object", "proposal-class-properties", "proposal-private-methods" diff --git a/packages/babel-plugin-proposal-private-property-in-object/test/fixtures/private/options.json b/packages/babel-plugin-proposal-private-property-in-object/test/fixtures/private/options.json index 9d27af601e..83069bfb94 100644 --- a/packages/babel-plugin-proposal-private-property-in-object/test/fixtures/private/options.json +++ b/packages/babel-plugin-proposal-private-property-in-object/test/fixtures/private/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], "proposal-private-property-in-object", "proposal-class-properties", "proposal-private-methods", diff --git a/packages/babel-plugin-transform-arrow-functions/test/fixtures/arrow-functions/self-referential/options.json b/packages/babel-plugin-transform-arrow-functions/test/fixtures/arrow-functions/self-referential/options.json index 925d855b5e..09d0c356a9 100644 --- a/packages/babel-plugin-transform-arrow-functions/test/fixtures/arrow-functions/self-referential/options.json +++ b/packages/babel-plugin-transform-arrow-functions/test/fixtures/arrow-functions/self-referential/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", ["transform-arrow-functions", { "spec": false }], "transform-function-name" ] diff --git a/packages/babel-plugin-transform-arrow-functions/test/fixtures/arrow-functions/spec/options.json b/packages/babel-plugin-transform-arrow-functions/test/fixtures/arrow-functions/spec/options.json index 50c8c58f0c..db0033700d 100644 --- a/packages/babel-plugin-transform-arrow-functions/test/fixtures/arrow-functions/spec/options.json +++ b/packages/babel-plugin-transform-arrow-functions/test/fixtures/arrow-functions/spec/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - "external-helpers", - ["transform-arrow-functions", { "spec": true }] - ] + "plugins": [["transform-arrow-functions", { "spec": true }]] } diff --git a/packages/babel-plugin-transform-arrow-functions/test/fixtures/assumption-newableArrowFunctions-false/options.json b/packages/babel-plugin-transform-arrow-functions/test/fixtures/assumption-newableArrowFunctions-false/options.json index 0f1579e8b4..d89ab0138c 100644 --- a/packages/babel-plugin-transform-arrow-functions/test/fixtures/assumption-newableArrowFunctions-false/options.json +++ b/packages/babel-plugin-transform-arrow-functions/test/fixtures/assumption-newableArrowFunctions-false/options.json @@ -1,5 +1,5 @@ { - "plugins": ["external-helpers", "transform-arrow-functions"], + "plugins": ["transform-arrow-functions"], "assumptions": { "noNewArrows": false } diff --git a/packages/babel-plugin-transform-arrow-functions/test/fixtures/spec/newableArrowFunction-default/options.json b/packages/babel-plugin-transform-arrow-functions/test/fixtures/spec/newableArrowFunction-default/options.json index 50c8c58f0c..db0033700d 100644 --- a/packages/babel-plugin-transform-arrow-functions/test/fixtures/spec/newableArrowFunction-default/options.json +++ b/packages/babel-plugin-transform-arrow-functions/test/fixtures/spec/newableArrowFunction-default/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - "external-helpers", - ["transform-arrow-functions", { "spec": true }] - ] + "plugins": [["transform-arrow-functions", { "spec": true }]] } diff --git a/packages/babel-plugin-transform-arrow-functions/test/fixtures/spec/newableArrowFunction-vs-spec-false/options.json b/packages/babel-plugin-transform-arrow-functions/test/fixtures/spec/newableArrowFunction-vs-spec-false/options.json index 54a0937262..d0e43099b4 100644 --- a/packages/babel-plugin-transform-arrow-functions/test/fixtures/spec/newableArrowFunction-vs-spec-false/options.json +++ b/packages/babel-plugin-transform-arrow-functions/test/fixtures/spec/newableArrowFunction-vs-spec-false/options.json @@ -1,8 +1,5 @@ { - "plugins": [ - "external-helpers", - ["transform-arrow-functions", { "spec": false }] - ], + "plugins": [["transform-arrow-functions", { "spec": false }]], "assumptions": { "noNewArrows": false } diff --git a/packages/babel-plugin-transform-arrow-functions/test/fixtures/spec/newableArrowFunction-vs-spec-true/options.json b/packages/babel-plugin-transform-arrow-functions/test/fixtures/spec/newableArrowFunction-vs-spec-true/options.json index fe79242117..e03b30abb1 100644 --- a/packages/babel-plugin-transform-arrow-functions/test/fixtures/spec/newableArrowFunction-vs-spec-true/options.json +++ b/packages/babel-plugin-transform-arrow-functions/test/fixtures/spec/newableArrowFunction-vs-spec-true/options.json @@ -1,8 +1,5 @@ { - "plugins": [ - "external-helpers", - ["transform-arrow-functions", { "spec": true }] - ], + "plugins": [["transform-arrow-functions", { "spec": true }]], "assumptions": { "noNewArrows": true } diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/assumption-newableArrowFunctions-false/basic/options.json b/packages/babel-plugin-transform-async-to-generator/test/fixtures/assumption-newableArrowFunctions-false/basic/options.json index 0aed78e05b..167bf9282e 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/assumption-newableArrowFunctions-false/basic/options.json +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/assumption-newableArrowFunctions-false/basic/options.json @@ -1,5 +1,5 @@ { - "plugins": ["external-helpers", "transform-async-to-generator"], + "plugins": ["transform-async-to-generator"], "assumptions": { "noNewArrows": false } diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/assumption-newableArrowFunctions-false/bluebird/options.json b/packages/babel-plugin-transform-async-to-generator/test/fixtures/assumption-newableArrowFunctions-false/bluebird/options.json index bcd09c73c4..9cdb7dfb28 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/assumption-newableArrowFunctions-false/bluebird/options.json +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/assumption-newableArrowFunctions-false/bluebird/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-async-to-generator", { "module": "bluebird", "method": "coroutine" } diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/async-iife-with-regenerator-spec/options.json b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/async-iife-with-regenerator-spec/options.json index cf84ec89ad..7aa70e7c2b 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/async-iife-with-regenerator-spec/options.json +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/async-iife-with-regenerator-spec/options.json @@ -2,7 +2,6 @@ "plugins": [ ["transform-arrow-functions", { "spec": true }], "transform-regenerator", - "transform-async-to-generator", - "external-helpers" + "transform-async-to-generator" ] } diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/async-iife-with-regenerator/options.json b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/async-iife-with-regenerator/options.json index 6d8f7fa0e0..ca96a1c209 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/async-iife-with-regenerator/options.json +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/async-iife-with-regenerator/options.json @@ -2,7 +2,6 @@ "plugins": [ "transform-arrow-functions", "transform-regenerator", - "transform-async-to-generator", - "external-helpers" + "transform-async-to-generator" ] } diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/function-arity/options.json b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/function-arity/options.json index 93f5d722d8..0d67235e87 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/function-arity/options.json +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/function-arity/options.json @@ -1,3 +1,3 @@ { - "plugins": ["transform-async-to-generator", "external-helpers"] + "plugins": ["transform-async-to-generator"] } diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/object-method-with-super/options.json b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/object-method-with-super/options.json index 93f5d722d8..0d67235e87 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/object-method-with-super/options.json +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/object-method-with-super/options.json @@ -1,3 +1,3 @@ { - "plugins": ["transform-async-to-generator", "external-helpers"] + "plugins": ["transform-async-to-generator"] } diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/options.json b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/options.json index 0df15395d1..27ea1b3d4a 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/options.json +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "transform-parameters", - "transform-async-to-generator" - ] + "plugins": ["transform-parameters", "transform-async-to-generator"] } diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/shadowed-promise-import/output.mjs b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/shadowed-promise-import/output.mjs index dd7acaaf09..98bc185e76 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/shadowed-promise-import/output.mjs +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/shadowed-promise-import/output.mjs @@ -1,16 +1,12 @@ -function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } - -function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } - -import _Promise from 'somewhere'; +import Promise from 'somewhere'; function foo() { return _foo.apply(this, arguments); } function _foo() { - _foo = _asyncToGenerator(function* () { - yield _Promise.resolve(); + _foo = babelHelpers.asyncToGenerator(function* () { + yield Promise.resolve(); }); return _foo.apply(this, arguments); } diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/shadowed-promise-nested/output.js b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/shadowed-promise-nested/output.js index a9472d55df..d3d697e56c 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/shadowed-promise-nested/output.js +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/shadowed-promise-nested/output.js @@ -1,15 +1,11 @@ -function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } - -function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } - -let _Promise; +let Promise; function foo() { return _foo.apply(this, arguments); } function _foo() { - _foo = _asyncToGenerator(function* () { + _foo = babelHelpers.asyncToGenerator(function* () { let Promise; yield bar(); @@ -18,7 +14,7 @@ function _foo() { } function _bar() { - _bar = _asyncToGenerator(function* () { + _bar = babelHelpers.asyncToGenerator(function* () { return Promise.resolve(); }); return _bar.apply(this, arguments); diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/shadowed-promise/output.js b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/shadowed-promise/output.js index bd1fbc62fd..64f0af5685 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/shadowed-promise/output.js +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/async-to-generator/shadowed-promise/output.js @@ -1,16 +1,12 @@ -function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } - -function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } - -let _Promise; +let Promise; function foo() { return _foo.apply(this, arguments); } function _foo() { - _foo = _asyncToGenerator(function* () { - yield new _Promise(resolve => { + _foo = babelHelpers.asyncToGenerator(function* () { + yield new Promise(resolve => { resolve(); }); }); diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/bluebird-coroutines/options.json b/packages/babel-plugin-transform-async-to-generator/test/fixtures/bluebird-coroutines/options.json index a5852f1fd4..c56e46297d 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/bluebird-coroutines/options.json +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/bluebird-coroutines/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-async-to-generator", { diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/export-async/options.json b/packages/babel-plugin-transform-async-to-generator/test/fixtures/export-async/options.json index b6ae56ff6d..445be281a9 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/export-async/options.json +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/export-async/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "transform-modules-commonjs", - "transform-async-to-generator" - ] + "plugins": ["transform-modules-commonjs", "transform-async-to-generator"] } diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/4943/output.js b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/4943/output.js index 57983b4c7e..629222db88 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/4943/output.js +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/4943/output.js @@ -1,9 +1,5 @@ "use strict"; -function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } - -function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } - function mandatory(paramName) { throw new Error(`Missing parameter: ${paramName}`); } @@ -13,7 +9,7 @@ function foo(_x) { } function _foo() { - _foo = _asyncToGenerator(function* (_ref) { + _foo = babelHelpers.asyncToGenerator(function* (_ref) { let a = _ref.a, _ref$b = _ref.b, b = _ref$b === void 0 ? mandatory("b") : _ref$b; diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/7178/options.json b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/7178/options.json index 6dc5e9a6a3..4095b672e0 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/7178/options.json +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/7178/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-async-to-generator", ["transform-react-jsx", { "runtime": "classic" }], "transform-react-constant-elements" diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/8783/output.js b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/8783/output.js index 819b9a4b22..e7db46fb3e 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/8783/output.js +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/8783/output.js @@ -1,9 +1,5 @@ -function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } - -function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } - (function () { - var _poll = _asyncToGenerator(function* () { + var _poll = babelHelpers.asyncToGenerator(function* () { console.log(yield Promise.resolve('Hello')); setTimeout(poll, 1000); }); diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/T6882/options.json b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/T6882/options.json index a6697d8893..852b714233 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/T6882/options.json +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/T6882/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-async-to-generator", "transform-block-scoping", "transform-arrow-functions", diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/T7194/options.json b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/T7194/options.json index 12832f77b0..0fa48d5615 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/T7194/options.json +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/T7194/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "transform-arrow-functions", - "transform-async-to-generator", - "external-helpers" - ] + "plugins": ["transform-arrow-functions", "transform-async-to-generator"] } diff --git a/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/options.json b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/options.json index 54b64ad0fb..0d67235e87 100644 --- a/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/options.json +++ b/packages/babel-plugin-transform-async-to-generator/test/fixtures/regression/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "transform-async-to-generator"] + "plugins": ["transform-async-to-generator"] } diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/deadcode-violation/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/deadcode-violation/output.js index 20ade30854..a9ecc00566 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/deadcode-violation/output.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/deadcode-violation/output.js @@ -1,7 +1,5 @@ -function _readOnlyError(name) { throw new TypeError("\"" + name + "\" is read-only"); } - (function () { var a = "foo"; - if (false) a = (_readOnlyError("a"), "false"); + if (false) a = (babelHelpers.readOnlyError("a"), "false"); return a; })(); diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/destructuring-assignment/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/destructuring-assignment/output.js index 2c6e0d3e5d..e055105133 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/destructuring-assignment/output.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/destructuring-assignment/output.js @@ -1,5 +1,3 @@ -function _readOnlyError(name) { throw new TypeError("\"" + name + "\" is read-only"); } - var a = 1, b = 2; -a = (_readOnlyError("a"), 3); +a = (babelHelpers.readOnlyError("a"), 3); diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/loop/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/loop/output.js index 33cef8ad91..f1b882b2e4 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/loop/output.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/loop/output.js @@ -1,5 +1,3 @@ -function _readOnlyError(name) { throw new TypeError("\"" + name + "\" is read-only"); } - -for (var i = 0; i < 3; i = (_readOnlyError("i"), i + 1)) { +for (var i = 0; i < 3; i = (babelHelpers.readOnlyError("i"), i + 1)) { console.log(i); } diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/nested-update-expressions/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/nested-update-expressions/output.js index 8bbef8353a..4f5d9284d7 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/nested-update-expressions/output.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/nested-update-expressions/output.js @@ -1,8 +1,6 @@ -function _readOnlyError(name) { throw new TypeError("\"" + name + "\" is read-only"); } - var c = 17; var a = 0; function f() { - return (_readOnlyError("c"), ++c) + --a; + return (babelHelpers.readOnlyError("c"), ++c) + --a; } diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-assignment/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-assignment/output.js index 70fa89f317..fe6f609dbd 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-assignment/output.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-assignment/output.js @@ -1,4 +1,2 @@ -function _readOnlyError(name) { throw new TypeError("\"" + name + "\" is read-only"); } - var MULTIPLIER = 5; -MULTIPLIER = (_readOnlyError("MULTIPLIER"), "overwrite"); +MULTIPLIER = (babelHelpers.readOnlyError("MULTIPLIER"), "overwrite"); diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-for-in/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-for-in/output.js index b5c79de3dc..71b72be5ca 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-for-in/output.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/no-for-in/output.js @@ -1,9 +1,6 @@ -function _readOnlyError(name) { throw new TypeError("\"" + name + "\" is read-only"); } - var MULTIPLIER = 5; for (MULTIPLIER in arr) { - _readOnlyError("MULTIPLIER"); - + babelHelpers.readOnlyError("MULTIPLIER"); ; } diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/update-expression-prefix/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/update-expression-prefix/output.js index db8cdac701..b9a3ee122b 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/update-expression-prefix/output.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/update-expression-prefix/output.js @@ -1,4 +1,2 @@ -function _readOnlyError(name) { throw new TypeError("\"" + name + "\" is read-only"); } - var a = "str"; -_readOnlyError("a"), --a; +babelHelpers.readOnlyError("a"), --a; diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/update-expression/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/update-expression/output.js index 8c9e99ae4d..355150f7ec 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/update-expression/output.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/const-violations/update-expression/output.js @@ -1,4 +1,2 @@ -function _readOnlyError(name) { throw new TypeError("\"" + name + "\" is read-only"); } - var foo = 1; -_readOnlyError("foo"), foo++; +babelHelpers.readOnlyError("foo"), foo++; diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/general/hoisting/options.json b/packages/babel-plugin-transform-block-scoping/test/fixtures/general/hoisting/options.json index 9d3c67e6ce..c1b2fe494b 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/general/hoisting/options.json +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/general/hoisting/options.json @@ -4,7 +4,6 @@ "syntax-jsx", "transform-react-jsx", "transform-block-scoped-functions", - "transform-for-of", - ["external-helpers", { "helperVersion": "7.100.0" }] + "transform-for-of" ] } diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-10046-async/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-10046-async/output.js index f9fe43527b..3be4aa7b6a 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-10046-async/output.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-10046-async/output.js @@ -1,10 +1,6 @@ -function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } - -function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } - if (true) { var _run = /*#__PURE__*/function () { - var _ref = _asyncToGenerator(function* () { + var _ref = babelHelpers.asyncToGenerator(function* () { return true; }); diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-10339/output.js b/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-10339/output.js index b482807df2..c3e4c75b51 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-10339/output.js +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/general/issue-10339/output.js @@ -1,5 +1,3 @@ -function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; } - var _loop = function (foo, bar) { () => foo; @@ -14,7 +12,7 @@ for (var _ref of {}) { var { foo } = _ref, - bar = _objectWithoutPropertiesLoose(_ref, ["foo"]); + bar = babelHelpers.objectWithoutPropertiesLoose(_ref, ["foo"]); _loop(foo, bar); } diff --git a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/options.json b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/options.json index e04afdec5d..07942e513e 100644 --- a/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/options.json +++ b/packages/babel-plugin-transform-block-scoping/test/fixtures/tdz/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - ["transform-block-scoping", { "tdz": true }], - ["external-helpers", { "helperVersion": "7.1000.0" }] - ] + "plugins": [["transform-block-scoping", { "tdz": true }]] } diff --git a/packages/babel-plugin-transform-classes/test/fixtures/assumption-constantSuper/accessing-super-property-optional-chain/options.json b/packages/babel-plugin-transform-classes/test/fixtures/assumption-constantSuper/accessing-super-property-optional-chain/options.json index d969db5fb3..92969ad7db 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/assumption-constantSuper/accessing-super-property-optional-chain/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/assumption-constantSuper/accessing-super-property-optional-chain/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], ["proposal-optional-chaining", { "loose": true }], "transform-function-name", ["transform-classes", { "loose": true }], diff --git a/packages/babel-plugin-transform-classes/test/fixtures/assumption-constantSuper/options.json b/packages/babel-plugin-transform-classes/test/fixtures/assumption-constantSuper/options.json index 39e1d1bab8..03b81d8a7b 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/assumption-constantSuper/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/assumption-constantSuper/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], "transform-function-name", "transform-classes", ["transform-spread", { "loose": true }], diff --git a/packages/babel-plugin-transform-classes/test/fixtures/assumption-noCallClass/options.json b/packages/babel-plugin-transform-classes/test/fixtures/assumption-noCallClass/options.json index fe4fa1e68b..f609342009 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/assumption-noCallClass/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/assumption-noCallClass/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], "transform-function-name", "transform-classes", ["transform-spread", { "loose": true }], diff --git a/packages/babel-plugin-transform-classes/test/fixtures/assumption-setClassMethods/method-return-type-annotation/options.json b/packages/babel-plugin-transform-classes/test/fixtures/assumption-setClassMethods/method-return-type-annotation/options.json index 1f9617ec39..1a5b13a7d3 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/assumption-setClassMethods/method-return-type-annotation/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/assumption-setClassMethods/method-return-type-annotation/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-function-name", ["transform-classes", { "loose": true }], "transform-spread", diff --git a/packages/babel-plugin-transform-classes/test/fixtures/assumption-setClassMethods/options.json b/packages/babel-plugin-transform-classes/test/fixtures/assumption-setClassMethods/options.json index 62562eb645..1595a86046 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/assumption-setClassMethods/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/assumption-setClassMethods/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], "transform-function-name", "transform-classes", ["transform-spread", { "loose": true }], diff --git a/packages/babel-plugin-transform-classes/test/fixtures/assumption-superIsCallableConstructor/options.json b/packages/babel-plugin-transform-classes/test/fixtures/assumption-superIsCallableConstructor/options.json index 7002b66f73..ba9c639033 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/assumption-superIsCallableConstructor/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/assumption-superIsCallableConstructor/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], "transform-function-name", "transform-classes", ["transform-spread", { "loose": true }], diff --git a/packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/loose/output.js b/packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/loose/output.js index 6656de5619..12a3fd9a97 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/loose/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/loose/output.js @@ -1,25 +1,11 @@ -function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); } - -function _wrapNativeSuper(Class) { var _cache = typeof Map === "function" ? new Map() : undefined; _wrapNativeSuper = function _wrapNativeSuper(Class) { if (Class === null || !_isNativeFunction(Class)) return Class; if (typeof Class !== "function") { throw new TypeError("Super expression must either be null or a function"); } if (typeof _cache !== "undefined") { if (_cache.has(Class)) return _cache.get(Class); _cache.set(Class, Wrapper); } function Wrapper() { return _construct(Class, arguments, _getPrototypeOf(this).constructor); } Wrapper.prototype = Object.create(Class.prototype, { constructor: { value: Wrapper, enumerable: false, writable: true, configurable: true } }); return _setPrototypeOf(Wrapper, Class); }; return _wrapNativeSuper(Class); } - -function _construct(Parent, args, Class) { if (_isNativeReflectConstruct()) { _construct = Reflect.construct; } else { _construct = function _construct(Parent, args, Class) { var a = [null]; a.push.apply(a, args); var Constructor = Function.bind.apply(Parent, a); var instance = new Constructor(); if (Class) _setPrototypeOf(instance, Class.prototype); return instance; }; } return _construct.apply(null, arguments); } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _isNativeFunction(fn) { return Function.toString.call(fn).indexOf("[native code]") !== -1; } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - var List = /*#__PURE__*/function (_Array) { "use strict"; - _inheritsLoose(List, _Array); + babelHelpers.inheritsLoose(List, _Array); function List() { return _Array.apply(this, arguments) || this; } return List; -}( /*#__PURE__*/_wrapNativeSuper(Array)); +}( /*#__PURE__*/babelHelpers.wrapNativeSuper(Array)); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/shadowed/options.json b/packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/shadowed/options.json index aec48c2b7d..7e50eb3348 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/shadowed/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/shadowed/options.json @@ -1,3 +1,3 @@ { - "plugins": ["transform-classes", "external-helpers"] + "plugins": ["transform-classes"] } diff --git a/packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/shadowed/output.js b/packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/shadowed/output.js index 4279f63b06..59f8625f82 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/shadowed/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/shadowed/output.js @@ -1,7 +1,3 @@ -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = babelHelpers.getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = babelHelpers.getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return babelHelpers.possibleConstructorReturn(this, result); }; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - let Array = function Array() { "use strict"; @@ -13,7 +9,7 @@ let List = /*#__PURE__*/function (_Array) { babelHelpers.inherits(List, _Array); - var _super = _createSuper(List); + var _super = babelHelpers.createSuper(List); function List() { babelHelpers.classCallCheck(this, List); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/spec/output.js b/packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/spec/output.js index 52f199090e..fb1678607c 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/spec/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/spec/output.js @@ -1,37 +1,14 @@ -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _wrapNativeSuper(Class) { var _cache = typeof Map === "function" ? new Map() : undefined; _wrapNativeSuper = function _wrapNativeSuper(Class) { if (Class === null || !_isNativeFunction(Class)) return Class; if (typeof Class !== "function") { throw new TypeError("Super expression must either be null or a function"); } if (typeof _cache !== "undefined") { if (_cache.has(Class)) return _cache.get(Class); _cache.set(Class, Wrapper); } function Wrapper() { return _construct(Class, arguments, _getPrototypeOf(this).constructor); } Wrapper.prototype = Object.create(Class.prototype, { constructor: { value: Wrapper, enumerable: false, writable: true, configurable: true } }); return _setPrototypeOf(Wrapper, Class); }; return _wrapNativeSuper(Class); } - -function _construct(Parent, args, Class) { if (_isNativeReflectConstruct()) { _construct = Reflect.construct; } else { _construct = function _construct(Parent, args, Class) { var a = [null]; a.push.apply(a, args); var Constructor = Function.bind.apply(Parent, a); var instance = new Constructor(); if (Class) _setPrototypeOf(instance, Class.prototype); return instance; }; } return _construct.apply(null, arguments); } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _isNativeFunction(fn) { return Function.toString.call(fn).indexOf("[native code]") !== -1; } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - var List = /*#__PURE__*/function (_Array) { "use strict"; - _inherits(List, _Array); + babelHelpers.inherits(List, _Array); - var _super = _createSuper(List); + var _super = babelHelpers.createSuper(List); function List() { - _classCallCheck(this, List); - + babelHelpers.classCallCheck(this, List); return _super.apply(this, arguments); } return List; -}( /*#__PURE__*/_wrapNativeSuper(Array)); +}( /*#__PURE__*/babelHelpers.wrapNativeSuper(Array)); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/wrap-native-super/options.json b/packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/wrap-native-super/options.json index 55e74be7ce..5d03380e6f 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/wrap-native-super/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/extend-builtins/wrap-native-super/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "transform-classes", - "transform-block-scoping", - "external-helpers" - ] + "plugins": ["transform-classes", "transform-block-scoping"] } diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/call-semantics-data-defined-on-parent/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/call-semantics-data-defined-on-parent/output.js index 4c0bcc52e1..6388e600e0 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/call-semantics-data-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/call-semantics-data-defined-on-parent/output.js @@ -1,9 +1,5 @@ "use strict"; -function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - let Base = /*#__PURE__*/function () { function Base() {} @@ -19,7 +15,7 @@ let Base = /*#__PURE__*/function () { }(); let Obj = /*#__PURE__*/function (_Base) { - _inheritsLoose(Obj, _Base); + babelHelpers.inheritsLoose(Obj, _Base); function Obj() { return _Base.apply(this, arguments) || this; diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/call-semantics-getter-defined-on-parent/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/call-semantics-getter-defined-on-parent/output.js index da4d0029d0..4eb5017cb6 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/call-semantics-getter-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/call-semantics-getter-defined-on-parent/output.js @@ -1,17 +1,9 @@ "use strict"; -function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - let Base = /*#__PURE__*/function () { function Base() {} - _createClass(Base, [{ + babelHelpers.createClass(Base, [{ key: "test", get: function () { // This is incorrect according to the spec, @@ -24,12 +16,11 @@ let Base = /*#__PURE__*/function () { }; } }]); - return Base; }(); let Obj = /*#__PURE__*/function (_Base) { - _inheritsLoose(Obj, _Base); + babelHelpers.inheritsLoose(Obj, _Base); function Obj() { return _Base.apply(this, arguments) || this; diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/call-semantics-not-defined-on-parent/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/call-semantics-not-defined-on-parent/output.js index 1e76b8c863..c24dcc14cb 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/call-semantics-not-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/call-semantics-not-defined-on-parent/output.js @@ -1,13 +1,9 @@ "use strict"; -function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - let Base = function Base() {}; let Obj = /*#__PURE__*/function (_Base) { - _inheritsLoose(Obj, _Base); + babelHelpers.inheritsLoose(Obj, _Base); function Obj() { return _Base.apply(this, arguments) || this; diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/call-semantics-setter-defined-on-parent/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/call-semantics-setter-defined-on-parent/output.js index d0d3d9071d..dc1af9bbd6 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/call-semantics-setter-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/call-semantics-setter-defined-on-parent/output.js @@ -1,28 +1,19 @@ "use strict"; -function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - let Base = /*#__PURE__*/function () { function Base() {} - _createClass(Base, [{ + babelHelpers.createClass(Base, [{ key: "test", set: function (v) { throw new Error("gobbledygook"); } }]); - return Base; }(); let Obj = /*#__PURE__*/function (_Base) { - _inheritsLoose(Obj, _Base); + babelHelpers.inheritsLoose(Obj, _Base); function Obj() { return _Base.apply(this, arguments) || this; diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/get-semantics-data-defined-on-parent/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/get-semantics-data-defined-on-parent/output.js index e3abdfc5b2..29f1f7d262 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/get-semantics-data-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/get-semantics-data-defined-on-parent/output.js @@ -1,15 +1,11 @@ "use strict"; -function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - let Base = function Base() {}; Base.prototype.test = 1; let Obj = /*#__PURE__*/function (_Base) { - _inheritsLoose(Obj, _Base); + babelHelpers.inheritsLoose(Obj, _Base); function Obj() { return _Base.apply(this, arguments) || this; diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/get-semantics-getter-defined-on-parent/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/get-semantics-getter-defined-on-parent/output.js index 21cf51afd7..f8dc39656b 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/get-semantics-getter-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/get-semantics-getter-defined-on-parent/output.js @@ -1,17 +1,9 @@ "use strict"; -function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - let Base = /*#__PURE__*/function () { function Base() {} - _createClass(Base, [{ + babelHelpers.createClass(Base, [{ key: "test", get: function () { // This is incorrect according to the spec, @@ -20,12 +12,11 @@ let Base = /*#__PURE__*/function () { return 1; } }]); - return Base; }(); let Obj = /*#__PURE__*/function (_Base) { - _inheritsLoose(Obj, _Base); + babelHelpers.inheritsLoose(Obj, _Base); function Obj() { return _Base.apply(this, arguments) || this; diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/get-semantics-not-defined-on-parent/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/get-semantics-not-defined-on-parent/output.js index e4c7eb3249..c6f6b7d521 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/get-semantics-not-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/get-semantics-not-defined-on-parent/output.js @@ -1,13 +1,9 @@ "use strict"; -function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - let Base = function Base() {}; let Obj = /*#__PURE__*/function (_Base) { - _inheritsLoose(Obj, _Base); + babelHelpers.inheritsLoose(Obj, _Base); function Obj() { return _Base.apply(this, arguments) || this; diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/get-semantics-setter-defined-on-parent/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/get-semantics-setter-defined-on-parent/output.js index d1e5164378..e353595522 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/get-semantics-setter-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/get-semantics-setter-defined-on-parent/output.js @@ -1,28 +1,19 @@ "use strict"; -function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - let Base = /*#__PURE__*/function () { function Base() {} - _createClass(Base, [{ + babelHelpers.createClass(Base, [{ key: "test", set: function (v) { throw new Error("called"); } }]); - return Base; }(); let Obj = /*#__PURE__*/function (_Base) { - _inheritsLoose(Obj, _Base); + babelHelpers.inheritsLoose(Obj, _Base); function Obj() { return _Base.apply(this, arguments) || this; diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/memoized-assign/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/memoized-assign/output.js index cffc803238..3a37cd627c 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/memoized-assign/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/memoized-assign/output.js @@ -1,9 +1,5 @@ "use strict"; -function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - let Base = function Base() {}; Object.defineProperty(Base.prototype, 0, { @@ -25,7 +21,7 @@ const proper = { }; let Obj = /*#__PURE__*/function (_Base) { - _inheritsLoose(Obj, _Base); + babelHelpers.inheritsLoose(Obj, _Base); function Obj() { return _Base.apply(this, arguments) || this; diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/memoized-update/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/memoized-update/output.js index 4565f4fa54..f1421dcab9 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/memoized-update/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/memoized-update/output.js @@ -1,9 +1,5 @@ "use strict"; -function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - let Base = function Base() {}; Object.defineProperty(Base.prototype, 0, { @@ -25,7 +21,7 @@ const proper = { }; let Obj = /*#__PURE__*/function (_Base) { - _inheritsLoose(Obj, _Base); + babelHelpers.inheritsLoose(Obj, _Base); function Obj() { return _Base.apply(this, arguments) || this; diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-data-defined-on-parent/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-data-defined-on-parent/output.js index ed6bd9d7a4..15ffd7b08a 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-data-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-data-defined-on-parent/output.js @@ -1,9 +1,5 @@ "use strict"; -function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - let Base = function Base() {}; Object.defineProperty(Base.prototype, 'test', { @@ -13,7 +9,7 @@ Object.defineProperty(Base.prototype, 'test', { }); let Obj = /*#__PURE__*/function (_Base) { - _inheritsLoose(Obj, _Base); + babelHelpers.inheritsLoose(Obj, _Base); function Obj() { return _Base.apply(this, arguments) || this; diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-getter-defined-on-parent/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-getter-defined-on-parent/output.js index d4812193a7..69a545aba5 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-getter-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-getter-defined-on-parent/output.js @@ -1,33 +1,24 @@ "use strict"; -function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - let called = false; let Base = /*#__PURE__*/function () { function Base() {} - _createClass(Base, [{ + babelHelpers.createClass(Base, [{ key: "test", get: function () { called = true; return 1; } }]); - return Base; }(); ; let Obj = /*#__PURE__*/function (_Base) { - _inheritsLoose(Obj, _Base); + babelHelpers.inheritsLoose(Obj, _Base); function Obj() { return _Base.apply(this, arguments) || this; diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-not-defined-on-parent-data-on-obj/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-not-defined-on-parent-data-on-obj/output.js index cbbae75137..8bc5276ba1 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-not-defined-on-parent-data-on-obj/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-not-defined-on-parent-data-on-obj/output.js @@ -1,13 +1,9 @@ "use strict"; -function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - let Base = function Base() {}; let Obj = /*#__PURE__*/function (_Base) { - _inheritsLoose(Obj, _Base); + babelHelpers.inheritsLoose(Obj, _Base); function Obj() { return _Base.apply(this, arguments) || this; diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-not-defined-on-parent-getter-on-obj/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-not-defined-on-parent-getter-on-obj/output.js index f68a10f545..eb51f368bf 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-not-defined-on-parent-getter-on-obj/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-not-defined-on-parent-getter-on-obj/output.js @@ -1,19 +1,11 @@ "use strict"; -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - -function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - let Base = function Base() {}; let called = false; let Obj = /*#__PURE__*/function (_Base) { - _inheritsLoose(Obj, _Base); + babelHelpers.inheritsLoose(Obj, _Base); function Obj() { return _Base.apply(this, arguments) || this; @@ -25,13 +17,12 @@ let Obj = /*#__PURE__*/function (_Base) { return this.test = 3; }; - _createClass(Obj, [{ + babelHelpers.createClass(Obj, [{ key: "test", get: function () { called = true; } }]); - return Obj; }(Base); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-not-defined-on-parent-not-on-obj/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-not-defined-on-parent-not-on-obj/output.js index a5c75b5081..6d252a8c1e 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-not-defined-on-parent-not-on-obj/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-not-defined-on-parent-not-on-obj/output.js @@ -1,13 +1,9 @@ "use strict"; -function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - let Base = function Base() {}; let Obj = /*#__PURE__*/function (_Base) { - _inheritsLoose(Obj, _Base); + babelHelpers.inheritsLoose(Obj, _Base); function Obj() { return _Base.apply(this, arguments) || this; diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-not-defined-on-parent-setter-on-obj/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-not-defined-on-parent-setter-on-obj/output.js index 61d6f91876..8501f70ae7 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-not-defined-on-parent-setter-on-obj/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-not-defined-on-parent-setter-on-obj/output.js @@ -1,19 +1,11 @@ "use strict"; -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - -function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - let Base = function Base() {}; let value = 2; let Obj = /*#__PURE__*/function (_Base) { - _inheritsLoose(Obj, _Base); + babelHelpers.inheritsLoose(Obj, _Base); function Obj() { return _Base.apply(this, arguments) || this; @@ -25,13 +17,12 @@ let Obj = /*#__PURE__*/function (_Base) { return this.test = 3; }; - _createClass(Obj, [{ + babelHelpers.createClass(Obj, [{ key: "test", set: function (v) { value = v; } }]); - return Obj; }(Base); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-setter-defined-on-parent/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-setter-defined-on-parent/output.js index a0304c9b26..2df4d3d7fe 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-setter-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set-loose/set-semantics-setter-defined-on-parent/output.js @@ -1,30 +1,21 @@ "use strict"; -function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - let value = 1; let Base = /*#__PURE__*/function () { function Base() {} - _createClass(Base, [{ + babelHelpers.createClass(Base, [{ key: "test", set: function (v) { value = v; } }]); - return Base; }(); let Obj = /*#__PURE__*/function (_Base) { - _inheritsLoose(Obj, _Base); + babelHelpers.inheritsLoose(Obj, _Base); function Obj() { return _Base.apply(this, arguments) || this; diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set/call-semantics-data-defined-on-parent/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set/call-semantics-data-defined-on-parent/output.js index 68b519765d..96302f0738 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set/call-semantics-data-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set/call-semantics-data-defined-on-parent/output.js @@ -1,35 +1,11 @@ "use strict"; -function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - let Base = /*#__PURE__*/function () { function Base() { - _classCallCheck(this, Base); + babelHelpers.classCallCheck(this, Base); } - _createClass(Base, [{ + babelHelpers.createClass(Base, [{ key: "test", value: function test(...args) { expect(this).toBe(obj); @@ -37,31 +13,26 @@ let Base = /*#__PURE__*/function () { return 1; } }]); - return Base; }(); let Obj = /*#__PURE__*/function (_Base) { - _inherits(Obj, _Base); + babelHelpers.inherits(Obj, _Base); - var _super = _createSuper(Obj); + var _super = babelHelpers.createSuper(Obj); function Obj() { - _classCallCheck(this, Obj); - + babelHelpers.classCallCheck(this, Obj); return _super.apply(this, arguments); } - _createClass(Obj, [{ + babelHelpers.createClass(Obj, [{ key: "call", value: function call() { - _get(_getPrototypeOf(Obj.prototype), "test", this).call(this, 1, 2, 3); - - _get(_getPrototypeOf(Obj.prototype), "test", this).call(this, 1, ...[2, 3]); - - _get(_getPrototypeOf(Obj.prototype), "test", this).call(this, ...[1, 2, 3]); - - return _get(_getPrototypeOf(Obj.prototype), "test", this).apply(this, arguments); + babelHelpers.get(babelHelpers.getPrototypeOf(Obj.prototype), "test", this).call(this, 1, 2, 3); + babelHelpers.get(babelHelpers.getPrototypeOf(Obj.prototype), "test", this).call(this, 1, ...[2, 3]); + babelHelpers.get(babelHelpers.getPrototypeOf(Obj.prototype), "test", this).call(this, ...[1, 2, 3]); + return babelHelpers.get(babelHelpers.getPrototypeOf(Obj.prototype), "test", this).apply(this, arguments); } }, { key: "test", @@ -69,7 +40,6 @@ let Obj = /*#__PURE__*/function (_Base) { throw new Error("called"); } }]); - return Obj; }(Base); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set/call-semantics-getter-defined-on-parent/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set/call-semantics-getter-defined-on-parent/output.js index 09274afc5a..5e7a6f0c9a 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set/call-semantics-getter-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set/call-semantics-getter-defined-on-parent/output.js @@ -1,35 +1,11 @@ "use strict"; -function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - let Base = /*#__PURE__*/function () { function Base() { - _classCallCheck(this, Base); + babelHelpers.classCallCheck(this, Base); } - _createClass(Base, [{ + babelHelpers.createClass(Base, [{ key: "test", get: function () { expect(this).toBe(obj); @@ -40,31 +16,26 @@ let Base = /*#__PURE__*/function () { }; } }]); - return Base; }(); let Obj = /*#__PURE__*/function (_Base) { - _inherits(Obj, _Base); + babelHelpers.inherits(Obj, _Base); - var _super = _createSuper(Obj); + var _super = babelHelpers.createSuper(Obj); function Obj() { - _classCallCheck(this, Obj); - + babelHelpers.classCallCheck(this, Obj); return _super.apply(this, arguments); } - _createClass(Obj, [{ + babelHelpers.createClass(Obj, [{ key: "call", value: function call() { - _get(_getPrototypeOf(Obj.prototype), "test", this).call(this, 1, 2, 3); - - _get(_getPrototypeOf(Obj.prototype), "test", this).call(this, 1, ...[2, 3]); - - _get(_getPrototypeOf(Obj.prototype), "test", this).call(this, ...[1, 2, 3]); - - return _get(_getPrototypeOf(Obj.prototype), "test", this).apply(this, arguments); + babelHelpers.get(babelHelpers.getPrototypeOf(Obj.prototype), "test", this).call(this, 1, 2, 3); + babelHelpers.get(babelHelpers.getPrototypeOf(Obj.prototype), "test", this).call(this, 1, ...[2, 3]); + babelHelpers.get(babelHelpers.getPrototypeOf(Obj.prototype), "test", this).call(this, ...[1, 2, 3]); + return babelHelpers.get(babelHelpers.getPrototypeOf(Obj.prototype), "test", this).apply(this, arguments); } }, { key: "test", @@ -72,7 +43,6 @@ let Obj = /*#__PURE__*/function (_Base) { throw new Error("called"); } }]); - return Obj; }(Base); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set/call-semantics-not-defined-on-parent/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set/call-semantics-not-defined-on-parent/output.js index 7cd583c678..9dfac6f987 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set/call-semantics-not-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set/call-semantics-not-defined-on-parent/output.js @@ -1,48 +1,23 @@ "use strict"; -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - -function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - let Base = function Base() { - _classCallCheck(this, Base); + babelHelpers.classCallCheck(this, Base); }; let Obj = /*#__PURE__*/function (_Base) { - _inherits(Obj, _Base); + babelHelpers.inherits(Obj, _Base); - var _super = _createSuper(Obj); + var _super = babelHelpers.createSuper(Obj); function Obj() { - _classCallCheck(this, Obj); - + babelHelpers.classCallCheck(this, Obj); return _super.apply(this, arguments); } - _createClass(Obj, [{ + babelHelpers.createClass(Obj, [{ key: "call", value: function call() { - return _get(_getPrototypeOf(Obj.prototype), "test", this).call(this); + return babelHelpers.get(babelHelpers.getPrototypeOf(Obj.prototype), "test", this).call(this); } }, { key: "test", @@ -50,7 +25,6 @@ let Obj = /*#__PURE__*/function (_Base) { throw new Error("gobbledygook"); } }]); - return Obj; }(Base); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set/call-semantics-setter-defined-on-parent/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set/call-semantics-setter-defined-on-parent/output.js index 0f52c66847..170d5bd955 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set/call-semantics-setter-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set/call-semantics-setter-defined-on-parent/output.js @@ -1,59 +1,33 @@ "use strict"; -function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - let Base = /*#__PURE__*/function () { function Base() { - _classCallCheck(this, Base); + babelHelpers.classCallCheck(this, Base); } - _createClass(Base, [{ + babelHelpers.createClass(Base, [{ key: "test", set: function (v) { throw new Error("gobbledygook"); } }]); - return Base; }(); let Obj = /*#__PURE__*/function (_Base) { - _inherits(Obj, _Base); + babelHelpers.inherits(Obj, _Base); - var _super = _createSuper(Obj); + var _super = babelHelpers.createSuper(Obj); function Obj() { - _classCallCheck(this, Obj); - + babelHelpers.classCallCheck(this, Obj); return _super.apply(this, arguments); } - _createClass(Obj, [{ + babelHelpers.createClass(Obj, [{ key: "call", value: function call() { - return _get(_getPrototypeOf(Obj.prototype), "test", this).call(this); + return babelHelpers.get(babelHelpers.getPrototypeOf(Obj.prototype), "test", this).call(this); } }, { key: "test", @@ -61,7 +35,6 @@ let Obj = /*#__PURE__*/function (_Base) { throw new Error("gobbledygook"); } }]); - return Obj; }(Base); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set/change-computed-key/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set/change-computed-key/output.js index 2dacc97ce1..8e5ae962c6 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set/change-computed-key/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set/change-computed-key/output.js @@ -1,17 +1,11 @@ -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - let A = /*#__PURE__*/function () { "use strict"; function A() { - _classCallCheck(this, A); + babelHelpers.classCallCheck(this, A); } - _createClass(A, [{ + babelHelpers.createClass(A, [{ key: x, get: function () {} }, { @@ -21,6 +15,5 @@ let A = /*#__PURE__*/function () { key: x, set: function (_) {} }]); - return A; }(); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set/get-semantics-data-defined-on-parent/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set/get-semantics-data-defined-on-parent/output.js index 7e3d8cc4b0..0cbbd07ac8 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set/get-semantics-data-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set/get-semantics-data-defined-on-parent/output.js @@ -1,53 +1,27 @@ "use strict"; -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - -function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - let Base = function Base() { - _classCallCheck(this, Base); + babelHelpers.classCallCheck(this, Base); }; Base.prototype.test = 1; let Obj = /*#__PURE__*/function (_Base) { - _inherits(Obj, _Base); + babelHelpers.inherits(Obj, _Base); - var _super = _createSuper(Obj); + var _super = babelHelpers.createSuper(Obj); function Obj() { - _classCallCheck(this, Obj); - + babelHelpers.classCallCheck(this, Obj); return _super.apply(this, arguments); } - _createClass(Obj, [{ + babelHelpers.createClass(Obj, [{ key: "get", value: function get() { - return _get(_getPrototypeOf(Obj.prototype), "test", this); + return babelHelpers.get(babelHelpers.getPrototypeOf(Obj.prototype), "test", this); } }]); - return Obj; }(Base); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set/get-semantics-getter-defined-on-parent/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set/get-semantics-getter-defined-on-parent/output.js index d16793fb2d..a960b4b96c 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set/get-semantics-getter-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set/get-semantics-getter-defined-on-parent/output.js @@ -1,63 +1,36 @@ "use strict"; -function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - let Base = /*#__PURE__*/function () { function Base() { - _classCallCheck(this, Base); + babelHelpers.classCallCheck(this, Base); } - _createClass(Base, [{ + babelHelpers.createClass(Base, [{ key: "test", get: function () { expect(this).toBe(obj); return 1; } }]); - return Base; }(); let Obj = /*#__PURE__*/function (_Base) { - _inherits(Obj, _Base); + babelHelpers.inherits(Obj, _Base); - var _super = _createSuper(Obj); + var _super = babelHelpers.createSuper(Obj); function Obj() { - _classCallCheck(this, Obj); - + babelHelpers.classCallCheck(this, Obj); return _super.apply(this, arguments); } - _createClass(Obj, [{ + babelHelpers.createClass(Obj, [{ key: "get", value: function get() { - return _get(_getPrototypeOf(Obj.prototype), "test", this); + return babelHelpers.get(babelHelpers.getPrototypeOf(Obj.prototype), "test", this); } }]); - return Obj; }(Base); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set/get-semantics-not-defined-on-parent/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set/get-semantics-not-defined-on-parent/output.js index 678e20f410..1fb4b45e16 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set/get-semantics-not-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set/get-semantics-not-defined-on-parent/output.js @@ -1,51 +1,25 @@ "use strict"; -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - -function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - let Base = function Base() { - _classCallCheck(this, Base); + babelHelpers.classCallCheck(this, Base); }; let Obj = /*#__PURE__*/function (_Base) { - _inherits(Obj, _Base); + babelHelpers.inherits(Obj, _Base); - var _super = _createSuper(Obj); + var _super = babelHelpers.createSuper(Obj); function Obj() { - _classCallCheck(this, Obj); - + babelHelpers.classCallCheck(this, Obj); return _super.apply(this, arguments); } - _createClass(Obj, [{ + babelHelpers.createClass(Obj, [{ key: "get", value: function get() { - return _get(_getPrototypeOf(Obj.prototype), "test", this); + return babelHelpers.get(babelHelpers.getPrototypeOf(Obj.prototype), "test", this); } }]); - return Obj; }(Base); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set/get-semantics-setter-defined-on-parent/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set/get-semantics-setter-defined-on-parent/output.js index 9614013afb..a0fd4c55b8 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set/get-semantics-setter-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set/get-semantics-setter-defined-on-parent/output.js @@ -1,62 +1,35 @@ "use strict"; -function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - let Base = /*#__PURE__*/function () { function Base() { - _classCallCheck(this, Base); + babelHelpers.classCallCheck(this, Base); } - _createClass(Base, [{ + babelHelpers.createClass(Base, [{ key: "test", set: function (v) { throw new Error("called"); } }]); - return Base; }(); let Obj = /*#__PURE__*/function (_Base) { - _inherits(Obj, _Base); + babelHelpers.inherits(Obj, _Base); - var _super = _createSuper(Obj); + var _super = babelHelpers.createSuper(Obj); function Obj() { - _classCallCheck(this, Obj); - + babelHelpers.classCallCheck(this, Obj); return _super.apply(this, arguments); } - _createClass(Obj, [{ + babelHelpers.createClass(Obj, [{ key: "get", value: function get() { - return _get(_getPrototypeOf(Obj.prototype), "test", this); + return babelHelpers.get(babelHelpers.getPrototypeOf(Obj.prototype), "test", this); } }]); - return Obj; }(Base); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set/memoized-assign/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set/memoized-assign/output.js index 151c25d42e..2a06e21fb0 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set/memoized-assign/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set/memoized-assign/output.js @@ -1,37 +1,7 @@ "use strict"; -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - -function set(target, property, value, receiver) { if (typeof Reflect !== "undefined" && Reflect.set) { set = Reflect.set; } else { set = function set(target, property, value, receiver) { var base = _superPropBase(target, property); var desc; if (base) { desc = Object.getOwnPropertyDescriptor(base, property); if (desc.set) { desc.set.call(receiver, value); return true; } else if (!desc.writable) { return false; } } desc = Object.getOwnPropertyDescriptor(receiver, property); if (desc) { if (!desc.writable) { return false; } desc.value = value; Object.defineProperty(receiver, property, desc); } else { _defineProperty(receiver, property, value); } return true; }; } return set(target, property, value, receiver); } - -function _set(target, property, value, receiver, isStrict) { var s = set(target, property, value, receiver || target); if (!s && isStrict) { throw new Error('failed to set property'); } return value; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - let Base = function Base() { - _classCallCheck(this, Base); + babelHelpers.classCallCheck(this, Base); }; Object.defineProperty(Base.prototype, 0, { @@ -53,32 +23,30 @@ const proper = { }; let Obj = /*#__PURE__*/function (_Base) { - _inherits(Obj, _Base); + babelHelpers.inherits(Obj, _Base); - var _super = _createSuper(Obj); + var _super = babelHelpers.createSuper(Obj); function Obj() { - _classCallCheck(this, Obj); - + babelHelpers.classCallCheck(this, Obj); return _super.apply(this, arguments); } - _createClass(Obj, [{ + babelHelpers.createClass(Obj, [{ key: "assign", value: function assign() { var _proper$prop; - _set(_getPrototypeOf(Obj.prototype), _proper$prop = proper.prop, _get(_getPrototypeOf(Obj.prototype), _proper$prop, this) + 1, this, true); + babelHelpers.set(babelHelpers.getPrototypeOf(Obj.prototype), _proper$prop = proper.prop, babelHelpers.get(babelHelpers.getPrototypeOf(Obj.prototype), _proper$prop, this) + 1, this, true); } }, { key: "assign2", value: function assign2() { var _i; - _set(_getPrototypeOf(Obj.prototype), _i = i, _get(_getPrototypeOf(Obj.prototype), _i, this) + 1, this, true); + babelHelpers.set(babelHelpers.getPrototypeOf(Obj.prototype), _i = i, babelHelpers.get(babelHelpers.getPrototypeOf(Obj.prototype), _i, this) + 1, this, true); } }]); - return Obj; }(Base); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set/memoized-update/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set/memoized-update/output.js index df734f4635..ce301851f2 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set/memoized-update/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set/memoized-update/output.js @@ -1,37 +1,7 @@ "use strict"; -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - -function set(target, property, value, receiver) { if (typeof Reflect !== "undefined" && Reflect.set) { set = Reflect.set; } else { set = function set(target, property, value, receiver) { var base = _superPropBase(target, property); var desc; if (base) { desc = Object.getOwnPropertyDescriptor(base, property); if (desc.set) { desc.set.call(receiver, value); return true; } else if (!desc.writable) { return false; } } desc = Object.getOwnPropertyDescriptor(receiver, property); if (desc) { if (!desc.writable) { return false; } desc.value = value; Object.defineProperty(receiver, property, desc); } else { _defineProperty(receiver, property, value); } return true; }; } return set(target, property, value, receiver); } - -function _set(target, property, value, receiver, isStrict) { var s = set(target, property, value, receiver || target); if (!s && isStrict) { throw new Error('failed to set property'); } return value; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - let Base = function Base() { - _classCallCheck(this, Base); + babelHelpers.classCallCheck(this, Base); }; Object.defineProperty(Base.prototype, 0, { @@ -53,32 +23,30 @@ const proper = { }; let Obj = /*#__PURE__*/function (_Base) { - _inherits(Obj, _Base); + babelHelpers.inherits(Obj, _Base); - var _super = _createSuper(Obj); + var _super = babelHelpers.createSuper(Obj); function Obj() { - _classCallCheck(this, Obj); - + babelHelpers.classCallCheck(this, Obj); return _super.apply(this, arguments); } - _createClass(Obj, [{ + babelHelpers.createClass(Obj, [{ key: "update", value: function update() { var _proper$prop, _super$proper$prop; - _set(_getPrototypeOf(Obj.prototype), _proper$prop = proper.prop, (_super$proper$prop = +_get(_getPrototypeOf(Obj.prototype), _proper$prop, this)) + 1, this, true), _super$proper$prop; + babelHelpers.set(babelHelpers.getPrototypeOf(Obj.prototype), _proper$prop = proper.prop, (_super$proper$prop = +babelHelpers.get(babelHelpers.getPrototypeOf(Obj.prototype), _proper$prop, this)) + 1, this, true), _super$proper$prop; } }, { key: "update2", value: function update2() { var _i, _super$i; - _set(_getPrototypeOf(Obj.prototype), _i = i, (_super$i = +_get(_getPrototypeOf(Obj.prototype), _i, this)) + 1, this, true), _super$i; + babelHelpers.set(babelHelpers.getPrototypeOf(Obj.prototype), _i = i, (_super$i = +babelHelpers.get(babelHelpers.getPrototypeOf(Obj.prototype), _i, this)) + 1, this, true), _super$i; } }]); - return Obj; }(Base); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set/method-conflict/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set/method-conflict/output.js index a2928cceb8..48d5adc938 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set/method-conflict/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set/method-conflict/output.js @@ -1,20 +1,13 @@ -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - let A = /*#__PURE__*/function () { "use strict"; function A() { - _classCallCheck(this, A); + babelHelpers.classCallCheck(this, A); } - _createClass(A, [{ + babelHelpers.createClass(A, [{ key: "x", set: function (_) {} }]); - return A; }(); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set/numeric-keys/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set/numeric-keys/output.js index 95a7661dab..6d839c6ec8 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set/numeric-keys/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set/numeric-keys/output.js @@ -1,17 +1,11 @@ -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - let A = /*#__PURE__*/function () { "use strict"; function A() { - _classCallCheck(this, A); + babelHelpers.classCallCheck(this, A); } - _createClass(A, [{ + babelHelpers.createClass(A, [{ key: "1", get: function () {}, set: function (_) {} @@ -35,6 +29,5 @@ let A = /*#__PURE__*/function () { key: "5n", set: function (_) {} }]); - return A; }(); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-data-defined-on-parent/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-data-defined-on-parent/output.js index aed4c0ef72..f8bd082882 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-data-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-data-defined-on-parent/output.js @@ -1,35 +1,7 @@ "use strict"; -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - -function set(target, property, value, receiver) { if (typeof Reflect !== "undefined" && Reflect.set) { set = Reflect.set; } else { set = function set(target, property, value, receiver) { var base = _superPropBase(target, property); var desc; if (base) { desc = Object.getOwnPropertyDescriptor(base, property); if (desc.set) { desc.set.call(receiver, value); return true; } else if (!desc.writable) { return false; } } desc = Object.getOwnPropertyDescriptor(receiver, property); if (desc) { if (!desc.writable) { return false; } desc.value = value; Object.defineProperty(receiver, property, desc); } else { _defineProperty(receiver, property, value); } return true; }; } return set(target, property, value, receiver); } - -function _set(target, property, value, receiver, isStrict) { var s = set(target, property, value, receiver || target); if (!s && isStrict) { throw new Error('failed to set property'); } return value; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - let Base = function Base() { - _classCallCheck(this, Base); + babelHelpers.classCallCheck(this, Base); }; Object.defineProperty(Base.prototype, 'test', { @@ -39,23 +11,21 @@ Object.defineProperty(Base.prototype, 'test', { }); let Obj = /*#__PURE__*/function (_Base) { - _inherits(Obj, _Base); + babelHelpers.inherits(Obj, _Base); - var _super = _createSuper(Obj); + var _super = babelHelpers.createSuper(Obj); function Obj() { - _classCallCheck(this, Obj); - + babelHelpers.classCallCheck(this, Obj); return _super.apply(this, arguments); } - _createClass(Obj, [{ + babelHelpers.createClass(Obj, [{ key: "set", value: function set() { - return _set(_getPrototypeOf(Obj.prototype), "test", 3, this, true); + return babelHelpers.set(babelHelpers.getPrototypeOf(Obj.prototype), "test", 3, this, true); } }]); - return Obj; }(Base); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-getter-defined-on-parent/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-getter-defined-on-parent/output.js index 53c3c81d6b..38ec4cbc51 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-getter-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-getter-defined-on-parent/output.js @@ -1,68 +1,37 @@ "use strict"; -function set(target, property, value, receiver) { if (typeof Reflect !== "undefined" && Reflect.set) { set = Reflect.set; } else { set = function set(target, property, value, receiver) { var base = _superPropBase(target, property); var desc; if (base) { desc = Object.getOwnPropertyDescriptor(base, property); if (desc.set) { desc.set.call(receiver, value); return true; } else if (!desc.writable) { return false; } } desc = Object.getOwnPropertyDescriptor(receiver, property); if (desc) { if (!desc.writable) { return false; } desc.value = value; Object.defineProperty(receiver, property, desc); } else { _defineProperty(receiver, property, value); } return true; }; } return set(target, property, value, receiver); } - -function _set(target, property, value, receiver, isStrict) { var s = set(target, property, value, receiver || target); if (!s && isStrict) { throw new Error('failed to set property'); } return value; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - let Base = /*#__PURE__*/function () { function Base() { - _classCallCheck(this, Base); + babelHelpers.classCallCheck(this, Base); } - _createClass(Base, [{ + babelHelpers.createClass(Base, [{ key: "test", get: function () { return 1; } }]); - return Base; }(); ; let Obj = /*#__PURE__*/function (_Base) { - _inherits(Obj, _Base); + babelHelpers.inherits(Obj, _Base); - var _super = _createSuper(Obj); + var _super = babelHelpers.createSuper(Obj); function Obj() { - _classCallCheck(this, Obj); - + babelHelpers.classCallCheck(this, Obj); return _super.apply(this, arguments); } - _createClass(Obj, [{ + babelHelpers.createClass(Obj, [{ key: "set", value: function set() { - return _set(_getPrototypeOf(Obj.prototype), "test", 3, this, true); + return babelHelpers.set(babelHelpers.getPrototypeOf(Obj.prototype), "test", 3, this, true); } }]); - return Obj; }(Base); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-not-defined-on-parent-data-on-obj/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-not-defined-on-parent-data-on-obj/output.js index bba625433c..0624e6a62f 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-not-defined-on-parent-data-on-obj/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-not-defined-on-parent-data-on-obj/output.js @@ -1,55 +1,25 @@ "use strict"; -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - -function set(target, property, value, receiver) { if (typeof Reflect !== "undefined" && Reflect.set) { set = Reflect.set; } else { set = function set(target, property, value, receiver) { var base = _superPropBase(target, property); var desc; if (base) { desc = Object.getOwnPropertyDescriptor(base, property); if (desc.set) { desc.set.call(receiver, value); return true; } else if (!desc.writable) { return false; } } desc = Object.getOwnPropertyDescriptor(receiver, property); if (desc) { if (!desc.writable) { return false; } desc.value = value; Object.defineProperty(receiver, property, desc); } else { _defineProperty(receiver, property, value); } return true; }; } return set(target, property, value, receiver); } - -function _set(target, property, value, receiver, isStrict) { var s = set(target, property, value, receiver || target); if (!s && isStrict) { throw new Error('failed to set property'); } return value; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - let Base = function Base() { - _classCallCheck(this, Base); + babelHelpers.classCallCheck(this, Base); }; let Obj = /*#__PURE__*/function (_Base) { - _inherits(Obj, _Base); + babelHelpers.inherits(Obj, _Base); - var _super = _createSuper(Obj); + var _super = babelHelpers.createSuper(Obj); function Obj() { - _classCallCheck(this, Obj); - + babelHelpers.classCallCheck(this, Obj); return _super.apply(this, arguments); } - _createClass(Obj, [{ + babelHelpers.createClass(Obj, [{ key: "set", value: function set() { - return _set(_getPrototypeOf(Obj.prototype), "test", 3, this, true); + return babelHelpers.set(babelHelpers.getPrototypeOf(Obj.prototype), "test", 3, this, true); } }]); - return Obj; }(Base); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-not-defined-on-parent-getter-on-obj/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-not-defined-on-parent-getter-on-obj/output.js index 0b3aba6cf6..75d6d77739 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-not-defined-on-parent-getter-on-obj/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-not-defined-on-parent-getter-on-obj/output.js @@ -1,58 +1,28 @@ "use strict"; -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - -function set(target, property, value, receiver) { if (typeof Reflect !== "undefined" && Reflect.set) { set = Reflect.set; } else { set = function set(target, property, value, receiver) { var base = _superPropBase(target, property); var desc; if (base) { desc = Object.getOwnPropertyDescriptor(base, property); if (desc.set) { desc.set.call(receiver, value); return true; } else if (!desc.writable) { return false; } } desc = Object.getOwnPropertyDescriptor(receiver, property); if (desc) { if (!desc.writable) { return false; } desc.value = value; Object.defineProperty(receiver, property, desc); } else { _defineProperty(receiver, property, value); } return true; }; } return set(target, property, value, receiver); } - -function _set(target, property, value, receiver, isStrict) { var s = set(target, property, value, receiver || target); if (!s && isStrict) { throw new Error('failed to set property'); } return value; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - let Base = function Base() { - _classCallCheck(this, Base); + babelHelpers.classCallCheck(this, Base); }; let Obj = /*#__PURE__*/function (_Base) { - _inherits(Obj, _Base); + babelHelpers.inherits(Obj, _Base); - var _super = _createSuper(Obj); + var _super = babelHelpers.createSuper(Obj); function Obj() { - _classCallCheck(this, Obj); - + babelHelpers.classCallCheck(this, Obj); return _super.apply(this, arguments); } - _createClass(Obj, [{ + babelHelpers.createClass(Obj, [{ key: "test", get: function () {} }, { key: "set", value: function set() { - return _set(_getPrototypeOf(Obj.prototype), "test", 3, this, true); + return babelHelpers.set(babelHelpers.getPrototypeOf(Obj.prototype), "test", 3, this, true); } }]); - return Obj; }(Base); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-not-defined-on-parent-not-on-obj/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-not-defined-on-parent-not-on-obj/output.js index 369e244bc8..4762d484b9 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-not-defined-on-parent-not-on-obj/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-not-defined-on-parent-not-on-obj/output.js @@ -1,55 +1,25 @@ "use strict"; -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - -function set(target, property, value, receiver) { if (typeof Reflect !== "undefined" && Reflect.set) { set = Reflect.set; } else { set = function set(target, property, value, receiver) { var base = _superPropBase(target, property); var desc; if (base) { desc = Object.getOwnPropertyDescriptor(base, property); if (desc.set) { desc.set.call(receiver, value); return true; } else if (!desc.writable) { return false; } } desc = Object.getOwnPropertyDescriptor(receiver, property); if (desc) { if (!desc.writable) { return false; } desc.value = value; Object.defineProperty(receiver, property, desc); } else { _defineProperty(receiver, property, value); } return true; }; } return set(target, property, value, receiver); } - -function _set(target, property, value, receiver, isStrict) { var s = set(target, property, value, receiver || target); if (!s && isStrict) { throw new Error('failed to set property'); } return value; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - let Base = function Base() { - _classCallCheck(this, Base); + babelHelpers.classCallCheck(this, Base); }; let Obj = /*#__PURE__*/function (_Base) { - _inherits(Obj, _Base); + babelHelpers.inherits(Obj, _Base); - var _super = _createSuper(Obj); + var _super = babelHelpers.createSuper(Obj); function Obj() { - _classCallCheck(this, Obj); - + babelHelpers.classCallCheck(this, Obj); return _super.apply(this, arguments); } - _createClass(Obj, [{ + babelHelpers.createClass(Obj, [{ key: "set", value: function set() { - return _set(_getPrototypeOf(Obj.prototype), "test", 3, this, true); + return babelHelpers.set(babelHelpers.getPrototypeOf(Obj.prototype), "test", 3, this, true); } }]); - return Obj; }(Base); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-not-defined-on-parent-setter-on-obj/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-not-defined-on-parent-setter-on-obj/output.js index e78cf98d9f..3fbbcf4a7e 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-not-defined-on-parent-setter-on-obj/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-not-defined-on-parent-setter-on-obj/output.js @@ -1,51 +1,22 @@ "use strict"; -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - -function set(target, property, value, receiver) { if (typeof Reflect !== "undefined" && Reflect.set) { set = Reflect.set; } else { set = function set(target, property, value, receiver) { var base = _superPropBase(target, property); var desc; if (base) { desc = Object.getOwnPropertyDescriptor(base, property); if (desc.set) { desc.set.call(receiver, value); return true; } else if (!desc.writable) { return false; } } desc = Object.getOwnPropertyDescriptor(receiver, property); if (desc) { if (!desc.writable) { return false; } desc.value = value; Object.defineProperty(receiver, property, desc); } else { _defineProperty(receiver, property, value); } return true; }; } return set(target, property, value, receiver); } - -function _set(target, property, value, receiver, isStrict) { var s = set(target, property, value, receiver || target); if (!s && isStrict) { throw new Error('failed to set property'); } return value; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - let Base = function Base() { - _classCallCheck(this, Base); + babelHelpers.classCallCheck(this, Base); }; let value = 2; let Obj = /*#__PURE__*/function (_Base) { - _inherits(Obj, _Base); + babelHelpers.inherits(Obj, _Base); - var _super = _createSuper(Obj); + var _super = babelHelpers.createSuper(Obj); function Obj() { - _classCallCheck(this, Obj); - + babelHelpers.classCallCheck(this, Obj); return _super.apply(this, arguments); } - _createClass(Obj, [{ + babelHelpers.createClass(Obj, [{ key: "test", set: function (v) { expect(this).toBe(obj); @@ -54,10 +25,9 @@ let Obj = /*#__PURE__*/function (_Base) { }, { key: "set", value: function set() { - return _set(_getPrototypeOf(Obj.prototype), "test", 3, this, true); + return babelHelpers.set(babelHelpers.getPrototypeOf(Obj.prototype), "test", 3, this, true); } }]); - return Obj; }(Base); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-setter-defined-on-parent/output.js b/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-setter-defined-on-parent/output.js index 5825fb560a..751e5eae69 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-setter-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/get-set/set-semantics-setter-defined-on-parent/output.js @@ -1,68 +1,37 @@ "use strict"; -function set(target, property, value, receiver) { if (typeof Reflect !== "undefined" && Reflect.set) { set = Reflect.set; } else { set = function set(target, property, value, receiver) { var base = _superPropBase(target, property); var desc; if (base) { desc = Object.getOwnPropertyDescriptor(base, property); if (desc.set) { desc.set.call(receiver, value); return true; } else if (!desc.writable) { return false; } } desc = Object.getOwnPropertyDescriptor(receiver, property); if (desc) { if (!desc.writable) { return false; } desc.value = value; Object.defineProperty(receiver, property, desc); } else { _defineProperty(receiver, property, value); } return true; }; } return set(target, property, value, receiver); } - -function _set(target, property, value, receiver, isStrict) { var s = set(target, property, value, receiver || target); if (!s && isStrict) { throw new Error('failed to set property'); } return value; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - let value = 1; let Base = /*#__PURE__*/function () { function Base() { - _classCallCheck(this, Base); + babelHelpers.classCallCheck(this, Base); } - _createClass(Base, [{ + babelHelpers.createClass(Base, [{ key: "test", set: function (v) { value = v; } }]); - return Base; }(); let Obj = /*#__PURE__*/function (_Base) { - _inherits(Obj, _Base); + babelHelpers.inherits(Obj, _Base); - var _super = _createSuper(Obj); + var _super = babelHelpers.createSuper(Obj); function Obj() { - _classCallCheck(this, Obj); - + babelHelpers.classCallCheck(this, Obj); return _super.apply(this, arguments); } - _createClass(Obj, [{ + babelHelpers.createClass(Obj, [{ key: "set", value: function set() { - return _set(_getPrototypeOf(Obj.prototype), "test", 3, this, true); + return babelHelpers.set(babelHelpers.getPrototypeOf(Obj.prototype), "test", 3, this, true); } }]); - return Obj; }(Base); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/loose-classCallCheck/with-superClass/output.js b/packages/babel-plugin-transform-classes/test/fixtures/loose-classCallCheck/with-superClass/output.js index 5295d0ece0..9b069d4ce7 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/loose-classCallCheck/with-superClass/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/loose-classCallCheck/with-superClass/output.js @@ -1,9 +1,3 @@ -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _inheritsLoose(subClass, superClass) { subClass.prototype = Object.create(superClass.prototype); subClass.prototype.constructor = subClass; _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - let B = function B() { "use strict"; }; @@ -11,13 +5,13 @@ let B = function B() { let A = /*#__PURE__*/function (_B) { "use strict"; - _inheritsLoose(A, _B); + babelHelpers.inheritsLoose(A, _B); function A(track) { var _this; if (track !== undefined) _this = _B.call(this, track) || this;else _this = _B.call(this) || this; - return _assertThisInitialized(_this); + return babelHelpers.assertThisInitialized(_this); } return A; diff --git a/packages/babel-plugin-transform-classes/test/fixtures/loose/accessing-super-property-optional-chain/options.json b/packages/babel-plugin-transform-classes/test/fixtures/loose/accessing-super-property-optional-chain/options.json index d969db5fb3..92969ad7db 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/loose/accessing-super-property-optional-chain/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/loose/accessing-super-property-optional-chain/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], ["proposal-optional-chaining", { "loose": true }], "transform-function-name", ["transform-classes", { "loose": true }], diff --git a/packages/babel-plugin-transform-classes/test/fixtures/loose/method-return-type-annotation/options.json b/packages/babel-plugin-transform-classes/test/fixtures/loose/method-return-type-annotation/options.json index 1f9617ec39..1a5b13a7d3 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/loose/method-return-type-annotation/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/loose/method-return-type-annotation/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-function-name", ["transform-classes", { "loose": true }], "transform-spread", diff --git a/packages/babel-plugin-transform-classes/test/fixtures/loose/options.json b/packages/babel-plugin-transform-classes/test/fixtures/loose/options.json index 6b7851da95..3c092f942f 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/loose/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/loose/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], "transform-function-name", ["transform-classes", { "loose": true }], ["transform-spread", { "loose": true }], diff --git a/packages/babel-plugin-transform-classes/test/fixtures/regression/2663/output.js b/packages/babel-plugin-transform-classes/test/fixtures/regression/2663/output.js index 8d76080f69..077077e006 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/regression/2663/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/regression/2663/output.js @@ -11,15 +11,11 @@ var _events = require("events"); var _binarySerializer = babelHelpers.interopRequireDefault(require("./helpers/binary-serializer")); -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = babelHelpers.getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = babelHelpers.getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return babelHelpers.possibleConstructorReturn(this, result); }; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - // import ... var Connection = /*#__PURE__*/function (_EventEmitter) { babelHelpers.inherits(Connection, _EventEmitter); - var _super = _createSuper(Connection); + var _super = babelHelpers.createSuper(Connection); function Connection(endpoint, joinKey, joinData, roomId) { var _this; diff --git a/packages/babel-plugin-transform-classes/test/fixtures/regression/2694/options.json b/packages/babel-plugin-transform-classes/test/fixtures/regression/2694/options.json index d5a41a6177..6d52631c71 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/regression/2694/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/regression/2694/options.json @@ -1,4 +1,3 @@ { - "plugins": ["external-helpers"], "presets": [["env", { "targets": { "browsers": "ie 6" } }]] } diff --git a/packages/babel-plugin-transform-classes/test/fixtures/regression/2694/output.js b/packages/babel-plugin-transform-classes/test/fixtures/regression/2694/output.js index 5618071963..59c519d1ca 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/regression/2694/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/regression/2694/output.js @@ -7,14 +7,10 @@ exports["default"] = void 0; var _BaseFoo2 = babelHelpers.interopRequireDefault(require("./BaseFoo")); -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = babelHelpers.getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = babelHelpers.getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return babelHelpers.possibleConstructorReturn(this, result); }; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - var SubFoo = /*#__PURE__*/function (_BaseFoo) { babelHelpers.inherits(SubFoo, _BaseFoo); - var _super = _createSuper(SubFoo); + var _super = babelHelpers.createSuper(SubFoo); function SubFoo() { babelHelpers.classCallCheck(this, SubFoo); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/regression/2775/output.js b/packages/babel-plugin-transform-classes/test/fixtures/regression/2775/output.js index 99084570cf..42e4703566 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/regression/2775/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/regression/2775/output.js @@ -7,14 +7,10 @@ exports["default"] = void 0; var _react = babelHelpers.interopRequireDefault(require("react")); -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = babelHelpers.getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = babelHelpers.getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return babelHelpers.possibleConstructorReturn(this, result); }; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - var RandomComponent = /*#__PURE__*/function (_Component) { babelHelpers.inherits(RandomComponent, _Component); - var _super = _createSuper(RandomComponent); + var _super = babelHelpers.createSuper(RandomComponent); function RandomComponent() { babelHelpers.classCallCheck(this, RandomComponent); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/regression/3028/output.js b/packages/babel-plugin-transform-classes/test/fixtures/regression/3028/output.js index f9ecd2cc61..ff67e5fa02 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/regression/3028/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/regression/3028/output.js @@ -5,10 +5,6 @@ Object.defineProperty(exports, "__esModule", { }); exports["default"] = void 0; -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = babelHelpers.getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = babelHelpers.getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return babelHelpers.possibleConstructorReturn(this, result); }; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - var b = function b() { babelHelpers.classCallCheck(this, b); }; @@ -16,7 +12,7 @@ var b = function b() { var a1 = /*#__PURE__*/function (_b) { babelHelpers.inherits(a1, _b); - var _super = _createSuper(a1); + var _super = babelHelpers.createSuper(a1); function a1() { var _this; @@ -37,7 +33,7 @@ var a1 = /*#__PURE__*/function (_b) { var a2 = /*#__PURE__*/function (_b2) { babelHelpers.inherits(a2, _b2); - var _super2 = _createSuper(a2); + var _super2 = babelHelpers.createSuper(a2); function a2() { var _this2; diff --git a/packages/babel-plugin-transform-classes/test/fixtures/regression/5769/output.js b/packages/babel-plugin-transform-classes/test/fixtures/regression/5769/output.js index ce66d339a0..b1f6ca29ac 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/regression/5769/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/regression/5769/output.js @@ -1,7 +1,3 @@ -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = babelHelpers.getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = babelHelpers.getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return babelHelpers.possibleConstructorReturn(this, result); }; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - var Point = /*#__PURE__*/function () { "use strict"; @@ -23,7 +19,7 @@ var ColorPoint = /*#__PURE__*/function (_Point) { babelHelpers.inherits(ColorPoint, _Point); - var _super = _createSuper(ColorPoint); + var _super = babelHelpers.createSuper(ColorPoint); function ColorPoint() { var _thisSuper, _thisSuper2, _this; diff --git a/packages/babel-plugin-transform-classes/test/fixtures/regression/5817/output.js b/packages/babel-plugin-transform-classes/test/fixtures/regression/5817/output.js index 3130341c6f..d22e12410e 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/regression/5817/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/regression/5817/output.js @@ -1,13 +1,9 @@ -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = babelHelpers.getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = babelHelpers.getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return babelHelpers.possibleConstructorReturn(this, result); }; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - var A = /*#__PURE__*/function (_B) { "use strict"; babelHelpers.inherits(A, _B); - var _super = _createSuper(A); + var _super = babelHelpers.createSuper(A); function A() { var _this; diff --git a/packages/babel-plugin-transform-classes/test/fixtures/regression/8499/output.js b/packages/babel-plugin-transform-classes/test/fixtures/regression/8499/output.js index a411679a5c..9d2a13b2c2 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/regression/8499/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/regression/8499/output.js @@ -1,7 +1,3 @@ -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = babelHelpers.getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = babelHelpers.getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return babelHelpers.possibleConstructorReturn(this, result); }; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - var oldReflect = this.Reflect; var oldHTMLElement = this.HTMLElement; @@ -22,7 +18,7 @@ try { babelHelpers.inherits(CustomElement, _HTMLElement); - var _super = _createSuper(CustomElement); + var _super = babelHelpers.createSuper(CustomElement); function CustomElement() { babelHelpers.classCallCheck(this, CustomElement); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/regression/T2494/output.js b/packages/babel-plugin-transform-classes/test/fixtures/regression/T2494/output.js index d40d660052..d250463b7e 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/regression/T2494/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/regression/T2494/output.js @@ -1,14 +1,10 @@ -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = babelHelpers.getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = babelHelpers.getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return babelHelpers.possibleConstructorReturn(this, result); }; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - var x = { Foo: /*#__PURE__*/function (_Foo) { "use strict"; babelHelpers.inherits(_class, _Foo); - var _super = _createSuper(_class); + var _super = babelHelpers.createSuper(_class); function _class() { babelHelpers.classCallCheck(this, _class); diff --git a/packages/babel-plugin-transform-classes/test/fixtures/regression/T2997/output.js b/packages/babel-plugin-transform-classes/test/fixtures/regression/T2997/output.js index bbfba7c7a5..f2edaf724c 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/regression/T2997/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/regression/T2997/output.js @@ -1,7 +1,3 @@ -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = babelHelpers.getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = babelHelpers.getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return babelHelpers.possibleConstructorReturn(this, result); }; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - var A = function A() { "use strict"; @@ -13,7 +9,7 @@ var B = /*#__PURE__*/function (_A) { babelHelpers.inherits(B, _A); - var _super = _createSuper(B); + var _super = babelHelpers.createSuper(B); function B() { var _this; diff --git a/packages/babel-plugin-transform-classes/test/fixtures/regression/T6755/output.js b/packages/babel-plugin-transform-classes/test/fixtures/regression/T6755/output.js index 202b822df3..8bab55a522 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/regression/T6755/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/regression/T6755/output.js @@ -1,7 +1,3 @@ -function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } - -function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } - var Example = /*#__PURE__*/function () { "use strict"; @@ -10,7 +6,7 @@ var Example = /*#__PURE__*/function () { var _proto = Example.prototype; _proto.test1 = /*#__PURE__*/function () { - var _test = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() { + var _test = babelHelpers.asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() { return regeneratorRuntime.wrap(function _callee$(_context) { while (1) { switch (_context.prev = _context.next) { diff --git a/packages/babel-plugin-transform-classes/test/fixtures/regression/T7010/options.json b/packages/babel-plugin-transform-classes/test/fixtures/regression/T7010/options.json index aec48c2b7d..7e50eb3348 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/regression/T7010/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/regression/T7010/options.json @@ -1,3 +1,3 @@ { - "plugins": ["transform-classes", "external-helpers"] + "plugins": ["transform-classes"] } diff --git a/packages/babel-plugin-transform-classes/test/fixtures/regression/T7537/output.js b/packages/babel-plugin-transform-classes/test/fixtures/regression/T7537/output.js index 41fd311829..22831fb5af 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/regression/T7537/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/regression/T7537/output.js @@ -1,41 +1,22 @@ -function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - var B = function B() { "use strict"; - _classCallCheck(this, B); + babelHelpers.classCallCheck(this, B); }; var A = /*#__PURE__*/function (_B) { "use strict"; - _inherits(A, _B); + babelHelpers.inherits(A, _B); - var _super = _createSuper(A); + var _super = babelHelpers.createSuper(A); function A(track) { var _this; - _classCallCheck(this, A); - + babelHelpers.classCallCheck(this, A); if (track !== undefined) _this = _super.call(this, track);else _this = _super.call(this); - return _possibleConstructorReturn(_this); + return babelHelpers.possibleConstructorReturn(_this); } return A; diff --git a/packages/babel-plugin-transform-classes/test/fixtures/regression/options.json b/packages/babel-plugin-transform-classes/test/fixtures/regression/options.json index 5aee2cfe4a..82c65cb132 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/regression/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/regression/options.json @@ -1,5 +1,5 @@ { - "plugins": ["external-helpers", "proposal-class-properties"], + "plugins": ["proposal-class-properties"], "presets": [ ["env", { "targets": { "browsers": "ie 6" } }], ["react", { "runtime": "classic" }] diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/accessing-super-property-optional-chain/options.json b/packages/babel-plugin-transform-classes/test/fixtures/spec/accessing-super-property-optional-chain/options.json index 1f88132a87..754efd3e24 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/spec/accessing-super-property-optional-chain/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/accessing-super-property-optional-chain/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], "proposal-optional-chaining", "transform-function-name", "transform-classes", diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/method-return-type-annotation/options.json b/packages/babel-plugin-transform-classes/test/fixtures/spec/method-return-type-annotation/options.json index 208e8b0ff0..89a40e8121 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/spec/method-return-type-annotation/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/method-return-type-annotation/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-function-name", "transform-classes", "transform-spread", diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/name-method-collision/options.json b/packages/babel-plugin-transform-classes/test/fixtures/spec/name-method-collision/options.json index 143e6342c2..d3ccf6f7d8 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/spec/name-method-collision/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/name-method-collision/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-function-name", "transform-classes", "transform-spread", diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/options.json b/packages/babel-plugin-transform-classes/test/fixtures/spec/options.json index cac9bea7af..9c122b0d04 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/spec/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], "transform-function-name", "transform-classes", "transform-spread", diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-array-pattern-1/options.json b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-array-pattern-1/options.json index 15c260b243..b82f04a023 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-array-pattern-1/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-array-pattern-1/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-function-name", "transform-classes", "transform-spread", diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-array-pattern/options.json b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-array-pattern/options.json index 15c260b243..b82f04a023 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-array-pattern/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-array-pattern/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-function-name", "transform-classes", "transform-spread", diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-object-pattern-1/options.json b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-object-pattern-1/options.json index 15c260b243..b82f04a023 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-object-pattern-1/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-object-pattern-1/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-function-name", "transform-classes", "transform-spread", diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-object-pattern/options.json b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-object-pattern/options.json index 15c260b243..b82f04a023 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-object-pattern/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-destructuring-object-pattern/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-function-name", "transform-classes", "transform-spread", diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-reference-before-bare-super-inline/output.js b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-reference-before-bare-super-inline/output.js index a357563467..62b840402f 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-reference-before-bare-super-inline/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-reference-before-bare-super-inline/output.js @@ -1,37 +1,15 @@ -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - var Foo = /*#__PURE__*/function (_Bar) { "use strict"; - _inherits(Foo, _Bar); + babelHelpers.inherits(Foo, _Bar); - var _super = _createSuper(Foo); + var _super = babelHelpers.createSuper(Foo); function Foo() { var _thisSuper, _this; - _classCallCheck(this, Foo); - - _get((_thisSuper = _assertThisInitialized(_this), _getPrototypeOf(Foo.prototype)), "foo", _thisSuper).call(_thisSuper, _this = _super.call(this)); - + babelHelpers.classCallCheck(this, Foo); + babelHelpers.get((_thisSuper = babelHelpers.assertThisInitialized(_this), babelHelpers.getPrototypeOf(Foo.prototype)), "foo", _thisSuper).call(_thisSuper, _this = _super.call(this)); return _this; } diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-reference-before-bare-super/output.js b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-reference-before-bare-super/output.js index 06aac66c17..c4cfe3e10c 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-reference-before-bare-super/output.js +++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-reference-before-bare-super/output.js @@ -1,37 +1,15 @@ -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - var Foo = /*#__PURE__*/function (_Bar) { "use strict"; - _inherits(Foo, _Bar); + babelHelpers.inherits(Foo, _Bar); - var _super = _createSuper(Foo); + var _super = babelHelpers.createSuper(Foo); function Foo() { var _thisSuper, _this; - _classCallCheck(this, Foo); - - _get((_thisSuper = _assertThisInitialized(_this), _getPrototypeOf(Foo.prototype)), "foo", _thisSuper).call(_thisSuper); - + babelHelpers.classCallCheck(this, Foo); + babelHelpers.get((_thisSuper = babelHelpers.assertThisInitialized(_this), babelHelpers.getPrototypeOf(Foo.prototype)), "foo", _thisSuper).call(_thisSuper); return _this = _super.call(this); } diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-reference-before-in-lambda-2/options.json b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-reference-before-in-lambda-2/options.json index 4b2ee4905c..5d03380e6f 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-reference-before-in-lambda-2/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-reference-before-in-lambda-2/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - "transform-classes", - "transform-block-scoping" - ] + "plugins": ["transform-classes", "transform-block-scoping"] } diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-reference-before-in-lambda-3/options.json b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-reference-before-in-lambda-3/options.json index 4b2ee4905c..5d03380e6f 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-reference-before-in-lambda-3/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-reference-before-in-lambda-3/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - "transform-classes", - "transform-block-scoping" - ] + "plugins": ["transform-classes", "transform-block-scoping"] } diff --git a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-reference-before-in-lambda/options.json b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-reference-before-in-lambda/options.json index 4b2ee4905c..5d03380e6f 100644 --- a/packages/babel-plugin-transform-classes/test/fixtures/spec/super-reference-before-in-lambda/options.json +++ b/packages/babel-plugin-transform-classes/test/fixtures/spec/super-reference-before-in-lambda/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - "transform-classes", - "transform-block-scoping" - ] + "plugins": ["transform-classes", "transform-block-scoping"] } diff --git a/packages/babel-plugin-transform-computed-properties/test/fixtures/assumption-setComputedProperties/options.json b/packages/babel-plugin-transform-computed-properties/test/fixtures/assumption-setComputedProperties/options.json index 2a2f114c2a..d2c0dbb039 100644 --- a/packages/babel-plugin-transform-computed-properties/test/fixtures/assumption-setComputedProperties/options.json +++ b/packages/babel-plugin-transform-computed-properties/test/fixtures/assumption-setComputedProperties/options.json @@ -1,8 +1,5 @@ { - "plugins": [ - "external-helpers", - "transform-computed-properties" - ], + "plugins": ["transform-computed-properties"], "assumptions": { "setComputedProperties": true } diff --git a/packages/babel-plugin-transform-computed-properties/test/fixtures/loose/options.json b/packages/babel-plugin-transform-computed-properties/test/fixtures/loose/options.json index 4a3f9912c7..adf52d69cc 100644 --- a/packages/babel-plugin-transform-computed-properties/test/fixtures/loose/options.json +++ b/packages/babel-plugin-transform-computed-properties/test/fixtures/loose/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - "external-helpers", - ["transform-computed-properties", { "loose": true }] - ] + "plugins": [["transform-computed-properties", { "loose": true }]] } diff --git a/packages/babel-plugin-transform-computed-properties/test/fixtures/regression/7144/options.json b/packages/babel-plugin-transform-computed-properties/test/fixtures/regression/7144/options.json index 1f70f9c5c9..616d7fa0d1 100644 --- a/packages/babel-plugin-transform-computed-properties/test/fixtures/regression/7144/options.json +++ b/packages/babel-plugin-transform-computed-properties/test/fixtures/regression/7144/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "transform-computed-properties"] + "plugins": ["transform-computed-properties"] } diff --git a/packages/babel-plugin-transform-computed-properties/test/fixtures/spec/options.json b/packages/babel-plugin-transform-computed-properties/test/fixtures/spec/options.json index 1f70f9c5c9..616d7fa0d1 100644 --- a/packages/babel-plugin-transform-computed-properties/test/fixtures/spec/options.json +++ b/packages/babel-plugin-transform-computed-properties/test/fixtures/spec/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "transform-computed-properties"] + "plugins": ["transform-computed-properties"] } diff --git a/packages/babel-plugin-transform-computed-properties/test/fixtures/spec/proto-shorthand/options.json b/packages/babel-plugin-transform-computed-properties/test/fixtures/spec/proto-shorthand/options.json index ab2481ec9f..065510fc05 100644 --- a/packages/babel-plugin-transform-computed-properties/test/fixtures/spec/proto-shorthand/options.json +++ b/packages/babel-plugin-transform-computed-properties/test/fixtures/spec/proto-shorthand/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "transform-computed-properties", - "transform-shorthand-properties" - ] + "plugins": ["transform-computed-properties", "transform-shorthand-properties"] } diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/allowArrayLike/holes/options.json b/packages/babel-plugin-transform-destructuring/test/fixtures/allowArrayLike/holes/options.json index 928c878a89..4eb4d0f556 100644 --- a/packages/babel-plugin-transform-destructuring/test/fixtures/allowArrayLike/holes/options.json +++ b/packages/babel-plugin-transform-destructuring/test/fixtures/allowArrayLike/holes/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - ["transform-destructuring", { "allowArrayLike": true }] - ] + "plugins": [["transform-destructuring", { "allowArrayLike": true }]] } diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/allowArrayLike/length-cropped/options.json b/packages/babel-plugin-transform-destructuring/test/fixtures/allowArrayLike/length-cropped/options.json index 928c878a89..4eb4d0f556 100644 --- a/packages/babel-plugin-transform-destructuring/test/fixtures/allowArrayLike/length-cropped/options.json +++ b/packages/babel-plugin-transform-destructuring/test/fixtures/allowArrayLike/length-cropped/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - ["transform-destructuring", { "allowArrayLike": true }] - ] + "plugins": [["transform-destructuring", { "allowArrayLike": true }]] } diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/allowArrayLike/simple/options.json b/packages/babel-plugin-transform-destructuring/test/fixtures/allowArrayLike/simple/options.json index 928c878a89..4eb4d0f556 100644 --- a/packages/babel-plugin-transform-destructuring/test/fixtures/allowArrayLike/simple/options.json +++ b/packages/babel-plugin-transform-destructuring/test/fixtures/allowArrayLike/simple/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - ["transform-destructuring", { "allowArrayLike": true }] - ] + "plugins": [["transform-destructuring", { "allowArrayLike": true }]] } diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/assumption-arrayLikeIsIterable/options.json b/packages/babel-plugin-transform-destructuring/test/fixtures/assumption-arrayLikeIsIterable/options.json index c2eb7c339d..7e1d243cba 100644 --- a/packages/babel-plugin-transform-destructuring/test/fixtures/assumption-arrayLikeIsIterable/options.json +++ b/packages/babel-plugin-transform-destructuring/test/fixtures/assumption-arrayLikeIsIterable/options.json @@ -1,8 +1,5 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - "transform-destructuring" - ], + "plugins": ["transform-destructuring"], "assumptions": { "arrayLikeIsIterable": true } diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/assumption-iterableIsArray/options.json b/packages/babel-plugin-transform-destructuring/test/fixtures/assumption-iterableIsArray/options.json index e08ab5b1c8..aa25815024 100644 --- a/packages/babel-plugin-transform-destructuring/test/fixtures/assumption-iterableIsArray/options.json +++ b/packages/babel-plugin-transform-destructuring/test/fixtures/assumption-iterableIsArray/options.json @@ -1,8 +1,5 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - "transform-destructuring" - ], + "plugins": ["transform-destructuring"], "assumptions": { "iterableIsArray": true } diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/assumption-objectRestNoSymbols/options.json b/packages/babel-plugin-transform-destructuring/test/fixtures/assumption-objectRestNoSymbols/options.json index d48381a6db..748e1139f7 100644 --- a/packages/babel-plugin-transform-destructuring/test/fixtures/assumption-objectRestNoSymbols/options.json +++ b/packages/babel-plugin-transform-destructuring/test/fixtures/assumption-objectRestNoSymbols/options.json @@ -1,8 +1,5 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0"}], - "transform-destructuring" - ], + "plugins": ["transform-destructuring"], "assumptions": { "objectRestNoSymbols": true } diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest-builtins/options.json b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest-builtins/options.json index 9b67610435..6431288e95 100644 --- a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest-builtins/options.json +++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest-builtins/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.1.5" }], ["transform-destructuring", { "useBuiltIns": true }], "transform-spread", "transform-parameters", diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest-loose/options.json b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest-loose/options.json index ec06f619d0..30b537ae91 100644 --- a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest-loose/options.json +++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/es7-object-rest-loose/options.json @@ -1,7 +1,6 @@ { "plugins": [ ["transform-destructuring", { "loose": true }], - "proposal-object-rest-spread", - ["external-helpers", { "helperVersion": "7.1.5" }] + "proposal-object-rest-spread" ] } diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/issue-5628/options.json b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/issue-5628/options.json index 4e36a37876..feaf0da96f 100644 --- a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/issue-5628/options.json +++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/issue-5628/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-arrow-functions", "transform-destructuring", "transform-spread", diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/options.json b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/options.json index 780d83b9b4..dcb2bf1edf 100644 --- a/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/options.json +++ b/packages/babel-plugin-transform-destructuring/test/fixtures/destructuring/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.1.5" }], "transform-destructuring", "transform-spread", "transform-parameters", diff --git a/packages/babel-plugin-transform-destructuring/test/fixtures/regression/11210/output.mjs b/packages/babel-plugin-transform-destructuring/test/fixtures/regression/11210/output.mjs index 031ed5b8a4..c8bacec631 100644 --- a/packages/babel-plugin-transform-destructuring/test/fixtures/regression/11210/output.mjs +++ b/packages/babel-plugin-transform-destructuring/test/fixtures/regression/11210/output.mjs @@ -1,8 +1,6 @@ -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - export default class A { constructor() { - _defineProperty(this, "handle", value => { + babelHelpers.defineProperty(this, "handle", value => { var _ref = {}; value = _ref.value; }); diff --git a/packages/babel-plugin-transform-duplicate-keys/test/fixtures/combination/options.json b/packages/babel-plugin-transform-duplicate-keys/test/fixtures/combination/options.json index 62e2b15a57..b47e3e1c44 100644 --- a/packages/babel-plugin-transform-duplicate-keys/test/fixtures/combination/options.json +++ b/packages/babel-plugin-transform-duplicate-keys/test/fixtures/combination/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "transform-duplicate-keys", - "transform-computed-properties" - ] + "plugins": ["transform-duplicate-keys", "transform-computed-properties"] } diff --git a/packages/babel-plugin-transform-exponentiation-operator/test/fixtures/regression/4349/output.js b/packages/babel-plugin-transform-exponentiation-operator/test/fixtures/regression/4349/output.js index 470bd7eee9..890157c0a5 100644 --- a/packages/babel-plugin-transform-exponentiation-operator/test/fixtures/regression/4349/output.js +++ b/packages/babel-plugin-transform-exponentiation-operator/test/fixtures/regression/4349/output.js @@ -1,20 +1,8 @@ var _obj; -function set(target, property, value, receiver) { if (typeof Reflect !== "undefined" && Reflect.set) { set = Reflect.set; } else { set = function set(target, property, value, receiver) { var base = _superPropBase(target, property); var desc; if (base) { desc = Object.getOwnPropertyDescriptor(base, property); if (desc.set) { desc.set.call(receiver, value); return true; } else if (!desc.writable) { return false; } } desc = Object.getOwnPropertyDescriptor(receiver, property); if (desc) { if (!desc.writable) { return false; } desc.value = value; Object.defineProperty(receiver, property, desc); } else { _defineProperty(receiver, property, value); } return true; }; } return set(target, property, value, receiver); } - -function _set(target, property, value, receiver, isStrict) { var s = set(target, property, value, receiver || target); if (!s && isStrict) { throw new Error('failed to set property'); } return value; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - foo = _obj = { bar() { - return _set(_getPrototypeOf(_obj), "baz", Math.pow(_get(_getPrototypeOf(_obj), "baz", this), 12), this, false); + return babelHelpers.set(babelHelpers.getPrototypeOf(_obj), "baz", Math.pow(babelHelpers.get(babelHelpers.getPrototypeOf(_obj), "baz", this), 12), this, false); } }; diff --git a/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/transformed-class-method-loose-return-type-annotation/options.json b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/transformed-class-method-loose-return-type-annotation/options.json index 1ab4d2d1ac..07337dd5cf 100644 --- a/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/transformed-class-method-loose-return-type-annotation/options.json +++ b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/transformed-class-method-loose-return-type-annotation/options.json @@ -1,4 +1,4 @@ { "presets": [["env", { "loose": true }]], - "plugins": ["transform-flow-comments", "external-helpers"] + "plugins": ["transform-flow-comments"] } diff --git a/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/transformed-class-method-return-type-annotation/options.json b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/transformed-class-method-return-type-annotation/options.json index f6a4804edc..3d975354a2 100644 --- a/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/transformed-class-method-return-type-annotation/options.json +++ b/packages/babel-plugin-transform-flow-comments/test/fixtures/flow-comments/transformed-class-method-return-type-annotation/options.json @@ -1,4 +1,4 @@ { "presets": ["env"], - "plugins": ["transform-flow-comments", "external-helpers"] + "plugins": ["transform-flow-comments"] } diff --git a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/regression/class-fields-uninitialized-babel-7/options.json b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/regression/class-fields-uninitialized-babel-7/options.json index 61f722239d..aad77a4760 100644 --- a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/regression/class-fields-uninitialized-babel-7/options.json +++ b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/regression/class-fields-uninitialized-babel-7/options.json @@ -1,8 +1,4 @@ { "BABEL_8_BREAKING": false, - "plugins": [ - "transform-flow-strip-types", - "proposal-class-properties", - "external-helpers" - ] + "plugins": ["transform-flow-strip-types", "proposal-class-properties"] } diff --git a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/regression/class-fields-uninitialized/options.json b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/regression/class-fields-uninitialized/options.json index 9f18d45f4f..7eb4117a25 100644 --- a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/regression/class-fields-uninitialized/options.json +++ b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/regression/class-fields-uninitialized/options.json @@ -1,8 +1,4 @@ { "BABEL_8_BREAKING": true, - "plugins": [ - "transform-flow-strip-types", - "proposal-class-properties", - "external-helpers" - ] + "plugins": ["transform-flow-strip-types", "proposal-class-properties"] } diff --git a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/regression/transformed-class-method-loose-return-type-annotation/options.json b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/regression/transformed-class-method-loose-return-type-annotation/options.json index 1233f02edd..574d8d5a5b 100644 --- a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/regression/transformed-class-method-loose-return-type-annotation/options.json +++ b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/regression/transformed-class-method-loose-return-type-annotation/options.json @@ -1,4 +1,4 @@ { "presets": [["env", { "loose": true }]], - "plugins": ["transform-flow-strip-types", "external-helpers"] + "plugins": ["transform-flow-strip-types"] } diff --git a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/regression/transformed-class-method-return-type-annotation/options.json b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/regression/transformed-class-method-return-type-annotation/options.json index 8b10296b45..723a208427 100644 --- a/packages/babel-plugin-transform-flow-strip-types/test/fixtures/regression/transformed-class-method-return-type-annotation/options.json +++ b/packages/babel-plugin-transform-flow-strip-types/test/fixtures/regression/transformed-class-method-return-type-annotation/options.json @@ -1,4 +1,4 @@ { "presets": ["env"], - "plugins": ["transform-flow-strip-types", "external-helpers"] + "plugins": ["transform-flow-strip-types"] } diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/allowArrayLike/holes/options.json b/packages/babel-plugin-transform-for-of/test/fixtures/allowArrayLike/holes/options.json index d708a284b7..71a02e40ac 100644 --- a/packages/babel-plugin-transform-for-of/test/fixtures/allowArrayLike/holes/options.json +++ b/packages/babel-plugin-transform-for-of/test/fixtures/allowArrayLike/holes/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - ["transform-for-of", { "allowArrayLike": true }] - ] + "plugins": [["transform-for-of", { "allowArrayLike": true }]] } diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/allowArrayLike/length-cropped/options.json b/packages/babel-plugin-transform-for-of/test/fixtures/allowArrayLike/length-cropped/options.json index d708a284b7..71a02e40ac 100644 --- a/packages/babel-plugin-transform-for-of/test/fixtures/allowArrayLike/length-cropped/options.json +++ b/packages/babel-plugin-transform-for-of/test/fixtures/allowArrayLike/length-cropped/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - ["transform-for-of", { "allowArrayLike": true }] - ] + "plugins": [["transform-for-of", { "allowArrayLike": true }]] } diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/allowArrayLike/simple/options.json b/packages/babel-plugin-transform-for-of/test/fixtures/allowArrayLike/simple/options.json index d708a284b7..71a02e40ac 100644 --- a/packages/babel-plugin-transform-for-of/test/fixtures/allowArrayLike/simple/options.json +++ b/packages/babel-plugin-transform-for-of/test/fixtures/allowArrayLike/simple/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - ["transform-for-of", { "allowArrayLike": true }] - ] + "plugins": [["transform-for-of", { "allowArrayLike": true }]] } diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/assumption-arrayLikeIsIterable/options.json b/packages/babel-plugin-transform-for-of/test/fixtures/assumption-arrayLikeIsIterable/options.json index 34fc8ef005..605a6c3c58 100644 --- a/packages/babel-plugin-transform-for-of/test/fixtures/assumption-arrayLikeIsIterable/options.json +++ b/packages/babel-plugin-transform-for-of/test/fixtures/assumption-arrayLikeIsIterable/options.json @@ -1,8 +1,5 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - "transform-for-of" - ], + "plugins": ["transform-for-of"], "assumptions": { "arrayLikeIsIterable": true } diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/assumption-skipForOfIteratorClosing/options.json b/packages/babel-plugin-transform-for-of/test/fixtures/assumption-skipForOfIteratorClosing/options.json index 77ffac99ff..c5894fa56e 100644 --- a/packages/babel-plugin-transform-for-of/test/fixtures/assumption-skipForOfIteratorClosing/options.json +++ b/packages/babel-plugin-transform-for-of/test/fixtures/assumption-skipForOfIteratorClosing/options.json @@ -1,8 +1,5 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - "transform-for-of" - ], + "plugins": ["transform-for-of"], "assumptions": { "skipForOfIteratorClosing": true } diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/loose-allowArrayLike/holes/options.json b/packages/babel-plugin-transform-for-of/test/fixtures/loose-allowArrayLike/holes/options.json index 92f525cc51..059cc552f9 100644 --- a/packages/babel-plugin-transform-for-of/test/fixtures/loose-allowArrayLike/holes/options.json +++ b/packages/babel-plugin-transform-for-of/test/fixtures/loose-allowArrayLike/holes/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - ["transform-for-of", { "loose": true, "allowArrayLike": true }] - ] + "plugins": [["transform-for-of", { "loose": true, "allowArrayLike": true }]] } diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/loose-allowArrayLike/length-cropped/options.json b/packages/babel-plugin-transform-for-of/test/fixtures/loose-allowArrayLike/length-cropped/options.json index 92f525cc51..059cc552f9 100644 --- a/packages/babel-plugin-transform-for-of/test/fixtures/loose-allowArrayLike/length-cropped/options.json +++ b/packages/babel-plugin-transform-for-of/test/fixtures/loose-allowArrayLike/length-cropped/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - ["transform-for-of", { "loose": true, "allowArrayLike": true }] - ] + "plugins": [["transform-for-of", { "loose": true, "allowArrayLike": true }]] } diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/loose-allowArrayLike/simple/options.json b/packages/babel-plugin-transform-for-of/test/fixtures/loose-allowArrayLike/simple/options.json index 92f525cc51..059cc552f9 100644 --- a/packages/babel-plugin-transform-for-of/test/fixtures/loose-allowArrayLike/simple/options.json +++ b/packages/babel-plugin-transform-for-of/test/fixtures/loose-allowArrayLike/simple/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - ["transform-for-of", { "loose": true, "allowArrayLike": true }] - ] + "plugins": [["transform-for-of", { "loose": true, "allowArrayLike": true }]] } diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/loose-exec/options.json b/packages/babel-plugin-transform-for-of/test/fixtures/loose-exec/options.json index 56e88c472f..b180b3b7a8 100644 --- a/packages/babel-plugin-transform-for-of/test/fixtures/loose-exec/options.json +++ b/packages/babel-plugin-transform-for-of/test/fixtures/loose-exec/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - ["transform-for-of", { "loose": true }], - ["external-helpers", { "helperVersion": "7.100.0" }] - ] + "plugins": [["transform-for-of", { "loose": true }]] } diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/loose/options.json b/packages/babel-plugin-transform-for-of/test/fixtures/loose/options.json index 56e88c472f..b180b3b7a8 100644 --- a/packages/babel-plugin-transform-for-of/test/fixtures/loose/options.json +++ b/packages/babel-plugin-transform-for-of/test/fixtures/loose/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - ["transform-for-of", { "loose": true }], - ["external-helpers", { "helperVersion": "7.100.0" }] - ] + "plugins": [["transform-for-of", { "loose": true }]] } diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/opt/options.json b/packages/babel-plugin-transform-for-of/test/fixtures/opt/options.json index fab63f43b1..5ac45b8e39 100644 --- a/packages/babel-plugin-transform-for-of/test/fixtures/opt/options.json +++ b/packages/babel-plugin-transform-for-of/test/fixtures/opt/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "transform-for-of", - "transform-flow-strip-types", - ["external-helpers", { "helperVersion": "7.100.0" }] - ] + "plugins": ["transform-for-of", "transform-flow-strip-types"] } diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/regression/options.json b/packages/babel-plugin-transform-for-of/test/fixtures/regression/options.json index 529e1126a1..9d8c9cc344 100644 --- a/packages/babel-plugin-transform-for-of/test/fixtures/regression/options.json +++ b/packages/babel-plugin-transform-for-of/test/fixtures/regression/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - "transform-for-of", - ["external-helpers", { "helperVersion": "7.100.0" }] - ] + "plugins": ["transform-for-of"] } diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/spec-exec/options.json b/packages/babel-plugin-transform-for-of/test/fixtures/spec-exec/options.json index 4cfffdb348..7b1dfa147b 100644 --- a/packages/babel-plugin-transform-for-of/test/fixtures/spec-exec/options.json +++ b/packages/babel-plugin-transform-for-of/test/fixtures/spec-exec/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - ["transform-for-of", { "loose": false }], - ["external-helpers", { "helperVersion": "7.100.0" }] - ] + "plugins": [["transform-for-of", { "loose": false }]] } diff --git a/packages/babel-plugin-transform-for-of/test/fixtures/spec/options.json b/packages/babel-plugin-transform-for-of/test/fixtures/spec/options.json index 3e99d8381d..9d8c9cc344 100644 --- a/packages/babel-plugin-transform-for-of/test/fixtures/spec/options.json +++ b/packages/babel-plugin-transform-for-of/test/fixtures/spec/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - "transform-for-of", - ["external-helpers", { "helperVersion": "7.100.0" }] - ] + "plugins": ["transform-for-of"] } diff --git a/packages/babel-plugin-transform-function-name/test/fixtures/function-name/modules-2/options.json b/packages/babel-plugin-transform-function-name/test/fixtures/function-name/modules-2/options.json index 129fe5ba31..1a4635f61a 100644 --- a/packages/babel-plugin-transform-function-name/test/fixtures/function-name/modules-2/options.json +++ b/packages/babel-plugin-transform-function-name/test/fixtures/function-name/modules-2/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-function-name", "transform-classes", ["proposal-decorators", { "legacy": true }], diff --git a/packages/babel-plugin-transform-function-name/test/fixtures/function-name/modules-3/options.json b/packages/babel-plugin-transform-function-name/test/fixtures/function-name/modules-3/options.json index acc2af3bf3..4e45a6a625 100644 --- a/packages/babel-plugin-transform-function-name/test/fixtures/function-name/modules-3/options.json +++ b/packages/babel-plugin-transform-function-name/test/fixtures/function-name/modules-3/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-function-name", "transform-modules-commonjs", "transform-classes", diff --git a/packages/babel-plugin-transform-function-name/test/fixtures/function-name/modules-3/output.js b/packages/babel-plugin-transform-function-name/test/fixtures/function-name/modules-3/output.js index 36cdd3e45c..37eb43d0a9 100644 --- a/packages/babel-plugin-transform-function-name/test/fixtures/function-name/modules-3/output.js +++ b/packages/babel-plugin-transform-function-name/test/fixtures/function-name/modules-3/output.js @@ -7,14 +7,10 @@ exports.default = void 0; var _store = require("./store"); -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = babelHelpers.getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = babelHelpers.getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return babelHelpers.possibleConstructorReturn(this, result); }; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - let Login = /*#__PURE__*/function (_React$Component) { babelHelpers.inherits(Login, _React$Component); - var _super = _createSuper(Login); + var _super = babelHelpers.createSuper(Login); function Login() { babelHelpers.classCallCheck(this, Login); diff --git a/packages/babel-plugin-transform-function-name/test/fixtures/function-name/modules/options.json b/packages/babel-plugin-transform-function-name/test/fixtures/function-name/modules/options.json index acc2af3bf3..4e45a6a625 100644 --- a/packages/babel-plugin-transform-function-name/test/fixtures/function-name/modules/options.json +++ b/packages/babel-plugin-transform-function-name/test/fixtures/function-name/modules/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-function-name", "transform-modules-commonjs", "transform-classes", diff --git a/packages/babel-plugin-transform-function-name/test/fixtures/function-name/options.json b/packages/babel-plugin-transform-function-name/test/fixtures/function-name/options.json index 14c812c3c4..e7d1719c56 100644 --- a/packages/babel-plugin-transform-function-name/test/fixtures/function-name/options.json +++ b/packages/babel-plugin-transform-function-name/test/fixtures/function-name/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-function-name", "transform-classes", ["proposal-decorators", { "legacy": true }] diff --git a/packages/babel-plugin-transform-function-name/test/fixtures/function-name/with-arrow-functions-transform-spec/options.json b/packages/babel-plugin-transform-function-name/test/fixtures/function-name/with-arrow-functions-transform-spec/options.json index 7f38a61694..c0e43c51e6 100644 --- a/packages/babel-plugin-transform-function-name/test/fixtures/function-name/with-arrow-functions-transform-spec/options.json +++ b/packages/babel-plugin-transform-function-name/test/fixtures/function-name/with-arrow-functions-transform-spec/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-function-name", ["transform-arrow-functions", { "spec": true }] ] diff --git a/packages/babel-plugin-transform-function-name/test/fixtures/function-name/with-arrow-functions-transform/options.json b/packages/babel-plugin-transform-function-name/test/fixtures/function-name/with-arrow-functions-transform/options.json index 1392ef3ae7..ba5f50de6e 100644 --- a/packages/babel-plugin-transform-function-name/test/fixtures/function-name/with-arrow-functions-transform/options.json +++ b/packages/babel-plugin-transform-function-name/test/fixtures/function-name/with-arrow-functions-transform/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "transform-function-name", - "transform-arrow-functions" - ] + "plugins": ["transform-function-name", "transform-arrow-functions"] } diff --git a/packages/babel-plugin-transform-function-name/test/fixtures/issues/5004/options.json b/packages/babel-plugin-transform-function-name/test/fixtures/issues/5004/options.json index ab147b5837..26c88b8271 100644 --- a/packages/babel-plugin-transform-function-name/test/fixtures/issues/5004/options.json +++ b/packages/babel-plugin-transform-function-name/test/fixtures/issues/5004/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "transform-function-name"] + "plugins": ["transform-function-name"] } diff --git a/packages/babel-plugin-transform-function-name/test/fixtures/issues/7199/options.json b/packages/babel-plugin-transform-function-name/test/fixtures/issues/7199/options.json index ab147b5837..26c88b8271 100644 --- a/packages/babel-plugin-transform-function-name/test/fixtures/issues/7199/options.json +++ b/packages/babel-plugin-transform-function-name/test/fixtures/issues/7199/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "transform-function-name"] + "plugins": ["transform-function-name"] } diff --git a/packages/babel-plugin-transform-instanceof/test/fixtures/instanceof/instanceof/options.json b/packages/babel-plugin-transform-instanceof/test/fixtures/instanceof/instanceof/options.json index 2c3bece984..ae05f183be 100644 --- a/packages/babel-plugin-transform-instanceof/test/fixtures/instanceof/instanceof/options.json +++ b/packages/babel-plugin-transform-instanceof/test/fixtures/instanceof/instanceof/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "transform-instanceof"] + "plugins": ["transform-instanceof"] } diff --git a/packages/babel-plugin-transform-jscript/test/fixtures/jscript/options.json b/packages/babel-plugin-transform-jscript/test/fixtures/jscript/options.json index 9010bda65f..619464536a 100644 --- a/packages/babel-plugin-transform-jscript/test/fixtures/jscript/options.json +++ b/packages/babel-plugin-transform-jscript/test/fixtures/jscript/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-block-scoping", "transform-classes", "transform-jscript", diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/get-module-name-option/options.json b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/get-module-name-option/options.json index c4146535aa..f62ac980e4 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/get-module-name-option/options.json +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/get-module-name-option/options.json @@ -1,10 +1,12 @@ { "sourceType": "module", "plugins": [ - "external-helpers", - ["transform-modules-amd", { - "moduleIds": true, - "moduleId": "my custom module name" - }] + [ + "transform-modules-amd", + { + "moduleIds": true, + "moduleId": "my custom module name" + } + ] ] } diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/module-name/options.json b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/module-name/options.json index 6aab7e2d4b..28dda1073d 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/module-name/options.json +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/module-name/options.json @@ -1,7 +1,4 @@ { "sourceType": "module", - "plugins": [ - "external-helpers", - ["transform-modules-amd", { "moduleIds": true }] - ] + "plugins": [["transform-modules-amd", { "moduleIds": true }]] } diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/noInterop-export-from/options.json b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/noInterop-export-from/options.json index 4a28969bfe..1f7df8f7c7 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/noInterop-export-from/options.json +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/noInterop-export-from/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - "external-helpers", - ["transform-modules-amd", { "noInterop": true }] - ] + "plugins": [["transform-modules-amd", { "noInterop": true }]] } diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/noInterop-import-default-only/options.json b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/noInterop-import-default-only/options.json index 4a28969bfe..1f7df8f7c7 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/noInterop-import-default-only/options.json +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/noInterop-import-default-only/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - "external-helpers", - ["transform-modules-amd", { "noInterop": true }] - ] + "plugins": [["transform-modules-amd", { "noInterop": true }]] } diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/options.json b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/options.json index 0b14673f89..8cbc099aab 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/options.json +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/amd/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "transform-modules-amd"] + "plugins": ["transform-modules-amd"] } diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/assumption-constantReexports/options.json b/packages/babel-plugin-transform-modules-amd/test/fixtures/assumption-constantReexports/options.json index 6687fc23f8..34e25aa427 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/assumption-constantReexports/options.json +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/assumption-constantReexports/options.json @@ -2,5 +2,5 @@ "assumptions": { "constantReexports": true }, - "plugins": ["external-helpers", "transform-modules-amd"] + "plugins": ["transform-modules-amd"] } diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/assumption-enumerableModuleMeta/options.json b/packages/babel-plugin-transform-modules-amd/test/fixtures/assumption-enumerableModuleMeta/options.json index 7f92d5a3c9..90d8a7671f 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/assumption-enumerableModuleMeta/options.json +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/assumption-enumerableModuleMeta/options.json @@ -2,5 +2,5 @@ "assumptions": { "enumerableModuleMeta": true }, - "plugins": ["external-helpers", "transform-modules-amd"] + "plugins": ["transform-modules-amd"] } diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/interop-module-string-names-loose/options.json b/packages/babel-plugin-transform-modules-amd/test/fixtures/interop-module-string-names-loose/options.json index 3571c3be31..8cadc5114a 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/interop-module-string-names-loose/options.json +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/interop-module-string-names-loose/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", ["transform-modules-amd", { "loose": true }], "syntax-module-string-names" ] diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/interop-module-string-names/options.json b/packages/babel-plugin-transform-modules-amd/test/fixtures/interop-module-string-names/options.json index f3ec3e4ef6..5b2514eeb7 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/interop-module-string-names/options.json +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/interop-module-string-names/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "transform-modules-amd", - "syntax-module-string-names" - ] + "plugins": ["transform-modules-amd", "syntax-module-string-names"] } diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/get-module-name-option-compat/options.json b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/get-module-name-option-compat/options.json index 918617aab9..332d2dedc2 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/get-module-name-option-compat/options.json +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/get-module-name-option-compat/options.json @@ -2,5 +2,5 @@ "sourceType": "module", "moduleIds": true, "moduleId": "my custom module name", - "plugins": ["external-helpers", ["transform-modules-amd", { "loose": true }]] + "plugins": [["transform-modules-amd", { "loose": true }]] } diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/get-module-name-option/options.json b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/get-module-name-option/options.json index 119cb21bfb..0847bd4238 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/get-module-name-option/options.json +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/get-module-name-option/options.json @@ -1,11 +1,13 @@ { "sourceType": "module", "plugins": [ - "external-helpers", - ["transform-modules-amd", { - "loose": true, - "moduleIds": true, - "moduleId": "my custom module name" - }] + [ + "transform-modules-amd", + { + "loose": true, + "moduleIds": true, + "moduleId": "my custom module name" + } + ] ] } diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/module-name-compat/options.json b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/module-name-compat/options.json index c231826eaf..9a4555b58e 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/module-name-compat/options.json +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/module-name-compat/options.json @@ -1,5 +1,5 @@ { "sourceType": "module", "moduleIds": true, - "plugins": ["external-helpers", ["transform-modules-amd", { "loose": true }]] + "plugins": [["transform-modules-amd", { "loose": true }]] } diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/module-name/options.json b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/module-name/options.json index cc6c05b5fd..c5b15e9bff 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/module-name/options.json +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/module-name/options.json @@ -1,10 +1,12 @@ { "sourceType": "module", "plugins": [ - "external-helpers", - ["transform-modules-amd", { - "loose": true, - "moduleIds": true - }] + [ + "transform-modules-amd", + { + "loose": true, + "moduleIds": true + } + ] ] } diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/noInterop-export-from/options.json b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/noInterop-export-from/options.json index b8c7153c97..98ab290f61 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/noInterop-export-from/options.json +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/noInterop-export-from/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-modules-amd", { diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/noInterop-import-default-only/options.json b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/noInterop-import-default-only/options.json index b8c7153c97..98ab290f61 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/noInterop-import-default-only/options.json +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/noInterop-import-default-only/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-modules-amd", { diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/options.json b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/options.json index 5570cb0e3f..8e3a22bf7c 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/options.json +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/loose/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", ["transform-modules-amd", { "loose": true }]] + "plugins": [["transform-modules-amd", { "loose": true }]] } diff --git a/packages/babel-plugin-transform-modules-amd/test/fixtures/regression/4192/options.json b/packages/babel-plugin-transform-modules-amd/test/fixtures/regression/4192/options.json index 1bed8bf267..c097612108 100644 --- a/packages/babel-plugin-transform-modules-amd/test/fixtures/regression/4192/options.json +++ b/packages/babel-plugin-transform-modules-amd/test/fixtures/regression/4192/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "transform-modules-amd", - "transform-member-expression-literals" - ] + "plugins": ["transform-modules-amd", "transform-member-expression-literals"] } diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/assumption-constantReexports/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/assumption-constantReexports/options.json index d795b6de6c..84831df969 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/assumption-constantReexports/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/assumption-constantReexports/options.json @@ -2,5 +2,5 @@ "assumptions": { "constantReexports": true }, - "plugins": ["external-helpers", "transform-modules-commonjs"] + "plugins": ["transform-modules-commonjs"] } diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/assumption-enumerableModuleMeta/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/assumption-enumerableModuleMeta/options.json index 7b20177727..37711a557a 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/assumption-enumerableModuleMeta/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/assumption-enumerableModuleMeta/options.json @@ -2,5 +2,5 @@ "assumptions": { "enumerableModuleMeta": true }, - "plugins": ["external-helpers", "transform-modules-commonjs"] + "plugins": ["transform-modules-commonjs"] } diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/auxiliary-comment/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/auxiliary-comment/options.json index 999500746f..a59e6bbd94 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/auxiliary-comment/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/auxiliary-comment/options.json @@ -1,5 +1,5 @@ { - "plugins": ["external-helpers", "transform-modules-commonjs"], + "plugins": ["transform-modules-commonjs"], "auxiliaryCommentBefore": "before", "auxiliaryCommentAfter": "after" } diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/disable-strict-mode/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/disable-strict-mode/options.json index a30f3a8390..00aca30891 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/disable-strict-mode/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/disable-strict-mode/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - "external-helpers", - ["transform-modules-commonjs", { "strictMode": false }] - ] + "plugins": [["transform-modules-commonjs", { "strictMode": false }]] } diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/imports-hoisting/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/imports-hoisting/options.json index bb7528c93a..264e555281 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/imports-hoisting/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/imports-hoisting/options.json @@ -1,4 +1,5 @@ { + "externalHelpers": false, "plugins": [ "transform-runtime", "transform-template-literals", diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/multi-load/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/multi-load/options.json index c10a137f38..e2dad01fb9 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/multi-load/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/multi-load/options.json @@ -1,4 +1,5 @@ { + "externalHelpers": false, "plugins": [ ["transform-modules-commonjs", { "loose": true }], "transform-runtime", diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/options.json index 0f456743bc..c58fb48212 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-loose/options.json @@ -1,7 +1,5 @@ { + "externalHelpers": true, "sourceType": "module", - "plugins": [ - "external-helpers", - ["transform-modules-commonjs", { "loose": true }] - ] + "plugins": [["transform-modules-commonjs", { "loose": true }]] } diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-module-string-names-loose/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-module-string-names-loose/options.json index 255ad4b1bd..554215f672 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-module-string-names-loose/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-module-string-names-loose/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", ["transform-modules-commonjs", { "loose": true }], "syntax-module-string-names" ] diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-module-string-names/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-module-string-names/options.json index 392fd3cecc..f1bc0c2ef0 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-module-string-names/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop-module-string-names/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "transform-modules-commonjs", - "syntax-module-string-names" - ] + "plugins": ["transform-modules-commonjs", "syntax-module-string-names"] } diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/imports-hoisting/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/imports-hoisting/options.json index ef5733cee7..facf2649e3 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/imports-hoisting/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/imports-hoisting/options.json @@ -1,4 +1,5 @@ { + "externalHelpers": false, "plugins": [ "transform-runtime", "transform-template-literals", diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/multi-load/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/multi-load/options.json index d456a31683..ca9dde4856 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/multi-load/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/multi-load/options.json @@ -1,3 +1,4 @@ { + "externalHelpers": false, "plugins": ["transform-modules-commonjs", "transform-runtime", "./plugin"] } diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/options.json index 47d0b962b9..d7020e6da3 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/interop/options.json @@ -1,4 +1,5 @@ { + "externalHelpers": true, "sourceType": "module", - "plugins": ["external-helpers", "transform-modules-commonjs"] + "plugins": ["transform-modules-commonjs"] } diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-dep/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-dep/options.json index edcd5f7c4c..f821721586 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-dep/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-dep/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - "external-helpers", - ["transform-modules-commonjs", { "lazy": true }] - ] + "plugins": [["transform-modules-commonjs", { "lazy": true }]] } diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-local/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-local/options.json index edcd5f7c4c..f821721586 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-local/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-local/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - "external-helpers", - ["transform-modules-commonjs", { "lazy": true }] - ] + "plugins": [["transform-modules-commonjs", { "lazy": true }]] } diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/options.json index ac2f03bf91..bf2c402d11 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/lazy-whitelist/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - "external-helpers", - ["transform-modules-commonjs", { "lazy": ["white"] }] - ] + "plugins": [["transform-modules-commonjs", { "lazy": ["white"] }]] } diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/options.json index 81e5ce1243..f371837384 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/options.json @@ -1,3 +1,4 @@ { + "externalHelpers": false, "plugins": ["transform-modules-commonjs"] } diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/reference-source-map/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/reference-source-map/options.json index e38115115d..22d896394d 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/reference-source-map/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/reference-source-map/options.json @@ -1,3 +1,4 @@ { - "plugins": ["external-helpers", "transform-modules-commonjs"] + "externalHelpers": true, + "plugins": ["transform-modules-commonjs"] } diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/undefined-this-computed-class-method-1/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/undefined-this-computed-class-method-1/options.json index 60ad58ace5..622d7811a4 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/undefined-this-computed-class-method-1/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/undefined-this-computed-class-method-1/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "transform-modules-commonjs", - "syntax-class-properties" - ] + "plugins": ["transform-modules-commonjs", "syntax-class-properties"] } diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/undefined-this-computed-class-method-2/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/undefined-this-computed-class-method-2/options.json index 60ad58ace5..622d7811a4 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/undefined-this-computed-class-method-2/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/undefined-this-computed-class-method-2/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "transform-modules-commonjs", - "syntax-class-properties" - ] + "plugins": ["transform-modules-commonjs", "syntax-class-properties"] } diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/undefined-this-computed-class-method-3/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/undefined-this-computed-class-method-3/options.json index 60ad58ace5..622d7811a4 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/undefined-this-computed-class-method-3/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/undefined-this-computed-class-method-3/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "transform-modules-commonjs", - "syntax-class-properties" - ] + "plugins": ["transform-modules-commonjs", "syntax-class-properties"] } diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/undefined-this-computed-class-property-name/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/undefined-this-computed-class-property-name/options.json index 60ad58ace5..622d7811a4 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/undefined-this-computed-class-property-name/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/misc/undefined-this-computed-class-property-name/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "transform-modules-commonjs", - "syntax-class-properties" - ] + "plugins": ["transform-modules-commonjs", "syntax-class-properties"] } diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/noInterop/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/noInterop/options.json index b44830bf61..61c64415b8 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/noInterop/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/noInterop/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - "external-helpers", - ["transform-modules-commonjs", { "noInterop": true }] - ] + "plugins": [["transform-modules-commonjs", { "noInterop": true }]] } diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/options.json new file mode 100644 index 0000000000..8da9fa5b3d --- /dev/null +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/options.json @@ -0,0 +1,3 @@ +{ + "externalHelpers": false +} diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/lazy-7176/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/lazy-7176/options.json index cf7a7ac366..6186007d36 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/lazy-7176/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/regression/lazy-7176/options.json @@ -1,6 +1,4 @@ { - "plugins": [ - ["transform-modules-commonjs", { "lazy": true }], - "external-helpers" - ] + "externalHelpers": true, + "plugins": [["transform-modules-commonjs", { "lazy": true }]] } diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/source-map/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/source-map/options.json index e38115115d..81e5ce1243 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/source-map/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/source-map/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "transform-modules-commonjs"] + "plugins": ["transform-modules-commonjs"] } diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/options.json index 3e4f571b01..b2444c1e5e 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/strict/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-modules-commonjs", { "strict": true, "mjsStrictNamespace": false } diff --git a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/update-expression/options.json b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/update-expression/options.json index ab27afaee3..787f400fea 100644 --- a/packages/babel-plugin-transform-modules-commonjs/test/fixtures/update-expression/options.json +++ b/packages/babel-plugin-transform-modules-commonjs/test/fixtures/update-expression/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", ["transform-modules-commonjs"]] + "plugins": [["transform-modules-commonjs"]] } diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/import-meta/options.json b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/import-meta/options.json index c812d885ed..38f13007da 100644 --- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/import-meta/options.json +++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/import-meta/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "transform-modules-systemjs"] + "plugins": ["transform-modules-systemjs"] } diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/interop-module-string-names/options.json b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/interop-module-string-names/options.json index e1251d0ca2..8006ade107 100644 --- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/interop-module-string-names/options.json +++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/interop-module-string-names/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "transform-modules-systemjs", - "syntax-module-string-names" - ] + "plugins": ["transform-modules-systemjs", "syntax-module-string-names"] } diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/regression/issue-12329/output.mjs b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/regression/issue-12329/output.mjs index 5c21b543b5..beeb7f3477 100644 --- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/regression/issue-12329/output.mjs +++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/regression/issue-12329/output.mjs @@ -3,8 +3,6 @@ System.register([], function (_export, _context) { var Light, Vec3; - function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - _export("Light", void 0); return { @@ -12,7 +10,7 @@ System.register([], function (_export, _context) { execute: function () { _export("Light", Light = class Light { constructor() { - _defineProperty(this, "_color", Vec3); + babelHelpers.defineProperty(this, "_color", Vec3); } }); diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-const-destructuring-object-rest/options.json b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-const-destructuring-object-rest/options.json index 3329c8d951..38f13007da 100644 --- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-const-destructuring-object-rest/options.json +++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/export-const-destructuring-object-rest/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - "external-helpers", - "transform-modules-systemjs" - ] + "plugins": ["transform-modules-systemjs"] } diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/get-module-name-option/options.json b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/get-module-name-option/options.json index a6532e9137..acb5e95711 100644 --- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/get-module-name-option/options.json +++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/get-module-name-option/options.json @@ -1,9 +1,11 @@ { "plugins": [ - "external-helpers", - ["transform-modules-systemjs", { - "moduleIds": true, - "moduleId": "my custom module name" - }] + [ + "transform-modules-systemjs", + { + "moduleIds": true, + "moduleId": "my custom module name" + } + ] ] } diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/options.json b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/options.json index c812d885ed..38f13007da 100644 --- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/options.json +++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/systemjs/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "transform-modules-systemjs"] + "plugins": ["transform-modules-systemjs"] } diff --git a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/tla/options.json b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/tla/options.json index 39c5d8d3f5..650b247545 100644 --- a/packages/babel-plugin-transform-modules-systemjs/test/fixtures/tla/options.json +++ b/packages/babel-plugin-transform-modules-systemjs/test/fixtures/tla/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "transform-modules-systemjs", "syntax-top-level-await"] + "plugins": ["transform-modules-systemjs", "syntax-top-level-await"] } diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/assumption-constantReexports/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/assumption-constantReexports/options.json index 1a3f6d1a0d..d5973e651b 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/assumption-constantReexports/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/assumption-constantReexports/options.json @@ -2,5 +2,5 @@ "assumptions": { "constantReexports": true }, - "plugins": ["external-helpers", "transform-modules-umd"] + "plugins": ["transform-modules-umd"] } diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/assumption-enumerableModuleMeta/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/assumption-enumerableModuleMeta/options.json index 56bfa8f269..912b099e99 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/assumption-enumerableModuleMeta/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/assumption-enumerableModuleMeta/options.json @@ -2,5 +2,5 @@ "assumptions": { "enumerableModuleMeta": true }, - "plugins": ["external-helpers", "transform-modules-umd"] + "plugins": ["transform-modules-umd"] } diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/interop-module-string-names-loose/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/interop-module-string-names-loose/options.json index 03d2a13005..05e7e255e9 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/interop-module-string-names-loose/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/interop-module-string-names-loose/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", ["transform-modules-umd", { "loose": true }], "syntax-module-string-names" ] diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/interop-module-string-names/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/interop-module-string-names/options.json index 7d7a0d93ec..2b6c7d6d1d 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/interop-module-string-names/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/interop-module-string-names/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "transform-modules-umd", - "syntax-module-string-names" - ] + "plugins": ["transform-modules-umd", "syntax-module-string-names"] } diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/get-module-name-option-compat/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/get-module-name-option-compat/options.json index 039bece2c3..86d81871c9 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/get-module-name-option-compat/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/get-module-name-option-compat/options.json @@ -2,5 +2,5 @@ "sourceType": "module", "moduleIds": true, "moduleId": "my custom module name", - "plugins": ["external-helpers", ["transform-modules-umd", { "loose": true }]] + "plugins": [["transform-modules-umd", { "loose": true }]] } diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/get-module-name-option/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/get-module-name-option/options.json index 1dc44a20c5..acf1111f80 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/get-module-name-option/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/get-module-name-option/options.json @@ -1,11 +1,13 @@ { "sourceType": "module", "plugins": [ - "external-helpers", - ["transform-modules-umd", { - "loose": true, - "moduleIds": true, - "moduleId": "my custom module name" - }] + [ + "transform-modules-umd", + { + "loose": true, + "moduleIds": true, + "moduleId": "my custom module name" + } + ] ] } diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-false-with-overrides/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-false-with-overrides/options.json index 35718196f4..a9d6d6ac28 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-false-with-overrides/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-false-with-overrides/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-modules-umd", { diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-true-with-overrides/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-true-with-overrides/options.json index 5206c894ed..b3c92a89a9 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-true-with-overrides/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-true-with-overrides/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-modules-umd", { diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-true/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-true/options.json index 3ac6242c2e..1b99ded8b1 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-true/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/imports-exact-globals-true/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-modules-umd", { diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id-with-overridden-global-in-namespace/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id-with-overridden-global-in-namespace/options.json index 81f94c6a3f..f215ae29b2 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id-with-overridden-global-in-namespace/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id-with-overridden-global-in-namespace/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-modules-umd", { diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id-with-overridden-global-in-very-nested-namespace/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id-with-overridden-global-in-very-nested-namespace/options.json index c41e884c8f..9a9b96b775 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id-with-overridden-global-in-very-nested-namespace/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id-with-overridden-global-in-very-nested-namespace/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-modules-umd", { diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id-with-overridden-global/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id-with-overridden-global/options.json index 02190d5d1d..9ab14716cd 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id-with-overridden-global/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id-with-overridden-global/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-modules-umd", { diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id/options.json index ffec5e61b8..139f6fa575 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-id/options.json @@ -1,5 +1,5 @@ { "sourceType": "module", "moduleId": "MyLib", - "plugins": ["external-helpers", ["transform-modules-umd", { "loose": true }]] + "plugins": [["transform-modules-umd", { "loose": true }]] } diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name-compat/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name-compat/options.json index 6ee8c312f9..fe390b6702 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name-compat/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name-compat/options.json @@ -1,5 +1,5 @@ { "sourceType": "module", "moduleIds": true, - "plugins": ["external-helpers", ["transform-modules-umd", { "loose": true }]] + "plugins": [["transform-modules-umd", { "loose": true }]] } diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name-with-overridden-global-compat/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name-with-overridden-global-compat/options.json index 745ff7a7ea..73a20d6ed2 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name-with-overridden-global-compat/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name-with-overridden-global-compat/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-modules-umd", { diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name-with-overridden-global/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name-with-overridden-global/options.json index 0a4089dfb8..2ebfbda11b 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name-with-overridden-global/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name-with-overridden-global/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-modules-umd", { diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name/options.json index b5625da731..abf6f890fa 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/module-name/options.json @@ -1,10 +1,12 @@ { "sourceType": "module", "plugins": [ - "external-helpers", - ["transform-modules-umd", { - "loose": true, - "moduleIds": true - }] + [ + "transform-modules-umd", + { + "loose": true, + "moduleIds": true + } + ] ] } diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/options.json index 4558224b4d..f3f8f2be6f 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", ["transform-modules-umd", { "loose": true }]] + "plugins": [["transform-modules-umd", { "loose": true }]] } diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/override-export-name/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/override-export-name/options.json index 3b9f778ff8..32f1562405 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/override-export-name/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/override-export-name/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-modules-umd", { diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/override-import-name/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/override-import-name/options.json index d7bd8e05b2..0a9736c7d1 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/override-import-name/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/loose/override-import-name/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-modules-umd", { diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/regression/4192/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/regression/4192/options.json index 5350a1585b..2d87909dae 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/regression/4192/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/regression/4192/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "transform-modules-umd", - "transform-member-expression-literals" - ] + "plugins": ["transform-modules-umd", "transform-member-expression-literals"] } diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/get-module-name-option/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/get-module-name-option/options.json index e1a151d01e..86bb3fc22e 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/get-module-name-option/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/get-module-name-option/options.json @@ -1,10 +1,12 @@ { "sourceType": "module", "plugins": [ - "external-helpers", - ["transform-modules-umd", { - "moduleIds": true, - "moduleId": "my custom module name" - }] + [ + "transform-modules-umd", + { + "moduleIds": true, + "moduleId": "my custom module name" + } + ] ] } diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-exact-globals-false-with-overrides/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-exact-globals-false-with-overrides/options.json index 9150394dc9..c46657ba98 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-exact-globals-false-with-overrides/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-exact-globals-false-with-overrides/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-modules-umd", { diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-exact-globals-true-with-overrides/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-exact-globals-true-with-overrides/options.json index 291cf1a9f0..1bdf7c0e4d 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-exact-globals-true-with-overrides/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-exact-globals-true-with-overrides/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-modules-umd", { diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-exact-globals-true/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-exact-globals-true/options.json index 37d2c6f3de..b684a07247 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-exact-globals-true/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/imports-exact-globals-true/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-modules-umd", { diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id-with-overridden-global-in-namespace/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id-with-overridden-global-in-namespace/options.json index bfb7432560..4eb7e2a9a6 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id-with-overridden-global-in-namespace/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id-with-overridden-global-in-namespace/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-modules-umd", { diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id-with-overridden-global-in-very-nested-namespace/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id-with-overridden-global-in-very-nested-namespace/options.json index 13f94a5fe6..cae072c6ac 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id-with-overridden-global-in-very-nested-namespace/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id-with-overridden-global-in-very-nested-namespace/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-modules-umd", { diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id-with-overridden-global/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id-with-overridden-global/options.json index 13966c9b1a..b7f3e10ae3 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id-with-overridden-global/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-id-with-overridden-global/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-modules-umd", { diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name-with-overridden-global-compat/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name-with-overridden-global-compat/options.json index 369639e804..38d9d7039b 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name-with-overridden-global-compat/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name-with-overridden-global-compat/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-modules-umd", { diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name-with-overridden-global/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name-with-overridden-global/options.json index f3aca6c656..a595de0b0b 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name-with-overridden-global/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name-with-overridden-global/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-modules-umd", { diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name/options.json index 991874b445..8580084f92 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/module-name/options.json @@ -1,9 +1,11 @@ { "sourceType": "module", "plugins": [ - "external-helpers", - ["transform-modules-umd", { - "moduleIds": true - }] + [ + "transform-modules-umd", + { + "moduleIds": true + } + ] ] } diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/options.json index 2eb6f704ae..d3ea30b918 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "transform-modules-umd"] + "plugins": ["transform-modules-umd"] } diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/override-export-name/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/override-export-name/options.json index 779b17b7ea..271cc74c40 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/override-export-name/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/override-export-name/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-modules-umd", { diff --git a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/override-import-name/options.json b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/override-import-name/options.json index 4805fd1648..3bb5bce1c5 100644 --- a/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/override-import-name/options.json +++ b/packages/babel-plugin-transform-modules-umd/test/fixtures/umd/override-import-name/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", [ "transform-modules-umd", { diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/basic/options.json b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/basic/options.json index 3b43d3bd5d..8447a58060 100644 --- a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/basic/options.json +++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/basic/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - "external-helpers", - ["transform-named-capturing-groups-regex", { "runtime": false }] - ] + "plugins": [["transform-named-capturing-groups-regex", { "runtime": false }]] } diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/options.json b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/options.json index 2490cf9876..8447a58060 100644 --- a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/options.json +++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/syntax/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.1000.0" }], - ["transform-named-capturing-groups-regex", { "runtime": false }] - ] + "plugins": [["transform-named-capturing-groups-regex", { "runtime": false }]] } diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/looks-like-a-group-unicode/options.json b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/looks-like-a-group-unicode/options.json index 1832df9cd6..148c4e8cb7 100644 --- a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/looks-like-a-group-unicode/options.json +++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/looks-like-a-group-unicode/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.1000.0" }], "transform-named-capturing-groups-regex", "transform-unicode-regex" ] diff --git a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/options.json b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/options.json index ce85d0c0f4..8b8fe93e5d 100644 --- a/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/options.json +++ b/packages/babel-plugin-transform-named-capturing-groups-regex/test/fixtures/wrapper/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.1000.0" }], - "transform-named-capturing-groups-regex" - ] + "plugins": ["transform-named-capturing-groups-regex"] } diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/get-semantics-data-defined-on-parent/output.js b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/get-semantics-data-defined-on-parent/output.js index a576d5093d..d2893ee30d 100644 --- a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/get-semantics-data-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/get-semantics-data-defined-on-parent/output.js @@ -2,12 +2,6 @@ var _obj; -function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - const Base = { test: 1 }; @@ -15,7 +9,7 @@ const obj = _obj = { test: 2, get() { - return _get(_getPrototypeOf(_obj), "test", this); + return babelHelpers.get(babelHelpers.getPrototypeOf(_obj), "test", this); } }; diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/get-semantics-getter-defined-on-parent/output.js b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/get-semantics-getter-defined-on-parent/output.js index c39886fa23..7cc5506030 100644 --- a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/get-semantics-getter-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/get-semantics-getter-defined-on-parent/output.js @@ -2,12 +2,6 @@ var _obj; -function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - const Base = { get test() { expect(this).toBe(obj); @@ -19,7 +13,7 @@ const obj = _obj = { test: 2, get() { - return _get(_getPrototypeOf(_obj), "test", this); + return babelHelpers.get(babelHelpers.getPrototypeOf(_obj), "test", this); } }; diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/get-semantics-not-defined-on-parent/output.js b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/get-semantics-not-defined-on-parent/output.js index 97f6025100..2ab1e28206 100644 --- a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/get-semantics-not-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/get-semantics-not-defined-on-parent/output.js @@ -2,18 +2,12 @@ var _obj; -function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - const Base = {}; const obj = _obj = { test: 2, get() { - return _get(_getPrototypeOf(_obj), "test", this); + return babelHelpers.get(babelHelpers.getPrototypeOf(_obj), "test", this); } }; diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/get-semantics-setter-defined-on-parent/output.js b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/get-semantics-setter-defined-on-parent/output.js index 251d55e479..7bd70046ec 100644 --- a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/get-semantics-setter-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/get-semantics-setter-defined-on-parent/output.js @@ -2,12 +2,6 @@ var _obj; -function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - const Base = { set test(v) { throw new Error("called"); @@ -18,7 +12,7 @@ const obj = _obj = { test: 2, get() { - return _get(_getPrototypeOf(_obj), "test", this); + return babelHelpers.get(babelHelpers.getPrototypeOf(_obj), "test", this); } }; diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-data-defined-on-parent/output.js b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-data-defined-on-parent/output.js index b73b5213cf..61257b6e02 100644 --- a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-data-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-data-defined-on-parent/output.js @@ -2,16 +2,6 @@ var _obj; -function set(target, property, value, receiver) { if (typeof Reflect !== "undefined" && Reflect.set) { set = Reflect.set; } else { set = function set(target, property, value, receiver) { var base = _superPropBase(target, property); var desc; if (base) { desc = Object.getOwnPropertyDescriptor(base, property); if (desc.set) { desc.set.call(receiver, value); return true; } else if (!desc.writable) { return false; } } desc = Object.getOwnPropertyDescriptor(receiver, property); if (desc) { if (!desc.writable) { return false; } desc.value = value; Object.defineProperty(receiver, property, desc); } else { _defineProperty(receiver, property, value); } return true; }; } return set(target, property, value, receiver); } - -function _set(target, property, value, receiver, isStrict) { var s = set(target, property, value, receiver || target); if (!s && isStrict) { throw new Error('failed to set property'); } return value; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - const Base = { test: 1 }; @@ -19,7 +9,7 @@ const obj = _obj = { test: 2, set() { - return _set(_getPrototypeOf(_obj), "test", 3, this, true); + return babelHelpers.set(babelHelpers.getPrototypeOf(_obj), "test", 3, this, true); } }; diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-getter-defined-on-parent/output.js b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-getter-defined-on-parent/output.js index cbcdae0086..c9fd7cc0ec 100644 --- a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-getter-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-getter-defined-on-parent/output.js @@ -2,16 +2,6 @@ var _obj; -function set(target, property, value, receiver) { if (typeof Reflect !== "undefined" && Reflect.set) { set = Reflect.set; } else { set = function set(target, property, value, receiver) { var base = _superPropBase(target, property); var desc; if (base) { desc = Object.getOwnPropertyDescriptor(base, property); if (desc.set) { desc.set.call(receiver, value); return true; } else if (!desc.writable) { return false; } } desc = Object.getOwnPropertyDescriptor(receiver, property); if (desc) { if (!desc.writable) { return false; } desc.value = value; Object.defineProperty(receiver, property, desc); } else { _defineProperty(receiver, property, value); } return true; }; } return set(target, property, value, receiver); } - -function _set(target, property, value, receiver, isStrict) { var s = set(target, property, value, receiver || target); if (!s && isStrict) { throw new Error('failed to set property'); } return value; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - const Base = { get test() { return 1; @@ -22,7 +12,7 @@ const obj = _obj = { test: 2, set() { - return _set(_getPrototypeOf(_obj), "test", 3, this, true); + return babelHelpers.set(babelHelpers.getPrototypeOf(_obj), "test", 3, this, true); } }; diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-data-non-configurable-on-obj/output.js b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-data-non-configurable-on-obj/output.js index 7ce8e46ad4..6766636c92 100644 --- a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-data-non-configurable-on-obj/output.js +++ b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-data-non-configurable-on-obj/output.js @@ -2,20 +2,10 @@ var _obj; -function set(target, property, value, receiver) { if (typeof Reflect !== "undefined" && Reflect.set) { set = Reflect.set; } else { set = function set(target, property, value, receiver) { var base = _superPropBase(target, property); var desc; if (base) { desc = Object.getOwnPropertyDescriptor(base, property); if (desc.set) { desc.set.call(receiver, value); return true; } else if (!desc.writable) { return false; } } desc = Object.getOwnPropertyDescriptor(receiver, property); if (desc) { if (!desc.writable) { return false; } desc.value = value; Object.defineProperty(receiver, property, desc); } else { _defineProperty(receiver, property, value); } return true; }; } return set(target, property, value, receiver); } - -function _set(target, property, value, receiver, isStrict) { var s = set(target, property, value, receiver || target); if (!s && isStrict) { throw new Error('failed to set property'); } return value; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - const Base = {}; const obj = _obj = { set() { - return _set(_getPrototypeOf(_obj), "test", 3, this, true); + return babelHelpers.set(babelHelpers.getPrototypeOf(_obj), "test", 3, this, true); } }; diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-data-non-enumerable-on-obj/output.js b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-data-non-enumerable-on-obj/output.js index 0fe6b9fc03..645b712af5 100644 --- a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-data-non-enumerable-on-obj/output.js +++ b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-data-non-enumerable-on-obj/output.js @@ -2,20 +2,10 @@ var _obj; -function set(target, property, value, receiver) { if (typeof Reflect !== "undefined" && Reflect.set) { set = Reflect.set; } else { set = function set(target, property, value, receiver) { var base = _superPropBase(target, property); var desc; if (base) { desc = Object.getOwnPropertyDescriptor(base, property); if (desc.set) { desc.set.call(receiver, value); return true; } else if (!desc.writable) { return false; } } desc = Object.getOwnPropertyDescriptor(receiver, property); if (desc) { if (!desc.writable) { return false; } desc.value = value; Object.defineProperty(receiver, property, desc); } else { _defineProperty(receiver, property, value); } return true; }; } return set(target, property, value, receiver); } - -function _set(target, property, value, receiver, isStrict) { var s = set(target, property, value, receiver || target); if (!s && isStrict) { throw new Error('failed to set property'); } return value; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - const Base = {}; const obj = _obj = { set() { - return _set(_getPrototypeOf(_obj), "test", 3, this, true); + return babelHelpers.set(babelHelpers.getPrototypeOf(_obj), "test", 3, this, true); } }; diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-data-non-writable-on-obj/output.js b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-data-non-writable-on-obj/output.js index 4eb398f036..db512d9daf 100644 --- a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-data-non-writable-on-obj/output.js +++ b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-data-non-writable-on-obj/output.js @@ -2,20 +2,10 @@ var _obj; -function set(target, property, value, receiver) { if (typeof Reflect !== "undefined" && Reflect.set) { set = Reflect.set; } else { set = function set(target, property, value, receiver) { var base = _superPropBase(target, property); var desc; if (base) { desc = Object.getOwnPropertyDescriptor(base, property); if (desc.set) { desc.set.call(receiver, value); return true; } else if (!desc.writable) { return false; } } desc = Object.getOwnPropertyDescriptor(receiver, property); if (desc) { if (!desc.writable) { return false; } desc.value = value; Object.defineProperty(receiver, property, desc); } else { _defineProperty(receiver, property, value); } return true; }; } return set(target, property, value, receiver); } - -function _set(target, property, value, receiver, isStrict) { var s = set(target, property, value, receiver || target); if (!s && isStrict) { throw new Error('failed to set property'); } return value; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - const Base = {}; const obj = _obj = { set() { - return _set(_getPrototypeOf(_obj), "test", 3, this, true); + return babelHelpers.set(babelHelpers.getPrototypeOf(_obj), "test", 3, this, true); } }; diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-data-on-obj/output.js b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-data-on-obj/output.js index b1994ab935..e44bc2076a 100644 --- a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-data-on-obj/output.js +++ b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-data-on-obj/output.js @@ -2,22 +2,12 @@ var _obj; -function set(target, property, value, receiver) { if (typeof Reflect !== "undefined" && Reflect.set) { set = Reflect.set; } else { set = function set(target, property, value, receiver) { var base = _superPropBase(target, property); var desc; if (base) { desc = Object.getOwnPropertyDescriptor(base, property); if (desc.set) { desc.set.call(receiver, value); return true; } else if (!desc.writable) { return false; } } desc = Object.getOwnPropertyDescriptor(receiver, property); if (desc) { if (!desc.writable) { return false; } desc.value = value; Object.defineProperty(receiver, property, desc); } else { _defineProperty(receiver, property, value); } return true; }; } return set(target, property, value, receiver); } - -function _set(target, property, value, receiver, isStrict) { var s = set(target, property, value, receiver || target); if (!s && isStrict) { throw new Error('failed to set property'); } return value; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - const Base = {}; const obj = _obj = { test: 2, set() { - return _set(_getPrototypeOf(_obj), "test", 3, this, true); + return babelHelpers.set(babelHelpers.getPrototypeOf(_obj), "test", 3, this, true); } }; diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-getter-on-obj/output.js b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-getter-on-obj/output.js index 35668a2625..8a23232bab 100644 --- a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-getter-on-obj/output.js +++ b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-getter-on-obj/output.js @@ -2,22 +2,12 @@ var _obj; -function set(target, property, value, receiver) { if (typeof Reflect !== "undefined" && Reflect.set) { set = Reflect.set; } else { set = function set(target, property, value, receiver) { var base = _superPropBase(target, property); var desc; if (base) { desc = Object.getOwnPropertyDescriptor(base, property); if (desc.set) { desc.set.call(receiver, value); return true; } else if (!desc.writable) { return false; } } desc = Object.getOwnPropertyDescriptor(receiver, property); if (desc) { if (!desc.writable) { return false; } desc.value = value; Object.defineProperty(receiver, property, desc); } else { _defineProperty(receiver, property, value); } return true; }; } return set(target, property, value, receiver); } - -function _set(target, property, value, receiver, isStrict) { var s = set(target, property, value, receiver || target); if (!s && isStrict) { throw new Error('failed to set property'); } return value; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - const Base = {}; const obj = _obj = { get test() {}, set() { - return _set(_getPrototypeOf(_obj), "test", 3, this, true); + return babelHelpers.set(babelHelpers.getPrototypeOf(_obj), "test", 3, this, true); } }; diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-not-on-obj/output.js b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-not-on-obj/output.js index 4ca6d9afec..04a342c6ba 100644 --- a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-not-on-obj/output.js +++ b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-not-on-obj/output.js @@ -2,20 +2,10 @@ var _obj; -function set(target, property, value, receiver) { if (typeof Reflect !== "undefined" && Reflect.set) { set = Reflect.set; } else { set = function set(target, property, value, receiver) { var base = _superPropBase(target, property); var desc; if (base) { desc = Object.getOwnPropertyDescriptor(base, property); if (desc.set) { desc.set.call(receiver, value); return true; } else if (!desc.writable) { return false; } } desc = Object.getOwnPropertyDescriptor(receiver, property); if (desc) { if (!desc.writable) { return false; } desc.value = value; Object.defineProperty(receiver, property, desc); } else { _defineProperty(receiver, property, value); } return true; }; } return set(target, property, value, receiver); } - -function _set(target, property, value, receiver, isStrict) { var s = set(target, property, value, receiver || target); if (!s && isStrict) { throw new Error('failed to set property'); } return value; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - const Base = {}; const obj = _obj = { set() { - return _set(_getPrototypeOf(_obj), "test", 3, this, true); + return babelHelpers.set(babelHelpers.getPrototypeOf(_obj), "test", 3, this, true); } }; diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-setter-on-obj/output.js b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-setter-on-obj/output.js index 05f7a8d1a1..629ed89235 100644 --- a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-setter-on-obj/output.js +++ b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-not-defined-on-parent-setter-on-obj/output.js @@ -2,16 +2,6 @@ var _obj; -function set(target, property, value, receiver) { if (typeof Reflect !== "undefined" && Reflect.set) { set = Reflect.set; } else { set = function set(target, property, value, receiver) { var base = _superPropBase(target, property); var desc; if (base) { desc = Object.getOwnPropertyDescriptor(base, property); if (desc.set) { desc.set.call(receiver, value); return true; } else if (!desc.writable) { return false; } } desc = Object.getOwnPropertyDescriptor(receiver, property); if (desc) { if (!desc.writable) { return false; } desc.value = value; Object.defineProperty(receiver, property, desc); } else { _defineProperty(receiver, property, value); } return true; }; } return set(target, property, value, receiver); } - -function _set(target, property, value, receiver, isStrict) { var s = set(target, property, value, receiver || target); if (!s && isStrict) { throw new Error('failed to set property'); } return value; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - const Base = {}; let value = 2; const obj = _obj = { @@ -21,7 +11,7 @@ const obj = _obj = { }, set() { - return _set(_getPrototypeOf(_obj), "test", 3, this, true); + return babelHelpers.set(babelHelpers.getPrototypeOf(_obj), "test", 3, this, true); } }; diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-setter-defined-on-parent/output.js b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-setter-defined-on-parent/output.js index 99389893c5..b27999d14c 100644 --- a/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-setter-defined-on-parent/output.js +++ b/packages/babel-plugin-transform-object-super/test/fixtures/get-set/set-semantics-setter-defined-on-parent/output.js @@ -2,16 +2,6 @@ var _obj; -function set(target, property, value, receiver) { if (typeof Reflect !== "undefined" && Reflect.set) { set = Reflect.set; } else { set = function set(target, property, value, receiver) { var base = _superPropBase(target, property); var desc; if (base) { desc = Object.getOwnPropertyDescriptor(base, property); if (desc.set) { desc.set.call(receiver, value); return true; } else if (!desc.writable) { return false; } } desc = Object.getOwnPropertyDescriptor(receiver, property); if (desc) { if (!desc.writable) { return false; } desc.value = value; Object.defineProperty(receiver, property, desc); } else { _defineProperty(receiver, property, value); } return true; }; } return set(target, property, value, receiver); } - -function _set(target, property, value, receiver, isStrict) { var s = set(target, property, value, receiver || target); if (!s && isStrict) { throw new Error('failed to set property'); } return value; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - let value = 1; const Base = { set test(v) { @@ -23,7 +13,7 @@ const obj = _obj = { test: 2, set() { - return _set(_getPrototypeOf(_obj), "test", 3, this, true); + return babelHelpers.set(babelHelpers.getPrototypeOf(_obj), "test", 3, this, true); } }; diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/object-super/options.json b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/options.json index 6109d3e790..5aef5b47e7 100644 --- a/packages/babel-plugin-transform-object-super/test/fixtures/object-super/options.json +++ b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "transform-object-super", - "transform-shorthand-properties" - ] + "plugins": ["transform-object-super", "transform-shorthand-properties"] } diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-array-pattern-1/options.json b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-array-pattern-1/options.json index 7975cd686c..b53e8d443b 100644 --- a/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-array-pattern-1/options.json +++ b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-array-pattern-1/options.json @@ -1,8 +1,4 @@ { - "plugins": [ - "external-helpers", - "transform-object-super", - "transform-shorthand-properties" - ], + "plugins": ["transform-object-super", "transform-shorthand-properties"], "throws": "Destructuring to a super field is not supported yet." } diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-array-pattern/options.json b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-array-pattern/options.json index 7975cd686c..b53e8d443b 100644 --- a/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-array-pattern/options.json +++ b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-array-pattern/options.json @@ -1,8 +1,4 @@ { - "plugins": [ - "external-helpers", - "transform-object-super", - "transform-shorthand-properties" - ], + "plugins": ["transform-object-super", "transform-shorthand-properties"], "throws": "Destructuring to a super field is not supported yet." } diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-object-pattern-1/options.json b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-object-pattern-1/options.json index 7975cd686c..b53e8d443b 100644 --- a/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-object-pattern-1/options.json +++ b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-object-pattern-1/options.json @@ -1,8 +1,4 @@ { - "plugins": [ - "external-helpers", - "transform-object-super", - "transform-shorthand-properties" - ], + "plugins": ["transform-object-super", "transform-shorthand-properties"], "throws": "Destructuring to a super field is not supported yet." } diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-object-pattern/options.json b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-object-pattern/options.json index 7975cd686c..b53e8d443b 100644 --- a/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-object-pattern/options.json +++ b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-destructuring-object-pattern/options.json @@ -1,8 +1,4 @@ { - "plugins": [ - "external-helpers", - "transform-object-super", - "transform-shorthand-properties" - ], + "plugins": ["transform-object-super", "transform-shorthand-properties"], "throws": "Destructuring to a super field is not supported yet." } diff --git a/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-exponentiation/output.js b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-exponentiation/output.js index 028ca49735..74a78811fa 100644 --- a/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-exponentiation/output.js +++ b/packages/babel-plugin-transform-object-super/test/fixtures/object-super/super-exponentiation/output.js @@ -1,19 +1,7 @@ var _obj; -function set(target, property, value, receiver) { if (typeof Reflect !== "undefined" && Reflect.set) { set = Reflect.set; } else { set = function set(target, property, value, receiver) { var base = _superPropBase(target, property); var desc; if (base) { desc = Object.getOwnPropertyDescriptor(base, property); if (desc.set) { desc.set.call(receiver, value); return true; } else if (!desc.writable) { return false; } } desc = Object.getOwnPropertyDescriptor(receiver, property); if (desc) { if (!desc.writable) { return false; } desc.value = value; Object.defineProperty(receiver, property, desc); } else { _defineProperty(receiver, property, value); } return true; }; } return set(target, property, value, receiver); } - -function _set(target, property, value, receiver, isStrict) { var s = set(target, property, value, receiver || target); if (!s && isStrict) { throw new Error('failed to set property'); } return value; } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _get(target, property, receiver) { if (typeof Reflect !== "undefined" && Reflect.get) { _get = Reflect.get; } else { _get = function _get(target, property, receiver) { var base = _superPropBase(target, property); if (!base) return; var desc = Object.getOwnPropertyDescriptor(base, property); if (desc.get) { return desc.get.call(receiver); } return desc.value; }; } return _get(target, property, receiver || target); } - -function _superPropBase(object, property) { while (!Object.prototype.hasOwnProperty.call(object, property)) { object = _getPrototypeOf(object); if (object === null) break; } return object; } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - foo = _obj = { bar: function () { - return _set(_getPrototypeOf(_obj), "baz", _get(_getPrototypeOf(_obj), "baz", this) ** 12, this, false); + return babelHelpers.set(babelHelpers.getPrototypeOf(_obj), "baz", babelHelpers.get(babelHelpers.getPrototypeOf(_obj), "baz", this) ** 12, this, false); } }; diff --git a/packages/babel-plugin-transform-parameters/test/fixtures/assumption-ignoreFunctionLength/options.json b/packages/babel-plugin-transform-parameters/test/fixtures/assumption-ignoreFunctionLength/options.json index f8c2c7a9fa..5ffeed191e 100644 --- a/packages/babel-plugin-transform-parameters/test/fixtures/assumption-ignoreFunctionLength/options.json +++ b/packages/babel-plugin-transform-parameters/test/fixtures/assumption-ignoreFunctionLength/options.json @@ -1,7 +1,6 @@ { "plugins": [ "proposal-class-properties", - "external-helpers", "syntax-flow", "transform-parameters", "transform-block-scoping", diff --git a/packages/babel-plugin-transform-parameters/test/fixtures/parameters/iife-this-9385/output.js b/packages/babel-plugin-transform-parameters/test/fixtures/parameters/iife-this-9385/output.js index c8c2ef9b1c..cb2b6357b5 100644 --- a/packages/babel-plugin-transform-parameters/test/fixtures/parameters/iife-this-9385/output.js +++ b/packages/babel-plugin-transform-parameters/test/fixtures/parameters/iife-this-9385/output.js @@ -5,18 +5,12 @@ Object.defineProperty(exports, "__esModule", { }); exports.Test = void 0; -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - var Test = /*#__PURE__*/function () { function Test() { - _classCallCheck(this, Test); + babelHelpers.classCallCheck(this, Test); } - _createClass(Test, [{ + babelHelpers.createClass(Test, [{ key: "invite", value: function invite() { var options = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {}; @@ -24,7 +18,6 @@ var Test = /*#__PURE__*/function () { console.log(this); } }]); - return Test; }(); diff --git a/packages/babel-plugin-transform-parameters/test/fixtures/parameters/options.json b/packages/babel-plugin-transform-parameters/test/fixtures/parameters/options.json index 81ab23a540..380ef10de3 100644 --- a/packages/babel-plugin-transform-parameters/test/fixtures/parameters/options.json +++ b/packages/babel-plugin-transform-parameters/test/fixtures/parameters/options.json @@ -1,7 +1,6 @@ { "plugins": [ "proposal-class-properties", - ["external-helpers", { "helperVersion": "7.100.0" }], "syntax-typescript", "syntax-flow", "transform-parameters", diff --git a/packages/babel-plugin-transform-parameters/test/fixtures/parameters/rest-arrow-functions/options.json b/packages/babel-plugin-transform-parameters/test/fixtures/parameters/rest-arrow-functions/options.json index 51a1d6759c..9d6485a5c0 100644 --- a/packages/babel-plugin-transform-parameters/test/fixtures/parameters/rest-arrow-functions/options.json +++ b/packages/babel-plugin-transform-parameters/test/fixtures/parameters/rest-arrow-functions/options.json @@ -1,7 +1,6 @@ { "plugins": [ ["proposal-class-properties", { "loose": true }], - "external-helpers", "syntax-flow", "transform-parameters", "transform-block-scoping", diff --git a/packages/babel-plugin-transform-parameters/test/fixtures/parameters/rest-async-arrow-functions/options.json b/packages/babel-plugin-transform-parameters/test/fixtures/parameters/rest-async-arrow-functions/options.json index a2a7a5798b..e056aafdfd 100644 --- a/packages/babel-plugin-transform-parameters/test/fixtures/parameters/rest-async-arrow-functions/options.json +++ b/packages/babel-plugin-transform-parameters/test/fixtures/parameters/rest-async-arrow-functions/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-parameters", "transform-async-to-generator", "transform-arrow-functions" diff --git a/packages/babel-plugin-transform-parameters/test/fixtures/regression/11256/options.json b/packages/babel-plugin-transform-parameters/test/fixtures/regression/11256/options.json index 5571fe0ba6..33010297d1 100644 --- a/packages/babel-plugin-transform-parameters/test/fixtures/regression/11256/options.json +++ b/packages/babel-plugin-transform-parameters/test/fixtures/regression/11256/options.json @@ -2,7 +2,6 @@ "plugins": [ "proposal-class-properties", "transform-parameters", - "transform-destructuring", - ["external-helpers", { "helperVersion": "7.100.0" }] + "transform-destructuring" ] } diff --git a/packages/babel-plugin-transform-parameters/test/fixtures/regression/4209/output.js b/packages/babel-plugin-transform-parameters/test/fixtures/regression/4209/output.js index 9254fa65f8..cf5db192bc 100644 --- a/packages/babel-plugin-transform-parameters/test/fixtures/regression/4209/output.js +++ b/packages/babel-plugin-transform-parameters/test/fixtures/regression/4209/output.js @@ -2,18 +2,12 @@ var _copyPaste = require("./copyPaste"); -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - var Thing = /*#__PURE__*/function () { function Thing() { - _classCallCheck(this, Thing); + babelHelpers.classCallCheck(this, Thing); } - _createClass(Thing, [{ + babelHelpers.createClass(Thing, [{ key: "handleCopySomething", value: function handleCopySomething() { (0, _copyPaste.copy)(); @@ -24,6 +18,5 @@ var Thing = /*#__PURE__*/function () { var copy = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : 123; } }]); - return Thing; }(); diff --git a/packages/babel-plugin-transform-parameters/test/fixtures/regression/6057-expanded/output.js b/packages/babel-plugin-transform-parameters/test/fixtures/regression/6057-expanded/output.js index f847bbdd65..10575b7c5b 100644 --- a/packages/babel-plugin-transform-parameters/test/fixtures/regression/6057-expanded/output.js +++ b/packages/babel-plugin-transform-parameters/test/fixtures/regression/6057-expanded/output.js @@ -1,66 +1,37 @@ "use strict"; -function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); } - Object.defineProperty(exports, "__esModule", { value: true }); exports["default"] = void 0; -var _args = _interopRequireDefault(require("utils/url/args")); - -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } - -function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } +var _args = babelHelpers.interopRequireDefault(require("utils/url/args")); var App = /*#__PURE__*/function (_Component) { - _inherits(App, _Component); + babelHelpers.inherits(App, _Component); - var _super = _createSuper(App); + var _super = babelHelpers.createSuper(App); function App() { var _this; - _classCallCheck(this, App); + babelHelpers.classCallCheck(this, App); for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) { args[_key] = arguments[_key]; } _this = _super.call.apply(_super, [this].concat(args)); - - _defineProperty(_assertThisInitialized(_this), "exportType", ''); - + babelHelpers.defineProperty(babelHelpers.assertThisInitialized(_this), "exportType", ''); return _this; } - _createClass(App, [{ + babelHelpers.createClass(App, [{ key: "componentDidMount", value: function componentDidMount() { this.exportType = _args["default"].get('type', window.location.href); } }]); - return App; }(Component); diff --git a/packages/babel-plugin-transform-proto-to-assign/test/fixtures/proto-to-assign/options.json b/packages/babel-plugin-transform-proto-to-assign/test/fixtures/proto-to-assign/options.json index 2409be178a..a5969d9b04 100644 --- a/packages/babel-plugin-transform-proto-to-assign/test/fixtures/proto-to-assign/options.json +++ b/packages/babel-plugin-transform-proto-to-assign/test/fixtures/proto-to-assign/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "transform-proto-to-assign"] + "plugins": ["transform-proto-to-assign"] } diff --git a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/async-function/output.mjs b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/async-function/output.mjs index d5adde5959..de048cb310 100644 --- a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/async-function/output.mjs +++ b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/async-function/output.mjs @@ -1,10 +1,6 @@ -function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } - -function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } - export default { function(name) { - return _asyncToGenerator(function* () { + return babelHelpers.asyncToGenerator(function* () { const uppercasedName = name.upperCase(); // awaits depending on uppercasedName go here return ; diff --git a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/inline-elements/output.js b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/inline-elements/output.js index 488564b4a3..5be06a3e3d 100644 --- a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/inline-elements/output.js +++ b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/inline-elements/output.js @@ -1,8 +1,4 @@ -var REACT_ELEMENT_TYPE; - -function _jsx(type, props, key, children) { if (!REACT_ELEMENT_TYPE) { REACT_ELEMENT_TYPE = typeof Symbol === "function" && Symbol["for"] && Symbol["for"]("react.element") || 0xeac7; } var defaultProps = type && type.defaultProps; var childrenLength = arguments.length - 3; if (!props && childrenLength !== 0) { props = { children: void 0 }; } if (childrenLength === 1) { props.children = children; } else if (childrenLength > 1) { var childArray = new Array(childrenLength); for (var i = 0; i < childrenLength; i++) { childArray[i] = arguments[i + 3]; } props.children = childArray; } if (props && defaultProps) { for (var propName in defaultProps) { if (props[propName] === void 0) { props[propName] = defaultProps[propName]; } } } else if (!props) { props = defaultProps || {}; } return { $$typeof: REACT_ELEMENT_TYPE, type: type, key: key === undefined ? null : '' + key, ref: null, props: props, _owner: null }; } - -var _ref = /*#__PURE__*/_jsx("foo", {}); +var _ref = /*#__PURE__*/babelHelpers.jsx("foo", {}); function render() { return _ref; @@ -11,7 +7,7 @@ function render() { function render() { var text = getText(); - var _ref2 = /*#__PURE__*/_jsx("foo", {}, void 0, text); + var _ref2 = /*#__PURE__*/babelHelpers.jsx("foo", {}, void 0, text); return function () { return _ref2; diff --git a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/parameter-destructure-rest/options.json b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/parameter-destructure-rest/options.json index 01101cd37c..d8227ce265 100644 --- a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/parameter-destructure-rest/options.json +++ b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/parameter-destructure-rest/options.json @@ -4,7 +4,6 @@ "transform-parameters", "transform-spread", "transform-react-constant-elements", - "syntax-jsx", - "external-helpers" + "syntax-jsx" ] } diff --git a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/parameter-destructure-spread-deopt/options.json b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/parameter-destructure-spread-deopt/options.json index 01101cd37c..d8227ce265 100644 --- a/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/parameter-destructure-spread-deopt/options.json +++ b/packages/babel-plugin-transform-react-constant-elements/test/fixtures/constant-elements/parameter-destructure-spread-deopt/options.json @@ -4,7 +4,6 @@ "transform-parameters", "transform-spread", "transform-react-constant-elements", - "syntax-jsx", - "external-helpers" + "syntax-jsx" ] } diff --git a/packages/babel-plugin-transform-react-display-name/test/fixtures/with-jsx-plugin-automatic/options.json b/packages/babel-plugin-transform-react-display-name/test/fixtures/with-jsx-plugin-automatic/options.json index 8bbe364582..614950d0cb 100644 --- a/packages/babel-plugin-transform-react-display-name/test/fixtures/with-jsx-plugin-automatic/options.json +++ b/packages/babel-plugin-transform-react-display-name/test/fixtures/with-jsx-plugin-automatic/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", ["transform-react-jsx", { "runtime": "automatic" }], "transform-react-display-name", "transform-arrow-functions" diff --git a/packages/babel-plugin-transform-react-display-name/test/fixtures/with-jsx-plugin/options.json b/packages/babel-plugin-transform-react-display-name/test/fixtures/with-jsx-plugin/options.json index 2266a21df9..ddf597dbcb 100644 --- a/packages/babel-plugin-transform-react-display-name/test/fixtures/with-jsx-plugin/options.json +++ b/packages/babel-plugin-transform-react-display-name/test/fixtures/with-jsx-plugin/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "syntax-jsx", "transform-react-jsx", "transform-react-display-name", diff --git a/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/lowercase-member-expression/options.json b/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/lowercase-member-expression/options.json index cf2845dc2a..2c4e5ab493 100644 --- a/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/lowercase-member-expression/options.json +++ b/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/lowercase-member-expression/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "syntax-jsx", "transform-react-inline-elements", ["transform-react-jsx", { "runtime": "classic" }], diff --git a/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/member-expression/options.json b/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/member-expression/options.json index cf2845dc2a..2c4e5ab493 100644 --- a/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/member-expression/options.json +++ b/packages/babel-plugin-transform-react-inline-elements/test/fixtures/inline-elements/member-expression/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "syntax-jsx", "transform-react-inline-elements", ["transform-react-jsx", { "runtime": "classic" }], diff --git a/packages/babel-plugin-transform-react-inline-elements/test/fixtures/options.json b/packages/babel-plugin-transform-react-inline-elements/test/fixtures/options.json index 59c68d65b1..46d0501c18 100644 --- a/packages/babel-plugin-transform-react-inline-elements/test/fixtures/options.json +++ b/packages/babel-plugin-transform-react-inline-elements/test/fixtures/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "syntax-jsx", "transform-react-inline-elements", ["transform-react-jsx", { "runtime": "classic" }] diff --git a/packages/babel-plugin-transform-react-jsx-development/test/fixtures/linux/classic-runtime-babel-7/output.js b/packages/babel-plugin-transform-react-jsx-development/test/fixtures/linux/classic-runtime-babel-7/output.js index 757cd80a15..913e775b79 100644 --- a/packages/babel-plugin-transform-react-jsx-development/test/fixtures/linux/classic-runtime-babel-7/output.js +++ b/packages/babel-plugin-transform-react-jsx-development/test/fixtures/linux/classic-runtime-babel-7/output.js @@ -1,7 +1,4 @@ var _jsxFileName = "/packages/babel-plugin-transform-react-jsx-development/test/fixtures/linux/classic-runtime-babel-7/input.js"; - -function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); } - var x = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", { __self: this, __source: { @@ -34,7 +31,7 @@ var x = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/Reac lineNumber: 6, columnNumber: 9 } -}), /*#__PURE__*/React.createElement("div", _extends({}, props, { +}), /*#__PURE__*/React.createElement("div", babelHelpers.extends({}, props, { key: "4", __self: this, __source: { diff --git a/packages/babel-plugin-transform-react-jsx-development/test/fixtures/linux/options.json b/packages/babel-plugin-transform-react-jsx-development/test/fixtures/linux/options.json index 10f3a57264..a53b1492e8 100644 --- a/packages/babel-plugin-transform-react-jsx-development/test/fixtures/linux/options.json +++ b/packages/babel-plugin-transform-react-jsx-development/test/fixtures/linux/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-react-jsx-development", "transform-react-display-name", "transform-arrow-functions" diff --git a/packages/babel-plugin-transform-react-jsx-development/test/fixtures/windows/classic-runtime-windows-babel-7/output.js b/packages/babel-plugin-transform-react-jsx-development/test/fixtures/windows/classic-runtime-windows-babel-7/output.js index 6c663aa850..3a92819a06 100644 --- a/packages/babel-plugin-transform-react-jsx-development/test/fixtures/windows/classic-runtime-windows-babel-7/output.js +++ b/packages/babel-plugin-transform-react-jsx-development/test/fixtures/windows/classic-runtime-windows-babel-7/output.js @@ -1,7 +1,4 @@ var _jsxFileName = "\\packages\\babel-plugin-transform-react-jsx-development\\test\\fixtures\\windows\\classic-runtime-windows-babel-7\\input.js"; - -function _extends() { _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); } - var x = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("div", { __self: this, __source: { @@ -34,7 +31,7 @@ var x = /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/Reac lineNumber: 6, columnNumber: 7 } -}), /*#__PURE__*/React.createElement("div", _extends({}, props, { +}), /*#__PURE__*/React.createElement("div", babelHelpers.extends({}, props, { key: "4", __self: this, __source: { diff --git a/packages/babel-plugin-transform-react-jsx-development/test/fixtures/windows/options.json b/packages/babel-plugin-transform-react-jsx-development/test/fixtures/windows/options.json index 9cac84b414..b1a973d38b 100644 --- a/packages/babel-plugin-transform-react-jsx-development/test/fixtures/windows/options.json +++ b/packages/babel-plugin-transform-react-jsx-development/test/fixtures/windows/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-react-jsx-development", "transform-react-display-name", "transform-arrow-functions" diff --git a/packages/babel-plugin-transform-react-jsx/test/fixtures/autoImport/after-polyfills-compiled-to-cjs/output.js b/packages/babel-plugin-transform-react-jsx/test/fixtures/autoImport/after-polyfills-compiled-to-cjs/output.js index d6fc30116c..82219a425a 100644 --- a/packages/babel-plugin-transform-react-jsx/test/fixtures/autoImport/after-polyfills-compiled-to-cjs/output.js +++ b/packages/babel-plugin-transform-react-jsx/test/fixtures/autoImport/after-polyfills-compiled-to-cjs/output.js @@ -4,12 +4,10 @@ require("react-app-polyfill/ie11"); require("react-app-polyfill/stable"); -var _reactDom = _interopRequireDefault(require("react-dom")); +var _reactDom = babelHelpers.interopRequireDefault(require("react-dom")); var _jsxRuntime = require("react/jsx-runtime"); -function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } - // https://github.com/babel/babel/issues/12522 _reactDom.default.render( /*#__PURE__*/(0, _jsxRuntime.jsx)("p", { children: "Hello, World!" diff --git a/packages/babel-plugin-transform-react-jsx/test/fixtures/react-automatic/optimisation.react.constant-elements/options.json b/packages/babel-plugin-transform-react-jsx/test/fixtures/react-automatic/optimisation.react.constant-elements/options.json index 721403cf39..e4cd07fb3a 100644 --- a/packages/babel-plugin-transform-react-jsx/test/fixtures/react-automatic/optimisation.react.constant-elements/options.json +++ b/packages/babel-plugin-transform-react-jsx/test/fixtures/react-automatic/optimisation.react.constant-elements/options.json @@ -1,6 +1,5 @@ { "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], "transform-react-constant-elements", "transform-classes", "syntax-jsx" diff --git a/packages/babel-plugin-transform-react-jsx/test/fixtures/react-automatic/options.json b/packages/babel-plugin-transform-react-jsx/test/fixtures/react-automatic/options.json index 8bbe364582..614950d0cb 100644 --- a/packages/babel-plugin-transform-react-jsx/test/fixtures/react-automatic/options.json +++ b/packages/babel-plugin-transform-react-jsx/test/fixtures/react-automatic/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", ["transform-react-jsx", { "runtime": "automatic" }], "transform-react-display-name", "transform-arrow-functions" diff --git a/packages/babel-plugin-transform-react-jsx/test/fixtures/react/optimisation.react.constant-elements/options.json b/packages/babel-plugin-transform-react-jsx/test/fixtures/react/optimisation.react.constant-elements/options.json index 35f1579a97..e4cd07fb3a 100644 --- a/packages/babel-plugin-transform-react-jsx/test/fixtures/react/optimisation.react.constant-elements/options.json +++ b/packages/babel-plugin-transform-react-jsx/test/fixtures/react/optimisation.react.constant-elements/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "transform-react-constant-elements", "transform-classes", "syntax-jsx" diff --git a/packages/babel-plugin-transform-react-jsx/test/fixtures/react/optimisation.react.constant-elements/output.js b/packages/babel-plugin-transform-react-jsx/test/fixtures/react/optimisation.react.constant-elements/output.js index bd906ac46f..92eda2c98a 100644 --- a/packages/babel-plugin-transform-react-jsx/test/fixtures/react/optimisation.react.constant-elements/output.js +++ b/packages/babel-plugin-transform-react-jsx/test/fixtures/react/optimisation.react.constant-elements/output.js @@ -1,7 +1,3 @@ -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = babelHelpers.getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = babelHelpers.getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return babelHelpers.possibleConstructorReturn(this, result); }; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - var _ref =
@@ -13,7 +9,7 @@ let App = /*#__PURE__*/function (_React$Component) { babelHelpers.inherits(App, _React$Component); - var _super = _createSuper(App); + var _super = babelHelpers.createSuper(App); function App() { babelHelpers.classCallCheck(this, App); diff --git a/packages/babel-plugin-transform-react-jsx/test/fixtures/react/options.json b/packages/babel-plugin-transform-react-jsx/test/fixtures/react/options.json index 319425c118..d53d016721 100644 --- a/packages/babel-plugin-transform-react-jsx/test/fixtures/react/options.json +++ b/packages/babel-plugin-transform-react-jsx/test/fixtures/react/options.json @@ -1,6 +1,5 @@ { "plugins": [ - "external-helpers", "syntax-jsx", ["transform-react-jsx", { "runtime": "classic" }], "transform-arrow-functions" diff --git a/packages/babel-plugin-transform-react-jsx/test/fixtures/spread-transform/transform-to-babel-extend/options.json b/packages/babel-plugin-transform-react-jsx/test/fixtures/spread-transform/transform-to-babel-extend/options.json index 48ae14dbd7..9aa4eff540 100644 --- a/packages/babel-plugin-transform-react-jsx/test/fixtures/spread-transform/transform-to-babel-extend/options.json +++ b/packages/babel-plugin-transform-react-jsx/test/fixtures/spread-transform/transform-to-babel-extend/options.json @@ -1,7 +1,6 @@ { "plugins": [ ["transform-react-jsx", { "runtime": "classic" }], - ["proposal-object-rest-spread", { "loose": true, "useBuiltIns": false }], - "external-helpers" + ["proposal-object-rest-spread", { "loose": true, "useBuiltIns": false }] ] } diff --git a/packages/babel-plugin-transform-regenerator/test/fixtures/regression/4219/output.js b/packages/babel-plugin-transform-regenerator/test/fixtures/regression/4219/output.js index 67483b2439..8c99667077 100644 --- a/packages/babel-plugin-transform-regenerator/test/fixtures/regression/4219/output.js +++ b/packages/babel-plugin-transform-regenerator/test/fixtures/regression/4219/output.js @@ -1,9 +1,5 @@ -function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } - -function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } - function test(fn) { - return /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() { + return /*#__PURE__*/babelHelpers.asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee() { var _args = arguments; return regeneratorRuntime.wrap(function _callee$(_context) { while (1) { diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/options.json index d6180568ae..023e5c3a49 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/options.json +++ b/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/options.json @@ -1,3 +1,4 @@ { + "externalHelpers": false, "os": ["linux", "darwin"] } diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true-corejs3-proposals/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true-corejs3-proposals/options.json index 9e14f2a7c2..fa928713e9 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true-corejs3-proposals/options.json +++ b/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true-corejs3-proposals/options.json @@ -1,7 +1,10 @@ { + "externalHelpers": true, "presets": ["env"], "plugins": [ - ["transform-runtime", { "absoluteRuntime": true, "corejs": { "version": 3, "proposals": true } }], - ["external-helpers", { "helperVersion": "7.100.0" }] + [ + "transform-runtime", + { "absoluteRuntime": true, "corejs": { "version": 3, "proposals": true } } + ] ] } diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true-corejs3-stable/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true-corejs3-stable/options.json index 71281fc3d3..23b3353cda 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true-corejs3-stable/options.json +++ b/packages/babel-plugin-transform-runtime/test/fixtures/absoluteRuntime/true-corejs3-stable/options.json @@ -1,7 +1,13 @@ { + "externalHelpers": true, "presets": ["env"], "plugins": [ - ["transform-runtime", { "absoluteRuntime": true, "corejs": { "version": 3, "proposals": false } }], - ["external-helpers", { "helperVersion": "7.100.0" }] + [ + "transform-runtime", + { + "absoluteRuntime": true, + "corejs": { "version": 3, "proposals": false } + } + ] ] } diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/dual-babel-runtime/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/dual-babel-runtime/options.json index de9d8de1f5..7d62f00004 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/dual-babel-runtime/options.json +++ b/packages/babel-plugin-transform-runtime/test/fixtures/dual-babel-runtime/options.json @@ -1,3 +1,4 @@ { + "externalHelpers": false, "validateLogs": true } diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/options.json new file mode 100644 index 0000000000..8da9fa5b3d --- /dev/null +++ b/packages/babel-plugin-transform-runtime/test/fixtures/options.json @@ -0,0 +1,3 @@ +{ + "externalHelpers": false +} diff --git a/packages/babel-plugin-transform-runtime/test/fixtures/windows/absoluteRuntime/options.json b/packages/babel-plugin-transform-runtime/test/fixtures/windows/absoluteRuntime/options.json index de2d6991e3..a57b27b99e 100644 --- a/packages/babel-plugin-transform-runtime/test/fixtures/windows/absoluteRuntime/options.json +++ b/packages/babel-plugin-transform-runtime/test/fixtures/windows/absoluteRuntime/options.json @@ -1,4 +1,5 @@ { + "externalHelpers": false, "presets": [ [ "@babel/preset-env", diff --git a/packages/babel-plugin-transform-spread/test/fixtures/allowArrayLike/holes/options.json b/packages/babel-plugin-transform-spread/test/fixtures/allowArrayLike/holes/options.json index 142b51685a..4ff02052b9 100644 --- a/packages/babel-plugin-transform-spread/test/fixtures/allowArrayLike/holes/options.json +++ b/packages/babel-plugin-transform-spread/test/fixtures/allowArrayLike/holes/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - ["transform-spread", { "allowArrayLike": true }] - ] + "plugins": [["transform-spread", { "allowArrayLike": true }]] } diff --git a/packages/babel-plugin-transform-spread/test/fixtures/allowArrayLike/length-cropped/options.json b/packages/babel-plugin-transform-spread/test/fixtures/allowArrayLike/length-cropped/options.json index 142b51685a..4ff02052b9 100644 --- a/packages/babel-plugin-transform-spread/test/fixtures/allowArrayLike/length-cropped/options.json +++ b/packages/babel-plugin-transform-spread/test/fixtures/allowArrayLike/length-cropped/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - ["transform-spread", { "allowArrayLike": true }] - ] + "plugins": [["transform-spread", { "allowArrayLike": true }]] } diff --git a/packages/babel-plugin-transform-spread/test/fixtures/allowArrayLike/simple/options.json b/packages/babel-plugin-transform-spread/test/fixtures/allowArrayLike/simple/options.json index 142b51685a..4ff02052b9 100644 --- a/packages/babel-plugin-transform-spread/test/fixtures/allowArrayLike/simple/options.json +++ b/packages/babel-plugin-transform-spread/test/fixtures/allowArrayLike/simple/options.json @@ -1,6 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - ["transform-spread", { "allowArrayLike": true }] - ] + "plugins": [["transform-spread", { "allowArrayLike": true }]] } diff --git a/packages/babel-plugin-transform-spread/test/fixtures/assumption-arrayLikeIsIterable/options.json b/packages/babel-plugin-transform-spread/test/fixtures/assumption-arrayLikeIsIterable/options.json index 966d179d16..b6c2e92ddf 100644 --- a/packages/babel-plugin-transform-spread/test/fixtures/assumption-arrayLikeIsIterable/options.json +++ b/packages/babel-plugin-transform-spread/test/fixtures/assumption-arrayLikeIsIterable/options.json @@ -1,8 +1,5 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - "transform-spread" - ], + "plugins": ["transform-spread"], "assumptions": { "arrayLikeIsIterable": true } diff --git a/packages/babel-plugin-transform-spread/test/fixtures/assumption-iterableIsArray/options.json b/packages/babel-plugin-transform-spread/test/fixtures/assumption-iterableIsArray/options.json index 992778aa56..f4487fc845 100644 --- a/packages/babel-plugin-transform-spread/test/fixtures/assumption-iterableIsArray/options.json +++ b/packages/babel-plugin-transform-spread/test/fixtures/assumption-iterableIsArray/options.json @@ -1,5 +1,5 @@ { - "plugins": ["external-helpers", "transform-spread"], + "plugins": ["transform-spread"], "assumptions": { "iterableIsArray": true } diff --git a/packages/babel-plugin-transform-spread/test/fixtures/call-context/flow-type-cast/options.json b/packages/babel-plugin-transform-spread/test/fixtures/call-context/flow-type-cast/options.json index 34154ac6a6..6a167c9b5f 100644 --- a/packages/babel-plugin-transform-spread/test/fixtures/call-context/flow-type-cast/options.json +++ b/packages/babel-plugin-transform-spread/test/fixtures/call-context/flow-type-cast/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "transform-spread", "syntax-flow"] + "plugins": ["transform-spread", "syntax-flow"] } diff --git a/packages/babel-plugin-transform-spread/test/fixtures/call-context/options.json b/packages/babel-plugin-transform-spread/test/fixtures/call-context/options.json index e9f2daf0be..0b67eabb11 100644 --- a/packages/babel-plugin-transform-spread/test/fixtures/call-context/options.json +++ b/packages/babel-plugin-transform-spread/test/fixtures/call-context/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "transform-spread", "transform-parameters"] + "plugins": ["transform-spread", "transform-parameters"] } diff --git a/packages/babel-plugin-transform-spread/test/fixtures/call-context/ts-type-cast/options.json b/packages/babel-plugin-transform-spread/test/fixtures/call-context/ts-type-cast/options.json index 32fc1d8b15..41bc477438 100644 --- a/packages/babel-plugin-transform-spread/test/fixtures/call-context/ts-type-cast/options.json +++ b/packages/babel-plugin-transform-spread/test/fixtures/call-context/ts-type-cast/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "transform-spread", "syntax-typescript"] + "plugins": ["transform-spread", "syntax-typescript"] } diff --git a/packages/babel-plugin-transform-spread/test/fixtures/regression/6647/options.json b/packages/babel-plugin-transform-spread/test/fixtures/regression/6647/options.json index 000d1f70d2..aad19fca1f 100644 --- a/packages/babel-plugin-transform-spread/test/fixtures/regression/6647/options.json +++ b/packages/babel-plugin-transform-spread/test/fixtures/regression/6647/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - "external-helpers", - "transform-spread", - "transform-modules-commonjs" - ] + "plugins": ["transform-spread", "transform-modules-commonjs"] } diff --git a/packages/babel-plugin-transform-spread/test/fixtures/regression/options.json b/packages/babel-plugin-transform-spread/test/fixtures/regression/options.json index e9f2daf0be..0b67eabb11 100644 --- a/packages/babel-plugin-transform-spread/test/fixtures/regression/options.json +++ b/packages/babel-plugin-transform-spread/test/fixtures/regression/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "transform-spread", "transform-parameters"] + "plugins": ["transform-spread", "transform-parameters"] } diff --git a/packages/babel-plugin-transform-spread/test/fixtures/spread/options.json b/packages/babel-plugin-transform-spread/test/fixtures/spread/options.json index e9f2daf0be..0b67eabb11 100644 --- a/packages/babel-plugin-transform-spread/test/fixtures/spread/options.json +++ b/packages/babel-plugin-transform-spread/test/fixtures/spread/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "transform-spread", "transform-parameters"] + "plugins": ["transform-spread", "transform-parameters"] } diff --git a/packages/babel-plugin-transform-spread/test/fixtures/spread/super-classes-plugin-after/options.json b/packages/babel-plugin-transform-spread/test/fixtures/spread/super-classes-plugin-after/options.json index 1271efa290..8c9d799e2e 100644 --- a/packages/babel-plugin-transform-spread/test/fixtures/spread/super-classes-plugin-after/options.json +++ b/packages/babel-plugin-transform-spread/test/fixtures/spread/super-classes-plugin-after/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - "transform-spread", - "transform-classes" - ] + "plugins": ["transform-spread", "transform-classes"] } diff --git a/packages/babel-plugin-transform-spread/test/fixtures/spread/super-classes-plugin-before/options.json b/packages/babel-plugin-transform-spread/test/fixtures/spread/super-classes-plugin-before/options.json index b998345208..2983360e3c 100644 --- a/packages/babel-plugin-transform-spread/test/fixtures/spread/super-classes-plugin-before/options.json +++ b/packages/babel-plugin-transform-spread/test/fixtures/spread/super-classes-plugin-before/options.json @@ -1,7 +1,3 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - "transform-classes", - "transform-spread" - ] + "plugins": ["transform-classes", "transform-spread"] } diff --git a/packages/babel-plugin-transform-spread/test/fixtures/spread/super-no-classes-plugin/options.json b/packages/babel-plugin-transform-spread/test/fixtures/spread/super-no-classes-plugin/options.json index 9286e543ef..ff36802195 100644 --- a/packages/babel-plugin-transform-spread/test/fixtures/spread/super-no-classes-plugin/options.json +++ b/packages/babel-plugin-transform-spread/test/fixtures/spread/super-no-classes-plugin/options.json @@ -1,7 +1,4 @@ { - "plugins": [ - ["external-helpers", { "helperVersion": "7.100.0" }], - "transform-spread" - ], + "plugins": ["transform-spread"], "throws": "It's not possible to compile spread arguments in `super()` without compiling classes." } diff --git a/packages/babel-plugin-transform-template-literals/test/fixtures/assumption-ignoreToPrimitiveHint/tag/output.js b/packages/babel-plugin-transform-template-literals/test/fixtures/assumption-ignoreToPrimitiveHint/tag/output.js index d2bd91618a..3066462b89 100644 --- a/packages/babel-plugin-transform-template-literals/test/fixtures/assumption-ignoreToPrimitiveHint/tag/output.js +++ b/packages/babel-plugin-transform-template-literals/test/fixtures/assumption-ignoreToPrimitiveHint/tag/output.js @@ -1,5 +1,3 @@ var _templateObject; -function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); } - -tag(_templateObject || (_templateObject = _taggedTemplateLiteral(["foo ", " baz"])), bar); +tag(_templateObject || (_templateObject = babelHelpers.taggedTemplateLiteral(["foo ", " baz"])), bar); diff --git a/packages/babel-plugin-transform-template-literals/test/fixtures/assumption-mutableTemplateObject/tag/output.js b/packages/babel-plugin-transform-template-literals/test/fixtures/assumption-mutableTemplateObject/tag/output.js index c0c2e762df..caaa852a09 100644 --- a/packages/babel-plugin-transform-template-literals/test/fixtures/assumption-mutableTemplateObject/tag/output.js +++ b/packages/babel-plugin-transform-template-literals/test/fixtures/assumption-mutableTemplateObject/tag/output.js @@ -1,7 +1,5 @@ var _templateObject, _templateObject2, _templateObject3; -function _taggedTemplateLiteralLoose(strings, raw) { if (!raw) { raw = strings.slice(0); } strings.raw = raw; return strings; } - -var foo = bar(_templateObject || (_templateObject = _taggedTemplateLiteralLoose(["wow\na", "b ", ""], ["wow\\na", "b ", ""])), 42, _.foobar()); -var bar = bar(_templateObject2 || (_templateObject2 = _taggedTemplateLiteralLoose(["wow\nab", " ", ""], ["wow\\nab", " ", ""])), 42, _.foobar()); -var bar = bar(_templateObject3 || (_templateObject3 = _taggedTemplateLiteralLoose(["wow\naB", " ", ""], ["wow\\naB", " ", ""])), 42, _.baz()); +var foo = bar(_templateObject || (_templateObject = babelHelpers.taggedTemplateLiteralLoose(["wow\na", "b ", ""], ["wow\\na", "b ", ""])), 42, _.foobar()); +var bar = bar(_templateObject2 || (_templateObject2 = babelHelpers.taggedTemplateLiteralLoose(["wow\nab", " ", ""], ["wow\\nab", " ", ""])), 42, _.foobar()); +var bar = bar(_templateObject3 || (_templateObject3 = babelHelpers.taggedTemplateLiteralLoose(["wow\naB", " ", ""], ["wow\\naB", " ", ""])), 42, _.baz()); diff --git a/packages/babel-plugin-transform-template-literals/test/fixtures/assumption-mutableTemplateObject/template-revision/output.js b/packages/babel-plugin-transform-template-literals/test/fixtures/assumption-mutableTemplateObject/template-revision/output.js index cc2999ada6..489fe3ef13 100644 --- a/packages/babel-plugin-transform-template-literals/test/fixtures/assumption-mutableTemplateObject/template-revision/output.js +++ b/packages/babel-plugin-transform-template-literals/test/fixtures/assumption-mutableTemplateObject/template-revision/output.js @@ -1,16 +1,14 @@ var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8; -function _taggedTemplateLiteralLoose(strings, raw) { if (!raw) { raw = strings.slice(0); } strings.raw = raw; return strings; } - -tag(_templateObject || (_templateObject = _taggedTemplateLiteralLoose([void 0], ["\\unicode and \\u{55}"]))); -tag(_templateObject2 || (_templateObject2 = _taggedTemplateLiteralLoose([void 0], ["\\01"]))); -tag(_templateObject3 || (_templateObject3 = _taggedTemplateLiteralLoose([void 0, "right"], ["\\xg", "right"])), 0); -tag(_templateObject4 || (_templateObject4 = _taggedTemplateLiteralLoose(["left", void 0], ["left", "\\xg"])), 0); -tag(_templateObject5 || (_templateObject5 = _taggedTemplateLiteralLoose(["left", void 0, "right"], ["left", "\\xg", "right"])), 0, 1); -tag(_templateObject6 || (_templateObject6 = _taggedTemplateLiteralLoose(["left", void 0, "right"], ["left", "\\u000g", "right"])), 0, 1); -tag(_templateObject7 || (_templateObject7 = _taggedTemplateLiteralLoose(["left", void 0, "right"], ["left", "\\u{-0}", "right"])), 0, 1); +tag(_templateObject || (_templateObject = babelHelpers.taggedTemplateLiteralLoose([void 0], ["\\unicode and \\u{55}"]))); +tag(_templateObject2 || (_templateObject2 = babelHelpers.taggedTemplateLiteralLoose([void 0], ["\\01"]))); +tag(_templateObject3 || (_templateObject3 = babelHelpers.taggedTemplateLiteralLoose([void 0, "right"], ["\\xg", "right"])), 0); +tag(_templateObject4 || (_templateObject4 = babelHelpers.taggedTemplateLiteralLoose(["left", void 0], ["left", "\\xg"])), 0); +tag(_templateObject5 || (_templateObject5 = babelHelpers.taggedTemplateLiteralLoose(["left", void 0, "right"], ["left", "\\xg", "right"])), 0, 1); +tag(_templateObject6 || (_templateObject6 = babelHelpers.taggedTemplateLiteralLoose(["left", void 0, "right"], ["left", "\\u000g", "right"])), 0, 1); +tag(_templateObject7 || (_templateObject7 = babelHelpers.taggedTemplateLiteralLoose(["left", void 0, "right"], ["left", "\\u{-0}", "right"])), 0, 1); function a() { var undefined = 4; - tag(_templateObject8 || (_templateObject8 = _taggedTemplateLiteralLoose([void 0], ["\\01"]))); + tag(_templateObject8 || (_templateObject8 = babelHelpers.taggedTemplateLiteralLoose([void 0], ["\\01"]))); } diff --git a/packages/babel-plugin-transform-template-literals/test/fixtures/default/cache-revision/output.js b/packages/babel-plugin-transform-template-literals/test/fixtures/default/cache-revision/output.js index 391209700a..076a1c523c 100644 --- a/packages/babel-plugin-transform-template-literals/test/fixtures/default/cache-revision/output.js +++ b/packages/babel-plugin-transform-template-literals/test/fixtures/default/cache-revision/output.js @@ -1,15 +1,13 @@ var _templateObject, _templateObject2; -function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); } - var tag = v => v; function foo() { - return tag(_templateObject || (_templateObject = _taggedTemplateLiteral(["some template"]))); + return tag(_templateObject || (_templateObject = babelHelpers.taggedTemplateLiteral(["some template"]))); } function bar() { - return tag(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["some template"]))); + return tag(_templateObject2 || (_templateObject2 = babelHelpers.taggedTemplateLiteral(["some template"]))); } expect(foo()).toBe(foo()); diff --git a/packages/babel-plugin-transform-template-literals/test/fixtures/default/simple-tag/output.js b/packages/babel-plugin-transform-template-literals/test/fixtures/default/simple-tag/output.js index cb92478b58..07aef260c4 100644 --- a/packages/babel-plugin-transform-template-literals/test/fixtures/default/simple-tag/output.js +++ b/packages/babel-plugin-transform-template-literals/test/fixtures/default/simple-tag/output.js @@ -1,6 +1,4 @@ var _templateObject, _templateObject2; -function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); } - -var foo = tag(_templateObject || (_templateObject = _taggedTemplateLiteral(["wow"]))); -var bar = tag(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["first", "second"])), 1); +var foo = tag(_templateObject || (_templateObject = babelHelpers.taggedTemplateLiteral(["wow"]))); +var bar = tag(_templateObject2 || (_templateObject2 = babelHelpers.taggedTemplateLiteral(["first", "second"])), 1); diff --git a/packages/babel-plugin-transform-template-literals/test/fixtures/default/tag-with-unicode-escapes-babel-7/output.js b/packages/babel-plugin-transform-template-literals/test/fixtures/default/tag-with-unicode-escapes-babel-7/output.js index 84eb40577d..d2313b2b42 100644 --- a/packages/babel-plugin-transform-template-literals/test/fixtures/default/tag-with-unicode-escapes-babel-7/output.js +++ b/packages/babel-plugin-transform-template-literals/test/fixtures/default/tag-with-unicode-escapes-babel-7/output.js @@ -1,5 +1,3 @@ var _templateObject; -function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); } - -var foo = bar(_templateObject || (_templateObject = _taggedTemplateLiteral(["aa\uD835\uDC9C\uD835\uDC9C"], ["\\u0061\\u{0061}\\ud835\\udc9c\\u{1d49c}"]))); +var foo = bar(_templateObject || (_templateObject = babelHelpers.taggedTemplateLiteral(["aa\uD835\uDC9C\uD835\uDC9C"], ["\\u0061\\u{0061}\\ud835\\udc9c\\u{1d49c}"]))); diff --git a/packages/babel-plugin-transform-template-literals/test/fixtures/default/tag-with-unicode-escapes/output.js b/packages/babel-plugin-transform-template-literals/test/fixtures/default/tag-with-unicode-escapes/output.js index 5c3b289ffc..e9e90f008e 100644 --- a/packages/babel-plugin-transform-template-literals/test/fixtures/default/tag-with-unicode-escapes/output.js +++ b/packages/babel-plugin-transform-template-literals/test/fixtures/default/tag-with-unicode-escapes/output.js @@ -1,5 +1,3 @@ var _templateObject; -function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); } - -var foo = bar(_templateObject || (_templateObject = _taggedTemplateLiteral(["aa𝒜𝒜"], ["\\u0061\\u{0061}\\ud835\\udc9c\\u{1d49c}"]))); +var foo = bar(_templateObject || (_templateObject = babelHelpers.taggedTemplateLiteral(["aa𝒜𝒜"], ["\\u0061\\u{0061}\\ud835\\udc9c\\u{1d49c}"]))); diff --git a/packages/babel-plugin-transform-template-literals/test/fixtures/default/tag/output.js b/packages/babel-plugin-transform-template-literals/test/fixtures/default/tag/output.js index 726c446db7..0e1b30ba5a 100644 --- a/packages/babel-plugin-transform-template-literals/test/fixtures/default/tag/output.js +++ b/packages/babel-plugin-transform-template-literals/test/fixtures/default/tag/output.js @@ -1,7 +1,5 @@ var _templateObject, _templateObject2, _templateObject3; -function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); } - -var foo = bar(_templateObject || (_templateObject = _taggedTemplateLiteral(["wow\na", "b ", ""], ["wow\\na", "b ", ""])), 42, _.foobar()); -var bar = bar(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["wow\nab", " ", ""], ["wow\\nab", " ", ""])), 42, _.foobar()); -var bar = bar(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["wow\naB", " ", ""], ["wow\\naB", " ", ""])), 42, _.baz()); +var foo = bar(_templateObject || (_templateObject = babelHelpers.taggedTemplateLiteral(["wow\na", "b ", ""], ["wow\\na", "b ", ""])), 42, _.foobar()); +var bar = bar(_templateObject2 || (_templateObject2 = babelHelpers.taggedTemplateLiteral(["wow\nab", " ", ""], ["wow\\nab", " ", ""])), 42, _.foobar()); +var bar = bar(_templateObject3 || (_templateObject3 = babelHelpers.taggedTemplateLiteral(["wow\naB", " ", ""], ["wow\\naB", " ", ""])), 42, _.baz()); diff --git a/packages/babel-plugin-transform-template-literals/test/fixtures/default/template-revision/output.js b/packages/babel-plugin-transform-template-literals/test/fixtures/default/template-revision/output.js index 63b4c97c39..58dd70d5a3 100644 --- a/packages/babel-plugin-transform-template-literals/test/fixtures/default/template-revision/output.js +++ b/packages/babel-plugin-transform-template-literals/test/fixtures/default/template-revision/output.js @@ -1,16 +1,14 @@ var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5, _templateObject6, _templateObject7, _templateObject8; -function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); } - -tag(_templateObject || (_templateObject = _taggedTemplateLiteral([void 0], ["\\unicode and \\u{55}"]))); -tag(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral([void 0], ["\\01"]))); -tag(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral([void 0, "right"], ["\\xg", "right"])), 0); -tag(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["left", void 0], ["left", "\\xg"])), 0); -tag(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["left", void 0, "right"], ["left", "\\xg", "right"])), 0, 1); -tag(_templateObject6 || (_templateObject6 = _taggedTemplateLiteral(["left", void 0, "right"], ["left", "\\u000g", "right"])), 0, 1); -tag(_templateObject7 || (_templateObject7 = _taggedTemplateLiteral(["left", void 0, "right"], ["left", "\\u{-0}", "right"])), 0, 1); +tag(_templateObject || (_templateObject = babelHelpers.taggedTemplateLiteral([void 0], ["\\unicode and \\u{55}"]))); +tag(_templateObject2 || (_templateObject2 = babelHelpers.taggedTemplateLiteral([void 0], ["\\01"]))); +tag(_templateObject3 || (_templateObject3 = babelHelpers.taggedTemplateLiteral([void 0, "right"], ["\\xg", "right"])), 0); +tag(_templateObject4 || (_templateObject4 = babelHelpers.taggedTemplateLiteral(["left", void 0], ["left", "\\xg"])), 0); +tag(_templateObject5 || (_templateObject5 = babelHelpers.taggedTemplateLiteral(["left", void 0, "right"], ["left", "\\xg", "right"])), 0, 1); +tag(_templateObject6 || (_templateObject6 = babelHelpers.taggedTemplateLiteral(["left", void 0, "right"], ["left", "\\u000g", "right"])), 0, 1); +tag(_templateObject7 || (_templateObject7 = babelHelpers.taggedTemplateLiteral(["left", void 0, "right"], ["left", "\\u{-0}", "right"])), 0, 1); function a() { var undefined = 4; - tag(_templateObject8 || (_templateObject8 = _taggedTemplateLiteral([void 0], ["\\01"]))); + tag(_templateObject8 || (_templateObject8 = babelHelpers.taggedTemplateLiteral([void 0], ["\\01"]))); } diff --git a/packages/babel-plugin-transform-template-literals/test/fixtures/loose/mutableTemplateObject/output.js b/packages/babel-plugin-transform-template-literals/test/fixtures/loose/mutableTemplateObject/output.js index 195dbdc464..1441a54e8b 100644 --- a/packages/babel-plugin-transform-template-literals/test/fixtures/loose/mutableTemplateObject/output.js +++ b/packages/babel-plugin-transform-template-literals/test/fixtures/loose/mutableTemplateObject/output.js @@ -1,5 +1,3 @@ var _templateObject; -function _taggedTemplateLiteralLoose(strings, raw) { if (!raw) { raw = strings.slice(0); } strings.raw = raw; return strings; } - -var o = tag(_templateObject || (_templateObject = _taggedTemplateLiteralLoose(["foo ", " baz"])), bar); +var o = tag(_templateObject || (_templateObject = babelHelpers.taggedTemplateLiteralLoose(["foo ", " baz"])), bar); diff --git a/packages/babel-plugin-transform-typeof-symbol/test/fixtures/symbols/builtin-global/output.mjs b/packages/babel-plugin-transform-typeof-symbol/test/fixtures/symbols/builtin-global/output.mjs index 35e7d5e1f7..fcc930381a 100644 --- a/packages/babel-plugin-transform-typeof-symbol/test/fixtures/symbols/builtin-global/output.mjs +++ b/packages/babel-plugin-transform-typeof-symbol/test/fixtures/symbols/builtin-global/output.mjs @@ -1,3 +1 @@ -function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function (obj) { return typeof obj; }; } else { _typeof = function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); } - -(typeof Reflect === "undefined" ? "undefined" : _typeof(Reflect)) === "object"; +(typeof Reflect === "undefined" ? "undefined" : babelHelpers.typeof(Reflect)) === "object"; diff --git a/packages/babel-plugin-transform-typeof-symbol/test/fixtures/symbols/default-export/output.mjs b/packages/babel-plugin-transform-typeof-symbol/test/fixtures/symbols/default-export/output.mjs index 5db84a8c49..5d90b34ba7 100644 --- a/packages/babel-plugin-transform-typeof-symbol/test/fixtures/symbols/default-export/output.mjs +++ b/packages/babel-plugin-transform-typeof-symbol/test/fixtures/symbols/default-export/output.mjs @@ -1,5 +1,3 @@ -function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function (obj) { return typeof obj; }; } else { _typeof = function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); } - export default function () { - _typeof({}) === "object"; + babelHelpers.typeof({}) === "object"; } diff --git a/packages/babel-plugin-transform-typeof-symbol/test/fixtures/symbols/shadow/output.js b/packages/babel-plugin-transform-typeof-symbol/test/fixtures/symbols/shadow/output.js index 05b5e74359..a482517098 100644 --- a/packages/babel-plugin-transform-typeof-symbol/test/fixtures/symbols/shadow/output.js +++ b/packages/babel-plugin-transform-typeof-symbol/test/fixtures/symbols/shadow/output.js @@ -1,6 +1,4 @@ -function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function (obj) { return typeof obj; }; } else { _typeof = function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); } - var _Symbol = foo(); -typeof s === "undefined" ? "undefined" : _typeof(s); +typeof s === "undefined" ? "undefined" : babelHelpers.typeof(s); foo(_Symbol); diff --git a/packages/babel-plugin-transform-typeof-symbol/test/fixtures/symbols/typeof/options.json b/packages/babel-plugin-transform-typeof-symbol/test/fixtures/symbols/typeof/options.json index 437d1f420d..5730916af9 100644 --- a/packages/babel-plugin-transform-typeof-symbol/test/fixtures/symbols/typeof/options.json +++ b/packages/babel-plugin-transform-typeof-symbol/test/fixtures/symbols/typeof/options.json @@ -1,3 +1,3 @@ { - "plugins": ["external-helpers", "transform-typeof-symbol"] + "plugins": ["transform-typeof-symbol"] } diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-method/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-method/output.mjs index ab375fbe48..33011d8f57 100644 --- a/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-method/output.mjs +++ b/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-method/output.mjs @@ -1,9 +1,7 @@ var _class; -function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; } - import { computed } from 'mobx'; let Foo = (_class = class Foo { get id() {} -}, (_applyDecoratedDescriptor(_class.prototype, "id", [computed], Object.getOwnPropertyDescriptor(_class.prototype, "id"), _class.prototype)), _class); +}, (babelHelpers.applyDecoratedDescriptor(_class.prototype, "id", [computed], Object.getOwnPropertyDescriptor(_class.prototype, "id"), _class.prototype)), _class); diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-parameter/output.mjs b/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-parameter/output.mjs index 58aa80d516..5222e0e0d3 100644 --- a/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-parameter/output.mjs +++ b/packages/babel-plugin-transform-typescript/test/fixtures/class/abstract-class-decorated-parameter/output.mjs @@ -1,13 +1,9 @@ var _class, _descriptor; -function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; } - -function _initializerWarningHelper(descriptor, context) { throw new Error('Decorating class property failed. Please ensure that ' + 'proposal-class-properties is enabled and runs after the decorators transform.'); } - import { observable } from 'mobx'; let Foo = (_class = class Foo { - id = _initializerWarningHelper(_descriptor, this); -}, (_descriptor = _applyDecoratedDescriptor(_class.prototype, "id", [observable], { + id = babelHelpers.initializerWarningHelper(_descriptor, this); +}, (_descriptor = babelHelpers.applyDecoratedDescriptor(_class.prototype, "id", [observable], { configurable: true, enumerable: true, writable: true, diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/decorated-declare-properties/output.js b/packages/babel-plugin-transform-typescript/test/fixtures/class/decorated-declare-properties/output.js index f0e0fb4d9f..2fe46d31a1 100644 --- a/packages/babel-plugin-transform-typescript/test/fixtures/class/decorated-declare-properties/output.js +++ b/packages/babel-plugin-transform-typescript/test/fixtures/class/decorated-declare-properties/output.js @@ -1,19 +1,11 @@ var _class, _descriptor, _temp; -function _initializerDefineProperty(target, property, descriptor, context) { if (!descriptor) return; Object.defineProperty(target, property, { enumerable: descriptor.enumerable, configurable: descriptor.configurable, writable: descriptor.writable, value: descriptor.initializer ? descriptor.initializer.call(context) : void 0 }); } - -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -function _applyDecoratedDescriptor(target, property, decorators, descriptor, context) { var desc = {}; Object.keys(descriptor).forEach(function (key) { desc[key] = descriptor[key]; }); desc.enumerable = !!desc.enumerable; desc.configurable = !!desc.configurable; if ('value' in desc || desc.initializer) { desc.writable = true; } desc = decorators.slice().reverse().reduce(function (desc, decorator) { return decorator(target, property, desc) || desc; }, desc); if (context && desc.initializer !== void 0) { desc.value = desc.initializer ? desc.initializer.call(context) : void 0; desc.initializer = undefined; } if (desc.initializer === void 0) { Object.defineProperty(target, property, desc); desc = null; } return desc; } - -function _initializerWarningHelper(descriptor, context) { throw new Error('Decorating class property failed. Please ensure that ' + 'proposal-class-properties is enabled and runs after the decorators transform.'); } - let Foo = (_class = (_temp = class Foo { constructor() { - _initializerDefineProperty(this, "bar", _descriptor, this); + babelHelpers.initializerDefineProperty(this, "bar", _descriptor, this); } -}, _temp), (_descriptor = _applyDecoratedDescriptor(_class.prototype, "bar", [decorator], { +}, _temp), (_descriptor = babelHelpers.applyDecoratedDescriptor(_class.prototype, "bar", [decorator], { configurable: true, enumerable: true, writable: true, diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-class-and-super/output.js b/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-class-and-super/output.js index 1834d5d884..0acfdba31f 100644 --- a/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-class-and-super/output.js +++ b/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-class-and-super/output.js @@ -1,31 +1,14 @@ -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (typeof call === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - let Employee = /*#__PURE__*/function (_Person) { "use strict"; - _inherits(Employee, _Person); + babelHelpers.inherits(Employee, _Person); - var _super = _createSuper(Employee); + var _super = babelHelpers.createSuper(Employee); function Employee(name) { var _this; - _classCallCheck(this, Employee); - + babelHelpers.classCallCheck(this, Employee); _this = _super.call(this); _this.name = name; return _this; diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-class/output.js b/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-class/output.js index 51dac97b4e..df14bf7dab 100644 --- a/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-class/output.js +++ b/packages/babel-plugin-transform-typescript/test/fixtures/class/parameter-properties-with-class/output.js @@ -1,11 +1,8 @@ -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - let Person = /*#__PURE__*/function () { "use strict"; function Person(name) { - _classCallCheck(this, Person); - + babelHelpers.classCallCheck(this, Person); this.name = name; } diff --git a/packages/babel-plugin-transform-typescript/test/fixtures/regression/11061/output.js b/packages/babel-plugin-transform-typescript/test/fixtures/regression/11061/output.js index 7582ed08e3..fa183150a0 100644 --- a/packages/babel-plugin-transform-typescript/test/fixtures/regression/11061/output.js +++ b/packages/babel-plugin-transform-typescript/test/fixtures/regression/11061/output.js @@ -7,11 +7,8 @@ exports.Something = void 0; var _firebaseAdmin = require("firebase-admin"); -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - let Something = function Something(messaging) { - _classCallCheck(this, Something); - + babelHelpers.classCallCheck(this, Something); this.messaging = messaging; }; diff --git a/packages/babel-plugin-transform-unicode-escapes/test/fixtures/unicode-escapes/tagged-template-transformed/output.js b/packages/babel-plugin-transform-unicode-escapes/test/fixtures/unicode-escapes/tagged-template-transformed/output.js index 7dc1fc8000..8c5ea2197e 100644 --- a/packages/babel-plugin-transform-unicode-escapes/test/fixtures/unicode-escapes/tagged-template-transformed/output.js +++ b/packages/babel-plugin-transform-unicode-escapes/test/fixtures/unicode-escapes/tagged-template-transformed/output.js @@ -1,9 +1,7 @@ var _templateObject, _templateObject2, _templateObject3, _templateObject4, _templateObject5; -function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); } - -test(_templateObject || (_templateObject = _taggedTemplateLiteral(["\uD835\uDC9C\uD835\uDC9C\uD835\uDC9C"], ["\uD835\uDC9C\\ud835\\udc9c\\u{1d49c}"]))); -test(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\uD835\uDC9C"], ["\\u{1d49c}"]))); -test(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\\u{1d49c}"], ["\\\\u{1d49c}"]))); -test(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\\\uD835\uDC9C"], ["\\\\\\u{1d49c}"]))); -test(_templateObject5 || (_templateObject5 = _taggedTemplateLiteral(["\\\\u{1d49c}"], ["\\\\\\\\u{1d49c}"]))); +test(_templateObject || (_templateObject = babelHelpers.taggedTemplateLiteral(["\uD835\uDC9C\uD835\uDC9C\uD835\uDC9C"], ["\uD835\uDC9C\\ud835\\udc9c\\u{1d49c}"]))); +test(_templateObject2 || (_templateObject2 = babelHelpers.taggedTemplateLiteral(["\uD835\uDC9C"], ["\\u{1d49c}"]))); +test(_templateObject3 || (_templateObject3 = babelHelpers.taggedTemplateLiteral(["\\u{1d49c}"], ["\\\\u{1d49c}"]))); +test(_templateObject4 || (_templateObject4 = babelHelpers.taggedTemplateLiteral(["\\\uD835\uDC9C"], ["\\\\\\u{1d49c}"]))); +test(_templateObject5 || (_templateObject5 = babelHelpers.taggedTemplateLiteral(["\\\\u{1d49c}"], ["\\\\\\\\u{1d49c}"]))); diff --git a/packages/babel-preset-env/test/fixtures/corejs2/entry-shippedProposals/options.json b/packages/babel-preset-env/test/fixtures/corejs2/entry-shippedProposals/options.json index 74afdd7619..6edc0aaa56 100644 --- a/packages/babel-preset-env/test/fixtures/corejs2/entry-shippedProposals/options.json +++ b/packages/babel-preset-env/test/fixtures/corejs2/entry-shippedProposals/options.json @@ -1,4 +1,5 @@ { + "externalHelpers": true, "presets": [ [ "../../../../lib", @@ -9,6 +10,5 @@ "corejs": 2 } ] - ], - "plugins": [["external-helpers", { "helperVersion": "7.100.0" }]] + ] } diff --git a/packages/babel-preset-env/test/fixtures/corejs2/options.json b/packages/babel-preset-env/test/fixtures/corejs2/options.json new file mode 100644 index 0000000000..8da9fa5b3d --- /dev/null +++ b/packages/babel-preset-env/test/fixtures/corejs2/options.json @@ -0,0 +1,3 @@ +{ + "externalHelpers": false +} diff --git a/packages/babel-preset-env/test/fixtures/corejs3/options.json b/packages/babel-preset-env/test/fixtures/corejs3/options.json new file mode 100644 index 0000000000..8da9fa5b3d --- /dev/null +++ b/packages/babel-preset-env/test/fixtures/corejs3/options.json @@ -0,0 +1,3 @@ +{ + "externalHelpers": false +} diff --git a/packages/babel-preset-env/test/fixtures/dynamic-import/options.json b/packages/babel-preset-env/test/fixtures/dynamic-import/options.json deleted file mode 100644 index 83dae6963a..0000000000 --- a/packages/babel-preset-env/test/fixtures/dynamic-import/options.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "plugins": [["external-helpers", { "helperVersion": "7.100" }]] -} diff --git a/packages/babel-preset-env/test/fixtures/export-namespace-from/options.json b/packages/babel-preset-env/test/fixtures/export-namespace-from/options.json deleted file mode 100644 index 83dae6963a..0000000000 --- a/packages/babel-preset-env/test/fixtures/export-namespace-from/options.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "plugins": [["external-helpers", { "helperVersion": "7.100" }]] -} diff --git a/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/methods-loose-preset-not-loose/output.js b/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/methods-loose-preset-not-loose/output.js index ec1282b425..4baaa28201 100644 --- a/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/methods-loose-preset-not-loose/output.js +++ b/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/methods-loose-preset-not-loose/output.js @@ -1,8 +1,4 @@ -var id = 0; - -function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; } - -var _foo = _classPrivateFieldLooseKey("foo"); +var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); class A { constructor() { diff --git a/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/preset-loose-no-plugins/output.js b/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/preset-loose-no-plugins/output.js index ec1282b425..4baaa28201 100644 --- a/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/preset-loose-no-plugins/output.js +++ b/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/preset-loose-no-plugins/output.js @@ -1,8 +1,4 @@ -var id = 0; - -function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; } - -var _foo = _classPrivateFieldLooseKey("foo"); +var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); class A { constructor() { diff --git a/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/preset-not-loose-no-plugins/output.js b/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/preset-not-loose-no-plugins/output.js index 97d788f68d..d5242cc50c 100644 --- a/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/preset-not-loose-no-plugins/output.js +++ b/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/preset-not-loose-no-plugins/output.js @@ -1,12 +1,10 @@ -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - var _foo = new WeakSet(); class A { constructor() { _foo.add(this); - _defineProperty(this, "x", 2); + babelHelpers.defineProperty(this, "x", 2); } } diff --git a/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/properties-and-methods-loose-preset-not-loose/output.js b/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/properties-and-methods-loose-preset-not-loose/output.js index ec1282b425..4baaa28201 100644 --- a/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/properties-and-methods-loose-preset-not-loose/output.js +++ b/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/properties-and-methods-loose-preset-not-loose/output.js @@ -1,8 +1,4 @@ -var id = 0; - -function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; } - -var _foo = _classPrivateFieldLooseKey("foo"); +var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); class A { constructor() { diff --git a/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/properties-and-methods-not-loose-preset-loose/output.js b/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/properties-and-methods-not-loose-preset-loose/output.js index 97d788f68d..d5242cc50c 100644 --- a/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/properties-and-methods-not-loose-preset-loose/output.js +++ b/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/properties-and-methods-not-loose-preset-loose/output.js @@ -1,12 +1,10 @@ -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - var _foo = new WeakSet(); class A { constructor() { _foo.add(this); - _defineProperty(this, "x", 2); + babelHelpers.defineProperty(this, "x", 2); } } diff --git a/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/properties-loose-preset-loose/output.js b/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/properties-loose-preset-loose/output.js index ec1282b425..4baaa28201 100644 --- a/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/properties-loose-preset-loose/output.js +++ b/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/properties-loose-preset-loose/output.js @@ -1,8 +1,4 @@ -var id = 0; - -function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; } - -var _foo = _classPrivateFieldLooseKey("foo"); +var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); class A { constructor() { diff --git a/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/properties-loose-preset-not-loose/output.js b/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/properties-loose-preset-not-loose/output.js index ec1282b425..4baaa28201 100644 --- a/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/properties-loose-preset-not-loose/output.js +++ b/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/properties-loose-preset-not-loose/output.js @@ -1,8 +1,4 @@ -var id = 0; - -function _classPrivateFieldLooseKey(name) { return "__private_" + id++ + "_" + name; } - -var _foo = _classPrivateFieldLooseKey("foo"); +var _foo = babelHelpers.classPrivateFieldLooseKey("foo"); class A { constructor() { diff --git a/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/properties-not-loose-preset-loose/output.js b/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/properties-not-loose-preset-loose/output.js index 97d788f68d..d5242cc50c 100644 --- a/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/properties-not-loose-preset-loose/output.js +++ b/packages/babel-preset-env/test/fixtures/loose-class-features-precedence/properties-not-loose-preset-loose/output.js @@ -1,12 +1,10 @@ -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - var _foo = new WeakSet(); class A { constructor() { _foo.add(this); - _defineProperty(this, "x", 2); + babelHelpers.defineProperty(this, "x", 2); } } diff --git a/packages/babel-preset-env/test/fixtures/modules/options.json b/packages/babel-preset-env/test/fixtures/modules/options.json deleted file mode 100644 index 83dae6963a..0000000000 --- a/packages/babel-preset-env/test/fixtures/modules/options.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "plugins": [["external-helpers", { "helperVersion": "7.100" }]] -} diff --git a/packages/babel-preset-env/test/fixtures/plugins-integration/issue-10662/output.js b/packages/babel-preset-env/test/fixtures/plugins-integration/issue-10662/output.js index 8f9250faa0..2d570317c1 100644 --- a/packages/babel-preset-env/test/fixtures/plugins-integration/issue-10662/output.js +++ b/packages/babel-preset-env/test/fixtures/plugins-integration/issue-10662/output.js @@ -13,9 +13,6 @@ })(typeof globalThis !== "undefined" ? globalThis : typeof self !== "undefined" ? self : this, function () { "use strict"; - function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); } - var globalThis = {}; - - _typeof(globalThis); + babelHelpers.typeof(globalThis); }); diff --git a/packages/babel-preset-env/test/fixtures/plugins-integration/issue-11278/options.json b/packages/babel-preset-env/test/fixtures/plugins-integration/issue-11278/options.json index c2c1dcf030..66a690b12a 100644 --- a/packages/babel-preset-env/test/fixtures/plugins-integration/issue-11278/options.json +++ b/packages/babel-preset-env/test/fixtures/plugins-integration/issue-11278/options.json @@ -6,6 +6,5 @@ "targets": ["chrome 48"] } ] - ], - "plugins": ["external-helpers"] + ] } diff --git a/packages/babel-preset-env/test/fixtures/plugins-integration/issue-7527/output.js b/packages/babel-preset-env/test/fixtures/plugins-integration/issue-7527/output.js index 1f31f4595d..556eb71da3 100644 --- a/packages/babel-preset-env/test/fixtures/plugins-integration/issue-7527/output.js +++ b/packages/babel-preset-env/test/fixtures/plugins-integration/issue-7527/output.js @@ -1,41 +1,16 @@ "use strict"; -function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); } - -function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } } - -function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); } - -function _createSuper(Derived) { var hasNativeReflectConstruct = _isNativeReflectConstruct(); return function _createSuperInternal() { var Super = _getPrototypeOf(Derived), result; if (hasNativeReflectConstruct) { var NewTarget = _getPrototypeOf(this).constructor; result = Reflect.construct(Super, arguments, NewTarget); } else { result = Super.apply(this, arguments); } return _possibleConstructorReturn(this, result); }; } - -function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); } - -function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; } - -function _wrapNativeSuper(Class) { var _cache = typeof Map === "function" ? new Map() : undefined; _wrapNativeSuper = function _wrapNativeSuper(Class) { if (Class === null || !_isNativeFunction(Class)) return Class; if (typeof Class !== "function") { throw new TypeError("Super expression must either be null or a function"); } if (typeof _cache !== "undefined") { if (_cache.has(Class)) return _cache.get(Class); _cache.set(Class, Wrapper); } function Wrapper() { return _construct(Class, arguments, _getPrototypeOf(this).constructor); } Wrapper.prototype = Object.create(Class.prototype, { constructor: { value: Wrapper, enumerable: false, writable: true, configurable: true } }); return _setPrototypeOf(Wrapper, Class); }; return _wrapNativeSuper(Class); } - -function _construct(Parent, args, Class) { if (_isNativeReflectConstruct()) { _construct = Reflect.construct; } else { _construct = function _construct(Parent, args, Class) { var a = [null]; a.push.apply(a, args); var Constructor = Function.bind.apply(Parent, a); var instance = new Constructor(); if (Class) _setPrototypeOf(instance, Class.prototype); return instance; }; } return _construct.apply(null, arguments); } - -function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } } - -function _isNativeFunction(fn) { return Function.toString.call(fn).indexOf("[native code]") !== -1; } - -function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); } - -function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); } - var MyDate = /*#__PURE__*/function (_Date) { - _inherits(MyDate, _Date); + babelHelpers.inherits(MyDate, _Date); - var _super = _createSuper(MyDate); + var _super = babelHelpers.createSuper(MyDate); function MyDate(time) { - _classCallCheck(this, MyDate); - + babelHelpers.classCallCheck(this, MyDate); return _super.call(this, time); } return MyDate; -}( /*#__PURE__*/_wrapNativeSuper(Date)); +}( /*#__PURE__*/babelHelpers.wrapNativeSuper(Date)); var myDate = new MyDate(); diff --git a/packages/babel-preset-env/test/fixtures/plugins-integration/issue-9935/output.js b/packages/babel-preset-env/test/fixtures/plugins-integration/issue-9935/output.js index c955d4e85a..d05554830b 100644 --- a/packages/babel-preset-env/test/fixtures/plugins-integration/issue-9935/output.js +++ b/packages/babel-preset-env/test/fixtures/plugins-integration/issue-9935/output.js @@ -1,13 +1,9 @@ -function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } } - -function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; } - class MyClass extends BaseClass { loadEntity() { var _superprop_getLoadEntity = () => super.loadEntity, _this = this; - return _asyncToGenerator(function* () { + return babelHelpers.asyncToGenerator(function* () { _this.website = yield _this.loadWebsite(); _this.report.setCompany(_this.website.company); diff --git a/packages/babel-preset-env/test/fixtures/preset-options/options.json b/packages/babel-preset-env/test/fixtures/preset-options/options.json deleted file mode 100644 index 83dae6963a..0000000000 --- a/packages/babel-preset-env/test/fixtures/preset-options/options.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "plugins": [["external-helpers", { "helperVersion": "7.100" }]] -} diff --git a/packages/babel-preset-env/test/fixtures/sanity/block-scoping-for-of/options.json b/packages/babel-preset-env/test/fixtures/sanity/block-scoping-for-of/options.json index d91aabf9cb..8700f8c4d6 100644 --- a/packages/babel-preset-env/test/fixtures/sanity/block-scoping-for-of/options.json +++ b/packages/babel-preset-env/test/fixtures/sanity/block-scoping-for-of/options.json @@ -6,6 +6,5 @@ "modules": false } ] - ], - "plugins": [["external-helpers", { "helperVersion": "7.100" }]] + ] } diff --git a/packages/babel-preset-env/test/fixtures/sanity/transform-duplicate-keys/output.js b/packages/babel-preset-env/test/fixtures/sanity/transform-duplicate-keys/output.js index c1e50907c1..85b9ede2e2 100644 --- a/packages/babel-preset-env/test/fixtures/sanity/transform-duplicate-keys/output.js +++ b/packages/babel-preset-env/test/fixtures/sanity/transform-duplicate-keys/output.js @@ -1,5 +1,3 @@ -function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; } - -var a = _defineProperty({ +var a = babelHelpers.defineProperty({ b: 1 }, "b", 2); diff --git a/packages/babel-preset-env/test/fixtures/shipped-proposals/node-12/options.json b/packages/babel-preset-env/test/fixtures/shipped-proposals/node-12/options.json index be69d71062..d82f397d9b 100644 --- a/packages/babel-preset-env/test/fixtures/shipped-proposals/node-12/options.json +++ b/packages/babel-preset-env/test/fixtures/shipped-proposals/node-12/options.json @@ -1,9 +1,11 @@ { "presets": [ - ["env", { - "targets": { "node": 12 }, - "shippedProposals": true - }] - ], - "plugins": [["external-helpers", { "helperVersion": "7.100" }]] + [ + "env", + { + "targets": { "node": 12 }, + "shippedProposals": true + } + ] + ] }