Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "effect-jsonapi",
// The tag equals the catalog's `vite-plus` pin; bump it with vite-plus.
"image": "ghcr.io/voidzero-dev/vite-plus:1.6.0",
"image": "ghcr.io/voidzero-dev/vite-plus:1.7.0",
"features": {
"ghcr.io/devcontainers/features/github-cli:1": {},
"ghcr.io/anthropics/devcontainer-features/claude-code:1.0": {}
Expand Down
3 changes: 2 additions & 1 deletion examples/blog/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"devDependencies": {
"@effect/vitest": "catalog:",
"@types/node": "catalog:",
"vite-plus": "catalog:"
"vite-plus": "catalog:",
"vitest": "catalog:"
}
}
3 changes: 2 additions & 1 deletion examples/github/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"devDependencies": {
"@effect/vitest": "catalog:",
"@types/node": "catalog:",
"vite-plus": "catalog:"
"vite-plus": "catalog:",
"vitest": "catalog:"
}
}
3 changes: 2 additions & 1 deletion examples/northwind/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
"devDependencies": {
"@effect/vitest": "catalog:",
"@types/node": "catalog:",
"vite-plus": "catalog:"
"vite-plus": "catalog:",
"vitest": "catalog:"
}
}
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@
"access": "public"
},
"scripts": {
"prepare": "vp config && effect-tsgo patch --typescript --oxlint"
"prepare": "vp config && effect-tsgo patch --typescript --oxlint --tsrs"
},
"dependencies": {
"@thomasfosterau/effect-ext": "catalog:"
Expand Down
771 changes: 408 additions & 363 deletions pnpm-lock.yaml

Large diffs are not rendered by default.

28 changes: 13 additions & 15 deletions pnpm-workspace.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,11 +11,12 @@ catalog:
# Executes every JSDoc `@example` under `tsx` (below) against `dist/`.
"@effect/docgen": ^4.1.2
"@effect/language-service": ^0.87.3
# `prepare` runs `effect-tsgo patch --typescript --oxlint`, which hard-errors
# on a `@typescript/native` or vite-plus oxlint version missing from the
# `components` table in node_modules/@effect/tsgo/dist/effect-tsgo.cjs.
# Read it before bumping any of the three.
"@effect/tsgo": 0.69.0
# `prepare` runs `effect-tsgo patch --typescript --oxlint --tsrs`, which
# hard-errors on a `@typescript/native` or vite-plus oxlint / tsrs version
# missing from the `components` table in
# node_modules/@effect/tsgo/dist/effect-tsgo.cjs. Read it before bumping any
# of them.
"@effect/tsgo": 0.73.2
# Peers `effect` at its own version.
"@effect/vitest": 4.1.4
"@enfect/oxlint": 0.10.0
Expand All @@ -35,9 +36,10 @@ catalog:
# the native TS7 `tsc` runs the type gates. Exact: @effect/tsgo patches it.
typescript: "npm:@typescript/typescript6@6.0.2"
"@typescript/native": "npm:typescript@7.0.2"
# `vite` must equal `vite-plus`; `vitest` must equal vite-plus's pin.
vite-plus: 1.6.0
vite: npm:@voidzero-dev/vite-plus-core@1.6.0
# `vite` and `vitest` must equal what vite-plus itself depends on (`npm view
# vite-plus@<v> dependencies`); `vite` no longer equals vite-plus.
vite-plus: 1.7.0
vite: npm:@voidzero-dev/vite-plus-core@8.3.8000
vitest: 5.1.0

# Published peer ranges. Raise `effect` only when a dependency (or effect's own
Expand All @@ -56,6 +58,9 @@ overrides:
"js-yaml@3": "^3.15.2"
"launch-editor@2": "^2.14.2"
"shell-quote@1": "^1.11.0"
# One `vite` (vite-plus's aliased core) and one `vitest` throughout.
vite@*: "catalog:"
vitest@*: "catalog:"
nodeLinker: hoisted
allowBuilds:
esbuild: true
Expand All @@ -72,13 +77,6 @@ permissions:

skills:
dirs: [.claude/skills]
peerDependencyRules:
allowAny:
- vite
- vitest
allowedVersions:
vite: "*"
vitest: "*"

# Hold new versions for 24 hours; first-party packages are exempt.
minimumReleaseAge: 1440
Expand Down
7 changes: 3 additions & 4 deletions src/Atomic.ts
Original file line number Diff line number Diff line change
Expand Up @@ -750,10 +750,9 @@ export type RelationshipOperation<Res extends Any> = {
: Res["relationships"][K] extends Relationship.Optional<infer T>
? UpdateToOneRelationshipOperation<Res, K, Schema.NullOr<Ref<T>>>
: Res["relationships"][K] extends Relationship.ToMany<infer T>
?
| ToManyRelationshipOperation<"add", Res, K, T>
| ToManyRelationshipOperation<"update", Res, K, T>
| ToManyRelationshipOperation<"remove", Res, K, T>
? | ToManyRelationshipOperation<"add", Res, K, T>
| ToManyRelationshipOperation<"update", Res, K, T>
| ToManyRelationshipOperation<"remove", Res, K, T>
: never;
}[RelationshipName<Res>];

Expand Down
138 changes: 68 additions & 70 deletions src/Endpoint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3767,94 +3767,92 @@ type GeneratedRelationships<
RO,
K
> extends true
?
| GeneratedRelated<
? | GeneratedRelated<
Type,
Attributes,
Rels,
Meta,
IdSchema,
K,
RelConfigObject<RO, K>,
GErrors,
GInclude,
GFields,
GSort,
GPage
>
| ReturnType<
typeof getRelationship<
Type,
Attributes,
Rels,
Meta,
IdSchema,
K,
RelConfigObject<RO, K>,
GErrors,
GInclude,
GFields,
GSort,
GPage
>
| ReturnType<
typeof getRelationship<
Type,
Attributes,
Rels,
Meta,
IdSchema,
RelErrors<RelConfigObject<RO, K>, GErrors>,
`${K}Relationship`,
`/${Type}/:id/relationships/${K}`,
Rels[K] extends Relationship.ToMany<Any>
? RelPage<RelConfigObject<RO, K>, GPage>
: never,
typeof AnyMeta,
RelRelationshipInclude<
Resource<Type, Attributes, Rels, Meta, IdSchema>,
K,
RelErrors<RelConfigObject<RO, K>, GErrors>,
`${K}Relationship`,
`/${Type}/:id/relationships/${K}`,
Rels[K] extends Relationship.ToMany<Any>
? RelPage<RelConfigObject<RO, K>, GPage>
: never,
typeof AnyMeta,
RelRelationshipInclude<
Resource<Type, Attributes, Rels, Meta, IdSchema>,
K,
RelConfigObject<RO, K>,
GRelInclude
>,
RelRelationshipFields<RelConfigObject<RO, K>, GRelFields>
>
RelConfigObject<RO, K>,
GRelInclude
>,
RelRelationshipFields<RelConfigObject<RO, K>, GRelFields>
>
| ReturnType<
typeof updateRelationship<
Type,
Attributes,
Rels,
Meta,
IdSchema,
K,
RelErrors<RelConfigObject<RO, K>, GErrors>,
`update${Capitalize<K>}Relationship`,
`/${Type}/:id/relationships/${K}`,
typeof AnyMeta
>
>
| ReturnType<
typeof updateRelationship<
Type,
Attributes,
Rels,
Meta,
IdSchema,
K,
RelErrors<RelConfigObject<RO, K>, GErrors>,
`update${Capitalize<K>}Relationship`,
`/${Type}/:id/relationships/${K}`,
typeof AnyMeta
>
>
: never;
}[RelationshipName<Resource<Type, Attributes, Rels, Meta, IdSchema>>]
| {
readonly [K in ToManyName<Resource<Type, Attributes, Rels, Meta, IdSchema>>]: EmitRel<
RO,
K
> extends true
?
| ReturnType<
typeof addRelationship<
Type,
Attributes,
Rels,
Meta,
IdSchema,
K,
RelErrors<RelConfigObject<RO, K>, GErrors>,
`add${Capitalize<K>}Relationship`,
`/${Type}/:id/relationships/${K}`,
typeof AnyMeta
>
? | ReturnType<
typeof addRelationship<
Type,
Attributes,
Rels,
Meta,
IdSchema,
K,
RelErrors<RelConfigObject<RO, K>, GErrors>,
`add${Capitalize<K>}Relationship`,
`/${Type}/:id/relationships/${K}`,
typeof AnyMeta
>
| ReturnType<
typeof removeRelationship<
Type,
Attributes,
Rels,
Meta,
IdSchema,
K,
RelErrors<RelConfigObject<RO, K>, GErrors>,
`remove${Capitalize<K>}Relationship`,
`/${Type}/:id/relationships/${K}`
>
>
| ReturnType<
typeof removeRelationship<
Type,
Attributes,
Rels,
Meta,
IdSchema,
K,
RelErrors<RelConfigObject<RO, K>, GErrors>,
`remove${Capitalize<K>}Relationship`,
`/${Type}/:id/relationships/${K}`
>
>
: never;
}[ToManyName<Resource<Type, Attributes, Rels, Meta, IdSchema>>];

