From a25356dd68022cf8b022a675f91af3697ced1c8d Mon Sep 17 00:00:00 2001
From: Ruidy <r.nemausat@empfohlen.de>
Date: Thu, 19 Aug 2021 01:52:41 +0200
Subject: [PATCH] refactor: controllers

---
 .idea/.gitignore                             |   8 -
 .idea/codeStyles/codeStyleConfig.xml         |   5 -
 .idea/hello-server.iml                       |   3 -
 .idea/inspectionProfiles/Project_Default.xml |   9 +
 .idea/watcherTasks.xml                       |   4 +-
 .idea/workspace.xml                          | 130 +++++++++
 .vscode/configurationCache.log               |   1 +
 .vscode/dryrun.log                           |   5 +
 .vscode/settings.json                        |  29 +-
 .vscode/targets.log                          | 290 +++++++++++++++++++
 Makefile                                     |  10 +-
 server.ts                                    |  40 ---
 cli.ts => src/cli.ts                         |   2 +-
 deps.ts => src/deps.ts                       |   6 +-
 src/main.ts                                  |   9 +
 src/{index.ts => mod.ts}                     |   0
 src/repositories/locales.test.ts             |   2 +-
 src/routes.ts                                |  24 ++
 src/server.ts                                |  15 +
 src/types/id.test.ts                         |   8 +-
 src/usecases/hello.test.ts                   |   2 +-
 view.ts => src/view.ts                       |   2 +-
 22 files changed, 523 insertions(+), 81 deletions(-)
 delete mode 100644 .idea/.gitignore
 delete mode 100644 .idea/codeStyles/codeStyleConfig.xml
 create mode 100644 .idea/workspace.xml
 create mode 100644 .vscode/configurationCache.log
 create mode 100644 .vscode/dryrun.log
 create mode 100644 .vscode/targets.log
 delete mode 100644 server.ts
 rename cli.ts => src/cli.ts (98%)
 rename deps.ts => src/deps.ts (64%)
 create mode 100644 src/main.ts
 rename src/{index.ts => mod.ts} (100%)
 create mode 100644 src/routes.ts
 create mode 100644 src/server.ts
 rename view.ts => src/view.ts (96%)

diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 73f69e0..0000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,8 +0,0 @@
-# Default ignored files
-/shelf/
-/workspace.xml
-# Datasource local storage ignored files
-/dataSources/
-/dataSources.local.xml
-# Editor-based HTTP Client requests
-/httpRequests/
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
deleted file mode 100644
index a55e7a1..0000000
--- a/.idea/codeStyles/codeStyleConfig.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
-  </state>
-</component>
\ No newline at end of file
diff --git a/.idea/hello-server.iml b/.idea/hello-server.iml
index 8dc09e5..d0876a7 100644
--- a/.idea/hello-server.iml
+++ b/.idea/hello-server.iml
@@ -5,7 +5,4 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-  <component name="TestRunnerService">
-    <option name="PROJECT_TEST_RUNNER" value="pytest" />
-  </component>
 </module>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/Project_Default.xml b/.idea/inspectionProfiles/Project_Default.xml
index 648db79..3d27f1f 100644
--- a/.idea/inspectionProfiles/Project_Default.xml
+++ b/.idea/inspectionProfiles/Project_Default.xml
@@ -2,6 +2,7 @@
   <profile version="1.0">
     <option name="myName" value="Project Default" />
     <inspection_tool class="Eslint" enabled="true" level="WARNING" enabled_by_default="true" />
+    <inspection_tool class="JSXSyntaxUsed" enabled="true" level="ERROR" enabled_by_default="true" />
     <inspection_tool class="PyCompatibilityInspection" enabled="true" level="WARNING" enabled_by_default="true">
       <option name="ourVersions">
         <value>
@@ -12,5 +13,13 @@
         </value>
       </option>
     </inspection_tool>
+    <inspection_tool class="PyUnresolvedReferencesInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredIdentifiers">
+        <list>
+          <option value="examples.work_queue.worker.sys" />
+          <option value="examples.work_queue.worker.BlockingChannel" />
+        </list>
+      </option>
+    </inspection_tool>
   </profile>
 </component>
