From 9de2a459705bce65dca80064931b1239c6dcbb56 Mon Sep 17 00:00:00 2001
From: Michael Avoyan <michael.avoyan.dev@gmail.com>
Date: Mon, 6 May 2024 15:49:30 +0300
Subject: [PATCH 1/7] v0.8.14 proper usage of Nullish

---
 packages/sample-server/package.json                           | 2 +-
 packages/sample-server/test/initalization.test.ts             | 1 +
 packages/sdk/package.json                                     | 2 +-
 packages/sdk/src/api/Nullish.ts                               | 1 +
 packages/sdk/src/api/VCL.ts                                   | 1 +
 packages/sdk/src/api/entities/VCLCountries.ts                 | 1 +
 packages/sdk/src/api/entities/VCLCountry.ts                   | 1 +
 packages/sdk/src/api/entities/VCLCredentialManifest.ts        | 1 +
 .../sdk/src/api/entities/VCLCredentialManifestDescriptor.ts   | 1 +
 .../api/entities/VCLCredentialManifestDescriptorByDeepLink.ts | 1 +
 .../api/entities/VCLCredentialManifestDescriptorByService.ts  | 1 +
 .../api/entities/VCLCredentialManifestDescriptorRefresh.ts    | 1 +
 packages/sdk/src/api/entities/VCLDeepLink.ts                  | 1 +
 .../sdk/src/api/entities/VCLOrganizationsSearchDescriptor.ts  | 1 +
 packages/sdk/src/api/entities/VCLPresentationRequest.ts       | 1 +
 .../sdk/src/api/entities/VCLPresentationRequestDescriptor.ts  | 1 +
 packages/sdk/src/api/entities/VCLResult.ts                    | 1 +
 .../sdk/src/api/entities/VCLServiceCredentialAgentIssuer.ts   | 1 +
 packages/sdk/src/api/entities/VCLSubmission.ts                | 1 +
 packages/sdk/src/api/entities/VCLToken.ts                     | 1 +
 packages/sdk/src/api/entities/VCLVerifiedProfile.ts           | 1 +
 packages/sdk/src/api/entities/error/VCLError.ts               | 1 +
 packages/sdk/src/global.ts                                    | 4 +---
 .../repositories/CredentialTypesUIFormSchemaRepositoryImpl.ts | 1 +
 .../sdk/src/impl/domain/usecases/FinalizeOffersUseCase.ts     | 1 +
 packages/sdk/src/impl/domain/usecases/SubmissionUseCase.ts    | 1 +
 packages/sdk/src/impl/extensions/StringExtensions.ts          | 2 +-
 packages/sdk/src/impl/utils/VCLLog.ts                         | 1 +
 packages/sdk/src/index.ts                                     | 4 ++++
 packages/sdk/test/NetworkServiceSuccess.ts                    | 1 +
 30 files changed, 33 insertions(+), 6 deletions(-)
 create mode 100644 packages/sdk/src/api/Nullish.ts

diff --git a/packages/sample-server/package.json b/packages/sample-server/package.json
index 6c43a3c..db6f2dc 100644
--- a/packages/sample-server/package.json
+++ b/packages/sample-server/package.json
@@ -19,7 +19,7 @@
         "@fastify/autoload": "~5.7.1",
         "env-var": "~7.3.0",
         "fastify": "~4.15.0",
