fluencelabs/aqua-vscode
1
0
Fork 0
mirror of https://github.com/fluencelabs/aqua-vscode synced 2025-05-28 15:41:20 +00:00
Code Issues Projects Releases Wiki Activity

resolve relative paths for imports (#20)

Browse Source
This commit is contained in:
Dima 2022-08-25 16:30:22 +04:00 committed by GitHub
parent ae72f62dbe
commit 7c7e80bd75
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
server/src/validation.ts
View File

@ -50,12 +50,14 @@ export async function compileAqua(
let imports: string[] = []; let imports: string[] = [];
let nodeModulesPaths = folders.map((f) => findNearestNodeModules(textDocument.uri, f.uri)).filter(notEmpty); const nodeModulesPaths = folders.map((f) => findNearestNodeModules(textDocument.uri, f.uri)).filter(notEmpty);
imports = imports.concat(nodeModulesPaths); imports = imports.concat(nodeModulesPaths);
const openFolders = folders.map((f) => f.uri.replace('file://', ''));
// add all workspace folders to imports // add all workspace folders to imports
imports = imports.concat(folders.map((f) => f.uri.replace('file://', ''))); imports = imports.concat(openFolders);
imports = imports.concat(folders.map((f) => f.uri.replace('file://', '')) + '/node_modules'); imports = imports.concat(openFolders.map((f) => Path.join(f, '/node_modules')));
if (settings.imports && Array.isArray(settings.imports)) { if (settings.imports && Array.isArray(settings.imports)) {
const validatedImports: string[] = settings.imports.filter((s) => { const validatedImports: string[] = settings.imports.filter((s) => {
@ -71,8 +73,18 @@ export async function compileAqua(
} }
}); });
imports = imports.concat(validatedImports.map((s) => s.replace('file://', ''))); const absoluteImports = validatedImports.filter((s) => Path.isAbsolute(s));
imports = imports.concat(validatedImports.map((s) => s.replace('file://', '')) + '/node_modules');
// relative imports must be started from open folders
const relativeImports = validatedImports
.filter((s) => !absoluteImports.includes(s))
.map((s) => openFolders.map((f) => Path.join(f, s)))
.flat();
imports = imports.concat(relativeImports);
imports = imports.concat(relativeImports.map((s) => Path.join(s, '/node_modules')));
imports = imports.concat(absoluteImports);
imports = imports.concat(absoluteImports.map((s) => Path.join(s, '/node_modules')));
} }
if (require.main) { if (require.main) {