halo-fe 1.0.24 → 1.0.26

package/README.md

@@ -6,4 +6,6 @@ Halo FrontEnd 基础库，基于本库，已打造以下终端类库：
 |---------------|------|
 | `halo-pc`     | PC端  |
 | `halo-mobile` | 移动端  |
-| `halo-chrome` | 谷歌插件 |
+| `halo-chrome` | 谷歌插件 |
+
+依赖不妨到peerDependencies中，是为了方便检测更新版本

package/dist/assets/{liquidjs-B8dqQyVv.js → liquidjs-C2HVw1Ra.js}

@@ -1,4 +1,4 @@
-class L {
+class F {
   constructor(e, s, r, i, n) {
     this.kind = e, this.input = s, this.begin = r, this.end = i, this.file = n;
   }
@@ -21,7 +21,7 @@ class V {
   }
 }
 const ft = Object.prototype.toString, be = String.prototype.toLowerCase, ce = Object.hasOwnProperty;
-function R(t) {
+function _(t) {
   return typeof t == "string";
 }
 function w(t) {
@@ -37,13 +37,13 @@ function gt(t) {
   return t.replace(/[-/\\^$*+?.()|[\]{}]/g, "\\$&");
 }
 function c(t) {
-  return t = d(t), R(t) ? t : _(t) ? "" : k(t) ? t.map((e) => c(e)).join("") : String(t);
+  return t = d(t), _(t) ? t : v(t) ? "" : k(t) ? t.map((e) => c(e)).join("") : String(t);
 }
 function ue(t) {
-  return t = d(t), k(t) ? t : R(t) && t.length > 0 ? [t] : yt(t) ? Array.from(t) : te(t) ? Object.keys(t).map((e) => [e, t[e]]) : [];
+  return t = d(t), k(t) ? t : _(t) && t.length > 0 ? [t] : yt(t) ? Array.from(t) : te(t) ? Object.keys(t).map((e) => [e, t[e]]) : [];
 }
 function T(t) {
-  return t = d(t), _(t) ? [] : k(t) ? t : [t];
+  return t = d(t), v(t) ? [] : k(t) ? t : [t];
 }
 function d(t) {
   return t instanceof V && w(t.valueOf) ? t.valueOf() : t;
@@ -57,7 +57,7 @@ function de(t) {
 function He(t) {
   return t && w(t.toLiquid) ? He(t.toLiquid()) : t;
 }
-function _(t) {
+function v(t) {
   return t == null;
 }
 function mt(t) {
@@ -215,7 +215,7 @@ function K(t, e = `unexpected ${JSON.stringify(t)}`) {
 }
 class Dt extends V {
   equals(e) {
-    return _(d(e));
+    return v(d(e));
   }
   gt() {
     return !1;
@@ -235,7 +235,7 @@ class Dt extends V {
 }
 class se extends V {
   equals(e) {
-    return e instanceof se ? !1 : (e = d(e), R(e) || k(e) ? e.length === 0 : te(e) ? Object.keys(e).length === 0 : !1);
+    return e instanceof se ? !1 : (e = d(e), _(e) || k(e) ? e.length === 0 : te(e) ? Object.keys(e).length === 0 : !1);
   }
   gt() {
     return !1;
@@ -255,7 +255,7 @@ class se extends V {
 }
 class qt extends se {
   equals(e) {
-    return e === !1 || _(d(e)) ? !0 : R(e) ? /^\s*$/.test(e) : super.equals(e);
+    return e === !1 || v(d(e)) ? !0 : _(e) ? /^\s*$/.test(e) : super.equals(e);
   }
 }
 class pe extends V {
@@ -331,7 +331,7 @@ var ee = function() {
     return e;
   }, ee.apply(this, arguments);
 };
-function S(t, e, s, r) {
+function O(t, e, s, r) {
   function i(n) {
     return n instanceof s ? n : new s(function(o) {
       o(n);
@@ -359,7 +359,7 @@ function S(t, e, s, r) {
   });
 }
 function N(t) {
-  return S(this, void 0, void 0, function* () {
+  return O(this, void 0, void 0, function* () {
     if (!X(t))
       return t;
     let e, s = !1, r = "next";
@@ -498,8 +498,8 @@ function Bt(t, e) {
   if (!a)
     return s;
   const l = {};
-  for (const F of r)
-    l[F] = !0;
+  for (const S of r)
+    l[S] = !0;
   let h = String(a(t, { flags: l, width: i, modifier: n })), u = Vt.has(o) ? " " : "0", p = i || At[o] || 0;
   return l["^"] ? h = h.toUpperCase() : l["#"] && (h = Tt(h)), l._ ? u = " " : l[0] && (u = "0"), l["-"] && (p = 0), J(h, p, u);
 }
@@ -528,9 +528,9 @@ const jt = 6e4, Ut = /([zZ]|([+-])(\d{2}):(\d{2}))$/, tt = [
   "Friday",
   "Saturday"
 ], Wt = st.map((t) => t.slice(0, 3));
-class O {
+class R {
   constructor(e, s, r) {
-    this.locale = s, this.DateTimeFormat = et(), this.date = new Date(e), this.timezoneFixed = r !== void 0, r === void 0 && (r = this.date.getTimezoneOffset()), this.timezoneOffset = R(r) ? O.getTimezoneOffset(r, this.date) : r, this.timezoneName = R(r) ? r : "";
+    this.locale = s, this.DateTimeFormat = et(), this.date = new Date(e), this.timezoneFixed = r !== void 0, r === void 0 && (r = this.date.getTimezoneOffset()), this.timezoneOffset = _(r) ? R.getTimezoneOffset(r, this.date) : r, this.timezoneName = _(r) ? r : "";
     const i = (this.date.getTimezoneOffset() - this.timezoneOffset) * jt, n = this.date.getTime() + i;
     this.displayDate = new Date(n);
   }
@@ -617,12 +617,12 @@ class O {
   static createDateFixedToTimezone(e, s) {
     const r = e.match(Ut);
     if (r && r[1] === "Z")
-      return new O(+new Date(e), s, 0);
+      return new R(+new Date(e), s, 0);
     if (r && r[2] && r[3] && r[4]) {
       const [, , i, n, o] = r, a = (i === "+" ? -1 : 1) * (parseInt(n, 10) * 60 + parseInt(o, 10));
-      return new O(+new Date(e), s, a);
+      return new R(+new Date(e), s, a);
     }
-    return new O(e, s);
+    return new R(e, s);
   }
   static getTimezoneOffset(e, s) {
     const r = s.toLocaleString("en-US", { timeZone: e }), i = s.toLocaleString("en-US", { timeZone: "UTC" }), n = new Date(r);
@@ -640,16 +640,16 @@ class he {
     e = xe(e), b(e <= this.limit, this.message);
   }
 }
-class ge extends L {
+class ge extends F {
   constructor(e, [s, r], i, n, o, a, l, h) {
     super(e, i, n, o, h), this.trimLeft = !1, this.trimRight = !1;
     const u = i[s] === "-", p = i[r - 1] === "-";
-    let F = u ? s + 1 : s, Y = p ? r - 1 : r;
-    for (; F < Y && f[i.charCodeAt(F)] & H; )
-      F++;
-    for (; Y > F && f[i.charCodeAt(Y - 1)] & H; )
+    let S = u ? s + 1 : s, Y = p ? r - 1 : r;
+    for (; S < Y && f[i.charCodeAt(S)] & H; )
+      S++;
+    for (; Y > S && f[i.charCodeAt(Y - 1)] & H; )
       Y--;
-    this.contentRange = [F, Y], this.trimLeft = u || a, this.trimRight = p || l;
+    this.contentRange = [S, Y], this.trimLeft = u || a, this.trimRight = p || l;
   }
   get content() {
     return this.input.slice(this.contentRange[0], this.contentRange[1]);
@@ -670,7 +670,7 @@ class Yt extends ge {
     super(g.Output, u, e, s, r, o, a, n);
   }
 }
-class De extends L {
+class De extends F {
   constructor(e, s, r, i) {
     super(g.HTML, e, s, r, i), this.input = e, this.begin = s, this.end = r, this.file = i, this.trimLeft = 0, this.trimRight = 0;
   }
@@ -678,17 +678,17 @@ class De extends L {
     return this.input.slice(this.begin + this.trimLeft, this.end - this.trimRight);
   }
 }
-class Jt extends L {
+class Jt extends F {
   constructor(e, s, r, i) {
     super(g.Number, e, s, r, i), this.input = e, this.begin = s, this.end = r, this.file = i, this.content = Number(this.getText());
   }
 }
-class ne extends L {
+class ne extends F {
   constructor(e, s, r, i) {
     super(g.Word, e, s, r, i), this.input = e, this.begin = s, this.end = r, this.file = i, this.content = this.getText();
   }
 }
-class Qt extends L {
+class Qt extends F {
   constructor(e, s, r, i) {
     super(g.Literal, e, s, r, i), this.input = e, this.begin = s, this.end = r, this.file = i, this.literal = this.getText(), this.content = Xe[this.literal];
   }
@@ -717,7 +717,7 @@ const qe = {
   or: 0
   /* OperatorType.Binary */
 };
-class Gt extends L {
+class Gt extends F {
   constructor(e, s, r, i) {
     super(g.Operator, e, s, r, i), this.input = e, this.begin = s, this.end = r, this.file = i, this.operator = this.getText();
   }
@@ -726,17 +726,17 @@ class Gt extends L {
     return e in qe ? qe[e] : 1;
   }
 }
-class Me extends L {
+class Me extends F {
   constructor(e, s, r, i, n, o) {
     super(g.PropertyAccess, r, i, n, o), this.variable = e, this.props = s;
   }
 }
-class Xt extends L {
+class Xt extends F {
   constructor(e, s, r, i, n, o) {
     super(g.Filter, r, i, n, o), this.name = e, this.args = s;
   }
 }
-class Kt extends L {
+class Kt extends F {
   constructor(e, s, r, i, n, o) {
     super(g.Hash, e, s, r, o), this.input = e, this.begin = s, this.end = r, this.name = i, this.value = n, this.file = o;
   }
@@ -779,12 +779,12 @@ function ts(t) {
   }
   return e;
 }
-class ss extends L {
+class ss extends F {
   constructor(e, s, r, i) {
     super(g.Quoted, e, s, r, i), this.input = e, this.begin = s, this.end = r, this.file = i, this.content = ts(this.getText());
   }
 }
-class rs extends L {
+class rs extends F {
   constructor(e, s, r, i, n, o) {
     super(g.Range, e, s, r, o), this.input = e, this.begin = s, this.end = r, this.lhs = i, this.rhs = n, this.file = o;
   }
@@ -794,7 +794,7 @@ class is extends ge {
     super(g.Tag, [s, r], e, s, r, !1, !1, n), this.tokenizer = new z(e, i.operators, n, this.contentRange), this.name = this.tokenizer.readTagName(), this.tokenizer.assert(this.name, "illegal liquid tag syntax"), this.tokenizer.skipBlank(), this.args = this.tokenizer.remaining();
   }
 }
-class ns extends L {
+class ns extends F {
   constructor(e, s, r, i, n, o) {
     super(g.FilteredValue, r, i, n, o), this.initial = e, this.filters = s, this.input = r, this.begin = i, this.end = n, this.file = o;
   }
@@ -999,7 +999,7 @@ function ys(t, e, s) {
   });
 }
 function ws(t) {
-  return S(this, void 0, void 0, function* () {
+  return O(this, void 0, void 0, function* () {
     return new Promise((e, s) => {
       const r = new XMLHttpRequest();
       r.onload = () => {
@@ -1017,7 +1017,7 @@ function Ts(t) {
   return e.responseText;
 }
 function ks(t) {
-  return S(this, void 0, void 0, function* () {
+  return O(this, void 0, void 0, function* () {
     return !0;
   });
 }
@@ -1039,7 +1039,7 @@ var vs = /* @__PURE__ */ Object.freeze({
   sep: _s
 });
 function Ls(t, e, ...s) {
-  return t = d(t), k(t) || R(t) ? t.length ? t : e : t === !1 && new Map(s).get("allow_false") ? !1 : re(t, this.context) ? e : t;
+  return t = d(t), k(t) || _(t) ? t.length ? t : e : t === !1 && new Map(s).get("allow_false") ? !1 : re(t, this.context) ? e : t;
 }
 function Ae(t, e = 0) {
   return JSON.stringify(t, null, e);
@@ -1116,21 +1116,21 @@ class $s {
     this.mapping = e, this.sep = "/";
   }
   exists(e) {
-    return S(this, void 0, void 0, function* () {
+    return O(this, void 0, void 0, function* () {
       return this.existsSync(e);
     });
   }
   existsSync(e) {
-    return !_(this.mapping[e]);
+    return !v(this.mapping[e]);
   }
   readFile(e) {
-    return S(this, void 0, void 0, function* () {
+    return O(this, void 0, void 0, function* () {
       return this.readFileSync(e);
     });
   }
   readFileSync(e) {
     const s = this.mapping[e];
-    if (_(s))
+    if (v(s))
       throw new Error(`ENOENT: ${e}`);
     return s;
   }
@@ -1153,6 +1153,7 @@ const U = {
   partials: ["."],
   relativeReference: !0,
   jekyllInclude: !1,
+  keyValueSeparator: ":",
   cache: void 0,
   extname: "",
   fs: vs,
@@ -1194,7 +1195,7 @@ function Cs(t) {
 }
 function G(t) {
   let e = [];
-  return k(t) && (e = t), R(t) && (e = [t]), e;
+  return k(t) && (e = t), _(t) && (e = [t]), e;
 }
 function As(t, e) {
   let s = !1;
@@ -1420,7 +1421,7 @@ class z {
       return;
     let i;
     this.skipBlank();
-    const n = e ? "=" : ":";
+    const n = _(e) ? e : e ? "=" : ":";
     return this.peek() === n && (++this.p, i = this.readValue()), new Kt(this.input, s, this.p, r, i, this.file);
   }
   remaining() {
@@ -1612,7 +1613,7 @@ function Us(t) {
       super(e, s, r), w(t.parse) && t.parse.call(this, e, s);
     }
     *render(e, s) {
-      const r = yield new W(this.token.args).render(e);
+      const r = yield new W(this.token.args, e.opts.keyValueSeparator).render(e);
       return yield t.render.call(this, e, s, r);
     }
   };
@@ -1631,7 +1632,7 @@ class at {
     return yield this.handler.apply({ context: s, liquid: this.liquid }, [e, ...r]);
   }
 }
-class v {
+class L {
   /**
    * @param str the value to be valuated, eg.: "foobar" | truncate: 3
    */
@@ -1657,7 +1658,7 @@ class Ws extends me {
     var r;
     super(e);
     const i = new z(e.input, s.options.operators, e.file, e.contentRange);
-    this.value = new v(i.readFilteredValue(), s);
+    this.value = new L(i.readFilteredValue(), s);
     const n = this.value.filters, o = s.options.outputEscape;
     !(!((r = n[n.length - 1]) === null || r === void 0) && r.raw) && o && n.push(new at(toString.call(o), o, [], s));
   }
@@ -1851,7 +1852,7 @@ class I {
     return D(this._getFromScope(e, s));
   }
   *_getFromScope(e, s, r = this.strictVariables) {
-    R(s) && (s = s.split("."));
+    _(s) && (s = s.split("."));
     for (let i = 0; i < s.length; i++)
       if (e = yield er(e, s[i], this.ownPropertyOnly), r && mt(e))
         throw new Lt(s.slice(0, i + 1).join("."));
@@ -1886,7 +1887,7 @@ class I {
   }
 }
 function er(t, e, s) {
-  if (t = He(t), _(t))
+  if (t = He(t), v(t))
     return t;
   if (k(t) && e < 0)
     return t[t.length + +e];
@@ -1906,7 +1907,7 @@ function rr(t) {
 function ir(t) {
   if (ce.call(t, "size") || t.size !== void 0)
     return t.size;
-  if (k(t) || R(t))
+  if (k(t) || _(t))
     return t.length;
   if (typeof t == "object")
     return Object.keys(t).length;
@@ -1963,7 +1964,7 @@ var vr = /* @__PURE__ */ Object.freeze({
   slugify: xr
 });
 const Lr = x(function(t, e) {
-  const s = T(t), r = _(e) ? " " : c(e), i = s.length * (1 + r.length);
+  const s = T(t), r = v(e) ? " " : c(e), i = s.length * (1 + r.length);
   return this.context.memoryLimit.use(i), s.join(r);
 }), Fr = x((t) => k(t) ? We(t) : ""), Sr = x((t) => k(t) ? t[0] : ""), Or = x(function(t) {
   const e = T(t);
@@ -2005,7 +2006,7 @@ function* Dr(t, e) {
 }
 function qr(t) {
   const e = T(t);
-  return this.context.memoryLimit.use(e.length), e.filter((s) => !_(d(s)));
+  return this.context.memoryLimit.use(e.length), e.filter((s) => !v(d(s)));
 }
 function ht(t, e = []) {
   const s = T(t), r = T(e);
@@ -2031,7 +2032,7 @@ function Pr(t) {
   return s.shift(), s;
 }
 function Cr(t, e, s = 1) {
-  return t = d(t), _(t) ? [] : (k(t) || (t = c(t)), e = e < 0 ? t.length + e : e, this.context.memoryLimit.use(s), t.slice(e, e + s));
+  return t = d(t), v(t) ? [] : (k(t) || (t = c(t)), e = e < 0 ? t.length + e : e, this.context.memoryLimit.use(s), t.slice(e, e + s));
 }
 function* Ar(t, e, s) {
   const r = [];
@@ -2042,7 +2043,7 @@ function* Ar(t, e, s) {
   return t.filter((n, o) => s === void 0 ? $(r[o], this.context) : P(r[o], s));
 }
 function* Vr(t, e, s) {
-  const r = [], i = new v(c(s), this.liquid), n = T(t);
+  const r = [], i = new L(c(s), this.liquid), n = T(t);
   this.context.memoryLimit.use(n.length);
   for (const o of n)
     (yield i.value(this.context.spawn({ [e]: o }))) && r.push(o);
@@ -2060,7 +2061,7 @@ function* Br(t, e) {
   return [...s.entries()].map(([i, n]) => ({ name: i, items: n }));
 }
 function* jr(t, e, s) {
-  const r = /* @__PURE__ */ new Map(), i = new v(c(s), this.liquid);
+  const r = /* @__PURE__ */ new Map(), i = new L(c(s), this.liquid);
   t = T(t), this.context.memoryLimit.use(t.length);
   for (const n of t) {
     const o = yield i.value(this.context.spawn({ [e]: n }));
@@ -2077,7 +2078,7 @@ function* Ur(t, e, s) {
   }
 }
 function* Hr(t, e, s) {
-  const r = new v(c(s), this.liquid), i = T(t);
+  const r = new L(c(s), this.liquid), i = T(t);
   for (const n of i)
     if (yield r.value(this.context.spawn({ [e]: n })))
       return n;
@@ -2086,7 +2087,7 @@ function Wr(t) {
   return t = T(t), this.context.memoryLimit.use(t.length), [...new Set(t)];
 }
 function Yr(t, e = 1) {
-  if (t = d(t), _(t))
+  if (t = d(t), v(t))
     return [];
   k(t) || (t = c(t)), this.context.memoryLimit.use(e);
   const s = [...t].sort(() => Math.random() - 0.5);
@@ -2124,7 +2125,7 @@ function we(t, e, s) {
   const o = ((r = t == null ? void 0 : t.length) !== null && r !== void 0 ? r : 0) + ((i = e == null ? void 0 : e.length) !== null && i !== void 0 ? i : 0) + ((n = s == null ? void 0 : s.length) !== null && n !== void 0 ? n : 0);
   this.context.memoryLimit.use(o);
   const a = ut(t, this.context.opts, s);
-  return a ? (e = d(e), e = _(e) ? this.context.opts.dateFormat : c(e), Z(a, e)) : t;
+  return a ? (e = d(e), e = v(e) ? this.context.opts.dateFormat : c(e), Z(a, e)) : t;
 }
 function Qr(t) {
   return we.call(this, t, "%Y-%m-%dT%H:%M:%S%:z");
@@ -2151,7 +2152,7 @@ function ct(t, e, s, r) {
 function ut(t, e, s) {
   let r;
   const i = s ?? e.timezoneOffset, n = e.locale;
-  return t = d(t), t === "now" || t === "today" ? r = new O(Date.now(), n, i) : de(t) ? r = new O(t * 1e3, n, i) : R(t) ? /^\d+$/.test(t) ? r = new O(+t * 1e3, n, i) : e.preserveTimezones && s === void 0 ? r = O.createDateFixedToTimezone(t, n) : r = new O(t, n, i) : r = new O(t, n, i), r.valid() ? r : void 0;
+  return t = d(t), t === "now" || t === "today" ? r = new R(Date.now(), n, i) : de(t) ? r = new R(t * 1e3, n, i) : _(t) ? /^\d+$/.test(t) ? r = new R(+t * 1e3, n, i) : e.preserveTimezones && s === void 0 ? r = R.createDateFixedToTimezone(t, n) : r = new R(t, n, i) : r = new R(t, n, i), r.valid() ? r : void 0;
 }
 var Kr = /* @__PURE__ */ Object.freeze({
   __proto__: null,
@@ -2305,7 +2306,7 @@ var bi = /* @__PURE__ */ Object.freeze({
 const xi = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({}, Is), mr), vr), Jr), Kr), bi), ot);
 class _i extends m {
   constructor(e, s, r) {
-    super(e, s, r), this.key = this.tokenizer.readIdentifier().content, this.tokenizer.assert(this.key, "expected variable name"), this.tokenizer.skipBlank(), this.tokenizer.assert(this.tokenizer.peek() === "=", 'expected "="'), this.tokenizer.advance(), this.value = new v(this.tokenizer.readFilteredValue(), this.liquid);
+    super(e, s, r), this.key = this.tokenizer.readIdentifier().content, this.tokenizer.assert(this.key, "expected variable name"), this.tokenizer.skipBlank(), this.tokenizer.assert(this.tokenizer.peek() === "=", 'expected "="'), this.tokenizer.advance(), this.value = new L(this.tokenizer.readFilteredValue(), this.liquid);
   }
   *render(e) {
     e.bottom()[this.key] = yield this.value.value(e, this.liquid.options.lenientIf);
@@ -2318,7 +2319,7 @@ class vi extends m {
     const n = this.tokenizer.readIdentifier(), o = this.tokenizer.readIdentifier(), a = this.tokenizer.readValue();
     if (!n.size() || o.content !== "in" || !a)
       throw new Error(`illegal tag: ${e.getText()}`);
-    this.variable = n.content, this.collection = a, this.hash = new W(this.tokenizer.remaining()), this.templates = [], this.elseTemplates = [];
+    this.variable = n.content, this.collection = a, this.hash = new W(this.tokenizer.remaining(), r.options.keyValueSeparator), this.templates = [], this.elseTemplates = [];
     let l;
     const h = i.parseStream(s).on("start", () => l = this.templates).on("tag:else", (u) => {
       K(u.args), l = this.elseTemplates;
@@ -2387,7 +2388,7 @@ class Oi extends m {
 }
 class Ri extends m {
   constructor(e, s, r, i) {
-    super(e, s, r), this.branches = [], this.elseTemplates = [], this.value = new v(this.tokenizer.readFilteredValue(), this.liquid), this.elseTemplates = [];
+    super(e, s, r), this.branches = [], this.elseTemplates = [], this.value = new L(this.tokenizer.readFilteredValue(), this.liquid), this.elseTemplates = [];
     let n = [], o = 0;
     const a = i.parseStream(s).on("tag:when", (l) => {
       if (o > 0)
@@ -2454,7 +2455,7 @@ class zi extends m {
       n.p = o;
       break;
     }
-    this.hash = new W(n.remaining());
+    this.hash = new W(n.remaining(), r.options.keyValueSeparator);
   }
   *render(e, s) {
     const { liquid: r, hash: i } = this, n = yield ke(this.file, e, r);
@@ -2469,8 +2470,8 @@ class zi extends m {
       a.forloop = new pe(u.length, l.getText(), h);
       for (const p of u) {
         a[h] = p;
-        const F = yield r._parsePartialFile(n, o.sync, this.currentFile);
-        yield r.renderer.renderTemplates(F, o, s), a.forloop.next();
+        const S = yield r._parsePartialFile(n, o.sync, this.currentFile);
+        yield r.renderer.renderTemplates(S, o, s), a.forloop.next();
       }
     } else {
       const l = yield r._parsePartialFile(n, o.sync, this.currentFile);
@@ -2504,7 +2505,7 @@ class Ni extends m {
     const { tokenizer: n } = e;
     this.file = Te(n, this.liquid, i), this.currentFile = e.file;
     const o = n.p;
-    n.readIdentifier().content === "with" ? (n.skipBlank(), n.peek() !== ":" ? this.withVar = n.readValue() : n.p = o) : n.p = o, this.hash = new W(n.remaining(), this.liquid.options.jekyllInclude);
+    n.readIdentifier().content === "with" ? (n.skipBlank(), n.peek() !== ":" ? this.withVar = n.readValue() : n.p = o) : n.p = o, this.hash = new W(n.remaining(), r.options.jekyllInclude || r.options.keyValueSeparator);
   }
   *render(e, s) {
     const { liquid: r, hash: i, withVar: n } = this, { renderer: o } = r, a = yield ke(this.file, e, r);
@@ -2549,11 +2550,11 @@ class Mi extends m {
     super(e, s, r), this.branches = [];
     let n = [];
     i.parseStream(s).on("start", () => this.branches.push({
-      value: new v(e.args, this.liquid),
+      value: new L(e.args, this.liquid),
       templates: n = []
     })).on("tag:elsif", (o) => {
       b(!this.elseTemplates, "unexpected elsif after else"), this.branches.push({
-        value: new v(o.args, this.liquid),
+        value: new L(o.args, this.liquid),
         templates: n = []
       });
     }).on("tag:else", (o) => {
@@ -2589,7 +2590,7 @@ class Ii extends m {
 }
 class $i extends m {
   constructor(e, s, r, i) {
-    super(e, s, r), this.file = Te(this.tokenizer, this.liquid, i), this.currentFile = e.file, this.args = new W(this.tokenizer.remaining()), this.templates = i.parseTokens(s);
+    super(e, s, r), this.file = Te(this.tokenizer, this.liquid, i), this.currentFile = e.file, this.args = new W(this.tokenizer.remaining(), r.options.keyValueSeparator), this.templates = i.parseTokens(s);
   }
   *render(e, s) {
     const { liquid: r, args: i, file: n } = this, { renderer: o } = r;
@@ -2602,7 +2603,7 @@ class $i extends m {
     const l = yield r._parseLayoutFile(a, e.sync, this.currentFile);
     e.setRegister("blockMode", C.STORE);
     const h = yield o.renderTemplates(this.templates, e), u = e.getRegister("blocks");
-    u[""] === void 0 && (u[""] = (p, F) => F.write(h)), e.setRegister("blockMode", C.OUTPUT), e.push(yield i.render(e)), yield o.renderTemplates(l, e, s), e.pop();
+    u[""] === void 0 && (u[""] = (p, S) => S.write(h)), e.setRegister("blockMode", C.OUTPUT), e.push(yield i.render(e)), yield o.renderTemplates(l, e, s), e.pop();
   }
 }
 class Pi extends m {
@@ -2671,7 +2672,7 @@ class Vi extends m {
     const o = this.tokenizer.readIdentifier(), a = this.tokenizer.readValue();
     if (o.content !== "in" || !a)
       throw new Error(`illegal tag: ${e.getText()}`);
-    this.variable = n.content, this.collection = a, this.args = new W(this.tokenizer.remaining()), this.templates = [];
+    this.variable = n.content, this.collection = a, this.args = new W(this.tokenizer.remaining(), r.options.keyValueSeparator), this.templates = [];
     let l;
     const h = i.parseStream(s).on("start", () => l = this.templates).on("tag:endtablerow", () => h.stop()).on("template", (u) => l.push(u)).on("end", () => {
       throw new Error(`tag ${e.getText()} not closed`);
@@ -2694,7 +2695,7 @@ class Bi extends m {
     super(e, s, r), this.branches = [], this.elseTemplates = [];
     let n = [], o = 0;
     i.parseStream(s).on("start", () => this.branches.push({
-      value: new v(e.args, this.liquid),
+      value: new L(e.args, this.liquid),
       test: re,
       templates: n = []
     })).on("tag:elsif", (a) => {
@@ -2703,7 +2704,7 @@ class Bi extends m {
         return;
       }
       this.branches.push({
-        value: new v(a.args, this.liquid),
+        value: new L(a.args, this.liquid),
         test: $,
         templates: n = []
       });
@@ -2741,7 +2742,7 @@ class Ui extends m {
 }
 class Hi extends m {
   constructor(e, s, r) {
-    super(e, s, r), this.tokenizer.skipBlank(), this.tokenizer.end() || (this.value = new v(this.tokenizer.readFilteredValue(), this.liquid));
+    super(e, s, r), this.tokenizer.skipBlank(), this.tokenizer.end() || (this.value = new L(this.tokenizer.readFilteredValue(), this.liquid));
   }
   *render(e, s) {
     if (!this.value)
@@ -2803,7 +2804,7 @@ class dt {
     return this.renderer.renderTemplates(e, i);
   }
   render(e, s, r) {
-    return S(this, void 0, void 0, function* () {
+    return O(this, void 0, void 0, function* () {
       return N(this._render(e, s, Object.assign(Object.assign({}, r), { sync: !1 })));
     });
   }
@@ -2819,7 +2820,7 @@ class dt {
     return this._render(i, s, r);
   }
   parseAndRender(e, s, r) {
-    return S(this, void 0, void 0, function* () {
+    return O(this, void 0, void 0, function* () {
       return N(this._parseAndRender(e, s, Object.assign(Object.assign({}, r), { sync: !1 })));
     });
   }
@@ -2836,7 +2837,7 @@ class dt {
     return new M(this).parseFile(e, s, r, i);
   }
   parseFile(e, s) {
-    return S(this, void 0, void 0, function* () {
+    return O(this, void 0, void 0, function* () {
       return N(new M(this).parseFile(e, !1, s));
     });
   }
@@ -2848,7 +2849,7 @@ class dt {
     return yield this._render(i, s, r);
   }
   renderFile(e, s, r) {
-    return S(this, void 0, void 0, function* () {
+    return O(this, void 0, void 0, function* () {
       return N(this._renderFile(e, s, Object.assign(Object.assign({}, r), { sync: !1 })));
     });
   }
@@ -2856,17 +2857,17 @@ class dt {
     return D(this._renderFile(e, s, Object.assign(Object.assign({}, r), { sync: !0 })));
   }
   renderFileToNodeStream(e, s, r) {
-    return S(this, void 0, void 0, function* () {
+    return O(this, void 0, void 0, function* () {
       const i = yield this.parseFile(e);
       return this.renderToNodeStream(i, s, r);
     });
   }
   _evalValue(e, s) {
-    const r = new v(e, this), i = s instanceof I ? s : new I(s, this.options);
+    const r = new L(e, this), i = s instanceof I ? s : new I(s, this.options);
     return r.value(i);
   }
   evalValue(e, s) {
-    return S(this, void 0, void 0, function* () {
+    return O(this, void 0, void 0, function* () {
       return N(this._evalValue(e, s));
     });
   }