From 9dea619ad415e9568f7db019c8142a8180c7281a Mon Sep 17 00:00:00 2001 From: scott-wyatt Date: Sun, 16 Sep 2018 17:28:36 -0400 Subject: [PATCH] [chore] LTS --- lib/TapestriesSpool.ts | 8 +++- lib/api/controllers/TapestryController.ts | 6 +++ lib/api/controllers/index.ts | 1 + lib/api/index.ts | 2 + package-lock.json | 56 +++++++++++++++-------- package.json | 10 ++-- 6 files changed, 56 insertions(+), 27 deletions(-) create mode 100644 lib/api/controllers/TapestryController.ts create mode 100644 lib/api/controllers/index.ts diff --git a/lib/TapestriesSpool.ts b/lib/TapestriesSpool.ts index e2980cf..a943c16 100644 --- a/lib/TapestriesSpool.ts +++ b/lib/TapestriesSpool.ts @@ -1,5 +1,4 @@ import { Spool } from '@fabrix/fabrix/dist/common' -import { union } from 'lodash' import { Utils } from './utils' import { validateConfig } from './validator' @@ -38,6 +37,9 @@ export class TapestriesSpool extends Spool { return Promise.all([ validateConfig.validateConfig(this.app.config.get('tapestries')) ]) + .catch(err => { + return Promise.reject(err) + }) } /** @@ -64,7 +66,7 @@ export class TapestriesSpool extends Spool { * Delete | DELETE | /{model}/{id?} | TapestryController.destroy * Delete | DELETE | /{model}/{id}/{child}/{id?}| TapestryController.destroyAssociation */ - configure () { + async configure () { const controllerTapestries = Utils.getControllerTapestries(this.app) || {} const modelTapestries = this.modelTapestries ? Utils.getModelTapestries(this.app) : {} const tapestryRoutes = {...controllerTapestries, ...modelTapestries} @@ -74,6 +76,8 @@ export class TapestriesSpool extends Spool { ...tapestryRoutes, ...configRoutes }) + + return Promise.resolve() } } diff --git a/lib/api/controllers/TapestryController.ts b/lib/api/controllers/TapestryController.ts new file mode 100644 index 0000000..02ed6ce --- /dev/null +++ b/lib/api/controllers/TapestryController.ts @@ -0,0 +1,6 @@ +import { FabrixController } from '@fabrix/fabrix/dist/common' +import { TapestryControllerNotInstalledError } from '../../errors' + +export class TapestryController extends FabrixController { + +} diff --git a/lib/api/controllers/index.ts b/lib/api/controllers/index.ts new file mode 100644 index 0000000..336ce12 --- /dev/null +++ b/lib/api/controllers/index.ts @@ -0,0 +1 @@ +export {} diff --git a/lib/api/index.ts b/lib/api/index.ts index 3288123..82e9164 100755 --- a/lib/api/index.ts +++ b/lib/api/index.ts @@ -1,5 +1,7 @@ +import * as controllers from './controllers' import * as services from './services' export { + controllers, services } diff --git a/package-lock.json b/package-lock.json index 79e78df..10f5abe 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,6 +1,6 @@ { "name": "@fabrix/spool-tapestries", - "version": "1.1.3", + "version": "1.5.0", "lockfileVersion": 1, "requires": true, "dependencies": { @@ -114,13 +114,21 @@ } }, "@fabrix/fabrix": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@fabrix/fabrix/-/fabrix-1.1.2.tgz", - "integrity": "sha512-pN0X58AUqw7QqN4phv3BBUcE6zoASEswg/YSQ6F4TJsJ0IQXPl7IhINB0tPs0RnJbWmO6uUhmeAjYIv/N27EcA==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@fabrix/fabrix/-/fabrix-1.5.0.tgz", + "integrity": "sha512-/5tEjBnZ3GQ5FfOp+SOOuFJjw9UgsmgMnjXo1kI9EX7QOz1u1iErVdDBmWj/aunnz1x+Ta2KlLIGCeXARwOorA==", "dev": true, "requires": { - "lodash": "4.17.10", + "lodash": "4.17.11", "mkdirp": "0.5.1" + }, + "dependencies": { + "lodash": { + "version": "4.17.11", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", + "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", + "dev": true + } } }, "@fabrix/lint": { @@ -130,14 +138,22 @@ "dev": true }, "@fabrix/spool-router": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/@fabrix/spool-router/-/spool-router-1.1.3.tgz", - "integrity": "sha512-fTgEDO2RcAi8TMPxcQWz6NkU/RLK8+givjEDgKCEutrM+K9Ib+DbY6MP+o/gNm1YZcsEJTksTPgtD19J9OavAA==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@fabrix/spool-router/-/spool-router-1.5.0.tgz", + "integrity": "sha512-94Kd709GNykjWmpKzlZ2RkKjJGaYpub/LcRYA/D5QW9TBx2eUDSq9sAbSWwZ4dQrBg7QBe3TEpoPGgff6WvC2g==", "dev": true, "requires": { "call": "5.0.1", - "joi": "13.4.0", - "lodash": "4.17.10" + "joi": "13.6.0", + "lodash": "4.17.11" + }, + "dependencies": { + "lodash": { + "version": "4.17.11", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.11.tgz", + "integrity": "sha512-cQKh8igo5QUhZ7lg38DYWAxMvjSAKG0A8wGSVimP07SIUEK2UO+arSRKbRZWtelMtN5V0Hkwh5ryOto/SshYIg==", + "dev": true + } } }, "@types/lodash": { @@ -226,7 +242,7 @@ "integrity": "sha1-K/8kpVVldn/ehp7ICDF+sQxI6WY=", "dev": true, "requires": { - "hoek": "5.0.3" + "hoek": "5.0.4" } }, "brace-expansion": { @@ -258,7 +274,7 @@ "dev": true, "requires": { "boom": "7.2.0", - "hoek": "5.0.3" + "hoek": "5.0.4" } }, "chalk": { @@ -386,9 +402,9 @@ "dev": true }, "hoek": { - "version": "5.0.3", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-5.0.3.tgz", - "integrity": "sha512-Bmr56pxML1c9kU+NS51SMFkiVQAb+9uFfXwyqR2tn4w2FPvmPt65eZ9aCcEfRXd9G74HkZnILC6p967pED4aiw==", + "version": "5.0.4", + "resolved": "https://registry.npmjs.org/hoek/-/hoek-5.0.4.tgz", + "integrity": "sha512-Alr4ZQgoMlnere5FZJsIyfIjORBqZll5POhDsF4q64dPuJR6rNxXdDxtHSQq8OXRurhmx+PWYEE8bXRROY8h0w==", "dev": true }, "inflight": { @@ -447,12 +463,12 @@ } }, "joi": { - "version": "13.4.0", - "resolved": "https://registry.npmjs.org/joi/-/joi-13.4.0.tgz", - "integrity": "sha512-JuK4GjEu6j7zr9FuVe2MAseZ6si/8/HaY0qMAejfDFHp7jcH4OKE937mIHM5VT4xDS0q7lpQbszbxKV9rm0yUg==", + "version": "13.6.0", + "resolved": "https://registry.npmjs.org/joi/-/joi-13.6.0.tgz", + "integrity": "sha512-E4QB0yRgEa6ZZKcSHJuBC+QeAwy+akCG0Bsa9edLqljyhlr+GuGDSmXYW1q7sj/FuAPy+ECUI3evVtK52tVfwg==", "dev": true, "requires": { - "hoek": "5.0.3", + "hoek": "5.0.4", "isemail": "3.1.3", "topo": "3.0.0" } @@ -2685,7 +2701,7 @@ "integrity": "sha512-Tlu1fGlR90iCdIPURqPiufqAlCZYzLjHYVVbcFWDMcX7+tK8hdZWAfsMrD/pBul9jqHHwFjNdf1WaxA9vTRRhw==", "dev": true, "requires": { - "hoek": "5.0.3" + "hoek": "5.0.4" } }, "trim-right": { diff --git a/package.json b/package.json index 3317783..76762b6 100755 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@fabrix/spool-tapestries", - "version": "1.1.3", + "version": "1.5.0", "description": "Spool - Tapestries, Easy RESTful Services", "scripts": { "build": "tsc -p ./lib/tsconfig.release.json", @@ -49,8 +49,8 @@ "lodash": "^4.17.10" }, "devDependencies": { - "@fabrix/fabrix": "^1.1.2", - "@fabrix/spool-router": "^1.1.3", + "@fabrix/fabrix": "^1.5.0", + "@fabrix/spool-router": "^1.5.0", "@fabrix/lint": "^1.0.0-alpha.3", "@types/lodash": "^4.14.109", "@types/node": "~10.3.4", @@ -64,8 +64,8 @@ "typescript": "~2.8.1" }, "peerDependencies": { - "@fabrix/fabrix": "^1.1.2", - "@fabrix/spool-router": "^1.1.3" + "@fabrix/fabrix": "^1.5.0", + "@fabrix/spool-router": "^1.5.0" }, "license": "MIT", "bugs": {