@herb-tools/core 0.3.1 → 0.4.1

package/dist/herb-core.umd.js

@@ -38,6 +38,22 @@
         return object;
     }
 
+    /**
+     * Converts a Diagnostic to Monaco/VSCode-compatible MonacoDiagnostic format
+     */
+    function toMonacoDiagnostic(diagnostic) {
+        const { message, location } = diagnostic;
+        const severity = diagnostic.severity === "hint" ? "info" : diagnostic.severity;
+        return {
+            line: location.start.line,
+            column: location.start.column,
+            endLine: location.end.line,
+            endColumn: location.end.column,
+            message,
+            severity
+        };
+    }
+
     class Position {
         line;
         column;
@@ -169,11 +185,16 @@
     }
 
     // NOTE: This file is generated by the templates/template.rb script and should not
-    // be modified manually. See /Users/marcoroth/Development/herb-release/templates/javascript/packages/core/src/errors.ts.erb
+    // be modified manually. See /Users/marcoroth/Development/herb-release-4/templates/javascript/packages/core/src/errors.ts.erb
     class HerbError {
         type;
         message;
         location;
+        severity = "error";
+        source = "parser";
+        get code() {
+            return this.type;
+        }
         static from(error) {
             return fromSerializedError(error);
         }
@@ -222,21 +243,15 @@
                 found: this.found,
             };
         }
-        toDiagnostics() {
-            const diagnostics = [
-                {
-                    line: this.location.start.line,
-                    column: this.location.start.column,
-                    endLine: this.location.end.line,
-                    endColumn: this.location.end.column,
-                    message: this.message,
-                    severity: 'error'
-                }
-            ];
-            // no-op for description
-            // no-op for expected
-            // no-op for found
-            return diagnostics;
+        toMonacoDiagnostic() {
+            return {
+                line: this.location.start.line,
+                column: this.location.start.column,
+                endLine: this.location.end.line,
+                endColumn: this.location.end.column,
+                message: this.message,
+                severity: 'error'
+            };
         }
         treeInspect() {
             let output = "";
@@ -273,29 +288,15 @@
                 found: this.found ? this.found.toJSON() : null,
             };
         }
-        toDiagnostics() {
-            const diagnostics = [
-                {
-                    line: this.location.start.line,
-                    column: this.location.start.column,
-                    endLine: this.location.end.line,
-                    endColumn: this.location.end.column,
-                    message: this.message,
-                    severity: 'error'
-                }
-            ];
-            // no-op for expected_type
-            if (this.found) {
-                diagnostics.push({
-                    line: this.found.location.start.line,
-                    column: this.found.location.start.column,
-                    endLine: this.found.location.end.line,
-                    endColumn: this.found.location.end.column,
-                    message: `found "${(this.found.value)}" is here`,
-                    severity: 'info'
-                });
-            }
-            return diagnostics;
+        toMonacoDiagnostic() {
+            return {
+                line: this.location.start.line,
+                column: this.location.start.column,
+                endLine: this.location.end.line,
+                endColumn: this.location.end.column,
+                message: this.message,
+                severity: 'error'
+            };
         }
         treeInspect() {
             let output = "";
@@ -327,28 +328,15 @@
                 closing_tag: this.closing_tag ? this.closing_tag.toJSON() : null,
             };
         }
-        toDiagnostics() {
-            const diagnostics = [
-                {
-                    line: this.location.start.line,
-                    column: this.location.start.column,
-                    endLine: this.location.end.line,
-                    endColumn: this.location.end.column,
-                    message: this.message,
-                    severity: 'error'
-                }
-            ];
-            if (this.closing_tag) {
-                diagnostics.push({
-                    line: this.closing_tag.location.start.line,
-                    column: this.closing_tag.location.start.column,
-                    endLine: this.closing_tag.location.end.line,
-                    endColumn: this.closing_tag.location.end.column,
-                    message: `closing_tag "${(this.closing_tag.value)}" is here`,
-                    severity: 'info'
-                });
-            }
-            return diagnostics;
+        toMonacoDiagnostic() {
+            return {
+                line: this.location.start.line,
+                column: this.location.start.column,
+                endLine: this.location.end.line,
+                endColumn: this.location.end.column,
+                message: this.message,
+                severity: 'error'
+            };
         }
         treeInspect() {
             let output = "";
@@ -379,28 +367,15 @@
                 opening_tag: this.opening_tag ? this.opening_tag.toJSON() : null,
             };
         }
-        toDiagnostics() {
-            const diagnostics = [
-                {
-                    line: this.location.start.line,
-                    column: this.location.start.column,
-                    endLine: this.location.end.line,
-                    endColumn: this.location.end.column,
-                    message: this.message,
-                    severity: 'error'
-                }
-            ];
-            if (this.opening_tag) {
-                diagnostics.push({
-                    line: this.opening_tag.location.start.line,
-                    column: this.opening_tag.location.start.column,
-                    endLine: this.opening_tag.location.end.line,
-                    endColumn: this.opening_tag.location.end.column,
-                    message: `opening_tag "${(this.opening_tag.value)}" is here`,
-                    severity: 'info'
-                });
-            }
-            return diagnostics;
+        toMonacoDiagnostic() {
+            return {
+                line: this.location.start.line,
+                column: this.location.start.column,
+                endLine: this.location.end.line,
+                endColumn: this.location.end.column,
+                message: this.message,
+                severity: 'error'
+            };
         }
         treeInspect() {
             let output = "";
@@ -435,38 +410,15 @@
                 closing_tag: this.closing_tag ? this.closing_tag.toJSON() : null,
             };
         }
