Skip to content

change refs emission to be for all named non-container types #1765

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 16 commits into from
Sep 19, 2025
Merged

change refs emission to be for all named non-container types #1765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
3edd2cd
change refs emission to be for all named non-container types (still d…
mathpirate Sep 11, 2025
8d34b60
format
mathpirate Sep 11, 2025
f3eb1cc
doc with both short- and long-term strategies for finishing this impl…
mathpirate Sep 11, 2025
64a51a6
progress towards working implementation, still WIP
mathpirate Sep 11, 2025
85f2a18
update fixtures to no longer expect root types to always be promoted …
mathpirate Sep 18, 2025
3ea091e
and finish updating js-runtime fixtures' expectations too
mathpirate Sep 18, 2025
cf5ab9c
don't include callables/function-like things in json schemas
mathpirate Sep 18, 2025
5b29b7d
update README about skipping callables
mathpirate Sep 18, 2025
990d390
handle anonymous type cycles more properly by synthesizing a name for…
mathpirate Sep 18, 2025
84c627b
fix linting
mathpirate Sep 18, 2025
0d77403
factor out structure for special-casing certain built-in types' schemas
mathpirate Sep 18, 2025
9801b61
handle certain built-in types specially
mathpirate Sep 18, 2025
4d710c1
fix bug i just introduced
mathpirate Sep 18, 2025
701fd1c
fix built-in type handling
mathpirate Sep 18, 2025
def478d
improve handling of boolean schemas as per robin's PR comment
mathpirate Sep 18, 2025
f5e8945
fmt
mathpirate Sep 18, 2025
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
44 changes: 28 additions & 16 deletions packages/js-runtime/test/fixtures/handler-schema/array-cell-remove-intersection.expected.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,26 +7,32 @@ interface ListState {
items: Cell<Item[]>;
}
const removeItem = handler({} as const satisfies JSONSchema, {
$schema: "https://json-schema.org/draft-07/schema#",
type: "object",
properties: {
items: {
type: "array",
items: {
type: "object",
properties: {
text: {
type: "string"
}
},
required: ["text"]
$ref: "#/definitions/Item"
},
asCell: true
},
index: {
type: "number"
}
},
required: ["items", "index"]
required: ["items", "index"],
definitions: {
Item: {
type: "object",
properties: {
text: {
type: "string"
}
},
required: ["text"]
}
}
} as const satisfies JSONSchema, (_, { items, index }) => {
const next = items.get().slice();
if (index >= 0 && index < next.length)
Expand All @@ -38,26 +44,32 @@ type ListStateWithIndex = ListState & {
index: number;
};
const removeItemAlias = handler({} as const satisfies JSONSchema, {
$schema: "https://json-schema.org/draft-07/schema#",
type: "object",
properties: {
items: {
type: "array",
items: {
type: "object",
properties: {
text: {
type: "string"
}
},
required: ["text"]
$ref: "#/definitions/Item"
},
asCell: true
},
index: {
type: "number"
}
},
required: ["items", "index"]
required: ["items", "index"],
definitions: {
Item: {
type: "object",
properties: {
text: {
type: "string"
}
},
required: ["text"]
}
}
} as const satisfies JSONSchema, (_, { items, index }) => {
const next = items.get().slice();
if (index >= 0 && index < next.length)
Expand Down
98 changes: 19 additions & 79 deletions packages/js-runtime/test/fixtures/handler-schema/date-and-map-types.expected.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,117 +9,57 @@ interface TimedState {
history: Map<string, Date>;
}
const timedHandler = handler({
$schema: "https://json-schema.org/draft-07/schema#",
type: "object",
properties: {
timestamp: {
type: "string",
format: "date-time"
},
data: {
$ref: "#/definitions/Map"
}
},
required: ["timestamp", "data"],
definitions: {
Map: {
type: "object",
properties: {
clear: {
type: "object",
properties: {}
},
delete: {
type: "object",
properties: {}
},
forEach: {
type: "object",
properties: {}
},
get: {
type: "object",
properties: {}
},
has: {
type: "object",
properties: {}
},
set: {
type: "object",
properties: {}
},
size: {
type: "number"
},
entries: {
type: "object",
properties: {}
},
keys: {
type: "object",
properties: {}
},
values: {
type: "object",
properties: {}
}
},
required: ["clear", "delete", "forEach", "get", "has", "set", "size", "entries", "keys", "values"]
required: ["size"]
}
},
required: ["timestamp", "data"]
}
} as const satisfies JSONSchema, {
$schema: "https://json-schema.org/draft-07/schema#",
type: "object",
properties: {
lastUpdate: {
type: "string",
format: "date-time"
},
history: {
$ref: "#/definitions/Map"
}
},
required: ["lastUpdate", "history"],
definitions: {
Map: {
type: "object",
properties: {
clear: {
type: "object",
properties: {}
},
delete: {
type: "object",
properties: {}
},
forEach: {
type: "object",
properties: {}
},
get: {
type: "object",
properties: {}
},
has: {
type: "object",
properties: {}
},
set: {
type: "object",
properties: {}
},
size: {
type: "number"
},
entries: {
type: "object",
properties: {}
},
keys: {
type: "object",
properties: {}
},
values: {
type: "object",
properties: {}
}
},
required: ["clear", "delete", "forEach", "get", "has", "set", "size", "entries", "keys", "values"]
required: ["size"]
}
},
required: ["lastUpdate", "history"]
}
} as const satisfies JSONSchema, (event, state) => {
state.lastUpdate = event.timestamp;
event.data.forEach((value, key) => {
state.history.set(key, new Date());
});
});
export { timedHandler };
export { timedHandler };
41 changes: 23 additions & 18 deletions packages/js-runtime/test/fixtures/jsx-expressions/jsx-complex-mixed.expected.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,27 +13,13 @@ interface State {
taxRate: number;
}
export default recipe({
$schema: "https://json-schema.org/draft-07/schema#",
type: "object",
properties: {
items: {
type: "array",
items: {
type: "object",
properties: {
id: {
type: "number"
},
name: {
type: "string"
},
price: {
type: "number"
},
active: {
type: "boolean"
}
},
required: ["id", "name", "price", "active"]
$ref: "#/definitions/Item"
}
},
filter: {
Expand All @@ -46,7 +32,27 @@ export default recipe({
type: "number"
}
},
required: ["items", "filter", "discount", "taxRate"]
required: ["items", "filter", "discount", "taxRate"],
definitions: {
Item: {
type: "object",
properties: {
id: {
type: "number"
},
name: {
type: "string"
},
price: {
type: "number"
},
active: {
type: "boolean"
}
},
required: ["id", "name", "price", "active"]
}
}
} as const satisfies JSONSchema, (state) => {
return {
[UI]: (<div>
Expand Down Expand Up @@ -84,4 +90,3 @@ export default recipe({
</div>),
};
});

Loading