@appthreat/atom-parsetools 1.1.0 → 1.1.1

package/astgen.js

@@ -262,34 +262,29 @@ const toEjsAst = (file) => {
   let arr = originalCode.split("");
   const scriptRegex = /(<script>)([\s\S]*?)(<\/script>)/gi;
   let match;
-
   while ((match = scriptRegex.exec(originalCode)) !== null) {
     const openStart = match.index;
     const openLen = match[1].length;
     arr[openStart] = "<";
     arr[openStart + 1] = "%";
-    for (let i = 2; i < openLen; i++) arr[openStart + i] = " ";
+    for (let i = 2; i < openLen; i++) {
+      arr[openStart + i] = " ";
+    }
     const closeStart = match.index + match[0].length - match[3].length;
     const closeLen = match[3].length;
     arr[closeStart] = "%";
     arr[closeStart + 1] = ">";
-    for (let i = 2; i < closeLen; i++) arr[closeStart + i] = " ";
+    for (let i = 2; i < closeLen; i++) {
+      arr[closeStart + i] = " ";
+    }
     const content = match[2];
     const contentOffset = openStart + openLen;
     const innerRegex = /(<%[=\-_#]?)([\s\S]*?)([-_#]?%>)/g;
     let innerMatch;
     while ((innerMatch = innerRegex.exec(content)) !== null) {
       const innerAbsStart = contentOffset + innerMatch.index;
-      if (innerMatch[1] === "<%" && innerMatch[3] === "-%>") {
-        for (let k = 0; k < innerMatch[0].length; k++)
-          arr[innerAbsStart + k] = " ";
-      } else {
-        for (let k = 0; k < innerMatch[1].length; k++)
-          arr[innerAbsStart + k] = " ";
-        const endDelimStart =
-          innerAbsStart + innerMatch[0].length - innerMatch[3].length;
-        for (let k = 0; k < innerMatch[3].length; k++)
-          arr[endDelimStart + k] = " ";
+      for (let k = 0; k < innerMatch[0].length; k++) {
+        arr[innerAbsStart + k] = " ";
       }
     }
   }
@@ -299,26 +294,55 @@ const toEjsAst = (file) => {
     const c = codeWithoutScriptTag[i];
     if (c === "\n" || c === "\r") out[i] = c;
   }
-
   const tagRegex = /(<%[=\-_#]?)([\s\S]*?)([-_#]?%>)/g;
   let tagMatch;
   while ((tagMatch = tagRegex.exec(codeWithoutScriptTag)) !== null) {
     const [fullMatch, openTag, content, closeTag] = tagMatch;
     if (openTag === "<%#" || content.trim().startsWith("include ")) continue;
-    const startIndex = tagMatch.index + openTag.length;
-    const endIndex = tagMatch.index + fullMatch.length - closeTag.length;
-    for (let k = startIndex; k < endIndex; k++) {
-      out[k] = codeWithoutScriptTag[k];
+    let processedContent = content.trim();
+    if (processedContent === "end") {
+      processedContent = "}";
+    } else if (processedContent === "else") {
+      processedContent = "} else {";
+    } else if (processedContent.startsWith("else if")) {
+      let sub = processedContent.substring(4).trim();
+      const controlMatch = sub.match(/^(if)\s+(?!\()(.+)$/);
+      if (controlMatch) {
+        sub = `if (${controlMatch[2]})`;
+      }
+      processedContent = `} else ${sub} {`;
+    } else {
+      const controlMatch = processedContent.match(
+        /^(if|while|for)\s+(?!\()(.+)$/
+      );
+      if (controlMatch) {
+        const keyword = controlMatch[1];
+        const condition = controlMatch[2];
+        processedContent = `${keyword} (${condition})`;
+      }
+      if (
+        /^(if|while|for|try|switch|catch)/.test(processedContent) &&
+        !processedContent.endsWith("{") &&
+        !processedContent.endsWith("}") &&
+        !processedContent.endsWith(";")
+      ) {
+        processedContent += " {";
+      }
     }
-    const trimmed = content.trim();
     const needsSemi =
-      trimmed.length > 0 &&
-      !trimmed.endsWith("{") &&
-      !trimmed.endsWith("}") &&
-      !trimmed.endsWith(";");
-
+      processedContent.length > 0 &&
+      !processedContent.endsWith("{") &&
+      !processedContent.endsWith("}") &&
+      !processedContent.endsWith(";");
     if (needsSemi) {
-      out[endIndex] = ";";
+      processedContent += ";";
+    }
+    const startIndex = tagMatch.index;
+    const maxLen = fullMatch.length;
+    for (let k = 0; k < processedContent.length; k++) {
+      if (k < maxLen) {
+        out[startIndex + k] = processedContent[k];
+      }
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appthreat/atom-parsetools",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "Parsing tools that complement the @appthreat/atom project.",
   "main": "./index.js",
   "type": "module",

package/plugins/composer/installed.php

@@ -1,9 +1,9 @@
 <?php return array(
     'root' => array(
         'name' => '__root__',
-        'pretty_version' => 'v1.1.0',
-        'version' => '1.1.0.0',
-        'reference' => '4684ed7a0f1aabea558c1198b039f1d6d2d1022c',
+        'pretty_version' => 'v1.1.1',
+        'version' => '1.1.1.0',
+        'reference' => 'f6576535af9e41e44bbfaf278b32edc0dfbaef01',
         'type' => 'library',
         'install_path' => __DIR__ . '/../../',
         'aliases' => array(),
@@ -11,9 +11,9 @@
     ),
     'versions' => array(
         '__root__' => array(
-            'pretty_version' => 'v1.1.0',
-            'version' => '1.1.0.0',
-            'reference' => '4684ed7a0f1aabea558c1198b039f1d6d2d1022c',
+            'pretty_version' => 'v1.1.1',
+            'version' => '1.1.1.0',
+            'reference' => 'f6576535af9e41e44bbfaf278b32edc0dfbaef01',
             'type' => 'library',
             'install_path' => __DIR__ . '/../../',
             'aliases' => array(),

package/plugins/rubyastgen/bundle/ruby/4.0.0/extensions/x86_64-linux/4.0.0/prism-1.7.0/gem_make.out

@@ -6,10 +6,10 @@ checking for whether -fvisibility=hidden is accepted as CFLAGS... yes
 creating Makefile
 
 current directory: /home/runner/work/atom-parsetools/atom-parsetools/plugins/rubyastgen/bundle/ruby/4.0.0/gems/prism-1.7.0/ext/prism
-make -j5 DESTDIR\= sitearchdir\=./.gem.20251228-2256-x6mrnn sitelibdir\=./.gem.20251228-2256-x6mrnn clean
+make -j5 DESTDIR\= sitearchdir\=./.gem.20260105-2215-ju1bl3 sitelibdir\=./.gem.20260105-2215-ju1bl3 clean
 
 current directory: /home/runner/work/atom-parsetools/atom-parsetools/plugins/rubyastgen/bundle/ruby/4.0.0/gems/prism-1.7.0/ext/prism
-make -j5 DESTDIR\= sitearchdir\=./.gem.20251228-2256-x6mrnn sitelibdir\=./.gem.20251228-2256-x6mrnn
+make -j5 DESTDIR\= sitearchdir\=./.gem.20260105-2215-ju1bl3 sitelibdir\=./.gem.20260105-2215-ju1bl3
 compiling api_node.c
 compiling api_pack.c
 compiling extension.c
@@ -37,8 +37,8 @@ compiling ./../../src/util/pm_strpbrk.c
 linking shared-object prism/prism.so
 
 current directory: /home/runner/work/atom-parsetools/atom-parsetools/plugins/rubyastgen/bundle/ruby/4.0.0/gems/prism-1.7.0/ext/prism
-make -j5 DESTDIR\= sitearchdir\=./.gem.20251228-2256-x6mrnn sitelibdir\=./.gem.20251228-2256-x6mrnn install
-/usr/bin/install -c -m 0755 prism.so ./.gem.20251228-2256-x6mrnn/prism
+make -j5 DESTDIR\= sitearchdir\=./.gem.20260105-2215-ju1bl3 sitelibdir\=./.gem.20260105-2215-ju1bl3 install
+/usr/bin/install -c -m 0755 prism.so ./.gem.20260105-2215-ju1bl3/prism
 
 current directory: /home/runner/work/atom-parsetools/atom-parsetools/plugins/rubyastgen/bundle/ruby/4.0.0/gems/prism-1.7.0/ext/prism
-make DESTDIR\= sitearchdir\=./.gem.20251228-2256-x6mrnn sitelibdir\=./.gem.20251228-2256-x6mrnn clean
+make DESTDIR\= sitearchdir\=./.gem.20260105-2215-ju1bl3 sitelibdir\=./.gem.20260105-2215-ju1bl3 clean

package/plugins/rubyastgen/bundle/ruby/4.0.0/extensions/x86_64-linux/4.0.0/racc-1.8.1/gem_make.out

@@ -3,16 +3,16 @@ current directory: /home/runner/work/atom-parsetools/atom-parsetools/plugins/rub
 creating Makefile
 
 current directory: /home/runner/work/atom-parsetools/atom-parsetools/plugins/rubyastgen/bundle/ruby/4.0.0/gems/racc-1.8.1/ext/racc/cparse
-make -j5 DESTDIR\= sitearchdir\=./.gem.20251228-2256-thfbzl sitelibdir\=./.gem.20251228-2256-thfbzl clean
+make -j5 DESTDIR\= sitearchdir\=./.gem.20260105-2215-74o4o6 sitelibdir\=./.gem.20260105-2215-74o4o6 clean
 
 current directory: /home/runner/work/atom-parsetools/atom-parsetools/plugins/rubyastgen/bundle/ruby/4.0.0/gems/racc-1.8.1/ext/racc/cparse
-make -j5 DESTDIR\= sitearchdir\=./.gem.20251228-2256-thfbzl sitelibdir\=./.gem.20251228-2256-thfbzl
+make -j5 DESTDIR\= sitearchdir\=./.gem.20260105-2215-74o4o6 sitelibdir\=./.gem.20260105-2215-74o4o6
 compiling cparse.c
 linking shared-object racc/cparse.so
 
 current directory: /home/runner/work/atom-parsetools/atom-parsetools/plugins/rubyastgen/bundle/ruby/4.0.0/gems/racc-1.8.1/ext/racc/cparse
-make -j5 DESTDIR\= sitearchdir\=./.gem.20251228-2256-thfbzl sitelibdir\=./.gem.20251228-2256-thfbzl install
-/usr/bin/install -c -m 0755 cparse.so ./.gem.20251228-2256-thfbzl/racc
+make -j5 DESTDIR\= sitearchdir\=./.gem.20260105-2215-74o4o6 sitelibdir\=./.gem.20260105-2215-74o4o6 install
+/usr/bin/install -c -m 0755 cparse.so ./.gem.20260105-2215-74o4o6/racc
 
 current directory: /home/runner/work/atom-parsetools/atom-parsetools/plugins/rubyastgen/bundle/ruby/4.0.0/gems/racc-1.8.1/ext/racc/cparse
-make DESTDIR\= sitearchdir\=./.gem.20251228-2256-thfbzl sitelibdir\=./.gem.20251228-2256-thfbzl clean
+make DESTDIR\= sitearchdir\=./.gem.20260105-2215-74o4o6 sitelibdir\=./.gem.20260105-2215-74o4o6 clean