combine the shared Location and FileSystem implementations into a single module, for simplicity

Author: erik-krogh

javascript/ql/lib/semmle/javascript/internal/FileSystemImpl.qll

@@ -2,20 +2,36 @@
  * Provides an implementation of `LocationsSig` from the `codeql/utils` package.
  */
 
-private import FileSystemImpl::FileSystemImpl as FSImpl
-private import codeql.utils.FileSystem as FS
 private import codeql.utils.Locations as Locs
 
 /** An implementation of `LocationsSig`. */
-module LocationsImpl implements Locs::LocationsSig<FSImpl> {
+module LocationsImpl implements Locs::LocationsSig {
+  abstract class Container extends @container {
+    abstract string getAbsolutePath();
+
+    string toString() { result = this.getAbsolutePath() }
+
+    Container getParentContainer() { containerparent(result, this) }
+  }
+
+  class File extends @file, Container {
+    override string getAbsolutePath() { files(this, result) }
+  }
+
+  class Folder extends @folder, Container {
+    override string getAbsolutePath() { folders(this, result) }
+  }
+
+  string getSourceLocationPrefix() { sourceLocationPrefix(result) }
+
   class Location = @location;
 
   predicate locations(
-    Location loc, FSImpl::File file, int startLine, int startColum, int endLine, int endColumn
+    Location loc, File file, int startLine, int startColum, int endLine, int endColumn
   ) {
     locations_default(loc, file, startLine, startColum, endLine, endColumn)
   }
 }
 
 /** An instantiation of the shared Locations module. */
-module Inst = Locs::Make<FSImpl, LocationsImpl>;
+module Inst = Locs::Make<LocationsImpl>;

javascript/ql/lib/semmle/javascript/internal/LocationsImpl.qll

@@ -1 +1,7 @@
-import codeql.ruby.internal.FileSystemImpl::Inst
+private import codeql.ruby.internal.LocationsImpl
+
+class Container = Inst::Container;
+
+class File = Inst::File;
+
+class Folder = Inst::Folder;

ruby/ql/lib/codeql/files/FileSystem.qll

@@ -1,20 +1,37 @@
 /**
- * Provides an implementation of `FileSystemSig` from the `codeql/utils` package.
+ * Provides an implementation of `LocationsSig` from the `codeql/utils` package.
  */
 
 private import codeql.utils.Locations as Locs
-private import FileSystemImpl::FileSystemImpl as FSImpl
 
-/** An implementation of `FileSystemSig`. */
-module LocationsImpl implements Locs::LocationsSig<FSImpl> {
+/** An implementation of `LocationsSig`. */
+module LocationsImpl implements Locs::LocationsSig {
+  abstract class Container extends @container {
+    abstract string getAbsolutePath();
+
+    Container getParentContainer() { containerparent(result, this) }
+
+    string toString() { result = this.getAbsolutePath() }
+  }
+
+  class File extends @file, Container {
+    override string getAbsolutePath() { files(this, result) }
+  }
+
+  class Folder extends Container, @folder {
+    override string getAbsolutePath() { folders(this, result) }
+  }
+
+  string getSourceLocationPrefix() { sourceLocationPrefix(result) }
+
   class Location = @location_default;
 
   predicate locations(
-    Location loc, FSImpl::File file, int startLine, int startColum, int endLine, int endColumn
+    Location loc, File file, int startLine, int startColum, int endLine, int endColumn
   ) {
     locations_default(loc, file, startLine, startColum, endLine, endColumn)
   }
 }
 
 /** An instantiation of the shared Locations module. */
-module Inst = Locs::Make<FSImpl, LocationsImpl>;
+module Inst = Locs::Make<LocationsImpl>;