@nuskin/contentstack-lib 2.1.0-pa-1117.2 → 2.1.0-pa-1117.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/__tests__/api.spec.js +28 -12
- package/docs/CHANGELOG.md +1 -1
- package/package.json +1 -1
- package/src/api.js +24 -12
package/__tests__/api.spec.js
CHANGED
|
@@ -209,7 +209,9 @@ describe("ContentstackApi", () => {
|
|
|
209
209
|
{
|
|
210
210
|
title: 'United States',
|
|
211
211
|
address_elements: addressFormFieldEntries,
|
|
212
|
-
postal_code_regex: '^[0-9]{5}(?:-[0-9]{4})?$'
|
|
212
|
+
postal_code_regex: '^[0-9]{5}(?:-[0-9]{4})?$',
|
|
213
|
+
verify_after_autocomplete: true,
|
|
214
|
+
wrap_address1_to_address2: false
|
|
213
215
|
}
|
|
214
216
|
]]);
|
|
215
217
|
const {getStack} = require('../src/api');
|
|
@@ -232,7 +234,9 @@ describe("ContentstackApi", () => {
|
|
|
232
234
|
required: false
|
|
233
235
|
}
|
|
234
236
|
],
|
|
235
|
-
postal_code_regex: '^[0-9]{5}(?:-[0-9]{4})?$'
|
|
237
|
+
postal_code_regex: '^[0-9]{5}(?:-[0-9]{4})?$',
|
|
238
|
+
verify_after_autocomplete: true,
|
|
239
|
+
wrap_address1_to_address2: false
|
|
236
240
|
}
|
|
237
241
|
]);
|
|
238
242
|
});
|
|
@@ -241,7 +245,9 @@ describe("ContentstackApi", () => {
|
|
|
241
245
|
mockPromiseResult.mockResolvedValueOnce([[
|
|
242
246
|
{
|
|
243
247
|
address_elements: addressFormFieldEntries,
|
|
244
|
-
postal_code_regex: '^[0-9]{5}(?:-[0-9]{4})?$'
|
|
248
|
+
postal_code_regex: '^[0-9]{5}(?:-[0-9]{4})?$',
|
|
249
|
+
verify_after_autocomplete: true,
|
|
250
|
+
wrap_address1_to_address2: false
|
|
245
251
|
}
|
|
246
252
|
]]);
|
|
247
253
|
const {getStack} = require('../src/api');
|
|
@@ -264,7 +270,9 @@ describe("ContentstackApi", () => {
|
|
|
264
270
|
required: false
|
|
265
271
|
}
|
|
266
272
|
],
|
|
267
|
-
postalCodeRegex: '^[0-9]{5}(?:-[0-9]{4})?$'
|
|
273
|
+
postalCodeRegex: '^[0-9]{5}(?:-[0-9]{4})?$',
|
|
274
|
+
verifyAfterAutocomplete: true,
|
|
275
|
+
wrapAddress1ToAddress2: false
|
|
268
276
|
}
|
|
269
277
|
]);
|
|
270
278
|
});
|
|
@@ -276,7 +284,10 @@ describe("ContentstackApi", () => {
|
|
|
276
284
|
pre_address_fields: [addressFormFieldEntries[0]],
|
|
277
285
|
address_form: {
|
|
278
286
|
title: 'default',
|
|
279
|
-
address_elements: addressFormFieldEntries
|
|
287
|
+
address_elements: addressFormFieldEntries,
|
|
288
|
+
postal_code_regex: '^[0-9]{5}(?:-[0-9]{4})?$',
|
|
289
|
+
verify_after_autocomplete: true,
|
|
290
|
+
wrap_address1_to_address2: false
|
|
280
291
|
},
|
|
281
292
|
post_address_fields: [addressFormFieldEntries[1]]
|
|
282
293
|
}
|
|
@@ -285,7 +296,6 @@ describe("ContentstackApi", () => {
|
|
|
285
296
|
const Stack = getStack('dev');
|
|
286
297
|
await expect(Stack.getShippingAddressForms(['United States'])).resolves.toStrictEqual([
|
|
287
298
|
{
|
|
288
|
-
title: 'United States',
|
|
289
299
|
pre_address_fields: [
|
|
290
300
|
{
|
|
291
301
|
field: 'address1',
|
|
@@ -296,7 +306,6 @@ describe("ContentstackApi", () => {
|
|
|
296
306
|
}
|
|
297
307
|
],
|
|
298
308
|
address_form: {
|
|
299
|
-
title: 'default',
|
|
300
309
|
address_elements: [
|
|
301
310
|
{
|
|
302
311
|
field: 'address1',
|
|
@@ -312,7 +321,10 @@ describe("ContentstackApi", () => {
|
|
|
312
321
|
max_length: 10,
|
|
313
322
|
required: false
|
|
314
323
|
}
|
|
315
|
-
]
|
|
324
|
+
],
|
|
325
|
+
postal_code_regex: '^[0-9]{5}(?:-[0-9]{4})?$',
|
|
326
|
+
verify_after_autocomplete: true,
|
|
327
|
+
wrap_address1_to_address2: false
|
|
316
328
|
},
|
|
317
329
|
post_address_fields: [
|
|
318
330
|
{
|
|
@@ -334,7 +346,10 @@ describe("ContentstackApi", () => {
|
|
|
334
346
|
pre_address_fields: [addressFormFieldEntries[0]],
|
|
335
347
|
address_form: {
|
|
336
348
|
title: 'default',
|
|
337
|
-
address_elements: addressFormFieldEntries
|
|
349
|
+
address_elements: addressFormFieldEntries,
|
|
350
|
+
postal_code_regex: '^[0-9]{5}(?:-[0-9]{4})?$',
|
|
351
|
+
verify_after_autocomplete: true,
|
|
352
|
+
wrap_address1_to_address2: false
|
|
338
353
|
},
|
|
339
354
|
post_address_fields: [addressFormFieldEntries[1]]
|
|
340
355
|
}
|
|
@@ -343,7 +358,6 @@ describe("ContentstackApi", () => {
|
|
|
343
358
|
const Stack = getStack('dev');
|
|
344
359
|
await expect(Stack.getShippingAddressForms(['United States'], true)).resolves.toStrictEqual([
|
|
345
360
|
{
|
|
346
|
-
title: 'United States',
|
|
347
361
|
preAddressFields: [
|
|
348
362
|
{
|
|
349
363
|
field: 'address1',
|
|
@@ -354,7 +368,6 @@ describe("ContentstackApi", () => {
|
|
|
354
368
|
}
|
|
355
369
|
],
|
|
356
370
|
addressForm: {
|
|
357
|
-
title: 'default',
|
|
358
371
|
addressElements: [
|
|
359
372
|
{
|
|
360
373
|
field: 'address1',
|
|
@@ -370,7 +383,10 @@ describe("ContentstackApi", () => {
|
|
|
370
383
|
maxLength: 10,
|
|
371
384
|
required: false
|
|
372
385
|
}
|
|
373
|
-
]
|
|
386
|
+
],
|
|
387
|
+
postalCodeRegex: '^[0-9]{5}(?:-[0-9]{4})?$',
|
|
388
|
+
verifyAfterAutocomplete: true,
|
|
389
|
+
wrapAddress1ToAddress2: false
|
|
374
390
|
},
|
|
375
391
|
postAddressFields: [
|
|
376
392
|
{
|
package/docs/CHANGELOG.md
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
# [2.1.0-pa-1117.
|
|
1
|
+
# [2.1.0-pa-1117.4](https://code.tls.nuskin.io/ns-am/utility/npm/contentstack-lib/compare/v2.1.0-pa-1117.3...v2.1.0-pa-1117.4) (2026-04-07)
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@nuskin/contentstack-lib",
|
|
3
|
-
"version": "2.1.0-pa-1117.
|
|
3
|
+
"version": "2.1.0-pa-1117.4",
|
|
4
4
|
"description": "This project contains configuration and api code to access Contentstack, to be shared between the backend (AWS Lambda) and frontend (Vue, etc).",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"scripts": {
|
package/src/api.js
CHANGED
|
@@ -184,7 +184,7 @@ const _getMultiEntries = async (contentType, includeRefs, values) => {
|
|
|
184
184
|
const [results] = await Stack
|
|
185
185
|
.ContentType(contentType)
|
|
186
186
|
.Query()
|
|
187
|
-
.containedIn('
|
|
187
|
+
.containedIn('country', values)
|
|
188
188
|
.includeReference(includeRefs)
|
|
189
189
|
.toJSON()
|
|
190
190
|
.find();
|
|
@@ -213,15 +213,30 @@ const _extractAddressFormFields = (addressFormFields = [], camelcase = false) =>
|
|
|
213
213
|
return camelcase ? _snakeObjectToCamel(mappedFields) : mappedFields;
|
|
214
214
|
}
|
|
215
215
|
|
|
216
|
+
const _extractAddressForm = (addressForm, camelcase = false) => {
|
|
217
|
+
if (!addressForm) {
|
|
218
|
+
return addressForm;
|
|
219
|
+
}
|
|
220
|
+
|
|
221
|
+
const mappedForm = {
|
|
222
|
+
address_elements: _extractAddressFormFields(addressForm.address_elements, camelcase),
|
|
223
|
+
postal_code_regex: addressForm.postal_code_regex,
|
|
224
|
+
verify_after_autocomplete: addressForm.verify_after_autocomplete,
|
|
225
|
+
wrap_address1_to_address2: addressForm.wrap_address1_to_address2
|
|
226
|
+
};
|
|
227
|
+
|
|
228
|
+
return camelcase ? _snakeObjectToCamel(mappedForm) : mappedForm;
|
|
229
|
+
}
|
|
230
|
+
|
|
216
231
|
const getShippingAddressForms = async (countries, camelcase = false) => {
|
|
217
|
-
const results = await _getMultiEntries(
|
|
218
|
-
|
|
219
|
-
|
|
232
|
+
const results = await _getMultiEntries(
|
|
233
|
+
'shipping_address_form',
|
|
234
|
+
['pre_address_fields', 'address_form', 'address_form.address_elements', 'post_address_fields'],
|
|
235
|
+
countries
|
|
236
|
+
);
|
|
237
|
+
const mappedResults = (results || []).map((result) => ({
|
|
220
238
|
pre_address_fields: _extractAddressFormFields(result.pre_address_fields, camelcase),
|
|
221
|
-
address_form: result.address_form
|
|
222
|
-
...result.address_form,
|
|
223
|
-
address_elements: _extractAddressFormFields(result.address_form.address_elements, camelcase)
|
|
224
|
-
} : result.address_form,
|
|
239
|
+
address_form: _extractAddressForm(result.address_form, camelcase),
|
|
225
240
|
post_address_fields: _extractAddressFormFields(result.post_address_fields, camelcase)
|
|
226
241
|
}));
|
|
227
242
|
|
|
@@ -230,10 +245,7 @@ const getShippingAddressForms = async (countries, camelcase = false) => {
|
|
|
230
245
|
|
|
231
246
|
const getAddressForms = async (countries, camelcase = false) => {
|
|
232
247
|
const results = await _getMultiEntries('address_form', 'address_elements', countries);
|
|
233
|
-
const mappedResults = (results || []).map((
|
|
234
|
-
address_elements: _extractAddressFormFields(address_elements, camelcase),
|
|
235
|
-
postal_code_regex
|
|
236
|
-
}));
|
|
248
|
+
const mappedResults = (results || []).map((result) => _extractAddressForm(result, camelcase));
|
|
237
249
|
|
|
238
250
|
return camelcase ? _snakeObjectToCamel(mappedResults) : mappedResults;
|
|
239
251
|
}
|