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

package/.eslintrc.json

@@ -11,7 +11,7 @@
         "SharedArrayBuffer": "readonly"
     },
     "parserOptions": {
-        "ecmaVersion": 2018,
+        "ecmaVersion": 2020,
         "sourceType": "module"
     },
     "extends": [

package/__tests__/api.spec.js

@@ -157,9 +157,9 @@ describe("ContentstackApi", () => {
       global.window = Object.create(window);
       global.window.location = { hostname };
       const {getStack} = require('../src/api');
-      getStack(env[index]);
+      getStack();
       expect(mockStack).toHaveBeenCalledWith({api_key: csCfg.apiKey, delivery_token: csCfg.deliveryToken, environment: csCfg.environment});
-    })
+    });
   });
 
   test('extractAddressFormFields maps address form field entries', () => {
@@ -204,6 +204,12 @@ describe("ContentstackApi", () => {
     ]);
   });
 
+  test('extractAddressFormFields returns an empty list when no entries are provided', () => {
+    const {getStack} = require('../src/api');
+    const Stack = getStack('dev');
+    expect(Stack.extractAddressFormFields()).toStrictEqual([]);
+  });
+
   test('getAddressForms maps address_elements', async () => {
     mockPromiseResult.mockResolvedValueOnce([[
       {
@@ -277,19 +283,49 @@ describe("ContentstackApi", () => {
     ]);
   });
 
+  test('getAddressForms returns an empty list when no forms are found', async () => {
+    mockPromiseResult.mockResolvedValueOnce([undefined]);
+    const {getStack} = require('../src/api');
+    const Stack = getStack('dev');
+    await expect(Stack.getAddressForms(['Unknown'])).resolves.toStrictEqual([]);
+  });
+
+  test('getSingletonEntries maps language code in to id', async () => {
+    mockSinglePromiseResult.mockResolvedValueOnce(singleCheckoutAdrStrings);
+    const {getStack} = require('../src/api');
+    const Stack = getStack('dev');
+    await Stack.getSingletonEntries({contentTypeUIDs: ['checkout_adr_strings'], language: 'in'});
+    expect(mockSinglePromiseResult).toHaveBeenCalled();
+  });
+
   test('getShippingAddressForms maps nested address form fields', async () => {
     mockPromiseResult.mockResolvedValueOnce([[
       {
         title: 'United States',
-        countries: ['United States'],
+        countries: [
+          {
+            countries: [
+              {
+                country_code: 'US',
+                country_name: 'United States'
+              },
+              {
+                country_code: 'CA',
+                country_name: 'Canada'
+              }
+            ]
+          }
+        ],
         pre_address_fields: [addressFormFieldEntries[0]],
-        address_form: {
-          title: 'default',
-          address_elements: addressFormFieldEntries,
-          postal_code_regex: '^[0-9]{5}(?:-[0-9]{4})?$',
-          verify_after_autocomplete: true,
-          wrap_address1_to_address2: false
-        },
+        address_form: [
+          {
+            title: 'default',
+            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]]
       }
     ]]);
@@ -297,7 +333,16 @@ describe("ContentstackApi", () => {
     const Stack = getStack('dev');
     await expect(Stack.getShippingAddressForms(['United States'])).resolves.toStrictEqual([
       {
-        countries: ['United States'],
+        countries: [
+          {
+            code: 'US',
+            name: 'United States'
+          },
+          {
+            code: 'CA',
+            name: 'Canada'
+          }
+        ],
         pre_address_fields: [
           {
             field: 'address1',
@@ -345,15 +390,30 @@ describe("ContentstackApi", () => {
     mockPromiseResult.mockResolvedValueOnce([[
       {
         title: 'United States',
-        countries: ['United States'],
+        countries: [
+          {
+            countries: [
+              {
+                country_code: 'US',
+                country_name: 'United States'
+              },
+              {
+                country_code: 'CA',
+                country_name: 'Canada'
+              }
+            ]
+          }
+        ],
         pre_address_fields: [addressFormFieldEntries[0]],
-        address_form: {
-          title: 'default',
-          address_elements: addressFormFieldEntries,
-          postal_code_regex: '^[0-9]{5}(?:-[0-9]{4})?$',
-          verify_after_autocomplete: true,
-          wrap_address1_to_address2: false
-        },
+        address_form: [
+          {
+            title: 'default',
+            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]]
       }
     ]]);
@@ -361,7 +421,16 @@ describe("ContentstackApi", () => {
     const Stack = getStack('dev');
     await expect(Stack.getShippingAddressForms(['United States'], true)).resolves.toStrictEqual([
       {
-        countries: ['United States'],
+        countries: [
+          {
+            code: 'US',
+            name: 'United States'
+          },
+          {
+            code: 'CA',
+            name: 'Canada'
+          }
+        ],
         preAddressFields: [
           {
             field: 'address1',
@@ -404,4 +473,25 @@ describe("ContentstackApi", () => {
       }
     ]);
   });
+
+  test('getShippingAddressForms returns empty nested data when optional references are missing', async () => {
+    mockPromiseResult.mockResolvedValueOnce([[
+      {
+        countries: [],
+        pre_address_fields: undefined,
+        address_form: [],
+        post_address_fields: undefined
+      }
+    ]]);
+    const {getStack} = require('../src/api');
+    const Stack = getStack('dev');
+    await expect(Stack.getShippingAddressForms(['Unknown'])).resolves.toStrictEqual([
+      {
+        countries: [],
+        pre_address_fields: [],
+        address_form: undefined,
+        post_address_fields: []
+      }
+    ]);
+  });
 });

package/docs/CHANGELOG.md

@@ -1 +1 @@
-# [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)
+# [2.1.0-pa-1117.7](https://code.tls.nuskin.io/ns-am/utility/npm/contentstack-lib/compare/v2.1.0-pa-1117.6...v2.1.0-pa-1117.7) (2026-04-08)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nuskin/contentstack-lib",
-  "version": "2.1.0-pa-1117.5",
+  "version": "2.1.0-pa-1117.7",
   "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": {
@@ -19,7 +19,7 @@
   "license": "ISC",
   "homepage": "https://code.tls.nuskin.io/ns-am/utility/npm/contentstack-lib/blob/master/README.md",
   "devDependencies": {
-    "eslint": "5.16.0",
+    "eslint": "7.32.0",
     "eslint-config-google": "0.14.0",
     "eslint-config-prettier": "4.1.0",
     "eslint-plugin-json": "2.1.1",

package/src/api.js

@@ -184,7 +184,7 @@ const _getMultiEntries = async (contentType, includeRefs, values) => {
     const [results] = await Stack
       .ContentType(contentType)
       .Query()
-      .containedIn('country', values)
+      .containedIn('title', values)
       .includeReference(includeRefs)
       .toJSON()
       .find();
@@ -228,16 +228,25 @@ const _extractAddressForm = (addressForm, camelcase = false) => {
   return camelcase ? _snakeObjectToCamel(mappedForm) : mappedForm;
 }
 
+const _extractShippingCountries = (countries = []) => {
+  const shippingCountries = countries[0]?.countries ?? [];
+
+  return shippingCountries.map(({country_code, country_name}) => ({
+    code: country_code,
+    name: country_name
+  }));
+}
+
 const getShippingAddressForms = async (countries, camelcase = false) => {
   const results = await _getMultiEntries(
     'shipping_address_form',
-    ['shipping_country_list', 'pre_address_fields', 'address_form', 'address_form.address_elements', 'post_address_fields'],
+    ['countries', 'pre_address_fields', 'address_form', 'address_form.address_elements', 'post_address_fields'],
     countries
   );
   const mappedResults = (results || []).map((result) => ({
-    countries: result.countries,
+    countries: _extractShippingCountries(result.countries),
     pre_address_fields: _extractAddressFormFields(result.pre_address_fields, camelcase),
-    address_form: _extractAddressForm(result.address_form, camelcase),
+    address_form: _extractAddressForm(result.address_form[0], camelcase),
     post_address_fields: _extractAddressFormFields(result.post_address_fields, camelcase)
   }));