chore: rebuild dist types

Includes transpiled JS/TS, and Typescript declaration files (typings).

[skip ci]

.gitattributes

@@ -13,5 +13,7 @@ tests export-ignore
 js/dist/* -diff
 js/dist/* linguist-generated
 js/dist-typings/* linguist-generated
+js/yarn.lock -diff
+js/package-lock.json -diff
 
 * text=auto eol=lf

.github/workflows/backend.yml

@@ -0,0 +1,15 @@
+name: Core PHP
+
+on: [workflow_dispatch, push, pull_request]
+
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
+jobs:
+  run:
+    uses: flarum/.github/.github/workflows/REUSABLE_backend.yml@main
+    with:
+      enable_backend_testing: true
+
+      backend_directory: .

.github/workflows/frontend.yml

@@ -0,0 +1,23 @@
+name: Core JS
+
+on: [workflow_dispatch, push, pull_request]
+
+# The reusable workflow definitions will be moved to the `flarum/framework` repo soon.
+# This will break your current script.
+# When this happens, run `flarum-cli audit infra --fix` to update your infrastructure.
+
+jobs:
+  run:
+    uses: flarum/.github/.github/workflows/REUSABLE_frontend.yml@main
+    with:
+      enable_bundlewatch: true
+      enable_prettier: true
+      enable_typescript: true
+
+      frontend_directory: ./js
+      backend_directory: .
+      js_package_manager: yarn
+      main_git_branch: master
+
+    secrets:
+      bundlewatch_github_token: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}

.github/workflows/js.yml

@@ -1,137 +0,0 @@
-name: JS
-
-on: [workflow_dispatch, push, pull_request]
-
-env:
-  NODE_VERSION: 16
-
-jobs:
-  prettier:
-    name: Prettier
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Set up Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          cache: "yarn"
-          cache-dependency-path: js/yarn.lock
-
-      - name: Install JS dependencies
-        run: yarn install --immutable
-        working-directory: ./js
-
-      - name: Check JS formatting
-        run: yarn run format-check
-        working-directory: ./js
-
-  typecheck:
-    name: Typecheck
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Set up Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          cache: "yarn"
-          cache-dependency-path: js/yarn.lock
-
-      - name: Install JS dependencies
-        run: yarn --frozen-lockfile
-        working-directory: ./js
-
-      - name: Typecheck
-        run: yarn run check-typings || true  # REMOVE THIS ONCE TYPE SAFETY REACHED
-        working-directory: ./js
-
-  type-coverage:
-    name: Type Coverage
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Set up Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          cache: "yarn"
-          cache-dependency-path: js/yarn.lock
-
-      - name: Install JS dependencies
-        run: yarn --frozen-lockfile
-        working-directory: ./js
-
-      - name: Check type coverage
-        run: yarn run check-typings-coverage
-        working-directory: ./js
-
-  build-prod:
-    name: Build and commit
-    runs-on: ubuntu-latest
-    needs: [prettier, typecheck, type-coverage]
-
-    # Only commit JS on push to master branch
-    # Remember to change in `build-test` job too
-    if: github.ref == 'refs/heads/master' && github.event_name == 'push'
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Set up Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          cache: "yarn"
-          cache-dependency-path: js/yarn.lock
-
-      # Our action will install npm, cd into `./js`, run `npm run build` and
-      # `npm run build-typings`, then commit and upload any changes
-      - name: Build production JS
-        uses: flarum/action-build@2
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          build_script: build
-          package_manager: yarn
-          typings_script: build-typings
-
-  build-test:
-    name: Test build
-    runs-on: ubuntu-latest
-    needs: [prettier, typecheck, type-coverage]
-
-    # Inverse check of `build-prod`
-    # Remember to change in `build-prod` job too
-    if: github.ref != 'refs/heads/master' || github.event_name != 'push'
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Set up Node
-        uses: actions/setup-node@v2
-        with:
-          node-version: ${{ env.NODE_VERSION }}
-          cache: "yarn"
-          cache-dependency-path: js/yarn.lock
-
-      # Our action will install npm, cd into `./js`, run `npm run build` and
-      # `npm run build-typings`, then commit and upload any changes
-      - name: Build production JS
-        uses: flarum/action-build@2
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          build_script: build
-          package_manager: yarn
-          typings_script: build-typings
-          do_not_commit: true

.github/workflows/pr_size_change.yml

@@ -1,45 +0,0 @@
-name: Bundle size checker
-
-on:
-  workflow_dispatch:
-
-  push:
-    paths:
-      - "js/**"
-  pull_request:
-    paths:
-      - "js/**"
-
-jobs:
-  bundlewatch:
-    runs-on: ubuntu-latest
-
-    name: Bundlewatch
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Setup Node.js
-        uses: actions/setup-node@v2
-        with:
-          node-version: "14"
-
-      - name: Use npm v7
-        run: sudo npm install -g npm@7.x.x
-
-      - name: Install JS dependencies
-        # We need to use `npm install` here. If we don't, the workflow will fail.
-        run: npm install
-        working-directory: ./js
-
-      - name: Build production assets
-        run: npm run build
-        working-directory: ./js
-
-      - name: Check bundle size change
-        run: node_modules/.bin/bundlewatch --config .bundlewatch.config.json
-        working-directory: ./js
-        env:
-          BUNDLEWATCH_GITHUB_TOKEN: ${{ secrets.BUNDLEWATCH_GITHUB_TOKEN }}
-          CI_COMMIT_SHA: ${{ github.event.pull_request.head.sha }}

.github/workflows/test.yml

@@ -1,79 +0,0 @@
-name: Tests
-
-on: [push, pull_request]
-
-jobs:
-  test:
-    runs-on: ubuntu-latest
-
-    strategy:
-      matrix:
-        php: [7.3, 7.4, '8.0', '8.1']
-        service: ['mysql:5.7', mariadb]
-        prefix: ['', flarum_]
-
-        include:
-          - service: 'mysql:5.7'
-            db: MySQL
-          - service: mariadb
-            db: MariaDB
-          - prefix: flarum_
-            prefixStr: (prefix)
-
-        exclude:
-          - php: 7.3
-            service: 'mysql:5.7'
-            prefix: flarum_
-          - php: 7.3
-            service: mariadb
-            prefix: flarum_
-          - php: 8.0
-            service: 'mysql:5.7'
-            prefix: flarum_
-          - php: 8.0
-            service: mariadb
-            prefix: flarum_
-
-    services:
-      mysql:
-        image: ${{ matrix.service }}
-        ports:
-          - 13306:3306
-
-    name: 'PHP ${{ matrix.php }} / ${{ matrix.db }} ${{ matrix.prefixStr }}'
-
-    steps:
-      - name: Check out code
-        uses: actions/checkout@v2
-
-      - name: Setup PHP
-        uses: shivammathur/setup-php@0b9d33cd0782337377999751fc10ea079fdd7104 # pin@v2
-        with:
-          php-version: ${{ matrix.php }}
-          coverage: xdebug
-          extensions: curl, dom, gd, json, mbstring, openssl, pdo_mysql, tokenizer, zip
-          tools: phpunit, composer:v2
-
-      # The authentication alter is necessary because newer mysql versions use the `caching_sha2_password` driver,
-      # which isn't supported prior to PHP7.4
-      # When we drop support for PHP7.3, we should remove this from the setup.
-      - name: Create MySQL Database
-        run: |
-          sudo systemctl start mysql
-          mysql -uroot -proot -e 'CREATE DATABASE flarum_test;' --port 13306
-          mysql -uroot -proot -e "ALTER USER 'root'@'localhost' IDENTIFIED WITH mysql_native_password BY 'root';" --port 13306
-
-      - name: Install Composer dependencies
-        run: composer install
-
-      - name: Setup Composer tests
-        run: composer test:setup
-        env:
-          DB_PORT: 13306
-          DB_PASSWORD: root
-          DB_PREFIX: ${{ matrix.prefix }}
-
-      - name: Run Composer tests
-        run: composer test
-        env:
-          COMPOSER_PROCESS_TIMEOUT: 600

.gitignore

@@ -1,6 +1,7 @@
 /vendor
 composer.lock
 composer.phar
+
 .DS_Store
 Thumbs.db
 tests/.phpunit.result.cache

CHANGELOG.md

@@ -1,5 +1,115 @@
 # Changelog
 
+## [1.2.0](https://github.com/flarum/core/compare/v1.1.1...v1.2.0)
+
+### Added
+- View `README` documentation in extension pages (https://github.com/flarum/core/pull/3094).
+- Declare & Use CSS Custom Properties (https://github.com/flarum/core/pull/3146).
+- Lazy draw dropdowns to improve performance (https://github.com/flarum/core/pull/2925).
+- Default Settings Extender (https://github.com/flarum/core/pull/3127).
+- Add `textarea` setting type to admin pages (https://github.com/flarum/core/pull/3141).
+- Allow registering settings as `Less` config vars through Settings Extender (https://github.com/flarum/core/pull/3011).
+- Allow replacing of blade template namespaces via extender (https://github.com/flarum/core/pull/3167).
+- Update to Webpack 5 (https://github.com/flarum/core/pull/3135).
+- Introduce `Less` custom function extender with a `is-extension-enabled` function (https://github.com/flarum/core/pull/3190).
+- Support for `few` in ICU Message syntax (https://github.com/flarum/core/pull/3122).
+- ES6 local support for number formatting (https://github.com/flarum/core/pull/3099).
+- Added dedicated endpoint for retrieving single groups (https://github.com/flarum/core/pull/3084).
+- Callback `loadWhere` relation eager loading extender (https://github.com/flarum/core/pull/3116).
+- Extensible document title driver implementation (https://github.com/flarum/core/pull/3109).
+- Type checks, typescript coverage GH action (https://github.com/flarum/core/pull/3136).
+- Add color indicator in appearance admin page instead of validating colors (https://github.com/flarum/core/pull/3140).
+- Add typing files for our translator libraries (https://github.com/flarum/core/pull/3175).
+- `StatusWidget` tools extensibility (https://github.com/flarum/core/pull/3189).
+- Allow switching the `ImageManager` driver (https://github.com/flarum/core/pull/3195).
+- Events for notification read/all read actions (https://github.com/flarum/core/pull/3203).
+
+### Changed
+- Testing with php8.1 (https://github.com/flarum/core/pull/3102).
+- Migrate fully to Yarn (https://github.com/flarum/core/pull/3155).
+- Handle post rendering errors to avoid crashes (https://github.com/flarum/core/pull/3061).
+- Added basic filtering, sorting, and pagination to groups endpoint (https://github.com/flarum/core/pull/3084).
+- Pass IP address to API Client pipeline (https://github.com/flarum/core/pull/3124).
+- Rename Extension Page "Uninstall" to "Purge" (https://github.com/flarum/core/pull/3123).
+- [A11Y] Improve accessibility for discussion reply count on post stream (https://github.com/flarum/core/pull/3090).
+- Improved post loading support (https://github.com/flarum/core/pull/3100).
+- Rewrite SubtreeRetainer into Typescript (https://github.com/flarum/core/pull/3137).
+- Rewrite ModalManager and state to Typescript (https://github.com/flarum/core/pull/3007).
+- Rewrite frontend application files to Typescript (https://github.com/flarum/core/pull/3006).
+- Allow extensions to modify the minimum search length in the Search component (https://github.com/flarum/core/pull/3130).
+- Allow use of any tag in `listItems` helper (https://github.com/flarum/core/pull/3147).
+- Replace `for ... in` with `Array.reduce` (https://github.com/flarum/core/pull/3149).
+- Page title format is now implemented through translations (https://github.com/flarum/core/pull/3077, https://github.com/flarum/core/pull/3228)
+- Add `aria-label` attribute to the navigation drawer button (https://github.com/flarum/core/pull/3157).
+- Convert extend util to TypeScript (https://github.com/flarum/core/pull/2928).
+- Better typings for DiscussionListState (https://github.com/flarum/core/pull/3132).
+- Rewrite ItemList, update `ItemList` typings (https://github.com/flarum/core/pull/3005).
+- Add priority order to discussion page controls (https://github.com/flarum/core/pull/3165).
+- Use `@php` in Blade templates (https://github.com/flarum/core/pull/3172).
+- Convert some common classes/utils to TS (https://github.com/flarum/core/pull/2929).
+- Convert routes to Typescript (https://github.com/flarum/core/pull/3177).
+- Move admin `colorItems` to an `ItemList` (https://github.com/flarum/core/pull/3186).
+- Centralize pagination/canonical meta URL generation in Document (https://github.com/flarum/core/pull/3077).
+- Use revision versioner to allow custom asset versioning (https://github.com/flarum/core/pull/3183).
+- Split up application error handling (https://github.com/flarum/core/pull/3184).
+- Make SlugManager available to blade template (https://github.com/flarum/core/pull/3194).
+- Convert models to TS (https://github.com/flarum/core/pull/3174).
+- Allow loading relations in other discussion endpoints (https://github.com/flarum/core/pull/3191).
+- Improve selected text stylization (https://github.com/flarum/core/pull/2961).
+- Extract notification `primaryControl` items to an ItemList (https://github.com/flarum/core/pull/3204).
+- Frontend code housekeeping (#3214, #3213).
+- Only retain scroll position if coming from discussion (https://github.com/flarum/core/pull/3229).
+- Use `aria-live` regions to focus screenreader attention on alerts as they appear (https://github.com/flarum/core/pull/3237).
+- Prevent unwarranted `a11y` warnings on custom Button subclasses (https://github.com/flarum/core/pull/3238).
+
+### Fixed
+- Missing locale text in the user editing modal (https://github.com/flarum/core/pull/3093).
+- Dashes in table prefix prevent installation (https://github.com/flarum/core/pull/3089).
+- Missing autocomplete attributes to input fields (https://github.com/flarum/core/pull/3088).
+- Missing route parameters throwing an error (https://github.com/flarum/core/pull/3118).
+- Mail settings select component never used (https://github.com/flarum/core/pull/3120).
+- White avatar image throws javascript errors on the profile page (https://github.com/flarum/core/pull/3119).
+- Unformatted avatar upload validation errors (https://github.com/flarum/core/pull/2946).
+- Webkit input clear button shows up with the custom one (https://github.com/flarum/core/pull/3128).
+- Media query breakpoints conflict with Windows display scaling (https://github.com/flarum/core/pull/3139).
+- `typeof this` not recognized by some IDEs (https://github.com/flarum/core/pull/3142).
+- `Model.save()` cannot save `null` `hasOne` relationship (https://github.com/flarum/core/pull/3131).
+- Edit post `until reply` policy broken on PHP 8 (https://github.com/flarum/core/pull/3145).
+- Inaccurate `Component.component` argument typings (https://github.com/flarum/core/pull/3148).
+- Scrolling notification list infinitely repeats (https://github.com/flarum/core/pull/3159).
+- Argument for INFO constant was assigned to `maxfiles` argument incorrectly (bfd81a83cfd0fa8125395a147ff0c9ce622f38e3).
+- `Activated` event is sent every time an email is confirmed instead of just once (https://github.com/flarum/core/pull/3163).
+- [A11Y] Modal close button missing accessible label (https://github.com/flarum/core/pull/3161).
+- [A11Y] Auth modal inputs missing accessible labels (https://github.com/flarum/core/pull/3207).
+- [A11Y] Triggering click on drawer button can cause layered backdrops (https://github.com/flarum/core/pull/3018).
+- [A11Y] Focus can leave open nav drawer on mobile (https://github.com/flarum/core/pull/3018).
+- [A11Y] Post action items not showing when focus is within the post (https://github.com/flarum/core/pull/3173).
+- [A11Y] Missing accessible label for alert dismiss button (https://github.com/flarum/core/pull/3237).
+- Error accessing the forum after saving a setting with more than 65k characters (https://github.com/flarum/core/pull/3162).
+- Cannot restart queue from within (https://github.com/flarum/core/pull/3166).
+- `Post--by-actor` not showing when comparing user instances (https://github.com/flarum/core/pull/3170).
+- Incorrect typings for Modal `hide()` method (https://github.com/flarum/core/pull/3180).
+- Avatar Upload throws errors with correct mimetype and incorrect extension (https://github.com/flarum/core/pull/3181).
+- Clicking the dropdown button on a post opens all dropdowns in `Post-actions` (https://github.com/flarum/core/pull/3185).
+- `getPlainContent()` causes external content to be fetched (https://github.com/flarum/core/pull/3193).
+- `listItems` not accepting all `Mithril.Children` (https://github.com/flarum/core/pull/3176).
+- Notifications mark as read option updates all notifications including the read ones (https://github.com/flarum/core/pull/3202).
+- Post meta permalink not properly generated (https://github.com/flarum/core/pull/3216).
+- Broken contribution link in README (https://github.com/flarum/core/pull/3211).
+- `WelcomeHero` is displayed when content is empty (https://github.com/flarum/core/pull/3219).
+- `last_activity_at, last_seen_at` updated on all API requests (https://github.com/flarum/core/pull/3231).
+- `RememberMe` access token updated twice in API requests (https://github.com/flarum/core/pull/3233).
+- Error in `funding` item in `composer.json` bricks the frontend (https://github.com/flarum/core/pull/3239).
+- Escaped quotes in window title (https://github.com/flarum/core/pull/3264)
+- `schedule:list` command fails due to missing timezone configuration.
+
+### Deprecated
+- Unused `evented` utility (https://github.com/flarum/core/pull/3125).
+
+## [1.1.1](https://github.com/flarum/core/compare/v1.1.0...v1.1.1)
+
+### Fixed
+- Performance issue with very large communities.
 
 ## [1.1.0](https://github.com/flarum/core/compare/v1.0.4...v1.1.0)
 

README.md

@@ -9,7 +9,6 @@
 <a href="https://github.styleci.io/repos/28257573"><img src="https://github.styleci.io/repos/28257573/shield?style=flat" alt="StyleCI"></a>
 </p>
 
-
 ## About Flarum
 
 **[Flarum](https://flarum.org/) is a delightfully simple discussion platform for your website.** It's fast and easy to use, with all the features you need to run a successful community. It is designed to be:
@@ -20,13 +19,15 @@
 
 * **Powerful and extensible.** Customize, extend, and integrate Flarum to suit your community. Flarum’s architecture is amazingly flexible, with a powerful Extension API.
 
+![Screenshot of a Flarum instance, showing multiple discussions and tags.](https://flarum.org/assets/img/home-screenshot.png)
+
 ## Installation
 
-This repository contains Flarum's core code. If you want to set up a forum, visit the [Flarum skeleton repository](https://github.com/flarum/flarum).
+This repository contains Flarum's core code. If you want to set up a forum, visit the [Flarum skeleton repository](https://github.com/flarum/flarum). For support, refer to the [documentation](https://docs.flarum.org/), and ask questions on [Flarum Discuss](https://discuss.flarum.org/) (our community forum) or [Discord server](https://flarum.org/discord/).
 
 ## Contributing
 
-Thank you for considering contributing to Flarum! Please read the **[Contributing guide](https://flarum.org/docs/contributing.html)** to learn how you can help.
+Thank you for considering contributing to Flarum! Please read the **[Contributing guide](https://docs.flarum.org/contributing)** to learn how you can help.
 
 ## Security Vulnerabilities
 

composer.json

@@ -86,7 +86,7 @@
         "wikimedia/less.php": "^3.0"
     },
     "require-dev": {
-        "flarum/testing": "1.0@dev"
+        "flarum/testing": "^1.0.0"
     },
     "autoload": {
         "psr-4": {
@@ -107,6 +107,28 @@
     "extra": {
         "branch-alias": {
             "dev-master": "1.x-dev"
+        },
+        "flarum-cli": {
+            "excludeScaffolding": [
+                "LICENSE.md",
+                "js/tsconfig.json",
+                "js/webpack.config.js"
+            ],
+            "modules": {
+                "backendTesting": true,
+                "js": true,
+                "gitConf": true,
+                "githubActions": true,
+                "prettier": true,
+                "typescript": true,
+                "bundlewatch": true,
+                "editorConfig": true,
+                "styleci": true,
+                "admin": true,
+                "forum": true,
+                "jsCommon": true,
+                "css": true
+            }
         }
     },
     "scripts": {

js/.yarnrc.yml

@@ -1,2 +1,3 @@
-yarnPath: .yarn/releases/yarn-3.1.0.cjs
 nodeLinker: node-modules
+
+yarnPath: .yarn/releases/yarn-3.1.1.cjs

js/admin.ts

@@ -1,2 +1,2 @@
 export * from './src/common';
-export * from './src/admin';
+export * from './src/admin';

js/dist-typings/@types/global.d.ts

@@ -21,7 +21,20 @@ declare type KeysOfType<Type extends object, Match> = {
  */
 declare type KeyOfType<Type extends object, Match> = KeysOfType<Type, Match>[keyof Type];
 
