From 34672414c3e0757173036e351df0a73c1708ded5 Mon Sep 17 00:00:00 2001 From: undergroundwires Date: Mon, 28 Dec 2020 22:11:23 +0100 Subject: [PATCH] refactor folders to move "/state" (IApplicationState) inside "/context" (IApplicationContext) --- CONTRIBUTING.md | 2 +- README.md | 2 +- .../{State => Context}/ApplicationContext.ts | 4 ++-- .../ApplicationContextProvider.ts | 2 +- .../{State => Context}/IApplicationContext.ts | 2 +- .../{ => Context}/State/ApplicationState.ts | 0 .../State/Code/ApplicationCode.ts | 4 ++-- .../State/Code/Event/CodeChangedEvent.ts | 2 +- .../State/Code/Event/ICodeChangedEvent.ts | 2 +- .../State/Code/Generation/CodeBuilder.ts | 0 .../State/Code/Generation/ICodeBuilder.ts | 0 .../State/Code/Generation/IUserScript.ts | 7 ++++++ .../Code/Generation/IUserScriptGenerator.ts | 2 +- .../Code/Generation/UserScriptGenerator.ts | 4 ++-- .../State/Code/IApplicationCode.ts | 0 .../State/Code/Position/CodePosition.ts | 0 .../State/Code/Position/ICodePosition.ts | 0 .../State/Filter/FilterResult.ts | 0 .../State/Filter/IFilterResult.ts | 0 .../{ => Context}/State/Filter/IUserFilter.ts | 0 .../{ => Context}/State/Filter/UserFilter.ts | 0 .../{ => Context}/State/IApplicationState.ts | 0 .../State/Selection/IUserSelection.ts | 0 .../State/Selection/SelectedScript.ts | 0 .../State/Selection/UserSelection.ts | 0 src/application/Parser/ApplicationParser.ts | 2 +- src/application/Parser/CategoryParser.ts | 2 +- .../Parser/Compiler/IScriptCompiler.ts | 2 +- .../Parser/Compiler/ScriptCompiler.ts | 2 +- src/application/Parser/ScriptParser.ts | 2 +- .../Parser/ScriptingDefinitionParser.ts | 2 +- .../State/Code/Generation/IUserScript.ts | 7 ------ .../Scripts/ScriptsTree/ScriptsTree.vue | 6 ++--- .../SelectableTree/Node/RevertToggle.vue | 2 +- .../Node/Reverter/CategoryReverter.ts | 4 ++-- .../SelectableTree/Node/Reverter/IReverter.ts | 4 ++-- .../Node/Reverter/ScriptReverter.ts | 4 ++-- .../Scripts/Selector/TheSelector.vue | 5 ++-- src/presentation/Scripts/TheScripts.vue | 2 +- src/presentation/StatefulVue.ts | 4 ++-- src/presentation/TheCodeArea.vue | 4 ++-- src/presentation/TheCodeButtons.vue | 6 ++--- src/presentation/TheSearchBar.vue | 2 +- .../ApplicationContext.spec.ts | 0 .../State/ApplicationState.spec.ts | 12 +++++----- .../State/Code/ApplicationCode.spec.ts | 24 +++++++++---------- .../State/Code/Event/CodeChangedEvent.spec.ts | 12 +++++----- .../State/Code/Generation/CodeBuilder.spec.ts | 2 +- .../Generation/UserScriptGenerator.spec.ts | 10 ++++---- .../State/Code/Position/CodePosition.spec.ts | 2 +- .../State/Filter/FilterResult.spec.ts | 6 ++--- .../State/Filter/UserFilter.spec.ts | 10 ++++---- .../State/Selection/SelectedScript.spec.ts | 4 ++-- .../State/Selection/UserSelection.spec.ts | 12 +++++----- .../application/Parser/CategoryParser.spec.ts | 2 +- .../Parser/Compiler/ScriptCompiler.spec.ts | 2 +- .../Parser/DocumentationParser.spec.ts | 2 +- .../Parser/ScriptingDefinitionParser.spec.ts | 2 +- .../Node/Reverter/CategoryReverter.spec.ts | 4 ++-- .../Node/Reverter/ScriptReverter.spec.ts | 4 ++-- tests/unit/stubs/ScriptCompilerStub.ts | 2 +- tests/unit/stubs/ScriptStub.ts | 2 +- tests/unit/stubs/SelectedScriptStub.ts | 2 +- tests/unit/stubs/YamlScriptStub.ts | 2 +- 64 files changed, 106 insertions(+), 107 deletions(-) rename src/application/{State => Context}/ApplicationContext.ts (84%) rename src/application/{State => Context}/ApplicationContextProvider.ts (82%) rename src/application/{State => Context}/IApplicationContext.ts (72%) rename src/application/{ => Context}/State/ApplicationState.ts (100%) rename src/application/{ => Context}/State/Code/ApplicationCode.ts (91%) rename src/application/{ => Context}/State/Code/Event/CodeChangedEvent.ts (96%) rename src/application/{ => Context}/State/Code/Event/ICodeChangedEvent.ts (78%) rename src/application/{ => Context}/State/Code/Generation/CodeBuilder.ts (100%) rename src/application/{ => Context}/State/Code/Generation/ICodeBuilder.ts (100%) create mode 100644 src/application/Context/State/Code/Generation/IUserScript.ts rename src/application/{ => Context}/State/Code/Generation/IUserScriptGenerator.ts (77%) rename src/application/{ => Context}/State/Code/Generation/UserScriptGenerator.ts (93%) rename src/application/{ => Context}/State/Code/IApplicationCode.ts (100%) rename src/application/{ => Context}/State/Code/Position/CodePosition.ts (100%) rename src/application/{ => Context}/State/Code/Position/ICodePosition.ts (100%) rename src/application/{ => Context}/State/Filter/FilterResult.ts (100%) rename src/application/{ => Context}/State/Filter/IFilterResult.ts (100%) rename src/application/{ => Context}/State/Filter/IUserFilter.ts (100%) rename src/application/{ => Context}/State/Filter/UserFilter.ts (100%) rename src/application/{ => Context}/State/IApplicationState.ts (100%) rename src/application/{ => Context}/State/Selection/IUserSelection.ts (100%) rename src/application/{ => Context}/State/Selection/SelectedScript.ts (100%) rename src/application/{ => Context}/State/Selection/UserSelection.ts (100%) delete mode 100644 src/application/State/Code/Generation/IUserScript.ts rename tests/unit/application/{State => Context}/ApplicationContext.spec.ts (100%) rename tests/unit/application/{ => Context}/State/ApplicationState.spec.ts (87%) rename tests/unit/application/{ => Context}/State/Code/ApplicationCode.spec.ts (89%) rename tests/unit/application/{ => Context}/State/Code/Event/CodeChangedEvent.spec.ts (92%) rename tests/unit/application/{ => Context}/State/Code/Generation/CodeBuilder.spec.ts (97%) rename tests/unit/application/{ => Context}/State/Code/Generation/UserScriptGenerator.spec.ts (95%) rename tests/unit/application/{ => Context}/State/Code/Position/CodePosition.spec.ts (95%) rename tests/unit/application/{ => Context}/State/Filter/FilterResult.spec.ts (88%) rename tests/unit/application/{ => Context}/State/Filter/UserFilter.spec.ts (95%) rename tests/unit/application/{ => Context}/State/Selection/SelectedScript.spec.ts (85%) rename tests/unit/application/{ => Context}/State/Selection/UserSelection.spec.ts (97%) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 70a72fb3..dd3a2160 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -31,7 +31,7 @@ - **Stateless**, extends `Vue` - **Stateful**, extends [`StatefulVue`](./src/presentation/StatefulVue.ts) - The source of truth for the state lies in application layer (`./src/application/`) and must be updated from the views if they're mutating the state - - They mutate or/and react to changes in [application state](src/application/State/ApplicationState.ts). + - They mutate or/and react to changes in [application state](src/application/Context/State/ApplicationState.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 diff --git a/README.md b/README.md index 97f24843..873a298d 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ - Event driven as in components simply listens to events from the state and act accordingly. - **Application Layer** - Keeps the application state - - The [state](src/application/State/ApplicationState.ts) is a mutable singleton & event producer. + - The [state](src/application/Context/State/ApplicationState.ts) is a mutable singleton & event producer. - The application is defined & controlled in a [single YAML file](src/application/application.yaml) (see [Data-driven programming](https://en.wikipedia.org/wiki/Data-driven_programming)) ![DDD + vue.js](img/architecture/app-ddd.png) diff --git a/src/application/State/ApplicationContext.ts b/src/application/Context/ApplicationContext.ts similarity index 84% rename from src/application/State/ApplicationContext.ts rename to src/application/Context/ApplicationContext.ts index 1fd26e59..e0b762e4 100644 --- a/src/application/State/ApplicationContext.ts +++ b/src/application/Context/ApplicationContext.ts @@ -1,7 +1,7 @@ import { IApplicationContext } from './IApplicationContext'; import { IApplication } from '@/domain/IApplication'; -import { IApplicationState } from './IApplicationState'; -import { ApplicationState } from './ApplicationState'; +import { IApplicationState } from './State/IApplicationState'; +import { ApplicationState } from './State/ApplicationState'; import applicationFile from 'js-yaml-loader!@/application/application.yaml'; import { parseApplication } from '../Parser/ApplicationParser'; diff --git a/src/application/State/ApplicationContextProvider.ts b/src/application/Context/ApplicationContextProvider.ts similarity index 82% rename from src/application/State/ApplicationContextProvider.ts rename to src/application/Context/ApplicationContextProvider.ts index a0482da4..9207cd7e 100644 --- a/src/application/State/ApplicationContextProvider.ts +++ b/src/application/Context/ApplicationContextProvider.ts @@ -1,5 +1,5 @@ import { ApplicationContext } from './ApplicationContext'; -import { IApplicationContext } from '@/application/State/IApplicationContext'; +import { IApplicationContext } from '@/application/Context/IApplicationContext'; import applicationFile from 'js-yaml-loader!@/application/application.yaml'; import { parseApplication } from '@/application/Parser/ApplicationParser'; diff --git a/src/application/State/IApplicationContext.ts b/src/application/Context/IApplicationContext.ts similarity index 72% rename from src/application/State/IApplicationContext.ts rename to src/application/Context/IApplicationContext.ts index 70666ff3..50afa734 100644 --- a/src/application/State/IApplicationContext.ts +++ b/src/application/Context/IApplicationContext.ts @@ -1,5 +1,5 @@ import { IApplication } from '@/domain/IApplication'; -import { IApplicationState } from './IApplicationState'; +import { IApplicationState } from './State/IApplicationState'; export interface IApplicationContext { readonly app: IApplication; diff --git a/src/application/State/ApplicationState.ts b/src/application/Context/State/ApplicationState.ts similarity index 100% rename from src/application/State/ApplicationState.ts rename to src/application/Context/State/ApplicationState.ts diff --git a/src/application/State/Code/ApplicationCode.ts b/src/application/Context/State/Code/ApplicationCode.ts similarity index 91% rename from src/application/State/Code/ApplicationCode.ts rename to src/application/Context/State/Code/ApplicationCode.ts index 1f81db02..c9b5e8f5 100644 --- a/src/application/State/Code/ApplicationCode.ts +++ b/src/application/Context/State/Code/ApplicationCode.ts @@ -1,8 +1,8 @@ import { CodeChangedEvent } from './Event/CodeChangedEvent'; import { CodePosition } from './Position/CodePosition'; import { ICodeChangedEvent } from './Event/ICodeChangedEvent'; -import { SelectedScript } from '@/application/State/Selection/SelectedScript'; -import { IUserSelection } from '@/application/State/Selection/IUserSelection'; +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 { IApplicationCode } from './IApplicationCode'; diff --git a/src/application/State/Code/Event/CodeChangedEvent.ts b/src/application/Context/State/Code/Event/CodeChangedEvent.ts similarity index 96% rename from src/application/State/Code/Event/CodeChangedEvent.ts rename to src/application/Context/State/Code/Event/CodeChangedEvent.ts index 6ab3d58c..cffd6c14 100644 --- a/src/application/State/Code/Event/CodeChangedEvent.ts +++ b/src/application/Context/State/Code/Event/CodeChangedEvent.ts @@ -1,7 +1,7 @@ import { ICodeChangedEvent } from './ICodeChangedEvent'; import { SelectedScript } from '../../Selection/SelectedScript'; import { IScript } from '@/domain/IScript'; -import { ICodePosition } from '@/application/State/Code/Position/ICodePosition'; +import { ICodePosition } from '@/application/Context/State/Code/Position/ICodePosition'; export class CodeChangedEvent implements ICodeChangedEvent { public readonly code: string; diff --git a/src/application/State/Code/Event/ICodeChangedEvent.ts b/src/application/Context/State/Code/Event/ICodeChangedEvent.ts similarity index 78% rename from src/application/State/Code/Event/ICodeChangedEvent.ts rename to src/application/Context/State/Code/Event/ICodeChangedEvent.ts index 49733de6..87780f1a 100644 --- a/src/application/State/Code/Event/ICodeChangedEvent.ts +++ b/src/application/Context/State/Code/Event/ICodeChangedEvent.ts @@ -1,5 +1,5 @@ import { IScript } from '@/domain/IScript'; -import { ICodePosition } from '@/application/State/Code/Position/ICodePosition'; +import { ICodePosition } from '@/application/Context/State/Code/Position/ICodePosition'; export interface ICodeChangedEvent { readonly code: string; diff --git a/src/application/State/Code/Generation/CodeBuilder.ts b/src/application/Context/State/Code/Generation/CodeBuilder.ts similarity index 100% rename from src/application/State/Code/Generation/CodeBuilder.ts rename to src/application/Context/State/Code/Generation/CodeBuilder.ts diff --git a/src/application/State/Code/Generation/ICodeBuilder.ts b/src/application/Context/State/Code/Generation/ICodeBuilder.ts similarity index 100% rename from src/application/State/Code/Generation/ICodeBuilder.ts rename to src/application/Context/State/Code/Generation/ICodeBuilder.ts diff --git a/src/application/Context/State/Code/Generation/IUserScript.ts b/src/application/Context/State/Code/Generation/IUserScript.ts new file mode 100644 index 00000000..7bbeb05a --- /dev/null +++ b/src/application/Context/State/Code/Generation/IUserScript.ts @@ -0,0 +1,7 @@ +import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript'; +import { ICodePosition } from '@/application/Context/State/Code/Position/ICodePosition'; + +export interface IUserScript { + code: string; + scriptPositions: Map; +} diff --git a/src/application/State/Code/Generation/IUserScriptGenerator.ts b/src/application/Context/State/Code/Generation/IUserScriptGenerator.ts similarity index 77% rename from src/application/State/Code/Generation/IUserScriptGenerator.ts rename to src/application/Context/State/Code/Generation/IUserScriptGenerator.ts index 63273041..10aee8b5 100644 --- a/src/application/State/Code/Generation/IUserScriptGenerator.ts +++ b/src/application/Context/State/Code/Generation/IUserScriptGenerator.ts @@ -1,4 +1,4 @@ -import { SelectedScript } from '@/application/State/Selection/SelectedScript'; +import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript'; import { IUserScript } from './IUserScript'; import { IScriptingDefinition } from '@/domain/IScriptingDefinition'; diff --git a/src/application/State/Code/Generation/UserScriptGenerator.ts b/src/application/Context/State/Code/Generation/UserScriptGenerator.ts similarity index 93% rename from src/application/State/Code/Generation/UserScriptGenerator.ts rename to src/application/Context/State/Code/Generation/UserScriptGenerator.ts index 667466a6..4fe13583 100644 --- a/src/application/State/Code/Generation/UserScriptGenerator.ts +++ b/src/application/Context/State/Code/Generation/UserScriptGenerator.ts @@ -1,7 +1,7 @@ -import { SelectedScript } from '@/application/State/Selection/SelectedScript'; +import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript'; import { IUserScriptGenerator } from './IUserScriptGenerator'; import { CodeBuilder } from './CodeBuilder'; -import { ICodePosition } from '@/application/State/Code/Position/ICodePosition'; +import { ICodePosition } from '@/application/Context/State/Code/Position/ICodePosition'; import { CodePosition } from '../Position/CodePosition'; import { IUserScript } from './IUserScript'; import { IScriptingDefinition } from '@/domain/IScriptingDefinition'; diff --git a/src/application/State/Code/IApplicationCode.ts b/src/application/Context/State/Code/IApplicationCode.ts similarity index 100% rename from src/application/State/Code/IApplicationCode.ts rename to src/application/Context/State/Code/IApplicationCode.ts diff --git a/src/application/State/Code/Position/CodePosition.ts b/src/application/Context/State/Code/Position/CodePosition.ts similarity index 100% rename from src/application/State/Code/Position/CodePosition.ts rename to src/application/Context/State/Code/Position/CodePosition.ts diff --git a/src/application/State/Code/Position/ICodePosition.ts b/src/application/Context/State/Code/Position/ICodePosition.ts similarity index 100% rename from src/application/State/Code/Position/ICodePosition.ts rename to src/application/Context/State/Code/Position/ICodePosition.ts diff --git a/src/application/State/Filter/FilterResult.ts b/src/application/Context/State/Filter/FilterResult.ts similarity index 100% rename from src/application/State/Filter/FilterResult.ts rename to src/application/Context/State/Filter/FilterResult.ts diff --git a/src/application/State/Filter/IFilterResult.ts b/src/application/Context/State/Filter/IFilterResult.ts similarity index 100% rename from src/application/State/Filter/IFilterResult.ts rename to src/application/Context/State/Filter/IFilterResult.ts diff --git a/src/application/State/Filter/IUserFilter.ts b/src/application/Context/State/Filter/IUserFilter.ts similarity index 100% rename from src/application/State/Filter/IUserFilter.ts rename to src/application/Context/State/Filter/IUserFilter.ts diff --git a/src/application/State/Filter/UserFilter.ts b/src/application/Context/State/Filter/UserFilter.ts similarity index 100% rename from src/application/State/Filter/UserFilter.ts rename to src/application/Context/State/Filter/UserFilter.ts diff --git a/src/application/State/IApplicationState.ts b/src/application/Context/State/IApplicationState.ts similarity index 100% rename from src/application/State/IApplicationState.ts rename to src/application/Context/State/IApplicationState.ts diff --git a/src/application/State/Selection/IUserSelection.ts b/src/application/Context/State/Selection/IUserSelection.ts similarity index 100% rename from src/application/State/Selection/IUserSelection.ts rename to src/application/Context/State/Selection/IUserSelection.ts diff --git a/src/application/State/Selection/SelectedScript.ts b/src/application/Context/State/Selection/SelectedScript.ts similarity index 100% rename from src/application/State/Selection/SelectedScript.ts rename to src/application/Context/State/Selection/SelectedScript.ts diff --git a/src/application/State/Selection/UserSelection.ts b/src/application/Context/State/Selection/UserSelection.ts similarity index 100% rename from src/application/State/Selection/UserSelection.ts rename to src/application/Context/State/Selection/UserSelection.ts diff --git a/src/application/Parser/ApplicationParser.ts b/src/application/Parser/ApplicationParser.ts index 743366b0..2950a13e 100644 --- a/src/application/Parser/ApplicationParser.ts +++ b/src/application/Parser/ApplicationParser.ts @@ -1,7 +1,7 @@ import { Category } from '@/domain/Category'; import { Application } from '@/domain/Application'; import { IApplication } from '@/domain/IApplication'; -import { YamlApplication } from 'js-yaml-loader!./../application.yaml'; +import { YamlApplication } from 'js-yaml-loader!@/application.yaml'; import { parseCategory } from './CategoryParser'; import { parseProjectInformation } from './ProjectInformationParser'; import { ScriptCompiler } from './Compiler/ScriptCompiler'; diff --git a/src/application/Parser/CategoryParser.ts b/src/application/Parser/CategoryParser.ts index d806c39d..09943ff7 100644 --- a/src/application/Parser/CategoryParser.ts +++ b/src/application/Parser/CategoryParser.ts @@ -1,4 +1,4 @@ -import { YamlCategory, YamlScript } from 'js-yaml-loader!./application.yaml'; +import { YamlCategory, YamlScript } from 'js-yaml-loader!@/application.yaml'; import { Script } from '@/domain/Script'; import { Category } from '@/domain/Category'; import { parseDocUrls } from './DocumentationParser'; diff --git a/src/application/Parser/Compiler/IScriptCompiler.ts b/src/application/Parser/Compiler/IScriptCompiler.ts index 747a98fe..1a838261 100644 --- a/src/application/Parser/Compiler/IScriptCompiler.ts +++ b/src/application/Parser/Compiler/IScriptCompiler.ts @@ -1,5 +1,5 @@ import { IScriptCode } from '@/domain/IScriptCode'; -import { YamlScript } from 'js-yaml-loader!./application.yaml'; +import { YamlScript } from 'js-yaml-loader!@/application.yaml'; export interface IScriptCompiler { canCompile(script: YamlScript): boolean; diff --git a/src/application/Parser/Compiler/ScriptCompiler.ts b/src/application/Parser/Compiler/ScriptCompiler.ts index 513eaa5b..5d50800d 100644 --- a/src/application/Parser/Compiler/ScriptCompiler.ts +++ b/src/application/Parser/Compiler/ScriptCompiler.ts @@ -1,7 +1,7 @@ import { generateIlCode, IILCode } from './ILCode'; import { IScriptCode } from '@/domain/IScriptCode'; import { ScriptCode } from '@/domain/ScriptCode'; -import { YamlScript, YamlFunction, FunctionCall, ScriptFunctionCall, FunctionCallParameters } from 'js-yaml-loader!./application.yaml'; +import { YamlScript, YamlFunction, FunctionCall, ScriptFunctionCall, FunctionCallParameters } from 'js-yaml-loader!@/application.yaml'; import { IScriptCompiler } from './IScriptCompiler'; interface ICompiledCode { diff --git a/src/application/Parser/ScriptParser.ts b/src/application/Parser/ScriptParser.ts index d1ffc38b..64d04593 100644 --- a/src/application/Parser/ScriptParser.ts +++ b/src/application/Parser/ScriptParser.ts @@ -1,5 +1,5 @@ import { Script } from '@/domain/Script'; -import { YamlScript } from 'js-yaml-loader!./application.yaml'; +import { YamlScript } from 'js-yaml-loader!@/application.yaml'; import { parseDocUrls } from './DocumentationParser'; import { RecommendationLevel } from '@/domain/RecommendationLevel'; import { IScriptCompiler } from './Compiler/IScriptCompiler'; diff --git a/src/application/Parser/ScriptingDefinitionParser.ts b/src/application/Parser/ScriptingDefinitionParser.ts index c303fc20..9776ad78 100644 --- a/src/application/Parser/ScriptingDefinitionParser.ts +++ b/src/application/Parser/ScriptingDefinitionParser.ts @@ -1,5 +1,5 @@ import { IScriptingDefinition } from '@/domain/IScriptingDefinition'; -import { YamlScriptingDefinition } from 'js-yaml-loader!./application.yaml'; +import { YamlScriptingDefinition } from 'js-yaml-loader!@/application.yaml'; import { ScriptingDefinition } from '@/domain/ScriptingDefinition'; import { ScriptingLanguage } from '@/domain/ScriptingLanguage'; import { IProjectInformation } from '@/domain/IProjectInformation'; diff --git a/src/application/State/Code/Generation/IUserScript.ts b/src/application/State/Code/Generation/IUserScript.ts deleted file mode 100644 index 99d57d31..00000000 --- a/src/application/State/Code/Generation/IUserScript.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { SelectedScript } from '@/application/State/Selection/SelectedScript'; -import { ICodePosition } from '@/application/State/Code/Position/ICodePosition'; - -export interface IUserScript { - code: string; - scriptPositions: Map; -} diff --git a/src/presentation/Scripts/ScriptsTree/ScriptsTree.vue b/src/presentation/Scripts/ScriptsTree/ScriptsTree.vue index 1a3630ca..b899621b 100644 --- a/src/presentation/Scripts/ScriptsTree/ScriptsTree.vue +++ b/src/presentation/Scripts/ScriptsTree/ScriptsTree.vue @@ -19,12 +19,12 @@ import { StatefulVue } from '@/presentation/StatefulVue'; import { IScript } from '@/domain/IScript'; import { ICategory } from '@/domain/ICategory'; - import { IApplicationState } from '@/application/State/IApplicationState'; - import { IFilterResult } from '@/application/State/Filter/IFilterResult'; + import { IApplicationState } from '@/application/Context/State/IApplicationState'; + import { IFilterResult } from '@/application/Context/State/Filter/IFilterResult'; import { parseAllCategories, parseSingleCategory, getScriptNodeId, getCategoryNodeId, getCategoryId, getScriptId } from './ScriptNodeParser'; import SelectableTree from './SelectableTree/SelectableTree.vue'; import { INode, NodeType } from './SelectableTree/Node/INode'; - import { SelectedScript } from '@/application/State/Selection/SelectedScript'; + import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript'; import { INodeSelectedEvent } from './SelectableTree/INodeSelectedEvent'; @Component({ diff --git a/src/presentation/Scripts/ScriptsTree/SelectableTree/Node/RevertToggle.vue b/src/presentation/Scripts/ScriptsTree/SelectableTree/Node/RevertToggle.vue index f2b495d8..9e264481 100644 --- a/src/presentation/Scripts/ScriptsTree/SelectableTree/Node/RevertToggle.vue +++ b/src/presentation/Scripts/ScriptsTree/SelectableTree/Node/RevertToggle.vue @@ -17,7 +17,7 @@ import { IReverter } from './Reverter/IReverter'; import { StatefulVue } from '@/presentation/StatefulVue'; import { INode } from './INode'; - import { SelectedScript } from '@/application/State/Selection/SelectedScript'; + import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript'; import { getReverter } from './Reverter/ReverterFactory'; @Component diff --git a/src/presentation/Scripts/ScriptsTree/SelectableTree/Node/Reverter/CategoryReverter.ts b/src/presentation/Scripts/ScriptsTree/SelectableTree/Node/Reverter/CategoryReverter.ts index abf6cc33..bda1b11e 100644 --- a/src/presentation/Scripts/ScriptsTree/SelectableTree/Node/Reverter/CategoryReverter.ts +++ b/src/presentation/Scripts/ScriptsTree/SelectableTree/Node/Reverter/CategoryReverter.ts @@ -1,9 +1,9 @@ import { IReverter } from './IReverter'; import { getCategoryId } from '../../../ScriptNodeParser'; -import { SelectedScript } from '@/application/State/Selection/SelectedScript'; +import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript'; import { IApplication } from '@/domain/IApplication'; import { ScriptReverter } from './ScriptReverter'; -import { IUserSelection } from '@/application/State/Selection/IUserSelection'; +import { IUserSelection } from '@/application/Context/State/Selection/IUserSelection'; export class CategoryReverter implements IReverter { private readonly categoryId: number; diff --git a/src/presentation/Scripts/ScriptsTree/SelectableTree/Node/Reverter/IReverter.ts b/src/presentation/Scripts/ScriptsTree/SelectableTree/Node/Reverter/IReverter.ts index 8df201c6..0a16a966 100644 --- a/src/presentation/Scripts/ScriptsTree/SelectableTree/Node/Reverter/IReverter.ts +++ b/src/presentation/Scripts/ScriptsTree/SelectableTree/Node/Reverter/IReverter.ts @@ -1,5 +1,5 @@ -import { SelectedScript } from '@/application/State/Selection/SelectedScript'; -import { IUserSelection } from '@/application/State/IApplicationState'; +import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript'; +import { IUserSelection } from '@/application/Context/State/IApplicationState'; export interface IReverter { getState(selectedScripts: ReadonlyArray): boolean; diff --git a/src/presentation/Scripts/ScriptsTree/SelectableTree/Node/Reverter/ScriptReverter.ts b/src/presentation/Scripts/ScriptsTree/SelectableTree/Node/Reverter/ScriptReverter.ts index 4c2f9075..415a2eb5 100644 --- a/src/presentation/Scripts/ScriptsTree/SelectableTree/Node/Reverter/ScriptReverter.ts +++ b/src/presentation/Scripts/ScriptsTree/SelectableTree/Node/Reverter/ScriptReverter.ts @@ -1,7 +1,7 @@ import { IReverter } from './IReverter'; import { getScriptId } from '../../../ScriptNodeParser'; -import { SelectedScript } from '@/application/State/Selection/SelectedScript'; -import { IUserSelection } from '@/application/State/IApplicationState'; +import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript'; +import { IUserSelection } from '@/application/Context/State/IApplicationState'; export class ScriptReverter implements IReverter { private readonly scriptId: string; diff --git a/src/presentation/Scripts/Selector/TheSelector.vue b/src/presentation/Scripts/Selector/TheSelector.vue index 187b47b4..c890c1b5 100644 --- a/src/presentation/Scripts/Selector/TheSelector.vue +++ b/src/presentation/Scripts/Selector/TheSelector.vue @@ -45,11 +45,10 @@ import { Component } from 'vue-property-decorator'; import { StatefulVue } from '@/presentation/StatefulVue'; import SelectableOption from './SelectableOption.vue'; -import { IApplicationState } from '@/application/State/IApplicationState'; import { IScript } from '@/domain/IScript'; -import { SelectedScript } from '@/application/State/Selection/SelectedScript'; +import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript'; import { RecommendationLevel } from '@/domain/RecommendationLevel'; -import { IApplicationContext } from '../../../application/State/IApplicationContext'; +import { IApplicationContext } from '@/application/Context/IApplicationContext'; enum SelectionState { Standard, diff --git a/src/presentation/Scripts/TheScripts.vue b/src/presentation/Scripts/TheScripts.vue index 0b820969..8795fc37 100644 --- a/src/presentation/Scripts/TheScripts.vue +++ b/src/presentation/Scripts/TheScripts.vue @@ -40,7 +40,7 @@ import { Component } from 'vue-property-decorator'; import { StatefulVue } from '@/presentation/StatefulVue'; import { Grouping } from './Grouping/Grouping'; - import { IFilterResult } from '@/application/State/Filter/IFilterResult'; + import { IFilterResult } from '@/application/Context/State/Filter/IFilterResult'; import TheGrouper from '@/presentation/Scripts/Grouping/TheGrouper.vue'; import TheSelector from '@/presentation/Scripts/Selector/TheSelector.vue'; import ScriptsTree from '@/presentation/Scripts/ScriptsTree/ScriptsTree.vue'; diff --git a/src/presentation/StatefulVue.ts b/src/presentation/StatefulVue.ts index 755c5e43..e7b0faac 100644 --- a/src/presentation/StatefulVue.ts +++ b/src/presentation/StatefulVue.ts @@ -1,7 +1,7 @@ import { Vue } from 'vue-property-decorator'; import { AsyncLazy } from '@/infrastructure/Threading/AsyncLazy'; -import { IApplicationContext } from '@/application/State/IApplicationContext'; -import { buildContext } from '@/application/State/ApplicationContextProvider'; +import { IApplicationContext } from '@/application/Context/IApplicationContext'; +import { buildContext } from '@/application/Context/ApplicationContextProvider'; export abstract class StatefulVue extends Vue { private static instance = new AsyncLazy( diff --git a/src/presentation/TheCodeArea.vue b/src/presentation/TheCodeArea.vue index d9aceaf3..055d6e65 100644 --- a/src/presentation/TheCodeArea.vue +++ b/src/presentation/TheCodeArea.vue @@ -7,8 +7,8 @@ import { Component, Prop } from 'vue-property-decorator'; import { StatefulVue } from './StatefulVue'; import ace from 'ace-builds'; import 'ace-builds/webpack-resolver'; -import { CodeBuilder } from '@/application/State/Code/Generation/CodeBuilder'; -import { ICodeChangedEvent } from '@/application/State/Code/Event/ICodeChangedEvent'; +import { CodeBuilder } from '@/application/Context/State/Code/Generation/CodeBuilder'; +import { ICodeChangedEvent } from '@/application/Context/State/Code/Event/ICodeChangedEvent'; import { IScript } from '@/domain/IScript'; import { ScriptingLanguage } from '@/domain/ScriptingLanguage'; diff --git a/src/presentation/TheCodeButtons.vue b/src/presentation/TheCodeButtons.vue index 8ff6623f..d0999c19 100644 --- a/src/presentation/TheCodeButtons.vue +++ b/src/presentation/TheCodeButtons.vue @@ -21,9 +21,9 @@ import { SaveFileDialog, FileType } from '@/infrastructure/SaveFileDialog'; import { Clipboard } from '@/infrastructure/Clipboard'; import IconButton from './IconButton.vue'; import { Environment } from '@/application/Environment/Environment'; -import { IApplicationCode } from '../application/State/IApplicationState'; +import { IApplicationCode } from '@/application/Context/State/IApplicationState'; import { ScriptingLanguage } from '@/domain/ScriptingLanguage'; -import { IApplicationContext } from '@/application/State/IApplicationContext'; +import { IApplicationContext } from '@/application/Context/IApplicationContext'; @Component({ components: { @@ -64,7 +64,7 @@ function saveCode(context: IApplicationContext) { const fileName = `privacy-script.${context.app.scripting.fileExtension}`; const content = context.state.code.current; const type = getType(context.app.scripting.language); - SaveFileDialog.saveFile(content, fileName, FileType.BatchFile); + SaveFileDialog.saveFile(content, fileName, type); } function getType(language: ScriptingLanguage) { diff --git a/src/presentation/TheSearchBar.vue b/src/presentation/TheSearchBar.vue index 908383ce..189ab505 100644 --- a/src/presentation/TheSearchBar.vue +++ b/src/presentation/TheSearchBar.vue @@ -13,7 +13,7 @@ import { Component, Watch } from 'vue-property-decorator'; import { StatefulVue } from './StatefulVue'; import { NonCollapsing } from '@/presentation/Scripts/Cards/NonCollapsingDirective'; -import { IUserFilter } from '@/application/State/IApplicationState'; +import { IUserFilter } from '@/application/Context/State/IApplicationState'; @Component( { directives: { NonCollapsing }, diff --git a/tests/unit/application/State/ApplicationContext.spec.ts b/tests/unit/application/Context/ApplicationContext.spec.ts similarity index 100% rename from tests/unit/application/State/ApplicationContext.spec.ts rename to tests/unit/application/Context/ApplicationContext.spec.ts diff --git a/tests/unit/application/State/ApplicationState.spec.ts b/tests/unit/application/Context/State/ApplicationState.spec.ts similarity index 87% rename from tests/unit/application/State/ApplicationState.spec.ts rename to tests/unit/application/Context/State/ApplicationState.spec.ts index 0a4c6a90..726714d3 100644 --- a/tests/unit/application/State/ApplicationState.spec.ts +++ b/tests/unit/application/Context/State/ApplicationState.spec.ts @@ -1,11 +1,11 @@ -import { UserSelection } from '@/application/State/Selection/UserSelection'; -import { ApplicationCode } from '@/application/State/Code/ApplicationCode'; -import { ScriptStub } from './../../stubs/ScriptStub'; -import { CategoryStub } from './../../stubs/CategoryStub'; -import { ApplicationStub } from './../../stubs/ApplicationStub'; +import { UserSelection } from '@/application/Context/State/Selection/UserSelection'; +import { ApplicationCode } from '@/application/Context/State/Code/ApplicationCode'; +import { ScriptStub } from '../../../stubs/ScriptStub'; +import { CategoryStub } from '../../../stubs/CategoryStub'; +import { ApplicationStub } from '../../../stubs/ApplicationStub'; import 'mocha'; import { expect } from 'chai'; -import { ApplicationState } from '@/application/State/ApplicationState'; +import { ApplicationState } from '@/application/Context/State/ApplicationState'; import { IScript } from '@/domain/IScript'; describe('ApplicationState', () => { diff --git a/tests/unit/application/State/Code/ApplicationCode.spec.ts b/tests/unit/application/Context/State/Code/ApplicationCode.spec.ts similarity index 89% rename from tests/unit/application/State/Code/ApplicationCode.spec.ts rename to tests/unit/application/Context/State/Code/ApplicationCode.spec.ts index d1eeed3e..8aadffe1 100644 --- a/tests/unit/application/State/Code/ApplicationCode.spec.ts +++ b/tests/unit/application/Context/State/Code/ApplicationCode.spec.ts @@ -1,18 +1,18 @@ import 'mocha'; import { expect } from 'chai'; -import { CategoryStub } from './../../../stubs/CategoryStub'; -import { ScriptStub } from './../../../stubs/ScriptStub'; -import { ApplicationStub } from './../../../stubs/ApplicationStub'; -import { UserSelection } from '@/application/State/Selection/UserSelection'; -import { ApplicationCode } from '@/application/State/Code/ApplicationCode'; -import { SelectedScript } from '@/application/State/Selection/SelectedScript'; -import { ICodeChangedEvent } from '@/application/State/Code/Event/ICodeChangedEvent'; -import { IUserScriptGenerator } from '@/application/State/Code/Generation/IUserScriptGenerator'; -import { CodePosition } from '@/application/State/Code/Position/CodePosition'; -import { ICodePosition } from '@/application/State/Code/Position/ICodePosition'; -import { ScriptingDefinitionStub } from './../../../stubs/ScriptingDefinitionStub'; +import { CategoryStub } from '../../../../stubs/CategoryStub'; +import { ScriptStub } from '../../../../stubs/ScriptStub'; +import { ApplicationStub } from '../../../../stubs/ApplicationStub'; +import { UserSelection } from '@/application/Context/State/Selection/UserSelection'; +import { ApplicationCode } from '@/application/Context/State/Code/ApplicationCode'; +import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript'; +import { ICodeChangedEvent } from '@/application/Context/State/Code/Event/ICodeChangedEvent'; +import { IUserScriptGenerator } from '@/application/Context/State/Code/Generation/IUserScriptGenerator'; +import { CodePosition } from '@/application/Context/State/Code/Position/CodePosition'; +import { ICodePosition } from '@/application/Context/State/Code/Position/ICodePosition'; +import { ScriptingDefinitionStub } from '../../../../stubs/ScriptingDefinitionStub'; import { IScriptingDefinition } from '@/domain/IScriptingDefinition'; -import { IUserScript } from '@/application/State/Code/Generation/IUserScript'; +import { IUserScript } from '@/application/Context/State/Code/Generation/IUserScript'; // TODO: Test scriptingDefinition: IScriptingDefinition logic diff --git a/tests/unit/application/State/Code/Event/CodeChangedEvent.spec.ts b/tests/unit/application/Context/State/Code/Event/CodeChangedEvent.spec.ts similarity index 92% rename from tests/unit/application/State/Code/Event/CodeChangedEvent.spec.ts rename to tests/unit/application/Context/State/Code/Event/CodeChangedEvent.spec.ts index 03b16740..29b446ae 100644 --- a/tests/unit/application/State/Code/Event/CodeChangedEvent.spec.ts +++ b/tests/unit/application/Context/State/Code/Event/CodeChangedEvent.spec.ts @@ -1,11 +1,11 @@ import 'mocha'; import { expect } from 'chai'; -import { CodeChangedEvent } from '@/application/State/Code/Event/CodeChangedEvent'; -import { SelectedScript } from '@/application/State/Selection/SelectedScript'; -import { ICodePosition } from '@/application/State/Code/Position/ICodePosition'; -import { CodePosition } from '@/application/State/Code/Position/CodePosition'; -import { SelectedScriptStub } from '../../../../stubs/SelectedScriptStub'; -import { ScriptStub } from '../../../../stubs/ScriptStub'; +import { CodeChangedEvent } from '@/application/Context/State/Code/Event/CodeChangedEvent'; +import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript'; +import { ICodePosition } from '@/application/Context/State/Code/Position/ICodePosition'; +import { CodePosition } from '@/application/Context/State/Code/Position/CodePosition'; +import { SelectedScriptStub } from '../../../../../stubs/SelectedScriptStub'; +import { ScriptStub } from '../../../../../stubs/ScriptStub'; describe('CodeChangedEvent', () => { describe('ctor', () => { diff --git a/tests/unit/application/State/Code/Generation/CodeBuilder.spec.ts b/tests/unit/application/Context/State/Code/Generation/CodeBuilder.spec.ts similarity index 97% rename from tests/unit/application/State/Code/Generation/CodeBuilder.spec.ts rename to tests/unit/application/Context/State/Code/Generation/CodeBuilder.spec.ts index b50d5b48..5fbd20b3 100644 --- a/tests/unit/application/State/Code/Generation/CodeBuilder.spec.ts +++ b/tests/unit/application/Context/State/Code/Generation/CodeBuilder.spec.ts @@ -1,6 +1,6 @@ import 'mocha'; import { expect } from 'chai'; -import { CodeBuilder } from '@/application/State/Code/Generation/CodeBuilder'; +import { CodeBuilder } from '@/application/Context/State/Code/Generation/CodeBuilder'; describe('CodeBuilder', () => { describe('appendLine', () => { diff --git a/tests/unit/application/State/Code/Generation/UserScriptGenerator.spec.ts b/tests/unit/application/Context/State/Code/Generation/UserScriptGenerator.spec.ts similarity index 95% rename from tests/unit/application/State/Code/Generation/UserScriptGenerator.spec.ts rename to tests/unit/application/Context/State/Code/Generation/UserScriptGenerator.spec.ts index b215a068..dd2fdd54 100644 --- a/tests/unit/application/State/Code/Generation/UserScriptGenerator.spec.ts +++ b/tests/unit/application/Context/State/Code/Generation/UserScriptGenerator.spec.ts @@ -1,10 +1,10 @@ import 'mocha'; import { expect } from 'chai'; -import { UserScriptGenerator } from '@/application/State/Code/Generation/UserScriptGenerator'; -import { SelectedScript } from '@/application/State/Selection/SelectedScript'; -import { CodeBuilder } from '@/application/State/Code/Generation/CodeBuilder'; -import { ScriptStub } from '../../../../stubs/ScriptStub'; -import { ScriptingDefinitionStub } from '../../../../stubs/ScriptingDefinitionStub'; +import { UserScriptGenerator } from '@/application/Context/State/Code/Generation/UserScriptGenerator'; +import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript'; +import { CodeBuilder } from '@/application/Context/State/Code/Generation/CodeBuilder'; +import { ScriptStub } from '../../../../../stubs/ScriptStub'; +import { ScriptingDefinitionStub } from '../../../../../stubs/ScriptingDefinitionStub'; describe('UserScriptGenerator', () => { describe('scriptingDefinition', () => { diff --git a/tests/unit/application/State/Code/Position/CodePosition.spec.ts b/tests/unit/application/Context/State/Code/Position/CodePosition.spec.ts similarity index 95% rename from tests/unit/application/State/Code/Position/CodePosition.spec.ts rename to tests/unit/application/Context/State/Code/Position/CodePosition.spec.ts index 8e7df886..7167e663 100644 --- a/tests/unit/application/State/Code/Position/CodePosition.spec.ts +++ b/tests/unit/application/Context/State/Code/Position/CodePosition.spec.ts @@ -1,4 +1,4 @@ -import { CodePosition } from '@/application/State/Code/Position/CodePosition'; +import { CodePosition } from '@/application/Context/State/Code/Position/CodePosition'; import 'mocha'; import { expect } from 'chai'; diff --git a/tests/unit/application/State/Filter/FilterResult.spec.ts b/tests/unit/application/Context/State/Filter/FilterResult.spec.ts similarity index 88% rename from tests/unit/application/State/Filter/FilterResult.spec.ts rename to tests/unit/application/Context/State/Filter/FilterResult.spec.ts index 2b122093..85f49da5 100644 --- a/tests/unit/application/State/Filter/FilterResult.spec.ts +++ b/tests/unit/application/Context/State/Filter/FilterResult.spec.ts @@ -1,6 +1,6 @@ -import { CategoryStub } from './../../../stubs/CategoryStub'; -import { ScriptStub } from './../../../stubs/ScriptStub'; -import { FilterResult } from '@/application/State/Filter/FilterResult'; +import { CategoryStub } from '../../../../stubs/CategoryStub'; +import { ScriptStub } from '../../../../stubs/ScriptStub'; +import { FilterResult } from '@/application/Context/State/Filter/FilterResult'; import 'mocha'; import { expect } from 'chai'; diff --git a/tests/unit/application/State/Filter/UserFilter.spec.ts b/tests/unit/application/Context/State/Filter/UserFilter.spec.ts similarity index 95% rename from tests/unit/application/State/Filter/UserFilter.spec.ts rename to tests/unit/application/Context/State/Filter/UserFilter.spec.ts index 2ec92edc..1291c6f2 100644 --- a/tests/unit/application/State/Filter/UserFilter.spec.ts +++ b/tests/unit/application/Context/State/Filter/UserFilter.spec.ts @@ -1,8 +1,8 @@ -import { CategoryStub } from './../../../stubs/CategoryStub'; -import { ScriptStub } from './../../../stubs/ScriptStub'; -import { IFilterResult } from '@/application/State/Filter/IFilterResult'; -import { ApplicationStub } from './../../../stubs/ApplicationStub'; -import { UserFilter } from '@/application/State/Filter/UserFilter'; +import { CategoryStub } from '../../../../stubs/CategoryStub'; +import { ScriptStub } from '../../../../stubs/ScriptStub'; +import { IFilterResult } from '@/application/Context/State/Filter/IFilterResult'; +import { ApplicationStub } from '../../../../stubs/ApplicationStub'; +import { UserFilter } from '@/application/Context/State/Filter/UserFilter'; import 'mocha'; import { expect } from 'chai'; diff --git a/tests/unit/application/State/Selection/SelectedScript.spec.ts b/tests/unit/application/Context/State/Selection/SelectedScript.spec.ts similarity index 85% rename from tests/unit/application/State/Selection/SelectedScript.spec.ts rename to tests/unit/application/Context/State/Selection/SelectedScript.spec.ts index 41520d1f..2f6d0f5f 100644 --- a/tests/unit/application/State/Selection/SelectedScript.spec.ts +++ b/tests/unit/application/Context/State/Selection/SelectedScript.spec.ts @@ -1,5 +1,5 @@ -import { ScriptStub } from './../../../stubs/ScriptStub'; -import { SelectedScript } from '@/application/State/Selection/SelectedScript'; +import { ScriptStub } from '../../../../stubs/ScriptStub'; +import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript'; import 'mocha'; import { expect } from 'chai'; diff --git a/tests/unit/application/State/Selection/UserSelection.spec.ts b/tests/unit/application/Context/State/Selection/UserSelection.spec.ts similarity index 97% rename from tests/unit/application/State/Selection/UserSelection.spec.ts rename to tests/unit/application/Context/State/Selection/UserSelection.spec.ts index 5e95dea9..de605f85 100644 --- a/tests/unit/application/State/Selection/UserSelection.spec.ts +++ b/tests/unit/application/Context/State/Selection/UserSelection.spec.ts @@ -1,12 +1,12 @@ import 'mocha'; import { expect } from 'chai'; import { IScript } from '@/domain/IScript'; -import { SelectedScriptStub } from '../../../stubs/SelectedScriptStub'; -import { ScriptStub } from '../../../stubs/ScriptStub'; -import { SelectedScript } from '@/application/State/Selection/SelectedScript'; -import { CategoryStub } from '../../../stubs/CategoryStub'; -import { ApplicationStub } from '../../../stubs/ApplicationStub'; -import { UserSelection } from '@/application/State/Selection/UserSelection'; +import { SelectedScriptStub } from '../../../../stubs/SelectedScriptStub'; +import { ScriptStub } from '../../../../stubs/ScriptStub'; +import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript'; +import { CategoryStub } from '../../../../stubs/CategoryStub'; +import { ApplicationStub } from '../../../../stubs/ApplicationStub'; +import { UserSelection } from '@/application/Context/State/Selection/UserSelection'; describe('UserSelection', () => { describe('ctor', () => { diff --git a/tests/unit/application/Parser/CategoryParser.spec.ts b/tests/unit/application/Parser/CategoryParser.spec.ts index 8aa3b832..de41d5be 100644 --- a/tests/unit/application/Parser/CategoryParser.spec.ts +++ b/tests/unit/application/Parser/CategoryParser.spec.ts @@ -1,7 +1,7 @@ import 'mocha'; import { expect } from 'chai'; import { parseCategory } from '@/application/Parser/CategoryParser'; -import { YamlCategory, CategoryOrScript, YamlScript } from 'js-yaml-loader!./application.yaml'; +import { YamlCategory, CategoryOrScript, YamlScript } from 'js-yaml-loader!@/application.yaml'; import { parseScript } from '@/application/Parser/ScriptParser'; import { parseDocUrls } from '@/application/Parser/DocumentationParser'; import { ScriptCompilerStub } from '../../stubs/ScriptCompilerStub'; diff --git a/tests/unit/application/Parser/Compiler/ScriptCompiler.spec.ts b/tests/unit/application/Parser/Compiler/ScriptCompiler.spec.ts index edb20b53..3ab08203 100644 --- a/tests/unit/application/Parser/Compiler/ScriptCompiler.spec.ts +++ b/tests/unit/application/Parser/Compiler/ScriptCompiler.spec.ts @@ -2,7 +2,7 @@ import 'mocha'; import { expect } from 'chai'; import { ScriptCompiler } from '@/application/Parser/Compiler/ScriptCompiler'; import { YamlScriptStub } from '../../../stubs/YamlScriptStub'; -import { YamlFunction, YamlScript, FunctionCall, ScriptFunctionCall, FunctionCallParameters } from 'js-yaml-loader!./application.yaml'; +import { YamlFunction, YamlScript, FunctionCall, ScriptFunctionCall, FunctionCallParameters } from 'js-yaml-loader!@/application.yaml'; import { IScriptCode } from '@/domain/IScriptCode'; import { IScriptCompiler } from '@/application/Parser/Compiler/IScriptCompiler'; diff --git a/tests/unit/application/Parser/DocumentationParser.spec.ts b/tests/unit/application/Parser/DocumentationParser.spec.ts index 7f3b52f5..da409206 100644 --- a/tests/unit/application/Parser/DocumentationParser.spec.ts +++ b/tests/unit/application/Parser/DocumentationParser.spec.ts @@ -1,6 +1,6 @@ import 'mocha'; import { expect } from 'chai'; -import { YamlDocumentable } from 'js-yaml-loader!./application.yaml'; +import { YamlDocumentable } from 'js-yaml-loader!@/application.yaml'; import { parseDocUrls } from '@/application/Parser/DocumentationParser'; describe('DocumentationParser', () => { diff --git a/tests/unit/application/Parser/ScriptingDefinitionParser.spec.ts b/tests/unit/application/Parser/ScriptingDefinitionParser.spec.ts index 5afdd772..cd9b82e0 100644 --- a/tests/unit/application/Parser/ScriptingDefinitionParser.spec.ts +++ b/tests/unit/application/Parser/ScriptingDefinitionParser.spec.ts @@ -1,6 +1,6 @@ import 'mocha'; import { expect } from 'chai'; -import { YamlScriptingDefinition } from 'js-yaml-loader!./application.yaml'; +import { YamlScriptingDefinition } from 'js-yaml-loader!@/application.yaml'; import { ScriptingLanguage } from '@/domain/ScriptingLanguage'; import { parseScriptingDefinition } from '@/application/Parser/ScriptingDefinitionParser'; import { ProjectInformationStub } from './../../stubs/ProjectInformationStub'; diff --git a/tests/unit/presentation/Scripts/ScriptsTree/SelectableTree/Node/Reverter/CategoryReverter.spec.ts b/tests/unit/presentation/Scripts/ScriptsTree/SelectableTree/Node/Reverter/CategoryReverter.spec.ts index 9fab1745..b46ae8a3 100644 --- a/tests/unit/presentation/Scripts/ScriptsTree/SelectableTree/Node/Reverter/CategoryReverter.spec.ts +++ b/tests/unit/presentation/Scripts/ScriptsTree/SelectableTree/Node/Reverter/CategoryReverter.spec.ts @@ -5,8 +5,8 @@ import { CategoryReverter } from '@/presentation/Scripts/ScriptsTree/SelectableT import { getCategoryNodeId } from '@/presentation/Scripts/ScriptsTree/ScriptNodeParser'; import { CategoryStub } from '../../../../../../stubs/CategoryStub'; import { ApplicationStub } from '../../../../../../stubs/ApplicationStub'; -import { SelectedScript } from '@/application/State/Selection/SelectedScript'; -import { UserSelection } from '@/application/State/Selection/UserSelection'; +import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript'; +import { UserSelection } from '@/application/Context/State/Selection/UserSelection'; describe('CategoryReverter', () => { describe('getState', () => { diff --git a/tests/unit/presentation/Scripts/ScriptsTree/SelectableTree/Node/Reverter/ScriptReverter.spec.ts b/tests/unit/presentation/Scripts/ScriptsTree/SelectableTree/Node/Reverter/ScriptReverter.spec.ts index 0501ff52..9f6468d5 100644 --- a/tests/unit/presentation/Scripts/ScriptsTree/SelectableTree/Node/Reverter/ScriptReverter.spec.ts +++ b/tests/unit/presentation/Scripts/ScriptsTree/SelectableTree/Node/Reverter/ScriptReverter.spec.ts @@ -4,8 +4,8 @@ import { ScriptReverter } from '@/presentation/Scripts/ScriptsTree/SelectableTre import { SelectedScriptStub } from '../../../../../../stubs/SelectedScriptStub'; import { getScriptNodeId } from '@/presentation/Scripts/ScriptsTree/ScriptNodeParser'; import { ScriptStub } from '../../../../../../stubs/ScriptStub'; -import { UserSelection } from '@/application/State/Selection/UserSelection'; -import { SelectedScript } from '@/application/State/Selection/SelectedScript'; +import { UserSelection } from '@/application/Context/State/Selection/UserSelection'; +import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript'; import { ApplicationStub } from '../../../../../../stubs/ApplicationStub'; import { CategoryStub } from '../../../../../../stubs/CategoryStub'; diff --git a/tests/unit/stubs/ScriptCompilerStub.ts b/tests/unit/stubs/ScriptCompilerStub.ts index 366551b5..37f35efa 100644 --- a/tests/unit/stubs/ScriptCompilerStub.ts +++ b/tests/unit/stubs/ScriptCompilerStub.ts @@ -1,6 +1,6 @@ import { IScriptCompiler } from '@/application/Parser/Compiler/IScriptCompiler'; import { IScriptCode } from '@/domain/IScriptCode'; -import { YamlScript } from 'js-yaml-loader!./application.yaml'; +import { YamlScript } from 'js-yaml-loader!@/application.yaml'; export class ScriptCompilerStub implements IScriptCompiler { public compilables = new Map(); diff --git a/tests/unit/stubs/ScriptStub.ts b/tests/unit/stubs/ScriptStub.ts index 9b73e38c..bd77b746 100644 --- a/tests/unit/stubs/ScriptStub.ts +++ b/tests/unit/stubs/ScriptStub.ts @@ -1,7 +1,7 @@ import { BaseEntity } from '@/infrastructure/Entity/BaseEntity'; import { IScript } from '@/domain/IScript'; import { RecommendationLevel } from '@/domain/RecommendationLevel'; -import { SelectedScript } from '@/application/State/Selection/SelectedScript'; +import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript'; export class ScriptStub extends BaseEntity implements IScript { public name = `name${this.id}`; diff --git a/tests/unit/stubs/SelectedScriptStub.ts b/tests/unit/stubs/SelectedScriptStub.ts index 1c352d9c..59d08218 100644 --- a/tests/unit/stubs/SelectedScriptStub.ts +++ b/tests/unit/stubs/SelectedScriptStub.ts @@ -1,4 +1,4 @@ -import { SelectedScript } from '@/application/State/Selection/SelectedScript'; +import { SelectedScript } from '@/application/Context/State/Selection/SelectedScript'; import { ScriptStub } from './ScriptStub'; export class SelectedScriptStub extends SelectedScript { diff --git a/tests/unit/stubs/YamlScriptStub.ts b/tests/unit/stubs/YamlScriptStub.ts index 1597aa60..b5b4e9c0 100644 --- a/tests/unit/stubs/YamlScriptStub.ts +++ b/tests/unit/stubs/YamlScriptStub.ts @@ -1,5 +1,5 @@ import { RecommendationLevel } from '@/domain/RecommendationLevel'; -import { ScriptFunctionCall, YamlScript } from 'js-yaml-loader!./application.yaml'; +import { ScriptFunctionCall, YamlScript } from 'js-yaml-loader!@/application.yaml'; export class YamlScriptStub implements YamlScript { public static createWithCode(): YamlScriptStub {