Skip to content

chore(core/schema): de-namespace static schema id types #1741

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 10, 2025
Merged

chore(core/schema): de-namespace static schema id types #1741

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 0 deletions .changeset/eight-ducks-rush.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
---
---
19 changes: 12 additions & 7 deletions packages/core/src/submodules/schema/schemas/NormalizedSchema.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,12 @@ import type {
StaticMapSchema,
StaticOperationSchema,
StaticSchema,
StaticSchemaId,
StaticSchemaIdError,
StaticSchemaIdList,
StaticSchemaIdMap,
StaticSchemaIdOperation,
StaticSchemaIdSimple,
StaticSchemaIdStruct,
StaticSimpleSchema,
StaticStructureSchema,
StreamingBlobSchema,
Expand Down Expand Up @@ -445,12 +450,12 @@ export function hydrate(
const [id, ...rest] = ss;
return (
{
[0 satisfies StaticSchemaId.Simple]: sim,
[1 satisfies StaticSchemaId.List]: list,
[2 satisfies StaticSchemaId.Map]: map,
[3 satisfies StaticSchemaId.Struct]: struct,
[-3 satisfies StaticSchemaId.Error]: error,
[9 satisfies StaticSchemaId.Operation]: op,
[0 satisfies StaticSchemaIdSimple]: sim,
[1 satisfies StaticSchemaIdList]: list,
[2 satisfies StaticSchemaIdMap]: map,
[3 satisfies StaticSchemaIdStruct]: struct,
[-3 satisfies StaticSchemaIdError]: error,
[9 satisfies StaticSchemaIdOperation]: op,
}[id] as Function
).call(null, ...rest);
}
Expand Down
46 changes: 32 additions & 14 deletions packages/types/src/schema/static-schemas.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,32 @@ import type { SchemaRef, SchemaTraits } from "../schema/schema";
/**
* @alpha
*/
export namespace StaticSchemaId {
export type Simple = 0;
export type List = 1;
export type Map = 2;
export type Struct = 3;
export type Error = -3;
export type Operation = 9;
}
export type StaticSchemaIdSimple = 0;

/**
* @alpha
*/
export type StaticSchemaIdList = 1;

/**
* @alpha
*/
export type StaticSchemaIdMap = 2;

/**
* @alpha
*/
export type StaticSchemaIdStruct = 3;

/**
* @alpha
*/
export type StaticSchemaIdError = -3;

/**
* @alpha
*/
export type StaticSchemaIdOperation = 9;

/**
* @alpha
Expand All @@ -41,23 +59,23 @@ export type ShapeNamespace = string;
/**
* @alpha
*/
export type StaticSimpleSchema = [StaticSchemaId.Simple, ShapeNamespace, ShapeName, SchemaRef, SchemaTraits];
export type StaticSimpleSchema = [StaticSchemaIdSimple, ShapeNamespace, ShapeName, SchemaRef, SchemaTraits];

/**
* @alpha
*/
export type StaticListSchema = [StaticSchemaId.List, ShapeNamespace, ShapeName, SchemaTraits, SchemaRef];
export type StaticListSchema = [StaticSchemaIdList, ShapeNamespace, ShapeName, SchemaTraits, SchemaRef];

/**
* @alpha
*/
export type StaticMapSchema = [StaticSchemaId.Map, ShapeNamespace, ShapeName, SchemaTraits, SchemaRef, SchemaRef];
export type StaticMapSchema = [StaticSchemaIdMap, ShapeNamespace, ShapeName, SchemaTraits, SchemaRef, SchemaRef];

/**
* @alpha
*/
export type StaticStructureSchema = [
StaticSchemaId.Struct,
StaticSchemaIdStruct,
ShapeNamespace,
ShapeName,
SchemaTraits,
Expand All @@ -69,7 +87,7 @@ export type StaticStructureSchema = [
* @alpha
*/
export type StaticErrorSchema = [
StaticSchemaId.Error,
StaticSchemaIdError,
ShapeNamespace,
ShapeName,
SchemaTraits,
Expand All @@ -81,7 +99,7 @@ export type StaticErrorSchema = [
* @alpha
*/
export type StaticOperationSchema = [
StaticSchemaId.Operation,
StaticSchemaIdOperation,
ShapeNamespace,
ShapeName,
SchemaTraits,
Expand Down