fix: remove joi-to-typescript & make interface manually

rittaschool · Oct 27, 2021 · 805da6d · 805da6d
1 parent 7e4ece2
commit 805da6d
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 113 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@rittaschool/shared",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "main": "./lib/index.cjs.js",
   "module": "./lib/index.esm.js",
   "types": "./lib/index.d.ts",
@@ -9,16 +9,13 @@
   "author": "Midka <[email protected]>",
   "license": "GPLv3",
   "scripts": {
-    "build": "rollup -c",
-    "types": "ts-node ./scripts/joi-to-typescript.ts"
+    "build": "rollup -c"
   },
   "packageManager": "[email protected]",
   "devDependencies": {
     "@types/node": "^16.11.6",
-    "joi-to-typescript": "^2.2.2",
     "rollup": "^2.58.0",
     "rollup-plugin-typescript2": "^0.30.0",
-    "ts-node": "^10.4.0",
     "typescript": "^4.4.4"
   },
   "files": [

diff --git a/scripts/joi-to-typescript.ts b/scripts/joi-to-typescript.ts
diff --git a/src/interfaces/validation/index.ts → src/interfaces/dto/index.ts b/src/interfaces/validation/index.ts → src/interfaces/dto/index.ts
@@ -1,22 +1,10 @@
-/**
- * This file was automatically generated by joi-to-typescript
- * Do not modify this file manually
- */
-
 export interface CreateUserValidationSchema {
   alias?: string;
   email?: string;
   firstName: string;
-  home?: {
-    address: string;
-    city: string;
-    country: string;
-    zip: string;
-  };
+  home?: LocationSchema;
   lastName?: string;
-  oauth2Identifiers?: {
-    opinsys?: string;
-  };
+  oauth2Identifiers?: Oauth2IdentifersValidation;
   password: string;
   phoneNumber?: string;
   username?: string;
@@ -37,17 +25,10 @@ export interface UpdateUserValidationSchema {
   alias?: string;
   email?: string;
   firstName?: string;
-  home?: {
-    address: string;
-    city: string;
-    country: string;
-    zip: string;
-  };
+  home?: LocationSchema;
   id: string;
   lastName?: string;
-  oauth2Identifiers?: {
-    opinsys?: string;
-  };
+  oauth2Identifiers?: Oauth2IdentifersValidation;
   password?: string;
   phoneNumber?: string;
   username?: string;

diff --git a/src/interfaces/index.ts b/src/interfaces/index.ts
@@ -1,4 +1,4 @@
 export * from "./auth";
 export * from "./schemas";
 export * from "./users";
-export * from "./validation";
+export * from "./dto";
diff --git a/src/interfaces/validation/Location.validation.ts b/src/interfaces/validation/Location.validation.ts
diff --git a/src/interfaces/validation/Oauth2Identifers.validation.ts b/src/interfaces/validation/Oauth2Identifers.validation.ts
diff --git a/src/interfaces/validation/User.validation.ts b/src/interfaces/validation/User.validation.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,8 +1,8 @@
 {
   "compilerOptions": {
     "outDir": "lib",
-    "target": "es2017",
-    "module": "CommonJS",
+    "target": "es5",
+    "module": "esnext",
     "lib": ["es2015"],
     "sourceMap": true,
     "strict": true,