ventojs 0.9.2 → 0.11.0

package/script/deps/deno.land/std@0.210.0/assert/assertion_error.d.ts

@@ -0,0 +1,14 @@
+/**
+ * Error thrown when an assertion fails.
+ *
+ * @example
+ * ```ts
+ * import { AssertionError } from "https://deno.land/std@$STD_VERSION/assert/assertion_error.ts";
+ *
+ * throw new AssertionError("Assertion failed");
+ * ```
+ */
+export declare class AssertionError extends Error {
+    /** Constructs a new instance. */
+    constructor(message: string);
+}

package/script/deps/deno.land/{std@0.208.0 → std@0.210.0}/assert/assertion_error.js

@@ -1,11 +1,22 @@
 "use strict";
+// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AssertionError = void 0;
-// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
+/**
+ * Error thrown when an assertion fails.
+ *
+ * @example
+ * ```ts
+ * import { AssertionError } from "https://deno.land/std@$STD_VERSION/assert/assertion_error.ts";
+ *
+ * throw new AssertionError("Assertion failed");
+ * ```
+ */
 class AssertionError extends Error {
-    name = "AssertionError";
+    /** Constructs a new instance. */
     constructor(message) {
         super(message);
+        this.name = "AssertionError";
     }
 }
 exports.AssertionError = AssertionError;

package/{esm/deps/deno.land/std@0.208.0 → script/deps/deno.land/std@0.210.0}/path/_common/glob_to_reg_exp.d.ts

