Skip to content

Commit 2183642

Browse files
v-rudkovskiyr-brown
v-rudkovskiy
authored and
r-brown
committed
update package.json
add Persisted
1 parent 9088638 commit 2183642

28 files changed

+680
-534
lines changed

‎package-lock.json‎

Lines changed: 501 additions & 371 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎package.json‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@
5050
"types": "dist/index.d.ts",
5151
"exports": {
5252
".": {
53+
"types": "./dist/index.d.ts",
5354
"import": "./dist/index.mjs",
54-
"require": "./dist/index.cjs",
55-
"types": "./dist/index.d.ts"
55+
"require": "./dist/index.cjs"
5656
}
5757
},
5858
"files": [
@@ -71,9 +71,7 @@
7171
"peerDependencies": {
7272
"axios": "^1.9.0"
7373
},
74-
"dependencies": {
75-
"btoa": "^1.2.1"
76-
},
74+
"dependencies": {},
7775
"devDependencies": {
7876
"@eslint/js": "^9.24.0",
7977
"@types/node": "^22.14.0",

‎src/entities/Notification.ts‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,9 @@ const Notification = function <T extends object>(
120120
serialize(): Record<string, string> {
121121
const data = serialize(props);
122122

123-
data.events = this.getEvents([]).join(',');
123+
if (data.events) {
124+
data.events = this.getEvents([]).join(',');
125+
}
124126

125127
return data;
126128
},

‎src/entities/PaymentMethod.ts‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,6 @@ const PaymentMethod = function <T extends object>(
4141
getNumber<D = undefined>(this: void, def?: D): string | D {
4242
return get(props, 'number', def) as string | D;
4343
},
44-
45-
setPaypalSubject(this: void, subject: string): void {
46-
set(props, 'paypal.subject', subject);
47-
},
48-
49-
getPaypalSubject<D = undefined>(this: void, def?: D): string | D {
50-
return get(props, 'paypal.subject', def) as string | D;
51-
},
5244
};
5345

5446
return defineEntity(props as PaymentMethodProps<T>, methods, PaymentMethod);

‎src/services/BundleService.ts‎

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ import Service from '@/services/Service';
2121

2222
// types
2323
import { ItemPagination } from '@/types/api/response';
24+
import { Persisted } from '@/types/entities';
2425
import { BundleEntity, BundleProps } from '@/types/entities/Bundle';
2526
import { LicenseEntity, LicenseProps } from '@/types/entities/License';
2627
import { IBundleService } from '@/types/services/BundleService';
@@ -41,7 +42,7 @@ const type = Constants.Bundle.TYPE;
4142

4243
const bundleService: IBundleService = {
4344
/**
44-
* Gets bundle by its number.See NetLicensingAPI for details:
45+
* Gets a bundle by its number.See NetLicensingAPI for details:
4546
* @see https://netlicensing.io/wiki/bundle-services#get-bundle
4647
*
4748
* determines the vendor on whose behalf the call is performed
@@ -60,13 +61,13 @@ const bundleService: IBundleService = {
6061
context: ContextInstance,
6162
number: string,
6263
config?: RequestConfig,
63-
): Promise<BundleEntity<T>> {
64+
): Promise<BundleEntity<Persisted<T>>> {
6465
ensureNotEmpty(number, 'number');
6566

6667
const response = await Service.get(context, `${endpoint}/${number}`, {}, config);
6768
const item = response.data.items?.item.find((v) => v.type === type);
6869

69-
return itemToBundle<T>(item);
70+
return itemToBundle<Persisted<T>>(item);
7071
},
7172

7273
/**
@@ -89,7 +90,7 @@ const bundleService: IBundleService = {
8990
context: ContextInstance,
9091
filter?: Record<string, string | boolean | number> | string | null,
9192
config?: RequestConfig,
92-
): Promise<PageInstance<BundleEntity<T>[]>> {
93+
): Promise<PageInstance<BundleEntity<Persisted<T>>[]>> {
9394
const data: { [Constants.FILTER]: string } = {};
9495

9596
if (filter) {
@@ -99,15 +100,15 @@ const bundleService: IBundleService = {
99100
const response = await Service.get(context, endpoint, data, config);
100101
const items = response.data.items;
101102

102-
const bundles: BundleEntity<T>[] | undefined = items?.item
103+
const bundles: BundleEntity<Persisted<T>>[] | undefined = items?.item
103104
.filter((v) => v.type === type)
104-
.map((v) => itemToBundle<T>(v));
105+
.map((v) => itemToBundle<Persisted<T>>(v));
105106

106107
return Page(bundles || [], items as ItemPagination);
107108
},
108109

109110
/**
110-
* Creates new bundle with given properties.See NetLicensingAPI for details:
111+
* Creates a new bundle with given properties.See NetLicensingAPI for details:
111112
* @see https://netlicensing.io/wiki/bundle-services#create-bundle
112113
*
113114
* determines the vendor on whose behalf the call is performed
@@ -127,13 +128,13 @@ const bundleService: IBundleService = {
127128
context: ContextInstance,
128129
bundle: BundleEntity<T>,
129130
config?: RequestConfig,
130-
): Promise<BundleEntity<T>> {
131+
): Promise<BundleEntity<Persisted<T>>> {
131132
ensureNotNull(bundle, 'bundle');
132133

133134
const response = await Service.post(context, endpoint, bundle.serialize(), config);
134135
const item = response.data.items?.item.find((v) => v.type === type);
135136

136-
return itemToBundle<T>(item);
137+
return itemToBundle<Persisted<T>>(item);
137138
},
138139

139140
/**
@@ -160,14 +161,14 @@ const bundleService: IBundleService = {
160161
number: string,
161162
bundle: BundleEntity<T>,
162163
config?: RequestConfig,
163-
): Promise<BundleEntity<T>> {
164+
): Promise<BundleEntity<Persisted<T>>> {
164165
ensureNotEmpty(number, 'number');
165166
ensureNotNull(bundle, 'bundle');
166167

167168
const response = await Service.post(context, `${endpoint}/${number}`, bundle.serialize(), config);
168169
const item = response.data.items?.item.find((v) => v.type === type);
169170

170-
return itemToBundle<T>(item);
171+
return itemToBundle<Persisted<T>>(item);
171172
},
172173

173174
/**
@@ -224,7 +225,7 @@ const bundleService: IBundleService = {
224225
number: string,
225226
licenseeNumber: string,
226227
config?: RequestConfig,
227-
): Promise<LicenseEntity<T>[]> {
228+
): Promise<LicenseEntity<Persisted<T>>[]> {
228229
ensureNotEmpty(number, 'number');
229230
ensureNotEmpty(licenseeNumber, 'licenseeNumber');
230231

@@ -233,7 +234,9 @@ const bundleService: IBundleService = {
233234
const response = await Service.post(context, `${endpoint}/${number}/${endpointObtain}`, data, config);
234235
const items = response.data.items;
235236

236-
return items?.item.filter((v) => v.type === Constants.License.TYPE).map((v) => itemToLicense<T>(v)) || [];
237+
const licenses = items?.item.filter((v) => v.type === Constants.License.TYPE);
238+
239+
return licenses?.map((v) => itemToLicense<Persisted<T>>(v)) || [];
237240
},
238241
};
239242

‎src/services/LicenseService.ts‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import { ensureNotEmpty, ensureNotNull } from '@/utils/validation';
3232

3333
// vo
3434
import Page from '@/vo/Page';
35+
import { Persisted } from '@/types/entities';
3536

3637
const endpoint = Constants.License.ENDPOINT_PATH;
3738
const type = Constants.License.TYPE;
@@ -57,13 +58,13 @@ const licenseService: ILicenseService = {
5758
context: ContextInstance,
5859
number: string,
5960
config?: RequestConfig,
60-
): Promise<LicenseEntity<T>> {
61+
): Promise<LicenseEntity<Persisted<T>>> {
6162
ensureNotEmpty(number, 'number');
6263

6364
const response = await Service.get(context, `${endpoint}/${number}`, {}, config);
6465
const item = response.data.items?.item.find((v) => v.type === type);
6566

66-
return itemToLicense<T>(item);
67+
return itemToLicense<Persisted<T>>(item);
6768
},
6869

6970
/**
@@ -86,7 +87,7 @@ const licenseService: ILicenseService = {
8687
context: ContextInstance,
8788
filter?: Record<string, string | boolean | number> | string | null,
8889
config?: RequestConfig,
89-
): Promise<PageInstance<LicenseEntity<T>[]>> {
90+
): Promise<PageInstance<LicenseEntity<Persisted<T>>[]>> {
9091
const data: { [Constants.FILTER]: string } = {};
9192

9293
if (filter) {
@@ -96,9 +97,9 @@ const licenseService: ILicenseService = {
9697
const response = await Service.get(context, endpoint, data, config);
9798
const items = response.data.items;
9899

99-
const list: LicenseEntity<T>[] | undefined = items?.item
100+
const list: LicenseEntity<Persisted<T>>[] | undefined = items?.item
100101
.filter((v) => v.type === type)
101-
.map((v) => itemToLicense<T>(v));
102+
.map((v) => itemToLicense<Persisted<T>>(v));
102103

103104
return Page(list || [], items as ItemPagination);
104105
},
@@ -139,7 +140,7 @@ const licenseService: ILicenseService = {
139140
transactionNumber: string | null,
140141
license: LicenseEntity<T>,
141142
config?: RequestConfig,
142-
): Promise<LicenseEntity<T>> {
143+
): Promise<LicenseEntity<Persisted<T>>> {
143144
ensureNotNull(license, 'license');
144145

145146
const data = license.serialize();
@@ -159,7 +160,7 @@ const licenseService: ILicenseService = {
159160
const response = await Service.post(context, endpoint, data, config);
160161
const item = response.data.items?.item.find((v) => v.type === type);
161162

162-
return itemToLicense<T>(item);
163+
return itemToLicense<Persisted<T>>(item);
163164
},
164165

165166
/**
@@ -191,7 +192,7 @@ const licenseService: ILicenseService = {
191192
transactionNumber: string | null,
192193
license: LicenseEntity<T>,
193194
config?: RequestConfig,
194-
): Promise<LicenseEntity<T>> {
195+
): Promise<LicenseEntity<Persisted<T>>> {
195196
ensureNotEmpty(number, 'number');
196197
ensureNotNull(license, 'license');
197198

@@ -204,7 +205,7 @@ const licenseService: ILicenseService = {
204205
const response = await Service.post(context, `${endpoint}/${number}`, data, config);
205206
const item = response.data.items?.item.find((v) => v.type === type);
206207

207-
return itemToLicense<T>(item);
208+
return itemToLicense<Persisted<T>>(item);
208209
},
209210

210211
/**
@@ -231,7 +232,7 @@ const licenseService: ILicenseService = {
231232
delete(
232233
context: ContextInstance,
233234
number: string,
234-
forceCascade: boolean,
235+
forceCascade?: boolean,
235236
config?: RequestConfig,
236237
): Promise<AxiosResponse<NlicResponse>> {
237238
ensureNotEmpty(number, 'number');

‎src/services/LicenseTemplateService.ts‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ import { ensureNotEmpty, ensureNotNull } from '@/utils/validation';
3232

3333
// vo
3434
import Page from '@/vo/Page';
35+
import { Persisted } from '@/types/entities';
3536

3637
const endpoint = Constants.LicenseTemplate.ENDPOINT_PATH;
3738
const type = Constants.LicenseTemplate.TYPE;
@@ -57,13 +58,13 @@ const licenseTemplateService: ILicenseTemplateService = {
5758
context: ContextInstance,
5859
number: string,
5960
config?: RequestConfig,
60-
): Promise<LicenseTemplateEntity<T>> {
61+
): Promise<LicenseTemplateEntity<Persisted<T>>> {
6162
ensureNotEmpty(number, 'number');
6263

6364
const response = await Service.get(context, `${endpoint}/${number}`, {}, config);
6465
const item = response.data.items?.item.find((v) => v.type === type);
6566

66-
return itemToLicenseTemplate<T>(item);
67+
return itemToLicenseTemplate<Persisted<T>>(item);
6768
},
6869

6970
/**
@@ -86,7 +87,7 @@ const licenseTemplateService: ILicenseTemplateService = {
8687
context: ContextInstance,
8788
filter?: Record<string, string | boolean | number> | string | null,
8889
config?: RequestConfig,
89-
): Promise<PageInstance<LicenseTemplateEntity<T>[]>> {
90+
): Promise<PageInstance<LicenseTemplateEntity<Persisted<T>>[]>> {
9091
const data: { [Constants.FILTER]: string } = {};
9192

9293
if (filter) {
@@ -96,9 +97,9 @@ const licenseTemplateService: ILicenseTemplateService = {
9697
const response = await Service.get(context, endpoint, data, config);
9798
const items = response.data.items;
9899

99-
const list: LicenseTemplateEntity<T>[] | undefined = items?.item
100+
const list: LicenseTemplateEntity<Persisted<T>>[] | undefined = items?.item
100101
.filter((v) => v.type === type)
101-
.map((v) => itemToLicenseTemplate<T>(v));
102+
.map((v) => itemToLicenseTemplate<Persisted<T>>(v));
102103

103104
return Page(list || [], items as ItemPagination);
104105
},
@@ -128,7 +129,7 @@ const licenseTemplateService: ILicenseTemplateService = {
128129
productModuleNumber: string | null,
129130
licenseTemplate: LicenseTemplateEntity<T>,
130131
config?: RequestConfig,
131-
): Promise<LicenseTemplateEntity<T>> {
132+
): Promise<LicenseTemplateEntity<Persisted<T>>> {
132133
ensureNotNull(licenseTemplate, 'licenseTemplate');
133134

134135
const data = licenseTemplate.serialize();
@@ -140,7 +141,7 @@ const licenseTemplateService: ILicenseTemplateService = {
140141
const response = await Service.post(context, endpoint, data, config);
141142
const item = response.data.items?.item.find((v) => v.type === type);
142143

143-
return itemToLicenseTemplate<T>(item);
144+
return itemToLicenseTemplate<Persisted<T>>(item);
144145
},
145146

146147
/**
@@ -167,14 +168,14 @@ const licenseTemplateService: ILicenseTemplateService = {
167168
number: string,
168169
licenseTemplate: LicenseTemplateEntity<T>,
169170
config?: RequestConfig,
170-
): Promise<LicenseTemplateEntity<T>> {
171+
): Promise<LicenseTemplateEntity<Persisted<T>>> {
171172
ensureNotEmpty(number, 'number');
172173
ensureNotNull(licenseTemplate, 'licenseTemplate');
173174

174175
const response = await Service.post(context, `${endpoint}/${number}`, licenseTemplate.serialize(), config);
175176
const item = response.data.items?.item.find((v) => v.type === type);
176177

177-
return itemToLicenseTemplate<T>(item);
178+
return itemToLicenseTemplate<Persisted<T>>(item);
178179
},
179180

180181
/**
@@ -199,7 +200,7 @@ const licenseTemplateService: ILicenseTemplateService = {
199200
delete(
200201
context: ContextInstance,
201202
number: string,
202-
forceCascade: boolean,
203+
forceCascade?: boolean,
203204
config?: RequestConfig,
204205
): Promise<AxiosResponse<NlicResponse>> {
205206
ensureNotEmpty(number, 'number');

0 commit comments

Comments
 (0)