fix(processor): cleaning up

tivac · Feb 3, 2022 · 897a2c5 · 897a2c5
1 parent 46c80da
commit 897a2c5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 18 deletions.
diff --git a/packages/processor/lib/keys.js b/packages/processor/lib/keys.js
@@ -27,3 +27,4 @@ exports.isValue = (key) => key.startsWith(VALUE_PREFIX);
 
 exports.FILE_PREFIX = FILE_PREFIX;
 exports.SELECTOR_PREFIX = SELECTOR_PREFIX;
+exports.VALUE_PREFIX = VALUE_PREFIX;
diff --git a/packages/processor/plugins/values-import.js b/packages/processor/plugins/values-import.js
@@ -36,10 +36,7 @@ module.exports = () => ({
  throw rule.error(`Could not find @value ${name} in "${parsed.source}"`);
  }
 
- const sourceKey = processor._addValue(file, name);
- const nameKey = processor._addValue(from, name);
-
- processor.graph.addDependency(nameKey, sourceKey);
+ processor._addDependency({ name : from, dependency : file, refs : [{ name }] });
 
  values[name] = {
  ...value,
@@ -58,10 +55,10 @@ module.exports = () => ({
  }
 
  processor._addValue(file, parsed.name, { namespace : true });
-
+ 
  for(const key in source.values) {
  const name = `${parsed.name}.${key}`;
-
+ 
  values[name] = {
  ...source.values[key],
  external : true,

diff --git a/packages/processor/processor.js b/packages/processor/processor.js
@@ -24,19 +24,17 @@ const pluginValuesImport = require("./plugins/values-import.js");
 const pluginValuesLocal = require("./plugins/before/values-local.js");
 const pluginValuesReplace = require("./plugins/values-replace.js");
 
+const keys = require("./lib/keys.js");
+
 const {
  selectorKey,
  fileKey,
  valueKey,
 
  filterByPrefix,
 
- isFile,
- isSelector,
- isValue,
-
  FILE_PREFIX,
-} = require("./lib/keys.js");
+} = keys;
 
 let fs;
 
@@ -638,12 +636,6 @@ class Processor {
 }
 
 // Static exports of key.js functionality
-Processor.selectorKey = selectorKey;
-Processor.fileKey = fileKey;
-Processor.valueKey = valueKey;
-
-Processor.isFile = isFile;
-Processor.isSelector = isSelector;
-Processor.isValue = isValue;
+Object.assign(Processor, keys);
 
 module.exports = Processor;