Fix dead URLs

It fixes whitespace on left when being highlighted when hovering on macOS (OS selection button on top)
The commit also unifies the way top menu buttons are displayed by reusing `MenuOptionListItem`s (renamed from `SelectableOption`) and `MenuOptionList`. This ensures right and consistent behavior.
Finally it fixes `enabled` property in menu option setting disabled state instead.

.github/ISSUE_TEMPLATE/1-bug-report-scripts.md

@@ -11,9 +11,11 @@ Please fill in as much of the template below as you're able.
 As a small open source project with small community, it can sometimes take a long time for issues to be addressed so please be patient. 
 -->
 
-### Describe the bug
+### Description
 
-<!-- A clear and concise description of what the bug is. -->
+<!--
+A clear and concise description of what the bug is.
+-->
 
 ### OS
 
@@ -23,14 +25,32 @@ On Windows you can find it using "Start button" > "Settings" > "System" > "About
 On macOS you can find it using "Apple menu (top left corner)" > "About This Mac".
 -->
 
-### Screenshots
+### Reproduction steps
 
-<!-- If applicable, add screenshots to help explain your problem. -->
+<!--
+How can the bug be recreated?
+It's the most important information in the bug report. Bugs that cannot be reproduced cannot be fixed and verified.
+E.g.
+    1. Go to '...'
+    2. Click on '....'
+    3. Scroll down to '....'
+    4. See error
+-->
 
 ### Scripts
 
-<!-- Which scripts did you execute? If applicable, please paste the executed scripts or attach the generated privacy.sexy file . -->
+<!--
+If applicable, please attach the generated privacy.sexy file instead of copy pasting which becomes too long.
+-->
+
+### Screenshots
+
+<!--
+If applicable, add screenshots to help explain your problem.
+-->
 
 ### Additional information
 
-<!-- Add any other context about the problem here. -->
+<!--
+If applicable, add any other context about the problem here.
+-->

.github/ISSUE_TEMPLATE/2-bug-report-generic.md

@@ -11,13 +11,16 @@ Please fill in as much of the template below as you're able.
 As a small open source project with small community, it can sometimes take a long time for issues to be addressed so please be patient. 
 -->
 
-### Describe the bug
+### Description
 
-<!-- A clear and concise description of what the bug is. -->
+<!--
+A clear and concise description of what the bug is.
+-->
 
-### To Reproduce
+### Reproduction steps
 
-<!-- 
+<!--
+It's the most important information in the bug report. Bugs that cannot be reproduced cannot be fixed and verified.
 Steps to reproduce the behavior:
 1. Go to '...'
 2. Click on '....'
@@ -41,12 +44,12 @@ If applicable, add screenshots to help explain your problem.
 
 <!--
 If applicable, mention how you were using privacy.sexy when the bug was encountered:
-- Web (on Desktop or mobile?)
-- Or desktop (Windows, macOS or Linux?)
+   - Web (on Desktop or mobile?)
+   - Or desktop (Windows, macOS or Linux?)
 -->
 
 ### Additional context
 
 <!--
-Add any other context about the problem here.
+If applicable, add any other context about the problem here.
 -->

.github/ISSUE_TEMPLATE/3-feature-request.md

@@ -0,0 +1,36 @@
+---
+name: Feature request
+about: Suggest an idea for privacy.sexy
+labels: enhancement
+---
+
+<!--
+Thank you for suggesting an idea to improve privacy better 🤗.
+Please fill in as much of the template below as you're able.
+-->
+
+### Problem description
+
+<!--
+What are we trying to solve?
+Please add a clear and concise description of the problem you are seeking to solve with this feature request.
+E.g. I'm always frustrated when [...]
+-->
+
+### Proposed solution
+
+<!--
+Describe the solution you'd like in a clear and concise manner.
+-->
+
+### Alternatives considered
+
+<!--
+A clear and concise description of any alternative solutions or features you've considered.
+-->
+
+### Additional information
+
+<!--
+If applicable, add any other context or screenshots about the feature request here.
+-->

.github/ISSUE_TEMPLATE/3-feature_request.md

@@ -1,27 +0,0 @@
----
-name: Feature request
-about: Suggest an idea for privacy.sexy
-labels: enhancement
----
-
-<!--
-Thank you for suggesting an idea to make privacy better. 🤗
-
-Please fill in as much of the template below as you're able.
--->
-
-### Problem Description
-
-<!-- Please add a clear and concise description of the problem you are seeking to solve with this feature request. Ex. I'm always frustrated when [...] -->
-
-### Proposed solution
-
-<!-- Describe the solution you'd like in a clear and concise manner. -->
-
-### Alternatives considered
-
-<!-- A clear and concise description of any alternative solutions or features you've considered. -->
-
-### Additional information
-
-<!-- Add any other context or screenshots about the feature request here. -->

.github/ISSUE_TEMPLATE/4-new-script-suggestion.md

@@ -0,0 +1,73 @@
+---
+name: New script suggestion
+about: Suggest a new script for privacy.sexy
+labels: enhancement
+---
+
+<!--
+Thank you for suggesting an script to make privacy better. 🤗 
+Please fill in as much of the template below as you're able.
+You could alternatively send a PR directly (see CONTRIBUTING.md).
+-->
+
+### OS
+
+<!--
+Which OS will the new script configure?
+Either "Windows" or "macOS".
+-->
+
+### Name
+
+<!--
+The name of the script.
+It should start with an imperative noun such as "disable", "turn off" , "clear"...
+E.g. "Disable webcam telemetry"
+-->
+
+### Script code
+
+<!--
+Code that will be executed when script is selected.
+Try to keep it as simple and backwards-compatible as possible.
+Allowed languages: 
+  - macOS: bash (sh)
+  - Windows: PowerShell (ps1) or batchfile
+    - 💡 Prioritize the one that's simpler, batchfile if similar.
+-->
+
+### Revert code
+
+<!--
+If applicable, add code that will revert the script code to its original (OS default) state.
+It may require additional time, but it's much appreciated by the community.
+Leave blank if the script is nonreversible (e.g. when clearing data without backup).
+-->
+
+### Suggested category
+
+<!--
+If applicable, suggest one more multiple suitable parent category of script.
+A category is the item where the script will be presented under.
+Most likely there already is a category for the script, so check the existing categories.
+If you're unsure, leave blank and maintainer(s) will choose one.
+-->
+
+### Suggested recommendation level
+
+<!--
+If applicable, suggest recommending the script or not recommending at all.
+A script should be only recommended if it'll be safe for your grandmother to run.
+So you have three options here:
+  STANDARD: Non-breaking scripts that does not limit any functionality.
+  STRICT: Scripts that can break certain functionality but not intrusive to common daily OS usage.
+  NONE: Script is not recommended for newbies at all, only those who knows what's going on should select it.
+If you're unsure, leave blank and maintainer(s) will choose one.
+-->
+
+### Additional documentation/references
+
+<!-- 
+If applicable, refer to documentation that should show up on the script description.
+Sources (URLs) should be as high quality as possible e.g. vendor documentation is favored over user forums.
+-->

.github/workflows/deploy-desktop.yaml

@@ -26,7 +26,9 @@ jobs:
       - name: Install dependencies
         run: npm ci
       - name: Run tests
-        run: npm run test:unit
+        run: |
+          npm run test:unit
+          npm run test:integration
       - name: Publish desktop app
         run: npm run electron:build -- -p always # https://nklayman.github.io/vue-cli-plugin-electron-builder/guide/recipes.html#upload-release-to-github
         env:

.github/workflows/deploy-site.yaml

@@ -90,7 +90,9 @@ jobs:
         working-directory: site
       -
         name: "App: Run tests"
-        run: npm run test:unit
+        run: |
+          npm run test:unit
+          npm run test:integration
         working-directory: site
       - 
         name: "App: Build"

.github/workflows/quality-checks.yaml

@@ -13,6 +13,7 @@ jobs:
           - npm run lint:md
           - npm run lint:md:relative-urls
           - npm run lint:md:consistency
+      fail-fast: false # So it continues with other commands if one fails
     steps:
       - name: Checkout
         uses: actions/checkout@v2

.github/workflows/security-checks.yaml

@@ -5,7 +5,7 @@ on:
   pull_request:
     paths: [ '/package.json', '/package-lock.json' ] # Allow PRs to be green if they do not introduce dependency change
   schedule:
-    - cron: '0 0 * * 0'
+    - cron: '0 0 * * 0' # at 00:00 on every Sunday
 
 jobs:
   npm-audit:

.github/workflows/test.yaml

@@ -1,12 +1,17 @@
 name: Test
 
-on: [ push, pull_request ]
+on:
+  push:
+  pull_request:
+  schedule: # for integration tests
+    - cron: '0 0 * * 0' # at 00:00 on every Sunday
 
 jobs:
   run-tests:
     strategy:
       matrix:
         os: [macos, ubuntu, windows]
+      fail-fast: false # So it still runs on other OSes if one of them fails
     runs-on: ${{ matrix.os }}-latest
     steps:
       -
@@ -21,5 +26,8 @@ jobs:
         name: Install dependencies
         run: npm ci
       -
-        name: Run tests
+        name: Run unit tests
         run: npm run test:unit
+      -
+        name: Run integration tests
+        run: npm run test:integration

CHANGELOG.md

@@ -1,5 +1,35 @@
 # Changelog
 