\ No newline at end of file
diff --git a/.idea/watcherTasks.xml b/.idea/watcherTasks.xml
index 87269d2..c53bf7f 100644
--- a/.idea/watcherTasks.xml
+++ b/.idea/watcherTasks.xml
@@ -7,7 +7,7 @@
       <option name="description" />
       <option name="exitCodeBehavior" value="ERROR" />
       <option name="fileExtension" value="ts" />
-      <option name="immediateSync" value="false" />
+      <option name="immediateSync" value="true" />
       <option name="name" value="deno" />
       <option name="output" value="" />
       <option name="outputFilters">
@@ -15,7 +15,7 @@
       </option>
       <option name="outputFromStdout" value="false" />
       <option name="program" value="deno" />
-      <option name="runOnExternalChanges" value="false" />
+      <option name="runOnExternalChanges" value="true" />
       <option name="scopeName" value="Project Files" />
       <option name="trackOnlyRoot" value="false" />
       <option name="workingDir" value="" />
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
new file mode 100644
index 0000000..1f8031c
--- /dev/null
+++ b/.idea/workspace.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="d0c77201-663f-463b-b30b-fd433a557d2f" name="Changes" comment="">
+      <change afterPath="$PROJECT_DIR$/src/main.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/routes.ts" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/server.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.gitignore" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/codeStyles/codeStyleConfig.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/hello-server.iml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/hello-server.iml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/inspectionProfiles/Project_Default.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/watcherTasks.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/watcherTasks.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.vscode/settings.json" beforeDir="false" afterPath="$PROJECT_DIR$/.vscode/settings.json" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/Makefile" beforeDir="false" afterPath="$PROJECT_DIR$/Makefile" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/cli.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/cli.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/deps.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/deps.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/server.ts" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/index.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/mod.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/repositories/locales.test.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/repositories/locales.test.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/types/id.test.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/types/id.test.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/usecases/hello.test.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/usecases/hello.test.ts" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/view.ts" beforeDir="false" afterPath="$PROJECT_DIR$/src/view.ts" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="FileTemplateManagerImpl">
+    <option name="RECENT_TEMPLATES">
+      <list>
+        <option value="TypeScript File" />
+      </list>
+    </option>
+  </component>
+  <component name="Git.Settings">
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="GitSEFilterConfiguration">
+    <file-type-list>
+      <filtered-out-file-type name="LOCAL_BRANCH" />
+      <filtered-out-file-type name="REMOTE_BRANCH" />
+      <filtered-out-file-type name="TAG" />
+      <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
+    </file-type-list>
+  </component>
+  <component name="JsBowerSettings">
+    <node-interpreter value="project" />
+    <bower-package value="" />
+    <bower.json value="" />
+  </component>
+  <component name="MacroExpansionManager">
+    <option name="directoryName" value="1ijkcixt" />
+  </component>
+  <component name="ProjectId" id="1wuK4ScIDfOJC3IylLWxy9lgarf" />
+  <component name="ProjectViewState">
+    <option name="autoscrollFromSource" value="true" />
+    <option name="autoscrollToSource" value="true" />
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent">
+    <property name="NEW_TOOLWINDOW_STRIPE_DEFAULTS" value="true" />
+    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
+    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
+    <property name="WebServerToolWindowFactoryState" value="false" />
+    <property name="node.js.detected.package.tslint" value="true" />
+    <property name="node.js.path.for.package.eslint" value="project" />
+    <property name="node.js.path.for.package.standard" value="project" />
+    <property name="node.js.selected.package.eslint" value="(autodetect)" />
+    <property name="node.js.selected.package.standard" value="" />
+    <property name="node.js.selected.package.tslint" value="(autodetect)" />
+    <property name="settings.editor.selected.configurable" value="watcher.settings" />
+    <property name="ts.external.directory.path" value="$APPLICATION_HOME_DIR$/plugins/JavaScriptLanguage/jsLanguageServicesImpl/external" />
+  </component>
+  <component name="RecentsManager">
+    <key name="es6.move.members.recent.items">
+      <recent name="$PROJECT_DIR$/routes.ts" />
+    </key>
+    <key name="MoveFile.RECENT_KEYS">
+      <recent name="$PROJECT_DIR$/src" />
+    </key>
+  </component>
+  <component name="RunManager" selected="Deno.Deno: server.ts">
+    <configuration name="Deno: server.ts" type="DenoConfigurationType" temporary="true" nameIsGenerated="true" inputPath="$PROJECT_DIR$/server.ts" programParameters="run" workingDirectory="$PROJECT_DIR$">
+      <method v="2" />
+    </configuration>
+    <configuration name="test" type="MixRunConfigurationType" factoryName="Elixir Mix">
+      <mix>
+        <argument>test</argument>
+      </mix>
+      <module-filters inherit-application-module-filters="true" />
+      <method v="2" />
+    </configuration>
+    <recent_temporary>
+      <list>
+        <item itemvalue="Deno.Deno: server.ts" />
+      </list>
+    </recent_temporary>
+  </component>
+  <component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="d0c77201-663f-463b-b30b-fd433a557d2f" name="Changes" comment="" />
+      <created>1629302841743</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1629302841743</updated>
+      <workItem from="1629302843625" duration="5327000" />
+    </task>
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.vscode/configurationCache.log b/.vscode/configurationCache.log
new file mode 100644
index 0000000..df66325
--- /dev/null
+++ b/.vscode/configurationCache.log
@@ -0,0 +1 @@
+{"buildTargets":["cli","lint","run","tests"],"launchTargets":[],"customConfigurationProvider":{"workspaceBrowse":{"browsePath":[],"compilerArgs":[]},"fileIndex":[]}}
\ No newline at end of file
diff --git a/.vscode/dryrun.log b/.vscode/dryrun.log
new file mode 100644
index 0000000..a447ce1
--- /dev/null
+++ b/.vscode/dryrun.log
@@ -0,0 +1,5 @@
+make -f "/Users/ruidy/Dev/_Perso/deno/hello-server/Makefile" --dry-run --always-make --keep-going --print-directory
+make: Entering directory `/Users/ruidy/Dev/_Perso/deno/hello-server'
+deno run cli.ts
+make: Leaving directory `/Users/ruidy/Dev/_Perso/deno/hello-server'
+ 
diff --git a/.vscode/settings.json b/.vscode/settings.json
index f8d9cfd..23631e6 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -1,14 +1,19 @@
 {
-    "deno.enable": true,
-    "deno.unstable": true,
-    "deno.lint": true,
-    "deno.import_intellisense_origins": {
-        "https://deno.land": true
-    },
-    "[typescript]": {
-        "editor.defaultFormatter": "denoland.vscode-deno"
-    },
-    "[typescriptreact]": {
-        "editor.defaultFormatter": "denoland.vscode-deno"
-    }
+  "deno.enable": true,
+  "deno.unstable": true,
+  "deno.lint": true,
+  "[typescript]": {
+    "editor.defaultFormatter": "denoland.vscode-deno"
+  },
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "denoland.vscode-deno"
+  },
+  "files.eol": "\n",
+  "files.trimTrailingWhitespace": true,
+  "files.exclude": {
+    "**/.git": true,
+    "**/.DS_Store": true,
+    "**/Thumbs.db": true,
+    "**/.aleph": true
+  }
 }