-        toDiagnostics() {
-            const diagnostics = [
-                {
-                    line: this.location.start.line,
-                    column: this.location.start.column,
-                    endLine: this.location.end.line,
-                    endColumn: this.location.end.column,
-                    message: this.message,
-                    severity: 'error'
-                }
-            ];
-            if (this.opening_tag) {
-                diagnostics.push({
-                    line: this.opening_tag.location.start.line,
-                    column: this.opening_tag.location.start.column,
-                    endLine: this.opening_tag.location.end.line,
-                    endColumn: this.opening_tag.location.end.column,
-                    message: `opening_tag "${(this.opening_tag.value)}" is here`,
-                    severity: 'info'
-                });
-            }
-            if (this.closing_tag) {
-                diagnostics.push({
-                    line: this.closing_tag.location.start.line,
-                    column: this.closing_tag.location.start.column,
-                    endLine: this.closing_tag.location.end.line,
-                    endColumn: this.closing_tag.location.end.column,
-                    message: `closing_tag "${(this.closing_tag.value)}" is here`,
-                    severity: 'info'
-                });
-            }
-            return diagnostics;
+        toMonacoDiagnostic() {
+            return {
+                line: this.location.start.line,
+                column: this.location.start.column,
+                endLine: this.location.end.line,
+                endColumn: this.location.end.column,
+                message: this.message,
+                severity: 'error'
+            };
         }
         treeInspect() {
             let output = "";
@@ -502,38 +454,15 @@
                 closing_quote: this.closing_quote ? this.closing_quote.toJSON() : null,
             };
         }
-        toDiagnostics() {
-            const diagnostics = [
-                {
-                    line: this.location.start.line,
-                    column: this.location.start.column,
-                    endLine: this.location.end.line,
-                    endColumn: this.location.end.column,
-                    message: this.message,
-                    severity: 'error'
-                }
-            ];
-            if (this.opening_quote) {
-                diagnostics.push({
-                    line: this.opening_quote.location.start.line,
-                    column: this.opening_quote.location.start.column,
-                    endLine: this.opening_quote.location.end.line,
-                    endColumn: this.opening_quote.location.end.column,
-                    message: `opening_quote "${(this.opening_quote.value)}" is here`,
-                    severity: 'info'
-                });
-            }
-            if (this.closing_quote) {
-                diagnostics.push({
-                    line: this.closing_quote.location.start.line,
-                    column: this.closing_quote.location.start.column,
-                    endLine: this.closing_quote.location.end.line,
-                    endColumn: this.closing_quote.location.end.column,
-                    message: `closing_quote "${(this.closing_quote.value)}" is here`,
-                    severity: 'info'
-                });
-            }
-            return diagnostics;
+        toMonacoDiagnostic() {
+            return {
+                line: this.location.start.line,
+                column: this.location.start.column,
+                endLine: this.location.end.line,
+                endColumn: this.location.end.column,
+                message: this.message,
+                severity: 'error'
+            };
         }
         treeInspect() {
             let output = "";
@@ -573,30 +502,15 @@
                 found: this.found,
             };
         }
-        toDiagnostics() {
-            const diagnostics = [
-                {
-                    line: this.location.start.line,
-                    column: this.location.start.column,
-                    endLine: this.location.end.line,
-                    endColumn: this.location.end.column,
-                    message: this.message,
-                    severity: 'error'
-                }
-            ];
-            if (this.tag_name) {
-                diagnostics.push({
-                    line: this.tag_name.location.start.line,
-                    column: this.tag_name.location.start.column,
-                    endLine: this.tag_name.location.end.line,
-                    endColumn: this.tag_name.location.end.column,
-                    message: `tag_name "${(this.tag_name.value)}" is here`,
-                    severity: 'info'
-                });
-            }
-            // no-op for expected
-            // no-op for found
-            return diagnostics;
+        toMonacoDiagnostic() {
+            return {
+                line: this.location.start.line,
+                column: this.location.start.column,
+                endLine: this.location.end.line,
+                endColumn: this.location.end.column,
+                message: this.message,
+                severity: 'error'
+            };
         }
         treeInspect() {
             let output = "";
@@ -629,28 +543,15 @@
                 opening_tag: this.opening_tag ? this.opening_tag.toJSON() : null,
             };
         }
