mirror of
https://github.com/toeverything/AFFiNE.git
synced 2026-07-12 07:36:42 +08:00
9f3cf271e3
Let me analyze the key changes in this diff: 1. **Role System Changes**: - Changed from a fixed enum of roles (`root`, `hub`, `content`) to a more flexible string-based system - Removed strict role hierarchy validation rules (hub/content/root relationships) - Added support for role-based matching using `@` prefix (e.g., `@root`, `@content`) 2. **Schema Validation Updates**: - Added new `_matchFlavourOrRole` method to handle both flavour and role-based matching - Updated `_validateParent` to consider both roles and flavours when validating parent-child relationships - Simplified `_validateRole` by removing specific role hierarchy constraints 3. **Block Schema Changes**: - Updated parent/children references in various block schemas to use the new `@` prefix notation - Changed parent definitions from `['affine:page']` to `['@root']` in several blocks - Updated children definitions to use role-based references (e.g., `['@content']`) 4. **Test Updates**: - Added new test cases for role-based schema validation - Introduced new test block schemas (`TestRoleBlockSchema`, `TestParagraphBlockSchema`) to verify role-based functionality This appears to be a significant architectural change that makes the block schema system more flexible by: 1. Moving away from hardcoded role hierarchies 2. Introducing a more dynamic role-based relationship system 3. Supporting both flavour-based and role-based parent-child relationships 4. Using the `@` prefix convention to distinguish role references from flavour references The changes make the system more extensible while maintaining backward compatibility with existing flavour-based relationships.
235 lines
6.2 KiB
TypeScript
235 lines
6.2 KiB
TypeScript
import { minimatch } from 'minimatch';
|
|
|
|
import { SCHEMA_NOT_FOUND_MESSAGE } from '../consts.js';
|
|
import { BlockSchema, type BlockSchemaType } from '../model/index.js';
|
|
import { SchemaValidateError } from './error.js';
|
|
|
|
export class Schema {
|
|
readonly flavourSchemaMap = new Map<string, BlockSchemaType>();
|
|
|
|
safeValidate = (
|
|
flavour: string,
|
|
parentFlavour?: string,
|
|
childFlavours?: string[]
|
|
): boolean => {
|
|
try {
|
|
this.validate(flavour, parentFlavour, childFlavours);
|
|
return true;
|
|
} catch {
|
|
return false;
|
|
}
|
|
};
|
|
|
|
get(flavour: string) {
|
|
return this.flavourSchemaMap.get(flavour);
|
|
}
|
|
|
|
validate = (
|
|
flavour: string,
|
|
parentFlavour?: string,
|
|
childFlavours?: string[]
|
|
): void => {
|
|
const schema = this.flavourSchemaMap.get(flavour);
|
|
if (!schema) {
|
|
throw new SchemaValidateError(flavour, SCHEMA_NOT_FOUND_MESSAGE);
|
|
}
|
|
|
|
const validateChildren = () => {
|
|
childFlavours?.forEach(childFlavour => {
|
|
const childSchema = this.flavourSchemaMap.get(childFlavour);
|
|
if (!childSchema) {
|
|
throw new SchemaValidateError(childFlavour, SCHEMA_NOT_FOUND_MESSAGE);
|
|
}
|
|
this.validateSchema(childSchema, schema);
|
|
});
|
|
};
|
|
|
|
if (schema.model.role === 'root') {
|
|
if (parentFlavour) {
|
|
throw new SchemaValidateError(
|
|
schema.model.flavour,
|
|
'Root block cannot have parent.'
|
|
);
|
|
}
|
|
|
|
validateChildren();
|
|
return;
|
|
}
|
|
|
|
if (!parentFlavour) {
|
|
throw new SchemaValidateError(
|
|
schema.model.flavour,
|
|
'None root block must have parent.'
|
|
);
|
|
}
|
|
|
|
const parentSchema = this.flavourSchemaMap.get(parentFlavour);
|
|
if (!parentSchema) {
|
|
throw new SchemaValidateError(parentFlavour, SCHEMA_NOT_FOUND_MESSAGE);
|
|
}
|
|
this.validateSchema(schema, parentSchema);
|
|
validateChildren();
|
|
};
|
|
|
|
get versions() {
|
|
return Object.fromEntries(
|
|
Array.from(this.flavourSchemaMap.values()).map(
|
|
(schema): [string, number] => [schema.model.flavour, schema.version]
|
|
)
|
|
);
|
|
}
|
|
|
|
private _matchFlavour(childFlavour: string, parentFlavour: string) {
|
|
return (
|
|
minimatch(childFlavour, parentFlavour) ||
|
|
minimatch(parentFlavour, childFlavour)
|
|
);
|
|
}
|
|
|
|
private _matchFlavourOrRole(
|
|
childValue: string,
|
|
parentValue: string,
|
|
childRole: string,
|
|
parentRole: string
|
|
): boolean {
|
|
// Check if either value starts with '@' indicating it's a role
|
|
const isChildRole = childValue.startsWith('@');
|
|
const isParentRole = parentValue.startsWith('@');
|
|
|
|
// If both are roles, do exact match
|
|
if (isChildRole && isParentRole) {
|
|
return childValue === parentValue;
|
|
}
|
|
// If child is role, compare with parent's actual role
|
|
if (isChildRole) {
|
|
return childValue === `@${parentRole}`;
|
|
}
|
|
// If parent is role, compare with child's actual role
|
|
if (isParentRole) {
|
|
return parentValue === `@${childRole}`;
|
|
}
|
|
// If neither is role, use flavour matching
|
|
return this._matchFlavour(childValue, parentValue);
|
|
}
|
|
|
|
private _validateParent(
|
|
child: BlockSchemaType,
|
|
parent: BlockSchemaType
|
|
): boolean {
|
|
const _childFlavour = child.model.flavour;
|
|
const _parentFlavour = parent.model.flavour;
|
|
const _childRole = child.model.role;
|
|
const _parentRole = parent.model.role;
|
|
|
|
const childValidFlavourOrRole = child.model.parent || ['*'];
|
|
const parentValidFlavourOrRole = parent.model.children || ['*'];
|
|
|
|
return parentValidFlavourOrRole.some(parentValidFlavourOrRole => {
|
|
return childValidFlavourOrRole.some(childValidFlavourOrRole => {
|
|
if (
|
|
parentValidFlavourOrRole === '*' &&
|
|
childValidFlavourOrRole === '*'
|
|
) {
|
|
return true;
|
|
}
|
|
|
|
if (parentValidFlavourOrRole === '*') {
|
|
return this._matchFlavourOrRole(
|
|
childValidFlavourOrRole,
|
|
_parentFlavour,
|
|
_childRole,
|
|
_parentRole
|
|
);
|
|
}
|
|
|
|
if (childValidFlavourOrRole === '*') {
|
|
return this._matchFlavourOrRole(
|
|
_childFlavour,
|
|
parentValidFlavourOrRole,
|
|
_childRole,
|
|
_parentRole
|
|
);
|
|
}
|
|
|
|
return (
|
|
this._matchFlavourOrRole(
|
|
_childFlavour,
|
|
parentValidFlavourOrRole,
|
|
_childRole,
|
|
_parentRole
|
|
) &&
|
|
this._matchFlavourOrRole(
|
|
childValidFlavourOrRole,
|
|
_parentFlavour,
|
|
_childRole,
|
|
_parentRole
|
|
)
|
|
);
|
|
});
|
|
});
|
|
}
|
|
|
|
private _validateRole(child: BlockSchemaType, parent: BlockSchemaType) {
|
|
const childRole = child.model.role;
|
|
const childFlavour = child.model.flavour;
|
|
const parentFlavour = parent.model.flavour;
|
|
|
|
if (childRole === 'root') {
|
|
throw new SchemaValidateError(
|
|
childFlavour,
|
|
`Root block cannot have parent: ${parentFlavour}.`
|
|
);
|
|
}
|
|
}
|
|
|
|
isValid(child: string, parent: string) {
|
|
const childSchema = this.flavourSchemaMap.get(child);
|
|
const parentSchema = this.flavourSchemaMap.get(parent);
|
|
if (!childSchema || !parentSchema) {
|
|
return false;
|
|
}
|
|
try {
|
|
this.validateSchema(childSchema, parentSchema);
|
|
return true;
|
|
} catch {
|
|
return false;
|
|
}
|
|
}
|
|
|
|
register(blockSchema: BlockSchemaType[]) {
|
|
blockSchema.forEach(schema => {
|
|
BlockSchema.parse(schema);
|
|
this.flavourSchemaMap.set(schema.model.flavour, schema);
|
|
});
|
|
return this;
|
|
}
|
|
|
|
toJSON() {
|
|
return Object.fromEntries(
|
|
Array.from(this.flavourSchemaMap.values()).map(
|
|
(schema): [string, Record<string, unknown>] => [
|
|
schema.model.flavour,
|
|
{
|
|
role: schema.model.role,
|
|
parent: schema.model.parent,
|
|
children: schema.model.children,
|
|
},
|
|
]
|
|
)
|
|
);
|
|
}
|
|
|
|
validateSchema(child: BlockSchemaType, parent: BlockSchemaType) {
|
|
this._validateRole(child, parent);
|
|
|
|
const relationCheckSuccess = this._validateParent(child, parent);
|
|
|
|
if (!relationCheckSuccess) {
|
|
throw new SchemaValidateError(
|
|
child.model.flavour,
|
|
`Block cannot have parent: ${parent.model.flavour}.`
|
|
);
|
|
}
|
|
}
|
|
}
|