Provide exports

Signed-off-by: Marius David Wieschollek <passwords.public@mdns.eu>

7 files changed, 125 insertions, 59 deletions

diff --git a/package-lock.json b/package-lock.json
index 40cfe92..13ea0cb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -5,14 +5,15 @@
     "requires": true,
     "packages": {
         "": {
-            "version": "1.0.0.BUILD",
+            "name": "passwords-client",
+            "version": "1.0.0",
             "license": "ISC",
             "dependencies": {
                 "eventemitter3": "^4.0.7",
-                "libsodium-wrappers": "^0.7.8",
-                "pako": "^1.0.11",
-                "url-parse": "^1.4.7",
-                "uuidv4": "^4.0.0"
+                "libsodium-wrappers": "^0.7.9",
+                "pako": "^2.0.4",
+                "url-parse": "^1.5.3",
+                "uuid": "^8.3.2"
             }
         },
         "node_modules/eventemitter3": {
@@ -34,9 +35,9 @@
             }
         },
         "node_modules/pako": {
-            "version": "1.0.11",
-            "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-            "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/pako/-/pako-2.0.4.tgz",
+            "integrity": "sha512-v8tweI900AUkZN6heMU/4Uy4cXRc2AYNRggVmTR+dEncawDJgCdLMximOVA2p4qO57WMynangsfGRb5WD6L1Bg=="
         },
         "node_modules/querystringify": {
             "version": "2.2.0",
@@ -49,28 +50,20 @@
             "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
         },
         "node_modules/url-parse": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz",
-            "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==",
+            "version": "1.5.3",
+            "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
+            "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
             "dependencies": {
                 "querystringify": "^2.1.1",
                 "requires-port": "^1.0.0"
             }
         },
         "node_modules/uuid": {
-            "version": "3.3.2",
-            "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-            "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==",
+            "version": "8.3.2",
+            "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+            "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==",
             "bin": {
-                "uuid": "bin/uuid"
-            }
-        },
-        "node_modules/uuidv4": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/uuidv4/-/uuidv4-4.0.0.tgz",
-            "integrity": "sha512-mG90kcW04v6frNmnLsnd7xqiKubIYgaQHxaHoBplAJpR95hgqkTDq8wpZQU5cN5w9gtKphqdsflHoEnXr2+ing==",
-            "dependencies": {
-                "uuid": "3.3.2"
+                "uuid": "dist/bin/uuid"
             }
         }
     },
@@ -94,9 +87,9 @@
             }
         },
         "pako": {
-            "version": "1.0.11",
-            "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.11.tgz",
-            "integrity": "sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw=="
+            "version": "2.0.4",
+            "resolved": "https://registry.npmjs.org/pako/-/pako-2.0.4.tgz",
+            "integrity": "sha512-v8tweI900AUkZN6heMU/4Uy4cXRc2AYNRggVmTR+dEncawDJgCdLMximOVA2p4qO57WMynangsfGRb5WD6L1Bg=="
         },
         "querystringify": {
             "version": "2.2.0",
@@ -109,26 +102,18 @@
             "integrity": "sha1-kl0mAdOaxIXgkc8NpcbmlNw9yv8="
         },
         "url-parse": {
-            "version": "1.5.1",
-            "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.1.tgz",
-            "integrity": "sha512-HOfCOUJt7iSYzEx/UqgtwKRMC6EU91NFhsCHMv9oM03VJcVo2Qrp8T8kI9D7amFf1cu+/3CEhgb3rF9zL7k85Q==",
+            "version": "1.5.3",
+            "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.3.tgz",
+            "integrity": "sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==",
             "requires": {
                 "querystringify": "^2.1.1",
                 "requires-port": "^1.0.0"
             }
         },
         "uuid": {
-            "version": "3.3.2",
-            "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.2.tgz",
-            "integrity": "sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA=="
-        },
-        "uuidv4": {
-            "version": "4.0.0",
-            "resolved": "https://registry.npmjs.org/uuidv4/-/uuidv4-4.0.0.tgz",
-            "integrity": "sha512-mG90kcW04v6frNmnLsnd7xqiKubIYgaQHxaHoBplAJpR95hgqkTDq8wpZQU5cN5w9gtKphqdsflHoEnXr2+ing==",
-            "requires": {
-                "uuid": "3.3.2"
-            }
+            "version": "8.3.2",
+            "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+            "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
         }
     }
 }
