refactor: moving all ES6 files to src/, working on #83

.npmignore

@@ -1 +1,4 @@
-test/
+/coverage
+/src
+/test
+.*

package.json

@@ -2,7 +2,7 @@
   "name": "liquidjs",
   "version": "5.2.0",
   "description": "Liquid template engine by pure JavaScript: compatible to shopify, easy to extend.",
-  "main": "index.js",
+  "main": "src/index.js",
   "scripts": {
     "lint": "eslint .",
     "test": "mocha --recursive",

src/filters.js

@@ -1,7 +1,7 @@
 'use strict'
-const strftime = require('./src/util/strftime.js')
-const _ = require('./src/util/underscore.js')
-const isTruthy = require('./src/syntax.js').isTruthy
+const strftime = require('./util/strftime.js')
+const _ = require('./util/underscore.js')
+const isTruthy = require('./syntax.js').isTruthy
 
 let escapeMap = {
   '&': '&',

src/index.js

@@ -1,21 +1,21 @@
-const Scope = require('./src/scope')
-const _ = require('./src/util/underscore.js')
-const assert = require('./src/util/assert.js')
-const tokenizer = require('./src/tokenizer.js')
-const statFileAsync = require('./src/util/fs.js').statFileAsync
-const readFileAsync = require('./src/util/fs.js').readFileAsync
+const Scope = require('./scope')
+const _ = require('./util/underscore.js')
+const assert = require('./util/assert.js')
+const tokenizer = require('./tokenizer.js')
+const statFileAsync = require('./util/fs.js').statFileAsync
+const readFileAsync = require('./util/fs.js').readFileAsync
 const path = require('path')
-const url = require('./src/util/url.js')
-const Render = require('./src/render.js')
-const lexical = require('./src/lexical.js')
-const Tag = require('./src/tag.js')
-const Filter = require('./src/filter.js')
-const Parser = require('./src/parser')
-const Syntax = require('./src/syntax.js')
+const url = require('./util/url.js')
+const Render = require('./render.js')
+const lexical = require('./lexical.js')
+const Tag = require('./tag.js')
+const Filter = require('./filter.js')
+const Parser = require('./parser')
+const Syntax = require('./syntax.js')
 const tags = require('./tags')
 const filters = require('./filters')
-const anySeries = require('./src/util/promise.js').anySeries
-const Errors = require('./src/util/error.js')
+const anySeries = require('./util/promise.js').anySeries
+const Errors = require('./util/error.js')
 
 var _engine = {
   init: function (tag, filter, options) {

src/tags/assign.js

@@ -2,8 +2,8 @@
 const Liquid = require('..')
 const lexical = Liquid.lexical
 const re = new RegExp(`(${lexical.identifier.source})\\s*=(.*)`)
-const assert = require('../src/util/assert.js')
-const types = require('../src/scope').types
+const assert = require('../util/assert.js')
+const types = require('../scope').types
 
 module.exports = function (liquid) {
   liquid.registerTag('assign', {

src/tags/capture.js

@@ -2,8 +2,8 @@
 const Liquid = require('..')
 const lexical = Liquid.lexical
 const re = new RegExp(`(${lexical.identifier.source})`)
-const assert = require('../src/util/assert.js')
-const types = require('../src/scope.js').types
+const assert = require('../util/assert.js')
+const types = require('../scope.js').types
 
 module.exports = function (liquid) {
   liquid.registerTag('capture', {

src/tags/cycle.js

@@ -2,7 +2,7 @@ const Liquid = require('..')
 const lexical = Liquid.lexical
 const groupRE = new RegExp(`^(?:(${lexical.value.source})\\s*:\\s*)?(.*)$`)
 const candidatesRE = new RegExp(lexical.value.source, 'g')
-const assert = require('../src/util/assert.js')
+const assert = require('../util/assert.js')
 
 module.exports = function (liquid) {
   liquid.registerTag('cycle', {

src/tags/decrement.js

@@ -1,8 +1,8 @@
 'use strict'
 const Liquid = require('..')
 const lexical = Liquid.lexical
-const assert = require('../src/util/assert.js')
-const types = require('../src/scope').types
+const assert = require('../util/assert.js')
+const types = require('../scope').types
 
 module.exports = function (liquid) {
   liquid.registerTag('decrement', {

src/tags/for.js

@@ -1,9 +1,9 @@
 const Liquid = require('..')
 const lexical = Liquid.lexical
-const mapSeries = require('../src/util/promise.js').mapSeries
-const _ = require('../src/util/underscore.js')
+const mapSeries = require('../util/promise.js').mapSeries
+const _ = require('../util/underscore.js')
 const RenderBreakError = Liquid.Types.RenderBreakError
-const assert = require('../src/util/assert.js')
+const assert = require('../util/assert.js')
 const re = new RegExp(`^(${lexical.identifier.source})\\s+in\\s+` +
     `(${lexical.value.source})` +
     `(?:\\s+${lexical.hash.source})*` +

src/tags/include.js

@@ -3,7 +3,7 @@ const Liquid = require('..')
 const lexical = Liquid.lexical
 const withRE = new RegExp(`with\\s+(${lexical.value.source})`)
 const staticFileRE = /[^\s,]+/
-const assert = require('../src/util/assert.js')
+const assert = require('../util/assert.js')
 
 module.exports = function (liquid) {
   liquid.registerTag('include', {

src/tags/increment.js

@@ -1,8 +1,8 @@
 'use strict'
 const Liquid = require('..')
-const assert = require('../src/util/assert.js')
+const assert = require('../util/assert.js')
 const lexical = Liquid.lexical
-const types = require('../src/scope').types
+const types = require('../scope').types
 
 module.exports = function (liquid) {
   liquid.registerTag('increment', {

src/tags/layout.js

@@ -1,6 +1,6 @@
 const Liquid = require('..')
 const lexical = Liquid.lexical
-const assert = require('../src/util/assert.js')
+const assert = require('../util/assert.js')
 const staticFileRE = /\S+/
 
 /*

src/tags/tablerow.js

@@ -1,7 +1,7 @@
 const Liquid = require('..')
-const mapSeries = require('../src/util/promise.js').mapSeries
+const mapSeries = require('../util/promise.js').mapSeries
 const lexical = Liquid.lexical
-const assert = require('../src/util/assert.js')
+const assert = require('../util/assert.js')
 const re = new RegExp(`^(${lexical.identifier.source})\\s+in\\s+` +
   `(${lexical.value.source})` +
   `(?:\\s+${lexical.hash.source})*$`)

test/express.js

@@ -3,7 +3,7 @@ const expect = chai.expect
 const mock = require('mock-fs')
 const request = require('supertest')
 const express = require('express')
-const Liquid = require('..')
+const Liquid = require('../src')
 
 describe('engine#express()', function () {
   var app, engine

test/filters.js

@@ -1,7 +1,7 @@
 const chai = require('chai')
 const chaiAsPromised = require('chai-as-promised')
 const expect = chai.expect
-var liquid = require('..')()
+var liquid = require('../src')()
 chai.use(chaiAsPromised)
 
 var ctx = {

test/index.js

@@ -1,6 +1,6 @@
 const chai = require('chai')
 const expect = chai.expect
-const Liquid = require('..')
+const Liquid = require('../src')
 const mock = require('mock-fs')
 chai.use(require('chai-as-promised'))
 

test/options/cache.js

@@ -1,7 +1,7 @@
 const chai = require('chai')
 const expect = chai.expect
 const mock = require('mock-fs')
-const Liquid = require('../..')
+const Liquid = require('../../src')
 chai.use(require('chai-as-promised'))
 
 describe('cache options', function () {

test/options/strict.js

@@ -1,6 +1,6 @@
 const chai = require('chai')
 const expect = chai.expect
-const Liquid = require('../..')
+const Liquid = require('../../src')
 chai.use(require('chai-as-promised'))
 
 describe('strict options', function () {

test/options/trimming.js

@@ -1,6 +1,6 @@
 const chai = require('chai')
 const expect = chai.expect
-const Liquid = require('../..')
+const Liquid = require('../../src')
 chai.use(require('chai-as-promised'))
 
 describe('trimming', function () {

test/tags/assign.js

@@ -1,5 +1,5 @@
 'use strict'
-const Liquid = require('../..')
+const Liquid = require('../../src')
 const chai = require('chai')
 const expect = chai.expect
 chai.use(require('chai-as-promised'))