From d886f6454424b3a6192c74a453a87c2718dc0421 Mon Sep 17 00:00:00 2001
From: Kirill Nesmeyanov <kirill.nesmeianov@tarkov.com>
Date: Tue, 9 Apr 2024 02:10:32 +0300
Subject: [PATCH] Improve doc pages and actualize 2/5 lang comparison sections

---
 Writerside/cfg/buildprofiles.xml              |   4 +
 Writerside/icons/class.svg                    |   1 +
 Writerside/icons/ko.svg                       |   4 +
 Writerside/icons/ok.svg                       |   4 +
 Writerside/icons/phpstan.png                  | Bin 0 -> 1632 bytes
 Writerside/icons/psalm.png                    | Bin 0 -> 1436 bytes
 Writerside/icons/typelang.svg                 |   8 +
 Writerside/icons/warning.svg                  |   6 +
 Writerside/tl.tree                            |  10 +-
 Writerside/topics/language.md                 | 342 ++++++++++++++++--
 Writerside/topics/language/basic-types.md     |   2 +
 .../{callables.md => callable-types.md}       |   6 +-
 .../topics/language/conditional-types.md      |   7 +
 Writerside/topics/language/const-types.md     |  18 +
 Writerside/topics/language/generic-types.md   |   8 +-
 Writerside/topics/language/literal-types.md   |   4 +-
 Writerside/topics/language/logical-types.md   |   2 +
 .../language/{shapes.md => shape-types.md}    |   4 +-
 Writerside/topics/overview.topic              |  19 +-
 Writerside/topics/parser.md                   |  20 +-
 Writerside/topics/parser/visitors.md          |   2 +
 .../visitors/class-name-matcher-visitor.md    |   3 +-
 .../parser/visitors/stream-dumper-visitor.md  |   3 +-
 .../parser/visitors/string-dumper-visitor.md  |   3 +-
 .../parser/visitors/type-map-visitor.md       |   3 +-
 Writerside/topics/printer.md                  | 130 +++++--
 Writerside/topics/reader.md                   |  44 ++-
 27 files changed, 557 insertions(+), 100 deletions(-)
 create mode 100644 Writerside/icons/class.svg
 create mode 100644 Writerside/icons/ko.svg
 create mode 100644 Writerside/icons/ok.svg
 create mode 100644 Writerside/icons/phpstan.png
 create mode 100644 Writerside/icons/psalm.png
 create mode 100644 Writerside/icons/typelang.svg
 create mode 100644 Writerside/icons/warning.svg
 rename Writerside/topics/language/{callables.md => callable-types.md} (98%)
 create mode 100644 Writerside/topics/language/conditional-types.md
 create mode 100644 Writerside/topics/language/const-types.md
 rename Writerside/topics/language/{shapes.md => shape-types.md} (96%)

diff --git a/Writerside/cfg/buildprofiles.xml b/Writerside/cfg/buildprofiles.xml
index f0dc589..c2026e1 100644
--- a/Writerside/cfg/buildprofiles.xml
+++ b/Writerside/cfg/buildprofiles.xml
@@ -25,6 +25,10 @@
         <browser-edits-url>https://github.com/php-type-language/docs/blob/master/Writerside/</browser-edits-url>
     </variables>
 
+    <icons>
+        <local-src>icons</local-src>
+    </icons>
+
     <footer>
         <social href="https://github.com/php-type-language" type="blog">GitHub</social>
         <link href="https://github.com/php-type-language/parser/issues">Issue tracker</link>
diff --git a/Writerside/icons/class.svg b/Writerside/icons/class.svg
new file mode 100644
index 0000000..67272c1
--- /dev/null
+++ b/Writerside/icons/class.svg
@@ -0,0 +1 @@
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg"><circle cx="8" cy="8" r="6.5" stroke="#3574F0"/><path d="M8.13295 11.5C9.61223 11.5 10.8836 10.6105 11.2075 9.33909H10.2213C9.90229 10.0739 9.11914 10.6057 8.13295 10.6057C6.77936 10.6057 5.80284 9.51796 5.80284 8C5.80284 6.48204 6.77936 5.39434 8.13295 5.39434C9.11914 5.39434 9.90229 5.92611 10.2213 6.66091H11.2075C10.8836 5.3895 9.61223 4.5 8.13295 4.5C6.21859 4.5 4.79248 5.99378 4.79248 8C4.79248 10.0062 6.21859 11.5 8.13295 11.5Z" fill="#3574F0"/></svg>
diff --git a/Writerside/icons/ko.svg b/Writerside/icons/ko.svg
new file mode 100644
index 0000000..de6ce67
--- /dev/null
+++ b/Writerside/icons/ko.svg
@@ -0,0 +1,4 @@
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8 15C11.866 15 15 11.866 15 8C15 4.13401 11.866 1 8 1C4.13401 1 1 4.13401 1 8C1 11.866 4.13401 15 8 15ZM5.81588 4.68431C5.50346 4.37189 4.99693 4.37189 4.68451 4.68431C4.37209 4.99673 4.37209 5.50326 4.68451 5.81568L6.86882 8L4.68451 10.1843C4.37209 10.4967 4.37209 11.0033 4.68451 11.3157C4.99693 11.6281 5.50347 11.6281 5.81588 11.3157L8.0002 9.13137L10.1845 11.3157C10.4969 11.6281 11.0035 11.6281 11.3159 11.3157C11.6283 11.0033 11.6283 10.4967 11.3159 10.1843L9.13157 8L11.3159 5.81568C11.6283 5.50326 11.6283 4.99673 11.3159 4.68431C11.0035 4.37189 10.4969 4.37189 10.1845 4.68431L8.0002 6.86863L5.81588 4.68431Z" fill="#E55765"/>
+</svg>
diff --git a/Writerside/icons/ok.svg b/Writerside/icons/ok.svg
new file mode 100644
index 0000000..103604d
--- /dev/null
+++ b/Writerside/icons/ok.svg
@@ -0,0 +1,4 @@
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M2.5 8.25L6 11.75L13.5 4.25" stroke="#55A76A" stroke-width="2" stroke-linecap="round"/>
+</svg>
diff --git a/Writerside/icons/phpstan.png b/Writerside/icons/phpstan.png
new file mode 100644
index 0000000000000000000000000000000000000000..ec0cd4e9ece8bd5aeb0f65d29c9b6183d648a072
GIT binary patch
literal 1632
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

