From 53a835ab5470716ca208146740d094c5cf3a812a Mon Sep 17 00:00:00 2001 From: harttle Date: Tue, 26 Feb 2019 00:43:30 +0800 Subject: [PATCH] fix(#108): remove absolute path in emitted d.ts --- benchmark/demo.ts | 6 +-- demo/typescript/index.ts | 2 +- libs.d.ts | 4 +- package-lock.json | 49 ++++------------------ package.json | 3 +- rollup.config.ts | 15 +++---- src/builtin/filters/array.ts | 2 +- src/builtin/filters/date.ts | 4 +- src/builtin/filters/object.ts | 2 +- src/builtin/filters/string.ts | 2 +- src/builtin/tags/assign.ts | 12 +++--- src/builtin/tags/block.ts | 14 +++---- src/builtin/tags/break.ts | 2 +- src/builtin/tags/capture.ts | 14 +++---- src/builtin/tags/case.ts | 14 +++---- src/builtin/tags/comment.ts | 6 +-- src/builtin/tags/continue.ts | 2 +- src/builtin/tags/cycle.ts | 12 +++--- src/builtin/tags/decrement.ts | 12 +++--- src/builtin/tags/for.ts | 24 +++++------ src/builtin/tags/if.ts | 14 +++---- src/builtin/tags/include.ts | 16 +++---- src/builtin/tags/increment.ts | 8 ++-- src/builtin/tags/index.ts | 2 +- src/builtin/tags/layout.ts | 18 ++++---- src/builtin/tags/raw.ts | 6 +-- src/builtin/tags/tablerow.ts | 22 +++++----- src/builtin/tags/unless.ts | 12 +++--- src/drop/blank-drop.ts | 6 +-- src/drop/empty-drop.ts | 4 +- src/drop/icomparable.ts | 2 +- src/drop/idrop.ts | 2 +- src/drop/null-drop.ts | 6 +-- src/liquid.ts | 2 +- src/parser/delimited-token.ts | 2 +- src/parser/parse-stream.ts | 4 +- src/parser/parser.ts | 10 ++--- src/parser/tag-token.ts | 2 +- src/parser/tokenizer.ts | 2 +- src/parser/whitespace-ctrl.ts | 8 ++-- src/render/render.ts | 8 ++-- src/render/syntax.ts | 14 +++---- src/template/filter/filter.ts | 4 +- src/template/html.ts | 6 +-- src/template/itemplate.ts | 4 +- src/template/output.ts | 10 ++--- src/template/tag/hash.ts | 6 +-- src/template/tag/itag-impl-options.ts | 8 ++-- src/template/tag/itag-impl.ts | 2 +- src/template/tag/tag.ts | 16 +++---- src/template/value.ts | 4 +- src/util/error.ts | 4 +- src/util/underscore.ts | 7 ---- test/integration/builtin/filters/array.ts | 2 +- test/integration/builtin/filters/date.ts | 2 +- test/integration/builtin/filters/html.ts | 2 +- test/integration/builtin/filters/math.ts | 2 +- test/integration/builtin/filters/object.ts | 2 +- test/integration/builtin/filters/string.ts | 2 +- test/integration/builtin/filters/url.ts | 2 +- test/integration/builtin/tags/assign.ts | 2 +- test/integration/builtin/tags/capture.ts | 2 +- test/integration/builtin/tags/case.ts | 2 +- test/integration/builtin/tags/comment.ts | 2 +- test/integration/builtin/tags/cycle.ts | 2 +- test/integration/builtin/tags/decrement.ts | 2 +- test/integration/builtin/tags/for.ts | 4 +- test/integration/builtin/tags/if.ts | 2 +- test/integration/builtin/tags/include.ts | 4 +- test/integration/builtin/tags/increment.ts | 2 +- test/integration/builtin/tags/layout.ts | 4 +- test/integration/builtin/tags/raw.ts | 2 +- test/integration/builtin/tags/tablerow.ts | 2 +- test/integration/builtin/tags/unless.ts | 2 +- test/integration/drop/blank-drop.ts | 2 +- test/integration/drop/empty-drop.ts | 2 +- test/integration/drop/null-drop.ts | 2 +- test/integration/liquid/cache.ts | 4 +- test/integration/liquid/delimiter.ts | 2 +- test/integration/liquid/liquid-options.ts | 2 +- test/integration/liquid/liquid.ts | 4 +- test/integration/liquid/strict.ts | 2 +- test/integration/liquid/trimming.ts | 2 +- test/integration/util/error.ts | 4 +- test/mocha.opts | 1 - test/stub/mockfs.ts | 4 +- test/stub/render.ts | 2 +- test/unit/fs/browser.ts | 2 +- test/unit/fs/node.ts | 2 +- test/unit/parser/lexical.ts | 2 +- test/unit/parser/tokenizer.ts | 8 ++-- test/unit/render/render.ts | 12 +++--- test/unit/render/syntax.ts | 4 +- test/unit/scope/scope.ts | 2 +- test/unit/template/filter/filter.ts | 4 +- test/unit/template/output.ts | 8 ++-- test/unit/template/tag.ts | 8 ++-- test/unit/template/value.ts | 6 +-- test/unit/util/assert.ts | 2 +- test/unit/util/promise.ts | 2 +- test/unit/util/strftime.ts | 2 +- test/unit/util/underscore.ts | 22 ++-------- tsconfig.json | 9 +--- 103 files changed, 275 insertions(+), 343 deletions(-) diff --git a/benchmark/demo.ts b/benchmark/demo.ts index 98b10994a2..986dd47e1c 100644 --- a/benchmark/demo.ts +++ b/benchmark/demo.ts @@ -1,7 +1,7 @@ import * as Benchmark from 'benchmark' -import Liquid from 'src/liquid' -import TagToken from 'src/parser/tag-token' -import Scope from 'src/scope/scope' +import Liquid from '../src/liquid' +import TagToken from '../src/parser/tag-token' +import Scope from '../src/scope/scope' const engine = new Liquid({ root: __dirname, diff --git a/demo/typescript/index.ts b/demo/typescript/index.ts index 4744892ac9..2249c643fa 100644 --- a/demo/typescript/index.ts +++ b/demo/typescript/index.ts @@ -1,4 +1,4 @@ -import Liquid from '../../dist/liquid.js' +import Liquid from 'liquidjs' const engine = new Liquid({ root: __dirname, diff --git a/libs.d.ts b/libs.d.ts index 757876a513..139b56fbb5 100644 --- a/libs.d.ts +++ b/libs.d.ts @@ -1,6 +1,6 @@ declare module 'rollup-plugin-uglify' { export function uglify (): any } -declare module 'rollup-plugin-shim' { - export default function shim(options: any): any +declare module 'rollup-plugin-alias' { + export default function alias(options: any): any } diff --git a/package-lock.json b/package-lock.json index 2fb8d08253..0cfb951a4e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -413,12 +413,6 @@ "parse5": "4.0.0" } }, - "@types/json5": { - "version": "0.0.29", - "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", - "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", - "dev": true - }, "@types/mime": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/@types/mime/-/mime-2.0.1.tgz", @@ -3565,15 +3559,6 @@ "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", "dev": true }, - "json5": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", - "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", - "dev": true, - "requires": { - "minimist": "1.2.0" - } - }, "jsonfile": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz", @@ -9151,11 +9136,14 @@ "acorn": "6.1.0" } }, - "rollup-plugin-shim": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/rollup-plugin-shim/-/rollup-plugin-shim-1.0.0.tgz", - "integrity": "sha512-rZqFD43y4U9nSqVq3iyWBiDwmBQJY8Txi04yI9jTKD3xcl7CbFjh1qRpQshUB3sONLubDzm7vJiwB+1MEGv67w==", - "dev": true + "rollup-plugin-alias": { + "version": "1.5.1", + "resolved": "https://registry.npmjs.org/rollup-plugin-alias/-/rollup-plugin-alias-1.5.1.tgz", + "integrity": "sha512-pQTYBRNfLedoVOO7AYHNegIavEIp4jKTga5jUi1r//KYgHKGWgG4qJXYhbcWKt2k1FwGlR5wCYoY+IFkme0t4A==", + "dev": true, + "requires": { + "slash": "2.0.0" + } }, "rollup-plugin-typescript2": { "version": "0.19.2", @@ -10224,27 +10212,6 @@ "yn": "3.0.0" } }, - "tsconfig-paths": { - "version": "3.8.0", - "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.8.0.tgz", - "integrity": "sha512-zZEYFo4sjORK8W58ENkRn9s+HmQFkkwydDG7My5s/fnfr2YYCaiyXe/HBUcIgU8epEKOXwiahOO+KZYjiXlWyQ==", - "dev": true, - "requires": { - "@types/json5": "0.0.29", - "deepmerge": "2.2.1", - "json5": "1.0.1", - "minimist": "1.2.0", - "strip-bom": "3.0.0" - }, - "dependencies": { - "deepmerge": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-2.2.1.tgz", - "integrity": "sha512-R9hc1Xa/NOBi9WRVUWg19rl1UB7Tt4kuPd+thNJgFZoxXsTz7ncaPaeIm+40oSGuP33DfMb4sZt1QIGiJzC4EA==", - "dev": true - } - } - }, "tslib": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.9.3.tgz", diff --git a/package.json b/package.json index 8e2d8dcb0f..5abddf6e71 100644 --- a/package.json +++ b/package.json @@ -76,7 +76,7 @@ "nyc": "^13.1.0", "regenerator-runtime": "^0.12.1", "rollup": "^1.1.2", - "rollup-plugin-shim": "^1.0.0", + "rollup-plugin-alias": "^1.5.1", "rollup-plugin-typescript2": "^0.19.2", "rollup-plugin-uglify": "^6.0.2", "semantic-release": "^15.13.3", @@ -84,7 +84,6 @@ "sinon-chai": "^3.3.0", "supertest": "^3.4.2", "ts-node": "^8.0.2", - "tsconfig-paths": "^3.8.0", "tslib": "^1.9.3", "typescript": "^3.3.3" }, diff --git a/rollup.config.ts b/rollup.config.ts index 013ce12747..6441274981 100644 --- a/rollup.config.ts +++ b/rollup.config.ts @@ -1,9 +1,8 @@ -import shim from 'rollup-plugin-shim' +import alias from 'rollup-plugin-alias' import { uglify } from 'rollup-plugin-uglify' import pkg from './package.json' import typescript from 'rollup-plugin-typescript2' -const fake = { fs: `export default {}`, path: `export default {}` } const version = process.env.VERSION || pkg.version const sourcemap = true const banner = `/* @@ -14,7 +13,7 @@ const banner = `/* const treeshake = { propertyReadSideEffects: false } -const input = 'src/liquid.ts' +const input = './src/liquid.ts' export default [{ output: [{ @@ -46,15 +45,14 @@ export default [{ banner }], plugins: [ - shim(fake), + alias({ resolve: ['.ts'], './fs/node': './fs/browser' }), typescript({ tsconfigOverride: { include: [ 'src' ], exclude: [ 'test', 'benchmark' ], compilerOptions: { target: 'es5', - module: 'ES2015', - paths: { 'src/fs': ['src/fs/browser'] } + module: 'ES2015' } } }) @@ -69,15 +67,14 @@ export default [{ sourcemap }], plugins: [ - shim(fake), + alias({ resolve: ['.ts'], './fs/node': './fs/browser' }), typescript({ tsconfigOverride: { include: [ 'src' ], exclude: [ 'test', 'benchmark' ], compilerOptions: { target: 'es5', - module: 'ES2015', - paths: { 'src/fs': ['src/fs/browser'] } + module: 'ES2015' } } }), diff --git a/src/builtin/filters/array.ts b/src/builtin/filters/array.ts index fb9f8f46d5..8cf8a331aa 100644 --- a/src/builtin/filters/array.ts +++ b/src/builtin/filters/array.ts @@ -1,4 +1,4 @@ -import { last } from 'src/util/underscore' +import { last } from '../../util/underscore' export default { 'join': (v: any[], arg: string) => v.join(arg === undefined ? ' ' : arg), diff --git a/src/builtin/filters/date.ts b/src/builtin/filters/date.ts index 59e1400a02..e3a54517c5 100644 --- a/src/builtin/filters/date.ts +++ b/src/builtin/filters/date.ts @@ -1,5 +1,5 @@ -import strftime from 'src/util/strftime' -import { isString } from 'src/util/underscore' +import strftime from '../../util/strftime' +import { isString } from '../../util/underscore' export default { 'date': (v: string | Date, arg: string) => { diff --git a/src/builtin/filters/object.ts b/src/builtin/filters/object.ts index 3e96bad2d6..c8d86abfc4 100644 --- a/src/builtin/filters/object.ts +++ b/src/builtin/filters/object.ts @@ -1,4 +1,4 @@ -import { isTruthy } from 'src/render/syntax' +import { isTruthy } from '../../render/syntax' export default { 'default': (v: T1, arg: T2): T1 | T2 => isTruthy(v) ? v : arg diff --git a/src/builtin/filters/string.ts b/src/builtin/filters/string.ts index b7a3467e8f..1acd264b7f 100644 --- a/src/builtin/filters/string.ts +++ b/src/builtin/filters/string.ts @@ -1,4 +1,4 @@ -import { FilterImpl } from 'src/template/filter/filter-impl' +import { FilterImpl } from '../../template/filter/filter-impl' export default { 'append': (v: string, arg: string) => v + arg, diff --git a/src/builtin/tags/assign.ts b/src/builtin/tags/assign.ts index e6849be6a7..2eaa2f5777 100644 --- a/src/builtin/tags/assign.ts +++ b/src/builtin/tags/assign.ts @@ -1,9 +1,9 @@ -import assert from 'src/util/assert' -import { identifier } from 'src/parser/lexical' -import { AssignScope } from 'src/scope/scopes' -import TagToken from 'src/parser/tag-token' -import Scope from 'src/scope/scope' -import ITagImplOptions from 'src/template/tag/itag-impl-options' +import assert from '../../util/assert' +import { identifier } from '../../parser/lexical' +import { AssignScope } from '../../scope/scopes' +import TagToken from '../../parser/tag-token' +import Scope from '../../scope/scope' +import ITagImplOptions from '../../template/tag/itag-impl-options' const re = new RegExp(`(${identifier.source})\\s*=([^]*)`) diff --git a/src/builtin/tags/block.ts b/src/builtin/tags/block.ts index 93f8f98f39..c2a18fbfae 100644 --- a/src/builtin/tags/block.ts +++ b/src/builtin/tags/block.ts @@ -1,10 +1,10 @@ -import BlockMode from 'src/scope/block-mode' -import TagToken from 'src/parser/tag-token' -import Token from 'src/parser/token' -import ITemplate from 'src/template/itemplate' -import Scope from 'src/scope/scope' -import ITagImplOptions from 'src/template/tag/itag-impl-options' -import ParseStream from 'src/parser/parse-stream' +import BlockMode from '../../scope/block-mode' +import TagToken from '../../parser/tag-token' +import Token from '../../parser/token' +import ITemplate from '../../template/itemplate' +import Scope from '../../scope/scope' +import ITagImplOptions from '../../template/tag/itag-impl-options' +import ParseStream from '../../parser/parse-stream' export default { parse: function (token: TagToken, remainTokens: Token[]) { diff --git a/src/builtin/tags/break.ts b/src/builtin/tags/break.ts index c9fc868d66..5f3f49d344 100644 --- a/src/builtin/tags/break.ts +++ b/src/builtin/tags/break.ts @@ -1,4 +1,4 @@ -import { RenderBreakError } from 'src/util/error' +import { RenderBreakError } from '../../util/error' export default { render: async function () { diff --git a/src/builtin/tags/capture.ts b/src/builtin/tags/capture.ts index b2e3bef826..a9f4bf4871 100644 --- a/src/builtin/tags/capture.ts +++ b/src/builtin/tags/capture.ts @@ -1,10 +1,10 @@ -import assert from 'src/util/assert' -import { identifier } from 'src/parser/lexical' -import { CaptureScope } from 'src/scope/scopes' -import TagToken from 'src/parser/tag-token' -import Token from 'src/parser/token' -import Scope from 'src/scope/scope' -import ITagImplOptions from 'src/template/tag/itag-impl-options' +import assert from '../../util/assert' +import { identifier } from '../../parser/lexical' +import { CaptureScope } from '../../scope/scopes' +import TagToken from '../../parser/tag-token' +import Token from '../../parser/token' +import Scope from '../../scope/scope' +import ITagImplOptions from '../../template/tag/itag-impl-options' const re = new RegExp(`(${identifier.source})`) diff --git a/src/builtin/tags/case.ts b/src/builtin/tags/case.ts index 7b4f21177b..6310527d39 100644 --- a/src/builtin/tags/case.ts +++ b/src/builtin/tags/case.ts @@ -1,10 +1,10 @@ -import { evalExp } from 'src/render/syntax' -import TagToken from 'src/parser/tag-token' -import Token from 'src/parser/token' -import Scope from 'src/scope/scope' -import ITemplate from 'src/template/itemplate' -import ITagImplOptions from 'src/template/tag/itag-impl-options' -import ParseStream from 'src/parser/parse-stream' +import { evalExp } from '../../render/syntax' +import TagToken from '../../parser/tag-token' +import Token from '../../parser/token' +import Scope from '../../scope/scope' +import ITemplate from '../../template/itemplate' +import ITagImplOptions from '../../template/tag/itag-impl-options' +import ParseStream from '../../parser/parse-stream' export default { parse: function (tagToken: TagToken, remainTokens: Token[]) { diff --git a/src/builtin/tags/comment.ts b/src/builtin/tags/comment.ts index f23460fa3d..8f13d20465 100644 --- a/src/builtin/tags/comment.ts +++ b/src/builtin/tags/comment.ts @@ -1,6 +1,6 @@ -import TagToken from 'src/parser/tag-token' -import Token from 'src/parser/token' -import ITagImplOptions from 'src/template/tag/itag-impl-options' +import TagToken from '../../parser/tag-token' +import Token from '../../parser/token' +import ITagImplOptions from '../../template/tag/itag-impl-options' export default { parse: function (tagToken: TagToken, remainTokens: Token[]) { diff --git a/src/builtin/tags/continue.ts b/src/builtin/tags/continue.ts index e9a5731012..66d5f81cba 100644 --- a/src/builtin/tags/continue.ts +++ b/src/builtin/tags/continue.ts @@ -1,4 +1,4 @@ -import { RenderBreakError } from 'src/util/error' +import { RenderBreakError } from '../../util/error' export default { render: async function () { diff --git a/src/builtin/tags/cycle.ts b/src/builtin/tags/cycle.ts index c9f5fb19f9..56df884405 100644 --- a/src/builtin/tags/cycle.ts +++ b/src/builtin/tags/cycle.ts @@ -1,9 +1,9 @@ -import assert from 'src/util/assert' -import { value as rValue } from 'src/parser/lexical' -import { evalValue } from 'src/render/syntax' -import TagToken from 'src/parser/tag-token' -import Scope from 'src/scope/scope' -import ITagImplOptions from 'src/template/tag/itag-impl-options' +import assert from '../../util/assert' +import { value as rValue } from '../../parser/lexical' +import { evalValue } from '../../render/syntax' +import TagToken from '../../parser/tag-token' +import Scope from '../../scope/scope' +import ITagImplOptions from '../../template/tag/itag-impl-options' const groupRE = new RegExp(`^(?:(${rValue.source})\\s*:\\s*)?(.*)$`) const candidatesRE = new RegExp(rValue.source, 'g') diff --git a/src/builtin/tags/decrement.ts b/src/builtin/tags/decrement.ts index 3c0dbea0f6..de36a54065 100644 --- a/src/builtin/tags/decrement.ts +++ b/src/builtin/tags/decrement.ts @@ -1,9 +1,9 @@ -import assert from 'src/util/assert' -import { identifier } from 'src/parser/lexical' -import { CaptureScope, AssignScope, DecrementScope } from 'src/scope/scopes' -import TagToken from 'src/parser/tag-token' -import Scope from 'src/scope/scope' -import ITagImplOptions from 'src/template/tag/itag-impl-options' +import assert from '../../util/assert' +import { identifier } from '../../parser/lexical' +import { CaptureScope, AssignScope, DecrementScope } from '../../scope/scopes' +import TagToken from '../../parser/tag-token' +import Scope from '../../scope/scope' +import ITagImplOptions from '../../template/tag/itag-impl-options' export default { parse: function (token: TagToken) { diff --git a/src/builtin/tags/for.ts b/src/builtin/tags/for.ts index 49b62d70f3..8dba084524 100644 --- a/src/builtin/tags/for.ts +++ b/src/builtin/tags/for.ts @@ -1,15 +1,15 @@ -import { mapSeries } from 'src/util/promise' -import { isString, isObject, isArray } from 'src/util/underscore' -import { evalExp } from 'src/render/syntax' -import assert from 'src/util/assert' -import { identifier, value, hash } from 'src/parser/lexical' -import TagToken from 'src/parser/tag-token' -import Token from 'src/parser/token' -import Scope from 'src/scope/scope' -import Hash from 'src/template/tag/hash' -import ITemplate from 'src/template/itemplate' -import ITagImplOptions from 'src/template/tag/itag-impl-options' -import ParseStream from 'src/parser/parse-stream' +import { mapSeries } from '../../util/promise' +import { isString, isObject, isArray } from '../../util/underscore' +import { evalExp } from '../../render/syntax' +import assert from '../../util/assert' +import { identifier, value, hash } from '../../parser/lexical' +import TagToken from '../../parser/tag-token' +import Token from '../../parser/token' +import Scope from '../../scope/scope' +import Hash from '../../template/tag/hash' +import ITemplate from '../../template/itemplate' +import ITagImplOptions from '../../template/tag/itag-impl-options' +import ParseStream from '../../parser/parse-stream' const re = new RegExp(`^(${identifier.source})\\s+in\\s+` + `(${value.source})` + diff --git a/src/builtin/tags/if.ts b/src/builtin/tags/if.ts index 7ef720af53..49effaf17f 100644 --- a/src/builtin/tags/if.ts +++ b/src/builtin/tags/if.ts @@ -1,10 +1,10 @@ -import { evalExp, isTruthy } from 'src/render/syntax' -import TagToken from 'src/parser/tag-token' -import Token from 'src/parser/token' -import Scope from 'src/scope/scope' -import ITemplate from 'src/template/itemplate' -import ITagImplOptions from 'src/template/tag/itag-impl-options' -import ParseStream from 'src/parser/parse-stream' +import { evalExp, isTruthy } from '../../render/syntax' +import TagToken from '../../parser/tag-token' +import Token from '../../parser/token' +import Scope from '../../scope/scope' +import ITemplate from '../../template/itemplate' +import ITagImplOptions from '../../template/tag/itag-impl-options' +import ParseStream from '../../parser/parse-stream' export default { parse: function (tagToken: TagToken, remainTokens: Token[]) { diff --git a/src/builtin/tags/include.ts b/src/builtin/tags/include.ts index 58dfb446ae..fcac6f7aff 100644 --- a/src/builtin/tags/include.ts +++ b/src/builtin/tags/include.ts @@ -1,11 +1,11 @@ -import assert from 'src/util/assert' -import { value, quotedLine } from 'src/parser/lexical' -import { evalValue } from 'src/render/syntax' -import BlockMode from 'src/scope/block-mode' -import TagToken from 'src/parser/tag-token' -import Scope from 'src/scope/scope' -import Hash from 'src/template/tag/hash' -import ITagImplOptions from 'src/template/tag/itag-impl-options' +import assert from '../../util/assert' +import { value, quotedLine } from '../../parser/lexical' +import { evalValue } from '../../render/syntax' +import BlockMode from '../../scope/block-mode' +import TagToken from '../../parser/tag-token' +import Scope from '../../scope/scope' +import Hash from '../../template/tag/hash' +import ITagImplOptions from '../../template/tag/itag-impl-options' const staticFileRE = /[^\s,]+/ const withRE = new RegExp(`with\\s+(${value.source})`) diff --git a/src/builtin/tags/increment.ts b/src/builtin/tags/increment.ts index ef3e9f2609..2e35a9a5a3 100644 --- a/src/builtin/tags/increment.ts +++ b/src/builtin/tags/increment.ts @@ -1,7 +1,7 @@ -import assert from 'src/util/assert' -import { identifier } from 'src/parser/lexical' -import { CaptureScope, AssignScope, IncrementScope } from 'src/scope/scopes' -import ITagImplOptions from 'src/template/tag/itag-impl-options' +import assert from '../../util/assert' +import { identifier } from '../../parser/lexical' +import { CaptureScope, AssignScope, IncrementScope } from '../../scope/scopes' +import ITagImplOptions from '../../template/tag/itag-impl-options' export default { parse: function (token) { diff --git a/src/builtin/tags/index.ts b/src/builtin/tags/index.ts index 757ed4c3d7..854d8128aa 100644 --- a/src/builtin/tags/index.ts +++ b/src/builtin/tags/index.ts @@ -15,7 +15,7 @@ import tablerow from './tablerow' import unless from './unless' import Break from './break' import Continue from './continue' -import ITagImplOptions from 'src/template/tag/itag-impl-options' +import ITagImplOptions from '../../template/tag/itag-impl-options' const tags: { [key: string]: ITagImplOptions } = { assign, 'for': For, capture, 'case': Case, comment, include, decrement, increment, cycle, 'if': If, layout, block, raw, tablerow, unless, 'break': Break, 'continue': Continue diff --git a/src/builtin/tags/layout.ts b/src/builtin/tags/layout.ts index ad87ff8c9f..4b650cfbdd 100644 --- a/src/builtin/tags/layout.ts +++ b/src/builtin/tags/layout.ts @@ -1,12 +1,12 @@ -import assert from 'src/util/assert' -import { value as rValue } from 'src/parser/lexical' -import { evalValue } from 'src/render/syntax' -import BlockMode from 'src/scope/block-mode' -import TagToken from 'src/parser/tag-token' -import Token from 'src/parser/token' -import Scope from 'src/scope/scope' -import Hash from 'src/template/tag/hash' -import ITagImplOptions from 'src/template/tag/itag-impl-options' +import assert from '../../util/assert' +import { value as rValue } from '../../parser/lexical' +import { evalValue } from '../../render/syntax' +import BlockMode from '../../scope/block-mode' +import TagToken from '../../parser/tag-token' +import Token from '../../parser/token' +import Scope from '../../scope/scope' +import Hash from '../../template/tag/hash' +import ITagImplOptions from '../../template/tag/itag-impl-options' const staticFileRE = /\S+/ diff --git a/src/builtin/tags/raw.ts b/src/builtin/tags/raw.ts index 0bd10978e6..7863d3e283 100644 --- a/src/builtin/tags/raw.ts +++ b/src/builtin/tags/raw.ts @@ -1,6 +1,6 @@ -import TagToken from 'src/parser/tag-token' -import Token from 'src/parser/token' -import ITagImplOptions from 'src/template/tag/itag-impl-options' +import TagToken from '../../parser/tag-token' +import Token from '../../parser/token' +import ITagImplOptions from '../../template/tag/itag-impl-options' export default { parse: function (tagToken: TagToken, remainTokens: Token[]) { diff --git a/src/builtin/tags/tablerow.ts b/src/builtin/tags/tablerow.ts index d9d8906e47..00e01d891c 100644 --- a/src/builtin/tags/tablerow.ts +++ b/src/builtin/tags/tablerow.ts @@ -1,14 +1,14 @@ -import { mapSeries } from 'src/util/promise' -import assert from 'src/util/assert' -import { evalExp } from 'src/render/syntax' -import { identifier, value, hash } from 'src/parser/lexical' -import TagToken from 'src/parser/tag-token' -import Token from 'src/parser/token' -import ITemplate from 'src/template/itemplate' -import Scope from 'src/scope/scope' -import Hash from 'src/template/tag/hash' -import ITagImplOptions from 'src/template/tag/itag-impl-options' -import ParseStream from 'src/parser/parse-stream' +import { mapSeries } from '../../util/promise' +import assert from '../../util/assert' +import { evalExp } from '../../render/syntax' +import { identifier, value, hash } from '../../parser/lexical' +import TagToken from '../../parser/tag-token' +import Token from '../../parser/token' +import ITemplate from '../../template/itemplate' +import Scope from '../../scope/scope' +import Hash from '../../template/tag/hash' +import ITagImplOptions from '../../template/tag/itag-impl-options' +import ParseStream from '../../parser/parse-stream' const re = new RegExp(`^(${identifier.source})\\s+in\\s+` + `(${value.source})` + diff --git a/src/builtin/tags/unless.ts b/src/builtin/tags/unless.ts index 577be87137..c5c45491df 100644 --- a/src/builtin/tags/unless.ts +++ b/src/builtin/tags/unless.ts @@ -1,9 +1,9 @@ -import { evalExp, isFalsy } from 'src/render/syntax' -import TagToken from 'src/parser/tag-token' -import Token from 'src/parser/token' -import Scope from 'src/scope/scope' -import ITagImplOptions from 'src/template/tag/itag-impl-options' -import ParseStream from 'src/parser/parse-stream' +import { evalExp, isFalsy } from '../../render/syntax' +import TagToken from '../../parser/tag-token' +import Token from '../../parser/token' +import Scope from '../../scope/scope' +import ITagImplOptions from '../../template/tag/itag-impl-options' +import ParseStream from '../../parser/parse-stream' export default { parse: function (tagToken: TagToken, remainTokens: Token[]) { diff --git a/src/drop/blank-drop.ts b/src/drop/blank-drop.ts index ceb3a8e476..b9dd815fe3 100644 --- a/src/drop/blank-drop.ts +++ b/src/drop/blank-drop.ts @@ -1,6 +1,6 @@ -import { isNil, isString } from 'src/util/underscore' -import { isDrop } from 'src/drop/idrop' -import { EmptyDrop } from 'src/drop/empty-drop' +import { isNil, isString } from '../util/underscore' +import { isDrop } from '../drop/idrop' +import { EmptyDrop } from '../drop/empty-drop' export class BlankDrop extends EmptyDrop { equals (value: any) { diff --git a/src/drop/empty-drop.ts b/src/drop/empty-drop.ts index 425bd8c025..bd752c209e 100644 --- a/src/drop/empty-drop.ts +++ b/src/drop/empty-drop.ts @@ -1,7 +1,7 @@ import { Drop } from './drop' import { IComparable } from './icomparable' -import { isObject, isString, isArray } from 'src/util/underscore' -import { IDrop } from 'src/drop/idrop' +import { isObject, isString, isArray } from '../util/underscore' +import { IDrop } from '../drop/idrop' export class EmptyDrop extends Drop implements IDrop, IComparable { equals (value: any) { diff --git a/src/drop/icomparable.ts b/src/drop/icomparable.ts index 0ce0b1c60b..a07a5501f8 100644 --- a/src/drop/icomparable.ts +++ b/src/drop/icomparable.ts @@ -1,4 +1,4 @@ -import { isFunction } from 'src/util/underscore' +import { isFunction } from '../util/underscore' export interface IComparable { equals: (rhs: any) => boolean diff --git a/src/drop/idrop.ts b/src/drop/idrop.ts index c28d295889..0089e9e258 100644 --- a/src/drop/idrop.ts +++ b/src/drop/idrop.ts @@ -1,5 +1,5 @@ import { Drop } from './drop' -import { isFunction } from 'src/util/underscore' +import { isFunction } from '../util/underscore' export interface IDrop { value(): any diff --git a/src/drop/null-drop.ts b/src/drop/null-drop.ts index 2d92770dbb..f6734c971a 100644 --- a/src/drop/null-drop.ts +++ b/src/drop/null-drop.ts @@ -1,8 +1,8 @@ import { Drop } from './drop' import { IComparable } from './icomparable' -import { isNil } from 'src/util/underscore' -import { IDrop, isDrop } from 'src/drop/idrop' -import { BlankDrop } from 'src/drop/blank-drop' +import { isNil } from '../util/underscore' +import { IDrop, isDrop } from '../drop/idrop' +import { BlankDrop } from '../drop/blank-drop' export class NullDrop extends Drop implements IDrop, IComparable { equals (value: any) { diff --git a/src/liquid.ts b/src/liquid.ts index 121df8a75c..7610ea1314 100644 --- a/src/liquid.ts +++ b/src/liquid.ts @@ -1,6 +1,6 @@ import Scope from './scope/scope' import * as Types from './types' -import fs from 'src/fs' +import fs from './fs/node' import * as _ from './util/underscore' import ITemplate from './template/itemplate' import Tokenizer from './parser/tokenizer' diff --git a/src/parser/delimited-token.ts b/src/parser/delimited-token.ts index 048bb7a688..625fa54bb1 100644 --- a/src/parser/delimited-token.ts +++ b/src/parser/delimited-token.ts @@ -1,5 +1,5 @@ import Token from './token' -import { last } from 'src/util/underscore' +import { last } from '../util/underscore' export default class DelimitedToken extends Token { trimLeft: boolean diff --git a/src/parser/parse-stream.ts b/src/parser/parse-stream.ts index 92424efa90..ea91df55fb 100644 --- a/src/parser/parse-stream.ts +++ b/src/parser/parse-stream.ts @@ -1,5 +1,5 @@ -import Token from 'src/parser/token' -import ITemplate from 'src/template/itemplate' +import Token from '../parser/token' +import ITemplate from '../template/itemplate' import TagToken from './tag-token' type ParseToken = ((token: Token, remainTokens: Array) => ITemplate) diff --git a/src/parser/parser.ts b/src/parser/parser.ts index 9e9feee886..defca40bb1 100644 --- a/src/parser/parser.ts +++ b/src/parser/parser.ts @@ -1,13 +1,13 @@ import { ParseError } from '../util/error' -import Liquid from 'src/liquid' +import Liquid from '../liquid' import ParseStream from './parse-stream' import Token from './token' import TagToken from './tag-token' import OutputToken from './output-token' -import Tag from 'src/template/tag/tag' -import Output from 'src/template/output' -import HTML from 'src/template/html' -import ITemplate from 'src/template/itemplate' +import Tag from '../template/tag/tag' +import Output from '../template/output' +import HTML from '../template/html' +import ITemplate from '../template/itemplate' export default class Parser { liquid: Liquid diff --git a/src/parser/tag-token.ts b/src/parser/tag-token.ts index 9a19a69667..a4ebc1d93d 100644 --- a/src/parser/tag-token.ts +++ b/src/parser/tag-token.ts @@ -1,5 +1,5 @@ import DelimitedToken from './delimited-token' -import { TokenizationError } from 'src/util/error' +import { TokenizationError } from '../util/error' import * as lexical from './lexical' export default class TagToken extends DelimitedToken { diff --git a/src/parser/tokenizer.ts b/src/parser/tokenizer.ts index 0eab47cb66..85781135cc 100644 --- a/src/parser/tokenizer.ts +++ b/src/parser/tokenizer.ts @@ -3,7 +3,7 @@ import HTMLToken from './html-token' import TagToken from './tag-token' import Token from './token' import OutputToken from './output-token' -import { TokenizationError } from 'src/util/error' +import { TokenizationError } from '../util/error' import { NormalizedFullOptions, applyDefault } from '../liquid-options' enum ParseState { HTML, OUTPUT, TAG } diff --git a/src/parser/whitespace-ctrl.ts b/src/parser/whitespace-ctrl.ts index 8c285833ea..30d00e91ce 100644 --- a/src/parser/whitespace-ctrl.ts +++ b/src/parser/whitespace-ctrl.ts @@ -1,7 +1,7 @@ -import DelimitedToken from 'src/parser/delimited-token' -import Token from 'src/parser/token' -import TagToken from 'src/parser/tag-token' -import { NormalizedFullOptions } from 'src/liquid-options' +import DelimitedToken from '../parser/delimited-token' +import Token from '../parser/token' +import TagToken from '../parser/tag-token' +import { NormalizedFullOptions } from '../liquid-options' export default function whiteSpaceCtrl (tokens: Token[], options: NormalizedFullOptions) { options = { greedy: true, ...options } diff --git a/src/render/render.ts b/src/render/render.ts index 8c35d9dc64..edb269cc67 100644 --- a/src/render/render.ts +++ b/src/render/render.ts @@ -1,7 +1,7 @@ -import { RenderError } from 'src/util/error' -import assert from 'src/util/assert' -import Scope from 'src/scope/scope' -import ITemplate from 'src/template/itemplate' +import { RenderError } from '../util/error' +import assert from '../util/assert' +import Scope from '../scope/scope' +import ITemplate from '../template/itemplate' export default class Render { async renderTemplates (templates: ITemplate[], scope: Scope) { diff --git a/src/render/syntax.ts b/src/render/syntax.ts index 027ac5995f..fe03533ab8 100644 --- a/src/render/syntax.ts +++ b/src/render/syntax.ts @@ -1,12 +1,12 @@ import * as lexical from '../parser/lexical' import assert from '../util/assert' -import Scope from 'src/scope/scope' -import { range, last } from 'src/util/underscore' -import { isComparable } from 'src/drop/icomparable' -import { NullDrop } from 'src/drop/null-drop' -import { EmptyDrop } from 'src/drop/empty-drop' -import { BlankDrop } from 'src/drop/blank-drop' -import { isDrop } from 'src/drop/idrop' +import Scope from '../scope/scope' +import { range, last } from '../util/underscore' +import { isComparable } from '../drop/icomparable' +import { NullDrop } from '../drop/null-drop' +import { EmptyDrop } from '../drop/empty-drop' +import { BlankDrop } from '../drop/blank-drop' +import { isDrop } from '../drop/idrop' const binaryOperators: {[key: string]: (lhs: any, rhs: any) => boolean} = { '==': (l: any, r: any) => { diff --git a/src/template/filter/filter.ts b/src/template/filter/filter.ts index ed22162944..212d7800ec 100644 --- a/src/template/filter/filter.ts +++ b/src/template/filter/filter.ts @@ -1,5 +1,5 @@ -import { evalValue } from 'src/render/syntax' -import Scope from 'src/scope/scope' +import { evalValue } from '../../render/syntax' +import Scope from '../../scope/scope' import { FilterImpl } from './filter-impl' export default class Filter { diff --git a/src/template/html.ts b/src/template/html.ts index a4e1c4e92b..a5babff96f 100644 --- a/src/template/html.ts +++ b/src/template/html.ts @@ -1,6 +1,6 @@ -import Template from 'src/template/template' -import ITemplate from 'src/template/itemplate' -import HTMLToken from 'src/parser/html-token' +import Template from '../template/template' +import ITemplate from '../template/itemplate' +import HTMLToken from '../parser/html-token' export default class extends Template implements ITemplate { str: string diff --git a/src/template/itemplate.ts b/src/template/itemplate.ts index 4a214c828d..9f4745a18a 100644 --- a/src/template/itemplate.ts +++ b/src/template/itemplate.ts @@ -1,5 +1,5 @@ -import Scope from 'src/scope/scope' -import Token from 'src/parser/token' +import Scope from '../scope/scope' +import Token from '../parser/token' export default interface ITemplate { token: Token; diff --git a/src/template/output.ts b/src/template/output.ts index 2628397f73..317b36a18d 100644 --- a/src/template/output.ts +++ b/src/template/output.ts @@ -1,9 +1,9 @@ import Value from './value' -import { stringify } from 'src/util/underscore' -import Template from 'src/template/template' -import ITemplate from 'src/template/itemplate' -import Scope from 'src/scope/scope' -import OutputToken from 'src/parser/output-token' +import { stringify } from '../util/underscore' +import Template from '../template/template' +import ITemplate from '../template/itemplate' +import Scope from '../scope/scope' +import OutputToken from '../parser/output-token' export default class Output extends Template implements ITemplate { value: Value diff --git a/src/template/tag/hash.ts b/src/template/tag/hash.ts index 0cdfc1030b..66a587e940 100644 --- a/src/template/tag/hash.ts +++ b/src/template/tag/hash.ts @@ -1,6 +1,6 @@ -import { hashCapture } from 'src/parser/lexical' -import { evalValue } from 'src/render/syntax' -import Scope from 'src/scope/scope' +import { hashCapture } from '../../parser/lexical' +import { evalValue } from '../../render/syntax' +import Scope from '../../scope/scope' /** * Key-Value Pairs Representing Tag Arguments diff --git a/src/template/tag/itag-impl-options.ts b/src/template/tag/itag-impl-options.ts index de8a745bf2..29294264c6 100644 --- a/src/template/tag/itag-impl-options.ts +++ b/src/template/tag/itag-impl-options.ts @@ -1,7 +1,7 @@ -import Scope from 'src/scope/scope' -import TagToken from 'src/parser/tag-token' -import Token from 'src/parser/token' -import Hash from 'src/template/tag/hash' +import Scope from '../../scope/scope' +import TagToken from '../../parser/tag-token' +import Token from '../../parser/token' +import Hash from '../../template/tag/hash' import ITagImpl from './itag-impl' export default interface ITagImplOptions { diff --git a/src/template/tag/itag-impl.ts b/src/template/tag/itag-impl.ts index b0b7182bb4..6216875f47 100644 --- a/src/template/tag/itag-impl.ts +++ b/src/template/tag/itag-impl.ts @@ -1,4 +1,4 @@ -import Liquid from 'src/liquid' +import Liquid from '../../liquid' import ITagImplOptions from './itag-impl-options' export default interface ITagImpl extends ITagImplOptions { diff --git a/src/template/tag/tag.ts b/src/template/tag/tag.ts index 6563126816..f5f8908d28 100644 --- a/src/template/tag/tag.ts +++ b/src/template/tag/tag.ts @@ -1,14 +1,14 @@ -import { create, stringify } from 'src/util/underscore' -import assert from 'src/util/assert' -import Scope from 'src/scope/scope' +import { create, stringify } from '../../util/underscore' +import assert from '../../util/assert' +import Scope from '../../scope/scope' import ITagImpl from './itag-impl' import ITagImplOptions from './itag-impl-options' -import Liquid from 'src/liquid' +import Liquid from '../../liquid' import Hash from './hash' -import Template from 'src/template/template' -import ITemplate from 'src/template/itemplate' -import TagToken from 'src/parser/tag-token' -import Token from 'src/parser/token' +import Template from '../../template/template' +import ITemplate from '../../template/itemplate' +import TagToken from '../../parser/tag-token' +import Token from '../../parser/token' export default class Tag extends Template implements ITemplate { name: string diff --git a/src/template/value.ts b/src/template/value.ts index 69becf904a..5a2cb1af67 100644 --- a/src/template/value.ts +++ b/src/template/value.ts @@ -1,6 +1,6 @@ -import { evalExp } from 'src/render/syntax' +import { evalExp } from '../render/syntax' import Filter from './filter/filter' -import Scope from 'src/scope/scope' +import Scope from '../scope/scope' enum ParseState { INIT = 0, diff --git a/src/util/error.ts b/src/util/error.ts index 3b81ceda37..b5d0c14928 100644 --- a/src/util/error.ts +++ b/src/util/error.ts @@ -1,6 +1,6 @@ import * as _ from './underscore' -import Token from 'src/parser/token' -import ITemplate from 'src/template/itemplate' +import Token from '../parser/token' +import ITemplate from '../template/itemplate' abstract class LiquidError extends Error { private token: Token diff --git a/src/util/underscore.ts b/src/util/underscore.ts index d302bbe741..a9a3b20387 100644 --- a/src/util/underscore.ts +++ b/src/util/underscore.ts @@ -62,13 +62,6 @@ export function isArray (value: any): value is any[] { return toStr.call(value) === '[object Array]' } -export function isError (value: any): value is Error { - const signature = toStr.call(value) - // [object XXXError] - return signature.substr(-6, 5) === 'Error' || - (typeof value.message === 'string' && typeof value.name === 'string') -} - /* * Iterates over own enumerable string keyed properties of an object and invokes iteratee for each property. * The iteratee is invoked with three arguments: (value, key, object). diff --git a/test/integration/builtin/filters/array.ts b/test/integration/builtin/filters/array.ts index 01e07b2f4b..902338da02 100644 --- a/test/integration/builtin/filters/array.ts +++ b/test/integration/builtin/filters/array.ts @@ -1,4 +1,4 @@ -import { test } from 'test/stub/render' +import { test } from '../../../stub/render' describe('filters/array', function () { describe('join', function () { diff --git a/test/integration/builtin/filters/date.ts b/test/integration/builtin/filters/date.ts index 4f9324492a..9f111bd7b1 100644 --- a/test/integration/builtin/filters/date.ts +++ b/test/integration/builtin/filters/date.ts @@ -1,4 +1,4 @@ -import { test, ctx } from 'test/stub/render' +import { test, ctx } from '../../../stub/render' describe('filters/date', function () { it('should support date: %a %b %d %Y', function () { diff --git a/test/integration/builtin/filters/html.ts b/test/integration/builtin/filters/html.ts index 746a7847cd..cd63c286a2 100644 --- a/test/integration/builtin/filters/html.ts +++ b/test/integration/builtin/filters/html.ts @@ -1,4 +1,4 @@ -import { test } from 'test/stub/render' +import { test } from '../../../stub/render' describe('filters/html', function () { describe('escape', function () { diff --git a/test/integration/builtin/filters/math.ts b/test/integration/builtin/filters/math.ts index 61f9778255..95a4ec0490 100644 --- a/test/integration/builtin/filters/math.ts +++ b/test/integration/builtin/filters/math.ts @@ -1,4 +1,4 @@ -import { test } from 'test/stub/render' +import { test } from '../../../stub/render' describe('filters/math', function () { describe('abs', function () { diff --git a/test/integration/builtin/filters/object.ts b/test/integration/builtin/filters/object.ts index 122feb2a31..a135e4b822 100644 --- a/test/integration/builtin/filters/object.ts +++ b/test/integration/builtin/filters/object.ts @@ -1,4 +1,4 @@ -import { test } from 'test/stub/render' +import { test } from '../../../stub/render' describe('filters/object', function () { describe('default', function () { diff --git a/test/integration/builtin/filters/string.ts b/test/integration/builtin/filters/string.ts index fcb00f2cb7..0839835d14 100644 --- a/test/integration/builtin/filters/string.ts +++ b/test/integration/builtin/filters/string.ts @@ -1,4 +1,4 @@ -import { test } from 'test/stub/render' +import { test } from '../../../stub/render' describe('filters/string', function () { describe('append', function () { diff --git a/test/integration/builtin/filters/url.ts b/test/integration/builtin/filters/url.ts index 02351197ec..c09a81f2e9 100644 --- a/test/integration/builtin/filters/url.ts +++ b/test/integration/builtin/filters/url.ts @@ -1,4 +1,4 @@ -import { test } from 'test/stub/render' +import { test } from '../../../stub/render' describe('filters/url', function () { describe('url_decode', function () { diff --git a/test/integration/builtin/tags/assign.ts b/test/integration/builtin/tags/assign.ts index f21dcffc06..8773f95d83 100644 --- a/test/integration/builtin/tags/assign.ts +++ b/test/integration/builtin/tags/assign.ts @@ -1,4 +1,4 @@ -import Liquid from 'src/liquid' +import Liquid from '../../../../src/liquid' import { expect, use } from 'chai' import * as chaiAsPromised from 'chai-as-promised' diff --git a/test/integration/builtin/tags/capture.ts b/test/integration/builtin/tags/capture.ts index 5a3b89872b..795aa590b8 100644 --- a/test/integration/builtin/tags/capture.ts +++ b/test/integration/builtin/tags/capture.ts @@ -1,4 +1,4 @@ -import Liquid from 'src/liquid' +import Liquid from '../../../../src/liquid' import { expect, use } from 'chai' import * as chaiAsPromised from 'chai-as-promised' diff --git a/test/integration/builtin/tags/case.ts b/test/integration/builtin/tags/case.ts index 8010335e4c..055fe02024 100644 --- a/test/integration/builtin/tags/case.ts +++ b/test/integration/builtin/tags/case.ts @@ -1,4 +1,4 @@ -import Liquid from 'src/liquid' +import Liquid from '../../../../src/liquid' import { expect, use } from 'chai' import * as chaiAsPromised from 'chai-as-promised' diff --git a/test/integration/builtin/tags/comment.ts b/test/integration/builtin/tags/comment.ts index cdd3644cb6..24a157b93d 100644 --- a/test/integration/builtin/tags/comment.ts +++ b/test/integration/builtin/tags/comment.ts @@ -1,4 +1,4 @@ -import Liquid from 'src/liquid' +import Liquid from '../../../../src/liquid' import { expect, use } from 'chai' import * as chaiAsPromised from 'chai-as-promised' diff --git a/test/integration/builtin/tags/cycle.ts b/test/integration/builtin/tags/cycle.ts index 2c25cea59a..f9ba4d6e41 100644 --- a/test/integration/builtin/tags/cycle.ts +++ b/test/integration/builtin/tags/cycle.ts @@ -1,4 +1,4 @@ -import Liquid from 'src/liquid' +import Liquid from '../../../../src/liquid' import { expect, use } from 'chai' import * as chaiAsPromised from 'chai-as-promised' diff --git a/test/integration/builtin/tags/decrement.ts b/test/integration/builtin/tags/decrement.ts index 6dcf5ff7d5..58fdbbc042 100644 --- a/test/integration/builtin/tags/decrement.ts +++ b/test/integration/builtin/tags/decrement.ts @@ -1,4 +1,4 @@ -import Liquid from 'src/liquid' +import Liquid from '../../../../src/liquid' import { expect, use } from 'chai' import * as chaiAsPromised from 'chai-as-promised' diff --git a/test/integration/builtin/tags/for.ts b/test/integration/builtin/tags/for.ts index cf6993fa2d..aa31b923a0 100644 --- a/test/integration/builtin/tags/for.ts +++ b/test/integration/builtin/tags/for.ts @@ -1,7 +1,7 @@ -import Liquid from 'src/liquid' +import Liquid from '../../../../src/liquid' import { expect, use } from 'chai' import * as chaiAsPromised from 'chai-as-promised' -import { Context } from 'src/scope/scope' +import { Context } from '../../../../src/scope/scope' use(chaiAsPromised) diff --git a/test/integration/builtin/tags/if.ts b/test/integration/builtin/tags/if.ts index c624a21e17..1f267912b3 100644 --- a/test/integration/builtin/tags/if.ts +++ b/test/integration/builtin/tags/if.ts @@ -1,4 +1,4 @@ -import Liquid from 'src/liquid' +import Liquid from '../../../../src/liquid' import { expect } from 'chai' describe('tags/if', function () { diff --git a/test/integration/builtin/tags/include.ts b/test/integration/builtin/tags/include.ts index f994f86dee..dc8787b73e 100644 --- a/test/integration/builtin/tags/include.ts +++ b/test/integration/builtin/tags/include.ts @@ -1,6 +1,6 @@ -import Liquid from 'src/liquid' +import Liquid from '../../../../src/liquid' import { expect } from 'chai' -import { mock, restore } from 'test/stub/mockfs' +import { mock, restore } from '../../../stub/mockfs' describe('tags/include', function () { let liquid: Liquid diff --git a/test/integration/builtin/tags/increment.ts b/test/integration/builtin/tags/increment.ts index 3a94204126..985dbdede2 100644 --- a/test/integration/builtin/tags/increment.ts +++ b/test/integration/builtin/tags/increment.ts @@ -1,4 +1,4 @@ -import Liquid from 'src/liquid' +import Liquid from '../../../../src/liquid' import { expect, use } from 'chai' import * as chaiAsPromised from 'chai-as-promised' diff --git a/test/integration/builtin/tags/layout.ts b/test/integration/builtin/tags/layout.ts index c15f09914f..25e7c323de 100644 --- a/test/integration/builtin/tags/layout.ts +++ b/test/integration/builtin/tags/layout.ts @@ -1,6 +1,6 @@ -import Liquid from 'src/liquid' +import Liquid from '../../../../src/liquid' import { expect } from 'chai' -import { mock, restore } from 'test/stub/mockfs' +import { mock, restore } from '../../../stub/mockfs' describe('tags/layout', function () { let liquid: Liquid diff --git a/test/integration/builtin/tags/raw.ts b/test/integration/builtin/tags/raw.ts index c499badca0..e916733832 100644 --- a/test/integration/builtin/tags/raw.ts +++ b/test/integration/builtin/tags/raw.ts @@ -1,4 +1,4 @@ -import Liquid from 'src/liquid' +import Liquid from '../../../../src/liquid' import { expect } from 'chai' describe('tags/raw', function () { diff --git a/test/integration/builtin/tags/tablerow.ts b/test/integration/builtin/tags/tablerow.ts index fc736aec2d..7fd1adb72c 100644 --- a/test/integration/builtin/tags/tablerow.ts +++ b/test/integration/builtin/tags/tablerow.ts @@ -1,4 +1,4 @@ -import Liquid from 'src/liquid' +import Liquid from '../../../../src/liquid' import { expect } from 'chai' describe('tags/tablerow', function () { diff --git a/test/integration/builtin/tags/unless.ts b/test/integration/builtin/tags/unless.ts index 04f2e36a57..d64a1f0d46 100644 --- a/test/integration/builtin/tags/unless.ts +++ b/test/integration/builtin/tags/unless.ts @@ -1,4 +1,4 @@ -import Liquid from 'src/liquid' +import Liquid from '../../../../src/liquid' import { expect, use } from 'chai' import * as chaiAsPromised from 'chai-as-promised' diff --git a/test/integration/drop/blank-drop.ts b/test/integration/drop/blank-drop.ts index 75e54ea3b5..37b091b9df 100644 --- a/test/integration/drop/blank-drop.ts +++ b/test/integration/drop/blank-drop.ts @@ -1,5 +1,5 @@ import { expect } from 'chai' -import Liquid from 'src/liquid' +import Liquid from '../../../src/liquid' describe('drop/blank-drop', function () { let liquid: Liquid diff --git a/test/integration/drop/empty-drop.ts b/test/integration/drop/empty-drop.ts index c084531c3e..1f2a87b047 100644 --- a/test/integration/drop/empty-drop.ts +++ b/test/integration/drop/empty-drop.ts @@ -1,5 +1,5 @@ import { expect } from 'chai' -import Liquid from 'src/liquid' +import Liquid from '../../../src/liquid' describe('drop/empty-drop', function () { let liquid: Liquid diff --git a/test/integration/drop/null-drop.ts b/test/integration/drop/null-drop.ts index 05be2f399a..654fe4a4bd 100644 --- a/test/integration/drop/null-drop.ts +++ b/test/integration/drop/null-drop.ts @@ -1,5 +1,5 @@ import { expect } from 'chai' -import Liquid from 'src/liquid' +import Liquid from '../../../src/liquid' describe('drop/null-drop', function () { let liquid: Liquid diff --git a/test/integration/liquid/cache.ts b/test/integration/liquid/cache.ts index b1d2bdfcf1..a3a1d0e230 100644 --- a/test/integration/liquid/cache.ts +++ b/test/integration/liquid/cache.ts @@ -1,6 +1,6 @@ import { expect } from 'chai' -import Liquid from 'src/liquid' -import { mock, restore } from 'test/stub/mockfs' +import Liquid from '../../../src/liquid' +import { mock, restore } from '../../stub/mockfs' describe('LiquidOptions#cache', function () { let engine: Liquid diff --git a/test/integration/liquid/delimiter.ts b/test/integration/liquid/delimiter.ts index 2f97870d6d..5da2ee5e61 100644 --- a/test/integration/liquid/delimiter.ts +++ b/test/integration/liquid/delimiter.ts @@ -1,5 +1,5 @@ import { expect } from 'chai' -import Liquid from 'src/liquid' +import Liquid from '../../../src/liquid' describe('LiquidOptions#*_delimiter_*', function () { it('should respect tag_delimiter_*', async function () { diff --git a/test/integration/liquid/liquid-options.ts b/test/integration/liquid/liquid-options.ts index f625c7332a..80e9a7b1ea 100644 --- a/test/integration/liquid/liquid-options.ts +++ b/test/integration/liquid/liquid-options.ts @@ -1,4 +1,4 @@ -import { normalize } from 'src/liquid-options' +import { normalize } from '../../../src/liquid-options' import { expect } from 'chai' describe('LiquidOptions', function () { diff --git a/test/integration/liquid/liquid.ts b/test/integration/liquid/liquid.ts index 30e0853290..2aa15adbdb 100644 --- a/test/integration/liquid/liquid.ts +++ b/test/integration/liquid/liquid.ts @@ -1,6 +1,6 @@ -import Liquid from 'src/liquid' +import Liquid from '../../../src/liquid' import * as chai from 'chai' -import { mock, restore } from 'test/stub/mockfs' +import { mock, restore } from '../../stub/mockfs' const expect = chai.expect diff --git a/test/integration/liquid/strict.ts b/test/integration/liquid/strict.ts index e8fce1d275..585c87af7a 100644 --- a/test/integration/liquid/strict.ts +++ b/test/integration/liquid/strict.ts @@ -1,4 +1,4 @@ -import Liquid from 'src/liquid' +import Liquid from '../../../src/liquid' import { expect } from 'chai' describe('LiquidOptions#strict_*', function () { diff --git a/test/integration/liquid/trimming.ts b/test/integration/liquid/trimming.ts index 331d0c40f5..9137c06783 100644 --- a/test/integration/liquid/trimming.ts +++ b/test/integration/liquid/trimming.ts @@ -1,5 +1,5 @@ import { expect } from 'chai' -import Liquid from 'src/liquid' +import Liquid from '../../../src/liquid' describe('LiquidOptions#trimming', function () { const ctx = { name: 'harttle' } diff --git a/test/integration/util/error.ts b/test/integration/util/error.ts index 8ad9a09eaf..caf3bc9f75 100644 --- a/test/integration/util/error.ts +++ b/test/integration/util/error.ts @@ -1,7 +1,7 @@ import { expect } from 'chai' -import Liquid from 'src/liquid' +import Liquid from '../../../src/liquid' import * as path from 'path' -import { mock, restore } from 'test/stub/mockfs' +import { mock, restore } from '../../stub/mockfs' let engine = new Liquid() const strictEngine = new Liquid({ diff --git a/test/mocha.opts b/test/mocha.opts index bdc416ac04..23e391a1e0 100644 --- a/test/mocha.opts +++ b/test/mocha.opts @@ -1,2 +1 @@ --require ts-node/register ---require tsconfig-paths/register diff --git a/test/stub/mockfs.ts b/test/stub/mockfs.ts index 60aee14453..72682e5879 100644 --- a/test/stub/mockfs.ts +++ b/test/stub/mockfs.ts @@ -1,5 +1,5 @@ -import { isString, forOwn } from 'src/util/underscore' -import fs from 'src/fs' +import { isString, forOwn } from '../../src/util/underscore' +import fs from '../../src/fs/node' type fileDescriptor = { mode: string, content: string } diff --git a/test/stub/render.ts b/test/stub/render.ts index d7083e8dfd..2f0abdc991 100644 --- a/test/stub/render.ts +++ b/test/stub/render.ts @@ -1,4 +1,4 @@ -import Liquid from 'src/liquid' +import Liquid from '../../src/liquid' import { expect } from 'chai' const liquid = new Liquid() diff --git a/test/unit/fs/browser.ts b/test/unit/fs/browser.ts index 06308d9b76..4e383e2a53 100644 --- a/test/unit/fs/browser.ts +++ b/test/unit/fs/browser.ts @@ -1,4 +1,4 @@ -import fs from 'src/fs/browser' +import fs from '../../../src/fs/browser' import * as sinon from 'sinon' import { expect, use } from 'chai' import * as chaiAsPromised from 'chai-as-promised' diff --git a/test/unit/fs/node.ts b/test/unit/fs/node.ts index 628ce977d7..d0feaa8dd1 100644 --- a/test/unit/fs/node.ts +++ b/test/unit/fs/node.ts @@ -1,4 +1,4 @@ -import fs from 'src/fs/node' +import fs from '../../../src/fs/node' import * as path from 'path' import { expect, use } from 'chai' import * as chaiAsPromised from 'chai-as-promised' diff --git a/test/unit/parser/lexical.ts b/test/unit/parser/lexical.ts index 223d36edfb..e53499f6bb 100644 --- a/test/unit/parser/lexical.ts +++ b/test/unit/parser/lexical.ts @@ -1,7 +1,7 @@ import * as chai from 'chai' const expect = chai.expect -const lexical = require('src/parser/lexical') +const lexical = require('../../../src/parser/lexical') describe('lexical', function () { it('should test range literal', function () { diff --git a/test/unit/parser/tokenizer.ts b/test/unit/parser/tokenizer.ts index 9b45147647..661f12ea29 100644 --- a/test/unit/parser/tokenizer.ts +++ b/test/unit/parser/tokenizer.ts @@ -1,8 +1,8 @@ import { expect } from 'chai' -import Tokenizer from 'src/parser/tokenizer' -import TagToken from 'src/parser/tag-token' -import OutputToken from 'src/parser/output-token' -import HTMLToken from 'src/parser/html-token' +import Tokenizer from '../../../src/parser/tokenizer' +import TagToken from '../../../src/parser/tag-token' +import OutputToken from '../../../src/parser/output-token' +import HTMLToken from '../../../src/parser/html-token' describe('tokenizer', function () { const tokenizer = new Tokenizer() diff --git a/test/unit/render/render.ts b/test/unit/render/render.ts index ead6c07026..214ce02210 100644 --- a/test/unit/render/render.ts +++ b/test/unit/render/render.ts @@ -1,10 +1,10 @@ import { expect } from 'chai' -import Scope from 'src/scope/scope' -import Token from 'src/parser/token' -import Tag from 'src/template/tag/tag' -import Filter from 'src/template/filter/filter' -import Render from 'src/render/render' -import HTML from 'src/template/html' +import Scope from '../../../src/scope/scope' +import Token from '../../../src/parser/token' +import Tag from '../../../src/template/tag/tag' +import Filter from '../../../src/template/filter/filter' +import Render from '../../../src/render/render' +import HTML from '../../../src/template/html' describe('render', function () { let render: Render diff --git a/test/unit/render/syntax.ts b/test/unit/render/syntax.ts index 562a897dbc..5621c3e0c8 100644 --- a/test/unit/render/syntax.ts +++ b/test/unit/render/syntax.ts @@ -1,6 +1,6 @@ -import Scope from 'src/scope/scope' +import Scope from '../../../src/scope/scope' import { expect } from 'chai' -import { evalExp, evalValue, isTruthy } from 'src/render/syntax' +import { evalExp, evalValue, isTruthy } from '../../../src/render/syntax' describe('render/syntax', function () { let scope: Scope diff --git a/test/unit/scope/scope.ts b/test/unit/scope/scope.ts index 3614ec0f08..6a18d2ccc3 100644 --- a/test/unit/scope/scope.ts +++ b/test/unit/scope/scope.ts @@ -1,5 +1,5 @@ import * as chai from 'chai' -import Scope, { Context } from 'src/scope/scope' +import Scope, { Context } from '../../../src/scope/scope' const expect = chai.expect diff --git a/test/unit/template/filter/filter.ts b/test/unit/template/filter/filter.ts index 1c3ef28f14..48d9da7646 100644 --- a/test/unit/template/filter/filter.ts +++ b/test/unit/template/filter/filter.ts @@ -1,8 +1,8 @@ import * as chai from 'chai' import * as sinon from 'sinon' import * as sinonChai from 'sinon-chai' -import Filter from 'src/template/filter/filter' -import Scope from 'src/scope/scope' +import Filter from '../../../../src/template/filter/filter' +import Scope from '../../../../src/scope/scope' chai.use(sinonChai) const expect = chai.expect diff --git a/test/unit/template/output.ts b/test/unit/template/output.ts index 6c9da5d846..e8b773e835 100644 --- a/test/unit/template/output.ts +++ b/test/unit/template/output.ts @@ -1,8 +1,8 @@ import * as chai from 'chai' -import Scope from 'src/scope/scope' -import Output from 'src/template/output' -import OutputToken from 'src/parser/output-token' -import Filter from 'src/template/filter/filter' +import Scope from '../../../src/scope/scope' +import Output from '../../../src/template/output' +import OutputToken from '../../../src/parser/output-token' +import Filter from '../../../src/template/filter/filter' const expect = chai.expect diff --git a/test/unit/template/tag.ts b/test/unit/template/tag.ts index bc9cef4474..4dc674b12e 100644 --- a/test/unit/template/tag.ts +++ b/test/unit/template/tag.ts @@ -1,10 +1,10 @@ import * as chai from 'chai' -import Tag from 'src/template/tag/tag' -import Scope from 'src/scope/scope' +import Tag from '../../../src/template/tag/tag' +import Scope from '../../../src/scope/scope' import * as sinon from 'sinon' import * as sinonChai from 'sinon-chai' -import Liquid from 'src/liquid' -import TagToken from 'src/parser/tag-token' +import Liquid from '../../../src/liquid' +import TagToken from '../../../src/parser/tag-token' chai.use(sinonChai) const expect = chai.expect diff --git a/test/unit/template/value.ts b/test/unit/template/value.ts index 5285808509..aa6c288ede 100644 --- a/test/unit/template/value.ts +++ b/test/unit/template/value.ts @@ -1,9 +1,9 @@ import * as chai from 'chai' import * as sinonChai from 'sinon-chai' import * as sinon from 'sinon' -import Scope from 'src/scope/scope' -import Filter from 'src/template/filter/filter' -import Value from 'src/template/value' +import Scope from '../../../src/scope/scope' +import Filter from '../../../src/template/filter/filter' +import Value from '../../../src/template/value' chai.use(sinonChai) diff --git a/test/unit/util/assert.ts b/test/unit/util/assert.ts index acf94ff4ed..046b06ed5c 100644 --- a/test/unit/util/assert.ts +++ b/test/unit/util/assert.ts @@ -1,5 +1,5 @@ import * as chai from 'chai' -import assert from 'src/util/assert' +import assert from '../../../src/util/assert' const expect = chai.expect diff --git a/test/unit/util/promise.ts b/test/unit/util/promise.ts index 381a791b20..9a1d2cc61b 100644 --- a/test/unit/util/promise.ts +++ b/test/unit/util/promise.ts @@ -7,7 +7,7 @@ const expect = chai.expect chai.use(sinonChai) chai.use(chaiAsPromised) -const P = require('src/util/promise') +const P = require('../../../src/util/promise') describe('util/promise', function () { describe('.mapSeries()', async function () { diff --git a/test/unit/util/strftime.ts b/test/unit/util/strftime.ts index 6517cf82a9..7d2a977828 100644 --- a/test/unit/util/strftime.ts +++ b/test/unit/util/strftime.ts @@ -1,5 +1,5 @@ import * as chai from 'chai' -import t from 'src/util/strftime' +import t from '../../../src/util/strftime' const expect = chai.expect diff --git a/test/unit/util/underscore.ts b/test/unit/util/underscore.ts index 8e037d3e43..dd5e588883 100644 --- a/test/unit/util/underscore.ts +++ b/test/unit/util/underscore.ts @@ -1,30 +1,14 @@ import * as chai from 'chai' import * as sinonChai from 'sinon-chai' import * as sinon from 'sinon' -import { RenderError, RenderBreakError } from 'src/util/error' -import * as _ from 'src/util/underscore' -import ITemplate from 'src/template/itemplate' +import { RenderError, RenderBreakError } from '../../../src/util/error' +import * as _ from '../../../src/util/underscore' +import ITemplate from '../../../src/template/itemplate' const expect = chai.expect chai.use(sinonChai) describe('util/underscore', function () { - describe('.isError()', function () { - it('should return true for new Error', function () { - expect(_.isError(new Error())).to.be.true - }) - it('should return true for RenderError', function () { - const tpl = { - token: { - input: 'xx' - } - } as ITemplate - expect(_.isError(new RenderError(new Error(), tpl))).to.be.true - }) - it('should return true for RenderBreakError', function () { - expect(_.isError(new RenderBreakError(''))).to.be.true - }) - }) describe('.isString()', function () { it('should return true for literal string', function () { expect(_.isString('foo')).to.be.true diff --git a/tsconfig.json b/tsconfig.json index 37b3e3eda1..8cbb709e58 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -8,14 +8,7 @@ "allowSyntheticDefaultImports": true, "resolveJsonModule": true, "strict": true, - "suppressImplicitAnyIndexErrors": true, - "baseUrl": ".", - "paths": { - "src/fs": ["src/fs/node"], - "benchmark": ["node_modules/benchmark"], - "src/*": ["src/*"], - "test/*": ["test/*"] - } + "suppressImplicitAnyIndexErrors": true }, "all": true, "exclude": [ "node_modules", "dist" ]