This commit is contained in:
Jun Yang
2018-10-06 12:20:13 +08:00
parent c0181aec31
commit d504c8107e
8 changed files with 140 additions and 140 deletions
+21 -21
View File
@@ -1,5 +1,5 @@
/* /*
* [email protected].0, https://github.com/liquidjs * [email protected].1, https://github.com/liquidjs
* (c) 2016-2018 harttle * (c) 2016-2018 harttle
* Released under the MIT License. * Released under the MIT License.
*/ */
@@ -7,8 +7,8 @@
function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; } function _interopDefault (ex) { return (ex && (typeof ex === 'object') && 'default' in ex) ? ex['default'] : ex; }
var fs = _interopDefault(require('fs'));
var path = _interopDefault(require('path')); var path = _interopDefault(require('path'));
var fs = _interopDefault(require('fs'));
var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) {
return typeof obj; return typeof obj;
@@ -745,6 +745,18 @@ function isString(value) {
return toStr.call(value) === '[object String]'; return toStr.call(value) === '[object String]';
} }
function promisify(fn) {
return function () {
var _arguments = arguments;
return new Promise(function (resolve, reject) {
fn.apply(undefined, Array.prototype.slice.call(_arguments).concat([function (err, result) {
err ? reject(err) : resolve(result);
}]));
});
};
}
function stringify(value) { function stringify(value) {
if (isNil(value)) { if (isNil(value)) {
return String(value); return String(value);
@@ -755,8 +767,8 @@ function stringify(value) {
if (typeof value.toLiquid === 'function') { if (typeof value.toLiquid === 'function') {
return stringify(value.toLiquid()); return stringify(value.toLiquid());
} }
if (isString(value)) { if (isString(value) || value instanceof RegExp || value instanceof Date) {
return value; return value.toString();
} }
var cache = []; var cache = [];
@@ -883,7 +895,7 @@ var integer = /-?\d+/;
var number = /-?\d+\.?\d*|\.?\d+/; var number = /-?\d+\.?\d*|\.?\d+/;
var bool = /true|false/; var bool = /true|false/;
// peoperty access // property access
var identifier = /[\w-]+[?]?/; var identifier = /[\w-]+[?]?/;
var subscript = new RegExp('\\[(?:' + quoted.source + '|[\\w-\\.]+)\\]'); var subscript = new RegExp('\\[(?:' + quoted.source + '|[\\w-\\.]+)\\]');
var literal = new RegExp('(?:' + quoted.source + '|' + bool.source + '|' + number.source + ')'); var literal = new RegExp('(?:' + quoted.source + '|' + bool.source + '|' + number.source + ')');
@@ -1169,7 +1181,7 @@ var Scope = {
name = str.slice(i + 1, j); name = str.slice(i + 1, j);
if (!isInteger(name)) { if (!isInteger(name)) {
// foo[bar] vs. foo[1] // foo[bar] vs. foo[1]
name = this.get(name); name = String(this.get(name));
} }
push(); push();
i = j + 1; i = j + 1;
@@ -1267,20 +1279,8 @@ function mapSeries(iterable, iteratee) {
}); });
} }
function readFileAsync(filepath) { var statFileAsync = promisify(fs.stat);
return new Promise(function (resolve, reject) { var readFileAsync = promisify(fs.readFile);
fs.readFile(filepath, 'utf8', function (err, content) {
err ? reject(err) : resolve(content);
});
});
}
function statFileAsync(path$$1) {
return new Promise(function (resolve, reject) {
fs.stat(path$$1, function (err, stat) {
return err ? reject(err) : resolve(stat);
});
});
}
var resolve = function () { var resolve = function () {
var _ref = asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(filepath, root, options) { var _ref = asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(filepath, root, options) {
@@ -1351,7 +1351,7 @@ var read = function () {
while (1) { while (1) {
switch (_context3.prev = _context3.next) { switch (_context3.prev = _context3.next) {
case 0: case 0:
return _context3.abrupt('return', readFileAsync(filepath)); return _context3.abrupt('return', readFileAsync(filepath, 'utf8'));
case 1: case 1:
case 'end': case 'end':
+1 -1
View File
File diff suppressed because one or more lines are too long
+5 -5
View File
@@ -1,5 +1,5 @@
/* /*
* [email protected].0, https://github.com/liquidjs * [email protected].1, https://github.com/liquidjs
* (c) 2016-2018 harttle * (c) 2016-2018 harttle
* Released under the MIT License. * Released under the MIT License.
*/ */
@@ -754,8 +754,8 @@
if (typeof value.toLiquid === 'function') { if (typeof value.toLiquid === 'function') {
return stringify(value.toLiquid()); return stringify(value.toLiquid());
} }
if (isString(value)) { if (isString(value) || value instanceof RegExp || value instanceof Date) {
return value; return value.toString();
} }
var cache = []; var cache = [];
@@ -869,7 +869,7 @@
var number = /-?\d+\.?\d*|\.?\d+/; var number = /-?\d+\.?\d*|\.?\d+/;
var bool = /true|false/; var bool = /true|false/;
// peoperty access // property access
var identifier = /[\w-]+[?]?/; var identifier = /[\w-]+[?]?/;
var subscript = new RegExp('\\[(?:' + quoted.source + '|[\\w-\\.]+)\\]'); var subscript = new RegExp('\\[(?:' + quoted.source + '|[\\w-\\.]+)\\]');
var literal = new RegExp('(?:' + quoted.source + '|' + bool.source + '|' + number.source + ')'); var literal = new RegExp('(?:' + quoted.source + '|' + bool.source + '|' + number.source + ')');
@@ -1155,7 +1155,7 @@
name = str.slice(i + 1, j); name = str.slice(i + 1, j);
if (!isInteger(name)) { if (!isInteger(name)) {
// foo[bar] vs. foo[1] // foo[bar] vs. foo[1]
name = this.get(name); name = String(this.get(name));
} }
push(); push();
i = j + 1; i = j + 1;
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
File diff suppressed because one or more lines are too long
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "liquidjs", "name": "liquidjs",
"version": "6.0.0", "version": "6.0.1",
"lockfileVersion": 1, "lockfileVersion": 1,
"requires": true, "requires": true,
"dependencies": { "dependencies": {
+1 -1
View File
@@ -1,6 +1,6 @@
{ {
"name": "liquidjs", "name": "liquidjs",
"version": "6.0.0", "version": "6.0.1",
"description": "Liquid template engine by pure JavaScript: compatible to shopify, easy to extend.", "description": "Liquid template engine by pure JavaScript: compatible to shopify, easy to extend.",
"main": "dist/liquid.common.js", "main": "dist/liquid.common.js",
"module": "src/index.js", "module": "src/index.js",