Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
47 changes: 40 additions & 7 deletions src/resolve-dependency.ts
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,42 @@ function getExportsTarget(
return undefined;
}

function patternKeyCompare(a: string, b: string): number {
const aPatternIndex = a.indexOf('*');
const bPatternIndex = b.indexOf('*');

const aBaseLength = aPatternIndex === -1 ? a.length : aPatternIndex + 1;
const bBaseLength = bPatternIndex === -1 ? b.length : bPatternIndex + 1;

if (aBaseLength > bBaseLength) return -1;
if (bBaseLength > aBaseLength) return 1;
if (aPatternIndex === -1) return 1;
if (bPatternIndex === -1) return -1;
if (a.length > b.length) return -1;
if (b.length > a.length) return 1;
return 0;
}

function getPatternMatch(pattern: string, subpath: string): string | undefined {
const patternIndex = pattern.indexOf('*');
if (patternIndex === -1 || pattern.lastIndexOf('*') !== patternIndex) {
return undefined;
}

const patternBase = pattern.slice(0, patternIndex);
if (!subpath.startsWith(patternBase)) return undefined;

const patternTrailer = pattern.slice(patternIndex + 1);
if (
subpath.length < pattern.length ||
(patternTrailer && !subpath.endsWith(patternTrailer))
) {
return undefined;
}

return subpath.slice(patternIndex, subpath.length - patternTrailer.length);
}

function addExportsTargetPath(
paths: string[],
pkgPath: string,
Expand Down Expand Up @@ -308,10 +344,9 @@ async function resolveExportsImports(
return Array.isArray(resolved) ? resolved : [resolved];
}
}
for (const match of Object.keys(matchObj).sort(
(a, b) => b.length - a.length,
)) {
if (match.endsWith('*') && subpath.startsWith(match.slice(0, -1))) {
for (const match of Object.keys(matchObj).sort(patternKeyCompare)) {
const wildcardReplacement = getPatternMatch(match, subpath);
if (wildcardReplacement !== undefined) {
const target = getExportsTarget(
matchObj[match],
job.conditions,
Expand All @@ -320,10 +355,8 @@ async function resolveExportsImports(
);
if (typeof target === 'string' && target.startsWith('./')) {
const resolvedPath =
pkgPath +
target.slice(1).replace(/\*/g, subpath.slice(match.length - 1));
pkgPath + target.slice(1).replace(/\*/g, wildcardReplacement);
const paths = [resolvedPath];
const wildcardReplacement = subpath.slice(match.length - 1);

const exportsForSubpath = matchObj[match];
if (
Expand Down
1 change: 1 addition & 0 deletions test/unit/imports-wildcard/dist/internal/marker.js
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
export const marker = 'resolved';
2 changes: 2 additions & 0 deletions test/unit/imports-wildcard/input.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import { marker } from '#internal/marker.js';
console.log(marker);
5 changes: 5 additions & 0 deletions test/unit/imports-wildcard/output.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
[
"test/unit/imports-wildcard/dist/internal/marker.js",
"test/unit/imports-wildcard/input.js",
"test/unit/imports-wildcard/package.json"
]
7 changes: 7 additions & 0 deletions test/unit/imports-wildcard/package.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"name": "imports-wildcard",
"type": "module",
"imports": {
"#*.js": "./dist/*.js"
}
}
Loading