Extollo/lib
2
0
Fork 0
Code Issues 15 Pull Requests Projects Releases 21 Wiki Activity

Add logic for resolving route handlers

Browse Source
This commit is contained in:
Garrett Mills
2021-03-08 11:08:56 -06:00
parent a9ffa771dc
commit 9747d40659
8 changed files with 80 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/service/Canonical.ts
View File

@@ -105,7 +105,7 @@ export abstract class Canonical<T> extends Unit {
}
public async initCanonicalItem(definition: CanonicalDefinition): Promise<T> {
return definition.imported.default ?? definition.imported[definition.canonicalName]
return definition.imported.default ?? definition.imported[definition.canonicalName.split(':').reverse()[0]]
}
protected async buildCanonicalDefinition(filePath: string): Promise<CanonicalDefinition> {

4
src/service/CanonicalInstantiable.ts
View File

@@ -17,8 +17,8 @@ export class CanonicalInstantiable<T> extends Canonical<Instantiable<T>> {
return this.app().make(definition.imported.default)
}
if ( isInstantiable(definition.imported[definition.canonicalName]) ) {
return this.app().make(definition.imported[definition.canonicalName])
if ( isInstantiable(definition.imported[definition.canonicalName.split(':').reverse()[0]]) ) {
return this.app().make(definition.imported[definition.canonicalName.split(':').reverse()[0]])
}
throw new InvalidCanonicalExportError(definition.originalName)

4
src/service/CanonicalStatic.ts
View File

@@ -8,8 +8,8 @@ export class CanonicalStatic<T, T2> extends Canonical<StaticClass<T, T2>> {
return definition.imported.default
}
if ( isStaticClass(definition.imported[definition.canonicalName]) ) {
return definition.imported[definition.canonicalName]
if ( isStaticClass(definition.imported[definition.canonicalName.split(':').reverse()[0]]) ) {
return definition.imported[definition.canonicalName.split(':').reverse()[0]]
}
throw new InvalidCanonicalExportError(definition.originalName)

8
src/service/Controllers.ts
View File

@@ -1,17 +1,17 @@
import {CanonicalInstantiable} from "./CanonicalInstantiable";
import {Singleton} from "@extollo/di";
import {CanonicalStatic} from "./CanonicalStatic";
import {Singleton, Instantiable} from "@extollo/di";
import {Controller} from "../http/Controller";
import {CanonicalDefinition} from "./Canonical";
@Singleton()
export class Controllers extends CanonicalInstantiable<Controller> {
export class Controllers extends CanonicalStatic<Instantiable<Controller>, Controller> {
protected appPath = ['http', 'controllers']
protected canonicalItem = 'controller'
protected suffix = '.controller.js'
public async initCanonicalItem(definition: CanonicalDefinition) {
const item = await super.initCanonicalItem(definition)
if ( !(item instanceof Controller) ) {
if ( !(item.prototype instanceof Controller) ) {
throw new TypeError(`Invalid controller definition: ${definition.originalName}. Controllers must extend from @extollo/lib.http.Controller.`)
}