Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 11 additions & 3 deletions packages/runtime-playground/src/editor-command-runners.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1796,13 +1796,15 @@ const EDITOR_VALIDATE_BLOCKS_READY_TIMEOUT_MS = 30_000

export interface BlockValidationNode {
name: string
originalName?: string
isValid: boolean
issues: string[]
innerBlocks?: BlockValidationNode[]
}

export interface BlockValidationResult {
name: string
originalName?: string
isValid: boolean
issues: string[]
}
Expand Down Expand Up @@ -1835,7 +1837,8 @@ export function flattenBlockValidationNodes(nodes: BlockValidationNode[]): Block
for (const node of list) {
results.push({
name: typeof node.name === "string" ? node.name : "",
isValid: node.isValid !== false,
...(typeof node.originalName === "string" && node.originalName ? { originalName: node.originalName } : {}),
isValid: node.isValid !== false && !(node.name === "core/missing" && node.originalName),
issues: Array.isArray(node.issues) ? node.issues.filter((issue): issue is string => typeof issue === "string") : [],
})
if (Array.isArray(node.innerBlocks) && node.innerBlocks.length > 0) {
Expand Down Expand Up @@ -1916,10 +1919,11 @@ async function evaluateEditorBlockValidation(page: import("playwright").Page, op
return String(issue)
}

type ValidationNode = { name: string; isValid: boolean; issues: string[]; innerBlocks: ValidationNode[] }
type ValidationNode = { name: string; originalName?: string; isValid: boolean; issues: string[]; innerBlocks: ValidationNode[] }
const validateNode = (block: unknown): ValidationNode => {
const record = (block && typeof block === "object" ? block : {}) as Record<string, unknown>
const name = typeof record.name === "string" ? record.name : ""
const originalName = typeof record.originalName === "string" ? record.originalName : ""
let isValid = record.isValid !== false
let issues: string[] = []
if (typeof validateBlock === "function") {
Expand All @@ -1942,8 +1946,12 @@ async function evaluateEditorBlockValidation(page: import("playwright").Page, op
if (isValid === false && issues.length === 0 && Array.isArray(record.validationIssues)) {
issues = (record.validationIssues as unknown[]).map(formatIssue).filter((issue) => issue.length > 0)
}
if (name === "core/missing" && originalName) {
isValid = false
if (issues.length === 0) issues = [`Missing editor registration for ${originalName}`]
}
const innerBlocks = Array.isArray(record.innerBlocks) ? (record.innerBlocks as unknown[]).map(validateNode) : []
return { name, isValid, issues, innerBlocks }
return { name, ...(originalName ? { originalName } : {}), isValid, issues, innerBlocks }
}

const parsed = wpBlocks.parse(content)
Expand Down
12 changes: 12 additions & 0 deletions tests/editor-validate-blocks.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,18 @@ const tree: BlockValidationNode[] = [
const flattened = flattenBlockValidationNodes(tree)
assert.deepEqual(flattened.map((entry) => entry.name), ["core/columns", "core/column", "core/paragraph"])

const missingCompanion = summarizeBlockValidation({
validationProvider: "wordpress-block-editor",
nodes: [{ name: "core/missing", originalName: "blocks-engine/form-input", isValid: true, issues: [] }],
})
assert.equal(missingCompanion.invalid_blocks, 1)
assert.deepEqual(missingCompanion.results[0], {
name: "core/missing",
originalName: "blocks-engine/form-input",
isValid: false,
issues: [],
})

// A post with valid blocks: every block isValid, zero invalid.
const validResult = summarizeBlockValidation({
validationProvider: "wordpress-block-editor",
Expand Down
Loading