diff --git a/src/components/Sidebar.astro b/src/components/Sidebar.astro
index 94de770..c9ac403 100644
--- a/src/components/Sidebar.astro
+++ b/src/components/Sidebar.astro
@@ -7,10 +7,6 @@ const basePath: string = Astro.props.basePath;
const entryPath = is_index_file(entry.path)? "": entry.path;
const entryUrl = basePath + entryPath + (entryPath.endsWith("/")? "" : "/");
-console.table({
- basePath,
- entryPath,
-})
function is_index_file(p) {
return p.endsWith("index")
@@ -35,7 +31,7 @@ function is_index_file(p) {
entry.children && (
<>
- {entry.title}
+ {entry.title.replaceAll("-", " ")}
diff --git a/src/layouts/NewDocsLayout.astro b/src/layouts/NewDocsLayout.astro
index 16c5934..a32e4a0 100644
--- a/src/layouts/NewDocsLayout.astro
+++ b/src/layouts/NewDocsLayout.astro
@@ -21,6 +21,7 @@ export interface AstroFile {
export interface Frontmatter {
layout: string
title: string
+ order: number
}
type Props = {
@@ -56,7 +57,8 @@ const second_level: Record> = {
for (const post of posts_2) {
const fragments = post.path.split("/");
if (fragments.length === 3) {
- const folder_name = fragments[1];
+ const folder_name = fragments[1]!;
+
// create if not exists
if (second_level[folder_name] === undefined) {
second_level[folder_name] = [];
@@ -65,21 +67,21 @@ for (const post of posts_2) {
}
else if (fragments.length === 2) {
// add to root folder
- second_level["_"].push(post);
+ second_level["_"]!.push(post);
}
}
// transform to the layout that the sidebar expects
-const entries = [];
+const entries: Array = [];
for (const levels_key in second_level) {
if (levels_key === "_") {
// top level
- const posts = second_level[levels_key];
+ const posts = second_level[levels_key]!;
entries.push(...posts)
}
else {
- const posts = second_level[levels_key];
+ const posts = second_level[levels_key]!;
const parentEntry = {
path: "",
title: levels_key,
@@ -91,9 +93,6 @@ for (const levels_key in second_level) {
const index_page = entries.find(post => post.relative_file === "/index.md" || post.relative_file === "/index.mdx");
const basePath = index_page.url;
-
-console.log(JSON.stringify(index_page, null, 4));
-console.log(basePath);
---
diff --git a/src/pages/en/latest/learn/_wrapper.astro b/src/pages/en/latest/learn/_wrapper.astro
index 0b4cda3..79329dd 100644
--- a/src/pages/en/latest/learn/_wrapper.astro
+++ b/src/pages/en/latest/learn/_wrapper.astro
@@ -1,10 +1,11 @@
---
-import path from "path";
-import NewDocsLayout from "@/layouts/NewDocsLayout.astro";
+import NewDocsLayout, { type AstroFile } from "@/layouts/NewDocsLayout.astro";
const { frontmatter, headings } = Astro.props;
// Get all the posts from this dir
-const posts = await Astro.glob("./**/*.{md,mdx}");
+
+const posts = await Astro.glob("./**/*.{md,mdx}") as unknown as Array;
+
// Current dir
const current_dir = import.meta.dirname;
---
diff --git a/src/pages/en/latest/learn/classes/abstract.mdx b/src/pages/en/latest/learn/classes/abstract.mdx
new file mode 100644
index 0000000..9d44b62
--- /dev/null
+++ b/src/pages/en/latest/learn/classes/abstract.mdx
@@ -0,0 +1,9 @@
+---
+layout: "../_wrapper.astro"
+title: Abstract
+---
+import Code from "@/components/Code.astro"
+
+# Abstract
+
+
diff --git a/src/pages/learn/classes/anonymous.mdx b/src/pages/en/latest/learn/classes/anonymous.mdx
similarity index 83%
rename from src/pages/learn/classes/anonymous.mdx
rename to src/pages/en/latest/learn/classes/anonymous.mdx
index 1a2cf7b..fe39986 100644
--- a/src/pages/learn/classes/anonymous.mdx
+++ b/src/pages/en/latest/learn/classes/anonymous.mdx
@@ -1,8 +1,8 @@
---
-layout: ../../../layouts/DocsLayout.astro
+layout: "../_wrapper.astro"
title: Anonymous classes
---
-import Code from "../../../components/Code.astro"
+import Code from "@/components/Code.astro"
# Anonymous classes
diff --git a/src/pages/learn/classes/constructor.mdx b/src/pages/en/latest/learn/classes/constructor.mdx
similarity index 96%
rename from src/pages/learn/classes/constructor.mdx
rename to src/pages/en/latest/learn/classes/constructor.mdx
index 0a8c6b4..f8a4c4d 100644
--- a/src/pages/learn/classes/constructor.mdx
+++ b/src/pages/en/latest/learn/classes/constructor.mdx
@@ -1,8 +1,8 @@
---
-layout: ../../../layouts/DocsLayout.astro
+layout: "../_wrapper.astro"
title: Constructor/Destructor
---
-import Code from "../../../components/Code.astro"
+import Code from "@/components/Code.astro"
# Constructor/Destructor
diff --git a/src/pages/learn/classes/definition.mdx b/src/pages/en/latest/learn/classes/definition.mdx
similarity index 97%
rename from src/pages/learn/classes/definition.mdx
rename to src/pages/en/latest/learn/classes/definition.mdx
index bfe502f..0019a50 100644
--- a/src/pages/learn/classes/definition.mdx
+++ b/src/pages/en/latest/learn/classes/definition.mdx
@@ -1,8 +1,8 @@
---
-layout: ../../../layouts/DocsLayout.astro
+layout: "../_wrapper.astro"
title: Basics
---
-import Code from "../../../components/Code.astro"
+import Code from "@/components/Code.astro"
# Classes
diff --git a/src/pages/learn/classes/inheritance.mdx b/src/pages/en/latest/learn/classes/inheritance.mdx
similarity index 88%
rename from src/pages/learn/classes/inheritance.mdx
rename to src/pages/en/latest/learn/classes/inheritance.mdx
index c5fbcb2..fbea016 100644
--- a/src/pages/learn/classes/inheritance.mdx
+++ b/src/pages/en/latest/learn/classes/inheritance.mdx
@@ -1,8 +1,8 @@
---
-layout: ../../../layouts/DocsLayout.astro
+layout: "../_wrapper.astro"
title: Inheritance
---
-import Code from "../../../components/Code.astro"
+import Code from "@/components/Code.astro"
# Inheritance
diff --git a/src/pages/learn/classes/interfaces.mdx b/src/pages/en/latest/learn/classes/interfaces.mdx
similarity index 76%
rename from src/pages/learn/classes/interfaces.mdx
rename to src/pages/en/latest/learn/classes/interfaces.mdx
index 8c2e3c9..46aba33 100644
--- a/src/pages/learn/classes/interfaces.mdx
+++ b/src/pages/en/latest/learn/classes/interfaces.mdx
@@ -1,8 +1,8 @@
---
-layout: ../../../layouts/DocsLayout.astro
+layout: "../_wrapper.astro"
title: Interfaces
---
-import Code from "../../../components/Code.astro"
+import Code from "@/components/Code.astro"
# Interfaces
diff --git a/src/pages/learn/classes/magic.mdx b/src/pages/en/latest/learn/classes/magic.mdx
similarity index 77%
rename from src/pages/learn/classes/magic.mdx
rename to src/pages/en/latest/learn/classes/magic.mdx
index 6279067..c40c405 100644
--- a/src/pages/learn/classes/magic.mdx
+++ b/src/pages/en/latest/learn/classes/magic.mdx
@@ -1,8 +1,8 @@
---
-layout: ../../../layouts/DocsLayout.astro
+layout: "../_wrapper.astro"
title: Magic methods
---
-import Code from "../../../components/Code.astro"
+import Code from "@/components/Code.astro"
# Magic methods
diff --git a/src/pages/en/latest/learn/classes/readonly.mdx b/src/pages/en/latest/learn/classes/readonly.mdx
new file mode 100644
index 0000000..7627c3f
--- /dev/null
+++ b/src/pages/en/latest/learn/classes/readonly.mdx
@@ -0,0 +1,15 @@
+---
+layout: "../_wrapper.astro"
+title: Readonly
+---
+import Code from "@/components/Code.astro"
+
+# Readonly
+
+ v2
-v1 >= v2
-`} />
-
-There is only `==` and `!=`. They are equivalent to `===` and `!==`.
-
-
-
-
-```php
-// PHP
-$obj = [
- 'names' => ['Toni', 'Stark'],
- 'age' => 33,
- 'numbers' => [32, 64, 128]
-]
-```
-
-
-
-
-```php
-// PHP
-$cat = new Cat("Michifu", 7);
-$cat->meow();
-```
-
-
-
-
-
-```php
-// PHP
-use \Some\Deeply\Nested\Class
-use \Some\Deeply\Nested\Interface
-```
-
-
-
-
-
-
-Other things:
-
-- Pattern matching
-- ADTs
-
-
-## Runtime changes
-
-Where possible THP will compile to available PHP functions/classes/methods/etc.
-
-For example:
-
- 18
- {
- "Welcome, {person.name}"
- }
- case Some(person)
- {
- "I'm sorry {person.name}, you need to be 18 or older"
- }
- case None
- {
- "Nobody is here"
- }
-`} />
-
-```php
-// Would compile to:
-$greeting = null;
-$_person = get_person();
-if ($_person !== null) {
- if ($_person["age"] > 18) {
- $greeting = "Welcome, " . $_person["name"];
- }
- else {
- $greeting = "I'm sorry " . $_person["name"] . ", you need to be 18 or older";
- }
-}
-else {
- $greeting = "Nobody is here";
-}
-```
-
-However, more advanced datatypes & helper functions will require a sort of
-runtime (new classes/functions/etc) or abuse the language's syntax/semantics.
-
-
diff --git a/src/pages/learn/install.md b/src/pages/learn/install.md
deleted file mode 100644
index 39aeae7..0000000
--- a/src/pages/learn/install.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-layout: ../../layouts/DocsLayout.astro
-title: Install
----
-
-# Install
-
-**THP is technically usable.**
-
-## From source (*nix)
-
-Requires Rust installed.
-
-Clone [the repo](https://git.araozu.dev/fernando/thp) and run
-`cargo build --release`. You'll have a `thp` binary on
-`target/release/thp`, run it and see for yourself.
-
-
-## Binary
-
-Goal: Install THP with a single binary. Assumes that php and composer is
-available.
-
-
-## With composer
-
-TBD: Install THP with `composer require thp`
-