@@ -1,3 +1,4 @@
+/** Options for {@linkcode globToRegExp}. */
 export interface GlobOptions {
     /** Extended glob syntax.
      * See https://www.linuxjournal.com/content/bash-extended-globbing.

package/script/deps/deno.land/std@0.210.0/path/common.d.ts

@@ -0,0 +1,13 @@
+/** Determines the common path from a set of paths, using an optional separator,
+ * which defaults to the OS default separator.
+ *
+ * ```ts
+ *       import { common } from "https://deno.land/std@$STD_VERSION/path/mod.ts";
+ *       const p = common([
+ *         "./deno/std/path/mod.ts",
+ *         "./deno/std/fs/mod.ts",
+ *       ]);
+ *       console.log(p); // "./deno/std/"
+ * ```
+ */
+export declare function common(paths: string[], sep?: "/" | "\\"): string;

package/script/deps/deno.land/{std@0.208.0 → std@0.210.0}/path/extname.js

@@ -5,7 +5,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.extname = void 0;
 const _os_js_1 = require("./_os.js");
 const extname_js_1 = require("./posix/extname.js");
-const extname_js_2 = require("./posix/extname.js");
+const extname_js_2 = require("./windows/extname.js");
 /**
  * Return the extension of the `path` with leading period.
  * @param path with extension

package/{esm/deps/deno.land/std@0.208.0 → script/deps/deno.land/std@0.210.0}/path/mod.d.ts

@@ -4,8 +4,8 @@ import * as _posix from "./posix/mod.js";
 export declare const win32: typeof _windows;
 /** @deprecated (will be removed after 1.0.0) Import from {@link https://deno.land/std/posix/mod.ts} instead. */
 export declare const posix: typeof _posix;
-export declare const sep: string;
-export declare const delimiter: string;
+export declare const sep: "/" | "\\";
+export declare const delimiter: ":" | ";";
 export * from "./basename.js";
 export * from "./dirname.js";
 export * from "./extname.js";

package/script/deps/deno.land/{std@0.208.0 → std@0.210.0}/path/mod.js

@@ -69,7 +69,9 @@ exports.win32 = _windows;
 /** @deprecated (will be removed after 1.0.0) Import from {@link https://deno.land/std/posix/mod.ts} instead. */
 exports.posix = _posix;
 exports.sep = _os_js_1.isWindows ? _windows.sep : _posix.sep;
-exports.delimiter = _os_js_1.isWindows ? _windows.delimiter : _posix.delimiter;
+exports.delimiter = _os_js_1.isWindows
+    ? _windows.delimiter
+    : _posix.delimiter;
 __exportStar(require("./basename.js"), exports);
 __exportStar(require("./dirname.js"), exports);
 __exportStar(require("./extname.js"), exports);

package/{esm/deps/deno.land/std@0.208.0 → script/deps/deno.land/std@0.210.0}/path/posix/to_file_url.d.ts

@@ -9,4 +9,4 @@
  * ```
  * @param path to convert to file URL
  */
-export declare function toFileUrl(path: string): import("url").URL;
+export declare function toFileUrl(path: string): URL;

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

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

package/script/deps.d.ts

@@ -1,2 +1,2 @@
-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";
+export * as path from "./deps/deno.land/std@0.210.0/path/mod.js";
+export * as html from "./deps/deno.land/std@0.210.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.208.0/path/mod.js"));
-exports.html = __importStar(require("./deps/deno.land/std@0.208.0/html/mod.js"));
+exports.path = __importStar(require("./deps/deno.land/std@0.210.0/path/mod.js"));
+exports.html = __importStar(require("./deps/deno.land/std@0.210.0/html/mod.js"));

package/script/mod.js

@@ -41,6 +41,7 @@ const export_js_1 = __importDefault(require("./plugins/export.js"));
 const echo_js_1 = __importDefault(require("./plugins/echo.js"));
 const escape_js_1 = __importDefault(require("./plugins/escape.js"));
 const unescape_js_1 = __importDefault(require("./plugins/unescape.js"));
+const trim_js_1 = __importDefault(require("./plugins/trim.js"));
 function default_1(options = {}) {
     const loader = typeof options.includes === "object"
         ? options.includes
@@ -64,6 +65,7 @@ function default_1(options = {}) {
     env.use((0, echo_js_1.default)());
     env.use((0, escape_js_1.default)());
     env.use((0, unescape_js_1.default)());
+    env.use((0, trim_js_1.default)());
     return env;
 }
 exports.default = default_1;

package/script/plugins/auto_trim.d.ts

@@ -0,0 +1,8 @@
+import type { Token } from "../src/tokenizer.js";
+import type { Environment } from "../src/environment.js";
+export declare const defaultTags: string[];
+export type AutoTrimOptions = {
+    tags: string[];
+};
+export default function (options?: AutoTrimOptions): (env: Environment) => void;
+export declare function autoTrim(tokens: Token[], options: AutoTrimOptions): void;

package/script/plugins/auto_trim.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.autoTrim = exports.defaultTags = void 0;
+exports.defaultTags = [
+    ">",
+    "#",
+    "set",
+    "/set",
+    "if",
+    "/if",
+    "else",
+    "for",
+    "/for",
+    "function",
+    "async",
+    "/function",
+    "export",
+    "/export",
+    "import",
+];
+function default_1(options = { tags: exports.defaultTags }) {
+    return (env) => {
+        env.tokenPreprocessors.push((_, tokens) => autoTrim(tokens, options));
+    };
+}
+exports.default = default_1;
+function autoTrim(tokens, options) {
+    for (let i = 0; i < tokens.length; i++) {
+        const previous = tokens[i - 1];
+        const token = tokens[i];
+        const next = tokens[i + 1];
+        const [type, code] = token;
+        if (type === "tag" && options.tags.find((tag) => code.startsWith(tag))) {
+            // Remove leading horizontal space
+            previous[1] = previous[1].replace(/[ \t]*$/, "");
+            // Remove trailing horizontal space + newline
+            next[1] = next[1].replace(/^[ \t]*(?:\r\n|\n)/, "");
+        }
+    }
+}
+exports.autoTrim = autoTrim;

package/script/plugins/escape.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const deps_js_1 = require("../deps.js");
 function default_1() {
     return (env) => {
-        env.filters.escape = deps_js_1.html.escape;
+        // deno-lint-ignore no-explicit-any
+        env.filters.escape = (value) => value ? deps_js_1.html.escape(value.toString()) : "";
     };
 }
 exports.default = default_1;

package/script/plugins/for.js

@@ -28,7 +28,9 @@ function forTag(env, code, output, tokens) {
     compiled.push("}");
     return compiled.join("\n");
 }
-function toIterator(item, withKeys = false) {
+function toIterator(
+// deno-lint-ignore no-explicit-any
+item, withKeys = false) {
     if (item === undefined || item === null) {
         return [];
     }
@@ -39,6 +41,18 @@ function toIterator(item, withKeys = false) {
         return toIterator(item(), withKeys);
     }
     if (typeof item === "object" && item !== null) {
+        if (typeof item[Symbol.iterator] === "function") {
+            if (withKeys) {
+                return iterableToEntries(item);
+            }
+            return item;
+        }
+        if (typeof item[Symbol.asyncIterator] === "function") {
+            if (withKeys) {
+                return asyncIterableToEntries(item);
+            }
+            return item;
+        }
         return withKeys ? Object.entries(item) : Object.values(item);
     }
     if (typeof item === "string") {
@@ -49,3 +63,15 @@ function toIterator(item, withKeys = false) {
     }
     return toIterator([item], withKeys);
 }
+function* iterableToEntries(iterator) {
+    let i = 0;
+    for (const value of iterator) {
+        yield [i++, value];
+    }
+}
+async function* asyncIterableToEntries(iterator) {
+    let i = 0;
+    for await (const value of iterator) {
+        yield [i++, value];
+    }
+}

package/script/plugins/js.js

@@ -7,7 +7,7 @@ function default_1() {
 }
 exports.default = default_1;
 function jsTag(_env, code) {
-    if (!code.startsWith("> ")) {
+    if (!code.startsWith(">")) {
         return;
     }
     return code.replace(/^>\s+/, "");

package/script/plugins/trim.d.ts

@@ -0,0 +1,4 @@
+import type { Token } from "../src/tokenizer.js";
+import type { Environment } from "../src/environment.js";
+export default function (): (env: Environment) => void;
+export declare function trim(_: Environment, tokens: Token[]): void;

package/script/plugins/trim.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.trim = void 0;
+function default_1() {
+    return (env) => {
+        env.tokenPreprocessors.push(trim);
+    };
+}
+exports.default = default_1;
+function trim(_, tokens) {
+    for (let i = 0; i < tokens.length; i++) {
+        const previous = tokens[i - 1];
+        const token = tokens[i];
+        const next = tokens[i + 1];
+        let [type, code] = token;
+        if (type === "tag" && code.startsWith("-")) {
+            previous[1] = previous[1].trimEnd();
+            code = code.slice(1);
+        }
+        if (type === "tag" && code.endsWith("-")) {
+            next[1] = next[1].trimStart();
+            code = code.slice(0, -1);
+        }
+        // Trim tag and filter code
+        switch (type) {
+            case "tag":
+            case "filter":
+                token[1] = code.trim();
+                break;
+        }
+    }
+}
+exports.trim = trim;

package/script/plugins/unescape.js

@@ -3,7 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const deps_js_1 = require("../deps.js");
 function default_1() {
     return (env) => {
-        env.filters.unescape = deps_js_1.html.unescape;
+        // deno-lint-ignore no-explicit-any
+        env.filters.unescape = (value) => value ? deps_js_1.html.unescape(value.toString()) : "";
     };
 }
 exports.default = default_1;

package/script/src/environment.d.ts

@@ -16,8 +16,13 @@ export interface TemplateSync {
     code: string;
     file?: string;
 }
+export type TokenPreprocessor = (env: Environment, tokens: Token[], path?: string) => Token[] | void;
 export type Tag = (env: Environment, code: string, output: string, tokens: Token[]) => string | undefined;
-export type Filter = (...args: any[]) => any;
+export type FilterThis = {
+    data: Record<string, unknown>;
+    env: Environment;
+};
+export type Filter = (this: FilterThis, ...args: any[]) => any;
 export type Plugin = (env: Environment) => void;
 export interface Options {
     loader: Loader;
@@ -29,6 +34,7 @@ export declare class Environment {
     cache: Map<string, Template>;
     options: Options;
     tags: Tag[];
+    tokenPreprocessors: TokenPreprocessor[];
     filters: Record<string, Filter>;
     utils: Record<string, unknown>;
     constructor(options: Options);
@@ -38,6 +44,7 @@ export declare class Environment {
     runStringSync(source: string, data?: Record<string, unknown>): TemplateResult;
     compile(source: string, path?: string, defaults?: Record<string, unknown>, sync?: false): Template;
     compile(source: string, path?: string, defaults?: Record<string, unknown>, sync?: true): TemplateSync;
+    tokenize(source: string, path?: string): Token[];
     load(file: string, from?: string): Promise<Template>;
     compileTokens(tokens: Token[], outputVar?: string, stopAt?: string[]): string[];
     compileFilters(tokens: Token[], output: string, autoescape?: boolean): string;

package/script/src/environment.js

@@ -33,6 +33,7 @@ class Environment {
     cache = new Map();
     options;
     tags = [];
+    tokenPreprocessors = [];
     filters = {};
     utils = {};
     constructor(options) {
@@ -63,10 +64,7 @@ class Environment {
         return template(data);
     }
     compile(source, path, defaults, sync = false) {
-        const { tokens, position, error } = (0, tokenizer_js_1.default)(source);
-        if (error) {
-            throw this.createError(path || "unknown", source, position, error);
-        }
+        const tokens = this.tokenize(source, path);
         const code = this.compileTokens(tokens).join("\n");
         const { dataVarname, useWith } = this.options;
         const constructor = new Function("__file", "__env", "__defaults", `return${sync ? "" : " async"} function (${dataVarname}) {
@@ -88,10 +86,29 @@ class Environment {
         template.source = source;
         return template;
     }
+    tokenize(source, path) {
+        const result = (0, tokenizer_js_1.default)(source);
+        let { tokens } = result;
+        const { position, error } = result;
+        if (error) {
+            throw this.createError(path || "unknown", source, position, error);
+        }
+        for (const tokenPreprocessor of this.tokenPreprocessors) {
+            const result = tokenPreprocessor(this, tokens, path);
+            if (result !== undefined) {
+                tokens = result;
+            }
+        }
+        return tokens;
+    }
     async load(file, from) {
         const path = from ? this.options.loader.resolve(from, file) : file;
         if (!this.cache.has(path)) {
-            const { source, data } = await this.options.loader.load(path);
+            // Remove query and hash params from path before loading
+            const cleanPath = path
+                .split("?")[0]
+                .split("#")[0];
+            const { source, data } = await this.options.loader.load(cleanPath);
             const template = this.compile(source, path, data);
             this.cache.set(path, template);
         }
@@ -153,7 +170,8 @@ class Environment {
             }
             else {
                 // It's a filter (e.g. filters.upper())
-                output = `${isAsync ? "await " : ""}__env.filters.${name}(${output}${args ? `, ${args}` : ""})`;
+                const { dataVarname } = this.options;
+                output = `${(isAsync || checkAsync(this.filters[name])) ? "await " : ""}__env.filters.${name}.call({data:${dataVarname},env:__env}, ${output}${args ? `, ${args}` : ""})`;
             }
         }
         // Escape by default
@@ -202,3 +220,6 @@ function errorLine(source, pos) {
     return [line, column, source.split("\n")[line - 1]];
 }
 exports.errorLine = errorLine;
+function checkAsync(fn) {
+    return fn.constructor?.name === "AsyncFunction";
+}

package/script/src/tokenizer.js

@@ -4,20 +4,13 @@ exports.parseTag = void 0;
 function tokenize(source) {
     const tokens = [];
     let type = "string";
-    let trimNext = false;
     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]);
-                }
+                tokens.push([type, code, position]);
                 if (index === -1) {
                     break;
                 }