-declare type VnodeElementTag<Attrs = Record<string, unknown>, State = Record<string, unknown>> = string | ComponentTypes<Attrs, State>;
+type Component<A> = import('mithril').Component<A>;
+
+declare type ComponentClass<Attrs = Record<string, unknown>, C extends Component<Attrs> = Component<Attrs>> = {
+  new (...args: any[]): Component<Attrs>;
+  prototype: C;
+};
+
+/**
+ * Unfortunately, TypeScript only supports strings and classes for JSX tags.
+ * Therefore, our type definition should only allow for those two types.
+ *
+ * @see https://github.com/microsoft/TypeScript/issues/14789#issuecomment-412247771
+ */
+declare type VnodeElementTag<Attrs = Record<string, unknown>, C extends Component<Attrs> = Component<Attrs>> = string | ComponentClass<Attrs, C>;
 
 /**
  * @deprecated Please import `app` from a namespace instead of using it as a global variable.
@@ -46,6 +59,17 @@ declare const app: never;
 declare const m: import('mithril').Static;
 declare const dayjs: typeof import('dayjs');
 
+/**
+ * From https://github.com/lokesh/color-thief/issues/188
+ */
+declare module 'color-thief-browser' {
+  type Color = [number, number, number];
+  export default class ColorThief {
+    getColor: (img: HTMLImageElement | null) => Color;
+    getPalette: (img: HTMLImageElement | null) => Color[];
+  }
+}
+
 type ESModule = { __esModule: true; [key: string]: unknown };
 
 /**

js/dist-typings/@types/mithril/index.d.ts

@@ -0,0 +1,517 @@
+// Type definitions for Mithril 2.0
+// Project: https://mithril.js.org/, https://github.com/mithriljs/mithril.js
+// Definitions by: Mike Linkovich <https://github.com/spacejack>, András Parditka <https://github.com/andraaspar>, Isiah Meadows <https://github.com/isiahmeadows>
+// Definitions: https://github.com/DefinitelyTyped/DefinitelyTyped
+// TypeScript Version: 3.2
+/** Renders a vnode structure into a DOM element. */
+declare function render(el: Element, vnodes: Mithril.Children): void;
+
+/** Mounts a component to a DOM element, enabling it to autoredraw on user events. */
+declare function mount(element: Element, component: Mithril.ComponentTypes<any, any>): void;
+/** Unmounts a component from a DOM element. */
+declare function mount(element: Element, component: null): void; // tslint:disable-line unified-signatures
+
+/** Makes an XHR request and returns a promise. */
+declare function request<T>(options: Mithril.RequestOptions<T> & { url: string }): Promise<T>;
+/** Makes an XHR request and returns a promise. */
+declare function request<T>(url: string, options?: Mithril.RequestOptions<T>): Promise<T>;
+
+/** Makes a JSON-P request and returns a promise. */
+declare function jsonp<T>(options: Mithril.JsonpOptions & { url: string }): Promise<T>; // tslint:disable-line:no-unnecessary-generics
+/** Makes a JSON-P request and returns a promise. */
+declare function jsonp<T>(url: string, options?: Mithril.JsonpOptions): Promise<T>; // tslint:disable-line:no-unnecessary-generics
+
+declare namespace Mithril {
+    interface CommonAttributes<Attrs, State> {
+        /** The oninit hook is called before a vnode is touched by the virtual DOM engine. */
+        oninit?(this: State, vnode: Vnode<Attrs, State>): any;
+        /** The oncreate hook is called after a DOM element is created and attached to the document. */
+        oncreate?(this: State, vnode: VnodeDOM<Attrs, State>): any;
+        /** The onbeforeremove hook is called before a DOM element is detached from the document. If a Promise is returned, Mithril only detaches the DOM element after the promise completes. */
+        onbeforeremove?(this: State, vnode: VnodeDOM<Attrs, State>): Promise<any> | void;
+        /** The onremove hook is called before a DOM element is removed from the document. */
+        onremove?(this: State, vnode: VnodeDOM<Attrs, State>): any;
+        /** The onbeforeupdate hook is called before a vnode is diffed in a update. */
+        onbeforeupdate?(this: State, vnode: Vnode<Attrs, State>, old: VnodeDOM<Attrs, State>): boolean | void;
+        /** The onupdate hook is called after a DOM element is updated, while attached to the document. */
+        onupdate?(this: State, vnode: VnodeDOM<Attrs, State>): any;
+        /** A key to optionally associate with this element. */
+        key?: string | number | undefined;
+    }
+
+    interface Hyperscript {
+        /** Creates a virtual element (Vnode). */
+        (selector: string, ...children: Children[]): Vnode<any, any>;
+        /** Creates a virtual element (Vnode). */
+        (selector: string, attributes: Attributes, ...children: Children[]): Vnode<any, any>;
+        /** Creates a virtual element (Vnode). */
+        <Attrs, State>(component: ComponentTypes<Attrs, State>, ...args: Children[]): Vnode<Attrs, State>;
+        /** Creates a virtual element (Vnode). */
+        <Attrs, State>(
+            component: ComponentTypes<Attrs, State>,
+            attributes: Attrs & CommonAttributes<Attrs, State>,
+            ...args: Children[]
+        ): Vnode<Attrs, State>;
+        /** Creates a fragment virtual element (Vnode). */
+        fragment(attrs: CommonAttributes<any, any> & { [key: string]: any }, children: ChildArrayOrPrimitive): Vnode<any, any>;
+        /** Turns an HTML string into a virtual element (Vnode). Do not use trust on unsanitized user input. */
+        trust(html: string): Vnode<any, any>;
+    }
+
+    interface RouteResolver<Attrs = {}, State = {}> {
+        /** The onmatch hook is called when the router needs to find a component to render. */
+        onmatch?(
+            this: this,
+            args: Attrs,
+            requestedPath: string,
+            route: string,
+        ): ComponentTypes<any, any> | Promise<any> | void;
+        /** The render method is called on every redraw for a matching route. */
+        render?(this: this, vnode: Vnode<Attrs, State>): Children;
+    }
+
+    /** This represents a key-value mapping linking routes to components. */
+    interface RouteDefs {
+        /** The key represents the route. The value represents the corresponding component. */
+        [url: string]: ComponentTypes<any, any> | RouteResolver<any, any>;
+    }
+
+    interface RouteOptions {
+        /** Routing parameters. If path has routing parameter slots, the properties of this object are interpolated into the path string. */
+        replace?: boolean | undefined;
+        /** The state object to pass to the underlying history.pushState / history.replaceState call. */
+        state?: any;
+        /** The title string to pass to the underlying history.pushState / history.replaceState call. */
+        title?: string | undefined;
+    }
+
+    interface RouteLinkAttrs extends Attributes {
+        href: string;
+        selector?: string | ComponentTypes<any> | undefined;
+        options?: RouteOptions | undefined;
+    }
+
+    interface Route {
+        /** Creates application routes and mounts Components and/or RouteResolvers to a DOM element. */
+        (element: Element, defaultRoute: string, routes: RouteDefs): void;
+        /** Returns the last fully resolved routing path, without the prefix. */
+        get(): string;
+        /** Redirects to a matching route or to the default route if no matching routes can be found. */
+        set(route: string, data?: any, options?: RouteOptions): void;
+        /** Defines a router prefix which is a fragment of the URL that dictates the underlying strategy used by the router. */
+        prefix: string;
+        /** This Component renders a link <a href> that will use the current routing strategy */
+        Link: Component<RouteLinkAttrs>;
+        /** Returns the named parameter value from the current route. */
+        param(name: string): string;
+        /** Gets all route parameters. */
+        param(): any;
+    }
+
+    interface RequestOptions<T> {
+        /** The HTTP method to use. */
+        method?: string | undefined;
+        /** The data to be interpolated into the URL and serialized into the querystring. */
+        params?: { [key: string]: any } | undefined;
+        /** The data to be serialized into the request body. */
+        body?: (XMLHttpRequest['send'] extends (x: infer R) => any ? R : never) | (object & { [id: string]: any }) | undefined;
+        /** Whether the request should be asynchronous. Defaults to true. */
+        async?: boolean | undefined;
+        /** A username for HTTP authorization. */
+        user?: string | undefined;
+        /** A password for HTTP authorization. */
+        password?: string | undefined;
+        /** Whether to send cookies to 3rd party domains. */
+        withCredentials?: boolean | undefined;
+        /** Exposes the underlying XMLHttpRequest object for low-level configuration. */
+        config?(xhr: XMLHttpRequest, options: this): XMLHttpRequest | void;
+        /** Headers to append to the request before sending it. */
+        headers?: { [key: string]: string } | undefined;
+        /** A constructor to be applied to each object in the response. */
+        type?: new (o: any) => any;
+        /** A serialization method to be applied to data. Defaults to JSON.stringify, or if options.data is an instance of FormData, defaults to the identity function. */
+        serialize?(data: any): any;
+        /** A deserialization method to be applied to the response. Defaults to a small wrapper around JSON.parse that returns null for empty responses. */
+        deserialize?(data: string): T;
+        /** A hook to specify how the XMLHttpRequest response should be read. Useful for reading response headers and cookies. Defaults to a function that returns xhr.responseText */
+        extract?(xhr: XMLHttpRequest, options: this): T;
+        /**
+         * Force the use of the HTTP body section for data in GET requests when set to true,
+         * or the use of querystring for other HTTP methods when set to false.
+         * Defaults to false for GET requests and true for other methods.
+         */
+        useBody?: boolean | undefined;
+        /** If false, redraws mounted components upon completion of the request. If true, it does not. */
+        background?: boolean | undefined;
+        /** Milliseconds a request can take before automatically being terminated. */
+        timeout?: number | undefined;
+        /** The expected type of the response, as a legal value of XMLHttpRequest.responseType. */
+        responseType?: '' | 'arraybuffer' | 'blob' | 'document' | 'json' | 'text' | undefined;
+    }
+
+    interface JsonpOptions {
+        /** The data to be interpolated into the URL and serialized into the querystring. */
+        params?: { [id: string]: any } | undefined;
+        /** The data to be serialized into the request body. */
+        body?: any;
+        /** A constructor to be applied to each object in the response. */
+        type?: new (o: any) => any;
+        /** The name of the function that will be called as the callback. */
+        callbackName?: string | undefined;
+        /** The name of the querystring parameter name that specifies the callback name. */
+        callbackKey?: string | undefined;
+        /** If false, redraws mounted components upon completion of the request. If true, it does not. */
+        background?: boolean | undefined;
+    }
+
+    interface Redraw {
+        /** Manually triggers an asynchronous redraw of mounted components. */
+        (): void;
+        /** Manually triggers a synchronous redraw of mounted components. */
+        sync(): void;
+    }
+
+    type Params = object & ParamsRec;
+
+    interface ParamsRec {
+        // Ideally, it'd be this:
+        // `[key: string | number]: Params | !symbol & !object`
+        [key: string]: string | number | boolean | null | undefined | Params;
+    }
+
+    interface Static extends Hyperscript {
+        route: Route;
+        mount: typeof mount;
+        render: typeof render;
+        redraw: Redraw;
+        request: typeof request;
+        jsonp: typeof jsonp;
+        /** Returns an object with key/value pairs parsed from a string of the form: ?a=1&b=2 */
+        parseQueryString(queryString: string): Params;
+        /** Turns the key/value pairs of an object into a string of the form: a=1&b=2 */
+        buildQueryString(values: Params): string;
+        /** Parse path name */
+        parsePathname(url: string): { path: string; params: Params };
+        /** Build path name */
+        buildPathname(template: string, params?: Params): string;
+    }
+
+    // Vnode children types
+    type Child = Vnode<any, any> | string | number | boolean | null | undefined;
+    interface ChildArray extends Array<Children> {}
+    type Children = Child | ChildArray;
+    type ChildArrayOrPrimitive = ChildArray | string | number | boolean;
+
+    /** Virtual DOM nodes, or vnodes, are Javascript objects that represent an element (or parts of the DOM). */
+    interface Vnode<Attrs = {}, State = {}> {
+        /** The nodeName of a DOM element. It may also be the string [ if a vnode is a fragment, # if it's a text vnode, or < if it's a trusted HTML vnode. Additionally, it may be a component. */
+        tag: string | ComponentTypes<Attrs, State>;
+        /** A hashmap of DOM attributes, events, properties and lifecycle methods. */
+        attrs: Attrs;
+        /** An object that is persisted between redraws. In component vnodes, state is a shallow clone of the component object. */
+        state: State;
+        /** The value used to map a DOM element to its respective item in an array of data. */
+        key?: string | number | undefined;
+        /** In most vnode types, the children property is an array of vnodes. For text and trusted HTML vnodes, The children property is either a string, a number or a boolean. */
+        children?: ChildArrayOrPrimitive | undefined;
+        /**
+         * This is used instead of children if a vnode contains a text node as its only child.
+         * This is done for performance reasons.
+         * Component vnodes never use the text property even if they have a text node as their only child.
+         */
+        text?: string | number | boolean | undefined;
+    }
+
+    // In some lifecycle methods, Vnode will have a dom property
+    // and possibly a domSize property.
+    interface VnodeDOM<Attrs = {}, State = {}> extends Vnode<Attrs, State> {
+        /** Points to the element that corresponds to the vnode. */
+        dom: Element;
+        /** This defines the number of DOM elements that the vnode represents (starting from the element referenced by the dom property). */
+        domSize?: number | undefined;
+    }
+
+    type _NoLifecycle<T> = Omit<T, keyof Component>;
+
+    interface CVnode<A = {}> extends Vnode<A, ClassComponent<A>> {}
+
+    interface CVnodeDOM<A = {}> extends VnodeDOM<A, ClassComponent<A>> {}
+
+    /**
+     * Components are a mechanism to encapsulate parts of a view to make code easier to organize and/or reuse.
+     * Any Javascript object that has a view method can be used as a Mithril component.
+     * Components can be consumed via the m() utility.
+     */
+    interface Component<Attrs = {}, State = {}> {
+        /** The oninit hook is called before a vnode is touched by the virtual DOM engine. */
+        oninit?(this: _NoLifecycle<this & State>, vnode: Vnode<Attrs, _NoLifecycle<this & State>>): any;
+        /** The oncreate hook is called after a DOM element is created and attached to the document. */
+        oncreate?(this: _NoLifecycle<this & State>, vnode: VnodeDOM<Attrs, _NoLifecycle<this & State>>): any;
+        /** The onbeforeremove hook is called before a DOM element is detached from the document. If a Promise is returned, Mithril only detaches the DOM element after the promise completes. */
+        onbeforeremove?(this: _NoLifecycle<this & State>, vnode: VnodeDOM<Attrs, _NoLifecycle<this & State>>): Promise<any> | void;
+        /** The onremove hook is called before a DOM element is removed from the document. */
+        onremove?(this: _NoLifecycle<this & State>, vnode: VnodeDOM<Attrs, _NoLifecycle<this & State>>): any;
+        /** The onbeforeupdate hook is called before a vnode is diffed in a update. */
+        onbeforeupdate?(this: _NoLifecycle<this & State>, vnode: Vnode<Attrs, _NoLifecycle<this & State>>, old: VnodeDOM<Attrs, _NoLifecycle<this & State>>): boolean | void;
+        /** The onupdate hook is called after a DOM element is updated, while attached to the document. */
+        onupdate?(this: _NoLifecycle<this & State>, vnode: VnodeDOM<Attrs, _NoLifecycle<this & State>>): any;
+        /** Creates a view out of virtual elements. */
+        view(this: _NoLifecycle<this & State>, vnode: Vnode<Attrs, _NoLifecycle<this & State>>): Children | null | void;
+    }
+
+    /**
+     * Components are a mechanism to encapsulate parts of a view to make code easier to organize and/or reuse.
+     * Any class that implements a view method can be used as a Mithril component.
+     * Components can be consumed via the m() utility.
+     */
+    interface ClassComponent<A = {}> {
+        /** The oninit hook is called before a vnode is touched by the virtual DOM engine. */
+        oninit?(vnode: Vnode<A, this>): any;
+        /** The oncreate hook is called after a DOM element is created and attached to the document. */
+        oncreate?(vnode: VnodeDOM<A, this>): any;
+        /** The onbeforeremove hook is called before a DOM element is detached from the document. If a Promise is returned, Mithril only detaches the DOM element after the promise completes. */
+        onbeforeremove?(vnode: VnodeDOM<A, this>): Promise<any> | void;
+        /** The onremove hook is called before a DOM element is removed from the document. */
+        onremove?(vnode: VnodeDOM<A, this>): any;
+        /** The onbeforeupdate hook is called before a vnode is diffed in a update. */
+        onbeforeupdate?(vnode: Vnode<A, this>, old: VnodeDOM<A, this>): boolean | void;
+        /** The onupdate hook is called after a DOM element is updated, while attached to the document. */
+        onupdate?(vnode: VnodeDOM<A, this>): any;
+        /** Creates a view out of virtual elements. */
+        view(vnode: Vnode<A, this>): Children | null | void;
+    }
+
+    /**
+     * Components are a mechanism to encapsulate parts of a view to make code easier to organize and/or reuse.
+     * Any function that returns an object with a view method can be used as a Mithril component.
+     * Components can be consumed via the m() utility.
+     */
+    type FactoryComponent<A = {}> = (vnode: Vnode<A>) => Component<A>;
+
+    /**
+     * Components are a mechanism to encapsulate parts of a view to make code easier to organize and/or reuse.
+     * Any function that returns an object with a view method can be used as a Mithril component.
+     * Components can be consumed via the m() utility.
+     */
+    type ClosureComponent<A = {}> = FactoryComponent<A>;
+
+    /**
+     * Components are a mechanism to encapsulate parts of a view to make code easier to organize and/or reuse.
+     * Any Javascript object that has a view method is a Mithril component. Components can be consumed via the m() utility.
+     */
+    type Comp<Attrs = {}, State = {}> = _NoLifecycle<State> & Component<Attrs, _NoLifecycle<State>>;
+
+    /** Components are a mechanism to encapsulate parts of a view to make code easier to organize and/or reuse. Components can be consumed via the m() utility. */
+    type ComponentTypes<A = {}, S = {}> =
+        | Component<A, S>
+        | { new (vnode: CVnode<A>): ClassComponent<A> }
+        | FactoryComponent<A>;
+
+    /** This represents the attributes available for configuring virtual elements, beyond the applicable DOM attributes. */
+    interface Attributes extends CommonAttributes<any, any> {
+        /** The class name(s) for this virtual element, as a space-separated list. */
+        className?: string | undefined;
+        /** The class name(s) for this virtual element, as a space-separated list. */
+        class?: string | undefined;
+        /** Any other virtual element properties, including attributes and event handlers. */
+        [property: string]: any;
+    }
+}
+
+declare global {
+    namespace JSX {
+        // tslint:disable-next-line:no-empty-interface
+        interface Element extends Mithril.Vnode {}
+
+        // tslint:disable-next-line:no-empty-interface
+        interface IntrinsicAttributes extends Mithril.Attributes {}
+        // tslint:disable-next-line:no-empty-interface
+        interface IntrinsicClassAttributes extends Mithril.Attributes {}
+
+        interface IntrinsicElements {
+            // HTML
+            a: Mithril.Attributes;
+            abbr: Mithril.Attributes;
+            address: Mithril.Attributes;
+            area: Mithril.Attributes;
+            article: Mithril.Attributes;
+            aside: Mithril.Attributes;
+            audio: Mithril.Attributes;
+            b: Mithril.Attributes;
+            base: Mithril.Attributes;
+            bdi: Mithril.Attributes;
+            bdo: Mithril.Attributes;
+            big: Mithril.Attributes;
+            blockquote: Mithril.Attributes;
+            body: Mithril.Attributes;
+            br: Mithril.Attributes;
+            button: Mithril.Attributes;
+            canvas: Mithril.Attributes;
+            caption: Mithril.Attributes;
+            cite: Mithril.Attributes;
+            code: Mithril.Attributes;
+            col: Mithril.Attributes;
+            colgroup: Mithril.Attributes;
+            data: Mithril.Attributes;
+            datalist: Mithril.Attributes;
+            dd: Mithril.Attributes;
+            del: Mithril.Attributes;
+            details: Mithril.Attributes;
+            dfn: Mithril.Attributes;
+            dialog: Mithril.Attributes;
+            div: Mithril.Attributes;
+            dl: Mithril.Attributes;
+            dt: Mithril.Attributes;
+            em: Mithril.Attributes;
+            embed: Mithril.Attributes;
+            fieldset: Mithril.Attributes;
+            figcaption: Mithril.Attributes;
+            figure: Mithril.Attributes;
+            footer: Mithril.Attributes;
+            form: Mithril.Attributes;
+            h1: Mithril.Attributes;
+            h2: Mithril.Attributes;
+            h3: Mithril.Attributes;
+            h4: Mithril.Attributes;
+            h5: Mithril.Attributes;
+            h6: Mithril.Attributes;
+            head: Mithril.Attributes;
+            header: Mithril.Attributes;
+            hgroup: Mithril.Attributes;
+            hr: Mithril.Attributes;
+            html: Mithril.Attributes;
+            i: Mithril.Attributes;
+            iframe: Mithril.Attributes;
+            img: Mithril.Attributes;
+            input: Mithril.Attributes;
+            ins: Mithril.Attributes;
+            kbd: Mithril.Attributes;
+            keygen: Mithril.Attributes;
+            label: Mithril.Attributes;
+            legend: Mithril.Attributes;
+            li: Mithril.Attributes;
+            link: Mithril.Attributes;
+            main: Mithril.Attributes;
+            map: Mithril.Attributes;
+            mark: Mithril.Attributes;
+            menu: Mithril.Attributes;
+            menuitem: Mithril.Attributes;
+            meta: Mithril.Attributes;
+            meter: Mithril.Attributes;
+            nav: Mithril.Attributes;
+            noindex: Mithril.Attributes;
+            noscript: Mithril.Attributes;
+            object: Mithril.Attributes;
+            ol: Mithril.Attributes;
+            optgroup: Mithril.Attributes;
+            option: Mithril.Attributes;
+            output: Mithril.Attributes;
+            p: Mithril.Attributes;
+            param: Mithril.Attributes;
+            picture: Mithril.Attributes;
+            pre: Mithril.Attributes;
+            progress: Mithril.Attributes;
+            q: Mithril.Attributes;
+            rp: Mithril.Attributes;
+            rt: Mithril.Attributes;
+            ruby: Mithril.Attributes;
+            s: Mithril.Attributes;
+            samp: Mithril.Attributes;
+            script: Mithril.Attributes;
+            section: Mithril.Attributes;
+            select: Mithril.Attributes;
+            small: Mithril.Attributes;
+            source: Mithril.Attributes;
+            span: Mithril.Attributes;
+            strong: Mithril.Attributes;
+            style: Mithril.Attributes;
+            sub: Mithril.Attributes;
+            summary: Mithril.Attributes;
+            sup: Mithril.Attributes;
+            table: Mithril.Attributes;
+            template: Mithril.Attributes;
+            tbody: Mithril.Attributes;
+            td: Mithril.Attributes;
+            textarea: Mithril.Attributes;
+            tfoot: Mithril.Attributes;
+            th: Mithril.Attributes;
+            thead: Mithril.Attributes;
+            time: Mithril.Attributes;
+            title: Mithril.Attributes;
+            tr: Mithril.Attributes;
+            track: Mithril.Attributes;
+            u: Mithril.Attributes;
+            ul: Mithril.Attributes;
+            var: Mithril.Attributes;
+            video: Mithril.Attributes;
+            wbr: Mithril.Attributes;
+            webview: Mithril.Attributes;
+
+            // SVG
+            svg: Mithril.Attributes;
+            animate: Mithril.Attributes;
+            animateMotion: Mithril.Attributes;
+            animateTransform: Mithril.Attributes;
+            circle: Mithril.Attributes;
+            clipPath: Mithril.Attributes;
+            defs: Mithril.Attributes;
+            desc: Mithril.Attributes;
+            ellipse: Mithril.Attributes;
+            feBlend: Mithril.Attributes;
+            feColorMatrix: Mithril.Attributes;
+            feComponentTransfer: Mithril.Attributes;
+            feComposite: Mithril.Attributes;
+            feConvolveMatrix: Mithril.Attributes;
+            feDiffuseLighting: Mithril.Attributes;
+            feDisplacementMap: Mithril.Attributes;
+            feDistantLight: Mithril.Attributes;
+            feDropShadow: Mithril.Attributes;
+            feFlood: Mithril.Attributes;
+            feFuncA: Mithril.Attributes;
+            feFuncB: Mithril.Attributes;
+            feFuncG: Mithril.Attributes;
+            feFuncR: Mithril.Attributes;
+            feGaussianBlur: Mithril.Attributes;
+            feImage: Mithril.Attributes;
+            feMerge: Mithril.Attributes;
+            feMergeNode: Mithril.Attributes;
+            feMorphology: Mithril.Attributes;
+            feOffset: Mithril.Attributes;
+            fePointLight: Mithril.Attributes;
+            feSpecularLighting: Mithril.Attributes;
+            feSpotLight: Mithril.Attributes;
+            feTile: Mithril.Attributes;
+            feTurbulence: Mithril.Attributes;
+            filter: Mithril.Attributes;
+            foreignObject: Mithril.Attributes;
+            g: Mithril.Attributes;
+            image: Mithril.Attributes;
+            line: Mithril.Attributes;
+            linearGradient: Mithril.Attributes;
+            marker: Mithril.Attributes;
+            mask: Mithril.Attributes;
+            metadata: Mithril.Attributes;
+            mpath: Mithril.Attributes;
+            path: Mithril.Attributes;
+            pattern: Mithril.Attributes;
+            polygon: Mithril.Attributes;
+            polyline: Mithril.Attributes;
+            radialGradient: Mithril.Attributes;
+            rect: Mithril.Attributes;
+            stop: Mithril.Attributes;
+            switch: Mithril.Attributes;
+            symbol: Mithril.Attributes;
+            text: Mithril.Attributes;
+            textPath: Mithril.Attributes;
+            tspan: Mithril.Attributes;
+            use: Mithril.Attributes;
+            view: Mithril.Attributes;
+
+            // Special Mithril types
+            '[': Mithril.Attributes;
+        }
+    }
+}
+
+declare const Mithril: Mithril.Static;
+export = Mithril;

