A little docs improvements

Author: Kirill Nesmeyanov

Writerside/labels.list

@@ -36,27 +36,15 @@
         The implementation of the functionality available for installation
         of "type-lang/reader" component.
     </primary-label>
-    <primary-label id="experimental" name="Special Feature" short-name="Extra" color="tangerine">
+    <primary-label id="experimental" name="Experimental" short-name="Experimental" color="tangerine">
         This is a unique functionality that is not supported by other popular
         third-party tools (e.g. PHPStan or Psalm) and has no alternatives.
     </primary-label>
 
-    <secondary-label id="psalm" name="Psalm" color="blue">
-        Also partially or fully supported by Psalm Linter.
-        Check out Psalm documentation for more details.
-    </secondary-label>
-    <secondary-label id="phpstan" name="PHPStan" color="blue">
-        Also partially or fully supported by PHPStan Linter.
-        Check out PHPStan documentation for more details.
-    </secondary-label>
-    <secondary-label id="storm" name="PhpStorm" color="blue">
-        Also partially or fully supported by PhpStorm IDE.
-        Check out PhpStorm documentation for more details.
-    </secondary-label>
-
     <secondary-label id="wip" name="WIP" color="red">Work in progress</secondary-label>
     <secondary-label id="beta" name="β" color="tangerine">Beta</secondary-label>
-    <secondary-label id="tl1.1" name="TypeLang Parser 1.1+" color="strawberry">Supported since type-lang/parser v1.1</secondary-label>
-    <secondary-label id="tl1.2" name="TypeLang Parser 1.2+" color="strawberry">Supported since type-lang/parser v1.2</secondary-label>
-    <secondary-label id="r1.1" name="Reader 1.1+" color="strawberry">Supported since type-lang/reader v1.1</secondary-label>
+    <secondary-label id="tl1.1" name="Available in Parser v1.1" color="strawberry">Available in type-lang/parser 1.1+</secondary-label>
+    <secondary-label id="tl1.2" name="Available in Parser v1.2" color="strawberry">Available in type-lang/parser 1.2+</secondary-label>
+    <secondary-label id="tl1.4" name="Available in Parser v1.4" color="strawberry">Available in type-lang/parser 1.4+</secondary-label>
+    <secondary-label id="r1.1" name="Available in Reader v1.1" color="strawberry">Available in type-lang/reader 1.1+</secondary-label>
 </labels>

Writerside/tl.tree

@@ -11,15 +11,15 @@
         <toc-element topic="logical-types.md"
             toc-title="Logical types"/>
         <toc-element topic="generic-types.md"
-                     toc-title="Template types (Generics)"/>
+                     toc-title="Generics"/>
         <toc-element topic="literal-types.md"
-                     toc-title="Literal values"/>
+                     toc-title="Literals"/>
         <toc-element topic="const-types.md"
-                     toc-title="Constant references"/>
+                     toc-title="Constants"/>
         <toc-element topic="shape-types.md"
-                     toc-title="Shape types"/>
+                     toc-title="Shapes"/>
         <toc-element topic="callable-types.md"
-                     toc-title="Callable types (Delegates)"/>
+                     toc-title="Callables"/>
         <!-- TODO -->
         <toc-element topic="conditional-types.md" toc-title="Conditions" hidden="true"/>
         <toc-element topic="comparison.md" toc-title="Comparison of syntax between different tools">

Writerside/topics/language/basic-types.md

@@ -1,8 +1,4 @@
 # Basic Types
-
-<secondary-label ref="phpstan"/>
-<secondary-label ref="psalm"/>
-<secondary-label ref="storm"/>
 <show-structure for="chapter" depth="2"/>
 
 The parser does not impose restrictions on type naming. The type name must begin
@@ -76,10 +72,6 @@ is **unacceptable**.
 
 ## Namespace
 
