ventojs 0.9.0 → 0.9.2

package/esm/deps/deno.land/{std@0.201.0/path/_parse.js → std@0.208.0/path/windows/parse.js}

@@ -1,104 +1,13 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // This module is browser compatible.
-import { CHAR_COLON, CHAR_DOT } from "./_constants.js";
-import { assertPath, isPathSeparator, isPosixPathSeparator, isWindowsDeviceRoot, stripTrailingSeparators, } from "./_util.js";
+import { CHAR_COLON, CHAR_DOT } from "../_common/constants.js";
+import { assertPath } from "../_common/assert_path.js";
+import { isPathSeparator, isWindowsDeviceRoot } from "./_util.js";
 /**
  * Return a `ParsedPath` object of the `path`.
  * @param path to process
  */
-export function posixParse(path) {
-    assertPath(path);
-    const ret = { root: "", dir: "", base: "", ext: "", name: "" };
-    if (path.length === 0)
-        return ret;
-    const isAbsolute = isPosixPathSeparator(path.charCodeAt(0));
-    let start;
-    if (isAbsolute) {
-        ret.root = "/";
-        start = 1;
-    }
-    else {
-        start = 0;
-    }
-    let startDot = -1;
-    let startPart = 0;
-    let end = -1;
-    let matchedSlash = true;
-    let i = path.length - 1;
-    // Track the state of characters (if any) we see before our first dot and
-    // after any path separator we find
-    let preDotState = 0;
-    // Get non-dir info
-    for (; i >= start; --i) {
-        const code = path.charCodeAt(i);
-        if (isPosixPathSeparator(code)) {
-            // If we reached a path separator that was not part of a set of path
-            // separators at the end of the string, stop now
-            if (!matchedSlash) {
-                startPart = i + 1;
-                break;
-            }
-            continue;
-        }
-        if (end === -1) {
-            // We saw the first non-path separator, mark this as the end of our
-            // extension
-            matchedSlash = false;
-            end = i + 1;
-        }
-        if (code === CHAR_DOT) {
-            // If this is our first dot, mark it as the start of our extension
-            if (startDot === -1)
-                startDot = i;
-            else if (preDotState !== 1)
-                preDotState = 1;
-        }
-        else if (startDot !== -1) {
-            // We saw a non-dot and non-path separator before our dot, so we should
-            // have a good chance at having a non-empty extension
-            preDotState = -1;
-        }
-    }
-    if (startDot === -1 ||
-        end === -1 ||
-        // We saw a non-dot character immediately before the dot
-        preDotState === 0 ||
-        // The (right-most) trimmed path component is exactly '..'
-        (preDotState === 1 && startDot === end - 1 && startDot === startPart + 1)) {
-        if (end !== -1) {
-            if (startPart === 0 && isAbsolute) {
-                ret.base = ret.name = path.slice(1, end);
-            }
-            else {
-                ret.base = ret.name = path.slice(startPart, end);
-            }
-        }
-        // Fallback to '/' in case there is no basename
-        ret.base = ret.base || "/";
-    }
-    else {
-        if (startPart === 0 && isAbsolute) {
-            ret.name = path.slice(1, startDot);
-            ret.base = path.slice(1, end);
-        }
-        else {
-            ret.name = path.slice(startPart, startDot);
-            ret.base = path.slice(startPart, end);
-        }
-        ret.ext = path.slice(startDot, end);
-    }
-    if (startPart > 0) {
-        ret.dir = stripTrailingSeparators(path.slice(0, startPart - 1), isPosixPathSeparator);
-    }
-    else if (isAbsolute)
-        ret.dir = "/";
-    return ret;
-}
-/**
- * Return a `ParsedPath` object of the `path`.
- * @param path to process
- */
-export function windowsParse(path) {
+export function parse(path) {
     assertPath(path);
     const ret = { root: "", dir: "", base: "", ext: "", name: "" };
     const len = path.length;

package/esm/deps/deno.land/{std@0.201.0/path/_relative.js → std@0.208.0/path/windows/relative.js}

@@ -1,103 +1,8 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // This module is browser compatible.
-import { CHAR_BACKWARD_SLASH } from "./_constants.js";
-import { assertPath, isPosixPathSeparator } from "./_util.js";
-import { posixResolve, windowsResolve } from "./_resolve.js";
-function assertArgs(from, to) {
-    assertPath(from);
-    assertPath(to);
-    if (from === to)
-        return "";
-}
-/**
- * Return the relative path from `from` to `to` based on current working directory.
- *
- * @param from path in current working directory
- * @param to path in current working directory
- */
-export function posixRelative(from, to) {
-    assertArgs(from, to);
-    from = posixResolve(from);
-    to = posixResolve(to);
-    if (from === to)
-        return "";
-    // Trim any leading backslashes
-    let fromStart = 1;
-    const fromEnd = from.length;
-    for (; fromStart < fromEnd; ++fromStart) {
-        if (!isPosixPathSeparator(from.charCodeAt(fromStart)))
-            break;
-    }
-    const fromLen = fromEnd - fromStart;
-    // Trim any leading backslashes
-    let toStart = 1;
-    const toEnd = to.length;
-    for (; toStart < toEnd; ++toStart) {
-        if (!isPosixPathSeparator(to.charCodeAt(toStart)))
-            break;
-    }
-    const toLen = toEnd - toStart;
-    // Compare paths to find the longest common path from root
-    const length = fromLen < toLen ? fromLen : toLen;
-    let lastCommonSep = -1;
-    let i = 0;
-    for (; i <= length; ++i) {
-        if (i === length) {
-            if (toLen > length) {
-                if (isPosixPathSeparator(to.charCodeAt(toStart + i))) {
-                    // We get here if `from` is the exact base path for `to`.
-                    // For example: from='/foo/bar'; to='/foo/bar/baz'
-                    return to.slice(toStart + i + 1);
-                }
-                else if (i === 0) {
-                    // We get here if `from` is the root
-                    // For example: from='/'; to='/foo'
-                    return to.slice(toStart + i);
-                }
-            }
-            else if (fromLen > length) {
-                if (isPosixPathSeparator(from.charCodeAt(fromStart + i))) {
-                    // We get here if `to` is the exact base path for `from`.
-                    // For example: from='/foo/bar/baz'; to='/foo/bar'
-                    lastCommonSep = i;
-                }
-                else if (i === 0) {
-                    // We get here if `to` is the root.
-                    // For example: from='/foo'; to='/'
-                    lastCommonSep = 0;
-                }
-            }
-            break;
-        }
-        const fromCode = from.charCodeAt(fromStart + i);
-        const toCode = to.charCodeAt(toStart + i);
-        if (fromCode !== toCode)
-            break;
-        else if (isPosixPathSeparator(fromCode))
-            lastCommonSep = i;
-    }
-    let out = "";
-    // Generate the relative path based on the path difference between `to`
-    // and `from`
-    for (i = fromStart + lastCommonSep + 1; i <= fromEnd; ++i) {
-        if (i === fromEnd || isPosixPathSeparator(from.charCodeAt(i))) {
-            if (out.length === 0)
-                out += "..";
-            else
-                out += "/..";
-        }
-    }
-    // Lastly, append the rest of the destination (`to`) path that comes after
-    // the common path parts
-    if (out.length > 0)
-        return out + to.slice(toStart + lastCommonSep);
-    else {
-        toStart += lastCommonSep;
-        if (isPosixPathSeparator(to.charCodeAt(toStart)))
-            ++toStart;
-        return to.slice(toStart);
-    }
-}
+import { CHAR_BACKWARD_SLASH } from "../_common/constants.js";
+import { resolve } from "./resolve.js";
+import { assertArgs } from "../_common/relative.js";
 /**
  * Return the relative path from `from` to `to` based on current working directory.
  *
@@ -109,10 +14,10 @@ export function posixRelative(from, to) {
  * @param from path in current working directory
  * @param to path in current working directory
  */
-export function windowsRelative(from, to) {
+export function relative(from, to) {
     assertArgs(from, to);
-    const fromOrig = windowsResolve(from);
-    const toOrig = windowsResolve(to);
+    const fromOrig = resolve(from);
+    const toOrig = resolve(to);
     if (fromOrig === toOrig)
         return "";
     from = fromOrig.toLowerCase();

package/esm/deps/deno.land/std@0.208.0/path/windows/resolve.d.ts

@@ -0,0 +1,5 @@
+/**
+ * Resolves path segments into a `path`
+ * @param pathSegments to process to path
+ */
+export declare function resolve(...pathSegments: string[]): string;

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

@@ -1,55 +1,15 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // This module is browser compatible.
-import * as dntShim from "../../../../_dnt.shims.js";
-import { CHAR_COLON } from "./_constants.js";
-import { assertPath, isPathSeparator, isPosixPathSeparator, isWindowsDeviceRoot, normalizeString, } from "./_util.js";
+import * as dntShim from "../../../../../_dnt.shims.js";
+import { CHAR_COLON } from "../_common/constants.js";
+import { normalizeString } from "../_common/normalize_string.js";
+import { assertPath } from "../_common/assert_path.js";
+import { isPathSeparator, isWindowsDeviceRoot } from "./_util.js";
 /**
  * Resolves path segments into a `path`
  * @param pathSegments to process to path
  */
-export 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();
-        }
-        assertPath(path);
-        // Skip empty entries
-        if (path.length === 0) {
-            continue;
-        }
-        resolvedPath = `${path}/${resolvedPath}`;
-        resolvedAbsolute = 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 = normalizeString(resolvedPath, !resolvedAbsolute, "/", isPosixPathSeparator);
-    if (resolvedAbsolute) {
-        if (resolvedPath.length > 0)
-            return `/${resolvedPath}`;
-        else
-            return "/";
-    }
-    else if (resolvedPath.length > 0)
-        return resolvedPath;
-    else
-        return ".";
-}
-/**
- * Resolves path segments into a `path`
- * @param pathSegments to process to path
- */
-export function windowsResolve(...pathSegments) {
+export function resolve(...pathSegments) {
     let resolvedDevice = "";
     let resolvedTail = "";
     let resolvedAbsolute = false;

package/esm/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/esm/deps/deno.land/std@0.208.0/path/windows/separator.js

@@ -0,0 +1,4 @@
+// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
+// This module is browser compatible.
+export const SEP = "\\";
+export const SEP_PATTERN = /[\\/]+/;

package/{script/deps/deno.land/std@0.201.0/path/_to_file_url.d.ts → esm/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/esm/deps/deno.land/{std@0.201.0/path/_to_file_url.js → std@0.208.0/path/windows/to_file_url.js}

@@ -1,37 +1,7 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // This module is browser compatible.
-import { posixIsAbsolute, windowsIsAbsolute } from "./_is_absolute.js";
-const WHITESPACE_ENCODINGS = {
-    "\u0009": "%09",
-    "\u000A": "%0A",
-    "\u000B": "%0B",
-    "\u000C": "%0C",
-    "\u000D": "%0D",
-    "\u0020": "%20",
-};
-function encodeWhitespace(string) {
-    return string.replaceAll(/[\s]/g, (c) => {
-        return WHITESPACE_ENCODINGS[c] ?? c;
-    });
-}
-/**
- * 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 function posixToFileUrl(path) {
-    if (!posixIsAbsolute(path)) {
-        throw new TypeError("Must be an absolute path.");
-    }
-    const url = new URL("file:///");
-    url.pathname = encodeWhitespace(path.replace(/%/g, "%25").replace(/\\/g, "%5C"));
-    return url;
-}
+import { encodeWhitespace } from "../_common/to_file_url.js";
+import { isAbsolute } from "./is_absolute.js";
 /**
  * Converts a path string to a file URL.
  *
@@ -44,8 +14,8 @@ export function posixToFileUrl(path) {
  * ```
  * @param path to convert to file URL
  */
-export function windowsToFileUrl(path) {
-    if (!windowsIsAbsolute(path)) {
+export function toFileUrl(path) {
+    if (!isAbsolute(path)) {
         throw new TypeError("Must be an absolute path.");
     }
     const [, hostname, pathname] = path.match(/^(?:[/\\]{2}([^/\\]+)(?=[/\\](?:[^/\\]|$)))?(.*)/);

package/esm/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/esm/deps/deno.land/{std@0.201.0/path/_to_namespaced_path.js → std@0.208.0/path/windows/to_namespaced_path.js}

@@ -1,27 +1,19 @@
 // Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 // This module is browser compatible.
-import { CHAR_BACKWARD_SLASH, CHAR_COLON, CHAR_DOT, CHAR_QUESTION_MARK, } from "./_constants.js";
+import { CHAR_BACKWARD_SLASH, CHAR_COLON, CHAR_DOT, CHAR_QUESTION_MARK, } from "../_common/constants.js";
 import { isWindowsDeviceRoot } from "./_util.js";
-import { windowsResolve } from "./_resolve.js";
+import { resolve } from "./resolve.js";
 /**
  * Resolves path to a namespace path
  * @param path to resolve to namespace
  */
-export function posixToNamespacedPath(path) {
-    // Non-op on posix systems
-    return path;
-}
-/**
- * Resolves path to a namespace path
- * @param path to resolve to namespace
- */
-export function windowsToNamespacedPath(path) {
+export function toNamespacedPath(path) {
     // Note: this will *probably* throw somewhere.
     if (typeof path !== "string")
         return path;
     if (path.length === 0)
         return "";
-    const resolvedPath = windowsResolve(path);
+    const resolvedPath = resolve(path);
     if (resolvedPath.length >= 3) {
         if (resolvedPath.charCodeAt(0) === CHAR_BACKWARD_SLASH) {
             // Possible UNC root

package/esm/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/esm/deps.js

@@ -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/esm/mod.js

@@ -20,8 +20,8 @@ export default function (options = {}) {
     const env = new 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(ifTag());

package/esm/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/esm/src/environment.js

@@ -34,30 +34,30 @@ export class Environment {
         return template(data);
     }
     compile(source, path, defaults, sync = false) {
-        try {
-            const tokens = tokenize(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 } = tokenize(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;
@@ -74,7 +74,7 @@ export 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;
             }
@@ -83,6 +83,7 @@ export 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") {
@@ -132,6 +133,13 @@ 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
@@ -144,3 +152,22 @@ 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]];
+}

package/esm/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]