Skip to content

refactor: Reuse indexAction in snapshotAction #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 8, 2023
Merged

refactor: Reuse indexAction in snapshotAction #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/pyright-scip/src/MainCommand.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export interface IndexOptions {
output: string;
cwd: string;
targetOnly?: string;
infer?: { projectVersionFromCommit: boolean };

// Progress reporting configuration
quiet: boolean;
Expand Down
66 changes: 23 additions & 43 deletions packages/pyright-scip/src/main-impl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ function indexAction(options: IndexOptions): void {
...options,
projectRoot,
environment,
infer: { projectVersionFromCommit: true },
infer: options.infer ?? { projectVersionFromCommit: true },
writeIndex: (partialIndex: scip.Index): void => {
fs.writeSync(output, partialIndex.serializeBinary());
},
Expand All @@ -54,55 +54,37 @@ function indexAction(options: IndexOptions): void {
}

function snapshotAction(snapshotRoot: string, options: SnapshotOptions): void {
setQuiet(options.quiet);
if (options.showProgressRateLimit !== undefined) {
setShowProgressRateLimit(options.showProgressRateLimit);
}

console.log('... Snapshotting ... ');
const environment = options.environment ? path.resolve(options.environment) : undefined;

const snapshotOnly = options.only;

const subdir: string = options.only;
const inputDirectory = path.resolve(join(snapshotRoot, 'input'));
const outputDirectory = path.resolve(join(snapshotRoot, 'output'));

// Either read all the directories or just the one passed in by name
let snapshotDirectories = fs.readdirSync(inputDirectory);
if (snapshotOnly) {
snapshotDirectories = [snapshotOnly];
if (subdir) {
console.assert(snapshotDirectories.find((val) => val === subdir) !== undefined);
snapshotDirectories = [subdir];
}

for (const snapshotDir of snapshotDirectories) {
let projectRoot = join(inputDirectory, snapshotDir);
if (!fs.lstatSync(projectRoot).isDirectory()) {
continue;
}

projectRoot = path.resolve(projectRoot);
const originalWorkdir = process.cwd();
process.chdir(projectRoot);

const scipBinaryFile = path.join(projectRoot, options.output);
const output = fs.openSync(scipBinaryFile, 'w');

if (options.index) {
let indexer = new Indexer({
...options,
projectRoot,
environment,
infer: { projectVersionFromCommit: false },
writeIndex: (partialIndex: any): void => {
fs.writeSync(output, partialIndex.serializeBinary());
},
});
indexer.index();
fs.close(output);
}

const contents = fs.readFileSync(scipBinaryFile);
const scipIndex = scip.Index.deserializeBinary(contents);
console.assert(fs.lstatSync(projectRoot).isDirectory());
console.log(`Output path = ${options.output}`);

indexAction({
projectName: options.projectName,
projectVersion: options.projectVersion,
projectNamespace: options.projectNamespace,
environment: options.environment ? path.resolve(options.environment) : undefined,
dev: options.dev,
output: options.output,
cwd: projectRoot,
targetOnly: options.targetOnly,
infer: { projectVersionFromCommit: false },
quiet: options.quiet,
showProgressRateLimit: undefined,
});

const scipIndexPath = path.join(projectRoot, options.output);
const scipIndex = scip.Index.deserializeBinary(fs.readFileSync(scipIndexPath));
for (const doc of scipIndex.documents) {
if (doc.relative_path.startsWith('..')) {
continue;
Expand All @@ -120,8 +102,6 @@ function snapshotAction(snapshotRoot: string, options: SnapshotOptions): void {
writeSnapshot(outputPath, obtained);
}
}

process.chdir(originalWorkdir);
}
}

Expand Down
2 changes: 1 addition & 1 deletion packages/pyright-scip/test/test-main.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ function testMain(mode: 'check' | 'update'): void {
projectVersion,
'--only',
subdirName,
];
]; // FIXME: This should pass with a --dev flag
if (mode === 'check') {
argv.push('--check');
}
Expand Down