@diplodoc/transform 4.15.0 → 4.16.0

package/lib/liquid/sourceMap.js.map

@@ -1 +1 @@
-{"version":3,"file":"sourceMap.js","sourceRoot":"","sources":["../../src/transform/liquid/sourceMap.ts"],"names":[],"mappings":";;;;;;AAAA,2DAAmC;AAEnC,MAAM,YAAY,GAAG,MAAM,CAAC,gBAAgB,CAAC;AAE7C,SAAgB,aAAa,CAAC,KAAa,EAAE,KAAa;IACtD,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;AACxD,CAAC;AAFD,sCAEC;AAED,SAAgB,gBAAgB,CAAC,SAAiB;IAC9C,MAAM,WAAW,GAAG,IAAA,gBAAM,EAAC,SAAS,CAAC,CAAC;IACtC,OAAO,WAAW,CAAC,YAAY,CAAC,CAAC;IAEjC,OAAO,WAAW,CAAC;AACvB,CAAC;AALD,4CAKC;AAeD,SAAgB,kBAAkB,CAAC,EAAC,eAAe,EAAE,cAAc,EAAE,SAAS,EAAU;IACpF,MAAM,WAAW,GAAG,eAAe,KAAK,cAAc,CAAC;IACvD,MAAM,eAAe,GAAG,IAAA,gBAAM,EAAC,SAAS,CAAC,CAAC;IAE1C,MAAM,cAAc,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjE,MAAM,iBAAiB,GAAG,CAAC,CAAS,EAAE,KAAa,EAAE,EAAE;QACnD,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;IACzC,CAAC,CAAC;IACF,MAAM,iBAAiB,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;IAEtE,MAAM,SAAS,GAAG,CAAC,EAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,GAAG,KAAK,EAAmB,EAAE,EAAE;QAC9E,IAAI,WAAW,EAAE;YACb,OAAO;SACV;QAED,KAAK,IAAI,CAAC,GAAG,KAAK,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,EAAE,EAAE;YAC/B,MAAM,aAAa,GAAG,CAAC,GAAG,MAAM,CAAC;YACjC,iBAAiB,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;YAEpC,IAAI,WAAW,EAAE;gBACb,iBAAiB,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;aAClD;SACJ;IACL,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,CAAC,CAAS,EAAE,EAAE;QAC7B,iBAAiB,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;IACvC,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,CAAC,EAAC,KAAK,EAAE,GAAG,EAA+B,EAAE,EAAE;QAC/D,KAAK,IAAI,CAAC,GAAG,KAAK,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,EAAE,EAAE;YAC/B,UAAU,CAAC,CAAC,CAAC,CAAC;SACjB;IACL,CAAC,CAAC;IAEF,OAAO;QACH,WAAW;QACX,iBAAiB;QACjB,SAAS;QACT,WAAW;QACX,UAAU;KACb,CAAC;AACN,CAAC;AA3CD,gDA2CC"}
+{"version":3,"file":"sourceMap.js","sourceRoot":"","sources":["../../src/transform/liquid/sourceMap.ts"],"names":[],"mappings":";;;;;;AAAA,2DAAmC;AAEnC,MAAM,YAAY,GAAG,MAAM,CAAC,gBAAgB,CAAC;AAE7C,SAAgB,aAAa,CAAC,KAAa,EAAE,KAAa;IACtD,OAAO,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC;AACxD,CAAC;AAFD,sCAEC;AAED,SAAgB,gBAAgB,CAAC,SAAiB;IAC9C,MAAM,WAAW,GAAG,IAAA,gBAAM,EAAC,SAAS,CAAC,CAAC;IACtC,OAAO,WAAW,CAAC,YAAY,CAAC,CAAC;IAEjC,OAAO,WAAW,CAAC;AACvB,CAAC;AALD,4CAKC;AAWD,SAAgB,kBAAkB,CAAC,SAAiC;IAChE,MAAM,eAAe,GAAG,IAAA,gBAAM,EAAC,SAAS,CAAC,CAAC;IAE1C,MAAM,cAAc,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjE,MAAM,iBAAiB,GAAG,CAAC,CAAS,EAAE,KAAa,EAAE,EAAE;QACnD,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAAG,KAAK,CAAC;IACzC,CAAC,CAAC;IACF,MAAM,iBAAiB,GAAG,CAAC,CAAS,EAAE,EAAE,CAAC,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,CAAC;IAEtE,MAAM,SAAS,GAAG,CAAC,EAAC,KAAK,EAAE,GAAG,EAAE,MAAM,EAAE,WAAW,GAAG,KAAK,EAAmB,EAAE,EAAE;QAC9E,KAAK,IAAI,CAAC,GAAG,KAAK,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,EAAE,EAAE;YAC/B,MAAM,aAAa,GAAG,CAAC,GAAG,MAAM,CAAC;YACjC,iBAAiB,CAAC,CAAC,EAAE,aAAa,CAAC,CAAC;YAEpC,IAAI,WAAW,EAAE;gBACb,iBAAiB,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC;aAClD;SACJ;IACL,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,CAAC,CAAS,EAAE,EAAE;QAC7B,iBAAiB,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;IACvC,CAAC,CAAC;IAEF,MAAM,WAAW,GAAG,CAAC,EAAC,KAAK,EAAE,GAAG,EAA+B,EAAE,EAAE;QAC/D,KAAK,IAAI,CAAC,GAAG,KAAK,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,EAAE,EAAE;YAC/B,UAAU,CAAC,CAAC,CAAC,CAAC;SACjB;IACL,CAAC,CAAC;IAEF,OAAO;QACH,iBAAiB;QACjB,SAAS;QACT,WAAW;QACX,UAAU;KACb,CAAC;AACN,CAAC;AArCD,gDAqCC"}

