@appthreat/atom 2.1.13 → 2.1.15

package/plugins/rubyastgen/bundle/ruby/3.4.0/gems/{parser-3.3.7.1 → parser-3.3.8.0}/lib/parser/ruby30.rb

@@ -11162,11 +11162,12 @@ end
 
 def _reduce_538(val, _values, result)
                       name = val[1][0]
+                      lvar = @builder.accessible(@builder.ident(val[1]))
+
                       unless static_env.declared?(name)
                         diagnostic :error, :undefined_lvar, { :name => name }, val[1]
                       end
 
-                      lvar = @builder.accessible(@builder.ident(val[1]))
                       result = @builder.pin(val[0], lvar)
 
     result

package/plugins/rubyastgen/bundle/ruby/3.4.0/gems/{parser-3.3.7.1 → parser-3.3.8.0}/lib/parser/ruby31.rb

@@ -11589,11 +11589,12 @@ end
 
 def _reduce_548(val, _values, result)
                       name = val[1][0]
+                      lvar = @builder.accessible(@builder.ident(val[1]))
+
                       unless static_env.declared?(name)
                         diagnostic :error, :undefined_lvar, { :name => name }, val[1]
                       end
 
-                      lvar = @builder.accessible(@builder.ident(val[1]))
                       result = @builder.pin(val[0], lvar)
 
     result

package/plugins/rubyastgen/bundle/ruby/3.4.0/gems/{parser-3.3.7.1 → parser-3.3.8.0}/lib/parser/ruby32.rb

@@ -11585,11 +11585,12 @@ end
 
 def _reduce_548(val, _values, result)
                       name = val[1][0]
+                      lvar = @builder.accessible(@builder.ident(val[1]))
+
                       unless static_env.declared?(name)
                         diagnostic :error, :undefined_lvar, { :name => name }, val[1]
                       end
 
-                      lvar = @builder.accessible(@builder.ident(val[1]))
                       result = @builder.pin(val[0], lvar)
 
     result

package/plugins/rubyastgen/bundle/ruby/3.4.0/gems/{parser-3.3.7.1 → parser-3.3.8.0}/lib/parser/ruby33.rb

@@ -11471,11 +11471,12 @@ end
 
 def _reduce_548(val, _values, result)
                       name = val[1][0]
+                      lvar = @builder.accessible(@builder.ident(val[1]))
+
                       unless static_env.declared?(name)
                         diagnostic :error, :undefined_lvar, { :name => name }, val[1]
                       end
 
-                      lvar = @builder.accessible(@builder.ident(val[1]))
                       result = @builder.pin(val[0], lvar)
 
     result

package/plugins/rubyastgen/bundle/ruby/3.4.0/gems/{parser-3.3.7.1 → parser-3.3.8.0}/lib/parser/ruby34.rb

@@ -11478,11 +11478,12 @@ end
 
 def _reduce_548(val, _values, result)
                       name = val[1][0]
+                      lvar = @builder.accessible(@builder.ident(val[1]))
+
                       unless static_env.declared?(name)
                         diagnostic :error, :undefined_lvar, { :name => name }, val[1]
                       end
 
-                      lvar = @builder.accessible(@builder.ident(val[1]))
                       result = @builder.pin(val[0], lvar)
 
     result

package/plugins/rubyastgen/bundle/ruby/3.4.0/gems/{parser-3.3.7.1 → parser-3.3.8.0}/lib/parser/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Parser
-  VERSION = '3.3.7.1'
+  VERSION = '3.3.8.0'
 end

package/plugins/rubyastgen/bundle/ruby/3.4.0/gems/racc-1.8.1/ext/racc/cparse/Makefile

@@ -13,12 +13,12 @@ NULLCMD = :
 #### Start of system configuration section. ####
 
 srcdir = .
-topdir = /opt/hostedtoolcache/Ruby/3.4.2/x64/include/ruby-3.4.0
+topdir = /opt/hostedtoolcache/Ruby/3.4.3/x64/include/ruby-3.4.0
 hdrdir = $(topdir)
