increase performance by polyfilling ResizeObserver only if required

Run button on Windows stopped working as CodeRunner was hanging when
executing fs.promises.mkdir as described in electron/electron#20951
It started happening after electron update to v12 in 1f515e7.
This commit adds the workaround suggested in electron/electron#19554
that fixes the issue.

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

@@ -0,0 +1,36 @@
+---
+name: Bug report (script bug or unexpected script behavior)
+about: Create a bug report for generated scripts to help privacy.sexy improve
+labels: bug
+title: '[BUG]: '
+---
+
+<!--
+Thank you for reporting an issue with generated script(s).
+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
+
+<!-- A clear and concise description of what the bug is. -->
+
+### OS
+
+<!--
+Which OS are you using? What version of OS you were using?
+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
+
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+### Scripts
+
+<!-- Which scripts did you execute? If applicable, please paste the executed scripts or attach the generated privacy.sexy file . -->
+
+### Additional information
+
+<!-- Add any other context about the problem here. -->

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

@@ -0,0 +1,52 @@
+---
+name: Bug report (unrelated to generated scripts)
+about: Create a bug report that's not related to generated scripts to help privacy.sexy improve
+labels: bug
+title: '[BUG]: '
+---
+
+<!--
+Thank you for reporting an issue.
+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
+
+<!-- A clear and concise description of what the bug is. -->
+
+### To Reproduce
+
+<!-- 
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+-->
+
+### Expected behavior
+
+<!--
+A clear and concise description of what you expected to happen.
+-->
+
+### Screenshots
+
+<!--
+If applicable, add screenshots to help explain your problem.
+-->
+
+### Distribution
+
+<!--
+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?)
+-->
+
+### Additional context
+
+<!--
+Add any other context about the problem here.
+-->

.github/ISSUE_TEMPLATE/3-feature_request.md

@@ -0,0 +1,27 @@
+---
+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/config.yml

@@ -0,0 +1 @@
+blank_issues_enabled: true

CHANGELOG.md

@@ -1,5 +1,49 @@
 # Changelog
 