diff --git a/package.json b/package.json
index fc0df2a..89a6834 100644
--- a/package.json
+++ b/package.json
@@ -3,6 +3,16 @@
     "version": "1.0.0.BUILD",
     "description": "JS client library for the Nextcloud Passwords app",
     "main": "src/main.js",
+    "exports": {
+        ".": "src/main.js",
+        "./models": "src/models.js",
+        "./errors": "src/errors.js",
+        "./utility": "src/utility.js",
+        "./boolean-state": "src/State/BooleanState.js",
+        "./basic-class-loader": "src/ClassLoader/BasicClassLoader.js",
+        "./default-class-loader": "src/ClassLoader/DefaultClassLoader.js",
+        "./enhanced-class-loader": "src/ClassLoader/EnhancedClassLoader.js"
+    },
     "author": "Marius Wieschollek",
     "license": "ISC",
     "keywords": [
@@ -17,9 +27,9 @@
     },
     "dependencies": {
         "eventemitter3": "^4.0.7",
-        "libsodium-wrappers": "^0.7.8",
-        "pako": "^1.0.11",
-        "url-parse": "^1.4.7",
-        "uuidv4": "^4.0.0"
+        "libsodium-wrappers": "^0.7.9",
+        "pako": "^2.0.4",
+        "url-parse": "^1.5.3",
+        "uuid": "^8.3.2"
     }
 }
diff --git a/src/Encryption/Keychain/CSEv1Keychain.js b/src/Encryption/Keychain/CSEv1Keychain.js
index b80ad63..954bbd1 100644
--- a/src/Encryption/Keychain/CSEv1Keychain.js
+++ b/src/Encryption/Keychain/CSEv1Keychain.js
@@ -1,6 +1,5 @@
 import sodium from 'libsodium-wrappers';
