akanealw/misode.github.io
1
0
Fork 0
mirror of https://github.com/misode/misode.github.io.git synced 2026-05-05 23:11:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Implement any/unsafe type

Browse Source
This commit is contained in:
Misode
2024-10-29 02:41:59 +01:00
parent a536c78e05
commit 7770b97a7a
2 changed files with 66 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/components/generator/McdocRenderer.tsx
+61 -1
View File
@@ -17,6 +17,13 @@ import { ItemDisplay } from '../ItemDisplay.jsx'
import { Octicon } from '../Octicon.jsx' import { Octicon } from '../Octicon.jsx'
const SPECIAL_UNSET = '__unset__' const SPECIAL_UNSET = '__unset__'
const ANY_TYPES: SimplifiedMcdocType[] = [
{ kind: 'boolean' },
{ kind: 'double' },
{ kind: 'string' },
{ kind: 'list', item: { kind: 'any' } },
{ kind: 'struct', fields: [ { kind: 'pair', key: { kind: 'string' }, type: { kind: 'any' } }] },
]
export interface McdocContext extends core.CheckerContext {} export interface McdocContext extends core.CheckerContext {}
@@ -77,6 +84,9 @@ function Head({ type, optional, node, makeEdit, ctx }: Props) {
if (type.kind === 'literal') { if (type.kind === 'literal') {
return <LiteralHead type={type} node={node} makeEdit={makeEdit} ctx={ctx} /> return <LiteralHead type={type} node={node} makeEdit={makeEdit} ctx={ctx} />
} }
if (type.kind === 'any' || type.kind === 'unsafe') {
return <AnyHead type={type} node={node} makeEdit={makeEdit} ctx={ctx} />
}
return <></> return <></>
} }
@@ -424,6 +434,32 @@ function LiteralHead({ type }: Props<LiteralType>) {
return <input value={type.value.value.toString()} disabled /> return <input value={type.value.value.toString()} disabled />
} }
function AnyHead({ optional, node, makeEdit, ctx }: Props) {
const { locale } = useLocale()
const selectedType = findSelectedAnyType(node)
const onSelect = useCallback((newValue: string) => {
makeEdit((range) => {
const newSelected = ANY_TYPES.find(t => t.kind === newValue)
if (!newSelected) {
return undefined
}
return getDefault(newSelected, range, ctx)
})
}, [makeEdit, ctx])
return <>
<select value={selectedType ? selectedType.kind : SPECIAL_UNSET} onInput={(e) => onSelect((e.target as HTMLSelectElement).value)}>
{(!selectedType || optional) && <option value={SPECIAL_UNSET}>{locale('unset')}</option>}
{ANY_TYPES.map((type) =>
<option value={type.kind}>{formatIdentifier(type.kind)}</option>
)}
</select>
{selectedType && <Head type={selectedType} node={node} makeEdit={makeEdit} ctx={ctx} />}
</>
}
function Body({ type, optional, node, makeEdit, ctx }: Props<SimplifiedMcdocType>) { function Body({ type, optional, node, makeEdit, ctx }: Props<SimplifiedMcdocType>) {
if (type.kind === 'union') { if (type.kind === 'union') {
return <UnionBody type={type} optional={optional} node={node} makeEdit={makeEdit} ctx={ctx} /> return <UnionBody type={type} optional={optional} node={node} makeEdit={makeEdit} ctx={ctx} />
@@ -457,6 +493,9 @@ function Body({ type, optional, node, makeEdit, ctx }: Props<SimplifiedMcdocType
<TupleBody type={type} node={node} makeEdit={makeEdit} ctx={ctx} /> <TupleBody type={type} node={node} makeEdit={makeEdit} ctx={ctx} />
</div> </div>
} }
if (type.kind === 'any' || type.kind === 'unsafe') {
return <AnyBody type={type} optional={optional} node={node} makeEdit={makeEdit} ctx={ctx} />
}
return <></> return <></>
} }
@@ -802,6 +841,16 @@ function TupleBody({ type, node, makeEdit, ctx }: Props<TupleType>) {
</> </>
} }
function AnyBody({ optional, node, makeEdit, ctx }: Props) {
const selectedType = findSelectedAnyType(node)
if (!selectedType) {
return <></>
}
return <Body type={selectedType} optional={optional} node={node} makeEdit={makeEdit} ctx={ctx} />
}
interface ErrorsProps { interface ErrorsProps {
type: SimplifiedMcdocType type: SimplifiedMcdocType
node: JsonNode | undefined node: JsonNode | undefined
@@ -1133,7 +1182,7 @@ function quickEqualTypes(a: SimplifiedMcdocType, b: SimplifiedMcdocType) {
function findSelectedMember(_union: UnionType<SimplifiedMcdocTypeNoUnion>, node: JsonNode | undefined) { function findSelectedMember(_union: UnionType<SimplifiedMcdocTypeNoUnion>, node: JsonNode | undefined) {
const selectedType = node?.typeDef const selectedType = node?.typeDef
if (!selectedType) { if (!selectedType || selectedType.kind === 'any' || selectedType.kind === 'unsafe') {
return undefined return undefined
} }
if (selectedType.kind === 'union') { if (selectedType.kind === 'union') {
@@ -1143,3 +1192,14 @@ function findSelectedMember(_union: UnionType<SimplifiedMcdocTypeNoUnion>, node:
} }
return selectedType return selectedType
} }
function findSelectedAnyType(node: JsonNode | undefined) {
switch (node?.type) {
case 'json:boolean': return ANY_TYPES[0]
case 'json:number': return ANY_TYPES[1]
case 'json:string': return ANY_TYPES[2]
case 'json:array': return ANY_TYPES[3]
case 'json:object': return ANY_TYPES[4]
default: return undefined
}
}
src/app/services/Spyglass.ts
+5 -2
View File
@@ -27,9 +27,12 @@ use ::java::data::worldgen::dimension::Dimension
dispatch minecraft:resource[text_component] to Text dispatch minecraft:resource[text_component] to Text
dispatch minecraft:resource[world] to struct WorldSettings { dispatch minecraft:resource[world] to struct WorldSettings {
generate_features: boolean,
bonus_chest: boolean,
seed: #[random] long, seed: #[random] long,
/// Defaults to \`true\`.
generate_features?: boolean,
/// Defaults to \`false\`.
bonus_chest?: boolean,
legacy_custom_options?: string,
dimensions: struct { dimensions: struct {
[#[id="dimension"] string]: Dimension, [#[id="dimension"] string]: Dimension,
}, },