ventojs 1.12.11 → 1.12.13

package/esm/mod.d.ts

@@ -2,8 +2,9 @@ import { Environment } from "./src/environment.js";
 import { Loader } from "./src/loader.js";
 export interface Options {
     includes?: string | Loader;
-    /** @deprecated */
+    /** @deprecated Use autoDataVarname */
     useWith?: boolean;
+    autoDataVarname?: boolean;
     dataVarname?: string;
     autoescape?: boolean;
 }

package/esm/mod.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAc,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAerD,MAAM,WAAW,OAAO;IACtB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,kBAAkB;IAClB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,CAAC,OAAO,WAAW,OAAO,GAAE,OAAY,GAAG,WAAW,CA4B3D"}
+{"version":3,"file":"mod.d.ts","sourceRoot":"","sources":["../src/mod.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AACnD,OAAO,EAAc,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAerD,MAAM,WAAW,OAAO;IACtB,QAAQ,CAAC,EAAE,MAAM,GAAG,MAAM,CAAC;IAC3B,sCAAsC;IACtC,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,CAAC,OAAO,WAAW,OAAO,GAAE,OAAY,GAAG,WAAW,CA4B3D"}

package/esm/mod.js

@@ -22,7 +22,7 @@ export default function (options = {}) {
         loader,
         dataVarname: options.dataVarname || "it",
         autoescape: options.autoescape ?? false,
-        useWith: options.useWith ?? true,
+        autoDataVarname: options.autoDataVarname ?? options.useWith ?? true,
     });
     // Register basic plugins
     env.use(ifTag());

package/esm/plugins/auto_trim.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"auto_trim.d.ts","sourceRoot":"","sources":["../../src/plugins/auto_trim.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,KAAK,EAAe,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEjE,eAAO,MAAM,WAAW,UAgBvB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAAE,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEjD,MAAM,CAAC,OAAO,WACZ,OAAO,GAAE,eAAuC,GAC/C,MAAM,CAIR;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,eAAe,QAkBjE"}
+{"version":3,"file":"auto_trim.d.ts","sourceRoot":"","sources":["../../src/plugins/auto_trim.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,qBAAqB,CAAC;AACjD,OAAO,KAAK,EAAe,MAAM,EAAE,MAAM,uBAAuB,CAAC;AAEjE,eAAO,MAAM,WAAW,UAgBvB,CAAC;AAEF,MAAM,MAAM,eAAe,GAAG;IAAE,IAAI,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC;AAEjD,MAAM,CAAC,OAAO,WACZ,OAAO,GAAE,eAAuC,GAC/C,MAAM,CAIR;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,eAAe,QAoBjE"}

package/esm/plugins/auto_trim.js

@@ -34,5 +34,8 @@ export function autoTrim(tokens, options) {
                 next[1] = next[1].replace(/^[ \t]*(?:\r\n|\n)/, "");
             }
         }
+        else if (type === "comment") {
+            previous[1] = previous[1].replace(/(?:\r\n|\n)[ \t]*$/, "");
+        }
     }
 }

package/esm/plugins/for.js

