Skip to content

Commit ba0f006

Browse files
authored
Merge pull request #3 from fabrix-app/v1.5
[chore] LTS
2 parents d028e66 + 9dea619 commit ba0f006

File tree

6 files changed

+56
-27
lines changed

6 files changed

+56
-27
lines changed

lib/TapestriesSpool.ts

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import { Spool } from '@fabrix/fabrix/dist/common'
2-
import { union } from 'lodash'
32

43
import { Utils } from './utils'
54
import { validateConfig } from './validator'
@@ -38,6 +37,9 @@ export class TapestriesSpool extends Spool {
3837
return Promise.all([
3938
validateConfig.validateConfig(this.app.config.get('tapestries'))
4039
])
40+
.catch(err => {
41+
return Promise.reject(err)
42+
})
4143
}
4244

4345
/**
@@ -64,7 +66,7 @@ export class TapestriesSpool extends Spool {
6466
* Delete | DELETE | /{model}/{id?} | TapestryController.destroy
6567
* Delete | DELETE | /{model}/{id}/{child}/{id?}| TapestryController.destroyAssociation
6668
*/
67-
configure () {
69+
async configure () {
6870
const controllerTapestries = Utils.getControllerTapestries(this.app) || {}
6971
const modelTapestries = this.modelTapestries ? Utils.getModelTapestries(this.app) : {}
7072
const tapestryRoutes = {...controllerTapestries, ...modelTapestries}
@@ -74,6 +76,8 @@ export class TapestriesSpool extends Spool {
7476
...tapestryRoutes,
7577
...configRoutes
7678
})
79+
80+
return Promise.resolve()
7781
}
7882
}
7983

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
import { FabrixController } from '@fabrix/fabrix/dist/common'
2+
import { TapestryControllerNotInstalledError } from '../../errors'
3+
4+
export class TapestryController extends FabrixController {
5+
6+
}

lib/api/controllers/index.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
export {}

lib/api/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
import * as controllers from './controllers'
12
import * as services from './services'
23

34
export {
5+
controllers,
46
services
57
}

package-lock.json

Lines changed: 36 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@fabrix/spool-tapestries",
3-
"version": "1.1.3",
3+
"version": "1.5.0",
44
"description": "Spool - Tapestries, Easy RESTful Services",
55
"scripts": {
66
"build": "tsc -p ./lib/tsconfig.release.json",
@@ -49,8 +49,8 @@
4949
"lodash": "^4.17.10"
5050
},
5151
"devDependencies": {
52-
"@fabrix/fabrix": "^1.1.2",
53-
"@fabrix/spool-router": "^1.1.3",
52+
"@fabrix/fabrix": "^1.5.0",
53+
"@fabrix/spool-router": "^1.5.0",
5454
"@fabrix/lint": "^1.0.0-alpha.3",
5555
"@types/lodash": "^4.14.109",
5656
"@types/node": "~10.3.4",
@@ -64,8 +64,8 @@
6464
"typescript": "~2.8.1"
6565
},
6666
"peerDependencies": {
67-
"@fabrix/fabrix": "^1.1.2",
68-
"@fabrix/spool-router": "^1.1.3"
67+
"@fabrix/fabrix": "^1.5.0",
68+
"@fabrix/spool-router": "^1.5.0"
6969
},
7070
"license": "MIT",
7171
"bugs": {

0 commit comments

Comments
 (0)