ayo/lion
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(providence): allow to resolve outside node_modules as well

Browse source
This commit is contained in:
Thijs Louisse 2023-11-29 12:34:50 +01:00 committed by Thijs Louisse
parent 292dcfc855
commit 244bdf7f53
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
packages-node/providence-analytics/src/program/analyzers/helpers/from-import-to-export-perspective.js
View file

@ -1,3 +1,4 @@
import path from 'path';
import { isRelativeSourcePath } from '../../utils/relative-source-path.js'; import { isRelativeSourcePath } from '../../utils/relative-source-path.js';
import { LogService } from '../../core/LogService.js'; import { LogService } from '../../core/LogService.js';
import { resolveImportPath } from '../../utils/resolve-import-path.js'; import { resolveImportPath } from '../../utils/resolve-import-path.js';
@ -35,7 +36,10 @@ export async function fromImportToExportPerspective({ importee, importer, import
return null; return null;
} }
const absolutePath = await resolveImportPath(importee, importer); const absolutePath = await resolveImportPath(importee, importer, {
modulePaths: [path.resolve(importeeProjectPath, '..')],
});
if (!absolutePath) { if (!absolutePath) {
return null; return null;
} }

6
packages-node/providence-analytics/src/program/utils/resolve-import-path.js
View file

@ -36,10 +36,10 @@ const fakePluginContext = {
* name without an extension. * name without an extension.
* @param {SpecifierSource} importee source like '@lion/core' or '../helpers/index.js' * @param {SpecifierSource} importee source like '@lion/core' or '../helpers/index.js'
* @param {PathFromSystemRoot} importer importing file, like '/my/project/importing-file.js' * @param {PathFromSystemRoot} importer importing file, like '/my/project/importing-file.js'
* @param {{customResolveOptions?: {preserveSymlinks:boolean}}} [opts] nodeResolve options * @param {{customResolveOptions?: {preserveSymlinks:boolean}; modulePaths?: string[]}} [opts] nodeResolve options
* @returns {Promise<PathFromSystemRoot|null|'[node-builtin]'>} the resolved file system path, like '/my/project/node_modules/@lion/core/index.js' * @returns {Promise<PathFromSystemRoot|null|'[node-builtin]'>} the resolved file system path, like '/my/project/node_modules/@lion/core/index.js'
*/ */
async function resolveImportPathFn(importee, importer, opts) { async function resolveImportPathFn(importee, importer, opts = {}) {
if (isBuiltin(importee)) { if (isBuiltin(importee)) {
return '[node-builtin]'; return '[node-builtin]';
} }
@ -49,7 +49,7 @@ async function resolveImportPathFn(importee, importer, opts) {
// allow resolving polyfills for nodejs libs // allow resolving polyfills for nodejs libs
preferBuiltins: false, preferBuiltins: false,
// extensions: ['.mjs', '.js', '.json', '.node'], // extensions: ['.mjs', '.js', '.json', '.node'],
...(opts || {}), ...opts,
}); });
const preserveSymlinks = const preserveSymlinks =