-arch_hdrdir = /opt/hostedtoolcache/Ruby/3.4.2/x64/include/ruby-3.4.0/x86_64-linux
+arch_hdrdir = /opt/hostedtoolcache/Ruby/3.4.3/x64/include/ruby-3.4.0/x86_64-linux
 PATH_SEPARATOR = :
 VPATH = $(srcdir):$(arch_hdrdir)/ruby:$(hdrdir)/ruby
-prefix = $(DESTDIR)/opt/hostedtoolcache/Ruby/3.4.2/x64
+prefix = $(DESTDIR)/opt/hostedtoolcache/Ruby/3.4.3/x64
 rubysitearchprefix = $(rubylibprefix)/$(sitearch)
 rubyarchprefix = $(rubylibprefix)/$(arch)
 rubylibprefix = $(libdir)/$(RUBY_BASE_NAME)

package/plugins/rubyastgen/bundle/ruby/3.4.0/specifications/{ast-2.4.2.gemspec → ast-2.4.3.gemspec}

@@ -1,28 +1,27 @@
 # -*- encoding: utf-8 -*-
-# stub: ast 2.4.2 ruby lib
+# stub: ast 2.4.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "ast".freeze
-  s.version = "2.4.2".freeze
+  s.version = "2.4.3".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
   s.authors = ["whitequark".freeze]
-  s.date = "2021-01-23"
+  s.date = "2025-03-19"
   s.description = "A library for working with Abstract Syntax Trees.".freeze
   s.email = ["whitequark@whitequark.org".freeze]
   s.homepage = "https://whitequark.github.io/ast/".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "3.2.3".freeze
+  s.rubygems_version = "3.6.2".freeze
   s.summary = "A library for working with Abstract Syntax Trees.".freeze
 
-  s.installed_by_version = "3.6.2".freeze
+  s.installed_by_version = "3.6.7".freeze
 
   s.specification_version = 4
 
-  s.add_development_dependency(%q<rake>.freeze, ["~> 12.3".freeze])
-  s.add_development_dependency(%q<bacon>.freeze, ["~> 1.2".freeze])
-  s.add_development_dependency(%q<bacon-colored_output>.freeze, [">= 0".freeze])
+  s.add_development_dependency(%q<rake>.freeze, ["~> 13.2".freeze])
+  s.add_development_dependency(%q<rspec>.freeze, ["~> 3.13".freeze])
   s.add_development_dependency(%q<simplecov>.freeze, [">= 0".freeze])
   s.add_development_dependency(%q<coveralls>.freeze, ["~> 0.8.23".freeze])
   s.add_development_dependency(%q<yard>.freeze, [">= 0".freeze])

package/plugins/rubyastgen/bundle/ruby/3.4.0/specifications/ostruct-0.6.1.gemspec

@@ -17,5 +17,5 @@ Gem::Specification.new do |s|
   s.rubygems_version = "3.5.11".freeze
   s.summary = "Class to build custom data structures, similar to a Hash.".freeze
 
-  s.installed_by_version = "3.6.2".freeze
+  s.installed_by_version = "3.6.7".freeze
 end

package/plugins/rubyastgen/bundle/ruby/3.4.0/specifications/{parser-3.3.7.1.gemspec → parser-3.3.8.0.gemspec}

@@ -1,15 +1,15 @@
 # -*- encoding: utf-8 -*-
-# stub: parser 3.3.7.1 ruby lib
+# stub: parser 3.3.8.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "parser".freeze
-  s.version = "3.3.7.1".freeze
+  s.version = "3.3.8.0".freeze
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
-  s.metadata = { "bug_tracker_uri" => "https://github.com/whitequark/parser/issues", "changelog_uri" => "https://github.com/whitequark/parser/blob/v3.3.7.1/CHANGELOG.md", "documentation_uri" => "https://www.rubydoc.info/gems/parser/3.3.7.1", "source_code_uri" => "https://github.com/whitequark/parser/tree/v3.3.7.1" } if s.respond_to? :metadata=
+  s.metadata = { "bug_tracker_uri" => "https://github.com/whitequark/parser/issues", "changelog_uri" => "https://github.com/whitequark/parser/blob/v3.3.8.0/CHANGELOG.md", "documentation_uri" => "https://www.rubydoc.info/gems/parser/3.3.8.0", "source_code_uri" => "https://github.com/whitequark/parser/tree/v3.3.8.0" } if s.respond_to? :metadata=
   s.require_paths = ["lib".freeze]
   s.authors = ["whitequark".freeze]
