@nuskin/contentstack-lib 2.1.0-pa-1117.3 → 2.1.0-pa-1117.5

package/__tests__/api.spec.js

@@ -281,10 +281,14 @@ describe("ContentstackApi", () => {
     mockPromiseResult.mockResolvedValueOnce([[
       {
         title: 'United States',
+        countries: ['United States'],
         pre_address_fields: [addressFormFieldEntries[0]],
         address_form: {
           title: 'default',
-          address_elements: addressFormFieldEntries
+          address_elements: addressFormFieldEntries,
+          postal_code_regex: '^[0-9]{5}(?:-[0-9]{4})?$',
+          verify_after_autocomplete: true,
+          wrap_address1_to_address2: false
         },
         post_address_fields: [addressFormFieldEntries[1]]
       }
@@ -293,7 +297,7 @@ describe("ContentstackApi", () => {
     const Stack = getStack('dev');
     await expect(Stack.getShippingAddressForms(['United States'])).resolves.toStrictEqual([
       {
-        title: 'United States',
+        countries: ['United States'],
         pre_address_fields: [
           {
             field: 'address1',
@@ -304,7 +308,6 @@ describe("ContentstackApi", () => {
           }
         ],
         address_form: {
-          title: 'default',
           address_elements: [
             {
               field: 'address1',
@@ -320,7 +323,10 @@ describe("ContentstackApi", () => {
               max_length: 10,
               required: false
             }
-          ]
+          ],
+          postal_code_regex: '^[0-9]{5}(?:-[0-9]{4})?$',
+          verify_after_autocomplete: true,
+          wrap_address1_to_address2: false
         },
         post_address_fields: [
           {
@@ -339,10 +345,14 @@ describe("ContentstackApi", () => {
     mockPromiseResult.mockResolvedValueOnce([[
       {
         title: 'United States',
+        countries: ['United States'],
         pre_address_fields: [addressFormFieldEntries[0]],
         address_form: {
           title: 'default',
-          address_elements: addressFormFieldEntries
+          address_elements: addressFormFieldEntries,
+          postal_code_regex: '^[0-9]{5}(?:-[0-9]{4})?$',
+          verify_after_autocomplete: true,
+          wrap_address1_to_address2: false
         },
         post_address_fields: [addressFormFieldEntries[1]]
       }
@@ -351,7 +361,7 @@ describe("ContentstackApi", () => {
     const Stack = getStack('dev');
     await expect(Stack.getShippingAddressForms(['United States'], true)).resolves.toStrictEqual([
       {
-        title: 'United States',
+        countries: ['United States'],
         preAddressFields: [
           {
             field: 'address1',
@@ -362,7 +372,6 @@ describe("ContentstackApi", () => {
           }
         ],
         addressForm: {
-          title: 'default',
           addressElements: [
             {
               field: 'address1',
@@ -378,7 +387,10 @@ describe("ContentstackApi", () => {
               maxLength: 10,
               required: false
             }
-          ]
+          ],
+          postalCodeRegex: '^[0-9]{5}(?:-[0-9]{4})?$',
+          verifyAfterAutocomplete: true,
+          wrapAddress1ToAddress2: false
         },
         postAddressFields: [
           {

package/docs/CHANGELOG.md

@@ -1 +1 @@
-# [2.1.0-pa-1117.3](https://code.tls.nuskin.io/ns-am/utility/npm/contentstack-lib/compare/v2.1.0-pa-1117.2...v2.1.0-pa-1117.3) (2026-04-06)
+# [2.1.0-pa-1117.5](https://code.tls.nuskin.io/ns-am/utility/npm/contentstack-lib/compare/v2.1.0-pa-1117.4...v2.1.0-pa-1117.5) (2026-04-08)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/contentstack-lib",
-  "version": "2.1.0-pa-1117.3",
+  "version": "2.1.0-pa-1117.5",
   "description": "This project contains configuration and api code to access Contentstack, to be shared between the backend (AWS Lambda) and frontend (Vue, etc).",
   "main": "src/index.js",
   "scripts": {

package/src/api.js

@@ -184,7 +184,7 @@ const _getMultiEntries = async (contentType, includeRefs, values) => {
     const [results] = await Stack
       .ContentType(contentType)
       .Query()
-      .containedIn('title', values)
+      .containedIn('country', values)
       .includeReference(includeRefs)
       .toJSON()
       .find();
@@ -213,15 +213,31 @@ const _extractAddressFormFields = (addressFormFields = [], camelcase = false) =>
   return camelcase ? _snakeObjectToCamel(mappedFields) : mappedFields;
 }
 
+const _extractAddressForm = (addressForm, camelcase = false) => {
+  if (!addressForm) {
+    return addressForm;
+  }
+
+  const mappedForm = {
+    address_elements: _extractAddressFormFields(addressForm.address_elements, camelcase),
+    postal_code_regex: addressForm.postal_code_regex,
+    verify_after_autocomplete: addressForm.verify_after_autocomplete,
+    wrap_address1_to_address2: addressForm.wrap_address1_to_address2
+  };
+
+  return camelcase ? _snakeObjectToCamel(mappedForm) : mappedForm;
+}
+
 const getShippingAddressForms = async (countries, camelcase = false) => {
-  const results = await _getMultiEntries('shipping_address_form', ['pre_address_fields', 'address_form', 'address_form.address_elements', 'post_address_fields'], countries);
-  const mappedResults = (results || []).map(result => ({
-    ...result,
+  const results = await _getMultiEntries(
+    'shipping_address_form',
+    ['shipping_country_list', 'pre_address_fields', 'address_form', 'address_form.address_elements', 'post_address_fields'],
+    countries
+  );
+  const mappedResults = (results || []).map((result) => ({
+    countries: result.countries,
     pre_address_fields: _extractAddressFormFields(result.pre_address_fields, camelcase),
-    address_form: result.address_form ? {
-      ...result.address_form,
-      address_elements: _extractAddressFormFields(result.address_form.address_elements, camelcase)
-    } : result.address_form,
+    address_form: _extractAddressForm(result.address_form, camelcase),
     post_address_fields: _extractAddressFormFields(result.post_address_fields, camelcase)
   }));
 
@@ -230,17 +246,7 @@ const getShippingAddressForms = async (countries, camelcase = false) => {
 
 const getAddressForms = async (countries, camelcase = false) => {
   const results = await _getMultiEntries('address_form', 'address_elements', countries);
-  const mappedResults = (results || []).map(({
-    address_elements,
-    postal_code_regex,
-    verify_after_autocomplete,
-    wrap_address1_to_address2
-  }) => ({
-    address_elements: _extractAddressFormFields(address_elements, camelcase),
-    postal_code_regex,
-    verify_after_autocomplete,
-    wrap_address1_to_address2
-  }));
+  const mappedResults = (results || []).map((result) => _extractAddressForm(result, camelcase));
 
   return camelcase ? _snakeObjectToCamel(mappedResults) : mappedResults;
 }