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

Render unknown fields

Browse Source
This commit is contained in:
Misode
2024-11-20 03:42:37 +01:00
parent f4f2450133
commit e11e88d6db
1 changed files with 32 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/app/components/generator/McdocRenderer.tsx
View File

@@ -1,7 +1,7 @@
import * as core from '@spyglassmc/core'
import type { JsonNode, JsonPairNode } from '@spyglassmc/json'
import type { JsonPairNode } from '@spyglassmc/json'
import * as json from '@spyglassmc/json'
import { JsonArrayNode, JsonBooleanNode, JsonNumberNode, JsonObjectNode, JsonStringNode } from '@spyglassmc/json'
import { JsonArrayNode, JsonBooleanNode, JsonNode, JsonNumberNode, JsonObjectNode, JsonStringNode } from '@spyglassmc/json'
import { localeQuote } from '@spyglassmc/locales'
import type { ListType, LiteralType, McdocType, NumericType, PrimitiveArrayType, StringType, TupleType, UnionType } from '@spyglassmc/mcdoc'
import { handleAttributes } from '@spyglassmc/mcdoc/lib/runtime/attribute/index.js'
@@ -506,8 +506,7 @@ function StructBody({ type: outerType, node, ctx }: Props<SimplifiedStructType>)
// Hack to support component negations, the only place with more than one dynamic field currently
const field = dynamicFields[key.startsWith('!') ? 1 : 0] as SimplifiedStructTypePairField | undefined
if (!field || (field.key.kind === 'any' && field.type.kind === 'any')) {
// Hide dispatch fallback
return <></>
return <UnknownField key={key} pair={pair} index={index} fieldKey={key} type={type} node={node} ctx={ctx} />
}
return <DynamicField key={key} pair={pair} index={index} field={field} fieldKey={key} isToggled={isToggled(key)} expand={expand(key)} collapse={collapse(key)}type={type} node={node} ctx={ctx} />
})}
@@ -701,6 +700,33 @@ function DynamicField({ pair, index, field, fieldKey, isToggled, expand, collaps
</div>
}
interface UnknownFieldProps extends Props {
pair: JsonPairNode
index: number
fieldKey: string
node: JsonObjectNode
}
function UnknownField({ pair, index, fieldKey, node, ctx }: UnknownFieldProps) {
const { locale } = useLocale()
const removeField = useCallback(() => {
ctx.makeEdit(() => {
node.children.splice(index, 1)
return node
})
}, [index, node, ctx])
return <div class="node">
<div class="node-header">
<Errors type={{ kind: 'any' }} node={pair} ctx={ctx} />
<button class="remove tooltipped tip-se" aria-label={locale('remove')} onClick={removeField}>
{Octicon.trashcan}
</button>
<Key label={fieldKey} />
</div>
</div>
}
function ListHead({ type, node, ctx }: Props<ListType | PrimitiveArrayType>) {
const { locale } = useLocale()
@@ -1105,7 +1131,7 @@ function Key({ label, raw }: KeyProps) {
interface ErrorsProps {
type: SimplifiedMcdocType
node: JsonNode | undefined
node: core.AstNode | undefined
ctx: McdocContext
}
function Errors({ type, node, ctx }: ErrorsProps) {
@@ -1119,7 +1145,7 @@ function Errors({ type, node, ctx }: ErrorsProps) {
// Unless they are inside a child node
.filter(e => !node.children?.some(c => (c.type === 'item' || c.type === 'pair') && core.Range.containsRange(c.range, e.range, true)))
// Filter out "Missing key" errors
.filter(e => !(core.Range.length(e.range) === 1 && (type.kind === 'struct' || (type.kind === 'union' && (selectUnionMember(type, node) ?? type.members[0]).kind === 'struct'))))
.filter(e => !(core.Range.length(e.range) === 1 && (type.kind === 'struct' || (type.kind === 'union' && JsonNode.is(node) && (selectUnionMember(type, node) ?? type.members[0]).kind === 'struct'))))
// Hide warnings if there are errors
return errors.find(e => e.severity === 3)
? errors.filter(e => e.severity === 3)