-  s.date = "2025-02-05"
+  s.date = "2025-04-14"
   s.description = "A Ruby parser written in pure Ruby.".freeze
   s.email = ["whitequark@whitequark.org".freeze]
   s.executables = ["ruby-parse".freeze, "ruby-rewrite".freeze]
@@ -17,10 +17,10 @@ Gem::Specification.new do |s|
   s.homepage = "https://github.com/whitequark/parser".freeze
   s.licenses = ["MIT".freeze]
   s.required_ruby_version = Gem::Requirement.new(">= 2.0.0".freeze)
-  s.rubygems_version = "3.5.3".freeze
+  s.rubygems_version = "3.6.2".freeze
   s.summary = "A Ruby parser written in pure Ruby.".freeze
 
-  s.installed_by_version = "3.6.2".freeze
+  s.installed_by_version = "3.6.7".freeze
 
   s.specification_version = 4
 

package/plugins/rubyastgen/bundle/ruby/3.4.0/specifications/racc-1.8.1.gemspec

@@ -24,5 +24,5 @@ Gem::Specification.new do |s|
   s.rubygems_version = "3.5.0.dev".freeze
   s.summary = "Racc is an LALR(1) parser generator".freeze
 
-  s.installed_by_version = "3.6.2".freeze
+  s.installed_by_version = "3.6.7".freeze
 end

package/rbastgen.js

@@ -15,14 +15,10 @@ export const PLUGINS_HOME = join(dirName, "plugins");
 const RUBY_ASTGEN_BIN =
   process.env.RUBY_ASTGEN_BIN || join(PLUGINS_HOME, "bin", "ruby_ast_gen");
 // Ruby version needed
