refactor: a square is not a rectangle

Author: patrickhulce

lib/sources/factory.js

@@ -4,7 +4,7 @@ const glob = require('glob')
 
 const _ = require('lodash')
 
-const Source = require('./source')
+const SimpleSource = require('./source')
 const JsSource = require('./js-source')
 
 const FILE_PREFIX = 'file://'
@@ -68,7 +68,7 @@ class SourceFactory {
       return new JsSource(file.content)
     }
 
-    return new Source(file.content)
+    return new SimpleSource(file.content)
   }
 }
 

lib/sources/js-source.js

@@ -1,10 +1,10 @@
 const esprima = require('esprima')
 const debug = require('debug')('nukecss:js-source')
-const Source = require('./source')
+const SimpleSource = require('./source')
 
-class JsSource extends Source {
+class JsSource {
   constructor(text, opts = {}) {
-    super(text)
+    this._text = text
 
     let tokens = opts.tokens
     if (!tokens) {
@@ -28,7 +28,7 @@ class JsSource extends Source {
   }
 
   _findWholeSelectorInTokens(selector) {
-    return this._tokensArray.find(token => Source.textContains(token, selector))
+    return this._tokensArray.find(token => SimpleSource.textContains(token, selector))
   }
 
   _findSelectorPartsInTokens(selector) {
@@ -53,7 +53,7 @@ class JsSource extends Source {
         this._findWholeSelectorInTokens(selector) ||
         this._findSelectorPartsInTokens(selector))
     } else {
-      return Source.textContains(this._text, selector)
+      return SimpleSource.textContains(this._text, selector)
     }
   }
 

lib/sources/source.js

@@ -1,4 +1,4 @@
-class Source {
+class SimpleSource {
   constructor(text) {
     this._text = text
   }
@@ -8,20 +8,20 @@ class Source {
   }
 
   contains(selector) {
-    return Source.textContains(this._text, selector)
+    return SimpleSource.textContains(this._text, selector)
   }
 
   join(source) {
     if (source.type !== 'simple') {
-      throw new Error('Source can only be joined with Source')
+      throw new Error('SimpleSource can only be joined with SimpleSource')
     }
 
-    return new Source(`${this._text} ${source._text}`)
+    return new SimpleSource(`${this._text} ${source._text}`)
   }
 
   static textContains(text, selector) {
     return new RegExp(`\\b${selector}\\b`, 'i').test(text)
   }
 }
 
-module.exports = Source
+module.exports = SimpleSource

test/sources/factory.test.js

@@ -93,7 +93,7 @@ describe('sources/factory.js', () => {
 
     context('when opts.simple=true', () => {
       const opts = {simple: true}
-      it('should always use Source', () => {
+      it('should always use SimpleSource', () => {
         const content = 'const foobar = "baz"'
         const sources = SourceFactory.fromObject({content, type: 'js'}, opts)
         expect(sources).to.have.length(1)