js/dist-typings/@types/mithril/stream/index.d.ts

@@ -0,0 +1,43 @@
+// tslint:disable:rulename strict-export-declare-modifiers
+/** Creates an empty stream. */
+declare function Stream<T>(): Stream<T>; // tslint:disable-line no-unnecessary-generics
+/** Creates a stream with an initial value. */
+declare function Stream<T>(value: T): Stream<T>; // tslint:disable-line unified-signatures
+
+declare interface Stream<T> {
+	/** Returns the value of the stream. */
+	(): T;
+	/** Sets the value of the stream. */
+	(value: T): this;
+	/** Creates a dependent stream whose value is set to the result of the callback function. */
+	map<U>(f: (current: T) => U | typeof Stream.SKIP): Stream<U>;
+	/** This method is functionally identical to stream. It exists to conform to Fantasy Land's Applicative specification. */
+	of(val: T): Stream<T>;
+	/** Apply. */
+	ap<U>(f: Stream<(value: T) => U>): Stream<U>;
+	/** A co-dependent stream that unregisters dependent streams when set to true. */
+	end: Stream<boolean>;
+	/** When a stream is passed as the argument to JSON.stringify(), the value of the stream is serialized. */
+	toJSON(): string;
+	/** Returns the value of the stream. */
+	valueOf(): T;
+}
+
+declare namespace Stream {
+	/** Creates a computed stream that reactively updates if any of its upstreams are updated. */
+	export function combine<T>(combiner: (...streams: any[]) => T, streams: Array<Stream<any>>): Stream<T>;
+	/** Combines the values of one or more streams into a single stream that is updated whenever one or more of the sources are updated */
+	export function lift<S extends any[], T>(fn: (...values: S) => T, ...streams: {[I in keyof S]: Stream<S[I]>}): Stream<T>;
+	/** Creates a stream whose value is the array of values from an array of streams. */
+	export function merge<S extends any[]>(streams: {[I in keyof S]: Stream<S[I]>}): Stream<{[I in keyof S]: S[I]}>;
+	/** Creates a new stream with the results of calling the function on every incoming stream with and accumulator and the incoming value. */
+	export function scan<T, U>(fn: (acc: U, value: T) => U, acc: U, stream: Stream<T>): Stream<U>;
+	/** Takes an array of pairs of streams and scan functions and merges all those streams using the given functions into a single stream. */
+	export function scanMerge<T, U>(pairs: Array<[Stream<T>, (acc: U, value: T) => U]>, acc: U): Stream<U>;
+	/** Takes an array of pairs of streams and scan functions and merges all those streams using the given functions into a single stream. */
+	export function scanMerge<U>(pairs: Array<[Stream<any>, (acc: U, value: any) => U]>, acc: U): Stream<U>;
+	/** A special value that can be returned to stream callbacks to skip execution of downstreams. */
+	export const SKIP: unique symbol;
+}
+
+export = Stream;

js/dist-typings/@types/translator-icu-rich.d.ts

@@ -0,0 +1,26 @@
+declare module '@askvortsov/rich-icu-message-formatter' {
+  type IValues = Record<string, any>;
+
+  type ITypeHandler = (
+    value: string,
+    matches: string,
+    locale: string,
+    values: IValues,
+    format: (message: string, values: IValues) => string
+  ) => string;
+  type IRichHandler = (tag: any, values: IValues, contents: string) => any;
+
+  type ValueOrArray<T> = T | ValueOrArray<T>[];
+  type NestedStringArray = ValueOrArray<string>;
+
+  export class RichMessageFormatter {
+    locale: string | null;
+    constructor(locale: string | null, typeHandlers: Record<string, ITypeHandler>, richHandler: IRichHandler);
+
+    format(message: string, values: IValues): string;
+    process(message: string, values: IValues): NestedStringArray;
+    rich(message: string, values: IValues): NestedStringArray;
+  }
+
+  export function mithrilRichHandler(tag: any, values: IValues, contents: string): any;
+}

js/dist-typings/@types/translator-icu.d.ts

@@ -0,0 +1,17 @@
+declare module '@ultraq/icu-message-formatter' {
+  export function pluralTypeHandler(
+    value: string,
+    matches: string,
+    locale: string,
+    values: Record<string, any>,
+    format: (text: string, values: Record<string, any>) => string
+  ): string;
+
+  export function selectTypeHandler(
+    value: string,
+    matches: string,
+    locale: string,
+    values: Record<string, any>,
+    format: (text: string, values: Record<string, any>) => string
+  ): string;
+}

js/dist-typings/admin/AdminApplication.d.ts

@@ -35,7 +35,7 @@ export default class AdminApplication extends Application {
     history: {
         canGoBack: () => boolean;
         getPrevious: () => void;
-        backUrl: () => any;
+        backUrl: () => string;
         back: () => void;
     };
     /**

js/dist-typings/admin/compat.d.ts

@@ -4,8 +4,8 @@ declare var _default: {
     Store: typeof import("../common/Store").default;
     'utils/BasicEditorDriver': typeof import("../common/utils/BasicEditorDriver").default;
     'utils/evented': {
-        handlers: Object;
-        getHandlers(event: string): any[];
+        handlers: Record<string, unknown>;
+        getHandlers(event: string): Function[];
         trigger(event: string, ...args: any[]): void;
         on(event: string, handler: Function): void;
         one(event: string, handler: Function): void;

js/dist-typings/admin/components/AdminNav.d.ts

@@ -5,9 +5,9 @@ export default class AdminNav extends Component<import("../../common/Component")
     /**
      * Build an item list of main links to show in the admin navigation.
      *
-     * @return {ItemList}
+     * @return {ItemList<import('mithril').Children>}
      */
-    items(): ItemList<any>;
+    items(): ItemList<import('mithril').Children>;
     extensionItems(): ItemList<any>;
 }
 import Component from "../../common/Component";

js/dist-typings/admin/components/AdminPage.d.ts

@@ -2,8 +2,8 @@ import type Mithril from 'mithril';
 import Page, { IPageAttrs } from '../../common/components/Page';
 import Stream from '../../common/utils/Stream';
 export interface AdminHeaderOptions {
-    title: string;
-    description: string;
+    title: Mithril.Children;
+    description: Mithril.Children;
     icon: string;
     /**
      * Will be used as the class for the AdminPage.

js/dist-typings/admin/components/AppearancePage.d.ts

@@ -1,4 +1,6 @@
 export default class AppearancePage extends AdminPage<import("../../common/components/Page").IPageAttrs> {
     constructor();
+    colorItems(): ItemList<any>;
 }
 import AdminPage from "./AdminPage";
+import ItemList from "../../common/utils/ItemList";

js/dist-typings/admin/components/BasicsPage.d.ts

@@ -7,10 +7,12 @@ export default class BasicsPage extends AdminPage<import("../../common/component
      * Build a list of options for the default homepage. Each option must be an
      * object with `path` and `label` properties.
      *
-     * @return {ItemList}
-     * @public
+     * @return {ItemList<{ path: string, label: import('mithril').Children }>}
      */
-    public homePageItems(): ItemList<any>;
+    homePageItems(): ItemList<{
+        path: string;
+        label: import('mithril').Children;
+    }>;
 }
 import AdminPage from "./AdminPage";
 import ItemList from "../../common/utils/ItemList";

js/dist-typings/admin/components/DashboardWidget.d.ts

@@ -3,14 +3,14 @@ export default class DashboardWidget extends Component<import("../../common/Comp
     /**
      * Get the class name to apply to the widget.
      *
-     * @return {String}
+     * @return {string}
      */
     className(): string;
     /**
      * Get the content of the widget.
      *
-     * @return {VirtualElement}
+     * @return {import('mithril').Children}
      */
-    content(): any;
+    content(): import('mithril').Children;
 }
 import Component from "../../common/Component";

