@christiango/unbarrel 0.12.5 → 0.12.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/getExportDefinitionFromReExport.d.ts.map +1 -1
- package/lib/getExportDefinitionFromReExport.js +21 -15
- package/lib/getExportDefinitionFromReExport.js.map +1 -1
- package/lib/getIssuesInBarrelFile.d.ts.map +1 -1
- package/lib/getIssuesInBarrelFile.js +13 -1
- package/lib/getIssuesInBarrelFile.js.map +1 -1
- package/package.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getExportDefinitionFromReExport.d.ts","sourceRoot":"","sources":["../src/getExportDefinitionFromReExport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAwB1G,4FAA4F;AAC5F,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,0BAA0B,CAAC;IACjC,kGAAkG;IAClG,UAAU,EAAE,MAAM,CAAC;IACnB,uFAAuF;IACvF,YAAY,EAAE,MAAM,CAAC;IACrB,8IAA8I;IAC9I,YAAY,EAAE,MAAM,CAAC;IACrB,sDAAsD;IACtD,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,oBAAoB,EAAE,MAAM,EAC5B,iBAAiB,EAAE,mBAAmB,GAAG,qBAAqB,GAC7D,wBAAwB,
|
|
1
|
+
{"version":3,"file":"getExportDefinitionFromReExport.d.ts","sourceRoot":"","sources":["../src/getExportDefinitionFromReExport.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwB,qBAAqB,EAAE,mBAAmB,EAAE,MAAM,wBAAwB,CAAC;AAwB1G,4FAA4F;AAC5F,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,0BAA0B,CAAC;IACjC,kGAAkG;IAClG,UAAU,EAAE,MAAM,CAAC;IACnB,uFAAuF;IACvF,YAAY,EAAE,MAAM,CAAC;IACrB,8IAA8I;IAC9I,YAAY,EAAE,MAAM,CAAC;IACrB,sDAAsD;IACtD,QAAQ,EAAE,OAAO,CAAC;CACnB;AAED;;;;GAIG;AACH,wBAAgB,+BAA+B,CAC7C,oBAAoB,EAAE,MAAM,EAC5B,iBAAiB,EAAE,mBAAmB,GAAG,qBAAqB,GAC7D,wBAAwB,CA8I1B"}
|
|
@@ -120,21 +120,27 @@ function getExportDefinitionFromReExport(absolutePathOfModule, reExportToResolve
|
|
|
120
120
|
}
|
|
121
121
|
}
|
|
122
122
|
else if (reExport.type === 'exportAll') {
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
123
|
+
try {
|
|
124
|
+
const matchingDefinition = getExportDefinitionFromReExport(importAbsolutePath, {
|
|
125
|
+
...reExportToResolve,
|
|
126
|
+
importPath: reExport.importPath,
|
|
127
|
+
});
|
|
128
|
+
// If the resolved import path is external, keep it as-is (don't join with local path)
|
|
129
|
+
const resolvedImportPath = !(0, importUtils_1.isInternalModule)(matchingDefinition.importPath)
|
|
130
|
+
? matchingDefinition.importPath
|
|
131
|
+
: (0, importUtils_1.convertToESMImportPath)(node_path_1.default.join(getBasePathForJoin(reExportToResolve.importPath, importAbsolutePath), matchingDefinition.importPath));
|
|
132
|
+
// Fix up the import path to be relative to the original module and handle any renames
|
|
133
|
+
return {
|
|
134
|
+
...matchingDefinition,
|
|
135
|
+
importPath: resolvedImportPath,
|
|
136
|
+
exportedName: reExportToResolve.exportedName,
|
|
137
|
+
typeOnly: matchingDefinition.typeOnly,
|
|
138
|
+
};
|
|
139
|
+
}
|
|
140
|
+
catch {
|
|
141
|
+
// If the named export is not found through this export * path,
|
|
142
|
+
// continue to the next re-export instead of throwing an error
|
|
143
|
+
}
|
|
138
144
|
}
|
|
139
145
|
}
|
|
140
146
|
throw new Error(`Could not resolve re-export ${reExportToResolve.exportedName} from ${absolutePathOfModule}`);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getExportDefinitionFromReExport.js","sourceRoot":"","sources":["../src/getExportDefinitionFromReExport.ts"],"names":[],"mappings":";;;;;AA0CA,
|
|
1
|
+
{"version":3,"file":"getExportDefinitionFromReExport.js","sourceRoot":"","sources":["../src/getExportDefinitionFromReExport.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getIssuesInBarrelFile.d.ts","sourceRoot":"","sources":["../src/getIssuesInBarrelFile.ts"],"names":[],"mappings":"AAKA,mFAAmF;AACnF,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,qBAAqB,CAAC;IAE5B,6DAA6D;IAC7D,YAAY,EAAE,MAAM,CAAC;IAErB,gEAAgE;IAChE,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,WAAW,CAAC;IAClB,6DAA6D;IAC7D,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,MAAM,eAAe,GAAG,wBAAwB,GAAG,cAAc,CAAC;AAExE;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,gBAAgB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,
|
|
1
|
+
{"version":3,"file":"getIssuesInBarrelFile.d.ts","sourceRoot":"","sources":["../src/getIssuesInBarrelFile.ts"],"names":[],"mappings":"AAKA,mFAAmF;AACnF,MAAM,WAAW,wBAAwB;IACvC,IAAI,EAAE,qBAAqB,CAAC;IAE5B,6DAA6D;IAC7D,YAAY,EAAE,MAAM,CAAC;IAErB,gEAAgE;IAChE,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,WAAW,CAAC;IAClB,6DAA6D;IAC7D,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,MAAM,eAAe,GAAG,wBAAwB,GAAG,cAAc,CAAC;AAExE;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CAAC,gBAAgB,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAoCjH;AAED;;;;GAIG;AACH,wBAAgB,qBAAqB,CAAC,gBAAgB,EAAE,MAAM,GAAG,eAAe,EAAE,CAgCjF"}
|
|
@@ -27,7 +27,19 @@ function isBarrelFileReference(absoluteFilePath, importPath, importedName) {
|
|
|
27
27
|
}
|
|
28
28
|
// Check if it's a re-export from an internal module (barrel file reference)
|
|
29
29
|
const matchingReExport = targetExports.reExports.find((reExport) => reExport.type === 'namedExport' && reExport.exportedName === importedName);
|
|
30
|
-
|
|
30
|
+
if (matchingReExport !== undefined && (0, importUtils_1.isInternalModule)(matchingReExport.importPath)) {
|
|
31
|
+
return true;
|
|
32
|
+
}
|
|
33
|
+
// Check if the target is a barrel file with export * statements
|
|
34
|
+
// If it has export * from internal modules and the export is not defined/explicitly re-exported in the target,
|
|
35
|
+
// then the target is acting as a barrel file forwarder
|
|
36
|
+
const hasExportAllFromInternal = targetExports.reExports.some((reExport) => reExport.type === 'exportAll' && (0, importUtils_1.isInternalModule)(reExport.importPath));
|
|
37
|
+
if (hasExportAllFromInternal) {
|
|
38
|
+
// The target module is a barrel file (has export *), and the export is not directly defined or explicitly
|
|
39
|
+
// re-exported there, so it's being implicitly forwarded - this is a barrel file reference
|
|
40
|
+
return true;
|
|
41
|
+
}
|
|
42
|
+
return false;
|
|
31
43
|
}
|
|
32
44
|
/**
|
|
33
45
|
* Analyzes the exports of the provided file and returns any references to barrel files within the current package. External packages are not included.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"getIssuesInBarrelFile.js","sourceRoot":"","sources":["../src/getIssuesInBarrelFile.ts"],"names":[],"mappings":";;;;;AAgCA,
|
|
1
|
+
{"version":3,"file":"getIssuesInBarrelFile.js","sourceRoot":"","sources":["../src/getIssuesInBarrelFile.ts"],"names":[],"mappings":"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"}
|