-import uuid from 'uuidv4';
-import BooleanState from '../../State/BooleanState';
+import { v4 as uuid } from 'uuid';
 
 export default class CSEv1Keychain {
 
diff --git a/src/errors.js b/src/errors.js
new file mode 100644
index 0000000..225f4a5
--- /dev/null
+++ b/src/errors.js
@@ -0,0 +1,55 @@
+import EncryptionNotEnabledError from "./Exception/Encryption/EncryptionNotEnabledError";
+import InvalidEncryptedTextLength from "./Exception/Encryption/InvalidEncryptedTextLength";
+import InvalidObjectTypeError from "./Exception/Encryption/InvalidObjectTypeError";
+import MissingEncryptionKeyError from "./Exception/Encryption/MissingEncryptionKeyError";
+import UnsupportedEncryptionTypeError from "./Exception/Encryption/UnsupportedEncryptionTypeError";
+import BadGatewayError from "./Exception/Http/BadGatewayError";
+import BadRequestError from "./Exception/Http/BadRequestError";
+import ForbiddenError from "./Exception/Http/ForbiddenError";
+import GatewayTimeoutError from "./Exception/Http/GatewayTimeoutError";
+import HttpError from "./Exception/Http/HttpError";
+import InternalServerError from "./Exception/Http/InternalServerError";
+import MethodNotAllowedError from "./Exception/Http/MethodNotAllowedError";
+import NotFoundError from "./Exception/Http/NotFoundError";
+import ServiceUnavailableError from "./Exception/Http/ServiceUnavailableError";
+import TooManyRequestsError from "./Exception/Http/TooManyRequestsError";
+import UnauthorizedError from "./Exception/Http/UnauthorizedError";
+import InvalidLink from "./Exception/PassLink/InvalidLink";
+import UnknownAction from "./Exception/PassLink/UnknownAction";
+import ChallengeTypeNotSupported from "./Exception/ChallengeTypeNotSupported";
+import ConfigurationError from "./Exception/ConfigruationError";
+import InvalidScopeError from "./Exception/InvalidScopeError";
+import NetworkError from "./Exception/NetworkError";
+import ResponseContentTypeError from "./Exception/ResponseContentTypeError";
+import ResponseDecodingError from "./Exception/ResponseDecodingError";
+import TokenTypeNotSupported from "./Exception/TokenTypeNotSupported";
+import UnknownPropertyError from "./Exception/UnknownPropertyError";
+
+export {
+    EncryptionNotEnabledError,
+    InvalidEncryptedTextLength,
+    InvalidObjectTypeError,
+    MissingEncryptionKeyError,
+    UnsupportedEncryptionTypeError,
+    BadGatewayError,
+    BadRequestError,
+    ForbiddenError,
+    GatewayTimeoutError,
+    HttpError,
+    InternalServerError,
+    MethodNotAllowedError,
+    NotFoundError,
+    ServiceUnavailableError,
+    TooManyRequestsError,
+    UnauthorizedError,
+    InvalidLink,
+    UnknownAction,
+    ChallengeTypeNotSupported,
+    ConfigurationError,
+    InvalidScopeError,
+    NetworkError,
+    ResponseContentTypeError,
+    ResponseDecodingError,
+    TokenTypeNotSupported,
+    UnknownPropertyError
+};
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 4f19add..e77e134 100644
--- a/src/main.js
+++ b/src/main.js
@@ -1,14 +1,8 @@
 import PassLink from './PassLink/PassLink';
-import PasswordsClient from './Client/PasswordsClient';
 import BasicPasswordsClient from './Client/BasicPasswordsClient';
-import EnhancedClassLoader from "./ClassLoader/EnhancedClassLoader";
-import DefaultClassLoader from "./ClassLoader/DefaultClassLoader";
-import BasicClassLoader from "./ClassLoader/BasicClassLoader";
-import EnhancedPassword from "./Model/Password/EnhancedPassword";
+import PasswordsClient from './Client/PasswordsClient';
 import Password from "./Model/Password/Password";
-import EnhancedFolder from "./Model/Folder/EnhancedFolder";
 import Folder from "./Model/Folder/Folder";
-import EnhancedTag from "./Model/Tag/EnhancedTag";
 import Tag from "./Model/Tag/Tag";
 import Server from "./Model/Server/Server";
 
@@ -17,13 +11,7 @@ export default PasswordsClient;
 export {
     PasswordsClient,
     BasicPasswordsClient,
-    EnhancedClassLoader,
-    DefaultClassLoader,
-    BasicClassLoader,
     PassLink,
-    EnhancedPassword,
-    EnhancedFolder,
-    EnhancedTag,
     Password,
     Folder,
     Tag,
diff --git a/src/models.js b/src/models.js
new file mode 100644
index 0000000..0ca4d89
--- /dev/null
+++ b/src/models.js
@@ -0,0 +1,22 @@
+import Password from './Model/Password/Password';
+import Folder from './Model/Folder/Folder';
+import Tag from './Model/Tag/Tag';
+import EnhancedPassword from './Model/Password/EnhancedPassword';
+import EnhancedFolder from './Model/Folder/EnhancedFolder';
+import EnhancedTag from './Model/Tag/EnhancedTag';
+import Server from './Model/Server/Server';
+import AbstractModel from './Model/AbstractModel';
+import Setting from "./Model/Setting/Setting";
+
+
+export {
+    AbstractModel,
+    EnhancedPassword,
+    EnhancedFolder,
+    EnhancedTag,
+    Password,
+    Folder,
+    Tag,
+    Server,
+    Setting
+};
diff --git a/src/utility.js b/src/utility.js
new file mode 100644
index 0000000..bb1e8f9
--- /dev/null
+++ b/src/utility.js
@@ -0,0 +1,7 @@
+import ObjectClone from "./Utility/ObjectClone";
+import ObjectMerger from "./Utility/ObjectMerger";
+
+export {
+    ObjectClone,
+    ObjectMerger
+};
\ No newline at end of file