diff --git a/.vscode/targets.log b/.vscode/targets.log
new file mode 100644
index 0000000..c20db93
--- /dev/null
+++ b/.vscode/targets.log
@@ -0,0 +1,290 @@
+make all -f "/Users/ruidy/Dev/_Perso/deno/hello-server/Makefile" --print-data-base --no-builtin-variables --no-builtin-rules --question
+# GNU Make 3.81
+# Copyright (C) 2006  Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions.
+# There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+# This program built for i386-apple-darwin11.3.0
+
+# Make data base, printed on Sun Jun 27 15:52:43 2021
+
+# Variables
+
+# automatic
+<D = $(patsubst %/,%,$(dir $<))
+# automatic
+?F = $(notdir $?)
+# environment
+ELECTRON_NO_ATTACH_CONSOLE = 1
+# environment
+LC_CTYPE = UTF-8
+# environment
+VSCODE_LOG_NATIVE = false
+# automatic
+?D = $(patsubst %/,%,$(dir $?))
+# automatic
+@D = $(patsubst %/,%,$(dir $@))
+# automatic
+@F = $(notdir $@)
+# makefile
+CURDIR := /Users/ruidy/Dev/_Perso/deno/hello-server
+# makefile
+SHELL = /bin/sh
+# environment
+VSCODE_NLS_CONFIG = {"locale":"en-gb","availableLanguages":{},"_languagePackSupport":true}
+# environment
+_ = /usr/bin/make
+# makefile (from `/Users/ruidy/Dev/_Perso/deno/hello-server/Makefile', line 1)
+MAKEFILE_LIST :=  /Users/ruidy/Dev/_Perso/deno/hello-server/Makefile
+# environment
+VSCODE_NODE_CACHED_DATA_DIR = /Users/ruidy/Library/Application Support/Code/CachedData/507ce72a4466fbb27b715c3722558bb15afa9f48
+# environment
+VSCODE_VERBOSE_LOGGING = true
+# environment
+__CFBundleIdentifier = com.googlecode.iterm2
+# environment
+VSCODE_IPC_HOOK_EXTHOST = /var/folders/1r/l9hbvtfx3d945mtjwqyzhtj80000gn/T/vscode-ipc-979150f6-1588-46bf-8dce-e07e0d556b71.sock
+# environment
+VSCODE_CWD = /Users/ruidy/Dev/_Perso/deno
+# environment
+PATH = /Users/ruidy/.deno/bin:/usr/local/sbin:/Users/ruidy/.pyenv/shims:/Users/ruidy/.pyenv/bin:/Users/ruidy/.cabal/bin:/Users/ruidy/.ghcup/bin:/Users/ruidy/.cargo/bin:/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/go/bin:/Library/Apple/usr/bin:/Users/ruidy/Library/Android/sdk/emulator:/Users/ruidy/Library/Android/sdk/tools:/Users/ruidy/Library/Android/sdk/tools/bin:/Users/ruidy/Library/Android/sdk/platform-tools:/Users/ruidy/go/bin:/Users/ruidy/flutter/bin
+# environment
+LSCOLORS = Gxfxcxdxbxegedabagacad
+# environment
+SPACESHIP_VERSION = 3.11.2
+# environment
+LaunchInstanceID = 8ADEE964-5E57-4086-A826-A6BCC41D815B
+# environment
+VSCODE_LOG_STACK = false
+# environment
+ELECTRON_RUN_AS_NODE = 1
+# environment
+PYENV_ROOT = /Users/ruidy/.pyenv
+# environment
+ANDROID_HOME = /Users/ruidy/Library/Android/sdk
+# default
+.FEATURES := target-specific order-only second-expansion else-if archives jobserver check-symlink
+# environment
+SSH_AUTH_SOCK = /private/tmp/com.apple.launchd.4YfI6Pdv5d/Listeners
+# automatic
+%F = $(notdir $%)
+# environment
+VSCODE_PIPE_LOGGING = true
+# environment
+PWD = /Users/ruidy/Dev/_Perso/deno/hello-server
+# environment
+ORIGINAL_XDG_CURRENT_DESKTOP = undefined
+# environment
+VSCODE_AMD_ENTRYPOINT = vs/workbench/services/extensions/node/extensionHostProcess
+# environment
+HOME = /Users/ruidy
+# default
+MAKEFILEPATH := /Applications/Xcode.app/Contents/Developer/Makefiles
+# environment
+VSCODE_CLI = 1
+# environment
+LOGNAME = ruidy
+# environment
+APPLICATION_INSIGHTS_NO_DIAGNOSTIC_CHANNEL = true
+# environment
+ZSH = /Users/ruidy/.oh-my-zsh
+# environment
+VSCODE_HANDLES_UNCAUGHT_ERRORS = true
+# automatic
+^D = $(patsubst %/,%,$(dir $^))
+# environment
+XPC_FLAGS = 0x0
+# environment
+COLORTERM = truecolor
+# default
+MAKE = $(MAKE_COMMAND)
+# environment
+LC_TERMINAL = iTerm2
+# environment
+SHLVL = 3
+# default
+MAKE_VERSION := 3.81
+# environment
+USER = ruidy
+# makefile
+.DEFAULT_GOAL := cli
+# default
+MAKECMDGOALS := all
+# environment
+TERM_SESSION_ID = w0t0p0:5617C3EF-E50D-4121-8BC4-192A3B141DF3
+# environment
+LESS = -R
+# automatic
+%D = $(patsubst %/,%,$(dir $%))
+# default
+MAKE_COMMAND := /Applications/Xcode.app/Contents/Developer/usr/bin/make
+# environment
+TERM_PROGRAM = iTerm.app
+# default
+.VARIABLES := 
+# environment
+TMPDIR = /var/folders/1r/l9hbvtfx3d945mtjwqyzhtj80000gn/T/
+# automatic
+*F = $(notdir $*)
+# environment
+VSCODE_IPC_HOOK = /Users/ruidy/Library/Application Support/Code/1.57.1-main.sock
+# makefile
+MAKEFLAGS = Rrqp
+# environment
+MFLAGS = -Rrqp
+# automatic
+*D = $(patsubst %/,%,$(dir $*))
+# environment
+TERM_PROGRAM_VERSION = 3.4.8
+# environment
+XPC_SERVICE_NAME = 0
+# environment
+LC_TERMINAL_VERSION = 3.4.8
+# automatic
++D = $(patsubst %/,%,$(dir $+))
+# automatic
++F = $(notdir $+)
+# environment
+ITERM_SESSION_ID = w0t0p0:5617C3EF-E50D-4121-8BC4-192A3B141DF3
+# environment
+COLORFGBG = 15;0
+# environment
+__CF_USER_TEXT_ENCODING = 0x1F5:0x0:0x0
+# environment
+COMMAND_MODE = unix2003
+# default
+MAKEFILES := 
+# automatic
+<F = $(notdir $<)
+# environment
+ITERM_PROFILE = Default
+# environment
+PAGER = less
+# environment
+LC_ALL = C
+# environment
+SECURITYSESSIONID = 186aa
+# environment
+SPACESHIP_ROOT = /Users/ruidy/.oh-my-zsh/custom/themes/spaceship-prompt
+# automatic
+^F = $(notdir $^)
+# default
+SUFFIXES := 
+# default
+.INCLUDE_DIRS = /usr/local/include
+# environment
+MAKELEVEL := 0
+# environment
+LANG = C
+# environment
+TERM = xterm-256color
+# environment
+VSCODE_PID = 27251
+# variable set hash-table stats:
+# Load=85/1024=8%, Rehash=0, Collisions=4/109=4%
+
+# Pattern-specific Variable Values
+
+# No pattern-specific variable values.
+
+# Directories
+
+
+# No files, no impossibilities in 0 directories.
+
+# Implicit Rules
+
+# No implicit rules.
+
+# Files
+
+cli:
+#  Phony target (prerequisite of .PHONY).
+#  Implicit rule search has not been done.
+#  File does not exist.
+#  File has not been updated.
+#  commands to execute (from `/Users/ruidy/Dev/_Perso/deno/hello-server/Makefile', line 3):
+	deno run cli.ts
+	
+
+# Not a target:
+all:
+#  Command-line target.
+#  Implicit rule search has been done.
+#  File does not exist.
+#  File has not been updated.
+# variable set hash-table stats:
+# Load=0/32=0%, Rehash=0, Collisions=0/0=0%
+
+.PHONY: lint cli run
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+#  commands to execute (from `/Users/ruidy/Dev/_Perso/deno/hello-server/Makefile', line 8):
+	deno lint --unstable
+	
+
+tests:
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+#  commands to execute (from `/Users/ruidy/Dev/_Perso/deno/hello-server/Makefile', line 10):
+	deno test --coverage=.coverage --unstable
+	deno coverage .coverage
+	
+
+# Not a target:
+.SUFFIXES:
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+
+# Not a target:
+.DEFAULT:
+#  Implicit rule search has not been done.
+#  Modification time never checked.
+#  File has not been updated.
+
+# Not a target:
+/Users/ruidy/Dev/_Perso/deno/hello-server/Makefile:
+#  Implicit rule search has been done.
+#  Last modified 2021-05-18 09:21:00
+#  File has been updated.
+#  Successfully updated.
+# variable set hash-table stats:
+# Load=0/32=0%, Rehash=0, Collisions=0/0=0%
+
+run:
+#  Phony target (prerequisite of .PHONY).
+#  Implicit rule search has not been done.
+#  File does not exist.
+#  File has not been updated.
+#  commands to execute (from `/Users/ruidy/Dev/_Perso/deno/hello-server/Makefile', line 6):
+	deno run --allow-net server.ts
+	
+
+lint:
+#  Phony target (prerequisite of .PHONY).
+#  Implicit rule search has not been done.
+#  File does not exist.
+#  File has not been updated.
+
+# files hash-table stats:
+# Load=9/1024=1%, Rehash=0, Collisions=0/26=0%
+# VPATH Search Paths
+
+# No `vpath' search paths.
+
+# No general (`VPATH' variable) search path.
+
+# # of strings in strcache: 1
+# # of strcache buffers: 1
+# strcache size: total = 4096 / max = 4096 / min = 4096 / avg = 4096
+# strcache free: total = 4045 / max = 4045 / min = 4045 / avg = 4045
+
+# Finished Make data base on Sun Jun 27 15:52:43 2021
+
+ 
+make: *** No rule to make target `all'.  Stop.
+ 
diff --git a/Makefile b/Makefile
index 8d2a00f..f4e6c5b 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
-.PHONY: cli
 cli:
 	deno run cli.ts
-.PHONY: run
 run:
-	deno run --allow-net server.ts
-.PHONY: lint
+	deno run --watch --allow-net src/main.ts
+lint:
 	deno lint --unstable
+test: tests
 tests:
 	deno test --coverage=.coverage --unstable
-	deno coverage .coverage
\ No newline at end of file
+	deno coverage .coverage
+.PHONY: cli run lint test tests
\ No newline at end of file
diff --git a/server.ts b/server.ts
deleted file mode 100644
index 1ebc671..0000000
--- a/server.ts
+++ /dev/null
@@ -1,40 +0,0 @@
-import { Application, Router, RouterContext } from "./deps.ts";
-import { ID, sayHello, sayRandomHello } from "./src/index.ts";
-import { htmlBody } from "./view.ts";
-
-const port = 8000;
-
-type AppOpts = { port: number };
-const getApplication = ({ port }: AppOpts): Application => {
-  const router = new Router();
-
-  router.get("/", (ctx: RouterContext) => {
-    ctx.response.body = htmlBody(sayRandomHello());
-  }).get("/:id", (ctx: RouterContext) => {
-    try {
-      const value = ctx.params.id;
-      if (value) {
-        const id = new ID(parseInt(value, 10));
-        ctx.response.body = htmlBody(sayHello(id));
-      }
-    } catch (error) {
-      console.error(error);
-      ctx.response.body = error.message;
-    }
-  });
-
-  const app = new Application();
-
-  app.use(router.routes());
-
-  app.addEventListener(
-    "listen",
-    () => console.log(`Server listening on http://localhost:${port}/`),
-  );
-  return app;
-};
-
-const app = getApplication({ port });
-
-await app.listen({ port });
-console.log(`Finished`);
diff --git a/cli.ts b/src/cli.ts
similarity index 98%
rename from cli.ts
rename to src/cli.ts
index 7f2ff94..518651a 100644
--- a/cli.ts
+++ b/src/cli.ts
@@ -1,5 +1,5 @@
 import { readLines } from "./deps.ts";
