Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
7e7f716424 | ||
|
|
62db7de537 | ||
|
|
ff823b3cba | ||
|
|
eeb831b717 | ||
|
|
ae7ffb6fa2 | ||
|
|
0d6a3f1b9b | ||
|
|
8615723c64 | ||
|
|
935e82d205 | ||
|
|
c7223dbe69 | ||
|
|
2d3577716d | ||
|
|
cc88c07961 | ||
|
|
62c37e6d89 | ||
|
|
947eac8089 | ||
|
|
eea2fbb17d | ||
|
|
b278a153d3 | ||
|
|
8b73143740 | ||
|
|
13497d1df8 | ||
|
|
998c4bfd80 | ||
|
|
9f56d7ae8e | ||
|
|
94ccc16963 | ||
|
|
0b97632a7c | ||
|
|
6f87c2f3b5 | ||
|
|
88159296d4 | ||
|
|
800c11139d | ||
|
|
05fad0fcd6 | ||
|
|
58d127da4e | ||
|
|
165bd9e3df | ||
|
|
02634f41de | ||
|
|
9da5b5dbf2 | ||
|
|
dc57529f0f | ||
|
|
484e5c8ca5 | ||
|
|
c51e32d6a6 | ||
|
|
9e5522c131 |
No files matched your search
+8
-1
@@ -22,7 +22,8 @@
|
|||||||
"eslint/sort-imports": "off",
|
"eslint/sort-imports": "off",
|
||||||
"import/consistent-type-specifier-style": "off",
|
"import/consistent-type-specifier-style": "off",
|
||||||
"unicorn/prefer-export-from": "off",
|
"unicorn/prefer-export-from": "off",
|
||||||
"typescript/method-signature-style": "off"
|
"typescript/method-signature-style": "off",
|
||||||
|
"typescript/promise-function-async": "off"
|
||||||
},
|
},
|
||||||
"options": { "typeAware": true },
|
"options": { "typeAware": true },
|
||||||
"env": { "builtin": true, "es2024": true, "node": true },
|
"env": { "builtin": true, "es2024": true, "node": true },
|
||||||
@@ -41,6 +42,12 @@
|
|||||||
"rules": {
|
"rules": {
|
||||||
"import/no-nodejs-modules": "off"
|
"import/no-nodejs-modules": "off"
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"files": ["src/util/__tests__/**"],
|
||||||
|
"rules": {
|
||||||
|
"import/no-nodejs-modules": "off"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"ignorePatterns": ["dist", "node_modules", "coverage"]
|
"ignorePatterns": ["dist", "node_modules", "coverage"]
|
||||||
|
|||||||
@@ -25,10 +25,10 @@ first-action facts. Do not restate evolving prose here — it will drift.
|
|||||||
Don't silence the type system to force a green run. As an agent these are forbidden:
|
Don't silence the type system to force a green run. As an agent these are forbidden:
|
||||||
|
|
||||||
- `// @ts-nocheck`, `// @ts-ignore`, `// @ts-expect-error`
|
- `// @ts-nocheck`, `// @ts-ignore`, `// @ts-expect-error`
|
||||||
- `// oxlint-disable` / `// oxlint-disable-next-line`
|
- `// oxlint-disable` / `// oxlint-disable-next-line` — the sole exception is the fixed file-level `typescript/no-floating-promises` header at the top of a `*.test.ts` file, spelled exactly as [CONTRIBUTING.md § Rules the tools don't enforce](./CONTRIBUTING.md#rules-the-tools-dont-enforce) prescribes
|
||||||
- `as` casts used to push an expression through (type-aware oxlint already flags unsafe assertions)
|
- `as` casts used to push an expression through (type-aware oxlint already flags unsafe assertions)
|
||||||
|
|
||||||
Fix the root cause with the type system instead — narrowing, generics, `satisfies`, conditional / mapped types, utility types (`NonNullable`, `Exclude`, …). TypeScript can express it; that's the intended tool. The `oxlint-disable`-location rule in [CONTRIBUTING.md § Rules the tools don't enforce](./CONTRIBUTING.md#rules-the-tools-dont-enforce) is a **human** last-resort convention (so a reviewer can spot a deliberate suppression) — it is not permission for you to add one. If the types genuinely cannot express something, stop and surface the conflict (commit message / handover) rather than suppress it.
|
Fix the root cause with the type system instead — narrowing, generics, `satisfies`, conditional / mapped types, utility types (`NonNullable`, `Exclude`, …). TypeScript can express it; that's the intended tool. The `oxlint-disable`-location rule in [CONTRIBUTING.md § Rules the tools don't enforce](./CONTRIBUTING.md#rules-the-tools-dont-enforce) is a **human** last-resort convention (so a reviewer can spot a deliberate suppression) — it is not permission for you to add one, except the one fixed `*.test.ts` file-level header named there. If the types genuinely cannot express something, stop and surface the conflict (commit message / handover) rather than suppress it.
|
||||||
|
|
||||||
The same applies to the checks themselves: **never `git commit --no-verify`** (or otherwise skip a pre-commit / pre-push hook). The checks are fast and offline, so a redundant run is fine — bypassing a hook to get green is the identical anti-pattern. If a commit already skipped a hook, redo it through one: `git reset --soft HEAD~1 && git commit -C <skipped-sha>`.
|
The same applies to the checks themselves: **never `git commit --no-verify`** (or otherwise skip a pre-commit / pre-push hook). The checks are fast and offline, so a redundant run is fine — bypassing a hook to get green is the identical anti-pattern. If a commit already skipped a hook, redo it through one: `git reset --soft HEAD~1 && git commit -C <skipped-sha>`.
|
||||||
|
|
||||||
@@ -42,7 +42,9 @@ Never start a long-lived / blocking process such as `npm run watch`. It runs unt
|
|||||||
|
|
||||||
### Working on tasks
|
### Working on tasks
|
||||||
|
|
||||||
- **Task with subtasks** (a task that has indented children): create the branch with `npm run create:branch -- <prefix>/<desc>`, inferring the prefix from the task content (`feature/…` / `fix/…` / `chore/…`) — do not hand-write `git switch -c`, the command enforces the clean-tree / current-`main` / green-baseline precondition. Work on each subtask with commits, then present a concise handover for the user to review. Use this fixed shape:
|
Every task — with or without subtasks — goes through the complete branching model:
|
||||||
|
|
||||||
|
- Create the branch with `npm run create:branch -- <prefix>/<desc>`, inferring the prefix from the task content (`feature/…` / `fix/…` / `chore/…`) — do not hand-write `git switch -c`, the command enforces the clean-tree / current-`main` / green-baseline precondition. Work with commits (each subtask gets one or more), then present a concise handover for the user to review. Use this fixed shape:
|
||||||
|
|
||||||
```md
|
```md
|
||||||
## Handover — <branch>
|
## Handover — <branch>
|
||||||
@@ -54,9 +56,7 @@ Never start a long-lived / blocking process such as `npm run watch`. It runs unt
|
|||||||
|
|
||||||
Once the user has no further objections, merge back: `npm run create:finish` (on the branch — it merges `--no-ff`, runs `npm run verify`, and deletes the branch). The branching model is documented in [CONTRIBUTING.md § Branching model](./CONTRIBUTING.md#branching-model).
|
Once the user has no further objections, merge back: `npm run create:finish` (on the branch — it merges `--no-ff`, runs `npm run verify`, and deletes the branch). The branching model is documented in [CONTRIBUTING.md § Branching model](./CONTRIBUTING.md#branching-model).
|
||||||
|
|
||||||
- **Leaf task** (no indented children): implement on the current branch and commit.
|
Follow [CONTRIBUTING.md § Testing discipline (type-driven)](./CONTRIBUTING.md#testing-discipline-type-driven) throughout.
|
||||||
|
|
||||||
In both cases, follow [CONTRIBUTING.md § Testing discipline (type-driven)](./CONTRIBUTING.md#testing-discipline-type-driven). Each subtask gets one or more commits.
|
|
||||||
|
|
||||||
## Read these
|
## Read these
|
||||||
|
|
||||||
|
|||||||
+12
-1
@@ -7,6 +7,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
|
|
||||||
## [Unreleased]
|
## [Unreleased]
|
||||||
|
|
||||||
|
## [0.4.0] - 2026-09-20
|
||||||
|
|
||||||
|
- move the `_` fallback out of handlers
|
||||||
|
|
||||||
|
## [0.3.0] - 2026-09-18
|
||||||
|
|
||||||
|
- condensed primitive matcher factories down to 2 from formerly 4
|
||||||
|
- house shared test helpers under `src/util/__tests__/`
|
||||||
|
|
||||||
## [0.2.0] - 2026-09-16
|
## [0.2.0] - 2026-09-16
|
||||||
|
|
||||||
- allow ternaries and lowercase comments in oxlint
|
- allow ternaries and lowercase comments in oxlint
|
||||||
@@ -54,7 +63,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
|
|||||||
|
|
||||||
- basic setup
|
- basic setup
|
||||||
|
|
||||||
[Unreleased]: https://gitea.e1nsnull.de/tmu/tiny-pattern-ts/compare/0.2.0...main
|
[Unreleased]: https://gitea.e1nsnull.de/tmu/tiny-pattern-ts/compare/0.4.0...main
|
||||||
|
[0.4.0]: https://gitea.e1nsnull.de/tmu/tiny-pattern-ts/compare/0.3.0...0.4.0
|
||||||
|
[0.3.0]: https://gitea.e1nsnull.de/tmu/tiny-pattern-ts/compare/0.2.0...0.3.0
|
||||||
[0.2.0]: https://gitea.e1nsnull.de/tmu/tiny-pattern-ts/compare/0.1.8...0.2.0
|
[0.2.0]: https://gitea.e1nsnull.de/tmu/tiny-pattern-ts/compare/0.1.8...0.2.0
|
||||||
[0.1.8]: https://gitea.e1nsnull.de/tmu/tiny-pattern-ts/compare/0.1.7...0.1.8
|
[0.1.8]: https://gitea.e1nsnull.de/tmu/tiny-pattern-ts/compare/0.1.7...0.1.8
|
||||||
[0.1.7]: https://gitea.e1nsnull.de/tmu/tiny-pattern-ts/compare/0.1.6...0.1.7
|
[0.1.7]: https://gitea.e1nsnull.de/tmu/tiny-pattern-ts/compare/0.1.6...0.1.7
|
||||||
|
|||||||
+10
-1
@@ -67,6 +67,11 @@ before the implementation. The loop is **type → red → green → refactor**:
|
|||||||
`npm run verify` as the definition-of-done gate.
|
`npm run verify` as the definition-of-done gate.
|
||||||
|
|
||||||
Every test pairs an `expectTypeOf(...)` with an `assert.*`; keep them together.
|
Every test pairs an `expectTypeOf(...)` with an `assert.*`; keep them together.
|
||||||
|
The autocomplete tests (`src/util/__tests__/lsp-completion.test.ts` for the
|
||||||
|
helper, `src/primitive.test.ts` for the matcher's popup) are the
|
||||||
|
exception —
|
||||||
|
the language server, not the type system, is the oracle (see
|
||||||
|
[development/testing.md § Autocomplete](./development/testing.md#autocomplete)).
|
||||||
Each test body follows **AAA (Arrange–Act–Assert)** with labeled blocks
|
Each test body follows **AAA (Arrange–Act–Assert)** with labeled blocks
|
||||||
separated by a blank line: `// Arrange` sets up the inputs (e.g. the matcher
|
separated by a blank line: `// Arrange` sets up the inputs (e.g. the matcher
|
||||||
factory), `// Act` exercises the subject once from them (not a second
|
factory), `// Act` exercises the subject once from them (not a second
|
||||||
@@ -151,7 +156,11 @@ reaches for by default:
|
|||||||
- **`oxlint-disable` directives live in source, not `.oxlintrc.json`.** The
|
- **`oxlint-disable` directives live in source, not `.oxlintrc.json`.** The
|
||||||
trade-off must sit next to the code it silences. This is a _human_ last-resort
|
trade-off must sit next to the code it silences. This is a _human_ last-resort
|
||||||
convention; agents must not add these — see
|
convention; agents must not add these — see
|
||||||
[AGENTS.md § Never do](./AGENTS.md#never-do). (why:
|
[AGENTS.md § Never do](./AGENTS.md#never-do). The sole agent exception is the
|
||||||
|
fixed file-level header at the top of a `*.test.ts` file, spelled exactly:
|
||||||
|
`/* oxlint-disable typescript/no-floating-promises -- expectTypeOf() is a sync
|
||||||
|
type-assertion library that the type-aware linter misidentifies as a promise
|
||||||
|
*/` — any other suppression stays human-last-resort. (why:
|
||||||
[development/tooling.md](./development/tooling.md#oxlint-disable-directives-live-next-to-the-code))
|
[development/tooling.md](./development/tooling.md#oxlint-disable-directives-live-next-to-the-code))
|
||||||
- **Don't put slow / network / whole-project scans in `check` or pre-commit.**
|
- **Don't put slow / network / whole-project scans in `check` or pre-commit.**
|
||||||
Advisory scans are not correctness gates; they belong under `maintain:`. (why:
|
Advisory scans are not correctness gates; they belong under `maintain:`. (why:
|
||||||
|
|||||||
+24
-1
@@ -27,8 +27,30 @@ v1.0:
|
|||||||
☐ Achieve 100% branch coverage on `src/primitive.ts`
|
☐ Achieve 100% branch coverage on `src/primitive.ts`
|
||||||
☐ Achieve 100% branch coverage on `src/index.ts`
|
☐ Achieve 100% branch coverage on `src/index.ts`
|
||||||
|
|
||||||
Bugs:
|
Testing:
|
||||||
|
✔ Cover autocomplete with real completion test cases in the suite @medium @done
|
||||||
|
→ `src/util/__tests__/lsp-completion.ts` (`#test-utils/…`) is the helper; the suite asserts its labels (see development/testing.md § Autocomplete)
|
||||||
|
→ wire it into `node --test` so a test asserts the offered labels
|
||||||
|
→ note: `Parameters<typeof factory>[0]` resolves only the *last* overload; use `@ts-expect-error` call sites for factory negatives, not `not.toExtend<Parameters<…>>`
|
||||||
|
✔ Drive the LSP completion helper through the LSP protocol library instead of a hand-rolled JSON-RPC client @medium @done
|
||||||
|
✔ Add `vscode-languageserver-protocol` and record the tooling decision @done
|
||||||
|
✔ Rewrite `src/util/__tests__/lsp-completion.ts` onto `createMessageConnection` and typed requests @done
|
||||||
|
✔ Update `development/testing.md § Autocomplete` for the new client @done
|
||||||
|
✔ Run `npm run verify` and check the task off @done
|
||||||
|
|
||||||
|
Matcher:
|
||||||
|
✔ Clean up: adopt the 3-overload matcher (`src/prototype-ac2.ts`) and delete the prototypes @high @done
|
||||||
|
→ `getMatcher` / `getMatcherW`, each with overloads `ExhaustiveLoose` → `Fallback` → `Handlers` (order is load-bearing)
|
||||||
|
→ fold into `src/primitive.ts` / the public API; drop `src/prototype*.ts`
|
||||||
|
✔ `_` should receive only the unhandled `T` keys, not all of `T` @medium @done
|
||||||
|
→ the fallback is now a second argument: `(handlers, (s) => …)`, `s: Exclude<T, keyof handlers>`
|
||||||
|
☐ A fallback for an already-exhaustive handler map must be a compile error @medium
|
||||||
|
→ `(handlers, fallback)` with `handlers` covering all of `T` is accepted; the redundant fallback should be rejected (currying would allow the guard)
|
||||||
|
|
||||||
|
Bugs:
|
||||||
|
✔ TS 7 LSP server logs `context canceled` on stderr at shutdown @done
|
||||||
|
→ `handleExit` returns `io.EOF`, cancelling the background context while `Session.updateWatches` is still in flight; the bare error is flushed to stderr and the server exits 1
|
||||||
|
→ close stdin after `shutdown` instead of sending `exit`; the server exits cleanly (code 0, no output), kill kept as a fallback
|
||||||
Enhancements:
|
Enhancements:
|
||||||
☐ Allow boolean literals in primitive union patterns (e.g. `true: () => "yes"`) @medium
|
☐ Allow boolean literals in primitive union patterns (e.g. `true: () => "yes"`) @medium
|
||||||
☐ Are there other primitive types that should be supported in union patterns? (e.g. `bigint`, `symbol`) @medium
|
☐ Are there other primitive types that should be supported in union patterns? (e.g. `bigint`, `symbol`) @medium
|
||||||
@@ -41,6 +63,7 @@ Documentation:
|
|||||||
☐ Add comparison section vs. other TS pattern-matching libs in Readme.md
|
☐ Add comparison section vs. other TS pattern-matching libs in Readme.md
|
||||||
☐ Write migration guide for users coming from discriminated unions
|
☐ Write migration guide for users coming from discriminated unions
|
||||||
☐ Create backlog tasks for implementation
|
☐ Create backlog tasks for implementation
|
||||||
|
✔ Document the matcher design paths in `development/` — union vs overload merge, inferred universe (`NoInfer`), conditional `RequireKeys`, cases-first — and why each was abandoned @done
|
||||||
☐ Validate code fences in Markdown (start with README.md) — compile the TypeScript examples against `src/` so the docs cannot drift from the API
|
☐ Validate code fences in Markdown (start with README.md) — compile the TypeScript examples against `src/` so the docs cannot drift from the API
|
||||||
|
|
||||||
Workflow:
|
Workflow:
|
||||||
|
|||||||
+84
-1
@@ -3,4 +3,87 @@
|
|||||||
The type-level design of the public API and the limitations it carries. The
|
The type-level design of the public API and the limitations it carries. The
|
||||||
user-facing reference is [README § API](../README.md#api).
|
user-facing reference is [README § API](../README.md#api).
|
||||||
|
|
||||||
Currently the library is placeholder code.
|
The matcher is implemented in `src/primitive.ts` and re-exported from
|
||||||
|
`src/index.ts` as `getMatcher` / `getMatcherW`; the rest of the library is
|
||||||
|
placeholder code.
|
||||||
|
|
||||||
|
## Matcher shape
|
||||||
|
|
||||||
|
#### Decision (2026-09)
|
||||||
|
|
||||||
|
A factory takes the universe and returns a builder; the builder takes a handler
|
||||||
|
map and an optional fallback:
|
||||||
|
|
||||||
|
```ts
|
||||||
|
const matcher = getMatcher<"a" | "b">()({ a: (s) => …, b: (s) => … });
|
||||||
|
const fallback = getMatcher<"a" | "b" | "c">()({ a: (s) => … }, (s) => …);
|
||||||
|
```
|
||||||
|
|
||||||
|
Exhaustive or fallback is decided **at the call site**, by whether the second
|
||||||
|
argument is present. The fallback's parameter is the remainder
|
||||||
|
`Exclude<T, keyof Handled>`. Only the return-strictness axis remains, so there
|
||||||
|
are two factories:
|
||||||
|
|
||||||
|
- `getMatcher` — one common `R`; the fallback must fit it;
|
||||||
|
- `getMatcherW` — the union `PatternReturns<Handled> | R`.
|
||||||
|
|
||||||
|
Each factory is two overloads whose order is load-bearing:
|
||||||
|
|
||||||
|
1. `Handlers<T, R>` — the exhaustive form, and the contextual type of the
|
||||||
|
handler-map popup;
|
||||||
|
2. `Handled extends Exact<Partial<Handlers<T, R>>, Handled>` plus
|
||||||
|
`Fallback<T, Handled, R>` — a partial handler map plus the fallback.
|
||||||
|
|
||||||
|
#### Why
|
||||||
|
|
||||||
|
- **The fallback is an argument, not a property.** TypeScript fixes a property's
|
||||||
|
contextual type before it infers its sibling keys, so `_: (s) => …` in the
|
||||||
|
handler map can only see all of `T`, never `Exclude<T, keyof Handled>`. A later
|
||||||
|
argument is contextually typed from inference on an earlier one, so the split
|
||||||
|
is what makes the remainder expressible.
|
||||||
|
- **Overload order keeps both messages.** #1 supplies the contextual type
|
||||||
|
(`a, b, c`); #2 accepts a partial map once a fallback is present, so its popup
|
||||||
|
is optional (`a?, b?, c?`). A gap without a fallback is reported against #1.
|
||||||
|
- **`R` needs an inference site.** `R` inside the `Exact<…>` constraint is not
|
||||||
|
one, so `handlers: Handled & Partial<Handlers<T, R>>` re-adds it; without that
|
||||||
|
`R` collapses to `unknown` when the handler params are inferred.
|
||||||
|
- **`Exact` restores the excess-property check.** TypeScript skips it for a
|
||||||
|
generic constraint, so without `Exact` the handler map accepts keys outside
|
||||||
|
`T`.
|
||||||
|
- Two factories, not four: the fallback is an argument, not a separate API.
|
||||||
|
|
||||||
|
#### Rejected
|
||||||
|
|
||||||
|
- **Single-object `_`** (the former shape). `_` sees only all of `T`; the
|
||||||
|
remainder is not expressible there, and an exhaustive map plus `_` was
|
||||||
|
accepted.
|
||||||
|
- **Curried handlers-first** — `(handlers)(fallback)`. `Handled` is fixed before
|
||||||
|
the second call, so a redundant-fallback guard would work. Rejected: two calls
|
||||||
|
for the common case.
|
||||||
|
- **`this` / HKT self-reference.** `this` is post-construction (method bodies,
|
||||||
|
return positions); a parameter's contextual type is pre-construction.
|
||||||
|
`keyof this` in an interface method is the interface, not the literal.
|
||||||
|
- **Variance / `const` type parameters / `NoInfer` / `unique symbol` brands /
|
||||||
|
defaulted type-param guards.** None change inference or evaluation order;
|
||||||
|
`in`/`out` on the handler map broke contextual typing outright. `NoInfer`
|
||||||
|
specifically leaks into the emitted `.d.ts`, raising the consumer floor to
|
||||||
|
TypeScript 5.4 (README promises `>= 5.0`).
|
||||||
|
- **Union merge**, **overload merge with only the exhaustive arm last**,
|
||||||
|
**inferred universe**, **conditional `RequireKeys`**, **cases-first curried** —
|
||||||
|
decided against while the API was single-object; their reasons (reported
|
||||||
|
near-miss member, no `_` in the exhaustive popup, `NoInfer`/floor, `keyof P`
|
||||||
|
counts optional keys, not pipe-friendly) hold where they still apply.
|
||||||
|
|
||||||
|
#### Known issue
|
||||||
|
|
||||||
|
- A redundant fallback is accepted: when the handler map already covers `T`, the
|
||||||
|
fallback is still allowed. The guard would be
|
||||||
|
`Exclude<T, keyof Handled> extends never ? never : unknown`, but the
|
||||||
|
conditional is evaluated before `Handled` is inferred; currying is the only
|
||||||
|
encoding that fixes it (see Rejected).
|
||||||
|
- `PatternReturns` must be
|
||||||
|
`ReturnType<Extract<ValueOf<P>, (...args: never[]) => unknown>>` so it survives
|
||||||
|
the closed, partly-optional `P` constraints.
|
||||||
|
- `Parameters<typeof factory>[0]` resolves only the **last** overload, so it is
|
||||||
|
not a sound "rejected" oracle for a factory. Factory-negative tests use
|
||||||
|
`@ts-expect-error` call sites (the test file only — the general ban stands).
|
||||||
+106
-5
@@ -30,7 +30,8 @@ before the implementation.
|
|||||||
- Testing the type only: it would not catch handler dispatch or the `_`
|
- Testing the type only: it would not catch handler dispatch or the `_`
|
||||||
fallback (see `src/primitive.test.ts`).
|
fallback (see `src/primitive.test.ts`).
|
||||||
|
|
||||||
The runner is `node --test --strip-types "src/**/*.test.ts"` and the tiers are in
|
The runner is `node --test --strip-types "src/**/*.test.ts"` and the tiers are
|
||||||
|
in
|
||||||
[CONTRIBUTING.md § Development commands](../CONTRIBUTING.md#development-commands).
|
[CONTRIBUTING.md § Development commands](../CONTRIBUTING.md#development-commands).
|
||||||
`c8` uses V8 coverage, so the `--strip-types` source is instrumented without a
|
`c8` uses V8 coverage, so the `--strip-types` source is instrumented without a
|
||||||
build step, and the runner relies on the `.ts` import-extension convention (see
|
build step, and the runner relies on the `.ts` import-extension convention (see
|
||||||
@@ -63,11 +64,111 @@ separated by a blank line; an empty block drops its label.
|
|||||||
- Unlabeled ordering (bare blank lines): the seams still have to be found by
|
- Unlabeled ordering (bare blank lines): the seams still have to be found by
|
||||||
reading; the labels cost nothing.
|
reading; the labels cost nothing.
|
||||||
|
|
||||||
|
## Test helpers
|
||||||
|
|
||||||
|
The rule is enforced by `import/no-relative-parent-imports`; this section records
|
||||||
|
why the mechanism is shaped like this.
|
||||||
|
|
||||||
|
#### Decision (2026-09)
|
||||||
|
|
||||||
|
A shared test helper — code that scattered `*.test.ts` files import to do their
|
||||||
|
testing — lives under `src/util/__tests__/` and is addressed by the
|
||||||
|
`#test-utils/…` self-reference (`package.json#imports`:
|
||||||
|
`"#test-utils/*": "./src/util/__tests__/*"`), never by a relative path:
|
||||||
|
|
||||||
|
```ts
|
||||||
|
import { LspSession } from "#test-utils/lsp-completion.ts";
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Why
|
||||||
|
|
||||||
|
- The lint rule bans upward (`../`) imports, and a cross-cutting helper can
|
||||||
|
always be placed above _some_ scattered consumer, wherever it goes. Name
|
||||||
|
beats path: a `#test-utils/…` specifier has no direction, so the rule never
|
||||||
|
fires and file moves only touch the one mapping in `package.json`.
|
||||||
|
- `#…` is Node's reserved prefix for _private_ subpath imports: publishing
|
||||||
|
`package.json` leaks nothing and resolves nothing for consumers.
|
||||||
|
- `__tests__` as the folder name is not about tests living there; it is the
|
||||||
|
directory pattern `tsconfig.build.json` already excludes, so a helper can
|
||||||
|
never be emitted into `dist/` and shipped by accident.
|
||||||
|
- Node's own resolver handles `#…` under `--strip-types`, and `tsc` resolves it
|
||||||
|
via the same `imports` field — one mechanism for runtime and type gate, no
|
||||||
|
loader needed.
|
||||||
|
- The helper uses `node:` builtins (it drives a language server), so
|
||||||
|
`import/no-nodejs-modules` is off for `src/util/__tests__/**` in
|
||||||
|
`.oxlintrc.json` — the same exception the `scripts/**` scope carries.
|
||||||
|
- Helpers carry no library coupling: their tests probe in-memory documents
|
||||||
|
whose contextual types are written inline, so only the helper's own contract
|
||||||
|
(marker handling, position, label extraction) is under test. A test that
|
||||||
|
asserts a _matcher's_ popup belongs with the matcher.
|
||||||
|
|
||||||
|
#### Rejected
|
||||||
|
|
||||||
|
- A helper beside the tests (`src/util/test.ts`, flat `src/`): composes only
|
||||||
|
while `src/` stays flat; the first nested test reaching it reintroduces the
|
||||||
|
banned upward import.
|
||||||
|
- Bare `~/…` specifier: not valid in `imports` (keys must start with `#`) —
|
||||||
|
resolution fails at runtime with `ERR_MODULE_NOT_FOUND`. A `#~/…` “home”
|
||||||
|
shorthand was dropped in review; `#test-utils/…` states what it is.
|
||||||
|
- tsconfig `paths` alias: resolves for `tsc` but not for plain
|
||||||
|
`node --test --strip-types` (no loader hook), breaking the fast tier.
|
||||||
|
- Turning `import/no-relative-parent-imports` off for test files: the rule
|
||||||
|
still guards non-test helpers importing each other, and the exemption is
|
||||||
|
only needed for the one specifier the mapping already solves cleanly.
|
||||||
|
|
||||||
|
## Autocomplete
|
||||||
|
|
||||||
|
#### Decision (2026-09)
|
||||||
|
|
||||||
|
Completion is verified by driving the repo's own language server
|
||||||
|
(`tsc --lsp --stdio`, the same server pi's LSP extension talks to) through
|
||||||
|
the test helper `#test-utils/lsp-completion.ts`
|
||||||
|
(`src/util/__tests__/lsp-completion.ts`), not through the type system:
|
||||||
|
|
||||||
|
```sh
|
||||||
|
node --strip-types src/util/__tests__/lsp-completion.ts <file> [<marker>]
|
||||||
|
```
|
||||||
|
|
||||||
|
The script prints the labels the server offers at a `/*COMPLETE*/` marker inside
|
||||||
|
`<file>` (the marker is stripped before the document is sent). Its `LspSession`
|
||||||
|
is imported by `src/util/__tests__/lsp-completion.test.ts` — which tests the
|
||||||
|
helper itself against inline documents, never the library's code — and by
|
||||||
|
`src/primitive.test.ts`, where the same probe asserts the matcher's popup;
|
||||||
|
the CLI is for manual inspection.
|
||||||
|
|
||||||
|
#### Why
|
||||||
|
|
||||||
|
- Completion is a contextual-type property: it depends on which overload
|
||||||
|
signature TypeScript picks for the object literal, and no type-level assertion
|
||||||
|
observes that.
|
||||||
|
- `Parameters<typeof factory>[0]` resolves only the _last_ overload, so it is
|
||||||
|
not the popup's contextual type either — see
|
||||||
|
[library.md § Matcher shape](./library.md#matcher-shape).
|
||||||
|
- The server is the only ground truth; the script reproduces what the editor
|
||||||
|
shows.
|
||||||
|
|
||||||
|
#### Rejected
|
||||||
|
|
||||||
|
- **`expect-type` would not work**: there is no operator for “the popup offers
|
||||||
|
these labels”. `toExtend` / `toEqualTypeOf` test assignability and cannot say
|
||||||
|
which overload supplied the contextual type.
|
||||||
|
- **Checking by hand in the editor**: not reproducible in review or by an agent.
|
||||||
|
- **`@ts-expect-error` at a completion position**: it asserts the absence of a
|
||||||
|
compile error, not the presence of specific labels.
|
||||||
|
|
||||||
|
#### Known issue
|
||||||
|
|
||||||
|
- Each test spawns its own `tsc` server so the tests share no state and pass in
|
||||||
|
any order; the file is an integration test (~1.6 s) that needs `node_modules`.
|
||||||
|
`didOpen` is handled in order before the completion request, so no settle
|
||||||
|
delay is needed.
|
||||||
|
- The server answers some requests with a string id (`client/registerCapability`);
|
||||||
|
the client must tolerate `string | number` ids or the server stalls.
|
||||||
|
|
||||||
## Known issues
|
## Known issues
|
||||||
|
|
||||||
- The type-aware linter misidentifies `expectTypeOf()` as a floating promise, so
|
- The type-aware linter misidentifies `expectTypeOf()` as a floating promise, so
|
||||||
test files that use it (`src/primitive.test.ts`) carry a
|
test files that use it (`src/primitive.test.ts`) carry a file-level
|
||||||
file-level `oxlint-disable
|
`oxlint-disable typescript/no-floating-promises` with an explanatory comment.
|
||||||
typescript/no-floating-promises` with an explanatory comment. It is a known
|
It is a known false positive, not a rule worth disabling project-wide (see
|
||||||
false positive, not a rule worth disabling project-wide (see
|
|
||||||
[tooling.md § oxlint-disable directives live next to the code](./tooling.md#oxlint-disable-directives-live-next-to-the-code)).
|
[tooling.md § oxlint-disable directives live next to the code](./tooling.md#oxlint-disable-directives-live-next-to-the-code)).
|
||||||
@@ -24,6 +24,8 @@ in [package.json](../package.json).
|
|||||||
- **@spences10/pi-lsp** — read-only LSP code intelligence for AI agents
|
- **@spences10/pi-lsp** — read-only LSP code intelligence for AI agents
|
||||||
(project-local `.pi/settings.json`); talks to this repo's TypeScript 7 via
|
(project-local `.pi/settings.json`); talks to this repo's TypeScript 7 via
|
||||||
`tsc --lsp --stdio`.
|
`tsc --lsp --stdio`.
|
||||||
|
- **vscode-languageserver-protocol** — LSP client and protocol types for the
|
||||||
|
autocomplete test helper (`src/util/__tests__/lsp-completion.ts`).
|
||||||
|
|
||||||
When each runs is in
|
When each runs is in
|
||||||
[CONTRIBUTING.md § Feedback tiers](../CONTRIBUTING.md#feedback-tiers).
|
[CONTRIBUTING.md § Feedback tiers](../CONTRIBUTING.md#feedback-tiers).
|
||||||
@@ -247,6 +249,38 @@ project.
|
|||||||
- The same script works by hand (whole project) and staged (scoped), so there is
|
- The same script works by hand (whole project) and staged (scoped), so there is
|
||||||
no second command to maintain.
|
no second command to maintain.
|
||||||
|
|
||||||
|
## Language server tooling
|
||||||
|
|
||||||
|
### `vscode-languageserver-protocol` backs the autocomplete helper
|
||||||
|
|
||||||
|
#### Decision (2026-09)
|
||||||
|
|
||||||
|
The autocomplete helper (`src/util/__tests__/lsp-completion.ts`) drives
|
||||||
|
`tsc --lsp --stdio` through `vscode-languageserver-protocol`'s
|
||||||
|
`createMessageConnection` and its typed request / notification objects, instead
|
||||||
|
of a hand-rolled JSON-RPC client.
|
||||||
|
|
||||||
|
#### Why
|
||||||
|
|
||||||
|
- Framing, `Content-Length` parsing, the pending-request map and server-request
|
||||||
|
dispatch are protocol plumbing the helper only reimplemented; the official
|
||||||
|
client owns them and tolerates the server's `string | number` ids.
|
||||||
|
- `InitializeRequest`, `CompletionRequest`, `DidOpenTextDocumentNotification`,
|
||||||
|
… carry their parameter and result types, so `CompletionList` / `CompletionItem`
|
||||||
|
replace the helper's ad-hoc shape guards.
|
||||||
|
- The `./node` entry re-exports `vscode-jsonrpc/node`, so one devDependency
|
||||||
|
supplies both the transport and the protocol types. It is test-only and never
|
||||||
|
ships (`files` publishes `dist/` only).
|
||||||
|
|
||||||
|
#### Rejected
|
||||||
|
|
||||||
|
- `vscode-languageclient`: the editor-side client with a full feature registry
|
||||||
|
— far more than a test helper needs.
|
||||||
|
- Generic JSON-RPC (`jsonrpc-lite`, `jayson`): still no LSP types, so they
|
||||||
|
replace framing only and leave the typed protocol surface unimplemented.
|
||||||
|
- Keeping the hand-rolled client: the low-level shape is the maintenance cost
|
||||||
|
the helper exists to remove, and it must be re-audited against the server.
|
||||||
|
|
||||||
## Editor and agent tooling
|
## Editor and agent tooling
|
||||||
|
|
||||||
### VSCode integration
|
### VSCode integration
|
||||||
|
|||||||
Generated
+32
-3
@@ -1,12 +1,12 @@
|
|||||||
{
|
{
|
||||||
"name": "tiny-pattern-ts",
|
"name": "tiny-pattern-ts",
|
||||||
"version": "0.2.0",
|
"version": "0.4.0",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "tiny-pattern-ts",
|
"name": "tiny-pattern-ts",
|
||||||
"version": "0.2.0",
|
"version": "0.4.0",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"type-fest": "^5.9.0"
|
"type-fest": "^5.9.0"
|
||||||
@@ -27,7 +27,8 @@
|
|||||||
"oxlint": "^1.83.0",
|
"oxlint": "^1.83.0",
|
||||||
"oxlint-tsgolint": "^7.0.2001",
|
"oxlint-tsgolint": "^7.0.2001",
|
||||||
"publint": "^0.3.24",
|
"publint": "^0.3.24",
|
||||||
"typescript": "^7.0.2"
|
"typescript": "^7.0.2",
|
||||||
|
"vscode-languageserver-protocol": "^3.18.3"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=26"
|
"node": ">=26"
|
||||||
@@ -4822,6 +4823,27 @@
|
|||||||
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
|
"node": "^14.17.0 || ^16.13.0 || >=18.0.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/vscode-jsonrpc": {
|
||||||
|
"version": "9.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/vscode-jsonrpc/-/vscode-jsonrpc-9.0.2.tgz",
|
||||||
|
"integrity": "sha512-SbQSV9yRemARxeXw6LU5sS6Zq0e9/DgCCX5yelH263ZQWukbTk8EF8fjTrr1dziasf4GwlJbvTwFnTrnQFWZXQ==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=14.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"node_modules/vscode-languageserver-protocol": {
|
||||||
|
"version": "3.18.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/vscode-languageserver-protocol/-/vscode-languageserver-protocol-3.18.3.tgz",
|
||||||
|
"integrity": "sha512-DF49+WeV5py4zO5hhobp60jjsDSK0lAqA0OuKBLBvp423HPWQcCbhZz3JgyfIewsEz2f8U+X75xNIFHdiXZm2w==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT",
|
||||||
|
"dependencies": {
|
||||||
|
"vscode-jsonrpc": "9.0.2",
|
||||||
|
"vscode-languageserver-types": "3.18.3"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/vscode-languageserver-textdocument": {
|
"node_modules/vscode-languageserver-textdocument": {
|
||||||
"version": "1.0.14",
|
"version": "1.0.14",
|
||||||
"resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.14.tgz",
|
"resolved": "https://registry.npmjs.org/vscode-languageserver-textdocument/-/vscode-languageserver-textdocument-1.0.14.tgz",
|
||||||
@@ -4829,6 +4851,13 @@
|
|||||||
"dev": true,
|
"dev": true,
|
||||||
"license": "MIT"
|
"license": "MIT"
|
||||||
},
|
},
|
||||||
|
"node_modules/vscode-languageserver-types": {
|
||||||
|
"version": "3.18.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.18.3.tgz",
|
||||||
|
"integrity": "sha512-XIlzJ7Qp/jzSI1ds7/FwPAWrPeTZA7pAtlW4hdJ1J6xXWJL6dR9QYnDhJOdLzdKhUQ5Mm6mvUMw+3DcOQQasPw==",
|
||||||
|
"dev": true,
|
||||||
|
"license": "MIT"
|
||||||
|
},
|
||||||
"node_modules/vscode-uri": {
|
"node_modules/vscode-uri": {
|
||||||
"version": "3.2.0",
|
"version": "3.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/vscode-uri/-/vscode-uri-3.2.0.tgz",
|
||||||
|
|||||||
+6
-2
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "tiny-pattern-ts",
|
"name": "tiny-pattern-ts",
|
||||||
"version": "0.2.0",
|
"version": "0.4.0",
|
||||||
"description": "Pattern matching for TypeScript/ESM environments (F#-style, not regex)",
|
"description": "Pattern matching for TypeScript/ESM environments (F#-style, not regex)",
|
||||||
"keywords": [
|
"keywords": [
|
||||||
"adt",
|
"adt",
|
||||||
@@ -27,6 +27,9 @@
|
|||||||
],
|
],
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"sideEffects": false,
|
"sideEffects": false,
|
||||||
|
"imports": {
|
||||||
|
"#test-utils/*": "./src/util/__tests__/*"
|
||||||
|
},
|
||||||
"exports": {
|
"exports": {
|
||||||
".": {
|
".": {
|
||||||
"types": "./dist/index.d.ts",
|
"types": "./dist/index.d.ts",
|
||||||
@@ -84,7 +87,8 @@
|
|||||||
"oxlint": "^1.83.0",
|
"oxlint": "^1.83.0",
|
||||||
"oxlint-tsgolint": "^7.0.2001",
|
"oxlint-tsgolint": "^7.0.2001",
|
||||||
"publint": "^0.3.24",
|
"publint": "^0.3.24",
|
||||||
"typescript": "^7.0.2"
|
"typescript": "^7.0.2",
|
||||||
|
"vscode-languageserver-protocol": "^3.18.3"
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=26"
|
"node": ">=26"
|
||||||
|
|||||||
+3
-3
@@ -73,9 +73,9 @@ git show-ref --verify --quiet "refs/heads/${BASE}" || {
|
|||||||
exit 1
|
exit 1
|
||||||
}
|
}
|
||||||
|
|
||||||
# Derive the remote rather than hardcoding it: this repo has `origin` (ssh) and
|
# Derive the remote rather than hardcoding it: `main` tracks `origin` (ssh)
|
||||||
# `origin_https`, and `main` tracks the latter — `git fetch origin main` would
|
# here; a hardcoded name would check currency against a ref that may not
|
||||||
# check currency against a ref that is never updated here.
|
# exist on a differently configured clone.
|
||||||
# `--quiet` echoes the unresolved `main@{upstream}` literal to stdout on
|
# `--quiet` echoes the unresolved `main@{upstream}` literal to stdout on
|
||||||
# failure, so it cannot be paired with a `$(...) || fallback`; the non-quiet
|
# failure, so it cannot be paired with a `$(...) || fallback`; the non-quiet
|
||||||
# form prints nothing on failure and the fallback runs.
|
# form prints nothing on failure and the fallback runs.
|
||||||
|
|||||||
+1
-6
@@ -1,6 +1 @@
|
|||||||
export {
|
export { getMatcher, getMatcherW } from "./primitive.ts";
|
||||||
getPrimitiveUnionMatcher,
|
|
||||||
getPrimitiveUnionMatcherPartial,
|
|
||||||
getPrimitiveUnionMatcherPartialW,
|
|
||||||
getPrimitiveUnionMatcherW,
|
|
||||||
} from "./primitive.ts";
|
|
||||||
+358
-224
@@ -1,50 +1,49 @@
|
|||||||
/* oxlint-disable typescript/no-floating-promises -- expectTypeOf() is a sync type-assertion library that the type-aware linter misidentifies as a promise */
|
/* oxlint-disable typescript/no-floating-promises -- expectTypeOf() is a sync type-assertion library that the type-aware linter misidentifies as a promise */
|
||||||
import { strict as assert } from "node:assert";
|
import { strict as assert } from "node:assert";
|
||||||
|
import path from "node:path";
|
||||||
import { test } from "node:test";
|
import { test } from "node:test";
|
||||||
|
|
||||||
import { expectTypeOf } from "expect-type";
|
import { expectTypeOf } from "expect-type";
|
||||||
|
|
||||||
import {
|
import {
|
||||||
getPrimitiveUnionMatcher,
|
type CompletionTarget,
|
||||||
getPrimitiveUnionMatcherPartial,
|
LspSession,
|
||||||
getPrimitiveUnionMatcherPartialW,
|
} from "#test-utils/lsp-completion.ts";
|
||||||
getPrimitiveUnionMatcherW,
|
|
||||||
} from "./primitive.ts";
|
import { getMatcher, getMatcherW } from "./primitive.ts";
|
||||||
|
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
// API: getPrimitiveUnionMatcherW — ✔️ Exhaustive / ❌ ReturnsStrict
|
// API: getMatcher — ✔️ Exhaustive / ✔️ ReturnsStrict
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
test("getPrimitiveUnionMatcherW requires every literal key", () => {
|
test("getMatcher: exhaustive pattern infers one common return type", () => {
|
||||||
// Arrange
|
// Arrange
|
||||||
const factory = getPrimitiveUnionMatcherW<"a" | "b">();
|
const factory = getMatcher<"a" | "b">();
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
const matcher = factory({
|
const matcher = factory({
|
||||||
a: (s) => {
|
a: (s) => {
|
||||||
expectTypeOf(s).toEqualTypeOf<"a">();
|
expectTypeOf(s).toEqualTypeOf<"a">();
|
||||||
return 1 as const;
|
return 1;
|
||||||
},
|
},
|
||||||
b: (s) => {
|
b: (s) => {
|
||||||
expectTypeOf(s).toEqualTypeOf<"b">();
|
expectTypeOf(s).toEqualTypeOf<"b">();
|
||||||
return "two" as const;
|
return 2;
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
// ❌ ReturnsStrict: mixed handler returns widen to their union.
|
// ✔️ ReturnsStrict: R is the best common return type, not a widening union.
|
||||||
expectTypeOf(matcher).toEqualTypeOf<(shape: "a" | "b") => 1 | "two">();
|
expectTypeOf(matcher).toEqualTypeOf<(shape: "a" | "b") => number>();
|
||||||
// A pattern missing a key must not satisfy the parameter type.
|
// ❌ a value outside T must not be accepted by the matcher
|
||||||
expectTypeOf<{
|
expectTypeOf<"c">().not.toExtend<Parameters<typeof matcher>[0]>();
|
||||||
a: () => number;
|
|
||||||
}>().not.toExtend<Parameters<typeof factory>[0]>();
|
|
||||||
assert.equal(matcher("a"), 1);
|
assert.equal(matcher("a"), 1);
|
||||||
assert.equal(matcher("b"), "two");
|
assert.equal(matcher("b"), 2);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("getPrimitiveUnionMatcherW dispatches on numeric literal keys", () => {
|
test("getMatcher: dispatches on numeric literal keys", () => {
|
||||||
// Arrange
|
// Arrange
|
||||||
const factory = getPrimitiveUnionMatcherW<1 | 2>();
|
const factory = getMatcher<1 | 2>();
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
const matcher = factory({
|
const matcher = factory({
|
||||||
@@ -64,9 +63,132 @@ test("getPrimitiveUnionMatcherW dispatches on numeric literal keys", () => {
|
|||||||
assert.equal(matcher(2), 20);
|
assert.equal(matcher(2), 20);
|
||||||
});
|
});
|
||||||
|
|
||||||
test("getPrimitiveUnionMatcherW dispatches on mixed string and numeric keys", () => {
|
test("getMatcher: dispatches on mixed string and numeric keys", () => {
|
||||||
// Arrange
|
// Arrange
|
||||||
const factory = getPrimitiveUnionMatcherW<"a" | "b" | 1 | 2>();
|
const factory = getMatcher<"a" | "b" | 1 | 2>();
|
||||||
|
|
||||||
|
// Act
|
||||||
|
const matcher = factory({
|
||||||
|
a: (s) => {
|
||||||
|
expectTypeOf(s).toEqualTypeOf<"a">();
|
||||||
|
return 1;
|
||||||
|
},
|
||||||
|
b: (s) => {
|
||||||
|
expectTypeOf(s).toEqualTypeOf<"b">();
|
||||||
|
return 2;
|
||||||
|
},
|
||||||
|
1: (n) => {
|
||||||
|
expectTypeOf(n).toEqualTypeOf<1>();
|
||||||
|
return 10;
|
||||||
|
},
|
||||||
|
2: (n) => {
|
||||||
|
expectTypeOf(n).toEqualTypeOf<2>();
|
||||||
|
return 20;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
expectTypeOf(matcher).toEqualTypeOf<(shape: "a" | "b" | 1 | 2) => number>();
|
||||||
|
assert.equal(matcher("a"), 1);
|
||||||
|
assert.equal(matcher("b"), 2);
|
||||||
|
assert.equal(matcher(1), 10);
|
||||||
|
assert.equal(matcher(2), 20);
|
||||||
|
});
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// API: getMatcher — ❌ Exhaustive (fallback) / ✔️ ReturnsStrict
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
test("getMatcher: a `_` fallback receives the unhandled keys", () => {
|
||||||
|
// Arrange
|
||||||
|
const factory = getMatcher<"a" | "b" | "c">();
|
||||||
|
|
||||||
|
// Act
|
||||||
|
const matcher = factory(
|
||||||
|
{
|
||||||
|
a: (s) => {
|
||||||
|
expectTypeOf(s).toEqualTypeOf<"a">();
|
||||||
|
return 1 as const;
|
||||||
|
},
|
||||||
|
},
|
||||||
|
(s) => {
|
||||||
|
// The fallback sees only the keys `a` did not handle.
|
||||||
|
expectTypeOf(s).toEqualTypeOf<"b" | "c">();
|
||||||
|
return 2 as const;
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
expectTypeOf(matcher).toEqualTypeOf<(shape: "a" | "b" | "c") => 1 | 2>();
|
||||||
|
// ❌ a value outside T must not be accepted by the matcher
|
||||||
|
expectTypeOf<"d">().not.toExtend<Parameters<typeof matcher>[0]>();
|
||||||
|
assert.equal(matcher("a"), 1);
|
||||||
|
assert.equal(matcher("b"), 2);
|
||||||
|
assert.equal(matcher("c"), 2);
|
||||||
|
});
|
||||||
|
|
||||||
|
test("getMatcher: a `_` fallback routes mixed string and numeric gaps", () => {
|
||||||
|
// Arrange
|
||||||
|
const factory = getMatcher<"a" | "b" | 1 | 2>();
|
||||||
|
|
||||||
|
// Act
|
||||||
|
const matcher = factory(
|
||||||
|
{
|
||||||
|
a: (s) => {
|
||||||
|
expectTypeOf(s).toEqualTypeOf<"a">();
|
||||||
|
return "A";
|
||||||
|
},
|
||||||
|
1: (n) => {
|
||||||
|
expectTypeOf(n).toEqualTypeOf<1>();
|
||||||
|
return "one";
|
||||||
|
},
|
||||||
|
},
|
||||||
|
(s) => {
|
||||||
|
expectTypeOf(s).toEqualTypeOf<"b" | 2>();
|
||||||
|
return "fallback";
|
||||||
|
},
|
||||||
|
);
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
expectTypeOf(matcher).toEqualTypeOf<(shape: "a" | "b" | 1 | 2) => string>();
|
||||||
|
assert.equal(matcher("a"), "A");
|
||||||
|
assert.equal(matcher("b"), "fallback");
|
||||||
|
assert.equal(matcher(1), "one");
|
||||||
|
assert.equal(matcher(2), "fallback");
|
||||||
|
});
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// API: getMatcherW — ✔️ Exhaustive / ❌ ReturnsStrict
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
test("getMatcherW: exhaustive pattern widens to the union of handler returns", () => {
|
||||||
|
// Arrange
|
||||||
|
const factory = getMatcherW<"x" | "y">();
|
||||||
|
|
||||||
|
// Act
|
||||||
|
const matcher = factory({
|
||||||
|
x: (s) => {
|
||||||
|
expectTypeOf(s).toEqualTypeOf<"x">();
|
||||||
|
return 1 as const;
|
||||||
|
},
|
||||||
|
y: (s) => {
|
||||||
|
expectTypeOf(s).toEqualTypeOf<"y">();
|
||||||
|
return "two" as const;
|
||||||
|
},
|
||||||
|
});
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
// ❌ ReturnsStrict: mixed handler returns widen to their union.
|
||||||
|
expectTypeOf(matcher).toEqualTypeOf<(shape: "x" | "y") => 1 | "two">();
|
||||||
|
// ❌ a value outside T must not be accepted by the matcher
|
||||||
|
expectTypeOf<"z">().not.toExtend<Parameters<typeof matcher>[0]>();
|
||||||
|
assert.equal(matcher("x"), 1);
|
||||||
|
assert.equal(matcher("y"), "two");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("getMatcherW: dispatches on mixed string and numeric keys", () => {
|
||||||
|
// Arrange
|
||||||
|
const factory = getMatcherW<"a" | "b" | 1 | 2>();
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
const matcher = factory({
|
const matcher = factory({
|
||||||
@@ -99,214 +221,46 @@ test("getPrimitiveUnionMatcherW dispatches on mixed string and numeric keys", ()
|
|||||||
});
|
});
|
||||||
|
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
// API: getPrimitiveUnionMatcher — ✔️ Exhaustive / ✔️ ReturnsStrict
|
// API: getMatcherW — ❌ Exhaustive (fallback) / ❌ ReturnsStrict
|
||||||
// ============================================================================
|
// ============================================================================
|
||||||
|
|
||||||
test("getPrimitiveUnionMatcher infers a single return type shared by all handlers", () => {
|
test("getMatcherW: a `_` fallback widens gaps into the union", () => {
|
||||||
// Arrange
|
// Arrange
|
||||||
const factory = getPrimitiveUnionMatcher<"a" | "b">();
|
const factory = getMatcherW<"x" | "y" | "z">();
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
const matcher = factory({
|
const matcher = factory(
|
||||||
a: (s): number => {
|
{
|
||||||
expectTypeOf(s).toEqualTypeOf<"a">();
|
|
||||||
return 1;
|
|
||||||
},
|
|
||||||
b: (s): 1 | 2 => {
|
|
||||||
expectTypeOf(s).toEqualTypeOf<"b">();
|
|
||||||
return 2;
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
// Assert
|
|
||||||
// ✔️ ReturnsStrict: R is the best common return type, not a widening union.
|
|
||||||
expectTypeOf(matcher).toEqualTypeOf<(shape: "a" | "b") => number>();
|
|
||||||
assert.equal(matcher("a"), 1);
|
|
||||||
assert.equal(matcher("b"), 2);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("getPrimitiveUnionMatcher handlers receive the matched literal", () => {
|
|
||||||
// Arrange
|
|
||||||
const factory = getPrimitiveUnionMatcher<"on" | "off">();
|
|
||||||
|
|
||||||
// Act
|
|
||||||
const matcher = factory({
|
|
||||||
on: (s) => {
|
|
||||||
expectTypeOf(s).toEqualTypeOf<"on">();
|
|
||||||
return `handler ${s}`;
|
|
||||||
},
|
|
||||||
off: (s) => {
|
|
||||||
expectTypeOf(s).toEqualTypeOf<"off">();
|
|
||||||
return `handler ${s}`;
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
// Assert
|
|
||||||
expectTypeOf(matcher).toEqualTypeOf<(shape: "on" | "off") => string>();
|
|
||||||
assert.equal(matcher("on"), "handler on");
|
|
||||||
assert.equal(matcher("off"), "handler off");
|
|
||||||
});
|
|
||||||
|
|
||||||
test("getPrimitiveUnionMatcher infers one return type across mixed string and numeric keys", () => {
|
|
||||||
// Arrange
|
|
||||||
const factory = getPrimitiveUnionMatcher<"a" | "b" | 1 | 2>();
|
|
||||||
|
|
||||||
// Act
|
|
||||||
const matcher = factory({
|
|
||||||
a: (s): number => {
|
|
||||||
expectTypeOf(s).toEqualTypeOf<"a">();
|
|
||||||
return 1;
|
|
||||||
},
|
|
||||||
b: (s): 1 | 2 => {
|
|
||||||
expectTypeOf(s).toEqualTypeOf<"b">();
|
|
||||||
return 2;
|
|
||||||
},
|
|
||||||
1: (n): number => {
|
|
||||||
expectTypeOf(n).toEqualTypeOf<1>();
|
|
||||||
return 10;
|
|
||||||
},
|
|
||||||
2: (n): number => {
|
|
||||||
expectTypeOf(n).toEqualTypeOf<2>();
|
|
||||||
return 20;
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
// Assert
|
|
||||||
// ✔️ ReturnsStrict: R is the best common return type, not a widening union.
|
|
||||||
expectTypeOf(matcher).toEqualTypeOf<(shape: "a" | "b" | 1 | 2) => number>();
|
|
||||||
assert.equal(matcher("a"), 1);
|
|
||||||
assert.equal(matcher("b"), 2);
|
|
||||||
assert.equal(matcher(1), 10);
|
|
||||||
assert.equal(matcher(2), 20);
|
|
||||||
});
|
|
||||||
|
|
||||||
// ============================================================================
|
|
||||||
// API: getPrimitiveUnionMatcherPartial — ❌ Exhaustive / ✔️ ReturnsStrict
|
|
||||||
// ============================================================================
|
|
||||||
|
|
||||||
test("getPrimitiveUnionMatcherPartial routes shapes without a handler to _", () => {
|
|
||||||
// Arrange
|
|
||||||
const factory = getPrimitiveUnionMatcherPartial<"a" | "b" | "c">();
|
|
||||||
// Two keys, so `{ a }` lacks only the `_` fallback, nothing else.
|
|
||||||
const sparseFactory = getPrimitiveUnionMatcherPartial<"a" | "b">();
|
|
||||||
|
|
||||||
// Act
|
|
||||||
const matcher = factory({
|
|
||||||
a: (s): 1 | 2 => {
|
|
||||||
expectTypeOf(s).toEqualTypeOf<"a">();
|
|
||||||
return 1;
|
|
||||||
},
|
|
||||||
_: (s): 1 | 2 => {
|
|
||||||
// The fallback sees the whole union, not a single literal.
|
|
||||||
expectTypeOf(s).toEqualTypeOf<"a" | "b" | "c">();
|
|
||||||
return 2;
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
// Assert
|
|
||||||
expectTypeOf(matcher).toEqualTypeOf<(shape: "a" | "b" | "c") => 1 | 2>();
|
|
||||||
// ❌ Exhaustive: gaps are allowed, but only with a `_` fallback.
|
|
||||||
expectTypeOf<{
|
|
||||||
a: () => number;
|
|
||||||
}>().not.toExtend<Parameters<typeof sparseFactory>[0]>();
|
|
||||||
assert.equal(matcher("a"), 1);
|
|
||||||
assert.equal(matcher("b"), 2);
|
|
||||||
assert.equal(matcher("c"), 2);
|
|
||||||
});
|
|
||||||
|
|
||||||
test("getPrimitiveUnionMatcherPartial also accepts an exhaustive pattern", () => {
|
|
||||||
// Arrange
|
|
||||||
const factory = getPrimitiveUnionMatcherPartial<"a" | "b">();
|
|
||||||
|
|
||||||
// Act
|
|
||||||
const matcher = factory({
|
|
||||||
a: (s) => {
|
|
||||||
expectTypeOf(s).toEqualTypeOf<"a">();
|
|
||||||
return "A";
|
|
||||||
},
|
|
||||||
b: (s) => {
|
|
||||||
expectTypeOf(s).toEqualTypeOf<"b">();
|
|
||||||
return "B";
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
// Assert
|
|
||||||
expectTypeOf(matcher).toEqualTypeOf<(shape: "a" | "b") => string>();
|
|
||||||
assert.equal(matcher("a"), "A");
|
|
||||||
assert.equal(matcher("b"), "B");
|
|
||||||
});
|
|
||||||
|
|
||||||
test("getPrimitiveUnionMatcherPartial routes mixed string and numeric keys, gaps go to _", () => {
|
|
||||||
// Arrange
|
|
||||||
const factory = getPrimitiveUnionMatcherPartial<"a" | "b" | 1 | 2>();
|
|
||||||
|
|
||||||
// Act
|
|
||||||
const matcher = factory({
|
|
||||||
a: (s): string => {
|
|
||||||
expectTypeOf(s).toEqualTypeOf<"a">();
|
|
||||||
return "A";
|
|
||||||
},
|
|
||||||
1: (n): string => {
|
|
||||||
expectTypeOf(n).toEqualTypeOf<1>();
|
|
||||||
return "one";
|
|
||||||
},
|
|
||||||
_: (s): string => {
|
|
||||||
// The fallback sees the whole union, not a single literal.
|
|
||||||
expectTypeOf(s).toEqualTypeOf<"a" | "b" | 1 | 2>();
|
|
||||||
return "fallback";
|
|
||||||
},
|
|
||||||
});
|
|
||||||
|
|
||||||
// Assert
|
|
||||||
expectTypeOf(matcher).toEqualTypeOf<(shape: "a" | "b" | 1 | 2) => string>();
|
|
||||||
assert.equal(matcher("a"), "A");
|
|
||||||
assert.equal(matcher("b"), "fallback");
|
|
||||||
assert.equal(matcher(1), "one");
|
|
||||||
assert.equal(matcher(2), "fallback");
|
|
||||||
});
|
|
||||||
|
|
||||||
// ============================================================================
|
|
||||||
// API: getPrimitiveUnionMatcherPartialW — ❌ Exhaustive / ❌ ReturnsStrict
|
|
||||||
// ============================================================================
|
|
||||||
|
|
||||||
test("getPrimitiveUnionMatcherPartialW allows gaps and widens to the union of handler returns", () => {
|
|
||||||
// Arrange
|
|
||||||
const factory = getPrimitiveUnionMatcherPartialW<"x" | "y" | "z">();
|
|
||||||
// Two keys, so `{ x }` lacks only the `_` fallback, nothing else.
|
|
||||||
const sparseFactory = getPrimitiveUnionMatcherPartialW<"x" | "y">();
|
|
||||||
|
|
||||||
// Act
|
|
||||||
const matcher = factory({
|
|
||||||
x: (s) => {
|
x: (s) => {
|
||||||
expectTypeOf(s).toEqualTypeOf<"x">();
|
expectTypeOf(s).toEqualTypeOf<"x">();
|
||||||
return 1 as const;
|
return 1 as const;
|
||||||
},
|
},
|
||||||
_: (s) => {
|
},
|
||||||
// The fallback sees the whole union, not a single literal.
|
(s) => {
|
||||||
expectTypeOf(s).toEqualTypeOf<"x" | "y" | "z">();
|
// The fallback sees only the keys `x` did not handle.
|
||||||
|
expectTypeOf(s).toEqualTypeOf<"y" | "z">();
|
||||||
return "fallback" as const;
|
return "fallback" as const;
|
||||||
},
|
},
|
||||||
});
|
);
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
expectTypeOf(matcher).toEqualTypeOf<
|
expectTypeOf(matcher).toEqualTypeOf<
|
||||||
(shape: "x" | "y" | "z") => 1 | "fallback"
|
(shape: "x" | "y" | "z") => 1 | "fallback"
|
||||||
>();
|
>();
|
||||||
// ❌ Exhaustive: gaps are allowed, but only with a `_` fallback.
|
// ❌ a value outside T must not be accepted by the matcher
|
||||||
expectTypeOf<{
|
expectTypeOf<"w">().not.toExtend<Parameters<typeof matcher>[0]>();
|
||||||
x: () => number;
|
|
||||||
}>().not.toExtend<Parameters<typeof sparseFactory>[0]>();
|
|
||||||
assert.equal(matcher("x"), 1);
|
assert.equal(matcher("x"), 1);
|
||||||
assert.equal(matcher("y"), "fallback");
|
assert.equal(matcher("y"), "fallback");
|
||||||
assert.equal(matcher("z"), "fallback");
|
assert.equal(matcher("z"), "fallback");
|
||||||
});
|
});
|
||||||
|
|
||||||
test("getPrimitiveUnionMatcherPartialW widens mixed string and numeric key returns to their union", () => {
|
test("getMatcherW: a `_` fallback widens mixed string and numeric returns", () => {
|
||||||
// Arrange
|
// Arrange
|
||||||
const factory = getPrimitiveUnionMatcherPartialW<"a" | "b" | 1 | 2>();
|
const factory = getMatcherW<"a" | "b" | 1 | 2>();
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
const matcher = factory({
|
const matcher = factory(
|
||||||
|
{
|
||||||
a: (s) => {
|
a: (s) => {
|
||||||
expectTypeOf(s).toEqualTypeOf<"a">();
|
expectTypeOf(s).toEqualTypeOf<"a">();
|
||||||
return "A" as const;
|
return "A" as const;
|
||||||
@@ -315,12 +269,12 @@ test("getPrimitiveUnionMatcherPartialW widens mixed string and numeric key retur
|
|||||||
expectTypeOf(n).toEqualTypeOf<1>();
|
expectTypeOf(n).toEqualTypeOf<1>();
|
||||||
return 10 as const;
|
return 10 as const;
|
||||||
},
|
},
|
||||||
_: (s) => {
|
},
|
||||||
// The fallback sees the whole union, not a single literal.
|
(s) => {
|
||||||
expectTypeOf(s).toEqualTypeOf<"a" | "b" | 1 | 2>();
|
expectTypeOf(s).toEqualTypeOf<"b" | 2>();
|
||||||
return "fallback" as const;
|
return "fallback" as const;
|
||||||
},
|
},
|
||||||
});
|
);
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
// ❌ ReturnsStrict: mixed handler returns widen to their union.
|
// ❌ ReturnsStrict: mixed handler returns widen to their union.
|
||||||
@@ -333,25 +287,205 @@ test("getPrimitiveUnionMatcherPartialW widens mixed string and numeric key retur
|
|||||||
assert.equal(matcher(2), "fallback");
|
assert.equal(matcher(2), "fallback");
|
||||||
});
|
});
|
||||||
|
|
||||||
test("getPrimitiveUnionMatcherPartialW also accepts an exhaustive pattern", () => {
|
// ============================================================================
|
||||||
|
// Factory contracts — calls that must not compile
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
test("getMatcher factory rejects patterns outside its contract", () => {
|
||||||
// Arrange
|
// Arrange
|
||||||
const factory = getPrimitiveUnionMatcherPartialW<"x" | "y">();
|
const factory = getMatcher<"a" | "b">();
|
||||||
|
|
||||||
|
// Act / Assert — the calls below must not compile.
|
||||||
|
// `Parameters<typeof factory>[0]` resolves only the *last* overload, so it
|
||||||
|
// is not a sound "rejected" oracle (an accepted partial pattern does not
|
||||||
|
// extend it either); the call sites are the oracle instead.
|
||||||
|
factory({
|
||||||
|
a: () => 1,
|
||||||
|
b: () => 2,
|
||||||
|
// @ts-expect-error `c` is not part of the universe `"a" | "b"`
|
||||||
|
c: () => 3,
|
||||||
|
});
|
||||||
|
// @ts-expect-error a gap without a `_` fallback is not exhaustive
|
||||||
|
factory({ a: () => 1 });
|
||||||
|
// @ts-expect-error a `string` fallback does not fit the `number` handler
|
||||||
|
factory({ a: () => 1 }, () => "x");
|
||||||
|
});
|
||||||
|
|
||||||
|
test("getMatcherW factory rejects patterns outside its contract", () => {
|
||||||
|
// Arrange
|
||||||
|
const factory = getMatcherW<"x" | "y">();
|
||||||
|
|
||||||
|
// Act / Assert — the calls below must not compile
|
||||||
|
factory({
|
||||||
|
x: () => 1 as const,
|
||||||
|
y: () => 2 as const,
|
||||||
|
// @ts-expect-error `z` is not part of the universe `"x" | "y"`
|
||||||
|
z: () => 3 as const,
|
||||||
|
});
|
||||||
|
// @ts-expect-error a gap without a `_` fallback is not exhaustive
|
||||||
|
factory({ x: () => 1 as const });
|
||||||
|
});
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// Dispatch — runtime behavior
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
test("getMatcher: an unhandled shape throws without a fallback", () => {
|
||||||
|
// Arrange — an open universe types its handler map as an index signature,
|
||||||
|
// so the type system cannot prove the runtime map is exhaustive.
|
||||||
|
const handlers: Record<string, () => number> = { a: () => 1 };
|
||||||
|
const matcher = getMatcher<string>()(handlers);
|
||||||
|
|
||||||
|
// Act / Assert
|
||||||
|
assert.equal(matcher("a"), 1);
|
||||||
|
assert.throws(() => matcher("b"), /Unhandled shape: b/);
|
||||||
|
});
|
||||||
|
|
||||||
|
// ============================================================================
|
||||||
|
// Autocomplete — the language server is the oracle, not the type system
|
||||||
|
// ============================================================================
|
||||||
|
|
||||||
|
// Completion is a contextual-type property that the type system cannot observe,
|
||||||
|
// so the cases below read the popup from the repo's language server (via the
|
||||||
|
// test helper) rather than pairing `expectTypeOf` with `assert` — see
|
||||||
|
// development/testing.md § Autocomplete. They probe the *matcher's* overloads,
|
||||||
|
// which is why they live with the matcher and not with the helper.
|
||||||
|
const REPO_ROOT = path.resolve(import.meta.dirname, "..");
|
||||||
|
const UNIVERSE = `"a" | "b" | "c"`;
|
||||||
|
|
||||||
|
// One session per probe: the tests share no language-server state (open
|
||||||
|
// documents, project membership), so they pass in any order.
|
||||||
|
interface LabelsProbe {
|
||||||
|
readonly name: string;
|
||||||
|
readonly factory: "getMatcher" | "getMatcherW";
|
||||||
|
readonly body: string;
|
||||||
|
readonly tail?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
const labelsFor = ({
|
||||||
|
name,
|
||||||
|
factory,
|
||||||
|
body,
|
||||||
|
tail = "",
|
||||||
|
}: LabelsProbe): Promise<readonly string[]> => {
|
||||||
|
const session = new LspSession(REPO_ROOT);
|
||||||
|
const target: CompletionTarget = {
|
||||||
|
file: `src/__autocomplete_${name}.ts`,
|
||||||
|
source: [
|
||||||
|
`import { ${factory} } from "./index.ts";`,
|
||||||
|
`const m = ${factory}<${UNIVERSE}>()({`,
|
||||||
|
body,
|
||||||
|
`}${tail});`,
|
||||||
|
"",
|
||||||
|
].join("\n"),
|
||||||
|
};
|
||||||
|
return session
|
||||||
|
.completionLabelsAt(target)
|
||||||
|
.then((result) => result.labels)
|
||||||
|
.finally(() => session.close());
|
||||||
|
};
|
||||||
|
|
||||||
|
test("autocomplete: an exhaustive pattern requires the universe", () => {
|
||||||
|
// Arrange
|
||||||
|
const name = "getMatcher_fresh";
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
const matcher = factory({
|
const labels = labelsFor({
|
||||||
x: (s) => {
|
name,
|
||||||
expectTypeOf(s).toEqualTypeOf<"x">();
|
factory: "getMatcher",
|
||||||
return 1 as const;
|
body: " /*COMPLETE*/",
|
||||||
},
|
|
||||||
y: (s) => {
|
|
||||||
expectTypeOf(s).toEqualTypeOf<"y">();
|
|
||||||
return "two" as const;
|
|
||||||
},
|
|
||||||
});
|
});
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
// ❌ ReturnsStrict: mixed handler returns widen to their union.
|
return labels.then((result) => {
|
||||||
expectTypeOf(matcher).toEqualTypeOf<(shape: "x" | "y") => 1 | "two">();
|
assert.deepEqual([...result], ["a", "b", "c"]);
|
||||||
assert.equal(matcher("x"), 1);
|
});
|
||||||
assert.equal(matcher("y"), "two");
|
});
|
||||||
|
|
||||||
|
test("autocomplete: handled keys drop out of the popup", () => {
|
||||||
|
// Arrange
|
||||||
|
const name = "getMatcher_after_key";
|
||||||
|
|
||||||
|
// Act
|
||||||
|
const labels = labelsFor({
|
||||||
|
name,
|
||||||
|
factory: "getMatcher",
|
||||||
|
body: " a: () => 1,\n /*COMPLETE*/",
|
||||||
|
});
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
return labels.then((result) => {
|
||||||
|
assert.deepEqual([...result], ["b", "c"]);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
test("autocomplete: a fallback makes the remaining keys optional", () => {
|
||||||
|
// Arrange
|
||||||
|
const name = "getMatcher_with_fallback";
|
||||||
|
|
||||||
|
// Act
|
||||||
|
const labels = labelsFor({
|
||||||
|
name,
|
||||||
|
factory: "getMatcher",
|
||||||
|
body: " /*COMPLETE*/",
|
||||||
|
tail: ", () => 0",
|
||||||
|
});
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
return labels.then((result) => {
|
||||||
|
assert.deepEqual([...result], ["a?", "b?", "c?"]);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
test("autocomplete: with a fallback, handled keys stay optional", () => {
|
||||||
|
// Arrange
|
||||||
|
const name = "getMatcher_with_fallback_after_key";
|
||||||
|
|
||||||
|
// Act
|
||||||
|
const labels = labelsFor({
|
||||||
|
name,
|
||||||
|
factory: "getMatcher",
|
||||||
|
body: " a: () => 1,\n /*COMPLETE*/",
|
||||||
|
tail: ", () => 0",
|
||||||
|
});
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
return labels.then((result) => {
|
||||||
|
assert.deepEqual([...result], ["b?", "c?"]);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
test("autocomplete: `getMatcherW` offers the same popup as `getMatcher`", () => {
|
||||||
|
// Arrange
|
||||||
|
const name = "getMatcherW_fresh";
|
||||||
|
|
||||||
|
// Act
|
||||||
|
const labels = labelsFor({
|
||||||
|
name,
|
||||||
|
factory: "getMatcherW",
|
||||||
|
body: " /*COMPLETE*/",
|
||||||
|
});
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
return labels.then((result) => {
|
||||||
|
assert.deepEqual([...result], ["a", "b", "c"]);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
test("autocomplete: `getMatcherW` also offers optional keys with a fallback", () => {
|
||||||
|
// Arrange
|
||||||
|
const name = "getMatcherW_with_fallback";
|
||||||
|
|
||||||
|
// Act
|
||||||
|
const labels = labelsFor({
|
||||||
|
name,
|
||||||
|
factory: "getMatcherW",
|
||||||
|
body: " /*COMPLETE*/",
|
||||||
|
tail: ", () => 0",
|
||||||
|
});
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
return labels.then((result) => {
|
||||||
|
assert.deepEqual([...result], ["a?", "b?", "c?"]);
|
||||||
|
});
|
||||||
});
|
});
|
||||||
+64
-60
@@ -1,71 +1,75 @@
|
|||||||
import type { Simplify, ValueOf } from "type-fest";
|
import type { Exact, ValueOf } from "type-fest";
|
||||||
|
|
||||||
type UnaryFn<T, R> = (shape: T) => R;
|
type UnaryFn<T, R> = (shape: T) => R;
|
||||||
|
|
||||||
// ============================================================================
|
// `Extract` drops optional handlers (`undefined`) so `PatternReturns` also works
|
||||||
// ✔️ Exhaustive
|
// when `P`'s constraint has optional keys.
|
||||||
// ❌ ReturnsStrict
|
type PatternReturns<P> = ReturnType<
|
||||||
// ============================================================================
|
Extract<ValueOf<P>, (...args: never[]) => unknown>
|
||||||
type PatternPrimitiveUnion<R, T extends string | number> = {
|
>;
|
||||||
[K in T]: UnaryFn<K, R>;
|
|
||||||
};
|
|
||||||
|
|
||||||
type PatternReturns<
|
type Handlers<T extends string | number, R> = { [K in T]: UnaryFn<K, R> };
|
||||||
P extends Record<string | number, UnaryFn<never, unknown>>,
|
|
||||||
> = ReturnType<ValueOf<P>>;
|
|
||||||
|
|
||||||
export const getPrimitiveUnionMatcherW: <T extends string | number>() => <
|
// The fallback is a *second argument*, not a property of the handler map,
|
||||||
P extends PatternPrimitiveUnion<unknown, T>,
|
// because its parameter is the remainder `Exclude<T, keyof Handled>` and TypeScript
|
||||||
>(
|
// fixes a property's contextual type before it infers its sibling keys. A later
|
||||||
pattern: Simplify<P>,
|
// argument, by contrast, is contextually typed from inference on an earlier
|
||||||
) => UnaryFn<T, PatternReturns<P>> = () => (pattern) => (shape) =>
|
// one, so the split is what makes the remainder expressible at all.
|
||||||
// Rewrite not to use any is possible, was evaluated and solutions were
|
// See development/library.md.
|
||||||
// more complex than the current solution.
|
type Fallback<T extends string | number, Handled, R> = UnaryFn<
|
||||||
|
Exclude<T, keyof Handled>,
|
||||||
|
R
|
||||||
|
>;
|
||||||
|
|
||||||
// oxlint-disable-next-line typescript/no-explicit-any typescript/no-unsafe-type-assertion
|
// TypeScript does not apply the excess-property check to a generic constraint,
|
||||||
(pattern[shape] as any)(shape);
|
// so `Exact` restores it for the generic forms: a handler map can otherwise
|
||||||
|
// carry keys outside `T`.
|
||||||
|
|
||||||
// ============================================================================
|
// oxlint-disable typescript/unified-signatures
|
||||||
// ✔️ Exhaustive
|
// Strict returns: one common `R`. Overload order is load-bearing:
|
||||||
// ✔️ ReturnsStrict
|
// #1 Handlers (first) -> the exhaustive form and the autocomplete popup
|
||||||
// ============================================================================
|
// #2 Fallback (last) -> accepts a partial handler map plus a fallback
|
||||||
export const getPrimitiveUnionMatcher: <T extends string | number>() => <R>(
|
interface MatcherStrict<T extends string | number> {
|
||||||
pattern: Simplify<PatternPrimitiveUnion<R, T>>,
|
<R>(handlers: Handlers<T, R>): UnaryFn<T, R>;
|
||||||
) => UnaryFn<T, R> = getPrimitiveUnionMatcherW;
|
<R, Handled extends Exact<Partial<Handlers<T, R>>, Handled>>(
|
||||||
|
handlers: Handled & Partial<Handlers<T, R>>,
|
||||||
|
fallback: Fallback<T, Handled, R>,
|
||||||
|
): UnaryFn<T, R>;
|
||||||
|
}
|
||||||
|
// oxlint-enable typescript/unified-signatures
|
||||||
|
|
||||||
// ============================================================================
|
// Widened returns: the union of every handler's return type. `P` is inferred
|
||||||
// ❌ Exhaustive
|
// from the whole handler map, whose closed constraint supplies the
|
||||||
// ✔️ ReturnsStrict
|
// contextual/autocomplete type.
|
||||||
// ============================================================================
|
// oxlint-disable typescript/unified-signatures
|
||||||
type PatternPrimitiveUnionPartial<R, T extends string | number> =
|
interface MatcherWidening<T extends string | number> {
|
||||||
| PatternPrimitiveUnion<R, T>
|
<P extends Exact<Handlers<T, unknown>, P>>(
|
||||||
| (Partial<PatternPrimitiveUnion<R, T>> & {
|
handlers: P,
|
||||||
_: UnaryFn<T, R>;
|
): UnaryFn<T, PatternReturns<P>>;
|
||||||
});
|
<R, Handled extends Exact<Partial<Handlers<T, unknown>>, Handled>>(
|
||||||
|
handlers: Handled,
|
||||||
|
fallback: Fallback<T, Handled, R>,
|
||||||
|
): UnaryFn<T, PatternReturns<Handled> | R>;
|
||||||
|
}
|
||||||
|
// oxlint-enable typescript/unified-signatures
|
||||||
|
|
||||||
export const getPrimitiveUnionMatcherPartial: <T extends string | number>() => <
|
type HandlerMap = Record<string | number, UnaryFn<never, unknown> | undefined>;
|
||||||
R,
|
|
||||||
>(
|
|
||||||
pattern: Simplify<PatternPrimitiveUnionPartial<R, T>>,
|
|
||||||
) => UnaryFn<T, R> = () => (pattern) => (shape) =>
|
|
||||||
// Rewrite not to use any is possible, was evaluated and solutions were
|
|
||||||
// more complex than the current solution.
|
|
||||||
|
|
||||||
// oxlint-disable-next-line typescript/no-explicit-any typescript/no-unsafe-type-assertion
|
const dispatch =
|
||||||
(pattern[shape] ?? (pattern as any)["_"])(shape);
|
(handlers: HandlerMap, fallback?: UnaryFn<never, unknown>) =>
|
||||||
|
(shape: string | number): unknown =>
|
||||||
|
(
|
||||||
|
handlers[shape] ??
|
||||||
|
fallback ??
|
||||||
|
(() => {
|
||||||
|
throw new Error(`Unhandled shape: ${shape}`);
|
||||||
|
})
|
||||||
|
)(
|
||||||
|
// oxlint-disable-next-line typescript/no-unsafe-type-assertion
|
||||||
|
shape as never,
|
||||||
|
);
|
||||||
|
|
||||||
// ============================================================================
|
export const getMatcher = <T extends string | number>(): MatcherStrict<T> =>
|
||||||
// ❌ Exhaustive
|
dispatch;
|
||||||
// ❌ ReturnsStrict
|
export const getMatcherW = <T extends string | number>(): MatcherWidening<T> =>
|
||||||
// ============================================================================
|
dispatch;
|
||||||
export const getPrimitiveUnionMatcherPartialW: <
|
|
||||||
T extends string | number,
|
|
||||||
>() => <P extends PatternPrimitiveUnionPartial<unknown, T>>(
|
|
||||||
// `Simplify<P>` is the inference hook: callers infer `P` from the argument.
|
|
||||||
// the second half pins the impl parameter's `R` to `PatternReturns<P>`.
|
|
||||||
// that makes the `= getPrimitiveUnionMatcherPartial` assignment type-check.
|
|
||||||
// neither half works alone.
|
|
||||||
// without the witness the union's `_` arm demands `_ ∈ keyof P`.
|
|
||||||
// without `Simplify<P>` the parameter types do not compare.
|
|
||||||
pattern: Simplify<P> & PatternPrimitiveUnionPartial<PatternReturns<P>, T>,
|
|
||||||
) => UnaryFn<T, PatternReturns<P>> = getPrimitiveUnionMatcherPartial;
|
|
||||||
@@ -0,0 +1,148 @@
|
|||||||
|
/* oxlint-disable typescript/no-floating-promises -- expectTypeOf() is a sync type-assertion library that the type-aware linter misidentifies as a promise */
|
||||||
|
import { strict as assert } from "node:assert";
|
||||||
|
import path from "node:path";
|
||||||
|
import { test } from "node:test";
|
||||||
|
|
||||||
|
import { expectTypeOf } from "expect-type";
|
||||||
|
|
||||||
|
import {
|
||||||
|
type CompletionResult,
|
||||||
|
type CompletionTarget,
|
||||||
|
LspSession,
|
||||||
|
} from "#test-utils/lsp-completion.ts";
|
||||||
|
|
||||||
|
const REPO_ROOT = path.resolve(import.meta.dirname, "../../..");
|
||||||
|
|
||||||
|
// The `#test-utils/*` self-reference (package.json#imports) is the one route
|
||||||
|
// scattered test files take to reach test helpers; this pins that it resolves
|
||||||
|
// and types without starting a language server
|
||||||
|
// (development/testing.md § Test helpers).
|
||||||
|
test("test-helper home: `#test-utils/…` resolves to the helper and types it", () => {
|
||||||
|
// Arrange
|
||||||
|
const target: CompletionTarget = {
|
||||||
|
file: "src/util/__tests__/lsp-completion.ts",
|
||||||
|
source: "",
|
||||||
|
};
|
||||||
|
|
||||||
|
// Assert — no session is constructed: the constructor spawns `tsc --lsp`,
|
||||||
|
// so only the resolved values and their types are checked here.
|
||||||
|
expectTypeOf(LspSession).toBeConstructibleWith("repo-root");
|
||||||
|
expectTypeOf<CompletionResult>().toMatchTypeOf<{
|
||||||
|
labels: readonly string[];
|
||||||
|
}>();
|
||||||
|
assert.equal(typeof LspSession, "function");
|
||||||
|
assert.equal(target.file, "src/util/__tests__/lsp-completion.ts");
|
||||||
|
});
|
||||||
|
|
||||||
|
// The helper drives a language server, so its contract is asserted against the
|
||||||
|
// server. Every document below is probed from memory and carries its
|
||||||
|
// contextual type inline, so the helper is tested without the library's code.
|
||||||
|
const probe = (source: string, marker?: string): Promise<CompletionResult> => {
|
||||||
|
const session = new LspSession(REPO_ROOT);
|
||||||
|
const target: CompletionTarget =
|
||||||
|
marker === undefined
|
||||||
|
? { file: "src/__probe.ts", source }
|
||||||
|
: { file: "src/__probe.ts", source, marker };
|
||||||
|
return session.completionLabelsAt(target).finally(() => session.close());
|
||||||
|
};
|
||||||
|
|
||||||
|
const HANDLERS = [
|
||||||
|
"type Handlers = { a: () => number; b: () => number; _?: () => number };",
|
||||||
|
"declare const apply: (handlers: Handlers) => Handlers;",
|
||||||
|
];
|
||||||
|
|
||||||
|
test("helper: a fresh object literal completes with its contextual keys", () => {
|
||||||
|
// Arrange
|
||||||
|
const source = [
|
||||||
|
...HANDLERS,
|
||||||
|
"const done = apply({",
|
||||||
|
" /*COMPLETE*/",
|
||||||
|
"});",
|
||||||
|
"export { done };",
|
||||||
|
].join("\n");
|
||||||
|
|
||||||
|
// Act
|
||||||
|
const probed = probe(source);
|
||||||
|
|
||||||
|
// Assert — the position is the marker's, which the helper strips
|
||||||
|
expectTypeOf(probed).toEqualTypeOf<Promise<CompletionResult>>();
|
||||||
|
return probed.then((result) => {
|
||||||
|
assert.deepEqual(result.position, { line: 3, character: 4 });
|
||||||
|
assert.deepEqual([...result.labels], ["_?", "a", "b"]);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
test("helper: a handled key drops out of the popup", () => {
|
||||||
|
// Arrange
|
||||||
|
const source = [
|
||||||
|
...HANDLERS,
|
||||||
|
"const done = apply({",
|
||||||
|
" b: () => 1,",
|
||||||
|
" /*COMPLETE*/",
|
||||||
|
"});",
|
||||||
|
"export { done };",
|
||||||
|
].join("\n");
|
||||||
|
|
||||||
|
// Act
|
||||||
|
const probed = probe(source);
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
expectTypeOf<CompletionResult["labels"]>().toEqualTypeOf<
|
||||||
|
readonly string[]
|
||||||
|
>();
|
||||||
|
return probed.then((result) => {
|
||||||
|
assert.deepEqual([...result.labels], ["_?", "a"]);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
test("helper: a custom marker is located at the line start", () => {
|
||||||
|
// Arrange
|
||||||
|
const source = [
|
||||||
|
"type Handlers = { a: () => number; _?: () => number };",
|
||||||
|
"declare const apply: (handlers: Handlers) => Handlers;",
|
||||||
|
"const done = apply({",
|
||||||
|
"@@@",
|
||||||
|
"});",
|
||||||
|
"export { done };",
|
||||||
|
].join("\n");
|
||||||
|
|
||||||
|
// Act
|
||||||
|
const probed = probe(source, "@@@");
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
expectTypeOf(probed).resolves.toEqualTypeOf<CompletionResult>();
|
||||||
|
return probed.then((result) => {
|
||||||
|
assert.deepEqual(result.position, { line: 3, character: 0 });
|
||||||
|
assert.deepEqual([...result.labels], ["_?", "a"]);
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
test("helper: labels are read from the server, not from a pattern literal", () => {
|
||||||
|
// Arrange
|
||||||
|
const source = [
|
||||||
|
'const text = "x";',
|
||||||
|
"const upper = text./*COMPLETE*/;",
|
||||||
|
"export { upper };",
|
||||||
|
].join("\n");
|
||||||
|
|
||||||
|
// Act
|
||||||
|
const probed = probe(source);
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
expectTypeOf(probed).resolves.toHaveProperty("labels");
|
||||||
|
return probed.then((result) => {
|
||||||
|
assert.ok(result.labels.includes("toUpperCase"));
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
test("helper: a source without the marker rejects", () => {
|
||||||
|
// Arrange
|
||||||
|
const source = "const text = 1;\nexport { text };\n";
|
||||||
|
|
||||||
|
// Act
|
||||||
|
const probed = probe(source);
|
||||||
|
|
||||||
|
// Assert
|
||||||
|
expectTypeOf(probed).resolves.toEqualTypeOf<CompletionResult>();
|
||||||
|
return assert.rejects(probed, /marker not found/);
|
||||||
|
});
|
||||||
@@ -0,0 +1,254 @@
|
|||||||
|
// oxlint-disable no-magic-numbers unicorn/no-null - tolerable here, this is a helper
|
||||||
|
import { spawn, type ChildProcessWithoutNullStreams } from "node:child_process";
|
||||||
|
import fs from "node:fs";
|
||||||
|
import path from "node:path";
|
||||||
|
import { setTimeout as delay } from "node:timers/promises";
|
||||||
|
import { pathToFileURL } from "node:url";
|
||||||
|
|
||||||
|
import {
|
||||||
|
type CompletionItem,
|
||||||
|
type CompletionList,
|
||||||
|
CompletionRequest,
|
||||||
|
ConfigurationRequest,
|
||||||
|
createMessageConnection,
|
||||||
|
DidOpenTextDocumentNotification,
|
||||||
|
InitializedNotification,
|
||||||
|
InitializeRequest,
|
||||||
|
type MessageConnection,
|
||||||
|
ShutdownRequest,
|
||||||
|
StreamMessageReader,
|
||||||
|
StreamMessageWriter,
|
||||||
|
} from "vscode-languageserver-protocol/node";
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Print the completion labels TypeScript's language server offers at a marker
|
||||||
|
* inside a source file.
|
||||||
|
*
|
||||||
|
* Usage: node --strip-types src/util/__tests__/lsp-completion.ts <file> [<marker>]
|
||||||
|
*
|
||||||
|
* The marker (default `DEFAULT_MARKER`, a `COMPLETE` block comment) is stripped
|
||||||
|
* from the source before it is sent; the request position is where the marker
|
||||||
|
* stood. Point it at a scratch file whose expected type is a matcher pattern to
|
||||||
|
* inspect the popup.
|
||||||
|
*
|
||||||
|
* `LspSession` exposes the same probe to the test suite, so completion is
|
||||||
|
* asserted against the server rather than the type system.
|
||||||
|
*
|
||||||
|
* Why a script and not a type assertion: completion is a contextual-type
|
||||||
|
* property that `expect-type` cannot observe, and `Parameters<…>` resolves only
|
||||||
|
* a single overload. The server is the only ground truth. See
|
||||||
|
* development/testing.md § Autocomplete.
|
||||||
|
*/
|
||||||
|
|
||||||
|
const DEFAULT_MARKER = "/*COMPLETE*/";
|
||||||
|
const ARGV_PREFIX_LENGTH = 2;
|
||||||
|
const EXIT_DELAY_MS = 200;
|
||||||
|
const FAILURE_EXIT_CODE = 1;
|
||||||
|
const USAGE = "usage: lsp-completion.ts <file> [<marker>]";
|
||||||
|
|
||||||
|
export interface Position {
|
||||||
|
readonly line: number;
|
||||||
|
readonly character: number;
|
||||||
|
}
|
||||||
|
|
||||||
|
/** A document to probe: `source` carries `marker`, which is stripped. */
|
||||||
|
export interface CompletionTarget {
|
||||||
|
/** Path relative to the session's repo root; drives URI and resolution. */
|
||||||
|
readonly file: string;
|
||||||
|
readonly source: string;
|
||||||
|
readonly marker?: string;
|
||||||
|
}
|
||||||
|
|
||||||
|
export interface CompletionResult {
|
||||||
|
readonly position: Position;
|
||||||
|
readonly labels: readonly string[];
|
||||||
|
}
|
||||||
|
|
||||||
|
const completionLabels = (
|
||||||
|
result: CompletionItem[] | CompletionList | null,
|
||||||
|
): readonly string[] => {
|
||||||
|
if (result === null) {
|
||||||
|
return [];
|
||||||
|
}
|
||||||
|
const items = Array.isArray(result) ? result : result.items;
|
||||||
|
return items
|
||||||
|
.map((item) => item.label)
|
||||||
|
.toSorted((left, right) => left.localeCompare(right));
|
||||||
|
};
|
||||||
|
|
||||||
|
const markerPosition = (source: string, marker: string): Position => {
|
||||||
|
const index = source.indexOf(marker);
|
||||||
|
if (index === -1) {
|
||||||
|
throw new Error(`marker not found: ${marker}`);
|
||||||
|
}
|
||||||
|
const lines = source.slice(0, index).split("\n");
|
||||||
|
const lineIndex = lines.length - 1;
|
||||||
|
const line = lines[lineIndex];
|
||||||
|
return { line: lineIndex, character: line === undefined ? 0 : line.length };
|
||||||
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* One language server, initialized on first use, shared across probes. Callers
|
||||||
|
* own the lifecycle and must `close()` it.
|
||||||
|
*/
|
||||||
|
export class LspSession {
|
||||||
|
readonly #child: ChildProcessWithoutNullStreams;
|
||||||
|
readonly #connection: MessageConnection;
|
||||||
|
readonly #repoRoot: string;
|
||||||
|
#ready: Promise<void> | undefined;
|
||||||
|
|
||||||
|
public constructor(repoRoot: string) {
|
||||||
|
this.#repoRoot = repoRoot;
|
||||||
|
this.#child = spawn(
|
||||||
|
path.join(repoRoot, "node_modules", ".bin", "tsc"),
|
||||||
|
["--lsp", "--stdio"],
|
||||||
|
{ cwd: repoRoot },
|
||||||
|
);
|
||||||
|
this.#child.stderr.on("data", (chunk: Buffer) => {
|
||||||
|
process.stderr.write(chunk);
|
||||||
|
});
|
||||||
|
this.#connection = createMessageConnection(
|
||||||
|
new StreamMessageReader(this.#child.stdout),
|
||||||
|
new StreamMessageWriter(this.#child.stdin),
|
||||||
|
);
|
||||||
|
// Server -> client requests the server waits on: answer so it proceeds.
|
||||||
|
// `workspace/configuration` wants one reply per requested item; a
|
||||||
|
// catch-all covers the rest (e.g. `client/registerCapability`).
|
||||||
|
this.#connection.onRequest(ConfigurationRequest.type, ({ items }) =>
|
||||||
|
items.map(() => null),
|
||||||
|
);
|
||||||
|
this.#connection.onRequest(() => null);
|
||||||
|
this.#connection.listen();
|
||||||
|
}
|
||||||
|
|
||||||
|
public completionLabelsAt(
|
||||||
|
target: CompletionTarget,
|
||||||
|
): Promise<CompletionResult> {
|
||||||
|
return this.#ensureInitialized()
|
||||||
|
.then(() => this.#open(target))
|
||||||
|
.then(({ uri, position }) =>
|
||||||
|
this.#connection
|
||||||
|
.sendRequest(CompletionRequest.type, {
|
||||||
|
textDocument: { uri },
|
||||||
|
position,
|
||||||
|
context: { triggerKind: 1 },
|
||||||
|
})
|
||||||
|
.then((result) => ({
|
||||||
|
position,
|
||||||
|
labels: completionLabels(result),
|
||||||
|
})),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/** `shutdown` + close stdin, then kill the server; safe after a failed probe. */
|
||||||
|
public close(): Promise<void> {
|
||||||
|
return (
|
||||||
|
this.#connection
|
||||||
|
.sendRequest(ShutdownRequest.type)
|
||||||
|
// The TS 7 Go server logs a bare `context canceled` to stderr
|
||||||
|
// when it handles `exit`; EOF on stdin shuts it down cleanly
|
||||||
|
// (exit 0, no output) instead.
|
||||||
|
.then(() => {
|
||||||
|
this.#child.stdin.end();
|
||||||
|
})
|
||||||
|
.then(() => delay(EXIT_DELAY_MS))
|
||||||
|
.finally(() => {
|
||||||
|
this.#connection.dispose();
|
||||||
|
this.#child.kill();
|
||||||
|
})
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#ensureInitialized(): Promise<void> {
|
||||||
|
this.#ready ??= this.#initialize();
|
||||||
|
return this.#ready;
|
||||||
|
}
|
||||||
|
|
||||||
|
#initialize(): Promise<void> {
|
||||||
|
return this.#connection
|
||||||
|
.sendRequest(InitializeRequest.type, {
|
||||||
|
processId: process.pid,
|
||||||
|
rootUri: pathToFileURL(this.#repoRoot).href,
|
||||||
|
workspaceFolders: [
|
||||||
|
{ uri: pathToFileURL(this.#repoRoot).href, name: "repo" },
|
||||||
|
],
|
||||||
|
capabilities: {
|
||||||
|
textDocument: {
|
||||||
|
completion: {
|
||||||
|
completionItem: { snippetSupport: false },
|
||||||
|
},
|
||||||
|
publishDiagnostics: {},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.then(() =>
|
||||||
|
this.#connection.sendNotification(
|
||||||
|
InitializedNotification.type,
|
||||||
|
{},
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
#open(target: CompletionTarget): Promise<{
|
||||||
|
readonly uri: string;
|
||||||
|
readonly position: Position;
|
||||||
|
}> {
|
||||||
|
const absolute = path.resolve(this.#repoRoot, target.file);
|
||||||
|
const marker = target.marker ?? DEFAULT_MARKER;
|
||||||
|
const position = markerPosition(target.source, marker);
|
||||||
|
const text = target.source.replace(marker, "");
|
||||||
|
const uri = pathToFileURL(absolute).href;
|
||||||
|
// The server handles `didOpen` in order before the completion request,
|
||||||
|
// so no settle delay is needed.
|
||||||
|
return this.#connection
|
||||||
|
.sendNotification(DidOpenTextDocumentNotification.type, {
|
||||||
|
textDocument: {
|
||||||
|
uri,
|
||||||
|
languageId: "typescript",
|
||||||
|
version: 1,
|
||||||
|
text,
|
||||||
|
},
|
||||||
|
})
|
||||||
|
.then(() => ({ uri, position }));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
const main = (args: readonly string[]): Promise<void> => {
|
||||||
|
const [file, markerArgument] = args;
|
||||||
|
if (file === undefined) {
|
||||||
|
process.stderr.write(`${USAGE}\n`);
|
||||||
|
process.exitCode = FAILURE_EXIT_CODE;
|
||||||
|
return Promise.resolve();
|
||||||
|
}
|
||||||
|
|
||||||
|
const repoRoot = path.resolve(import.meta.dirname, "../../..");
|
||||||
|
const absolute = path.resolve(repoRoot, file);
|
||||||
|
const source = fs.readFileSync(absolute, "utf8");
|
||||||
|
const session = new LspSession(repoRoot);
|
||||||
|
return session
|
||||||
|
.completionLabelsAt({
|
||||||
|
file,
|
||||||
|
source,
|
||||||
|
marker: markerArgument ?? DEFAULT_MARKER,
|
||||||
|
})
|
||||||
|
.then(({ position, labels }) => {
|
||||||
|
process.stdout.write(
|
||||||
|
`\n[${file}] completions @ ${position.line}:${position.character}:\n${labels.join(", ")}\n`,
|
||||||
|
);
|
||||||
|
})
|
||||||
|
.finally(() => session.close());
|
||||||
|
};
|
||||||
|
|
||||||
|
const isEntryPoint = (): boolean => {
|
||||||
|
const [entry] = process.argv.slice(1, 2);
|
||||||
|
return entry !== undefined && import.meta.url === pathToFileURL(entry).href;
|
||||||
|
};
|
||||||
|
|
||||||
|
if (isEntryPoint()) {
|
||||||
|
main(process.argv.slice(ARGV_PREFIX_LENGTH)).catch((error: unknown) => {
|
||||||
|
process.stderr.write(
|
||||||
|
`${error instanceof Error ? error.message : String(error)}\n`,
|
||||||
|
);
|
||||||
|
process.exitCode = FAILURE_EXIT_CODE;
|
||||||
|
});
|
||||||
|
}
|
||||||
Reference in new issue
Block a user