+## 0.10.2 (2021-04-19)
+
+* in CI/CD, run other tests/check even if one of them fails | [5c43965](https://github.com/undergroundwires/privacy.sexy/commit/5c43965f0bc44f991ada7d3bad68937a80665dc3)
+* fix desktop initial window size being bigger than current display size on smaller Linux/Windows screens | [02bdc4c](https://github.com/undergroundwires/privacy.sexy/commit/02bdc4cf0426c452f3fc9af52b819ca9b0757290)
+* refactor extra code, duplicates, complexity | [00d8e55](https://github.com/undergroundwires/privacy.sexy/commit/00d8e551db001247fadfb6f6af7a4c5ce19a9e64)
+* improve disabling ads and marketing #65 | [040ed27](https://github.com/undergroundwires/privacy.sexy/commit/040ed2701c4a468749901f4c5369b221bc0973c4)
+* document breaking behavior in script name #64 | [b1ed3ce](https://github.com/undergroundwires/privacy.sexy/commit/b1ed3ce55f2d003cad1ead23e674aa66d4eb5802)
+* add module alias '@tests/' | [60c8061](https://github.com/undergroundwires/privacy.sexy/commit/60c80611eab227791fabb883caf93418cef5fd00)
+* document chromium warning for policy changes | [aea04e5](https://github.com/undergroundwires/privacy.sexy/commit/aea04e5f7cd48fbb9b407b68ade75575a6064c82)
+* fix script revert activating recommendation level | [a2f1085](https://github.com/undergroundwires/privacy.sexy/commit/a2f10857e2a8debb3ce01f79b0dfbe8649ea9a17)
+* fix typo and dead URL in Windows scripts (#70) | [8141a01](https://github.com/undergroundwires/privacy.sexy/commit/8141a01ef798331b4d82f5ca95f7b18df4f6f912)
+* fix vue warning for undefined property during render | [b25b8cc](https://github.com/undergroundwires/privacy.sexy/commit/b25b8cc8052655af70b0695c6c3085974d783bb6)
+
+[compare](https://github.com/undergroundwires/privacy.sexy/compare/0.10.1...0.10.2)
+
+## 0.10.1 (2021-03-25)
+
+* refactor script compilation to make it easy to add new expressions #41 #53 | [646db90](https://github.com/undergroundwires/privacy.sexy/commit/646db9058541cebd0af437554de04fdc6bb63a6e)
+* restructure presentation layer | [f3c7413](https://github.com/undergroundwires/privacy.sexy/commit/f3c7413f529be4a00dba7b0ab23904b48ea13a35)
+* fix a test where "it" is not used inside "describe" | [1a5f920](https://github.com/undergroundwires/privacy.sexy/commit/1a5f92021f7423cd039f8f5326cd6f99b355c962)
+* bump dependencies to latest | [1f515e7](https://github.com/undergroundwires/privacy.sexy/commit/1f515e7be525291c960ccb71db05312db6da53f5)
+* fix throttle function not being able to run with argument(s) | [1935db1](https://github.com/undergroundwires/privacy.sexy/commit/1935db10192051401ab00ca2cd767955d0d3b866)
+* fix fs module hanging not allowing code to run | [5f527a0](https://github.com/undergroundwires/privacy.sexy/commit/5f527a00cf225d3e74b3f6577d6e2456e919de24)
+* refactor all modals to use same dialog component | [6f46cdb](https://github.com/undergroundwires/privacy.sexy/commit/6f46cdb4ed49a8941c6c0dde5c5e2a816c06daef)
+* fix safari cleanup scripts that are not working on modern versions | [05932c5](https://github.com/undergroundwires/privacy.sexy/commit/05932c5a36446d551c5bc811165e3295fbe15e3f)
+* refactor features to use shared functions #41 | [ac2249f](https://github.com/undergroundwires/privacy.sexy/commit/ac2249f25664827d8a6d2c7ebd659ccf126b0cde)
+* increase performance by polyfilling ResizeObserver only if required | [448e378](https://github.com/undergroundwires/privacy.sexy/commit/448e378dc4501f9de69af63634c87d0e5060bf52)
+
+[compare](https://github.com/undergroundwires/privacy.sexy/compare/0.10.0...0.10.1)
+
 ## 0.10.0 (2021-03-02)
 
 * allow functions to call other functions #53 | [7661575](https://github.com/undergroundwires/privacy.sexy/commit/7661575573c6d3e8f4bc28bfa7a124a764c72ef9)

README.md

@@ -16,7 +16,7 @@
 
 - Online version at [https://privacy.sexy](https://privacy.sexy)
   - 💡 No need to run any compiled software on your computer.
-- Alternatively download offline version for [Windows](https://github.com/undergroundwires/privacy.sexy/releases/download/0.10.0/privacy.sexy-Setup-0.10.0.exe), [macOS](https://github.com/undergroundwires/privacy.sexy/releases/download/0.10.0/privacy.sexy-0.10.0.dmg) or [Linux](https://github.com/undergroundwires/privacy.sexy/releases/download/0.10.0/privacy.sexy-0.10.0.AppImage).
+- Alternatively download offline version for [Windows](https://github.com/undergroundwires/privacy.sexy/releases/download/0.10.2/privacy.sexy-Setup-0.10.2.exe), [macOS](https://github.com/undergroundwires/privacy.sexy/releases/download/0.10.2/privacy.sexy-0.10.2.dmg) or [Linux](https://github.com/undergroundwires/privacy.sexy/releases/download/0.10.2/privacy.sexy-0.10.2.AppImage).
   - 💡 Single click to execute your script.
 - ❗ Come back regularly to apply latest version for stronger privacy and security.
 
@@ -34,17 +34,20 @@
 
 ## Extend scripts
 
-1. Fork the repository
-2. Add more scripts in respective script collection in [collections](src/application/collections/) folder.
-   - 📖 If you're unsure about the syntax you can refer to the [collection files | documentation](docs/collection-files.md).
-   - 🙏 For any new script, please add `revertCode` and `docs` values if possible.
-3. Send a pull request 👌
+- You can either [create an issue](https://github.com/undergroundwires/privacy.sexy/issues/new/choose)
+- Or send a PR:
+  1. Fork the repository
+  2. Add more scripts in respective script collection in [collections](src/application/collections/) folder.
+     - 📖 If you're unsure about the syntax you can refer to the [collection files | documentation](docs/collection-files.md).
+     - 🙏 For any new script, please add `revertCode` and `docs` values if possible.
+  3. Send a pull request 👌
 
 ## Commands
 
 - Project setup: `npm install`
 - Testing
   - Run unit tests: `npm run test:unit`
+  - Run integration tests: `npm run test:integration`
   - Lint: `npm run lint`
 - **Desktop app**
   - Development: `npm run electron:serve`
@@ -53,8 +56,8 @@
   - Development: `npm run serve` to compile & hot-reload for development.
   - Production: `npm run build` to prepare files for distribution.
   - Or run using Docker:
-    1. Build: `docker build -t undergroundwires/privacy.sexy:0.10.0 .`
-    2. Run: `docker run -it -p 8080:80 --rm --name privacy.sexy-0.10.0 undergroundwires/privacy.sexy:0.10.0`
+    1. Build: `docker build -t undergroundwires/privacy.sexy:0.10.2 .`
+    2. Run: `docker run -it -p 8080:80 --rm --name privacy.sexy-0.10.2 undergroundwires/privacy.sexy:0.10.2`
 
 ## Architecture overview
 

docs/application.md

@@ -3,6 +3,14 @@
 - It's mainly responsible for
   - creating and event based [application state](#application-state)
   - [parsing](#parsing) and [compiling](#compiling) [application data](#application-data)
+- Consumed by [presentation layer](./presentation.md)
+
+## Structure
+
+- [`/src/` **`application/`**](./../src/application/): Contains all application related code.
+  - [**`collections/`**](./../src/application/collections/): Holds [collection files](./collection-files.md)
+  - [**`Common/`**](./../src/application/Common/): Contains common functionality that is shared in application layer.
+  - `..`: other classes are categorized using folders-by-feature structure
 
 ## Application state
 

docs/tests.md

@@ -1,16 +1,24 @@
-# Unit tests
+# Tests
 
-- Unit tests are defined in [`./tests`](./../tests)
+- There are two different types of tests executed:
+  1. [Unit tests](#unit-tests)
+  2. [Integration tests](#integration-tests)
+- 💡 You can use path/module alias `@/tests` in import statements.
+
+## Unit tests
+
+- Tests each component in isolation
+- Defined in [`./tests/unit`](./../tests/unit)
 - They follow same folder structure as [`./src`](./../src)
 
-## Naming
+### Naming
 
 - Each test suite first describe the system under test
   - E.g. tests for class `Application` is categorized under `Application`
 - Tests for specific methods are categorized under method name (if applicable)
   - E.g. test for `run()` is categorized under `run`
 
-## Act, arrange, assert
+### Act, arrange, assert
 
 - Tests use act, arrange and assert (AAA) pattern when applicable
 - **Arrange**
@@ -23,7 +31,13 @@
   - Should elicit some sort of response
   - Starts with comment line `// assert`
 
-## Stubs
+### Stubs
 
 - Stubs are defined in [`./tests/stubs`](./../tests/unit/stubs)
 - They implement dummy behavior to be functional
+
+## Integration tests
+
+- Tests functionality of a component in combination with others (not isolated)
+- Ensure dependencies to third parties work as expected
+- Defined in [`./tests/integration`](./../tests/integration)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "privacy.sexy",
-  "version": "0.10.0",
+  "version": "0.10.2",
   "private": true,
   "description": "Enforce privacy & security best-practices on Windows and macOS, because privacy is sexy 🍑🍆",
   "author": "undergroundwires",
@@ -8,6 +8,7 @@
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
     "test:unit": "vue-cli-service test:unit",
+    "test:integration": "vue-cli-service test:unit \"tests/integration/**/*.spec.ts\"",
     "lint": "npm run lint:vue && npm run lint:yaml && npm run lint:md && npm run lint:md:relative-urls && npm run lint:md:consistency",
     "electron:build": "vue-cli-service electron:build",
     "electron:serve": "vue-cli-service electron:serve",
@@ -21,18 +22,19 @@
   },
   "main": "background.js",
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^1.2.34",
-    "@fortawesome/free-brands-svg-icons": "^5.15.2",
-    "@fortawesome/free-regular-svg-icons": "^5.15.2",
-    "@fortawesome/free-solid-svg-icons": "^5.15.2",
+    "@fortawesome/fontawesome-svg-core": "^1.2.35",
+    "@fortawesome/free-brands-svg-icons": "^5.15.3",
+    "@fortawesome/free-regular-svg-icons": "^5.15.3",
+    "@fortawesome/free-solid-svg-icons": "^5.15.3",
     "@fortawesome/vue-fontawesome": "^2.0.2",
-    "@juggle/resize-observer": "^3.3.0",
+    "@juggle/resize-observer": "^3.3.1",
     "ace-builds": "^1.4.12",
-    "core-js": "^3.9.1",
+    "core-js": "^3.12.1",
+    "cross-fetch": "^3.1.4",
     "file-saver": "^2.0.5",
-    "inversify": "^5.0.5",
+    "inversify": "^5.1.1",
     "liquor-tree": "^0.2.70",
-    "v-tooltip": "2.1.2",
+    "v-tooltip": "2.1.3",
     "vue": "^2.6.12",
     "vue-class-component": "^7.2.6",
     "vue-js-modal": "^2.0.0-rc.6",
@@ -40,29 +42,29 @@
   },
   "devDependencies": {
     "@types/ace": "0.0.45",
-    "@types/chai": "^4.2.15",
-    "@types/file-saver": "^2.0.1",
-    "@types/mocha": "^8.2.1",
-    "@vue/cli-plugin-babel": "^4.5.11",
-    "@vue/cli-plugin-typescript": "^4.5.11",
-    "@vue/cli-plugin-unit-mocha": "^4.5.11",
-    "@vue/cli-service": "^4.5.11",
-    "@vue/test-utils": "1.1.3",
-    "chai": "^4.3.3",
-    "electron": "^12.0.1",
-    "electron-devtools-installer": "^3.1.1",
-    "electron-log": "^4.3.2",
+    "@types/chai": "^4.2.18",
+    "@types/file-saver": "^2.0.2",
+    "@types/mocha": "^8.2.2",
+    "@vue/cli-plugin-babel": "^4.5.13",
+    "@vue/cli-plugin-typescript": "^4.5.13",
+    "@vue/cli-plugin-unit-mocha": "^4.5.13",
+    "@vue/cli-service": "^4.5.13",
+    "@vue/test-utils": "1.2.0",
+    "chai": "^4.3.4",
+    "electron": "^12.0.7",
+    "electron-devtools-installer": "^3.2.0",
+    "electron-log": "^4.3.5",
     "electron-updater": "^4.3.8",
     "js-yaml-loader": "^1.2.2",
     "markdownlint-cli": "^0.27.1",
     "remark-cli": "^9.0.0",
     "remark-lint-no-dead-urls": "^1.1.0",
     "remark-preset-lint-consistent": "^4.0.0",
-    "remark-validate-links": "^10.0.3",
-    "sass": "^1.32.8",
-    "sass-loader": "^10.1.1",
-    "tslib": "^2.1.0",
-    "typescript": "^4.2.3",
+    "remark-validate-links": "^10.0.4",
+    "sass": "^1.32.12",
+    "sass-loader": "^10.0.1",
+    "tslib": "^2.2.0",
+    "typescript": "^4.2.4",
     "vue-cli-plugin-electron-builder": "^2.0.0-rc.6",
     "vue-template-compiler": "^2.6.12",
     "yaml-lint": "^1.2.4"

src/application/Common/Array.ts

@@ -0,0 +1,21 @@
+// Compares to Array<T> objects for equality, ignoring order
+export function scrambledEqual<T>(array1: readonly T[], array2: readonly T[]) {
+    if (!array1) { throw new Error('undefined first array'); }
+    if (!array2) { throw new Error('undefined second array'); }
+    const sortedArray1 = sort(array1);
+    const sortedArray2 = sort(array2);
+    return sequenceEqual(sortedArray1, sortedArray2);
+    function sort(array: readonly T[]) {
+        return array.slice().sort();
+    }
+}
+
+// Compares to Array<T> objects for equality in same order
+export function sequenceEqual<T>(array1: readonly T[], array2: readonly T[]) {
+    if (!array1) { throw new Error('undefined first array'); }
+    if (!array2) { throw new Error('undefined second array'); }
+    if (array1.length !== array2.length) {
+        return false;
+    }
+    return array1.every((val, index) => val === array2[index]);
+}

src/application/Common/Enum.ts

@@ -1,6 +1,6 @@
 // Because we cannot do "T extends enum" 😞 https://github.com/microsoft/TypeScript/issues/30611
-type EnumType = number | string;
-type EnumVariable<T extends EnumType, TEnumValue extends EnumType> = { [key in T]: TEnumValue };
+export type EnumType = number | string;
+export type EnumVariable<T extends EnumType, TEnumValue extends EnumType> = { [key in T]: TEnumValue };
 
 export interface IEnumParser<TEnum> {
     parseEnum(value: string, propertyName: string): TEnum;
@@ -41,3 +41,14 @@ export function getEnumValues<T extends EnumType, TEnumValue extends EnumType>(
     return getEnumNames(enumVariable)
         .map((level) => enumVariable[level]) as TEnumValue[];
 }
+
+export function assertInRange<T extends EnumType, TEnumValue extends EnumType>(
+    value: TEnumValue,
+    enumVariable: EnumVariable<T, TEnumValue>) {
+    if (value === undefined) {
+        throw new Error('undefined enum value');
+    }
+    if (!(value in enumVariable)) {
+        throw new RangeError(`enum value "${value}" is out of range`);
+    }
+}

src/application/Common/ScriptingLanguage/IScriptingLanguageFactory.ts

@@ -0,0 +1,5 @@
+import { ScriptingLanguage } from '@/domain/ScriptingLanguage';
+
+export interface IScriptingLanguageFactory<T> {
+    create(language: ScriptingLanguage): T;
+}

src/application/Common/ScriptingLanguage/ScriptingLanguageFactory.ts

@@ -0,0 +1,31 @@
+import { ScriptingLanguage } from '@/domain/ScriptingLanguage';
+import { IScriptingLanguageFactory } from './IScriptingLanguageFactory';
+import { assertInRange } from '@/application/Common/Enum';
+
+type Getter<T> = () => T;
+
+export abstract class ScriptingLanguageFactory<T> implements IScriptingLanguageFactory<T> {
+    private readonly getters = new Map<ScriptingLanguage, Getter<T>>();
+
+    public create(language: ScriptingLanguage): T {
+        assertInRange(language, ScriptingLanguage);
+        if (!this.getters.has(language)) {
+            throw new RangeError(`unknown language: "${ScriptingLanguage[language]}"`);
+        }
+        const getter = this.getters.get(language);
+        const instance = getter();
+        return instance;
+    }
+
+    protected registerGetter(language: ScriptingLanguage, getter: Getter<T>) {
+        assertInRange(language, ScriptingLanguage);
+        if (!getter)  {
+            throw new Error('undefined getter');
+        }
+        if (this.getters.has(language)) {
+            throw new Error(`${ScriptingLanguage[language]} is already registered`);
+        }
+        this.getters.set(language, getter);
+    }
+
+}

src/application/Context/ApplicationContext.ts

@@ -5,6 +5,7 @@ import { IApplication } from '@/domain/IApplication';
 import { OperatingSystem } from '@/domain/OperatingSystem';
 import { ICategoryCollection } from '@/domain/ICategoryCollection';
 import { EventSource } from '@/infrastructure/Events/EventSource';
+import { assertInRange } from '@/application/Common/Enum';
 
 type StateMachine = Map<OperatingSystem, ICategoryCollectionState>;
 
@@ -22,7 +23,7 @@ export class ApplicationContext implements IApplicationContext {
         public readonly app: IApplication,
         initialContext: OperatingSystem) {
         validateApp(app);
-        validateOs(initialContext);
+        assertInRange(initialContext, OperatingSystem);
         this.states = initializeStates(app);
         this.changeContext(initialContext);
     }
@@ -50,18 +51,6 @@ function validateApp(app: IApplication) {
     }
 }
 
-function validateOs(os: OperatingSystem) {
-    if (os === undefined) {
-        throw new Error('undefined os');
-    }
-    if (os === OperatingSystem.Unknown) {
-        throw new Error('unknown os');
-    }
-    if (!(os in OperatingSystem)) {
-        throw new Error(`os "${os}" is out of range`);
-    }
-}
-
 function initializeStates(app: IApplication): StateMachine {
     const machine = new Map<OperatingSystem, ICategoryCollectionState>();
     for (const collection of app.collections) {

src/application/Context/State/Code/Generation/CodeBuilderFactory.ts

@@ -1,15 +1,14 @@
+import { ScriptingLanguageFactory } from '@/application/Common/ScriptingLanguage/ScriptingLanguageFactory';
 import { ScriptingLanguage } from '@/domain/ScriptingLanguage';
 import { ICodeBuilder } from './ICodeBuilder';
-import { ICodeBuilderFactory } from './ICodeBuilderFactory';
 import { BatchBuilder } from './Languages/BatchBuilder';
 import { ShellBuilder } from './Languages/ShellBuilder';
+import { ICodeBuilderFactory } from './ICodeBuilderFactory';
 
-export class CodeBuilderFactory implements ICodeBuilderFactory {
-    public create(language: ScriptingLanguage): ICodeBuilder {
-        switch (language) {
-            case ScriptingLanguage.shellscript: return new ShellBuilder();
-            case ScriptingLanguage.batchfile:   return new BatchBuilder();
-            default: throw new RangeError(`unknown language: "${ScriptingLanguage[language]}"`);
-        }
+export class CodeBuilderFactory extends ScriptingLanguageFactory<ICodeBuilder> implements ICodeBuilderFactory {
+    constructor() {
+        super();
+        this.registerGetter(ScriptingLanguage.shellscript, () => new ShellBuilder());
+        this.registerGetter(ScriptingLanguage.batchfile, () => new BatchBuilder());
     }
 }

src/application/Context/State/Code/Generation/ICodeBuilderFactory.ts

@@ -1,6 +1,5 @@
-import { ScriptingLanguage } from '@/domain/ScriptingLanguage';
 import { ICodeBuilder } from './ICodeBuilder';
+import { IScriptingLanguageFactory } from '@/application/Common/ScriptingLanguage/IScriptingLanguageFactory';
 
-export interface ICodeBuilderFactory {
-    create(language: ScriptingLanguage): ICodeBuilder;
+export interface ICodeBuilderFactory extends IScriptingLanguageFactory<ICodeBuilder> {
 }

src/application/Context/State/Selection/IUserSelection.ts

@@ -6,7 +6,6 @@ import { IEventSource } from '@/infrastructure/Events/IEventSource';
 export interface IUserSelection {
     readonly changed: IEventSource<ReadonlyArray<SelectedScript>>;
     readonly selectedScripts: ReadonlyArray<SelectedScript>;
-    readonly totalSelected: number;
     areAllSelected(category: ICategory): boolean;
     isAnySelected(category: ICategory): boolean;
     removeAllInCategory(categoryId: number): void;

src/application/Context/State/Selection/UserSelection.ts

@@ -101,10 +101,6 @@ export class UserSelection implements IUserSelection {
         return this.scripts.getItems();
     }
 
-    public get totalSelected(): number {
-        return this.scripts.getItems().length;
-    }
-
     public selectAll(): void {
         for (const script of this.collection.getAllScripts()) {
             if (!this.scripts.exists(script.id)) {

src/application/Environment/BrowserOs/BrowserOsDetector.ts

@@ -4,17 +4,17 @@ import { IBrowserOsDetector } from './IBrowserOsDetector';
 
 export class BrowserOsDetector implements IBrowserOsDetector {
     private readonly detectors = BrowserDetectors;
-    public detect(userAgent: string): OperatingSystem {
+    public detect(userAgent: string): OperatingSystem | undefined {
         if (!userAgent) {
-            return OperatingSystem.Unknown;
+            return undefined;
         }
         for (const detector of this.detectors) {
             const os = detector.detect(userAgent);
-            if (os !== OperatingSystem.Unknown) {
+            if (os !== undefined) {
                 return os;
             }
         }
-        return OperatingSystem.Unknown;
+        return undefined;
     }
 }
 

src/application/Environment/BrowserOs/DetectorBuilder.ts

@@ -29,10 +29,10 @@ export class DetectorBuilder {
             throw new Error('User agent is null or undefined');
         }
         if (this.existingPartsInUserAgent.some((part) => !userAgent.includes(part))) {
-            return OperatingSystem.Unknown;
+            return undefined;
         }
         if (this.notExistingPartsInUserAgent.some((part) => userAgent.includes(part))) {
-            return OperatingSystem.Unknown;
+            return undefined;
         }
         return this.os;
     }

src/application/Environment/BrowserOs/IBrowserOsDetector.ts

@@ -1,5 +1,5 @@
 import { OperatingSystem } from '@/domain/OperatingSystem';
 
 export interface IBrowserOsDetector {
-    detect(userAgent: string): OperatingSystem;
+    detect(userAgent: string): OperatingSystem | undefined;
 }

src/application/Environment/Environment.ts

@@ -44,7 +44,7 @@ function getProcessPlatform(variables: IEnvironmentVariables): string {
     return variables.process.platform;
 }
 
-function getDesktopOsType(processPlatform: string): OperatingSystem {
+function getDesktopOsType(processPlatform: string): OperatingSystem | undefined {
     // https://nodejs.org/api/process.html#process_process_platform
     if (processPlatform === 'darwin') {
         return OperatingSystem.macOS;
@@ -53,7 +53,7 @@ function getDesktopOsType(processPlatform: string): OperatingSystem {
     } else if (processPlatform === 'linux') {
         return OperatingSystem.Linux;
     }
-    return OperatingSystem.Unknown;
+    return undefined;
 }
 
 function isDesktop(variables: IEnvironmentVariables): boolean {

src/application/Parser/Script/CategoryCollectionParseContext.ts

@@ -1,6 +1,6 @@
 import { IScriptingDefinition } from '@/domain/IScriptingDefinition';
 import { ILanguageSyntax } from '@/domain/ScriptCode';
-import { FunctionData } from 'js-yaml-loader!*';
+import { FunctionData } from 'js-yaml-loader!@/*';
 import { IScriptCompiler } from './Compiler/IScriptCompiler';
 import { ScriptCompiler } from './Compiler/ScriptCompiler';
 import { ICategoryCollectionParseContext } from './ICategoryCollectionParseContext';

src/application/Parser/Script/Compiler/Function/FunctionCompiler.ts

@@ -1,4 +1,4 @@
-import { FunctionData, InstructionHolder } from 'js-yaml-loader!*';
+import { FunctionData, InstructionHolder } from 'js-yaml-loader!@/*';
 import { SharedFunction } from './SharedFunction';
 import { SharedFunctionCollection } from './SharedFunctionCollection';
 import { ISharedFunctionCollection } from './ISharedFunctionCollection';

src/application/Parser/Script/Compiler/Function/IFunctionCompiler.ts

@@ -1,4 +1,4 @@
-import { FunctionData } from 'js-yaml-loader!*';
+import { FunctionData } from 'js-yaml-loader!@/*';
 import { ISharedFunctionCollection } from './ISharedFunctionCollection';
 
 export interface IFunctionCompiler {

src/application/Parser/Script/Compiler/Function/SharedFunction.ts

@@ -1,9 +1,10 @@
 import { ISharedFunction } from './ISharedFunction';
 
 export class SharedFunction implements ISharedFunction {
+    public readonly parameters: readonly string[];
     constructor(
         public readonly name: string,
-        public readonly parameters: readonly string[],
+        parameters: readonly string[],
         public readonly code: string,
         public readonly revertCode: string,
         ) {

src/application/Parser/Script/Compiler/FunctionCall/FunctionCallCompiler.ts

@@ -1,4 +1,4 @@
-import { FunctionCallData, FunctionCallParametersData, FunctionData, ScriptFunctionCallData } from 'js-yaml-loader!*';
+import { FunctionCallData, FunctionCallParametersData, FunctionData, ScriptFunctionCallData } from 'js-yaml-loader!@/*';
 import { ICompiledCode } from './ICompiledCode';
 import { ISharedFunctionCollection } from '../Function/ISharedFunctionCollection';
 import { IFunctionCallCompiler } from './IFunctionCallCompiler';

src/application/Parser/Script/Compiler/FunctionCall/IFunctionCallCompiler.ts

@@ -1,4 +1,4 @@
-import { ScriptFunctionCallData } from 'js-yaml-loader!*';
+import { ScriptFunctionCallData } from 'js-yaml-loader!@/*';
 import { ICompiledCode } from './ICompiledCode';
 import { ISharedFunctionCollection } from '../Function/ISharedFunctionCollection';
 

src/application/Parser/Script/Syntax/ISyntaxFactory.ts

@@ -1,6 +1,5 @@
 import { ILanguageSyntax } from '@/domain/ScriptCode';
-import { ScriptingLanguage } from '@/domain/ScriptingLanguage';
+import { IScriptingLanguageFactory } from '@/application/Common/ScriptingLanguage/IScriptingLanguageFactory';
 
-export interface ISyntaxFactory {
-    create(language: ScriptingLanguage): ILanguageSyntax;
+export interface ISyntaxFactory extends IScriptingLanguageFactory<ILanguageSyntax> {
 }

src/application/Parser/Script/Syntax/SyntaxFactory.ts

@@ -1,15 +1,14 @@
 import { ILanguageSyntax } from '@/domain/ScriptCode';
 import { ScriptingLanguage } from '@/domain/ScriptingLanguage';
-import { ISyntaxFactory } from './ISyntaxFactory';
+import { ScriptingLanguageFactory } from '@/application/Common/ScriptingLanguage/ScriptingLanguageFactory';
 import { BatchFileSyntax } from './BatchFileSyntax';
 import { ShellScriptSyntax } from './ShellScriptSyntax';
+import { ISyntaxFactory } from './ISyntaxFactory';
 
-export class SyntaxFactory implements ISyntaxFactory {
-    public create(language: ScriptingLanguage): ILanguageSyntax {
-        switch (language) {
-            case ScriptingLanguage.batchfile:   return new BatchFileSyntax();
-            case ScriptingLanguage.shellscript: return new ShellScriptSyntax();
-            default:    throw new RangeError(`unknown language: "${ScriptingLanguage[language]}"`);
-        }
+export class SyntaxFactory extends ScriptingLanguageFactory<ILanguageSyntax> implements ISyntaxFactory {
+    constructor() {
+        super();
+        this.registerGetter(ScriptingLanguage.batchfile, () => new BatchFileSyntax());
+        this.registerGetter(ScriptingLanguage.shellscript, () => new ShellScriptSyntax());
     }
 }

src/application/collections/collection.yaml.d.ts

@@ -1,4 +1,4 @@
-declare module 'js-yaml-loader!*' {
+declare module 'js-yaml-loader!@/*' {
     export interface CollectionData {
         readonly os: string;
         readonly scripting: ScriptingDefinitionData;

src/application/collections/macos.yaml

@@ -185,7 +185,7 @@ actions:
                                     rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/sessionstore-backups/upgrade.js*-20*
                             -
                                 name: Delete Firefox passwords
-                                docs: http://kb.mozillazine.org/Password_Manager
+                                docs: https://web.archive.org/web/20210425202923/http://kb.mozillazine.org/Password_Manager
                                 code: |-
                                     rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/signons.txt
                                     rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/signons2.txt
@@ -437,7 +437,7 @@ actions:
             -
                 name: Disable PowerShell Core telemetry
                 recommend: standard
-                docs: https://github.com/PowerShell/PowerShell/tree/release/v7.1.1#telemetry
+                docs: https://github.com/PowerShell/PowerShell/blob/v7.1.0/README.md#telemetry
                 call:
                     -
                         function: PersistUserEnvironmentConfiguration

src/application/collections/windows.yaml

@@ -600,7 +600,7 @@ actions:
                             reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\Device Metadata" /v "PreventDeviceMetadataFromNetwork" /t REG_DWORD /d 0 /f
                     -
                         name: Do not include drivers with Windows Updates
-                        docs: https://getadmx.com/?Category=Windows_10_2016&Policy=Microsoft.Policies.WindowsUpdate::ExcludeWUDriversInQualityUpdate
+                        docs: https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.WindowsUpdate::ExcludeWUDriversInQualityUpdate
                         recommend: strict
                         code: reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate" /v "ExcludeWUDriversInQualityUpdate" /t REG_DWORD /d 1 /f
                         revertCode: reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate" /v "ExcludeWUDriversInQualityUpdate" /t REG_DWORD /d 0 /f
@@ -613,7 +613,7 @@ actions:
             -
                 name: Disable cloud speech recognition
                 recommend: standard
-                docs: https://www.tenforums.com/tutorials/101902-turn-off-online-speech-recognition-windows-10-a.html
+                docs: https://docs.microsoft.com/en-us/windows/privacy/manage-connections-from-windows-operating-system-components-to-microsoft-services#186-speech
                 code: reg add "HKCU\Software\Microsoft\Speech_OneCore\Settings\OnlineSpeechPrivacy" /v "HasAccepted" /t "REG_DWORD" /d 0 /f
                 revertCode: reg add "HKCU\Software\Microsoft\Speech_OneCore\Settings\OnlineSpeechPrivacy" /v "HasAccepted" /t "REG_DWORD" /d 1 /f
             -
@@ -629,7 +629,7 @@ actions:
             -
                 name: Disable Windows feedback
                 recommend: standard
-                docs: https://www.tenforums.com/tutorials/2441-change-feedback-frequency-windows-10-a.html
+                docs: https://docs.microsoft.com/en-us/windows/privacy/manage-connections-from-windows-operating-system-components-to-microsoft-services#1816-feedback--diagnostics
                 code: |-
                     reg add "HKCU\SOFTWARE\Microsoft\Siuf\Rules" /v "NumberOfSIUFInPeriod" /t REG_DWORD /d 0 /f 
                     reg delete "HKCU\SOFTWARE\Microsoft\Siuf\Rules" /v "PeriodInNanoSeconds" /f
@@ -656,8 +656,9 @@ actions:
                         name: Deny app access to location
                         recommend: standard
                         docs: 
-                            - https://r-pufky.github.io/docs/operating-systems/windows/10/securing-installation/privacy/location.html
-                            - https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-privacy#privacy-letappsaccesslocation
+                            - https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-privacy#privacy-letappsaccesslocation # LetAppsAccessLocation
+                            - https://www.joseespitia.com/2019/07/24/registry-keys-for-windows-10-application-privacy-settings/ # ConsentStore\location
+                            - https://social.technet.microsoft.com/Forums/en-US/63904312-04af-41e5-8b57-1dd446ea45c5/ # lfsvc\Service\Configuration
                         code: |-
                             reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\location" /v "Value" /d "Deny" /f
                             :: For older Windows (before 1903)
@@ -1039,7 +1040,6 @@ actions:
                         revertCode: reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\bluetoothSync" /v "Value" /d "Allow" /t REG_SZ /f
                     -
                         category: Disable app access to voice activation
-                        docs: https://www.tenforums.com/tutorials/130122-allow-deny-apps-access-use-voice-activation-windows-10-a.html
                         children:
                             -
                                 name: Disable apps and Cortana to activate with voice
@@ -1248,45 +1248,72 @@ actions:
                     -
                         name: Disable ad customization with Advertising ID
                         recommend: standard
+                        docs: https://docs.microsoft.com/en-us/windows/privacy/manage-connections-from-windows-operating-system-components-to-microsoft-services#181-general
                         code: |-
-                            reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\AdvertisingInfo" /v "Enabled" /t REG_DWORD /d 0 /f 
-                            reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\AdvertisingInfo" /v "DisabledByGroupPolicy" /t REG_DWORD /d 1 /f
+                            reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\AdvertisingInfo" /v "Enabled" /t REG_DWORD /d "0" /f 
+                            reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\AdvertisingInfo" /v "DisabledByGroupPolicy" /t REG_DWORD /d "1" /f
+                        revertCode: |-
+                            reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\AdvertisingInfo" /v "Enabled" /t REG_DWORD /d "1" /f 
+                            reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\AdvertisingInfo" /v "DisabledByGroupPolicy" /t REG_DWORD /d "0" /f
+                    -
+                        category: Disable cloud-based tips and ads
+                        children:
+                            -
+                                name: Disable Windows Tips
+                                recommend: standard
+                                docs: https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.CloudContent::DisableSoftLanding
+                                code: reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\CloudContent" /v "DisableSoftLanding" /t REG_DWORD /d "1" /f
+                                revertCode: reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\CloudContent" /v "DisableSoftLanding" /t REG_DWORD /d "0" /f
+                            -
+                                name: Disable Windows Spotlight (random wallpaper on lock screen)
+                                recommend: standard
+                                docs:
+                                    - https://docs.microsoft.com/en-us/windows/configuration/windows-spotlight
+                                    - https://docs.microsoft.com/en-us/windows/privacy/manage-connections-from-windows-operating-system-components-to-microsoft-services#25-windows-spotlight
+                                code: reg add "HKLM\Software\Policies\Microsoft\Windows\CloudContent" /v "DisableWindowsSpotlightFeatures" /t "REG_DWORD" /d "1" /f
+                                revertCode: reg add "HKLM\Software\Policies\Microsoft\Windows\CloudContent" /v "DisableWindowsSpotlightFeatures" /t "REG_DWORD" /d "0" /f
+                            -
+                                name: Disable Microsoft consumer experiences
+                                recommend: standard
+                                docs:
+                                    - https://www.stigviewer.com/stig/windows_10/2018-04-06/finding/V-71771
+                                    - https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.CloudContent::DisableWindowsConsumerFeatures
+                                    - https://docs.microsoft.com/en-us/windows/privacy/manage-connections-from-windows-operating-system-components-to-microsoft-services#1816-feedback--diagnostics
+                                code: reg add "HKLM\Software\Policies\Microsoft\Windows\CloudContent" /v "DisableWindowsConsumerFeatures" /t "REG_DWORD" /d "1" /f
+                                revertCode: reg add "HKLM\Software\Policies\Microsoft\Windows\CloudContent" /v "DisableWindowsConsumerFeatures" /t "REG_DWORD" /d "0" /f
                     -
-                        name: Disable targeted tips
-                        recommend: standard
-                        code: |-
-                            reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\CloudContent" /v "DisableSoftLanding" /t REG_DWORD /d 1 /f
-                            reg add "HKLM\Software\Policies\Microsoft\Windows\CloudContent" /v "DisableWindowsSpotlightFeatures" /t "REG_DWORD" /d "1" /f
-                            reg add "HKLM\Software\Policies\Microsoft\Windows\CloudContent" /v "DisableWindowsConsumerFeatures" /t "REG_DWORD" /d "1" /f
-                    - 
                         name: Turn Off Suggested Content in Settings app
                         recommend: standard
-                        docs: https://www.tenforums.com/tutorials/100541-turn-off-suggested-content-settings-app-windows-10-a.html
+                        docs:
+                            - https://docs.microsoft.com/en-us/windows-server/remote/remote-desktop-services/rds-vdi-recommendations-2004
+                            - https://www.blogsdna.com/28017/how-to-disable-turn-off-suggested-content-on-windows-10-setting-app.htm
                         code: |-
-                            reg add HKCU\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager /v "SubscribedContent-338393Enabled" /d "0" /t REG_DWORD /f
-                            reg add HKCU\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager /v "SubscribedContent-353694Enabled" /d "0" /t REG_DWORD /f
-                            reg add HKCU\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager /v "SubscribedContent-353696Enabled" /d "0" /t REG_DWORD /f
-            -                
+                            reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-338393Enabled" /d "0" /t REG_DWORD /f
+                            reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-353694Enabled" /d "0" /t REG_DWORD /f
+                            reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-353696Enabled" /d "0" /t REG_DWORD /f
+                        revertCode: |-
+                            reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-338393Enabled" /d "1" /t REG_DWORD /f
+                            reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-353694Enabled" /d "1" /t REG_DWORD /f
+                            reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\ContentDeliveryManager" /v "SubscribedContent-353696Enabled" /d "1" /t REG_DWORD /f
+            -
                 category: Disable biometrics (breaks fingerprinting/facial login)
                 children:
                     -
                         name: Do not allow the use of biometrics
                         recommend: strict
-                        docs: https://getadmx.com/?Category=Windows_10_2016&Policy=Microsoft.Policies.Biometrics::Biometrics_EnableBio
+                        docs: https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.Biometrics::Biometrics_EnableBio
                         code: reg add "HKLM\SOFTWARE\Policies\Microsoft\Biometrics" /v "Enabled" /t REG_DWORD /d "0" /f
                         revertCode: reg add "HKLM\SOFTWARE\Policies\Microsoft\Biometrics" /v "Enabled" /t REG_DWORD /d "1" /f
                     -
                         name: Do not allow users to log on using biometrics
                         recommend: strict
-                        docs: https://getadmx.com/?Category=Windows_10_2016&Policy=Microsoft.Policies.Biometrics::Biometrics_EnableCredProv
+                        docs: https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.Biometrics::Biometrics_EnableCredProv
                         code: reg add "HKLM\SOFTWARE\Policies\Microsoft\Biometrics\Credential Provider" /v "Enabled" /t "REG_DWORD" /d "0" /f
                         revertCode: reg add "HKLM\SOFTWARE\Policies\Microsoft\Biometrics\Credential Provider" /v "Enabled" /t "REG_DWORD" /d "1" /f
                     -
                         name: Do not start Windows Biometric Service
                         recommend: strict
-                        docs: 
-                            - http://batcmd.com/windows/10/services/wbiosrvc/
-                            - http://revertservice.com/10/wbiosrvc/
+                        docs: https://docs.microsoft.com/en-us/windows-server/security/windows-services/security-guidelines-for-disabling-system-services-in-windows-server#windows-biometric-service
                         code: |-
                             reg add "HKLM\SYSTEM\CurrentControlSet\Services\WbioSrvc" /v "Start" /t REG_DWORD /d 4 /f
                             sc stop "WbioSrvc" & sc config "WbioSrvc" start=disabled
@@ -1314,7 +1341,7 @@ actions:
             -
                 name: Disable Website Access of Language List
                 recommend: standard
-                docs: https://www.tenforums.com/tutorials/82980-turn-off-website-access-language-list-windows-10-a.html
+                docs: https://docs.microsoft.com/en-us/windows/privacy/manage-connections-from-windows-operating-system-components-to-microsoft-services#181-general
                 code: reg add "HKCU\Control Panel\International\User Profile" /v "HttpAcceptLanguageOptOut" /t REG_DWORD /d 1 /f 
                 revertCode: reg add "HKCU\Control Panel\International\User Profile" /v "HttpAcceptLanguageOptOut" /t REG_DWORD /d 0 /f 
             -
@@ -1335,7 +1362,7 @@ actions:
                     reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\GameDVR" /v "AllowGameDVR" /t REG_DWORD /d 0 /f
             -
                 name: Disable Windows DRM internet access
-                docs: https://getadmx.com/?Category=Windows_10_2016&Policy=Microsoft.Policies.DigitalRights2::DisableOnline
+                docs: https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.DigitalRights2::DisableOnline
                 recommend: standard
                 code: reg add "HKLM\SOFTWARE\Policies\Microsoft\WMDRM" /v "DisableOnline" /t REG_DWORD /d 1 /f
             -
@@ -1353,13 +1380,13 @@ actions:
                 children:
                     -
                         name: Disable Windows Insider Service
-                        docs: http://revertservice.com/10/wisvc/
+                        docs: https://docs.microsoft.com/en-us/windows-server/security/windows-services/security-guidelines-for-disabling-system-services-in-windows-server#windows-insider-service
                         recommend: standard
                         code: sc stop "wisvc" & sc config "wisvc" start=disabled
                         revertCode: sc config "wisvc" start=demand
                     -
                         name: Do not let Microsoft try features on this build
-                        docs: https://getadmx.com/?Category=Windows_10_2016&Policy=Microsoft.Policies.DataCollection::EnableExperimentation
+                        docs: https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.DataCollection::EnableExperimentation
                         recommend: standard
                         code: |-
                             reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\PreviewBuilds" /v "EnableExperimentation" /t REG_DWORD /d 0 /f
@@ -1371,13 +1398,13 @@ actions:
                             reg delete "HKLM\SOFTWARE\Microsoft\PolicyManager\default\System\AllowExperimentation" /v "value" /f
                     -
                         name: Disable getting preview builds of Windows
-                        docs: https://getadmx.com/?Category=Windows_10_2016&Policy=Microsoft.Policies.AllowBuildPreview::AllowBuildPreview
+                        docs: https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.AllowBuildPreview::AllowBuildPreview
                         recommend: standard
                         code: reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\PreviewBuilds" /v "AllowBuildPreview" /t REG_DWORD /d 0 /f
                         revertCode: reg delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\PreviewBuilds" /v "AllowBuildPreview" /f
                     -
                         name: Remove "Windows Insider Program" from Settings 
-                        docs: https://www.askvg.com/windows-10-tip-remove-windows-insider-program-section-from-settings-page/
+                        docs: https://winaero.com/how-to-hide-the-windows-insider-program-page-from-the-settings-app-in-windows-10/
                         code: reg add "HKLM\SOFTWARE\Microsoft\WindowsSelfHost\UI\Visibility" /v "HideInsiderPage" /t "REG_DWORD" /d "1" /f
                         revertCode: reg delete "HKLM\SOFTWARE\Microsoft\WindowsSelfHost\UI\Visibility" /v "HideInsiderPage" /f
             -
@@ -1445,7 +1472,10 @@ actions:
                     -
                         name: Disable Language Setting Sync
                         recommend: standard
-                        docs: https://www.tenforums.com/tutorials/4077-turn-off-sync-settings-microsoft-account-windows-10-a.html
+                        docs:
+                            - https://winaero.com/turn-on-off-sync-settings-windows-10/
+                            - https://www.thewindowsclub.com/how-to-configure-windows-10-sync-settings-using-registry-editor
+                            - https://tuxicoman.jesuislibre.net/blog/wp-content/uploads/Windows10_Telemetrie_1709.pdf # from guide on confidentiality and privacy with Windows 10 distributed to the French police, previous version of guide: https://www.pmenier.net/dotclear/docext/win10/.Windows10-Presentation.pdf
                         code: reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\SettingSync\Groups\Language" /t REG_DWORD /v "Enabled" /d 0 /f
                         revertCode: reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\SettingSync\Groups\Language" /t REG_DWORD /v "Enabled" /d 1 /f
     -
@@ -1515,7 +1545,7 @@ actions:
                     -
                         name: Do not send Watson events 
                         recommend: standard
-                        docs: https://getadmx.com/?Category=SystemCenterEndpointProtection&Policy=Microsoft.Policies.Antimalware::reporting_disablegenericreports
+                        docs: https://admx.help/?Category=SystemCenterEndpointProtection&Policy=Microsoft.Policies.Antimalware::reporting_disablegenericreports
                         code: reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows Defender\Reporting" /v "DisableGenericReports" /t REG_DWORD /d 1 /f
                         revertCode: reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows Defender\Reporting" /v "DisableGenericReports" /t REG_DWORD /d 0 /f
                     -
@@ -1526,7 +1556,7 @@ actions:
                                 recommend: standard
                                 docs:
                                     - https://www.stigviewer.com/stig/windows_defender_antivirus/2017-12-27/finding/V-75161
-                                    - https://getadmx.com/?Category=Windows_10_2016&Policy=Microsoft.Policies.WindowsDefender::Spynet_LocalSettingOverrideSpynetReporting
+                                    - https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.WindowsDefender::Spynet_LocalSettingOverrideSpynetReporting
                                 code: reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows Defender\Spynet" /v "LocalSettingOverrideSpynetReporting" /t REG_DWORD /d 0 /f
                                 revertCode: reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows Defender\Spynet" /v "LocalSettingOverrideSpynetReporting" /t REG_DWORD /d 1 /f
                             -
@@ -1534,7 +1564,7 @@ actions:
                                 recommend: standard
                                 docs:
                                     - https://www.stigviewer.com/stig/windows_7/2012-07-02/finding/V-15713
-                                    - https://getadmx.com/?Category=Windows_7_2008R2&Policy=Microsoft.Policies.WindowsDefender::SpyNetReporting
+                                    - https://admx.help/?Category=Windows_7_2008R2&Policy=Microsoft.Policies.WindowsDefender::SpyNetReporting
                                     - https://docs.microsoft.com/en-us/windows/client-management/mdm/policy-csp-defender#defender-allowcloudprotection
                                 code: reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows Defender\Spynet" /v "SpynetReporting" /t REG_DWORD /d 0 /f
                                 revertCode: reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows Defender\Spynet" /v "SpynetReporting" /t REG_DWORD /d 1 /f
@@ -1548,7 +1578,7 @@ actions:
                     - 
                         name: Disable Malicious Software Reporting tool diagnostic data
                         recommend: standard
-                        docs: https://getadmx.com/?Category=Windows10_Telemetry&Policy=Microsoft.Policies.Win10Privacy::DontReportInfection
+                        docs: https://admx.help/?Category=Windows10_Telemetry&Policy=Microsoft.Policies.Win10Privacy::DontReportInfection
                         code: reg add "HKLM\SOFTWARE\Policies\Microsoft\MRT" /v "DontReportInfectionInformation" /t REG_DWORD /d 1 /f
                         revertCode: reg add "HKLM\SOFTWARE\Policies\Microsoft\MRT" /v "DontReportInfectionInformation" /t REG_DWORD /d 0 /f
             -
@@ -1788,7 +1818,7 @@ actions:
                                 category: Chromium Edge settings
                                 children:
                                     -
-                                        name: Disable Edge usage and crash-related data reporting # Obselete since Microsoft Edge version 89
+                                        name: Disable Edge usage and crash-related data reporting (shows "Your browser is managed") # Obselete since Microsoft Edge version 89
                                         recommend: standard
                                         docs:
                                             - https://admx.help/?Category=EdgeChromium&Policy=Microsoft.Policies.Edge::MetricsReportingEnabled
@@ -1796,7 +1826,7 @@ actions:
                                         code: reg add "HKLM\SOFTWARE\Policies\Microsoft\Edge" /v "MetricsReportingEnabled" /t REG_DWORD /d 0 /f
                                         revertCode: reg delete "HKLM\SOFTWARE\Policies\Microsoft\Edge" /v "MetricsReportingEnabled" /f  
                                     -
-                                        name: Disable sending site information # Obselete since Microsoft Edge version 89
+                                        name: Disable sending site information (shows "Your browser is managed") # Obselete since Microsoft Edge version 89
                                         recommend: standard
                                         docs: 
                                             - https://admx.help/?Category=EdgeChromium&Policy=Microsoft.Policies.Edge::SendSiteInfoToImproveServices
@@ -1805,7 +1835,9 @@ actions:
                                         revertCode: reg delete "HKLM\SOFTWARE\Policies\Microsoft\Edge" /v "SendSiteInfoToImproveServices" /f
                                     -
                                         name: Disable Automatic Installation of Microsoft Edge Chromium
-                                        docs: https://docs.microsoft.com/en-us/deployedge/microsoft-edge-blocker-toolkit
+                                        docs:
+                                            - https://admx.help/?Category=EdgeChromium_Blocker&Policy=Microsoft.Policies.EdgeUpdate::NoUpdate
+                                            - https://web.archive.org/web/20210118230052/https://docs.microsoft.com/en-us/deployedge/microsoft-edge-blocker-toolkit
                                         code: reg add "HKLM\SOFTWARE\Microsoft\EdgeUpdate" /v "DoNotUpdateToEdgeWithChromium" /t REG_DWORD /d 1 /f
                                         revertCode: reg delete "HKLM\SOFTWARE\Microsoft\EdgeUpdate" /v "DoNotUpdateToEdgeWithChromium" /f
                             -
@@ -1819,26 +1851,26 @@ actions:
                             -
                                 name: Disable MFU tracking
                                 recommend: standard
-                                docs: https://getadmx.com/?Category=Windows_10_2016&Policy=Microsoft.Policies.EdgeUI::DisableMFUTracking
+                                docs: https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.EdgeUI::DisableMFUTracking
                                 code: reg add "HKCU\Software\Policies\Microsoft\Windows\EdgeUI" /v "DisableMFUTracking" /t REG_DWORD /d 1 /f
                                 revertCode: reg add "HKCU\Software\Policies\Microsoft\Windows\EdgeUI" /v "DisableMFUTracking" /t REG_DWORD /d 0 /f
                             -
                                 name: Disable recent apps
                                 recommend: standard
-                                docs: https://getadmx.com/?Category=Windows_10_2016&Policy=Microsoft.Policies.EdgeUI::DisableRecentApps
+                                docs: https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.EdgeUI::DisableRecentApps
                                 code: reg add "HKCU\Software\Policies\Microsoft\Windows\EdgeUI" /v "DisableRecentApps" /t REG_DWORD /d 1 /f
                                 revertCode: reg add "HKCU\Software\Policies\Microsoft\Windows\EdgeUI" /v "DisableRecentApps" /t REG_DWORD /d 0/f
                             -
                                 name: Turn off backtracking
                                 recommend: standard
-                                docs: https://getadmx.com/?Category=Windows_10_2016&Policy=Microsoft.Policies.EdgeUI::TurnOffBackstack
+                                docs: https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.EdgeUI::TurnOffBackstack
                                 code: reg add "HKCU\Software\Policies\Microsoft\Windows\EdgeUI" /v "TurnOffBackstack" /t REG_DWORD /d 1 /f
                                 revertCode: reg add "HKCU\Software\Policies\Microsoft\Windows\EdgeUI" /v "TurnOffBackstack" /t REG_DWORD /d 0 /f
                             -
                                 name: Disable Search Suggestions in Edge
                                 docs: 
                                     - https://docs.microsoft.com/en-us/microsoft-edge/deploy/group-policies/address-bar-settings-gp
-                                    - https://getadmx.com/?Category=Windows_10_2016&Policy=Microsoft.Policies.MicrosoftEdge::AllowSearchSuggestionsinAddressBar
+                                    - https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.MicrosoftEdge::AllowSearchSuggestionsinAddressBar
                                 recommend: standard
                                 code: reg add "HKLM\SOFTWARE\Policies\Microsoft\MicrosoftEdge\SearchScopes" /v "ShowSearchSuggestionsGlobal" /t REG_DWORD /d 0 /f
                                 revertCode: reg add "HKLM\SOFTWARE\Policies\Microsoft\MicrosoftEdge\SearchScopes" /v "ShowSearchSuggestionsGlobal" /t REG_DWORD /d 1 /f
@@ -1894,7 +1926,7 @@ actions:
                                 category: Chrome cleanup
                                 children:
                                     - 
-                                        name: Do not share scanned software data to Google
+                                        name: Do not share scanned software data to Google (shows "Your browser is managed")
                                         recommend: standard
                                         docs: 
                                             - https://www.chromium.org/administrators/policy-list-3#ChromeCleanupReportingEnabled
@@ -1902,7 +1934,7 @@ actions:
                                         code: reg add "HKLM\SOFTWARE\Policies\Google\Chrome" /v "ChromeCleanupReportingEnabled" /t REG_DWORD /d 0 /f
                                         revertCode: reg delete "HKLM\SOFTWARE\Policies\Google\Chrome" /v "ChromeCleanupReportingEnabled" /f
                                     - 
-                                        name: Prevent Chrome from scanning the system for cleanup
+                                        name: Prevent Chrome from scanning the system for cleanup (shows "Your browser is managed")
                                         recommend: standard
                                         docs: 
                                             - https://www.chromium.org/administrators/policy-list-3#ChromeCleanupEnabled
@@ -1910,7 +1942,7 @@ actions:
                                         code: reg add "HKLM\SOFTWARE\Policies\Google\Chrome" /v "ChromeCleanupEnabled" /t REG_DWORD /d 0 /f
                                         revertCode: reg delete "HKLM\SOFTWARE\Policies\Google\Chrome" /v "ChromeCleanupEnabled" /f
                             -
-                                name: Disable Chrome metrics reporting
+                                name: Disable Chrome metrics reporting (shows "Your browser is managed")
                                 recommend: standard
                                 docs: https://www.stigviewer.com/stig/google_chrome_v23_windows/2013-01-11/finding/V-35780
                                 code: reg add "HKLM\SOFTWARE\Policies\Google\Chrome" /v "MetricsReportingEnabled" /t REG_DWORD /d 0 /f
@@ -2009,7 +2041,7 @@ actions:
                             reg add "HKCU\Software\Policies\Microsoft\WindowsMediaPlayer" /v "PreventRadioPresetsRetrieval" /t REG_DWORD /d 1 /f
                             reg add "HKLM\SOFTWARE\Policies\Microsoft\WMDRM" /v "DisableOnline" /t REG_DWORD /d 1 /f
                     -
-                        name: Disable dows Media Player Network Sharing Service
+                        name: Disable Windows Media Player Network Sharing Service
                         recommend: standard
                         code: sc stop "WMPNetworkSvc" & sc config "WMPNetworkSvc" start=disabled
             -
@@ -2598,20 +2630,20 @@ actions:
                     -
                         name: Disable online tips
                         recommend: standard
-                        docs: https://getadmx.com/?Category=Windows_10_2016&Policy=Microsoft.Policies.ControlPanel::AllowOnlineTips
+                        docs: https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.ControlPanel::AllowOnlineTips
                         code: reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer" /v "AllowOnlineTips" /t REG_DWORD /d 0 /f
                         revertCode: reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer" /v "AllowOnlineTips" /t REG_DWORD /d 1 /f
                     -
                         name: Turn off Internet File Association service
                         recommend: standard
-                        docs: https://getadmx.com/?Category=Windows_10_2016&Policy=Microsoft.Policies.InternetCommunicationManagement::ShellNoUseInternetOpenWith_2
+                        docs: https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.InternetCommunicationManagement::ShellNoUseInternetOpenWith_2
                         code: reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer" /v "NoInternetOpenWith" /t REG_DWORD /d 1 /f
                         revertCode: reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer" /v "NoInternetOpenWith" /t REG_DWORD /d 0 /f
                     -
                         name: Turn off the "Order Prints" picture task
                         recommend: standard
                         docs:
-                            - https://getadmx.com/?Category=Windows_10_2016&Policy=Microsoft.Policies.InternetCommunicationManagement::ShellRemoveOrderPrints_2
+                            - https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.InternetCommunicationManagement::ShellRemoveOrderPrints_2
                             - https://www.stigviewer.com/stig/microsoft_windows_server_2012_member_server/2013-07-25/finding/WN12-CC-000042
                         code: reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer" /v "NoOnlinePrintsWizard" /t REG_DWORD /d 1 /f
                         revertCode: reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer" /v "NoOnlinePrintsWizard" /t REG_DWORD /d 0 /f
@@ -2633,19 +2665,19 @@ actions:
                     -
                         name: Do not keep history of recently opened documents
                         recommend: strict
-                        docs: https://getadmx.com/?Category=Windows_10_2016&Policy=Microsoft.Policies.StartMenu::NoRecentDocsHistory
+                        docs: https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.StartMenu::NoRecentDocsHistory
                         code: reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer" /v "NoRecentDocsHistory" /t REG_DWORD /d 1 /f
                         revertCode: reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Policies\Explorer" /v "NoRecentDocsHistory" /t REG_DWORD /d 0 /f
                     -
                         name: Clear history of recently opened documents on exit
                         recommend: strict
-                        docs: https://getadmx.com/?Category=Windows_10_2016&Policy=Microsoft.Policies.StartMenu::ClearRecentDocsOnExit
+                        docs: https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.StartMenu::ClearRecentDocsOnExit
                         code: reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Policies\Explorer" /v "ClearRecentDocsOnExit" /t REG_DWORD /d 1 /f
                         revertCode: reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Policies\Explorer" /v "ClearRecentDocsOnExit" /t REG_DWORD /d 01 /f
             -
                 name: Disable Live Tiles push notifications
                 recommend: standard
-                docs: https://getadmx.com/?Category=Windows_10_2016&Policy=Microsoft.Policies.Notifications::NoTileNotification
+                docs: https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.Notifications::NoTileNotification
                 code: reg add "HKCU\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\PushNotifications" /v "NoTileApplicationNotification" /t REG_DWORD /d 1 /f
                 revertCode: reg add "HKCU\SOFTWARE\Policies\Microsoft\Windows\CurrentVersion\PushNotifications" /v "NoTileApplicationNotification" /t REG_DWORD /d 0 /f
             -
@@ -2653,26 +2685,27 @@ actions:
                 recommend: standard
                 docs:
                     - https://www.stigviewer.com/stig/microsoft_windows_server_2012_member_server/2013-07-25/finding/WN12-CC-000030
-                    - https://getadmx.com/?Category=Windows_10_2016&Policy=Microsoft.Policies.InternetCommunicationManagement::ShellNoUseStoreOpenWith_1
+                    - https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.InternetCommunicationManagement::ShellNoUseStoreOpenWith_1
                 code: reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\Explorer" /v "NoUseStoreOpenWith" /t REG_DWORD /d 1 /f
                 revertCode: reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\Explorer" /v "NoUseStoreOpenWith" /t REG_DWORD /d 0 /f
             -
                 name: Do not show recently used files in Quick Access
                 recommend: strict
-                docs: https://www.tenforums.com/tutorials/2713-add-remove-recent-files-quick-access-windows-10-a.html
+                docs:
+                    - https://matthewhill.uk/windows/group-policy-disable-recent-files-frequent-folder-explorer/ # ShowRecent
+                    - https://www.howto-connect.com/delete-recent-frequent-from-file-explorer-on-windows-10/ # 3134ef9c-6b18-4996-ad04-ed5912e00eb5
+                    - https://docs.microsoft.com/en-us/windows/win32/sysinfo/32-bit-and-64-bit-application-data-in-the-registry # Wow6432Node
                 code: |-
-                    if %PROCESSOR_ARCHITECTURE%==x86 ( REM is 32 bit?
-                        reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer" /v "ShowRecent" /d 0 /t REG_DWORD /f
-                    ) else (
+                    reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer" /v "ShowRecent" /d 0 /t "REG_DWORD" /f
+                    reg delete "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HomeFolderDesktop\NameSpace\DelegateFolders\{3134ef9c-6b18-4996-ad04-ed5912e00eb5}" /f
+                    if not %PROCESSOR_ARCHITECTURE%==x86 ( REM is 64 bit?
                         reg delete "HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Explorer\HomeFolderDesktop\NameSpace\DelegateFolders\{3134ef9c-6b18-4996-ad04-ed5912e00eb5}" /f
-                        reg delete "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HomeFolderDesktop\NameSpace\DelegateFolders\{3134ef9c-6b18-4996-ad04-ed5912e00eb5}" /f
                     )
                 revertCode:
-                    if %PROCESSOR_ARCHITECTURE%==x86 ( REM is 32 bit?
-                        reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer" /v "ShowRecent" /d 1 /t REG_DWORD /f
-                    ) else (
+                    reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer" /v "ShowRecent" /d "1" /t "REG_DWORD" /f
+                    reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HomeFolderDesktop\NameSpace\DelegateFolders\{3134ef9c-6b18-4996-ad04-ed5912e00eb5}" /f
+                    if not %PROCESSOR_ARCHITECTURE%==x86 ( REM is 64 bit?
                         reg add "HKLM\SOFTWARE\Wow6432Node\Microsoft\Windows\CurrentVersion\Explorer\HomeFolderDesktop\NameSpace\DelegateFolders\{3134ef9c-6b18-4996-ad04-ed5912e00eb5}" /f
-                        reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\HomeFolderDesktop\NameSpace\DelegateFolders\{3134ef9c-6b18-4996-ad04-ed5912e00eb5}" /f
                     )
             -
                 name: Disable Sync Provider Notifications
@@ -2680,12 +2713,15 @@ actions:
                 revertCode: reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Advanced" /v "ShowSyncProviderNotifications" /d 1 /t REG_DWORD /f
             -
                 name: Turn hibernate off to disable sleep for quick start
-                docs: http://www.windows10windows7.com/w10/win10zs/100102504.html
+                docs: https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/compact-os#ram-pagefilesys-and-hiberfilsys
                 code: powercfg -h off
                 revertCode: powercfg -h on
             -
                 name: Enable camera on/off OSD notifications
-                docs: https://www.tenforums.com/tutorials/166065-how-enable-disable-camera-off-osd-notifications-windows-10-a.html
+                docs:
+                    - https://docs.microsoft.com/en-us/windows-hardware/customize/desktop/unattend/microsoft-windows-coremmres-nophysicalcameraled
+                    - https://www.reddit.com/r/Surface/comments/88nyln/the_webcamled_took_anyone_it_apart/dwm64p5
+                    - https://answers.microsoft.com/en-us/windows/forum/all/enable-osd-notification-for-webcam/caf1fff4-78d3-4b93-905b-ef657097a44e
                 code: reg add "HKLM\SOFTWARE\Microsoft\OEM\Device\Capture" /v "NoPhysicalCameraLED" /d 1 /t REG_DWORD /f
                 revertCode: reg delete "HKLM\Software\Microsoft\OEM\Device\Capture" /v "NoPhysicalCameraLED" /f
             -
@@ -2702,11 +2738,11 @@ actions:
                     -
                         name: Desktop
                         code: |-
-                            reg add "HKLM\Software\Microsoft\Windows\CurrentVersion\Explorer\FolderDescriptions\{31C0DD25-9439-4F12-BF41-7FF4EDA38722}\PropertyBag" /v "ThisPCPolicy" /t REG_SZ /d "Hide" /f
-                            reg add "HKLM\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Explorer\FolderDescriptions\{31C0DD25-9439-4F12-BF41-7FF4EDA38722}\PropertyBag" /v "ThisPCPolicy" /t REG_SZ /d "Hide" /f
+                            reg add "HKLM\Software\Microsoft\Windows\CurrentVersion\Explorer\FolderDescriptions\{B4BFCC3A-DB2C-424C-B029-7FE99A87C641}\PropertyBag" /v "ThisPCPolicy" /t REG_SZ /d "Hide" /f
+                            reg add "HKLM\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Explorer\FolderDescriptions\{B4BFCC3A-DB2C-424C-B029-7FE99A87C641}\PropertyBag" /v "ThisPCPolicy" /t REG_SZ /d "Hide" /f
                         revertCode: |-
-                            reg add "HKLM\Software\Microsoft\Windows\CurrentVersion\Explorer\FolderDescriptions\{31C0DD25-9439-4F12-BF41-7FF4EDA38722}\PropertyBag" /v "ThisPCPolicy" /t REG_SZ /d "Show" /f
-                            reg add "HKLM\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Explorer\FolderDescriptions\{31C0DD25-9439-4F12-BF41-7FF4EDA38722}\PropertyBag" /v "ThisPCPolicy" /t REG_SZ /d "Show" /f
+                            reg add "HKLM\Software\Microsoft\Windows\CurrentVersion\Explorer\FolderDescriptions\{B4BFCC3A-DB2C-424C-B029-7FE99A87C641}\PropertyBag" /v "ThisPCPolicy" /t REG_SZ /d "Show" /f
+                            reg add "HKLM\Software\Wow6432Node\Microsoft\Windows\CurrentVersion\Explorer\FolderDescriptions\{B4BFCC3A-DB2C-424C-B029-7FE99A87C641}\PropertyBag" /v "ThisPCPolicy" /t REG_SZ /d "Show" /f
                     -
                         name: Documents
                         code: |-
@@ -2825,14 +2861,18 @@ actions:
                         code: sc stop "XboxNetApiSvc" & sc config "XboxNetApiSvc" start=disabled
                         revertCode: sc config "XboxNetApiSvc" start=demand
             -
-                name: Volume Shadow Copy Service
-                recommend: standard
-                docs: https://docs.microsoft.com/en-us/windows-server/storage/file-server/volume-shadow-copy-service
+                name: Disable Volume Shadow Copy Service (breaks System Restore and Windows Backup) # Also known as • Volume Snapshot Service • VSS • VSC
+                recommend: strict
+                docs:
+                    - https://docs.microsoft.com/en-us/windows-server/storage/file-server/volume-shadow-copy-service
+                    - https://www.schneier.com/blog/archives/2009/12/the_security_im.html
                 code: sc stop "VSS" & sc config "VSS" start=disabled
                 revertCode: sc config "VSS" start=demand
             -
                 name: Disable NetBios for all interfaces
-                docs: https://10dsecurity.com/saying-goodbye-netbios/
+                docs:
+                    - https://bobcares.com/blog/disable-netbios-and-llmnr-protocols-in-windows-using-gpo/
+                    - https://social.technet.microsoft.com/Forums/windowsserver/en-US/c5f3c095-1ad2-4963-b075-787f800b81f2/
                 call:
                     function: RunPowerShell
                     parameters:
@@ -2986,7 +3026,7 @@ actions:
                                         packageName: Microsoft.Messaging
                             -
                                 name: Mixed Reality Portal app
-                                docs: https://www.microsoft.com/en-us/p/mixed-reality-portal
+                                docs: https://www.microsoft.com/en-us/p/mixed-reality-portal/9ng1h8b3zc7m
                                 call:
                                     function: UninstallStoreApp
                                     parameters:
@@ -3004,7 +3044,7 @@ actions:
                                                 packageName: Microsoft.MicrosoftOfficeHub
                                     -
                                         name: OneNote app
-                                        docs: https://www.microsoft.com/en-us/p/onenote-for-windows-10
+                                        docs: https://www.microsoft.com/en-us/p/onenote-for-windows-10/9wzdncrfhvjl
                                         call:
                                             function: UninstallStoreApp
                                             parameters:
@@ -3454,7 +3494,7 @@ actions:
                                                 packageName: Microsoft.ECApp
                                     -
                                         name: Lock app (shows lock screen)
-                                        docs: https://www.dashtech.org/can-you-disable-lockapp-exe-on-windows-10/
+                                        docs: https://www.getwox.com/what-is-lockapp-exe/
                                         call:
                                             function: UninstallSystemApp
                                             parameters:
@@ -3511,7 +3551,7 @@ actions:
                                             parameters:
                                                 packageName: Microsoft.Windows.CapturePicker
                                     -
-                                        name: Cloud Experience Host app # Allows to connect to corporate domains or Microsoft cloud based services
+                                        name: Cloud Experience Host app (breaks Microsoft cloud/corporate sign in) # Allows to connect to corporate domains or Microsoft cloud based services
                                         recommend: strict
                                         call:
                                             function: UninstallSystemApp
@@ -4302,30 +4342,32 @@ actions:
                 code: |-
                     :: Configure time source
                     w32tm /config /syncfromflags:manual /manualpeerlist:"0.pool.ntp.org 1.pool.ntp.org 2.pool.ntp.org 3.pool.ntp.org"
-                    :: Restart time service if running
+                    :: Stop time service if running
                     SC queryex "w32time"|Find "STATE"|Find /v "RUNNING">Nul||(
                         net stop w32time
-                        net start w32time
                     )
-                    :: Sync now
+                    :: Start time service and sync now
+                    net start w32time
                     w32tm /config /update
                     w32tm /resync
                 revertCode: |-
                     :: Configure time source
                     w32tm /config /syncfromflags:manual /manualpeerlist:"time.windows.com"
-                    :: Restart time service if running
+                    :: Stop time service if running
                     SC queryex "w32time"|Find "STATE"|Find /v "RUNNING">Nul||(
                         net stop w32time
-                        net start w32time
                     )
-                    :: Sync now
+                    :: Start time servie and sync now
+                    net start w32time
                     w32tm /config /update
                     w32tm /resync
             -
-                name: Disable Reserved Storage for updates
+                name: Disable Reserved Storage for updates # since 19H1 (1903)
                 docs: 
-                    - https://techcommunity.microsoft.com/t5/storage-at-microsoft/windows-10-and-reserved-storage/ba-p/428327
-                    - https://www.tenforums.com/tutorials/124858-enable-disable-reserved-storage-windows-10-a.html
+                    - https://techcommunity.microsoft.com/t5/storage-at-microsoft/windows-10-and-reserved-storage/ba-p/428327 # Announcement
+                    - https://techcommunity.microsoft.com/t5/windows-it-pro-blog/managing-reserved-storage-in-windows-10-environments/ba-p/1297070#toc-hId--8696946 # Set-ReservedStorageState
+                    - https://www.howtogeek.com/425563/how-to-disable-reserved-storage-on-windows-10/ # ShippedWithReserves
+                    - https://techcommunity.microsoft.com/t5/windows-servicing/reserve-manager-enabled-with-low-disk-space-block/m-p/2073132 # PassedPolicy
                 code: |-
                     dism /online /Set-ReservedStorageState /State:Disabled /NoRestart
                     reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\ReserveManager" /v "MiscPolicyInfo" /t REG_DWORD /d "2" /f

src/domain/CategoryCollection.ts

@@ -1,4 +1,4 @@
-import { getEnumNames, getEnumValues } from '@/application/Common/Enum';
+import { getEnumNames, getEnumValues, assertInRange } from '@/application/Common/Enum';
 import { IEntity } from '../infrastructure/Entity/IEntity';
 import { ICategory } from './ICategory';
 import { IScript } from './IScript';
@@ -21,7 +21,7 @@ export class CategoryCollection implements ICategoryCollection {
             throw new Error('undefined scripting definition');
         }
         this.queryable = makeQueryable(actions);
-        ensureValidOs(os);
+        assertInRange(os, OperatingSystem);
         ensureValid(this.queryable);
         ensureNoDuplicates(this.queryable.allCategories);
         ensureNoDuplicates(this.queryable.allScripts);
@@ -54,18 +54,6 @@ export class CategoryCollection implements ICategoryCollection {
     }
 }
 
-function ensureValidOs(os: OperatingSystem): void {
-    if (os === undefined) {
-        throw new Error('undefined os');
-    }
-    if (os === OperatingSystem.Unknown) {
-        throw new Error('unknown os');
-    }
-    if (!(os in OperatingSystem)) {
-        throw new Error(`os "${os}" is out of range`);
-    }
-}
-
 function ensureNoDuplicates<TKey>(entities: ReadonlyArray<IEntity<TKey>>) {
     const totalOccurrencesById = new Map<TKey, number>();
     for (const entity of entities) {

src/domain/OperatingSystem.ts

@@ -10,5 +10,4 @@ export enum OperatingSystem {
     Android,
     iOS,
     WindowsPhone,
-    Unknown,
 }

src/domain/ProjectInformation.ts

@@ -1,5 +1,6 @@
 import { IProjectInformation } from './IProjectInformation';
 import { OperatingSystem } from './OperatingSystem';
+import { assertInRange } from '@/application/Common/Enum';
 
 export class ProjectInformation implements IProjectInformation {
     public readonly repositoryWebUrl: string;
@@ -42,6 +43,7 @@ function getWebUrl(gitUrl: string) {
 }
 
 function getFileName(os: OperatingSystem, version: string): string {
+    assertInRange(os, OperatingSystem);
     switch (os) {
         case OperatingSystem.Linux:
             return `privacy.sexy-${version}.AppImage`;
@@ -50,6 +52,6 @@ function getFileName(os: OperatingSystem, version: string): string {
         case OperatingSystem.Windows:
             return `privacy.sexy-Setup-${version}.exe`;
         default:
-            throw new Error(`Unsupported os: ${OperatingSystem[os]}`);
+            throw new RangeError(`Unsupported os: ${OperatingSystem[os]}`);
     }
 }

src/domain/ScriptCode.ts

@@ -7,16 +7,7 @@ export class ScriptCode implements IScriptCode {
         syntax: ILanguageSyntax) {
         if (!syntax) { throw new Error('undefined syntax'); }
         validateCode(execute, syntax);
-        if (revert) {
-            try {
-                validateCode(revert, syntax);
-                if (execute === revert) {
-                    throw new Error(`Code itself and its reverting code cannot be the same`);
-                }
-            } catch (err) {
-                throw Error(`(revert): ${err.message}`);
-            }
-        }
+        validateRevertCode(revert, execute, syntax);
     }
 }
 
@@ -25,6 +16,20 @@ export interface ILanguageSyntax {
     readonly commonCodeParts: string[];
 }
 
+function validateRevertCode(revertCode: string, execute: string, syntax: ILanguageSyntax) {
+    if (!revertCode) {
+        return;
+    }
+    try {
+        validateCode(revertCode, syntax);
+        if (execute === revertCode) {
+            throw new Error(`Code itself and its reverting code cannot be the same`);
+        }
+    } catch (err) {
+        throw Error(`(revert): ${err.message}`);
+    }
+}
+
 function validateCode(code: string, syntax: ILanguageSyntax): void {
     if (!code || code.length === 0) {
         throw new Error(`code is empty or undefined`);

src/infrastructure/CodeRunner.ts

@@ -5,16 +5,20 @@ import fs from 'fs';
 import child_process from 'child_process';
 import { OperatingSystem } from '@/domain/OperatingSystem';
 
-export async function runCodeAsync(
-    code: string, folderName: string, fileExtension: string,
-    node = getNodeJs(), environment = Environment.CurrentEnvironment): Promise<void> {
-    const dir = node.path.join(node.os.tmpdir(), folderName);
-    await node.fs.promises.mkdir(dir, {recursive: true});
-    const filePath = node.path.join(dir, `run.${fileExtension}`);
-    await node.fs.promises.writeFile(filePath, code);
-    await node.fs.promises.chmod(filePath, '755');
-    const command = getExecuteCommand(filePath, environment);
-    node.child_process.exec(command);
+export class CodeRunner {
+    constructor(
+        private readonly node = getNodeJs(),
+        private readonly environment = Environment.CurrentEnvironment) {
+    }
+    public async runCodeAsync(code: string, folderName: string, fileExtension: string): Promise<void> {
+        const dir = this.node.path.join(this.node.os.tmpdir(), folderName);
+        await this.node.fs.promises.mkdir(dir, {recursive: true});
+        const filePath = this.node.path.join(dir, `run.${fileExtension}`);
+        await this.node.fs.promises.writeFile(filePath, code);
+        await this.node.fs.promises.chmod(filePath, '755');
+        const command = getExecuteCommand(filePath, this.environment);
+        this.node.child_process.exec(command);
+    }
 }
 
 function getExecuteCommand(scriptPath: string, environment: Environment): string {

src/infrastructure/Threading/AsyncSleep.ts

@@ -0,0 +1,5 @@
+export type SchedulerType = (callback: (...args: any[]) => void, ms: number) => void;
+
+export function sleepAsync(time: number, scheduler: SchedulerType = setTimeout) {
+    return new Promise((resolve) => scheduler(() => resolve(undefined), time));
+}

src/presentation/background.ts

@@ -4,7 +4,7 @@
 // This script is running through entire life of the application.
 // It doesn't have any windows which you can see on screen, opens the main window from here.
 
-import { app, protocol, BrowserWindow, shell } from 'electron';
+import { app, protocol, BrowserWindow, shell, screen } from 'electron';
 import { createProtocol } from 'vue-cli-plugin-electron-builder/lib';
 import installExtension, { VUEJS_DEVTOOLS } from 'electron-devtools-installer';
 import path from 'path';
@@ -34,9 +34,10 @@ if (!process.env.IS_TEST) {
 
 function createWindow() {
   // Create the browser window.
+  const size = getWindowSize(1350, 955);
   win = new BrowserWindow({
-    width: 1350,
-    height: 955,
+    width: size.width,
+    height: size.height,
     webPreferences: {
       contextIsolation: false, // To reach node https://github.com/nklayman/vue-cli-plugin-electron-builder/issues/1285
       // Use pluginOptions.nodeIntegration, leave this alone
@@ -143,3 +144,12 @@ function loadUrlWithNodeWorkaround(window: BrowserWindow, url: string) {
     window.loadURL(url);
   }, 10);
 }
+
+function getWindowSize(idealWidth: number, idealHeight: number) {
+  let { width, height } = screen.getPrimaryDisplay().workAreaSize;
+  // To ensure not creating a screen bigger than current screen size
+  // Not using "enableLargerThanScreen" as it's macOS only (see https://www.electronjs.org/docs/api/browser-window)
+  width = Math.min(width, idealWidth);
+  height = Math.min(height, idealHeight);
+  return { width, height };
+}

src/presentation/components/Code/CodeButtons/TheCodeButtons.vue

@@ -37,7 +37,7 @@ import { ScriptingLanguage } from '@/domain/ScriptingLanguage';
 import { IApplicationCode } from '@/application/Context/State/Code/IApplicationCode';
 import { IScriptingDefinition } from '@/domain/IScriptingDefinition';
 import { OperatingSystem } from '@/domain/OperatingSystem';
-import { runCodeAsync } from '@/infrastructure/CodeRunner';
+import { CodeRunner } from '@/infrastructure/CodeRunner';
 import { IApplicationContext } from '@/application/Context/IApplicationContext';
 
 @Component({
@@ -116,11 +116,12 @@ function buildFileName(scripting: IScriptingDefinition) {
 }
 
 async function executeCodeAsync(context: IApplicationContext) {
-    await runCodeAsync(
-        /*code*/ context.state.code.current,
-        /*appName*/ context.app.info.name,
-        /*fileExtension*/ context.state.collection.scripting.fileExtension,
-      );
+  const runner = new CodeRunner();
+  await runner.runCodeAsync(
+    /*code*/ context.state.code.current,
+    /*appName*/ context.app.info.name,
+    /*fileExtension*/ context.state.collection.scripting.fileExtension,
+  );
 }
 
 </script>

src/presentation/components/Scripts/Menu/Grouping/TheGrouper.vue

@@ -1,26 +1,38 @@
 <template>
     <div class="container">
-        <span class="part">Group by:</span>
+        <MenuOptionList
+            label="Group by"
+            class="part">
+            <MenuOptionListItem
+                label="Cards"
+                :enabled="!cardsSelected"
+                @click="groupByCard()"
+            />
+            <MenuOptionListItem
+                label="None"
+                :enabled="!noneSelected"
+                @click="groupByNone()"
+            />
+        </MenuOptionList>
         <span class="part">
-            <span 
-                class="part"
-                v-bind:class="{ 'disabled': cardsSelected, 'enabled': !cardsSelected}"
-                @click="groupByCard()">Cards</span>
-            <span class="part">|</span>
-            <span class="part"
-                v-bind:class="{ 'disabled': noneSelected, 'enabled': !noneSelected}"
-                @click="groupByNone()">None</span>
-            </span>
+        </span>
     </div>
 </template>
 
 <script lang="ts">
 import { Component, Vue } from 'vue-property-decorator';
 import { Grouping } from './Grouping';
+import MenuOptionList from './../MenuOptionList.vue';
+import MenuOptionListItem from './../MenuOptionListItem.vue';
 
 const DefaultGrouping = Grouping.Cards;
 
-@Component
+@Component({
+  components: {
+    MenuOptionList,
+    MenuOptionListItem,
+  },
+})
 export default class TheGrouper extends Vue {
     public cardsSelected = false;
     public noneSelected = false;
@@ -50,29 +62,5 @@ export default class TheGrouper extends Vue {
 </script>
 
 <style scoped lang="scss">
-@import "@/presentation/styles/colors.scss";
-@import "@/presentation/styles/fonts.scss";
-
-.container {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap;
-    font-family: $normal-font;
-    .part {
-        display: flex;
-        margin-right:5px;
-    }
-}
-
-.enabled {
-    cursor: pointer;
-    &:hover {
-        font-weight:bold;
-        text-decoration:underline;
-    }
-}
-.disabled {
-    color:$gray;
-}
 
 </style>

src/presentation/components/Scripts/Menu/MenuOptionList.vue

@@ -0,0 +1,38 @@
+<template>
+    <div class="list">
+        <div v-if="label">{{ label }}:</div>
+        <div class="items">
+            <slot />
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+import { Component, Vue, Prop } from 'vue-property-decorator';
+
+@Component
+export default class MenuOptionList extends Vue {
+  @Prop() public label: string;
+}
+</script>
+
+<style scoped lang="scss">
+@import "@/presentation/styles/fonts.scss";
+
+$gap: 0.25rem;
+.list {
+  font-family: $normal-font;
+  display: flex;
+  align-items: center;
+  .items {
+    * + *::before {
+        content: '|';
+        padding-right: $gap;
+        padding-left: $gap;
+    }
+  }
+  > *:not(:last-child) {
+    margin-right: $gap;
+  }
+}
+</style>

src/presentation/components/Scripts/Menu/MenuOptionListItem.vue

@@ -1,8 +1,10 @@
 <template>
-    <span
-        v-bind:class="{ 'disabled': enabled, 'enabled': !enabled}"
-        v-non-collapsing
-        @click="onClicked()">{{label}}</span>
+    <span> <!-- Parent wrapper allows adding content inside with CSS without making it clickable -->
+        <span
+            v-bind:class="{ 'disabled': !enabled, 'enabled': enabled}"
+            v-non-collapsing
+            @click="enabled && onClicked()">{{label}}</span>
+    </span>
 </template>
 
 <script lang="ts">
@@ -12,7 +14,7 @@ import { NonCollapsing } from '@/presentation/components/Scripts/Cards/NonCollap
 @Component({
     directives: { NonCollapsing },
 })
-export default class SelectableOption extends Vue {
+export default class MenuOptionListItem extends Vue {
   @Prop() public enabled: boolean;
   @Prop() public label: string;
   @Emit('click') public onClicked() { return; }

src/presentation/components/Scripts/Menu/Selector/SelectionTypeHandler.ts

@@ -0,0 +1,86 @@
+import { IScript } from '@/domain/IScript';
+import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript';
+import { RecommendationLevel } from '@/domain/RecommendationLevel';
+import { scrambledEqual } from '@/application/Common/Array';
+import { ICategoryCollectionState } from '@/application/Context/State/ICategoryCollectionState';
+
+export enum SelectionType {
+    Standard,
+    Strict,
+    All,
+    None,
+    Custom,
+}
+
+export class SelectionTypeHandler {
+    constructor(private readonly state: ICategoryCollectionState) {
+        if (!state) { throw new Error('undefined state'); }
+    }
+    public selectType(type: SelectionType) {
+        if (type === SelectionType.Custom) {
+            throw new Error('cannot select custom type');
+        }
+        const selector = selectors.get(type);
+        selector.select(this.state);
+    }
+    public getCurrentSelectionType(): SelectionType {
+        for (const [type, selector] of Array.from(selectors.entries())) {
+            if (selector.isSelected(this.state)) {
+                return type;
+            }
+        }
+        return SelectionType.Custom;
+    }
+}
+
+interface ISingleTypeHandler {
+    isSelected: (state: ICategoryCollectionState) => boolean;
+    select: (state: ICategoryCollectionState) => void;
+}
+
+const selectors = new Map<SelectionType, ISingleTypeHandler>([
+    [SelectionType.None, {
+        select: (state) =>
+            state.selection.deselectAll(),
+        isSelected: (state) =>
+            state.selection.selectedScripts.length === 0,
+    }],
+    [SelectionType.Standard, getRecommendationLevelSelector(RecommendationLevel.Standard)],
+    [SelectionType.Strict, getRecommendationLevelSelector(RecommendationLevel.Strict)],
+    [SelectionType.All, {
+        select: (state) =>
+            state.selection.selectAll(),
+        isSelected: (state) =>
+            state.selection.selectedScripts.length === state.collection.totalScripts,
+    }],
+]);
+
+function getRecommendationLevelSelector(level: RecommendationLevel): ISingleTypeHandler {
+    return {
+        select: (state) => selectOnly(level, state),
+        isSelected: (state) => hasAllSelectedLevelOf(level, state),
+    };
+}
+
+function hasAllSelectedLevelOf(level: RecommendationLevel, state: ICategoryCollectionState) {
+    const scripts = state.collection.getScriptsByLevel(level);
+    const selectedScripts = state.selection.selectedScripts;
+    return areAllSelected(scripts, selectedScripts);
+}
+
+function selectOnly(level: RecommendationLevel, state: ICategoryCollectionState) {
+    const scripts = state.collection.getScriptsByLevel(level);
+    state.selection.selectOnly(scripts);
+}
+
+function areAllSelected(
+    expectedScripts: ReadonlyArray<IScript>,
+    selection: ReadonlyArray<SelectedScript>): boolean {
+    selection = selection.filter((selected) => !selected.revert);
+    if (expectedScripts.length < selection.length) {
+        return false;
+    }
+    const selectedScriptIds = selection.map((script) => script.id);
+    const expectedScriptIds = expectedScripts.map((script) => script.id);
+    return scrambledEqual(selectedScriptIds, expectedScriptIds);
+}

src/presentation/components/Scripts/Menu/Selector/TheSelector.vue

@@ -1,176 +1,79 @@
 <template>
-    <div class="container">
-        <div class="part">Select:</div>
-        <div class="part">
-            <div class="part">
-                <SelectableOption
-                    label="None"
-                    :enabled="this.currentSelection == SelectionState.None"
-                    @click="selectAsync(SelectionState.None)"
-                    v-tooltip=" 'Deselect all selected scripts.<br/>' +
-                                '💡 Good start to dive deeper into tweaks and select only what you want.'"
-                    />
-            </div>
-            <div class="part"> | </div>
-            <div class="part">
-                <SelectableOption
-                    label="Standard"
-                    :enabled="this.currentSelection == SelectionState.Standard"
-                    @click="selectAsync(SelectionState.Standard)"
-                    v-tooltip=" '🛡️ Balanced for privacy and functionality.<br/>' +
-                                'OS and applications will function normally.<br/>' +
-                                '💡 Recommended for everyone'"
-                    />
-                </div>
-            <div class="part"> | </div>
-            <div class="part">
-                <SelectableOption
-                    label="Strict"
-                    :enabled="this.currentSelection == SelectionState.Strict"
-                    @click="selectAsync(SelectionState.Strict)"
-                    v-tooltip=" '🚫 Stronger privacy, disables risky functions that may leak your data.<br/>' +
-                                '⚠️ Double check to remove sripts where you would trade functionality for privacy<br/>' +
-                                '💡 Recommended for daily users that prefers more privacy over non-essential functions'"
-                    />
-                </div>
-            <div class="part"> | </div>
-            <div class="part">
-                    <SelectableOption
-                        label="All"
-                        :enabled="this.currentSelection == SelectionState.All"
-                        @click="selectAsync(SelectionState.All)"
-                        v-tooltip=" '🔒 Strongest privacy, disabling any functionality that may leak your data.<br/>' +
-                                    '🛑 Not designed for daily users, it will break important functionalities.<br/>' +
-                                    '💡 Only recommended for extreme use-cases like crime labs where no leak is acceptable'"
-                    />
-            </div>
-        </div>
-    </div>
+    <MenuOptionList label="Select">
+        <MenuOptionListItem
+            label="None"
+            :enabled="this.currentSelection !== SelectionType.None"
+            @click="selectType(SelectionType.None)"
+            v-tooltip=" 'Deselect all selected scripts.<br/>' +
+                        '💡 Good start to dive deeper into tweaks and select only what you want.'"
+            />
+        <MenuOptionListItem
+            label="Standard"
+            :enabled="this.currentSelection !== SelectionType.Standard"
+            @click="selectType(SelectionType.Standard)"
+            v-tooltip=" '🛡️ Balanced for privacy and functionality.<br/>' +
+                        'OS and applications will function normally.<br/>' +
+                        '💡 Recommended for everyone'"
+            />
+        <MenuOptionListItem
+            label="Strict"
+            :enabled="this.currentSelection !== SelectionType.Strict"
+            @click="selectType(SelectionType.Strict)"
+            v-tooltip=" '🚫 Stronger privacy, disables risky functions that may leak your data.<br/>' +
+                        '⚠️ Double check to remove scripts where you would trade functionality for privacy<br/>' +
+                        '💡 Recommended for daily users that prefers more privacy over non-essential functions'"
+            />
+        <MenuOptionListItem
+            label="All"
+            :enabled="this.currentSelection !== SelectionType.All"
+            @click="selectType(SelectionType.All)"
+            v-tooltip=" '🔒 Strongest privacy, disabling any functionality that may leak your data.<br/>' +
+                        '🛑 Not designed for daily users, it will break important functionalities.<br/>' +
+                        '💡 Only recommended for extreme use-cases like crime labs where no leak is acceptable'"
+        />
+    </MenuOptionList>
 </template>
 
 <script lang="ts">
 import { Component } from 'vue-property-decorator';
 import { StatefulVue } from '@/presentation/components/Shared/StatefulVue';
-import SelectableOption from './SelectableOption.vue';
-import { IScript } from '@/domain/IScript';
-import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript';
-import { RecommendationLevel } from '@/domain/RecommendationLevel';
 import { ICategoryCollectionState } from '@/application/Context/State/ICategoryCollectionState';
+import { SelectionType, SelectionTypeHandler } from './SelectionTypeHandler';
+import MenuOptionList from './../MenuOptionList.vue';
+import MenuOptionListItem from '../MenuOptionListItem.vue';
 
-enum SelectionState {
-    Standard,
-    Strict,
-    All,
-    None,
-    Custom,
-}
 @Component({
   components: {
-    SelectableOption,
+    MenuOptionList,
+    MenuOptionListItem,
   },
 })
 export default class TheSelector extends StatefulVue {
-    public SelectionState = SelectionState;
-    public currentSelection = SelectionState.None;
+    public SelectionType = SelectionType;
+    public currentSelection = SelectionType.None;
+    private selectionTypeHandler: SelectionTypeHandler;
 
-    public async selectAsync(type: SelectionState): Promise<void> {
+    public async selectType(type: SelectionType) {
         if (this.currentSelection === type) {
             return;
         }
-        const context = await this.getCurrentContextAsync();
-        selectType(context.state, type);
+        this.selectionTypeHandler.selectType(type);
     }
 
-    protected handleCollectionState(newState: ICategoryCollectionState, oldState: ICategoryCollectionState): void {
-        this.updateSelections(newState);
-        newState.selection.changed.on(() => this.updateSelections(newState));
-        if (oldState) {
-            oldState.selection.changed.on(() => this.updateSelections(oldState));
-        }
+    protected handleCollectionState(newState: ICategoryCollectionState): void {
+        this.events.unsubscribeAll();
+        this.selectionTypeHandler = new SelectionTypeHandler(newState);
+        this.updateSelections();
+        this.events.register(newState.selection.changed.on(() => this.updateSelections()));
     }
 
-    private updateSelections(state: ICategoryCollectionState) {
-       this.currentSelection = getCurrentSelectionState(state);
+    private updateSelections() {
+       this.currentSelection = this.selectionTypeHandler.getCurrentSelectionType();
     }
 }
 
-interface ITypeSelector {
-    isSelected: (state: ICategoryCollectionState) => boolean;
-    select: (state: ICategoryCollectionState) => void;
-}
-
-const selectors = new Map<SelectionState, ITypeSelector>([
-    [SelectionState.None, {
-        select: (state) =>
-            state.selection.deselectAll(),
-        isSelected: (state) =>
-            state.selection.totalSelected === 0,
-    }],
-    [SelectionState.Standard, {
-        select: (state) =>
-            state.selection.selectOnly(
-                state.collection.getScriptsByLevel(RecommendationLevel.Standard)),
-        isSelected: (state) =>
-            hasAllSelectedLevelOf(RecommendationLevel.Standard, state),
-    }],
-    [SelectionState.Strict, {
-        select: (state) =>
-            state.selection.selectOnly(state.collection.getScriptsByLevel(RecommendationLevel.Strict)),
-        isSelected: (state) =>
-            hasAllSelectedLevelOf(RecommendationLevel.Strict, state),
-    }],
-    [SelectionState.All, {
-        select: (state) =>
-            state.selection.selectAll(),
-        isSelected: (state) =>
-            state.selection.totalSelected === state.collection.totalScripts,
-    }],
-]);
-
-function selectType(state: ICategoryCollectionState, type: SelectionState) {
-    const selector = selectors.get(type);
-    selector.select(state);
-}
-
-function getCurrentSelectionState(state: ICategoryCollectionState): SelectionState {
-    for (const [type, selector] of Array.from(selectors.entries())) {
-        if (selector.isSelected(state)) {
-            return type;
-        }
-    }
-    return SelectionState.Custom;
-}
-
-function hasAllSelectedLevelOf(level: RecommendationLevel, state: ICategoryCollectionState) {
-    const scripts = state.collection.getScriptsByLevel(level);
-    const selectedScripts = state.selection.selectedScripts;
-    return areAllSelected(scripts, selectedScripts);
-}
-
-function areAllSelected(
-    expectedScripts: ReadonlyArray<IScript>,
-    selection: ReadonlyArray<SelectedScript>): boolean {
-    selection = selection.filter((selected) => !selected.revert);
-    if (expectedScripts.length < selection.length) {
-        return false;
-    }
-    const selectedScriptIds = selection.map((script) => script.id).sort();
-    const expectedScriptIds = expectedScripts.map((script) => script.id).sort();
-    return selectedScriptIds.every((id, index) => id === expectedScriptIds[index]);
-}
 </script>
 
 <style scoped lang="scss">
-@import "@/presentation/styles/fonts.scss";
 
-.container {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap;
-    .part {
-        display: flex;
-        margin-right:5px;
-    }
-    font-family: $normal-font;
-}
 </style>

src/presentation/components/Scripts/Menu/TheOsChanger.vue

@@ -1,17 +1,12 @@
 <template>
-  <div class="container">
-    <!-- <div>OS:</div> -->
-    <div class="os-list">
-      <div v-for="os in this.allOses" :key="os.name">
-        <span
-          class="os-name"
-          v-bind:class="{ 'current': currentOs === os.os }"
-          v-on:click="changeOsAsync(os.os)">
-          {{ os.name }}
-        </span>
-      </div>
-    </div>
-  </div>
+  <MenuOptionList>
+      <MenuOptionListItem
+        v-for="os in this.allOses" :key="os.name"
+        :enabled="currentOs !== os.os"
+        @click="changeOsAsync(os.os)"
+        :label="os.name"
+        />
+  </MenuOptionList>
 </template>
 
 <script lang="ts">
@@ -20,11 +15,18 @@ import { OperatingSystem } from '@/domain/OperatingSystem';
 import { StatefulVue } from '@/presentation/components/Shared/StatefulVue';
 import { ICategoryCollectionState } from '@/application/Context/State/ICategoryCollectionState';
 import { ApplicationFactory } from '@/application/ApplicationFactory';
+import MenuOptionList from './MenuOptionList.vue';
+import MenuOptionListItem from './MenuOptionListItem.vue';
 
-@Component
+@Component({
+  components: {
+    MenuOptionList,
+    MenuOptionListItem,
+  },
+})
 export default class TheOsChanger extends StatefulVue {
   public allOses: Array<{ name: string, os: OperatingSystem }> = [];
-  public currentOs: OperatingSystem = OperatingSystem.Unknown;
+  public currentOs?: OperatingSystem = null;
 
   public async created() {
     const app = await ApplicationFactory.Current.getAppAsync();
@@ -52,31 +54,5 @@ function renderOsName(os: OperatingSystem): string {
 </script>
 
 <style scoped lang="scss">
-@import "@/presentation/styles/fonts.scss";
-@import "@/presentation/styles/colors.scss";
-.container {
-  font-family: $normal-font;
-  display: flex;
-  align-items: center;
-  .os-list {
-    display: flex;
-    margin-left: 0.25rem;
-    div + div::before {
-        content: "|";
-        margin-left: 0.5rem;
-    }
-    .os-name {
-      &:not(.current) {
-        cursor: pointer;
-        &:hover {
-            font-weight: bold;
-            text-decoration: underline;
-        }
-      }
-      &.current {
-        color: $gray;
-      }
-    }
-  }
-}
+
 </style>

src/presentation/components/Scripts/ScriptsTree/SelectableTree/SelectableTree.vue

@@ -22,7 +22,8 @@ import LiquorTree from 'liquor-tree';
 import Node from './Node/Node.vue';
 import { INode } from './Node/INode';
 import { convertExistingToNode, toNewLiquorTreeNode } from './LiquorTree/NodeWrapper/NodeTranslator';
-import { INodeSelectedEvent } from './/INodeSelectedEvent';
+import { INodeSelectedEvent } from './INodeSelectedEvent';
+import { sleepAsync } from '@/infrastructure/Threading/AsyncSleep';
 import { getNewState } from './LiquorTree/NodeWrapper/NodeStateUpdater';
 import { LiquorTreeOptions } from './LiquorTree/LiquorTreeOptions';
 import { FilterPredicate, NodePredicateFilter } from './LiquorTree/NodeWrapper/NodePredicateFilter';
@@ -121,7 +122,6 @@ function recurseDown(
 async function tryUntilDefinedAsync<T>(
     accessor: () => T | undefined,
     delayInMs: number, maxTries: number): Promise<T | undefined> {
-    const sleepAsync = () => new Promise(((resolve) => setTimeout(resolve, delayInMs)));
     let triesLeft = maxTries;
     let value: T;
     while (triesLeft !== 0) {
@@ -130,7 +130,7 @@ async function tryUntilDefinedAsync<T>(
             return value;
         }
         triesLeft--;
-        await sleepAsync();
+        await sleepAsync(delayInMs);
     }
     return value;
 }

tests/integration/application/Parser/ApplicationParser.spec.ts

@@ -0,0 +1,14 @@
+import 'mocha';
+import { expect } from 'chai';
+import { parseApplication } from '@/application/Parser/ApplicationParser';
+
+describe('ApplicationParser', () => {
+    describe('parseApplication', () => {
+        it('can parse current application', () => {
+            // act
+            const act = () => parseApplication();
+            // assert
+            expect(act).to.not.throw();
+        });
+    });
+});

tests/integration/application/collections/NoDeadDocumentationUrls.spec.ts

@@ -0,0 +1,48 @@
+import 'mocha';
+import { expect } from 'chai';
+import { parseApplication } from '@/application/Parser/ApplicationParser';
+import { IApplication } from '@/domain/IApplication';
+import { IUrlStatus } from './StatusChecker/IUrlStatus';
+import { getUrlStatusesInParallelAsync, IBatchRequestOptions } from './StatusChecker/BatchStatusChecker';
+
+describe('collections', () => {
+    // arrange
+    const app = parseApplication();
+    const urls = collectUniqueUrls(app);
+    const options: IBatchRequestOptions = {
+        domainOptions: {
+            sameDomainParallelize: true, // no need to be so nice until sources start failing
+            // sameDomainDelayInMs: 2 /* sec */ * 1000,
+        },
+        requestOptions: {
+            retryExponentialBaseInMs: 3 /* sec */ * 1000,
+            additionalHeaders: { referer: app.info.homepage },
+        },
+    };
+    const testTimeoutInMs = urls.length * 60000 /* 1 minute */;
+    it('have no dead urls', async () => {
+        // act
+        const results = await getUrlStatusesInParallelAsync(urls, options);
+        // assert
+        const deadUrls = results.filter((r) => r.statusCode !== 200);
+        expect(deadUrls).to.have.lengthOf(0, printUrls(deadUrls));
+    }).timeout(testTimeoutInMs);
+});
+
+function collectUniqueUrls(app: IApplication): string[] {
+    return app
+        .collections
+        .flatMap((a) => a.getAllScripts())
+        .flatMap((script) => script.documentationUrls)
+        .filter((url, index, array) => array.indexOf(url) === index);
+}
+
+function printUrls(statuses: IUrlStatus[]): string {
+    return '\n' +
+        statuses.map((status) =>
+            `- ${status.url}\n` +
+            (status.statusCode ? `\tResponse code: ${status.statusCode}` : '') +
+            (status.error ? `\tException: ${JSON.stringify(status.error, null, '\t')}` : ''))
+        .join(`\n`)
+        + '\n';
+}

tests/integration/application/collections/StatusChecker/BatchStatusChecker.ts

@@ -0,0 +1,67 @@
+import { sleepAsync } from '@/infrastructure/Threading/AsyncSleep';
+import { IUrlStatus } from './IUrlStatus';
+import { getUrlStatusAsync, IRequestOptions } from './Requestor';
+import { groupUrlsByDomain } from './UrlPerDomainGrouper';
+
+export async function getUrlStatusesInParallelAsync(
+    urls: string[],
+    options?: IBatchRequestOptions): Promise<IUrlStatus[]> {
+    const uniqueUrls = Array.from(new Set(urls));
+    options = { ...DefaultOptions, ...options };
+    console.log('Options: ', options); // tslint:disable-line: no-console
+    const results = await requestAsync(uniqueUrls, options);
+    return results;
+}
+
+export interface IBatchRequestOptions {
+    domainOptions?: IDomainOptions;
+    requestOptions?: IRequestOptions;
+}
+
+interface IDomainOptions {
+    sameDomainParallelize?: boolean;
+    sameDomainDelayInMs?: number;
+}
+
+const DefaultOptions: IBatchRequestOptions = {
+    domainOptions: {
+        sameDomainParallelize: false,
+        sameDomainDelayInMs: 3 /* sec */ * 1000,
+    },
+    requestOptions: {
+        retryExponentialBaseInMs: 5 /* sec */ * 1000,
+        additionalHeaders: {},
+    },
+};
+
+function requestAsync(urls: string[], options: IBatchRequestOptions): Promise<IUrlStatus[]> {
+    if (!options.domainOptions.sameDomainParallelize) {
+        return runOnEachDomainWithDelayAsync(
+            urls,
+            (url) => getUrlStatusAsync(url, options.requestOptions),
+            options.domainOptions.sameDomainDelayInMs);
+    } else {
+        return Promise.all(
+            urls.map((url) => getUrlStatusAsync(url, options.requestOptions)));
+    }
+}
+
+async function runOnEachDomainWithDelayAsync(
+    urls: string[],
+    action: (url: string) => Promise<IUrlStatus>,
+    delayInMs: number): Promise<IUrlStatus[]> {
+    const grouped = groupUrlsByDomain(urls);
+    const tasks = grouped.map(async (group) => {
+        const results = new Array<IUrlStatus>();
+        for (const url of group) {
+            const status = await action(url);
+            results.push(status);
+            if (results.length !== group.length) {
+                await sleepAsync(delayInMs);
+            }
+        }
+        return results;
+    });
+    const r = await Promise.all(tasks);
+    return r.flat();
+}

tests/integration/application/collections/StatusChecker/ExponentialBackOffRetryHandler.ts

@@ -0,0 +1,44 @@
+import { sleepAsync } from '@/infrastructure/Threading/AsyncSleep';
+import { IUrlStatus } from './IUrlStatus';
+
+const DefaultBaseRetryIntervalInMs = 5 /* sec */ * 1000;
+
+export async function retryWithExponentialBackOffAsync(
+    action: () => Promise<IUrlStatus>,
+    baseRetryIntervalInMs: number = DefaultBaseRetryIntervalInMs,
+    currentRetry = 1): Promise<IUrlStatus> {
+    const maxTries: number = 3;
+    const status = await action();
+    if (shouldRetry(status)) {
+        if (currentRetry <= maxTries) {
+            const exponentialBackOffInMs = getRetryTimeoutInMs(currentRetry, baseRetryIntervalInMs);
+            // tslint:disable-next-line: no-console
+            console.log(`Retrying (${currentRetry}) in ${exponentialBackOffInMs / 1000} seconds`, status);
+            await sleepAsync(exponentialBackOffInMs);
+            return retryWithExponentialBackOffAsync(action, baseRetryIntervalInMs, currentRetry + 1);
+        }
+    }
+    return status;
+}
+
+function shouldRetry(status: IUrlStatus) {
+    if (status.error) {
+        return true;
+    }
+    return isTransientError(status.statusCode)
+        || status.statusCode === 429; // Too Many Requests
+}
+
+function isTransientError(statusCode: number) {
+    return statusCode >= 500 && statusCode <= 599;
+}
+
+function getRetryTimeoutInMs(currentRetry: number, baseRetryIntervalInMs: number = DefaultBaseRetryIntervalInMs) {
+    const retryRandomFactor = 0.5;  // Retry intervals are between 50% and 150%
+                                    // of the exponentially increasing base amount
+    const minRandom = 1 - retryRandomFactor;
+    const maxRandom = 1 + retryRandomFactor;
+    const randomization = (Math.random() * (maxRandom - minRandom)) + maxRandom;
+    const exponential = Math.pow(2, currentRetry - 1);
+    return Math.ceil(exponential * baseRetryIntervalInMs * randomization);
+}

tests/integration/application/collections/StatusChecker/IUrlStatus.ts

@@ -0,0 +1,5 @@
+export interface IUrlStatus {
+    url: string;
+    error?: any;
+    statusCode?: number;
+}

tests/integration/application/collections/StatusChecker/Requestor.ts

@@ -0,0 +1,47 @@
+import { retryWithExponentialBackOffAsync } from './ExponentialBackOffRetryHandler';
+import { IUrlStatus } from './IUrlStatus';
+import fetch from 'cross-fetch';
+
+export interface IRequestOptions {
+    retryExponentialBaseInMs?: number;
+    additionalHeaders?: Record<string, string>;
+}
+
+export async function getUrlStatusAsync(
+    url: string,
+    options: IRequestOptions = DefaultOptions): Promise<IUrlStatus> {
+    options = { ...DefaultOptions, ...options };
+    const fetchOptions = getFetchOptions(options);
+    return retryWithExponentialBackOffAsync(async () => {
+        console.log('Requesting', url); // tslint:disable-line: no-console
+        try {
+            const response = await fetch(url, fetchOptions);
+            return { url, statusCode: response.status};
+        } catch (err) {
+            return { url, error: err};
+        }
+    }, options.retryExponentialBaseInMs);
+}
+
+const DefaultOptions: IRequestOptions = {
+    retryExponentialBaseInMs: 5000,
+    additionalHeaders: {},
+};
+
+function getFetchOptions(options: IRequestOptions) {
+    return {
+        method: 'GET',
+        headers: { ...DefaultHeaders, ...options.additionalHeaders },
+    };
+}
+
+const DefaultHeaders: Record<string, string> = {
+    /* Chrome on macOS */
+    'user-agent': 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/90.0.4430.93 Safari/537.36',
+    'upgrade-insecure-requests': '1',
+    'connection': 'keep-alive',
+    'accept': 'text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8',
+    'accept-encoding': 'gzip, deflate, br',
+    'cache-control': 'max-age=0',
+    'accept-language': 'en-US,en;q=0.9',
+};

tests/integration/application/collections/StatusChecker/UrlPerDomainGrouper.ts

@@ -0,0 +1,19 @@
+export function groupUrlsByDomain(urls: string[]): string[][] {
+    const domains = new Set<string>();
+    const urlsWithDomain = urls.map((url) => ({
+        url,
+        domain: extractDomain(url),
+    }));
+    for (const url of urlsWithDomain) {
+        domains.add(url.domain);
+    }
+    return Array.from(domains).map((domain) => {
+        return urlsWithDomain
+            .filter((url) => url.domain === domain)
+            .map((url) => url.url);
+    });
+}
+
+function extractDomain(url: string): string {
+    return url.split('://')[1].split('/')[0].toLowerCase();
+}

tests/unit/application/ApplicationFactory.spec.ts

@@ -1,7 +1,7 @@
 import 'mocha';
 import { expect } from 'chai';
 import { ApplicationFactory, ApplicationGetter } from '@/application/ApplicationFactory';
-import { ApplicationStub } from '../stubs/ApplicationStub';
+import { ApplicationStub } from '@tests/unit/stubs/ApplicationStub';
 
 describe('ApplicationFactory', () => {
     describe('ctor', () => {

tests/unit/application/Common/Array.ComparerTestScenario.ts

@@ -0,0 +1,69 @@
+interface IComparerTestCase<T> {
+    readonly name: string;
+    readonly first: readonly T[];
+    readonly second: readonly T[];
+    readonly expected: boolean;
+}
+
+export class ComparerTestScenario {
+    private readonly testCases: Array<IComparerTestCase<number>> = [];
+
+    public addEmptyArrays(expectedResult: boolean) {
+        return this.addTestCase({
+            name: 'empty array',
+            first: [ ],
+            second: [ ],
+            expected: expectedResult,
+        }, true);
+    }
+    public addSameItemsWithSameOrder(expectedResult: boolean) {
+        return this.addTestCase({
+            name: 'same items with same order',
+            first: [ 1, 2, 3 ],
+            second: [ 1, 2, 3 ],
+            expected: expectedResult,
+        }, true);
+    }
+    public addSameItemsWithDifferentOrder(expectedResult: boolean) {
+        return this.addTestCase({
+            name: 'same items with different order',
+            first: [ 1, 2, 3 ],
+            second: [ 2, 3, 1 ],
+            expected: expectedResult,
+        }, true);
+    }
+    public addDifferentItemsWithSameLength(expectedResult: boolean) {
+        return this.addTestCase({
+            name: 'different items with same length',
+            first: [ 1, 2, 3 ],
+            second: [ 4, 5, 6 ],
+            expected: expectedResult,
+        }, true);
+    }
+    public addDifferentItemsWithDifferentLength(expectedResult: boolean) {
+        return this.addTestCase({
+            name: 'different items with different length',
+            first: [ 1, 2 ],
+            second: [ 3, 4, 5 ],
+            expected: expectedResult,
+        }, true);
+    }
+    public forEachCase(handler: (testCase: IComparerTestCase<number>) => void) {
+        for (const testCase of this.testCases) {
+            handler(testCase);
+        }
+    }
+
+    private addTestCase(testCase: IComparerTestCase<number>, addReversed: boolean) {
+        this.testCases.push(testCase);
+        if (addReversed) {
+            this.testCases.push({
+                name: `${testCase.name} (reversed)`,
+                first: testCase.second,
+                second: testCase.first,
+                expected: testCase.expected,
+            });
+        }
+        return this;
+    }
+}

tests/unit/application/Common/Array.spec.ts

@@ -0,0 +1,68 @@
+import 'mocha';
+import { expect } from 'chai';
+import { scrambledEqual } from '@/application/Common/Array';
+import { sequenceEqual } from '@/application/Common/Array';
+import { ComparerTestScenario } from './Array.ComparerTestScenario';
+
+describe('Array', () => {
+    describe('scrambledEqual', () => {
+        describe('throws if arguments are undefined', () => {
+            it('first argument is undefined', () => {
+                const expectedError = 'undefined first array';
+                const act = () => scrambledEqual(undefined, []);
+                expect(act).to.throw(expectedError);
+            });
+            it('second arguments is undefined', () => {
+                const expectedError = 'undefined second array';
+                const act = () => scrambledEqual([], undefined);
+                expect(act).to.throw(expectedError);
+            });
+        });
+        describe('returns as expected', () => {
+            // arrange
+            const scenario = new ComparerTestScenario()
+                .addSameItemsWithSameOrder(true)
+                .addSameItemsWithDifferentOrder(true)
+                .addDifferentItemsWithSameLength(false)
+                .addDifferentItemsWithDifferentLength(false);
+            // act
+            scenario.forEachCase((testCase) => {
+                it(testCase.name, () => {
+                    const actual = scrambledEqual(testCase.first, testCase.second);
+                    // assert
+                    expect(actual).to.equal(testCase.expected);
+                });
+            });
+        });
+    });
+    describe('sequenceEqual', () => {
+        describe('throws if arguments are undefined', () => {
+            it('first argument is undefined', () => {
+                const expectedError = 'undefined first array';
+                const act = () => sequenceEqual(undefined, []);
+                expect(act).to.throw(expectedError);
+            });
+            it('second arguments is undefined', () => {
+                const expectedError = 'undefined second array';
+                const act = () => sequenceEqual([], undefined);
+                expect(act).to.throw(expectedError);
+            });
+        });
+        describe('returns as expected', () => {
+            // arrange
+            const scenario = new ComparerTestScenario()
+                .addSameItemsWithSameOrder(true)
+                .addSameItemsWithDifferentOrder(true)
+                .addDifferentItemsWithSameLength(false)
+                .addDifferentItemsWithDifferentLength(false);
+            // act
+            scenario.forEachCase((testCase) => {
+                it(testCase.name, () => {
+                    const actual = scrambledEqual(testCase.first, testCase.second);
+                    // assert
+                    expect(actual).to.equal(testCase.expected);
+                });
+            });
+        });
+    });
+});

tests/unit/application/Common/Enum.spec.ts

@@ -1,6 +1,8 @@
 import 'mocha';
 import { expect } from 'chai';
-import { getEnumNames, getEnumValues, createEnumParser } from '@/application/Common/Enum';
+import { getEnumNames, getEnumValues, createEnumParser, assertInRange } from '@/application/Common/Enum';
+import { EnumRangeTestRunner } from './EnumRangeTestRunner';
+import { scrambledEqual } from '@/application/Common/Array';
 
 describe('Enum', () => {
     describe('createEnumParser', () => {
@@ -78,7 +80,7 @@ describe('Enum', () => {
             // act
             const actual = getEnumNames(TestEnum);
             // assert
-            expect(expected.sort()).to.deep.equal(actual.sort());
+            expect(scrambledEqual(expected, actual));
         });
     });
     describe('getEnumValues', () => {
@@ -89,7 +91,19 @@ describe('Enum', () => {
             // act
             const actual = getEnumValues(TestEnum);
             // assert
-            expect(expected.sort()).to.deep.equal(actual.sort());
+            expect(scrambledEqual(expected, actual));
         });
     });
+    describe('assertInRange', () => {
+        // arrange
+        enum TestEnum { Red, Green, Blue }
+        const validValue = TestEnum.Red;
+        // act
+        const act = (value: TestEnum) => assertInRange(value, TestEnum);
+        // assert
+        new EnumRangeTestRunner(act)
+            .testOutOfRangeThrows()
+            .testUndefinedValueThrows()
+            .testValidValueDoesNotThrow(validValue);
+    });
 });

tests/unit/application/Common/EnumRangeTestRunner.ts

@@ -0,0 +1,54 @@
+import 'mocha';
+import { expect } from 'chai';
+import { EnumType } from '@/application/Common/Enum';
+
+export class EnumRangeTestRunner<TEnumValue extends EnumType> {
+    constructor(private readonly runner: (value: TEnumValue) => any) {
+    }
+    public testOutOfRangeThrows() {
+        it('throws when value is out of range', () => {
+            // arrange
+            const value = Number.MAX_SAFE_INTEGER as TEnumValue;
+            const expectedError = `enum value "${value}" is out of range`;
+            // act
+            const act = () => this.runner(value);
+            // assert
+            expect(act).to.throw(expectedError);
+        });
+        return this;
+    }
+    public testUndefinedValueThrows() {
+        it('throws when value is undefined', () => {
+            // arrange
+            const value = undefined;
+            const expectedError = 'undefined enum value';
+            // act
+            const act = () => this.runner(value);
+            // assert
+            expect(act).to.throw(expectedError);
+        });
+        return this;
+    }
+    public testInvalidValueThrows(invalidValue: TEnumValue, expectedError: string) {
+        it(`throws ${expectedError}`, () => {
+            // arrange
+            const value = invalidValue;
+            // act
+            const act = () => this.runner(value);
+            // assert
+            expect(act).to.throw(expectedError);
+        });
+        return this;
+    }
+    public testValidValueDoesNotThrow(validValue: TEnumValue) {
+        it('throws when value is undefined', () => {
+            // arrange
+            const value = validValue;
+            // act
+            const act = () => this.runner(value);
+            // assert
+            expect(act).to.not.throw();
+        });
+        return this;
+    }
+}

tests/unit/application/Common/ScriptingLanguage/ScriptingLanguageFactory.spec.ts

@@ -0,0 +1,60 @@
+import 'mocha';
+import { expect } from 'chai';
+import { ScriptingLanguage } from '@/domain/ScriptingLanguage';
+import { ScriptingLanguageFactory } from '@/application/Common/ScriptingLanguage/ScriptingLanguageFactory';
+import { ScriptingLanguageFactoryTestRunner } from './ScriptingLanguageFactoryTestRunner';
+import { EnumRangeTestRunner } from '@tests/unit/application/Common/EnumRangeTestRunner';
+
+class ScriptingLanguageConcrete extends ScriptingLanguageFactory<number> {
+    public registerGetter(language: ScriptingLanguage, getter: () => number) {
+        super.registerGetter(language, getter);
+    }
+}
+
+describe('ScriptingLanguageFactory', () => {
+    describe('registerGetter', () => {
+        describe('validates language', () => {
+            // arrange
+            const validValue = ScriptingLanguage.batchfile;
+            const getter = () => undefined;
+            const sut = new ScriptingLanguageConcrete();
+            // act
+            const act = (language: ScriptingLanguage) => sut.registerGetter(language, getter);
+            // assert
+            new EnumRangeTestRunner(act)
+                .testOutOfRangeThrows()
+                .testUndefinedValueThrows()
+                .testValidValueDoesNotThrow(validValue);
+        });
+        it('throw when getter is undefined', () => {
+            // arrange
+            const expectedError = `undefined getter`;
+            const language = ScriptingLanguage.batchfile;
+            const getter = undefined;
+            const sut = new ScriptingLanguageConcrete();
+            // act
+            const act = () => sut.registerGetter(language, getter);
+            // assert
+            expect(act).to.throw(expectedError);
+        });
+        it('throw when language is already registered', () => {
+            // arrange
+            const language = ScriptingLanguage.batchfile;
+            const expectedError = `${ScriptingLanguage[language]} is already registered`;
+            const getter = () => undefined;
+            const sut = new ScriptingLanguageConcrete();
+            // act
+            sut.registerGetter(language, getter);
+            const reRegister = () => sut.registerGetter(language, getter);
+            // assert
+            expect(reRegister).to.throw(expectedError);
+        });
+    });
+    describe('create', () => {
+        const sut = new ScriptingLanguageConcrete();
+        sut.registerGetter(ScriptingLanguage.batchfile, () => undefined);
+        const runner = new ScriptingLanguageFactoryTestRunner();
+        runner.testCreateMethod(sut);
+    });
+});
+

tests/unit/application/Common/ScriptingLanguage/ScriptingLanguageFactoryTestRunner.ts

@@ -0,0 +1,49 @@
+import 'mocha';
+import { expect } from 'chai';
+import { IScriptingLanguageFactory } from '@/application/Common/ScriptingLanguage/IScriptingLanguageFactory';
+import { ScriptingLanguage } from '@/domain/ScriptingLanguage';
+import { EnumRangeTestRunner } from '@tests/unit/application/Common/EnumRangeTestRunner';
+
+export class ScriptingLanguageFactoryTestRunner<T> {
+    private expectedTypes = new Map<ScriptingLanguage, T>();
+    public expect(language: ScriptingLanguage, resultType: T) {
+        this.expectedTypes.set(language, resultType);
+        return this;
+    }
+    public testCreateMethod(sut: IScriptingLanguageFactory<T>) {
+        if (!sut) { throw new Error('undefined sut'); }
+        testLanguageValidation(sut);
+        testExpectedInstanceTypes(sut, this.expectedTypes);
+    }
+}
+
+function testExpectedInstanceTypes<T>(
+    sut: IScriptingLanguageFactory<T>,
+    expectedTypes: Map<ScriptingLanguage, T>) {
+    describe('create returns expected instances', () => {
+        // arrange
+        for (const language of Array.from(expectedTypes.keys())) {
+            it(ScriptingLanguage[language], () => {
+                // act
+                const expected = expectedTypes.get(language);
+                const result = sut.create(language);
+                // assert
+                expect(result).to.be.instanceOf(expected, `Actual was: ${result.constructor.name}`);
+            });
+        }
+    });
+}
+
+function testLanguageValidation<T>(sut: IScriptingLanguageFactory<T>) {
+    describe('validates language', () => {
+        // arrange
+        const validValue = ScriptingLanguage.batchfile;
+        // act
+        const act = (value: ScriptingLanguage) => sut.create(value);
+        // assert
+        new EnumRangeTestRunner(act)
+            .testOutOfRangeThrows()
+            .testUndefinedValueThrows()
+            .testValidValueDoesNotThrow(validValue);
+    });
+}

tests/unit/application/Context/ApplicationContext.spec.ts

@@ -5,8 +5,9 @@ import { OperatingSystem } from '@/domain/OperatingSystem';
 import { ICategoryCollectionState } from '@/application/Context/State/ICategoryCollectionState';
 import { IApplicationContext, IApplicationContextChangedEvent } from '@/application/Context/IApplicationContext';
 import { IApplication } from '@/domain/IApplication';
-import { ApplicationStub } from '../../stubs/ApplicationStub';
-import { CategoryCollectionStub } from '../../stubs/CategoryCollectionStub';
+import { ApplicationStub } from '@tests/unit/stubs/ApplicationStub';
+import { CategoryCollectionStub } from '@tests/unit/stubs/CategoryCollectionStub';
+import { EnumRangeTestRunner } from '@tests/unit/application/Common/EnumRangeTestRunner';
 
 describe('ApplicationContext', () => {
     describe('changeContext', () => {
@@ -180,40 +181,15 @@ describe('ApplicationContext', () => {
                 expect(actual).to.deep.equal(expected);
             });
             describe('throws when OS is invalid', () => {
-                // arrange
-                const testCases = [
-                    {
-                        name: 'out of range',
-                        expectedError: 'os "9999" is out of range',
-                        os: 9999,
-                    },
-                    {
-                        name: 'undefined',
-                        expectedError: 'undefined os',
-                        os: undefined,
-                    },
-                    {
-                        name: 'unknown',
-                        expectedError: 'unknown os',
-                        os: OperatingSystem.Unknown,
-                    },
-                    {
-                        name: 'does not exist in application',
-                        expectedError: 'os "Android" is not defined in application',
-                        os: OperatingSystem.Android,
-                    },
-                ];
                 // act
-                for (const testCase of testCases) {
-                    it(testCase.name, () => {
-                        const act = () =>
-                            new ObservableApplicationContextFactory()
-                                .withInitialOs(testCase.os)
-                                .construct();
-                        // assert
-                        expect(act).to.throw(testCase.expectedError);
-                    });
-                }
+                const act = (os: OperatingSystem) => new ObservableApplicationContextFactory()
+                    .withInitialOs(os)
+                    .construct();
+                // assert
+                new EnumRangeTestRunner(act)
+                    .testOutOfRangeThrows()
+                    .testUndefinedValueThrows()
+                    .testInvalidValueThrows(OperatingSystem.Android, 'os "Android" is not defined in application');
             });
         });
         describe('app', () => {

tests/unit/application/Context/ApplicationContextFactory.spec.ts

@@ -2,12 +2,12 @@ import 'mocha';
 import { expect } from 'chai';
 import { OperatingSystem } from '@/domain/OperatingSystem';
 import { ICategoryCollection } from '@/domain/ICategoryCollection';
-import { CategoryCollectionStub } from '../../stubs/CategoryCollectionStub';
-import { EnvironmentStub } from '../../stubs/EnvironmentStub';
-import { ApplicationStub } from '../../stubs/ApplicationStub';
 import { buildContextAsync } from '@/application/Context/ApplicationContextFactory';
 import { IApplicationFactory } from '@/application/IApplicationFactory';
 import { IApplication } from '@/domain/IApplication';
+import { EnvironmentStub } from '@tests/unit/stubs/EnvironmentStub';
+import { ApplicationStub } from '@tests/unit/stubs/ApplicationStub';
+import { CategoryCollectionStub } from '@tests/unit/stubs/CategoryCollectionStub';
 
 describe('ApplicationContextFactory', () => {
     describe('buildContextAsync', () => {

tests/unit/application/Context/State/CategoryCollectionState.spec.ts

@@ -5,9 +5,9 @@ import { ApplicationCode } from '@/application/Context/State/Code/ApplicationCod
 import { CategoryCollectionState } from '@/application/Context/State/CategoryCollectionState';
 import { OperatingSystem } from '@/domain/OperatingSystem';
 import { IScript } from '@/domain/IScript';
-import { ScriptStub } from '../../../stubs/ScriptStub';
-import { CategoryStub } from '../../../stubs/CategoryStub';
-import { CategoryCollectionStub } from '../../../stubs/CategoryCollectionStub';
+import { ScriptStub } from '@tests/unit/stubs/ScriptStub';
+import { CategoryStub } from '@tests/unit/stubs/CategoryStub';
+import { CategoryCollectionStub } from '@tests/unit/stubs/CategoryCollectionStub';
 
 describe('CategoryCollectionState', () => {
     describe('code', () => {
@@ -55,7 +55,7 @@ describe('CategoryCollectionState', () => {
             const collection = new CategoryCollectionStub();
             const sut = new CategoryCollectionState(collection);
             // act
-            const actual = sut.selection.totalSelected;
+            const actual = sut.selection.selectedScripts.length;
             // assert
             expect(actual).to.equal(0);
         });
@@ -68,7 +68,7 @@ describe('CategoryCollectionState', () => {
             // act
             sut.selection.selectAll();
             // assert
-            expect(sut.selection.totalSelected).to.equal(1);
+            expect(sut.selection.selectedScripts.length).to.equal(1);
             expect(sut.selection.isSelected(expectedScript.id)).to.equal(true);
         });
     });

tests/unit/application/Context/State/Code/ApplicationCode.spec.ts

@@ -9,10 +9,10 @@ import { CodePosition } from '@/application/Context/State/Code/Position/CodePosi
 import { ICodePosition } from '@/application/Context/State/Code/Position/ICodePosition';
 import { IScriptingDefinition } from '@/domain/IScriptingDefinition';
 import { IUserScript } from '@/application/Context/State/Code/Generation/IUserScript';
-import { ScriptingDefinitionStub } from '../../../../stubs/ScriptingDefinitionStub';
-import { CategoryStub } from '../../../../stubs/CategoryStub';
-import { ScriptStub } from '../../../../stubs/ScriptStub';
-import { CategoryCollectionStub } from '../../../../stubs/CategoryCollectionStub';
+import { ScriptingDefinitionStub } from '@tests/unit/stubs/ScriptingDefinitionStub';
+import { CategoryStub } from '@tests/unit/stubs/CategoryStub';
+import { ScriptStub } from '@tests/unit/stubs/ScriptStub';
+import { CategoryCollectionStub } from '@tests/unit/stubs/CategoryCollectionStub';
 
 describe('ApplicationCode', () => {
     describe('ctor', () => {

tests/unit/application/Context/State/Code/Event/CodeChangedEvent.spec.ts

@@ -4,8 +4,8 @@ import { CodeChangedEvent } from '@/application/Context/State/Code/Event/CodeCha
 import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript';
 import { ICodePosition } from '@/application/Context/State/Code/Position/ICodePosition';
 import { CodePosition } from '@/application/Context/State/Code/Position/CodePosition';
-import { SelectedScriptStub } from '../../../../../stubs/SelectedScriptStub';
-import { ScriptStub } from '../../../../../stubs/ScriptStub';
+import { SelectedScriptStub } from '@tests/unit/stubs/SelectedScriptStub';
+import { ScriptStub } from '@tests/unit/stubs/ScriptStub';
 
 describe('CodeChangedEvent', () => {
     describe('ctor', () => {

tests/unit/application/Context/State/Code/Generation/CodeBuilderFactory.spec.ts

@@ -1,36 +1,13 @@
-import 'mocha';
-import { expect } from 'chai';
 import { ScriptingLanguage } from '@/domain/ScriptingLanguage';
 import { ShellBuilder } from '@/application/Context/State/Code/Generation/Languages/ShellBuilder';
 import { BatchBuilder } from '@/application/Context/State/Code/Generation/Languages/BatchBuilder';
 import { CodeBuilderFactory } from '@/application/Context/State/Code/Generation/CodeBuilderFactory';
+import { ScriptingLanguageFactoryTestRunner } from '@tests/unit/application/Common/ScriptingLanguage/ScriptingLanguageFactoryTestRunner';
 
 describe('CodeBuilderFactory', () => {
-    describe('create', () => {
-        describe('creates expected type', () => {
-            // arrange
-            const testCases: Array< { language: ScriptingLanguage, expected: any} > = [
-                { language: ScriptingLanguage.shellscript,  expected: ShellBuilder},
-                { language: ScriptingLanguage.batchfile,    expected: BatchBuilder},
-            ];
-            for (const testCase of testCases) {
-                it(ScriptingLanguage[testCase.language], () => {
-                    // act
-                    const sut = new CodeBuilderFactory();
-                    const result = sut.create(testCase.language);
-                    // assert
-                    expect(result).to.be.instanceOf(testCase.expected,
-                        `Actual was: ${result.constructor.name}`);
-                });
-            }
-        });
-        it('throws on unknown scripting language', () => {
-            // arrange
-            const sut = new CodeBuilderFactory();
-            // act
-            const act = () => sut.create(3131313131);
-            // assert
-            expect(act).to.throw(`unknown language: "${ScriptingLanguage[3131313131]}"`);
-        });
-    });
+    const sut = new CodeBuilderFactory();
+    const runner = new ScriptingLanguageFactoryTestRunner()
+        .expect(ScriptingLanguage.shellscript, ShellBuilder)
+        .expect(ScriptingLanguage.batchfile, BatchBuilder);
+    runner.testCreateMethod(sut);
 });

tests/unit/application/Context/State/Code/Generation/UserScriptGenerator.spec.ts

@@ -4,8 +4,8 @@ import { UserScriptGenerator } from '@/application/Context/State/Code/Generation
 import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript';
 import { ICodeBuilderFactory } from '@/application/Context/State/Code/Generation/ICodeBuilderFactory';
 import { ICodeBuilder } from '@/application/Context/State/Code/Generation/ICodeBuilder';
-import { ScriptStub } from '../../../../../stubs/ScriptStub';
-import { ScriptingDefinitionStub } from '../../../../../stubs/ScriptingDefinitionStub';
+import { ScriptStub } from '@tests/unit/stubs/ScriptStub';
+import { ScriptingDefinitionStub } from '@tests/unit/stubs/ScriptingDefinitionStub';
 
 describe('UserScriptGenerator', () => {
     describe('scriptingDefinition', () => {

tests/unit/application/Context/State/Code/Position/CodePosition.spec.ts

@@ -1,6 +1,6 @@
-import { CodePosition } from '@/application/Context/State/Code/Position/CodePosition';
 import 'mocha';
 import { expect } from 'chai';
+import { CodePosition } from '@/application/Context/State/Code/Position/CodePosition';
 
 describe('CodePosition', () => {
     describe('ctor', () => {

tests/unit/application/Context/State/Filter/FilterResult.spec.ts

@@ -1,8 +1,8 @@
-import { CategoryStub } from '../../../../stubs/CategoryStub';
-import { ScriptStub } from '../../../../stubs/ScriptStub';
-import { FilterResult } from '@/application/Context/State/Filter/FilterResult';
 import 'mocha';
 import { expect } from 'chai';
+import { FilterResult } from '@/application/Context/State/Filter/FilterResult';
+import { CategoryStub } from '@tests/unit/stubs/CategoryStub';
+import { ScriptStub } from '@tests/unit/stubs/ScriptStub';
 
 describe('FilterResult', () => {
     describe('hasAnyMatches', () => {

tests/unit/application/Context/State/Filter/UserFilter.spec.ts

@@ -1,11 +1,10 @@
-
 import 'mocha';
 import { expect } from 'chai';
 import { IFilterResult } from '@/application/Context/State/Filter/IFilterResult';
 import { UserFilter } from '@/application/Context/State/Filter/UserFilter';
-import { CategoryStub } from '../../../../stubs/CategoryStub';
-import { ScriptStub } from '../../../../stubs/ScriptStub';
-import { CategoryCollectionStub } from '../../../../stubs/CategoryCollectionStub';
+import { CategoryStub } from '@tests/unit/stubs/CategoryStub';
+import { ScriptStub } from '@tests/unit/stubs/ScriptStub';
+import { CategoryCollectionStub } from '@tests/unit/stubs/CategoryCollectionStub';
 
 describe('UserFilter', () => {
     describe('removeFilter', () => {

tests/unit/application/Context/State/Selection/SelectedScript.spec.ts

@@ -1,7 +1,7 @@
-import { ScriptStub } from '../../../../stubs/ScriptStub';
-import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript';
 import 'mocha';
 import { expect } from 'chai';
+import { ScriptStub } from '@tests/unit/stubs/ScriptStub';
+import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript';
 
 describe('SelectedScript', () => {
     it('id is same as script id', () => {

tests/unit/application/Context/State/Selection/UserSelection.spec.ts

@@ -3,10 +3,10 @@ import { expect } from 'chai';
 import { IScript } from '@/domain/IScript';
 import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript';
 import { UserSelection } from '@/application/Context/State/Selection/UserSelection';
-import { CategoryStub } from '../../../../stubs/CategoryStub';
-import { CategoryCollectionStub } from '../../../../stubs/CategoryCollectionStub';
-import { SelectedScriptStub } from '../../../../stubs/SelectedScriptStub';
-import { ScriptStub } from '../../../../stubs/ScriptStub';
+import { CategoryStub } from '@tests/unit/stubs/CategoryStub';
+import { CategoryCollectionStub } from '@tests/unit/stubs/CategoryCollectionStub';
+import { SelectedScriptStub } from '@tests/unit/stubs/SelectedScriptStub';
+import { ScriptStub } from '@tests/unit/stubs/ScriptStub';
 
 describe('UserSelection', () => {
     describe('ctor', () => {
@@ -152,7 +152,6 @@ describe('UserSelection', () => {
             // act
             sut.removeAllInCategory(categoryId);
             // assert
-            expect(sut.totalSelected).to.equal(0);
             expect(sut.selectedScripts.length).to.equal(0);
         });
         it('removes existing some exists', () => {
@@ -167,7 +166,6 @@ describe('UserSelection', () => {
             // act
             sut.removeAllInCategory(categoryId);
             // assert
-            expect(sut.totalSelected).to.equal(0);
             expect(sut.selectedScripts.length).to.equal(0);
         });
     });

tests/unit/application/Environment/BrowserOs/BrowserOsDetector.spec.ts

@@ -1,16 +1,18 @@
+import 'mocha';
 import { expect } from 'chai';
 import { OperatingSystem } from '@/domain/OperatingSystem';
 import { BrowserOsDetector } from '@/application/Environment/BrowserOs/BrowserOsDetector';
 import { BrowserOsTestCases } from './BrowserOsTestCases';
 
 describe('BrowserOsDetector', () => {
-    it('unkown when user agent is undefined', () => {
+    it('returns undefined when user agent is undefined', () => {
         // arrange
+        const expected = undefined;
         const sut = new BrowserOsDetector();
         // act
         const actual = sut.detect(undefined);
         // assert
-        expect(actual).to.equal(OperatingSystem.Unknown);
+        expect(actual).to.equal(expected);
     });
     it('detects as expected', () => {
         for (const testCase of BrowserOsTestCases) {

tests/unit/application/Environment/DesktopOsTestCases.ts

@@ -9,7 +9,7 @@ interface IDesktopTestCase {
 export const DesktopOsTestCases: ReadonlyArray<IDesktopTestCase> = [
     {
         processPlatform: 'aix',
-        expectedOs: OperatingSystem.Unknown,
+        expectedOs: undefined,
     },
     {
         processPlatform: 'darwin',
@@ -17,7 +17,7 @@ export const DesktopOsTestCases: ReadonlyArray<IDesktopTestCase> = [
     },
     {
         processPlatform: 'freebsd',
-        expectedOs: OperatingSystem.Unknown,
+        expectedOs: undefined,
     },
     {
         processPlatform: 'linux',
@@ -25,11 +25,11 @@ export const DesktopOsTestCases: ReadonlyArray<IDesktopTestCase> = [
     },
     {
         processPlatform: 'openbsd',
-        expectedOs: OperatingSystem.Unknown,
+        expectedOs: undefined,
     },
     {
         processPlatform: 'sunos',
-        expectedOs: OperatingSystem.Unknown,
+        expectedOs: undefined,
     },
     {
         processPlatform: 'win32',

tests/unit/application/Environment/Environment.spec.ts

@@ -1,8 +1,9 @@
+import 'mocha';
+import { expect } from 'chai';
 import { IBrowserOsDetector } from '@/application/Environment/BrowserOs/IBrowserOsDetector';
 import { OperatingSystem } from '@/domain/OperatingSystem';
 import { DesktopOsTestCases } from './DesktopOsTestCases';
 import { Environment } from '@/application/Environment/Environment';
-import { expect } from 'chai';
 
 interface EnvironmentVariables {
     window?: any;

tests/unit/application/Parser/ApplicationParser.spec.ts

@@ -10,18 +10,12 @@ import { ProjectInformation } from '@/domain/ProjectInformation';
 import { ICategoryCollection } from '@/domain/ICategoryCollection';
 import { OperatingSystem } from '@/domain/OperatingSystem';
 import { getEnumValues } from '@/application/Common/Enum';
-import { CategoryCollectionStub } from '../../stubs/CategoryCollectionStub';
-import { getProcessEnvironmentStub } from '../../stubs/ProcessEnvironmentStub';
-import { CollectionDataStub } from '../../stubs/CollectionDataStub';
+import { CategoryCollectionStub } from '@tests/unit/stubs/CategoryCollectionStub';
+import { getProcessEnvironmentStub } from '@tests/unit/stubs/ProcessEnvironmentStub';
+import { CollectionDataStub } from '@tests/unit/stubs/CollectionDataStub';
 
 describe('ApplicationParser', () => {
     describe('parseApplication', () => {
-        it('can parse current application', () => { // Integration test
-            // act
-            const act = () => parseApplication();
-            // assert
-            expect(act).to.not.throw();
-        });
         describe('parser', () => {
             it('returns result from the parser', () => {
                 // arrange

tests/unit/application/Parser/CategoryCollectionParser.spec.ts

@@ -7,13 +7,13 @@ import { parseProjectInformation } from '@/application/Parser/ProjectInformation
 import { OperatingSystem } from '@/domain/OperatingSystem';
 import { RecommendationLevel } from '@/domain/RecommendationLevel';
 import { ScriptingDefinitionParser } from '@/application/Parser/ScriptingDefinition/ScriptingDefinitionParser';
-import { EnumParserStub } from '../../stubs/EnumParserStub';
-import { ProjectInformationStub } from '../../stubs/ProjectInformationStub';
-import { getCategoryStub, CollectionDataStub } from '../../stubs/CollectionDataStub';
-import { CategoryCollectionParseContextStub } from '../../stubs/CategoryCollectionParseContextStub';
-import { CategoryDataStub } from '../../stubs/CategoryDataStub';
-import { ScriptDataStub } from '../../stubs/ScriptDataStub';
-import { FunctionDataStub } from '../../stubs/FunctionDataStub';
+import { EnumParserStub } from '@tests/unit/stubs/EnumParserStub';
+import { ProjectInformationStub } from '@tests/unit/stubs/ProjectInformationStub';
+import { getCategoryStub, CollectionDataStub } from '@tests/unit/stubs/CollectionDataStub';
+import { CategoryCollectionParseContextStub } from '@tests/unit/stubs/CategoryCollectionParseContextStub';
+import { CategoryDataStub } from '@tests/unit/stubs/CategoryDataStub';
+import { ScriptDataStub } from '@tests/unit/stubs/ScriptDataStub';
+import { FunctionDataStub } from '@tests/unit/stubs/FunctionDataStub';
 
 describe('CategoryCollectionParser', () => {
     describe('parseCategoryCollection', () => {

tests/unit/application/Parser/CategoryParser.spec.ts

@@ -3,11 +3,11 @@ import { expect } from 'chai';
 import { parseCategory } from '@/application/Parser/CategoryParser';
 import { parseScript } from '@/application/Parser/Script/ScriptParser';
 import { parseDocUrls } from '@/application/Parser/DocumentationParser';
-import { ScriptCompilerStub } from '../../stubs/ScriptCompilerStub';
-import { ScriptDataStub } from '../../stubs/ScriptDataStub';
-import { CategoryCollectionParseContextStub } from '../../stubs/CategoryCollectionParseContextStub';
-import { LanguageSyntaxStub } from '../../stubs/LanguageSyntaxStub';
-import { CategoryDataStub } from '../../stubs/CategoryDataStub';
+import { ScriptCompilerStub } from '@tests/unit/stubs/ScriptCompilerStub';
+import { ScriptDataStub } from '@tests/unit/stubs/ScriptDataStub';
+import { CategoryCollectionParseContextStub } from '@tests/unit/stubs/CategoryCollectionParseContextStub';
+import { LanguageSyntaxStub } from '@tests/unit/stubs/LanguageSyntaxStub';
+import { CategoryDataStub } from '@tests/unit/stubs/CategoryDataStub';
 
 describe('CategoryParser', () => {
     describe('parseCategory', () => {

tests/unit/application/Parser/ProjectInformationParser.spec.ts

@@ -1,7 +1,7 @@
 import 'mocha';
 import { expect } from 'chai';
 import { parseProjectInformation } from '@/application/Parser/ProjectInformationParser';
-import { getProcessEnvironmentStub } from '../../stubs/ProcessEnvironmentStub';
+import { getProcessEnvironmentStub } from '@tests/unit/stubs/ProcessEnvironmentStub';
 
 describe('ProjectInformationParser', () => {
     describe('parseProjectInformation', () => {

tests/unit/application/Parser/Script/CategoryCollectionParseContext.spec.ts

@@ -1,14 +1,14 @@
 import 'mocha';
 import { expect } from 'chai';
+import { FunctionData } from 'js-yaml-loader!@/*';
 import { ISyntaxFactory } from '@/application/Parser/Script/Syntax/ISyntaxFactory';
 import { ScriptingLanguage } from '@/domain/ScriptingLanguage';
-import { LanguageSyntaxStub } from '../../../stubs/LanguageSyntaxStub';
 import { CategoryCollectionParseContext } from '@/application/Parser/Script/CategoryCollectionParseContext';
-import { ScriptingDefinitionStub } from '../../../stubs/ScriptingDefinitionStub';
-import { FunctionDataStub } from '../../../stubs/FunctionDataStub';
 import { ILanguageSyntax } from '@/domain/ScriptCode';
 import { ScriptCompiler } from '@/application/Parser/Script/Compiler/ScriptCompiler';
-import { FunctionData } from 'js-yaml-loader!*';
+import { LanguageSyntaxStub } from '@tests/unit/stubs/LanguageSyntaxStub';
+import { ScriptingDefinitionStub } from '@tests/unit/stubs/ScriptingDefinitionStub';
+import { FunctionDataStub } from '@tests/unit/stubs/FunctionDataStub';
 
 describe('CategoryCollectionParseContext', () => {
     describe('ctor', () => {

tests/unit/application/Parser/Script/Compiler/Expressions/ExpressionsCompiler.spec.ts

@@ -2,8 +2,8 @@ import 'mocha';
 import { expect } from 'chai';
 import { ExpressionsCompiler } from '@/application/Parser/Script/Compiler/Expressions/ExpressionsCompiler';
 import { IExpressionParser } from '@/application/Parser/Script/Compiler/Expressions/Parser/IExpressionParser';
-import { ExpressionStub } from '../../../../../stubs/ExpressionStub';
-import { ExpressionParserStub } from '../../../../../stubs/ExpressionParserStub';
+import { ExpressionStub } from '@tests/unit/stubs/ExpressionStub';
+import { ExpressionParserStub } from '@tests/unit/stubs/ExpressionParserStub';
 
 describe('ExpressionsCompiler', () => {
     describe('compileExpressions', () => {

tests/unit/application/Parser/Script/Compiler/Expressions/Parser/CompositeExpressionParser.spec.ts

@@ -3,7 +3,7 @@ import { expect } from 'chai';
 import { IExpression } from '@/application/Parser/Script/Compiler/Expressions/Expression/IExpression';
 import { IExpressionParser } from '@/application/Parser/Script/Compiler/Expressions/Parser/IExpressionParser';
 import { CompositeExpressionParser } from '@/application/Parser/Script/Compiler/Expressions/Parser/CompositeExpressionParser';
-import { ExpressionStub } from '../../../../../../stubs/ExpressionStub';
+import { ExpressionStub } from '@tests/unit/stubs/ExpressionStub';
 
 describe('CompositeExpressionParser', () => {
     describe('ctor', () => {

tests/unit/application/Parser/Script/Compiler/Expressions/SyntaxParsers/ParameterSubstitutionParser.spec.ts

@@ -5,17 +5,25 @@ import { ExpressionPosition } from '@/application/Parser/Script/Compiler/Express
 import { ExpressionArguments } from '@/application/Parser/Script/Compiler/Expressions/Expression/IExpression';
 
 describe('ParameterSubstitutionParser', () => {
-    it('finds at expected positions', () => {
+    describe('finds at expected positions', () => {
         // arrange
-        const testCases = [ {
-                name: 'single parameter',
+        const testCases = [
+            {
+                name: 'matches single parameter',
                 code: '{{ $parameter }}!',
-                expected: [ new ExpressionPosition(0, 16) ],
-            }, {
-                name: 'different parameters',
+                expected: [new ExpressionPosition(0, 16)],
+            },
+            {
+                name: 'matches different parameters',
                 code: 'He{{ $firstParameter }} {{ $secondParameter }}!!',
-                expected: [ new ExpressionPosition(2, 23), new ExpressionPosition(24, 46) ],
-        }];
+                expected: [new ExpressionPosition(2, 23), new ExpressionPosition(24, 46)],
+            },
+            {
+                name: 'tolerates spaces around brackets',
+                code: 'He{{$firstParameter}}!!',
+                expected: [new ExpressionPosition(2, 21) ],
+            },
+        ];
         for (const testCase of testCases) {
             it(testCase.name, () => {
                 const sut = new ParameterSubstitutionParser();
@@ -27,7 +35,7 @@ describe('ParameterSubstitutionParser', () => {
             });
         }
     });
-    it('evaluates as expected', () => {
+    describe('evaluates as expected', () => {
         const testCases = [ {
             name: 'single parameter',
             code: '{{ $parameter }}',
@@ -45,7 +53,7 @@ describe('ParameterSubstitutionParser', () => {
                 value: 'Hello',
             },
             {
-                name: 'firstParameter',
+                name: 'secondParameter',
                 value: 'World',
             }],
             expected: [ 'Hello', 'World' ],

tests/unit/application/Parser/Script/Compiler/Function/FunctionCompiler.spec.ts

@@ -1,11 +1,11 @@
 import 'mocha';
 import { expect } from 'chai';
 import { ISharedFunction } from '@/application/Parser/Script/Compiler/Function/ISharedFunction';
-import { FunctionData } from 'js-yaml-loader!*';
+import { FunctionData } from 'js-yaml-loader!@/*';
 import { IFunctionCallCompiler } from '@/application/Parser/Script/Compiler/FunctionCall/IFunctionCallCompiler';
 import { FunctionCompiler } from '@/application/Parser/Script/Compiler/Function/FunctionCompiler';
-import { FunctionCallCompilerStub } from '../../../../../stubs/FunctionCallCompilerStub';
-import { FunctionDataStub } from '../../../../../stubs/FunctionDataStub';
+import { FunctionCallCompilerStub } from '@tests/unit/stubs/FunctionCallCompilerStub';
+import { FunctionDataStub } from '@tests/unit/stubs/FunctionDataStub';
 
 describe('FunctionsCompiler', () => {
     describe('compileFunctions', () => {

tests/unit/application/Parser/Script/Compiler/Function/SharedFunctionCollection.spec.ts

@@ -1,7 +1,7 @@
 import 'mocha';
 import { expect } from 'chai';
 import { SharedFunctionCollection } from '@/application/Parser/Script/Compiler/Function/SharedFunctionCollection';
-import { SharedFunctionStub } from '../../../../../stubs/SharedFunctionStub';
+import { SharedFunctionStub } from '@tests/unit/stubs/SharedFunctionStub';
 
 describe('SharedFunctionCollection', () => {
     describe('addFunction', () => {

tests/unit/application/Parser/Script/Compiler/FunctionCall/FunctionCallCompiler.spec.ts

@@ -1,12 +1,12 @@
 import 'mocha';
 import { expect } from 'chai';
-import { FunctionCallData, FunctionCallParametersData } from 'js-yaml-loader!*';
+import { FunctionCallData, FunctionCallParametersData } from 'js-yaml-loader!@/*';
 import { FunctionCallCompiler } from '@/application/Parser/Script/Compiler/FunctionCall/FunctionCallCompiler';
 import { ISharedFunctionCollection } from '@/application/Parser/Script/Compiler/Function/ISharedFunctionCollection';
 import { IExpressionsCompiler } from '@/application/Parser/Script/Compiler/Expressions/IExpressionsCompiler';
-import { ExpressionsCompilerStub } from '../../../../../stubs/ExpressionsCompilerStub';
-import { SharedFunctionCollectionStub } from '../../../../../stubs/SharedFunctionCollectionStub';
-import { SharedFunctionStub } from '../../../../../stubs/SharedFunctionStub';
+import { ExpressionsCompilerStub } from '@tests/unit/stubs/ExpressionsCompilerStub';
+import { SharedFunctionCollectionStub } from '@tests/unit/stubs/SharedFunctionCollectionStub';
+import { SharedFunctionStub } from '@tests/unit/stubs/SharedFunctionStub';
 
 describe('FunctionCallCompiler', () => {
     describe('compileCall', () => {

tests/unit/application/Parser/Script/Compiler/ScriptCompiler.spec.ts

@@ -6,12 +6,12 @@ import { ILanguageSyntax } from '@/domain/ScriptCode';
 import { IFunctionCompiler } from '@/application/Parser/Script/Compiler/Function/IFunctionCompiler';
 import { IFunctionCallCompiler } from '@/application/Parser/Script/Compiler/FunctionCall/IFunctionCallCompiler';
 import { ICompiledCode } from '@/application/Parser/Script/Compiler/FunctionCall/ICompiledCode';
-import { LanguageSyntaxStub } from '../../../../stubs/LanguageSyntaxStub';
-import { ScriptDataStub } from '../../../../stubs/ScriptDataStub';
-import { FunctionDataStub } from '../../../../stubs/FunctionDataStub';
-import { FunctionCallCompilerStub } from '../../../../stubs/FunctionCallCompilerStub';
-import { FunctionCompilerStub } from '../../../../stubs/FunctionCompilerStub';
-import { SharedFunctionCollectionStub } from '../../../../stubs/SharedFunctionCollectionStub';
+import { LanguageSyntaxStub } from '@tests/unit/stubs/LanguageSyntaxStub';
+import { ScriptDataStub } from '@tests/unit/stubs/ScriptDataStub';
+import { FunctionDataStub } from '@tests/unit/stubs/FunctionDataStub';
+import { FunctionCallCompilerStub } from '@tests/unit/stubs/FunctionCallCompilerStub';
+import { FunctionCompilerStub } from '@tests/unit/stubs/FunctionCompilerStub';
+import { SharedFunctionCollectionStub } from '@tests/unit/stubs/SharedFunctionCollectionStub';
 
 describe('ScriptCompiler', () => {
     describe('ctor', () => {

tests/unit/application/Parser/Script/ScriptParser.spec.ts

@@ -4,12 +4,12 @@ import { parseScript } from '@/application/Parser/Script/ScriptParser';
 import { parseDocUrls } from '@/application/Parser/DocumentationParser';
 import { RecommendationLevel } from '@/domain/RecommendationLevel';
 import { ICategoryCollectionParseContext } from '@/application/Parser/Script/ICategoryCollectionParseContext';
-import { ScriptCompilerStub } from '../../../stubs/ScriptCompilerStub';
-import { ScriptDataStub } from '../../../stubs/ScriptDataStub';
-import { EnumParserStub } from '../../../stubs/EnumParserStub';
-import { ScriptCodeStub } from '../../../stubs/ScriptCodeStub';
-import { CategoryCollectionParseContextStub } from '../../../stubs/CategoryCollectionParseContextStub';
-import { LanguageSyntaxStub } from '../../../stubs/LanguageSyntaxStub';
+import { ScriptCompilerStub } from '@tests/unit/stubs/ScriptCompilerStub';
+import { ScriptDataStub } from '@tests/unit/stubs/ScriptDataStub';
+import { EnumParserStub } from '@tests/unit/stubs/EnumParserStub';
+import { ScriptCodeStub } from '@tests/unit/stubs/ScriptCodeStub';
+import { CategoryCollectionParseContextStub } from '@tests/unit/stubs/CategoryCollectionParseContextStub';
+import { LanguageSyntaxStub } from '@tests/unit/stubs/LanguageSyntaxStub';
 
 describe('ScriptParser', () => {
     describe('parseScript', () => {

tests/unit/application/Parser/Script/Syntax/ConcreteSyntaxes.spec.ts

@@ -4,7 +4,6 @@ import { ILanguageSyntax } from '@/domain/ScriptCode';
 import { BatchFileSyntax } from '@/application/Parser/Script/Syntax/BatchFileSyntax';
 import { ShellScriptSyntax } from '@/application/Parser/Script/Syntax/ShellScriptSyntax';
 
-
 function getSystemsUnderTest(): ILanguageSyntax[] {
     return [ new BatchFileSyntax(), new ShellScriptSyntax() ];
 }