hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2026-04-25 00:35:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

JS: Make return type class for installDependencies()

Browse Source
This commit is contained in:
Asger Feldthaus
2020-01-16 15:04:57 +00:00
parent 71b540755d
commit 21eecc4c9c
3 changed files with 78 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
javascript/extractor/src/com/semmle/js/extractor/AutoBuild.java
View File

@@ -1,5 +1,37 @@
package com.semmle.js.extractor;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.Writer;
import java.lang.ProcessBuilder.Redirect;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
import java.nio.file.FileVisitResult;
import java.nio.file.FileVisitor;
import java.nio.file.Files;
import java.nio.file.InvalidPathException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.SimpleFileVisitor;
import java.nio.file.StandardCopyOption;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
import java.util.stream.Stream;
import com.google.gson.Gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonObject;
@@ -28,38 +60,6 @@ import com.semmle.util.language.LegacyLanguage;
import com.semmle.util.process.Env;
import com.semmle.util.projectstructure.ProjectLayout;
import com.semmle.util.trap.TrapWriter;
import java.io.BufferedReader;
import java.io.File;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
import java.io.Writer;
import java.lang.ProcessBuilder.Redirect;
import java.net.URI;
import java.net.URISyntaxException;
import java.nio.charset.StandardCharsets;
import java.nio.file.FileVisitResult;
import java.nio.file.FileVisitor;
import java.nio.file.Files;
import java.nio.file.InvalidPathException;
import java.nio.file.Path;
import java.nio.file.Paths;
import java.nio.file.SimpleFileVisitor;
import java.nio.file.StandardCopyOption;
import java.nio.file.attribute.BasicFileAttributes;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.regex.Pattern;
import java.util.stream.Stream;
/**
* An alternative entry point to the JavaScript extractor.
@@ -557,9 +557,9 @@ public class AutoBuild {
List<Path> tsconfigFiles = new ArrayList<>();
findFilesToExtract(defaultExtractor, filesToExtract, tsconfigFiles);
Map<Path, Path> originalFiles = Collections.emptyMap();
DependencyInstallationResult dependencyInstallationResult = DependencyInstallationResult.empty;
if (!tsconfigFiles.isEmpty() && this.installDependencies) {
originalFiles = this.installDependencies(filesToExtract);
dependencyInstallationResult = this.installDependencies(filesToExtract);
}
// extract TypeScript projects and files
@@ -567,7 +567,7 @@ public class AutoBuild {
try {
extractedFiles = extractTypeScript(defaultExtractor, filesToExtract, tsconfigFiles);
} finally {
restoreOriginalFiles(originalFiles);
restoreOriginalFiles(dependencyInstallationResult.getOriginalFiles());
}
// extract remaining files
@@ -618,9 +618,9 @@ public class AutoBuild {
private static final Pattern validPackageName = Pattern.compile("(@[\\w.-]+/)?\\w[\\w.-]*");
protected Map<Path, Path> installDependencies(Set<Path> filesToExtract) {
protected DependencyInstallationResult installDependencies(Set<Path> filesToExtract) {
if (!verifyYarnInstallation()) {
return Collections.emptyMap();
return DependencyInstallationResult.empty;
}
Path rootNodeModules = Paths.get("node_modules");
@@ -741,7 +741,7 @@ public class AutoBuild {
}
}
return originalFiles;
return new DependencyInstallationResult(originalFiles);
}
private ExtractorConfig mkExtractorConfig() {

26
javascript/extractor/src/com/semmle/js/extractor/DependencyInstallationResult.java Normal file
View File

@@ -0,0 +1,26 @@
package com.semmle.js.extractor;
import java.nio.file.Path;
import java.util.Collections;
import java.util.Map;
/**
* Contains the results of installing dependencies.
*/
public class DependencyInstallationResult {
private Map<Path, Path> originalFiles;
public static final DependencyInstallationResult empty = new DependencyInstallationResult(Collections.emptyMap());
public DependencyInstallationResult(Map<Path, Path> originalFiles) {
this.originalFiles = originalFiles;
}
/**
* Returns the mapping from files left behind by dependency installation to
* the backups of those files, to be restored after extraction.
*/
public Map<Path, Path> getOriginalFiles() {
return originalFiles;
}
}

26
javascript/extractor/src/com/semmle/js/extractor/test/AutoBuildTests.java
View File

@@ -1,14 +1,5 @@
package com.semmle.js.extractor.test;
import com.semmle.js.extractor.AutoBuild;
import com.semmle.js.extractor.ExtractorState;
import com.semmle.js.extractor.FileExtractor;
import com.semmle.js.extractor.FileExtractor.FileType;
import com.semmle.util.data.StringUtil;
import com.semmle.util.exception.UserError;
import com.semmle.util.files.FileUtil;
import com.semmle.util.files.FileUtil8;
import com.semmle.util.process.Env;
import java.io.File;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
@@ -20,18 +11,29 @@ import java.nio.file.SimpleFileVisitor;
import java.nio.file.attribute.BasicFileAttributes;
import java.nio.file.attribute.DosFileAttributeView;
import java.util.ArrayList;
import java.util.Collections;
import java.util.LinkedHashMap;
import java.util.LinkedHashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
import org.junit.After;
import org.junit.Assert;
import org.junit.Assume;
import org.junit.Before;
import org.junit.Test;
import com.semmle.js.extractor.AutoBuild;
import com.semmle.js.extractor.DependencyInstallationResult;
import com.semmle.js.extractor.ExtractorState;
import com.semmle.js.extractor.FileExtractor;
import com.semmle.js.extractor.FileExtractor.FileType;
import com.semmle.util.data.StringUtil;
import com.semmle.util.exception.UserError;
import com.semmle.util.files.FileUtil;
import com.semmle.util.files.FileUtil8;
import com.semmle.util.process.Env;
public class AutoBuildTests {
private Path SEMMLE_DIST, LGTM_SRC;
private Set<String> expected;
@@ -135,9 +137,9 @@ public class AutoBuildTests {
}
@Override
protected Map<Path, Path> installDependencies(Set<Path> filesToExtract) {
protected DependencyInstallationResult installDependencies(Set<Path> filesToExtract) {
// never install dependencies during testing
return Collections.emptyMap();
return DependencyInstallationResult.empty;
}
@Override