@@ -44,39 +37,23 @@ function tokenize(source) {
                 const lastIndex = indexes.length - 1;
                 let tag;
                 indexes.reduce((prev, curr, index) => {
-                    let code = source.slice(prev, curr - 2);
+                    const 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];
+                        tag = [type, code, position];
                         tokens.push(tag);
                         return curr;
                     }
-                    // Right trim
-                    if (index === lastIndex && code.endsWith("-")) {
-                        code = code.slice(0, -1);
-                        trimNext = true;
-                    }
                     // Filters
-                    tokens.push(["filter", code.trim()]);
+                    tokens.push(["filter", code]);
                     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 (tag?.[1].match(/^\-?\s*echo\s*\-?$/)) {
+                    const end = source.match(/{{\-?\s*\/echo\s*\-?}}/);
                     if (!end) {
                         throw new Error("Unclosed echo tag");
                     }
@@ -115,7 +92,8 @@ function parseTag(source) {
                     statuses.unshift("bracket");
                 }
                 else if (status !== "comment" && status !== "single-quote" &&
-                    status !== "double-quote" && status !== "literal") {
+                    status !== "double-quote" && status !== "literal" &&
+                    status !== "regex" && status !== "line-comment") {
                     statuses.unshift("bracket");
                 }
                 break;
@@ -140,7 +118,9 @@ function parseTag(source) {
                 }
                 else if (status !== "comment" &&
                     status !== "single-quote" &&
-                    status !== "literal") {
+                    status !== "literal" &&
+                    status !== "regex" &&
+                    status !== "line-comment") {
                     statuses.unshift("double-quote");
                 }
                 break;
@@ -153,7 +133,9 @@ function parseTag(source) {
                 }
                 else if (status !== "comment" &&
                     status !== "double-quote" &&
-                    status !== "literal") {
+                    status !== "literal" &&
+                    status !== "regex" &&
+                    status !== "line-comment") {
                     statuses.unshift("single-quote");
                 }
                 break;
@@ -166,23 +148,56 @@ function parseTag(source) {
                 }
                 else if (status !== "comment" &&
                     status !== "double-quote" &&
-                    status !== "single-quote") {
+                    status !== "single-quote" &&
+                    status !== "regex" &&
+                    status !== "line-comment") {
                     statuses.unshift("literal");
                 }
                 break;
             }
-            // Detect comments
+            // Detect comments and regex
             case "/": {
                 const status = statuses[0];
-                if (status !== "single-quote" && status !== "double-quote" &&
-                    status !== "literal") {
-                    if (source.charAt(index) === "*") {
-                        statuses.unshift("comment");
+                if (status === "single-quote" || status === "double-quote" ||
+                    status === "literal" || status === "line-comment") {
+                    break;
+                }
+                // We are in a comment: close or ignore
+                if (status === "comment") {
+                    if (source.charAt(index - 2) === "*") {
+                        statuses.shift();
                     }
-                    else if (status === "comment" &&
-                        source.charAt(index - 2) === "*") {
+                    break;
+                }
+                // We are in a regex: close or ignore
+                if (status === "regex") {
+                    if (source.charAt(index - 2) !== "\\") {
                         statuses.shift();
                     }
+                    break;
+                }
+                // Start a new comment
+                if (source.charAt(index) === "*") {
+                    statuses.unshift("comment");
+                    break;
+                }
+                // Start a new line comment
+                if (source.charAt(index - 2) === "/") {
+                    statuses.unshift("line-comment");
+                    break;
+                }
+                // Start a new regex
+                const prev = prevChar(source, index - 1);
+                if (prev === "(" || prev === "=" || prev === ":" || prev === ",") {
+                    statuses.unshift("regex");
+                }
+                break;
+            }
+            // Detect end of line comments
+            case "\n": {
+                const status = statuses[0];
+                if (status === "line-comment") {
+                    statuses.shift();
                 }
                 break;
             }
@@ -199,3 +214,13 @@ function parseTag(source) {
     throw new Error("Unclosed tag");
 }
 exports.parseTag = parseTag;
+// Get the previous character in a string ignoring spaces, line breaks and tabs
+function prevChar(source, index) {
+    while (index > 0) {
+        const char = source.charAt(--index);
+        if (char !== " " && char !== "\n" && char !== "\r" && char !== "\t") {
+            return char;
+        }
+    }
+    return "";
+}

package/esm/deps/deno.land/std@0.208.0/assert/assert.d.ts

@@ -1,2 +0,0 @@
-/** Make an assertion, error will be thrown if `expr` does not have truthy value. */
-export declare function assert(expr: unknown, msg?: string): asserts expr;

package/esm/deps/deno.land/std@0.208.0/assert/assert.js

@@ -1,8 +0,0 @@
-// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-import { AssertionError } from "./assertion_error.js";
-/** Make an assertion, error will be thrown if `expr` does not have truthy value. */
-export function assert(expr, msg = "") {
-    if (!expr) {
-        throw new AssertionError(msg);
-    }
-}

package/esm/deps/deno.land/std@0.208.0/assert/assertion_error.d.ts

@@ -1,4 +0,0 @@
-export declare class AssertionError extends Error {
-    name: string;
-    constructor(message: string);
-}

package/esm/deps/deno.land/std@0.208.0/assert/assertion_error.js

@@ -1,7 +0,0 @@
-// Copyright 2018-2023 the Deno authors. All rights reserved. MIT license.
-export class AssertionError extends Error {
-    name = "AssertionError";
-    constructor(message) {
-        super(message);
-    }
-}

package/script/deps/deno.land/std@0.208.0/assert/assert.d.ts

@@ -1,2 +0,0 @@
-/** Make an assertion, error will be thrown if `expr` does not have truthy value. */
-export declare function assert(expr: unknown, msg?: string): asserts expr;

package/script/deps/deno.land/std@0.208.0/assert/assertion_error.d.ts

@@ -1,4 +0,0 @@
-export declare class AssertionError extends Error {
-    name: string;
-    constructor(message: string);
-}

package/script/deps/deno.land/std@0.208.0/path/posix/common.d.ts

@@ -1,13 +0,0 @@
-/** Determines the common path from a set of paths, using an optional separator,
- * which defaults to the OS default separator.
- *
- * ```ts
- *       import { common } from "https://deno.land/std@$STD_VERSION/path/mod.ts";
- *       const p = common([
- *         "./deno/std/path/mod.ts",
- *         "./deno/std/fs/mod.ts",
- *       ]);
- *       console.log(p); // "./deno/std/"
- * ```
- */
-export declare function common(paths: string[], sep?: string): string;

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

@@ -1,2 +0,0 @@
-export declare const SEP: string;
-export declare const SEP_PATTERN: RegExp;