enhance: Allow schema import directly - not just { schema }

.changeset/modern-grapes-sell.md

@@ -0,0 +1,26 @@
+---
+"@data-client/core": patch
+"@data-client/endpoint": patch
+"@data-client/graphql": patch
+"@data-client/react": patch
+"@data-client/rest": patch
+"@data-client/vue": patch
+---
+
+Add direct exports for schema classes from `@data-client/endpoint`
+
+Schema classes (`Union`, `Invalidate`, `Collection`, `Query`, `Values`, `All`) can now be imported directly instead of requiring the `schema` namespace.
+
+#### Before
+```ts
+import { schema } from '@data-client/endpoint';
+const myUnion = new schema.Union({ users: User, groups: Group }, 'type');
+```
+
+#### After
+```ts
+import { Union } from '@data-client/endpoint';
+const myUnion = new Union({ users: User, groups: Group }, 'type');
+```
+
+The `schema` namespace export remains available for backward compatibility.

.cursor/commands/changeset.md

@@ -42,6 +42,8 @@ Generate changesets, update documentation, draft blog entries, and prepare PR de
    - Summarize motivation from changeset descriptions
    - Describe solution at a high level first (not implementation details)
    - Include any mermaid diagrams that might help convey key concepts, especially if one was present in a plan.md
+   - Drop 'Open questions' section if no relevant content
+   - Keep in mind you are a chat agent talking in markdown, so cannot start a markdown block without escaping the contents.
 
 ## Changeset Format
 - **First line**: Action verb ("Add", "Fix", "Update", "Remove")
@@ -55,4 +57,4 @@ Generate changesets, update documentation, draft blog entries, and prepare PR de
 - Multiple use cases: Separate with brief labels
 
 ## Markdown Formatting
-Follow `@.cursor/rules/markdown-formatting.mdc` for all markdown content.
+Follow `@.cursor/rules/markdown-formatting.mdc` for all markdown content including the PR desc.

.cursor/rules/markdown-formatting.mdc

@@ -10,6 +10,7 @@ Link API concepts that have corresponding doc pages:
 
 - **External doc links**: `[Union](https://dataclient.io/rest/api/Union)`
 - **Internal doc links**: Use site paths like `[Controller](/docs/api/Controller)` or `[Entity](/rest/api/Entity)`
+- **Package links**: `[@data-client/rest](www.npmjs.com/package/@data-client/rest)`
 
 ## Repository Links
 

.cursor/rules/react.mdc

@@ -83,7 +83,7 @@ ctrl.fetch(), ctrl.fetchIfStale(), ctrl.expireAll(), ctrl.invalidate(), ctrl.inv
 ## Programmatic queries
 
 ```ts
-const queryRemainingTodos = new schema.Query(
+const queryRemainingTodos = new Query(
   TodoResource.getList.schema,
   entries => entries.filter(todo => !todo.completed).length,
 );
@@ -93,7 +93,7 @@ const firstUserRemainingTodos = useQuery(queryRemainingTodos, { userId: 1 });
 ```
 
 ```ts
-const groupTodoByUser = new schema.Query(
+const groupTodoByUser = new Query(
   TodoResource.getList.schema,
   todos => Object.groupBy(todos, todo => todo.userId),
 );

.cursor/rules/schema.mdc

@@ -11,33 +11,33 @@ to represent the data expected.
 ### Object
 
 - [Entity](https://dataclient.io/rest/api/Entity) - represents a single unique object (denormalized)
-- [new schema.Union(Entity)](https://dataclient.io/rest/api/Union) - polymorphic objects (A | B)
+- [new Union(Entity)](https://dataclient.io/rest/api/Union) - polymorphic objects (A | B)
 - `{[key:string]: Schema}` - immutable objects
-- `new schema.Invalidate(Entity)` - to delete an Entity
+- `new Invalidate(Entity)` - to delete an Entity
 
 ### List
 
-- [new schema.Collection([Entity])](https://dataclient.io/rest/api/Collection) - mutable/growable lists
+- [new Collection([Entity])](https://dataclient.io/rest/api/Collection) - mutable/growable lists
 - `[Entity]` - immutable lists
-- `new schema.All(Entity)` - list all Entities of a kind
+- `new All(Entity)` - list all Entities of a kind
 
 ### Map
 
-- `new schema.Collection(schema.Values(Entity))` - mutable/growable maps
-- `new schema.Values(Entity)` - immutable maps
+- `new Collection(Values(Entity))` - mutable/growable maps
+- `new Values(Entity)` - immutable maps
 
 ### Programmatic
 
-- [new schema.Query(Queryable)](https://dataclient.io/rest/api/Query) - memoized programmatic selectors
+- [new Query(Queryable)](https://dataclient.io/rest/api/Query) - memoized programmatic selectors
   ```ts