package/lib/plugins/links/index.js

@@ -133,7 +133,7 @@ function processLink(state, tokens, idx, opts) {
         });
     }
     let newPathname = '';
-    if (!(0, path_1.isAbsolute)(href)) {
+    if (!(0, path_1.isAbsolute)(href) && !href.includes('//')) {
         newPathname = getPublicPath(opts, file);
         href = url_1.default.format(Object.assign(Object.assign({}, url_1.default.parse(href)), { pathname: newPathname }));
     }

package/lib/plugins/links/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/plugins/links/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/transform/plugins/links/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@diplodoc/transform",
-  "version": "4.15.0",
+  "version": "4.16.0",
   "description": "A simple transformer of text in YFM (Yandex Flavored Markdown) to HTML",
   "keywords": [
     "markdown",

package/src/.eslintrc.js

@@ -12,5 +12,14 @@ module.exports = {
                 '@typescript-eslint/no-namespace': [1, {allowDeclarations: true}],
             },
         },
+        {
+            files: ['*.ts', '*.tsx'],
+            parser: '@typescript-eslint/parser',
+            parserOptions: {
+                sourceType: 'module',
+                project: ['./tsconfig.transform.json', './tsconfig.json'],
+                tsconfigRootDir: __dirname + '/../',
+            },
+        }
     ],
 };

package/src/transform/getObject.ts