-import { ID, sayHello, sayRandomHello, ValidationError } from "./src/index.ts";
+import { ID, sayHello, sayRandomHello, ValidationError } from "./mod.ts";
 
 const start = async () => {
   console.log("Hello, World! (International version)\n");
diff --git a/deps.ts b/src/deps.ts
similarity index 64%
rename from deps.ts
rename to src/deps.ts
index 8feda56..268af89 100644
--- a/deps.ts
+++ b/src/deps.ts
@@ -6,4 +6,8 @@ export {
 } from "https://deno.land/std@0.87.0/testing/asserts.ts";
 export { readLines } from "https://deno.land/std@0.87.0/io/bufio.ts";
 export { Application, Router } from "https://deno.land/x/oak/mod.ts";
-export type { RouterContext } from "https://deno.land/x/oak/mod.ts";
+export type {
+  RouteParams,
+  RouterContext,
+} from "https://deno.land/x/oak/mod.ts";
+export { Random } from "https://deno.land/x/random/Random.js";
diff --git a/src/main.ts b/src/main.ts
new file mode 100644
index 0000000..c5f4cb9
--- /dev/null
+++ b/src/main.ts
@@ -0,0 +1,9 @@
+import { router } from "./routes.ts";
+import { getApplication } from "./server.ts";
+
+const port = 8000;
+
+const app = getApplication({ port, router });
+
+await app.listen({ port });
+console.log(`Finished`);
diff --git a/src/index.ts b/src/mod.ts
similarity index 100%
rename from src/index.ts
rename to src/mod.ts
diff --git a/src/repositories/locales.test.ts b/src/repositories/locales.test.ts
index 33c0be1..890afca 100644
--- a/src/repositories/locales.test.ts
+++ b/src/repositories/locales.test.ts
@@ -1,4 +1,4 @@
-import { assertEquals } from "../../deps.ts";
+import { assertEquals } from "../deps.ts";
 import { getLocaleById, Locale } from "./locales.ts";
 
 Deno.test("Get locale by id", () => {
diff --git a/src/routes.ts b/src/routes.ts
new file mode 100644
index 0000000..87e4054
--- /dev/null
+++ b/src/routes.ts
@@ -0,0 +1,24 @@
+import { Router, RouterContext } from "./deps.ts";
+import { ID, sayHello, sayRandomHello } from "./mod.ts";
+import { htmlBody } from "./view.ts";
+
+export const router = new Router();
+
+router.get("/", (ctx: RouterContext) => {
+  ctx.response.body = htmlBody(sayRandomHello());
+});
+
+router.get<
+  Record<string, string | undefined>
+>("/:id", (ctx: RouterContext) => {
+  try {
+    const value = ctx.params.id;
+    if (value && value !== "favicon.ico") {
+      const id = new ID(parseInt(value, 10));
+      ctx.response.body = htmlBody(sayHello(id));
+    }
+  } catch (error) {
+    console.error(error);
+    ctx.response.body = error.message;
+  }
+});
diff --git a/src/server.ts b/src/server.ts
new file mode 100644
index 0000000..072740f
--- /dev/null
+++ b/src/server.ts
@@ -0,0 +1,15 @@
+import { Application, Router } from "./deps.ts";
+
+type AppOpts = { port: number; router: Router };
+
+export const getApplication = ({ port, router }: AppOpts): Application => {
+  const app = new Application();
+
+  app.use(router.routes());
+
+  app.addEventListener(
+    "listen",
+    () => console.log(`Server listening on http://localhost:${port}/`),
+  );
+  return app;
+};
diff --git a/src/types/id.test.ts b/src/types/id.test.ts
index 5623ed9..3377a82 100644
--- a/src/types/id.test.ts
+++ b/src/types/id.test.ts
@@ -1,4 +1,4 @@
-import { assertThrows } from "../../deps.ts";
+import { assert, assertThrows, Random } from "../deps.ts";
 import { ValidationError } from "../errors/exceptions.ts";
 import { ID } from "./id.ts";
 
@@ -9,3 +9,9 @@ Deno.test("ID validation fails for non strictly positive values", () => {
 Deno.test("Hello fails for too large values", () => {
   assertThrows(() => new ID(666), ValidationError, `Invalid index: 666`);
 });
+
+Deno.test("ID is valid", () => {
+  const value = new Random().int(1, 77);
+  const id = new ID(value);
+  assert(id);
+});
diff --git a/src/usecases/hello.test.ts b/src/usecases/hello.test.ts
index 99d4962..5316e99 100644
--- a/src/usecases/hello.test.ts
+++ b/src/usecases/hello.test.ts
@@ -1,4 +1,4 @@
-import { assertEquals, assertStrictEquals } from "../../deps.ts";
+import { assertEquals, assertStrictEquals } from "../deps.ts";
 import { ID } from "../types/id.ts";
 import { HelloResponse, sayHello, sayRandomHello } from "./hello.ts";
 
diff --git a/view.ts b/src/view.ts
similarity index 96%
rename from view.ts
rename to src/view.ts
index 87bd43b..f7547ec 100644
--- a/view.ts
+++ b/src/view.ts
@@ -1,4 +1,4 @@
-import { Locale } from "./src/repositories/locales.ts";
+import { Locale } from "./repositories/locales.ts";
 
 export const htmlBody = ({ locale: language, message: hello }: Locale) =>
   `<!DOCTYPE html>