-const RUBY_VERSION_NEEDED = "3.4.2";
+const RUBY_VERSION_NEEDED = "3.4.3";
 function main(argvs) {
   const cwd = process.env.ATOM_CWD || process.cwd();
-  argvs.splice(
-    0,
-    0,
-    process.env.RUBY_ASTGEN_BIN || join(PLUGINS_HOME, "bin", "ruby_ast_gen")
-  );
+  argvs.splice(0, 0, RUBY_ASTGEN_BIN);
   const env = {
     ...process.env
   };

package/scalasem.js

@@ -0,0 +1,365 @@
+#!/usr/bin/env node
+// Usage: scalasem $(pwd) slices.json
+import { tmpdir } from "node:os";
+import { basename, dirname, join, relative } from "node:path";
+import { spawnSync } from "node:child_process";
+import { detectScala, detectScalac, getAllFiles } from "./utils.mjs";
+import process from "node:process";
+import {
+  existsSync,
+  mkdtempSync,
+  mkdirSync,
+  readFileSync,
+  rmSync,
+  writeFileSync
+} from "node:fs";
+
+function main(argvs) {
+  if (!detectScala() && !detectScalac()) {
+    console.warn("Scala is not installed!");
+    return false;
+  }
+  let configFiles = getAllFiles(argvs[0], "routes");
+  configFiles = configFiles.concat(getAllFiles(argvs[0], ".conf"));
+  let tastyFiles = getAllFiles(argvs[0], ".tasty");
+  if (!tastyFiles.length) {
+    let buildTool = "sbt";
+    const millFiles = getAllFiles(argvs[0], "build.mill");
+    if (millFiles.length) {
+      buildTool = "mill";
+    }
+    const cwd = process.env.ATOM_CWD || process.cwd();
+    let compileCommand =
+      process?.env[`${buildTool.toUpperCase()}_COMPILE_COMMAND`] || "compile";
+    if (process.env.SCALA_VERSION && buildTool === "sbt") {
+      compileCommand = `++${process.env.SCALA_VERSION} ${compileCommand}`;
+    } else {
+      // Detect crossScalaVersions
+      const scalaVersion = findScalaVersion(cwd);
+      if (scalaVersion) {
+        compileCommand = `++${scalaVersion} ${compileCommand}`;
+      }
+    }
+    console.log(`Executing '${buildTool} ${compileCommand}' in ${argvs[0]}`);
+    const result = spawnSync(buildTool, compileCommand.split(" "), {
+      encoding: "utf-8",
+      cwd,
+      stdio: "ignore",
+      stderr: "inherit",
+      env: process.env,
+      timeout: process.env.ATOM_TIMEOUT || process.env.ASTGEN_TIMEOUT
+    });
+    if (result.error || result.status !== 0) {
+      if (result.stderr) {
+        console.log(result.stderr);
+      }
+      return false;
+    }
+    tastyFiles = getAllFiles(argvs[0], ".tasty");
+    console.log(`Obtained ${tastyFiles.length} IR files after compilation.`);
+  }
+  const slicesFile =
+    argvs.length > 1 ? argvs[1] : join(argvs[0], "slices.json");
+  createSemanticSlices(tastyFiles, configFiles, slicesFile);
+}
+main(process.argv.slice(2));
+
+function findScalaVersion(cwd) {
+  let scalaVersion;
+  const buildSbtFile = join(cwd, "build.sbt");
+  if (existsSync(buildSbtFile)) {
+    const buildData = readFileSync(buildSbtFile, "utf-8");
+    for (let line of buildData.split("\n")) {
+      if (line.trim().includes("val ") && line.includes("scala")) {
+        const match = line.match(/"(3\.[^"]+)"/);
+        if (match) {
+          return match[1];
+        }
+      }
+      if (line.trim().includes("crossScalaVersions")) {
+        const crossVersions = line.split("crossScalaVersions").pop().trim();
+        if (crossVersions.includes("3.")) {
+          const match = crossVersions.match(/"(3\.[^"]+)"/);
+          if (match) {
+            return match[1];
+          }
+        }
+      }
+    }
+  }
+  return scalaVersion;
+}
+
+function createSemanticSlices(tastyFiles, configFiles, slicesFile) {
+  const outDir = mkdtempSync(join(tmpdir(), "scalasem-"));
+  const MAX_BUFFER =
+    Number.parseInt(process.env.ATOM_MAX_BUFFER) || 100 * 1024 * 1024;
+  const cwd = process.env.ATOM_CWD || process.cwd();
+  const slices = {};
+  slices.config = parseConfigFiles(configFiles);
+  for (const af of tastyFiles) {
+    const result = spawnSync(
+      process.env.SCALAC_CMD || "scalac",
+      ["-color:never", "-print-tasty", af],
+      {
+        encoding: "utf-8",
+        cwd,
+        env: process.env,
+        maxBuffer: MAX_BUFFER,
+        timeout: process.env.ATOM_TIMEOUT || process.env.ASTGEN_TIMEOUT
+      }
+    );
+    if (result.error || result.status !== 0) {
+      if (result.stderr) {
+        console.log(result.stderr);
+      }
+    }
+    if (result.stdout) {
+      let fileOutDir = join(outDir, relative(cwd, dirname(af)));
+      const scalaDir = relative(cwd, dirname(af)).replace(
+        new RegExp("target/scala-(.)*/classes"),
+        ""
+      );
+      if (fileOutDir.includes("classes")) {
+        fileOutDir = fileOutDir.replace(
+          new RegExp("target/scala-(.)*/classes"),
+          ""
+        );
+      }
+      mkdirSync(fileOutDir, { recursive: true });
+      const astFile = join(
+        fileOutDir,
+        basename(af).replace(".tasty", ".scala.ast")
+      );
+      const scalaFile = join(
+        scalaDir,
+        basename(af).replace(".tasty", ".scala")
+      );
+      writeFileSync(astFile, Buffer.from(result.stdout).toString());
+      const usages = parseTasty(astFile);
+      slices[usages.sourceFile || scalaFile] = usages;
+      rmSync(astFile);
+    }
+  }
+  const slicesJson = JSON.stringify(slices, null, null);
+  writeFileSync(slicesFile, slicesJson);
+  if (!Object.keys(slices).length) {
+    console.log("Empty slices file created.");
+  } else {
+    console.log(
+      `Slices file ${slicesFile} created successfully with ${
+        Object.keys(slices).length
+      } entries.`
+    );
+  }
+  if (outDir?.startsWith(tmpdir())) {
+    rmSync(outDir, { recursive: true });
+  }
+}
+
+function parseTasty(tastyAstFile) {
+  const astData = readFileSync(tastyAstFile, "utf-8");
+  let namesMode = false;
+  let treesMode = false;
+  let sourcePathsMode = false;
+  const literals = new Set();
+  const usedTypes = new Set();
+  const tags = new Set();
+  let sourceFile;
+  for (let line of astData.split("\n")) {
+    line = line.replace("\r", "").trim();
+    if (!line.length || line.startsWith("---")) {
+      continue;
+    }
+    if (line.startsWith("Names ") || line.startsWith("Names:")) {
+      namesMode = true;
+    }
+    if (line.startsWith("Trees ") || line.startsWith("Trees:")) {
+      namesMode = false;
+      treesMode = true;
+    }
+    if (line.startsWith("Positions ") || line.startsWith("positions:")) {
+      namesMode = false;
+      treesMode = false;
+    }
+    if (namesMode) {
+      // 3: api
+      if (line.includes(": ")) {
+        const literal = line.split(": ").pop().trim();
+        if (literal.length > 1) {
+          literals.add(literal);
+        }
+      }
+    }
+    if (treesMode && line.includes(" Signature(")) {
+      // 139:         SELECTin(12) 38 [<init>[Signed Signature(List(play.api.mvc.MessagesControllerComponents),play.api.mvc.MessagesAbstractController) @<init>]]
+      const signatureTypes = line
+        .split(" Signature(")
+        .pop()
+        .split(") ")[0]
+        .replaceAll("List(", "")
+        .replaceAll(")", "")
+        .split(",");
+      for (let sig of signatureTypes) {
+        sig = sig.trim();
+        if (
+          sig.length > 3 &&
+          !sig.startsWith("scala.") &&
+          !sig.startsWith("java.") &&
+          !sig.startsWith("javax.inject.")
+        ) {
+          usedTypes.add(sig);
+          if (sig.startsWith("play.api.")) {
+            tags.add("framework");
+          }
+          if (
+            sig.startsWith("play.api.data.Form") ||
+            sig.startsWith("play.api.mvc.Request") ||
+            sig.startsWith("play.twirl.api")
+          ) {
+            tags.add("framework-input");
+          }
+          if (
+            sig.startsWith("play.twirl.api.Html") ||
+            sig.startsWith("play.api.mvc.Result") ||
+            sig.startsWith("play.api.mvc.Action")
+          ) {
+            tags.add("framework-output");
+          }
+          if (
+            sig.startsWith("play.api.routing.") ||
+            sig.startsWith("play.core.routing") ||
+            sig.startsWith("router.RoutesPrefix")
+          ) {
+            tags.add("framework-route");
+          }
+          if (
+            sig.startsWith("slick.sql.") ||
+            sig.startsWith("play.db.") ||
+            sig.startsWith("slick.jdbc.")
+          ) {
+            tags.add("database");
+          }
+        }
+      }
+    }
+    if (line.includes("source paths:")) {
+      sourcePathsMode = true;
+    }
+    if (sourcePathsMode) {
+      if (line.includes(" [") && line.endsWith("]")) {
+        sourceFile = line.split(" [").pop().replace(/]/g, "");
+        sourcePathsMode = false;
+      } else if (line.includes(".scala") && line.includes(": ")) {
+        sourceFile = line.split(": ").pop().trim();
+        sourcePathsMode = false;
+      }
+    }
+    if (!namesMode && !treesMode && !sourcePathsMode) {
+      continue;
+    }
+  }
+  if (sourceFile?.includes("target")) {
+    tags.add("generated");
+  }
+  return {
+    sourceFile,
+    tags: Array.from(tags).sort(),
+    usedTypes: Array.from(usedTypes).sort(),
+    literals: Array.from(literals)
+  };
+}
+
+function parseConfigFiles(configFiles) {
+  const configMetadata = { routes: [] };
+  for (const aconfig of configFiles) {
+    if (aconfig.endsWith("routes")) {
+      const routes = parseRoutes(aconfig);
+      if (routes?.length) {
+        for (const aroute of routes) {
+          let duplicate = false;
+          for (const exisRoute of configMetadata.routes) {
+            if (
+              exisRoute.method === aroute.method &&
+              exisRoute.pattern === aroute.pattern
+            ) {
+              if (
+                exisRoute.controllerMethod &&
+                exisRoute.controllerMethod === aroute.controllerMethod
+              ) {
+                duplicate = true;
+                continue;
+              }
+            }
+          }
+          if (!duplicate) {
+            configMetadata["routes"].push(aroute);
+          }
+        }
+      }
+    }
+  }
+  if (configMetadata.routes.length) {
+    console.log("Found", configMetadata.routes.length, "routes.");
+  }
+  return configMetadata;
+}
+
+function parseRoutes(routesFile) {
+  const routes = [];
+  const routesData = readFileSync(routesFile, "utf-8");
+  for (let aline of routesData.split("\n")) {
+    aline = aline.replace("\r", "").trim();
+    if (aline.startsWith("#") || aline.startsWith("+")) {
+      continue;
+    }
+    const tmpA = aline.split(/\s+/);
+    if (tmpA.length < 2) {
+      continue;
+    }
+    // Ignore static assets
+    if (["/webjars"].includes(tmpA[1])) {
+      continue;
+    }
+    if (
+      [
+        "GET",
+        "PATCH",
+        "POST",
+        "OPTIONS",
+        "HEAD",
+        "DELETE",
+        "PUT",
+        "->"
+      ].includes(tmpA[0].toUpperCase())
+    ) {
+      let controllerMethod = tmpA.length > 2 ? tmpA[2] : undefined;
+      if (controllerMethod.includes("(")) {
+        controllerMethod = controllerMethod.split("(")[0];
+      }
+      // Exclude webjars
+      if (controllerMethod.startsWith("webjars.")) {
+        continue;
+      }
+      // Handle wildcards
+      if (tmpA[0] === "->") {
+        // We now need to parse a method called "routes" in the controllerMethod to identify the list of http methods
+        // Let's keep things simple for now
+        for (const m of ["GET", "PATCH", "POST", "DELETE", "PUT"]) {
+          routes.push({
+            method: m,
+            pattern: tmpA[1],
+            controllerMethod
+          });
+        }
+      } else {
+        routes.push({
+          method: tmpA[0],
+          pattern: tmpA[1],
+          controllerMethod
+        });
+      }
+    }
+  }
+  return routes;
+}

