From 6daed205c1dc9c42848ce34f10325700a1876e04 Mon Sep 17 00:00:00 2001
From: Roberto Dip <rob@haiku.ai>
Date: Thu, 18 Apr 2019 21:28:20 +0100
Subject: [PATCH] fix: move custom error types to a better place and refactor

---
 packages/cli/package.json                            | 1 +
 packages/cli/src/errors.ts                           | 3 +++
 packages/cli/src/index.ts                            | 1 +
 packages/cli/tsconfig.json                           | 3 ++-
 packages/designfile/package.json                     | 1 -
 packages/designfile/src/commands/extract.action.ts   | 3 +--
 packages/designfile/src/helpers/request.ts           | 4 +---
 packages/{designfile/src => types}/typed-errors.d.ts | 0
 8 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 packages/cli/src/errors.ts
 rename packages/{designfile/src => types}/typed-errors.d.ts (100%)

diff --git a/packages/cli/package.json b/packages/cli/package.json
index f96ade4cb..66b1f56c8 100644
--- a/packages/cli/package.json
+++ b/packages/cli/package.json
@@ -38,6 +38,7 @@
     "commander": "^2.19.0",
     "enquirer": "^2.3.0",
     "fs-extra": "^7.0.1",
+    "typed-errors": "^1.1.0",
     "server-destroy": "^1.0.1"
   },
   "bin": {
diff --git a/packages/cli/src/errors.ts b/packages/cli/src/errors.ts
new file mode 100644
index 000000000..0340bcea8
--- /dev/null
+++ b/packages/cli/src/errors.ts
@@ -0,0 +1,3 @@
+import {makeTypedError} from 'typed-errors';
+``
+export const UnauthorizedRequestException = makeTypedError('UnauthorizedRequestException');
diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts
index ffe5175cd..3afe5d6e1 100644
--- a/packages/cli/src/index.ts
+++ b/packages/cli/src/index.ts
@@ -2,3 +2,4 @@ export * from './api';
 export * from './utils';
 export * from './reporting';
 export * from './network';
+export * from './errors';
diff --git a/packages/cli/tsconfig.json b/packages/cli/tsconfig.json
index 2ff8c114a..0bb0c1a36 100644
--- a/packages/cli/tsconfig.json
+++ b/packages/cli/tsconfig.json
@@ -2,7 +2,8 @@
   "extends": "../tsconfig.packages.json",
   "compilerOptions": {
     "rootDir": "src",
-    "outDir": "lib"
+    "outDir": "lib",
+    "baseUrl": "."
   },
   "include": [
     "src/**/*.ts"
diff --git a/packages/designfile/package.json b/packages/designfile/package.json
index a26ed2f03..4f71c1912 100644
--- a/packages/designfile/package.json
+++ b/packages/designfile/package.json
@@ -27,7 +27,6 @@
     "pngjs": "^3.3.3",
     "request": "^2.88.0",
     "server-destroy": "^1.0.1",
-    "typed-errors": "^1.1.0",
     "uuid": "^3.3.2"
   },
   "devDependencies": {
diff --git a/packages/designfile/src/commands/extract.action.ts b/packages/designfile/src/commands/extract.action.ts
index 5345306bc..9e5fcb6d2 100644
--- a/packages/designfile/src/commands/extract.action.ts
+++ b/packages/designfile/src/commands/extract.action.ts
@@ -1,11 +1,10 @@
-import {info, success, warning} from '@diez/cli';
+import {info, success, warning, UnauthorizedRequestException} from '@diez/cli';
 import {Registry} from '@diez/storage';
 import {prompt} from 'enquirer';
 import {ExporterFactory} from '../exporters';
 import {FigmaExporter, getFigmaAccessToken} from '../exporters/figma';
 import {IllustratorExporter} from '../exporters/illustrator';
 import {SketchExporter} from '../exporters/sketch';
-import {UnauthorizedRequestException} from '../helpers/request';
 
 const findFactory = async (source: string): Promise<ExporterFactory> => {
   for (const factory of [FigmaExporter, IllustratorExporter, SketchExporter]) {
diff --git a/packages/designfile/src/helpers/request.ts b/packages/designfile/src/helpers/request.ts
index a5fa5316e..74b610024 100644
--- a/packages/designfile/src/helpers/request.ts
+++ b/packages/designfile/src/helpers/request.ts
@@ -1,8 +1,6 @@
 import {createWriteStream, unlink} from 'fs-extra';
 import request, {Headers} from 'request';
-import {makeTypedError} from 'typed-errors';
-
-export const UnauthorizedRequestException = makeTypedError('UnauthorizedRequestException');
+import {UnauthorizedRequestException} from '@diez/cli';
 
 export const performGetRequestWithBearerToken = <T>(uri: string, token: string): Promise<T> => {
   return performGetRequest<T>(uri, true, {Authorization: `Bearer ${token}`});
diff --git a/packages/designfile/src/typed-errors.d.ts b/packages/types/typed-errors.d.ts
similarity index 100%
rename from packages/designfile/src/typed-errors.d.ts
rename to packages/types/typed-errors.d.ts