@@ -32,7 +32,7 @@ item, withKeys = false) {
         return [];
     }
     if (Array.isArray(item)) {
-        return withKeys ? Object.entries(item) : item;
+        return withKeys ? item.map((value, i) => [i, value]) : item;
     }
     if (typeof item === "function") {
         return toIterator(item(), withKeys);

package/esm/plugins/set.js

@@ -18,8 +18,8 @@ function setTag(env, code, _output, tokens) {
         const [, variable, value] = match;
         const val = env.compileFilters(tokens, value);
         return `
-    ${dataVarname}["${variable}"] = ${val};
     var ${variable} = ${val};
+    ${dataVarname}["${variable}"] = ${variable};
     `;
     }
     // Value is captured (eg: {{ set foo }}bar{{ /set }})

package/esm/src/environment.d.ts

@@ -28,7 +28,7 @@ export interface Options {
     loader: Loader;
     dataVarname: string;
     autoescape: boolean;
-    useWith: boolean;
+    autoDataVarname: boolean;
 }
 export declare class Environment {
     cache: Map<string, Template>;
@@ -48,8 +48,5 @@ export declare class Environment {
     load(file: string, from?: string): Promise<Template>;
     compileTokens(tokens: Token[], outputVar?: string, stopAt?: string[]): string[];
     compileFilters(tokens: Token[], output: string, autoescape?: boolean): string;
-    createError(path: string, source: string, position: number, cause: Error): Error;
 }
-/** Returns the number and code of the errored line */
-export declare function errorLine(source: string, pos: number): [number, number, string];
 //# sourceMappingURL=environment.d.ts.map

package/esm/src/environment.d.ts.map

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

package/esm/src/environment.js

@@ -1,6 +1,7 @@
 import * as dntShim from "../_dnt.shims.js";
 import tokenize from "./tokenizer.js";
 import { transformTemplateCode } from "./transformer.js";
+import { TemplateError, TransformError } from "./errors.js";
 export class Environment {
     cache = new Map();
     options;
@@ -41,11 +42,19 @@ export class Environment {
         }
         const tokens = this.tokenize(source, path);
         let code = this.compileTokens(tokens).join("\n");
-        const { dataVarname, useWith } = this.options;
-        if (useWith) {
-            code = transformTemplateCode(code, dataVarname);
+        const { dataVarname, autoDataVarname } = this.options;
+        if (autoDataVarname) {
+            try {
+                code = transformTemplateCode(code, dataVarname);
+            }
+            catch (cause) {
+                if (cause instanceof TransformError) {
+                    throw new TemplateError(path, source, cause.position, cause);
+                }
+                throw new Error(`Unknown error while transforming ${path}`, { cause });
+            }
         }
-        const constructor = new Function("__file", "__env", "__defaults", `return${sync ? "" : " async"} function (${dataVarname}) {
+        const constructor = new Function("__file", "__env", "__defaults", "__err", `return${sync ? "" : " async"} function (${dataVarname}) {
         let __pos = 0;
         try {
           ${dataVarname} = Object.assign({}, __defaults, ${dataVarname});
@@ -54,11 +63,11 @@ export class Environment {
           return __exports;
         } catch (cause) {
           const template = __env.cache.get(__file);
-          throw __env.createError(__file, template?.source || "", __pos, cause);
+          throw new __err(__file, template?.source, __pos, cause);
         }
       }
       `);
-        const template = constructor(path, this, defaults);
+        const template = constructor(path, this, defaults, TemplateError);
         template.file = path;
         template.code = code;
         template.source = source;
@@ -69,7 +78,7 @@ export class Environment {
         let { tokens } = result;
         const { position, error } = result;
         if (error) {
-            throw this.createError(path || "unknown", source, position, error);
+            throw new TemplateError(path, source, position, error);
         }
         for (const tokenPreprocessor of this.tokenPreprocessors) {
             const result = tokenPreprocessor(this, tokens, path);
@@ -160,13 +169,6 @@ export class Environment {
         }
         return output;
     }
-    createError(path, source, position, cause) {
-        if (!source) {
-            return cause;
-        }
-        const [line, column, code] = errorLine(source, position);
-        return new Error(`Error in the template ${path}:${line}:${column}\n\n${code.trim()}\n\n> ${cause.message}\n`, { cause });
-    }
 }
 function isGlobal(name) {
     // @ts-ignore TS doesn't know about globalThis
@@ -179,25 +181,6 @@ function isGlobal(name) {
         return typeof dntShim.dntGlobalThis[obj]?.[prop] === "function";
     }
 }
-/** Returns the number and code of the errored line */
-export function errorLine(source, pos) {
-    let line = 1;
-    let column = 1;
-    for (let index = 0; index < pos; index++) {
-        if (source[index] === "\n" ||
-            (source[index] === "\r" && source[index + 1] === "\n")) {
-            line++;
-            column = 1;
-            if (source[index] === "\r") {
-                index++;
-            }
-        }
-        else {
-            column++;
-        }
-    }
-    return [line, column, source.split("\n")[line - 1]];
-}
 function checkAsync(fn) {
     return fn.constructor?.name === "AsyncFunction";
 }

package/esm/src/errors.d.ts

@@ -0,0 +1,21 @@
+declare class VentoBaseError extends Error {
+    name: string;
+}
+export declare class TemplateError extends VentoBaseError {
+    path: string;
+    source: string;
+    position: number;
+    constructor(path?: string, source?: string, position?: number, cause?: Error);
+}
+export declare class TransformError extends VentoBaseError {
+    position: number;
+    constructor(message: string, position?: number, cause?: Error);
+}
+/** Returns the number and code of the errored line */
+export declare function errorLine(source: string, position: number): {
+    line: number;
+    column: number;
+    code: string;
+};
+export {};
+//# sourceMappingURL=errors.d.ts.map

package/esm/src/errors.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/src/errors.ts"],"names":[],"mappings":"AAAA,cAAM,cAAe,SAAQ,KAAK;IACvB,IAAI,SAAyB;CACvC;AAED,qBAAa,aAAc,SAAQ,cAAc;IAEtC,IAAI,EAAE,MAAM;IACZ,MAAM,EAAE,MAAM;IACd,QAAQ,EAAE,MAAM;gBAFhB,IAAI,GAAE,MAAoB,EAC1B,MAAM,GAAE,MAAuB,EAC/B,QAAQ,GAAE,MAAU,EAC3B,KAAK,CAAC,EAAE,KAAK;CAYhB;AAED,qBAAa,cAAe,SAAQ,cAAc;IAGvC,QAAQ,EAAE,MAAM;gBADvB,OAAO,EAAE,MAAM,EACR,QAAQ,GAAE,MAAU,EAC3B,KAAK,CAAC,EAAE,KAAK;CAIhB;AAED,sDAAsD;AACtD,wBAAgB,SAAS,CACvB,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,GACf;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,CAqBhD"}

package/esm/src/errors.js

@@ -0,0 +1,44 @@
+class VentoBaseError extends Error {
+    name = this.constructor.name;
+}
+export class TemplateError extends VentoBaseError {
+    path;
+    source;
+    position;
+    constructor(path = "<unknown>", source = "<empty file>", position = 0, cause) {
+        const { line, column, code } = errorLine(source, position);
+        super(`Error in template ${path}:${line}:${column}\n\n${code.trim()}\n\n`, { cause });
+        this.path = path;
+        this.source = source;
+        this.position = position;
+        if (cause) {
+            this.message += `(via ${cause.name})\n`;
+        }
+    }
+}
+export class TransformError extends VentoBaseError {
+    position;
+    constructor(message, position = 0, cause) {
+        super(message, { cause });
+        this.position = position;
+    }
+}
+/** Returns the number and code of the errored line */
+export function errorLine(source, position) {
+    let line = 1;
+    let column = 1;
+    for (let index = 0; index < position; index++) {
+        if (source[index] === "\n" ||
+            (source[index] === "\r" && source[index + 1] === "\n")) {
+            line++;
+            column = 1;
+            if (source[index] === "\r") {
+                index++;
+            }
+        }
+        else {
+            column++;
+        }
+    }
+    return { line, column, code: source.split("\n")[line - 1] };
+}

package/esm/src/transformer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"transformer.d.ts","sourceRoot":"","sources":["../../src/src/transformer.ts"],"names":[],"mappings":"AAkHA,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM,GACpB,MAAM,CAiIR"}
+{"version":3,"file":"transformer.d.ts","sourceRoot":"","sources":["../../src/src/transformer.ts"],"names":[],"mappings":"AA4HA,wBAAgB,qBAAqB,CACnC,IAAI,EAAE,MAAM,EACZ,aAAa,EAAE,MAAM,GACpB,MAAM,CAwJR"}

package/esm/src/transformer.js

@@ -1,5 +1,6 @@
 import * as dntShim from "../_dnt.shims.js";
 import { astring, meriyah, walker } from "../deps.js";
+import { TransformError } from "./errors.js";
 // List of identifiers that are in globalThis
 // but should be accessed as templateState.identifier
 const INCLUDE_GLOBAL = [
@@ -94,17 +95,34 @@ export function transformTemplateCode(code, templateState) {
     if (!code.trim()) {
         return code;
     }
-    const parsed = meriyah.parseScript(code, { module: true });
+    let parsed;
+    try {
+        parsed = meriyah.parseScript(code, { module: true });
+    }
+    catch (error) {
+        const { message, start, loc } = error;
+        // Use information from `meriyah` to annotate the part of
+        // the compiled template function that triggered the ParseError
+        const annotation = `\u001B[2m${loc.start.line}\u001B[0m ` +
+            code.split("\n")[loc.start.line - 1] +
+            `\n${" ".repeat(loc.start.column)}\u001B[31m^\u001B[39m`;
+        // Grab the last instance of Vento's `__pos` variable before the
+        // error was thrown. Pass this back to Vento to
+        // tie this error with problmatic template code
+        const matches = [...code.slice(0, start).matchAll(/__pos = (\d+);/g)];
+        const position = Number(matches.at(-1)?.[1]);
+        throw new TransformError(`[meriyah] ${message} while parsing compiled template function:\n\n${annotation}`, position);
+    }
     const tracker = new ScopeTracker();
     const exclude = [
         templateState,
         ...DEFAULT_EXCLUDES,
     ];
     if (parsed.type !== "Program") {
-        throw new Error("Expected a program");
+        throw new TransformError("[meriyah] Expected a program");
     }
     if (parsed.body.length === 0) {
-        throw new Error("Empty program");
+        throw new TransformError("[meriyah] Empty program");
     }
     // Transforms an identifier to a MemberExpression
     // if it's not in the exclude list

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ventojs",
-  "version": "1.12.11",
+  "version": "1.12.13",
   "description": "🌬 A minimal but powerful template engine",
   "homepage": "https://vento.js.org/",
   "repository": "github:oscarotero/vento",