@markuplint/ml-spec 3.0.0-alpha.82 → 3.0.0-dev.24

package/lib/types/index.d.ts

@@ -1,20 +1,20 @@
 import type { ARIA } from './aria';
 import type { AttributeJSON, AttributeType, GlobalAttributes } from './attributes';
-import type { ContentModel, Category } from './permitted-structres';
+import type { ContentModel, Category } from './permitted-structures';
 import type { NamespaceURI } from '@markuplint/ml-ast';
 /**
- * markuplit Markup-language spec
+ * markuplint Markup-language spec
  */
 export interface MLMLSpec {
     cites: Cites;
     def: SpecDefs;
     specs: ElementSpec[];
 }
-export declare type ExtendedElementSpec = Partial<Omit<ElementSpec, 'name' | 'attributes'>> & {
+export type ExtendedElementSpec = Partial<Omit<ElementSpec, 'name' | 'attributes'>> & {
     name: ElementSpec['name'];
     attributes?: Record<string, Partial<Attribute>>;
 };
-export declare type ExtendedSpec = {
+export type ExtendedSpec = {
     cites?: Cites;
     def?: Partial<SpecDefs>;
     specs?: ExtendedElementSpec[];
@@ -22,8 +22,8 @@ export declare type ExtendedSpec = {
 /**
  * Reference URLs
  */
-export declare type Cites = string[];
-export declare type SpecDefs = {
+export type Cites = string[];
+export type SpecDefs = {
     '#globalAttrs': Partial<{
         '#extends': Record<string, Partial<Attribute>>;
         '#HTMLGlobalAttrs': Record<string, Partial<Attribute>>;
@@ -37,7 +37,7 @@ export declare type SpecDefs = {
         [model in Category]?: string[];
     };
 };
-declare type ARIASpec = {
+type ARIASpec = {
     roles: ARIARoleInSchema[];
     graphicsRoles: ARIARoleInSchema[];
     props: ARIAProperty[];
@@ -45,7 +45,7 @@ declare type ARIASpec = {
 /**
  * Element spec
  */
-export declare type ElementSpec = {
+export type ElementSpec = {
     /**
      * Tag name
      */
@@ -82,7 +82,7 @@ export declare type ElementSpec = {
      */
     nonStandard?: true;
     /**
-     * Element cateogries
+     * Element categories
      */
     categories: Category[];
     /**
@@ -90,9 +90,9 @@ export declare type ElementSpec = {
      */
     contentModel: ContentModel;
     /**
-     * Tag omittion
+     * Tag omission
      */
-    omittion: ElementSpecOmittion;
+    omission: ElementSpecOmission;
     /**
      * Global Attributes
      */
@@ -102,7 +102,7 @@ export declare type ElementSpec = {
      */
     attributes: Record<string, Attribute>;
     /**
-     * WAI-ARIA role and properies
+     * WAI-ARIA role and properties
      */
     aria: ARIA;
     /**
@@ -115,15 +115,15 @@ export declare type ElementSpec = {
      */
     possibleToAddProperties?: true;
 };
-declare type ElementSpecOmittion = false | ElementSpecOmittionTags;
-declare type ElementSpecOmittionTags = {
+type ElementSpecOmission = false | ElementSpecOmissionTags;
+type ElementSpecOmissionTags = {
     startTag: boolean | ElementCondition;
     endTag: boolean | ElementCondition;
 };
-declare type ElementCondition = {
+type ElementCondition = {
     __WIP__: 'WORK_IN_PROGRESS';
 };
-export declare type Attribute = {
+export type Attribute = {
     name: string;
     type: AttributeType | AttributeType[];
     description?: string;
@@ -133,8 +133,8 @@ export declare type Attribute = {
     deprecated?: boolean;
     nonStandard?: true;
 } & ExtendableAttributeSpec;
-declare type ExtendableAttributeSpec = Omit<AttributeJSON, 'type'>;
-export declare type ARIARole = {
+type ExtendableAttributeSpec = Omit<AttributeJSON, 'type'>;
+export type ARIARole = {
     name: string;
     isAbstract: boolean;
     requiredContextRole: string[];
@@ -147,19 +147,19 @@ export declare type ARIARole = {
     ownedProperties: ARIARoleOwnedProperties[];
     prohibitedProperties: string[];
 };
-export declare type ARIARoleInSchema = Partial<ARIARole & {
+export type ARIARoleInSchema = Partial<ARIARole & {
     description: string;
     generalization: string[];
 }> & {
     name: string;
 };
-export declare type ARIARoleOwnedProperties = {
+export type ARIARoleOwnedProperties = {
     name: string;
     inherited?: true;
     required?: true;
     deprecated?: true;
 };
-export declare type ARIAProperty = {
+export type ARIAProperty = {
     name: string;
     type: 'property' | 'state';
     deprecated?: true;
@@ -174,15 +174,15 @@ export declare type ARIAProperty = {
     equivalentHtmlAttrs?: EquivalentHtmlAttr[];
     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 = {
+export type ARIAAttributeValue = 'true/false' | 'tristate' | 'true/false/undefined' | 'ID reference' | 'ID reference list' | 'integer' | 'number' | 'string' | 'token' | 'token list' | 'URI';
+export type ARIAVersion = '1.1' | '1.2';
+export type EquivalentHtmlAttr = {
     htmlAttrName: string;
     isNotStrictEquivalent?: true;
     value: string | null;
 };
-export declare type Matches = (selector: string) => boolean;
-export declare type ComputedRole = {
+export type Matches = (selector: string) => boolean;
+export type ComputedRole = {
     el: Element;
     role: (ARIARole & {
         superClassRoles: ARIARoleInSchema[];
@@ -190,5 +190,5 @@ export declare type ComputedRole = {
     }) | 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 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/types/permitted-structres.d.ts

@@ -3,62 +3,56 @@
  * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
  * and run json-schema-to-typescript to regenerate this file.
  */
-export declare type PermittedContent = PermittedContentRequire | PermittedContentOptional | PermittedContentOneOrMore | PermittedContentZeroOrMore | PermittedContentChoice | PermittedContentInterleave;
-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 type PermittedContentPattern = PermittedContentRequire | PermittedContentOptional | PermittedContentOneOrMore | PermittedContentZeroOrMore | PermittedContentChoice | PermittedContentTransparent;
+export type Model = ContentType | ContentType[];
+export type ContentType = string | Category;
+export type Category = '#text' | '#phrasing' | '#flow' | '#interactive' | '#heading' | '#sectioning' | '#metadata' | '#embedded' | '#palpable' | '#script-supporting' | '#SVGAnimation' | '#SVGBasicShapes' | '#SVGContainer' | '#SVGDescriptive' | '#SVGFilterPrimitive' | '#SVGFont' | '#SVGGradient' | '#SVGGraphics' | '#SVGGraphicsReferencing' | '#SVGLightSource' | '#SVGNeverRendered' | '#SVGNone' | '#SVGPaintServer' | '#SVGRenderable' | '#SVGShape' | '#SVGStructural' | '#SVGStructurallyExternal' | '#SVGTextContent' | '#SVGTextContentChild';
 export interface ContentModelsSchema {
     __contentModel?: ContentModel;
 }
 export interface ContentModel {
-    contents: PermittedContentSpec | boolean;
+    contents: PermittedContentPattern[] | boolean;
     descendantOf?: string;
     conditional?: {
         condition: string;
-        contents: PermittedContentSpec | boolean;
+        contents: PermittedContentPattern[] | boolean;
     }[];
 }
 export interface PermittedContentRequire {
-    require: Target;
-    ignore?: Target;
-    notAllowedDescendants?: ContentType[];
+    require: Model;
     max?: number;
     min?: number;
     _TODO_?: string;
 }
 export interface PermittedContentOptional {
-    optional: Target;
-    ignore?: Target;
-    notAllowedDescendants?: ContentType[];
+    optional: Model;
     max?: number;
     _TODO_?: string;
 }
 export interface PermittedContentOneOrMore {
-    oneOrMore: Target | PermittedContentSpec;
-    ignore?: Target;
-    notAllowedDescendants?: ContentType[];
+    oneOrMore: Model | PermittedContentPattern[];
     max?: number;
     _TODO_?: string;
 }
 export interface PermittedContentZeroOrMore {
-    zeroOrMore: Target | PermittedContentSpec;
-    ignore?: Target;
-    notAllowedDescendants?: ContentType[];
+    zeroOrMore: Model | PermittedContentPattern[];
     max?: number;
     _TODO_?: string;
 }
 export interface PermittedContentChoice {
-    choice: [PermittedContentSpec, PermittedContentSpec] | [PermittedContentSpec, PermittedContentSpec, PermittedContentSpec] | [PermittedContentSpec, PermittedContentSpec, PermittedContentSpec, PermittedContentSpec] | [
-        PermittedContentSpec,
-        PermittedContentSpec,
-        PermittedContentSpec,
-        PermittedContentSpec,
-        PermittedContentSpec
+    /**
+     * @minItems 2
+     * @maxItems 5
+     */
+    choice: [PermittedContentPattern[], PermittedContentPattern[]] | [PermittedContentPattern[], PermittedContentPattern[], PermittedContentPattern[]] | [PermittedContentPattern[], PermittedContentPattern[], PermittedContentPattern[], PermittedContentPattern[]] | [
+        PermittedContentPattern[],
+        PermittedContentPattern[],
+        PermittedContentPattern[],
+        PermittedContentPattern[],
+        PermittedContentPattern[]
     ];
     _TODO_?: string;
 }
-export interface PermittedContentInterleave {
-    interleave: [PermittedContentSpec, PermittedContentSpec, ...PermittedContentSpec[]];
-    _TODO_?: string;
+export interface PermittedContentTransparent {
+    transparent: string;
 }

package/lib/types/permitted-structures.d.ts

@@ -0,0 +1,54 @@
+/**
+ * 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.
+ */
+export type PermittedContentPattern = PermittedContentRequire | PermittedContentOptional | PermittedContentOneOrMore | PermittedContentZeroOrMore | PermittedContentChoice | PermittedContentTransparent;
+export type Model = ContentType | ContentType[];
+export type ContentType = string | Category;
+export type Category = '#text' | '#phrasing' | '#flow' | '#interactive' | '#heading' | '#sectioning' | '#metadata' | '#embedded' | '#palpable' | '#script-supporting' | '#SVGAnimation' | '#SVGBasicShapes' | '#SVGContainer' | '#SVGDescriptive' | '#SVGFilterPrimitive' | '#SVGFont' | '#SVGGradient' | '#SVGGraphics' | '#SVGGraphicsReferencing' | '#SVGLightSource' | '#SVGNeverRendered' | '#SVGNone' | '#SVGPaintServer' | '#SVGRenderable' | '#SVGShape' | '#SVGStructural' | '#SVGStructurallyExternal' | '#SVGTextContent' | '#SVGTextContentChild';
+export interface ContentModelsSchema {
+    __contentModel?: ContentModel;
+}
+export interface ContentModel {
+    contents: PermittedContentPattern[] | boolean;
+    descendantOf?: string;
+    conditional?: {
+        condition: string;
+        contents: PermittedContentPattern[] | boolean;
+    }[];
+}
+export interface PermittedContentRequire {
+    require: Model;
+    max?: number;
+    min?: number;
+    _TODO_?: string;
+}
+export interface PermittedContentOptional {
+    optional: Model;
+    max?: number;
+    _TODO_?: string;
+}
+export interface PermittedContentOneOrMore {
+    oneOrMore: Model | PermittedContentPattern[];
+    max?: number;
+    _TODO_?: string;
+}
+export interface PermittedContentZeroOrMore {
+    zeroOrMore: Model | PermittedContentPattern[];
+    max?: number;
+    _TODO_?: string;
+}
+export interface PermittedContentChoice {
+    choice: [PermittedContentPattern[], PermittedContentPattern[]] | [PermittedContentPattern[], PermittedContentPattern[], PermittedContentPattern[]] | [PermittedContentPattern[], PermittedContentPattern[], PermittedContentPattern[], PermittedContentPattern[]] | [
+        PermittedContentPattern[],
+        PermittedContentPattern[],
+        PermittedContentPattern[],
+        PermittedContentPattern[],
+        PermittedContentPattern[]
+    ];
+    _TODO_?: string;
+}
+export interface PermittedContentTransparent {
+    transparent: string;
+}

package/lib/types/permitted-structures.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/get-ns.d.ts

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

package/lib/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

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

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

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

package/lib/utils/resolve-namespace.js

@@ -3,24 +3,29 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveNamespace = void 0;
 const get_ns_1 = require("./get-ns");
 const cache = new Map();
-function resolveNamespace(localName, namespaceURI = 'http://www.w3.org/1999/xhtml') {
-    const cached = cache.get(localName + namespaceURI);
+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 name = localName.split(':')[1] || localName;
-    const ns = (0, get_ns_1.getNS)(namespaceURI || null);
+    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: `${ns === 'html' ? '' : `${ns}:`}${name}`,
-        localName: name,
-        namespace: ns,
-        namespaceURI: [
-            'http://www.w3.org/1999/xhtml',
-            'http://www.w3.org/2000/svg',
-            'http://www.w3.org/1998/Math/MathML',
-        ].find(ns => ns === namespaceURI) || 'http://www.w3.org/1999/xhtml',
+        localNameWithNS: `${namespace === 'html' ? '' : `${namespace}:`}${localName}`,
+        localName,
+        namespace,
+        namespaceURI: namespaceURIMap[namespace],
     };
-    cache.set(localName + namespaceURI, result);
+    cache.set(name + namespaceURI, result);
     return result;
 }
 exports.resolveNamespace = resolveNamespace;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@markuplint/ml-spec",
-	"version": "3.0.0-alpha.82+6cde1134",
+	"version": "3.0.0-dev.24+f55f5eff",
 	"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>",
@@ -22,14 +22,14 @@
 		"schema": "run-s schema:*"
 	},
 	"dependencies": {
-		"@markuplint/ml-ast": "^2.0.0",
+		"@markuplint/ml-ast": "3.0.0-rc.0",
 		"dom-accessibility-api": "^0.5.14",
-		"tslib": "^2.3.1"
+		"tslib": "^2.4.1"
 	},
 	"devDependencies": {
-		"@markuplint/test-tools": "3.0.0-alpha",
-		"@markuplint/types": "2.1.0",
-		"json-schema-to-typescript": "^10.1.5"
+		"@markuplint/test-tools": "3.0.0-rc.0",
+		"@markuplint/types": "3.0.0-dev.24+f55f5eff",
+		"json-schema-to-typescript": "^11.0.2"
 	},
-	"gitHead": "6cde113402758a8fdbd6a0fcf98e78efd2cdb778"
+	"gitHead": "f55f5eff289296feba26f20b0c085e0528c80ac4"
 }

package/schema.json

@@ -17,7 +17,7 @@
 			],
 			"type": "string"
 		},
-		"AttributeCtegory": {
+		"AttributeCategory": {
 			"enum": ["aria", "eventhandler", "form", "global", "particular", "xml"],
 			"type": "string"
 		},
@@ -85,7 +85,7 @@
 					"items": {
 						"properties": {
 							"category": {
-								"$ref": "#/definitions/AttributeCtegory"
+								"$ref": "#/definitions/AttributeCategory"
 							},
 							"deprecated": {
 								"enum": [true],
@@ -162,7 +162,7 @@
 										{
 											"properties": {
 												"category": {
-													"$ref": "#/definitions/AttributeCtegory"
+													"$ref": "#/definitions/AttributeCategory"
 												},
 												"deprecated": {
 													"enum": [true],
@@ -211,7 +211,7 @@
 						"type": "array"
 					},
 					"categories": {
-						"description": "Element cateogries",
+						"description": "Element categories",
 						"items": {
 							"anyOf": [
 								{
@@ -294,7 +294,7 @@
 						],
 						"description": "Obsolete or alternative elements"
 					},
-					"omittion": {
+					"omission": {
 						"anyOf": [
 							{
 								"properties": {
@@ -338,7 +338,7 @@
 								"type": "boolean"
 							}
 						],
-						"description": "Tag omittion"
+						"description": "Tag omission"
 					},
 					"permittedContent": {
 						"description": "Permitted content",

package/schemas/aria.schema.json

@@ -101,7 +101,7 @@
 								]
 							}
 						},
-						"whithout": {
+						"without": {
 							"type": "array",
 							"minItems": 1,
 							"items": {

package/schemas/content-models.schema.json

@@ -8,7 +8,8 @@
 				"contents": {
 					"oneOf": [
 						{
-							"$ref": "#/definitions/PermittedContentSpec"
+							"type": "array",
+							"items": { "$ref": "#/definitions/PermittedContentPattern" }
 						},
 						{ "type": "boolean" }
 					]
@@ -27,7 +28,8 @@
 							"contents": {
 								"oneOf": [
 									{
-										"$ref": "#/definitions/PermittedContentSpec"
+										"type": "array",
+										"items": { "$ref": "#/definitions/PermittedContentPattern" }
 									},
 									{ "type": "boolean" }
 								]
@@ -57,7 +59,6 @@
 				"#heading",
 				"#sectioning",
 				"#metadata",
-				"#transparent",
 				"#embedded",
 				"#palpable",
 				"#script-supporting",
@@ -79,11 +80,10 @@
 				"#SVGStructural",
 				"#SVGStructurallyExternal",
 				"#SVGTextContent",
-				"#SVGTextContentChild",
-				"#SVGOtherXMLNamespace"
+				"#SVGTextContentChild"
 			]
 		},
-		"Target": {
+		"Model": {
 			"oneOf": [
 				{ "$ref": "#/definitions/ContentType" },
 				{
@@ -93,11 +93,7 @@
 				}
 			]
 		},
-		"PermittedContentSpec": {
-			"type": "array",
-			"items": { "$ref": "#/definitions/PermittedContent" }
-		},
-		"PermittedContent": {
+		"PermittedContentPattern": {
 			"type": "object",
 			"oneOf": [
 				{ "$ref": "#/definitions/PermittedContentRequire" },
@@ -105,7 +101,7 @@
 				{ "$ref": "#/definitions/PermittedContentOneOrMore" },
 				{ "$ref": "#/definitions/PermittedContentZeroOrMore" },
 				{ "$ref": "#/definitions/PermittedContentChoice" },
-				{ "$ref": "#/definitions/PermittedContentInterleave" }
+				{ "$ref": "#/definitions/PermittedContentTransparent" }
 			]
 		},
 		"PermittedContentRequire": {
@@ -113,13 +109,7 @@
 			"additionalProperties": false,
 			"required": ["require"],
 			"properties": {
-				"require": { "$ref": "#/definitions/Target" },
-				"ignore": { "$ref": "#/definitions/Target" },
-				"notAllowedDescendants": {
-					"type": "array",
-					"items": { "$ref": "#/definitions/ContentType" },
-					"uniqueItems": true
-				},
+				"require": { "$ref": "#/definitions/Model" },
 				"max": { "type": "number" },
 				"min": { "type": "number" },
 				"_TODO_": { "type": "string" }
@@ -130,13 +120,7 @@
 			"additionalProperties": false,
 			"required": ["optional"],
 			"properties": {
-				"optional": { "$ref": "#/definitions/Target" },
-				"ignore": { "$ref": "#/definitions/Target" },
-				"notAllowedDescendants": {
-					"type": "array",
-					"items": { "$ref": "#/definitions/ContentType" },
-					"uniqueItems": true
-				},
+				"optional": { "$ref": "#/definitions/Model" },
 				"max": { "type": "number" },
 				"_TODO_": { "type": "string" }
 			}
@@ -147,13 +131,13 @@
 			"required": ["oneOrMore"],
 			"properties": {
 				"oneOrMore": {
-					"oneOf": [{ "$ref": "#/definitions/Target" }, { "$ref": "#/definitions/PermittedContentSpec" }]
-				},
-				"ignore": { "$ref": "#/definitions/Target" },
-				"notAllowedDescendants": {
-					"type": "array",
-					"items": { "$ref": "#/definitions/ContentType" },
-					"uniqueItems": true
+					"oneOf": [
+						{ "$ref": "#/definitions/Model" },
+						{
+							"type": "array",
+							"items": { "$ref": "#/definitions/PermittedContentPattern" }
+						}
+					]
 				},
 				"max": { "type": "number" },
 				"_TODO_": { "type": "string" }
@@ -165,13 +149,13 @@
 			"required": ["zeroOrMore"],
 			"properties": {
 				"zeroOrMore": {
-					"oneOf": [{ "$ref": "#/definitions/Target" }, { "$ref": "#/definitions/PermittedContentSpec" }]
-				},
-				"ignore": { "$ref": "#/definitions/Target" },
-				"notAllowedDescendants": {
-					"type": "array",
-					"items": { "$ref": "#/definitions/ContentType" },
-					"uniqueItems": true
+					"oneOf": [
+						{ "$ref": "#/definitions/Model" },
+						{
+							"type": "array",
+							"items": { "$ref": "#/definitions/PermittedContentPattern" }
+						}
+					]
 				},
 				"max": { "type": "number" },
 				"_TODO_": { "type": "string" }
@@ -184,24 +168,24 @@
 			"properties": {
 				"choice": {
 					"type": "array",
-					"items": { "$ref": "#/definitions/PermittedContentSpec" },
+					"items": {
+						"type": "array",
+						"items": { "$ref": "#/definitions/PermittedContentPattern" }
+					},
 					"minItems": 2,
 					"maxItems": 5
 				},
 				"_TODO_": { "type": "string" }
 			}
 		},
-		"PermittedContentInterleave": {
+		"PermittedContentTransparent": {
 			"type": "object",
 			"additionalProperties": false,
-			"required": ["interleave"],
+			"required": ["transparent"],
 			"properties": {
-				"interleave": {
-					"type": "array",
-					"items": { "$ref": "#/definitions/PermittedContentSpec" },
-					"minItems": 2
-				},
-				"_TODO_": { "type": "string" }
+				"transparent": {
+					"type": "string"
+				}
 			}
 		}
 	},