@markuplint/ml-spec 2.1.0 → 3.0.0-alpha.0

package/lib/types/aria.d.ts

@@ -0,0 +1,130 @@
+/**
+ * This file was automatically generated by json-schema-to-typescript.
+ * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+ * and run json-schema-to-typescript to regenerate this file.
+ */
+/**
+ * If `false`, this mean is "No corresponding role".
+ */
+export declare type ImplicitRole = false | string;
+/**
+ * If `true`, this mean is "Any". If `false`, this mean is "No".
+ */
+export declare type PermittedRoles = boolean | (string | {
+    name: string;
+    deprecated?: true;
+    [k: string]: unknown;
+})[] | {
+    'core-aam'?: true;
+    'graphics-aam'?: true;
+};
+/**
+ * If set false:
+ * > No role or aria-* attributes
+ */
+export declare type PermittedARIAProperties = false | {
+    global?: true;
+    /**
+     * Set true if the spec says "and any aria-* attributes applicable to the allowed roles."
+     */
+    role?: true | string | [string, ...string[]];
+    only?: [
+        (string | {
+            name: string;
+            value?: string;
+        }),
+        ...(string | {
+            name: string;
+            value?: string;
+        })[]
+    ];
+    whithout?: [
+        {
+            type: 'not-recommended' | 'should-not' | 'must-not';
+            name: string;
+            value?: string;
+            alt?: {
+                method: 'remove-attr' | 'set-attr';
+                target: string;
+            };
+        },
+        ...{
+            type: 'not-recommended' | 'should-not' | 'must-not';
+            name: string;
+            value?: string;
+            alt?: {
+                method: 'remove-attr' | 'set-attr';
+                target: string;
+            };
+        }[]
+    ];
+};
+export interface AriaSchema {
+    _?: ARIA;
+    [k: string]: unknown;
+}
+export interface ARIA {
+    implicitRole: ImplicitRole;
+    permittedRoles: PermittedRoles;
+    namingProhibited?: true;
+    implicitProperties?: ImplicitProperties;
+    properties?: PermittedARIAProperties;
+    conditions?: {
+        /**
+         * This interface was referenced by `undefined`'s JSON-Schema definition
+         * via the `patternProperty` ".+".
+         */
+        [k: string]: {
+            implicitRole?: ImplicitRole;
+            permittedRoles?: PermittedRoles;
+            namingProhibited?: true;
+            implicitProperties?: ImplicitProperties;
+            properties?: PermittedARIAProperties;
+        };
+    };
+    '1.2'?: {
+        implicitRole?: ImplicitRole;
+        permittedRoles?: PermittedRoles;
+        namingProhibited?: true;
+        implicitProperties?: ImplicitProperties;
+        properties?: PermittedARIAProperties;
+        conditions?: {
+            /**
+             * This interface was referenced by `undefined`'s JSON-Schema definition
+             * via the `patternProperty` ".+".
+             */
+            [k: string]: {
+                implicitRole?: ImplicitRole;
+                permittedRoles?: PermittedRoles;
+                namingProhibited?: true;
+                implicitProperties?: ImplicitProperties;
+                properties?: PermittedARIAProperties;
+            };
+        };
+    };
+    '1.1'?: {
+        implicitRole?: ImplicitRole;
+        permittedRoles?: PermittedRoles;
+        implicitProperties?: ImplicitProperties;
+        properties?: PermittedARIAProperties;
+        conditions?: {
+            /**
+             * This interface was referenced by `undefined`'s JSON-Schema definition
+             * via the `patternProperty` ".+".
+             */
+            [k: string]: {
+                implicitRole?: ImplicitRole;
+                permittedRoles?: PermittedRoles;
+                implicitProperties?: ImplicitProperties;
+                properties?: PermittedARIAProperties;
+            };
+        };
+    };
+}
+export interface ImplicitProperties {
+    /**
+     * This interface was referenced by `ImplicitProperties`'s JSON-Schema definition
+     * via the `patternProperty` "^aria-.+".
+     */
+    [k: string]: string;
+}

package/lib/{attributes.d.ts → types/attributes.d.ts}

