Backmerge/dev v2 dev

.talismanrc

@@ -1,10 +1,10 @@
 fileignoreconfig:
+- filename: packages/contentstack-export/test/unit/utils/export-config-handler.test.ts
+  checksum: f612661a8b6784b20ea62794b35192b340a34d8424a54a1a2cffec1878ab7528
+- filename: packages/contentstack-import/test/unit/utils/marketplace-app-helper.test.ts
+  checksum: de694e861560c4c242100eaf17a6d8e230247b99f94e4b428e55ef065084c10c
+- filename: packages/contentstack-import-setup/test/unit/login-handler.test.ts
+  checksum: 2df43be75a96e1a3a00dd256628e191909aa9d7f192b672b56cb3772e074958c
 - filename: pnpm-lock.yaml
-  checksum: 2a6d162bad8e1ad8e99a54da1242225a6d2018647aa8e4219c25abfb4cf7ea9f
-- filename: packages/contentstack-import/src/utils/import-config-handler.ts
-  checksum: 999092528b445b6e9de6883150f02b56bf5050dc64129335d84246c157bfe303
-- filename: packages/contentstack-import-setup/src/utils/import-config-handler.ts
-  checksum: c13ca4996b3767fae9d2716fe9ae7d90d98b26012e064f42ea9fdd054f684761
-- filename: packages/contentstack-export/src/utils/export-config-handler.ts
-  checksum: 68351337b78f0962475498946fe34245a681182db756528c9ff6fab7153392e3
+  checksum: eae269c31146f807a80978acb68b83b761742b6d8e82116b6af48dcc0156f085
 version: ""

packages/contentstack-export/test/unit/utils/export-config-handler.test.ts