-        "@velocitycareerlabs/vnf-nodejs-wallet-sdk": "^0.8.13"
+        "@velocitycareerlabs/vnf-nodejs-wallet-sdk": "^0.8.14"
     },
     "devDependencies": {
         "@jest/globals": "~29.5.0",
diff --git a/packages/sample-server/test/initalization.test.ts b/packages/sample-server/test/initalization.test.ts
index 06d9fc0..93418a8 100644
--- a/packages/sample-server/test/initalization.test.ts
+++ b/packages/sample-server/test/initalization.test.ts
@@ -17,6 +17,7 @@ import VCLJwtSignService from "@velocitycareerlabs/vnf-nodejs-wallet-sdk/src/api
 import VCLJwtDescriptor from "@velocitycareerlabs/vnf-nodejs-wallet-sdk/src/api/entities/VCLJwtDescriptor";
 import VCLJwt from "@velocitycareerlabs/vnf-nodejs-wallet-sdk/src/api/entities/VCLJwt";
 import VCLJwtVerifyService from "@velocitycareerlabs/vnf-nodejs-wallet-sdk/src/api/jwt/VCLJwtVerifyService";
+import { Nullish } from "@velocitycareerlabs/vnf-nodejs-wallet-sdk/src/api/Nullish";
 
 describe("initalization flow", () => {
     let appInstance: FastifyInstance;
diff --git a/packages/sdk/package.json b/packages/sdk/package.json
index e606adc..bd66ae1 100644
--- a/packages/sdk/package.json
+++ b/packages/sdk/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@velocitycareerlabs/vnf-nodejs-wallet-sdk",
-    "version": "0.8.13",
+    "version": "0.8.14",
     "description": "VNF Wallet SDK Nodejs",
     "main": "dist/index.js",
     "types": "dist/index.d.ts",
diff --git a/packages/sdk/src/api/Nullish.ts b/packages/sdk/src/api/Nullish.ts
new file mode 100644
index 0000000..d47ede7
--- /dev/null
+++ b/packages/sdk/src/api/Nullish.ts
@@ -0,0 +1 @@
+export type Nullish<T> = T | null | undefined;
\ No newline at end of file
diff --git a/packages/sdk/src/api/VCL.ts b/packages/sdk/src/api/VCL.ts
index d2a22c6..7b522ad 100644
--- a/packages/sdk/src/api/VCL.ts
+++ b/packages/sdk/src/api/VCL.ts
@@ -26,6 +26,7 @@ import VCLSubmissionResult from "./entities/VCLSubmissionResult";
 import VCLToken from "./entities/VCLToken";
 import VCLVerifiedProfile from "./entities/VCLVerifiedProfile";
 import VCLVerifiedProfileDescriptor from "./entities/VCLVerifiedProfileDescriptor";
+import { Nullish } from "./Nullish";
 
 export default interface VCL {
     initialize(
diff --git a/packages/sdk/src/api/entities/VCLCountries.ts b/packages/sdk/src/api/entities/VCLCountries.ts
index d5452e7..205faa2 100644
--- a/packages/sdk/src/api/entities/VCLCountries.ts
+++ b/packages/sdk/src/api/entities/VCLCountries.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../Nullish";
 import VCLCountry from "./VCLCountry";
 
 class VCLCountries {
diff --git a/packages/sdk/src/api/entities/VCLCountry.ts b/packages/sdk/src/api/entities/VCLCountry.ts
index 6c9848d..119fcf7 100644
--- a/packages/sdk/src/api/entities/VCLCountry.ts
+++ b/packages/sdk/src/api/entities/VCLCountry.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../Nullish";
 import VCLPlace from "./VCLPlace";
 import VCLRegions from "./VCLRegions";
 
diff --git a/packages/sdk/src/api/entities/VCLCredentialManifest.ts b/packages/sdk/src/api/entities/VCLCredentialManifest.ts
index 4d92dc1..a1d0ecb 100644
--- a/packages/sdk/src/api/entities/VCLCredentialManifest.ts
+++ b/packages/sdk/src/api/entities/VCLCredentialManifest.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../Nullish";
 import VCLJwt from "./VCLJwt";
 import VCLVerifiedProfile from "./VCLVerifiedProfile";
 
diff --git a/packages/sdk/src/api/entities/VCLCredentialManifestDescriptor.ts b/packages/sdk/src/api/entities/VCLCredentialManifestDescriptor.ts
index 2d5f2ad..72abdee 100644
--- a/packages/sdk/src/api/entities/VCLCredentialManifestDescriptor.ts
+++ b/packages/sdk/src/api/entities/VCLCredentialManifestDescriptor.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../Nullish";
 import VCLIssuingType from "./VCLIssuingType";
 import VCLPushDelegate from "./VCLPushDelegate";
 
diff --git a/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByDeepLink.ts b/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByDeepLink.ts
index 28b7fb2..7043c9b 100644
--- a/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByDeepLink.ts
+++ b/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByDeepLink.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../Nullish";
 import VCLCredentialManifestDescriptor from "./VCLCredentialManifestDescriptor";
 import VCLDeepLink from "./VCLDeepLink";
 import VCLIssuingType from "./VCLIssuingType";
diff --git a/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByService.ts b/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByService.ts
index fb50aab..93f94b8 100644
--- a/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByService.ts
+++ b/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByService.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../Nullish";
 import VCLCredentialManifestDescriptor from "./VCLCredentialManifestDescriptor";
 import VCLIssuingType from "./VCLIssuingType";
 import VCLPushDelegate from "./VCLPushDelegate";
diff --git a/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorRefresh.ts b/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorRefresh.ts
index 5ef284e..91f6c1e 100644
--- a/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorRefresh.ts
+++ b/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorRefresh.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../Nullish";
 import VCLCredentialManifestDescriptor from "./VCLCredentialManifestDescriptor";
 import VCLIssuingType from "./VCLIssuingType";
 import VCLService from "./VCLService";
diff --git a/packages/sdk/src/api/entities/VCLDeepLink.ts b/packages/sdk/src/api/entities/VCLDeepLink.ts
index 9710b36..e6de68c 100644
--- a/packages/sdk/src/api/entities/VCLDeepLink.ts
+++ b/packages/sdk/src/api/entities/VCLDeepLink.ts
@@ -1,4 +1,5 @@
 import "../../impl/extensions/StringExtensions";
+import { Nullish } from "../Nullish";
 
 export default class VCLDeepLink {
     public requestUri: Nullish<string>;
diff --git a/packages/sdk/src/api/entities/VCLOrganizationsSearchDescriptor.ts b/packages/sdk/src/api/entities/VCLOrganizationsSearchDescriptor.ts
index 60b2355..f63184e 100644
--- a/packages/sdk/src/api/entities/VCLOrganizationsSearchDescriptor.ts
+++ b/packages/sdk/src/api/entities/VCLOrganizationsSearchDescriptor.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../Nullish";
 import VCLServiceTypes from "./VCLServiceTypes";
 
 export default class VCLOrganizationsSearchDescriptor {
diff --git a/packages/sdk/src/api/entities/VCLPresentationRequest.ts b/packages/sdk/src/api/entities/VCLPresentationRequest.ts
index c776928..1ae09ad 100644
--- a/packages/sdk/src/api/entities/VCLPresentationRequest.ts
+++ b/packages/sdk/src/api/entities/VCLPresentationRequest.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../Nullish";
 import VCLDeepLink from "./VCLDeepLink";
 import VCLJwt from "./VCLJwt";
 import VCLPushDelegate from "./VCLPushDelegate";
diff --git a/packages/sdk/src/api/entities/VCLPresentationRequestDescriptor.ts b/packages/sdk/src/api/entities/VCLPresentationRequestDescriptor.ts
index 94b1422..3e296d1 100644
--- a/packages/sdk/src/api/entities/VCLPresentationRequestDescriptor.ts
+++ b/packages/sdk/src/api/entities/VCLPresentationRequestDescriptor.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../Nullish";
 import VCLDeepLink from "./VCLDeepLink";
 import VCLPushDelegate from "./VCLPushDelegate";
 
diff --git a/packages/sdk/src/api/entities/VCLResult.ts b/packages/sdk/src/api/entities/VCLResult.ts
index 52c364b..141a98a 100644
--- a/packages/sdk/src/api/entities/VCLResult.ts
+++ b/packages/sdk/src/api/entities/VCLResult.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../Nullish";
 import VCLError from "./error/VCLError";
 
 export default class VCLResult<R> {
diff --git a/packages/sdk/src/api/entities/VCLServiceCredentialAgentIssuer.ts b/packages/sdk/src/api/entities/VCLServiceCredentialAgentIssuer.ts
index 6d70982..11e314a 100644
--- a/packages/sdk/src/api/entities/VCLServiceCredentialAgentIssuer.ts
+++ b/packages/sdk/src/api/entities/VCLServiceCredentialAgentIssuer.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../Nullish";
 import VCLService from "./VCLService";
 
 export default class VCLServiceCredentialAgentIssuer extends VCLService {
diff --git a/packages/sdk/src/api/entities/VCLSubmission.ts b/packages/sdk/src/api/entities/VCLSubmission.ts
index 849605d..3fea8c4 100644
--- a/packages/sdk/src/api/entities/VCLSubmission.ts
+++ b/packages/sdk/src/api/entities/VCLSubmission.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../Nullish";
 import VCLJwt from "./VCLJwt";
 import VCLPushDelegate from "./VCLPushDelegate";
 import VCLVerifiableCredential from "./VCLVerifiableCredential";
diff --git a/packages/sdk/src/api/entities/VCLToken.ts b/packages/sdk/src/api/entities/VCLToken.ts
index c812c64..2ebe466 100644
--- a/packages/sdk/src/api/entities/VCLToken.ts
+++ b/packages/sdk/src/api/entities/VCLToken.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../Nullish";
 import VCLJwt from "./VCLJwt"
 
 export default class VCLToken {
diff --git a/packages/sdk/src/api/entities/VCLVerifiedProfile.ts b/packages/sdk/src/api/entities/VCLVerifiedProfile.ts
index 814e207..45b97ec 100644
--- a/packages/sdk/src/api/entities/VCLVerifiedProfile.ts
+++ b/packages/sdk/src/api/entities/VCLVerifiedProfile.ts
@@ -22,6 +22,7 @@ data class VCLVerifiedProfile(val payload: JSONObject) {
 }
 */
 
+import { Nullish } from "../Nullish";
 import VCLServiceType from "./VCLServiceType";
 import VCLServiceTypes from "./VCLServiceTypes";
 
diff --git a/packages/sdk/src/api/entities/error/VCLError.ts b/packages/sdk/src/api/entities/error/VCLError.ts
index e654035..c0237f8 100644
--- a/packages/sdk/src/api/entities/error/VCLError.ts
+++ b/packages/sdk/src/api/entities/error/VCLError.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../../../api/Nullish";
 import VCLErrorCode from "./VCLErrorCode";
 
 export default class VCLError extends Error {
diff --git a/packages/sdk/src/global.ts b/packages/sdk/src/global.ts
index d27abab..b4bd7ba 100644
--- a/packages/sdk/src/global.ts
+++ b/packages/sdk/src/global.ts
@@ -1,11 +1,9 @@
-declare type Nullish<T> = T | null | undefined;
-
 declare type JSONObject = any;
 
 interface String {
     getQueryParameters(): Map<string, string>;
     appendQueryParams(queryParams: string): string;
-    getUrlSubPath(subPathPrefix: string): Nullish<string>;
+    getUrlSubPath(subPathPrefix: string): string | null | undefined;
     randomString(length: number): string;
 }
 
diff --git a/packages/sdk/src/impl/data/repositories/CredentialTypesUIFormSchemaRepositoryImpl.ts b/packages/sdk/src/impl/data/repositories/CredentialTypesUIFormSchemaRepositoryImpl.ts
index c596d18..b830937 100644
--- a/packages/sdk/src/impl/data/repositories/CredentialTypesUIFormSchemaRepositoryImpl.ts
+++ b/packages/sdk/src/impl/data/repositories/CredentialTypesUIFormSchemaRepositoryImpl.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../../../api/Nullish";
 import VCLCountries from "../../../api/entities/VCLCountries";
 import VCLCredentialTypesUIFormSchema from "../../../api/entities/VCLCredentialTypesUIFormSchema";
 import VCLCredentialTypesUIFormSchemaDescriptor from "../../../api/entities/VCLCredentialTypesUIFormSchemaDescriptor";
diff --git a/packages/sdk/src/impl/domain/usecases/FinalizeOffersUseCase.ts b/packages/sdk/src/impl/domain/usecases/FinalizeOffersUseCase.ts
index 80e2f6a..1231129 100644
--- a/packages/sdk/src/impl/domain/usecases/FinalizeOffersUseCase.ts
+++ b/packages/sdk/src/impl/domain/usecases/FinalizeOffersUseCase.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../../../api/Nullish";
 import VCLDidJwk from "../../../api/entities/VCLDidJwk";
 import VCLFinalizeOffersDescriptor from "../../../api/entities/VCLFinalizeOffersDescriptor";
 import VCLJwtVerifiableCredentials from "../../../api/entities/VCLJwtVerifiableCredentials";
diff --git a/packages/sdk/src/impl/domain/usecases/SubmissionUseCase.ts b/packages/sdk/src/impl/domain/usecases/SubmissionUseCase.ts
index 2120d1d..b7a2537 100644
--- a/packages/sdk/src/impl/domain/usecases/SubmissionUseCase.ts
+++ b/packages/sdk/src/impl/domain/usecases/SubmissionUseCase.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../../../api/Nullish";
 import VCLDidJwk from "../../../api/entities/VCLDidJwk";
 import VCLResult from "../../../api/entities/VCLResult";
 import VCLSubmission from "../../../api/entities/VCLSubmission";
diff --git a/packages/sdk/src/impl/extensions/StringExtensions.ts b/packages/sdk/src/impl/extensions/StringExtensions.ts
index 069e4e4..3607818 100644
--- a/packages/sdk/src/impl/extensions/StringExtensions.ts
+++ b/packages/sdk/src/impl/extensions/StringExtensions.ts
@@ -30,7 +30,7 @@ String.prototype.appendQueryParams = function (queryParams: string): string {
 
 String.prototype.getUrlSubPath = function (
     subPathPrefix: string
-): Nullish<string> {
+): string | null | undefined {
     return decodeURI(this.valueOf())
         .split("/")
         .find((item) => item.startsWith(subPathPrefix));
diff --git a/packages/sdk/src/impl/utils/VCLLog.ts b/packages/sdk/src/impl/utils/VCLLog.ts
index e3bffea..3d637d8 100644
--- a/packages/sdk/src/impl/utils/VCLLog.ts
+++ b/packages/sdk/src/impl/utils/VCLLog.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../../api/Nullish";
 import GlobalConfig from "../GlobalConfig";
 
 export default class VCLLog {
diff --git a/packages/sdk/src/index.ts b/packages/sdk/src/index.ts
index f37531b..fbda9cd 100644
--- a/packages/sdk/src/index.ts
+++ b/packages/sdk/src/index.ts
@@ -53,6 +53,8 @@ import VCLErrorCode from "./api/entities/error/VCLErrorCode";
 import VCLKeyService from "./api/keys/VCLKeyService";
 import VCLJwtSignService from "./api/jwt/VCLJwtSignService";
 import VCLJwtVerifyService from "./api/jwt/VCLJwtVerifyService";
+import VCLResult from "./api/entities/VCLResult";
+import { Nullish } from "./api/Nullish";
 
 export {
     VCL,
@@ -111,6 +113,8 @@ export {
     VCLKeyService,
     VCLJwtSignService,
     VCLJwtVerifyService,
+    VCLResult,
+    Nullish,
 };
 
 // export type {
diff --git a/packages/sdk/test/NetworkServiceSuccess.ts b/packages/sdk/test/NetworkServiceSuccess.ts
index 7816679..f30dfea 100644
--- a/packages/sdk/test/NetworkServiceSuccess.ts
+++ b/packages/sdk/test/NetworkServiceSuccess.ts
@@ -4,6 +4,7 @@ import Request, {
     HttpMethod,
 } from "../src/impl/data/infrastructure/network/Request";
 import Response from "../src/impl/data/infrastructure/network/Response";
+import { Nullish } from "../src/api/Nullish";
 
 export default class NetworkServiceSuccess implements NetworkService {
     constructor(private readonly validResponse: JSONObject) {}

From 1c55ab2f5ebb3838d72f1a7c5d3ca68e6186f8c9 Mon Sep 17 00:00:00 2001
From: Michael Avoyan <michael.avoyan.dev@gmail.com>
Date: Mon, 6 May 2024 15:51:57 +0300
Subject: [PATCH 2/7] Update yarn.lock

---
 yarn.lock | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index 4c4e6bb..17a7126 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3311,9 +3311,9 @@ fast-json-stable-stringify@2.x, fast-json-stable-stringify@^2.0.0, fast-json-sta
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
 fast-json-stringify@^5.7.0:
-  version "5.15.0"
-  resolved "https://registry.npmjs.org/fast-json-stringify/-/fast-json-stringify-5.15.0.tgz#79ea7203c8e541c744e1d59a4fb17133688c181a"
-  integrity sha512-BUEAAyDKb64u+kmkINYfXUUiKjBKerSmVu/dzotfaWSHBxR44JFrOZgkhMO6VxDhDfiuAoi8mx4drd5nvNdA4Q==
+  version "5.15.1"
+  resolved "https://registry.npmjs.org/fast-json-stringify/-/fast-json-stringify-5.15.1.tgz#1348b89c174cd771467e017cf61c75a796154c45"
+  integrity sha512-JopGtkvvguRqrS4gHXSSA2jf4pDgOZkeBAkLO1LbzOpiOMo7/kugoR+KiWifpLpluaVeYDkAuxCJOj4Gyc6L9A==
   dependencies:
     "@fastify/merge-json-schemas" "^0.1.0"
     ajv "^8.10.0"

From 5ca72929f4d767b173bceb594789f1ecec557f9c Mon Sep 17 00:00:00 2001
From: Michael Avoyan <michael.avoyan.dev@gmail.com>
Date: Mon, 6 May 2024 15:54:13 +0300
Subject: [PATCH 3/7] Update Nullish.ts

---
 packages/sdk/src/api/Nullish.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/sdk/src/api/Nullish.ts b/packages/sdk/src/api/Nullish.ts
index d47ede7..df216d1 100644
--- a/packages/sdk/src/api/Nullish.ts
+++ b/packages/sdk/src/api/Nullish.ts
@@ -1 +1 @@
-export type Nullish<T> = T | null | undefined;
\ No newline at end of file
+export type Nullish = null | undefined;
\ No newline at end of file

From 259b6da4ec29ee45083d9fd24e235efaf79d6312 Mon Sep 17 00:00:00 2001
From: Michael Avoyan <michael.avoyan.dev@gmail.com>
Date: Mon, 6 May 2024 15:57:29 +0300
Subject: [PATCH 4/7] Update Nullish.ts

---
 packages/sdk/src/api/Nullish.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/sdk/src/api/Nullish.ts b/packages/sdk/src/api/Nullish.ts
index df216d1..d47ede7 100644
--- a/packages/sdk/src/api/Nullish.ts
+++ b/packages/sdk/src/api/Nullish.ts
@@ -1 +1 @@
-export type Nullish = null | undefined;
\ No newline at end of file
+export type Nullish<T> = T | null | undefined;
\ No newline at end of file

From 5acdf37cea7fdb39da3158f0d84f5a5949174af5 Mon Sep 17 00:00:00 2001
From: Michael Avoyan <michael.avoyan.dev@gmail.com>
Date: Mon, 6 May 2024 16:33:02 +0300
Subject: [PATCH 5/7] move Nullish to root

---
 packages/sdk/src/{api => }/Nullish.ts                           | 0
 packages/sdk/src/api/VCL.ts                                     | 2 +-
 packages/sdk/src/api/entities/VCLCountries.ts                   | 2 +-
 packages/sdk/src/api/entities/VCLCountry.ts                     | 2 +-
 packages/sdk/src/api/entities/VCLCredentialManifest.ts          | 2 +-
 .../sdk/src/api/entities/VCLCredentialManifestDescriptor.ts     | 2 +-
 .../api/entities/VCLCredentialManifestDescriptorByDeepLink.ts   | 2 +-
 .../api/entities/VCLCredentialManifestDescriptorByService.ts    | 2 +-
 .../src/api/entities/VCLCredentialManifestDescriptorRefresh.ts  | 2 +-
 packages/sdk/src/api/entities/VCLDeepLink.ts                    | 2 +-
 .../sdk/src/api/entities/VCLOrganizationsSearchDescriptor.ts    | 2 +-
 packages/sdk/src/api/entities/VCLPresentationRequest.ts         | 2 +-
 .../sdk/src/api/entities/VCLPresentationRequestDescriptor.ts    | 2 +-
 packages/sdk/src/api/entities/VCLResult.ts                      | 2 +-
 .../sdk/src/api/entities/VCLServiceCredentialAgentIssuer.ts     | 2 +-
 packages/sdk/src/api/entities/VCLSubmission.ts                  | 2 +-
 packages/sdk/src/api/entities/VCLToken.ts                       | 2 +-
 packages/sdk/src/api/entities/VCLVerifiedProfile.ts             | 2 +-
 packages/sdk/src/api/entities/error/VCLError.ts                 | 2 +-
 .../repositories/CredentialTypesUIFormSchemaRepositoryImpl.ts   | 2 +-
 packages/sdk/src/impl/domain/usecases/FinalizeOffersUseCase.ts  | 2 +-
 packages/sdk/src/impl/domain/usecases/SubmissionUseCase.ts      | 2 +-
 packages/sdk/src/impl/utils/VCLLog.ts                           | 2 +-
 packages/sdk/src/index.ts                                       | 2 +-
 packages/sdk/test/NetworkServiceSuccess.ts                      | 2 +-
 25 files changed, 24 insertions(+), 24 deletions(-)
 rename packages/sdk/src/{api => }/Nullish.ts (100%)

diff --git a/packages/sdk/src/api/Nullish.ts b/packages/sdk/src/Nullish.ts
similarity index 100%
rename from packages/sdk/src/api/Nullish.ts
rename to packages/sdk/src/Nullish.ts
diff --git a/packages/sdk/src/api/VCL.ts b/packages/sdk/src/api/VCL.ts
index 7b522ad..98ba24b 100644
--- a/packages/sdk/src/api/VCL.ts
+++ b/packages/sdk/src/api/VCL.ts
@@ -26,7 +26,7 @@ import VCLSubmissionResult from "./entities/VCLSubmissionResult";
 import VCLToken from "./entities/VCLToken";
 import VCLVerifiedProfile from "./entities/VCLVerifiedProfile";
 import VCLVerifiedProfileDescriptor from "./entities/VCLVerifiedProfileDescriptor";
-import { Nullish } from "./Nullish";
+import { Nullish } from "../Nullish";
 
 export default interface VCL {
     initialize(
diff --git a/packages/sdk/src/api/entities/VCLCountries.ts b/packages/sdk/src/api/entities/VCLCountries.ts
index 205faa2..6404ca9 100644
--- a/packages/sdk/src/api/entities/VCLCountries.ts
+++ b/packages/sdk/src/api/entities/VCLCountries.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../Nullish";
+import { Nullish } from "../../Nullish";
 import VCLCountry from "./VCLCountry";
 
 class VCLCountries {
diff --git a/packages/sdk/src/api/entities/VCLCountry.ts b/packages/sdk/src/api/entities/VCLCountry.ts
index 119fcf7..e39fed8 100644
--- a/packages/sdk/src/api/entities/VCLCountry.ts
+++ b/packages/sdk/src/api/entities/VCLCountry.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../Nullish";
+import { Nullish } from "../../Nullish";
 import VCLPlace from "./VCLPlace";
 import VCLRegions from "./VCLRegions";
 
diff --git a/packages/sdk/src/api/entities/VCLCredentialManifest.ts b/packages/sdk/src/api/entities/VCLCredentialManifest.ts
index a1d0ecb..bef1c02 100644
--- a/packages/sdk/src/api/entities/VCLCredentialManifest.ts
+++ b/packages/sdk/src/api/entities/VCLCredentialManifest.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../Nullish";
+import { Nullish } from "../../Nullish";
 import VCLJwt from "./VCLJwt";
 import VCLVerifiedProfile from "./VCLVerifiedProfile";
 
diff --git a/packages/sdk/src/api/entities/VCLCredentialManifestDescriptor.ts b/packages/sdk/src/api/entities/VCLCredentialManifestDescriptor.ts
index 72abdee..970867b 100644
--- a/packages/sdk/src/api/entities/VCLCredentialManifestDescriptor.ts
+++ b/packages/sdk/src/api/entities/VCLCredentialManifestDescriptor.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../Nullish";
+import { Nullish } from "../../Nullish";
 import VCLIssuingType from "./VCLIssuingType";
 import VCLPushDelegate from "./VCLPushDelegate";
 
diff --git a/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByDeepLink.ts b/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByDeepLink.ts
index 7043c9b..61a9a8e 100644
--- a/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByDeepLink.ts
+++ b/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByDeepLink.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../Nullish";
+import { Nullish } from "../../Nullish";
 import VCLCredentialManifestDescriptor from "./VCLCredentialManifestDescriptor";
 import VCLDeepLink from "./VCLDeepLink";
 import VCLIssuingType from "./VCLIssuingType";
diff --git a/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByService.ts b/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByService.ts
index 93f94b8..8e15e8d 100644
--- a/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByService.ts
+++ b/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByService.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../Nullish";
+import { Nullish } from "../../Nullish";
 import VCLCredentialManifestDescriptor from "./VCLCredentialManifestDescriptor";
 import VCLIssuingType from "./VCLIssuingType";
 import VCLPushDelegate from "./VCLPushDelegate";
diff --git a/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorRefresh.ts b/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorRefresh.ts
index 91f6c1e..a628d61 100644
--- a/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorRefresh.ts
+++ b/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorRefresh.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../Nullish";
+import { Nullish } from "../../Nullish";
 import VCLCredentialManifestDescriptor from "./VCLCredentialManifestDescriptor";
 import VCLIssuingType from "./VCLIssuingType";
 import VCLService from "./VCLService";
diff --git a/packages/sdk/src/api/entities/VCLDeepLink.ts b/packages/sdk/src/api/entities/VCLDeepLink.ts
index e6de68c..c356c22 100644
--- a/packages/sdk/src/api/entities/VCLDeepLink.ts
+++ b/packages/sdk/src/api/entities/VCLDeepLink.ts
@@ -1,5 +1,5 @@
 import "../../impl/extensions/StringExtensions";
-import { Nullish } from "../Nullish";
+import { Nullish } from "../../Nullish";
 
 export default class VCLDeepLink {
     public requestUri: Nullish<string>;
diff --git a/packages/sdk/src/api/entities/VCLOrganizationsSearchDescriptor.ts b/packages/sdk/src/api/entities/VCLOrganizationsSearchDescriptor.ts
index f63184e..2b61c3b 100644
--- a/packages/sdk/src/api/entities/VCLOrganizationsSearchDescriptor.ts
+++ b/packages/sdk/src/api/entities/VCLOrganizationsSearchDescriptor.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../Nullish";
+import { Nullish } from "../../Nullish";
 import VCLServiceTypes from "./VCLServiceTypes";
 
 export default class VCLOrganizationsSearchDescriptor {
diff --git a/packages/sdk/src/api/entities/VCLPresentationRequest.ts b/packages/sdk/src/api/entities/VCLPresentationRequest.ts
index 1ae09ad..dde5d8e 100644
--- a/packages/sdk/src/api/entities/VCLPresentationRequest.ts
+++ b/packages/sdk/src/api/entities/VCLPresentationRequest.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../Nullish";
+import { Nullish } from "../../Nullish";
 import VCLDeepLink from "./VCLDeepLink";
 import VCLJwt from "./VCLJwt";
 import VCLPushDelegate from "./VCLPushDelegate";
diff --git a/packages/sdk/src/api/entities/VCLPresentationRequestDescriptor.ts b/packages/sdk/src/api/entities/VCLPresentationRequestDescriptor.ts
index 3e296d1..e3fbba7 100644
--- a/packages/sdk/src/api/entities/VCLPresentationRequestDescriptor.ts
+++ b/packages/sdk/src/api/entities/VCLPresentationRequestDescriptor.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../Nullish";
+import { Nullish } from "../../Nullish";
 import VCLDeepLink from "./VCLDeepLink";
 import VCLPushDelegate from "./VCLPushDelegate";
 
diff --git a/packages/sdk/src/api/entities/VCLResult.ts b/packages/sdk/src/api/entities/VCLResult.ts
index 141a98a..7aa90ef 100644
--- a/packages/sdk/src/api/entities/VCLResult.ts
+++ b/packages/sdk/src/api/entities/VCLResult.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../Nullish";
+import { Nullish } from "../../Nullish";
 import VCLError from "./error/VCLError";
 
 export default class VCLResult<R> {
diff --git a/packages/sdk/src/api/entities/VCLServiceCredentialAgentIssuer.ts b/packages/sdk/src/api/entities/VCLServiceCredentialAgentIssuer.ts
index 11e314a..8d8cdf1 100644
--- a/packages/sdk/src/api/entities/VCLServiceCredentialAgentIssuer.ts
+++ b/packages/sdk/src/api/entities/VCLServiceCredentialAgentIssuer.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../Nullish";
+import { Nullish } from "../../Nullish";
 import VCLService from "./VCLService";
 
 export default class VCLServiceCredentialAgentIssuer extends VCLService {
diff --git a/packages/sdk/src/api/entities/VCLSubmission.ts b/packages/sdk/src/api/entities/VCLSubmission.ts
index 3fea8c4..a0a4abe 100644
--- a/packages/sdk/src/api/entities/VCLSubmission.ts
+++ b/packages/sdk/src/api/entities/VCLSubmission.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../Nullish";
+import { Nullish } from "../../Nullish";
 import VCLJwt from "./VCLJwt";
 import VCLPushDelegate from "./VCLPushDelegate";
 import VCLVerifiableCredential from "./VCLVerifiableCredential";
diff --git a/packages/sdk/src/api/entities/VCLToken.ts b/packages/sdk/src/api/entities/VCLToken.ts
index 2ebe466..e8fc13f 100644
--- a/packages/sdk/src/api/entities/VCLToken.ts
+++ b/packages/sdk/src/api/entities/VCLToken.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../Nullish";
+import { Nullish } from "../../Nullish";
 import VCLJwt from "./VCLJwt"
 
 export default class VCLToken {
diff --git a/packages/sdk/src/api/entities/VCLVerifiedProfile.ts b/packages/sdk/src/api/entities/VCLVerifiedProfile.ts
index 45b97ec..2907815 100644
--- a/packages/sdk/src/api/entities/VCLVerifiedProfile.ts
+++ b/packages/sdk/src/api/entities/VCLVerifiedProfile.ts
@@ -22,7 +22,7 @@ data class VCLVerifiedProfile(val payload: JSONObject) {
 }
 */
 
-import { Nullish } from "../Nullish";
+import { Nullish } from "../../Nullish";
 import VCLServiceType from "./VCLServiceType";
 import VCLServiceTypes from "./VCLServiceTypes";
 
diff --git a/packages/sdk/src/api/entities/error/VCLError.ts b/packages/sdk/src/api/entities/error/VCLError.ts
index c0237f8..b854e92 100644
--- a/packages/sdk/src/api/entities/error/VCLError.ts
+++ b/packages/sdk/src/api/entities/error/VCLError.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../../../api/Nullish";
+import { Nullish } from "../../../Nullish";
 import VCLErrorCode from "./VCLErrorCode";
 
 export default class VCLError extends Error {
diff --git a/packages/sdk/src/impl/data/repositories/CredentialTypesUIFormSchemaRepositoryImpl.ts b/packages/sdk/src/impl/data/repositories/CredentialTypesUIFormSchemaRepositoryImpl.ts
index b830937..2d362fb 100644
--- a/packages/sdk/src/impl/data/repositories/CredentialTypesUIFormSchemaRepositoryImpl.ts
+++ b/packages/sdk/src/impl/data/repositories/CredentialTypesUIFormSchemaRepositoryImpl.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../../../api/Nullish";
+import { Nullish } from "../../../Nullish";
 import VCLCountries from "../../../api/entities/VCLCountries";
 import VCLCredentialTypesUIFormSchema from "../../../api/entities/VCLCredentialTypesUIFormSchema";
 import VCLCredentialTypesUIFormSchemaDescriptor from "../../../api/entities/VCLCredentialTypesUIFormSchemaDescriptor";
diff --git a/packages/sdk/src/impl/domain/usecases/FinalizeOffersUseCase.ts b/packages/sdk/src/impl/domain/usecases/FinalizeOffersUseCase.ts
index 1231129..cfa0797 100644
--- a/packages/sdk/src/impl/domain/usecases/FinalizeOffersUseCase.ts
+++ b/packages/sdk/src/impl/domain/usecases/FinalizeOffersUseCase.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../../../api/Nullish";
+import { Nullish } from "../../../Nullish";
 import VCLDidJwk from "../../../api/entities/VCLDidJwk";
 import VCLFinalizeOffersDescriptor from "../../../api/entities/VCLFinalizeOffersDescriptor";
 import VCLJwtVerifiableCredentials from "../../../api/entities/VCLJwtVerifiableCredentials";
diff --git a/packages/sdk/src/impl/domain/usecases/SubmissionUseCase.ts b/packages/sdk/src/impl/domain/usecases/SubmissionUseCase.ts
index b7a2537..9ab168f 100644
--- a/packages/sdk/src/impl/domain/usecases/SubmissionUseCase.ts
+++ b/packages/sdk/src/impl/domain/usecases/SubmissionUseCase.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../../../api/Nullish";
+import { Nullish } from "../../../Nullish";
 import VCLDidJwk from "../../../api/entities/VCLDidJwk";
 import VCLResult from "../../../api/entities/VCLResult";
 import VCLSubmission from "../../../api/entities/VCLSubmission";
diff --git a/packages/sdk/src/impl/utils/VCLLog.ts b/packages/sdk/src/impl/utils/VCLLog.ts
index 3d637d8..08d3561 100644
--- a/packages/sdk/src/impl/utils/VCLLog.ts
+++ b/packages/sdk/src/impl/utils/VCLLog.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../../api/Nullish";
+import { Nullish } from "../../Nullish";
 import GlobalConfig from "../GlobalConfig";
 
 export default class VCLLog {
diff --git a/packages/sdk/src/index.ts b/packages/sdk/src/index.ts
index fbda9cd..14932e8 100644
--- a/packages/sdk/src/index.ts
+++ b/packages/sdk/src/index.ts
@@ -54,7 +54,7 @@ import VCLKeyService from "./api/keys/VCLKeyService";
 import VCLJwtSignService from "./api/jwt/VCLJwtSignService";
 import VCLJwtVerifyService from "./api/jwt/VCLJwtVerifyService";
 import VCLResult from "./api/entities/VCLResult";
-import { Nullish } from "./api/Nullish";
+import { Nullish } from "./Nullish";
 
 export {
     VCL,
diff --git a/packages/sdk/test/NetworkServiceSuccess.ts b/packages/sdk/test/NetworkServiceSuccess.ts
index f30dfea..4e37e33 100644
--- a/packages/sdk/test/NetworkServiceSuccess.ts
+++ b/packages/sdk/test/NetworkServiceSuccess.ts
@@ -4,7 +4,7 @@ import Request, {
     HttpMethod,
 } from "../src/impl/data/infrastructure/network/Request";
 import Response from "../src/impl/data/infrastructure/network/Response";
-import { Nullish } from "../src/api/Nullish";
+import { Nullish } from "../src/Nullish";
 
 export default class NetworkServiceSuccess implements NetworkService {
     constructor(private readonly validResponse: JSONObject) {}

From 1850d468911e7ee7ab3dc7d072368813fe3da266 Mon Sep 17 00:00:00 2001
From: Michael Avoyan <michael.avoyan.dev@gmail.com>
Date: Mon, 6 May 2024 17:01:43 +0300
Subject: [PATCH 6/7] move Nullish to types.ts

---
 packages/sdk/src/api/VCL.ts                                   | 2 +-
 packages/sdk/src/api/entities/VCLCountries.ts                 | 2 +-
 packages/sdk/src/api/entities/VCLCountry.ts                   | 2 +-
 packages/sdk/src/api/entities/VCLCredentialManifest.ts        | 2 +-
 .../sdk/src/api/entities/VCLCredentialManifestDescriptor.ts   | 2 +-
 .../api/entities/VCLCredentialManifestDescriptorByDeepLink.ts | 2 +-
 .../api/entities/VCLCredentialManifestDescriptorByService.ts  | 2 +-
 .../api/entities/VCLCredentialManifestDescriptorRefresh.ts    | 2 +-
 packages/sdk/src/api/entities/VCLDeepLink.ts                  | 2 +-
 packages/sdk/src/api/entities/VCLJwt.ts                       | 2 +-
 .../sdk/src/api/entities/VCLOrganizationsSearchDescriptor.ts  | 2 +-
 packages/sdk/src/api/entities/VCLPresentationRequest.ts       | 2 +-
 .../sdk/src/api/entities/VCLPresentationRequestDescriptor.ts  | 2 +-
 packages/sdk/src/api/entities/VCLResult.ts                    | 2 +-
 .../sdk/src/api/entities/VCLServiceCredentialAgentIssuer.ts   | 2 +-
 packages/sdk/src/api/entities/VCLSubmission.ts                | 2 +-
 packages/sdk/src/api/entities/VCLToken.ts                     | 2 +-
 packages/sdk/src/api/entities/VCLVerifiedProfile.ts           | 2 +-
 packages/sdk/src/api/entities/error/VCLError.ts               | 2 +-
 packages/sdk/src/impl/data/infrastructure/network/Request.ts  | 2 ++
 .../repositories/CredentialTypesUIFormSchemaRepositoryImpl.ts | 2 +-
 .../sdk/src/impl/domain/usecases/FinalizeOffersUseCase.ts     | 2 +-
 packages/sdk/src/impl/domain/usecases/SubmissionUseCase.ts    | 2 +-
 packages/sdk/src/impl/utils/VCLLog.ts                         | 2 +-
 packages/sdk/src/index.ts                                     | 2 +-
 packages/sdk/src/{Nullish.ts => types.ts}                     | 0
 packages/sdk/test/NetworkServiceSuccess.ts                    | 2 +-
 packages/sdk/tsconfig.json                                    | 4 +---
 28 files changed, 28 insertions(+), 28 deletions(-)
 rename packages/sdk/src/{Nullish.ts => types.ts} (100%)

diff --git a/packages/sdk/src/api/VCL.ts b/packages/sdk/src/api/VCL.ts
index 98ba24b..db258cf 100644
--- a/packages/sdk/src/api/VCL.ts
+++ b/packages/sdk/src/api/VCL.ts
@@ -26,7 +26,7 @@ import VCLSubmissionResult from "./entities/VCLSubmissionResult";
 import VCLToken from "./entities/VCLToken";
 import VCLVerifiedProfile from "./entities/VCLVerifiedProfile";
 import VCLVerifiedProfileDescriptor from "./entities/VCLVerifiedProfileDescriptor";
-import { Nullish } from "../Nullish";
+import { Nullish } from "../types";
 
 export default interface VCL {
     initialize(
diff --git a/packages/sdk/src/api/entities/VCLCountries.ts b/packages/sdk/src/api/entities/VCLCountries.ts
index 6404ca9..20df5a6 100644
--- a/packages/sdk/src/api/entities/VCLCountries.ts
+++ b/packages/sdk/src/api/entities/VCLCountries.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../../Nullish";
+import { Nullish } from "../../types";
 import VCLCountry from "./VCLCountry";
 
 class VCLCountries {
diff --git a/packages/sdk/src/api/entities/VCLCountry.ts b/packages/sdk/src/api/entities/VCLCountry.ts
index e39fed8..63cb6ee 100644
--- a/packages/sdk/src/api/entities/VCLCountry.ts
+++ b/packages/sdk/src/api/entities/VCLCountry.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../../Nullish";
+import { Nullish } from "../../types";
 import VCLPlace from "./VCLPlace";
 import VCLRegions from "./VCLRegions";
 
diff --git a/packages/sdk/src/api/entities/VCLCredentialManifest.ts b/packages/sdk/src/api/entities/VCLCredentialManifest.ts
index bef1c02..5aaa083 100644
--- a/packages/sdk/src/api/entities/VCLCredentialManifest.ts
+++ b/packages/sdk/src/api/entities/VCLCredentialManifest.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../../Nullish";
+import { Nullish } from "../../types";
 import VCLJwt from "./VCLJwt";
 import VCLVerifiedProfile from "./VCLVerifiedProfile";
 
diff --git a/packages/sdk/src/api/entities/VCLCredentialManifestDescriptor.ts b/packages/sdk/src/api/entities/VCLCredentialManifestDescriptor.ts
index 970867b..36a13a7 100644
--- a/packages/sdk/src/api/entities/VCLCredentialManifestDescriptor.ts
+++ b/packages/sdk/src/api/entities/VCLCredentialManifestDescriptor.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../../Nullish";
+import { Nullish } from "../../types";
 import VCLIssuingType from "./VCLIssuingType";
 import VCLPushDelegate from "./VCLPushDelegate";
 
diff --git a/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByDeepLink.ts b/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByDeepLink.ts
index 61a9a8e..ccf74ad 100644
--- a/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByDeepLink.ts
+++ b/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByDeepLink.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../../Nullish";
+import { Nullish } from "../../types";
 import VCLCredentialManifestDescriptor from "./VCLCredentialManifestDescriptor";
 import VCLDeepLink from "./VCLDeepLink";
 import VCLIssuingType from "./VCLIssuingType";
diff --git a/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByService.ts b/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByService.ts
index 8e15e8d..99e7ba7 100644
--- a/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByService.ts
+++ b/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByService.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../../Nullish";
+import { Nullish } from "../../types";
 import VCLCredentialManifestDescriptor from "./VCLCredentialManifestDescriptor";
 import VCLIssuingType from "./VCLIssuingType";
 import VCLPushDelegate from "./VCLPushDelegate";
diff --git a/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorRefresh.ts b/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorRefresh.ts
index a628d61..d688e60 100644
--- a/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorRefresh.ts
+++ b/packages/sdk/src/api/entities/VCLCredentialManifestDescriptorRefresh.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../../Nullish";
+import { Nullish } from "../../types";
 import VCLCredentialManifestDescriptor from "./VCLCredentialManifestDescriptor";
 import VCLIssuingType from "./VCLIssuingType";
 import VCLService from "./VCLService";
diff --git a/packages/sdk/src/api/entities/VCLDeepLink.ts b/packages/sdk/src/api/entities/VCLDeepLink.ts
index c356c22..b38f676 100644
--- a/packages/sdk/src/api/entities/VCLDeepLink.ts
+++ b/packages/sdk/src/api/entities/VCLDeepLink.ts
@@ -1,5 +1,5 @@
 import "../../impl/extensions/StringExtensions";
-import { Nullish } from "../../Nullish";
+import { Nullish } from "../../types";
 
 export default class VCLDeepLink {
     public requestUri: Nullish<string>;
diff --git a/packages/sdk/src/api/entities/VCLJwt.ts b/packages/sdk/src/api/entities/VCLJwt.ts
index 6dbb819..766f00b 100644
--- a/packages/sdk/src/api/entities/VCLJwt.ts
+++ b/packages/sdk/src/api/entities/VCLJwt.ts
@@ -1,4 +1,4 @@
-import { JWK, base64url } from "jose";
+import { Nullish } from "../../types";
 
 export default class VCLJwt {
     public encodedJwt: Nullish<string>;
diff --git a/packages/sdk/src/api/entities/VCLOrganizationsSearchDescriptor.ts b/packages/sdk/src/api/entities/VCLOrganizationsSearchDescriptor.ts
index 2b61c3b..177f2b0 100644
--- a/packages/sdk/src/api/entities/VCLOrganizationsSearchDescriptor.ts
+++ b/packages/sdk/src/api/entities/VCLOrganizationsSearchDescriptor.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../../Nullish";
+import { Nullish } from "../../types";
 import VCLServiceTypes from "./VCLServiceTypes";
 
 export default class VCLOrganizationsSearchDescriptor {
diff --git a/packages/sdk/src/api/entities/VCLPresentationRequest.ts b/packages/sdk/src/api/entities/VCLPresentationRequest.ts
index dde5d8e..35142fd 100644
--- a/packages/sdk/src/api/entities/VCLPresentationRequest.ts
+++ b/packages/sdk/src/api/entities/VCLPresentationRequest.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../../Nullish";
+import { Nullish } from "../../types";
 import VCLDeepLink from "./VCLDeepLink";
 import VCLJwt from "./VCLJwt";
 import VCLPushDelegate from "./VCLPushDelegate";
diff --git a/packages/sdk/src/api/entities/VCLPresentationRequestDescriptor.ts b/packages/sdk/src/api/entities/VCLPresentationRequestDescriptor.ts
index e3fbba7..040747d 100644
--- a/packages/sdk/src/api/entities/VCLPresentationRequestDescriptor.ts
+++ b/packages/sdk/src/api/entities/VCLPresentationRequestDescriptor.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../../Nullish";
+import { Nullish } from "../../types";
 import VCLDeepLink from "./VCLDeepLink";
 import VCLPushDelegate from "./VCLPushDelegate";
 
diff --git a/packages/sdk/src/api/entities/VCLResult.ts b/packages/sdk/src/api/entities/VCLResult.ts
index 7aa90ef..167a9e0 100644
--- a/packages/sdk/src/api/entities/VCLResult.ts
+++ b/packages/sdk/src/api/entities/VCLResult.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../../Nullish";
+import { Nullish } from "../../types";
 import VCLError from "./error/VCLError";
 
 export default class VCLResult<R> {
diff --git a/packages/sdk/src/api/entities/VCLServiceCredentialAgentIssuer.ts b/packages/sdk/src/api/entities/VCLServiceCredentialAgentIssuer.ts
index 8d8cdf1..bcb41a0 100644
--- a/packages/sdk/src/api/entities/VCLServiceCredentialAgentIssuer.ts
+++ b/packages/sdk/src/api/entities/VCLServiceCredentialAgentIssuer.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../../Nullish";
+import { Nullish } from "../../types";
 import VCLService from "./VCLService";
 
 export default class VCLServiceCredentialAgentIssuer extends VCLService {
diff --git a/packages/sdk/src/api/entities/VCLSubmission.ts b/packages/sdk/src/api/entities/VCLSubmission.ts
index a0a4abe..20b4d69 100644
--- a/packages/sdk/src/api/entities/VCLSubmission.ts
+++ b/packages/sdk/src/api/entities/VCLSubmission.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../../Nullish";
+import { Nullish } from "../../types";
 import VCLJwt from "./VCLJwt";
 import VCLPushDelegate from "./VCLPushDelegate";
 import VCLVerifiableCredential from "./VCLVerifiableCredential";
diff --git a/packages/sdk/src/api/entities/VCLToken.ts b/packages/sdk/src/api/entities/VCLToken.ts
index e8fc13f..27d219c 100644
--- a/packages/sdk/src/api/entities/VCLToken.ts
+++ b/packages/sdk/src/api/entities/VCLToken.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../../Nullish";
+import { Nullish } from "../../types";
 import VCLJwt from "./VCLJwt"
 
 export default class VCLToken {
diff --git a/packages/sdk/src/api/entities/VCLVerifiedProfile.ts b/packages/sdk/src/api/entities/VCLVerifiedProfile.ts
index 2907815..66ab8db 100644
--- a/packages/sdk/src/api/entities/VCLVerifiedProfile.ts
+++ b/packages/sdk/src/api/entities/VCLVerifiedProfile.ts
@@ -22,7 +22,7 @@ data class VCLVerifiedProfile(val payload: JSONObject) {
 }
 */
 
-import { Nullish } from "../../Nullish";
+import { Nullish } from "../../types";
 import VCLServiceType from "./VCLServiceType";
 import VCLServiceTypes from "./VCLServiceTypes";
 
diff --git a/packages/sdk/src/api/entities/error/VCLError.ts b/packages/sdk/src/api/entities/error/VCLError.ts
index b854e92..f991973 100644
--- a/packages/sdk/src/api/entities/error/VCLError.ts
+++ b/packages/sdk/src/api/entities/error/VCLError.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../../../Nullish";
+import { Nullish } from "../../../types";
 import VCLErrorCode from "./VCLErrorCode";
 
 export default class VCLError extends Error {
diff --git a/packages/sdk/src/impl/data/infrastructure/network/Request.ts b/packages/sdk/src/impl/data/infrastructure/network/Request.ts
index afee43d..86a9a67 100644
--- a/packages/sdk/src/impl/data/infrastructure/network/Request.ts
+++ b/packages/sdk/src/impl/data/infrastructure/network/Request.ts
@@ -1,3 +1,5 @@
+import { Nullish } from "../../../../types";
+
 export enum HttpMethod {
     GET = "GET",
     POST = "POST",
diff --git a/packages/sdk/src/impl/data/repositories/CredentialTypesUIFormSchemaRepositoryImpl.ts b/packages/sdk/src/impl/data/repositories/CredentialTypesUIFormSchemaRepositoryImpl.ts
index 2d362fb..befa682 100644
--- a/packages/sdk/src/impl/data/repositories/CredentialTypesUIFormSchemaRepositoryImpl.ts
+++ b/packages/sdk/src/impl/data/repositories/CredentialTypesUIFormSchemaRepositoryImpl.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../../../Nullish";
+import { Nullish } from "../../../types";
 import VCLCountries from "../../../api/entities/VCLCountries";
 import VCLCredentialTypesUIFormSchema from "../../../api/entities/VCLCredentialTypesUIFormSchema";
 import VCLCredentialTypesUIFormSchemaDescriptor from "../../../api/entities/VCLCredentialTypesUIFormSchemaDescriptor";
diff --git a/packages/sdk/src/impl/domain/usecases/FinalizeOffersUseCase.ts b/packages/sdk/src/impl/domain/usecases/FinalizeOffersUseCase.ts
index cfa0797..76a074f 100644
--- a/packages/sdk/src/impl/domain/usecases/FinalizeOffersUseCase.ts
+++ b/packages/sdk/src/impl/domain/usecases/FinalizeOffersUseCase.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../../../Nullish";
+import { Nullish } from "../../../types";
 import VCLDidJwk from "../../../api/entities/VCLDidJwk";
 import VCLFinalizeOffersDescriptor from "../../../api/entities/VCLFinalizeOffersDescriptor";
 import VCLJwtVerifiableCredentials from "../../../api/entities/VCLJwtVerifiableCredentials";
diff --git a/packages/sdk/src/impl/domain/usecases/SubmissionUseCase.ts b/packages/sdk/src/impl/domain/usecases/SubmissionUseCase.ts
index 9ab168f..bd304b8 100644
--- a/packages/sdk/src/impl/domain/usecases/SubmissionUseCase.ts
+++ b/packages/sdk/src/impl/domain/usecases/SubmissionUseCase.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../../../Nullish";
+import { Nullish } from "../../../types";
 import VCLDidJwk from "../../../api/entities/VCLDidJwk";
 import VCLResult from "../../../api/entities/VCLResult";
 import VCLSubmission from "../../../api/entities/VCLSubmission";
diff --git a/packages/sdk/src/impl/utils/VCLLog.ts b/packages/sdk/src/impl/utils/VCLLog.ts
index 08d3561..d397a0e 100644
--- a/packages/sdk/src/impl/utils/VCLLog.ts
+++ b/packages/sdk/src/impl/utils/VCLLog.ts
@@ -1,4 +1,4 @@
-import { Nullish } from "../../Nullish";
+import { Nullish } from "../../types";
 import GlobalConfig from "../GlobalConfig";
 
 export default class VCLLog {
diff --git a/packages/sdk/src/index.ts b/packages/sdk/src/index.ts
index 14932e8..3f2efdd 100644
--- a/packages/sdk/src/index.ts
+++ b/packages/sdk/src/index.ts
@@ -54,7 +54,7 @@ import VCLKeyService from "./api/keys/VCLKeyService";
 import VCLJwtSignService from "./api/jwt/VCLJwtSignService";
 import VCLJwtVerifyService from "./api/jwt/VCLJwtVerifyService";
 import VCLResult from "./api/entities/VCLResult";
-import { Nullish } from "./Nullish";
+import { Nullish } from "./types";
 
 export {
     VCL,
diff --git a/packages/sdk/src/Nullish.ts b/packages/sdk/src/types.ts
similarity index 100%
rename from packages/sdk/src/Nullish.ts
rename to packages/sdk/src/types.ts
diff --git a/packages/sdk/test/NetworkServiceSuccess.ts b/packages/sdk/test/NetworkServiceSuccess.ts
index 4e37e33..8187385 100644
--- a/packages/sdk/test/NetworkServiceSuccess.ts
+++ b/packages/sdk/test/NetworkServiceSuccess.ts
@@ -4,7 +4,7 @@ import Request, {
     HttpMethod,
 } from "../src/impl/data/infrastructure/network/Request";
 import Response from "../src/impl/data/infrastructure/network/Response";
-import { Nullish } from "../src/Nullish";
+import { Nullish } from "../src/types";
 
 export default class NetworkServiceSuccess implements NetworkService {
     constructor(private readonly validResponse: JSONObject) {}
diff --git a/packages/sdk/tsconfig.json b/packages/sdk/tsconfig.json
index ace7a3b..ad083c2 100644
--- a/packages/sdk/tsconfig.json
+++ b/packages/sdk/tsconfig.json
@@ -25,9 +25,7 @@
     },
   },
   "include": [
-    "./src/**/*",
-    "global.d.ts",
-    "index.d.ts"
+    "./src/**/*"
   ],
   "exclude": [
     "node_modules",

From 155ec573f4e09904cbb2af103286fdb66bd2c1b7 Mon Sep 17 00:00:00 2001
From: Michael Avoyan <michael.avoyan.dev@gmail.com>
Date: Mon, 6 May 2024 17:21:15 +0300
Subject: [PATCH 7/7] fix

---
 packages/sdk/src/api/entities/VCLCredentialType.ts              | 2 ++
 packages/sdk/src/api/entities/VCLCredentialTypes.ts             | 1 +
 packages/sdk/src/api/entities/VCLGenerateOffersDescriptor.ts    | 1 +
 packages/sdk/src/api/entities/VCLJwtDescriptor.ts               | 1 +
 packages/sdk/src/api/jwt/VCLJwtSignService.ts                   | 1 +
 packages/sdk/src/impl/VCLImpl.ts                                | 1 +
 .../src/impl/data/infrastructure/network/NetworkServiceImpl.ts  | 1 +
 packages/sdk/src/impl/data/models/CountriesModelImpl.ts         | 1 +
 .../sdk/src/impl/data/models/CredentialTypeSchemasModelImpl.ts  | 1 +
 packages/sdk/src/impl/data/models/CredentialTypesModelImpl.ts   | 1 +
 .../sdk/src/impl/data/repositories/CountriesRepositoryImpl.ts   | 1 +
 .../src/impl/data/repositories/FinalizeOffersRepositoryImpl.ts  | 1 +
 .../sdk/src/impl/data/repositories/JwtServiceRepositoryImpl.ts  | 1 +
 .../src/impl/data/repositories/OrganizationsRepositoryImpl.ts   | 1 +
 .../sdk/src/impl/data/usecases/FinalizeOffersUseCaseImpl.ts     | 1 +
 packages/sdk/src/impl/data/usecases/JwtServiceUseCaseImpl.ts    | 1 +
 packages/sdk/src/impl/data/usecases/SubmissionUseCaseImpl.ts    | 1 +
 .../sdk/src/impl/domain/infrastructure/db/SecretStoreService.ts | 2 +-
 .../src/impl/domain/infrastructure/network/NetworkService.ts    | 1 +
 packages/sdk/src/impl/domain/models/Model.ts                    | 2 ++
 .../sdk/src/impl/domain/repositories/JwtServiceRepository.ts    | 1 +
 packages/sdk/src/impl/domain/usecases/JwtServiceUseCase.ts      | 1 +
 22 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/packages/sdk/src/api/entities/VCLCredentialType.ts b/packages/sdk/src/api/entities/VCLCredentialType.ts
index 5c125c6..5977e69 100644
--- a/packages/sdk/src/api/entities/VCLCredentialType.ts
+++ b/packages/sdk/src/api/entities/VCLCredentialType.ts
@@ -1,3 +1,5 @@
+import { Nullish } from "../../types";
+
 export default class VCLCredentialType {
     constructor(
         public payload: JSONObject,
diff --git a/packages/sdk/src/api/entities/VCLCredentialTypes.ts b/packages/sdk/src/api/entities/VCLCredentialTypes.ts
index e57e945..e3e2b80 100644
--- a/packages/sdk/src/api/entities/VCLCredentialTypes.ts
+++ b/packages/sdk/src/api/entities/VCLCredentialTypes.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../../types";
 import VCLCredentialType from "./VCLCredentialType";
 
 export default class VCLCredentialTypes {
diff --git a/packages/sdk/src/api/entities/VCLGenerateOffersDescriptor.ts b/packages/sdk/src/api/entities/VCLGenerateOffersDescriptor.ts
index 2a26e45..1ec5b6c 100644
--- a/packages/sdk/src/api/entities/VCLGenerateOffersDescriptor.ts
+++ b/packages/sdk/src/api/entities/VCLGenerateOffersDescriptor.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../../types";
 import VCLCredentialManifest from "./VCLCredentialManifest";
 import VCLVerifiableCredential from "./VCLVerifiableCredential";
 
diff --git a/packages/sdk/src/api/entities/VCLJwtDescriptor.ts b/packages/sdk/src/api/entities/VCLJwtDescriptor.ts
index 2085aeb..1e05f45 100644
--- a/packages/sdk/src/api/entities/VCLJwtDescriptor.ts
+++ b/packages/sdk/src/api/entities/VCLJwtDescriptor.ts
@@ -1,5 +1,6 @@
 import { randomUUID } from "crypto";
 import VCLDidJwk from "./VCLDidJwk";
+import { Nullish } from "../../types";
 
 export default class VCLJwtDescriptor {
     constructor(
diff --git a/packages/sdk/src/api/jwt/VCLJwtSignService.ts b/packages/sdk/src/api/jwt/VCLJwtSignService.ts
index 6cc436e..2f99b65 100644
--- a/packages/sdk/src/api/jwt/VCLJwtSignService.ts
+++ b/packages/sdk/src/api/jwt/VCLJwtSignService.ts
@@ -9,6 +9,7 @@ interface VCLJwtSignService {
     )
 }*/
 
+import { Nullish } from "../../types";
 import VCLDidJwk from "../entities/VCLDidJwk";
 import VCLJwt from "../entities/VCLJwt";
 import VCLJwtDescriptor from "../entities/VCLJwtDescriptor";
diff --git a/packages/sdk/src/impl/VCLImpl.ts b/packages/sdk/src/impl/VCLImpl.ts
index b4e7b43..0cabb48 100644
--- a/packages/sdk/src/impl/VCLImpl.ts
+++ b/packages/sdk/src/impl/VCLImpl.ts
@@ -58,6 +58,7 @@ import OrganizationsUseCase from "./domain/usecases/OrganizationsUseCase";
 import CredentialTypesUIFormSchemaUseCase from "./domain/usecases/CredentialTypesUIFormSchemaUseCase";
 import VCLDidJwkDescriptor from "../api/entities/VCLDidJwkDescriptor";
 import KeyServiceUseCase from "./domain/usecases/KeyServiceUseCase";
+import { Nullish } from "../types";
 export class VCLImpl implements VCL {
     static TAG = VCLImpl.name;
 
diff --git a/packages/sdk/src/impl/data/infrastructure/network/NetworkServiceImpl.ts b/packages/sdk/src/impl/data/infrastructure/network/NetworkServiceImpl.ts
index 9a4fcaa..90b3012 100644
--- a/packages/sdk/src/impl/data/infrastructure/network/NetworkServiceImpl.ts
+++ b/packages/sdk/src/impl/data/infrastructure/network/NetworkServiceImpl.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../../../../types";
 import VCLResult from "../../../../api/entities/VCLResult";
 import NetworkService from "../../../domain/infrastructure/network/NetworkService";
 import VCLLog from "../../../utils/VCLLog";
diff --git a/packages/sdk/src/impl/data/models/CountriesModelImpl.ts b/packages/sdk/src/impl/data/models/CountriesModelImpl.ts
index 06aa820..43886fa 100644
--- a/packages/sdk/src/impl/data/models/CountriesModelImpl.ts
+++ b/packages/sdk/src/impl/data/models/CountriesModelImpl.ts
@@ -3,6 +3,7 @@ import VCLError from "../../../api/entities/error/VCLError";
 import VCLResult from "../../../api/entities/VCLResult";
 import CountriesModel from "../../domain/models/CountriesModel";
 import CountriesUseCase from "../../domain/usecases/CountriesModelUseCase";
+import { Nullish } from "../../../types";
 
 export default class CountriesModelImpl implements CountriesModel {
     constructor(private readonly countriesUseCase: CountriesUseCase) {}
diff --git a/packages/sdk/src/impl/data/models/CredentialTypeSchemasModelImpl.ts b/packages/sdk/src/impl/data/models/CredentialTypeSchemasModelImpl.ts
index ca044f6..662d0c3 100644
--- a/packages/sdk/src/impl/data/models/CredentialTypeSchemasModelImpl.ts
+++ b/packages/sdk/src/impl/data/models/CredentialTypeSchemasModelImpl.ts
@@ -3,6 +3,7 @@ import VCLError from "../../../api/entities/error/VCLError";
 import VCLResult from "../../../api/entities/VCLResult";
 import CredentialTypeSchemasModel from "../../domain/models/CredentialTypeSchemasModel";
 import CredentialTypeSchemasUseCase from "../../domain/usecases/CredentialTypeSchemasUseCase";
+import { Nullish } from "../../../types";
 
 export default class CredentialTypeSchemasModelImpl
     implements CredentialTypeSchemasModel
diff --git a/packages/sdk/src/impl/data/models/CredentialTypesModelImpl.ts b/packages/sdk/src/impl/data/models/CredentialTypesModelImpl.ts
index 1807de8..c5be2ce 100644
--- a/packages/sdk/src/impl/data/models/CredentialTypesModelImpl.ts
+++ b/packages/sdk/src/impl/data/models/CredentialTypesModelImpl.ts
@@ -3,6 +3,7 @@ import VCLError from "../../../api/entities/error/VCLError";
 import VCLResult from "../../../api/entities/VCLResult";
 import CredentialTypesModel from "../../domain/models/CredentialTypesModel";
 import { CredentialTypesUseCase } from "../../domain/usecases/CredentialTypesUseCase";
+import { Nullish } from "../../../types";
 
 export default class CredentialTypesModelImpl implements CredentialTypesModel {
     constructor(
diff --git a/packages/sdk/src/impl/data/repositories/CountriesRepositoryImpl.ts b/packages/sdk/src/impl/data/repositories/CountriesRepositoryImpl.ts
index f94dbce..e51dda8 100644
--- a/packages/sdk/src/impl/data/repositories/CountriesRepositoryImpl.ts
+++ b/packages/sdk/src/impl/data/repositories/CountriesRepositoryImpl.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../../../types";
 import VCLCountries from "../../../api/entities/VCLCountries";
 import VCLCountry from "../../../api/entities/VCLCountry";
 import VCLRegion from "../../../api/entities/VCLRegion";
diff --git a/packages/sdk/src/impl/data/repositories/FinalizeOffersRepositoryImpl.ts b/packages/sdk/src/impl/data/repositories/FinalizeOffersRepositoryImpl.ts
index 4bb8235..37b0aeb 100644
--- a/packages/sdk/src/impl/data/repositories/FinalizeOffersRepositoryImpl.ts
+++ b/packages/sdk/src/impl/data/repositories/FinalizeOffersRepositoryImpl.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../../../types";
 import VCLError from "../../../api/entities/error/VCLError";
 import VCLFinalizeOffersDescriptor from "../../../api/entities/VCLFinalizeOffersDescriptor";
 import VCLJwt from "../../../api/entities/VCLJwt";
diff --git a/packages/sdk/src/impl/data/repositories/JwtServiceRepositoryImpl.ts b/packages/sdk/src/impl/data/repositories/JwtServiceRepositoryImpl.ts
index 725116c..4fea6b1 100644
--- a/packages/sdk/src/impl/data/repositories/JwtServiceRepositoryImpl.ts
+++ b/packages/sdk/src/impl/data/repositories/JwtServiceRepositoryImpl.ts
@@ -8,6 +8,7 @@ import VCLResult from "../../../api/entities/VCLResult";
 import JwtServiceRepository from "../../domain/repositories/JwtServiceRepository";
 import VCLJwtSignService from "../../../api/jwt/VCLJwtSignService";
 import VCLJwtVerifyService from "../../../api/jwt/VCLJwtVerifyService";
+import { Nullish } from "../../../types";
 
 export default class JwtServiceRepositoryImpl implements JwtServiceRepository {
     constructor(
diff --git a/packages/sdk/src/impl/data/repositories/OrganizationsRepositoryImpl.ts b/packages/sdk/src/impl/data/repositories/OrganizationsRepositoryImpl.ts
index 087ea7d..a2a4aec 100644
--- a/packages/sdk/src/impl/data/repositories/OrganizationsRepositoryImpl.ts
+++ b/packages/sdk/src/impl/data/repositories/OrganizationsRepositoryImpl.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../../..//types";
 import VCLError from "../../../api/entities/error/VCLError";
 import VCLOrganization from "../../../api/entities/VCLOrganization";
 import VCLOrganizations from "../../../api/entities/VCLOrganizations";
diff --git a/packages/sdk/src/impl/data/usecases/FinalizeOffersUseCaseImpl.ts b/packages/sdk/src/impl/data/usecases/FinalizeOffersUseCaseImpl.ts
index 2d9df99..1b7d162 100644
--- a/packages/sdk/src/impl/data/usecases/FinalizeOffersUseCaseImpl.ts
+++ b/packages/sdk/src/impl/data/usecases/FinalizeOffersUseCaseImpl.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../../../types";
 import VCLError from "../../../api/entities/error/VCLError";
 import VCLDidJwk from "../../../api/entities/VCLDidJwk";
 import VCLFinalizeOffersDescriptor from "../../../api/entities/VCLFinalizeOffersDescriptor";
diff --git a/packages/sdk/src/impl/data/usecases/JwtServiceUseCaseImpl.ts b/packages/sdk/src/impl/data/usecases/JwtServiceUseCaseImpl.ts
index 0ec67fd..82fd59f 100644
--- a/packages/sdk/src/impl/data/usecases/JwtServiceUseCaseImpl.ts
+++ b/packages/sdk/src/impl/data/usecases/JwtServiceUseCaseImpl.ts
@@ -6,6 +6,7 @@ import VCLJwtDescriptor from "../../../api/entities/VCLJwtDescriptor";
 import VCLResult from "../../../api/entities/VCLResult";
 import JwtServiceRepository from "../../domain/repositories/JwtServiceRepository";
 import JwtServiceUseCase from "../../domain/usecases/JwtServiceUseCase";
+import { Nullish } from "../../../types";
 
 export default class JwtServiceUseCaseImpl implements JwtServiceUseCase {
     constructor(private readonly jwtServiceRepository: JwtServiceRepository) {}
diff --git a/packages/sdk/src/impl/data/usecases/SubmissionUseCaseImpl.ts b/packages/sdk/src/impl/data/usecases/SubmissionUseCaseImpl.ts
index 4bc2dd3..65ca470 100644
--- a/packages/sdk/src/impl/data/usecases/SubmissionUseCaseImpl.ts
+++ b/packages/sdk/src/impl/data/usecases/SubmissionUseCaseImpl.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../../../types";
 import VCLDidJwk from "../../../api/entities/VCLDidJwk";
 import VCLJwt from "../../../api/entities/VCLJwt";
 import VCLJwtDescriptor from "../../../api/entities/VCLJwtDescriptor";
diff --git a/packages/sdk/src/impl/domain/infrastructure/db/SecretStoreService.ts b/packages/sdk/src/impl/domain/infrastructure/db/SecretStoreService.ts
index 469ca57..e03c713 100644
--- a/packages/sdk/src/impl/domain/infrastructure/db/SecretStoreService.ts
+++ b/packages/sdk/src/impl/domain/infrastructure/db/SecretStoreService.ts
@@ -1,5 +1,5 @@
 import { KeyPairKeyObjectResult } from "crypto";
-import { JWK } from "jose";
+import { Nullish } from "../../../../types";
 
 export default interface SecretStoreService {
     storeKey(keyId: string, key: KeyPairKeyObjectResult): void;
diff --git a/packages/sdk/src/impl/domain/infrastructure/network/NetworkService.ts b/packages/sdk/src/impl/domain/infrastructure/network/NetworkService.ts
index 03d9d32..6701b6a 100644
--- a/packages/sdk/src/impl/domain/infrastructure/network/NetworkService.ts
+++ b/packages/sdk/src/impl/domain/infrastructure/network/NetworkService.ts
@@ -1,3 +1,4 @@
+import { Nullish } from "../../../../types";
 import VCLResult from "../../../../api/entities/VCLResult";
 import Request, {
     HttpMethod,
diff --git a/packages/sdk/src/impl/domain/models/Model.ts b/packages/sdk/src/impl/domain/models/Model.ts
index 917af66..4effe8f 100644
--- a/packages/sdk/src/impl/domain/models/Model.ts
+++ b/packages/sdk/src/impl/domain/models/Model.ts
@@ -1,3 +1,5 @@
+import { Nullish } from "../../../types";
+
 export default interface Model<T> {
     data: Nullish<T>;
 }
diff --git a/packages/sdk/src/impl/domain/repositories/JwtServiceRepository.ts b/packages/sdk/src/impl/domain/repositories/JwtServiceRepository.ts
index f7d33ce..39c941b 100644
--- a/packages/sdk/src/impl/domain/repositories/JwtServiceRepository.ts
+++ b/packages/sdk/src/impl/domain/repositories/JwtServiceRepository.ts
@@ -6,6 +6,7 @@ import VCLPublicJwk from "../../../api/entities/VCLPublicJwk";
 import VCLJwt from "../../../api/entities/VCLJwt";
 import VCLJwtDescriptor from "../../../api/entities/VCLJwtDescriptor";
 import VCLResult from "../../../api/entities/VCLResult";
+import { Nullish } from "../../../types";
 
 export default interface JwtServiceRepository {
     decode(encodedJwt: string): Promise<VCLResult<VCLJwt>>;
diff --git a/packages/sdk/src/impl/domain/usecases/JwtServiceUseCase.ts b/packages/sdk/src/impl/domain/usecases/JwtServiceUseCase.ts
index e59d5b5..839de9a 100644
--- a/packages/sdk/src/impl/domain/usecases/JwtServiceUseCase.ts
+++ b/packages/sdk/src/impl/domain/usecases/JwtServiceUseCase.ts
@@ -4,6 +4,7 @@ import VCLPublicJwk from "../../../api/entities/VCLPublicJwk";
 import VCLJwt from "../../../api/entities/VCLJwt";
 import VCLJwtDescriptor from "../../../api/entities/VCLJwtDescriptor";
 import VCLResult from "../../../api/entities/VCLResult";
+import { Nullish } from "../../../types";
 
 export default interface JwtServiceUseCase {
     verifyJwt(