@@ -41,15 +41,9 @@ export declare type AttributeType = (("<'--*'>" | "<'-ms-accelerator'>" | "<'-ms
     lte?: number;
     clampable?: boolean;
 };
-export declare type AttributeCondition = {
-    ancestor: Selectors;
-} | {
-    self: Selectors;
-};
-export declare type Selectors = string | [string, string, ...string[]];
+export declare type AttributeCondition = string | [string, string, ...string[]];
 export interface AttributesSchema {
     tag: string;
-    ref: string;
     global?: GlobalAttributes;
     attributes: Attributes;
 }
@@ -83,8 +77,6 @@ export interface Attributes {
  * via the `patternProperty` ".*".
  */
 export interface AttributeJSON {
-    _TODO_?: string;
-    ref: string;
     type?: AttributeType | [AttributeType, ...AttributeType[]];
     defaultValue?: string;
     deprecated?: boolean;
@@ -92,7 +84,7 @@ export interface AttributeJSON {
     requiredEither?: string[];
     noUse?: boolean;
     condition?: AttributeCondition;
-    ineffective?: Selectors;
+    ineffective?: AttributeCondition;
     animatable?: boolean;
     experimental?: boolean;
 }

package/lib/{types.d.ts → types/index.d.ts}

@@ -1,6 +1,7 @@
-import type { AttributeJSON } from '.';
-import type { AttributeType, GlobalAttributes } from './attributes';
-import type { ContentModel, PermittedStructuresSchema } from './permitted-structres';
+import type { ARIA } from './aria';
+import type { AttributeJSON, AttributeType, GlobalAttributes } from './attributes';
+import type { ContentModel, Category } from './permitted-structres';
+import type { NamespaceURI } from '@markuplint/ml-ast';
 /**
  * markuplit Markup-language spec
  */
@@ -28,12 +29,19 @@ export declare type SpecDefs = {
         '#HTMLGlobalAttrs': Record<string, Partial<Attribute>>;
         [OtherGlobalAttrs: string]: Record<string, Partial<Attribute>>;
     }>;
-    '#ariaAttrs': ARIAAttribute[];
-    '#roles': ARIRRoleAttribute[];
+    '#aria': {
+        '1.2': ARIASpec;
+        '1.1': ARIASpec;
+    };
     '#contentModels': {
-        [model in ContentModel]?: string[];
+        [model in Category]?: string[];
     };
 };
+declare type ARIASpec = {
+    roles: ARIARoleInSchema[];
+    graphicsRoles: ARIARoleInSchema[];
+    props: ARIAProperty[];
+};
 /**
  * Element spec
  */
@@ -46,7 +54,7 @@ export declare type ElementSpec = {
      * Namespaces in XML
      * @see https://www.w3.org/TR/xml-names/
      */
-    namespace?: 'http://www.w3.org/1999/xhtml' | 'http://www.w3.org/2000/svg' | 'http://www.w3.org/1998/Math/MathML';
+    namespace?: NamespaceURI;
     /**
      * Reference URL
      */
@@ -76,33 +84,11 @@ export declare type ElementSpec = {
     /**
      * Element cateogries
      */
-    categories: ContentModel[];
+    categories: Category[];
     /**
      * Permitted contents and permitted parents
      */
-    permittedStructures: PermittedStructuresSchema;
-    /**
-     * Permitted ARIA roles
-     */
-    permittedRoles: {
-        summary: string;
-        roles: PermittedRoles;
-        conditions?: {
-            condition: string;
-            roles: PermittedRoles;
-        }[];
-    };
-    /**
-     * Implicit ARIA role
-     */
-    implicitRole: {
-        summary: string;
-        role: ImplicitRole;
-        conditions?: {
-            condition: string;
-            role: ImplicitRole;
-        }[];
-    };
+    contentModel: ContentModel;
     /**
      * Tag omittion
      */
@@ -115,6 +101,10 @@ export declare type ElementSpec = {
      * Attributes
      */
     attributes: Record<string, Attribute>;
+    /**
+     * WAI-ARIA role and properies
+     */
+    aria: ARIA;
     /**
      * If true, it is possible to add any properties as attributes,
      * for example, when using a template engine or a view language.
@@ -125,15 +115,6 @@ export declare type ElementSpec = {
      */
     possibleToAddProperties?: true;
 };
-/**
- * If `false`, this mean is "No corresponding role".
- */
-declare type ImplicitRole = string | false;
-/**
- * If `true`, this mean is "Any".
- * If `false`, this mean is "No".
- */
-export declare type PermittedRoles = string[] | boolean;
 declare type ElementSpecOmittion = false | ElementSpecOmittionTags;
 declare type ElementSpecOmittionTags = {
     startTag: boolean | ElementCondition;
@@ -152,28 +133,33 @@ export declare type Attribute = {
     deprecated?: boolean;
     nonStandard?: true;
 } & ExtendableAttributeSpec;
-declare type ExtendableAttributeSpec = Omit<AttributeJSON, 'ref' | '_TODO_' | 'type'>;
-export declare type ARIRRoleAttribute = {
+declare type ExtendableAttributeSpec = Omit<AttributeJSON, 'type'>;
+export declare type ARIARole = {
     name: string;
-    description: string;
-    isAbstract?: true;
-    generalization: string[];
-    requiredContextRole?: string[];
+    isAbstract: boolean;
+    requiredContextRole: string[];
+    requiredOwnedElements: string[];
     accessibleNameRequired: boolean;
+    accessibleNameFromAuthor: boolean;
     accessibleNameFromContent: boolean;
     accessibleNameProhibited: boolean;
-    ownedAttribute: ARIARoleOwnedPropOrState[];
-    childrenPresentational?: boolean;
+    childrenPresentational: boolean;
+    ownedProperties: ARIARoleOwnedProperties[];
+    prohibitedProperties: string[];
 };
-export declare type ARIARoleOwnedPropOrState = {
+export declare type ARIARoleInSchema = Partial<ARIARole & {
+    description: string;
+    generalization: string[];
+}> & {
+    name: string;
+};
+export declare type ARIARoleOwnedProperties = {
     name: string;
     inherited?: true;
     required?: true;
     deprecated?: true;
-    prohibited?: true;
-    defaultValue?: boolean | string | number;
 };
-export declare type ARIAAttribute = {
+export declare type ARIAProperty = {
     name: string;
     type: 'property' | 'state';
     deprecated?: true;
@@ -189,21 +175,20 @@ export declare type ARIAAttribute = {
     valueDescriptions?: Record<string, string>;
 };
 export declare type ARIAAttributeValue = 'true/false' | 'tristate' | 'true/false/undefined' | 'ID reference' | 'ID reference list' | 'integer' | 'number' | 'string' | 'token' | 'token list' | 'URI';
+export declare type ARIAVersion = '1.1' | '1.2';
 export declare type EquivalentHtmlAttr = {
     htmlAttrName: string;
     isNotStrictEquivalent?: true;
     value: string | null;
 };
-export interface SpecOM {
-    [tagName: string]: MLDOMElementSpec;
-}
-export interface MLDOMElementSpec {
-    experimental: boolean;
-    obsolete: boolean | string;
-    deprecated: boolean;
-    nonStandard: boolean;
-    categories: ContentModel[];
-    permittedStructures: PermittedStructuresSchema;
-    attributes: Attribute[];
-}
+export declare type Matches = (selector: string) => boolean;
+export declare type ComputedRole = {
+    el: Element;
+    role: (ARIARole & {
+        superClassRoles: ARIARoleInSchema[];
+        isImplicit?: boolean;
+    }) | null;
+    errorType?: RoleComputationError;
+};
+export declare type RoleComputationError = 'ABSTRACT' | 'GLOBAL_PROP_MUST_NOT_BE_PRESENTATIONAL' | 'IMPLICIT_ROLE_NAMESPACE_ERROR' | 'INTERACTIVE_ELEMENT_MUST_NOT_BE_PRESENTATIONAL' | 'INVALID_LANDMARK' | 'INVALID_REQUIRED_CONTEXT_ROLE' | 'NO_EXPLICIT' | 'NO_OWNER' | 'NO_PERMITTED' | 'REQUIRED_OWNED_ELEMENT_MUST_NOT_BE_PRESENTATIONAL' | 'ROLE_NO_EXISTS';
 export {};

package/lib/{permitted-structres.d.ts → types/permitted-structres.d.ts}

@@ -4,34 +4,25 @@
  * and run json-schema-to-typescript to regenerate this file.
  */
 export declare type PermittedContent = PermittedContentRequire | PermittedContentOptional | PermittedContentOneOrMore | PermittedContentZeroOrMore | PermittedContentChoice | PermittedContentInterleave;
-export declare type Target = Node | Node[];
-export declare type Node = string | '#text' | ContentModel;
-export declare type ContentModel = '#phrasing' | '#flow' | '#interactive' | '#heading' | '#sectioning' | '#metadata' | '#transparent' | '#embedded' | '#palpable' | '#script-supporting' | '#SVGAnimation' | '#SVGBasicShapes' | '#SVGContainer' | '#SVGDescriptive' | '#SVGFilterPrimitive' | '#SVGFont' | '#SVGGradient' | '#SVGGraphics' | '#SVGGraphicsReferencing' | '#SVGLightSource' | '#SVGNeverRendered' | '#SVGNone' | '#SVGPaintServer' | '#SVGRenderable' | '#SVGShape' | '#SVGStructural' | '#SVGStructurallyExternal' | '#SVGTextContent' | '#SVGTextContentChild' | '#SVGOtherXMLNamespace';
+export declare type Target = ContentType | ContentType[];
+export declare type ContentType = string | Category;
+export declare type Category = '#text' | '#phrasing' | '#flow' | '#interactive' | '#heading' | '#sectioning' | '#metadata' | '#transparent' | '#embedded' | '#palpable' | '#script-supporting' | '#SVGAnimation' | '#SVGBasicShapes' | '#SVGContainer' | '#SVGDescriptive' | '#SVGFilterPrimitive' | '#SVGFont' | '#SVGGradient' | '#SVGGraphics' | '#SVGGraphicsReferencing' | '#SVGLightSource' | '#SVGNeverRendered' | '#SVGNone' | '#SVGPaintServer' | '#SVGRenderable' | '#SVGShape' | '#SVGStructural' | '#SVGStructurallyExternal' | '#SVGTextContent' | '#SVGTextContentChild' | '#SVGOtherXMLNamespace';
 export declare type PermittedContentSpec = PermittedContent[];
-export interface PermittedStructuresSchema {
-    summary?: string;
-    tag: string;
+export interface ContentModelsSchema {
+    __contentModel?: ContentModel;
+}
+export interface ContentModel {
+    contents: PermittedContentSpec | boolean;
+    descendantOf?: string;
     conditional?: {
-        condition: {
-            hasAttr: string;
-        } | {
-            parent: string;
-            /**
-             * Not support yet
-             */
-            hasNotAttr?: string;
-            _TODO_?: string;
-            _parent?: string;
-        };
+        condition: string;
         contents: PermittedContentSpec | boolean;
     }[];
-    contents: PermittedContentSpec | boolean;
-    ancestor?: Node;
 }
 export interface PermittedContentRequire {
     require: Target;
     ignore?: Target;
-    notAllowedDescendants?: Node[];
+    notAllowedDescendants?: ContentType[];
     max?: number;
     min?: number;
     _TODO_?: string;
@@ -39,21 +30,21 @@ export interface PermittedContentRequire {
 export interface PermittedContentOptional {
     optional: Target;
     ignore?: Target;
-    notAllowedDescendants?: Node[];
+    notAllowedDescendants?: ContentType[];
     max?: number;
     _TODO_?: string;
 }
 export interface PermittedContentOneOrMore {
     oneOrMore: Target | PermittedContentSpec;
     ignore?: Target;
-    notAllowedDescendants?: Node[];
+    notAllowedDescendants?: ContentType[];
     max?: number;
     _TODO_?: string;
 }
 export interface PermittedContentZeroOrMore {
     zeroOrMore: Target | PermittedContentSpec;
     ignore?: Target;
-    notAllowedDescendants?: Node[];
+    notAllowedDescendants?: ContentType[];
     max?: number;
     _TODO_?: string;
 }

package/lib/types/permitted-structres.js

@@ -0,0 +1,8 @@
+"use strict";
+/* tslint:disable */
+/**
+ * This file was automatically generated by json-schema-to-typescript.
+ * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
+ * and run json-schema-to-typescript to regenerate this file.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });

package/lib/utils/cache.d.ts

@@ -0,0 +1,10 @@
+declare type CacheKeys<K1, K2 = undefined, K3 = undefined, K4 = undefined, K5 = undefined, K6 = undefined> = K2 extends undefined ? [K1] : K3 extends undefined ? [K1, K2] : K4 extends undefined ? [K1, K2, K3] : K5 extends undefined ? [K1, K2, K3, K4] : K6 extends undefined ? [K1, K2, K3, K4, K5] : [K1, K2, K3, K4, K5, K6];
+export declare class Cache<V, K1, K2 = undefined, K3 = undefined, K4 = undefined, K5 = undefined, K6 = undefined, K = CacheKeys<K1, K2, K3, K4, K5, K6>> {
+    #private;
+    constructor();
+    set(keys: K, value: V): this;
+    get(keys: K): V | undefined;
+    createKey(keys: K): string;
+    clear(): void;
+}
+export {};

package/lib/utils/cache.js

@@ -0,0 +1,42 @@
+"use strict";
+var _Cache_i, _Cache_m, _Cache_o;
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Cache = void 0;
+const tslib_1 = require("tslib");
+class Cache {
+    constructor() {
+        _Cache_i.set(this, 0);
+        _Cache_m.set(this, new Map());
+        _Cache_o.set(this, new Map());
+    }
+    set(keys, value) {
+        const _keys = this.createKey(keys);
+        tslib_1.__classPrivateFieldGet(this, _Cache_m, "f").set(_keys, value);
+        return this;
+    }
+    get(keys) {
+        const _keys = this.createKey(keys);
+        return tslib_1.__classPrivateFieldGet(this, _Cache_m, "f").get(_keys);
+    }
+    createKey(keys) {
+        const _keys = keys
+            // @ts-ignore
+            .map(o => {
+            if (tslib_1.__classPrivateFieldGet(this, _Cache_o, "f").has(o)) {
+                return tslib_1.__classPrivateFieldGet(this, _Cache_o, "f").get(o);
+            }
+            const i = tslib_1.__classPrivateFieldGet(this, _Cache_i, "f") + 1;
+            tslib_1.__classPrivateFieldSet(this, _Cache_i, i, "f");
+            tslib_1.__classPrivateFieldGet(this, _Cache_o, "f").set(o, i);
+            return i;
+        })
+            .join('_');
+        return _keys;
+    }
+    clear() {
+        tslib_1.__classPrivateFieldGet(this, _Cache_m, "f").clear();
+        tslib_1.__classPrivateFieldGet(this, _Cache_o, "f").clear();
+    }
+}
+exports.Cache = Cache;
+_Cache_i = new WeakMap(), _Cache_m = new WeakMap(), _Cache_o = new WeakMap();

package/lib/utils/get-ns.d.ts

@@ -0,0 +1,2 @@
+import type { Namespace } from '@markuplint/ml-ast';
+export declare function getNS(namespaceURI: string | null): Namespace;

package/lib/{get-ns.js → utils/get-ns.js}

@@ -9,6 +9,9 @@ function getNS(namespaceURI) {
         case 'http://www.w3.org/1998/Math/MathML': {
             return 'mml';
         }
+        case 'http://www.w3.org/1999/xlink': {
+            return 'xlink';
+        }
         default: {
             return 'html';
         }

package/lib/utils/merge-array.d.ts

@@ -0,0 +1,5 @@
+declare type NamedDefinition = string | {
+    name: string;
+};
+export declare function mergeArray<T extends NamedDefinition>(a: T[], b: T[] | null | undefined): T[];
+export {};

package/lib/utils/merge-array.js

@@ -0,0 +1,36 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.mergeArray = void 0;
+function mergeArray(a, b) {
+    if (!b) {
+        return a;
+    }
+    const result = a.slice();
+    for (const bItem of b) {
+        const bName = getName(bItem);
+        const aIndex = result.findIndex(item => getName(item) === bName);
+        if (aIndex === -1) {
+            result.push(bItem);
+            continue;
+        }
+        const aItem = result.splice(aIndex, 1)[0];
+        if (typeof bItem === 'string') {
+            continue;
+        }
+        if (typeof aItem === 'string') {
+            result.push(bItem);
+            continue;
+        }
+        const exItem = {
+            ...aItem,
+            ...bItem,
+        };
+        result.push(exItem);
+    }
+    return result;
+}
+exports.mergeArray = mergeArray;
+function getName(def) {
+    const result = typeof def === 'string' ? def : def.name;
+    return result.toLowerCase().trim();
+}

package/lib/utils/resolve-namespace.d.ts

@@ -0,0 +1,9 @@
+import type { NamespaceURI, Namespace } from '@markuplint/ml-ast';
+declare type NamespacedElementName = {
+    localNameWithNS: string;
+    localName: string;
+    namespace: Namespace;
+    namespaceURI: NamespaceURI;
+};
+export declare function resolveNamespace(name: string, namespaceURI?: string | null): NamespacedElementName;
+export {};

package/lib/utils/resolve-namespace.js

@@ -0,0 +1,31 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolveNamespace = void 0;
+const get_ns_1 = require("./get-ns");
+const cache = new Map();
+const namespaceURIMap = {
+    html: 'http://www.w3.org/1999/xhtml',
+    svg: 'http://www.w3.org/2000/svg',
+    mml: 'http://www.w3.org/1998/Math/MathML',
+    xlink: 'http://www.w3.org/1999/xlink',
+};
+function resolveNamespace(name, namespaceURI = 'http://www.w3.org/1999/xhtml') {
+    const cached = cache.get(name + namespaceURI);
+    if (cached) {
+        return cached;
+    }
+    const [_explicitNS, _localName] = name.split(':');
+    const explicitNS = _localName ? _explicitNS : null;
+    const localName = _localName !== null && _localName !== void 0 ? _localName : _explicitNS;
+    const namespace = ['html', 'svg', 'mml', 'xlink'].find(_ns => _ns === (explicitNS || (0, get_ns_1.getNS)(namespaceURI || null))) ||
+        'html';
+    const result = {
+        localNameWithNS: `${namespace === 'html' ? '' : `${namespace}:`}${localName}`,
+        localName,
+        namespace,
+        namespaceURI: namespaceURIMap[namespace],
+    };
+    cache.set(name + namespaceURI, result);
+    return result;
+}
+exports.resolveNamespace = resolveNamespace;

package/lib/utils.d.ts

@@ -1,5 +1,8 @@
-declare type NamedDefinition = string | {
-    name: string;
-};
+declare type NamedDefinition =
+	| string
+	| {
+			name: string;
+	  };
+export declare function getNS(namespaceURI: string | null): 'svg' | 'mml' | 'html';
 export declare function mergeArray<T extends NamedDefinition>(a: T[], b: T[] | null | undefined): T[];
 export {};

package/lib/utils.js

@@ -1,6 +1,20 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeArray = void 0;
+exports.mergeArray = exports.getNS = void 0;
+function getNS(namespaceURI) {
+    switch (namespaceURI) {
+        case 'http://www.w3.org/2000/svg': {
+            return 'svg';
+        }
+        case 'http://www.w3.org/1998/Math/MathML': {
+            return 'mml';
+        }
+        default: {
+            return 'html';
+        }
+    }
+}
+exports.getNS = getNS;
 function mergeArray(a, b) {
     if (!b) {
         return a;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/ml-spec",
-	"version": "2.1.0",
+	"version": "3.0.0-alpha.0",
 	"description": "Types and schema that specs of the Markup languages for markuplint",
 	"repository": "git@github.com:markuplint/markuplint.git",
 	"author": "Yusuke Hirao <yusukehirao@me.com>",
@@ -16,16 +16,20 @@
 		"dev": "tsc --build --watch",
 		"clean": "tsc --build --clean",
 		"schema:gen": "ts-node ./gen/gen.ts; prettier --write './schemas/*.json';",
-		"schema:structures": "json2ts ./schemas/permitted-structures.schema.json > ./src/permitted-structres.ts; prettier --write ./src/permitted-structres.ts; eslint --fix --config ../../../.eslintrc ./src/permitted-structres.ts",
-		"schema:attributes": "json2ts ./schemas/attributes.schema.json --cwd ./schemas > ./src/attributes.ts; prettier --write ./src/attributes.ts; eslint --fix --config ../../../.eslintrc ./src/attributes.ts",
-		"schema": "yarn schema:gen; yarn schema:structures; yarn schema:attributes; tsc;"
+		"schema:content-models": "json2ts ./schemas/content-models.schema.json > ./src/types/permitted-structres.ts; prettier --write ./src/types/permitted-structres.ts; eslint --fix --config ../../../.eslintrc ./src/types/permitted-structres.ts",
+		"schema:attributes": "json2ts ./schemas/attributes.schema.json --cwd ./schemas > ./src/types/attributes.ts; prettier --write ./src/types/attributes.ts; eslint --fix --config ../../../.eslintrc ./src/types/attributes.ts",
+		"schema:aria": "json2ts ./schemas/aria.schema.json --cwd ./schemas > ./src/types/aria.ts; prettier --write ./src/types/aria.ts; eslint --fix --config ../../../.eslintrc ./src/types/aria.ts",
+		"schema": "run-s schema:*"
 	},
 	"dependencies": {
+		"@markuplint/ml-ast": "3.0.0-alpha.0",
+		"dom-accessibility-api": "^0.5.14",
 		"tslib": "^2.3.1"
 	},
 	"devDependencies": {
-		"@markuplint/types": "2.1.0",
+		"@markuplint/test-tools": "3.0.0-alpha.0",
+		"@markuplint/types": "3.0.0-alpha.0",
 		"json-schema-to-typescript": "^10.1.5"
 	},
-	"gitHead": "0321513e36cc74929c41e06e1f58c43ff7602556"
+	"gitHead": "d32c522e016888e20bcbb5f09352c006b964f193"
 }