js/dist-typings/admin/components/HeaderPrimary.d.ts

@@ -8,9 +8,9 @@ export default class HeaderPrimary extends Component<import("../../common/Compon
     /**
      * Build an item list for the controls.
      *
-     * @return {ItemList}
+     * @return {ItemList<import('mithril').Children>}
      */
-    items(): ItemList<any>;
+    items(): ItemList<import('mithril').Children>;
 }
 import Component from "../../common/Component";
 import ItemList from "../../common/utils/ItemList";

js/dist-typings/admin/components/HeaderSecondary.d.ts

@@ -6,9 +6,9 @@ export default class HeaderSecondary extends Component<import("../../common/Comp
     /**
      * Build an item list for the controls.
      *
-     * @return {ItemList}
+     * @return {ItemList<import('mithril').Children>}
      */
-    items(): ItemList<any>;
+    items(): ItemList<import('mithril').Children>;
 }
 import Component from "../../common/Component";
 import ItemList from "../../common/utils/ItemList";

js/dist-typings/admin/components/LoadingModal.d.ts

@@ -1,11 +1,14 @@
-import Modal from '../../common/components/Modal';
-export default class LoadingModal<ModalAttrs = {}> extends Modal<ModalAttrs> {
+/// <reference path="../../@types/translator-icu-rich.d.ts" />
+import Modal, { IInternalModalAttrs } from '../../common/components/Modal';
+export interface ILoadingModalAttrs extends IInternalModalAttrs {
+}
+export default class LoadingModal<ModalAttrs extends ILoadingModalAttrs = ILoadingModalAttrs> extends Modal<ModalAttrs> {
     /**
      * @inheritdoc
      */
     static readonly isDismissible: boolean;
     className(): string;
-    title(): any;
+    title(): import("@askvortsov/rich-icu-message-formatter").NestedStringArray;
     content(): string;
     onsubmit(e: Event): void;
 }

js/dist-typings/admin/components/ReadmeModal.d.ts

@@ -1,8 +1,18 @@
-export default class ReadmeModal extends Modal<import("../../common/components/Modal").IInternalModalAttrs> {
-    constructor();
-    name: any;
-    extName: any;
-    loadReadme(): Promise<void>;
-    readme: any;
+/// <reference path="../../@types/translator-icu-rich.d.ts" />
+import Modal, { IInternalModalAttrs } from '../../common/components/Modal';
+import ExtensionReadme from '../models/ExtensionReadme';
+import type Mithril from 'mithril';
+import type { Extension } from '../AdminApplication';
+export interface IReadmeModalAttrs extends IInternalModalAttrs {
+    extension: Extension;
+}
+export default class ReadmeModal<CustomAttrs extends IReadmeModalAttrs = IReadmeModalAttrs> extends Modal<CustomAttrs> {
+    protected name: string;
+    protected extName: string;
+    protected readme: ExtensionReadme;
+    oninit(vnode: Mithril.Vnode<CustomAttrs, this>): void;
+    className(): string;
+    title(): import("@askvortsov/rich-icu-message-formatter").NestedStringArray;
+    content(): JSX.Element;
+    loadReadme(): Promise<void>;
 }
-import Modal from "../../common/components/Modal";

js/dist-typings/admin/components/StatusWidget.d.ts

@@ -1,5 +1,6 @@
 export default class StatusWidget extends DashboardWidget {
     items(): ItemList<any>;
+    toolsItems(): ItemList<any>;
     handleClearCache(e: any): void;
 }
 import DashboardWidget from "./DashboardWidget";

js/dist-typings/admin/components/UploadImageButton.d.ts

@@ -13,16 +13,16 @@ export default class UploadImageButton extends Button<import("../../common/compo
     /**
      * After a successful upload/removal, reload the page.
      *
-     * @param {Object} response
+     * @param {object} response
      * @protected
      */
-    protected success(response: Object): void;
+    protected success(response: object): void;
     /**
      * If upload/removal fails, stop loading.
      *
-     * @param {Object} response
+     * @param {object} response
      * @protected
      */
-    protected failure(response: Object): void;
+    protected failure(response: object): void;
 }
 import Button from "../../common/components/Button";

js/dist-typings/admin/components/UserListPage.d.ts

@@ -1,4 +1,5 @@
-/// <reference types="mithril" />
+/// <reference path="../../@types/translator-icu-rich.d.ts" />
+import type Mithril from 'mithril';
 import type User from '../../common/models/User';
 import ItemList from '../../common/utils/ItemList';
 import AdminPage from './AdminPage';
@@ -6,11 +7,11 @@ declare type ColumnData = {
     /**
      * Column title
      */
-    name: String;
+    name: Mithril.Children;
     /**
      * Component(s) to show for this column.
      */
-    content: (user: User) => JSX.Element;
+    content: (user: User) => Mithril.Children;
 };
 /**
  * Admin page which displays a paginated list of all users on the forum.
@@ -65,8 +66,8 @@ export default class UserListPage extends AdminPage {
     headerInfo(): {
         className: string;
         icon: string;
-        title: any;
-        description: any;
+        title: import("@askvortsov/rich-icu-message-formatter").NestedStringArray;
+        description: import("@askvortsov/rich-icu-message-formatter").NestedStringArray;
     };
     /**
      * Asynchronously fetch the next set of users to be rendered.

js/dist-typings/admin/models/ExtensionReadme.d.ts

@@ -1,4 +1,4 @@
 export default class ExtensionReadme extends Model {
-    content: any;
+    content: () => any;
 }
 import Model from "../../common/Model";

js/dist-typings/admin/routes.d.ts

@@ -1,6 +1,5 @@
+import AdminApplication from './AdminApplication';
 /**
  * The `routes` initializer defines the forum app's routes.
- *
- * @param {App} app
  */
-export default function _default(app: any): void;
+export default function (app: AdminApplication): void;

js/dist-typings/common/Application.d.ts

@@ -1,6 +1,6 @@
 import ItemList from './utils/ItemList';
 import Translator from './Translator';
-import Store from './Store';
+import Store, { ApiPayload, ApiResponsePlural, ApiResponseSingle } from './Store';
 import Session from './Session';
 import Drawer from './utils/Drawer';
 import RequestError, { InternalFlarumRequestOptions } from './utils/RequestError';
@@ -12,11 +12,9 @@ import type DefaultResolver from './resolvers/DefaultResolver';
 import type Mithril from 'mithril';
 import type Component from './Component';
 import type { ComponentAttrs } from './Component';
+import Model, { SavedModelData } from './Model';
 export declare type FlarumScreens = 'phone' | 'tablet' | 'desktop' | 'desktop-hd';
-export declare type FlarumGenericRoute = RouteItem<Record<string, unknown>, Component<{
-    routeName: string;
-    [key: string]: unknown;
-}>, Record<string, unknown>>;
+export declare type FlarumGenericRoute = RouteItem<any, any, any>;
 export interface FlarumRequestOptions<ResponseType> extends Omit<Mithril.RequestOptions<ResponseType>, 'extract'> {
     errorHandler?: (error: RequestError) => void;
     url: string;
@@ -52,18 +50,14 @@ export declare type RouteItem<Attrs extends ComponentAttrs, Comp extends Compone
     /**
      * The component to render when this route matches.
      */
-    component: {
-        new (): Comp;
-    };
+    component: new () => Comp;
     /**
      * A custom resolver class.
      *
      * This should be the class itself, and **not** an instance of the
      * class.
      */
-    resolverClass?: {
-        new (): DefaultResolver<Attrs, Comp, RouteArgs>;
-    };
+    resolverClass?: new (component: new () => Comp, routeName: string) => DefaultResolver<Attrs, Comp, RouteArgs>;
 } | {
     /**
      * An instance of a route resolver.
@@ -79,6 +73,8 @@ export interface RouteResolver<Attrs extends ComponentAttrs, Comp extends Compon
      *
      * Returns the component class, and **not** a Vnode or JSX
      * expression.
+     *
+     * @see https://mithril.js.org/route.html#routeresolveronmatch
      */
     onmatch(this: this, args: RouteArgs, requestedPath: string, route: string): {
         new (): Comp;
@@ -86,9 +82,14 @@ export interface RouteResolver<Attrs extends ComponentAttrs, Comp extends Compon
     /**
      * A function which renders the provided component.
      *
+     * If not specified, the route will default to rendering the
+     * component on its own, inside of a fragment.
+     *
      * Returns a Mithril Vnode or other children.
+     *
+     * @see https://mithril.js.org/route.html#routeresolverrender
      */
-    render(this: this, vnode: Mithril.Vnode<Attrs, Comp>): Mithril.Children;
+    render?(this: this, vnode: Mithril.Vnode<Attrs, Comp>): Mithril.Children;
 }
 /**
  * The `App` class provides a container for an application, as well as various
@@ -166,10 +167,10 @@ export default class Application {
      */
     drawer: Drawer;
     data: {
-        apiDocument: Record<string, unknown> | null;
+        apiDocument: ApiPayload | null;
         locale: string;
         locales: Record<string, string>;
-        resources: Record<string, unknown>[];
+        resources: SavedModelData[];
         session: {
             userId: number;
             csrfToken: string;
@@ -197,7 +198,8 @@ export default class Application {
     /**
      * Get the API response document that has been preloaded into the application.
      */
-    preloadedApiDocument(): Record<string, unknown> | null;
+    preloadedApiDocument<M extends Model>(): ApiResponseSingle<M> | null;
+    preloadedApiDocument<Ms extends Model[]>(): ApiResponsePlural<Ms[number]> | null;
     /**
      * Determine the current screen mode, based on our media queries.
      */
@@ -220,11 +222,13 @@ export default class Application {
      * Make an AJAX request, handling any low-level errors that may occur.
      *
      * @see https://mithril.js.org/request.html
-     *
-     * @param options
-     * @return {Promise}
      */
-    request<ResponseType>(originalOptions: FlarumRequestOptions<ResponseType>): Promise<ResponseType | string>;
+    request<ResponseType>(originalOptions: FlarumRequestOptions<ResponseType>): Promise<ResponseType>;
+    /**
+     * By default, show an error alert, and log the error to the console.
+     */
+    protected requestErrorCatch<ResponseType>(error: RequestError, customErrorHandler: FlarumRequestOptions<ResponseType>['errorHandler']): Promise<never>;
+    protected requestErrorDefaultHandler(e: unknown, isDebug: boolean, formattedErrors: string[]): void;
     private showDebug;
     /**
      * Construct a URL to the route with the given name.

js/dist-typings/common/Fragment.d.ts

@@ -28,8 +28,8 @@ export default abstract class Fragment {
      * containing all of the `li` elements inside the DOM element of this
      * fragment.
      *
-     * @param {String} [selector] a jQuery-compatible selector string
-     * @returns {jQuery} the jQuery object for the DOM node
+     * @param [selector] a jQuery-compatible selector string
+     * @returns the jQuery object for the DOM node
      * @final
      */
     $(selector?: string): JQuery;

js/dist-typings/common/Model.d.ts

@@ -1,149 +1,147 @@
+import { FlarumRequestOptions } from './Application';
+import Store, { ApiPayloadSingle, ApiResponseSingle, MetaInformation } from './Store';
+export interface ModelIdentifier {
+    type: string;
+    id: string;
+}
+export interface ModelAttributes {
+    [key: string]: unknown;
+}
+export interface ModelRelationships {
+    [relationship: string]: {
+        data: ModelIdentifier | ModelIdentifier[];
+    };
+}
+export interface UnsavedModelData {
+    type?: string;
+    attributes?: ModelAttributes;
+    relationships?: ModelRelationships;
+}
+export interface SavedModelData {
+    type: string;
+    id: string;
+    attributes?: ModelAttributes;
+    relationships?: ModelRelationships;
+}
+export declare type ModelData = UnsavedModelData | SavedModelData;
+export interface SaveRelationships {
+    [relationship: string]: Model | Model[];
+}
+export interface SaveAttributes {
+    [key: string]: unknown;
+    relationships?: SaveRelationships;
+}
 /**
  * The `Model` class represents a local data resource. It provides methods to
  * persist changes via the API.
- *
- * @abstract
  */
-export default class Model {
-    /**
-     * Generate a function which returns the value of the given attribute.
-     *
-     * @param {String} name
-     * @param {function} [transform] A function to transform the attribute value
-     * @return {*}
-     * @public
-     */
-    public static attribute(name: string, transform?: Function | undefined): any;
-    /**
-     * Generate a function which returns the value of the given has-one
-     * relationship.
-     *
-     * @param {String} name
-     * @return {Model|Boolean|undefined} false if no information about the
-     *     relationship exists; undefined if the relationship exists but the model
-     *     has not been loaded; or the model if it has been loaded.
-     * @public
-     */
-    public static hasOne(name: string): Model | boolean | undefined;
-    /**
-     * Generate a function which returns the value of the given has-many
-     * relationship.
-     *
-     * @param {String} name
-     * @return {Array|Boolean} false if no information about the relationship
-     *     exists; an array if it does, containing models if they have been
-     *     loaded, and undefined for those that have not.
-     * @public
-     */
-    public static hasMany(name: string): any[] | boolean;
-    /**
-     * Transform the given value into a Date object.
-     *
-     * @param {String} value
-     * @return {Date|null}
-     * @public
-     */
-    public static transformDate(value: string): Date | null;
-    /**
-     * Get a resource identifier object for the given model.
-     *
-     * @param {Model} model
-     * @return {Object}
-     * @protected
-     */
-    protected static getIdentifier(model: Model): Object;
-    /**
-     * @param {Object} data A resource object from the API.
-     * @param {Store} store The data store that this model should be persisted to.
-     * @public
-     */
-    constructor(data?: Object, store?: any);
+export default abstract class Model {
     /**
      * The resource object from the API.
-     *
-     * @type {Object}
-     * @public
      */
-    public data: Object;
+    data: ModelData;
     /**
      * The time at which the model's data was last updated. Watching the value
      * of this property is a fast way to retain/cache a subtree if data hasn't
      * changed.
-     *
-     * @type {Date}
-     * @public
      */
-    public freshness: Date;
+    freshness: Date;
     /**
      * Whether or not the resource exists on the server.
-     *
-     * @type {Boolean}
-     * @public
      */
-    public exists: boolean;
+    exists: boolean;
     /**
      * The data store that this resource should be persisted to.
-     *
-     * @type {Store}
-     * @protected
      */
-    protected store: any;
+    protected store: Store;
+    /**
+     * @param data A resource object from the API.
+     * @param store The data store that this model should be persisted to.
+     */
+    constructor(data?: ModelData, store?: Store);
     /**
      * Get the model's ID.
      *
-     * @return {Integer}
-     * @public
      * @final
      */
-    public id(): any;
+    id(): string | undefined;
     /**
      * Get one of the model's attributes.
      *
-     * @param {String} attribute
-     * @return {*}
-     * @public
      * @final
      */
-    public attribute(attribute: string): any;
+    attribute<T = unknown>(attribute: string): T;
     /**
      * Merge new data into this model locally.
      *
-     * @param {Object} data A resource object to merge into this model
-     * @public
+     * @param data A resource object to merge into this model
      */
-    public pushData(data: Object): void;
+    pushData(data: ModelData | {
+        relationships?: SaveRelationships;
+    }): this;
     /**
      * Merge new attributes into this model locally.
      *
-     * @param {Object} attributes The attributes to merge.
-     * @public
+     * @param attributes The attributes to merge.
      */
-    public pushAttributes(attributes: Object): void;
+    pushAttributes(attributes: ModelAttributes): void;
     /**
      * Merge new attributes into this model, both locally and with persistence.
      *
-     * @param {Object} attributes The attributes to save. If a 'relationships' key
+     * @param attributes The attributes to save. If a 'relationships' key
      *     exists, it will be extracted and relationships will also be saved.
-     * @param {Object} [options]
-     * @return {Promise}
-     * @public
      */
-    public save(attributes: Object, options?: Object | undefined): Promise<any>;
+    save(attributes: SaveAttributes, options?: Omit<FlarumRequestOptions<ApiPayloadSingle>, 'url'> & {
+        meta?: MetaInformation;
+    }): Promise<ApiResponseSingle<this>>;
     /**
      * Send a request to delete the resource.
      *
-     * @param {Object} body Data to send along with the DELETE request.
-     * @param {Object} [options]
-     * @return {Promise}
-     * @public
+     * @param body Data to send along with the DELETE request.
      */
-    public delete(body: Object, options?: Object | undefined): Promise<any>;
+    delete(body?: FlarumRequestOptions<void>['body'], options?: Omit<FlarumRequestOptions<void>, 'url'>): Promise<void>;
     /**
      * Construct a path to the API endpoint for this resource.
-     *
-     * @return {String}
-     * @protected
      */
     protected apiEndpoint(): string;
-    copyData(): any;
+    protected copyData(): ModelData;
+    protected rawRelationship<M extends Model>(relationship: string): undefined | ModelIdentifier;
+    protected rawRelationship<M extends Model[]>(relationship: string): undefined | ModelIdentifier[];
+    /**
+     * Generate a function which returns the value of the given attribute.
+     *
+     * @param transform A function to transform the attribute value
+     */
+    static attribute<T>(name: string): () => T;
+    static attribute<T, O = unknown>(name: string, transform: (attr: O) => T): () => T;
+    /**
+     * Generate a function which returns the value of the given has-one
+     * relationship.
+     *
+     * @return false if no information about the
+     *     relationship exists; undefined if the relationship exists but the model
+     *     has not been loaded; or the model if it has been loaded.
+     */
+    static hasOne<M extends Model>(name: string): () => M | false;
+    static hasOne<M extends Model | null>(name: string): () => M | null | false;
+    /**
+     * Generate a function which returns the value of the given has-many
+     * relationship.
+     *
+     * @return false if no information about the relationship
+     *     exists; an array if it does, containing models if they have been
+     *     loaded, and undefined for those that have not.
+     */
+    static hasMany<M extends Model>(name: string): () => (M | undefined)[] | false;
+    /**
+     * Transform the given value into a Date object.
+     */
+    static transformDate(value: string): Date;
+    static transformDate(value: string | null): Date | null;
+    static transformDate(value: string | undefined): Date | undefined;
+    static transformDate(value: string | null | undefined): Date | null | undefined;
+    /**
+     * Get a resource identifier object for the given model.
+     */
+    protected static getIdentifier(model: Model): ModelIdentifier;
 }

js/dist-typings/common/Session.d.ts

@@ -5,10 +5,8 @@ export declare type LoginParams = {
      * The username/email
      */
     identification: string;
-    /**
-     * Password
-     */
     password: string;
+    remember: boolean;
 };
 /**
  * The `Session` class defines the current user session. It stores a reference

js/dist-typings/common/Store.d.ts

@@ -1,97 +1,127 @@
+import { FlarumRequestOptions } from './Application';
+import Model, { ModelData, SavedModelData } from './Model';
+export interface MetaInformation {
+    [key: string]: any;
+}
+export interface ApiQueryParamsSingle {
+    fields?: string[];
+    include?: string;
+    bySlug?: boolean;
+    meta?: MetaInformation;
+}
+export interface ApiQueryParamsPlural {
+    fields?: string[];
+    include?: string;
+    filter?: {
+        q: string;
+        [key: string]: string;
+    };
+    page?: {
+        offset?: number;
+        number?: number;
+        limit?: number;
+        size?: number;
+    };
+    sort?: string;
+    meta?: MetaInformation;
+}
+export declare type ApiQueryParams = ApiQueryParamsPlural | ApiQueryParamsSingle;
+export interface ApiPayloadSingle {
+    data: SavedModelData;
+    included?: SavedModelData[];
+    meta?: MetaInformation;
+}
+export interface ApiPayloadPlural {
+    data: SavedModelData[];
+    included?: SavedModelData[];
+    links?: {
+        first: string;
+        next?: string;
+        prev?: string;
+    };
+    meta?: MetaInformation;
+}
+export declare type ApiPayload = ApiPayloadSingle | ApiPayloadPlural;
+export declare type ApiResponseSingle<M extends Model> = M & {
+    payload: ApiPayloadSingle;
+};
+export declare type ApiResponsePlural<M extends Model> = M[] & {
+    payload: ApiPayloadPlural;
+};
+export declare type ApiResponse<M extends Model> = ApiResponseSingle<M> | ApiResponsePlural<M>;
+interface ApiQueryRequestOptions<ResponseType> extends Omit<FlarumRequestOptions<ResponseType>, 'url'> {
+}
+interface StoreData {
+    [type: string]: Partial<Record<string, Model>>;
+}
+export declare function payloadIsPlural(payload: ApiPayload): payload is ApiPayloadPlural;
 /**
  * The `Store` class defines a local data store, and provides methods to
  * retrieve data from the API.
  */
 export default class Store {
-    constructor(models: any);
     /**
      * The local data store. A tree of resource types to IDs, such that
      * accessing data[type][id] will return the model for that type/ID.
-     *
-     * @type {Object}
-     * @protected
      */
-    protected data: Object;
+    protected data: StoreData;
     /**
      * The model registry. A map of resource types to the model class that
      * should be used to represent resources of that type.
-     *
-     * @type {Object}
-     * @public
      */
-    public models: Object;
+    models: Record<string, typeof Model>;
+    constructor(models: Record<string, typeof Model>);
     /**
      * Push resources contained within an API payload into the store.
      *
-     * @param {Object} payload
-     * @return {Model|Model[]} The model(s) representing the resource(s) contained
+     * @return The model(s) representing the resource(s) contained
      *     within the 'data' key of the payload.
-     * @public
      */
-    public pushPayload(payload: Object): any | any[];
+    pushPayload<M extends Model>(payload: ApiPayloadSingle): ApiResponseSingle<M>;
+    pushPayload<Ms extends Model[]>(payload: ApiPayloadPlural): ApiResponsePlural<Ms[number]>;
     /**
      * Create a model to represent a resource object (or update an existing one),
      * and push it into the store.
      *
-     * @param {Object} data The resource object
-     * @return {Model|null} The model, or null if no model class has been
+     * @param data The resource object
+     * @return The model, or null if no model class has been
      *     registered for this resource type.
-     * @public
      */
-    public pushObject(data: Object): any | null;
+    pushObject<M extends Model>(data: SavedModelData): M | null;
+    pushObject<M extends Model>(data: SavedModelData, allowUnregistered: false): M;
     /**
      * Make a request to the API to find record(s) of a specific type.
-     *
-     * @param {String} type The resource type.
-     * @param {Integer|Integer[]|Object} [id] The ID(s) of the model(s) to retrieve.
-     *     Alternatively, if an object is passed, it will be handled as the
-     *     `query` parameter.
-     * @param {Object} [query]
-     * @param {Object} [options]
-     * @return {Promise}
-     * @public
      */
-    public find(type: string, id?: any | any[] | Object, query?: Object | undefined, options?: Object | undefined): Promise<any>;
+    find<M extends Model>(type: string, params: ApiQueryParamsSingle): Promise<ApiResponseSingle<M>>;
+    find<Ms extends Model[]>(type: string, params: ApiQueryParamsPlural): Promise<ApiResponsePlural<Ms[number]>>;
+    find<M extends Model>(type: string, id: string, params?: ApiQueryParamsSingle, options?: ApiQueryRequestOptions<ApiPayloadSingle>): Promise<ApiResponseSingle<M>>;
+    find<Ms extends Model[]>(type: string, ids: string[], params?: ApiQueryParamsPlural, options?: ApiQueryRequestOptions<ApiPayloadPlural>): Promise<ApiResponsePlural<Ms[number]>>;
     /**
      * Get a record from the store by ID.
-     *
-     * @param {String} type The resource type.
-     * @param {Integer} id The resource ID.
-     * @return {Model}
-     * @public
      */
-    public getById(type: string, id: any): any;
+    getById<M extends Model>(type: string, id: string): M | undefined;
     /**
      * Get a record from the store by the value of a model attribute.
      *
-     * @param {String} type The resource type.
-     * @param {String} key The name of the method on the model.
-     * @param {*} value The value of the model attribute.
-     * @return {Model}
-     * @public
+     * @param type The resource type.
+     * @param key The name of the method on the model.
+     * @param value The value of the model attribute.
      */
-    public getBy(type: string, key: string, value: any): any;
+    getBy<M extends Model, T = unknown>(type: string, key: keyof M, value: T): M | undefined;
     /**
      * Get all loaded records of a specific type.
-     *
-     * @param {String} type
-     * @return {Model[]}
-     * @public
      */
-    public all(type: string): any[];
+    all<M extends Model>(type: string): M[];
     /**
      * Remove the given model from the store.
-     *
-     * @param {Model} model
      */
-    remove(model: any): void;
+    remove(model: Model): void;
     /**
      * Create a new record of the given type.
      *
-     * @param {String} type The resource type
-     * @param {Object} [data] Any data to initialize the model with
-     * @return {Model}
-     * @public
+     * @param type The resource type
+     * @param data Any data to initialize the model with
      */
-    public createRecord(type: string, data?: Object | undefined): any;
+    createRecord<M extends Model>(type: string, data?: ModelData): M;
 }
+export {};

js/dist-typings/common/Translator.d.ts

@@ -1,3 +1,6 @@
+/// <reference path="../@types/translator-icu-rich.d.ts" />
+import { RichMessageFormatter } from '@askvortsov/rich-icu-message-formatter';
+import { pluralTypeHandler, selectTypeHandler } from '@ultraq/icu-message-formatter';
 declare type Translations = Record<string, string>;
 declare type TranslatorParameters = Record<string, unknown>;
 export default class Translator {
@@ -8,15 +11,15 @@ export default class Translator {
     /**
      * The underlying ICU MessageFormatter util.
      */
-    protected formatter: any;
+    protected formatter: RichMessageFormatter;
     setLocale(locale: string): void;
     addTranslations(translations: Translations): void;
     /**
      * An extensible entrypoint for extenders to register type handlers for translations.
      */
     protected formatterTypeHandlers(): {
-        plural: any;
-        select: any;
+        plural: typeof pluralTypeHandler;
+        select: typeof selectTypeHandler;
     };
     /**
      * A temporary system to preprocess parameters.
@@ -26,6 +29,6 @@ export default class Translator {
      * @internal
      */
     protected preprocessParameters(parameters: TranslatorParameters): TranslatorParameters;
-    trans(id: string, parameters?: TranslatorParameters): any;
+    trans(id: string, parameters?: TranslatorParameters): import("@askvortsov/rich-icu-message-formatter").NestedStringArray;
 }
 export {};

js/dist-typings/common/compat.d.ts

@@ -4,8 +4,8 @@ declare var _default: {
     Store: typeof Store;
     'utils/BasicEditorDriver': typeof BasicEditorDriver;
     'utils/evented': {
-        handlers: Object;
-        getHandlers(event: string): any[];
+        handlers: Record<string, unknown>;
+        getHandlers(event: string): Function[];
         trigger(event: string, ...args: any[]): void;
         on(event: string, handler: Function): void;
         one(event: string, handler: Function): void;

js/dist-typings/common/components/Checkbox.d.ts

@@ -15,14 +15,14 @@ export default class Checkbox extends Component<import("../Component").Component
     /**
      * Get the template for the checkbox's display (tick/cross icon).
      *
-     * @return {*}
+     * @return {import('mithril').Children}
      * @protected
      */
-    protected getDisplay(): any;
+    protected getDisplay(): import('mithril').Children;
     /**
      * Run a callback when the state of the checkbox is changed.
      *
-     * @param {Boolean} checked
+     * @param {boolean} checked
      * @protected
      */
     protected onchange(checked: boolean): void;

js/dist-typings/common/components/Dropdown.d.ts

@@ -22,17 +22,17 @@ export default class Dropdown extends Component<import("../Component").Component
     /**
      * Get the template for the button.
      *
-     * @return {*}
+     * @return {import('mithril').Children}
      * @protected
      */
-    protected getButton(children: any): any;
+    protected getButton(children: any): import('mithril').Children;
     /**
      * Get the template for the button's content.
      *
-     * @return {*}
+     * @return {import('mithril').Children}
      * @protected
      */
-    protected getButtonContent(children: any): any;
+    protected getButtonContent(children: any): import('mithril').Children;
     getMenu(items: any): JSX.Element;
 }
 import Component from "../Component";

js/dist-typings/common/components/EditUserModal.d.ts

@@ -1,26 +1,31 @@
-/**
- * The `EditUserModal` component displays a modal dialog with a login form.
- */
-export default class EditUserModal extends Modal<import("./Modal").IInternalModalAttrs> {
-    constructor();
-    username: Stream<any> | undefined;
-    email: Stream<any> | undefined;
-    isEmailConfirmed: Stream<any> | undefined;
-    setPassword: Stream<boolean> | undefined;
-    password: Stream<any> | undefined;
-    groups: {} | undefined;
-    fields(): ItemList<any>;
+/// <reference path="../../@types/translator-icu-rich.d.ts" />
+import Modal, { IInternalModalAttrs } from './Modal';
+import ItemList from '../utils/ItemList';
+import Stream from '../utils/Stream';
+import type Mithril from 'mithril';
+import type User from '../models/User';
+import type { SaveAttributes } from '../Model';
+export interface IEditUserModalAttrs extends IInternalModalAttrs {
+    user: User;
+}
+export default class EditUserModal<CustomAttrs extends IEditUserModalAttrs = IEditUserModalAttrs> extends Modal<CustomAttrs> {
+    protected username: Stream<string>;
+    protected email: Stream<string>;
+    protected isEmailConfirmed: Stream<boolean>;
+    protected setPassword: Stream<boolean>;
+    protected password: Stream<string>;
+    protected groups: Record<string, Stream<boolean>>;
+    oninit(vnode: Mithril.Vnode<CustomAttrs, this>): void;
+    className(): string;
+    title(): import("@askvortsov/rich-icu-message-formatter").NestedStringArray;
+    content(): JSX.Element;
+    fields(): ItemList<unknown>;
     activate(): void;
-    data(): {
-        relationships: {};
-    };
-    nonAdminEditingAdmin(): any;
+    data(): SaveAttributes;
+    onsubmit(e: SubmitEvent): void;
+    nonAdminEditingAdmin(): boolean | null;
     /**
      * @internal
-     * @protected
      */
-    protected userIsAdmin(user: any): any;
+    protected userIsAdmin(user: User | null): boolean | null;
 }
-import Modal from "./Modal";
-import Stream from "../utils/Stream";
-import ItemList from "../utils/ItemList";

js/dist-typings/common/components/LinkButton.d.ts

@@ -16,10 +16,10 @@ export default class LinkButton extends Button<import("./Button").IButtonAttrs>
     /**
      * Determine whether a component with the given attrs is 'active'.
      *
-     * @param {Object} attrs
-     * @return {Boolean}
+     * @param {object} attrs
+     * @return {boolean}
      */
-    static isActive(attrs: Object): boolean;
+    static isActive(attrs: object): boolean;
     constructor();
 }
 import Button from "./Button";

js/dist-typings/common/components/LoadingIndicator.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="mithril" />
 import Component, { ComponentAttrs } from '../Component';
 export interface LoadingIndicatorAttrs extends ComponentAttrs {
     /**

js/dist-typings/common/components/Modal.d.ts

@@ -22,8 +22,8 @@ export default abstract class Modal<ModalAttrs extends IInternalModalAttrs = IIn
     /**
      * Attributes for an alert component to show below the header.
      */
-    alertAttrs: AlertAttrs;
-    oninit(vnode: Mithril.VnodeDOM<ModalAttrs, this>): void;
+    alertAttrs: AlertAttrs | null;
+    oninit(vnode: Mithril.Vnode<ModalAttrs, this>): void;
     oncreate(vnode: Mithril.VnodeDOM<ModalAttrs, this>): void;
     onbeforeremove(vnode: Mithril.VnodeDOM<ModalAttrs, this>): Promise<void> | void;
     /**
@@ -37,7 +37,7 @@ export default abstract class Modal<ModalAttrs extends IInternalModalAttrs = IIn
     /**
      * Get the title of the modal dialog.
      */
-    abstract title(): string;
+    abstract title(): Mithril.Children;
     /**
      * Get the content of the modal.
      */

js/dist-typings/common/components/Navigation.d.ts

@@ -18,23 +18,23 @@ export default class Navigation extends Component<import("../Component").Compone
     /**
      * Get the back button.
      *
-     * @return {Object}
+     * @return {import('mithril').Children}
      * @protected
      */
-    protected getBackButton(): Object;
+    protected getBackButton(): import('mithril').Children;
     /**
      * Get the pane pinned toggle button.
      *
-     * @return {Object|String}
+     * @return {import('mithril').Children}
      * @protected
      */
-    protected getPaneButton(): Object | string;
+    protected getPaneButton(): import('mithril').Children;
     /**
      * Get the drawer toggle button.
      *
-     * @return {Object|String}
+     * @return {import('mithril').Children}
      * @protected
      */
-    protected getDrawerButton(): Object | string;
+    protected getDrawerButton(): import('mithril').Children;
 }
 import Component from "../Component";

js/dist-typings/common/components/RequestErrorModal.d.ts

@@ -1,4 +1,11 @@
-export default class RequestErrorModal extends Modal<import("./Modal").IInternalModalAttrs> {
-    constructor();
+import type RequestError from '../utils/RequestError';
+import Modal, { IInternalModalAttrs } from './Modal';
+export interface IRequestErrorModalAttrs extends IInternalModalAttrs {
+    error: RequestError;
+    formattedError: string[];
+}
+export default class RequestErrorModal<CustomAttrs extends IRequestErrorModalAttrs = IRequestErrorModalAttrs> extends Modal<CustomAttrs> {
+    className(): string;
+    title(): string;
+    content(): JSX.Element;
 }
-import Modal from "./Modal";

js/dist-typings/common/components/SplitDropdown.d.ts

@@ -7,9 +7,10 @@ export default class SplitDropdown extends Dropdown {
      * Get the first child. If the first child is an array, the first item in that
      * array will be returned.
      *
-     * @return {*}
+     * @param {unknown[] | unknown} children
+     * @return {unknown}
      * @protected
      */
-    protected getFirstChild(children: any): any;
+    protected getFirstChild(children: unknown[] | unknown): unknown;
 }
 import Dropdown from "./Dropdown";

js/dist-typings/common/components/TextEditor.d.ts

@@ -36,19 +36,19 @@ export default class TextEditor extends Component<import("../Component").Compone
     /**
      * Build an item list for the text editor controls.
      *
-     * @return {ItemList}
+     * @return {ItemList<import('mithril').Children>}
      */
-    controlItems(): ItemList<any>;
+    controlItems(): ItemList<import('mithril').Children>;
     /**
      * Build an item list for the toolbar controls.
      *
-     * @return {ItemList}
+     * @return {ItemList<import('mithril').Children>}
      */
-    toolbarItems(): ItemList<any>;
+    toolbarItems(): ItemList<import('mithril').Children>;
     /**
      * Handle input into the textarea.
      *
-     * @param {String} value
+     * @param {string} value
      */
     oninput(value: string): void;
     /**

js/dist-typings/common/extend.d.ts

@@ -23,7 +23,7 @@
  * @param methods The name or names of the method(s) to extend
  * @param callback A callback which mutates the method's output
  */
-export declare function extend<T extends object, K extends KeyOfType<T, Function>>(object: T, methods: K | K[], callback: (this: T, val: ReturnType<T[K]>, ...args: Parameters<T[K]>) => void): void;
+export declare function extend<T extends Record<string, any>, K extends KeyOfType<T, Function>>(object: T, methods: K | K[], callback: (this: T, val: ReturnType<T[K]>, ...args: Parameters<T[K]>) => void): void;
 /**
  * Override an object's method by replacing it with a new function, so that the
  * new function will be run every time the object's method is called.
@@ -51,4 +51,4 @@ export declare function extend<T extends object, K extends KeyOfType<T, Function
  * @param methods The name or names of the method(s) to override
  * @param newMethod The method to replace it with
  */
-export declare function override<T extends object, K extends KeyOfType<T, Function>>(object: T, methods: K | K[], newMethod: (this: T, orig: T[K], ...args: Parameters<T[K]>) => void): void;
+export declare function override<T extends Record<any, any>, K extends KeyOfType<T, Function>>(object: T, methods: K | K[], newMethod: (this: T, orig: T[K], ...args: Parameters<T[K]>) => void): void;

js/dist-typings/common/helpers/fireDebugWarning.d.ts

@@ -10,3 +10,17 @@
  * can fix.
  */
 export default function fireDebugWarning(...args: Parameters<typeof console.warn>): void;
+/**
+ * Fire a Flarum deprecation warning which is shown in the JS console.
+ *
+ * These warnings are only shown when the forum is in debug mode, and the function exists to
+ * reduce bundle size caused by multiple warnings across our JavaScript.
+ *
+ * @param message The message to display. (Short, but sweet, please!)
+ * @param githubId The PR or Issue ID with more info in relation to this change.
+ * @param [removedFrom] The version in which this feature will be completely removed. (default: 2.0)
+ * @param [repo] The repo which the issue or PR is located in. (default: flarum/core)
+ *
+ * @see {@link fireDebugWarning}
+ */
+export declare function fireDeprecationWarning(message: string, githubId: string, removedFrom?: string, repo?: string): void;

js/dist-typings/common/helpers/listItems.d.ts

@@ -1,16 +1,27 @@
 import type Mithril from 'mithril';
-import Component, { ComponentAttrs } from '../Component';
-export interface ModdedVnodeAttrs {
+import { ComponentAttrs } from '../Component';
+declare type ModdedVnodeAttrs = {
     itemClassName?: string;
     key?: string;
-}
-export declare type ModdedVnode<Attrs> = Mithril.Vnode<ModdedVnodeAttrs, Component<Attrs> | {}> & {
+};
+declare type ModdedTag = Mithril.Vnode['tag'] & {
+    isListItem?: boolean;
+    isActive?: (attrs: ComponentAttrs) => boolean;
+};
+declare type ModdedVnode = Mithril.Vnode<ModdedVnodeAttrs> & {
     itemName?: string;
     itemClassName?: string;
-    tag: Mithril.Vnode['tag'] & {
-        isListItem?: boolean;
-        isActive?: (attrs: ComponentAttrs) => boolean;
-    };
+    tag: ModdedTag;
+};
+declare type ModdedChild = ModdedVnode | string | number | boolean | null | undefined;
+declare type ModdedChildArray = ModdedChildren[];
+declare type ModdedChildren = ModdedChild | ModdedChildArray;
+/**
+ * This type represents an element of a list returned by `ItemList.toArray()`,
+ * coupled with some static properties used on various components.
+ */
+export declare type ModdedChildrenWithItemName = ModdedChildren & {
+    itemName?: string;
 };
 /**
  * The `listItems` helper wraps an array of components in the provided tag,
@@ -19,4 +30,5 @@ export declare type ModdedVnode<Attrs> = Mithril.Vnode<ModdedVnodeAttrs, Compone
  * By default, this tag is an `<li>` tag, but this is customisable through the
  * second function parameter, `customTag`.
  */
-export default function listItems<Attrs extends Record<string, unknown>>(rawItems: ModdedVnode<Attrs> | ModdedVnode<Attrs>[], customTag?: string | Component<Attrs>, attributes?: Attrs): Mithril.Vnode[];
+export default function listItems<Attrs extends ComponentAttrs>(rawItems: ModdedChildrenWithItemName[], customTag?: VnodeElementTag<Attrs>, attributes?: Attrs): Mithril.Vnode[];
+export {};

js/dist-typings/common/helpers/punctuateSeries.d.ts

@@ -6,7 +6,7 @@
  * punctuateSeries(['Toby', 'Franz', 'Dominion']) // Toby, Franz, and Dominion
  * ```
  *
- * @param {Array} items
- * @return {VirtualElement}
+ * @param {import('mithril').Children[]} items
+ * @return {import('mithril').Children}')}
  */
-export default function punctuateSeries(items: any[]): any;
+export default function punctuateSeries(items: import('mithril').Children[]): import('mithril').Children;

js/dist-typings/common/helpers/username.d.ts

@@ -4,4 +4,4 @@ import User from '../models/User';
  * The `username` helper displays a user's username in a <span class="username">
  * tag. If the user doesn't exist, the username will be displayed as [deleted].
  */
-export default function username(user: User): Mithril.Vnode;
+export default function username(user: User | null | undefined | false): Mithril.Vnode;

js/dist-typings/common/index.d.ts

@@ -1,3 +1,13 @@
-import * as Extend from "./extend/index";
-import app from "./app";
+import 'expose-loader?exposes=$,jQuery!jquery';
+import 'expose-loader?exposes=m!mithril';
+import 'expose-loader?exposes=dayjs!dayjs';
+import 'bootstrap/js/affix';
+import 'bootstrap/js/dropdown';
+import 'bootstrap/js/modal';
+import 'bootstrap/js/tooltip';
+import 'bootstrap/js/transition';
+import 'jquery.hotkeys/jquery.hotkeys';
+import * as Extend from './extend/index';
+import app from './app';
 export { Extend, app };
+import './utils/arrayFlatPolyfill';

js/dist-typings/common/models/Discussion.d.ts

@@ -1,3 +1,48 @@
+import Model from '../Model';
+import ItemList from '../utils/ItemList';
+import Mithril from 'mithril';
+import Post from './Post';
+import User from './User';
 export default class Discussion extends Model {
+    title(): string;
+    slug(): string;
+    createdAt(): Date | undefined;
+    user(): false | User | null;
+    firstPost(): false | Post | null;
+    lastPostedAt(): Date | null | undefined;
+    lastPostedUser(): false | User | null;
+    lastPost(): false | Post | null;
+    lastPostNumber(): number | null | undefined;
+    commentCount(): number | undefined;
+    replyCount(): Number;
+    posts(): false | (Post | undefined)[];
+    mostRelevantPost(): false | Post | null;
+    lastReadAt(): Date | null | undefined;
+    lastReadPostNumber(): number | null | undefined;
+    isUnread(): boolean;
+    isRead(): boolean;
+    hiddenAt(): Date | null | undefined;
+    hiddenUser(): false | User | null;
+    isHidden(): boolean;
+    canReply(): boolean | undefined;
+    canRename(): boolean | undefined;
+    canHide(): boolean | undefined;
+    canDelete(): boolean | undefined;
+    /**
+     * Remove a post from the discussion's posts relationship.
+     */
+    removePost(id: string): void;
+    /**
+     * Get the estimated number of unread posts in this discussion for the current
+     * user.
+     */
+    unreadCount(): number;
+    /**
+     * Get the Badge components that apply to this discussion.
+     */
+    badges(): ItemList<Mithril.Children>;
+    /**
+     * Get a list of all of the post IDs in this discussion.
+     */
+    postIds(): string[];
 }
-import Model from "../Model";

js/dist-typings/common/models/Forum.d.ts

@@ -1,3 +1,4 @@
+import Model from '../Model';
 export default class Forum extends Model {
+    apiEndpoint(): string;
 }
-import Model from "../Model";

js/dist-typings/common/models/Group.d.ts

@@ -1,9 +1,11 @@
-export default Group;
-declare class Group extends Model {
+import Model from '../Model';
+export default class Group extends Model {
+    static ADMINISTRATOR_ID: string;
+    static GUEST_ID: string;
+    static MEMBER_ID: string;
+    nameSingular(): string;
+    namePlural(): string;
+    color(): string | null;
+    icon(): string | null;
+    isHidden(): boolean;
 }
-declare namespace Group {
-    const ADMINISTRATOR_ID: string;
-    const GUEST_ID: string;
-    const MEMBER_ID: string;
-}
-import Model from "../Model";

js/dist-typings/common/models/Notification.d.ts

@@ -1,3 +1,11 @@
+import Model from '../Model';
+import User from './User';
 export default class Notification extends Model {
+    contentType(): string;
+    content(): string;
+    createdAt(): Date;
+    isRead(): boolean;
+    user(): false | User;
+    fromUser(): false | User | null;
+    subject(): false | Model | null;
 }
-import Model from "../Model";

js/dist-typings/common/models/Post.d.ts

@@ -1,3 +1,23 @@
+import Model from '../Model';
+import Discussion from './Discussion';
+import User from './User';
 export default class Post extends Model {
+    number(): number;
+    discussion(): Discussion;
+    createdAt(): Date;
+    user(): false | User;
+    contentType(): string | null;
+    content(): string | null | undefined;
+    contentHtml(): string | null | undefined;
+    renderFailed(): boolean | undefined;
+    contentPlain(): string | null | undefined;
+    editedAt(): Date | null | undefined;
+    editedUser(): false | User | null;
+    isEdited(): boolean;
+    hiddenAt(): Date | null | undefined;
+    hiddenUser(): false | User | null;
+    isHidden(): boolean;
+    canEdit(): boolean | undefined;
+    canHide(): boolean | undefined;
+    canDelete(): boolean | undefined;
 }
-import Model from "../Model";

js/dist-typings/common/models/User.d.ts

@@ -1,3 +1,46 @@
+import { Color } from 'color-thief-browser';
+import Model from '../Model';
+import ItemList from '../utils/ItemList';
+import Mithril from 'mithril';
+import Group from './Group';
 export default class User extends Model {
+    username(): string;
+    slug(): string;
+    displayName(): string;
+    email(): string | undefined;
+    isEmailConfirmed(): boolean | undefined;
+    password(): string | undefined;
+    avatarUrl(): string | null;
+    preferences(): Record<string, any> | null | undefined;
+    groups(): false | (Group | undefined)[];
+    joinTime(): Date | null | undefined;
+    lastSeenAt(): Date | null | undefined;
+    markedAllAsReadAt(): Date | null | undefined;
+    unreadNotificationCount(): number | undefined;
+    newNotificationCount(): number | undefined;
+    discussionCount(): number | undefined;
+    commentCount(): number | undefined;
+    canEdit(): boolean | undefined;
+    canEditCredentials(): boolean | undefined;
+    canEditGroups(): boolean | undefined;
+    canDelete(): boolean | undefined;
+    color(): string;
+    protected avatarColor: Color | null;
+    /**
+     * Check whether or not the user has been seen in the last 5 minutes.
+     */
+    isOnline(): boolean;
+    /**
+     * Get the Badge components that apply to this user.
+     */
+    badges(): ItemList<Mithril.Children>;
+    /**
+     * Calculate the dominant color of the user's avatar. The dominant color will
+     * be set to the `avatarColor` property once it has been calculated.
+     */
+    protected calculateAvatarColor(): void;
+    /**
+     * Update the user's preferences.
+     */
+    savePreferences(newPreferences: Record<string, unknown>): Promise<this>;
 }
-import Model from "../Model";

js/dist-typings/common/resolvers/DefaultResolver.d.ts

@@ -11,13 +11,9 @@ import type { default as Component, ComponentAttrs } from '../Component';
 export default class DefaultResolver<Attrs extends ComponentAttrs, Comp extends Component<Attrs & {
     routeName: string;
 }>, RouteArgs extends Record<string, unknown> = {}> implements RouteResolver<Attrs, Comp, RouteArgs> {
-    component: {
-        new (): Comp;
-    };
+    component: new () => Comp;
     routeName: string;
-    constructor(component: {
-        new (): Comp;
-    }, routeName: string);
+    constructor(component: new () => Comp, routeName: string);
     /**
      * When a route change results in a changed key, a full page
      * rerender occurs. This method can be overriden in subclasses

js/dist-typings/common/states/AlertManagerState.d.ts

@@ -20,11 +20,11 @@ export default class AlertManagerState {
     /**
      * Show an Alert in the alerts area.
      *
-     * @returns The alert's ID, which can be used to dismiss the alert.
+     * @return The alert's ID, which can be used to dismiss the alert.
      */
     show(children: Mithril.Children): AlertIdentifier;
     show(attrs: AlertAttrs, children: Mithril.Children): AlertIdentifier;
-    show(componentClass: Alert, attrs: AlertAttrs, children: Mithril.Children): AlertIdentifier;
+    show(componentClass: typeof Alert, attrs: AlertAttrs, children: Mithril.Children): AlertIdentifier;
     /**
      * Dismiss an alert.
      */

js/dist-typings/common/states/ModalManagerState.d.ts

@@ -1,4 +1,16 @@
+import type Component from '../Component';
 import Modal from '../components/Modal';
+/**
+ * Ideally, `show` would take a higher-kinded generic, ala:
+ *  `show<Attrs, C>(componentClass: C<Attrs>, attrs: Attrs): void`
+ * Unfortunately, TypeScript does not support this:
+ * https://github.com/Microsoft/TypeScript/issues/1213
+ * Therefore, we have to use this ugly, messy workaround.
+ */
+declare type UnsafeModalClass = ComponentClass<any, Modal> & {
+    isDismissible: boolean;
+    component: typeof Component.component;
+};
 /**
  * Class used to manage modal state.
  *
@@ -9,9 +21,15 @@ export default class ModalManagerState {
      * @internal
      */
     modal: null | {
-        componentClass: typeof Modal;
+        componentClass: UnsafeModalClass;
         attrs?: Record<string, unknown>;
+        key: number;
     };
+    /**
+     * Used to force re-initialization of modals if a modal
+     * is replaced by another of the same type.
+     */
+    private key;
     private closeTimeout?;
     /**
      * Shows a modal dialog.
@@ -25,7 +43,7 @@ export default class ModalManagerState {
      * // This "hack" is needed due to quirks with nested redraws in Mithril.
      * setTimeout(() => app.modal.show(MyCoolModal, { attr: 'value' }), 0);
      */
-    show(componentClass: typeof Modal, attrs?: Record<string, unknown>): void;
+    show(componentClass: UnsafeModalClass, attrs?: Record<string, unknown>): void;
     /**
      * Closes the currently open dialog, if one is open.
      */
@@ -33,7 +51,8 @@ export default class ModalManagerState {
     /**
      * Checks if a modal is currently open.
      *
-     * @returns `true` if a modal dialog is currently open, otherwise `false`.
+     * @return `true` if a modal dialog is currently open, otherwise `false`.
      */
     isModalOpen(): boolean;
 }
+export {};

js/dist-typings/common/states/PageState.d.ts

@@ -5,12 +5,11 @@ export default class PageState {
     /**
      * Determine whether the page matches the given class and data.
      *
-     * @param {object} type The page class to check against. Subclasses are
-     *                      accepted as well.
-     * @param {object} data
+     * @param {object} type The page class to check against. Subclasses are accepted as well.
+     * @param {Record<string, unknown>} data
      * @return {boolean}
      */
-    matches(type: object, data?: object): boolean;
+    matches(type: object, data?: Record<string, unknown>): boolean;
     get(key: any): any;
     set(key: any, value: any): void;
 }

js/dist-typings/common/states/PaginatedListState.d.ts

@@ -1,4 +1,5 @@
 import Model from '../Model';
+import { ApiQueryParamsPlural, ApiResponsePlural } from '../Store';
 export interface Page<TModel> {
     number: number;
     items: TModel[];
@@ -13,6 +14,9 @@ export interface PaginationLocation {
 export interface PaginatedListParams {
     [key: string]: any;
 }
+export interface PaginatedListRequestParams extends Omit<ApiQueryParamsPlural, 'include'> {
+    include?: string | string[];
+}
 export default abstract class PaginatedListState<T extends Model, P extends PaginatedListParams = PaginatedListParams> {
     protected location: PaginationLocation;
     protected pageSize: number;
@@ -26,11 +30,11 @@ export default abstract class PaginatedListState<T extends Model, P extends Pagi
     clear(): void;
     loadPrev(): Promise<void>;
     loadNext(): Promise<void>;
-    protected parseResults(pg: number, results: T[]): void;
+    protected parseResults(pg: number, results: ApiResponsePlural<T>): void;
     /**
      * Load a new page of results.
      */
-    protected loadPage(page?: number): Promise<T[]>;
+    protected loadPage(page?: number): Promise<ApiResponsePlural<T>>;
     /**
      * Get the parameters that should be passed in the API request.
      * Do not include page offset unless subclass overrides loadPage.
@@ -38,7 +42,7 @@ export default abstract class PaginatedListState<T extends Model, P extends Pagi
      * @abstract
      * @see loadPage
      */
-    protected requestParams(): any;
+    protected requestParams(): PaginatedListRequestParams;
     /**
      * Update the `this.params` object, calling `refresh` if they have changed.
      * Use `requestParams` for converting `this.params` into API parameters
@@ -73,7 +77,7 @@ export default abstract class PaginatedListState<T extends Model, P extends Pagi
     /**
      * Stored state parameters.
      */
-    getParams(): any;
+    getParams(): P;
     protected getNextPageNumber(): number;
     protected getPrevPageNumber(): number;
     protected paramsChanged(newParams: P): boolean;

js/dist-typings/common/utils/Drawer.d.ts

@@ -34,20 +34,15 @@ export default class Drawer {
      * Check whether or not the drawer is currently open.
      *
      * @return {boolean}
-     * @public
      */
-    public isOpen(): boolean;
+    isOpen(): boolean;
     /**
      * Hide the drawer.
-     *
-     * @public
      */
-    public hide(): void;
+    hide(): void;
     /**
      * Show the drawer.
-     *
-     * @public
      */
-    public show(): void;
+    show(): void;
     $backdrop: JQuery<HTMLElement> | undefined;
 }

js/dist-typings/common/utils/ItemList.d.ts

@@ -192,7 +192,7 @@ export default class ItemList<T> {
      *
      * @param content The item's content (objects only)
      * @param key The item's key
-     * @returns Proxied content
+     * @return Proxied content
      *
      * @internal
      */

js/dist-typings/common/utils/RequestError.d.ts

@@ -1,6 +1,6 @@
 import type Mithril from 'mithril';
+import type { AlertAttrs } from '../components/Alert';
 export declare type InternalFlarumRequestOptions<ResponseType> = Mithril.RequestOptions<ResponseType> & {
-    errorHandler: (error: RequestError) => void;
     url: string;
 };
 export default class RequestError<ResponseType = string> {
@@ -16,6 +16,6 @@ export default class RequestError<ResponseType = string> {
             [key: string]: unknown;
         }[];
     } | null;
-    alert: any;
+    alert: AlertAttrs | null;
     constructor(status: number, responseText: string | null, options: InternalFlarumRequestOptions<ResponseType>, xhr: XMLHttpRequest);
 }

js/dist-typings/common/utils/ScrollListener.d.ts

@@ -6,7 +6,6 @@ export default class ScrollListener {
     /**
      * @param {(top: number) => void} callback The callback to run when the scroll position
      *     changes.
-     * @public
      */
     constructor(callback: (top: number) => void);
     callback: (top: number) => void;
@@ -20,21 +19,15 @@ export default class ScrollListener {
     protected loop(): void;
     /**
      * Run the callback, whether there was a scroll event or not.
-     *
-     * @public
      */
-    public update(): void;
+    update(): void;
     /**
      * Start listening to and handling the window's scroll position.
-     *
-     * @public
      */
-    public start(): void;
+    start(): void;
     active: (() => void) | null | undefined;
     /**
      * Stop listening to and handling the window's scroll position.
-     *
-     * @public
      */
-    public stop(): void;
+    stop(): void;
 }

js/dist-typings/common/utils/anchorScroll.d.ts

@@ -8,7 +8,7 @@
  * position can be anchor to an element that is in or below the viewport, so
  * the content in the viewport will stay the same.
  *
- * @param {DOMElement} element The element to anchor the scroll position to.
- * @param {Function} callback The callback to run that will change page content.
+ * @param {HTMLElement | SVGElement | Element} element The element to anchor the scroll position to.
+ * @param {() => void} callback The callback to run that will change page content.
  */
-export default function anchorScroll(element: any, callback: Function): void;
+export default function anchorScroll(element: HTMLElement | SVGElement | Element, callback: () => void): void;

js/dist-typings/common/utils/computed.d.ts

@@ -1,10 +1,10 @@
+import Model from '../Model';
 /**
  * The `computed` utility creates a function that will cache its output until
  * any of the dependent values are dirty.
  *
- * @param {...String} dependentKeys The keys of the dependent values.
- * @param {function} compute The function which computes the value using the
+ * @param dependentKeys The keys of the dependent values.
+ * @param compute The function which computes the value using the
  *     dependent values.
- * @return {Function}
  */
-export default function computed(...dependentKeys: string[]): Function;
+export default function computed<T, M = Model>(...args: [...string[], (this: M, ...args: unknown[]) => T]): () => T;

js/dist-typings/common/utils/evented.d.ts

@@ -1,79 +1,97 @@
 declare namespace _default {
-    const handlers: Object;
+    const handlers: Record<string, unknown>;
     /**
      * Get all of the registered handlers for an event.
      *
-     * @param {String} event The name of the event.
-     * @return {Array}
+     * @param {string} event The name of the event.
+     * @return {Function[]}
      * @protected
+     *
+     * @deprecated
      */
-    function getHandlers(event: string): any[];
+    function getHandlers(event: string): Function[];
     /**
      * Get all of the registered handlers for an event.
      *
-     * @param {String} event The name of the event.
-     * @return {Array}
+     * @param {string} event The name of the event.
+     * @return {Function[]}
      * @protected
+     *
+     * @deprecated
      */
-    function getHandlers(event: string): any[];
+    function getHandlers(event: string): Function[];
     /**
      * Trigger an event.
      *
-     * @param {String} event The name of the event.
-     * @param {...*} args Arguments to pass to event handlers.
-     * @public
+     * @param {string} event The name of the event.
+     * @param {any[]} args Arguments to pass to event handlers.
+     *
+     * @deprecated
      */
     function trigger(event: string, ...args: any[]): void;
     /**
      * Trigger an event.
      *
-     * @param {String} event The name of the event.
-     * @param {...*} args Arguments to pass to event handlers.
-     * @public
+     * @param {string} event The name of the event.
+     * @param {any[]} args Arguments to pass to event handlers.
+     *
+     * @deprecated
      */
     function trigger(event: string, ...args: any[]): void;
     /**
      * Register an event handler.
      *
-     * @param {String} event The name of the event.
-     * @param {function} handler The function to handle the event.
+     * @param {string} event The name of the event.
+     * @param {Function} handler The function to handle the event.
+     *
+     * @deprecated
      */
     function on(event: string, handler: Function): void;
     /**
      * Register an event handler.
      *
-     * @param {String} event The name of the event.
-     * @param {function} handler The function to handle the event.
+     * @param {string} event The name of the event.
+     * @param {Function} handler The function to handle the event.
+     *
+     * @deprecated
      */
     function on(event: string, handler: Function): void;
     /**
      * Register an event handler so that it will run only once, and then
      * unregister itself.
      *
-     * @param {String} event The name of the event.
-     * @param {function} handler The function to handle the event.
+     * @param {string} event The name of the event.
+     * @param {Function} handler The function to handle the event.
+     *
+     * @deprecated
      */
     function one(event: string, handler: Function): void;
     /**
      * Register an event handler so that it will run only once, and then
      * unregister itself.
      *
-     * @param {String} event The name of the event.
-     * @param {function} handler The function to handle the event.
+     * @param {string} event The name of the event.
+     * @param {Function} handler The function to handle the event.
+     *
+     * @deprecated
      */
     function one(event: string, handler: Function): void;
     /**
      * Unregister an event handler.
      *
-     * @param {String} event The name of the event.
-     * @param {function} handler The function that handles the event.
+     * @param {string} event The name of the event.
+     * @param {Function} handler The function that handles the event.
+     *
+     * @deprecated
      */
     function off(event: string, handler: Function): void;
     /**
      * Unregister an event handler.
      *
-     * @param {String} event The name of the event.
-     * @param {function} handler The function that handles the event.
+     * @param {string} event The name of the event.
+     * @param {Function} handler The function that handles the event.
+     *
+     * @deprecated
      */
     function off(event: string, handler: Function): void;
 }

js/dist-typings/common/utils/mixin.d.ts

@@ -5,8 +5,8 @@
  * @example
  * class MyClass extends mixin(ExistingClass, evented, etc) {}
  *
- * @param {Class} Parent The class to extend the new class from.
- * @param {...Object} mixins The objects to mix in.
- * @return {Class} A new class that extends Parent and contains the mixins.
+ * @param {object} Parent The class to extend the new class from.
+ * @param {Record<string, any>[]} mixins The objects to mix in.
+ * @return {object} A new class that extends Parent and contains the mixins.
  */
-export default function mixin(Parent: any, ...mixins: Object[]): any;
+export default function mixin(Parent: object, ...mixins: Record<string, any>[]): object;

js/dist-typings/common/utils/styleSelectedText.d.ts

@@ -9,6 +9,7 @@ interface StyleArgs {
     scanFor: string;
     surroundWithNewlines: boolean;
     orderedList: boolean;
+    unorderedList: boolean;
     trimFirst: boolean;
 }
 export default function styleSelectedText(textarea: HTMLTextAreaElement, styleArgs: StyleArgs): void;

js/dist-typings/forum/ForumApplication.d.ts

@@ -1,5 +1,6 @@
 import History from './utils/History';
 import Pane from './utils/Pane';
+import { makeRouteHelpers } from './routes';
 import Application from '../common/Application';
 import NotificationListState from './states/NotificationListState';
 import GlobalSearchState from './states/GlobalSearchState';
@@ -44,6 +45,7 @@ export default class ForumApplication extends Application {
      * is used in the index page and the slideout pane.
      */
     discussions: DiscussionListState;
+    route: typeof Application.prototype.route & ReturnType<typeof makeRouteHelpers>;
     constructor();
     /**
      * @inheritdoc

js/dist-typings/forum/compat.d.ts

@@ -4,8 +4,8 @@ declare var _default: {
     Store: typeof import("../common/Store").default;
     'utils/BasicEditorDriver': typeof BasicEditorDriver;
     'utils/evented': {
-        handlers: Object;
-        getHandlers(event: string): any[];
+        handlers: Record<string, unknown>;
+        getHandlers(event: string): Function[];
         trigger(event: string, ...args: any[]): void;
         on(event: string, handler: Function): void;
         one(event: string, handler: Function): void;
@@ -92,38 +92,38 @@ declare var _default: {
     'states/PaginatedListState': typeof import("../common/states/PaginatedListState").default;
 } & {
     'utils/PostControls': {
-        controls(post: any, context: any): import("../common/utils/ItemList").default<any>;
-        userControls(post: any, context: any): import("../common/utils/ItemList").default<any>;
-        moderationControls(post: any, context: any): import("../common/utils/ItemList").default<any>;
-        destructiveControls(post: any, context: any): import("../common/utils/ItemList").default<any>;
-        editAction(): Promise<any>;
-        hideAction(): Promise<any>;
-        restoreAction(): Promise<any>;
-        deleteAction(context: any): Promise<any>;
+        controls(post: import("../common/models/Post").default, context: import("../common/Component").default<any, any>): import("../common/utils/ItemList").default<import("mithril").Children>;
+        userControls(post: import("../common/models/Post").default, context: import("../common/Component").default<any, any>): import("../common/utils/ItemList").default<import("mithril").Children>;
+        moderationControls(post: import("../common/models/Post").default, context: import("../common/Component").default<any, any>): import("../common/utils/ItemList").default<import("mithril").Children>;
+        destructiveControls(post: import("../common/models/Post").default, context: import("../common/Component").default<any, any>): import("../common/utils/ItemList").default<import("mithril").Children>;
+        editAction(): Promise<void>;
+        hideAction(): Promise<void>;
+        restoreAction(): Promise<void>;
+        deleteAction(context: any): Promise<void>;
     };
     'utils/KeyboardNavigatable': typeof KeyboardNavigatable;
     'utils/slidable': typeof slidable;
     'utils/History': typeof History;
     'utils/DiscussionControls': {
-        controls(discussion: any, context: any): import("../common/utils/ItemList").default<any>;
-        userControls(discussion: any, context: any): import("../common/utils/ItemList").default<any>;
-        moderationControls(discussion: any): import("../common/utils/ItemList").default<any>;
-        destructiveControls(discussion: any): import("../common/utils/ItemList").default<any>;
-        replyAction(goToLast: boolean, forceRefresh: boolean): Promise<any>;
-        hideAction(): Promise<any>;
-        restoreAction(): Promise<any>;
-        deleteAction(): Promise<any>;
-        renameAction(): Promise<any>;
+        controls(discussion: import("../common/models/Discussion").default, context: import("../common/Component").default<any, any>): import("../common/utils/ItemList").default<import("mithril").Children>;
+        userControls(discussion: import("../common/models/Discussion").default, context: import("../common/Component").default<any, any>): import("../common/utils/ItemList").default<import("mithril").Children>;
+        moderationControls(discussion: import("../common/models/Discussion").default): import("../common/utils/ItemList").default<import("mithril").Children>;
+        destructiveControls(discussion: import("../common/models/Discussion").default): import("../common/utils/ItemList").default<import("mithril").Children>;
+        replyAction(goToLast: boolean, forceRefresh: boolean): Promise<void>;
+        hideAction(): Promise<void>;
+        restoreAction(): Promise<void>;
+        deleteAction(): Promise<void>;
+        renameAction(): any;
     };
     'utils/alertEmailConfirmation': typeof alertEmailConfirmation;
     'utils/UserControls': {
-        controls(user: any, context: any): import("../common/utils/ItemList").default<any>;
-        userControls(): import("../common/utils/ItemList").default<any>;
-        moderationControls(user: any): import("../common/utils/ItemList").default<any>;
-        destructiveControls(user: any): import("../common/utils/ItemList").default<any>;
-        deleteAction(user: any): void;
-        showDeletionAlert(user: any, type: string): void;
-        editAction(user: any): void;
+        controls(user: import("../common/models/User").default, context: import("../common/Component").default<any, any>): import("../common/utils/ItemList").default<import("mithril").Children>;
+        userControls(): import("../common/utils/ItemList").default<import("mithril").Children>;
+        moderationControls(user: import("../common/models/User").default): import("../common/utils/ItemList").default<import("mithril").Children>;
+        destructiveControls(user: import("../common/models/User").default): import("../common/utils/ItemList").default<import("mithril").Children>;
+        deleteAction(user: import("../common/models/User").default): void;
+        showDeletionAlert(user: import("../common/models/User").default, type: string): void;
+        editAction(user: import("../common/models/User").default): void;
     };
     'utils/Pane': typeof Pane;
     'utils/BasicEditorDriver': typeof BasicEditorDriver;

js/dist-typings/forum/components/AvatarEditor.d.ts

@@ -24,36 +24,36 @@ export default class AvatarEditor extends Component<import("../../common/Compone
     /**
      * Get the items in the edit avatar dropdown menu.
      *
-     * @return {ItemList}
+     * @return {ItemList<import('mithril').Children>}
      */
-    controlItems(): ItemList<any>;
+    controlItems(): ItemList<import('mithril').Children>;
     /**
      * Enable dragover style
      *
-     * @param {Event} e
+     * @param {DragEvent} e
      */
-    enableDragover(e: Event): void;
+    enableDragover(e: DragEvent): void;
     /**
      * Disable dragover style
      *
-     * @param {Event} e
+     * @param {DragEvent} e
      */
-    disableDragover(e: Event): void;
+    disableDragover(e: DragEvent): void;
     /**
      * Upload avatar when file is dropped into dropzone.
      *
-     * @param {Event} e
+     * @param {DragEvent} e
      */
-    dropUpload(e: Event): void;
+    dropUpload(e: DragEvent): void;
     /**
      * If the user doesn't have an avatar, there's no point in showing the
      * controls dropdown, because only one option would be viable: uploading.
      * Thus, when the avatar editor's dropdown toggle button is clicked, we prompt
      * the user to upload an avatar immediately.
      *
-     * @param {Event} e
+     * @param {MouseEvent} e
      */
-    quickUpload(e: Event): void;
+    quickUpload(e: MouseEvent): void;
     /**
      * Upload avatar using file picker
      */
@@ -72,17 +72,17 @@ export default class AvatarEditor extends Component<import("../../common/Compone
      * After a successful upload/removal, push the updated user data into the
      * store, and force a recomputation of the user's avatar color.
      *
-     * @param {Object} response
+     * @param {object} response
      * @protected
      */
-    protected success(response: Object): void;
+    protected success(response: object): void;
     /**
      * If avatar upload/removal fails, stop loading.
      *
-     * @param {Object} response
+     * @param {object} response
      * @protected
      */
-    protected failure(response: Object): void;
+    protected failure(response: object): void;
 }
 import Component from "../../common/Component";
 import ItemList from "../../common/utils/ItemList";

js/dist-typings/forum/components/CommentPost.d.ts

@@ -32,9 +32,9 @@ export default class CommentPost extends Post {
     /**
      * Build an item list for the post's header.
      *
-     * @return {ItemList}
+     * @return {ItemList<import('mithril').Children>}
      */
-    headerItems(): ItemList<any>;
+    headerItems(): ItemList<import('mithril').Children>;
 }
 import Post from "./Post";
 import ItemList from "../../common/utils/ItemList";

js/dist-typings/forum/components/Composer.d.ts

@@ -21,9 +21,9 @@ export default class Composer extends Component<import("../../common/Component")
     /**
      * Resize the composer according to mouse movement.
      *
-     * @param {Event} e
+     * @param {MouseEvent} e
      */
-    onmousemove(e: Event): void;
+    onmousemove(e: MouseEvent): void;
     /**
      * Finish resizing the composer when the mouse is released.
      */
@@ -83,23 +83,23 @@ export default class Composer extends Component<import("../../common/Component")
     /**
      * Build an item list for the composer's controls.
      *
-     * @return {ItemList}
+     * @return {ItemList<import('mithril').Children>}
      */
-    controlItems(): ItemList<any>;
+    controlItems(): ItemList<import('mithril').Children>;
     /**
      * Initialize default Composer height.
      */
     initializeHeight(): void;
     /**
      * Default height of the Composer in case none is saved.
-     * @returns {Integer}
+     * @returns {number}
      */
-    defaultHeight(): any;
+    defaultHeight(): number;
     /**
      * Save a new Composer height and update the DOM.
-     * @param {Integer} height
+     * @param {number} height
      */
-    changeHeight(height: any): void;
+    changeHeight(height: number): void;
 }
 import Component from "../../common/Component";
 import ItemList from "../../common/utils/ItemList";

js/dist-typings/forum/components/ComposerBody.d.ts

@@ -27,15 +27,15 @@ export default class ComposerBody extends Component<import("../../common/Compone
     /**
      * Check if there is any unsaved data.
      *
-     * @return {String}
+     * @return {boolean}
      */
-    hasChanges(): string;
+    hasChanges(): boolean;
     /**
      * Build an item list for the composer's header.
      *
-     * @return {ItemList}
+     * @return {ItemList<import('mithril').Children>}
      */
-    headerItems(): ItemList<any>;
+    headerItems(): ItemList<import('mithril').Children>;
     /**
      * Handle the submit event of the text editor.
      *

js/dist-typings/forum/components/DiscussionComposer.d.ts

@@ -21,14 +21,14 @@ export default class DiscussionComposer extends ComposerBody {
      * Handle the title input's keydown event. When the return key is pressed,
      * move the focus to the start of the text editor.
      *
-     * @param {Event} e
+     * @param {KeyboardEvent} e
      */
-    onkeydown(e: Event): void;
+    onkeydown(e: KeyboardEvent): void;
     /**
      * Get the data to submit to the server when the discussion is saved.
      *
-     * @return {Object}
+     * @return {Record<string, unknown>}
      */
-    data(): Object;
+    data(): Record<string, unknown>;
 }
 import ComposerBody from "./ComposerBody";

js/dist-typings/forum/components/DiscussionHero.d.ts

@@ -10,9 +10,9 @@ export default class DiscussionHero extends Component<import("../../common/Compo
     /**
      * Build an item list for the contents of the discussion hero.
      *
-     * @return {ItemList}
+     * @return {ItemList<import('mithril').Children>}
      */
-    items(): ItemList<any>;
+    items(): ItemList<import('mithril').Children>;
 }
 import Component from "../../common/Component";
 import ItemList from "../../common/utils/ItemList";

js/dist-typings/forum/components/DiscussionListItem.d.ts

@@ -23,7 +23,7 @@ export default class DiscussionListItem extends Component<import("../../common/C
     /**
      * Determine whether or not the discussion is currently being viewed.
      *
-     * @return {Boolean}
+     * @return {boolean}
      */
     active(): boolean;
     /**
@@ -31,14 +31,14 @@ export default class DiscussionListItem extends Component<import("../../common/C
      * should be displayed instead of information about the most recent reply to
      * the discussion.
      *
-     * @return {Boolean}
+     * @return {boolean}
      */
     showFirstPost(): boolean;
     /**
      * Determine whether or not the number of replies should be shown instead of
      * the number of unread posts.
      *
-     * @return {Boolean}
+     * @return {boolean}
      */
     showRepliesCount(): boolean;
     /**
@@ -49,9 +49,9 @@ export default class DiscussionListItem extends Component<import("../../common/C
      * Build an item list of info for a discussion listing. By default this is
      * just the first/last post indicator.
      *
-     * @return {ItemList}
+     * @return {ItemList<import('mithril').Children>}
      */
-    infoItems(): ItemList<any>;
+    infoItems(): ItemList<import('mithril').Children>;
     replyCountItem(): JSX.Element;
 }
 import Component from "../../common/Component";

js/dist-typings/forum/components/DiscussionPage.d.ts

@@ -3,6 +3,7 @@ import Page, { IPageAttrs } from '../../common/components/Page';
 import ItemList from '../../common/utils/ItemList';
 import PostStreamState from '../states/PostStreamState';
 import Discussion from '../../common/models/Discussion';
+import { ApiResponseSingle } from '../../common/Store';
 export interface IDiscussionPageAttrs extends IPageAttrs {
     id: string;
     near?: number;
@@ -30,34 +31,24 @@ export default class DiscussionPage<CustomAttrs extends IDiscussionPageAttrs = I
     view(): JSX.Element;
     /**
      * List of components shown while the discussion is loading.
-     *
-     * @returns {ItemList}
      */
-    loadingItems(): ItemList<unknown>;
+    loadingItems(): ItemList<Mithril.Children>;
     /**
      * Function that renders the `sidebarItems` ItemList.
-     *
-     * @returns {import('mithril').Children}
      */
-    sidebar(): JSX.Element;
+    sidebar(): Mithril.Children;
     /**
      * Renders the discussion's hero.
-     *
-     * @returns {import('mithril').Children}
      */
-    hero(): JSX.Element;
+    hero(): Mithril.Children;
     /**
      * List of items rendered as the main page content.
-     *
-     * @returns {ItemList}
      */
-    pageContent(): ItemList<unknown>;
+    pageContent(): ItemList<Mithril.Children>;
     /**
      * List of items rendered inside the main page content container.
-     *
-     * @returns {ItemList}
      */
-    mainContent(): ItemList<unknown>;
+    mainContent(): ItemList<Mithril.Children>;
     /**
      * Load the discussion from the API or use the preloaded one.
      */
@@ -65,23 +56,16 @@ export default class DiscussionPage<CustomAttrs extends IDiscussionPageAttrs = I
     /**
      * Get the parameters that should be passed in the API request to get the
      * discussion.
-     *
-     * @return {Object}
      */
-    requestParams(): {
-        bySlug: boolean;
-        page: {
-            near: number;
-        };
-    };
+    requestParams(): Record<string, unknown>;
     /**
      * Initialize the component to display the given discussion.
      */
-    show(discussion: Discussion): void;
+    show(discussion: ApiResponseSingle<Discussion>): void;
     /**
      * Build an item list for the contents of the sidebar.
      */
-    sidebarItems(): ItemList<Mithril.Vnode<{}, {}>>;
+    sidebarItems(): ItemList<Mithril.Children>;
     /**
      * When the posts that are visible in the post stream change (i.e. the user
      * scrolls up or down), then we update the URL and mark the posts as read.

js/dist-typings/forum/components/EditPostComposer.d.ts

@@ -17,8 +17,8 @@ export default class EditPostComposer extends ComposerBody {
     /**
      * Get the data to submit to the server when the post is saved.
      *
-     * @return {Object}
+     * @return {Record<string, unknown>}
      */
-    data(): Object;
+    data(): Record<string, unknown>;
 }
 import ComposerBody from "./ComposerBody";

js/dist-typings/forum/components/EventPost.d.ts

@@ -13,27 +13,27 @@ export default class EventPost extends Post {
     /**
      * Get the name of the event icon.
      *
-     * @return {String}
+     * @return {string}
      */
     icon(): string;
     /**
      * Get the description text for the event.
      *
-     * @param {Object} data
-     * @return {String|Object} The description to render in the DOM
+     * @param {Record<string, unknown>} data
+     * @return {import('mithril').Children} The description to render in the DOM
      */
-    description(data: Object): string | Object;
+    description(data: Record<string, unknown>): import('mithril').Children;
     /**
      * Get the translation key for the description of the event.
      *
-     * @return {String}
+     * @return {string}
      */
     descriptionKey(): string;
     /**
      * Get the translation data for the description of the event.
      *
-     * @return {Object}
+     * @return {Record<string, unknown>}
      */
-    descriptionData(): Object;
+    descriptionData(): Record<string, unknown>;
 }
 import Post from "./Post";

js/dist-typings/forum/components/ForgotPasswordModal.d.ts

@@ -1,25 +1,25 @@
+/// <reference path="../../@types/translator-icu-rich.d.ts" />
+import Modal, { IInternalModalAttrs } from '../../common/components/Modal';
+import Stream from '../../common/utils/Stream';
+import Mithril from 'mithril';
+import RequestError from '../../common/utils/RequestError';
+export interface IForgotPasswordModalAttrs extends IInternalModalAttrs {
+    email?: string;
+}
 /**
  * The `ForgotPasswordModal` component displays a modal which allows the user to
  * enter their email address and request a link to reset their password.
- *
- * ### Attrs
- *
- * - `email`
  */
-export default class ForgotPasswordModal extends Modal<import("../../common/components/Modal").IInternalModalAttrs> {
-    constructor();
+export default class ForgotPasswordModal<CustomAttrs extends IForgotPasswordModalAttrs = IForgotPasswordModalAttrs> extends Modal<CustomAttrs> {
     /**
      * The value of the email input.
-     *
-     * @type {Function}
      */
-    email: Function | undefined;
-    /**
-     * Whether or not the password reset email was sent successfully.
-     *
-     * @type {Boolean}
-     */
-    success: boolean | undefined;
-    alert: any;
+    email: Stream<string>;
+    success: boolean;
+    oninit(vnode: Mithril.Vnode<CustomAttrs, this>): void;
+    className(): string;
+    title(): import("@askvortsov/rich-icu-message-formatter").NestedStringArray;
+    content(): JSX.Element;
+    onsubmit(e: SubmitEvent): void;
+    onerror(error: RequestError): void;
 }
-import Modal from "../../common/components/Modal";

js/dist-typings/forum/components/HeaderPrimary.d.ts

@@ -7,9 +7,9 @@ export default class HeaderPrimary extends Component<import("../../common/Compon
     /**
      * Build an item list for the controls.
      *
-     * @return {ItemList}
+     * @return {ItemList<import('mithril').Children>}
      */
-    items(): ItemList<any>;
+    items(): ItemList<import('mithril').Children>;
 }
 import Component from "../../common/Component";
 import ItemList from "../../common/utils/ItemList";

js/dist-typings/forum/components/IndexPage.d.ts

@@ -10,49 +10,47 @@ export default class IndexPage extends Page<import("../../common/components/Page
     /**
      * Get the component to display as the hero.
      *
-     * @return {MithrilComponent}
+     * @return {import('mithril').Children}
      */
-    hero(): any;
+    hero(): import('mithril').Children;
     /**
      * Build an item list for the sidebar of the index page. By default this is a
      * "New Discussion" button, and then a DropdownSelect component containing a
      * list of navigation items.
      *
-     * @return {ItemList}
+     * @return {ItemList<import('mithril').Children>}
      */
-    sidebarItems(): ItemList<any>;
+    sidebarItems(): ItemList<import('mithril').Children>;
     /**
      * Build an item list for the navigation in the sidebar of the index page. By
      * default this is just the 'All Discussions' link.
      *
-     * @return {ItemList}
+     * @return {ItemList<import('mithril').Children>}
      */
-    navItems(): ItemList<any>;
+    navItems(): ItemList<import('mithril').Children>;
     /**
      * Build an item list for the part of the toolbar which is concerned with how
      * the results are displayed. By default this is just a select box to change
      * the way discussions are sorted.
      *
-     * @return {ItemList}
+     * @return {ItemList<import('mithril').Children>}
      */
-    viewItems(): ItemList<any>;
+    viewItems(): ItemList<import('mithril').Children>;
     /**
      * Build an item list for the part of the toolbar which is about taking action
      * on the results. By default this is just a "mark all as read" button.
      *
-     * @return {ItemList}
+     * @return {ItemList<import('mithril').Children>}
      */
-    actionItems(): ItemList<any>;
+    actionItems(): ItemList<import('mithril').Children>;
     /**
      * Open the composer for a new discussion or prompt the user to login.
      *
-     * @return {Promise}
+     * @return {Promise<void>}
      */
-    newDiscussionAction(): Promise<any>;
+    newDiscussionAction(): Promise<void>;
     /**
      * Mark all discussions as read.
-     *
-     * @return void
      */
     markAllAsRead(): void;
 }

js/dist-typings/forum/components/LogInButtons.d.ts

@@ -6,10 +6,9 @@ export default class LogInButtons extends Component<import("../../common/Compone
     /**
      * Build a list of LogInButton components.
      *
-     * @return {ItemList}
-     * @public
+     * @return {ItemList<import('mithril').Children>}
      */
-    public items(): ItemList<any>;
+    items(): ItemList<import('mithril').Children>;
 }
 import Component from "../../common/Component";
 import ItemList from "../../common/utils/ItemList";

js/dist-typings/forum/components/LogInModal.d.ts

@@ -1,48 +1,45 @@
-/**
- * The `LogInModal` component displays a modal dialog with a login form.
- *
- * ### Attrs
- *
- * - `identification`
- * - `password`
- */
-export default class LogInModal extends Modal<import("../../common/components/Modal").IInternalModalAttrs> {
-    constructor();
+/// <reference path="../../@types/translator-icu-rich.d.ts" />
+import Modal, { IInternalModalAttrs } from '../../common/components/Modal';
+import ItemList from '../../common/utils/ItemList';
+import Stream from '../../common/utils/Stream';
+import type Mithril from 'mithril';
+import RequestError from '../../common/utils/RequestError';
+export interface ILoginModalAttrs extends IInternalModalAttrs {
+    identification?: string;
+    password?: string;
+    remember?: boolean;
+}
+export default class LogInModal<CustomAttrs extends ILoginModalAttrs = ILoginModalAttrs> extends Modal<CustomAttrs> {
     /**
      * The value of the identification input.
-     *
-     * @type {Function}
      */
-    identification: Function | undefined;
+    identification: Stream<string>;
     /**
      * The value of the password input.
-     *
-     * @type {Function}
      */
-    password: Function | undefined;
+    password: Stream<string>;
     /**
      * The value of the remember me input.
-     *
-     * @type {Function}
      */
-    remember: Function | undefined;
+    remember: Stream<boolean>;
+    oninit(vnode: Mithril.Vnode<CustomAttrs, this>): void;
+    className(): string;
+    title(): import("@askvortsov/rich-icu-message-formatter").NestedStringArray;
+    content(): JSX.Element[];
     body(): JSX.Element[];
-    fields(): ItemList<any>;
+    fields(): ItemList<unknown>;
     footer(): (string | JSX.Element)[];
     /**
      * Open the forgot password modal, prefilling it with an email if the user has
      * entered one.
-     *
-     * @public
      */
-    public forgotPassword(): void;
+    forgotPassword(): void;
     /**
      * Open the sign up modal, prefilling it with an email/username/password if
      * the user has entered one.
-     *
-     * @public
      */
-    public signUp(): void;
+    signUp(): void;
+    onready(): void;
+    onsubmit(e: SubmitEvent): void;
+    onerror(error: RequestError): void;
 }
-import Modal from "../../common/components/Modal";
-import ItemList from "../../common/utils/ItemList";

js/dist-typings/forum/components/Notification.d.ts

@@ -13,31 +13,31 @@ export default class Notification extends Component<import("../../common/Compone
     /**
      * Get the name of the icon that should be displayed in the notification.
      *
-     * @return {String}
+     * @return {string}
      * @abstract
      */
     icon(): string;
     /**
      * Get the URL that the notification should link to.
      *
-     * @return {String}
+     * @return {string}
      * @abstract
      */
     href(): string;
     /**
      * Get the content of the notification.
      *
-     * @return {VirtualElement}
+     * @return {import('mithril').Children}
      * @abstract
      */
-    content(): any;
+    content(): import('mithril').Children;
     /**
      * Get the excerpt of the notification.
      *
-     * @return {VirtualElement}
+     * @return {import('mithril').Children}
      * @abstract
      */
-    excerpt(): any;
+    excerpt(): import('mithril').Children;
     /**
      * Mark the notification as read.
      */

js/dist-typings/forum/components/NotificationGrid.d.ts

@@ -11,47 +11,55 @@ export default class NotificationGrid extends Component<import("../../common/Com
     /**
      * Information about the available notification methods.
      *
-     * @type {Array}
+     * @type {({ name: string, icon: string, label: import('mithril').Children })[]}
      */
-    methods: any[] | undefined;
+    methods: {
+        name: string;
+        icon: string;
+        label: import('mithril').Children;
+    }[] | undefined;
     /**
      * A map of which notification checkboxes are loading.
      *
-     * @type {Object}
+     * @type {Record<string, boolean>}
      */
-    loading: Object | undefined;
+    loading: Record<string, boolean> | undefined;
     /**
      * Information about the available notification types.
      *
-     * @type {Array}
+     * @type {({ name: string, icon: string, label: import('mithril').Children })[]}
      */
-    types: any[] | undefined;
+    types: {
+        name: string;
+        icon: string;
+        label: import('mithril').Children;
+    }[] | undefined;
     /**
      * Toggle the state of the given preferences, based on the value of the first
      * one.
      *
-     * @param {Array} keys
+     * @param {string[]} keys
      */
-    toggle(keys: any[]): void;
+    toggle(keys: string[]): void;
     /**
      * Toggle all notification types for the given method.
      *
-     * @param {String} method
+     * @param {string} method
      */
     toggleMethod(method: string): void;
     /**
      * Toggle all notification methods for the given type.
      *
-     * @param {String} type
+     * @param {string} type
      */
     toggleType(type: string): void;
     /**
      * Get the name of the preference key for the given notification type-method
      * combination.
      *
-     * @param {String} type
-     * @param {String} method
-     * @return {String}
+     * @param {string} type
+     * @param {string} method
+     * @return {string}
      */
     preferenceKey(type: string, method: string): string;
     /**
@@ -63,9 +71,13 @@ export default class NotificationGrid extends Component<import("../../common/Com
      * - `icon` The icon to display in the column header.
      * - `label` The label to display in the column header.
      *
-     * @return {ItemList}
+     * @return {ItemList<{ name: string, icon: string, label: import('mithril').Children }>}
      */
-    notificationMethods(): ItemList<any>;
+    notificationMethods(): ItemList<{
+        name: string;
+        icon: string;
+        label: import('mithril').Children;
+    }>;
     /**
      * Build an item list for the notification types to display in the grid.
      *
@@ -75,9 +87,14 @@ export default class NotificationGrid extends Component<import("../../common/Com
      * - `icon` The icon to display in the notification grid row.
      * - `label` The label to display in the notification grid row.
      *
-     * @return {ItemList}
+     * @return {ItemList<{ name: string, icon: string, label: import('mithril').Children}>}
      */
-    notificationTypes(): ItemList<any>;
+    notificationTypes(): ItemList<{
+        name: string;
+        icon: string;
+        label: import('mithril').Children;
+    }>;
 }
 import Component from "../../common/Component";
 import ItemList from "../../common/utils/ItemList";
+import icon from "../../common/helpers/icon";

js/dist-typings/forum/components/NotificationList.d.ts

@@ -4,6 +4,7 @@
  */
 export default class NotificationList extends Component<import("../../common/Component").ComponentAttrs, undefined> {
     constructor();
+    controlItems(): ItemList<any>;
     content(state: any): any;
     $notifications: JQuery<HTMLElement> | undefined;
     $scrollParent: JQuery<HTMLElement> | JQuery<Window & typeof globalThis> | undefined;
@@ -16,3 +17,4 @@ export default class NotificationList extends Component<import("../../common/Com
     inPanel(): boolean;
 }
 import Component from "../../common/Component";
+import ItemList from "../../common/utils/ItemList";

js/dist-typings/forum/components/NotificationsDropdown.d.ts

@@ -1,8 +1,8 @@
 export default class NotificationsDropdown extends Dropdown {
     onclick(): void;
     goToRoute(): void;
-    getUnreadCount(): any;
-    getNewCount(): any;
+    getUnreadCount(): number | undefined;
+    getNewCount(): number | undefined;
     menuClick(e: any): void;
 }
 import Dropdown from "../../common/components/Dropdown";

js/dist-typings/forum/components/Post.d.ts

@@ -25,34 +25,34 @@ export default class Post extends Component<import("../../common/Component").Com
     /**
      * Get attributes for the post element.
      *
-     * @return {Object}
+     * @return {Record<string, unknown>}
      */
-    elementAttrs(): Object;
+    elementAttrs(): Record<string, unknown>;
     /**
      * Get the post's content.
      *
-     * @return {Array}
+     * @return {import('mithril').Children}
      */
-    content(): any[];
+    content(): import('mithril').Children;
     /**
      * Get the post's classes.
      *
-     * @param existing string
+     * @param {string} existing
      * @returns {string[]}
      */
-    classes(existing: any): string[];
+    classes(existing: string): string[];
     /**
      * Build an item list for the post's actions.
      *
-     * @return {ItemList}
+     * @return {ItemList<import('mithril').Children>}
      */
-    actionItems(): ItemList<any>;
+    actionItems(): ItemList<import('mithril').Children>;
     /**
      * Build an item list for the post's footer.
      *
-     * @return {ItemList}
+     * @return {ItemList<import('mithril').Children>}
      */
-    footerItems(): ItemList<any>;
+    footerItems(): ItemList<import('mithril').Children>;
 }
 import Component from "../../common/Component";
 import SubtreeRetainer from "../../common/utils/SubtreeRetainer";