package/utils.mjs

@@ -28,7 +28,7 @@ const IGNORE_DIRS = process.env.ASTGEN_IGNORE_DIRS
 
 const IGNORE_FILE_PATTERN = new RegExp(
   process.env.ASTGEN_IGNORE_FILE_PATTERN ||
-    "(conf|config|test|spec|min|three|\\.d)\\.(js|ts|jsx|tsx)$",
+    "(test|spec|min|three|\\.d)\\.(js|ts|jsx|tsx)$",
   "i"
 );
 
@@ -69,7 +69,12 @@ export const getAllFiles = (dir, extn, files, result, regex) => {
         // ignore
       }
     } else {
-      if (regex.test(fileWithDir)) {
+      if (
+        regex.test(fileWithDir) ||
+        (extn &&
+          !extn.includes(".") &&
+          fileWithDir.toLowerCase().endsWith(extn.toLowerCase()))
+      ) {
         result.push(fileWithDir);
       }
     }
@@ -112,3 +117,23 @@ export const detectRuby = (versionNeeded) => {
   }
   return true;
 };
+
+export const detectScala = () => {
+  let result = spawnSync(process.env.SCALA_CMD || "scala", ["--version"], {
+    encoding: "utf-8"
+  });
+  if (result.status !== 0 || result.error) {
+    return false;
+  }
+  return true;
+};
+
+export const detectScalac = () => {
+  let result = spawnSync(process.env.SCALAC_CMD || "scalac", ["--version"], {
+    encoding: "utf-8"
+  });
+  if (result.status !== 0 || result.error) {
+    return false;
+  }
+  return true;
+};