@appthreat/atom-parsetools 1.1.0 → 1.1.2

package/astgen.js

@@ -262,7 +262,6 @@ 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;
@@ -293,6 +292,7 @@ const toEjsAst = (file) => {
       }
     }
   }
+
   const codeWithoutScriptTag = arr.join("");
   const out = new Array(codeWithoutScriptTag.length).fill(" ");
   for (let i = 0; i < codeWithoutScriptTag.length; i++) {
@@ -305,20 +305,75 @@ const toEjsAst = (file) => {
   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();
+    let isTransformed = false;
+    if (processedContent === "end") {
+      processedContent = "}";
+      isTransformed = true;
+    } else if (processedContent === "else") {
+      processedContent = "} else {";
+      isTransformed = true;
+    } 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} {`;
+      isTransformed = true;
+    } else {
+      const controlMatch = processedContent.match(
+        /^(if|while|for)\s+(?!\()(.+)$/
+      );
+      if (controlMatch) {
+        const keyword = controlMatch[1];
+        const condition = controlMatch[2];
+        processedContent = `${keyword} (${condition})`;
+        isTransformed = true;
+      }
+      if (
+        /^(if|while|for|try|switch|catch)/.test(processedContent) &&
+        !processedContent.endsWith("{") &&
+        !processedContent.endsWith("}") &&
+        !processedContent.endsWith(";")
+      ) {
+        processedContent += " {";
+        isTransformed = true;
+      }
     }
-    const trimmed = content.trim();
-    const needsSemi =
-      trimmed.length > 0 &&
-      !trimmed.endsWith("{") &&
-      !trimmed.endsWith("}") &&
-      !trimmed.endsWith(";");
-
-    if (needsSemi) {
-      out[endIndex] = ";";
+    if (isTransformed) {
+      const startIndex = tagMatch.index;
+      const maxLen = fullMatch.length;
+      const needsSemi =
+        processedContent.length > 0 &&
+        !processedContent.endsWith("{") &&
+        !processedContent.endsWith("}") &&
+        !processedContent.endsWith(";");
+      if (needsSemi) processedContent += ";";
+
+      for (let k = 0; k < processedContent.length; k++) {
+        if (k < maxLen) {
+          out[startIndex + k] = processedContent[k];
+        }
+      }
+    } else {
+      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];
+      }
+
+      const needsSemi =
+        processedContent.length > 0 &&
+        !processedContent.endsWith("{") &&
+        !processedContent.endsWith("}") &&
+        !processedContent.endsWith(";");
+
+      if (needsSemi) {
+        out[endIndex] = ";";
+      }
     }
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@appthreat/atom-parsetools",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "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.2',
+        'version' => '1.1.2.0',
+        'reference' => 'ea69d1c066e3a4d62a23e93dcb74e93379a38151',
         '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.2',
+            'version' => '1.1.2.0',
+            'reference' => 'ea69d1c066e3a4d62a23e93dcb74e93379a38151',
             '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.20260106-2204-t77tu9 sitelibdir\=./.gem.20260106-2204-t77tu9 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.20260106-2204-t77tu9 sitelibdir\=./.gem.20260106-2204-t77tu9
 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.20260106-2204-t77tu9 sitelibdir\=./.gem.20260106-2204-t77tu9 install
+/usr/bin/install -c -m 0755 prism.so ./.gem.20260106-2204-t77tu9/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.20260106-2204-t77tu9 sitelibdir\=./.gem.20260106-2204-t77tu9 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.20260106-2204-4787mi sitelibdir\=./.gem.20260106-2204-4787mi 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.20260106-2204-4787mi sitelibdir\=./.gem.20260106-2204-4787mi
 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.20260106-2204-4787mi sitelibdir\=./.gem.20260106-2204-4787mi install
+/usr/bin/install -c -m 0755 cparse.so ./.gem.20260106-2204-4787mi/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.20260106-2204-4787mi sitelibdir\=./.gem.20260106-2204-4787mi clean