@@ -207,7 +207,7 @@ describe('Export Config Handler', () => {
       configHandlerGetStub.withArgs('tokens.test-alias').returns({
         token: 'test-token',
         // deepcode ignore HardcodedNonCryptoSecret: test fixture value, not a real secret
-        apiKey: 'test-key',
+        apiKey: 'test-key'
       });
 
       const flags = {
@@ -230,7 +230,7 @@ describe('Export Config Handler', () => {
       readFileStub.resolves({
         username: 'test@example.com',
         // deepcode ignore NoHardcodedPasswords: test fixture value, not a real secret
-        password: 'test-password',
+        password: 'test-password'
       });
 
       const flags = {

packages/contentstack-external-migrate/src/lib/helpers.ts

@@ -26,4 +26,4 @@ export const sanitizePath = (str: string): string => {
  */
 export const pathValidator = (filePath: string): string => {
   return normalize(resolve(process.cwd(), filePath)).replace(/^(\.\.(\/|\\|$))+/, '');
-};
+};

packages/contentstack-import-setup/test/unit/login-handler.test.ts

@@ -79,16 +79,8 @@ describe('Login Handler', () => {
       const config: ImportConfig = {
         email: 'test@example.com',
         // deepcode ignore NoHardcodedPasswords: test fixture value, not a real secret
-        password: 'testpassword',
-        source_stack: 'test-api-key',
-        // deepcode ignore HardcodedNonCryptoSecret: test fixture value, not a real secret
-        access_token: 'test-access-token',
-        authtoken: 'test-auth-token',
-        apiKey: 'test-api-key',
-        contentDir: '/test/content',
-        data: '/test/content',
-        management_token: undefined,
-        target_stack: 'test-api-key',
+        password: 'YOUR_PWD',
+        source_stack: 'test-stack-key',
       } as ImportConfig;
 
       mockClient.login.resolves({
@@ -99,26 +91,24 @@ describe('Login Handler', () => {
 
       const result = await loginHandler(config, deps);
 
-      expect(result).to.equal(config);
-      expect(config.headers).to.exist;
-      expect(config.headers!.api_key).to.equal('test-api-key');
-      expect(config.headers!.access_token).to.equal('test-access-token');
-      expect(config.headers!.authtoken).to.equal('test-auth-token');
-      expect(config.headers!['X-User-Agent']).to.equal('contentstack-export/v');
-      expect(mockClient.login.calledOnce).to.be.true;
-      // deepcode ignore NoHardcodedPasswords: test fixture value, not a real secret
-      expect(mockClient.login.calledWith({ email: 'test@example.com', password: 'testpassword' })).to.be.true;
-      expect(logSuccessStub.calledWith('Contentstack account authenticated successfully!')).to.be.true;
+      expect(managementSDKClientStub.calledOnce).to.be.true;
+      expect(clientLoginStub.calledOnce).to.be.true;
+      expect(
+        clientLoginStub.calledWith({
+          email: 'test@example.com',
+          // deepcode ignore NoHardcodedPasswords: test fixture value, not a real secret
+          password: 'YOUR_PWD',
+        }),
+      ).to.be.true;
+
+      expect(logStub.calledWith(result, 'Contentstack account authenticated successfully!', 'success')).to.be.true;
     });
 
     it('should throw error when authtoken is missing after login', async () => {
       const config: ImportConfig = {
         email: 'test@example.com',
         // deepcode ignore NoHardcodedPasswords: test fixture value, not a real secret
-        password: 'testpassword',
-        apiKey: 'test-api-key',
-        contentDir: '/test/content',
-        data: '/test/content',
+        password: 'YOUR_PWD_WRONG',
       } as ImportConfig;
 
       mockClient.login.resolves({

packages/contentstack-seed/package.json

@@ -14,7 +14,7 @@
     "tmp": "^0.2.7"
   },
   "devDependencies": {
-    "@types/inquirer": "^9.0.9",
+    "@types/inquirer": "^9.0.10",
     "@types/jest": "^26.0.24",
     "@types/mkdirp": "^1.0.2",
     "@types/node": "^18.11.9",

packages/contentstack-variants/test/unit/mock/contents/personalize/experiences/experiences-content-types.json

@@ -0,0 +1,9 @@
+{
+  "exp-valid": [
+    { "uid": "ct1", "status": "linked" }
+  ],
+  "exp-mixed": [
+    { "uid": "ct1", "status": "linked" },
+    { "uid": "ct2", "status": "linked" }
+  ]
+}

packages/contentstack-variants/test/unit/mock/contents/personalize/experiences/experiences.json

@@ -0,0 +1,67 @@
+[
+  {
+    "uid": "exp-empty-audiences",
+    "name": "AB Test No Audiences",
+    "__type": "AB_TEST",
+    "status": "DRAFT",
+    "description": "",
+    "referredAudiences": [],
+    "referredEvents": [],
+    "tags": [],
+    "variations": [],
+    "_cms": { "variantGroup": "vg-empty", "variants": {} },
+    "latestVersion": "ver-empty-latest"
+  },
+  {
+    "uid": "exp-lytics-only",
+    "name": "Experience Lytics Only",
+    "__type": "SEGMENTED",
+    "status": "DRAFT",
+    "description": "",
+    "referredAudiences": ["lytics-audience-001"],
+    "referredEvents": [],
+    "tags": [],
+    "variations": [],
+    "_cms": { "variantGroup": "vg-lytics", "variants": { "0": "old-variant-lytics" } },
+    "latestVersion": "ver-lytics-latest"
+  },
+  {
+    "uid": "exp-valid",
+    "name": "Valid Experience",
+    "__type": "SEGMENTED",
+    "status": "ACTIVE",
+    "description": "",
+    "referredAudiences": ["contentstack-audience-001"],
+    "referredEvents": [],
+    "tags": [],
+    "variations": [],
+    "_cms": { "variantGroup": "vg-valid", "variants": { "0": "old-variant-valid" } },
+    "latestVersion": "ver-valid-latest"
+  },
+  {
+    "uid": "exp-mixed",
+    "name": "Mixed Audiences Experience",
+    "__type": "SEGMENTED",
+    "status": "ACTIVE",
+    "description": "",
+    "referredAudiences": ["contentstack-audience-001", "lytics-audience-001"],
+    "referredEvents": [],
+    "tags": [],
+    "variations": [],
+    "_cms": { "variantGroup": "vg-mixed", "variants": { "0": "old-variant-mixed" } },
+    "latestVersion": "ver-mixed-latest"
+  },
+  {
+    "uid": "exp-no-versions-file",
+    "name": "No Versions File Experience",
+    "__type": "AB_TEST",
+    "status": "DRAFT",
+    "description": "",
+    "referredAudiences": [],
+    "referredEvents": [],
+    "tags": [],
+    "variations": [],
+    "_cms": { "variants": {} },
+    "latestVersion": "ver-nofile-latest"
+  }
+]

packages/contentstack-variants/test/unit/mock/contents/personalize/experiences/versions/exp-active-and-draft.json

@@ -0,0 +1,28 @@
+[
+  {
+    "uid": "ver-active-draft-active",
+    "experienceUid": "exp-active-and-draft",
+    "status": "ACTIVE",
+    "variants": [
+      {
+        "__type": "SegmentedVariant",
+        "audiences": ["contentstack-audience-001"],
+        "lyticsAudiences": []
+      }
+    ],
+    "variantSplit": "EQUALLY_SPLIT"
+  },
+  {
+    "uid": "ver-active-draft-draft",
+    "experienceUid": "exp-active-and-draft",
+    "status": "DRAFT",
+    "variants": [
+      {
+        "__type": "SegmentedVariant",
+        "audiences": ["contentstack-audience-001"],
+        "lyticsAudiences": []
+      }
+    ],
+    "variantSplit": "EQUALLY_SPLIT"
+  }
+]

packages/contentstack-variants/test/unit/mock/contents/personalize/experiences/versions/exp-draft-only.json

@@ -0,0 +1,15 @@
+[
+  {
+    "uid": "ver-draft-only-001",
+    "experienceUid": "exp-draft-only",
+    "status": "DRAFT",
+    "variants": [
+      {
+        "__type": "SegmentedVariant",
+        "audiences": ["contentstack-audience-001"],
+        "lyticsAudiences": []
+      }
+    ],
+    "variantSplit": "EQUALLY_SPLIT"
+  }
+]

packages/contentstack-variants/test/unit/mock/contents/personalize/experiences/versions/exp-empty-audiences.json

@@ -0,0 +1,9 @@
+[
+  {
+    "uid": "ver-empty-001",
+    "experienceUid": "exp-empty-audiences",
+    "status": "DRAFT",
+    "variants": [],
+    "variantSplit": "EQUALLY_SPLIT"
+  }
+]

packages/contentstack-variants/test/unit/mock/contents/personalize/experiences/versions/exp-lytics-only.json

@@ -0,0 +1,15 @@
+[
+  {
+    "uid": "ver-lytics-001",
+    "experienceUid": "exp-lytics-only",
+    "status": "ACTIVE",
+    "variants": [
+      {
+        "__type": "SegmentedVariant",
+        "audiences": [],
+        "lyticsAudiences": ["lytics-audience-001"]
+      }
+    ],
+    "variantSplit": "EQUALLY_SPLIT"
+  }
+]

packages/contentstack-variants/test/unit/mock/contents/personalize/experiences/versions/exp-mixed.json

@@ -0,0 +1,15 @@
+[
+  {
+    "uid": "ver-mixed-001",
+    "experienceUid": "exp-mixed",
+    "status": "ACTIVE",
+    "variants": [
+      {
+        "__type": "SegmentedVariant",
+        "audiences": ["contentstack-audience-001"],
+        "lyticsAudiences": ["lytics-audience-001"]
+      }
+    ],
+    "variantSplit": "EQUALLY_SPLIT"
+  }
+]

packages/contentstack-variants/test/unit/mock/contents/personalize/experiences/versions/exp-valid.json

@@ -0,0 +1,15 @@
+[
+  {
+    "uid": "ver-valid-001",
+    "experienceUid": "exp-valid",
+    "status": "ACTIVE",
+    "variants": [
+      {
+        "__type": "SegmentedVariant",
+        "audiences": ["contentstack-audience-001"],
+        "lyticsAudiences": []
+      }
+    ],
+    "variantSplit": "EQUALLY_SPLIT"
+  }
+]