@jbearak/sight 0.14.4 → 0.14.5

package/dist/sight-server.js

@@ -52,7 +52,7 @@ var package_default;
 var init_package = __esm(() => {
   package_default = {
     name: "@jbearak/sight",
-    version: "0.14.4",
+    version: "0.14.5",
     type: "module",
     workspaces: [
       "client"
@@ -13253,6 +13253,15 @@ var init_lexer = __esm(() => {
   ASSIGNMENT_OPERATORS = new Set(["=", "==", "!=", "<", ">", "<=", ">="]);
 });
 
+// src/utils/local-macro.ts
+function unwrap_macval(content) {
+  return MACVAL_LITERAL_PATTERN.exec(content)?.[1] ?? content;
+}
+var MACVAL_LITERAL_PATTERN;
+var init_local_macro = __esm(() => {
+  MACVAL_LITERAL_PATTERN = /^macval\(([A-Za-z0-9_]+)\)$/;
+});
+
 // src/utils/continuation.ts
 function is_swallowed_continuation_terminator(my_token, in_continuation) {
   return my_token.type === "STATEMENT_TERMINATOR" && in_continuation && my_token.value === `
@@ -13291,6 +13300,7 @@ class ContinuationTracker {
 var PREFIX_COMMANDS, StataParser;
 var init_parser = __esm(() => {
   init_types();
+  init_local_macro();
   init_file_path_utils();
   PREFIX_COMMANDS = new Set(["by", "bysort", "quietly", "qui", "capture", "cap", "noisily", "noi"]);
   StataParser = class StataParser {
@@ -13788,7 +13798,7 @@ var init_parser = __esm(() => {
     }
     extract_local_macro_name(value) {
       if (value.startsWith("`") && value.endsWith("'")) {
-        return value.slice(1, -1);
+        return unwrap_macval(value.slice(1, -1));
       }
       return null;
     }
@@ -14011,7 +14021,11 @@ var init_parser = __esm(() => {
       const options = [];
       if (this.check("COMMA")) {
         this.advance();
-        while (!this.check("STATEMENT_TERMINATOR") && !this.isAtEnd() && !this.isTrivia()) {
+        while (!this.check("STATEMENT_TERMINATOR") && !this.isAtEnd()) {
+          if (this.skipContinuation())
+            continue;
+          if (this.isTrivia())
+            break;
           if (this.check("WORD")) {
             const optionToken = this.advance();
             const option = {
@@ -14212,7 +14226,11 @@ var init_parser = __esm(() => {
       const options = [];
       if (this.check("COMMA")) {
         this.advance();
-        while (!this.check("STATEMENT_TERMINATOR") && !this.isAtEnd() && !this.isTrivia()) {
+        while (!this.check("STATEMENT_TERMINATOR") && !this.isAtEnd()) {
+          if (this.skipContinuation())
+            continue;
+          if (this.isTrivia())
+            break;
           if (this.check("WORD")) {
             const option_token = this.advance();
             const option = {
@@ -14973,7 +14991,11 @@ var init_parser = __esm(() => {
       const options = [];
       if (this.check("COMMA")) {
         this.advance();
-        while (!this.check("STATEMENT_TERMINATOR") && !this.isAtEnd() && !this.isTrivia()) {
+        while (!this.check("STATEMENT_TERMINATOR") && !this.isAtEnd()) {
+          if (this.skipContinuation())
+            continue;
+          if (this.isTrivia())
+            break;
           if (this.check("WORD")) {
             const option_token = this.advance();
             const option = {
@@ -19927,7 +19949,7 @@ class SemanticAnalyzer {
   }
   extract_local_macro_name(value) {
     if (value.startsWith("`") && value.endsWith("'")) {
-      return value.slice(1, -1);
+      return unwrap_macval(value.slice(1, -1));
     }
     return null;
   }
@@ -20020,6 +20042,7 @@ var STATA_SYSTEM_GLOBALS, WEIGHT_TYPES, STATA_STORAGE_TYPES, STR_WIDTH_RE, MATA_
 var init_analyzer = __esm(() => {
   init_scoped_locals();
   init_types();
+  init_local_macro();
   init_directive_parser();
   init_loop_expander();
   init_macro_creating_commands();
@@ -73841,4 +73864,4 @@ export {
   is_cli_entry_point
 };
 
-//# debugId=7A54D1D3B542825B64756E2164756E21
+//# debugId=19E8989026935ECD64756E2164756E21

package/dist/sight-server.js.sha256

@@ -1 +1 @@
-4770f4e115de3c4df1dea43547bbf32b3d99fbc135026bedef1e73a691b47a7a  sight-server.js
+861c239888154dd8cbe21fadf25874416280e17b2bb9fbf2080e8dd4a63dbbfc  sight-server.js

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbearak/sight",
-  "version": "0.14.4",
+  "version": "0.14.5",
   "type": "module",
   "workspaces": [
     "client"