Fix more import issues from monorepo merge

package.json

@@ -17,6 +17,7 @@
     "@types/pug": "^2.0.4",
     "@types/rimraf": "^3.0.0",
     "@types/ssh2": "^0.5.46",
+    "@types/uuid": "^8.3.0",
     "busboy": "^0.3.1",
     "colors": "^1.4.0",
     "dotenv": "^8.2.0",
@@ -25,10 +26,12 @@
     "pg": "^8.6.0",
     "pluralize": "^8.0.0",
     "pug": "^3.0.2",
+    "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",
     "ssh2": "^1.1.0",
     "ts-node": "^9.1.1",
-    "typescript": "^4.2.3"
+    "typescript": "^4.2.3",
+    "uuid": "^8.3.2"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",

pnpm-lock.yaml

@@ -8,6 +8,7 @@ dependencies:
   '@types/pug': 2.0.4
   '@types/rimraf': 3.0.0
   '@types/ssh2': 0.5.46
+  '@types/uuid': 8.3.0
   busboy: 0.3.1
   colors: 1.4.0
   dotenv: 8.2.0
@@ -16,10 +17,12 @@ dependencies:
   pg: 8.6.0
   pluralize: 8.0.0
   pug: 3.0.2
+  reflect-metadata: 0.1.13
   rimraf: 3.0.2
   ssh2: 1.1.0
   ts-node: 9.1.1_typescript@4.2.3
   typescript: 4.2.3
+  uuid: 8.3.2
 lockfileVersion: 5.2
 packages:
   /@babel/helper-validator-identifier/7.12.11:
@@ -112,6 +115,10 @@ packages:
     dev: false
     resolution:
       integrity: sha512-1pC8FHrMPYdkLoUOwTYYifnSEPzAFZRsp3JFC/vokQ+dRrVI+hDBwz0SNmQ3pL6h39OSZlPs0uCG7wKJkftnaA==
+  /@types/uuid/8.3.0:
+    dev: false
+    resolution:
+      integrity: sha512-eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ==
   /acorn/7.4.1:
     dev: false
     engines:
@@ -593,6 +600,10 @@ packages:
       node: '>= 6'
     resolution:
       integrity: sha512-BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA==
+  /reflect-metadata/0.1.13:
+    dev: false
+    resolution:
+      integrity: sha512-Ts1Y/anZELhSsjMcU605fU9RE4Oi3p5ORujwbIKXfWa+0Zxs510Qrmrce5/Jowq3cHSZSJqBjypxmHarc+vEWg==
   /resolve/1.20.0:
     dependencies:
       is-core-module: 2.2.0
@@ -701,6 +712,11 @@ packages:
     dev: false
     resolution:
       integrity: sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=
+  /uuid/8.3.2:
+    dev: false
+    hasBin: true
+    resolution:
+      integrity: sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
   /void-elements/3.1.0:
     dev: false
     engines:
@@ -744,6 +760,7 @@ specifiers:
   '@types/pug': ^2.0.4
   '@types/rimraf': ^3.0.0
   '@types/ssh2': ^0.5.46
+  '@types/uuid': ^8.3.0
   busboy: ^0.3.1
   colors: ^1.4.0
   dotenv: ^8.2.0
@@ -752,7 +769,9 @@ specifiers:
   pg: ^8.6.0
   pluralize: ^8.0.0
   pug: ^3.0.2
+  reflect-metadata: ^0.1.13
   rimraf: ^3.0.2
   ssh2: ^1.1.0
   ts-node: ^9.1.1
   typescript: ^4.2.3
+  uuid: ^8.3.2

src/http/HTTPError.ts

