@trebired/code-discipline 1.4.0 → 1.4.1
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/CHANGELOG.md
CHANGED
|
@@ -2,6 +2,10 @@
|
|
|
2
2
|
|
|
3
3
|
All notable changes to `@trebired/code-discipline` will be documented here.
|
|
4
4
|
|
|
5
|
+
## 1.4.1
|
|
6
|
+
|
|
7
|
+
- Fixed relative import resolution for TypeScript ESM-style `.js` specifiers so imports like `./x.js` can resolve to source files such as `./x.ts` during sync checks and rewrites.
|
|
8
|
+
|
|
5
9
|
## 1.4.0
|
|
6
10
|
|
|
7
11
|
- Added `codeDiscipline({ mode, ... })` as the package-owned runtime dispatcher for `check`, `fix`, `sync`, and startup-style sync usage.
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import type { NormalizedSyncImportsOptions } from "./types.js";
|
|
2
2
|
declare function isRelativeImportSpecifier(specifier: string): boolean;
|
|
3
|
+
declare function buildFileCandidates(candidatePath: string, sourceExtensions: string[]): string[];
|
|
3
4
|
declare function resolveFileCandidate(candidatePath: string, sourceExtensions: string[]): Promise<string | null>;
|
|
4
5
|
declare function resolveProjectPathTarget(targetPath: string, sourceExtensions: string[]): Promise<string | null>;
|
|
5
6
|
declare function resolveRelativeImport(specifier: string, sourceFile: string, options: NormalizedSyncImportsOptions): Promise<string | null>;
|
|
6
|
-
export { isRelativeImportSpecifier, resolveFileCandidate, resolveProjectPathTarget, resolveRelativeImport };
|
|
7
|
+
export { buildFileCandidates, isRelativeImportSpecifier, resolveFileCandidate, resolveProjectPathTarget, resolveRelativeImport };
|
|
7
8
|
//# sourceMappingURL=resolve.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/imports/resolve.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"resolve.d.ts","sourceRoot":"","sources":["../../src/imports/resolve.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,4BAA4B,EAAE,MAAM,YAAY,CAAC;AAK/D,iBAAS,yBAAyB,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAE7D;AAQD,iBAAS,mBAAmB,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,GAAG,MAAM,EAAE,CAiBxF;AAED,iBAAe,oBAAoB,CAAC,aAAa,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAkB7G;AAED,iBAAe,wBAAwB,CAAC,UAAU,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAE9G;AAED,iBAAe,qBAAqB,CAClC,SAAS,EAAE,MAAM,EACjB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,4BAA4B,GACpC,OAAO,CAAC,MAAM,GAAG,IAAI,CAAC,CAUxB;AAED,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,qBAAqB,EAAE,CAAC"}
|
package/dist/imports/resolve.js
CHANGED
|
@@ -1,18 +1,32 @@
|
|
|
1
1
|
import fs from "node:fs/promises";
|
|
2
2
|
import path from "node:path";
|
|
3
3
|
import { isInsideDirectory } from "../shared/utils.js";
|
|
4
|
+
const RUNTIME_SPECIFIER_EXTENSIONS = new Set([".js", ".jsx", ".mjs", ".cjs"]);
|
|
4
5
|
function isRelativeImportSpecifier(specifier) {
|
|
5
6
|
return specifier.startsWith("./") || specifier.startsWith("../");
|
|
6
7
|
}
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
8
|
+
function pushUniqueCandidate(candidates, candidatePath) {
|
|
9
|
+
if (!candidates.includes(candidatePath)) {
|
|
10
|
+
candidates.push(candidatePath);
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
function buildFileCandidates(candidatePath, sourceExtensions) {
|
|
14
|
+
const candidates = [];
|
|
15
|
+
pushUniqueCandidate(candidates, candidatePath);
|
|
16
|
+
const specifierExtension = path.extname(candidatePath).toLowerCase();
|
|
17
|
+
if (RUNTIME_SPECIFIER_EXTENSIONS.has(specifierExtension)) {
|
|
18
|
+
const sourceStem = candidatePath.slice(0, -specifierExtension.length);
|
|
19
|
+
for (const extension of sourceExtensions) {
|
|
20
|
+
pushUniqueCandidate(candidates, `${sourceStem}${extension}`);
|
|
21
|
+
}
|
|
12
22
|
}
|
|
13
|
-
catch { }
|
|
14
23
|
for (const extension of sourceExtensions) {
|
|
15
|
-
|
|
24
|
+
pushUniqueCandidate(candidates, `${candidatePath}${extension}`);
|
|
25
|
+
}
|
|
26
|
+
return candidates;
|
|
27
|
+
}
|
|
28
|
+
async function resolveFileCandidate(candidatePath, sourceExtensions) {
|
|
29
|
+
for (const filePath of buildFileCandidates(candidatePath, sourceExtensions)) {
|
|
16
30
|
try {
|
|
17
31
|
const stat = await fs.stat(filePath);
|
|
18
32
|
if (stat.isFile())
|
|
@@ -45,5 +59,5 @@ async function resolveRelativeImport(specifier, sourceFile, options) {
|
|
|
45
59
|
return null;
|
|
46
60
|
return resolved;
|
|
47
61
|
}
|
|
48
|
-
export { isRelativeImportSpecifier, resolveFileCandidate, resolveProjectPathTarget, resolveRelativeImport };
|
|
62
|
+
export { buildFileCandidates, isRelativeImportSpecifier, resolveFileCandidate, resolveProjectPathTarget, resolveRelativeImport };
|
|
49
63
|
//# sourceMappingURL=resolve.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/imports/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,SAAS,yBAAyB,CAAC,SAAiB;IAClD,OAAO,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;AACnE,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"resolve.js","sourceRoot":"","sources":["../../src/imports/resolve.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAClC,OAAO,IAAI,MAAM,WAAW,CAAC;AAG7B,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,4BAA4B,GAAG,IAAI,GAAG,CAAC,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC;AAE9E,SAAS,yBAAyB,CAAC,SAAiB;IAClD,OAAO,SAAS,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;AACnE,CAAC;AAED,SAAS,mBAAmB,CAAC,UAAoB,EAAE,aAAqB;IACtE,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;QACxC,UAAU,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC;IACjC,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAAC,aAAqB,EAAE,gBAA0B;IAC5E,MAAM,UAAU,GAAa,EAAE,CAAC;IAChC,mBAAmB,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;IAE/C,MAAM,kBAAkB,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC,WAAW,EAAE,CAAC;IACrE,IAAI,4BAA4B,CAAC,GAAG,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACzD,MAAM,UAAU,GAAG,aAAa,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;QACtE,KAAK,MAAM,SAAS,IAAI,gBAAgB,EAAE,CAAC;YACzC,mBAAmB,CAAC,UAAU,EAAE,GAAG,UAAU,GAAG,SAAS,EAAE,CAAC,CAAC;QAC/D,CAAC;IACH,CAAC;IAED,KAAK,MAAM,SAAS,IAAI,gBAAgB,EAAE,CAAC;QACzC,mBAAmB,CAAC,UAAU,EAAE,GAAG,aAAa,GAAG,SAAS,EAAE,CAAC,CAAC;IAClE,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,KAAK,UAAU,oBAAoB,CAAC,aAAqB,EAAE,gBAA0B;IACnF,KAAK,MAAM,QAAQ,IAAI,mBAAmB,CAAC,aAAa,EAAE,gBAAgB,CAAC,EAAE,CAAC;QAC5E,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;YACrC,IAAI,IAAI,CAAC,MAAM,EAAE;gBAAE,OAAO,QAAQ,CAAC;QACrC,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACZ,CAAC;IAED,KAAK,MAAM,SAAS,IAAI,gBAAgB,EAAE,CAAC;QACzC,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,QAAQ,SAAS,EAAE,CAAC,CAAC;QAEhE,IAAI,CAAC;YACH,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YACtC,IAAI,IAAI,CAAC,MAAM,EAAE;gBAAE,OAAO,SAAS,CAAC;QACtC,CAAC;QAAC,MAAM,CAAC,CAAA,CAAC;IACZ,CAAC;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAED,KAAK,UAAU,wBAAwB,CAAC,UAAkB,EAAE,gBAA0B;IACpF,OAAO,oBAAoB,CAAC,UAAU,EAAE,gBAAgB,CAAC,CAAC;AAC5D,CAAC;AAED,KAAK,UAAU,qBAAqB,CAClC,SAAiB,EACjB,UAAkB,EAClB,OAAqC;IAErC,IAAI,CAAC,yBAAyB,CAAC,SAAS,CAAC;QAAE,OAAO,IAAI,CAAC;IAEvD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,SAAS,CAAC,CAAC;IACnE,MAAM,QAAQ,GAAG,MAAM,oBAAoB,CAAC,QAAQ,EAAE,OAAO,CAAC,gBAAgB,CAAC,CAAC;IAEhF,IAAI,CAAC,QAAQ;QAAE,OAAO,IAAI,CAAC;IAC3B,IAAI,CAAC,iBAAiB,CAAC,QAAQ,EAAE,OAAO,CAAC,UAAU,CAAC;QAAE,OAAO,IAAI,CAAC;IAElE,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,OAAO,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,oBAAoB,EAAE,wBAAwB,EAAE,qBAAqB,EAAE,CAAC"}
|
package/package.json
CHANGED