Merge pull request #58 from velocitycareerlabs/VL-7723

v0.8.14 proper usage of Nullish

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",

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;

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",

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 "../types";
 
 export default interface VCL {
     initialize(

packages/sdk/src/api/entities/VCLCountries.ts

@@ -1,3 +1,4 @@
+import { Nullish } from "../../types";
 import VCLCountry from "./VCLCountry";
 
 class VCLCountries {

packages/sdk/src/api/entities/VCLCountry.ts

@@ -1,3 +1,4 @@
+import { Nullish } from "../../types";
 import VCLPlace from "./VCLPlace";
 import VCLRegions from "./VCLRegions";
 

packages/sdk/src/api/entities/VCLCredentialManifest.ts

@@ -1,3 +1,4 @@
+import { Nullish } from "../../types";
 import VCLJwt from "./VCLJwt";
 import VCLVerifiedProfile from "./VCLVerifiedProfile";
 

packages/sdk/src/api/entities/VCLCredentialManifestDescriptor.ts

@@ -1,3 +1,4 @@
+import { Nullish } from "../../types";
 import VCLIssuingType from "./VCLIssuingType";
 import VCLPushDelegate from "./VCLPushDelegate";
 

packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByDeepLink.ts

@@ -1,3 +1,4 @@
+import { Nullish } from "../../types";
 import VCLCredentialManifestDescriptor from "./VCLCredentialManifestDescriptor";
 import VCLDeepLink from "./VCLDeepLink";
 import VCLIssuingType from "./VCLIssuingType";

packages/sdk/src/api/entities/VCLCredentialManifestDescriptorByService.ts

@@ -1,3 +1,4 @@
+import { Nullish } from "../../types";
 import VCLCredentialManifestDescriptor from "./VCLCredentialManifestDescriptor";
 import VCLIssuingType from "./VCLIssuingType";
 import VCLPushDelegate from "./VCLPushDelegate";

packages/sdk/src/api/entities/VCLCredentialManifestDescriptorRefresh.ts

@@ -1,3 +1,4 @@
+import { Nullish } from "../../types";
 import VCLCredentialManifestDescriptor from "./VCLCredentialManifestDescriptor";
 import VCLIssuingType from "./VCLIssuingType";
 import VCLService from "./VCLService";

packages/sdk/src/api/entities/VCLCredentialType.ts

@@ -1,3 +1,5 @@
+import { Nullish } from "../../types";
+
 export default class VCLCredentialType {
     constructor(
         public payload: JSONObject,

packages/sdk/src/api/entities/VCLCredentialTypes.ts

@@ -1,3 +1,4 @@
+import { Nullish } from "../../types";
 import VCLCredentialType from "./VCLCredentialType";
 
 export default class VCLCredentialTypes {

packages/sdk/src/api/entities/VCLDeepLink.ts

@@ -1,4 +1,5 @@
 import "../../impl/extensions/StringExtensions";
+import { Nullish } from "../../types";
 
 export default class VCLDeepLink {
     public requestUri: Nullish<string>;

packages/sdk/src/api/entities/VCLGenerateOffersDescriptor.ts

@@ -1,3 +1,4 @@
+import { Nullish } from "../../types";
 import VCLCredentialManifest from "./VCLCredentialManifest";
 import VCLVerifiableCredential from "./VCLVerifiableCredential";
 

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>;

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(

packages/sdk/src/api/entities/VCLOrganizationsSearchDescriptor.ts

@@ -1,3 +1,4 @@
+import { Nullish } from "../../types";
 import VCLServiceTypes from "./VCLServiceTypes";
 
 export default class VCLOrganizationsSearchDescriptor {

packages/sdk/src/api/entities/VCLPresentationRequest.ts

@@ -1,3 +1,4 @@
+import { Nullish } from "../../types";
 import VCLDeepLink from "./VCLDeepLink";
 import VCLJwt from "./VCLJwt";
 import VCLPushDelegate from "./VCLPushDelegate";

packages/sdk/src/api/entities/VCLPresentationRequestDescriptor.ts

@@ -1,3 +1,4 @@
+import { Nullish } from "../../types";
 import VCLDeepLink from "./VCLDeepLink";
 import VCLPushDelegate from "./VCLPushDelegate";
 

packages/sdk/src/api/entities/VCLResult.ts

@@ -1,3 +1,4 @@
+import { Nullish } from "../../types";
 import VCLError from "./error/VCLError";
 
 export default class VCLResult<R> {

packages/sdk/src/api/entities/VCLServiceCredentialAgentIssuer.ts

@@ -1,3 +1,4 @@
+import { Nullish } from "../../types";
 import VCLService from "./VCLService";
 
 export default class VCLServiceCredentialAgentIssuer extends VCLService {

packages/sdk/src/api/entities/VCLSubmission.ts

@@ -1,3 +1,4 @@
+import { Nullish } from "../../types";
 import VCLJwt from "./VCLJwt";
 import VCLPushDelegate from "./VCLPushDelegate";
 import VCLVerifiableCredential from "./VCLVerifiableCredential";

packages/sdk/src/api/entities/VCLToken.ts

@@ -1,3 +1,4 @@
+import { Nullish } from "../../types";
 import VCLJwt from "./VCLJwt"
 
 export default class VCLToken {

packages/sdk/src/api/entities/VCLVerifiedProfile.ts

@@ -22,6 +22,7 @@ data class VCLVerifiedProfile(val payload: JSONObject) {
 }
 */
 
+import { Nullish } from "../../types";
 import VCLServiceType from "./VCLServiceType";
 import VCLServiceTypes from "./VCLServiceTypes";
 

packages/sdk/src/api/entities/error/VCLError.ts

@@ -1,3 +1,4 @@
+import { Nullish } from "../../../types";
 import VCLErrorCode from "./VCLErrorCode";
 
 export default class VCLError extends Error {

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";

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;
 }
 

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;
 

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";

packages/sdk/src/impl/data/infrastructure/network/Request.ts

@@ -1,3 +1,5 @@
+import { Nullish } from "../../../../types";
+
 export enum HttpMethod {
     GET = "GET",
     POST = "POST",

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) {}

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

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(

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";

packages/sdk/src/impl/data/repositories/CredentialTypesUIFormSchemaRepositoryImpl.ts

@@ -1,3 +1,4 @@
+import { Nullish } from "../../../types";
 import VCLCountries from "../../../api/entities/VCLCountries";
 import VCLCredentialTypesUIFormSchema from "../../../api/entities/VCLCredentialTypesUIFormSchema";
 import VCLCredentialTypesUIFormSchemaDescriptor from "../../../api/entities/VCLCredentialTypesUIFormSchemaDescriptor";

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";

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(

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";

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";

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) {}

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";

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;

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,

packages/sdk/src/impl/domain/models/Model.ts

@@ -1,3 +1,5 @@
+import { Nullish } from "../../../types";
+
 export default interface Model<T> {
     data: Nullish<T>;
 }

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>>;

packages/sdk/src/impl/domain/usecases/FinalizeOffersUseCase.ts

@@ -1,3 +1,4 @@
+import { Nullish } from "../../../types";
 import VCLDidJwk from "../../../api/entities/VCLDidJwk";
 import VCLFinalizeOffersDescriptor from "../../../api/entities/VCLFinalizeOffersDescriptor";
 import VCLJwtVerifiableCredentials from "../../../api/entities/VCLJwtVerifiableCredentials";

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(

packages/sdk/src/impl/domain/usecases/SubmissionUseCase.ts

@@ -1,3 +1,4 @@
+import { Nullish } from "../../../types";
 import VCLDidJwk from "../../../api/entities/VCLDidJwk";
 import VCLResult from "../../../api/entities/VCLResult";
 import VCLSubmission from "../../../api/entities/VCLSubmission";

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));

packages/sdk/src/impl/utils/VCLLog.ts

@@ -1,3 +1,4 @@
+import { Nullish } from "../../types";
 import GlobalConfig from "../GlobalConfig";
 
 export default class VCLLog {

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 "./types";
 
 export {
     VCL,
@@ -111,6 +113,8 @@ export {
     VCLKeyService,
     VCLJwtSignService,
     VCLJwtVerifyService,
+    VCLResult,
+    Nullish,
 };
 
 // export type {

packages/sdk/src/types.ts

@@ -0,0 +1 @@
+export type Nullish<T> = T | null | undefined;

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/types";
 
 export default class NetworkServiceSuccess implements NetworkService {
     constructor(private readonly validResponse: JSONObject) {}

packages/sdk/tsconfig.json

@@ -25,9 +25,7 @@
     },
   },
   "include": [
-    "./src/**/*",
-    "global.d.ts",
-    "index.d.ts"
+    "./src/**/*"
   ],
   "exclude": [
     "node_modules",

yarn.lock

@@ -3311,9 +3311,9 @@ [email protected], 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"