Skip to content
This repository has been archived by the owner on Aug 4, 2021. It is now read-only.

Commit

Permalink
Use extractAssignedNames from rollup-pluginutils. Resolves #303 (#383)
Browse files Browse the repository at this point in the history
  • Loading branch information
lukastaegert committed Apr 4, 2019
1 parent 31b1bbc commit 34270d4
Show file tree
Hide file tree
Showing 4 changed files with 26 additions and 111 deletions.
89 changes: 20 additions & 69 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Expand Up @@ -28,19 +28,19 @@
"estree-walker": "^0.6.0",
"magic-string": "^0.25.2",
"resolve": "^1.10.0",
"rollup-pluginutils": "^2.5.0"
"rollup-pluginutils": "^2.6.0"
},
"devDependencies": {
"acorn": "^6.1.1",
"eslint": "^5.15.3",
"eslint": "^5.16.0",
"eslint-plugin-import": "^2.16.0",
"husky": "^1.3.1",
"lint-staged": "^8.1.5",
"locate-character": "^2.0.5",
"mocha": "^6.0.2",
"prettier": "^1.16.4",
"require-relative": "^0.8.7",
"rollup": "^1.7.3",
"rollup": "^1.8.0",
"rollup-plugin-buble": "^0.19.6",
"rollup-plugin-node-resolve": "^4.0.1",
"shx": "^0.3.2",
Expand Down
36 changes: 0 additions & 36 deletions src/ast-utils.js
Expand Up @@ -31,42 +31,6 @@ export function flatten(node) {
return { name, keypath: parts.join('.') };
}

export function extractNames(node) {
const names = [];
extractors[node.type](names, node);
return names;
}

const extractors = {
Identifier(names, node) {
names.push(node.name);
},

ObjectPattern(names, node) {
node.properties.forEach(prop => {
extractors[prop.value.type](names, prop.value);
});
},

ArrayPattern(names, node) {
node.elements.forEach(element => {
if (element) extractors[element.type](names, element);
});
},

RestElement(names, node) {
extractors[node.argument.type](names, node.argument);
},

AssignmentPattern(names, node) {
extractors[node.left.type](names, node.left);
},

MemberExpression(names, node) {
extractors[node.property.type](names, node.property);
}
};

export function isTruthy(node) {
if (node.type === 'Literal') return !!node.value;
if (node.type === 'ParenthesizedExpression') return isTruthy(node.expression);
Expand Down
6 changes: 3 additions & 3 deletions src/transform.js
@@ -1,7 +1,7 @@
import { walk } from 'estree-walker';
import MagicString from 'magic-string';
import { attachScopes, makeLegalIdentifier } from 'rollup-pluginutils';
import { extractNames, flatten, isFalsy, isReference, isTruthy } from './ast-utils.js';
import { attachScopes, extractAssignedNames, makeLegalIdentifier } from 'rollup-pluginutils';
import { flatten, isFalsy, isReference, isTruthy } from './ast-utils.js';
import { HELPERS_ID, PROXY_PREFIX } from './helpers.js';
import { getName } from './utils.js';

Expand Down Expand Up @@ -155,7 +155,7 @@ export function transformCommonjs(
if (node.type !== 'AssignmentExpression') return;
if (node.left.type === 'MemberExpression') return;

extractNames(node.left).forEach(name => {
extractAssignedNames(node.left).forEach(name => {
assignedTo.add(name);
});
}
Expand Down

0 comments on commit 34270d4

Please sign in to comment.