+## 0.10.0 (2021-03-02)
+
+* allow functions to call other functions #53 | [7661575](https://github.com/undergroundwires/privacy.sexy/commit/7661575573c6d3e8f4bc28bfa7a124a764c72ef9)
+* add option to run script directly in desktop app | [9a6b903](https://github.com/undergroundwires/privacy.sexy/commit/9a6b903b9297802845043fd41115756acd4a145c)
+* add script to automatically kill devicecensus process | [c9b91f6](https://github.com/undergroundwires/privacy.sexy/commit/c9b91f6d8f9bd16308b6beda119e7154a985b6cf)
+* refactor disabling application experience and document better | [45a3669](https://github.com/undergroundwires/privacy.sexy/commit/45a3669443d82855a52f60524d341c15f380f9e7)
+* escape printed characters to prevent command injection #45 | [1260eea](https://github.com/undergroundwires/privacy.sexy/commit/1260eea690e4fa5420e58c9de9f88cc29cb242db)
+* move code area to right on bigger screens | [cf39e6d](https://github.com/undergroundwires/privacy.sexy/commit/cf39e6d2541ea547f41d9553c380c54c24c58038)
+* more scripts to disable speech recognition and Cortana | [ee43fd9](https://github.com/undergroundwires/privacy.sexy/commit/ee43fd92a019ebd26c13890f9146c5b5bb56afaf)
+* add more macos scripts for privacy cleanup | [b0a7d0b](https://github.com/undergroundwires/privacy.sexy/commit/b0a7d0b53b3d8ac144a0241d70c037f460b0c0cc)
+* add better error messages to setting vscode settings | [65226f3](https://github.com/undergroundwires/privacy.sexy/commit/65226f3984480d0bc7932fd8d76a328f08308850)
+* remove windows scripts for removing non-bloating system apps #55 | [15004ff](https://github.com/undergroundwires/privacy.sexy/commit/15004ff1f1fb85a1d92e11ef695bcb2f37110610)
+* remove "preview" disclaimer from macOS | [970221b](https://github.com/undergroundwires/privacy.sexy/commit/970221b996e25fe5b029cbaa78607c9bbc8c3c0e)
+* update screenshot | [bd41af4](https://github.com/undergroundwires/privacy.sexy/commit/bd41af466fd135f7dc2f171633e4f60d8547c373)
+
+[compare](https://github.com/undergroundwires/privacy.sexy/compare/0.9.2...0.10.0)
+
+## 0.9.2 (2021-02-13)
+
+* do not compile with unused locals vuejs/vetur#1063 | [73e0520](https://github.com/undergroundwires/privacy.sexy/commit/73e0520de70cdbaf0ecdc6e9be5e85f003fcfb79)
+* fix wrong path for NvTelemtry file in NVIDIA script | [34b8822](https://github.com/undergroundwires/privacy.sexy/commit/34b8822ac821acb47e483e21b57e380551bcf455)
+* refactor event handling to consume base class for lifecycling | [f1e21ba](https://github.com/undergroundwires/privacy.sexy/commit/f1e21babbfaac21903594a37e30163bfe3338279)
+* make compiler throw if a function call includes an unexpected parameter | [15353d0](https://github.com/undergroundwires/privacy.sexy/commit/15353d0e2513c89ee4ffd9d9c5e9e83ef69b96b6)
+* refactor vscode configuration scripts using functions #41 | [67b2d1c](https://github.com/undergroundwires/privacy.sexy/commit/67b2d1c11cd5b131dff93a4437db79d96ed8b3dc)
+* refactor state handling to make application available independent of the state | [df273f7](https://github.com/undergroundwires/privacy.sexy/commit/df273f7f635ab156ac51a8dfb3fec66c4979f1c4)
+* add test to ensure correct shared functions are being parsed | [d7de420](https://github.com/undergroundwires/privacy.sexy/commit/d7de420d5c91bd9ce64880cd4a4391ad3a0a5401)
+* refactor and add tests for NonCollapsingDirective | [5934b17](https://github.com/undergroundwires/privacy.sexy/commit/5934b1728328c3b2ece1597b74dd87477d162175)
+* add GitHub issue templates | [daa997b](https://github.com/undergroundwires/privacy.sexy/commit/daa997b21b624d133c6f5e4cd6b70214588f9144)
+* correct the typo in application.md (#60) | [575636e](https://github.com/undergroundwires/privacy.sexy/commit/575636e6b728a2bdd1a9bd72c57bbf2752f10887)
+
+[compare](https://github.com/undergroundwires/privacy.sexy/compare/0.9.1...0.9.2)
+
+## 0.9.1 (2021-01-23)
+
+* in CI/CD, allow publishing to github if release is more than 2 hours old electron-userland/electron-builder#2074 | [cf907d0](https://github.com/undergroundwires/privacy.sexy/commit/cf907d029a6d80682ba78ec887a9c4fab639db51)
+* in CI/CD, publish packages for other OSes if single one fails | [4015e2c](https://github.com/undergroundwires/privacy.sexy/commit/4015e2ccd8492e0693365b70fbfe3bd0ac7a6ea2)
+* specify desktop publish targets as defaults (may) change | [2316e3f](https://github.com/undergroundwires/privacy.sexy/commit/2316e3fb6867e5d765eafcf675b77f88bd2a0f52)
+* fix selection state indicator on cards not showing up | [8b0e47d](https://github.com/undergroundwires/privacy.sexy/commit/8b0e47da38c49cfe2645d7d25970c448ecd200f8)
+* transpile using babel for legacy browser support | [7930bef](https://github.com/undergroundwires/privacy.sexy/commit/7930bef48c4e9a4fe0823673958ed8377f5ee533)
+* fix node APIs no longer working on desktop nklayman/vue-cli-plugin-electron-builder#610, nklayman/vue-cli-plugin-electron-builder#742 | [d7f9ef1](https://github.com/undergroundwires/privacy.sexy/commit/d7f9ef1cbebe911aa19f29be8c5fa9360550793e)
+* improve explanation for selections | [229c13a](https://github.com/undergroundwires/privacy.sexy/commit/229c13a195dee92e4a31731b7b41c319273a16f1)
+
+[compare](https://github.com/undergroundwires/privacy.sexy/compare/0.9.0...0.9.1)
+
 ## 0.9.0 (2021-01-15)
 
 * refactor application.yaml to become an os definition #40 | [f7557bc](https://github.com/undergroundwires/privacy.sexy/commit/f7557bcc0faf44e8395b68c7eb14c5f715f07b92)

CONTRIBUTING.md

@@ -7,9 +7,9 @@
   - Proposing new features
   - Becoming a maintainer
 
-## Pull Request Process
+## Pull request process
 
-- [GitHub flow](https://guides.github.com/introduction/flow/index.html) is used
+- [GitHub flow](https://guides.github.com/introduction/flow/index.html) with [GitOps](./img/architecture/gitops.png) is used
 - Your pull requests are actively welcomed.
 - The steps:
   1. Fork the repo and create your branch from master.
@@ -23,17 +23,12 @@
 - ❗ DON'T
   - Do not update the versions, current version is only [set by the maintainer](./img/architecture/gitops.png) and updated automatically by [bump-everywhere](https://github.com/undergroundwires/bump-everywhere)
 
-## Guidelines
-
-### Handle the state in presentation layer
-
-- There are two types of components:
-  - **Stateless**, extends `Vue`
-  - **Stateful**, extends [`StatefulVue`](./src/presentation/StatefulVue.ts)
-    - The source of truth for the state lies in application layer ([`./src/application/`](src/application/)) and must be updated from the views if they're mutating the state
-    - They mutate or/and react to state changes in [ApplicationContext](src/application/Context/ApplicationContext.ts).
-    - You can react by getting the state and listening to it and update the view accordingly in [`mounted()`](https://vuejs.org/v2/api/#mounted) method.
-
 ## License
 
-By contributing, you agree that your contributions will be licensed under its GNU General Public License v3.0.
+By contributing, you agree that your contributions will be licensed under its [GNU General Public License v3.0](./LICENSE).
+
+## Read more
+
+- See [tests](./docs/tests.md) for testing
+- See [extend script](./README.md#extend-scripts) for quick steps to extend scripts
+- See [architecture overview](./README.md#architecture-overview) to deep dive into privacy.sexy codebase

README.md

@@ -14,11 +14,13 @@
 
 ## Get started
 
-- Online version: [https://privacy.sexy](https://privacy.sexy)
-  - or download latest desktop version for [Windows](https://github.com/undergroundwires/privacy.sexy/releases/download/0.9.0/privacy.sexy-Setup-0.9.0.exe), [Linux](https://github.com/undergroundwires/privacy.sexy/releases/download/0.9.0/privacy.sexy-0.9.0.AppImage), [macOS](https://github.com/undergroundwires/privacy.sexy/releases/download/0.9.0/privacy.sexy-0.9.0.dmg)
-- 💡 Come back regularly to apply latest version for stronger privacy and security.
+- 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).
+  - 💡 Single click to execute your script.
+- ❗ Come back regularly to apply latest version for stronger privacy and security.
 
-[![privacy.sexy application](img/screenshot.png)](https://privacy.sexy)
+[![privacy.sexy application](img/screenshot.png?raw=true)](https://privacy.sexy)
 
 ## Why
 
@@ -51,29 +53,17 @@
   - 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.9.0 .`
-    2. Run: `docker run -it -p 8080:80 --rm --name privacy.sexy-0.9.0 undergroundwires/privacy.sexy:0.9.0`
+    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`
 
-## Architecture
+## Architecture overview
 
 ### Application
 
 - Powered by **TypeScript**, **Vue.js** and **Electron** 💪
   - and driven by **Domain-driven design**, **Event-driven architecture**, **Data-driven programming** concepts.
 - Application uses highly decoupled models & services in different DDD layers.
-  - **Domain layer** is where the application is modelled with validation logic.
-  - **Presentation Layer**
-    - Consists of Vue.js components and other UI-related code.
-    - Desktop application is created using [Electron](https://www.electronjs.org/).
-    - Event driven as in components simply listens to events from the state and act accordingly.
-  - **Application Layer**
-    - Keeps the application state using [state pattern](https://en.wikipedia.org/wiki/State_pattern)
-    - [ApplicationContext](src/application/Context/ApplicationContext.ts)
-      - Holds the [CategoryCollectionState](src/application/Context/State/CategoryCollectionState.ts)] for each OS
-      - Same instance is shared throughout the application
-    - The scripts are defined and controlled in [yaml files](src/application/collections/) per OS
-      - Uses [data-driven programming](https://en.wikipedia.org/wiki/Data-driven_programming)
-      - 📖 See [extend scripts](#extend-scripts) to read about how to extend them.
+- 📖 Read more on • [Presentation](./docs/presentation.md) • [Application](./docs/application.md)
 
 ![DDD + vue.js](img/architecture/app-ddd.png)
 

docs/application.md

@@ -0,0 +1,36 @@
+# Application
+
+- It's mainly responsible for
+  - creating and event based [application state](#application-state)
+  - [parsing](#parsing) and [compiling](#compiling) [application data](#application-data)
+
+## Application state
+
+- [ApplicationContext.ts](./../src/application/Context/ApplicationContext.ts) holds the [CategoryCollectionState](./../src/application/Context/State/CategoryCollectionState.ts) for each OS
+- Uses [state pattern](https://en.wikipedia.org/wiki/State_pattern)
+- Same instance is shared throughout the application to ensure consistent state
+- 📖 See [Application State | Presentation layer](./presentation.md#application-state) to read more about how the state should be managed by the presentation layer.
+- 📖 See [ApplicationContext.ts](./../src/application/Context/ApplicationContext.ts) to start diving into the state code.
+
+## Application data
+
+- Compiled to [`Application`](./../src/domain/Application.ts) domain object.
+- The scripts are defined and controlled in different data files per OS
+- Enables [data-driven programming](https://en.wikipedia.org/wiki/Data-driven_programming) and easier contributions
+- Application data is defined in collection files and
+- 📖 See [Application data | Presentation layer](./presentation.md#application-data) to read how the application data is read by the presentation layer.
+- 📖 See [collection files documentation](./collection-files.md) to read more about how the data files are structured/defined and see [collection yaml files](./../src/application/collections/) to directly check the code.
+
+## Parsing
+
+- Application data is parsed to domain object [`Application.ts`](./../src/domain/Application.ts)
+- Steps
+  1. (Compile time) Load application data from [collection yaml files](./../src/application/collections/) using webpack loader
+  2. (Runtime) Parse and compile application and make it available to presentation layer by [`ApplicationFactory.ts`](./../src/application/ApplicationFactory.ts)
+
+### Compiling
+
+- Parsing the application files includes compiling scripts using [collection file defined functions](./collection-files.md#function)
+- To extend the syntax:
+  1. Add a new parser under [SyntaxParsers](./../src/application/Parser/Script/Compiler/Expressions/SyntaxParsers) where you can look at other parsers to understand more.
+  2. Register your in [CompositeExpressionParser](./../src/application/Parser/Script/Compiler/Expressions/Parser/CompositeExpressionParser.ts)

docs/collection-files.md

@@ -101,11 +101,15 @@
 ### `Function`
 
 - Functions allow re-usable code throughout the defined scripts.
-- Functions are templates compiled by privacy.sexy and uses special expressions.
-- Expressions are defined inside mustaches (double brackets, `{{` and `}}`)
+- Functions are templates compiled by privacy.sexy and uses special [expressions](#expressions).
+- Functions can call other functions by defining `call` property instead of `code`
 - 👀 See [parameter substitution](#parameter-substitution) for an example usage
 
-#### Parameter substitution
+#### Expressions
+
+- Expressions are defined inside mustaches (double brackets, `{{` and `}}`)
+
+##### Parameter substitution
 
 A simple function example
 
@@ -125,6 +129,22 @@ It would print "Hello world" if it's called in a [script](#script) as following:
       argument: World
 ```
 
+A function can call other functions such as:
+
+```yaml
+  - 
+    function: CallerFunction
+    parameters: [ 'value' ]
+    call:
+      function: EchoArgument
+      parameters:
+        argument: {{ $value }}
+  -
+    function: EchoArgument
+    parameters: [ 'argument' ]
+    code: Hello {{ $argument }} !
+```
+
 #### `Function` syntax
 
 - `name`: *`string`* (**required**)
@@ -135,15 +155,20 @@ It would print "Hello world" if it's called in a [script](#script) as following:
 - `parameters`: `[` *`string`* `, ... ]`
   - Name of the parameters that the function has.
   - Parameter values are provided by a [Script](#script) through a [FunctionCall](#FunctionCall)
-  - Parameter names must be defined to be used in expressions such as [parameter substitution](#parameter-substitution)
+  - Parameter names must be defined to be used in [expressions](#expressions)
   - ❗ Parameter names must be unique
- `code`: *`string`* (**required**)
+ `code`: *`string`* (**required** if `call` is undefined)
   - Batch file commands that will be executed
   - 💡 If defined, best practice to also define `revertCode`
+  - ❗ If not defined `call` must be defined
 - `revertCode`: *`string`*
   - Code that'll undo the change done by `code` property.
   - E.g. let's say `code` sets an environment variable as `setx POWERSHELL_TELEMETRY_OPTOUT 1`
     - then `revertCode` should be doing `setx POWERSHELL_TELEMETRY_OPTOUT 0`
+- `call`: ***[`FunctionCall`](#FunctionCall)*** | `[` ***[`FunctionCall`](#FunctionCall)*** `, ... ]` (may be **required**)
+  - A shared function or sequence of functions to call (called in order)
+  - The parameter values that are sent can use [expressions](#expressions)
+  - ❗ If not defined `code` must be defined
 
 ### `ScriptingDefinition`
 

docs/presentation.md

@@ -0,0 +1,51 @@
+# Presentation layer
+
+- Consists of Vue.js components and other UI-related code.
+- Desktop application is created using [Electron](https://www.electronjs.org/).
+- Event driven as in components simply listens to events from the state and act accordingly.
+
+## Structure
+
+- [`/src/` **`presentation/`**](./../src/presentation/): Contains all presentation related code including Vue and Electron configurations
+  - [**`bootstrapping/`**](./../src/presentation/bootstrapping/): Registers Vue global objects including components and plugins.
+  - [**`components/`**](./../src/presentation/components/): Contains all Vue components and their helper classes.
+    - [**`Shared/`**](./../src/presentation/components/Shared): Contains Vue components and component helpers that are shared across other components.
+  - [**`styles/`**](./../src/presentation/styles/): Contains shared styles used throughout different components.
+  - [**`main.ts`**](./../src/presentation/main.ts): Application entry point that mounts and starts Vue application.
+  - [**`background.ts`**](./../src/presentation/background.ts): Main process of Electron, started as first thing when app starts.
+- [**`/public/`**](./../public/): Contains static assets that will simply be copied and not go through webpack.
+- [**`/vue.config.js`**](./../vue.config.js): Global Vue CLI configurations loaded by `@vue/cli-service`
+- [**`/postcss.config.js`**](./../postcss.config.js): PostCSS configurations that are used by Vue CLI internally
+- [**`/babel.config.js`**](./../babel.config.js): Babel configurations for polyfills used by `@vue/cli-plugin-babel`
+
+## Application data
+
+- Components and should use [ApplicationFactory](./../src/application/ApplicationFactory.ts) singleton to reach the application domain.
+- [Application.ts](../src/domain/Application.ts) domain model is the stateless application representation including
+  - available scripts, collections as defined in [collection files](./collection-files.md)
+  - package information as defined in [`package.json`](./../package.json)
+- 📖 See [Application data | Application layer](./presentation.md#application-data) where application data is parsed and compiled.
+
+## Application state
+
+- Stateful components mutate or/and react to state changes in [ApplicationContext](./../src/application/Context/ApplicationContext.ts).
+- Stateless components that does not handle state extends `Vue`
+- Stateful components that depends on the collection state such as user selection, search queries and more extends [`StatefulVue`](./../src/presentation/components/Shared/StatefulVue.ts)
+- The single source of truth is a singleton of the state created and made available to presentation layer by [`StatefulVue`](./../src/presentation/components/Shared/StatefulVue.ts)
+- `StatefulVue` includes abstract `handleCollectionState` that is fired once the component is loaded and also each time [collection](./collection-files.md) is changed.
+- Do not forget to subscribe from events when component is destroyed or if needed [collection](./collection-files.md) is changed.
+  - 💡 `events` in base class [`StatefulVue`](./../src/presentation/components/Shared/StatefulVue.ts) makes lifecycling easier
+- 📖 See [Application state | Application layer](./presentation.md#application-state) where the state is implemented using using state pattern.
+
+## Modals
+
+- [Dialog.vue](./../src/presentation/components/Shared/Dialog.vue) is a shared component that can be used to show modal windows
+- Simply wrap the content inside of its slot and call `.show()` method on its reference.
+- Example:
+
+  ```html
+    <Dialog ref="testDialog">
+      <div>Hello world</div>
+    </Dialog>
+    <div @click="$refs.testDialog.show()">Show dialog</div>
+  ```

docs/tests.md

@@ -0,0 +1,29 @@
+# Unit tests
+
+- Unit tests are defined in [`./tests`](./../tests)
+- They follow same folder structure as [`./src`](./../src)
+
+## 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
+
+- Tests use act, arrange and assert (AAA) pattern when applicable
+- **Arrange**
+  - Should set up the test case
+  - Starts with comment line `// arrange`
+- **Act**
+  - Should cover the main thing to be tested
+  - Starts with comment line `// act`
+- **Assert**
+  - Should elicit some sort of response
+  - Starts with comment line `// assert`
+
+## Stubs
+
+- Stubs are defined in [`./tests/stubs`](./../tests/unit/stubs)
+- They implement dummy behavior to be functional

img/architecture/app-ddd.drawio

@@ -1 +1 @@
-<mxfile host="www.draw.io" modified="2019-12-27T03:04:27.829Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/79.0.3945.88 Safari/537.36" etag="O-1eaon4mqUmgvki0auB" version="12.4.3" pages="1"><diagram id="rhL8jzEM8kVVyiS98U7u" name="Page-1">3Zpdk6I4FIZ/jZdakPDlpa3tzlTNbnVVV83OzE1XhACZAUKF2Or8+k0wCBhau1f8GrpayUkC5HlzTg7IAE7T9V8M5fHfNMDJABjBegBnAwA8YIpPadhsDS50t4aIkWBrMmvDM/mNldFQ1iUJcNFqyClNOMnbRp9mGfZ5y4YYo6t2s5Am7bPmKMKa4dlHiW79lwQ8VsOyjdr+CZMors5sGqomRVVjZShiFNBVwwQfB3DKKOXbvXQ9xYlkV3HZ9pu/Ubu7MIYz/p4OD0/efJxMXmZfs6kd/vj2Txp+HlrVxfFNNWIcCACqSBmPaUQzlDzW1gdGl1mA5WENUarbfKE0F0ZTGH9izjdKTbTkVJhiniaqFq8J/ya7j2xV+t6oma3VkcvCpipknG0anWTxe7Ou7laWqn4FZ/QXntKEsnJ8cFxuomY7cjncN4kqU0GXzMcHMFYzE7EI8wPtwE534S+YplhcqejHcII4eW1fB1IzN9q1q8UVO0rfj2gNrqL1TreWarWI96AbPFG3suuEMbRpNMgpyXjROPKTNIgGKnZC5Zsqctp77n24NTDtvQmzPX09fXbjOGFGwatGj0bsMEbAfmf4uONpaF0zfKjjvqJkqc70xHAhxirOTTNtIrRlXsWE4+cclRhWIlNoSxqSJGkwDmzsBVYXfQ8soOPIHjTj1TyrrgwzjteHxdDhqQ6O23Yf5U2res2H1coeN9Z7xzgTbehc07XMlmu907PMtmeBm3AtcCHX+n8RftwO2iZsBe2j7YHrnj/IQ+9eUsSbmlCnpgwnRQ+gxepJnifE7yNUtwKvFrpDW/51ieGUmzpCw77ddiKdFMXtdhTf3Yw1wzjoCOPu2cK4fS/Oc9P3V/AeEiSoOd2Mpoj0mxotzCAIO7mbhgvH+Ayp0XjPqca6UwGrw6nsczmVpYH+nIUMCSJLny8Z7hV46PnY97uALzzbso0zAHf3clGnA7h3ySjmaMDxK1aZzRugzY+DDrHTDTpwxwvD6GeF8PbYujpbtwMtOBdaV0PLcE4Lwqk6+F3jhR0L8EXxenqoeMw44ffIdj8uXB3uWIPLY4ZRQLLoD8B79dBg6ll8Kn9e6TfsLpDvBbALLoCWZQf9wBXJSRuuYelw7ZHZgRecC6+er4ldEhy7R7pVxMA2R+Obg2xrkAuO+KEU7R18e6C15+xm9ZTjiqjOk2X1MbOc47DMrqej52Olp02o+YDDSGhE/NsDZ+pLymXBVWPoBjfaiNFfG9rtMdMXCg1SEaNc7pK0fJ+giUTCEHyTSUKiTNi4fIizs35BC5w8yYRfTlw4W1DOaSoaJLLiAfm/olKAVjokN9GkPNmkyLfvPcg0CFWFkKylZA/qemYx5/KFiYkkAeZ+kFkj4tMsJEJaNvLFGcFcrHxIfEm7iDlz4UK0GKIsGC6Y+JQmW6Ykc+i4L1+X+GfxIpuINMUb5VXG1+t9r60Jb1/yMQPQ16771x1+WPchCugC79QHnvfyjIqiR91NcGPC6yvx/QtvHhV+ka3Ep5B1Lf7FnlgYpFk+3Sp6Uhq4+zkqBCNdbQh1tStb/2rrucT9q20cVTukLMLZsMBU/rI/d8Stwjwn5fPTYkhzTlLyu0wKenR0WN0O7MTXpbc6pLc+LL0o1m/WbX8JrV9PhI//AQ==</diagram></mxfile>
+<mxfile host="Electron" modified="2021-01-31T12:32:01.751Z" agent="5.0 (Windows NT 10.0; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/14.1.8 Chrome/87.0.4280.88 Electron/11.1.1 Safari/537.36" etag="OTbSPW1ZOLwiPL6mt-j9" version="14.1.8" type="device"><diagram id="rhL8jzEM8kVVyiS98U7u" name="Page-1">3VtZd6JKF/01/dhZjA6PREjCXRbGFpM2L70QCYIoLsUI/PpvnwKcMD3cazrJl6wEqfHU3vvsKoz5Infm6e3KWU5ZPPGiL5IwSb/I+hdJUsUmflNBVhQoDaEo8FfBpCgS9wWDIPfKwqrZJph466OGSRxHSbA8LnTjxcJzk6MyZ7WKt8fNnuPoeNal43u1goHrRPXSx2CSTIvSlirsy++8wJ9WM4tCWTN3qsZlwXrqTOLtQZFsfJE7qzhOilfztONFhF2FS9Hv5pXaXWArb5H8Tofr+9ZNO9J+6A+Ljvr89N2aP5tflSq4JKtW7E0AQHkbr5Jp7McLJzL2pdereLOYeDSsgLt9m24cL1EoojD0kiQr2XQ2SYyiaTKPylovDZLv1P1KLe9GBzV6Wo7Mb7LqZpGssoNOdDs6rNt343dVv3WyimdeJ47iFV+f3OZfqKkDWGK6jjcr1/sJapUQnZXvJT9pJxXtCNGDCUp6br147iFSNFh5kZMEL8eSc0rl+rt2e3LxouT3T7iW3oXrHW9HrO1J/IC8yZfmjXfVVisnO2iwjINFsj4Y+Z4K0KD0TrnMzdI51ZP0/nlrSVRPBFNMv5fPbh3/QVHyu7rHgXcIV5L6m/bxeWSofCj7KMd9caJNOdP9yltj8Zg7XtSEcEzzdhok3mDpcFy2OCkcU/ocRNEBxhPVa02Uc+i3pLHcaFCPeJFUOjuzFVbBeqvES38KXlnbaB6nT5lN2/2eL1c7+/Rgv69OMxdHW268Z2qJR6n1m5klHmeW9B6pJb1Xav07h28fm7YoH5n2L9tLzebbm7zc+ixHxPcU1MWPDP/JPaSaV2vLZRS4l7DqI+OtWfezSt/nyGjwr3KEg/Li62ck/b6Lq8cuvnsYO7Rx6YyNN9/MxtXPkjwf6flK/pQHJLmWdHo8d4LLHo3G4mTyfBZ3UWjKbe8Njkbtk6Rq15NKUs4klfpWSaXUgDYXzysHiGzcZLPyLgr4c8v1XPcc4OOWqqjCGwDePDmLNs4A3vqbLtaoAe69eOXJ5hWgxT8H+tlrnAd60myPBeEyO0TrBNtmHdvmGWilt4K2WYN25S3jdZDE5eCfGl75zAb8V+Ft1a3CWCRB8hmxPfWFdwe3XQM3ma48ZxIs/P8DeN/dGsT6KX5Of165rO2OBU/2GufAFbyW0GpdBlwcTo7BFZQ6uOqVeAZe6a3grZ/X8DKY/OoZ6aNCLKniVfvDgazWQF4nTvKzI9qf42vo9H0ZFE9MQKze/XhHCP/K6euSGJ6+mXoORPHcu6lvh2H9mOUcviEiRLEfuJ8HULG+Nf1dQHdr2AOazamXG0eR5xKqH1efHw/N+lZUA289dZb0MpjzTywcQkUrh5QjLQr8BcoSeptoV9p1xl50T48UJHVZH8dJEs/RIKKKa8ed+ZyYowMXfaEJn0xbL4tPVtBBy6lunoOUqLwu49GnSUIfydAICenGnSyUq8CNF88BKF9duZhRusHe6uBC5VDHDZIuXn91FpOv4xV+U5FKh54budH88bDxwvUPaoKDUOtqWZ0pL/pk3aa/UpxyryhXap38fenl6a9vkp+ffvmP6f/qTOKxtxOB1Gr9GDjr9QXpl9TWVVP9PQlI5zUgvZkI6tv85xeB+EsRjBdb/AbFKX7wCtsyFdNbausLsS7LyhHlcuOqVT+QSO0zht9+K7Lr55HPT7bwS7Kf45XvLb6uvZg+TXDTAC83y4C/Z7v+Gi+TYB7k/ER2wZzfvUtSsS/XqK/0cUh9VfZfqH/Y3Hrj5vegr7fv2awhLwLh8cyf5n7J/CWIPS+Z8+Qe8V/RzamUteJWulm/gJzrlM58nfs7S3rKrpXxY7pxcyFw7r4Jrh6/dOWJPMlUmWXqizt3X1iobVmnnU/mbmDeTZZPd9/i+4GZWfYoMG+nkfM4iSe6ELBwKJnBteQ8Psj9eVtBm62paz4v103RCkzMfX/r+k/zaD1Gj/G8vXkamMV9R8wmj2l0P/gnmswfNmPp28wMldZIirKRlEbm7dNyfLttmwHL+uE/N0wwMLtFs6Qs9Om1unt9Z7bN0Mh6HfPlPkwXB33Vb7OH62/hLCjLEnfxsH6yi1i8+UM2zniUd9fTya3vPyFK2zawfkVkuulbubGxwijs2qbUBS7WQBC6oZtbgSBYgSJaobthoZl27SGVSyzQUqujCMweJqhPcfWZrW0se5Z17f6G5SMZ2KDtKLcGGq6mYOpMxb1gzY0MV8nKtOoKPA2fdajdKMOcVC4yiSVWpsiWbSbMZhjbxNgzxDFCHKZIYzEepylYmZAjnhx1PuJRmO6jD9aUz1LiqBsaQq8jpKjLMJZv6RjH9uWubaTd0M+tx3MxaRTTpmcPJawb8/Zlby4kWBvKZqqpu2jLtpbEUo4jxwBz2kOxWLshW4GWsUDJe3bfZ/kM8ZBmGOZkSq+j5bQ+FjJoiWL1wYO76el+jv4y4tiygaaijYR+GBu42po0sk1wxfEtr4hzoG27wIjpmkj4WzraZVgvjU9zow/TXQXrABY+8Qeeh4SJivi2TGcJHz830MYgvMCvoIBrzkcP2Fq8DeFPPDDU9WX0zxnVvcqpkHfDmQAN4DpUvYArdzv6/i02b/ttcyakPYo3NGl9W8xHvFPcWyg+QY5izQblGcadIXcFgc+n+xwP8CsWmhymLBBIu+grEB8CcEW8Ptqwck0zWgv0CDz1IepGGLt/Hs8O8BwoWyuc+Wifs9wKGdeARtio4C4j3Vvh0IfuVHALfg1gPEOsBtbaV0x9RPFluE8pZ4ABrn3oxkQe+FuKE30zWgt+gP1MfY1bU+8Tf9Ay8kDvS6RDi17nlAsjhWvtkdY7pHFIY4h1poInmluxOhrmdIUe8gXYiozj7UNrTCy4nAms0KqAssQKSQt96Jj0MiIfkICpwmwXGoWOwdPrsRJOrgz8ZCt/CLkubZYjZ0n3AmLJMJZq6W5i0Rj5CJgMEYNJmMiESY+0w/EeIUcpTkMs8sYAf8CNuAk06Arj5CbnGXy/ih/4Jx3JRR4b4hkdKtxrMi3t6S7laT7KMa+tCUUu+6RB4lXqwc8QP7h3eU739D7mIe0apPuUUUz6kDREeKo9e5T0qL3OuEYseFGXvIzy5/bVvCFNy/C3jPN2W3ohjYs1kkd0aT2hKUKLaW+gKD3ySfJpvQ//MEhjyG3kAvyD8XgE0qxI8XA/DYeUx7S2DJiCY7STXo0HOsB6uIZd1ZKXCTiBRkzu9z19BLwoj42kyEsT+qdYfLHUYIo4Ea+m0N6CeAXue1inRdjkM65dC+OAb8xtSow8PSM9ukmP+1c/ezVXqd4eCZQnaC+McoPvNSzTuIfhWuwPpF/eZkQ5grWT12jEPfj0aayUv87dpPBt4piwYrTPUR5R/iiv40T+oEHPtA/McuSpCK1k2DtoPInZ/4RYM+FAuSgSLvBZeBe45X7F84G4zfg+m1VtuYbLMu20n1/1IzzIO7G/kW/tvL+o2/Xf9ava0rqrGE777eYF5zx/4Iamfj0lbjAW4uvnZZ7Bi4wyV3gcx/WYAzGU9dcN2+7THqLynON7Vz8d5aSZ4UE8/dN4hAMcgAnXu0px4QwjHuC2679fB28LXWrJHhPe73DMPaaFXgn7Au+BdgbvPTZFjgAdySjXDB/RWbVu0jr5vQLfOq2vtFPUL+Kgmyst9/ZGcDrXM5wcLcxH5wHSqkjnLkv/Fv4Rd3WshDpW7BQr9V9j1flbWGEs7rczn2so9zOce6CxmVLstxo8XeBeWJwrNRWemvL9Jx8mHMP8aQo/ynCu86trNU9RT35J50BXIo/r2eRptNe78B/yf9pvyZ/orGls6ZxSxK3RtYxBK2OqYtCKmIr85vtOEdNTwwxadFLvtBf34fblCUroyniiyRV6hrrMnz8l+Uo9fuNJlurPoY0zz6GNP34Oxe3+v8qKTwHv/zVPNv4H</diagram></mxfile>

package.json

@@ -1,6 +1,6 @@
 {
   "name": "privacy.sexy",
-  "version": "0.9.0",
+  "version": "0.10.0",
   "private": true,
   "description": "Enforce privacy & security best-practices on Windows and macOS, because privacy is sexy 🍑🍆",
   "author": "undergroundwires",
@@ -21,47 +21,49 @@
   },
   "main": "background.js",
   "dependencies": {
-    "@fortawesome/fontawesome-svg-core": "^1.2.32",
-    "@fortawesome/free-brands-svg-icons": "^5.15.1",
-    "@fortawesome/free-regular-svg-icons": "^5.15.1",
-    "@fortawesome/free-solid-svg-icons": "^5.15.1",
+    "@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/vue-fontawesome": "^2.0.2",
+    "@juggle/resize-observer": "^3.3.0",
     "ace-builds": "^1.4.12",
-    "core-js": "^3.6.5",
+    "core-js": "^3.9.1",
     "file-saver": "^2.0.5",
     "inversify": "^5.0.5",
     "liquor-tree": "^0.2.70",
-    "v-tooltip": "2.0.2",
+    "v-tooltip": "2.1.2",
     "vue": "^2.6.12",
     "vue-class-component": "^7.2.6",
     "vue-js-modal": "^2.0.0-rc.6",
     "vue-property-decorator": "^9.1.2"
   },
   "devDependencies": {
-    "@types/ace": "0.0.44",
-    "@types/chai": "^4.2.14",
+    "@types/ace": "0.0.45",
+    "@types/chai": "^4.2.15",
     "@types/file-saver": "^2.0.1",
-    "@types/mocha": "^8.2.0",
-    "@vue/cli-plugin-babel": "^4.5.10",
-    "@vue/cli-plugin-typescript": "^4.5.9",
-    "@vue/cli-plugin-unit-mocha": "^4.5.9",
-    "@vue/cli-service": "^4.5.9",
-    "@vue/test-utils": "1.1.2",
-    "chai": "^4.2.0",
-    "electron": "^11.1.0",
+    "@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.1",
-    "electron-updater": "^4.3.5",
+    "electron-log": "^4.3.2",
+    "electron-updater": "^4.3.8",
     "js-yaml-loader": "^1.2.2",
-    "markdownlint-cli": "^0.26.0",
+    "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.2",
-    "sass": "^1.30.0",
-    "sass-loader": "^10.1.0",
-    "typescript": "^4.1.3",
-    "vue-cli-plugin-electron-builder": "^2.0.0-rc.5",
+    "remark-validate-links": "^10.0.3",
+    "sass": "^1.32.8",
+    "sass-loader": "^10.1.1",
+    "tslib": "^2.1.0",
+    "typescript": "^4.2.3",
+    "vue-cli-plugin-electron-builder": "^2.0.0-rc.6",
     "vue-template-compiler": "^2.6.12",
     "yaml-lint": "^1.2.4"
   },

src/application/ApplicationFactory.ts

@@ -0,0 +1,21 @@
+import { IApplication } from '@/domain/IApplication';
+import { AsyncLazy } from '@/infrastructure/Threading/AsyncLazy';
+import { IApplicationFactory } from './IApplicationFactory';
+import { parseApplication } from './Parser/ApplicationParser';
+
+export type ApplicationGetter = () => IApplication;
+const ApplicationGetter: ApplicationGetter = parseApplication;
+
+export class ApplicationFactory implements IApplicationFactory {
+    public static readonly Current: IApplicationFactory = new ApplicationFactory(ApplicationGetter);
+    private readonly getter: AsyncLazy<IApplication>;
+    protected constructor(costlyGetter: ApplicationGetter) {
+        if (!costlyGetter) {
+            throw new Error('undefined getter');
+        }
+        this.getter = new AsyncLazy<IApplication>(() => Promise.resolve(costlyGetter()));
+    }
+    public getAppAsync(): Promise<IApplication> {
+        return this.getter.getValueAsync();
+    }
+}

src/application/Context/ApplicationContext.ts

@@ -4,12 +4,12 @@ import { CategoryCollectionState } from './State/CategoryCollectionState';
 import { IApplication } from '@/domain/IApplication';
 import { OperatingSystem } from '@/domain/OperatingSystem';
 import { ICategoryCollection } from '@/domain/ICategoryCollection';
-import { Signal } from '@/infrastructure/Events/Signal';
+import { EventSource } from '@/infrastructure/Events/EventSource';
 
 type StateMachine = Map<OperatingSystem, ICategoryCollectionState>;
 
 export class ApplicationContext implements IApplicationContext {
-    public readonly contextChanged = new Signal<IApplicationContextChangedEvent>();
+    public readonly contextChanged = new EventSource<IApplicationContextChangedEvent>();
     public collection: ICategoryCollection;
     public currentOs: OperatingSystem;
 

src/application/Context/ApplicationContextFactory.ts

@@ -4,15 +4,15 @@ import { OperatingSystem } from '@/domain/OperatingSystem';
 import { Environment } from '../Environment/Environment';
 import { IApplication } from '@/domain/IApplication';
 import { IEnvironment } from '../Environment/IEnvironment';
-import { parseApplication } from '../Parser/ApplicationParser';
+import { IApplicationFactory } from '../IApplicationFactory';
+import { ApplicationFactory } from '../ApplicationFactory';
 
-export type ApplicationParserType = () => IApplication;
-const ApplicationParser: ApplicationParserType = parseApplication;
-
-export function buildContext(
-    parser = ApplicationParser,
-    environment = Environment.CurrentEnvironment): IApplicationContext {
-    const app = parser();
+export async function buildContextAsync(
+    factory: IApplicationFactory = ApplicationFactory.Current,
+    environment = Environment.CurrentEnvironment): Promise<IApplicationContext> {
+    if (!factory) { throw new Error('undefined factory'); }
+    if (!environment) { throw new Error('undefined environment'); }
+    const app = await factory.getAppAsync();
     const os = getInitialOs(app, environment);
     return new ApplicationContext(app, os);
 }

src/application/Context/IApplicationContext.ts

@@ -1,12 +1,12 @@
 import { ICategoryCollectionState } from './State/ICategoryCollectionState';
 import { OperatingSystem } from '@/domain/OperatingSystem';
-import { ISignal } from '@/infrastructure/Events/ISignal';
+import { IEventSource } from '@/infrastructure/Events/IEventSource';
 import { IApplication } from '@/domain/IApplication';
 
 export interface IApplicationContext {
     readonly app: IApplication;
     readonly state: ICategoryCollectionState;
-    readonly contextChanged: ISignal<IApplicationContextChangedEvent>;
+    readonly contextChanged: IEventSource<IApplicationContextChangedEvent>;
     changeContext(os: OperatingSystem): void;
 }
 

src/application/Context/State/Code/ApplicationCode.ts

@@ -4,13 +4,13 @@ import { ICodeChangedEvent } from './Event/ICodeChangedEvent';
 import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript';
 import { IUserSelection } from '@/application/Context/State/Selection/IUserSelection';
 import { UserScriptGenerator } from './Generation/UserScriptGenerator';
-import { Signal } from '@/infrastructure/Events/Signal';
+import { EventSource } from '@/infrastructure/Events/EventSource';
 import { IApplicationCode } from './IApplicationCode';
 import { IUserScriptGenerator } from './Generation/IUserScriptGenerator';
 import { IScriptingDefinition } from '@/domain/IScriptingDefinition';
 
 export class ApplicationCode implements IApplicationCode {
-    public readonly changed = new Signal<ICodeChangedEvent>();
+    public readonly changed = new EventSource<ICodeChangedEvent>();
     public current: string;
 
     private scriptPositions = new Map<SelectedScript, CodePosition>();

src/application/Context/State/Code/Generation/Languages/BatchBuilder.ts

@@ -5,6 +5,12 @@ export class BatchBuilder extends CodeBuilder {
         return '::';
     }
     protected writeStandardOut(text: string): string {
-        return `echo ${text}`;
+        return `echo ${escapeForEcho(text)}`;
     }
 }
+
+function escapeForEcho(text: string) {
+    return text
+        .replace(/&/g, '^&')
+        .replace(/%/g, '%%');
+}

src/application/Context/State/Code/Generation/Languages/ShellBuilder.ts

@@ -5,6 +5,11 @@ export class ShellBuilder extends CodeBuilder {
         return '#';
     }
     protected writeStandardOut(text: string): string {
-        return `echo '${text}'`;
+        return `echo '${escapeForEcho(text)}'`;
     }
 }
+
+function escapeForEcho(text: string) {
+    return text
+        .replace(/'/g, '\'\\\'\'');
+}

src/application/Context/State/Code/IApplicationCode.ts

@@ -1,7 +1,7 @@
 import { ICodeChangedEvent } from './Event/ICodeChangedEvent';
-import { ISignal } from '@/infrastructure/Events/ISignal';
+import { IEventSource } from '@/infrastructure/Events/IEventSource';
 
 export interface IApplicationCode {
-    readonly changed: ISignal<ICodeChangedEvent>;
+    readonly changed: IEventSource<ICodeChangedEvent>;
     readonly current: string;
 }

src/application/Context/State/Filter/IUserFilter.ts

@@ -1,10 +1,10 @@
-import { ISignal } from '@/infrastructure/Events/ISignal';
+import { IEventSource } from '@/infrastructure/Events/IEventSource';
 import { IFilterResult } from './IFilterResult';
 
 export interface IUserFilter {
     readonly currentFilter: IFilterResult | undefined;
-    readonly filtered: ISignal<IFilterResult>;
-    readonly filterRemoved: ISignal<void>;
+    readonly filtered: IEventSource<IFilterResult>;
+    readonly filterRemoved: IEventSource<void>;
     setFilter(filter: string): void;
     removeFilter(): void;
 }

src/application/Context/State/Filter/UserFilter.ts

@@ -2,12 +2,12 @@ import { IScript } from '@/domain/IScript';
 import { FilterResult } from './FilterResult';
 import { IFilterResult } from './IFilterResult';
 import { IUserFilter } from './IUserFilter';
-import { Signal } from '@/infrastructure/Events/Signal';
+import { EventSource } from '@/infrastructure/Events/EventSource';
 import { ICategoryCollection } from '@/domain/ICategoryCollection';
 
 export class UserFilter implements IUserFilter {
-    public readonly filtered = new Signal<IFilterResult>();
-    public readonly filterRemoved = new Signal<void>();
+    public readonly filtered = new EventSource<IFilterResult>();
+    public readonly filterRemoved = new EventSource<void>();
     public currentFilter: IFilterResult | undefined;
 
     constructor(private collection: ICategoryCollection) {

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

@@ -1,10 +1,10 @@
 import { SelectedScript } from './SelectedScript';
 import { IScript } from '@/domain/IScript';
 import { ICategory } from '@/domain/ICategory';
-import { ISignal } from '@/infrastructure/Events/ISignal';
+import { IEventSource } from '@/infrastructure/Events/IEventSource';
 
 export interface IUserSelection {
-    readonly changed: ISignal<ReadonlyArray<SelectedScript>>;
+    readonly changed: IEventSource<ReadonlyArray<SelectedScript>>;
     readonly selectedScripts: ReadonlyArray<SelectedScript>;
     readonly totalSelected: number;
     areAllSelected(category: ICategory): boolean;

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

@@ -2,13 +2,13 @@ import { SelectedScript } from './SelectedScript';
 import { IUserSelection } from './IUserSelection';
 import { InMemoryRepository } from '@/infrastructure/Repository/InMemoryRepository';
 import { IScript } from '@/domain/IScript';
-import { Signal } from '@/infrastructure/Events/Signal';
+import { EventSource } from '@/infrastructure/Events/EventSource';
 import { IRepository } from '@/infrastructure/Repository/IRepository';
 import { ICategory } from '@/domain/ICategory';
 import { ICategoryCollection } from '@/domain/ICategoryCollection';
 
 export class UserSelection implements IUserSelection {
-    public readonly changed = new Signal<ReadonlyArray<SelectedScript>>();
+    public readonly changed = new EventSource<ReadonlyArray<SelectedScript>>();
     private readonly scripts: IRepository<string, SelectedScript>;
 
     constructor(

src/application/IApplicationFactory.ts

@@ -0,0 +1,5 @@
+import { IApplication } from '@/domain/IApplication';
+
+export interface IApplicationFactory {
+    getAppAsync(): Promise<IApplication>;
+}

src/application/Parser/CategoryCollectionParser.ts

@@ -2,19 +2,20 @@ import { Category } from '@/domain/Category';
 import { CollectionData } from 'js-yaml-loader!@/*';
 import { parseCategory } from './CategoryParser';
 import { OperatingSystem } from '@/domain/OperatingSystem';
-import { parseScriptingDefinition } from './ScriptingDefinitionParser';
 import { createEnumParser } from '../Common/Enum';
 import { ICategoryCollection } from '@/domain/ICategoryCollection';
 import { CategoryCollection } from '@/domain/CategoryCollection';
 import { IProjectInformation } from '@/domain/IProjectInformation';
 import { CategoryCollectionParseContext } from './Script/CategoryCollectionParseContext';
+import { ScriptingDefinitionParser } from './ScriptingDefinition/ScriptingDefinitionParser';
 
 export function parseCategoryCollection(
     content: CollectionData,
     info: IProjectInformation,
     osParser = createEnumParser(OperatingSystem)): ICategoryCollection {
     validate(content);
-    const scripting = parseScriptingDefinition(content.scripting, info);
+    const scripting = new ScriptingDefinitionParser()
+        .parse(content.scripting, info);
     const context = new CategoryCollectionParseContext(content.functions, scripting);
     const categories = new Array<Category>();
     for (const action of content.actions) {

src/application/Parser/Script/Compiler/Expressions/Expression/Expression.ts

@@ -0,0 +1,35 @@
+import { ExpressionPosition } from './ExpressionPosition';
+import { ExpressionArguments, IExpression } from './IExpression';
+
+export type ExpressionEvaluator = (args?: ExpressionArguments) => string;
+export class Expression implements IExpression {
+    constructor(
+        public readonly position: ExpressionPosition,
+        public readonly evaluator: ExpressionEvaluator,
+        public readonly parameters: readonly string[] = new Array<string>()) {
+        if (!position) {
+            throw new Error('undefined position');
+        }
+        if (!evaluator) {
+            throw new Error('undefined evaluator');
+        }
+    }
+    public evaluate(args?: ExpressionArguments): string {
+        args = filterUnusedArguments(this.parameters, args);
+        return this.evaluator(args);
+    }
+}
+
+function filterUnusedArguments(
+    parameters: readonly string[], args: ExpressionArguments): ExpressionArguments {
+    let result: ExpressionArguments = {};
+    for (const parameter of Object.keys(args)) {
+        if (parameters.includes(parameter)) {
+            result = {
+                ...result,
+                [parameter]: args[parameter],
+            };
+        }
+    }
+    return result;
+}

src/application/Parser/Script/Compiler/Expressions/Expression/ExpressionPosition.ts

@@ -0,0 +1,15 @@
+export class ExpressionPosition {
+    constructor(
+        public readonly start: number,
+        public readonly end: number) {
+        if (start === end) {
+            throw new Error(`no length (start = end = ${start})`);
+        }
+        if (start > end) {
+            throw Error(`start (${start}) after end (${end})`);
+        }
+        if (start < 0) {
+            throw Error(`negative start position: ${start}`);
+        }
+    }
+}

src/application/Parser/Script/Compiler/Expressions/Expression/IExpression.ts

@@ -0,0 +1,12 @@
+import { ExpressionPosition } from './ExpressionPosition';
+
+export interface IExpression {
+    readonly position: ExpressionPosition;
+    readonly parameters?: readonly string[];
+    evaluate(args?: ExpressionArguments): string;
+}
+
+export interface ExpressionArguments {
+    readonly [parameter: string]: string;
+}
+

src/application/Parser/Script/Compiler/Expressions/ExpressionsCompiler.ts

@@ -0,0 +1,52 @@
+import { IExpressionsCompiler, ParameterValueDictionary } from './IExpressionsCompiler';
+import { IExpression } from './Expression/IExpression';
+import { IExpressionParser } from './Parser/IExpressionParser';
+import { CompositeExpressionParser } from './Parser/CompositeExpressionParser';
+
+export class ExpressionsCompiler implements IExpressionsCompiler {
+    public constructor(private readonly extractor: IExpressionParser = new CompositeExpressionParser()) { }
+    public compileExpressions(code: string, parameters?: ParameterValueDictionary): string {
+        const expressions = this.extractor.findExpressions(code);
+        const requiredParameterNames = expressions.map((e) => e.parameters).filter((p) => p).flat();
+        const uniqueParameterNames = Array.from(new Set(requiredParameterNames));
+        ensureRequiredArgsProvided(uniqueParameterNames, parameters);
+        return compileExpressions(expressions, code, parameters);
+    }
+}
+
+function compileExpressions(expressions: IExpression[], code: string, parameters?: ParameterValueDictionary) {
+    let compiledCode = '';
+    expressions = expressions
+        .slice() // copy the array to not mutate the parameter
+        .sort((a, b) => b.position.start - a.position.start);
+    let index = 0;
+    while (index !== code.length) {
+        const nextExpression = expressions.pop();
+        if (nextExpression) {
+            compiledCode += code.substring(index, nextExpression.position.start);
+            const expressionCode = nextExpression.evaluate(parameters);
+            compiledCode += expressionCode;
+            index = nextExpression.position.end;
+        } else {
+            compiledCode += code.substring(index, code.length);
+            break;
+        }
+    }
+    return compiledCode;
+}
+
+function ensureRequiredArgsProvided(parameters: readonly string[], args: ParameterValueDictionary) {
+    parameters = parameters || [];
+    args = args || {};
+    if (!parameters.length) {
+        return;
+    }
+    const notProvidedParameters = parameters.filter((parameter) => !Boolean(args[parameter]));
+    if (notProvidedParameters.length) {
+        throw new Error(`parameter value(s) not provided for: ${printList(notProvidedParameters)}`);
+    }
+}
+
+function printList(list: readonly string[]): string {
+    return `"${list.join('", "')}"`;
+}

src/application/Parser/Script/Compiler/Expressions/IExpressionsCompiler.ts

@@ -0,0 +1,5 @@
+export interface ParameterValueDictionary { [parameterName: string]: string; }
+
+export interface IExpressionsCompiler {
+    compileExpressions(code: string, parameters?: ParameterValueDictionary): string;
+}

src/application/Parser/Script/Compiler/Expressions/Parser/CompositeExpressionParser.ts

@@ -0,0 +1,23 @@
+import { IExpression } from '../Expression/IExpression';
+import { IExpressionParser } from './IExpressionParser';
+import { ParameterSubstitutionParser } from '../SyntaxParsers/ParameterSubstitutionParser';
+
+const parsers = [
+    new ParameterSubstitutionParser(),
+];
+
+export class CompositeExpressionParser implements IExpressionParser {
+    public constructor(private readonly leafs: readonly IExpressionParser[] = parsers) {
+        if (leafs.some((leaf) => !leaf)) { throw new Error('undefined leaf'); }
+    }
+    public findExpressions(code: string): IExpression[] {
+        const expressions = new Array<IExpression>();
+        for (const parser of this.leafs) {
+            const newExpressions = parser.findExpressions(code);
+            if (newExpressions && newExpressions.length) {
+                expressions.push(...newExpressions);
+            }
+        }
+        return expressions;
+    }
+}

src/application/Parser/Script/Compiler/Expressions/Parser/IExpressionParser.ts

@@ -0,0 +1,5 @@
+import { IExpression } from '../Expression/IExpression';
+
+export interface IExpressionParser {
+    findExpressions(code: string): IExpression[];
+}

src/application/Parser/Script/Compiler/Expressions/Parser/RegexParser.ts

@@ -0,0 +1,35 @@
+import { IExpressionParser } from './IExpressionParser';
+import { ExpressionPosition } from '../Expression/ExpressionPosition';
+import { IExpression } from '../Expression/IExpression';
+import { Expression, ExpressionEvaluator } from '../Expression/Expression';
+
+export abstract class RegexParser implements IExpressionParser {
+    protected abstract readonly regex: RegExp;
+    public findExpressions(code: string): IExpression[] {
+        return Array.from(this.findRegexExpressions(code));
+    }
+
+    protected abstract buildExpression(match: RegExpMatchArray): IPrimitiveExpression;
+
+    private* findRegexExpressions(code: string): Iterable<IExpression> {
+        const matches = Array.from(code.matchAll(this.regex));
+        for (const match of matches) {
+            const startPos = match.index;
+            const endPos = startPos + match[0].length;
+            let position: ExpressionPosition;
+            try {
+                position = new ExpressionPosition(startPos, endPos);
+            } catch (error) {
+                throw new Error(`[${this.constructor.name}] invalid script position: ${error.message}\nRegex ${this.regex}\nCode: ${code}`);
+            }
+            const primitiveExpression = this.buildExpression(match);
+            const expression = new Expression(position, primitiveExpression.evaluator, primitiveExpression.parameters);
+            yield expression;
+        }
+    }
+}
+
+export interface IPrimitiveExpression {
+    evaluator: ExpressionEvaluator;
+    parameters?: readonly string[];
+}

src/application/Parser/Script/Compiler/Expressions/SyntaxParsers/ParameterSubstitutionParser.ts

@@ -0,0 +1,12 @@
+import { RegexParser, IPrimitiveExpression } from '../Parser/RegexParser';
+
+export class ParameterSubstitutionParser extends RegexParser {
+    protected readonly regex = /{{\s*\$\s*([^}| ]+)\s*}}/g;
+    protected buildExpression(match: RegExpMatchArray): IPrimitiveExpression {
+        const parameterName = match[1];
+        return {
+            parameters: [ parameterName ],
+            evaluator: (args) => args[parameterName],
+        };
+    }
+}

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

@@ -0,0 +1,126 @@
+import { FunctionData, InstructionHolder } from 'js-yaml-loader!*';
+import { SharedFunction } from './SharedFunction';
+import { SharedFunctionCollection } from './SharedFunctionCollection';
+import { ISharedFunctionCollection } from './ISharedFunctionCollection';
+import { IFunctionCompiler } from './IFunctionCompiler';
+import { IFunctionCallCompiler } from '../FunctionCall/IFunctionCallCompiler';
+import { FunctionCallCompiler } from '../FunctionCall/FunctionCallCompiler';
+
+export class FunctionCompiler implements IFunctionCompiler {
+    public static readonly instance: IFunctionCompiler = new FunctionCompiler();
+    protected constructor(
+        private readonly functionCallCompiler: IFunctionCallCompiler = FunctionCallCompiler.instance) {
+     }
+    public compileFunctions(functions: readonly FunctionData[]): ISharedFunctionCollection {
+        const collection = new SharedFunctionCollection();
+        if (!functions || !functions.length) {
+            return collection;
+        }
+        ensureValidFunctions(functions);
+        functions
+            .filter((func) => hasCode(func))
+            .forEach((func) => {
+                const shared = new SharedFunction(func.name, func.parameters, func.code, func.revertCode);
+                collection.addFunction(shared);
+            });
+        functions
+            .filter((func) => hasCall(func))
+            .forEach((func) => {
+                const code = this.functionCallCompiler.compileCall(func.call, collection);
+                const shared = new SharedFunction(func.name, func.parameters, code.code, code.revertCode);
+                collection.addFunction(shared);
+            });
+        return collection;
+    }
+}
+
+function hasCode(data: FunctionData): boolean {
+    return Boolean(data.code);
+}
+
+function hasCall(data: FunctionData): boolean {
+    return Boolean(data.call);
+}
+
+
+function ensureValidFunctions(functions: readonly FunctionData[]) {
+    ensureNoUndefinedItem(functions);
+    ensureNoDuplicatesInFunctionNames(functions);
+    ensureNoDuplicatesInParameterNames(functions);
+    ensureNoDuplicateCode(functions);
+    ensureEitherCallOrCodeIsDefined(functions);
+    ensureExpectedParameterNameTypes(functions);
+}
+
+function printList(list: readonly string[]): string {
+    return `"${list.join('","')}"`;
+}
+
+function ensureEitherCallOrCodeIsDefined(holders: readonly InstructionHolder[]) {
+    // Ensure functions do not define both call and code
+    const withBothCallAndCode = holders.filter((holder) => hasCode(holder) && hasCall(holder));
+    if (withBothCallAndCode.length) {
+        throw new Error(`both "code" and "call" are defined in ${printNames(withBothCallAndCode)}`);
+    }
+    // Ensure functions have either code or call
+    const hasEitherCodeOrCall = holders.filter((holder) => !hasCode(holder) && !hasCall(holder));
+    if (hasEitherCodeOrCall.length) {
+        throw new Error(`neither "code" or "call" is defined in ${printNames(hasEitherCodeOrCall)}`);
+    }
+}
+
+function ensureExpectedParameterNameTypes(functions: readonly FunctionData[]) {
+    const unexpectedFunctions = functions.filter((func) => func.parameters && !isArrayOfStrings(func.parameters));
+    if (unexpectedFunctions.length) {
+        throw new Error(`unexpected parameter name type in ${printNames(unexpectedFunctions)}`);
+    }
+    function isArrayOfStrings(value: any): boolean {
+        return Array.isArray(value) && value.every((item) => typeof item === 'string');
+     }
+}
+
+function printNames(holders: readonly InstructionHolder[]) {
+    return printList(holders.map((holder) => holder.name));
+}
+
+function ensureNoDuplicatesInFunctionNames(functions: readonly FunctionData[]) {
+    const duplicateFunctionNames = getDuplicates(functions
+        .map((func) => func.name.toLowerCase()));
+    if (duplicateFunctionNames.length) {
+        throw new Error(`duplicate function name: ${printList(duplicateFunctionNames)}`);
+    }
+}
+function ensureNoUndefinedItem(functions: readonly FunctionData[]) {
+    if (functions.some((func) => !func)) {
+        throw new Error(`some functions are undefined`);
+    }
+}
+function ensureNoDuplicatesInParameterNames(functions: readonly FunctionData[]) {
+    const functionsWithParameters = functions
+        .filter((func) => func.parameters && func.parameters.length > 0);
+    for (const func of functionsWithParameters) {
+        const duplicateParameterNames = getDuplicates(func.parameters);
+        if (duplicateParameterNames.length) {
+            throw new Error(`"${func.name}": duplicate parameter name: ${printList(duplicateParameterNames)}`);
+        }
+    }
+}
+function ensureNoDuplicateCode(functions: readonly FunctionData[]) {
+    const duplicateCodes = getDuplicates(functions
+        .map((func) => func.code)
+        .filter((code) => code),
+    );
+    if (duplicateCodes.length > 0) {
+        throw new Error(`duplicate "code" in functions: ${printList(duplicateCodes)}`);
+    }
+    const duplicateRevertCodes = getDuplicates(functions
+        .filter((func) => func.revertCode)
+        .map((func) => func.revertCode));
+    if (duplicateRevertCodes.length > 0) {
+        throw new Error(`duplicate "revertCode" in functions: ${printList(duplicateRevertCodes)}`);
+    }
+}
+
+function getDuplicates(texts: readonly string[]): string[] {
+    return texts.filter((item, index) => texts.indexOf(item) !== index);
+}

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

@@ -0,0 +1,6 @@
+import { FunctionData } from 'js-yaml-loader!*';
+import { ISharedFunctionCollection } from './ISharedFunctionCollection';
+
+export interface IFunctionCompiler {
+    compileFunctions(functions: readonly FunctionData[]): ISharedFunctionCollection;
+}

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

@@ -0,0 +1,6 @@
+export interface ISharedFunction {
+    readonly name: string;
+    readonly parameters?: readonly string[];
+    readonly code: string;
+    readonly revertCode?: string;
+}

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

@@ -0,0 +1,5 @@
+import { ISharedFunction } from './ISharedFunction';
+
+export interface ISharedFunctionCollection {
+    getFunctionByName(name: string): ISharedFunction;
+}

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

@@ -0,0 +1,14 @@
+import { ISharedFunction } from './ISharedFunction';
+
+export class SharedFunction implements ISharedFunction {
+    constructor(
+        public readonly name: string,
+        public readonly parameters: readonly string[],
+        public readonly code: string,
+        public readonly revertCode: string,
+        ) {
+        if (!name) { throw new Error('undefined function name'); }
+        if (!code) { throw new Error(`undefined function ("${name}") code`); }
+        this.parameters = parameters || [];
+    }
+}

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

@@ -0,0 +1,23 @@
+import { ISharedFunction } from './ISharedFunction';
+import { ISharedFunctionCollection } from './ISharedFunctionCollection';
+
+export class SharedFunctionCollection implements ISharedFunctionCollection {
+    private readonly functionsByName = new Map<string, ISharedFunction>();
+
+    public addFunction(func: ISharedFunction): void {
+        if (!func) { throw new Error('undefined function'); }
+        if (this.functionsByName.has(func.name)) {
+            throw new Error(`function with name ${func.name} already exists`);
+        }
+        this.functionsByName.set(func.name, func);
+    }
+
+    public getFunctionByName(name: string): ISharedFunction {
+        if (!name) { throw Error('undefined function name'); }
+        const func = this.functionsByName.get(name);
+        if (!func) {
+            throw new Error(`called function is not defined "${name}"`);
+        }
+        return func;
+    }
+}

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

@@ -0,0 +1,89 @@
+import { FunctionCallData, FunctionCallParametersData, FunctionData, ScriptFunctionCallData } from 'js-yaml-loader!*';
+import { ICompiledCode } from './ICompiledCode';
+import { ISharedFunctionCollection } from '../Function/ISharedFunctionCollection';
+import { IFunctionCallCompiler } from './IFunctionCallCompiler';
+import { IExpressionsCompiler } from '../Expressions/IExpressionsCompiler';
+import { ExpressionsCompiler } from '../Expressions/ExpressionsCompiler';
+
+export class FunctionCallCompiler implements IFunctionCallCompiler {
+    public static readonly instance: IFunctionCallCompiler = new FunctionCallCompiler();
+    protected constructor(
+        private readonly expressionsCompiler: IExpressionsCompiler = new ExpressionsCompiler()) { }
+    public compileCall(
+        call: ScriptFunctionCallData,
+        functions: ISharedFunctionCollection): ICompiledCode {
+        if (!functions) { throw new Error('undefined functions'); }
+        if (!call) { throw new Error('undefined call'); }
+        const compiledCodes = new Array<ICompiledCode>();
+        const calls = getCallSequence(call);
+        calls.forEach((currentCall, currentCallIndex) => {
+            ensureValidCall(currentCall);
+            const commonFunction = functions.getFunctionByName(currentCall.function);
+            ensureExpectedParameters(commonFunction, currentCall);
+            let functionCode = compileCode(commonFunction, currentCall.parameters, this.expressionsCompiler);
+            if (currentCallIndex !== calls.length - 1) {
+                functionCode = appendLine(functionCode);
+            }
+            compiledCodes.push(functionCode);
+        });
+        const compiledCode = merge(compiledCodes);
+        return compiledCode;
+    }
+}
+
+function ensureExpectedParameters(func: FunctionData, call: FunctionCallData) {
+    const actual = Object.keys(call.parameters || {});
+    const expected = func.parameters || [];
+    if (!actual.length && !expected.length) {
+        return;
+    }
+    const unexpectedParameters = actual.filter((callParam) => !expected.includes(callParam));
+    if (unexpectedParameters.length) {
+        throw new Error(
+            `function "${func.name}" has unexpected parameter(s) provided: "${unexpectedParameters.join('", "')}"`);
+    }
+}
+
+function merge(codes: readonly ICompiledCode[]): ICompiledCode {
+    return {
+        code: codes.map((code) => code.code).join(''),
+        revertCode: codes.map((code) => code.revertCode).join(''),
+    };
+}
+
+function compileCode(
+    func: FunctionData,
+    parameters: FunctionCallParametersData,
+    compiler: IExpressionsCompiler): ICompiledCode {
+    return {
+        code: compiler.compileExpressions(func.code, parameters),
+        revertCode: compiler.compileExpressions(func.revertCode, parameters),
+    };
+}
+
+function getCallSequence(call: ScriptFunctionCallData): FunctionCallData[] {
+    if (typeof call !== 'object') {
+        throw new Error('called function(s) must be an object');
+    }
+    if (call instanceof Array) {
+        return call as FunctionCallData[];
+    }
+    return [ call as FunctionCallData ];
+}
+
+function ensureValidCall(call: FunctionCallData) {
+    if (!call) {
+        throw new Error(`undefined function call`);
+    }
+    if (!call.function) {
+        throw new Error(`empty function name called`);
+    }
+}
+
+function appendLine(code: ICompiledCode): ICompiledCode {
+    const appendLineIfNotEmpty = (str: string) => str ? `${str}\n` : str;
+    return {
+        code: appendLineIfNotEmpty(code.code),
+        revertCode: appendLineIfNotEmpty(code.revertCode),
+    };
+}

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

@@ -0,0 +1,4 @@
+export interface ICompiledCode {
+    readonly code: string;
+    readonly revertCode?: string;
+}

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

@@ -0,0 +1,9 @@
+import { ScriptFunctionCallData } from 'js-yaml-loader!*';
+import { ICompiledCode } from './ICompiledCode';
+import { ISharedFunctionCollection } from '../Function/ISharedFunctionCollection';
+
+export interface IFunctionCallCompiler {
+    compileCall(
+        call: ScriptFunctionCallData,
+        functions: ISharedFunctionCollection): ICompiledCode;
+}

src/application/Parser/Script/Compiler/ILCode.ts

@@ -1,73 +0,0 @@
-export interface IILCode {
-    compile(): string;
-    getUniqueParameterNames(): string[];
-    substituteParameter(parameterName: string, parameterValue: string): IILCode;
-}
-
-export function generateIlCode(rawText: string): IILCode {
-    const ilCode = generateIl(rawText);
-    return new ILCode(ilCode);
-}
-
-class ILCode implements IILCode {
-    private readonly ilCode: string;
-
-    constructor(ilCode: string) {
-        this.ilCode = ilCode;
-    }
-
-    public substituteParameter(parameterName: string, parameterValue: string): IILCode {
-        const newCode = substituteParameter(this.ilCode, parameterName, parameterValue);
-        return new ILCode(newCode);
-    }
-
-    public getUniqueParameterNames(): string[] {
-        return getUniqueParameterNames(this.ilCode);
-    }
-
-    public compile(): string {
-        ensureNoExpressionLeft(this.ilCode);
-        return this.ilCode;
-    }
-}
-
-// Trim each expression and put them inside "{{exp|}}" e.g. "{{ $hello }}" becomes "{{exp|$hello}}"
-function generateIl(rawText: string): string {
-    return rawText.replace(/\{\{([\s]*[^;\s\{]+[\s]*)\}\}/g, (_, match) => {
-        return `\{\{exp|${match.trim()}\}\}`;
-    });
-}
-
-// finds all "{{exp|..}} left"
-function ensureNoExpressionLeft(ilCode: string) {
-    const allSubstitutions = ilCode.matchAll(/\{\{exp\|(.*?)\}\}/g);
-    const allMatches = Array.from(allSubstitutions, (match) => match[1]);
-    const uniqueExpressions = getDistinctValues(allMatches);
-    if (uniqueExpressions.length > 0) {
-        throw new Error(`unknown expression: ${printList(uniqueExpressions)}`);
-    }
-}
-
-// Parses all distinct usages of {{exp|$parameterName}}
-function getUniqueParameterNames(ilCode: string) {
-    const allSubstitutions = ilCode.matchAll(/\{\{exp\|\$([^;\s\{]+[\s]*)\}\}/g);
-    const allParameters = Array.from(allSubstitutions, (match) => match[1]);
-    const uniqueParameterNames = getDistinctValues(allParameters);
-    return uniqueParameterNames;
-}
-
-// substitutes {{exp|$parameterName}} to value of the parameter
-function substituteParameter(ilCode: string, parameterName: string, parameterValue: string) {
-    const pattern = `{{exp|$${parameterName}}}`;
-    return ilCode.split(pattern).join(parameterValue); // as .replaceAll() is not yet supported by TS
-}
-
-function getDistinctValues(values: readonly string[]): string[] {
-    return values.filter((value, index, self) => {
-        return self.indexOf(value) === index;
-      });
-}
-
-function printList(list: readonly string[]): string {
-    return `"${list.join('","')}"`;
-}

src/application/Parser/Script/Compiler/ScriptCompiler.ts

@@ -1,171 +1,42 @@
-import { generateIlCode, IILCode } from './ILCode';
 import { IScriptCode } from '@/domain/IScriptCode';
 import { ScriptCode } from '@/domain/ScriptCode';
-import { ScriptData, FunctionData, FunctionCallData, ScriptFunctionCallData, FunctionCallParametersData } from 'js-yaml-loader!@/*';
+import { FunctionData, ScriptData } from 'js-yaml-loader!@/*';
 import { IScriptCompiler } from './IScriptCompiler';
 import { ILanguageSyntax } from '@/domain/ScriptCode';
-
-interface ICompiledCode {
-    readonly code: string;
-    readonly revertCode: string;
-}
+import { ISharedFunctionCollection } from './Function/ISharedFunctionCollection';
+import { IFunctionCallCompiler } from './FunctionCall/IFunctionCallCompiler';
+import { FunctionCallCompiler } from './FunctionCall/FunctionCallCompiler';
+import { IFunctionCompiler } from './Function/IFunctionCompiler';
+import { FunctionCompiler } from './Function/FunctionCompiler';
 
 export class ScriptCompiler implements IScriptCompiler {
+    private readonly functions: ISharedFunctionCollection;
     constructor(
-        private readonly functions: readonly FunctionData[] | undefined,
-        private syntax: ILanguageSyntax) {
-        ensureValidFunctions(functions);
+        functions: readonly FunctionData[] | undefined,
+        private readonly syntax: ILanguageSyntax,
+        functionCompiler: IFunctionCompiler = FunctionCompiler.instance,
+        private readonly callCompiler: IFunctionCallCompiler = FunctionCallCompiler.instance,
+        ) {
         if (!syntax) { throw new Error('undefined syntax'); }
+        this.functions = functionCompiler.compileFunctions(functions);
     }
     public canCompile(script: ScriptData): boolean {
+        if (!script) { throw new Error('undefined script'); }
         if (!script.call) {
             return false;
         }
         return true;
     }
     public compile(script: ScriptData): IScriptCode {
-        this.ensureCompilable(script.call);
-        const compiledCodes = new Array<ICompiledCode>();
-        const calls = getCallSequence(script.call);
-        calls.forEach((currentCall, currentCallIndex) => {
-            ensureValidCall(currentCall, script.name);
-            const commonFunction = this.getFunctionByName(currentCall.function);
-            let functionCode = compileCode(commonFunction, currentCall.parameters);
-            if (currentCallIndex !== calls.length - 1) {
-                functionCode = appendLine(functionCode);
-            }
-            compiledCodes.push(functionCode);
-        });
-        const scriptCode = merge(compiledCodes);
-        return new ScriptCode(scriptCode.code, scriptCode.revertCode, script.name, this.syntax);
-    }
-
-    private getFunctionByName(name: string): FunctionData {
-        const func = this.functions.find((f) => f.name === name);
-        if (!func) {
-            throw new Error(`called function is not defined "${name}"`);
-        }
-        return func;
-    }
-    private ensureCompilable(call: ScriptFunctionCallData) {
-        if (!this.functions || this.functions.length === 0) {
-            throw new Error('cannot compile without shared functions');
-        }
-        if (typeof call !== 'object') {
-            throw new Error('called function(s) must be an object');
+        if (!script) { throw new Error('undefined script'); }
+        try {
+            const compiledCode = this.callCompiler.compileCall(script.call, this.functions);
+            return new ScriptCode(
+                compiledCode.code,
+                compiledCode.revertCode,
+                this.syntax);
+        } catch (error) {
+            throw Error(`Script "${script.name}" ${error.message}`);
         }
     }
 }
-
-function getDuplicates(texts: readonly string[]): string[] {
-    return texts.filter((item, index) => texts.indexOf(item) !== index);
-}
-
-function printList(list: readonly string[]): string {
-    return `"${list.join('","')}"`;
-}
-
-function ensureNoDuplicatesInFunctionNames(functions: readonly FunctionData[]) {
-    const duplicateFunctionNames = getDuplicates(functions
-        .map((func) => func.name.toLowerCase()));
-    if (duplicateFunctionNames.length) {
-        throw new Error(`duplicate function name: ${printList(duplicateFunctionNames)}`);
-    }
-}
-function ensureNoUndefinedItem(functions: readonly FunctionData[]) {
-    if (functions.some((func) => !func)) {
-        throw new Error(`some functions are undefined`);
-    }
-}
-function ensureNoDuplicatesInParameterNames(functions: readonly FunctionData[]) {
-    const functionsWithParameters = functions
-        .filter((func) => func.parameters && func.parameters.length > 0);
-    for (const func of functionsWithParameters) {
-        const duplicateParameterNames = getDuplicates(func.parameters);
-        if (duplicateParameterNames.length) {
-            throw new Error(`"${func.name}": duplicate parameter name: ${printList(duplicateParameterNames)}`);
-        }
-    }
-}
-
-function ensureNoDuplicateCode(functions: readonly FunctionData[]) {
-    const duplicateCodes = getDuplicates(functions.map((func) => func.code));
-    if (duplicateCodes.length > 0) {
-        throw new Error(`duplicate "code" in functions: ${printList(duplicateCodes)}`);
-    }
-    const duplicateRevertCodes = getDuplicates(functions
-        .filter((func) => func.revertCode)
-        .map((func) => func.revertCode));
-    if (duplicateRevertCodes.length > 0) {
-        throw new Error(`duplicate "revertCode" in functions: ${printList(duplicateRevertCodes)}`);
-    }
-}
-
-function ensureValidFunctions(functions: readonly FunctionData[]) {
-    if (!functions || functions.length === 0) {
-        return;
-    }
-    ensureNoUndefinedItem(functions);
-    ensureNoDuplicatesInFunctionNames(functions);
-    ensureNoDuplicatesInParameterNames(functions);
-    ensureNoDuplicateCode(functions);
-}
-
-function appendLine(code: ICompiledCode): ICompiledCode {
-    const appendLineIfNotEmpty = (str: string) => str ? `${str}\n` : str;
-    return {
-        code: appendLineIfNotEmpty(code.code),
-        revertCode: appendLineIfNotEmpty(code.revertCode),
-    };
-}
-
-function merge(codes: readonly ICompiledCode[]): ICompiledCode {
-    return {
-        code: codes.map((code) => code.code).join(''),
-        revertCode: codes.map((code) => code.revertCode).join(''),
-    };
-}
-
-function compileCode(func: FunctionData, parameters: FunctionCallParametersData): ICompiledCode {
-    return {
-        code: compileExpressions(func.code, parameters),
-        revertCode: compileExpressions(func.revertCode, parameters),
-    };
-}
-
-function compileExpressions(code: string, parameters: FunctionCallParametersData): string {
-    let intermediateCode = generateIlCode(code);
-    intermediateCode = substituteParameters(intermediateCode, parameters);
-    return intermediateCode.compile();
-}
-
-function substituteParameters(intermediateCode: IILCode, parameters: FunctionCallParametersData): IILCode {
-    const parameterNames = intermediateCode.getUniqueParameterNames();
-    if (parameterNames.length && !parameters) {
-        throw new Error(`no parameters defined, expected: ${printList(parameterNames)}`);
-    }
-    for (const parameterName of parameterNames) {
-        const parameterValue = parameters[parameterName];
-        if (!parameterValue) {
-            throw Error(`parameter value is not provided for "${parameterName}" in function call`);
-        }
-        intermediateCode = intermediateCode.substituteParameter(parameterName, parameterValue);
-    }
-    return intermediateCode;
-}
-
-function ensureValidCall(call: FunctionCallData, scriptName: string) {
-    if (!call) {
-        throw new Error(`undefined function call in script "${scriptName}"`);
-    }
-    if (!call.function) {
-        throw new Error(`empty function name called in script "${scriptName}"`);
-    }
-}
-
-function getCallSequence(call: ScriptFunctionCallData): FunctionCallData[] {
-    if (call instanceof Array) {
-        return call as FunctionCallData[];
-    }
-    return [ call as FunctionCallData ];
-}

src/application/Parser/Script/ScriptParser.ts

@@ -31,7 +31,7 @@ function parseCode(script: ScriptData, context: ICategoryCollectionParseContext)
     if (context.compiler.canCompile(script)) {
         return context.compiler.compile(script);
     }
-    return new ScriptCode(script.code, script.revertCode, script.name, context.syntax);
+    return new ScriptCode(script.code, script.revertCode, context.syntax);
 }
 
 function ensureNotBothCallAndCode(script: ScriptData) {

src/application/Parser/ScriptingDefinition/CodeSubstituter.ts

@@ -0,0 +1,33 @@
+import { IExpressionsCompiler, ParameterValueDictionary } from '@/application/Parser/Script/Compiler/Expressions/IExpressionsCompiler';
+import { ParameterSubstitutionParser } from '@/application/Parser/Script/Compiler/Expressions/SyntaxParsers/ParameterSubstitutionParser';
+import { CompositeExpressionParser } from '@/application/Parser/Script/Compiler/Expressions/Parser/CompositeExpressionParser';
+import { ExpressionsCompiler } from '@/application/Parser/Script/Compiler/Expressions/ExpressionsCompiler';
+import { IProjectInformation } from '@/domain/IProjectInformation';
+import { ICodeSubstituter } from './ICodeSubstituter';
+
+export class CodeSubstituter implements ICodeSubstituter {
+    constructor(
+        private readonly compiler: IExpressionsCompiler = createSubstituteCompiler(),
+        private readonly date = new Date(),
+    ) {
+
+    }
+    public substitute(code: string, info: IProjectInformation): string {
+        if (!code) { throw new Error('undefined code'); }
+        if (!info) { throw new Error('undefined info'); }
+        const parameters: ParameterValueDictionary = {
+            homepage: info.homepage,
+            version: info.version,
+            date: this.date.toUTCString(),
+        };
+        const compiledCode = this.compiler.compileExpressions(code, parameters);
+        return compiledCode;
+    }
+}
+
+function createSubstituteCompiler(): IExpressionsCompiler {
+    const parsers = [ new ParameterSubstitutionParser() ];
+    const parser = new CompositeExpressionParser(parsers);
+    const expressionCompiler = new ExpressionsCompiler(parser);
+    return expressionCompiler;
+}

src/application/Parser/ScriptingDefinition/ICodeSubstituter.ts

@@ -0,0 +1,5 @@
+import { IProjectInformation } from '@/domain/IProjectInformation';
+
+export interface ICodeSubstituter {
+    substitute(code: string, info: IProjectInformation): string;
+}

src/application/Parser/ScriptingDefinition/ScriptingDefinitionParser.ts

@@ -0,0 +1,31 @@
+import { IScriptingDefinition } from '@/domain/IScriptingDefinition';
+import { ScriptingDefinitionData } from 'js-yaml-loader!@/*';
+import { ScriptingDefinition } from '@/domain/ScriptingDefinition';
+import { ScriptingLanguage } from '@/domain/ScriptingLanguage';
+import { IProjectInformation } from '@/domain/IProjectInformation';
+import { createEnumParser } from '../../Common/Enum';
+import { ICodeSubstituter } from './ICodeSubstituter';
+import { CodeSubstituter } from './CodeSubstituter';
+
+export class ScriptingDefinitionParser {
+    constructor(
+        private readonly languageParser = createEnumParser(ScriptingLanguage),
+        private readonly codeSubstituter: ICodeSubstituter = new CodeSubstituter(),
+    ) {
+    }
+    public parse(
+        definition: ScriptingDefinitionData,
+        info: IProjectInformation): IScriptingDefinition {
+        if (!info) { throw new Error('undefined info'); }
+        if (!definition) { throw new Error('undefined definition'); }
+        const language = this.languageParser.parseEnum(definition.language, 'language');
+        const startCode = this.codeSubstituter.substitute(definition.startCode, info);
+        const endCode = this.codeSubstituter.substitute(definition.endCode, info);
+        return new ScriptingDefinition(
+            language,
+            startCode,
+            endCode,
+        );
+    }
+}
+

src/application/Parser/ScriptingDefinitionParser.ts

@@ -1,36 +0,0 @@
-import { IScriptingDefinition } from '@/domain/IScriptingDefinition';
-import { ScriptingDefinitionData } from 'js-yaml-loader!@/*';
-import { ScriptingDefinition } from '@/domain/ScriptingDefinition';
-import { ScriptingLanguage } from '@/domain/ScriptingLanguage';
-import { IProjectInformation } from '@/domain/IProjectInformation';
-import { createEnumParser } from '../Common/Enum';
-import { generateIlCode } from './Script/Compiler/ILCode';
-
-export function parseScriptingDefinition(
-    definition: ScriptingDefinitionData,
-    info: IProjectInformation,
-    date = new Date(),
-    languageParser = createEnumParser(ScriptingLanguage)): IScriptingDefinition {
-    if (!info) {
-        throw new Error('undefined info');
-    }
-    if (!definition) {
-        throw new Error('undefined definition');
-    }
-    const language = languageParser.parseEnum(definition.language, 'language');
-    const startCode = applySubstitutions(definition.startCode, info, date);
-    const endCode = applySubstitutions(definition.endCode, info, date);
-    return new ScriptingDefinition(
-        language,
-        startCode,
-        endCode,
-    );
-}
-
-function applySubstitutions(code: string, info: IProjectInformation, date: Date): string {
-    let ilCode = generateIlCode(code);
-    ilCode = ilCode.substituteParameter('homepage', info.homepage);
-    ilCode = ilCode.substituteParameter('version', info.version);
-    ilCode = ilCode.substituteParameter('date', date.toUTCString());
-    return ilCode.compile();
-}

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

@@ -18,30 +18,33 @@ declare module 'js-yaml-loader!*' {
         readonly docs?: DocumentationUrlsData;
     }
 
-    export interface FunctionData {
-        name: string;
-        code: string;
-        revertCode?: string;
-        parameters?: readonly string[];
+    export interface InstructionHolder {
+        readonly name: string;
+
+        readonly code?: string;
+        readonly revertCode?: string;
+
+        readonly call?: ScriptFunctionCallData;
+    }
+
+    export interface FunctionData extends InstructionHolder {
+        readonly parameters?: readonly string[];
     }
 
     export interface FunctionCallParametersData {
-        [index: string]: string;
+        readonly [index: string]: string;
     }
 
     export interface FunctionCallData {
-        function: string;
-        parameters?: FunctionCallParametersData;
+        readonly function: string;
+        readonly parameters?: FunctionCallParametersData;
     }
 
     export type ScriptFunctionCallData = readonly FunctionCallData[] | FunctionCallData | undefined;
 
-    export interface ScriptData extends DocumentableData {
-        name: string;
-        code?: string;
-        revertCode?: string;
-        call: ScriptFunctionCallData;
-        recommend?: string;
+    export interface ScriptData extends InstructionHolder, DocumentableData {
+        readonly name: string;
+        readonly recommend?: string;
     }
 
     export interface ScriptingDefinitionData {

src/application/collections/macos.yaml

@@ -40,17 +40,352 @@ actions:
                     sudo rm -rfv /var/spool/cups/tmp/*
                     sudo rm -rfv /var/spool/cups/cache/job.cache*
             -
-                name: Clear the list of iOS devices connected
+                name: Empty trash on all volumes
                 recommend: strict
                 code: |-
-                    sudo defaults delete /Users/$USER/Library/Preferences/com.apple.iPod.plist "conn:128:Last Connect"
-                    sudo defaults delete /Users/$USER/Library/Preferences/com.apple.iPod.plist Devices
-                    sudo defaults delete /Library/Preferences/com.apple.iPod.plist "conn:128:Last Connect"
-                    sudo defaults delete /Library/Preferences/com.apple.iPod.plist Devices
-                    sudo rm -rfv /var/db/lockdown/*
+                    # on all mounted volumes
+                    sudo rm -rfv /Volumes/*/.Trashes/* &>/dev/null
+                    # on main HDD
+                    sudo rm -rfv ~/.Trash/* &>/dev/null
             -
-                name: Reset privacy database (remove all permissions)
-                code: sudo tccutil reset All 
+                name: Clear system cache files
+                recommend: strict
+                code: |-
+                    sudo rm -rfv /Library/Caches/* &>/dev/null
+                    sudo rm -rfv /System/Library/Caches/* &>/dev/null
+                    sudo rm -rfv ~/Library/Caches/* &>/dev/null
+            -
+                name: Clear system log files
+                recommend: strict
+                code: |-
+                    sudo rm -rfv /private/var/log/asl/*.asl &>/dev/null
+                    sudo rm -rfv /Library/Logs/DiagnosticReports/* &>/dev/null
+                    sudo rm -rfv /Library/Logs/Adobe/* &>/dev/null
+                    rm -rfv ~/Library/Containers/com.apple.mail/Data/Library/Logs/Mail/* &>/dev/null
+                    rm -rfv ~/Library/Logs/CoreSimulator/* &>/dev/null
+                    sudo rm -rfv /var/log/*
+            -
+                category: Clear browser history
+                children:
+                    -
+                        category: Clear Google Chrome history
+                        children:
+                            -
+                                name: Clear Google Chrome browsing history
+                                code: |-
+                                    rm -rfv ~/Library/Application\ Support/Google/Chrome/Default/History &>/dev/null
+                                    rm -rfv ~/Library/Application\ Support/Google/Chrome/Default/History-journal &>/dev/null
+                            -
+                                name: Google Chrome Cache Files
+                                code: sudo rm -rfv ~/Library/Application\ Support/Google/Chrome/Default/Application\ Cache/* &>/dev/null
+                    -
+                        category: Clear Safari history
+                        children:
+                            -
+                                name: Clear Safari browsing history
+                                docs:
+                                    - https://discussions.apple.com/thread/7586106?answerId=30314600022#30314600022
+                                    - https://davidkoepi.wordpress.com/2013/04/20/safariforensic/
+                                code: |-
+                                    rm -f ~/Library/Safari/History.db
+                                    rm -f ~/Library/Safari/History.db-lock
+                                    rm -f ~/Library/Safari/History.db-shm
+                                    rm -f ~/Library/Safari/History.db-wal
+                                    # For older versions of Safari
+                                    rm -f ~/Library/Safari/History.plist # URL, visit count, webpage title, last visited timestamp, redirected URL, autocomplete
+                                    rm -f ~/Library/Safari/HistoryIndex.sk # History index
+                            -
+                                name: Clear Safari downloads history
+                                docs: https://blog.d204n6.com/2020/09/macos-safari-preferences-and-privacy.html
+                                code: rm -f ~/Library/Safari/Downloads.plist
+                            -
+                                name: Clear Safari top sites
+                                docs: https://davidkoepi.wordpress.com/2013/04/20/safariforensic/
+                                code: rm -f ~/Library/Safari/TopSites.plist
+                            -
+                                name: Clear Safari last session (open tabs) history
+                                docs:
+                                    - https://apple.stackexchange.com/a/374116
+                                    - https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2013-7127
+                                code: rm -f ~/Library/Safari/LastSession.plist
+                            -
+                                category: Clear Safari caches
+                                children:
+                                    -
+                                        name: Clear Safari cached blobs, URLs and timestamps
+                                        docs: https://davidkoepi.wordpress.com/2013/04/20/safariforensic/
+                                        code: rm -f ~/Library/Caches/com.apple.Safari/Cache.db
+                                    -
+                                        name: Clear Safari web page icons displayed on URL bar
+                                        docs:
+                                          - https://davidkoepi.wordpress.com/2013/04/20/safariforensic/
+                                          - https://lifehacker.com/safaris-private-browsing-mode-saves-urls-in-an-easily-a-1691944343
+                                        code: rm -f ~/Library/Safari/WebpageIcons.db
+                                    -
+                                        name: Clear Safari webpage previews (thumbnails)
+                                        docs:
+                                          - https://davidkoepi.wordpress.com/2013/04/20/safariforensic/
+                                          - https://www.reddit.com/r/apple/comments/18lp92/your_apple_computer_keeps_a_screen_shot_of_nearly/
+                                        code: rm -rfv ~/Library/Caches/com.apple.Safari/Webpage\ Previews
+                            -
+                                name: Clear copy of the Safari history
+                                docs: https://forensicsfromthesausagefactory.blogspot.com/2010/06/safari-history-spotlight-webhistory.html
+                                code: rm -rfv ~/Library/Caches/Metadata/Safari/History
+                            -
+                                name: Clear search history embedded in Safari preferences
+                                docs: https://krypted.com/tag/recentsearchstrings/
+                                code: defaults write ~/Library/Preferences/com.apple.Safari RecentSearchStrings '( )'
+                            -
+                                name: Clear Safari cookies
+                                docs:
+                                  - https://www.toolbox.com/tech/operating-systems/blogs/understanding-the-safari-cookiesbinarycookies-file-format-010712/
+                                  - https://link.springer.com/content/pdf/10.1007/0-387-36891-4_13.pdf
+                                code: |-
+                                    rm -f ~/Library/Cookies/Cookies.binarycookies
+                                    # Used before Safari 5.1
+                                    rm -f ~/Library/Cookies/Cookies.plist
+                            -
+                                name: Clear Safari zoom level preferences per site
+                                docs: https://blog.d204n6.com/2020/09/macos-safari-preferences-and-privacy.html
+                                code: rm -f ~/Library/Safari/PerSiteZoomPreferences.plist
+                            -
+                                name: Clear URLs that are allowed to display notifications in Safari
+                                docs: https://blog.d204n6.com/2020/09/macos-safari-preferences-and-privacy.html
+                                code: rm -f ~/Library/Safari/UserNotificationPreferences.plist
+                            -
+                                name: Clear Safari per-site preferences for Downloads, Geolocation, PopUps, and Autoplays
+                                docs: https://blog.d204n6.com/2020/09/macos-safari-preferences-and-privacy.html
+                                code: rm -f ~/Library/Safari/PerSitePreferences.db
+                    -
+                        category: Clear Firefox history
+                        children:
+                            -
+                                name: Clear Firefox cache
+                                code: |-
+                                    sudo rm -rf ~/Library/Caches/Mozilla/
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/netpredictions.sqlite
+                            -
+                                name: Delete Firefox form history
+                                code: |-
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/formhistory.sqlite
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/formhistory.dat
+                            -
+                                name: Delete Firefox site preferences
+                                code: rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/content-prefs.sqlite
+                            -
+                                name: Delete Firefox session restore data (loads after the browser closes or crashes)
+                                code: |-
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/sessionCheckpoints.json
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/sessionstore*.js*
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/sessionstore.bak*
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/sessionstore-backups/previous.js*
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/sessionstore-backups/recovery.js*
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/sessionstore-backups/recovery.bak*
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/sessionstore-backups/previous.bak*
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/sessionstore-backups/upgrade.js*-20*
+                            -
+                                name: Delete Firefox passwords
+                                docs: 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
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/signons3.txt
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/signons.sqlite
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/logins.json
+                            -
+                                name: Delete Firefox HTML5 cookies
+                                code: rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/webappsstore.sqlite
+                            -
+                                name: Delete Firefox crash reports
+                                code: |-
+                                    rm -rfv ~/Library/Application\ Support/Firefox/Crash\ Reports/
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/minidumps/*.dmp
+                            -
+                                name: Delete Firefox backup files
+                                code: |-
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/bookmarkbackups/*.json
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/bookmarkbackups/*.jsonlz4
+                            -
+                                name: Delete Firefox cookies
+                                code: |-
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/cookies.txt
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/cookies.sqlite
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/cookies.sqlite-shm
+                                    rm -fv ~/Library/Application\ Support/Firefox/Profiles/*/cookies.sqlite-wal
+                                    rm -rfv ~/Library/Application\ Support/Firefox/Profiles/*/storage/default/http*
+            -
+                category: Clear third party application data
+                children:
+                    -
+                        name: Clear Adobe cache
+                        recommend: standard
+                        code: sudo rm -rfv ~/Library/Application\ Support/Adobe/Common/Media\ Cache\ Files/* &>/dev/null
+                    -
+                        name: Clear Gradle cache
+                        recommend: strict
+                        code: |-
+                            if [ -d "/Users/${HOST}/.gradle/caches" ]; then
+                                rm -rfv ~/.gradle/caches/ &> /dev/null
+                            fi
+                    -
+                        name: Clear Dropbox cache
+                        recommend: standard
+                        code: |-
+                            if [ -d "/Users/${HOST}/Dropbox" ]; then
+                                sudo rm -rfv ~/Dropbox/.dropbox.cache/* &>/dev/null
+                            fi
+                    -
+                        name: Clear Google Drive file stream cache
+                        recommend: standard
+                        code: |-
+                            killall "Google Drive File Stream"
+                            rm -rfv ~/Library/Application\ Support/Google/DriveFS/[0-9a-zA-Z]*/content_cache &>/dev/null
+                    -
+                        name: Clear Composer cache
+                        recommend: strict
+                        code: |-
+                            if type "composer" &> /dev/null; then
+                                composer clearcache &> /dev/null
+                            fi
+                    -
+                        name: Clear Homebrew cache
+                        recommend: strict
+                        code: |-
+                            if type "brew" &>/dev/null; then
+                                brew cleanup -s &>/dev/null
+                                rm -rfv $(brew --cache) &>/dev/null
+                                brew tap --repair &>/dev/null
+                            fi
+                    -
+                        name: Clear any old versions of Ruby gems
+                        recommend: strict
+                        code: |-
+                            if type "gem" &> /dev/null; then
+                                gem cleanup &>/dev/null
+                            fi
+                    -
+                        name: Clear Docker
+                        recommend: strict
+                        code: |-
+                            if type "docker" &> /dev/null; then
+                                docker system prune -af
+                            fi
+                    -
+                        name: Clear Pyenv-VirtualEnv cache
+                        recommend: strict
+                        code: |-
+                            if [ "$PYENV_VIRTUALENV_CACHE_PATH" ]; then
+                                rm -rfv $PYENV_VIRTUALENV_CACHE_PATH &>/dev/null
+                            fi
+                    -
+                        name: Clear NPM cache
+                        recommend: strict
+                        code: |-
+                            if type "npm" &> /dev/null; then
+                                npm cache clean --force
+                            fi
+                    -
+                        name: Clear Yarn cache
+                        recommend: strict
+                        code: |-
+                            if type "yarn" &> /dev/null; then
+                                echo 'Cleanup Yarn Cache...'
+                                yarn cache clean --force
+                            fi
+            -
+                category: iOS Cleanup
+                children:
+                    -
+                        name: Clear iOS applications
+                        recommend: strict
+                        code: rm -rfv ~/Music/iTunes/iTunes\ Media/Mobile\ Applications/* &>/dev/null
+                    -
+                        name: Clear iOS photo caches
+                        recommend: standard
+                        code: rm -rf ~/Pictures/iPhoto\ Library/iPod\ Photo\ Cache/*
+                    -
+                        name: Remove iOS Device Backups
+                        recommend: strict
+                        code: rm -rfv ~/Library/Application\ Support/MobileSync/Backup/* &>/dev/null
+                    -
+                        name: Clear iOS Simulators
+                        recommend: strict
+                        code: |-
+                            if type "xcrun" &>/dev/null; then
+                                osascript -e 'tell application "com.apple.CoreSimulator.CoreSimulatorService" to quit'
+                                osascript -e 'tell application "iOS Simulator" to quit'
+                                osascript -e 'tell application "Simulator" to quit'
+                                xcrun simctl shutdown all
+                                xcrun simctl erase all
+                            fi
+                    -
+                        name: Clear the list of iOS devices connected
+                        recommend: strict
+                        code: |-
+                            sudo defaults delete /Users/$USER/Library/Preferences/com.apple.iPod.plist "conn:128:Last Connect"
+                            sudo defaults delete /Users/$USER/Library/Preferences/com.apple.iPod.plist Devices
+                            sudo defaults delete /Library/Preferences/com.apple.iPod.plist "conn:128:Last Connect"
+                            sudo defaults delete /Library/Preferences/com.apple.iPod.plist Devices
+                            sudo rm -rfv /var/db/lockdown/*
+            -
+                name: Clear XCode Derived Data and Archives
+                recommend: strict
+                code: |-
+                    rm -rfv ~/Library/Developer/Xcode/DerivedData/* &>/dev/null
+                    rm -rfv ~/Library/Developer/Xcode/Archives/* &>/dev/null
+                    rm -rfv ~/Library/Developer/Xcode/iOS Device Logs/* &>/dev/null
+            -
+                name: Clear DNS cache
+                recommend: standard
+                code: |-
+                    sudo dscacheutil -flushcache
+                    sudo killall -HUP mDNSResponder
+            -
+                name: Purge inactive memory
+                recommend: standard
+                code: sudo purge
+            -
+                category: Reset privacy permissions for all applications
+                children:
+                    -
+                        name: Reset camera permissions
+                        code: tccutil reset Camera
+                    -
+                        name: Reset microphone permissions
+                        code: tccutil reset Microphone
+                    -
+                        name: Reset accessibility permissions
+                        code: tccutil reset Accessibility
+                    -
+                        name: Reset screen capture permissions
+                        code: tccutil reset ScreenCapture
+                    -
+                        name: Reset reminders permissions
+                        code: tccutil reset Reminders
+                    -
+                        name: Reset photos permissions
+                        code: tccutil reset Photos
+                    -
+                        name: Reset calendar permissions
+                        code: tccutil reset Calendar
+                    -
+                        name: Reset full disk access permissions
+                        code: tccutil reset SystemPolicyAllFiles
+                    -
+                        name: Reset contacts permissions
+                        code: tccutil reset SystemPolicyAllFiles
+                    -
+                        name: Reset desktop folder permissions
+                        code: tccutil reset SystemPolicyDesktopFolder
+                    -
+                        name: Reset documents folder permissions
+                        code: tccutil reset SystemPolicyDocumentsFolder
+                    -
+                        name: Reset downloads permissions
+                        code: tccutil reset SystemPolicyDownloadsFolder
+                    -
+                        name: Reset all app permissions
+                        code: tccutil reset All 
     -
         category: Configure programs
         children:

src/application/collections/windows.yaml

@@ -476,26 +476,62 @@ actions:
                             schtasks /change /TN "\Microsoft\Windows\Customer Experience Improvement Program\KernelCeipTask" /ENABLE
                             schtasks /change /TN "\Microsoft\Windows\Customer Experience Improvement Program\UsbCeip" /ENABLE
                     -
-                        name: Disable Webcam Telemetry (devicecensus.exe)
-                        recommend: standard
-                        docs: https://www.ghacks.net/2019/09/23/what-is-devicecensus-exe-on-windows-10-and-why-does-it-need-internet-connectivity/
-                        code: schtasks /change /TN "Microsoft\Windows\Device Information\Device" /DISABLE
-                        revertCode: schtasks /change /TN "Microsoft\Windows\Device Information\Device" /ENABLE
+                        category: Disable Webcam Telemetry (devicecensus.exe)
+                        docs:
+                            - https://www.ghacks.net/2019/09/23/what-is-devicecensus-exe-on-windows-10-and-why-does-it-need-internet-connectivity/
+                            - https://answers.microsoft.com/en-us/windows/forum/windows_10-security/devicecensusexe-and-host-process-for-windows-task/520d42a2-45c1-402a-81de-e1116ecf2538
+                        children:
+                            -
+                                name: Disable devicecensus.exe (telemetry) task
+                                recommend: standard
+                                code: schtasks /change /TN "Microsoft\Windows\Device Information\Device" /disable
+                                revertCode: schtasks /change /TN "Microsoft\Windows\Device Information\Device" /enable
+                            -
+                                name: Disable devicecensus.exe (telemetry) process
+                                recommend: standard
+                                call:
+                                    function: KillProcessWhenItStarts
+                                    parameters:
+                                        processName: DeviceCensus.exe
                     -
-                        name: Disable Application Experience (Compatibility Telemetry)
-                        recommend: standard
-                        code: |-
-                            schtasks /change /TN "Microsoft\Windows\Application Experience\Microsoft Compatibility Appraiser" /DISABLE
-                            schtasks /change /TN "Microsoft\Windows\Application Experience\ProgramDataUpdater" /DISABLE
-                            schtasks /change /TN "Microsoft\Windows\Application Experience\StartupAppTask" /DISABLE
-                            schtasks /change /TN "Microsoft\Windows\Application Experience\AitAgent" /DISABLE
-                            reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\CompatTelRunner.exe" /v "Debugger" /t REG_SZ /d "%windir%\System32\taskkill.exe" /f
-                        revertCode: |-
-                            schtasks /change /TN "Microsoft\Windows\Application Experience\Microsoft Compatibility Appraiser" /ENABLE
-                            schtasks /change /TN "Microsoft\Windows\Application Experience\ProgramDataUpdater" /ENABLE
-                            schtasks /change /TN "Microsoft\Windows\Application Experience\StartupAppTask" /ENABLE
-                            schtasks /change /TN "Microsoft\Windows\Application Experience\AitAgent" /ENABLE
-                            reg delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\CompatTelRunner.exe" /v "Debugger" /f
+                        category: Disable Compatibility Telemetry (Application Experience)
+                        children:
+                            -
+                                category: Disable Microsoft Compatibility Appraiser
+                                docs: https://www.ghacks.net/2016/10/26/turn-off-the-windows-customer-experience-program/
+                                children:
+                                    -
+                                        name: Disable Microsoft Compatibility Appraiser task
+                                        recommend: standard
+                                        code: schtasks /change /TN "Microsoft\Windows\Application Experience\Microsoft Compatibility Appraiser" /disable
+                                        revertCode: schtasks /change /TN "Microsoft\Windows\Application Experience\Microsoft Compatibility Appraiser" /enable
+                                    -
+                                        name: Disable CompatTelRunner.exe (Microsoft Compatibility Appraiser) process
+                                        recommend: standard
+                                        call:
+                                            function: KillProcessWhenItStarts
+                                            parameters:
+                                                processName: CompatTelRunner.exe
+                            -
+                                name: Disable sending information to Customer Experience Improvement Program
+                                recommend: standard
+                                docs:
+                                    - https://www.ghacks.net/2016/10/26/turn-off-the-windows-customer-experience-program/
+                                    - https://answers.microsoft.com/en-us/windows/forum/windows_10-performance/permanently-disabling-windows-compatibility/6bf71583-81b0-4a74-ae2e-8fd73305aad1
+                                code: schtasks /change /TN "Microsoft\Windows\Application Experience\ProgramDataUpdater" /disable
+                                revertCode: schtasks /change /TN "Microsoft\Windows\Application Experience\ProgramDataUpdater" /enable
+                            -
+                                name: Disable Application Impact Telemetry Agent task
+                                recommend: standard
+                                docs: https://www.shouldiblockit.com/aitagent.exe-6181.aspx
+                                code: schtasks /change /TN "Microsoft\Windows\Application Experience\AitAgent" /disable
+                                revertCode: schtasks /change /TN "Microsoft\Windows\Application Experience\AitAgent" /enable
+                            -
+                                name: Disable "Disable apps to improve performance" reminder
+                                recommend: strict
+                                docs: https://www.ghacks.net/2016/10/26/turn-off-the-windows-customer-experience-program/
+                                code: schtasks /change /TN "Microsoft\Windows\Application Experience\StartupAppTask" /disable
+                                revertCode: schtasks /change /TN "Microsoft\Windows\Application Experience\StartupAppTask" /enable
                     -
                         name: Disable telemetry in data collection policy
                         recommend: standard
@@ -1001,6 +1037,34 @@ actions:
                         recommend: standard
                         code: reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\CapabilityAccessManager\ConsentStore\bluetoothSync" /v "Value" /d "Deny" /t REG_SZ /f
                         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
+                                recommend: standard
+                                docs: https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.AppPrivacy::LetAppsActivateWithVoice
+                                code: |-
+                                    reg add "HKCU\Software\Microsoft\Speech_OneCore\Settings\VoiceActivation\UserPreferenceForAllApps" /v "AgentActivationEnabled" /t REG_DWORD /d 0 /f
+                                    :: Using GPO (re-activation through GUI is not possible)
+                                    reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" /v "LetAppsActivateWithVoice" /t REG_DWORD /d 2 /f
+                                revertCode: |-
+                                    reg add "HKCU\Software\Microsoft\Speech_OneCore\Settings\VoiceActivation\UserPreferenceForAllApps" /v "AgentActivationEnabled" /t REG_DWORD /d 1 /f
+                                    :: Using GPO
+                                    reg delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" /v "LetAppsActivateWithVoice" /f
+                            -
+                                name: Disable apps and Cortana to activate with voice when sytem is locked
+                                recommend: standard
+                                docs: https://admx.help/?Category=Windows_10_2016&Policy=Microsoft.Policies.AppPrivacy::LetAppsActivateWithVoiceAboveLock
+                                code: |-
+                                    reg add "HKCU\Software\Microsoft\Speech_OneCore\Settings\VoiceActivation\UserPreferenceForAllApps" /v "AgentActivationOnLockScreenEnabled" /t REG_DWORD /d 0 /f
+                                    :: Using GPO (re-activation through GUI is not possible)
+                                    reg add "HKLM\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" /v "LetAppsActivateWithVoiceAboveLock" /t REG_DWORD /d 2 /f
+                                revertCode: |-
+                                    reg add "HKCU\Software\Microsoft\Speech_OneCore\Settings\VoiceActivation\UserPreferenceForAllApps" /v "AgentActivationOnLockScreenEnabled" /t REG_DWORD /d 1 /f
+                                    :: Using GPO
+                                    reg delete "HKLM\SOFTWARE\Policies\Microsoft\Windows\AppPrivacy" /v "LetAppsActivateWithVoiceAboveLock" /f
             -
                 category: Disable location access
                 children:
@@ -1081,11 +1145,61 @@ actions:
                                 revertCode: |-
                                     reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "CortanaEnabled" /t REG_DWORD /d 1 /f 
                                     reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "CortanaEnabled" /t REG_DWORD /d 1 /f
+                            -
+                                category: Disable Cortana history
+                                children:
+                                    -
+                                        name: Prevent Cortana from displaying history
+                                        recommend: standard
+                                        code: reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "HistoryViewEnabled" /t REG_DWORD /d 0 /f 
+                                        revertCode: reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "HistoryViewEnabled" /f 
+                                    -
+                                        name: Prevent Cortana from using device history
+                                        recommend: standard
+                                        code: reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "DeviceHistoryEnabled" /t REG_DWORD /d 0 /f 
+                                        revertCode: reg add "HKCU\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "DeviceHistoryEnabled" /f 
                             -
                                 name: Remove the Cortana taskbar icon
                                 recommend: standard
                                 code: reg add HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced /v "ShowCortanaButton" /t REG_DWORD /d 0 /f
                                 revertCode: reg delete HKCU\Software\Microsoft\Windows\CurrentVersion\Explorer\Advanced /v "ShowCortanaButton" /f
+                            -
+                                name: Disable Cortana in ambient mode
+                                recommend: standard
+                                code: reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "CortanaInAmbientMode" /t REG_DWORD /d 0 /f
+                                revertCode: reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\Search" /v "CortanaInAmbientMode" /t REG_DWORD /d 1 /f
+                            -
+                                category: Disable Cortana voice listening
+                                children:
+                                    -
+                                        name: Disable "Hey Cortana" voice activation
+                                        recommend: standard
+                                        code: |-
+                                            reg add "HKCU\Software\Microsoft\Speech_OneCore\Preferences" /v "VoiceActivationOn" /t REG_DWORD /d 0 /f
+                                            reg add "HKLM\Software\Microsoft\Speech_OneCore\Preferences" /v "VoiceActivationDefaultOn" /t REG_DWORD /d 0 /f
+                                        revertCode: |-
+                                            reg add "HKCU\Software\Microsoft\Speech_OneCore\Preferences" /v "VoiceActivationOn" /t REG_DWORD /d 1 /f
+                                            reg add "HKLM\Software\Microsoft\Speech_OneCore\Preferences" /v "VoiceActivationDefaultOn" /t REG_DWORD /d 1 /f
+                                    -
+                                        name: Disable Cortana listening to commands on Windows key + C
+                                        recommend: standard
+                                        code: reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Search" /v "VoiceShortcut" /t REG_DWORD /d 0 /f
+                                        revertCode: reg add "HKCU\Software\Microsoft\Windows\CurrentVersion\Search" /v "VoiceShortcut" /t REG_DWORD /d 1 /f
+                                    -
+                                        name: Disable using Cortana even when device is locked
+                                        recommend: standard
+                                        code: reg add "HKCU\Software\Microsoft\Speech_OneCore\Preferences" /v "VoiceActivationEnableAboveLockscreen" /t REG_DWORD /d 0 /f
+                                        revertCode: reg add "HKCU\Software\Microsoft\Speech_OneCore\Preferences" /v "VoiceActivationEnableAboveLockscreen" /t REG_DWORD /d 1 /f
+                                    -
+                                        name: Disable automatic update of Speech Data
+                                        recommend: standard
+                                        code: reg add "HKCU\Software\Microsoft\Speech_OneCore\Preferences" /v "ModelDownloadAllowed" /t REG_DWORD /d 0 /f
+                                        revertCode: reg delete "HKCU\Software\Microsoft\Speech_OneCore\Preferences" /v "ModelDownloadAllowed" /f
+                                    -
+                                        name: Disable Cortana voice support during Windows setup
+                                        recommend: standard
+                                        code: reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\OOBE" /v "DisableVoice" /t REG_DWORD /d 1 /f
+                                        revertCode: reg add "HKLM\SOFTWARE\Microsoft\Windows\CurrentVersion\OOBE" /v "DisableVoice" /f
                     -
                         category: Configure Windows search indexing
                         children:
@@ -1467,7 +1581,7 @@ actions:
                         name: Delete NVIDIA residual telemetry files
                         recommend: standard
                         code: |-
-                            del /s %systemdrive%\System32\DriverStore\FileRepository\NvTelemetry*.dll
+                            del /s %SystemRoot%\System32\DriverStore\FileRepository\NvTelemetry*.dll
                             rmdir /s /q "%ProgramFiles(x86)%\NVIDIA Corporation\NvTelemetry" 2>nul
                             rmdir /s /q "%ProgramFiles%\NVIDIA Corporation\NvTelemetry" 2>nul
                     -
@@ -1508,45 +1622,72 @@ actions:
                         name: Disable Visual Studio Code telemetry
                         docs: https://code.visualstudio.com/docs/getstarted/telemetry
                         recommend: standard
-                        code: Powershell -Command "$jsonfile = \"$env:APPDATA\Code\User\settings.json\"; $json = Get-Content $jsonfile | Out-String | ConvertFrom-Json; $json | Add-Member -Type NoteProperty -Name 'telemetry.enableTelemetry' -Value $false -Force; $json | ConvertTo-Json | Set-Content $jsonfile;"
-                        revertCode: Powershell -Command "$jsonfile = \"$env:APPDATA\Code\User\settings.json\"; $json = Get-Content $jsonfile | ConvertFrom-Json; $json.PSObject.Properties.Remove('telemetry.enableTelemetry'); $json | ConvertTo-Json | Set-Content $jsonfile;"
+                        call:
+                            function: SetVsCodeSetting
+                            parameters:
+                                setting: telemetry.enableTelemetry
+                                powerShellValue: $false
                     -
                         name: Disable Visual Studio Code crash reporting
                         docs: https://code.visualstudio.com/docs/getstarted/telemetry
                         recommend: standard
-                        code: Powershell -Command "$jsonfile = \"$env:APPDATA\Code\User\settings.json\"; $json = Get-Content $jsonfile | Out-String | ConvertFrom-Json; $json | Add-Member -Type NoteProperty -Name 'telemetry.enableCrashReporter' -Value $false -Force; $json | ConvertTo-Json | Set-Content $jsonfile;"
-                        revertCode: Powershell -Command "$jsonfile = \"$env:APPDATA\Code\User\settings.json\"; $json = Get-Content $jsonfile | ConvertFrom-Json;$json.PSObject.Properties.Remove('telemetry.enableCrashReporter'); $json | ConvertTo-Json | Set-Content $jsonfile;"
+                        call:
+                            function: SetVsCodeSetting
+                            parameters:
+                                setting: telemetry.enableCrashReporter
+                                powerShellValue: $false
                     -
                         name: Do not run Microsoft online experiments
                         docs: https://github.com/Microsoft/vscode/blob/1aee0c194cff72d179b9f8ef324e47f34555a07d/src/vs/workbench/contrib/experiments/node/experimentService.ts#L173
                         recommend: standard
-                        code: Powershell -Command "$jsonfile = \"$env:APPDATA\Code\User\settings.json\"; $json = Get-Content $jsonfile | Out-String | ConvertFrom-Json; $json | Add-Member -Type NoteProperty -Name 'workbench.enableExperiments' -Value $false -Force; $json | ConvertTo-Json | Set-Content $jsonfile;"
-                        revertCode: Powershell -Command "$jsonfile = \"$env:APPDATA\Code\User\settings.json\"; $json = Get-Content $jsonfile | ConvertFrom-Json;$json.PSObject.Properties.Remove('workbench.enableExperiments'); $json | ConvertTo-Json | Set-Content $jsonfile;"
+                        call:
+                            function: SetVsCodeSetting
+                            parameters:
+                                setting: workbench.enableExperiments
+                                powerShellValue: $false
                     -
                         name: Choose manual updates over automatic updates
-                        docs: https://github.com/Microsoft/vscode/blob/1aee0c194cff72d179b9f8ef324e47f34555a07d/src/vs/workbench/contrib/experiments/node/experimentService.ts#L173
-                        code: Powershell -Command "$jsonfile = \"$env:APPDATA\Code\User\settings.json\"; $json = Get-Content $jsonfile | Out-String | ConvertFrom-Json; $json | Add-Member -Type NoteProperty -Name 'update.mode' -Value \"manual\" -Force; $json | ConvertTo-Json | Set-Content $jsonfile;"
-                        revertCode: Powershell -Command "$jsonfile = \"$env:APPDATA\Code\User\settings.json\"; $json = Get-Content $jsonfile | ConvertFrom-Json;$json.PSObject.Properties.Remove('update.mode'); $json | ConvertTo-Json | Set-Content $jsonfile;"
+                        call:
+                            function: SetVsCodeSetting
+                            parameters:
+                                setting: update.mode
+                                powerShellValue: >-
+                                    'manual'
                     -
                         name: Show Release Notes from Microsoft online service after an update
-                        code: Powershell -Command "$jsonfile = \"$env:APPDATA\Code\User\settings.json\"; $json = Get-Content $jsonfile | Out-String | ConvertFrom-Json; $json | Add-Member -Type NoteProperty -Name 'update.showReleaseNotes' -Value $false -Force; $json | ConvertTo-Json | Set-Content $jsonfile;"
-                        revertCode: Powershell -Command "$jsonfile = \"$env:APPDATA\Code\User\settings.json\"; $json = Get-Content $jsonfile | ConvertFrom-Json;$json.PSObject.Properties.Remove('update.showReleaseNotes'); $json | ConvertTo-Json | Set-Content $jsonfile;"
+                        call:
+                            function: SetVsCodeSetting
+                            parameters:
+                                setting: update.showReleaseNotes
+                                powerShellValue: $false
                     -
                         name: Automatically check extensions from Microsoft online service
-                        code: Powershell -Command "$jsonfile = \"$env:APPDATA\Code\User\settings.json\"; $json = Get-Content $jsonfile | Out-String | ConvertFrom-Json; $json | Add-Member -Type NoteProperty -Name 'extensions.autoCheckUpdates' -Value $false -Force; $json | ConvertTo-Json | Set-Content $jsonfile;"
-                        revertCode: Powershell -Command "$jsonfile = \"$env:APPDATA\Code\User\settings.json\"; $json = Get-Content $jsonfile | ConvertFrom-Json;$json.PSObject.Properties.Remove('extensions.autoCheckUpdates'); $json | ConvertTo-Json | Set-Content $jsonfile;"
+                        call:
+                            function: SetVsCodeSetting
+                            parameters:
+                                setting: extensions.autoCheckUpdates
+                                powerShellValue: $false
                     -
-                        name: Fetch recommendations from a Microsoft online service
-                        code: Powershell -Command "$jsonfile = \"$env:APPDATA\Code\User\settings.json\"; $json = Get-Content $jsonfile | Out-String | ConvertFrom-Json; $json | Add-Member -Type NoteProperty -Name 'extensions.showRecommendationsOnlyOnDemand' -Value $true -Force; $json | ConvertTo-Json | Set-Content $jsonfile;"
-                        revertCode: Powershell -Command "$jsonfile = \"$env:APPDATA\Code\User\settings.json\"; $json = Get-Content $jsonfile | ConvertFrom-Json;$json.PSObject.Properties.Remove('extensions.showRecommendationsOnlyOnDemand'); $json | ConvertTo-Json | Set-Content $jsonfile;"
+                        name: Fetch recommendations from Microsoft only on demand
+                        call:
+                            function: SetVsCodeSetting
+                            parameters:
+                                setting: extensions.showRecommendationsOnlyOnDemand
+                                powerShellValue: $true
                     -
                         name: Automatically fetch git commits from remote repository
-                        code: Powershell -Command "$jsonfile = \"$env:APPDATA\Code\User\settings.json\"; $json = Get-Content $jsonfile | Out-String | ConvertFrom-Json; $json | Add-Member -Type NoteProperty -Name 'git.autofetch' -Value $false -Force; $json | ConvertTo-Json | Set-Content $jsonfile;"
-                        revertCode: Powershell -Command "$jsonfile = \"$env:APPDATA\Code\User\settings.json\"; $json = Get-Content $jsonfile | ConvertFrom-Json;$json.PSObject.Properties.Remove('git.autofetch'); $json | ConvertTo-Json | Set-Content $jsonfile;"
+                        call:
+                            function: SetVsCodeSetting
+                            parameters:
+                                setting: git.autofetch
+                                powerShellValue: $false
                     -
                         name: Fetch package information from NPM and Bower
-                        code: Powershell -Command "$jsonfile = \"$env:APPDATA\Code\User\settings.json\"; $json = Get-Content $jsonfile | Out-String | ConvertFrom-Json; $json | Add-Member -Type NoteProperty -Name 'npm.fetchOnlinePackageInfo' -Value $false -Force; $json | ConvertTo-Json | Set-Content $jsonfile;"
-                        revertCode: Powershell -Command "$jsonfile = \"$env:APPDATA\Code\User\settings.json\"; $json = Get-Content $jsonfile | ConvertFrom-Json;$json.PSObject.Properties.Remove('npm.fetchOnlinePackageInfo'); $json | ConvertTo-Json | Set-Content $jsonfile;"
+                        call:
+                            function: SetVsCodeSetting
+                            parameters:
+                                setting: npm.fetchOnlinePackageInfo
+                                powerShellValue: $false
             -
                 category: Disable Microsoft Office telemetry
                 docs: https://docs.microsoft.com/en-us/deployoffice/compat/manage-the-privacy-of-data-monitored-by-telemetry-in-office
@@ -2692,8 +2833,19 @@ actions:
             -
                 name: Disable NetBios for all interfaces
                 docs: https://10dsecurity.com/saying-goodbye-netbios/
-                code: Powershell -Command "$key = 'HKLM:SYSTEM\CurrentControlSet\services\NetBT\Parameters\Interfaces'; Get-ChildItem $key | foreach { Set-ItemProperty -Path \"$key\$($_.pschildname)\" -Name NetbiosOptions -Value 2 -Verbose}"
-                revertCode: Powershell -Command "$key = 'HKLM:SYSTEM\CurrentControlSet\services\NetBT\Parameters\Interfaces'; Get-ChildItem $key | foreach { Set-ItemProperty -Path \"$key\$($_.pschildname)\" -Name NetbiosOptions -Value 0 -Verbose}"
+                call:
+                    function: RunPowerShell
+                    parameters:
+                        code: 
+                            $key = 'HKLM:SYSTEM\CurrentControlSet\services\NetBT\Parameters\Interfaces';
+                            Get-ChildItem $key | foreach {
+                                Set-ItemProperty -Path \"$key\$($_.pschildname)\" -Name NetbiosOptions -Value 2 -Verbose
+                            }
+                        revertCode:
+                            $key = 'HKLM:SYSTEM\CurrentControlSet\services\NetBT\Parameters\Interfaces';
+                            Get-ChildItem $key | foreach {
+                                Set-ItemProperty -Path \"$key\$($_.pschildname)\" -Name NetbiosOptions -Value 0 -Verbose
+                            }
     -
         category: Remove bloatware
         children:
@@ -3459,12 +3611,13 @@ actions:
                                             function: UninstallSystemApp
                                             parameters:
                                                 packageName: Microsoft.Windows.SecureAssessmentBrowser
-                            -
-                                name: Start app
-                                call:
-                                    function: UninstallSystemApp
-                                    parameters:
-                                        packageName: Microsoft.Windows.ShellExperienceHost
+                            # -
+                            #   # Not a bloatware, required for different setting windows such as WiFi and battery panes in action bar
+                            #   name: Start app
+                            #   call:
+                            #       function: UninstallSystemApp
+                            #       parameters:
+                            #       packageName: Microsoft.Windows.ShellExperienceHost
                             -
                                 category: Windows Feedback
                                 children:
@@ -3496,12 +3649,13 @@ actions:
                                     function: UninstallSystemApp
                                     parameters:
                                         packageName: Windows.ContactSupport
-                            -
-                                name: Settings app
-                                call:
-                                    function: UninstallSystemApp
-                                    parameters:
-                                        packageName: Windows.immersivecontrolpanel
+                            # -
+                            #     # Not a bloatware, required for core OS functinoality
+                            #     name: Settings app
+                            #     call:
+                            #         function: UninstallSystemApp
+                            #         parameters:
+                            #             packageName: Windows.immersivecontrolpanel
                             -
                                 name: Windows Print 3D app
                                 call:
@@ -3622,22 +3776,31 @@ actions:
                 children:
                     -
                         name: Direct Play feature
-                        code: dism /Online /Disable-Feature /FeatureName:"DirectPlay" /NoRestart
-                        revertCode: dism /Online /Enable-Feature /FeatureName:"DirectPlay" /NoRestart
+                        call:
+                            function: DisableFeature
+                            parameters:
+                                featureName: DirectPlay
                     -
                         name: Internet Explorer feature
-                        code: |-
-                            dism /Online /Disable-Feature /FeatureName:"Internet-Explorer-Optional-x64" /NoRestart
-                            dism /Online /Disable-Feature /FeatureName:"Internet-Explorer-Optional-x84" /NoRestart
-                            dism /Online /Disable-Feature /FeatureName:"Internet-Explorer-Optional-amd64" /NoRestart
-                        revertCode: |-
-                            dism /Online /Enable-Feature /FeatureName:"Internet-Explorer-Optional-x64" /NoRestart
-                            dism /Online /Enable-Feature /FeatureName:"Internet-Explorer-Optional-x84" /NoRestart
-                            dism /Online /Enable-Feature /FeatureName:"Internet-Explorer-Optional-amd64" /NoRestart
+                        call:
+                            -
+                                function: DisableFeature
+                                parameters:
+                                    featureName: Internet-Explorer-Optional-x64
+                            -
+                                function: DisableFeature
+                                parameters:
+                                    featureName: Internet-Explorer-Optional-x84
+                            -
+                                function: DisableFeature
+                                parameters:
+                                    featureName: Internet-Explorer-Optional-amd64
                     -
                         name: Legacy Components feature
-                        code: dism /Online /Disable-Feature /FeatureName:"LegacyComponents" /NoRestart
-                        revertCode: dism /Online /Enable-Feature /FeatureName:"LegacyComponents" /NoRestart
+                        call:
+                            function: DisableFeature
+                            parameters:
+                                featureName: LegacyComponents
                     -
                         category: Server features for developers & administrators
                         children:
@@ -3646,39 +3809,55 @@ actions:
                                 children:
                                     -
                                         name: Hyper-V feature
-                                        code: dism /Online /Disable-Feature /FeatureName:"Microsoft-Hyper-V-All" /NoRestart
-                                        revertCode: dism /Online /Enable-Feature /FeatureName:"Microsoft-Hyper-V-All" /NoRestart
+                                        call:
+                                            function: DisableFeature
+                                            parameters:
+                                                featureName: Microsoft-Hyper-V-All
                                     -
                                         name: Hyper-V GUI Management Tools feature
-                                        code: dism /Online /Disable-Feature /FeatureName:"Microsoft-Hyper-V-Management-Clients" /NoRestart
-                                        revertCode: dism /Online /Enable-Feature /FeatureName:"Microsoft-Hyper-V-Management-Clients" /NoRestart
+                                        call:
+                                            function: DisableFeature
+                                            parameters:
+                                                featureName: Microsoft-Hyper-V-Management-Clients
                                     -
                                         name: Hyper-V Management Tools feature
-                                        code: dism /Online /Disable-Feature /FeatureName:"Microsoft-Hyper-V-Tools-All" /NoRestart
-                                        revertCode: dism /Online /Enable-Feature /FeatureName:"Microsoft-Hyper-V-Tools-All" /NoRestart
+                                        call:
+                                            function: DisableFeature
+                                            parameters:
+                                                featureName: Microsoft-Hyper-V-Tools-All
                                     -
                                         name: Hyper-V Module for Windows PowerShell feature
-                                        code: dism /Online /Disable-Feature /FeatureName:"Microsoft-Hyper-V-Management-PowerShell" /NoRestart
-                                        revertCode: dism /Online /Enable-Feature /FeatureName:"Microsoft-Hyper-V-Management-PowerShell" /NoRestart
+                                        call:
+                                            function: DisableFeature
+                                            parameters:
+                                                featureName: Microsoft-Hyper-V-Management-PowerShell
                             -
                                 name: Telnet Client feature
-                                code: dism /Online /Disable-Feature /FeatureName:"TelnetClient" /NoRestart
-                                revertCode: dism /Online /Enable-Feature /FeatureName:"TelnetClient" /NoRestart
                                 docs: https://social.technet.microsoft.com/wiki/contents/articles/38433.windows-10-enabling-telnet-client.aspx
+                                call:
+                                    function: DisableFeature
+                                    parameters:
+                                        featureName: TelnetClient
                             -
                                 name: Net.TCP Port Sharing feature
-                                code: dism /Online /Disable-Feature /FeatureName:"WCF-TCP-PortSharing45" /NoRestart
-                                revertCode: dism /Online /Enable-Feature /FeatureName:"WCF-TCP-PortSharing45" /NoRestart
                                 docs: https://docs.microsoft.com/en-us/dotnet/framework/wcf/feature-details/net-tcp-port-sharing
+                                call:
+                                    function: DisableFeature
+                                    parameters:
+                                        featureName: WCF-TCP-PortSharing45
                             -
                                 name: SMB Direct feature
-                                code: dism /Online /Disable-Feature /FeatureName:"SmbDirect" /NoRestart
-                                revertCode: dism /Online /Enable-Feature /FeatureName:"SmbDirect" /NoRestart
                                 docs: https://docs.microsoft.com/en-us/windows-server/storage/file-server/smb-direct
+                                call:
+                                    function: DisableFeature
+                                    parameters:
+                                        featureName: SmbDirect
                             -
                                 name: TFTP Client feature
-                                code: dism /Online /Disable-Feature /FeatureName:"TFTP" /NoRestart
-                                revertCode: dism /Online /Enable-Feature /FeatureName:"TFTP" /NoRestart
+                                call:
+                                    function: DisableFeature
+                                    parameters:
+                                        featureName: TFTP
                     -
                         category: Printing features
                         children:
@@ -3687,60 +3866,86 @@ actions:
                                 children:
                                     -
                                         name: Internet Printing Client
-                                        code: dism /Online /Disable-Feature /FeatureName:"Printing-Foundation-InternetPrinting-Client" /NoRestart
-                                        revertCode: dism /Online /Enable-Feature /FeatureName:"Printing-Foundation-InternetPrinting-Client" /NoRestart
+                                        call:
+                                            function: DisableFeature
+                                            parameters:
+                                                featureName: Printing-Foundation-InternetPrinting-Client
                                     -
                                         name: LPD Print Service
-                                        code: dism /Online /Disable-Feature /FeatureName:"Printing-Foundation-LPDPrintService" /NoRestart
-                                        revertCode: dism /Online /Enable-Feature /FeatureName:"Printing-Foundation-LPDPrintService" /NoRestart
+                                        call:
+                                            function: DisableFeature
+                                            parameters:
+                                                featureName: LPDPrintService
                                     -
                                         name: LPR Port Monitor feature
-                                        code: dism /Online /Disable-Feature /FeatureName:"Printing-Foundation-LPRPortMonitor" /NoRestart
-                                        revertCode: dism /Online /Enable-Feature /FeatureName:"Printing-Foundation-LPRPortMonitor" /NoRestart
+                                        call:
+                                            function: DisableFeature
+                                            parameters:
+                                                featureName: Printing-Foundation-LPRPortMonitor
                                     -
                                         name: Microsoft Print to PDF feature
-                                        code: dism /Online /Disable-Feature /FeatureName:"Printing-PrintToPDFServices-Features" /NoRestart
-                                        revertCode: dism /Online /Enable-Feature /FeatureName:"Printing-PrintToPDFServices-Features" /NoRestart
+                                        call:
+                                            function: DisableFeature
+                                            parameters:
+                                                featureName: Printing-PrintToPDFServices-Features
                             -
                                 name: Print and Document Services feature
-                                code: dism /Online /Disable-Feature /FeatureName:"Printing-Foundation-Features" /NoRestart
-                                revertCode: dism /Online /Enable-Feature /FeatureName:"Printing-Foundation-Features" /NoRestart
+                                call:
+                                    function: DisableFeature
+                                    parameters:
+                                        featureName: Printing-Foundation-Features
                             -
                                 name: Work Folders Client feature
-                                code: dism /Online /Disable-Feature /FeatureName:"WorkFolders-Client" /NoRestart
-                                revertCode: dism /Online /Enable-Feature /FeatureName:"WorkFolders-Client" /NoRestart
                                 docs: https://docs.microsoft.com/en-us/windows-server/storage/work-folders/work-folders-overview
+                                call:
+                                    function: DisableFeature
+                                    parameters:
+                                        featureName: WorkFolders-Client
                             -
                                 category: XPS support
                                 children:
                                 -
                                     name: XPS Services feature
-                                    code: dism /Online /Disable-Feature /FeatureName:"Printing-XPSServices-Features" /NoRestart
-                                    revertCode: dism /Online /Enable-Feature /FeatureName:"Printing-XPSServices-Features" /NoRestart
+                                    call:
+                                        function: DisableFeature
+                                        parameters:
+                                            featureName: Printing-XPSServices-Features
                                 -
                                     name: XPS Viewer feature
-                                    code: dism /Online /Disable-Feature /FeatureName:"Xps-Foundation-Xps-Viewer" /NoRestart
-                                    revertCode: dism /Online /Enable-Feature /FeatureName:"Xps-Foundation-Xps-Viewer" /NoRestart
+                                    call:
+                                        function: DisableFeature
+                                        parameters:
+                                            featureName: Xps-Foundation-Xps-Viewer
                     -
                         name: Media Features feature
-                        code: dism /Online /Disable-Feature /FeatureName:"MediaPlayback" /NoRestart
-                        revertCode: dism /Online /Enable-Feature /FeatureName:"MediaPlayback" /NoRestart
+                        call:
+                            function: DisableFeature
+                            parameters:
+                                featureName: MediaPlayback
                     -
                         name: Scan Management feature
-                        code: dism /Online /Disable-Feature /FeatureName:"ScanManagementConsole" /NoRestart
-                        revertCode: dism /Online /Enable-Feature /FeatureName:"ScanManagementConsole" /NoRestart
+                        call:
+                            function: DisableFeature
+                            parameters:
+                                featureName: ScanManagementConsole
                     -
                         name: Windows Fax and Scan feature
-                        code: dism /Online /Disable-Feature /FeatureName:"FaxServicesClientPackage" /NoRestart
-                        revertCode: dism /Online /Enable-Feature /FeatureName:"FaxServicesClientPackage" /NoRestart
+                        call:
+                            function: DisableFeature
+                            parameters:
+                                featureName: FaxServicesClientPackage
                     -
                         name: Windows Media Player feature
-                        code: dism /Online /Disable-Feature /FeatureName:"WindowsMediaPlayer" /NoRestart
-                        revertCode: dism /Online /Enable-Feature /FeatureName:"WindowsMediaPlayer" /NoRestart
+                        call:
+                            function: DisableFeature
+                            parameters:
+                                featureName: WindowsMediaPlayer
                     -
                         name: Windows Search feature
-                        code: dism /Online /Disable-Feature /FeatureName:"SearchEngine-Client-Package" /NoRestart
-                        revertCode: dism /Online /Enable-Feature /FeatureName:"SearchEngine-Client-Package" /NoRestart
+                        call:
+                            function: DisableFeature
+                            parameters:
+                                featureName: SearchEngine-Client-Package
             -
                 category: Uninstall capabilities & features on demand
                 docs: https://docs.microsoft.com/en-us/windows-hardware/manufacture/desktop/features-on-demand-non-language-fod#fods-that-are-not-preinstalled-but-may-need-to-be-preinstalled
@@ -4138,67 +4343,86 @@ actions:
                     copy "%~dpnx0" "%AppData%\Microsoft\Windows\Start Menu\Programs\Startup\privacy-cleanup.bat"
                 revertCode: del /f /q %AppData%\Microsoft\Windows\Start Menu\Programs\Startup\privacy-cleanup.bat
 functions:
+    -
+        name: KillProcessWhenItStarts
+        parameters: [ processName ]
+        # https://docs.microsoft.com/en-us/previous-versions/windows/desktop/xperf/image-file-execution-options
+        code: reg add "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\'{{ $processName }}'" /v "Debugger" /t REG_SZ /d "%windir%\System32\taskkill.exe" /f
+        revertCode: reg delete "HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Image File Execution Options\'{{ $processName }}'" /v "Debugger" /f
+    -
+        name: DisableFeature
+        parameters: [ featureName ]
+        code: dism /Online /Disable-Feature /FeatureName:"{{ $featureName }}" /NoRestart
+        revertCode: dism /Online /Enable-Feature /FeatureName:"{{ $featureName }}" /NoRestart
     -
         name: UninstallStoreApp
         parameters: [ packageName ]
-        code: PowerShell -Command "Get-AppxPackage '{{ $packageName }}' | Remove-AppxPackage"
-        revertCode:
-            PowerShell -ExecutionPolicy Unrestricted -Command "
-                $package = Get-AppxPackage -AllUsers '{{ $packageName }}';
-                if (!$package) {
-                    Write-Error \"Cannot reinstall '{{ $packageName }}'\" -ErrorAction Stop
-                }
-                $manifest = $package.InstallLocation + '\AppxManifest.xml';
-                Add-AppxPackage -DisableDevelopmentMode -Register \"$manifest\" "
+        call:
+            function: RunPowerShell
+            parameters:
+                code: Get-AppxPackage '{{ $packageName }}' | Remove-AppxPackage
+                revertCode:
+                    $package = Get-AppxPackage -AllUsers '{{ $packageName }}';
+                    if (!$package) {
+                        Write-Error \"Cannot reinstall '{{ $packageName }}'\" -ErrorAction Stop
+                    }
+                    $manifest = $package.InstallLocation + '\AppxManifest.xml';
+                    Add-AppxPackage -DisableDevelopmentMode -Register \"$manifest\"
     -
         name: UninstallSystemApp
         parameters: [ packageName ]
         # It simply renames files
         #   Because system apps are non removable (check: (Get-AppxPackage -AllUsers 'Windows.CBSPreview').NonRemovable)
         #   Otherwise they throw 0x80070032 when trying to uninstall them
-        code:
-            PowerShell -Command "
-            $package = (Get-AppxPackage -AllUsers '{{ $packageName }}');
-            if (!$package) { 
-                Write-Host 'Not installed';
-                exit 0;
-            }
-            $directories = @($package.InstallLocation, \"$env:LOCALAPPDATA\Packages\$($package.PackageFamilyName)\");
-            foreach($dir in $directories) {
-                if ( !$dir -Or !(Test-Path \"$dir\") ) { continue; }
-                cmd /c ('takeown /f \"' + $dir + '\" /r /d y 1> nul'); if($LASTEXITCODE) { throw 'Failed to take ownership'; }
-                cmd /c ('icacls \"' + $dir + '\" /grant administrators:F /t 1> nul'); if($LASTEXITCODE) { throw 'Failed to take ownership'; }
-                $files = Get-ChildItem -File -Path $dir -Recurse -Force;
-                foreach($file in $files) {
-                    if($file.Name.EndsWith('.OLD')) { continue; }
-                    $newName =  $file.FullName + '.OLD';
-                    Write-Host \"Rename '$($file.FullName)' to '$newName'\";
-                    Move-Item -LiteralPath \"$($file.FullName)\" -Destination \"$newName\" -Force;
-                }
-            };"
-        revertCode:
-            PowerShell -Command "
-            $package = (Get-AppxPackage -AllUsers '{{ $packageName }}');
-            if (!$package) { 
-                Write-Error 'App could not be found' -ErrorAction Stop;
-            }
-            $directories = @($package.InstallLocation, \"$env:LOCALAPPDATA\Packages\$($package.PackageFamilyName)\");
-            foreach($dir in $directories) {
-                if ( !$dir -Or !(Test-Path \"$dir\") ) { continue; }
-                cmd /c ('takeown /f \"' + $dir + '\" /r /d y 1> nul'); if($LASTEXITCODE) { throw 'Failed to take ownership'; }
-                cmd /c ('icacls \"' + $dir + '\" /grant administrators:F /t 1> nul'); if($LASTEXITCODE) { throw 'Failed to take ownership'; }
-                $files = Get-ChildItem -File -Path \"$dir\*.OLD\" -Recurse -Force;
-                foreach($file in $files) {
-                    $newName = $file.FullName.Substring(0, $file.FullName.Length - 4);
-                    Write-Host \"Rename '$($file.FullName)' to '$newName'\";
-                    Move-Item -LiteralPath \"$($file.FullName)\" -Destination \"$newName\" -Force;
-                }
-            };"
+        call:
+            function: RunPowerShell
+            parameters:
+                code:
+                    $package = (Get-AppxPackage -AllUsers '{{ $packageName }}');
+                    if (!$package) { 
+                        Write-Host 'Not installed';
+                        exit 0;
+                    }
+                    $directories = @($package.InstallLocation, \"$env:LOCALAPPDATA\Packages\$($package.PackageFamilyName)\");
+                    foreach($dir in $directories) {
+                        if ( !$dir -Or !(Test-Path \"$dir\") ) { continue; }
+                        cmd /c ('takeown /f \"' + $dir + '\" /r /d y 1> nul'); if($LASTEXITCODE) { throw 'Failed to take ownership'; }
+                        cmd /c ('icacls \"' + $dir + '\" /grant administrators:F /t 1> nul'); if($LASTEXITCODE) { throw 'Failed to take ownership'; }
+                        $files = Get-ChildItem -File -Path $dir -Recurse -Force;
+                        foreach($file in $files) {
+                            if($file.Name.EndsWith('.OLD')) { continue; }
+                            $newName =  $file.FullName + '.OLD';
+                            Write-Host \"Rename '$($file.FullName)' to '$newName'\";
+                            Move-Item -LiteralPath \"$($file.FullName)\" -Destination \"$newName\" -Force;
+                        }
+                    }
+                revertCode:
+                    $package = (Get-AppxPackage -AllUsers '{{ $packageName }}');
+                    if (!$package) { 
+                        Write-Error 'App could not be found' -ErrorAction Stop;
+                    }
+                    $directories = @($package.InstallLocation, \"$env:LOCALAPPDATA\Packages\$($package.PackageFamilyName)\");
+                    foreach($dir in $directories) {
+                        if ( !$dir -Or !(Test-Path \"$dir\") ) { continue; }
+                        cmd /c ('takeown /f \"' + $dir + '\" /r /d y 1> nul'); if($LASTEXITCODE) { throw 'Failed to take ownership'; }
+                        cmd /c ('icacls \"' + $dir + '\" /grant administrators:F /t 1> nul'); if($LASTEXITCODE) { throw 'Failed to take ownership'; }
+                        $files = Get-ChildItem -File -Path \"$dir\*.OLD\" -Recurse -Force;
+                        foreach($file in $files) {
+                            $newName = $file.FullName.Substring(0, $file.FullName.Length - 4);
+                            Write-Host \"Rename '$($file.FullName)' to '$newName'\";
+                            Move-Item -LiteralPath \"$($file.FullName)\" -Destination \"$newName\" -Force;
+                        }
+                    }
     -
         name: UninstallCapability
         parameters: [ capabilityName ]
-        code: PowerShell -Command "Get-WindowsCapability -Online -Name '{{ $capabilityName }}*' | Remove-WindowsCapability -Online"
-        revertCode: PowerShell -Command "$capability = Get-WindowsCapability -Online -Name '{{ $capabilityName }}*'; Add-WindowsCapability -Name \"$capability.Name\" -Online"
+        call:
+            function: RunPowerShell
+            parameters:
+                code: Get-WindowsCapability -Online -Name '{{ $capabilityName }}*' | Remove-WindowsCapability -Online
+                revertCode:
+                    $capability = Get-WindowsCapability -Online -Name '{{ $capabilityName }}*';
+                    Add-WindowsCapability -Name \"$capability.Name\" -Online
     -
         name: RenameSystemFile
         parameters: [ filePath ]
@@ -4220,3 +4444,31 @@ functions:
             ) else (
                 echo Could not find backup file "{{ $filePath }}.OLD" 1>&2
             )
+    -
+        name: SetVsCodeSetting
+        parameters: [ setting, powerShellValue ]
+        call:
+            function: RunPowerShell
+            parameters:
+                code:
+                    $jsonfile = \"$env:APPDATA\Code\User\settings.json\";
+                    if (!(Test-Path $jsonfile -PathType Leaf)) {
+                        Write-Host \"No updates. Settings file was not at $jsonfile\";
+                        exit 0;
+                    }
+                    $json = Get-Content $jsonfile | Out-String | ConvertFrom-Json;
+                    $json | Add-Member -Type NoteProperty -Name '{{ $setting }}' -Value {{ $powerShellValue }} -Force;
+                    $json | ConvertTo-Json | Set-Content $jsonfile;
+                revertCode:
+                    $jsonfile = \"$env:APPDATA\Code\User\settings.json\";
+                    if (!(Test-Path $jsonfile -PathType Leaf)) {
+                        Write-Error \"Settings file could not be found at $jsonfile\" -ErrorAction Stop;
+                    }
+                    $json = Get-Content $jsonfile | ConvertFrom-Json;
+                    $json.PSObject.Properties.Remove('{{ $setting }}');
+                    $json | ConvertTo-Json | Set-Content $jsonfile;
+    -
+        name: RunPowerShell
+        parameters: [ code, revertCode ]
+        code: PowerShell -ExecutionPolicy Unrestricted -Command "{{ $code }}"
+        revertCode: PowerShell -ExecutionPolicy Unrestricted -Command "{{ $revertCode }}"

src/domain/ScriptCode.ts

@@ -4,16 +4,17 @@ export class ScriptCode implements IScriptCode {
     constructor(
         public readonly execute: string,
         public readonly revert: string,
-        scriptName: string,
         syntax: ILanguageSyntax) {
-        if (!scriptName)    {   throw new Error('script name is undefined');    }
-        if (!syntax)        {   throw new Error('syntax is undefined');         }
-        validateCode(scriptName, execute, syntax);
+        if (!syntax) { throw new Error('undefined syntax'); }
+        validateCode(execute, syntax);
         if (revert) {
-            scriptName = `${scriptName} (revert)`;
-            validateCode(scriptName, revert, syntax);
-            if (execute === revert) {
-                throw new Error(`${scriptName}: Code itself and its reverting code cannot be the same`);
+            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}`);
             }
         }
     }
@@ -24,21 +25,21 @@ export interface ILanguageSyntax {
     readonly commonCodeParts: string[];
 }
 
-function validateCode(name: string, code: string, syntax: ILanguageSyntax): void {
+function validateCode(code: string, syntax: ILanguageSyntax): void {
     if (!code || code.length === 0) {
-        throw new Error(`code of ${name} is empty or undefined`);
+        throw new Error(`code is empty or undefined`);
     }
-    ensureNoEmptyLines(name, code);
-    ensureCodeHasUniqueLines(name, code, syntax);
+    ensureNoEmptyLines(code);
+    ensureCodeHasUniqueLines(code, syntax);
 }
 
-function ensureNoEmptyLines(name: string, code: string): void {
+function ensureNoEmptyLines(code: string): void {
     if (code.split('\n').some((line) => line.trim().length === 0)) {
-        throw Error(`script has empty lines "${name}"`);
+        throw Error(`script has empty lines`);
     }
 }
 
-function ensureCodeHasUniqueLines(name: string, code: string, syntax: ILanguageSyntax): void {
+function ensureCodeHasUniqueLines(code: string, syntax: ILanguageSyntax): void {
     const lines = code.split('\n')
         .filter((line) => !shouldIgnoreLine(line, syntax));
     if (lines.length === 0) {
@@ -46,7 +47,7 @@ function ensureCodeHasUniqueLines(name: string, code: string, syntax: ILanguageS
     }
     const duplicateLines = lines.filter((e, i, a) => a.indexOf(e) !== i);
     if (duplicateLines.length !== 0) {
-        throw Error(`Duplicates detected in script "${name}":\n ${duplicateLines.join('\n')}`);
+        throw Error(`Duplicates detected in script:\n${duplicateLines.map((line, index) => `(${index}) - ${line}`).join('\n')}`);
     }
 }
 

src/infrastructure/Clipboard.ts

@@ -1,4 +1,3 @@
-
 export class Clipboard {
     public static copyText(text: string): void {
         const el = document.createElement('textarea');

src/infrastructure/CodeRunner.ts

@@ -0,0 +1,69 @@
+import { Environment } from '@/application/Environment/Environment';
+import os from 'os';
+import path from 'path';
+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);
+}
+
+function getExecuteCommand(scriptPath: string, environment: Environment): string {
+    switch (environment.os) {
+        case OperatingSystem.macOS:
+            return `open -a Terminal.app ${scriptPath}`;
+            // Another option with graphical sudo would be
+            //  `osascript -e "do shell script \\"${scriptPath}\\" with administrator privileges"`
+            // However it runs in background
+        case OperatingSystem.Windows:
+            return scriptPath;
+        default:
+            throw Error('undefined os');
+    }
+}
+
+function getNodeJs(): INodeJs {
+    return { os, path, fs, child_process };
+}
+
+export interface INodeJs {
+    os: INodeOs;
+    path: INodePath;
+    fs: INodeFs;
+    child_process: INodeChildProcess;
+}
+
+export interface INodeOs {
+    tmpdir(): string;
+}
+
+export interface INodePath {
+    join(...paths: string[]): string;
+}
+
+export interface INodeChildProcess {
+    exec(command: string): void;
+}
+
+export interface INodeFs {
+    readonly promises: INodeFsPromises;
+}
+
+interface INodeFsPromisesMakeDirectoryOptions {
+    recursive?: boolean;
+}
+
+interface INodeFsPromises { // https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/node/v13/fs.d.ts
+    chmod(path: string, mode: string | number): Promise<void>;
+    mkdir(path: string, options: INodeFsPromisesMakeDirectoryOptions): Promise<string>;
+    writeFile(path: string, data: string): Promise<void>;
+}

src/infrastructure/Events/EventSource.ts

@@ -1,7 +1,6 @@
-import { EventHandler, ISignal } from './ISignal';
-import { IEventSubscription } from './ISubscription';
+import { EventHandler, IEventSource, IEventSubscription } from './IEventSource';
 
-export class Signal<T> implements ISignal<T> {
+export class EventSource<T> implements IEventSource<T> {
     private handlers = new Map<number, EventHandler<T>>();
 
     public on(handler: EventHandler<T>): IEventSubscription {

src/infrastructure/Events/EventSubscriptionCollection.ts

@@ -0,0 +1,12 @@
+import { IEventSubscription } from './IEventSource';
+
+export class EventSubscriptionCollection {
+    private readonly subscriptions = new Array<IEventSubscription>();
+    public register(...subscriptions: IEventSubscription[]) {
+        this.subscriptions.push(...subscriptions);
+    }
+    public unsubscribeAll() {
+        this.subscriptions.forEach((listener) => listener.unsubscribe());
+        this.subscriptions.splice(0, this.subscriptions.length);
+    }
+}

src/infrastructure/Events/IEventSource.ts

@@ -1,6 +1,11 @@
-import { IEventSubscription } from './ISubscription';
-export interface ISignal<T> {
+export interface IEventSource<T> {
     on(handler: EventHandler<T>): IEventSubscription;
 }
 
+export interface IEventSubscription {
+    unsubscribe(): void;
+}
+
 export type EventHandler<T> = (data: T) => void;
+
+

src/infrastructure/Events/ISubscription.ts

@@ -1,3 +0,0 @@
-export interface IEventSubscription {
-    unsubscribe(): void;
-}

src/infrastructure/Threading/AsyncLazy.ts

@@ -1,7 +1,7 @@
-import { Signal } from '../Events/Signal';
+import { EventSource } from '../Events/EventSource';
 
 export class AsyncLazy<T> {
-    private valueCreated = new Signal();
+    private valueCreated = new EventSource();
     private isValueCreated = false;
     private isCreatingValue = false;
     private value: T | undefined;
@@ -15,7 +15,7 @@ export class AsyncLazy<T> {
     public async getValueAsync(): Promise<T> {
         // If value is already created, return the value directly
         if (this.isValueCreated) {
-            return Promise.resolve(this.value as T);
+            return Promise.resolve(this.value);
         }
         // If value is being created, wait until the value is created and then return it.
         if (this.isCreatingValue) {

src/presentation/Scripts/TheScripts.vue

@@ -1,195 +0,0 @@
-<template>
-    <div>
-        <div class="heading">
-            <TheSelector class="item"/>
-            <TheOsChanger class="item"/>
-            <TheGrouper
-                class="item"
-                v-on:groupingChanged="onGroupingChanged($event)"
-                v-if="!this.isSearching" />
-        </div>
-        <div class="scripts">
-            <div v-if="!isSearching">
-                <CardList v-if="currentGrouping === Grouping.Cards"/>
-                <div class="tree" v-if="currentGrouping === Grouping.None">
-                    <ScriptsTree />
-                </div>
-            </div>
-            <div v-else> <!-- Searching -->
-                <div class="search">
-                    <div class="search__query">
-                        <div>Searching for "{{this.searchQuery | threeDotsTrim}}"</div>
-                        <div class="search__query__close-button">
-                            <font-awesome-icon
-                                :icon="['fas', 'times']" 
-                                v-on:click="clearSearchQueryAsync()"/>
-                        </div>
-                    </div>
-                    <div v-if="!searchHasMatches" class="search-no-matches">
-                        <div>Sorry, no matches for "{{this.searchQuery | threeDotsTrim}}" 😞</div>
-                        <div>Feel free to extend the scripts <a :href="repositoryUrl" target="_blank" class="child github" >here</a> ✨</div>
-                    </div>
-                </div>
-                <div v-if="searchHasMatches" class="tree tree--searching">
-                    <ScriptsTree />
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script lang="ts">
-import TheGrouper from '@/presentation/Scripts/Grouping/TheGrouper.vue';
-import TheOsChanger from '@/presentation/Scripts/TheOsChanger.vue';
-import TheSelector from '@/presentation/Scripts/Selector/TheSelector.vue';
-import ScriptsTree from '@/presentation/Scripts/ScriptsTree/ScriptsTree.vue';
-import CardList from '@/presentation/Scripts/Cards/CardList.vue';
-import { Component } from 'vue-property-decorator';
-import { StatefulVue } from '@/presentation/StatefulVue';
-import { Grouping } from './Grouping/Grouping';
-import { IFilterResult } from '@/application/Context/State/Filter/IFilterResult';
-import { ICategoryCollectionState } from '@/application/Context/State/ICategoryCollectionState';
-import { IApplication } from '@/domain/IApplication';
-import { IEventSubscription } from '@/infrastructure/Events/ISubscription';
-
-/** Shows content of single category or many categories */
-@Component({
-components: {
-    TheGrouper,
-    TheSelector,
-    ScriptsTree,
-    CardList,
-    TheOsChanger,
-},
-filters: {
-    threeDotsTrim(query: string) {
-        const threshold = 30;
-        if (query.length <= threshold - 3) {
-            return query;
-        }
-        return `${query.substr(0, threshold)}...`;
-    },
-},
-})
-export default class TheScripts extends StatefulVue {
-    public repositoryUrl = '';
-    public Grouping = Grouping; // Make it accessible from view
-    public currentGrouping = Grouping.Cards;
-    public searchQuery = '';
-    public isSearching = false;
-    public searchHasMatches = false;
-
-    private listeners = new Array<IEventSubscription>();
-
-    public destroyed() {
-        this.unsubscribeAll();
-    }
-    public async clearSearchQueryAsync() {
-        const context = await this.getCurrentContextAsync();
-        const filter = context.state.filter;
-        filter.removeFilter();
-    }
-    public onGroupingChanged(group: Grouping) {
-        this.currentGrouping = group;
-    }
-
-    protected initialize(app: IApplication): void {
-        this.repositoryUrl = app.info.repositoryWebUrl;
-    }
-    protected handleCollectionState(newState: ICategoryCollectionState): void {
-        this.unsubscribeAll();
-        this.subscribe(newState);
-    }
-
-    private subscribe(state: ICategoryCollectionState) {
-        this.listeners.push(state.filter.filterRemoved.on(() => {
-            this.isSearching = false;
-        }));
-        state.filter.filtered.on((result: IFilterResult) => {
-            this.searchQuery = result.query;
-            this.isSearching = true;
-            this.searchHasMatches = result.hasAnyMatches();
-        });
-    }
-    private unsubscribeAll() {
-        this.listeners.forEach((listener) => listener.unsubscribe());
-        this.listeners.splice(0, this.listeners.length);
-    }
-}
-</script>
-
-<style scoped lang="scss">
-@import "@/presentation/styles/colors.scss";
-@import "@/presentation/styles/fonts.scss";
-
-$inner-margin: 4px;
-
-.scripts {
-    margin-top: $inner-margin;
-    .tree {
-        padding-left: 3%;
-        padding-top: 15px;
-        padding-bottom: 15px;
-        &--searching {
-            padding-top: 0px;
-        }
-    }
-}
-
-.search {
-    display: flex;
-    flex-direction: column;
-    background-color: $slate;
-    &__query {
-        display: flex;
-        justify-content: center;
-        flex-direction: row;
-        align-items: center;
-        margin-top: 1em;
-        color: $gray;
-        &__close-button {
-            cursor: pointer;
-            font-size: 1.25em;
-            margin-left: 0.25rem;
-            &:hover {
-                opacity: 0.9;
-            }
-        }
-    }
-    &-no-matches {
-        display:flex;
-        flex-direction: column;
-        word-break:break-word;
-        text-transform: uppercase;
-        color: $light-gray;
-        font-size: 1.5em;
-        padding:10px;
-        text-align:center;
-        > div {
-            padding-bottom:13px;
-        }
-        a {
-            color: $gray;
-        }
-    }
-}
-
-.heading {
-    margin-top: $inner-margin;
-    display: flex;
-    flex-wrap: wrap;
-    .item {
-        flex: 1;
-        white-space: nowrap;
-        display: flex;
-        justify-content: center;
-        margin: 0 5px 0 5px;
-        &:first-child {
-            justify-content: flex-start;
-        }
-        &:last-child {
-            justify-content: flex-end;
-        }
-    }
-}
-</style>

src/presentation/background.ts

@@ -1,5 +1,9 @@
 'use strict';
 
+// This is main process of Electron, started as first thing when app starts.
+// 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 { createProtocol } from 'vue-cli-plugin-electron-builder/lib';
 import installExtension, { VUEJS_DEVTOOLS } from 'electron-devtools-installer';
@@ -34,6 +38,7 @@ function createWindow() {
     width: 1350,
     height: 955,
     webPreferences: {
+      contextIsolation: false, // To reach node https://github.com/nklayman/vue-cli-plugin-electron-builder/issues/1285
       // Use pluginOptions.nodeIntegration, leave this alone
       // See https://nklayman.github.io/vue-cli-plugin-electron-builder/guide/security.html#node-integration
       nodeIntegration: (process.env
@@ -110,14 +115,14 @@ if (isDevelopment) {
 function loadApplication(window: BrowserWindow) {
   if (process.env.WEBPACK_DEV_SERVER_URL) {
     // Load the url of the dev server if in development mode
-    win.loadURL(process.env.WEBPACK_DEV_SERVER_URL as string);
+    loadUrlWithNodeWorkaround(win, process.env.WEBPACK_DEV_SERVER_URL as string);
     if (!process.env.IS_TEST) {
       win.webContents.openDevTools();
     }
   } else {
     createProtocol('app');
     // Load the index.html when not in development
-    win.loadURL('app://./index.html');
+    loadUrlWithNodeWorkaround(win, 'app://./index.html');
     // tslint:disable-next-line:max-line-length
     autoUpdater.checkForUpdatesAndNotify(); // https://nklayman.github.io/vue-cli-plugin-electron-builder/guide/recipes.html#check-for-updates-in-background-js-ts
   }
@@ -131,3 +136,10 @@ function configureExternalsUrlsOpenBrowser(window: BrowserWindow) {
     }
   });
 }
+
+// Workaround for https://github.com/electron/electron/issues/19554 otherwise fs does not work
+function loadUrlWithNodeWorkaround(window: BrowserWindow, url: string) {
+  setTimeout(() => {
+    window.loadURL(url);
+  }, 10);
+}

src/presentation/bootstrapping/Modules/IconBootstrapper.ts

@@ -7,8 +7,7 @@ import { FontAwesomeIcon } from '@fortawesome/vue-fontawesome';
 import { faFolderOpen, faFolder, faSmile } from '@fortawesome/free-regular-svg-icons';
 /** SOLID ICONS (PREFIX: fas (default)) */
 import { faTimes, faFileDownload, faCopy, faSearch, faInfoCircle, faUserSecret, faDesktop,
-    faTag, faGlobe, faSave, faBatteryFull, faBatteryHalf } from '@fortawesome/free-solid-svg-icons';
-
+    faTag, faGlobe, faSave, faBatteryFull, faBatteryHalf, faPlay, faArrowsAltH } from '@fortawesome/free-solid-svg-icons';
 
 export class IconBootstrapper implements IVueBootstrapper {
     public bootstrap(vue: VueConstructor): void {
@@ -24,9 +23,12 @@ export class IconBootstrapper implements IVueBootstrapper {
             faTimes,
             faFileDownload, faSave,
             faCopy,
+            faPlay,
             faSearch,
             faBatteryFull, faBatteryHalf,
-            faInfoCircle);
+            faInfoCircle,
+            faArrowsAltH,
+        );
         vue.component('font-awesome-icon', FontAwesomeIcon);
     }
 }

src/presentation/components/App.vue

@@ -1,31 +1,28 @@
 <template>
   <div id="app">
       <div class="wrapper">
-          <TheHeader class="row" />
-          <TheSearchBar class="row" />
-          <TheScripts class="row"/>
-          <TheCodeArea class="row" theme="xcode" />
-          <TheCodeButtons class="row code-buttons" />
-          <TheFooter />
+        <TheHeader class="row" />
+        <TheSearchBar class="row" />
+        <TheScriptArea class="row" />
+        <TheCodeButtons class="row code-buttons" />
+        <TheFooter />
       </div>
    </div>
 </template>
 
 <script lang="ts">
 import { Component, Vue } from 'vue-property-decorator';
-import TheHeader from '@/presentation/TheHeader.vue';
-import TheFooter from '@/presentation/TheFooter/TheFooter.vue';
-import TheCodeArea from '@/presentation/TheCodeArea.vue';
-import TheCodeButtons from '@/presentation/CodeButtons/TheCodeButtons.vue';
-import TheSearchBar from '@/presentation/TheSearchBar.vue';
-import TheScripts from '@/presentation/Scripts/TheScripts.vue';
+import TheHeader from '@/presentation/components/TheHeader.vue';
+import TheFooter from '@/presentation/components/TheFooter/TheFooter.vue';
+import TheCodeButtons from '@/presentation/components/Code/CodeButtons/TheCodeButtons.vue';
+import TheScriptArea from '@/presentation/components/Scripts/TheScriptArea.vue';
+import TheSearchBar from '@/presentation/components/TheSearchBar.vue';
 
 @Component({
   components: {
     TheHeader,
-    TheCodeArea,
     TheCodeButtons,
-    TheScripts,
+    TheScriptArea,
     TheSearchBar,
     TheFooter,
   },
@@ -38,6 +35,7 @@ export default class App extends Vue {
 <style lang="scss">
 @import "@/presentation/styles/colors.scss";
 @import "@/presentation/styles/fonts.scss";
+@import "@/presentation/styles/media.scss";
 
 * {
   box-sizing: border-box;
@@ -49,12 +47,10 @@ body {
   color: $slate;
 }
 
-
 #app {
   margin-right: auto;
   margin-left: auto;
-  max-width: 1500px;
-  
+  max-width: 1600px;
   .wrapper {
     margin: 0% 2% 0% 2%;
     background-color: white;
@@ -62,18 +58,15 @@ body {
     padding: 2%;
     display:flex;
     flex-direction: column;
-
     .row {
       margin-bottom: 10px;
     }
-
     .code-buttons {
       padding-bottom: 10px;
     }
   }
 }
 
-
 @import "@/presentation/styles/tooltip.scss";
 @import "@/presentation/styles/tree.scss";
 </style>

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

@@ -1,8 +1,8 @@
 <template>
     <div class="instructions">
-        <!-- <p>
+        <p>
             Since you're using online version of {{ this.appName }}, you will need to do additional steps after downloading the file to execute your script on macOS:
-        </p> -->
+        </p>
         <p>
             <ol>
                 <li>
@@ -73,36 +73,33 @@
                 </li>
             </ol>
         </p>
-        <!-- <p>
+        <p>
             Or download the <a :href="this.macOsDownloadUrl">offline version</a> to run your scripts directly to skip these steps.
-        </p> -->
+        </p>
     </div>
 </template>
 
 <script lang="ts">
-import { Component, Prop } from 'vue-property-decorator';
-import { StatefulVue } from '@/presentation/StatefulVue';
+import { Component, Prop, Vue } from 'vue-property-decorator';
 import Code from './Code.vue';
-import { IApplication } from '@/domain/IApplication';
 import { OperatingSystem } from '@/domain/OperatingSystem';
+import { ApplicationFactory } from '@/application/ApplicationFactory';
 
 @Component({
     components: {
         Code,
     },
 })
-export default class MacOsInstructions extends StatefulVue {
+export default class MacOsInstructions extends Vue {
   @Prop() public fileName: string;
   public appName = '';
   public macOsDownloadUrl = '';
 
-  protected initialize(app: IApplication): void {
+  public async created() {
+    const app = await ApplicationFactory.Current.getAppAsync();
     this.appName = app.info.name;
     this.macOsDownloadUrl = app.info.getDownloadUrl(OperatingSystem.macOS);
   }
-  protected handleCollectionState(): void {
-    return;
-  }
 }
 </script>
 

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

@@ -1,5 +1,11 @@
 <template>
     <div class="container" v-if="hasCode">
+        <IconButton
+            v-if="this.canRun"
+            text="Run"
+            v-on:click="executeCodeAsync"
+            icon-prefix="fas" icon-name="play">
+        </IconButton>
         <IconButton
             :text="this.isDesktopVersion ? 'Save' : 'Download'"
             v-on:click="saveCodeAsync"
@@ -11,52 +17,43 @@
             v-on:click="copyCodeAsync"
             icon-prefix="fas" icon-name="copy">
         </IconButton>
-        <modal :name="macOsModalName" height="auto" :scrollable="true" :adaptive="true"
-          v-if="this.isMacOsCollection">
-          <div class="modal">
-            <div class="modal__content">
-                <MacOsInstructions :fileName="this.fileName" />
-            </div>
-            <div class="modal__close-button">
-              <font-awesome-icon :icon="['fas', 'times']"  @click="$modal.hide(macOsModalName)"/>
-            </div>
-          </div>
-        </modal>
+        <Dialog v-if="this.isMacOsCollection" ref="instructionsDialog">
+          <MacOsInstructions :fileName="this.fileName" />
+        </Dialog>
     </div>
 </template>
 
 <script lang="ts">
 import { Component } from 'vue-property-decorator';
-import { StatefulVue } from '@/presentation/StatefulVue';
+import { StatefulVue } from '@/presentation/components/Shared/StatefulVue';
 import { SaveFileDialog, FileType } from '@/infrastructure/SaveFileDialog';
 import { Clipboard } from '@/infrastructure/Clipboard';
+import Dialog from '@/presentation/components/Shared/Dialog.vue';
 import IconButton from './IconButton.vue';
 import MacOsInstructions from './MacOsInstructions.vue';
 import { Environment } from '@/application/Environment/Environment';
 import { ICategoryCollectionState } from '@/application/Context/State/ICategoryCollectionState';
 import { ScriptingLanguage } from '@/domain/ScriptingLanguage';
-import { IApplication } from '@/domain/IApplication';
 import { IApplicationCode } from '@/application/Context/State/Code/IApplicationCode';
-import { IEventSubscription } from '@/infrastructure/Events/ISubscription';
 import { IScriptingDefinition } from '@/domain/IScriptingDefinition';
 import { OperatingSystem } from '@/domain/OperatingSystem';
+import { runCodeAsync } from '@/infrastructure/CodeRunner';
+import { IApplicationContext } from '@/application/Context/IApplicationContext';
 
 @Component({
   components: {
     IconButton,
     MacOsInstructions,
+    Dialog,
   },
 })
 export default class TheCodeButtons extends StatefulVue {
-  public readonly macOsModalName = 'macos-instructions';
-
+  public readonly isDesktopVersion = Environment.CurrentEnvironment.isDesktop;
+  public canRun = false;
   public hasCode = false;
-  public isDesktopVersion = Environment.CurrentEnvironment.isDesktop;
   public isMacOsCollection = false;
   public fileName = '';
 
-  private codeListener: IEventSubscription;
-
   public async copyCodeAsync() {
     const code = await this.getCurrentCodeAsync();
     Clipboard.copyText(code.current);
@@ -65,19 +62,16 @@ export default class TheCodeButtons extends StatefulVue {
     const context = await this.getCurrentContextAsync();
     saveCode(this.fileName, context.state);
     if (this.isMacOsCollection) {
-      this.$modal.show(this.macOsModalName);
+      (this.$refs.instructionsDialog as any).show();
     }
   }
-  public destroyed() {
-    if (this.codeListener) {
-      this.codeListener.unsubscribe();
-    }
+  public async executeCodeAsync() {
+    const context = await this.getCurrentContextAsync();
+    await executeCodeAsync(context);
   }
 
-  protected initialize(app: IApplication): void {
-    return;
-  }
   protected handleCollectionState(newState: ICategoryCollectionState): void {
+    this.canRun = this.isDesktopVersion && newState.collection.os === Environment.CurrentEnvironment.os;
     this.isMacOsCollection = newState.collection.os === OperatingSystem.macOS;
     this.fileName = buildFileName(newState.collection.scripting);
     this.react(newState.code);
@@ -90,12 +84,10 @@ export default class TheCodeButtons extends StatefulVue {
   }
   private async react(code: IApplicationCode) {
     this.hasCode = code.current && code.current.length > 0;
-    if (this.codeListener) {
-      this.codeListener.unsubscribe();
-    }
-    this.codeListener = code.changed.on((newCode) => {
+    this.events.unsubscribeAll();
+    this.events.register(code.changed.on((newCode) => {
       this.hasCode = newCode && newCode.code.length > 0;
-    });
+    }));
   }
 }
 
@@ -122,12 +114,18 @@ function buildFileName(scripting: IScriptingDefinition) {
   }
   return fileName;
 }
+
+async function executeCodeAsync(context: IApplicationContext) {
+    await runCodeAsync(
+        /*code*/ context.state.code.current,
+        /*appName*/ context.app.info.name,
+        /*fileExtension*/ context.state.collection.scripting.fileExtension,
+      );
+}
+
 </script>
 
 <style scoped lang="scss">
-@import "@/presentation/styles/colors.scss";
-@import "@/presentation/styles/fonts.scss";
-
 .container {
     display: flex;
     flex-direction: row;
@@ -136,26 +134,4 @@ function buildFileName(scripting: IScriptingDefinition) {
 .container > * + * {
   margin-left: 30px;
 }
-.modal {
-    font-family: $normal-font;
-    margin-bottom: 10px;
-    display: flex;
-    flex-direction: row;
-
-    &__content {
-      width: 100%;
-      margin: 5%;
-    }
-
-    &__close-button {
-      width: auto;
-      font-size: 1.5em;
-      margin-right:0.25em;
-      align-self: flex-start;
-      cursor: pointer;
-      &:hover {
-        opacity: 0.9;
-      }
-    }
-}
 </style>

src/presentation/components/Code/TheCodeArea.vue

@@ -1,56 +1,55 @@
 <template>
-    <div :id="editorId" class="code-area" ></div>
+  <Responsive v-on:sizeChanged="sizeChanged()">
+    <div
+      :id="editorId"
+      class="code-area"
+    ></div>
+  </Responsive>
 </template>
 
 <script lang="ts">
 import { Component, Prop } from 'vue-property-decorator';
-import { StatefulVue } from './StatefulVue';
+import { StatefulVue } from '@/presentation/components/Shared/StatefulVue';
 import ace from 'ace-builds';
 import 'ace-builds/webpack-resolver';
 import { ICodeChangedEvent } from '@/application/Context/State/Code/Event/ICodeChangedEvent';
 import { IScript } from '@/domain/IScript';
 import { ScriptingLanguage } from '@/domain/ScriptingLanguage';
 import { ICategoryCollectionState } from '@/application/Context/State/ICategoryCollectionState';
-import { IApplication } from '@/domain/IApplication';
-import { IEventSubscription } from '@/infrastructure/Events/ISubscription';
-import { IApplicationCode } from '@/application/Context/State/Code/IApplicationCode';
 import { CodeBuilderFactory } from '@/application/Context/State/Code/Generation/CodeBuilderFactory';
+import Responsive from '@/presentation/components/Shared/Responsive.vue';
 
-@Component
+@Component({
+  components: {
+    Responsive,
+  },
+})
 export default class TheCodeArea extends StatefulVue {
   public readonly editorId = 'codeEditor';
 
   private editor!: ace.Ace.Editor;
   private currentMarkerId?: number;
-  private codeListener: IEventSubscription;
 
   @Prop() private theme!: string;
 
   public destroyed() {
-    this.unsubscribeCodeListening();
     this.destroyEditor();
   }
-
-  protected initialize(app: IApplication): void {
-    return;
+  public sizeChanged() {
+    if (this.editor) {
+      this.editor.resize();
+    }
   }
+
   protected handleCollectionState(newState: ICategoryCollectionState): void {
     this.destroyEditor();
     this.editor = initializeEditor(this.theme, this.editorId, newState.collection.scripting.language);
     const appCode = newState.code;
     this.editor.setValue(appCode.current || getDefaultCode(newState.collection.scripting.language), 1);
-    this.unsubscribeCodeListening();
-    this.subscribe(appCode);
+    this.events.unsubscribeAll();
+    this.events.register(appCode.changed.on((code) => this.updateCodeAsync(code)));
   }
 
-  private subscribe(appCode: IApplicationCode) {
-    this.codeListener = appCode.changed.on((code) => this.updateCodeAsync(code));
-  }
-  private unsubscribeCodeListening() {
-    if (this.codeListener) {
-      this.codeListener.unsubscribe();
-    }
-  }
   private async updateCodeAsync(event: ICodeChangedEvent) {
     this.removeCurrentHighlighting();
     if (event.isEmpty()) {
@@ -60,7 +59,6 @@ export default class TheCodeArea extends StatefulVue {
       return;
     }
     this.editor.setValue(event.code, 1);
-
     if (event.addedScripts && event.addedScripts.length) {
       this.reactToChanges(event, event.addedScripts);
     } else if (event.changedScripts && event.changedScripts.length) {
@@ -99,6 +97,7 @@ export default class TheCodeArea extends StatefulVue {
   private destroyEditor() {
     if (this.editor) {
       this.editor.destroy();
+      this.editor = undefined;
     }
   }
 }
@@ -111,6 +110,7 @@ function initializeEditor(theme: string, editorId: string, language: ScriptingLa
   editor.setTheme(`ace/theme/${theme}`);
   editor.setReadOnly(true);
   editor.setAutoScrollEditorIntoView(true);
+  editor.setShowPrintMargin(false); // hides vertical line
   editor.getSession().setUseWrapMode(true); // So code is readable on mobile
   return editor;
 }
@@ -145,17 +145,17 @@ function getDefaultCode(language: ScriptingLanguage): string {
 
 </script>
 
-<style lang="scss">
+<style scoped lang="scss">
 @import "@/presentation/styles/colors.scss";
-.code-area {
-    width: 100%;
-    max-height: 1000px;
-    min-height: 200px;
-    overflow: auto;
-    &__highlight {
-      background-color:$accent;
-      opacity: 0.2; // having procent fails in production (minified) build
-      position:absolute;
-    }
+::v-deep .code-area {
+  min-height: 200px;
+  width: 100%;
+  height: 100%;
+  overflow: auto;
+  &__highlight {
+    background-color: $accent;
+    opacity: 0.2; // having procent fails in production (minified) build
+    position: absolute;
+  }
 }
 </style>

src/presentation/components/Scripts/Cards/CardList.vue

@@ -1,8 +1,17 @@
 <template>
-  <div>
-    <div v-if="categoryIds != null && categoryIds.length > 0" class="cards">
+  <Responsive v-on:widthChanged="width = $event">
+    <!-- <div id="responsivity-debug">
+      Width: {{ width || 'undefined' }}
+      Size: <span v-if="width <= 500">small</span><span v-if="width > 500 && width < 750">medium</span><span v-if="width >= 750">big</span> 
+    </div> -->
+    <div v-if="categoryIds != null && categoryIds.length > 0"  class="cards">
       <CardListItem
         class="card"
+        v-bind:class="{ 
+          'small-screen': width <= 500,
+          'medium-screen': width > 500 && width < 750,
+          'big-screen': width >= 750         
+        }"
         v-for="categoryId of categoryIds"
         :data-category="categoryId"
         v-bind:key="categoryId"
@@ -12,24 +21,26 @@
       </CardListItem>
     </div>
     <div v-else class="error">Something went bad 😢</div>
-  </div>
+  </Responsive>
 </template>
 
 <script lang="ts">
-import { Component } from 'vue-property-decorator';
 import CardListItem from './CardListItem.vue';
-import { StatefulVue } from '@/presentation/StatefulVue';
+import Responsive from '@/presentation/components/Shared/Responsive.vue';
+import { Component } from 'vue-property-decorator';
+import { StatefulVue } from '@/presentation/components/Shared/StatefulVue';
 import { ICategory } from '@/domain/ICategory';
 import { hasDirective } from './NonCollapsingDirective';
 import { ICategoryCollectionState } from '@/application/Context/State/ICategoryCollectionState';
-import { IApplication } from '@/domain/IApplication';
 
 @Component({
   components: {
     CardListItem,
+    Responsive,
   },
 })
 export default class CardList extends StatefulVue {
+  public width: number = 0;
   public categoryIds: number[] = [];
   public activeCategoryId?: number = null;
 
@@ -45,9 +56,6 @@ export default class CardList extends StatefulVue {
     this.activeCategoryId = isExpanded ? categoryId : undefined;
   }
 
-  protected initialize(app: IApplication): void {
-    return;
-  }
   protected handleCollectionState(newState: ICategoryCollectionState, oldState: ICategoryCollectionState): void {
     this.setCategories(newState.collection.actions);
     this.activeCategoryId = undefined;
@@ -79,6 +87,7 @@ export default class CardList extends StatefulVue {
   flex-flow: row wrap;
   font-family: $main-font;
 }
+
 .error {
   width: 100%;
   text-align: center;

src/presentation/components/Scripts/Cards/CardListItem.vue

@@ -33,9 +33,8 @@
 
 <script lang="ts">
 import { Component, Prop, Watch, Emit } from 'vue-property-decorator';
-import ScriptsTree from '@/presentation/Scripts/ScriptsTree/ScriptsTree.vue';
-import { StatefulVue } from '@/presentation/StatefulVue';
-import { IEventSubscription } from '@/infrastructure/Events/ISubscription';
+import ScriptsTree from '@/presentation/components/Scripts/ScriptsTree/ScriptsTree.vue';
+import { StatefulVue } from '@/presentation/components/Shared/StatefulVue';
 
 @Component({
   components: {
@@ -50,17 +49,11 @@ export default class CardListItem extends StatefulVue {
   public isAnyChildSelected = false;
   public areAllChildrenSelected = false;
 
-  private selectionChangedListener: IEventSubscription;
-
   public async mounted() {
-    this.updateStateAsync(this.categoryId);
     const context = await this.getCurrentContextAsync();
-    this.selectionChangedListener = context.state.selection.changed.on(() => this.updateStateAsync(this.categoryId));
-  }
-  public destroyed() {
-    if (this.selectionChangedListener) {
-      this.selectionChangedListener.unsubscribe();
-    }
+    this.events.register(context.state.selection.changed.on(
+      () => this.updateSelectionIndicatorsAsync(this.categoryId)));
+    await this.updateStateAsync(this.categoryId);
   }
   @Emit('selected')
   public onSelected(isExpanded: boolean) {
@@ -81,19 +74,22 @@ export default class CardListItem extends StatefulVue {
   @Watch('categoryId')
   public async updateStateAsync(value: |number) {
     const context = await this.getCurrentContextAsync();
-    const category = !value ? undefined : context.state.collection.findCategory(this.categoryId);
+    const category = !value ? undefined : context.state.collection.findCategory(value);
     this.cardTitle = category ? category.name : undefined;
-    const currentSelection = context.state.selection;
-    this.isAnyChildSelected = category ? currentSelection.isAnySelected(category) : false;
-    this.areAllChildrenSelected = category ? currentSelection.areAllSelected(category) : false;
-  }
-  protected initialize(): void {
-    return;
+    await this.updateSelectionIndicatorsAsync(value);
   }
+
   protected handleCollectionState(): void {
-    // No need, as categoryId will be updated instead
     return;
   }
+
+  private async updateSelectionIndicatorsAsync(categoryId: number) {
+    const context = await this.getCurrentContextAsync();
+    const selection = context.state.selection;
+    const category = context.state.collection.findCategory(categoryId);
+    this.isAnyChildSelected = category ? selection.isAnySelected(category) : false;
+    this.areAllChildrenSelected = category ? selection.areAllSelected(category) : false;
+  }
 }
 
 </script>
@@ -110,12 +106,7 @@ $expanded-margin-top: 30px;
 
 .card {
   margin: 15px; 
-  width: calc((100% / 3) - #{$card-line-break-width});
   transition: all 0.2s ease-in-out;
-  // Media queries for stacking cards
-  @media screen and (max-width: $big-screen-width) {  width: calc((100% / 2) - #{$card-line-break-width}); }
-  @media screen and (max-width: $medium-screen-width) {  width: 100%; }
-  @media screen and (max-width: $small-screen-width) {  width: 90%; }
 
   &__inner {  
     padding: $card-padding $card-padding 0 $card-padding;
@@ -245,31 +236,32 @@ $expanded-margin-top: 30px;
     }
   }
 }
-
-@media screen and (min-width: $big-screen-width) { // when 3 cards in a row
-  .card:nth-of-type(3n+2) .card__expander {
-    margin-left: calc(-100% - #{$card-line-break-width});
-  }
-  .card:nth-of-type(3n+3) .card__expander {
-    margin-left: calc(-200% - (#{$card-line-break-width} * 2));
-  }
-  .card:nth-of-type(3n+4) {
-    clear: left;
+@mixin adaptive-card($cards-in-row) {
+  &.card {
+    width: calc((100% / #{$cards-in-row}) - #{$card-line-break-width});
+    @for $nth-card from 2 through $cards-in-row {
+      &:nth-of-type(#{$cards-in-row}n+#{$nth-card}) {
+        .card__expander {
+          $card-left: -100% * ($nth-card - 1);
+          $additional-space: $card-line-break-width * ($nth-card - 1);
+          margin-left: calc(#{$card-left} - #{$additional-space});
+        }
+      }
+    }
+    // Ensure new line after last row
+    $card-after-last: $cards-in-row + 1;
+    &:nth-of-type(#{$cards-in-row}n+#{$card-after-last}) {
+      clear: left;
+    }
   }
   .card__expander {
-    width: calc(300% + (#{$card-line-break-width} * 2));
+    $all-cards-width: 100% * $cards-in-row;
+    $card-padding: $card-line-break-width * ($cards-in-row - 1);
+    width: calc(#{$all-cards-width} + #{$card-padding});
   }
 }
 
-@media screen and (min-width: $medium-screen-width) and (max-width: $big-screen-width) { // when 2 cards in a row
-  .card:nth-of-type(2n+2) .card__expander {
-    margin-left: calc(-100% - #{$card-line-break-width});
-  }
-  .card:nth-of-type(2n+3) {
-    clear: left;
-  }
-  .card__expander {
-    width: calc(200% + #{$card-line-break-width});
-  }
-}
+.big-screen     {   @include adaptive-card(3);  }
+.medium-screen  {   @include adaptive-card(2);  }
+.small-screen   {   @include adaptive-card(1);  }
 </style>

src/presentation/components/Scripts/Cards/NonCollapsingDirective.ts

@@ -1,6 +1,6 @@
 import { DirectiveOptions } from 'vue';
 
-const attributeName = 'data-interactionDoesNotCollapse';
+const attributeName = 'data-interaction-does-not-collapse';
 
 export function hasDirective(el: Element): boolean {
     if (el.hasAttribute(attributeName)) {

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

@@ -7,7 +7,7 @@
 
 <script lang="ts">
 import { Component, Prop, Emit, Vue } from 'vue-property-decorator';
-import { NonCollapsing } from '@/presentation/Scripts/Cards/NonCollapsingDirective';
+import { NonCollapsing } from '@/presentation/components/Scripts/Cards/NonCollapsingDirective';
 
 @Component({
     directives: { NonCollapsing },

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

@@ -1,6 +1,6 @@
 <template>
     <div class="container">
-        <div class="part select">Select:</div>
+        <div class="part">Select:</div>
         <div class="part">
             <div class="part">
                 <SelectableOption
@@ -50,13 +50,12 @@
 
 <script lang="ts">
 import { Component } from 'vue-property-decorator';
-import { StatefulVue } from '@/presentation/StatefulVue';
+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 { IApplication } from '@/domain/IApplication';
 
 enum SelectionState {
     Standard,
@@ -82,9 +81,6 @@ export default class TheSelector extends StatefulVue {
         selectType(context.state, type);
     }
 
-    protected initialize(app: IApplication): void {
-        return;
-    }
     protected handleCollectionState(newState: ICategoryCollectionState, oldState: ICategoryCollectionState): void {
         this.updateSelections(newState);
         newState.selection.changed.on(() => this.updateSelections(newState));
@@ -177,5 +173,4 @@ function areAllSelected(
     }
     font-family: $normal-font;
 }
-
 </style>

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

@@ -1,12 +1,15 @@
 <template>
   <div class="container">
-    <div v-for="os in this.allOses" :key="os.name">
-      <span
-        class="name"
-        v-bind:class="{ 'current': currentOs === os.os }"
-        v-on:click="changeOsAsync(os.os)">
-        {{ os.name }}
-      </span>
+    <!-- <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>
 </template>
@@ -14,25 +17,26 @@
 <script lang="ts">
 import { Component } from 'vue-property-decorator';
 import { OperatingSystem } from '@/domain/OperatingSystem';
-import { StatefulVue } from '@/presentation/StatefulVue';
+import { StatefulVue } from '@/presentation/components/Shared/StatefulVue';
 import { ICategoryCollectionState } from '@/application/Context/State/ICategoryCollectionState';
-import { IApplication } from '@/domain/IApplication';
+import { ApplicationFactory } from '@/application/ApplicationFactory';
 
 @Component
 export default class TheOsChanger extends StatefulVue {
   public allOses: Array<{ name: string, os: OperatingSystem }> = [];
-  public currentOs: OperatingSystem = undefined;
+  public currentOs: OperatingSystem = OperatingSystem.Unknown;
 
+  public async created() {
+    const app = await ApplicationFactory.Current.getAppAsync();
+    this.allOses = app.getSupportedOsList()
+      .map((os) => ({ os, name: renderOsName(os) }));
+  }
   public async changeOsAsync(newOs: OperatingSystem) {
     const context = await this.getCurrentContextAsync();
     context.changeContext(newOs);
   }
 
-  protected initialize(app: IApplication): void {
-    this.allOses = app.getSupportedOsList()
-      .map((os) => ({ os, name: renderOsName(os) }));
-  }
-  protected handleCollectionState(newState: ICategoryCollectionState, oldState: ICategoryCollectionState): void {
+  protected handleCollectionState(newState: ICategoryCollectionState): void {
     this.currentOs = newState.os;
     this.$forceUpdate(); // v-bind:class is not updated otherwise
   }
@@ -41,7 +45,7 @@ export default class TheOsChanger extends StatefulVue {
 function renderOsName(os: OperatingSystem): string {
     switch (os) {
       case OperatingSystem.Windows: return 'Windows';
-      case OperatingSystem.macOS: return 'macOS (preview)';
+      case OperatingSystem.macOS: return 'macOS';
       default: throw new RangeError(`Cannot render os name: ${OperatingSystem[os]}`);
     }
 }
@@ -54,20 +58,24 @@ function renderOsName(os: OperatingSystem): string {
   font-family: $normal-font;
   display: flex;
   align-items: center;
-  div + div::before {
-      content: "|";
-      margin-left: 0.5rem;
-  }
-  .name {
-    &:not(.current) {
-      cursor: pointer;
-      &:hover {
-          font-weight: bold;
-          text-decoration: underline;
-      }
+  .os-list {
+    display: flex;
+    margin-left: 0.25rem;
+    div + div::before {
+        content: "|";
+        margin-left: 0.5rem;
     }
-    &.current {
-      color: $gray;
+    .os-name {
+      &:not(.current) {
+        cursor: pointer;
+        &:hover {
+            font-weight: bold;
+            text-decoration: underline;
+        }
+      }
+      &.current {
+        color: $gray;
+      }
     }
   }
 }

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

@@ -0,0 +1,77 @@
+<template>
+    <div id="container">
+        <TheSelector class="item" />
+        <TheOsChanger class="item"  />
+        <TheGrouper
+            class="item"
+            v-on:groupingChanged="$emit('groupingChanged', $event)"
+            v-if="!this.isSearching" />
+    </div>
+</template>
+
+<script lang="ts">
+import { Component } from 'vue-property-decorator';
+import TheOsChanger from './TheOsChanger.vue';
+import TheSelector from './Selector/TheSelector.vue';
+import TheGrouper from './Grouping/TheGrouper.vue';
+import { StatefulVue } from '@/presentation/components/Shared/StatefulVue';
+import { ICategoryCollectionState } from '@/application/Context/State/ICategoryCollectionState';
+import { IEventSubscription } from '@/infrastructure/Events/IEventSource';
+
+@Component({
+  components: {
+    TheSelector,
+    TheOsChanger,
+    TheGrouper,
+  },
+})
+export default class TheScriptsMenu extends StatefulVue {
+  public isSearching = false;
+
+  private listeners = new Array<IEventSubscription>();
+
+  public destroyed() {
+    this.unsubscribeAll();
+  }
+
+  protected initialize(): void {
+    return;
+  }
+  protected handleCollectionState(newState: ICategoryCollectionState): void {
+    this.subscribe(newState);
+  }
+
+  private subscribe(state: ICategoryCollectionState) {
+      this.listeners.push(state.filter.filterRemoved.on(() => {
+          this.isSearching = false;
+      }));
+      state.filter.filtered.on(() => {
+          this.isSearching = true;
+      });
+  }
+  private unsubscribeAll() {
+      this.listeners.forEach((listener) => listener.unsubscribe());
+      this.listeners.splice(0, this.listeners.length);
+  }
+}
+</script>
+
+<style scoped lang="scss">
+#container {
+    display: flex;
+    flex-wrap: wrap;
+    .item {
+        flex: 1;
+        white-space: nowrap;
+        display: flex;
+        justify-content: center;
+        margin: 0 5px 0 5px;
+        &:first-child {
+            justify-content: flex-start;
+        }
+        &:last-child {
+            justify-content: flex-end;
+        }
+    }
+}
+</style>

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

@@ -16,7 +16,7 @@
 
 <script lang="ts">
 import { Component, Prop, Watch } from 'vue-property-decorator';
-import { StatefulVue } from '@/presentation/StatefulVue';
+import { StatefulVue } from '@/presentation/components/Shared/StatefulVue';
 import { IScript } from '@/domain/IScript';
 import { ICategory } from '@/domain/ICategory';
 import { ICategoryCollectionState } from '@/application/Context/State/ICategoryCollectionState';
@@ -27,8 +27,6 @@ import SelectableTree from './SelectableTree/SelectableTree.vue';
 import { INode, NodeType } from './SelectableTree/Node/INode';
 import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript';
 import { INodeSelectedEvent } from './SelectableTree/INodeSelectedEvent';
-import { IApplication } from '@/domain/IApplication';
-import { IEventSubscription } from '@/infrastructure/Events/ISubscription';
 
 @Component({
   components: {
@@ -43,7 +41,6 @@ export default class ScriptsTree extends StatefulVue {
   public filterText?: string = null;
 
   private filtered?: IFilterResult;
-  private listeners = new Array<IEventSubscription>();
 
   public async toggleNodeSelectionAsync(event: INodeSelectedEvent) {
       const context = await this.getCurrentContextAsync();
@@ -75,31 +72,24 @@ export default class ScriptsTree extends StatefulVue {
       || this.filtered.categoryMatches.some(
         (category: ICategory) => node.id === getCategoryNodeId(category));
   }
-  public destroyed() {
-    this.unsubscribeAll();
-  }
 
-  protected initialize(app: IApplication): void {
-    return;
-  }
   protected async handleCollectionState(newState: ICategoryCollectionState) {
     this.setCurrentFilter(newState.filter.currentFilter);
     if (!this.categoryId) {
       this.nodes = parseAllCategories(newState.collection);
     }
-    this.unsubscribeAll();
-    this.subscribe(newState);
+    this.events.unsubscribeAll();
+    this.subscribeState(newState);
   }
 
-  private subscribe(state: ICategoryCollectionState) {
-    this.listeners.push(state.selection.changed.on(this.handleSelectionChanged));
-    this.listeners.push(state.filter.filterRemoved.on(this.handleFilterRemoved));
-    this.listeners.push(state.filter.filtered.on(this.handleFiltered));
-  }
-  private unsubscribeAll() {
-    this.listeners.forEach((listener) => listener.unsubscribe());
-    this.listeners.splice(0, this.listeners.length);
+  private subscribeState(state: ICategoryCollectionState) {
+    this.events.register(
+      state.selection.changed.on(this.handleSelectionChanged),
+      state.filter.filterRemoved.on(this.handleFilterRemoved),
+      state.filter.filtered.on(this.handleFiltered),
+    );
   }
+
   private setCurrentFilter(currentFilter: IFilterResult | undefined) {
     if (!currentFilter) {
       this.handleFilterRemoved();