ventojs 0.9.0 → 0.9.2

package/script/deps/deno.land/{std@0.201.0/path/_resolve.js → std@0.208.0/path/windows/resolve.js}

@@ -23,60 +23,19 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.windowsResolve = exports.posixResolve = void 0;
+exports.resolve = void 0;
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // This module is browser compatible.
-const dntShim = __importStar(require("../../../../_dnt.shims.js"));
-const _constants_js_1 = require("./_constants.js");
+const dntShim = __importStar(require("../../../../../_dnt.shims.js"));
+const constants_js_1 = require("../_common/constants.js");
+const normalize_string_js_1 = require("../_common/normalize_string.js");
+const assert_path_js_1 = require("../_common/assert_path.js");
 const _util_js_1 = require("./_util.js");
 /**
  * Resolves path segments into a `path`
  * @param pathSegments to process to path
  */
-function posixResolve(...pathSegments) {
-    let resolvedPath = "";
-    let resolvedAbsolute = false;
-    for (let i = pathSegments.length - 1; i >= -1 && !resolvedAbsolute; i--) {
-        let path;
-        if (i >= 0)
-            path = pathSegments[i];
-        else {
-            // deno-lint-ignore no-explicit-any
-            const { Deno } = dntShim.dntGlobalThis;
-            if (typeof Deno?.cwd !== "function") {
-                throw new TypeError("Resolved a relative path without a CWD.");
-            }
-            path = Deno.cwd();
-        }
-        (0, _util_js_1.assertPath)(path);
-        // Skip empty entries
-        if (path.length === 0) {
-            continue;
-        }
-        resolvedPath = `${path}/${resolvedPath}`;
-        resolvedAbsolute = (0, _util_js_1.isPosixPathSeparator)(path.charCodeAt(0));
-    }
-    // At this point the path should be resolved to a full absolute path, but
-    // handle relative paths to be safe (might happen when Deno.cwd() fails)
-    // Normalize the path
-    resolvedPath = (0, _util_js_1.normalizeString)(resolvedPath, !resolvedAbsolute, "/", _util_js_1.isPosixPathSeparator);
-    if (resolvedAbsolute) {
-        if (resolvedPath.length > 0)
-            return `/${resolvedPath}`;
-        else
-            return "/";
-    }
-    else if (resolvedPath.length > 0)
-        return resolvedPath;
-    else
-        return ".";
-}
-exports.posixResolve = posixResolve;
-/**
- * Resolves path segments into a `path`
- * @param pathSegments to process to path
- */
-function windowsResolve(...pathSegments) {
+function resolve(...pathSegments) {
     let resolvedDevice = "";
     let resolvedTail = "";
     let resolvedAbsolute = false;
@@ -105,7 +64,7 @@ function windowsResolve(...pathSegments) {
                 path = `${resolvedDevice}\\`;
             }
         }
-        (0, _util_js_1.assertPath)(path);
+        (0, assert_path_js_1.assertPath)(path);
         const len = path.length;
         // Skip empty entries
         if (len === 0)
@@ -166,7 +125,7 @@ function windowsResolve(...pathSegments) {
             }
             else if ((0, _util_js_1.isWindowsDeviceRoot)(code)) {
                 // Possible device root
-                if (path.charCodeAt(1) === _constants_js_1.CHAR_COLON) {
+                if (path.charCodeAt(1) === constants_js_1.CHAR_COLON) {
                     device = path.slice(0, 2);
                     rootEnd = 2;
                     if (len > 2) {
@@ -205,7 +164,7 @@ function windowsResolve(...pathSegments) {
     // but handle relative paths to be safe (might happen when Deno.cwd()
     // fails)
     // Normalize the tail path
-    resolvedTail = (0, _util_js_1.normalizeString)(resolvedTail, !resolvedAbsolute, "\\", _util_js_1.isPathSeparator);
+    resolvedTail = (0, normalize_string_js_1.normalizeString)(resolvedTail, !resolvedAbsolute, "\\", _util_js_1.isPathSeparator);
     return resolvedDevice + (resolvedAbsolute ? "\\" : "") + resolvedTail || ".";
 }
-exports.windowsResolve = windowsResolve;
+exports.resolve = resolve;

package/script/deps/deno.land/std@0.208.0/path/windows/separator.d.ts

@@ -0,0 +1,2 @@
+export declare const SEP = "\\";
+export declare const SEP_PATTERN: RegExp;

package/script/deps/deno.land/std@0.208.0/path/windows/separator.js

@@ -0,0 +1,7 @@
+"use strict";
+// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
+// This module is browser compatible.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SEP_PATTERN = exports.SEP = void 0;
+exports.SEP = "\\";
+exports.SEP_PATTERN = /[\\/]+/;

package/{esm/deps/deno.land/std@0.201.0/path/_to_file_url.d.ts → script/deps/deno.land/std@0.208.0/path/windows/to_file_url.d.ts}

@@ -1,15 +1,4 @@
 /// <reference types="node" />
-/**
- * Converts a path string to a file URL.
- *
- * ```ts
- * import { toFileUrl } from "https://deno.land/std@$STD_VERSION/path/posix.ts";
- *
- * toFileUrl("/home/foo"); // new URL("file:///home/foo")
- * ```
- * @param path to convert to file URL
- */
-export declare function posixToFileUrl(path: string): import("url").URL;
 /**
  * Converts a path string to a file URL.
  *
@@ -22,4 +11,4 @@ export declare function posixToFileUrl(path: string): import("url").URL;
  * ```
  * @param path to convert to file URL
  */
-export declare function windowsToFileUrl(path: string): URL;
+export declare function toFileUrl(path: string): URL;

package/script/deps/deno.land/std@0.208.0/path/windows/to_file_url.js

@@ -0,0 +1,35 @@
+"use strict";
+// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
+// This module is browser compatible.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toFileUrl = void 0;
+const to_file_url_js_1 = require("../_common/to_file_url.js");
+const is_absolute_js_1 = require("./is_absolute.js");
+/**
+ * Converts a path string to a file URL.
+ *
+ * ```ts
+ * import { toFileUrl } from "https://deno.land/std@$STD_VERSION/path/win32.ts";
+ *
+ * toFileUrl("\\home\\foo"); // new URL("file:///home/foo")
+ * toFileUrl("C:\\Users\\foo"); // new URL("file:///C:/Users/foo")
+ * toFileUrl("\\\\127.0.0.1\\home\\foo"); // new URL("file://127.0.0.1/home/foo")
+ * ```
+ * @param path to convert to file URL
+ */
+function toFileUrl(path) {
+    if (!(0, is_absolute_js_1.isAbsolute)(path)) {
+        throw new TypeError("Must be an absolute path.");
+    }
+    const [, hostname, pathname] = path.match(/^(?:[/\\]{2}([^/\\]+)(?=[/\\](?:[^/\\]|$)))?(.*)/);
+    const url = new URL("file:///");
+    url.pathname = (0, to_file_url_js_1.encodeWhitespace)(pathname.replace(/%/g, "%25"));
+    if (hostname !== undefined && hostname !== "localhost") {
+        url.hostname = hostname;
+        if (!url.hostname) {
+            throw new TypeError("Invalid hostname.");
+        }
+    }
+    return url;
+}
+exports.toFileUrl = toFileUrl;

package/script/deps/deno.land/std@0.208.0/path/windows/to_namespaced_path.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Resolves path to a namespace path
+ * @param path to resolve to namespace
+ */
+export declare function toNamespacedPath(path: string): string;

package/script/deps/deno.land/{std@0.201.0/path/_to_namespaced_path.js → std@0.208.0/path/windows/to_namespaced_path.js}

@@ -2,36 +2,27 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // This module is browser compatible.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.windowsToNamespacedPath = exports.posixToNamespacedPath = void 0;
-const _constants_js_1 = require("./_constants.js");
+exports.toNamespacedPath = void 0;
+const constants_js_1 = require("../_common/constants.js");
 const _util_js_1 = require("./_util.js");
-const _resolve_js_1 = require("./_resolve.js");
+const resolve_js_1 = require("./resolve.js");
 /**
  * Resolves path to a namespace path
  * @param path to resolve to namespace
  */
-function posixToNamespacedPath(path) {
-    // Non-op on posix systems
-    return path;
-}
-exports.posixToNamespacedPath = posixToNamespacedPath;
-/**
- * Resolves path to a namespace path
- * @param path to resolve to namespace
- */
-function windowsToNamespacedPath(path) {
+function toNamespacedPath(path) {
     // Note: this will *probably* throw somewhere.
     if (typeof path !== "string")
         return path;
     if (path.length === 0)
         return "";
-    const resolvedPath = (0, _resolve_js_1.windowsResolve)(path);
+    const resolvedPath = (0, resolve_js_1.resolve)(path);
     if (resolvedPath.length >= 3) {
-        if (resolvedPath.charCodeAt(0) === _constants_js_1.CHAR_BACKWARD_SLASH) {
+        if (resolvedPath.charCodeAt(0) === constants_js_1.CHAR_BACKWARD_SLASH) {
             // Possible UNC root
-            if (resolvedPath.charCodeAt(1) === _constants_js_1.CHAR_BACKWARD_SLASH) {
+            if (resolvedPath.charCodeAt(1) === constants_js_1.CHAR_BACKWARD_SLASH) {
                 const code = resolvedPath.charCodeAt(2);
-                if (code !== _constants_js_1.CHAR_QUESTION_MARK && code !== _constants_js_1.CHAR_DOT) {
+                if (code !== constants_js_1.CHAR_QUESTION_MARK && code !== constants_js_1.CHAR_DOT) {
                     // Matched non-long UNC root, convert the path to a long UNC path
                     return `\\\\?\\UNC\\${resolvedPath.slice(2)}`;
                 }
@@ -39,8 +30,8 @@ function windowsToNamespacedPath(path) {
         }
         else if ((0, _util_js_1.isWindowsDeviceRoot)(resolvedPath.charCodeAt(0))) {
             // Possible device root
-            if (resolvedPath.charCodeAt(1) === _constants_js_1.CHAR_COLON &&
-                resolvedPath.charCodeAt(2) === _constants_js_1.CHAR_BACKWARD_SLASH) {
+            if (resolvedPath.charCodeAt(1) === constants_js_1.CHAR_COLON &&
+                resolvedPath.charCodeAt(2) === constants_js_1.CHAR_BACKWARD_SLASH) {
                 // Matched device root, convert the path to a long UNC path
                 return `\\\\?\\${resolvedPath}`;
             }
@@ -48,4 +39,4 @@ function windowsToNamespacedPath(path) {
     }
     return path;
 }
-exports.windowsToNamespacedPath = windowsToNamespacedPath;
+exports.toNamespacedPath = toNamespacedPath;

package/script/deps.d.ts

@@ -1,2 +1,2 @@
-export * as path from "./deps/deno.land/std@0.201.0/path/mod.js";
-export * as html from "./deps/deno.land/std@0.201.0/html/mod.js";
+export * as path from "./deps/deno.land/std@0.208.0/path/mod.js";
+export * as html from "./deps/deno.land/std@0.208.0/html/mod.js";

package/script/deps.js

@@ -24,5 +24,5 @@ var __importStar = (this && this.__importStar) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.html = exports.path = void 0;
-exports.path = __importStar(require("./deps/deno.land/std@0.201.0/path/mod.js"));
-exports.html = __importStar(require("./deps/deno.land/std@0.201.0/html/mod.js"));
+exports.path = __importStar(require("./deps/deno.land/std@0.208.0/path/mod.js"));
+exports.html = __importStar(require("./deps/deno.land/std@0.208.0/html/mod.js"));

package/script/mod.js

@@ -48,8 +48,8 @@ function default_1(options = {}) {
     const env = new environment_js_1.Environment({
         loader,
         dataVarname: options.dataVarname || "it",
-        autoescape: options.autoescape || false,
-        useWith: options.useWith || true,
+        autoescape: options.autoescape ?? false,
+        useWith: options.useWith ?? true,
     });
     // Register basic plugins
     env.use((0, if_js_1.default)());

package/script/src/environment.d.ts

@@ -6,11 +6,13 @@ export interface TemplateResult {
 }
 export interface Template {
     (data?: Record<string, unknown>): Promise<TemplateResult>;
+    source: string;
     code: string;
     file?: string;
 }
 export interface TemplateSync {
     (data?: Record<string, unknown>): TemplateResult;
+    source: string;
     code: string;
     file?: string;
 }
@@ -39,4 +41,7 @@ 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];

package/script/src/environment.js

@@ -26,7 +26,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Environment = void 0;
+exports.errorLine = exports.Environment = void 0;
 const dntShim = __importStar(require("../_dnt.shims.js"));
 const tokenizer_js_1 = __importDefault(require("./tokenizer.js"));
 class Environment {
@@ -63,30 +63,30 @@ class Environment {
         return template(data);
     }
     compile(source, path, defaults, sync = false) {
-        try {
-            const tokens = (0, tokenizer_js_1.default)(source);
-            const code = this.compileTokens(tokens).join("\n");
-            const { dataVarname, useWith } = this.options;
-            const constructor = new Function("__file", "__env", "__defaults", `return${sync ? "" : " async"} function (${dataVarname}) {
-          try {
-            ${dataVarname} = Object.assign({}, __defaults, ${dataVarname});
-            const __exports = { content: "" };
-            ${useWith ? `with (${dataVarname}) {${code}}` : code}
-            return __exports;
-          } catch (cause) {
-            throw new Error(\`Error rendering template: \${__file}\`, { cause });
-          }
-        }
-        `);
-            // console.log(code);
-            const template = constructor(path, this, defaults);
-            template.file = path;
-            template.code = code;
-            return template;
+        const { tokens, position, error } = (0, tokenizer_js_1.default)(source);
+        if (error) {
+            throw this.createError(path || "unknown", source, position, error);
         }
-        catch (cause) {
-            throw new Error(`Error compiling template: ${path || source}`, { cause });
+        const code = this.compileTokens(tokens).join("\n");
+        const { dataVarname, useWith } = this.options;
+        const constructor = new Function("__file", "__env", "__defaults", `return${sync ? "" : " async"} function (${dataVarname}) {
+        let __pos = 0;
+        try {
+          ${dataVarname} = Object.assign({}, __defaults, ${dataVarname});
+          const __exports = { content: "" };
+          ${useWith ? `with (${dataVarname}) {${code}}` : code}
+          return __exports;
+        } catch (cause) {
+          const template = __env.cache.get(__file);
+          throw __env.createError(__file, template?.source || "", __pos, cause);
         }
+      }
+      `);
+        const template = constructor(path, this, defaults);
+        template.file = path;
+        template.code = code;
+        template.source = source;
+        return template;
     }
     async load(file, from) {
         const path = from ? this.options.loader.resolve(from, file) : file;
@@ -103,7 +103,7 @@ class Environment {
             if (stopAt && tokens[0][0] === "tag" && stopAt.includes(tokens[0][1])) {
                 break;
             }
-            const [type, code] = tokens.shift();
+            const [type, code, pos] = tokens.shift();
             if (type === "comment") {
                 continue;
             }
@@ -112,6 +112,7 @@ class Environment {
                 continue;
             }
             if (type === "tag") {
+                compiled.push(`__pos = ${pos};`);
                 for (const tag of this.tags) {
                     const compiledTag = tag(this, code, outputVar, tokens);
                     if (typeof compiledTag === "string") {
@@ -161,6 +162,13 @@ 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 });
+    }
 }
 exports.Environment = Environment;
 function isGlobal(name) {
@@ -174,3 +182,23 @@ function isGlobal(name) {
         return typeof dntShim.dntGlobalThis[obj]?.[prop] === "function";
     }
 }
+/** Returns the number and code of the errored line */
+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]];
+}
+exports.errorLine = errorLine;

package/script/src/tokenizer.d.ts

@@ -1,6 +1,11 @@
 export type TokenType = "string" | "tag" | "filter" | "comment";
-export type Token = [TokenType, string];
-export default function tokenize(source: string): Token[];
+export type Token = [TokenType, string, number?];
+export interface TokenizeResult {
+    tokens: Token[];
+    position: number;
+    error: Error | undefined;
+}
+export default function tokenize(source: string): TokenizeResult;
 /**
  * Parse a tag and return the indexes of the start and end brackets, and the filters between.
  * For example: {{ tag |> filter1 |> filter2 }} => [2, 9, 20, 31]

package/script/src/tokenizer.js

@@ -5,84 +5,95 @@ function tokenize(source) {
     const tokens = [];
     let type = "string";
     let trimNext = false;
-    while (source.length > 0) {
-        if (type === "string") {
-            const index = source.indexOf("{{");
-            const code = index === -1 ? source : source.slice(0, index);
-            if (trimNext) {
-                tokens.push([type, code.trimStart()]);
-                trimNext = false;
-            }
-            else {
-                tokens.push([type, code]);
-            }
-            if (index === -1) {
-                break;
+    let position = 0;
+    try {
+        while (source.length > 0) {
+            if (type === "string") {
+                const index = source.indexOf("{{");
+                const code = index === -1 ? source : source.slice(0, index);
+                if (trimNext) {
+                    tokens.push([type, code.trimStart(), position]);
+                    trimNext = false;
+                }
+                else {
+                    tokens.push([type, code, position]);
+                }
+                if (index === -1) {
+                    break;
+                }
+                position += index;
+                source = source.slice(index);
+                type = source.startsWith("{{#") ? "comment" : "tag";
+                continue;
             }
-            source = source.slice(index);
-            type = source.startsWith("{{#") ? "comment" : "tag";
-            continue;
-        }
-        if (type === "comment") {
-            source = source.slice(3);
-            const index = source.indexOf("#}}");
-            const comment = index === -1 ? source : source.slice(0, index);
-            tokens.push([type, comment]);
-            if (index === -1) {
-                break;
+            if (type === "comment") {
+                source = source.slice(3);
+                const index = source.indexOf("#}}");
+                const comment = index === -1 ? source : source.slice(0, index);
+                tokens.push([type, comment, position]);
+                if (index === -1) {
+                    break;
+                }
+                position += index + 3;
+                source = source.slice(index + 3);
+                type = "string";
+                continue;
             }
-            source = source.slice(index + 3);
-            type = "string";
-            continue;
-        }
-        if (type === "tag") {
-            const indexes = parseTag(source);
-            const lastIndex = indexes.length - 1;
-            let tag;
-            indexes.reduce((prev, curr, index) => {
-                let code = source.slice(prev, curr - 2);
-                // Tag
-                if (index === 1) {
-                    // Left trim
-                    if (code.startsWith("-")) {
-                        code = code.slice(1);
-                        const lastToken = tokens[tokens.length - 1];
-                        lastToken[1] = lastToken[1].trimEnd();
+            if (type === "tag") {
+                const indexes = parseTag(source);
+                const lastIndex = indexes.length - 1;
+                let tag;
+                indexes.reduce((prev, curr, index) => {
+                    let code = source.slice(prev, curr - 2);
+                    // Tag
+                    if (index === 1) {
+                        // Left trim
+                        if (code.startsWith("-")) {
+                            code = code.slice(1);
+                            const lastToken = tokens[tokens.length - 1];
+                            lastToken[1] = lastToken[1].trimEnd();
+                        }
+                        // Right trim
+                        if (code.endsWith("-") && index === lastIndex) {
+                            code = code.slice(0, -1);
+                            trimNext = true;
+                        }
+                        tag = [type, code.trim(), position];
+                        tokens.push(tag);
+                        return curr;
                     }
                     // Right trim
-                    if (code.endsWith("-") && index === lastIndex) {
+                    if (index === lastIndex && code.endsWith("-")) {
                         code = code.slice(0, -1);
                         trimNext = true;
                     }
-                    tag = [type, code.trim()];
-                    tokens.push(tag);
+                    // Filters
+                    tokens.push(["filter", code.trim()]);
                     return curr;
+                });
+                position += indexes[lastIndex];
+                source = source.slice(indexes[lastIndex]);
+                type = "string";
+                // Search the closing echo tag {{ /echo }}
+                if (tag?.[1] === "echo") {
+                    const end = source.match(/{{\s*\/echo\s*}}/);
+                    if (!end) {
+                        throw new Error("Unclosed echo tag");
+                    }
+                    const rawCode = source.slice(0, end.index);
+                    tag[1] = `echo ${JSON.stringify(rawCode)}`;
+                    const length = Number(end.index) + end[0].length;
+                    source = source.slice(length);
+                    position += length;
                 }
-                // Right trim
-                if (index === lastIndex && code.endsWith("-")) {
-                    code = code.slice(0, -1);
-                    trimNext = true;
-                }
-                // Filters
-                tokens.push(["filter", code.trim()]);
-                return curr;
-            });
-            source = source.slice(indexes[indexes.length - 1]);
-            type = "string";
-            // Search the closing echo tag {{ /echo }}
-            if (tag?.[1] === "echo") {
-                const end = source.match(/{{\s*\/echo\s*}}/);
-                if (!end) {
-                    throw new Error("Unclosed echo tag");
-                }
-                const rawCode = source.slice(0, end.index);
-                tag[1] = `echo ${JSON.stringify(rawCode)}`;
-                source = source.slice(Number(end.index) + end[0].length);
+                continue;
             }
-            continue;
         }
     }
-    return tokens;
+    catch (error) {
+        return { tokens, position, error };
+    }
+    return { tokens, position, error: undefined };
 }
 exports.default = tokenize;
 /**

package/esm/deps/deno.land/std@0.201.0/path/_basename.d.ts

@@ -1,16 +0,0 @@
-/**
- * Return the last portion of a `path`.
- * Trailing directory separators are ignored, and optional suffix is removed.
- *
- * @param path - path to extract the name from.
- * @param [suffix] - suffix to remove from extracted name.
- */
-export declare function posixBasename(path: string, suffix?: string): string;
-/**
- * Return the last portion of a `path`.
- * Trailing directory separators are ignored, and optional suffix is removed.
- *
- * @param path - path to extract the name from.
- * @param [suffix] - suffix to remove from extracted name.
- */
-export declare function windowsBasename(path: string, suffix?: string): string;