This commit is contained in:
harttle
2019-01-28 18:06:47 +08:00
parent 7a2e036c79
commit 8a881ac69a
41 changed files with 116 additions and 116 deletions
+2 -2
View File
@@ -1,7 +1,7 @@
import * as lexical from './lexical.js'
import {evalValue} from './syntax.js'
import { evalValue } from './syntax.js'
import assert from './util/assert.js'
import {assign, create} from './util/underscore.js'
import { assign, create } from './util/underscore.js'
const valueRE = new RegExp(`${lexical.value.source}`, 'g')
+1 -1
View File
@@ -1,6 +1,6 @@
import strftime from './util/strftime.js'
import * as _ from './util/underscore.js'
import {isTruthy} from './syntax.js'
import { isTruthy } from './syntax.js'
const escapeMap = {
'&': '&',
+2 -2
View File
@@ -8,8 +8,8 @@ import Render from './render.js'
import Tag from './tag.js'
import Filter from './filter.js'
import Parser from './parser'
import {isTruthy, isFalsy, evalExp, evalValue} from './syntax.js'
import {ParseError, TokenizationError, RenderBreakError, AssertionError} from './util/error.js'
import { isTruthy, isFalsy, evalExp, evalValue } from './syntax.js'
import { ParseError, TokenizationError, RenderBreakError, AssertionError } from './util/error.js'
import tags from './tags/index.js'
import filters from './filters.js'
+2 -2
View File
@@ -1,6 +1,6 @@
import * as lexical from './lexical.js'
import {create} from './util/underscore.js'
import {ParseError} from './util/error.js'
import { create } from './util/underscore.js'
import { ParseError } from './util/error.js'
import assert from './util/assert.js'
export default function (Tag, Filter) {
+3 -3
View File
@@ -1,6 +1,6 @@
import {evalExp} from './syntax.js'
import {RenderBreakError, RenderError} from './util/error.js'
import {stringify, create} from './util/underscore.js'
import { evalExp } from './syntax.js'
import { RenderBreakError, RenderError } from './util/error.js'
import { stringify, create } from './util/underscore.js'
import assert from './util/assert.js'
const render = {
+3 -3
View File
@@ -1,6 +1,6 @@
import {hashCapture} from './lexical.js'
import {create} from './util/underscore.js'
import {evalValue} from './syntax.js'
import { hashCapture } from './lexical.js'
import { create } from './util/underscore.js'
import { evalValue } from './syntax.js'
import assert from './util/assert.js'
function hash (markup, scope) {
+3 -3
View File
@@ -1,10 +1,10 @@
import assert from '../util/assert.js'
import {identifier} from '../lexical.js'
import {create} from '../util/underscore.js'
import { identifier } from '../lexical.js'
import { create } from '../util/underscore.js'
export default function (liquid, Liquid) {
const re = new RegExp(`(${identifier.source})\\s*=([^]*)`)
const {AssignScope} = Liquid.Types
const { AssignScope } = Liquid.Types
liquid.registerTag('assign', {
parse: function (token) {
+3 -3
View File
@@ -1,10 +1,10 @@
import assert from '../util/assert.js'
import {create} from '../util/underscore.js'
import {identifier} from '../lexical.js'
import { create } from '../util/underscore.js'
import { identifier } from '../lexical.js'
export default function (liquid, Liquid) {
const re = new RegExp(`(${identifier.source})`)
const {CaptureScope} = Liquid.Types
const { CaptureScope } = Liquid.Types
liquid.registerTag('capture', {
parse: function (tagToken, remainTokens) {
+1 -1
View File
@@ -1,5 +1,5 @@
import assert from '../util/assert.js'
import {value as rValue} from '../lexical.js'
import { value as rValue } from '../lexical.js'
export default function (liquid, Liquid) {
const groupRE = new RegExp(`^(?:(${rValue.source})\\s*:\\s*)?(.*)$`)
+3 -3
View File
@@ -1,9 +1,9 @@
import {create} from '../util/underscore.js'
import { create } from '../util/underscore.js'
import assert from '../util/assert.js'
import {identifier} from '../lexical.js'
import { identifier } from '../lexical.js'
export default function (liquid, Liquid) {
const {CaptureScope, AssignScope, DecrementScope} = Liquid.Types
const { CaptureScope, AssignScope, DecrementScope } = Liquid.Types
liquid.registerTag('decrement', {
parse: function (token) {
+4 -4
View File
@@ -1,7 +1,7 @@
import {mapSeries} from '../util/promise.js'
import {isString, isObject, isArray} from '../util/underscore.js'
import { mapSeries } from '../util/promise.js'
import { isString, isObject, isArray } from '../util/underscore.js'
import assert from '../util/assert.js'
import {identifier, value, hash} from '../lexical.js'
import { identifier, value, hash } from '../lexical.js'
export default function (liquid, Liquid) {
const RenderBreakError = Liquid.Types.RenderBreakError
@@ -11,7 +11,7 @@ export default function (liquid, Liquid) {
`(?:\\s+(reversed))?` +
`(?:\\s+${hash.source})*$`)
liquid.registerTag('for', {parse, render})
liquid.registerTag('for', { parse, render })
function parse (tagToken, remainTokens) {
const match = re.exec(tagToken.args)
+1 -1
View File
@@ -1,5 +1,5 @@
import assert from '../util/assert.js'
import {value, quotedLine} from '../lexical.js'
import { value, quotedLine } from '../lexical.js'
const staticFileRE = /[^\s,]+/
+3 -3
View File
@@ -1,9 +1,9 @@
import assert from '../util/assert.js'
import {create} from '../util/underscore.js'
import {identifier} from '../lexical.js'
import { create } from '../util/underscore.js'
import { identifier } from '../lexical.js'
export default function (liquid, Liquid) {
const {CaptureScope, AssignScope, IncrementScope} = Liquid.Types
const { CaptureScope, AssignScope, IncrementScope } = Liquid.Types
liquid.registerTag('increment', {
parse: function (token) {
+1 -1
View File
@@ -1,5 +1,5 @@
import assert from '../util/assert.js'
import {value as rValue} from '../lexical.js'
import { value as rValue } from '../lexical.js'
/*
* blockMode:
+2 -2
View File
@@ -1,6 +1,6 @@
import {mapSeries} from '../util/promise.js'
import { mapSeries } from '../util/promise.js'
import assert from '../util/assert.js'
import {identifier, value, hash} from '../lexical.js'
import { identifier, value, hash } from '../lexical.js'
export default function (liquid, Liquid) {
const re = new RegExp(`^(${identifier.source})\\s+in\\s+` +
+1 -1
View File
@@ -1,4 +1,4 @@
import {last, isArray} from './util/underscore'
import { last, isArray } from './util/underscore'
function domResolve (root, path) {
const base = document.createElement('base')
+1 -1
View File
@@ -1,6 +1,6 @@
import * as _ from './util/underscore.js'
import path from 'path'
import {anySeries} from './util/promise.js'
import { anySeries } from './util/promise.js'
import fs from 'fs'
const statFileAsync = _.promisify(fs.stat)
+2 -2
View File
@@ -1,10 +1,10 @@
import * as lexical from './lexical.js'
import {TokenizationError} from './util/error.js'
import { TokenizationError } from './util/error.js'
import * as _ from './util/underscore.js'
import assert from './util/assert.js'
import whiteSpaceCtrl from './whitespace-ctrl.js'
export {default as whiteSpaceCtrl} from './whitespace-ctrl.js'
export { default as whiteSpaceCtrl } from './whitespace-ctrl.js'
export function parse (input, file, options) {
assert(_.isString(input), 'illegal input')
+1 -1
View File
@@ -1,4 +1,4 @@
import {AssertionError} from './error.js'
import { AssertionError } from './error.js'
export default function (predicate, message) {
if (!predicate) {
+1 -1
View File
@@ -22,7 +22,7 @@ function initLiquidError (err, token) {
}
export function TokenizationError (message, token) {
initLiquidError.call(this, {message: message}, token)
initLiquidError.call(this, { message: message }, token)
}
TokenizationError.prototype = _.create(Error.prototype)
TokenizationError.prototype.constructor = TokenizationError
+1 -1
View File
@@ -1,4 +1,4 @@
import {assign} from './util/underscore.js'
import { assign } from './util/underscore.js'
export default function whiteSpaceCtrl (tokens, options) {
options = assign({ greedy: true }, options)