literal 0
HcmV?d00001

diff --git a/Writerside/icons/psalm.png b/Writerside/icons/psalm.png
new file mode 100644
index 0000000000000000000000000000000000000000..23284c7fafb7198f7f6190017b4211f2fab98946
GIT binary patch
literal 1436
zcmV;N1!MY&P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004XF*Lt006O%
z3;baP000G3Nkl<ZSP7k1OGsQ<5Up-Ien5=hQ3OMRsGx2{5C_r4U}iNWvr`y@!ssHn
z5Er5#?sVf1aT6RDZd~fZ4<?&zqPU9^1WhCo)P<sGtAmXH&OOzAUf=i9I?P=9y}DI(
z>T~PXyYIDcd3ibM?(Xi*&CSh=P$-lp_Y9*GpU<aSdro*P8Fiqx-uMXy0)bh--~T#*
z;3+97jfI7U5+5J$*wBEK3NKH&ml8)xJ^1VE>$J_y&Bn8{Gw~bdML|J<JbLs<vjhMa
zhD~ibb(F=T#E=pL9t%ZG#17ov-licqfjaTrP<lAv;M|tmbK*$7I@lwoseW1jAZAA(
zC<lX)C$()%|H!*{?__>{UOs>Rtp19Ni>0NdMas&`XyT%@*94%k1DVXU;UHsDoD<6=
zgTbJ*x3|ms`noH?$B!RnWo1Q1Mn<HvvQqui#`fh0gNu&sc`O<9)6>(kv$LairjzB%
zmoKj1WPlwW9=_K<^iBd`c-es=BY$~$DSdr?GB7ZJ22y--a<Y_`mP&SZwzRdisqX31
zr)q=S_V%_M92_{ly)gm|KnnuwazS=@cqm<6U9z#Up-|d^wzjrvS0^SWY9MUK#KZ($
zstgRU^owoAa5W(WHUM)NefsoCy1Tmt`^^D4FH`_?I6Xf<m$z@<5+=`{J(H}gEY(p6
zEPXo(*h+goH8mxpqoZOTSBj;ms7TV&)72>*L5XeY?Cg~N{e8v8#l>lZA|MCnpty7k
zREQ@piWBVj;NYNZHE6h|rY31@Y!o=hphGeCXt>qYRh1*Lo}L~lFE5W`RO7xyD-a0|
z!{g&)>FDUt?q-10)KnQ78q(Es)u0%_>}>DI%*>2a+WPu>sjaPbN^fIn4_iN*0SpHC
z$B!RNMMZ@x^OKVk86O{)-Q8WsDX_F(TU%3mCj9)@=Z+2v$ceS7Z((5}R8v!<0A{J4
z%x!6DNqT#GwXrC}5n5MQr(2PbkU+5@L7a$q5>8J~^|3T>JVzgE^5Me=@k7C^LG7!m
zs!GPj#^lM9CyqTDZE|wbIf#fy)iN?N<m&25a&vRFN2t4x!f7~xND>4>fjLHAUY;gV
zU0tm_Z`6Ya5*0vmzI^#oUcGvyeWW_iqHG!F;gc|OC_sRLJz_GTNl8h%70u1f&N%_O
zgEM%P^V_#?YLC<J{rmSWA5hT7o;yuQB^!hwQs^5R8l=C!U(5%L<DB^X{Cp=l*x-E+
z8{1wPbF<~Xxw*NJx4Z=2NB8#j^nIS0ndySyRg9;hq@+afI{vq@xVRWSioIa_S%r=~
zXiiR!!nqRK;)KM-Ve4&sTkgD!RA`**foPSEhPDyrkYjNEf9<0uA)KN4j9;XY{O513
z0Lpl73{G)4iLkvbL$ZJWHDg-d@7jO#559_BLIgLbfyl)_#)nxcJ&~fXB0?oLZ_Np(
zeF!fzlZZEIrvi3KVSMrXAL28m)>T1(l1H`%taos$Y`HB%ZnURQP$vNjnMfF~W?`QX
z1pfgWwumNgcx*4Wz)lJ<J%}QBCEhKejtPS29F+5iaQE53Rx5B9GGD>idm})GNaFUV
zTpWq&mvTC?tE4jRm8iXqrwtpBI#7)8V`%2uct${a`SULdc<>ghFVJ<?&bjO(K^Yt{
zR3LbHb(I!xUbDJCcRyNt_YF?N*l>jmgMIl=_IPU=o1ou(TFq{K{i>f}C_M(Npp3aW
za%%<7Dj+i#cn9Yxfg_LDUtC<s*47q|^I0GMo*x|@y}=(v15D#;N%73v{eeKLLlE=B
qoWs!(gMcyY&9`L`3pZcOufGG1)Zzt~sDc^*0000<MNUMnLSTX*k+Nt2

literal 0
HcmV?d00001

diff --git a/Writerside/icons/typelang.svg b/Writerside/icons/typelang.svg
new file mode 100644
index 0000000..a3ccbe4
--- /dev/null
+++ b/Writerside/icons/typelang.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="32px" height="32px" viewBox="0 0 32 32" version="1.1">
+    <rect fill="#fff" x="0" width="32" height="32" rx="4" />
+    <g transform="scale(.8) translate(3.7 3.7)">
+    <path fill="#222330" d="M 23.214844 0.28125 C 23.085938 0.101562 22.882812 0 22.667969 0 L 16 0 C 15.714844 0.00390625 15.464844 0.183594 15.375 0.453125 L 4.707031 31.121094 C 4.636719 31.324219 4.671875 31.546875 4.796875 31.71875 C 4.917969 31.894531 5.121094 32 5.332031 32 L 12 32 C 12.285156 31.996094 12.535156 31.816406 12.625 31.546875 L 23.292969 0.878906 C 23.363281 0.679688 23.335938 0.457031 23.214844 0.28125 Z M 23.214844 0.28125 "/>
+    <circle fill="#222330" cx="23.3" cy="28" r="4"/>
+    </g>
+</svg>
diff --git a/Writerside/icons/warning.svg b/Writerside/icons/warning.svg
new file mode 100644
index 0000000..97bedf4
--- /dev/null
+++ b/Writerside/icons/warning.svg
@@ -0,0 +1,6 @@
+<!-- Copyright 2000-2023 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license. -->
+<svg width="16" height="16" viewBox="0 0 16 16" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M7.13398 1.5C7.51888 0.833332 8.48112 0.833333 8.86602 1.5L14.9282 12C15.3131 12.6667 14.832 13.5 14.0622 13.5H1.93782C1.16802 13.5 0.686897 12.6667 1.0718 12L7.13398 1.5Z" fill="#FFAF0F"/>
+<path d="M8 4.5L8 8" stroke="white" stroke-width="1.8" stroke-linecap="round"/>
+<circle cx="8.00039" cy="11.1" r="1.1" fill="white"/>
+</svg>
diff --git a/Writerside/tl.tree b/Writerside/tl.tree
index 099cb26..d07086a 100644
--- a/Writerside/tl.tree
+++ b/Writerside/tl.tree
@@ -13,10 +13,12 @@
     <toc-element topic="language.md" toc-title="Syntax">
         <toc-element topic="basic-types.md"/>
         <toc-element topic="logical-types.md"/>
-        <toc-element topic="generic-types.md"/>
-        <toc-element topic="literal-types.md"/>
-        <toc-element topic="shapes.md"/>
-        <toc-element topic="callables.md"/>
+        <toc-element topic="generic-types.md" toc-title="Generics"/>
+        <toc-element topic="literal-types.md" toc-title="Literals"/>
+        <toc-element topic="const-types.md" toc-title="Constants" hidden="true"/>
+        <toc-element topic="shape-types.md" toc-title="Shapes"/>
+        <toc-element topic="callable-types.md" toc-title="Callables"/>
+        <toc-element topic="conditional-types.md" toc-title="Conditions" hidden="true"/>
     </toc-element>
 
     <toc-element topic="parser.md">
diff --git a/Writerside/topics/language.md b/Writerside/topics/language.md
index 798f15d..16d54fa 100644
--- a/Writerside/topics/language.md
+++ b/Writerside/topics/language.md
@@ -1,5 +1,7 @@
 # Syntax Comparison
 
+<show-structure for="chapter" depth="2"/>
+
 The language is defined by a syntax that is based on the grammar of popular
 static code analysis tools: [PHPStan](https://phpstan.org/) and [Psalm](https://psalm.dev/).
 
@@ -10,38 +12,328 @@ static code analysis tools: [PHPStan](https://phpstan.org/) and [Psalm](https://
 > Below is a comparison list of all syntactic structures (grammar). The logical component 
 > (the physical existence of the type) is not taken into account.
 
+
 ## Basic Types
 
-Below is a list of simple, logical (composite) and other common types.
-
-| Code Example                   | TypeLang | Psalm                                             | PHPStan                                                                                               |
-|--------------------------------|----------|---------------------------------------------------|-------------------------------------------------------------------------------------------------------|
-| `ClassName`                    | ✔️       | ✔️                                                | ✔️                                                                                                    |
-| `Non\Qualified\Name`           | ✔️       | ✔️                                                | ✔️                                                                                                    |
-| `\Full\Qualified\Name`         | ✔️       | ✔️                                                | ✔️                                                                                                    |
-| `type-name`                    | ✔️       | ✔️                                                | ✔️                                                                                                    |
-| Union `T1 \| T2`               | ✔️       | ✔️                                                | ✔️                                                                                                    |
-| Intersection `T1 & T2`         | ✔️       | ✔️                                                | ✔️                                                                                                    |
-| Nullable `?T`                  | ✔️       | ✔️                                                | ✔️                                                                                                    |
-| `OneTemplateParam<T>`          | ✔️       | ✔️                                                | ✔️                                                                                                    |
-| `ManyTemplateParams<T, Y, Z>`  | ✔️       | ✔️                                                | ✔️                                                                                                    |
-| `TrailingComma<T, Y,>`         | ✔️       | [❌ Not Supported](https://psalm.dev/r/866c32c49d) | ✔️                                                                                                    |
-| `GenericModifier<out T, in Y>` | ✔️       | [❌ Not Supported](https://psalm.dev/r/80a466e81c) | ⚠️ [Call-site variance](https://phpstan.org/blog/whats-up-with-template-covariant#call-site-variance) |
-| Legacy List `T[]`              | ✔️       | ✔️                                                | ✔️                                                                                                    |
-| Legacy Nested List `T[][]`     | ✔️       | ✔️                                                | ✔️                                                                                                    |
+Below is a list of simple, logical and other common types.
+
+<table style="both">
+    <tr>
+        <td></td>
+        <td width="130">
+            <icon src="typelang.svg" height="16"/>&nbsp;<a href="https://github.com/php-type-language">TypeLang</a>
+        </td>
+        <td width="120">
+            <icon src="psalm.png" height="16"/>&nbsp;<a href="https://github.com/vimeo/psalm">Psalm</a>
+        </td>
+        <td width="120">
+            <icon src="phpstan.png" height="16"/>&nbsp;<a href="https://github.com/phpstan">PHPStan</a>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <a href="basic-types.md" anchor="namespace">
+                Class or type name (including <tooltip term="FQN">FQN</tooltip>)
+            </a>
+            <code-block lang="typescript">
+            Non\Qualified\Name
+            </code-block>
+        </td>
+        <td><icon src="ok.svg"/></td>
+        <td><icon src="ok.svg"/></td>
+        <td><icon src="ok.svg"/></td>
+    </tr>
+    <tr>
+        <td>
+            <a href="logical-types.md" anchor="union-type">
+                Logical union types
+            </a>
+            <code-block lang="typescript">
+            T | U | V
+            </code-block>
+        </td>
+        <td><icon src="ok.svg"/></td>
+        <td><icon src="ok.svg"/></td>
+        <td><icon src="ok.svg"/></td>
+    </tr>
+    <tr>
+        <td>
+            <a href="logical-types.md" anchor="intersection-type">
+                Logical intersection types
+            </a>
+            <code-block lang="typescript">
+            T & U & V
+            </code-block>
+        </td>
+        <td><icon src="ok.svg"/></td>
+        <td><icon src="ok.svg"/></td>
+        <td><icon src="ok.svg"/></td>
+    </tr>
+    <tr>
+        <td>
+            <a href="logical-types.md" anchor="nullable-type">
+                Logical nullable types
+            </a>
+            <code-block lang="typescript">
+            ?T
+            </code-block>
+        </td>
+        <td><icon src="ok.svg"/></td>
+        <td><icon src="ok.svg"/></td>
+        <td><icon src="ok.svg"/></td>
+    </tr>
+    <tr>
+        <td>
+            <a href="generic-types.md" anchor="list-syntax">
+                Legacy list types syntax
+            </a>
+            <code-block lang="typescript">
+                User[]
+            </code-block>
+        </td>
+        <td><icon src="ok.svg"/></td>
+        <td><icon src="ok.svg"/></td>
+        <td><icon src="ok.svg"/></td>
+    </tr>
+    <tr>
+        <td>
+            <a href="generic-types.md">
+                Template arguments (Generics)
+            </a>
+            <code-block lang="typescript">
+                ExampleCollection&lt;array-key, User>
+            </code-block>
+        </td>
+        <td><icon src="ok.svg"/></td>
+        <td>
+            <icon src="warning.svg"/>
+            <a anchor="ref-1-1">
+                Trailing comma not supported <sup>1</sup>
+            </a>
+        </td>
+        <td><icon src="ok.svg"/></td>
+    </tr>
+    <tr>
+        <td>
+            <a href="generic-types.md" anchor="call-site-hints">
+                Template argument hints
+            </a>
+            <code-block lang="typescript">
+                ExampleCollection&lt;in array-key, out User>
+            </code-block>
+        </td>
+        <td><icon src="ok.svg"/></td>
+        <td>
+            <icon src="ko.svg"/>
+            <a href="https://psalm.dev/r/80a466e81c">Syntax Error</a>
+        </td>
+        <td>
+            <icon src="warning.svg"/>
+            <a anchor="ref-1-2">
+                Call-site variance <sup>2</sup>
+            </a>
+        </td>
+    </tr>
+    <tr>
+        <td></td>
+        <td>
+            <note>
+                <format style="bold" color="DarkSeaGreen">7/7</format>
+            </note>
+        </td>
+        <td>
+            <warning>
+                <format style="bold" color="RosyBrown">6/7</format>
+            </warning>
+        </td>
+        <td>
+            <note>
+                <format style="bold" color="DarkSeaGreen">7/7</format>
+            </note>
+        </td>
+    </tr>
+    <tr>
+        <td colspan="4">
+            <deflist>
+                <def title="1. Psalm does NOT support arguments ending with a comma" id="ref-1-1">
+                    <code-block lang="typescript">
+                    ExampleCollection&lt;array-key, User,>
+                    </code-block>
+                    <a href="https://psalm.dev/r/866c32c49d">Open in psalm.dev</a>
+                </def>
+                <def title="2. PHPStan supports call-site variance only" id="ref-1-2">
+                    <code-block lang="typescript">
+                    Collection&lt;covariant Animal>
+                    </code-block>
+                    <a href="https://phpstan.org/blog/whats-up-with-template-covariant#call-site-variance">Open in phpstan.org</a>
+                </def>
+            </deflist>
+        </td>
+    </tr>
+</table>
 
 ## Conditional Types
 
 Below is a list of conditional types.
 
-| Code Example                              | TypeLang | Psalm                                             | PHPStan                                                                       |
-|-------------------------------------------|----------|---------------------------------------------------|-------------------------------------------------------------------------------|
-| Simple eq `T is A ? B : C`                | ✔️       | ✔️                                                | ✔️                                                                            |
-| Simple neq `T is not A ? B : C`           | ✔️       | ✔️                                                | ✔️                                                                            |
-| Referenced eq `$var is A ? B : C`         | ✔️       | ✔️                                                | ✔️                                                                            |
-| Referenced neq `$var is not A ? B : C`    | ✔️       | ✔️                                                | ✔️                                                                            |
-| Referenced inv eq `A is $var ? B : C`     | ✔️       | [❌ Not Supported](https://psalm.dev/r/c70473ea70) | [❌ Not Supported](https://phpstan.org/r/dc886f85-85b6-46b4-9a21-a37a90e6b0c9) |
-| Referenced inv eq `A is not $var ? B : C` | ✔️       | [❌ Not Supported](https://psalm.dev/r/ebe7c053d6) | [❌ Not Supported](https://phpstan.org/r/0b7b5621-cec4-4967-be6f-3bca3c032df9) |
+<table style="both">
+    <tr>
+        <td></td>
+        <td width="130">
+            <icon src="typelang.svg" height="16"/>&nbsp;<a href="https://github.com/php-type-language">TypeLang</a>
+        </td>
+        <td width="120">
+            <icon src="psalm.png" height="16"/>&nbsp;<a href="https://github.com/vimeo/psalm">Psalm</a>
+        </td>
+        <td width="120">
+            <icon src="phpstan.png" height="16"/>&nbsp;<a href="https://github.com/phpstan">PHPStan</a>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <a href="conditional-types.md">
+                Conditional (negative) equality types
+            </a>
+            <code-block lang="typescript">
+            T is A ? B : C
+            </code-block>
+        </td>
+        <td><icon src="ok.svg"/></td>
+        <td><icon src="ok.svg"/></td>
+        <td><icon src="ok.svg"/></td>
+    </tr>
+    <tr>
+        <td>
+            <a href="conditional-types.md">
+                Conditional negative equality types
+            </a>
+            <code-block lang="typescript">
+            T is not A ? B : C
+            </code-block>
+        </td>
+        <td><icon src="ok.svg"/></td>
+        <td><icon src="ok.svg"/></td>
+        <td><icon src="ok.svg"/></td>
+    </tr>
+    <tr>
+        <td>
+            <a href="conditional-types.md">
+                Conditional referenced types
+            </a>
+            <code-block lang="typescript">
+            $var is A ? B : C
+            $var is not A ? B : C
+            </code-block>
+        </td>
+        <td><icon src="ok.svg"/></td>
+        <td><icon src="ok.svg"/></td>
+        <td><icon src="ok.svg"/></td>
+    </tr>
+    <tr>
+        <td>
+            <a href="conditional-types.md">
+                Conditional referenced types 
+            </a>
+            <a href="https://en.wikipedia.org/wiki/Yoda_conditions">
+                in Yoda-style
+            </a>
+            <code-block lang="typescript">
+            A is $var ? B : C
+            A is not $var ? B : C
+            </code-block>
+        </td>
+        <td><icon src="ok.svg"/></td>
+        <td>
+            <icon src="ko.svg"/>
+            <a href="https://psalm.dev/r/c70473ea70">Syntax Error</a>
+        </td>
+        <td>
+            <icon src="ko.svg"/>
+            <a href="https://phpstan.org/r/dc886f85-85b6-46b4-9a21-a37a90e6b0c9">Syntax Error</a>
+        </td>
+    </tr>
+    <tr>
+        <td>
+            <a href="conditional-types.md">
+                Functions in conditional types
+            </a>
+            <code-block lang="typescript">
+            foo() is A ? B : C
+            foo() is not A ? B : C
+            </code-block>
+        </td>
+        <td><icon src="ok.svg"/></td>
+        <td><icon src="ok.svg"/> <a anchor="ref-2-1">List of supported functions <sup>1</sup></a></td>
+        <td><icon src="ok.svg"/> <a anchor="ref-2-2">List of supported functions <sup>2</sup></a></td>
+    </tr>
+    <tr>
+        <td>
+            <a href="conditional-types.md">
+                Functions in conditional types
+            </a>
+            <a href="https://en.wikipedia.org/wiki/Yoda_conditions">
+                in Yoda-style
+            </a>
+            <code-block lang="typescript">
+            A is foo() ? B : C
+            A is not foo() ? B : C
+            </code-block>
+        </td>
+        <td><icon src="ok.svg"/></td>
+        <td>
+            <icon src="ko.svg"/>
+            <a href="https://psalm.dev/r/d936b5ed48">Syntax Error</a>
+        </td>
+        <td>
+            <icon src="ko.svg"/>
+            <a href="https://phpstan.org/r/529ccac7-2c9b-4a59-837f-26c846bd216f">Syntax Error</a>
+        </td>
+    </tr>
+    <tr>
+        <td></td>
+        <td>
+            <note>
+                <format style="bold" color="DarkSeaGreen">6/6</format>
+            </note>
+        </td>
+        <td>
+            <warning>
+                <format style="bold" color="RosyBrown">4/6</format>
+            </warning>
+        </td>
+        <td>
+            <warning>
+                <format style="bold" color="RosyBrown">4/6</format>
+            </warning>
+        </td>
+    </tr>
+    <tr>
+        <td colspan="4">
+            <deflist>
+                <def title="1. Psalm supports the following functions" id="ref-2-1">
+                    <list>
+                        <li><code>define()</code></li>
+                        <li><code>array_map()</code></li>
+                        <li><code>array_filter()</code></li>
+                        <li><code>func_get_arg()</code></li>
+                        <li><code>func_get_args()</code></li>
+                        <li><code>func_num_args()</code></li>
+                        <li><code>is_a()</code></li>
+                        <li><code>is_subclass_of()</code></li>
+                        <li><code>class_alias()</code></li>
+                    </list>
+                </def>
+                <def title="2. PHPStan supports the following functions" id="ref-2-2">
+                    <list>
+                        <li><code>func_get_arg()</code></li>
+                        <li><code>func_get_args()</code></li>
+                        <li><code>func_num_args()</code></li>
+                    </list>
+                </def>
+            </deflist>
+        </td>
+    </tr>
+</table>
 
 ## Literal Types
 
diff --git a/Writerside/topics/language/basic-types.md b/Writerside/topics/language/basic-types.md
index f0a075f..47e8c63 100644
--- a/Writerside/topics/language/basic-types.md
+++ b/Writerside/topics/language/basic-types.md
@@ -1,5 +1,7 @@
 # Basic Types
 
+<show-structure for="chapter" depth="2"/>
+
 The parser does not impose restrictions on type naming. The type name must begin with the 
 characters `[a-zA-Z\x80-\xff]` (any letter) and `_` (underscore) and can contain any characters 
 within the limit `[a-zA-Z0-9\x80-\xff]` (any letter), as well as the characters `_` (underscore) and `-` (dash).
diff --git a/Writerside/topics/language/callables.md b/Writerside/topics/language/callable-types.md
similarity index 98%
rename from Writerside/topics/language/callables.md
rename to Writerside/topics/language/callable-types.md
index 1af82d2..0b14ca2 100644
--- a/Writerside/topics/language/callables.md
+++ b/Writerside/topics/language/callable-types.md
@@ -1,8 +1,6 @@
----
-description: Functional (Callable) Types
----
+# Callable Types
 
-# Callables
+<show-structure for="chapter" depth="2"/>
 
 Callable types describe an arbitrary type that describes a function.
 
diff --git a/Writerside/topics/language/conditional-types.md b/Writerside/topics/language/conditional-types.md
new file mode 100644
index 0000000..284b72c
--- /dev/null
+++ b/Writerside/topics/language/conditional-types.md
@@ -0,0 +1,7 @@
+# Conditional Types
+
+<warning>
+WIP: Documentation is not complete
+</warning>
+
+<show-structure for="chapter" depth="2"/>
diff --git a/Writerside/topics/language/const-types.md b/Writerside/topics/language/const-types.md
new file mode 100644
index 0000000..3e2c14e
--- /dev/null
+++ b/Writerside/topics/language/const-types.md
@@ -0,0 +1,18 @@
+# Constant Types
+
+<warning>
+WIP: Documentation is not complete
+</warning>
+
+<show-structure for="chapter" depth="2"/>
+
+Constants are identifiers containing specific readonly values. There are two types 
+of constants:
+- Global (including those located in a namespace).
+```typescript
+Path\To\CONSTANT_NAME
+```
+- Constants of a class.
+```typescript
+Path\To\ClassName::CONSTANT_NAME
+```
diff --git a/Writerside/topics/language/generic-types.md b/Writerside/topics/language/generic-types.md
index 43f55d2..e9ba865 100644
--- a/Writerside/topics/language/generic-types.md
+++ b/Writerside/topics/language/generic-types.md
@@ -1,4 +1,6 @@
-# Generics
+# Generic Types
+
+<show-structure for="chapter" depth="2"/>
 
 Each type can take arguments containing other type declarations. Validation of
 arguments and their number lies on the implementing side; the parser does not
@@ -64,7 +66,7 @@ comma (`,`).
 </tab>
 </tabs>
 
-### Call-Site Hints
+## Call-Site Hints
 
 Each generic argument allows you to define an additional hint, which can 
 be used, for example, in static analyzers to indicate the
@@ -102,7 +104,7 @@ be used, for example, in static analyzers to indicate the
 </tab>
 </tabs>
 
-### List Syntax
+## List Syntax
 
 In addition to modern list declarations such as `list<int>` or
 `array<array-key, int>`, the legacy `int[]` syntax is allowed.
diff --git a/Writerside/topics/language/literal-types.md b/Writerside/topics/language/literal-types.md
index 35787b2..646dd58 100644
--- a/Writerside/topics/language/literal-types.md
+++ b/Writerside/topics/language/literal-types.md
@@ -1,4 +1,6 @@
-# Literals
+# Literal Types
+
+<show-structure for="chapter" depth="2"/>
 
 As a type description, specific values corresponding to a specific type are
 allowed:
diff --git a/Writerside/topics/language/logical-types.md b/Writerside/topics/language/logical-types.md
index 619f95e..06b5b7c 100644
--- a/Writerside/topics/language/logical-types.md
+++ b/Writerside/topics/language/logical-types.md
@@ -1,5 +1,7 @@
 # Logical Types
 
+<show-structure for="chapter" depth="2"/>
+
 The TypeLang, [like PHP](https://www.php.net/manual/en/language.types.type-system.php#language.types.type-system.composite), supports two types of composite (logical)
 types: Union and Intersection. The ability to specify a _nullable_ type using a
 separate expression is also supported.
diff --git a/Writerside/topics/language/shapes.md b/Writerside/topics/language/shape-types.md
similarity index 96%
rename from Writerside/topics/language/shapes.md
rename to Writerside/topics/language/shape-types.md
index a34d201..272bebf 100644
--- a/Writerside/topics/language/shapes.md
+++ b/Writerside/topics/language/shape-types.md
@@ -1,4 +1,6 @@
-# Shapes
+# Shape Types
+
+<show-structure for="chapter" depth="2"/>
 
 Each **composite** type can be rigidly described by a structural type called a
 "shape". A shape within the PHP language can be applied to any array or object
diff --git a/Writerside/topics/overview.topic b/Writerside/topics/overview.topic
index 673a178..6fdab6c 100644
--- a/Writerside/topics/overview.topic
+++ b/Writerside/topics/overview.topic
@@ -6,21 +6,22 @@
        title="Language Overview"
        id="overview" help-id="index">
     <section-starting-page>
-        <title>Language Overview</title>
+        <title>Overview</title>
         <description>
             The language is defined by a syntax that is based on the grammar of
             popular static code analysis tools: PHPStan, Psalm and other.
         </description>
 
         <spotlight>
+            <a href="language.md" type="container"
+                summary="Language for describing more precise and strict PHP types.">Language</a>
             <a href="parser.md" type="mixed"
-               summary="Parser component analyzes the code and builds the language AST.">Parser</a>
-            <a href="printer.md" type="creative"
-               summary="Printer component converts the parsed AST to an arbitrary string.">Printer</a>
+                summary="Reference implementation of a TypeLang parser providing functionality
+                    for analysis, recognition and construction of AST.">Parser</a>
         </spotlight>
 
         <primary>
-            <title>Language Reference</title>
+            <title>Reference</title>
             <a href="basic-types.md"
                summary="Description of simple type definitions."/>
             <a href="logical-types.md"
@@ -33,10 +34,14 @@
 
         <secondary>
             <title>Advanced Features</title>
-            <a href="shapes.md"
+            <a href="const-types.md"
+               summary="Description of the constants and constant masks syntax." />
+            <a href="shape-types.md"
                summary="Description of type fields that allow you to clarify information about composite types." />
-            <a href="callables.md"
+            <a href="callable-types.md"
                summary="Description of the syntax of any callable types and from arguments." />
+            <a href="conditional-types.md"
+               summary="Description of the syntax of the condition dependent types." />
         </secondary>
 
         <misc>
diff --git a/Writerside/topics/parser.md b/Writerside/topics/parser.md
index b11828e..1ba93e8 100644
--- a/Writerside/topics/parser.md
+++ b/Writerside/topics/parser.md
@@ -1,15 +1,23 @@
 # Parser Component
 
-## Installation
+<show-structure for="chapter" depth="2"/>
 
 A parser component is used to analyze and construct types AST with their
-information and grammar checking. 
+information and grammar checking.
 
-You can install it with:
+## Installation
 
-```bash
-composer require type-lang/parser
-```
+<tldr>
+    <p>
+        Via <a href="https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies">Composer</a>:
+        <code lang="bash">composer require type-lang/parser</code>
+    </p>
+</tldr>
+
+**Requirements:**
+* `PHP >= 8.1`
+* `ext-pcre`
+* `ext-mbstring` <sup>optional</sup>
 
 ## Usage
 
diff --git a/Writerside/topics/parser/visitors.md b/Writerside/topics/parser/visitors.md
index 603f969..5fa77c0 100644
--- a/Writerside/topics/parser/visitors.md
+++ b/Writerside/topics/parser/visitors.md
@@ -1,5 +1,7 @@
 # Visitors
 
+<show-structure for="chapter" depth="2"/>
+
 To completely traverse a graph of all types, you can use the
 `TypeLang\Parser\Traverser` class. The traverser instance can accept several
 the `TypeLang\Parser\Traverser\VisitorInterface` implementation as a constructor
diff --git a/Writerside/topics/parser/visitors/class-name-matcher-visitor.md b/Writerside/topics/parser/visitors/class-name-matcher-visitor.md
index f58bcb4..84a7cb9 100644
--- a/Writerside/topics/parser/visitors/class-name-matcher-visitor.md
+++ b/Writerside/topics/parser/visitors/class-name-matcher-visitor.md
@@ -1,6 +1,7 @@
-
 # ClassNameMatcherVisitor
 
+<show-structure for="chapter" depth="2"/>
+
 To search for the first suitable node for an instance of a class, you can
 use the `ClassNameMatcherVisitor` visitor.
 
diff --git a/Writerside/topics/parser/visitors/stream-dumper-visitor.md b/Writerside/topics/parser/visitors/stream-dumper-visitor.md
index d0bcccd..cb74bac 100644
--- a/Writerside/topics/parser/visitors/stream-dumper-visitor.md
+++ b/Writerside/topics/parser/visitors/stream-dumper-visitor.md
@@ -1,6 +1,7 @@
-
 # StreamDumperVisitor
 
+<show-structure for="chapter" depth="2"/>
+
 To easily debug the structure and output of the AST, you can use the `StreamDumperVisitor` visitor.
 
 ```php
diff --git a/Writerside/topics/parser/visitors/string-dumper-visitor.md b/Writerside/topics/parser/visitors/string-dumper-visitor.md
index 82204cd..cdc327e 100644
--- a/Writerside/topics/parser/visitors/string-dumper-visitor.md
+++ b/Writerside/topics/parser/visitors/string-dumper-visitor.md
@@ -1,6 +1,7 @@
-
 # StringDumperVisitor
 
+<show-structure for="chapter" depth="2"/>
+
 To easily debug the structure and capture AST structure, you can use the `StringDumperVisitor` visitor.
 
 ```php
diff --git a/Writerside/topics/parser/visitors/type-map-visitor.md b/Writerside/topics/parser/visitors/type-map-visitor.md
index d30aed0..678685b 100644
--- a/Writerside/topics/parser/visitors/type-map-visitor.md
+++ b/Writerside/topics/parser/visitors/type-map-visitor.md
@@ -1,6 +1,7 @@
-
 # TypeMapVisitor
 
+<show-structure for="chapter" depth="2"/>
+
 To convert short names to their <tooltip term="FQN">FQN</tooltip> alternatives, 
 you can use `TypeMapVisitor`.
 
diff --git a/Writerside/topics/printer.md b/Writerside/topics/printer.md
index f965391..5384fdb 100644
--- a/Writerside/topics/printer.md
+++ b/Writerside/topics/printer.md
@@ -1,28 +1,42 @@
 # Printer Component
 
-## Installation
+<show-structure for="chapter" depth="2"/>
 
 The printer package is responsible for visualizing the AST as string 
 formats.
 
-You can install it with:
+## Installation
+
+<tldr>
+    <p>
+        Via <a href="https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies">Composer</a>:
+        <code lang="bash">composer require type-lang/printer</code>
+    </p>
+</tldr>
 
-```bash
-composer require type-lang/printer
-```
+**Requirements:**
+* `PHP >= 8.1`
 
-### Usage
+## Usage
 
-Package supports two printer classes:
+Package supports two printer classes.
 
-* `TypeLang\Printer\PrettyPrinter` — Used to display types as accurately as possible.
-* `TypeLang\Printer\NativeTypePrinter` — Used to display types compatible with PHP.
+<deflist>
+    <def title="TypeLang\Printer\PrettyPrinter">
+        Used to display types as accurately as possible.
+    </def>
+    <def title="TypeLang\Printer\NativeTypePrinter">
+        Used to display types compatible with PHP.
+    </def>
+</deflist>
 
 Any printer implements the `TypeLang\Printer\PrinterInterface` interface, which 
 contains an `print()` method for displaying ASTs as formatted strings.
 
+### Shapes
+
 <tabs>
-<tab title="TypeLang\Printer\PrettyPrinter">
+<tab title="PrettyPrinter">
 
 ```php
 $parser = new TypeLang\Parser\Parser();
@@ -36,7 +50,7 @@ $result = $parser->parse(<<<'PHP'
 echo $printer->print($result);
 ```
 
-> Displays types as accurately as possible:
+> Displays types as accurately as possible.
 > ```php
 > object{
 >     key: type,
@@ -46,7 +60,7 @@ echo $printer->print($result);
 > ```
 
 </tab>
-<tab title="TypeLang\Printer\NativeTypePrinter">
+<tab title="NativeTypePrinter">
 
 ```php
 $parser = new TypeLang\Parser\Parser();
@@ -60,7 +74,7 @@ $result = $parser->parse(<<<'PHP'
 echo $printer->print($result);
 ```
 
-> Displays types that are compatible with PHP:
+> Displays types that are compatible with PHP.
 > ```php
 > object
 > ```
@@ -68,38 +82,88 @@ echo $printer->print($result);
 </tab>
 </tabs>
 
-#### Callables
+### Callables
+
+<tabs>
+<tab title="PrettyPrinter">
 
 ```php
-$expected = $parser->parse(<<<'PHP'
+$parser = new TypeLang\Parser\Parser();
+$printer = new TypeLang\Printer\PrettyPrinter();
+
+$result = $parser->parse(<<<'PHP'
     callable(...A &$a)|callable(B &...$b)
     PHP);
 
-echo $pretty->print($expected);
-// Expected Pretty Printer Output:
-//
-// > callable(A &...$a)|callable(B &...$b)
+echo $printer->print($result);
+```
+
+> Displays types as accurately as possible.
+> ```php
+> callable(A &...$a)|callable(B &...$b)
+> ```
 
-echo $native->print($expected);
-// Expected Native Printer Output:
-//
-// > callable
+</tab>
+<tab title="NativeTypePrinter">
+
+```php
+$parser = new TypeLang\Parser\Parser();
+$printer = new TypeLang\Printer\NativeTypePrinter();
+
+$result = $parser->parse(<<<'PHP'
+    callable(...A &$a)|callable(B &...$b)
+    PHP);
+
+echo $printer->print($result);
 ```
 
-#### Conditional
+> Displays types that are compatible with PHP.
+> ```php
+> callable
+> ```
+
+</tab>
+</tabs>
+
+### Conditional
+
+<tabs>
+<tab title="PrettyPrinter">
 
 ```php
-$expected = $parser->parse(<<<'PHP'
+$parser = new TypeLang\Parser\Parser();
+$printer = new TypeLang\Printer\PrettyPrinter();
+
+$result = $parser->parse(<<<'PHP'
     $arg is null ? non-empty-string : int<0, max>
     PHP);
 
-echo $pretty->print($expected);
-// Expected Pretty Printer Output:
-//
-// > ($arg is null ? non-empty-string : int<0, max>)
+echo $printer->print($result);
+```
+
+> Displays types as accurately as possible.
+> ```php
+> ($arg is null ? non-empty-string : int<0, max>)
+> ```
+
+</tab>
+<tab title="NativeTypePrinter">
+
+```php
+$parser = new TypeLang\Parser\Parser();
+$printer = new TypeLang\Printer\NativeTypePrinter();
+
+$result = $parser->parse(<<<'PHP'
+    $arg is null ? non-empty-string : int<0, max>
+    PHP);
 
-echo $native->print($expected);
-// Expected Native Printer Output:
-//
-// > string|int
+echo $printer->print($result);
 ```
+
+> Displays types that are compatible with PHP.
+> ```php
+> string|int
+> ```
+
+</tab>
+</tabs>
diff --git a/Writerside/topics/reader.md b/Writerside/topics/reader.md
index 0171628..ed4849d 100644
--- a/Writerside/topics/reader.md
+++ b/Writerside/topics/reader.md
@@ -1,32 +1,44 @@
 # Reader Component
 
-## Installation
+<show-structure for="chapter" depth="2"/>
 
-The `reader` package provides a set of methods for reading PHP metadata and 
+This package provides a set of methods for reading PHP metadata and 
 converting it into the TypeLang AST Nodes.
 
-You can install it with:
+## Installation
+
+<tldr>
+    <p>
+        Via <a href="https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies">Composer</a>:
+        <code lang="bash">composer require type-lang/reader</code>
+    </p>
+</tldr>
 
-```bash
-composer require type-lang/reader
-```
+**Requirements:**
+* `PHP >= 8.1`
 
 ## Usage
 
-Package supports one reader class:
+Package supports one reader class.
 
-* `TypeLang\Reader\ReflectionReader` — Used to read metadata from reflection objects.
+<deflist>
+    <def title="TypeLang\Reader\ReflectionReader">
+        Used to read types metadata from reflection objects.
+    </def>
+</deflist>
 
 Any reader implements the `TypeLang\Reader\ReaderInterface` interface, which 
 contains several methods:
 
-- `findConstantType(ReflectionClassConstant)` — To read type from constants.
-- `findPropertyType(ReflectionProperty)` — To read type from properties.
-- `findFunctionType(ReflectionFunctionAbstract)` — To read type from functions and methods.
-- `findParameterType(ReflectionParameter)` — To read type from parameters.
+- [`findConstantType(ReflectionClassConstant): ?TypeStatement`](#constants)
+- [`findPropertyType(ReflectionProperty): ?TypeStatement`](#properties)
+- [`findFunctionType(ReflectionFunctionAbstract): ?TypeStatement`](#functions)
+- [`findParameterType(ReflectionParameter): ?TypeStatement`](#parameters)
 
 ### Constants
 
+Method `findConstantType()` is used to read types from constants.
+
 ```php
 class Example
 {
@@ -65,6 +77,8 @@ TypeLang\Parser\Node\Stmt\NamedTypeNode {
 
 ### Properties
 
+Method `findPropertyType()` is used to read types from class properties.
+
 ```php
 class Example
 {
@@ -103,6 +117,9 @@ TypeLang\Parser\Node\Stmt\NamedTypeNode {
 
 ### Functions
 
+Method `findFunctionType()` is used to read return types from
+functions and class methods.
+
 ```php
 $example = function(): void {};
 
@@ -135,6 +152,9 @@ TypeLang\Parser\Node\Stmt\NamedTypeNode {
 
 ### Parameters
 
+Method `findParameterType()` is used to read types from
+function and method parameters.
+
 ```php
 $example = function(bool $param) {};