Expand Down
15 changes: 7 additions & 8 deletions src/Resource.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2240,14 +2240,13 @@ type DeclaredOperators<D, All extends string> = D extends true
* @category type-level
*/
export type FilterableKeys<Res extends Any> = Res extends Any
?
| FilterableIdKey<Res>
| {
[K in AttributeKeys<Res>]: [FilterMarkerOf<AttributesOf<Res>[K]>] extends [never]
? never
: K;
}[AttributeKeys<Res>]
| FilterableRelationshipKeys<Res>
? | FilterableIdKey<Res>
| {
[K in AttributeKeys<Res>]: [FilterMarkerOf<AttributesOf<Res>[K]>] extends [never]
? never
: K;
}[AttributeKeys<Res>]
| FilterableRelationshipKeys<Res>
: never;

/**
Expand Down
9 changes: 4 additions & 5 deletions src/internal/conformance/evaluation.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1215,11 +1215,10 @@ const judgeWalked = (
sparseFamily(endpoint, path, candidates, [...nullable, ...total, ...relationships]),
includeFamily(endpoint, path, candidates, [...nullable, ...total, ...relationships]),
];
return Effect.flatMap(judgeAll(io, ctx, path, candidates, groupProbes), (groups) =>
Effect.map(judgeFamilies(io, ctx, path, candidates, families), (judged) => [
...groups,
...judged,
]),
return Effect.zipWith(
judgeAll(io, ctx, path, candidates, groupProbes),
judgeFamilies(io, ctx, path, candidates, families),
(groups, judged) => [...groups, ...judged],
);
};

Expand Down
2 changes: 1 addition & 1 deletion tsconfig.base.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,14 +52,14 @@
"globalDateInEffect": "warning",
"globalFetch": "warning",
"globalFetchInEffect": "warning",
"globalJsonInEffect": "warning",
"globalRandom": "warning",
"globalRandomInEffect": "warning",
"globalTimers": "warning",
"globalTimersInEffect": "warning",
"instanceOfSchema": "warning",
"newPromise": "warning",
"nodeBuiltinImport": "warning",
"preferSchemaOverJson": "warning",
"processEnv": "warning",
"processEnvInEffect": "warning",
// Effect marks much of `effect/http` and `effect/http-api`
Expand Down
12 changes: 11 additions & 1 deletion vite.config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,11 @@ export default defineConfig({
"test/floor/**",
],
extends: [recommended, effect.configs.recommended],
options: { typeAware: true, typeCheck: true },
// `typeCheck` is off: tsrs's type check reports the Effect language
// service's warnings (tsconfig.base.json's `diagnosticSeverity`) as errors,
// ignoring `ignoreEffectWarningsInTscExitCode`. `vp run check` stays the
// type gate.
options: { typeAware: true, typeCheck: false },
plugins: ["eslint", "typescript", "unicorn", "oxc", "import", "promise", "vitest"],
categories: {
correctness: "error",
Expand Down Expand Up @@ -355,6 +359,12 @@ export default defineConfig({
// declarations put types in hashed chunks a consumer's declaration emit
// cannot name, so `build` emits them per module with `tsc`.
pack: {
deps: {
// tsdown <0.23 compatibility: resolve external dependency subpaths.
// Remove to preserve subpath imports as written (the new default).
// https://tsdown.dev/options/dependencies#deps-resolvedepsubpath
resolveDepSubpath: true,
},
entry: ["src/index.ts", "src/schema.ts", "src/[A-Z]*.ts", "!src/**/*.test.ts"],
format: "esm",
platform: "neutral",
Expand Down