-  const queryRemainingTodos = new schema.Query(
+  const queryRemainingTodos = new Query(
     TodoResource.getList.schema,
     entries => entries.filter(todo => !todo.completed).length,
   );
   ```
 
   ```ts
-  const groupTodoByUser = new schema.Query(
+  const groupTodoByUser = new Query(
     TodoResource.getList.schema,
     todos => Object.groupBy(todos, todo => todo.userId),
   );
@@ -58,7 +58,7 @@ to represent the data expected.
 
 ## 3. **Union Types (Polymorphic Schemas)**
 
-To define polymorphic resources (e.g., events), use [schema.Union](https://dataclient.io/rest/api/Union) and a discriminator field.
+To define polymorphic resources (e.g., events), use [Union](https://dataclient.io/rest/api/Union) and a discriminator field.
 
 ```typescript
 import { schema } from '@data-client/rest';
@@ -72,7 +72,7 @@ export class IssuesEvent extends Event { /* ... */ }
 
 export const EventResource = resource({
   path: '/users/:login/events/public/:id',
-  schema: new schema.Union(
+  schema: new Union(
     {
       PullRequestEvent,
       IssuesEvent,

.cursor/rules/vue-testing.mdc

@@ -394,7 +394,7 @@ expect(result.current?.value).toBe(undefined);
 
 **Testing nested collections:**
 ```typescript
-const userTodos = new schema.Collection(new schema.Array(Todo), {
+const userTodos = new Collection(new schema.Array(Todo), {
   argsKey: ({ userId }) => ({ userId }),
 });
 

.github/copilot-instructions.md

@@ -27,7 +27,7 @@
 	- Examples: `examples/nextjs/resources/TodoResource.ts`, `examples/github-app/src/resources/Issue.tsx`.
 - Place app-level API definitions and custom Managers in `src/resources/` within examples/apps (e.g., `examples/todo-app/src/resources/`).
 - Managers communicate via actions and the `Controller`; import `actionTypes` from `@data-client/react` for type checks.
-- Programmatic queries use `new schema.Query(...)` with a Resource’s schema; see `README.md` examples.
+- Programmatic queries use `new Query(...)` with a Resource’s schema; see `README.md` examples.
 
 ### Integration details
 - Babel (`babel.config.js`) resolves relative `.js` imports to `.ts` in tests; when `COMPILE_TARGET=native`, it prefers `.native.*` files.

README.md

@@ -140,8 +140,8 @@ ctrl.set(Article, { id }, articleData);
 ### [Programmatic queries](https://dataclient.io/rest/api/Query)
 
 ```typescript
-const queryTotalVotes = new schema.Query(
-  new schema.Collection([BlogPost]),
+const queryTotalVotes = new Query(
+  new Collection([BlogPost]),
   posts => posts.reduce((total, post) => total + post.votes, 0),
 );
 
@@ -150,7 +150,7 @@ const totalVotesForUser = useQuery(queryTotalVotes, { userId });
 ```
 
 ```typescript
-const groupTodoByUser = new schema.Query(
+const groupTodoByUser = new Query(
   TodoResource.getList.schema,
   todos => Object.groupBy(todos, todo => todo.userId),
 );

__tests__/UnionSchema.ts

@@ -1,4 +1,4 @@
-import { Entity, schema } from '@data-client/rest';
+import { Entity, Union } from '@data-client/rest';
 
 export enum SequenceType {
   TemporalCatDiff = 'temporal_cat_diff',
@@ -30,7 +30,7 @@ export class ContinuousSequence extends Sequence {
 export const waterfallSchema = {
   analysisId: '',
   sequences: [
-    new schema.Union(
+    new Union(
       {
         [SequenceType.TemporalCatCount]: CategoricalSequence,
         [SequenceType.TemporalCatDiff]: CategoricalSequence,

__tests__/new.ts

@@ -2,7 +2,6 @@ import { Temporal } from '@js-temporal/polyfill';
 import React, { createContext, useContext } from 'react';
 
 import {
-  schema,
   Endpoint,
   resource,
   RestEndpoint,
@@ -15,6 +14,8 @@ import {
   RestInstance,
   Resource,
   ResourceOptions,
+  Union,
+  Invalidate,
 } from '@data-client/rest';
 
 /** Represents data with primary key being from 'id' field. */
@@ -446,7 +447,7 @@ export const FutureArticleResource = {
     CoolerArticleResource.delete as any as RestType<
       string | number,
       undefined,
-      schema.Invalidate<typeof CoolerArticle>,
+      Invalidate<typeof CoolerArticle>,
       true
     >
   ).extend({
@@ -611,7 +612,7 @@ export class SecondUnion extends UnionBase {
   readonly secondeOnlyField: number = 10;
 }
 
-export const UnionSchema = new schema.Union(
+export const UnionSchema = new Union(
   {
     first: FirstUnion,
     second: SecondUnion,
@@ -627,7 +628,7 @@ export const UnionResource = {
   // just to test the other type of union def
   getList: UnionResourceBase.getList.extend({
     schema: [
-      new schema.Union(
+      new Union(
         {
           first: FirstUnion,
           second: SecondUnion,

docs/core/README.md

@@ -290,19 +290,19 @@ function ArticleEdit() {
 ### More data modeling
 
 What if our entity is not the top level item? Here we define the `getList`
-endpoint with [new schema.Collection([Todo])](/rest/api/Collection) as its schema. [Schemas](./concepts/normalization.md#schema) tell Reactive Data Client _where_ to find
+endpoint with [new Collection([Todo])](/rest/api/Collection) as its schema. [Schemas](./concepts/normalization.md#schema) tell Reactive Data Client _where_ to find
 the Entities. By placing inside a list, Reactive Data Client knows to expect a response
 where each item of the list is the entity specified.
 
 ```typescript {6}
-import { RestEndpoint, schema } from '@data-client/rest';
+import { RestEndpoint, Collection } from '@data-client/rest';
 
 // get and update definitions omitted
 
 const getList = new RestEndpoint({
   urlPrefix: 'https://jsonplaceholder.typicode.com',
   path: '/todos',
-  schema: new schema.Collection([Todo]),
+  schema: new Collection([Todo]),
   searchParams: {} as { userId?: string | number } | undefined,
   paginationField: 'page',
 });

docs/core/api/useDLE.md

@@ -267,7 +267,7 @@ export const getPosts = new RestEndpoint({
   path: '/post',
   searchParams: { page: '' },
   schema: {
-    results: new schema.Collection([PaginatedPost]),
+    results: new Collection([PaginatedPost]),
     nextPage: '',
     lastPage: '',
   },

docs/core/api/useDebounce.md

@@ -25,7 +25,7 @@ When loading new data, the [AsyncBoundary](./AsyncBoundary.md) will continue ren
 <HooksPlayground row>
 
 ```ts title="IssueQuery" collapsed
-import { RestEndpoint, Entity, schema } from '@data-client/rest';
+import { RestEndpoint, Entity, Collection } from '@data-client/rest';
 
 export class Issue extends Entity {
   number = 0;
@@ -62,7 +62,7 @@ export const issueQuery = new RestEndpoint({
   paginationField: 'page',
   schema: {
     incomplete_results: false,
-    items: new schema.Collection([Issue]),
+    items: new Collection([Issue]),
     total_count: 0,
   },
 });

docs/core/api/useQuery.md

@@ -109,16 +109,16 @@ export const UserResource = resource({
 ```
 
 ```tsx title="UsersPage" {22}
-import { schema } from '@data-client/rest';
+import { Query } from '@data-client/rest';
 import { useQuery, useFetch } from '@data-client/react';
 import { UserResource, User } from './UserResource';
 
 interface Args {
   asc: boolean;
   isAdmin?: boolean;
 }
-const sortedUsers = new schema.Query(
-  new schema.All(User),
+const sortedUsers = new Query(
+  new All(User),
   (entries, { asc, isAdmin }: Args = { asc: false }) => {
     let sorted = [...entries].sort((a, b) => a.name.localeCompare(b.name));
     if (isAdmin !== undefined)

docs/core/api/useSuspense.md

@@ -337,7 +337,7 @@ export const getPosts = new RestEndpoint({
   path: '/post',
   searchParams: { page: '' },
   schema: {
-    posts: new schema.Collection([PaginatedPost]),
+    posts: new Collection([PaginatedPost]),
     nextPage: '',
     lastPage: '',
   },

docs/core/concepts/expiry-policy.md

@@ -577,6 +577,8 @@ delay: () => 150,
 >
 
 ```ts title="api/lastUpdated" collapsed
+import { Entity, RestEndpoint } from '@data-client/rest';
+
 export class TimedEntity extends Entity {
   id = '';
   updatedAt = Temporal.Instant.fromEpochMilliseconds(0);
@@ -611,11 +613,12 @@ export default function TimePage({ id }) {
 ```
 
 ```tsx title="ShowTime"
+import { Invalidate } from '@data-client/rest';
 import { useLoading } from '@data-client/react';
 import { TimedEntity } from './api/lastUpdated';
 import TimePage from './TimePage';
 
-const InvalidateTimedEntity = new schema.Invalidate(TimedEntity);
+const InvalidateTimedEntity = new Invalidate(TimedEntity);
 export const deleteLastUpdated = new RestEndpoint({
   path: '/api/currentTime/:id',
   method: 'DELETE',

docs/core/concepts/normalization.md

@@ -71,7 +71,7 @@ values={[
 ```typescript
 const getPresentations = new Endpoint(
   () => fetch(`/presentations`).then(res => res.json()),
-  { schema: new schema.Collection([Presentation]) },
+  { schema: new Collection([Presentation]) },
 );
 ```
 
@@ -137,7 +137,7 @@ const todoCreate = new RestEndpoint({
   urlPrefix: 'https://jsonplaceholder.typicode.com',
   path: '/todos',
   method: 'POST',
-  schema: new schema.Collection([Todo]).push,
+  schema: new Collection([Todo]).push,
 });
 ```
 
@@ -203,13 +203,13 @@ export default function UpdateTodoForm({ id }: { id: number }) {
 <TabItem value="Delete">
 
 ```typescript
-import { schema, RestEndpoint } from '@data-client/rest';
+import { Invalidate, RestEndpoint } from '@data-client/rest';
 
 const todoDelete = new RestEndpoint({
   urlPrefix: 'https://jsonplaceholder.typicode.com',
   path: '/todos/:id',
   method: 'DELETE',
-  schema: new schema.Invalidate(Todo),
+  schema: new Invalidate(Todo),
 });
 ```
 
@@ -251,13 +251,13 @@ Schemas are a declarative definition of how to [process responses](/rest/api/sch
 - Functions to [deserialize fields](/rest/guides/network-transform#deserializing-fields)
 
 ```typescript
-import { RestEndpoint, schema } from '@data-client/rest';
+import { RestEndpoint, Collection } from '@data-client/rest';
 
 const getTodoList = new RestEndpoint({
   urlPrefix: 'https://jsonplaceholder.typicode.com',
   path: '/todos',
   // highlight-next-line
-  schema: new schema.Collection([Todo]),
+  schema: new Collection([Todo]),
 });
 ```