@shivaedev/quality 0.53.1 → 0.54.0
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 +22 -0
- package/README.md +8 -5
- package/dist/adapters/knip/entryPointFindings.d.ts.map +1 -1
- package/dist/adapters/knip/entryPointFindings.js +14 -8
- package/dist/adapters/knip/entryPointFindings.js.map +1 -1
- package/dist/biome/recognizeDiagnostics.d.ts.map +1 -1
- package/dist/biome/recognizeDiagnostics.js +4 -5
- package/dist/biome/recognizeDiagnostics.js.map +1 -1
- package/dist/cli/changedRanges.d.ts +2 -0
- package/dist/cli/changedRanges.d.ts.map +1 -0
- package/dist/cli/changedRanges.js +23 -0
- package/dist/cli/changedRanges.js.map +1 -0
- package/dist/cli/fix.d.ts.map +1 -1
- package/dist/cli/fix.js +12 -12
- package/dist/cli/fix.js.map +1 -1
- package/dist/imports/adminBindings.d.ts +8 -0
- package/dist/imports/adminBindings.d.ts.map +1 -0
- package/dist/imports/adminBindings.js +36 -0
- package/dist/imports/adminBindings.js.map +1 -0
- package/dist/imports/adminEvidence.d.ts +6 -0
- package/dist/imports/adminEvidence.d.ts.map +1 -0
- package/dist/imports/adminEvidence.js +46 -0
- package/dist/imports/adminEvidence.js.map +1 -0
- package/dist/imports/adminFindings.d.ts +4 -0
- package/dist/imports/adminFindings.d.ts.map +1 -0
- package/dist/imports/adminFindings.js +55 -0
- package/dist/imports/adminFindings.js.map +1 -0
- package/dist/imports/nodePlatformBarrels.d.ts +3 -0
- package/dist/imports/nodePlatformBarrels.d.ts.map +1 -0
- package/dist/imports/nodePlatformBarrels.js +46 -0
- package/dist/imports/nodePlatformBarrels.js.map +1 -0
- package/dist/naming/ownExports.d.ts +1 -0
- package/dist/naming/ownExports.d.ts.map +1 -1
- package/dist/naming/ownExports.js +4 -1
- package/dist/naming/ownExports.js.map +1 -1
- package/dist/rules/builtIn.d.ts +1 -1
- package/dist/rules/builtIn.d.ts.map +1 -1
- package/dist/rules/builtIn.js +2 -0
- package/dist/rules/builtIn.js.map +1 -1
- package/dist/rules/files/namedAfterExport.d.ts.map +1 -1
- package/dist/rules/files/namedAfterExport.js +6 -2
- package/dist/rules/files/namedAfterExport.js.map +1 -1
- package/dist/rules/imports/adminPaths.d.ts +2 -0
- package/dist/rules/imports/adminPaths.d.ts.map +1 -0
- package/dist/rules/imports/adminPaths.js +11 -0
- package/dist/rules/imports/adminPaths.js.map +1 -0
- package/dist/rules/imports/runtime.d.ts.map +1 -1
- package/dist/rules/imports/runtime.js +3 -2
- package/dist/rules/imports/runtime.js.map +1 -1
- package/dist/rules/stories/httpStatus.d.ts.map +1 -1
- package/dist/rules/stories/httpStatus.js +11 -2
- package/dist/rules/stories/httpStatus.js.map +1 -1
- package/package.json +3 -3
- package/src/adapters/knip/entryPointFindings.ts +15 -8
- package/src/biome/recognizeDiagnostics.ts +6 -7
- package/src/cli/changedRanges.ts +24 -0
- package/src/cli/fix.ts +13 -14
- package/src/imports/adminBindings.ts +45 -0
- package/src/imports/adminEvidence.ts +52 -0
- package/src/imports/adminFindings.ts +65 -0
- package/src/imports/nodePlatformBarrels.ts +51 -0
- package/src/naming/ownExports.ts +5 -1
- package/src/rules/builtIn.ts +2 -0
- package/src/rules/files/namedAfterExport.ts +6 -2
- package/src/rules/imports/adminPaths.ts +12 -0
- package/src/rules/imports/runtime.ts +3 -2
- package/src/rules/stories/httpStatus.ts +13 -2
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,27 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.54.0 - 2026-11-01
|
|
4
|
+
|
|
5
|
+
### Added
|
|
6
|
+
|
|
7
|
+
- Enforce `imports/admin-paths`: report admin-only source files outside an `admin/` path and admin files reached by member code, naming the destination folder. Follow production imports within each source tree while allowing registration composition and shared member dependencies.
|
|
8
|
+
|
|
9
|
+
### Fixed
|
|
10
|
+
|
|
11
|
+
- Count an entry point's dependency as used when an application's live source imports that piece through it, while keeping unused pieces and abandoned-file imports visible.
|
|
12
|
+
- Quality reports HTTP error branches written with `HttpStatus.fromLiteral` outside configured HTTP edges, including comparisons, switch cases and status-list membership.
|
|
13
|
+
- GitHub App requests and artifact storage downloads use the shared HTTP status filter while retaining their GitHub error tags and reasons.
|
|
14
|
+
- Server OTLP exports use the shared HTTP status filter to reset warning suppression after success and report redacted collector failures.
|
|
15
|
+
- Report production imports of the `@effect/platform-node` barrel with module subpaths that avoid loading optional integrations such as redis.
|
|
16
|
+
- Recognize native Effect `catchTags` record keys regardless of the handler body while retaining diagnostics for actual nested component and hook factories.
|
|
17
|
+
- Keep a constant's matching filename valid when the constant becomes private.
|
|
18
|
+
- Name each conflicting fix and format pass's file and line/column range when `quality fix` cannot settle.
|
|
19
|
+
- Use Node platform module subpaths in package runtimes and commands instead of loading the barrel.
|
|
20
|
+
|
|
21
|
+
### Breaking
|
|
22
|
+
|
|
23
|
+
- Generated apps keep shared declarations outside the admin-only tree. Migrate custom `ReadStatistics` imports from `#admin/ReadStatistics.ts` to `#ReadStatistics.ts`, and custom `AdminNavigation` type imports from `#client/admin/Shell.tsx` to `#client/AdminNavigation.ts`.
|
|
24
|
+
|
|
3
25
|
## 0.53.1 - 2026-11-01
|
|
4
26
|
|
|
5
27
|
### Fixed
|
package/README.md
CHANGED
|
@@ -141,6 +141,8 @@ These contexts work at any repository path without configuration; TypeScript and
|
|
|
141
141
|
|
|
142
142
|
### 2. When architecture needs it: describe an import boundary
|
|
143
143
|
|
|
144
|
+
`imports/admin-paths` follows production imports within each `src/` tree. Files reached only from admin paths, `adminPage`, `registerAdmin`, an exported `adminRegistration`, or a guard using an imported admin permission belong under an `admin/` segment. Member code reaching an admin file is reported too; each finding names the folder to move it to. A member module may compose its admin `registration`, `pages` and `make` files from a `registration` or `modules` file, and both sides may use member persistence. Whole admin modules can live in `src/modules/admin/<name>/`; member features keep admin declarations, server work and client work in their own `admin/` subfolders. Type-only imports also determine ownership; test consumers are excluded. This checks literal import reachability and direct named framework calls, not runtime authorization or computed loaders.
|
|
145
|
+
|
|
144
146
|
An app says where its code runs through folder names. A package adopts the runtime convention by having `src/client/` or `src/server/`; no config entry is needed. In that package, `src/client/` is browser code, `src/server/` is server code, and everything else is shared except package-root tooling. Keep shared code wherever its topic belongs; there is no required `src/shared/` folder or runtime file suffix.
|
|
145
147
|
|
|
146
148
|
`imports/runtime` rejects client imports of server code or Node built-ins. Shared code may import neither client nor server code, use browser globals such as `window`, `document` or `localStorage`, or import Node built-ins. Both client and server code may import shared code. The check includes type imports and re-exports and resolves aliases through the shared import graph. Locally bound names and property names are not browser globals; portable web APIs such as `URL`, `fetch` and `AbortController` remain available to shared code. Test files and `test-support/` ship nowhere and are outside this runtime policy.
|
|
@@ -207,7 +209,7 @@ Three more rules keep a spec readable as a story, as the [story-testing skill](h
|
|
|
207
209
|
|
|
208
210
|
`boundaries/queue-sql` rejects SQL mentioning the private `pgboss.` schema. Apps use their queue definitions and let workers process jobs; there is no queue-purge API by design. `boundaries/auth-sql` rejects SQL accessing Better Auth's `user`, `account`, `session` and `verification` tables. App tables reference users by foreign key: migrations may reference only `user(id)` with `ON DELETE CASCADE` or `ON DELETE SET NULL`. Import `userReference` from `@shivaedev/identity/server/better-auth/userReference.ts` and interpolate `sql(userReference.table)` and `sql(userReference.column)` in the reference. Apps use identity for account data; `options.owners` names platform's own auth implementation and its migrations. These rules inspect SQL templates, literal query calls and query variables, and inventoried `.sql` files. They do not evaluate arbitrary runtime SQL construction.
|
|
209
211
|
|
|
210
|
-
`boundaries/http-status` rejects comparisons with HTTP error status numbers, switch cases and literal status-list membership outside `options.edge`. Domain code handles typed errors; the named HTTP edge translates them into transport responses. Process exit codes remain ordinary domain values.
|
|
212
|
+
`boundaries/http-status` rejects comparisons with HTTP error status numbers, switch cases and literal status-list membership outside `options.edge`. It recognizes numeric literals and `HttpStatus.fromLiteral("NotFound")`, for example. Domain code handles typed errors; the named HTTP edge translates them into transport responses. Process exit codes remain ordinary domain values.
|
|
211
213
|
|
|
212
214
|
Glob options (`toolOwned`, `content`, `edge`, `owners` and `suites`) use `{ glob, reason }` declarations. Every declaration needs a nonblank reason and must match a current inventoried file; otherwise configuration fails. Remove declarations when their files disappear. Paths and patterns are relative to the config's directory. Naming and suite options use gitignore patterns; `edge` and `owners` use Node glob patterns.
|
|
213
215
|
|
|
@@ -536,16 +538,17 @@ export default defineConfig({
|
|
|
536
538
|
|
|
537
539
|
A skipped test proves nothing. `noSkippedTests` reports unconditional skips as errors, and its automatic fix is disabled: repair the test or remove a claim it cannot prove. Slow tests belong in the slow project.
|
|
538
540
|
|
|
539
|
-
The **PostgreSQL URL gate** is the only permitted skip convention: a test that needs real PostgreSQL registers conditionally on its `PLATFORM_*_TEST_DATABASE_URL`.
|
|
541
|
+
The **PostgreSQL URL gate** is the only permitted skip convention: a test that needs real PostgreSQL registers conditionally on its `PLATFORM_*_TEST_DATABASE_URL`. Use `postgresTestUrl(name)` from `@shivaedev/test-sql/server/adapters/postgresTestUrl.ts` at collection time. It returns `{ url, configured }`, treats absent and empty URLs as missing, and throws when a URL is missing and `CI` is nonempty. With a URL, execute the body against PostgreSQL and let connection or setup failures fail the test. Nothing else may skip. Keep the condition next to the database setup, either in the test file or its shared `test-support` module:
|
|
540
542
|
|
|
541
543
|
```ts
|
|
542
544
|
import { test } from "vitest";
|
|
543
|
-
import {
|
|
545
|
+
import { postgresTestUrl } from "@shivaedev/test-sql/server/adapters/postgresTestUrl.ts";
|
|
544
546
|
|
|
545
|
-
const
|
|
547
|
+
const { configured } = postgresTestUrl("PLATFORM_SQL_TEST_DATABASE_URL");
|
|
548
|
+
const integration = test.skipIf(!configured);
|
|
546
549
|
```
|
|
547
550
|
|
|
548
|
-
|
|
551
|
+
Declare the real PostgreSQL tests with `integration(name, body)`, or pass `configured` as a story kit's `runIf`. CI must supply the URL for every such test; a green run with missing URLs gives no PostgreSQL evidence.
|
|
549
552
|
|
|
550
553
|
#### Configuration limits
|
|
551
554
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entryPointFindings.d.ts","sourceRoot":"","sources":["../../../src/adapters/knip/entryPointFindings.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"entryPointFindings.d.ts","sourceRoot":"","sources":["../../../src/adapters/knip/entryPointFindings.ts"],"names":[],"mappings":"AAUA,OAAO,KAAK,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAOrD,wBAAsB,kBAAkB,CAAC,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAC,CAyDlG"}
|
|
@@ -3,11 +3,15 @@ import { readPackageManifest } from "#adapters/manifestInventory.ts";
|
|
|
3
3
|
import { ambientModules } from "#imports/ambient.ts";
|
|
4
4
|
import { importGraph } from "#imports/graph.ts";
|
|
5
5
|
import { isTooling } from "#imports/isTooling.ts";
|
|
6
|
+
import { packageNameOf } from "#imports/packageName.ts";
|
|
6
7
|
import { projectsFor } from "#imports/projects.ts";
|
|
7
8
|
import { packageOf } from "#imports/workspace.ts";
|
|
8
9
|
import { entryPointsOf, isApplication, provider } from "#manifests/entryPoints.ts";
|
|
9
10
|
import { isTestCode } from "#naming/testName.ts";
|
|
10
11
|
import { parse } from "#rules/parse.ts";
|
|
12
|
+
function importedPackage(specifier) {
|
|
13
|
+
return /^[.#/]/u.test(specifier) ? undefined : packageNameOf(specifier);
|
|
14
|
+
}
|
|
11
15
|
export async function entryPointFindings(inputs, findings) {
|
|
12
16
|
const graph = await importGraph(inputs);
|
|
13
17
|
const projectOf = projectsFor(inputs.root);
|
|
@@ -43,16 +47,18 @@ export async function entryPointFindings(inputs, findings) {
|
|
|
43
47
|
return true;
|
|
44
48
|
}
|
|
45
49
|
return ![...graph.edges, ...graph.unresolved].some((edge) => {
|
|
46
|
-
if (
|
|
50
|
+
if (unusedFiles.has(edge.from)) {
|
|
51
|
+
return false;
|
|
52
|
+
}
|
|
53
|
+
const target = importedPackage(edge.specifier);
|
|
54
|
+
if (target === undefined) {
|
|
47
55
|
return false;
|
|
48
56
|
}
|
|
49
|
-
const
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
.join("/");
|
|
55
|
-
return target !== undefined && provider(entries, target, development(directory, edge.from), true)?.name === name;
|
|
57
|
+
const consumer = owner(edge.from);
|
|
58
|
+
const supplied = provider(policies.get(consumer) ?? [], target, development(consumer, edge.from), true);
|
|
59
|
+
return consumer === directory
|
|
60
|
+
? supplied?.name === name
|
|
61
|
+
: supplied !== undefined && workspace.get(supplied.name) === directory && target === name;
|
|
56
62
|
});
|
|
57
63
|
});
|
|
58
64
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"entryPointFindings.js","sourceRoot":"","sources":["../../../src/adapters/knip/entryPointFindings.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"entryPointFindings.js","sourceRoot":"","sources":["../../../src/adapters/knip/entryPointFindings.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recognizeDiagnostics.d.ts","sourceRoot":"","sources":["../../src/biome/recognizeDiagnostics.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"recognizeDiagnostics.d.ts","sourceRoot":"","sources":["../../src/biome/recognizeDiagnostics.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAkD9C,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,SAAS,UAAU,EAAE,GAAG,SAAS,UAAU,EAAE,CAY5G"}
|
|
@@ -15,15 +15,14 @@ function generatorParameter(node) {
|
|
|
15
15
|
}
|
|
16
16
|
function tagHandler(node, syntax) {
|
|
17
17
|
const property = node.parent;
|
|
18
|
-
if (!ts.isPropertyAssignment(property) ||
|
|
18
|
+
if (!(ts.isPropertyAssignment(property) || ts.isMethodDeclaration(property))
|
|
19
|
+
|| property.name !== node
|
|
20
|
+
|| !ts.isObjectLiteralExpression(property.parent)) {
|
|
19
21
|
return false;
|
|
20
22
|
}
|
|
21
23
|
const handlers = property.parent;
|
|
22
24
|
const call = handlers.parent;
|
|
23
|
-
return
|
|
24
|
-
&& call.arguments.includes(handlers)
|
|
25
|
-
&& ts.isArrowFunction(property.initializer)
|
|
26
|
-
&& nativeEffectCall(property.initializer.body, "fail", syntax));
|
|
25
|
+
return nativeEffectCall(call, "catchTags", syntax) && call.arguments.includes(handlers);
|
|
27
26
|
}
|
|
28
27
|
function misclassified(diagnostic, syntax) {
|
|
29
28
|
const { start, end } = diagnostic.location;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recognizeDiagnostics.js","sourceRoot":"","sources":["../../src/biome/recognizeDiagnostics.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,WAAW,CAAC;AACpC,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAe,QAAQ,EAAE,MAAM,aAAa,CAAC;AAEtE,MAAM,UAAU,GAAwB,IAAI,GAAG,CAAC,CAAC,2CAA2C,EAAE,2BAA2B,CAAC,CAAC,CAAC;AAE5H,SAAS,kBAAkB,CAAC,IAAa;IACxC,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC;IAC9B,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC;IAClC,OAAO,CACN,EAAE,CAAC,WAAW,CAAC,SAAS,CAAC;WACtB,SAAS,CAAC,IAAI,KAAK,IAAI;WACvB,EAAE,CAAC,oBAAoB,CAAC,QAAQ,CAAC;WACjC,QAAQ,CAAC,aAAa,KAAK,SAAS;WACpC,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC;WACpC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAC/C,CAAC;AACH,CAAC;AAED,SAAS,UAAU,CAAC,IAAa,EAAE,MAAc;IAChD,MAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC;IAC7B,
|
|
1
|
+
{"version":3,"file":"recognizeDiagnostics.js","sourceRoot":"","sources":["../../src/biome/recognizeDiagnostics.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"changedRanges.d.ts","sourceRoot":"","sources":["../../src/cli/changedRanges.ts"],"names":[],"mappings":"AAmBA,wBAAgB,aAAa,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,GAAG,SAAS,MAAM,EAAE,CAItI"}
|
|
@@ -0,0 +1,23 @@
|
|
|
1
|
+
function position(text, offset) {
|
|
2
|
+
const lines = text.slice(0, offset).split("\n");
|
|
3
|
+
return `${lines.length}:${[...(lines.at(-1) ?? "")].length + 1}`;
|
|
4
|
+
}
|
|
5
|
+
function range(before, after) {
|
|
6
|
+
let start = 0;
|
|
7
|
+
while (start < before.length && start < after.length && before[start] === after[start]) {
|
|
8
|
+
start += 1;
|
|
9
|
+
}
|
|
10
|
+
let end = before.length;
|
|
11
|
+
let otherEnd = after.length;
|
|
12
|
+
while (end > start && otherEnd > start && before[end - 1] === after[otherEnd - 1]) {
|
|
13
|
+
end -= 1;
|
|
14
|
+
otherEnd -= 1;
|
|
15
|
+
}
|
|
16
|
+
return `${position(before, start)}-${position(before, end)}`;
|
|
17
|
+
}
|
|
18
|
+
export function changedRanges(before, after, pass) {
|
|
19
|
+
return [...new Set([...before.keys(), ...after.keys()])]
|
|
20
|
+
.filter((path) => before.get(path) !== after.get(path))
|
|
21
|
+
.map((path) => `${path}:${range(before.get(path) ?? "", after.get(path) ?? "")} (${pass})`);
|
|
22
|
+
}
|
|
23
|
+
//# sourceMappingURL=changedRanges.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"changedRanges.js","sourceRoot":"","sources":["../../src/cli/changedRanges.ts"],"names":[],"mappings":"AAAA,SAAS,QAAQ,CAAC,IAAY,EAAE,MAAc;IAC7C,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAChD,OAAO,GAAG,KAAK,CAAC,MAAM,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;AAClE,CAAC;AAED,SAAS,KAAK,CAAC,MAAc,EAAE,KAAa;IAC3C,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,OAAO,KAAK,GAAG,MAAM,CAAC,MAAM,IAAI,KAAK,GAAG,KAAK,CAAC,MAAM,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;QACxF,KAAK,IAAI,CAAC,CAAC;IACZ,CAAC;IACD,IAAI,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC;IACxB,IAAI,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC;IAC5B,OAAO,GAAG,GAAG,KAAK,IAAI,QAAQ,GAAG,KAAK,IAAI,MAAM,CAAC,GAAG,GAAG,CAAC,CAAC,KAAK,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,EAAE,CAAC;QACnF,GAAG,IAAI,CAAC,CAAC;QACT,QAAQ,IAAI,CAAC,CAAC;IACf,CAAC;IACD,OAAO,GAAG,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,QAAQ,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;AAC9D,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,MAAmC,EAAE,KAAkC,EAAE,IAAY;IAClH,OAAO,CAAC,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,MAAM,CAAC,IAAI,EAAE,EAAE,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;SACtD,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,KAAK,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SACtD,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,IAAI,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,KAAK,IAAI,GAAG,CAAC,CAAC;AAC9F,CAAC"}
|
package/dist/cli/fix.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix.d.ts","sourceRoot":"","sources":["../../src/cli/fix.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,MAAM,EAAc,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"fix.d.ts","sourceRoot":"","sources":["../../src/cli/fix.ts"],"names":[],"mappings":"AACA,OAAO,EAAW,MAAM,EAAc,MAAM,QAAQ,CAAC;AAKrD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAK3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,UAAU,CAAC;AAE7C,eAAO,MAAM,cAAc,IAAI,CAAC;AAMhC,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,YAAY,EAAE,YAAY,CAAC,CAU/G;AAED,MAAM,WAAW,IAAI,CAAC,QAAQ,EAAE,aAAa;IAC5C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;CAC7D;AAED,MAAM,WAAW,QAAQ,CAAC,QAAQ,EAAE,aAAa;IAChD,QAAQ,CAAC,MAAM,EAAE,SAAS,IAAI,CAAC,QAAQ,EAAE,aAAa,CAAC,EAAE,CAAC;IAC1D,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,QAAQ,EAAE,aAAa,CAAC,CAAC;CACvF;AA2DD,eAAO,MAAM,MAAM,GAAsC,QAAQ,EAAE,aAAa,2GAuB9E,CAAC;AAEH,eAAO,MAAM,GAAG,8FAKd,CAAC"}
|
package/dist/cli/fix.js
CHANGED
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { relative } from "node:path";
|
|
2
2
|
import { Console, Effect, FileSystem } from "effect";
|
|
3
3
|
import { biomeReport } from "#biome/report.ts";
|
|
4
|
+
import { changedRanges } from "#cli/changedRanges.ts";
|
|
4
5
|
import { loadConfig } from "#config/load.ts";
|
|
5
6
|
import { SetupFailure } from "#failure.ts";
|
|
6
7
|
import { posix } from "#inventory/ignoreScope.ts";
|
|
@@ -39,19 +40,16 @@ const round = Effect.fn("Cli.round")(function* (passes, index, afterEachPass) {
|
|
|
39
40
|
const changed = yield* pass.run;
|
|
40
41
|
total += changed;
|
|
41
42
|
parts.push(`${plural(changed, "file")} ${pass.label}`);
|
|
42
|
-
yield* afterEachPass;
|
|
43
|
+
yield* afterEachPass(pass.label);
|
|
43
44
|
}
|
|
44
45
|
yield* Console.log(`quality: Biome round ${index} rewrote ${parts.join(" and ")}.`);
|
|
45
46
|
return total;
|
|
46
47
|
});
|
|
47
|
-
function changedBetween(before, after) {
|
|
48
|
-
return [...new Set([...before.keys(), ...after.keys()])].filter((path) => before.get(path) !== after.get(path));
|
|
49
|
-
}
|
|
50
48
|
function unsettled(changed) {
|
|
51
49
|
const paths = [...changed].sort((left, right) => left.localeCompare(right));
|
|
52
50
|
const stopped = `Biome still rewrote files after ${MAX_FIX_ROUNDS} rounds, so quality fix stopped.`;
|
|
53
51
|
const named = paths.length > 0
|
|
54
|
-
? [`${stopped} These
|
|
52
|
+
? [`${stopped} These ranges changed in the last round (before each pass):`, ...paths.map((path) => ` ${path}`)]
|
|
55
53
|
: [
|
|
56
54
|
`${stopped} The files it changed in the last round are ones quality fix does not read, such as files .gitignore lists.`,
|
|
57
55
|
"Run `biome check --write --unsafe --verbose` to name them.",
|
|
@@ -62,18 +60,20 @@ function unsettled(changed) {
|
|
|
62
60
|
}
|
|
63
61
|
export const settle = Effect.fn("Cli.settle")(function* ({ passes, snapshot, }) {
|
|
64
62
|
for (let index = 1; index < MAX_FIX_ROUNDS; index += 1) {
|
|
65
|
-
if ((yield* round(passes, index, Effect.void)) === 0) {
|
|
63
|
+
if ((yield* round(passes, index, () => Effect.void)) === 0) {
|
|
66
64
|
return;
|
|
67
65
|
}
|
|
68
66
|
}
|
|
69
67
|
const changed = new Set();
|
|
70
68
|
let previous = yield* snapshot;
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
69
|
+
function record(label) {
|
|
70
|
+
return Effect.map(snapshot, (current) => {
|
|
71
|
+
for (const path of changedRanges(previous, current, label)) {
|
|
72
|
+
changed.add(path);
|
|
73
|
+
}
|
|
74
|
+
previous = current;
|
|
75
|
+
});
|
|
76
|
+
}
|
|
77
77
|
if ((yield* round(passes, MAX_FIX_ROUNDS, record)) === 0) {
|
|
78
78
|
return;
|
|
79
79
|
}
|
package/dist/cli/fix.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"fix.js","sourceRoot":"","sources":["../../src/cli/fix.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"fix.js","sourceRoot":"","sources":["../../src/cli/fix.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import ts from "typescript";
|
|
2
|
+
export interface AdminBindings {
|
|
3
|
+
readonly factories: ReadonlySet<string>;
|
|
4
|
+
readonly guards: ReadonlySet<string>;
|
|
5
|
+
readonly permissions: ReadonlySet<string>;
|
|
6
|
+
}
|
|
7
|
+
export declare function adminBindings(source: ts.SourceFile): AdminBindings;
|
|
8
|
+
//# sourceMappingURL=adminBindings.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"adminBindings.d.ts","sourceRoot":"","sources":["../../src/imports/adminBindings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,MAAM,WAAW,aAAa;IAC7B,QAAQ,CAAC,SAAS,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACxC,QAAQ,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IACrC,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;CAC1C;AAsBD,wBAAgB,aAAa,CAAC,MAAM,EAAE,EAAE,CAAC,UAAU,GAAG,aAAa,CAgBlE"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import ts from "typescript";
|
|
2
|
+
function namedImports(source) {
|
|
3
|
+
return source.statements.filter(ts.isImportDeclaration).flatMap((statement) => {
|
|
4
|
+
const bindings = statement.importClause?.namedBindings;
|
|
5
|
+
if (!(ts.isStringLiteral(statement.moduleSpecifier) && bindings !== undefined && ts.isNamedImports(bindings))
|
|
6
|
+
|| statement.importClause?.isTypeOnly) {
|
|
7
|
+
return [];
|
|
8
|
+
}
|
|
9
|
+
const origin = statement.moduleSpecifier.text;
|
|
10
|
+
return bindings.elements
|
|
11
|
+
.filter((element) => !element.isTypeOnly)
|
|
12
|
+
.map((binding) => ({
|
|
13
|
+
local: binding.name.text,
|
|
14
|
+
name: (binding.propertyName ?? binding.name).text,
|
|
15
|
+
origin,
|
|
16
|
+
}));
|
|
17
|
+
});
|
|
18
|
+
}
|
|
19
|
+
export function adminBindings(source) {
|
|
20
|
+
const factories = new Set();
|
|
21
|
+
const permissions = new Set();
|
|
22
|
+
const guards = new Set(["middleware"]);
|
|
23
|
+
for (const { local, name, origin } of namedImports(source)) {
|
|
24
|
+
if (origin.startsWith("@shivaedev/admin/") && ["adminPage", "registerAdmin"].includes(name)) {
|
|
25
|
+
factories.add(local);
|
|
26
|
+
}
|
|
27
|
+
if (/(?:^|[/#])admin\//u.test(origin)) {
|
|
28
|
+
permissions.add(local);
|
|
29
|
+
}
|
|
30
|
+
if (origin.startsWith("@shivaedev/") && ["requirePermission", "permissionMiddleware", "permissionReadPolicy"].includes(name)) {
|
|
31
|
+
guards.add(local);
|
|
32
|
+
}
|
|
33
|
+
}
|
|
34
|
+
return { factories, guards, permissions };
|
|
35
|
+
}
|
|
36
|
+
//# sourceMappingURL=adminBindings.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"adminBindings.js","sourceRoot":"","sources":["../../src/imports/adminBindings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAQ5B,SAAS,YAAY,CAAC,MAAqB;IAC1C,OAAO,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,EAAE,CAAC,mBAAmB,CAAC,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;QAC7E,MAAM,QAAQ,GAAG,SAAS,CAAC,YAAY,EAAE,aAAa,CAAC;QACvD,IACC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,SAAS,CAAC,eAAe,CAAC,IAAI,QAAQ,KAAK,SAAS,IAAI,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;eACtG,SAAS,CAAC,YAAY,EAAE,UAAU,EACpC,CAAC;YACF,OAAO,EAAE,CAAC;QACX,CAAC;QACD,MAAM,MAAM,GAAG,SAAS,CAAC,eAAe,CAAC,IAAI,CAAC;QAC9C,OAAO,QAAQ,CAAC,QAAQ;aACtB,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC;aACxC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;YAClB,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI;YACxB,IAAI,EAAE,CAAC,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI;YACjD,MAAM;SACN,CAAC,CAAC,CAAC;IACN,CAAC,CAAC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa,CAAC,MAAqB;IAClD,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IACpC,MAAM,WAAW,GAAG,IAAI,GAAG,EAAU,CAAC;IACtC,MAAM,MAAM,GAAG,IAAI,GAAG,CAAS,CAAC,YAAY,CAAC,CAAC,CAAC;IAC/C,KAAK,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC;QAC5D,IAAI,MAAM,CAAC,UAAU,CAAC,mBAAmB,CAAC,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAC7F,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACtB,CAAC;QACD,IAAI,oBAAoB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACvC,WAAW,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACxB,CAAC;QACD,IAAI,MAAM,CAAC,UAAU,CAAC,aAAa,CAAC,IAAI,CAAC,mBAAmB,EAAE,sBAAsB,EAAE,sBAAsB,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;YAC9H,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACnB,CAAC;IACF,CAAC;IACD,OAAO,EAAE,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,CAAC;AAC3C,CAAC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { SourceFile } from "#rule.ts";
|
|
2
|
+
export declare function sourceRoot(path: string): string | undefined;
|
|
3
|
+
export declare function adminPath(path: string): boolean;
|
|
4
|
+
export declare function composition(path: string): boolean;
|
|
5
|
+
export declare function adminEvidence(file: SourceFile): boolean;
|
|
6
|
+
//# sourceMappingURL=adminEvidence.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"adminEvidence.d.ts","sourceRoot":"","sources":["../../src/imports/adminEvidence.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAI3C,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAE3D;AAED,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAG/C;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAEjD;AAsBD,wBAAgB,aAAa,CAAC,IAAI,EAAE,UAAU,GAAG,OAAO,CAavD"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import ts from "typescript";
|
|
2
|
+
import { parse } from "#rules/parse.ts";
|
|
3
|
+
import { adminBindings } from "./adminBindings.js";
|
|
4
|
+
export function sourceRoot(path) {
|
|
5
|
+
return /^(?:.*\/)?src\//u.exec(path)?.[0];
|
|
6
|
+
}
|
|
7
|
+
export function adminPath(path) {
|
|
8
|
+
const root = sourceRoot(path);
|
|
9
|
+
return root !== undefined && path.slice(root.length).split("/").includes("admin");
|
|
10
|
+
}
|
|
11
|
+
export function composition(path) {
|
|
12
|
+
return /(?:^|\/)(?:registration|modules)\.[cm]?[jt]sx?$/u.test(path);
|
|
13
|
+
}
|
|
14
|
+
function adminCall(node, bindings) {
|
|
15
|
+
if (ts.isIdentifier(node.expression) && bindings.factories.has(node.expression.text)) {
|
|
16
|
+
return true;
|
|
17
|
+
}
|
|
18
|
+
const expression = ts.isCallExpression(node.expression) ? node.expression.expression : node.expression;
|
|
19
|
+
const callee = ts.isPropertyAccessExpression(expression) ? expression.name.text : expression.getText();
|
|
20
|
+
return bindings.guards.has(callee) && node.arguments.some((argument) => ts.isIdentifier(argument) && bindings.permissions.has(argument.text));
|
|
21
|
+
}
|
|
22
|
+
function exportedRegistration(node) {
|
|
23
|
+
if (!(ts.isFunctionDeclaration(node) || ts.isVariableStatement(node))) {
|
|
24
|
+
return false;
|
|
25
|
+
}
|
|
26
|
+
const exported = node.modifiers?.some((modifier) => modifier.kind === ts.SyntaxKind.ExportKeyword);
|
|
27
|
+
const names = ts.isFunctionDeclaration(node)
|
|
28
|
+
? [node.name?.text]
|
|
29
|
+
: node.declarationList.declarations.map((declaration) => declaration.name.getText());
|
|
30
|
+
return exported === true && names.includes("adminRegistration");
|
|
31
|
+
}
|
|
32
|
+
export function adminEvidence(file) {
|
|
33
|
+
const source = parse(file);
|
|
34
|
+
if (source === undefined) {
|
|
35
|
+
return false;
|
|
36
|
+
}
|
|
37
|
+
const bindings = adminBindings(source);
|
|
38
|
+
let found = false;
|
|
39
|
+
function visit(node) {
|
|
40
|
+
found ||= (ts.isCallExpression(node) && adminCall(node, bindings)) || exportedRegistration(node);
|
|
41
|
+
ts.forEachChild(node, visit);
|
|
42
|
+
}
|
|
43
|
+
visit(source);
|
|
44
|
+
return found;
|
|
45
|
+
}
|
|
46
|
+
//# sourceMappingURL=adminEvidence.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"adminEvidence.js","sourceRoot":"","sources":["../../src/imports/adminEvidence.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"adminFindings.d.ts","sourceRoot":"","sources":["../../src/imports/adminFindings.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAEpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AA0B9C,wBAAgB,aAAa,CAAC,KAAK,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,UAAU,EAAE,GAAG,SAAS,OAAO,EAAE,CAkCpG"}
|
|
@@ -0,0 +1,55 @@
|
|
|
1
|
+
import { posix } from "node:path";
|
|
2
|
+
import { isTestCode } from "#naming/testName.ts";
|
|
3
|
+
import { adminEvidence, adminPath, composition, sourceRoot } from "./adminEvidence.js";
|
|
4
|
+
function reachable(seeds, next) {
|
|
5
|
+
const reached = new Set();
|
|
6
|
+
const pending = [...seeds];
|
|
7
|
+
for (const file of pending) {
|
|
8
|
+
if (!reached.has(file)) {
|
|
9
|
+
reached.add(file);
|
|
10
|
+
pending.push(...next(file));
|
|
11
|
+
}
|
|
12
|
+
}
|
|
13
|
+
return reached;
|
|
14
|
+
}
|
|
15
|
+
function destination(file, admin) {
|
|
16
|
+
if (!admin) {
|
|
17
|
+
const root = sourceRoot(file) ?? "";
|
|
18
|
+
return posix.dirname(root + file.slice(root.length).replace(/(?:^|\/)admin\//u, (segment) => (segment.startsWith("/") ? "/" : "")));
|
|
19
|
+
}
|
|
20
|
+
const runtime = /^(?<root>.*\/(?:client|server))\/(?<local>.*)$/u.exec(file)?.groups;
|
|
21
|
+
if (runtime?.root !== undefined && runtime.local !== undefined) {
|
|
22
|
+
return posix.dirname(`${runtime.root}/admin/${runtime.local}`);
|
|
23
|
+
}
|
|
24
|
+
return `${posix.dirname(file)}/admin`;
|
|
25
|
+
}
|
|
26
|
+
export function adminFindings(graph, sources) {
|
|
27
|
+
const files = sources.filter((file) => sourceRoot(file.path) !== undefined && !isTestCode(file.path));
|
|
28
|
+
const paths = new Set(files.map((file) => file.path));
|
|
29
|
+
const seeds = new Set(files.filter((file) => adminPath(file.path) || adminEvidence(file)).map((file) => file.path));
|
|
30
|
+
const edges = graph.edges.filter((edge) => edge.kind === "import" && paths.has(edge.from));
|
|
31
|
+
const adjacency = new Map();
|
|
32
|
+
const imported = new Set();
|
|
33
|
+
for (const edge of edges) {
|
|
34
|
+
if (edge.to.kind === "file" && paths.has(edge.to.path) && sourceRoot(edge.from) === sourceRoot(edge.to.path)) {
|
|
35
|
+
adjacency.set(edge.from, [...(adjacency.get(edge.from) ?? []), edge.to.path]);
|
|
36
|
+
imported.add(edge.to.path);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
function next(file) {
|
|
40
|
+
return adjacency.get(file) ?? [];
|
|
41
|
+
}
|
|
42
|
+
const admin = reachable([...seeds], next);
|
|
43
|
+
const members = files.filter(({ path }) => !seeds.has(path) && (!(admin.has(path) && imported.has(path)) || composition(path)));
|
|
44
|
+
const member = reachable(members.map((file) => file.path), (file) => next(file).filter((target) => !(composition(file) && seeds.has(target) && /\/(?:[^/]*[Rr]egistration|pages|make)\.[cm]?[jt]sx?$/u.test(target))));
|
|
45
|
+
return files.flatMap(({ path }) => {
|
|
46
|
+
if (adminPath(path) && member.has(path)) {
|
|
47
|
+
return [{ file: path, message: `Member code reaches this admin/ file. Move it to ${destination(path, false)}/.` }];
|
|
48
|
+
}
|
|
49
|
+
if (!adminPath(path) && admin.has(path) && !member.has(path)) {
|
|
50
|
+
return [{ file: path, message: `Only admin permissions or registrations reach this file. Move it to ${destination(path, true)}/.` }];
|
|
51
|
+
}
|
|
52
|
+
return [];
|
|
53
|
+
});
|
|
54
|
+
}
|
|
55
|
+
//# sourceMappingURL=adminFindings.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"adminFindings.js","sourceRoot":"","sources":["../../src/imports/adminFindings.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nodePlatformBarrels.d.ts","sourceRoot":"","sources":["../../src/imports/nodePlatformBarrels.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AA2BpD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,UAAU,GAAG,SAAS,OAAO,EAAE,CAqBxE"}
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import ts from "typescript";
|
|
2
|
+
import { isTestCode } from "#naming/testName.ts";
|
|
3
|
+
import { parse } from "#rules/parse.ts";
|
|
4
|
+
import { specifierSites } from "./specifiers.js";
|
|
5
|
+
const BARREL = "@effect/platform-node";
|
|
6
|
+
function subpaths(source, start) {
|
|
7
|
+
const statement = source.statements.find((node) => node.pos <= start && node.end > start);
|
|
8
|
+
const bindings = statement !== undefined && ts.isImportDeclaration(statement) ? statement.importClause?.namedBindings : undefined;
|
|
9
|
+
if (bindings !== undefined && ts.isNamedImports(bindings)) {
|
|
10
|
+
const values = bindings.elements.filter((element) => !element.isTypeOnly);
|
|
11
|
+
return values.length === 0 && bindings.elements.length > 0
|
|
12
|
+
? undefined
|
|
13
|
+
: values.map((element) => `${BARREL}/${(element.propertyName ?? element.name).text}`);
|
|
14
|
+
}
|
|
15
|
+
if (statement !== undefined
|
|
16
|
+
&& ts.isExportDeclaration(statement)
|
|
17
|
+
&& statement.exportClause !== undefined
|
|
18
|
+
&& ts.isNamedExports(statement.exportClause)
|
|
19
|
+
&& statement.exportClause.elements.every((element) => element.isTypeOnly)) {
|
|
20
|
+
return undefined;
|
|
21
|
+
}
|
|
22
|
+
return [];
|
|
23
|
+
}
|
|
24
|
+
export function nodePlatformBarrels(file) {
|
|
25
|
+
const source = isTestCode(file.path) ? undefined : parse(file);
|
|
26
|
+
if (source === undefined || source.isDeclarationFile) {
|
|
27
|
+
return [];
|
|
28
|
+
}
|
|
29
|
+
return specifierSites(source)
|
|
30
|
+
.filter((site) => site.specifier === BARREL && !site.type)
|
|
31
|
+
.flatMap((site) => {
|
|
32
|
+
const paths = subpaths(source, site.start);
|
|
33
|
+
if (paths === undefined) {
|
|
34
|
+
return [];
|
|
35
|
+
}
|
|
36
|
+
return [
|
|
37
|
+
{
|
|
38
|
+
file: file.path,
|
|
39
|
+
line: site.line,
|
|
40
|
+
message: `The ${BARREL} barrel loads optional integrations such as redis. Import module subpaths instead: ${paths.length > 0 ? paths.map((path) => `\`import * as ${path.slice(path.lastIndexOf("/") + 1)} from "${path}"\``).join("; ") : `\`import * as NodeServices from "${BARREL}/NodeServices"\` (choose the module you use)`}.`,
|
|
41
|
+
subject: BARREL,
|
|
42
|
+
},
|
|
43
|
+
];
|
|
44
|
+
});
|
|
45
|
+
}
|
|
46
|
+
//# sourceMappingURL=nodePlatformBarrels.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"nodePlatformBarrels.js","sourceRoot":"","sources":["../../src/imports/nodePlatformBarrels.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAEjD,OAAO,EAAE,KAAK,EAAE,MAAM,iBAAiB,CAAC;AACxC,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,MAAM,MAAM,GAAG,uBAAuB,CAAC;AAEvC,SAAS,QAAQ,CAAC,MAAqB,EAAE,KAAa;IACrD,MAAM,SAAS,GAAG,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,IAAI,KAAK,IAAI,IAAI,CAAC,GAAG,GAAG,KAAK,CAAC,CAAC;IAC1F,MAAM,QAAQ,GAAG,SAAS,KAAK,SAAS,IAAI,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,YAAY,EAAE,aAAa,CAAC,CAAC,CAAC,SAAS,CAAC;IAClI,IAAI,QAAQ,KAAK,SAAS,IAAI,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC3D,MAAM,MAAM,GAAG,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,OAAO,CAAC,UAAU,CAAC,CAAC;QAC1E,OAAO,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC;YACzD,CAAC,CAAC,SAAS;YACX,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,YAAY,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;IACxF,CAAC;IACD,IACC,SAAS,KAAK,SAAS;WACpB,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC;WACjC,SAAS,CAAC,YAAY,KAAK,SAAS;WACpC,EAAE,CAAC,cAAc,CAAC,SAAS,CAAC,YAAY,CAAC;WACzC,SAAS,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,EACxE,CAAC;QACF,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,OAAO,EAAE,CAAC;AACX,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,IAAgB;IACnD,MAAM,MAAM,GAAG,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC/D,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,iBAAiB,EAAE,CAAC;QACtD,OAAO,EAAE,CAAC;IACX,CAAC;IACD,OAAO,cAAc,CAAC,MAAM,CAAC;SAC3B,MAAM,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,KAAK,MAAM,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;SACzD,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QACjB,MAAM,KAAK,GAAG,QAAQ,CAAC,MAAM,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC3C,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACzB,OAAO,EAAE,CAAC;QACX,CAAC;QACD,OAAO;YACN;gBACC,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,OAAO,EAAE,OAAO,MAAM,sFAAsF,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,iBAAiB,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,UAAU,IAAI,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,oCAAoC,MAAM,8CAA8C,GAAG;gBACtU,OAAO,EAAE,MAAM;aACf;SACD,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -4,5 +4,6 @@ export interface OwnExport {
|
|
|
4
4
|
readonly kind: "type" | "value";
|
|
5
5
|
readonly name: string;
|
|
6
6
|
}
|
|
7
|
+
export declare function ownDeclarations(source: ts.SourceFile): readonly OwnExport[];
|
|
7
8
|
export declare function ownExports(source: ts.SourceFile): readonly OwnExport[];
|
|
8
9
|
//# sourceMappingURL=ownExports.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ownExports.d.ts","sourceRoot":"","sources":["../../src/naming/ownExports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,MAAM,WAAW,SAAS;IACzB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACtB;
|
|
1
|
+
{"version":3,"file":"ownExports.d.ts","sourceRoot":"","sources":["../../src/naming/ownExports.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,MAAM,WAAW,SAAS;IACzB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IAChC,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;CACtB;AAyDD,wBAAgB,eAAe,CAAC,MAAM,EAAE,EAAE,CAAC,UAAU,GAAG,SAAS,SAAS,EAAE,CAE3E;AA0DD,wBAAgB,UAAU,CAAC,MAAM,EAAE,EAAE,CAAC,UAAU,GAAG,SAAS,SAAS,EAAE,CAItE"}
|
|
@@ -45,8 +45,11 @@ function declared(statement) {
|
|
|
45
45
|
: undefined;
|
|
46
46
|
return named !== undefined && ts.isIdentifier(named) ? [{ constant: false, kind: "value", name: named.text }] : [];
|
|
47
47
|
}
|
|
48
|
+
export function ownDeclarations(source) {
|
|
49
|
+
return source.statements.flatMap(declared);
|
|
50
|
+
}
|
|
48
51
|
function locals(source) {
|
|
49
|
-
const all = source
|
|
52
|
+
const all = ownDeclarations(source);
|
|
50
53
|
return new Map(all.map((local) => [local.name, local]));
|
|
51
54
|
}
|
|
52
55
|
function listed(statement, known) {
|