-<secondary-label ref="phpstan"/>
-<secondary-label ref="psalm"/>
-<secondary-label ref="storm"/>
-
 Each name can contain a namespace symbol (`\` — backslash), which is 
 [similar to that in PHP](https://www.php.net/manual/en/language.namespaces.rationale.php). The separator can be located either in the middle
 or at the beginning of any <tooltip term="Identifier">Identifier</tooltip>. End

Writerside/topics/language/callable-types.md

@@ -1,8 +1,4 @@
 # Callable Types
-
-<secondary-label ref="phpstan"/>
-<secondary-label ref="psalm"/>
-<secondary-label ref="storm"/>
 <show-structure for="chapter" depth="2"/>
 
 Callable types describe an arbitrary type that describes a function.
@@ -27,10 +23,6 @@ Each callable MAY have a list of parameters and/or a return type definition.
 
 ### Named Parameters
 
-<secondary-label ref="phpstan"/>
-<secondary-label ref="psalm"/>
-<secondary-label ref="storm"/>
-
 The name after the type of the parameter defines the parameter that
 [allows passing by name](https://www.php.net/manual/en/functions.arguments.php#functions.named-arguments).
 
@@ -68,10 +60,6 @@ Just like in the PHP language.
 
 ### Output Parameters
 
-<secondary-label ref="phpstan"/>
-<secondary-label ref="psalm"/>
-<secondary-label ref="storm"/>
-
 Passing a parameter by reference means that the function can change the passed
 variable while it is running.
 
@@ -109,10 +97,6 @@ the type and before the name.
 
 ### Optional Parameters
 
-<secondary-label ref="phpstan"/>
-<secondary-label ref="psalm"/>
-<secondary-label ref="storm"/>
-
 An optional parameter means that the argument may not be passed when such a
 function is called.
 
@@ -160,10 +144,6 @@ parameter description.
 
 ### Variadic Parameters
 
-<secondary-label ref="phpstan"/>
-<secondary-label ref="psalm"/>
-<secondary-label ref="storm"/>
-
 Variadic parameters are indicated by the "`...`" and can be placed either
 _before the type_ or _before the parameter name._
 

Writerside/topics/language/const-types.md

@@ -57,10 +57,6 @@ Given the complete identity of the grammar of constants with
 
 ## Class Constants
 
-<secondary-label ref="phpstan"/>
-<secondary-label ref="psalm"/>
-<secondary-label ref="storm"/>
-
 Class constants begin with any [type name](basic-types.md), then contain 
 a double colon (`::`) character, and then the constant name.
 
@@ -96,10 +92,6 @@ a double colon (`::`) character, and then the constant name.
 
 ## Constant Masks
 
-<secondary-label ref="phpstan"/>
-<secondary-label ref="psalm"/>
-<secondary-label ref="storm"/>
-
 A reference to a certain set of constants can be defined using a mask. The
 use of masks is identical to regular constants, but must be terminated with
 an asterisk (`*`).

Writerside/topics/language/generic-types.md

@@ -1,8 +1,4 @@
 # Generic Types
-
-<secondary-label ref="phpstan"/>
-<secondary-label ref="psalm"/>
-<secondary-label ref="storm"/>
 <show-structure for="chapter" depth="2"/>
 
 Each type can take arguments containing other type declarations. Validation of
@@ -77,7 +73,6 @@ and the reference to the type:
 
 ## Call-Site Hints
 
-<secondary-label ref="phpstan"/>
 
 Each template argument allows you to define an additional hint, which can be 
 used, for example, in static analyzers to indicate the
@@ -124,10 +119,6 @@ used, for example, in static analyzers to indicate the
 
 ## List Syntax
 
-<secondary-label ref="phpstan"/>
-<secondary-label ref="psalm"/>
-<secondary-label ref="storm"/>
-
 In addition to modern list declarations such as `list<int>` or
 `array<array-key, int>`, the legacy `int[]` syntax is allowed.
 

Writerside/topics/language/literal-types.md

@@ -13,10 +13,6 @@ allowed:
 
 ## Boolean And Null
 
-<secondary-label ref="phpstan"/>
-<secondary-label ref="psalm"/>
-<secondary-label ref="storm"/>
-
 The literals `true` and `false` are used as the value of the PHP `bool` type.
 
 > Note: `true` and `false` values are not case sensitive.
@@ -35,10 +31,6 @@ For other types the logic is more complicated.
 
 ## Strings
 
-<secondary-label ref="phpstan"/>
-<secondary-label ref="psalm"/>
-<secondary-label ref="storm"/>
-
 The syntax of string types is similar to that in PHP: The string allows single
 (`'`) and double (`"`) quotes, which can be escaped using a backslash (`\`).
 
@@ -130,10 +122,6 @@ representation. The braces are required in the sequence. E.g. `"\u{41}" === "A"`
 
 ## Integer
 
-<secondary-label ref="phpstan"/>
-<secondary-label ref="psalm"/>
-<secondary-label ref="storm"/>
-
 The syntax of integer numbers is similar to the PHP language. Binary, octal,
 decimal and hexadecimal number systems are supported.
 
@@ -279,10 +267,6 @@ the numbers between `0` and `F` and must match the regular expression
 
 ## Float
 
-<secondary-label ref="phpstan"/>
-<secondary-label ref="psalm"/>
-<secondary-label ref="storm"/>
-
 The syntax of float numbers is similar to the PHP language. Basic floating point
 syntax and scientific notation are supported.
 
@@ -340,7 +324,6 @@ trailing number may be omitted. Negative values are prefixed with a minus (`-`.
 
 ### Scientific Notation
 
-<secondary-label ref="phpstan"/>
 
 Scientific notation is a way of expressing numbers that are too large or too
 small to be conveniently written in decimal form, since to do so would require

Writerside/topics/language/logical-types.md

@@ -6,39 +6,27 @@ The TypeLang, [like PHP](https://www.php.net/manual/en/language.types.type-syste
 Union and Intersection. The ability to specify a _nullable_ type using a 
 separate expression is also supported.
 
-### Union Type
-
-<secondary-label ref="phpstan"/>
-<secondary-label ref="psalm"/>
-<secondary-label ref="storm"/>
+### Union Types
 
 Each union type is separated by a pipe character (`|`) and may contain any other
 type definition.
 
-> One of `A` **OR** `B` **OR** `C`.
+> `A` **OR** `B` **OR** `C`.
 > ```typescript
 > A | B | C
 > ```
 
-### Intersection Type
-
-<secondary-label ref="phpstan"/>
-<secondary-label ref="psalm"/>
-<secondary-label ref="storm"/>
+### Intersection Types
 
 Each intersection type is separated by an ampersand character (`&`) and may
 contain any other type definition.
 
-> All of `A` **AND** `B` **AND** `C`.
+> `A` **AND** `B` **AND** `C`.
 > ```typescript
 > A & B & C
 > ```
 
-### Nullable Type
-
-<secondary-label ref="phpstan"/>
-<secondary-label ref="psalm"/>
-<secondary-label ref="storm"/>
+### Nullable Types
 
 Nullable type is a shortened alias for union type `T | null` 
 and is written as `?T.`
@@ -66,3 +54,16 @@ and is written as `?T.`
 </tab>
 </tabs>
 
+### Parentheses
+
+Parentheses can be used to disambiguate types.
+
+> `A` **AND** `B` _or_ `C`
+> ```typescript
+> (A & B) | C
+> ```
+>
+> `A` **AND** `C` _or_ `B` **AND** `C`
+> ```typescript
+> (A | B) & C
+> ```

Writerside/topics/language/shape-types.md

@@ -1,8 +1,4 @@
 # Shape Types
-
-<secondary-label ref="phpstan"/>
-<secondary-label ref="psalm"/>
-<secondary-label ref="storm"/>
 <show-structure for="chapter" depth="2"/>
 
 Each **composite** type can be rigidly described by a structural type called a
@@ -69,10 +65,6 @@ array{
 
 ### Unsealed Shapes
 
-<secondary-label ref="phpstan"/>
-<secondary-label ref="psalm"/>
-<secondary-label ref="storm"/>
-
 Unsealed (unclosed) shapes mean that the composite type can contain additional
 fields beyond those described in the shape. Such types must be terminated with
 the "`...`".
@@ -96,10 +88,6 @@ array{
 
 ### Typed Shapes
 
-<secondary-label ref="phpstan"/>
-<secondary-label ref="psalm"/>
-<secondary-label ref="storm"/>
-
 In addition, such shapes can describe template arguments (types) for values
 or for keys and values, which are described after the ellipsis (`...`) char
 and contain syntax [similar to generics](generic-types.md).