@@ -1,10 +1,17 @@
-export = function getObject(path: string, obj: Object) {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    return path.split('.').reduce((acc: any | undefined, item) => {
-        if (!acc || !Object.getOwnPropertyNames(acc).includes(item)) {
-            return undefined;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export = function getObject(path: string, obj: Record<string, any>, fallback?: any) {
+    const queue = path.split('.');
+
+    let box = obj;
+    while (queue.length) {
+        const step = queue.shift() as string;
+
+        if (!Object.prototype.hasOwnProperty.call(box, step)) {
+            return fallback || undefined;
         }
 
-        return acc[item];
-    }, obj);
+        box = box[step];
+    }
+
+    return box;
 };

package/src/transform/liquid/conditions.ts

@@ -1,193 +1,231 @@
 import {bold} from 'chalk';
-
-import evalExp from './evaluation';
+import {NoValue, evalExp} from './evaluation';
 import {tagLine} from './lexical';
 import {log} from '../log';
-import {getPreparedLeftContent, removeIndentBlock} from './utils';
-import {createSourceMapApi, getLineNumber} from './sourceMap';
-
-type Options = {
-    firstLineNumber: number;
-    lastLineNumber: number;
-    resFirstLineNumber: number;
-    resLastLineNumber: number;
-    linesTotal: number;
-    sourceMap: Record<number, number>;
-};
+import {SourceMapApi, createSourceMapApi, getLineNumber} from './sourceMap';
 
-function changeSourceMap({
-    firstLineNumber,
-    lastLineNumber,
-    resFirstLineNumber,
-    resLastLineNumber,
-    linesTotal,
-    sourceMap,
-}: Options) {
-    if (!sourceMap) {
-        return;
-    }
+interface SourceMap {
+    start: number;
+    end: number;
+    rawStart: string;
+    rawEnd: string;
+}
 
-    const {isInlineTag, getSourceMapValue, moveLines, removeLines} = createSourceMapApi({
-        firstLineNumber,
-        lastLineNumber,
-        sourceMap,
-    });
+function resourcemap(source: string, ifTag: SourceMap, ifCon: SourceMap | null, api: SourceMapApi) {
+    const [sourseStartLine, sourceEndLine] = [
+        getLineNumber(source, ifTag.start + 1),
+        getLineNumber(source, ifTag.end - 1),
+    ];
 
-    if (isInlineTag) {
+    if (sourseStartLine === sourceEndLine || ifTag === ifCon) {
         return;
     }
 
+    const linesTotal = source.split('\n').length;
+    const {getSourceMapValue, moveLines, removeLines} = api;
+
     let offsetRestLines;
-    if (resFirstLineNumber) {
+    if (ifCon) {
+        const [resultStartLine, resultEndLine] = [
+            getLineNumber(source, ifCon.start),
+            getLineNumber(source, ifCon.end),
+        ];
+
         // Move condition's content to the top
-        const offsetContentLines = firstLineNumber - resFirstLineNumber;
+        const offsetContentLines = sourseStartLine - resultStartLine;
         moveLines({
-            start: resFirstLineNumber,
-            end: resLastLineNumber - 1,
+            start: resultStartLine,
+            end: resultEndLine,
             offset: offsetContentLines,
             withReplace: true,
         });
 
         // Remove the rest lines of the condition block
-        removeLines({start: firstLineNumber, end: resFirstLineNumber - 1});
-        removeLines({start: resLastLineNumber, end: lastLineNumber});
+        removeLines({start: sourseStartLine, end: resultStartLine - 1});
+        removeLines({start: resultEndLine + 1, end: sourceEndLine});
 
         // Calculate an offset of the rest lines
-        offsetRestLines = getSourceMapValue(resLastLineNumber - 1) - lastLineNumber;
+        offsetRestLines = getSourceMapValue(resultEndLine) - sourceEndLine;
     } else {
         // Remove the whole condition block
-        removeLines({start: firstLineNumber, end: lastLineNumber});
+        removeLines({start: sourseStartLine, end: sourceEndLine});
 
         // Calculate offset of the rest lines
-        offsetRestLines = firstLineNumber - lastLineNumber - 1;
+        offsetRestLines = sourseStartLine - sourceEndLine - 1;
     }
 
     // Offset the rest lines
-    moveLines({start: lastLineNumber + 1, end: linesTotal, offset: offsetRestLines});
+    moveLines({start: sourceEndLine + 1, end: linesTotal, offset: offsetRestLines});
+}
+
+type IfCondition = SourceMap & {
+    expr: string;
+};
+
+function headLinebreak(raw: string) {
+    const match = raw.match(/^([^{]+){.*/);
+
+    return match ? match[1] : '';
 }
 
-function getElseProp<B extends keyof Elses>({elses}: {elses: Elses[]}, propName: B, index = 0) {
-    if (!elses.length || index >= elses.length) {
-        return undefined;
+function tailLinebreak(raw: string) {
+    const match = raw.match(/.*}(\s*\n)$/);
+
+    return match ? match[1] : '';
+}
+
+function trimResult(content: string, ifTag: IfTag, ifCon: IfCondition | null) {
+    if (!ifCon) {
+        return ifTag.isBlock ? '\n' : '';
     }
 
-    return elses[index][propName];
+    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;
 }
 
-type Opts = {
-    ifTag: Tag;
-    vars: Record<string, unknown>;
-    content: string;
-    match: RegExpExecArray;
-    lastIndex: number;
-    sourceMap: Record<number, number>;
-    linesTotal: number;
-};
+class IfTag implements SourceMap {
+    private conditions: IfCondition[] = [];
 
-function inlineConditions({ifTag, vars, content, match, lastIndex, sourceMap, linesTotal}: Opts) {
-    let res = '';
-    const firstLineNumber = getLineNumber(content, ifTag.startPos);
-    const lastLineNumber = getLineNumber(content, lastIndex);
-    let resFirstLineNumber = 0;
-    let resLastLineNumber = 0;
+    get start() {
+        if (!this.conditions.length) {
+            return -1;
+        }
 
-    if (evalExp(ifTag.condition, vars)) {
-        const ifRawLastIndex = ifTag.startPos + ifTag.ifRaw.length;
-        const contentLastIndex = getElseProp(ifTag, 'startPos') || match.index;
+        const first = this.conditions[0];
 
-        res = content.substring(ifRawLastIndex, contentLastIndex);
-        resFirstLineNumber = getLineNumber(content, ifRawLastIndex + 1);
-        resLastLineNumber = getLineNumber(content, contentLastIndex + 1);
-    } else {
-        ifTag.elses.some(({condition, startPos, raw}, index) => {
-            const isTruthy = !condition || evalExp(condition, vars);
+        return first.start - first.rawStart.length;
+    }
 
-            if (isTruthy) {
-                const elseRawLastIndex = startPos + raw.length;
-                const contentLastIndex = getElseProp(ifTag, 'startPos', index + 1) || match.index;
+    get end() {
+        if (!this.conditions.length) {
+            return -1;
+        }
 
-                res = content.substring(elseRawLastIndex, contentLastIndex);
-                resFirstLineNumber = getLineNumber(content, elseRawLastIndex + 1);
-                resLastLineNumber = getLineNumber(content, contentLastIndex + 1);
+        const last = this.conditions[this.conditions.length - 1];
 
-                return true;
-            }
+        return last.end + last.rawEnd.length;
+    }
 
-            return false;
-        });
+    get rawStart() {
+        if (!this.conditions.length) {
+            return '';
+        }
+
+        const first = this.conditions[0];
+
+        return first.rawStart;
     }
 
-    changeSourceMap({
-        firstLineNumber,
-        lastLineNumber,
-        resFirstLineNumber,
-        resLastLineNumber,
-        linesTotal,
-        sourceMap,
-    });
-
-    const preparedLeftContent = getPreparedLeftContent({
-        content,
-        tagStartPos: ifTag.startPos,
-        tagContent: res,
-    });
-
-    let shift = 0;
-    if (
-        res === '' &&
-        preparedLeftContent[preparedLeftContent.length - 1] === '\n' &&
-        content[lastIndex] === '\n'
-    ) {
-        shift = 1;
+    get rawEnd() {
+        if (!this.conditions.length) {
+            return '';
+        }
+
+        const last = this.conditions[this.conditions.length - 1];
+
+        return last.rawEnd;
+    }
+
+    get isBlock() {
+        const first = this.conditions[0];
+        const last = this.conditions[this.conditions.length - 1];
+
+        return tailLinebreak(first.rawStart) && headLinebreak(last.rawEnd);
     }
 
-    if (res !== '') {
-        if (res[0] === '\n') {
-            res = res.substring(1);
+    *[Symbol.iterator](): Generator<IfCondition> {
+        for (const condition of this.conditions) {
+            yield condition;
         }
+    }
+
+    openCondition(raw: string, expr: string, start: number) {
+        this.closeCondition(raw, start);
+        this.conditions.push({
+            rawStart: raw,
+            start: start + raw.length,
+            expr,
+        } as IfCondition);
 
-        res = removeIndentBlock(res);
+        return start + raw.length - tailLinebreak(raw).length;
+    }
 
-        if (res[res.length - 1] === '\n') {
-            res = res.slice(0, -1);
+    closeCondition(raw: string, end: number) {
+        const condition = this.conditions[this.conditions.length - 1];
+        if (condition) {
+            condition.rawEnd = raw;
+            condition.end = end;
         }
     }
+}
+
+function inlineConditions(
+    content: string,
+    ifTag: IfTag,
+    vars: Record<string, unknown>,
+    strict: boolean,
+) {
+    let ifCon = null;
+
+    for (const condition of ifTag) {
+        const value = evalExp(condition.expr, vars, strict);
+
+        if (condition.expr && value === NoValue) {
+            return {
+                result: content,
+                // Fix offset for next matches.
+                // There can be some significant linebreak and spaces.
+                lastIndex: ifTag.end - tailLinebreak(ifTag.rawEnd).length,
+                ifCon: ifTag,
+            };
+        }
 
-    const leftPart = preparedLeftContent + res;
+        if (!condition.expr || value) {
+            ifCon = condition;
+            break;
+        }
+    }
+
+    const start = content.slice(0, ifTag.start);
+    const end = content.slice(ifTag.end);
+    const result = trimResult(content, ifTag, ifCon);
 
     return {
-        result: leftPart + content.substring(lastIndex + shift),
-        idx: leftPart.length,
+        result: start + result + end,
+        lastIndex: start.length + result.length,
+        ifCon,
     };
 }
 
-type Elses = {startPos: number; raw: string; condition?: string};
-
-type Tag = {
-    isOpen: Boolean;
-    condition: string;
-    startPos: number;
-    ifRaw: string;
-    elses: Elses[];
-};
-
 export = function conditions(
-    originInput: string,
+    input: string,
     vars: Record<string, unknown>,
     path?: string,
     settings?: {
         sourceMap: Record<number, number>;
+        strict?: boolean;
     },
 ) {
     const sourceMap = settings?.sourceMap || {};
+    const strict = settings?.strict || false;
+    const tagStack: IfTag[] = [];
 
-    const R_LIQUID = /({%-?([\s\S]*?)-?%})/g;
+    // Consumes all between curly braces
+    // and all closest upon to first linebreak before and after braces.
+    const R_LIQUID = /((?:\n[^\n{]*)?{%-?([\s\S]*?)-?%}(?:\s*\n)?)/g;
 
     let match;
-    const tagStack: Tag[] = [];
-    let input = originInput;
-    let linesTotal = originInput.split('\n').length;
-
     while ((match = R_LIQUID.exec(input)) !== null) {
         if (!match[1]) {
             continue;
@@ -201,50 +239,41 @@ export = function conditions(
         const [type, args] = tagMatch.slice(1);
 
         switch (type) {
-            case 'if':
-                tagStack.push({
-                    isOpen: true,
-                    condition: args,
-                    startPos: match.index,
-                    ifRaw: match[1],
-                    elses: [],
-                });
-                break;
-            case 'else':
-                tagStack[tagStack.length - 1].elses.push({
-                    startPos: match.index,
-                    raw: match[1],
-                });
+            case 'if': {
+                const tag = new IfTag();
+
+                R_LIQUID.lastIndex = tag.openCondition(match[1], args, match.index);
+
+                tagStack.push(tag);
                 break;
+            }
             case 'elsif':
-                tagStack[tagStack.length - 1].elses.push({
-                    condition: args,
-                    startPos: match.index,
-                    raw: match[1],
-                });
+            case 'else': {
+                const tag = tagStack[tagStack.length - 1] as IfTag;
+
+                R_LIQUID.lastIndex = tag.openCondition(match[1], args, match.index);
+
                 break;
+            }
             case 'endif': {
                 const ifTag = tagStack.pop();
 
                 if (!ifTag) {
+                    // TODO(3y3): make lint rule
                     log.error(
                         `If block must be opened before close${path ? ` in ${bold(path)}` : ''}`,
                     );
                     break;
                 }
 
-                const {idx, result} = inlineConditions({
-                    ifTag,
-                    vars,
-                    content: input,
-                    match,
-                    lastIndex: R_LIQUID.lastIndex,
-                    sourceMap,
-                    linesTotal,
-                });
-                R_LIQUID.lastIndex = idx;
+                ifTag.closeCondition(match[1], match.index);
+
+                const {result, lastIndex, ifCon} = inlineConditions(input, ifTag, vars, strict);
+
+                resourcemap(input, ifTag, ifCon, createSourceMapApi(sourceMap));
+
+                R_LIQUID.lastIndex = lastIndex;
                 input = result;
-                linesTotal = result.split('\n').length;
 
                 break;
             }

package/src/transform/liquid/cycles.ts

@@ -30,11 +30,8 @@ function changeSourceMap({
         return;
     }
 
-    const {isInlineTag, moveLines, removeLine} = createSourceMapApi({
-        firstLineNumber,
-        lastLineNumber,
-        sourceMap,
-    });
+    const isInlineTag = firstLineNumber === lastLineNumber;
+    const {moveLines, removeLine} = createSourceMapApi(sourceMap);
 
     if (isInlineTag || !resFirstLineNumber) {
         return;

package/src/transform/liquid/evaluation.ts

@@ -39,7 +39,9 @@ const operators: Record<string, WithFilter | NoFilter | DotOperator> = {
         const parsed = lexical.getParsedMethod(r);
 
         try {
-            if (!parsed) throw new Error();
+            if (!parsed) {
+                throw new Error();
+            }
             const {name, args} = parsed;
 
             return l[name](...args);
@@ -56,7 +58,9 @@ const operators: Record<string, WithFilter | NoFilter | DotOperator> = {
     }) as DotOperator,
 };
 
-function evalValue(originStr: string, scope: Scope) {
+export const NoValue = Symbol('NoValue');
+
+function evalValue(originStr: string, scope: Scope, strict: boolean) {
     const str = originStr && originStr.trim();
     if (!str) {
         return undefined;
@@ -66,7 +70,7 @@ function evalValue(originStr: string, scope: Scope) {
         return lexical.parseLiteral(str);
     }
     if (lexical.isVariable(str)) {
-        return getObject(str, scope);
+        return getObject(str, scope, strict ? NoValue : undefined);
     }
 
     throw new TypeError(`cannot eval '${str}' as value`);
@@ -80,13 +84,25 @@ function isFalsy(val: unknown) {
     return val === false || undefined === val || val === null;
 }
 
+const operatorREs = lexical.operators.map(
+    (op) =>
+        new RegExp(
+            `^(${lexical.quoteBalanced.source})(${op.source})(${lexical.quoteBalanced.source})$`,
+        ),
+);
+
 export function evalExp(
     exp: string,
     scope: Record<string, unknown>,
-): string[] | boolean | string | undefined | ((input: string) => number | string) {
-    const operatorREs = lexical.operators;
-    let match;
-
+    strict = false,
+):
+    | string[]
+    | number[]
+    | boolean
+    | string
+    | symbol
+    | undefined
+    | ((input: string) => number | string) {
     if (Object.getOwnPropertyNames(filters).includes(exp.trim())) {
         return filters[exp.trim() as keyof typeof filters];
     }
@@ -98,28 +114,30 @@ export function evalExp(
     try {
         for (let i = 0; i < operatorREs.length; i++) {
             const operatorRE = operatorREs[i];
-            const expRE = new RegExp(
-                `^(${lexical.quoteBalanced.source})(${operatorRE.source})(${lexical.quoteBalanced.source})$`,
-            );
-            if ((match = exp.match(expRE))) {
-                const l = evalExp(match[1], scope);
+            const match = exp.match(operatorRE);
+            if (match) {
                 const operator = match[2].trim();
+                if (operator === '.' && !lexical.isSupportedMethod(match[3].trim())) {
+                    break;
+                }
+
                 const op = operators[operator];
-                const r = evalExp(match[3], scope);
-
-                if (
-                    operator !== '.' ||
-                    (operator === '.' && lexical.isSupportedMethod(r as string))
-                ) {
-                    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-                    return op(l as any, r as any, exp);
+                const l = evalExp(match[1], scope, strict);
+                const r = evalExp(match[3], scope, strict);
+
+                if (l === NoValue || r === NoValue) {
+                    return NoValue;
                 }
+
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                return op(l as any, r as any, exp);
             }
         }
 
-        if ((match = exp.match(lexical.rangeLine))) {
-            const low = evalValue(match[1], scope);
-            const high = evalValue(match[2], scope);
+        const match = exp.match(lexical.rangeLine);
+        if (match) {
+            const low = Number(evalValue(match[1], scope, strict));
+            const high = Number(evalValue(match[2], scope, strict));
             const range = [];
 
             for (let j = low; j <= high; j++) {
@@ -129,7 +147,7 @@ export function evalExp(
             return range;
         }
 
-        return evalValue(exp, scope);
+        return evalValue(exp, scope, strict);
     } catch (e) {
         if (e instanceof SkippedEvalError) {
             log.warn(`Skip error: ${e}`);
@@ -142,4 +160,5 @@ export function evalExp(
     return undefined;
 }
 
-export default (exp: string, scope: Record<string, unknown>) => Boolean(evalExp(exp, scope));
+export default (exp: string, scope: Record<string, unknown>, strict = false) =>
+    Boolean(evalExp(exp, scope, strict));