From c8835cbbee114e83f0ff98dd5816695cd4d08829 Mon Sep 17 00:00:00 2001 From: Logan Smyth Date: Fri, 29 Sep 2017 11:05:57 -0700 Subject: [PATCH] Remove unnecessary Store subclass. --- .../babel-core/src/transformation/file/index.js | 14 ++++++++++---- .../babel-core/src/transformation/plugin-pass.js | 13 ++++++++++--- packages/babel-core/src/transformation/store.js | 15 --------------- 3 files changed, 20 insertions(+), 22 deletions(-) delete mode 100644 packages/babel-core/src/transformation/store.js diff --git a/packages/babel-core/src/transformation/file/index.js b/packages/babel-core/src/transformation/file/index.js index 38947d5397..b48c1581bc 100644 --- a/packages/babel-core/src/transformation/file/index.js +++ b/packages/babel-core/src/transformation/file/index.js @@ -9,7 +9,6 @@ import sourceMap from "source-map"; import generate from "babel-generator"; import { codeFrameColumns } from "babel-code-frame"; import traverse from "babel-traverse"; -import Store from "../store"; import { parse } from "babylon"; import * as t from "babel-types"; import buildDebug from "debug"; @@ -38,7 +37,7 @@ const errorVisitor = { }, }; -export default class File extends Store { +export default class File { constructor({ options, passes }: ResolvedConfig) { if (!INTERNAL_PLUGINS) { // Lazy-init the internal plugin to remove the init-time circular dependency between plugins being @@ -49,8 +48,7 @@ export default class File extends Store { }).passes[0]; } - super(); - + this._map = new Map(); this.pluginPasses = passes; this.opts = options; @@ -113,6 +111,14 @@ export default class File extends Store { code: string; shebang: string; + set(key: string, val) { + this._map.set(key, val); + } + + get(key: string): any { + return this._map.get(key); + } + getMetadata() { let has = false; for (const node of (this.ast.program.body: Array)) { diff --git a/packages/babel-core/src/transformation/plugin-pass.js b/packages/babel-core/src/transformation/plugin-pass.js index c0a6626cf5..edde9acd07 100644 --- a/packages/babel-core/src/transformation/plugin-pass.js +++ b/packages/babel-core/src/transformation/plugin-pass.js @@ -1,9 +1,8 @@ -import Store from "./store"; import File from "./file"; -export default class PluginPass extends Store { +export default class PluginPass { constructor(file: File, key: string, options: Object = {}) { - super(); + this._map = new Map(); this.key = key; this.file = file; @@ -14,6 +13,14 @@ export default class PluginPass extends Store { file: File; opts: Object; + set(key: string, val) { + this._map.set(key, val); + } + + get(key: string): any { + return this._map.get(key); + } + addHelper(...args) { return this.file.addHelper(...args); } diff --git a/packages/babel-core/src/transformation/store.js b/packages/babel-core/src/transformation/store.js deleted file mode 100644 index bcf5bc7e4b..0000000000 --- a/packages/babel-core/src/transformation/store.js +++ /dev/null @@ -1,15 +0,0 @@ -export default class Store { - constructor() { - this._map = new Map(); - } - - set(key: string, val) { - this._map.set(key, val); - } - - get(key: string): any { - if (this._map.has(key)) { - return this._map.get(key); - } - } -}