@@ -1,4 +1,4 @@
-import {ErrorWithContext, HTTPStatus, HTTPMessage} from "@extollo/util"
+import {ErrorWithContext, HTTPStatus, HTTPMessage} from "../util"
 
 /**
  * An error class that has an associated HTTP status.

src/http/kernel/HTTPKernelModule.ts

@@ -1,4 +1,4 @@
-import {Injectable} from "@extollo/di";
+import {Injectable} from "../../di";
 import {AppClass} from "../../lifecycle/AppClass";
 import {HTTPKernel} from "./HTTPKernel";
 import {Request} from "../lifecycle/Request";

src/http/kernel/module/ExecuteResolvedRouteHandlerHTTPModule.ts

@@ -3,7 +3,7 @@ import {Request} from "../../lifecycle/Request";
 import {ActivatedRoute} from "../../routing/ActivatedRoute";
 import {ResponseObject} from "../../routing/Route";
 import {http} from "../../response/HTTPErrorResponseFactory";
-import {HTTPStatus} from "@extollo/util";
+import {HTTPStatus} from "../../../util";
 import {AbstractResolvedRouteHandlerHTTPModule} from "./AbstractResolvedRouteHandlerHTTPModule";
 
 /**

src/http/kernel/module/PersistSessionHTTPModule.ts

@@ -1,5 +1,5 @@
 import {HTTPKernelModule} from "../HTTPKernelModule";
-import {Injectable} from "@extollo/di"
+import {Injectable} from "../../../di"
 import {HTTPKernel} from "../HTTPKernel";
 import {Request} from "../../lifecycle/Request";
 import {Session} from "../../session/Session";

src/http/response/DehydratedStateResponseFactory.ts

@@ -1,5 +1,5 @@
 import {ResponseFactory} from "./ResponseFactory"
-import {Rehydratable} from "@extollo/util"
+import {Rehydratable} from "../../util"
 import {Request} from "../lifecycle/Request";
 
 /**

src/http/response/HTTPErrorResponseFactory.ts

@@ -1,6 +1,6 @@
 import {ErrorResponseFactory} from "./ErrorResponseFactory";
 import {HTTPError} from "../HTTPError";
-import {HTTPStatus} from "@extollo/util"
+import {HTTPStatus} from "../../util"
 
 /**
  * Helper that generates a new HTTPErrorResponseFactory given the HTTP status and message.

src/http/response/ResponseFactory.ts

@@ -1,4 +1,4 @@
-import {HTTPStatus} from "@extollo/util"
+import {HTTPStatus} from "../../util"
 import {Request} from "../lifecycle/Request"
 
 /**

src/http/response/TemporaryRedirectResponseFactory.ts

@@ -1,5 +1,5 @@
 import {ResponseFactory} from "./ResponseFactory";
-import {HTTPStatus} from "@extollo/util";
+import {HTTPStatus} from "../../util";
 import {Request} from "../lifecycle/Request";
 
 /**

src/http/session/MemorySession.ts

@@ -1,5 +1,5 @@
 import {NoSessionKeyError, Session, SessionData, SessionNotLoadedError} from "./Session";
-import {Injectable} from "@extollo/di";
+import {Injectable} from "../../di";
 
 /**
  * Implementation of the session driver that stores session data in memory.

src/service/CanonicalInstantiable.ts

@@ -3,7 +3,7 @@
  * @extends Error
  */
 import {Canonical, CanonicalDefinition} from "./Canonical";
-import {Instantiable, isInstantiable} from "@extollo/di";
+import {Instantiable, isInstantiable} from "../di";
 
 /**
  * Error thrown when the export of a canonical file is determined to be invalid.

src/service/CanonicalStatic.ts

@@ -1,5 +1,5 @@
 import {Canonical, CanonicalDefinition} from "./Canonical";
-import {isStaticClass, StaticClass} from "@extollo/di";
+import {isStaticClass, StaticClass} from "../di";
 import {InvalidCanonicalExportError} from "./CanonicalInstantiable";
 
 /**

src/views/PugViewEngine.ts

@@ -1,5 +1,5 @@
 import {ViewEngine} from "./ViewEngine"
-import {Injectable} from "@extollo/di"
+import {Injectable} from "../di"
 import * as pug from "pug"
 
 /**