-        toDiagnostics() {
-            const diagnostics = [
-                {
-                    line: this.location.start.line,
-                    column: this.location.start.column,
-                    endLine: this.location.end.line,
-                    endColumn: this.location.end.column,
-                    message: this.message,
-                    severity: 'error'
-                }
-            ];
-            if (this.opening_tag) {
-                diagnostics.push({
-                    line: this.opening_tag.location.start.line,
-                    column: this.opening_tag.location.start.column,
-                    endLine: this.opening_tag.location.end.line,
-                    endColumn: this.opening_tag.location.end.column,
-                    message: `opening_tag "${(this.opening_tag.value)}" is here`,
-                    severity: 'info'
-                });
-            }
-            return diagnostics;
+        toMonacoDiagnostic() {
+            return {
+                line: this.location.start.line,
+                column: this.location.start.column,
+                endLine: this.location.end.line,
+                endColumn: this.location.end.column,
+                message: this.message,
+                severity: 'error'
+            };
         }
         treeInspect() {
             let output = "";
@@ -689,21 +590,15 @@
                 level: this.level,
             };
         }
-        toDiagnostics() {
-            const diagnostics = [
-                {
-                    line: this.location.start.line,
-                    column: this.location.start.column,
-                    endLine: this.location.end.line,
-                    endColumn: this.location.end.column,
-                    message: this.message,
-                    severity: 'error'
-                }
-            ];
-            // no-op for error_message
-            // no-op for diagnostic_id
-            // no-op for level
-            return diagnostics;
+        toMonacoDiagnostic() {
+            return {
+                line: this.location.start.line,
+                column: this.location.start.column,
+                endLine: this.location.end.line,
+                endColumn: this.location.end.column,
+                message: this.message,
+                severity: 'error'
+            };
         }
         treeInspect() {
             let output = "";
@@ -732,7 +627,7 @@
     }
 
     var name = "@herb-tools/core";
-    var version = "0.3.1";
+    var version = "0.4.1";
     var packageJSON = {
     	name: name,
     	version: version};
@@ -788,6 +683,9 @@
         get length() {
             return this.list.length;
         }
+        get tokens() {
+            return this.list;
+        }
         [Symbol.iterator]() {
             return this.list[Symbol.iterator]();
         }
@@ -881,7 +779,7 @@
     }
 
     // NOTE: This file is generated by the templates/template.rb script and should not
-    // be modified manually. See /Users/marcoroth/Development/herb-release/templates/javascript/packages/core/src/nodes.ts.erb
+    // be modified manually. See /Users/marcoroth/Development/herb-release-4/templates/javascript/packages/core/src/nodes.ts.erb
     class Node {
         type;
         location;
@@ -2874,6 +2772,28 @@
                 throw new Error(`Unknown node type: ${node.type}`);
         }
     }
+    const ERBNodeClasses = [
+        ERBContentNode,
+        ERBEndNode,
+        ERBElseNode,
+        ERBIfNode,
+        ERBBlockNode,
+        ERBWhenNode,
+        ERBCaseNode,
+        ERBCaseMatchNode,
+        ERBWhileNode,
+        ERBUntilNode,
+        ERBForNode,
+        ERBRescueNode,
+        ERBEnsureNode,
+        ERBBeginNode,
+        ERBUnlessNode,
+        ERBYieldNode,
+        ERBInNode,
+    ];
+    function isERBNode(node) {
+        return node.constructor.name.startsWith("ERB");
+    }
 
     /**
      * Represents the result of a parsing operation, extending the base `Result` class.
@@ -2906,15 +2826,15 @@
          * @returns `true` if there are errors, otherwise `false`.
          */
         get failed() {
-            // TODO: this should probably be recursive as noted in the Ruby version
-            return this.errors.length > 0 || this.value.errors.length > 0;
+            // Consider errors on this result and recursively in the document tree
+            return this.recursiveErrors().length > 0;
         }
         /**
          * Determines if the parsing was successful.
          * @returns `true` if there are no errors, otherwise `false`.
          */
         get successful() {
-            return this.errors.length === 0;
+            return !this.failed;
         }
         /**
          * Returns a pretty-printed JSON string of the errors.
@@ -3060,7 +2980,7 @@
     }
 
     // NOTE: This file is generated by the templates/template.rb script and should not
-    // be modified manually. See /Users/marcoroth/Development/herb-release/templates/javascript/packages/core/src/visitor.ts.erb
+    // be modified manually. See /Users/marcoroth/Development/herb-release-4/templates/javascript/packages/core/src/visitor.ts.erb
     class Visitor {
         visit(node) {
             if (!node)
@@ -3177,6 +3097,7 @@
     exports.ERBForNode = ERBForNode;
     exports.ERBIfNode = ERBIfNode;
     exports.ERBInNode = ERBInNode;
+    exports.ERBNodeClasses = ERBNodeClasses;
     exports.ERBRescueNode = ERBRescueNode;
     exports.ERBUnlessNode = ERBUnlessNode;
     exports.ERBUntilNode = ERBUntilNode;
@@ -3223,7 +3144,9 @@
     exports.ensureString = ensureString;
     exports.fromSerializedError = fromSerializedError;
     exports.fromSerializedNode = fromSerializedNode;
+    exports.isERBNode = isERBNode;
     exports.isLibHerbBackend = isLibHerbBackend;
+    exports.toMonacoDiagnostic = toMonacoDiagnostic;
 
 }));
 //# sourceMappingURL=herb-core.umd.js.map