bare-script 3.5.5 → 3.7.0

package/lib/model.js

@@ -17,6 +17,15 @@ struct BareScript
     # The script's statements
     ScriptStatement[] statements
 
+    # The script name
+    optional string scriptName
+
+    # The script's lines
+    optional string[] scriptLines
+
+    # If true, this is a system include script
+    optional bool system
+
 
 # A script statement
 union ScriptStatement
@@ -31,7 +40,7 @@ union ScriptStatement
     ReturnStatement return
 
     # A label definition
-    string label
+    LabelStatement label
 
     # A function definition
     FunctionStatement function
@@ -40,8 +49,18 @@ union ScriptStatement
     IncludeStatement include
 
 
+# Script statement base struct
+struct BaseStatement
+
+    # The script statement's line number
+    optional int lineNumber
+
+    # The number of lines in the script statement (default is 1)
+    optional int lineCount
+
+
 # An expression statement
-struct ExpressionStatement
+struct ExpressionStatement (BaseStatement)
 
     # The variable name to assign the expression value
     optional string name
@@ -51,7 +70,7 @@ struct ExpressionStatement
 
 
 # A jump statement
-struct JumpStatement
+struct JumpStatement (BaseStatement)
 
     # The label to jump to
     string label
@@ -61,14 +80,21 @@ struct JumpStatement
 
 
 # A return statement
-struct ReturnStatement
+struct ReturnStatement (BaseStatement)
 
     # The expression to return
     optional Expression expr
 
 
+# A label statement
+struct LabelStatement (BaseStatement)
+
+    # The label name
+    string name
+
+
 # A function definition statement
-struct FunctionStatement
+struct FunctionStatement (BaseStatement)
 
     # If true, the function is defined as async
     optional bool async
@@ -87,7 +113,7 @@ struct FunctionStatement
 
 
 # An include statement
-struct IncludeStatement
+struct IncludeStatement (BaseStatement)
 
     # The list of include scripts to load and execute in the global scope
     IncludeScript[len > 0] includes
@@ -103,6 +129,36 @@ struct IncludeScript
     optional bool system
 
 
+# The coverage global configuration
+struct CoverageGlobal
+
+    # If true, coverage is enabled
+    optional bool enabled
+
+    # The map of script name to script coverage
+    optional CoverageGlobalScript{} scripts
+
+
+# The script coverage
+struct CoverageGlobalScript
+
+    # The script
+    BareScript script
+
+    # The map of script line number string to script statement coverage
+    CoverageGlobalStatement{} covered
+
+
+# The script statement coverage
+struct CoverageGlobalStatement
+
+    # The script statement
+    ScriptStatement statement
+
+    # The statement's coverage count
+    int count
+
+
 # An expression
 union Expression
 
@@ -363,12 +419,13 @@ export function lintScript(script) {
                 // Function label statement checks
                 } else if (fnStatementKey === 'label') {
                     // Label redefinition?
-                    if (fnStatement.label in fnLabelsDefined) {
+                    const fnStatementLabel = fnStatement.label.name;
+                    if (fnStatementLabel in fnLabelsDefined) {
                         warnings.push(
-                            `Redefinition of label "${fnStatement.label}" in function "${statement.function.name}" (index ${ixFnStatement})`
+                            `Redefinition of label "${fnStatementLabel}" in function "${statement.function.name}" (index ${ixFnStatement})`
                         );
                     } else {
-                        fnLabelsDefined[fnStatement.label] = ixFnStatement;
+                        fnLabelsDefined[fnStatementLabel] = ixFnStatement;
                     }
 
                 // Function jump statement checks
@@ -403,10 +460,11 @@ export function lintScript(script) {
         // Global label statement checks
         } else if (statementKey === 'label') {
             // Label redefinition?
-            if (statement.label in labelsDefined) {
-                warnings.push(`Redefinition of global label "${statement.label}" (index ${ixStatement})`);
+            const statementLabel = statement.label.name;
+            if (statementLabel in labelsDefined) {
+                warnings.push(`Redefinition of global label "${statementLabel}" (index ${ixStatement})`);
             } else {
-                labelsDefined[statement.label] = ixStatement;
+                labelsDefined[statementLabel] = ixStatement;
             }
 
         // Global jump statement checks

package/lib/options.js

@@ -64,9 +64,52 @@ export function urlFileRelative(file, url) {
         return url;
     }
 
-    // URL is relative POSIX path
-    return `${file.slice(0, file.lastIndexOf('/') + 1)}${url}`;
+    // URL is relative POSIX path - join with root
+    const result = `${file.slice(0, file.lastIndexOf('/') + 1)}${url}`;
+
+    // Normalize non-URL POSIX paths
+    if (!rURL.test(result)) {
+        return normalizePath(result);
+    }
+
+    return result;
 }
 
 
+// Regular expression to match URLs
 export const rURL = /^[a-z]+:/;
+
+
+// Normalize a POSIX path
+export function normalizePath(filepath) {
+    // Handle empty string
+    if (!filepath || filepath === '.') {
+        return '.';
+    }
+
+    // Check if path is absolute
+    const isAbsolute = filepath.startsWith('/');
+
+    // Split path into segments
+    const segments = filepath.split('/').filter(segment => segment !== '' && segment !== '.');
+
+    // Process segments to handle '..'
+    const stack = [];
+    for (const segment of segments) {
+        if (segment === '..') {
+            // Only pop if we're not at the root and stack is not empty
+            if (stack.length > 0 && stack[stack.length - 1] !== '..') {
+                stack.pop();
+            } else if (!isAbsolute) {
+                // For relative paths, keep '..' if we can't go up further
+                stack.push(segment);
+            }
+            // For absolute paths, ignore '..' at root
+        } else {
+            stack.push(segment);
+        }
+    }
+
+    // Reconstruct path
+    return isAbsolute ? `/${stack.join('/')}` : stack.join('/');
+}