ventojs 1.14.0 → 1.15.1

package/esm/src/environment.js

@@ -26,7 +26,7 @@ export class Environment {
         if (file) {
             const cached = this.cache.get(file);
             if (cached) {
-                return await cached(data);
+                return (await cached)(data);
             }
             const template = this.compile(source, file);
             this.cache.set(file, template);
@@ -65,7 +65,7 @@ export class Environment {
           ${code}
           return __exports;
         } catch (cause) {
-          const template = __env.cache.get(__file);
+          const template = ${sync ? "" : "await"} __env.cache.get(__file);
           throw new __err(__file, template?.source, __pos, cause);
         }
       }
@@ -77,12 +77,7 @@ export class Environment {
         return template;
     }
     tokenize(source, path) {
-        const result = tokenize(source);
-        let { tokens } = result;
-        const { position, error } = result;
-        if (error) {
-            throw new TemplateError(path, source, position, error);
-        }
+        let tokens = tokenize(source);
         for (const tokenPreprocessor of this.tokenPreprocessors) {
             const result = tokenPreprocessor(this, tokens, path);
             if (result !== undefined) {
@@ -93,16 +88,18 @@ export class Environment {
     }
     async load(file, from) {
         const path = this.options.loader.resolve(from || "", file);
-        if (!this.cache.has(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);
+        let cached = this.cache.get(path);
+        if (cached) {
+            return cached;
         }
-        return this.cache.get(path);
+        // Remove query and hash params from path before loading
+        const cleanPath = path
+            .split("?")[0]
+            .split("#")[0];
+        cached = this.options.loader.load(cleanPath)
+            .then(({ source, data }) => this.compile(source, path, data));
+        this.cache.set(path, cached);
+        return await cached;
     }
     compileTokens(tokens, outputVar = "__exports.content", stopAt) {
         const compiled = [];

package/esm/src/errors.d.ts

@@ -1,3 +1,4 @@
+import "../_dnt.polyfills.js";
 declare class VentoBaseError extends Error {
     name: string;
 }

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

@@ -1 +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;CAQhB;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"}
+{"version":3,"file":"errors.d.ts","sourceRoot":"","sources":["../../src/src/errors.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,CAAC;AAC9B,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;CAQhB;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

@@ -1,3 +1,4 @@
+import "../_dnt.polyfills.js";
 class VentoBaseError extends Error {
     name = this.constructor.name;
 }

package/esm/src/js.d.ts

@@ -1,5 +1,12 @@
-type breakpoints = "new-filter" | "open-bracket" | "close" | "unclosed";
-type Visitor = (type: breakpoints, index: number) => false | void;
-export default function analyze(source: string, visitor: Visitor): void;
-export {};
+import "../_dnt.polyfills.js";
+/**
+ * This function iterates over the top-level scope of a JavaScript source code string.
+ * It yields pairs of the index and the type of each top-level element found.
+ *
+ * @example `{ foo: { bar: 1 } }` will yield:
+ * - [0, "{"] for the opening brace
+ * - [18, "}"] for the closing brace
+ * - [18, ""] for the end of the string
+ */
+export default function iterateTopLevel(source: string, start?: number): Generator<[number, string]>;
 //# sourceMappingURL=js.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"js.d.ts","sourceRoot":"","sources":["../../src/src/js.ts"],"names":[],"mappings":"AAAA,KAAK,WAAW,GACZ,YAAY,GACZ,cAAc,GACd,OAAO,GACP,UAAU,CAAC;AAaf,KAAK,OAAO,GAAG,CAAC,IAAI,EAAE,WAAW,EAAE,KAAK,EAAE,MAAM,KAAK,KAAK,GAAG,IAAI,CAAC;AAElE,MAAM,CAAC,OAAO,UAAU,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,OAAO,EAAE,OAAO,QA0N/D"}
+{"version":3,"file":"js.d.ts","sourceRoot":"","sources":["../../src/src/js.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,CAAC;AAK9B;;;;;;;;GAQG;AACH,MAAM,CAAC,OAAO,UAAW,eAAe,CACtC,MAAM,EAAE,MAAM,EACd,KAAK,GAAE,MAAU,GAChB,SAAS,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAkL7B"}

package/esm/src/js.js

@@ -1,197 +1,183 @@
-export default function analyze(source, visitor) {
-    const length = source.length;
-    const statuses = [];
-    let index = 0;
-    while (index < length) {
-        const char = source.charAt(index++);
-        switch (char) {
-            case "{": {
-                switch (statuses[0]) {
-                    // String interpolation `${...}`
-                    case "literal":
-                        if (source.charAt(index - 2) === "$" &&
-                            source.charAt(index - 3) !== "\\") {
-                            statuses.unshift("bracket");
-                        }
-                        break;
-                    // Open bracket
-                    case undefined:
-                    case "square-bracket":
-                    case "bracket":
-                        if (!statuses.length && visitor("open-bracket", index) === false) {
-                            return;
-                        }
-                        statuses.unshift("bracket");
-                        break;
+import "../_dnt.polyfills.js";
+const TEMPLATE_PART = /[`}](?:\\?[^])*?(?:`|\${)/y;
+const REGEX_LITERAL_START = /(?<=[(=:,?&!]\s*)\//y;
+const STOPPING_POINT = /['"`{}[\]/|]/g;
+/**
+ * This function iterates over the top-level scope of a JavaScript source code string.
+ * It yields pairs of the index and the type of each top-level element found.
+ *
+ * @example `{ foo: { bar: 1 } }` will yield:
+ * - [0, "{"] for the opening brace
+ * - [18, "}"] for the closing brace
+ * - [18, ""] for the end of the string
+ */
+export default function* iterateTopLevel(source, start = 0) {
+    let cursor = start;
+    let depth = -1;
+    const brackets = [];
+    const max = source.length;
+    parsing: while (cursor < max) {
+        // Search for the next stopping point (e.g., a brace, quote, or regex).
+        STOPPING_POINT.lastIndex = cursor;
+        const match = STOPPING_POINT.exec(source);
+        // No stopping point found, stop parsing.
+        if (!match) {
+            break parsing;
+        }
+        cursor = match.index;
+        const [stop] = match;
+        // Check the type of the stopping point.
+        switch (stop) {
+            case "|": {
+                cursor++;
+                // It's a pipe `|>` in the top-level scope
+                if (depth < 0 && source[cursor] === ">") {
+                    cursor++;
+                    yield [cursor - 2, "|>"];
                 }
                 break;
             }
-            // Detect end brackets
-            case "}": {
-                switch (statuses[0]) {
-                    // Close a bracket
-                    case "bracket":
-                        statuses.shift();
-                        if (statuses.length === 0 && visitor("close", index) === false) {
-                            return;
-                        }
-                        break;
-                }
+            case "'":
+            case `"`: {
+                // It's a quote or double-quote string: find the end.
+                let escapes = 0;
+                do {
+                    cursor = source.indexOf(stop, cursor + 1);
+                    if (cursor == -1) { // No closing quote found
+                        break parsing;
+                    }
+                    escapes = 0;
+                    // Handle escaped quotes
+                    while (source[cursor - 1 - escapes] == "\\") {
+                        escapes++;
+                    }
+                } while (escapes % 2 != 0);
+                cursor++;
                 break;
             }
-            case '"': {
-                switch (statuses[0]) {
-                    // Close double quotes
-                    case "double-quote":
-                        statuses.shift();
-                        break;
-                    // Open double quotes
-                    case undefined:
-                    case "square-bracket":
-                    case "bracket":
-                        statuses.unshift("double-quote");
-                        break;
-                }
+            case "{": {
+                // It's an opening brace: yield if it's in the top-level scope.
+                if (depth < 0)
+                    yield [cursor, "{"];
+                cursor++;
+                // Handle `{}`
+                if (source[cursor] == "}")
+                    cursor++;
+                // Push the opening brace onto the stack.
+                else
+                    brackets[++depth] = "{";
                 break;
             }
-            case "'": {
-                switch (statuses[0]) {
-                    // Close single quotes
-                    case "single-quote":
-                        statuses.shift();
-                        break;
-                    // Open single quotes
-                    case undefined:
-                    case "square-bracket":
-                    case "bracket":
-                        statuses.unshift("single-quote");
-                        break;
-                }
+            case "[": {
+                // It's an opening brace: yield if it's in the top-level scope.
+                if (depth < 0)
+                    yield [cursor, "["];
+                cursor++;
+                // Handle `[]`
+                if (source[cursor] == "]")
+                    cursor++;
+                // Push the opening brace onto the stack.
+                else
+                    brackets[++depth] = "[";
                 break;
             }
-            case "`": {
-                switch (statuses[0]) {
-                    // Close literal
-                    case "literal":
-                        statuses.shift();
-                        break;
-                    // Open literal
-                    case undefined:
-                    case "square-bracket":
-                    case "bracket":
-                        statuses.unshift("literal");
-                        break;
-                }
+            case "]": {
+                // Close the last opened bracket if it matches.
+                if (brackets[depth] == "[")
+                    depth--;
+                // Yield if it's in the top-level scope.
+                if (depth < 0)
+                    yield [cursor, "]"];
+                cursor++;
                 break;
             }
-            case "[": {
-                switch (statuses[0]) {
-                    // Open a square bracket in a regex
-                    case "regex":
-                        if (source.charAt(index - 2) !== "\\") {
-                            statuses.unshift("regex-bracket");
-                        }
-                        break;
-                    // Open a square bracket
-                    case undefined:
-                    case "square-bracket":
-                    case "bracket":
-                        if (!statuses.length && visitor("open-bracket", index) === false) {
-                            return;
-                        }
-                        statuses.unshift("square-bracket");
-                        break;
+            case "}": {
+                // Close the last opened brace if it matches.
+                if (brackets[depth] == "{") {
+                    depth--;
+                    // Yield if it's in the top-level scope.
+                    if (depth < 0)
+                        yield [cursor, "}"];
+                    cursor++;
+                    break;
                 }
-                break;
-            }
-            case "]": {
-                switch (statuses[0]) {
-                    // Close a square bracket in a regex
-                    case "regex-bracket":
-                        if (source.charAt(index - 2) !== "\\") {
-                            statuses.shift();
-                        }
-                        break;
-                    // Close a square bracket
-                    case "square-bracket":
-                        statuses.shift();
-                        if (statuses.length === 0 && visitor("close", index) === false) {
-                            return;
-                        }
-                        break;
+                // If it doesn't match, but we're in the top-level scope, yield anyway.
+                if (depth < 0) {
+                    yield [cursor, "}"];
+                    cursor++;
+                    break;
+                }
+                // Break if we're not inside in a template literal.
+                // otherwise, continue parsing.
+                if (brackets[depth] != "`") {
+                    cursor++;
+                    break;
                 }
+                depth--;
+            } /* falls through */
+            case "`": {
+                // Search for template literal part or end.
+                TEMPLATE_PART.lastIndex = cursor;
+                const match = TEMPLATE_PART.exec(source);
+                // If we don't find anything, return end of the string.
+                if (!match)
+                    return [max, ""];
+                const [part] = match;
+                cursor += part.length;
+                // We found the end of the template literal
+                if (source[cursor - 1] == "`")
+                    break;
+                // Otherwise, we found a template literal part.
+                // Store the opening backtick in the stack.
+                brackets[++depth] = "`";
                 break;
             }
             case "/": {
-                switch (statuses[0]) {
-                    // Close a comment
-                    case "comment":
-                        if (source.charAt(index - 2) === "*") {
-                            statuses.shift();
-                        }
-                        break;
-                    // Close a regular expression
-                    case "regex":
-                        if (source.charAt(index - 2) !== "\\") {
-                            statuses.shift();
-                        }
-                        break;
-                    case undefined:
-                    case "square-bracket":
-                    case "bracket":
-                        // Open a new comment
-                        if (source.charAt(index) === "*") {
-                            statuses.unshift("comment");
-                            break;
-                        }
-                        // Open a new line comment
-                        if (source.charAt(index - 2) === "/") {
-                            statuses.unshift("line-comment");
-                            break;
-                        }
-                        // Open a new regex
-                        if (["(", "=", ":", ",", "?", "&", "!"].includes(prevChar(source, index - 1))) {
-                            statuses.unshift("regex");
-                            break;
-                        }
-                        break;
+                // It's a line comment
+                if (source[cursor + 1] == "/") {
+                    cursor = source.indexOf("\n", cursor + 2);
+                    if (cursor == -1)
+                        break parsing;
+                    break;
                 }
-                break;
-            }
-            case "\n": {
-                switch (statuses[0]) {
-                    // Close a line comment
-                    case "line-comment":
-                        statuses.shift();
-                        break;
+                // It's a block comment
+                if (source[cursor + 1] == "*") {
+                    cursor = source.indexOf("*/", cursor + 2);
+                    if (cursor == -1)
+                        break parsing;
+                    break;
                 }
-                break;
-            }
-            case "|": {
-                switch (statuses[0]) {
-                    // New pipeline
-                    case "bracket":
-                        if (source.charAt(index) === ">" &&
-                            visitor("new-filter", index + 1) === false) {
-                            return;
-                        }
-                        break;
+                // Check if it's a regex literal.
+                REGEX_LITERAL_START.lastIndex = cursor;
+                if (!REGEX_LITERAL_START.test(source)) {
+                    cursor++;
+                    break;
                 }
-                break;
+                // It's a regex literal: find the end.
+                let inCharClass = false;
+                cursor++;
+                do {
+                    const character = source[cursor];
+                    cursor++;
+                    switch (character) {
+                        case "\\":
+                            cursor++;
+                            break;
+                        case "[":
+                            inCharClass = true;
+                            break;
+                        case "]":
+                            inCharClass = false;
+                            break;
+                        case "/":
+                            if (!inCharClass)
+                                continue parsing;
+                            break;
+                    }
+                } while (cursor < max);
+                break parsing;
             }
         }
     }
-    if (statuses.length > 0) {
-        visitor("unclosed", index);
-    }
-}
-// 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 "";
+    return [max, ""];
 }

package/esm/src/{loader.node.d.ts → loader.d.ts}

@@ -7,4 +7,4 @@ export declare class FileLoader implements Loader {
     load(file: string): Promise<TemplateSource>;
     resolve(from: string, file: string): string;
 }
-//# sourceMappingURL=loader.node.d.ts.map
+//# sourceMappingURL=loader.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../src/src/loader.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,CAAC;AAI9B,OAAO,KAAK,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAG/D,YAAY,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC;AAEvC,qBAAa,UAAW,YAAW,MAAM;;gBAG3B,IAAI,GAAE,MAAsB;IAIlC,IAAI,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC;IAMjD,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM;CAW5C"}

package/esm/src/{loader.node.js → loader.js}

@@ -9,7 +9,7 @@ export class FileLoader {
     }
     async load(file) {
         return {
-            source: await fs.readFile(file, { encoding: "utf-8" }),
+            source: await fs.readFile(file, "utf-8"),
         };
     }
     resolve(from, file) {

package/esm/src/tokenizer.d.ts

@@ -1,12 +1,7 @@
 import "../_dnt.polyfills.js";
 export type TokenType = "string" | "tag" | "filter" | "comment";
 export type Token = [TokenType, string, number?];
-export interface TokenizeResult {
-    tokens: Token[];
-    position: number;
-    error: Error | undefined;
-}
-export default function tokenize(source: string): TokenizeResult;
+export default function tokenize(source: string): Token[];
 /**
  * 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/esm/src/tokenizer.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"tokenizer.d.ts","sourceRoot":"","sources":["../../src/src/tokenizer.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,CAAC;AAG9B,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,KAAK,GAAG,QAAQ,GAAG,SAAS,CAAC;AAChE,MAAM,MAAM,KAAK,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAEjD,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,KAAK,EAAE,CAAC;IAChB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,KAAK,GAAG,SAAS,CAAC;CAC1B;AAED,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,cAAc,CAsF/D;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAiBjD"}
+{"version":3,"file":"tokenizer.d.ts","sourceRoot":"","sources":["../../src/src/tokenizer.ts"],"names":[],"mappings":"AAAA,OAAO,sBAAsB,CAAC;AAG9B,MAAM,MAAM,SAAS,GAAG,QAAQ,GAAG,KAAK,GAAG,QAAQ,GAAG,SAAS,CAAC;AAChE,MAAM,MAAM,KAAK,GAAG,CAAC,SAAS,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAEjD,MAAM,CAAC,OAAO,UAAU,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,KAAK,EAAE,CAkFxD;AAED;;;GAGG;AACH,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,MAAM,EAAE,CAWjD"}