add useLegacyConditions

Author: Feverqwe

src/transform/liquid/conditions.ts

@@ -76,6 +76,26 @@ function tailLinebreak(raw: string) {
     return match ? match[1] : '';
 }
 
+function legacyTrimResult(content: string, ifTag: IfTag, ifCon: IfCondition | null) {
+    if (!ifCon) {
+        return ifTag.isBlock ? '\n' : '';
+    }
+
+    content = content.substring(ifCon.start, ifCon.end);
+
+    const head = headLinebreak(ifCon.rawStart);
+    if (head) {
+        content = (ifTag.isBlock ? '\n' : head) + content;
+    }
+
+    const tail = tailLinebreak(ifCon.rawEnd);
+    if (tail) {
+        content = content + (ifTag.isBlock ? '\n' : tail);
+    }
+
+    return content;
+}
+
 function trimResult(content: string, ifTag: IfTag, ifCon: IfCondition | null) {
     if (!ifCon) {
         const head = headLinebreak(ifTag.rawStart);
@@ -208,6 +228,7 @@ function inlineConditions(
     ifTag: IfTag,
     vars: Record<string, unknown>,
     strict: boolean,
+    useLegacyConditions: boolean,
 ) {
     let ifCon = null;
 
@@ -232,13 +253,22 @@ function inlineConditions(
 
     const start = content.slice(0, ifTag.start);
     const end = content.slice(ifTag.end);
-    const result = trimResult(content, ifTag, ifCon);
+    let result;
+    if (useLegacyConditions) {
+        result = legacyTrimResult(content, ifTag, ifCon);
+    } else {
+        result = trimResult(content, ifTag, ifCon);
+    }
 
-    return {
+    const r = {
         result: start + result + end,
-        lastIndex: start.length + result.length - tailLinebreak(ifTag.rawEnd).length,
+        lastIndex: start.length + result.length,
         ifCon,
     };
+    if (useLegacyConditions) {
+        r.lastIndex -= tailLinebreak(ifTag.rawEnd).length;
+    }
+    return r;
 }
 
 export = function conditions(
@@ -248,15 +278,20 @@ export = function conditions(
     settings?: {
         sourceMap: Record<number, number>;
         strict?: boolean;
+        useLegacyConditions?: boolean;
     },
 ) {
     const sourceMap = settings?.sourceMap || {};
     const strict = settings?.strict || false;
+    const useLegacyConditions = settings?.useLegacyConditions || false;
     const tagStack: IfTag[] = [];
 
     // Consumes all between curly braces
     // and all closest upon to first linebreak before and after braces.
-    const R_LIQUID = /((?:\n[\t ]*)?{%-?([\s\S]*?)-?%}(?:[\t ]*\n)?)/g;
+    let R_LIQUID = /((?:\n[^\n{]*)?{%-?([\s\S]*?)-?%}(?:\s*\n)?)/g;
+    if (useLegacyConditions) {
+        R_LIQUID = /((?:\n[\t ]*)?{%-?([\s\S]*?)-?%}(?:[\t ]*\n)?)/g;
+    }
 
     let match;
     while ((match = R_LIQUID.exec(input)) !== null) {
@@ -301,7 +336,13 @@ export = function conditions(
 
                 ifTag.closeCondition(match[1], match.index);
 
-                const {result, lastIndex, ifCon} = inlineConditions(input, ifTag, vars, strict);
+                const {result, lastIndex, ifCon} = inlineConditions(
+                    input,
+                    ifTag,
+                    vars,
+                    strict,
+                    useLegacyConditions,
+                );
 
                 resourcemap(input, ifTag, ifCon, createSourceMapApi(sourceMap));
 
@@ -313,7 +354,9 @@ export = function conditions(
             default:
                 // This is not condition.
                 // Step back last linebreaks to match them on next condition
-                R_LIQUID.lastIndex -= tailLinebreak(match[1]).length;
+                if (useLegacyConditions) {
+                    R_LIQUID.lastIndex -= tailLinebreak(match[1]).length;
+                }
         }
     }
 

src/transform/liquid/index.ts

@@ -80,6 +80,7 @@ function liquid<
         conditions = true,
         substitutions = true,
         conditionsInCode = false,
+        useLegacyConditions = false,
         keepNotVar = false,
         withSourceMap,
     } = settings || {};
@@ -89,6 +90,7 @@ function liquid<
         conditions,
         substitutions,
         conditionsInCode,
+        useLegacyConditions,
         keepNotVar,
         withSourceMap,
     });
@@ -116,7 +118,7 @@ function liquid<
 
     if (conditions) {
         const strict = conditions === 'strict';
-        output = applyConditions(output, vars, path, {sourceMap, strict});
+        output = applyConditions(output, vars, path, {sourceMap, strict, useLegacyConditions});
     }
 
     if (substitutions) {

src/transform/liquid/services/argv.ts

@@ -5,6 +5,7 @@ export type ArgvSettings = {
     substitutions?: boolean;
     keepNotVar?: boolean;
     withSourceMap?: boolean;
+    useLegacyConditions?: boolean;
 };
 
 let _argv: ArgvSettings;