Move NodePath cache out of the AST

As mentioned on the task https://phabricator.babeljs.io/T7179 having
this cache on the AST leads to all sorts of portability and reuse
bugs.

This moves the cache into a clearable WeakMap which will fix the
following:

1. Moving the AST between different babel versions or tools will not
lead into sharing potentially outdated cached information

2. `.clear()` can be called on the cache by a plugin to clear
potentially outdated information. This is helpful when implementing two
seperate pipelines that should not share information.

I think the next step (which is harder, I tried) is to isolate cache and
make it live on a transform or pipeline level state (like the `hub`).

The reason it is hard is because the `babel-traverse` main API -- although
requires the state object to be passed -- not many callers do. To fix
this we should release a patch version that warns about this and fix all
the internal callers. Next couple of releases we can start throwing when
no state is passed (or we can create our own state).
This commit is contained in:
Amjad Masad 2016-03-02 12:20:11 -08:00
parent 3667527d04
commit b9a893aab6
5 changed files with 34 additions and 5 deletions

View File

@ -9,6 +9,7 @@ import * as t from "babel-types";
export { default as NodePath } from "./path";
export { default as Scope } from "./scope";
export { default as Hub } from "./hub";
export { default as cache } from "./path/cache";
export { visitors };
export default function traverse(

View File

@ -0,0 +1,25 @@
let wm = new WeakMap();
// To implement clear we need to export a facade.
export default {
clear() {
wm = new WeakMap();
},
delete(k) {
return wm.delete(k)
},
get(k) {
return wm.get(k)
},
has(k) {
return wm.has(k)
},
set(k, v) {
wm.set(k, v);
return wm;
},
};

View File

@ -1 +0,0 @@
export const PATH_CACHE_KEY = "_paths"; //Symbol();

View File

@ -4,12 +4,12 @@ import type Hub from "../hub";
import type TraversalContext from "../context";
import * as virtualTypes from "./lib/virtual-types";
import buildDebug from "debug";
import { PATH_CACHE_KEY } from "./constants";
import invariant from "invariant";
import traverse from "../index";
import assign from "lodash/object/assign";
import Scope from "../scope";
import * as t from "babel-types";
import cache from "./cache";
let debug = buildDebug("babel");
@ -69,7 +69,11 @@ export default class NodePath {
let targetNode = container[key];
let paths = parent[PATH_CACHE_KEY] = parent[PATH_CACHE_KEY] || [];
let paths = cache.get(parent) || [];
if (!cache.has(parent)) {
cache.set(parent, paths);
}
let path;
for (let i = 0; i < paths.length; i++) {

View File

@ -1,7 +1,7 @@
/* eslint max-len: 0 */
// This file contains methods that modify the path/node in some ways.
import { PATH_CACHE_KEY } from "./constants";
import cache from "./cache";
import PathHoister from "./lib/hoister";
import NodePath from "./index";
import * as t from "babel-types";
@ -136,7 +136,7 @@ export function insertAfter(nodes) {
export function updateSiblingKeys(fromIndex, incrementBy) {
if (!this.parent) return;
let paths = this.parent[PATH_CACHE_KEY];
let paths = cache.get(this.parent);
for (let i = 0; i < paths.length; i++) {
let path = paths[i];
if (path.key >= fromIndex) {