merged latest changes

Author: shafeeqd959

.github/workflows/release-v2-beta-plugins.yml

@@ -135,17 +135,10 @@ jobs:
           package: ./packages/contentstack-branches/package.json
           tag: beta
 
-      - name: Create Beta Release
-        id: create_release
-        env:
-          GITHUB_TOKEN: ${{ secrets.PKG_TOKEN }}
-          VERSION: ${{ steps.publish-core.outputs.version }}
-        run: |
-          # Get the previous beta release for comparison
-          PREVIOUS_BETA=$(gh release list --limit 10 | grep 'beta' | head -1 | cut -f1)
-
-          if [ -n "$PREVIOUS_BETA" ]; then
-            gh release create v"$VERSION" --title "Beta Release $VERSION" --notes-from-tag "$PREVIOUS_BETA" --prerelease
-          else
-            gh release create v"$VERSION" --title "Beta Release $VERSION" --generate-notes --prerelease
-          fi
+      # Query Export
+      - name: Publishing query-export (Beta)
+        uses: JS-DevTools/npm-publish@v3
+        with:
+          token: ${{ secrets.NPM_TOKEN }}
+          package: ./packages/contentstack-query-export/package.json
+          tag: beta

.github/workflows/unit-test.yml

@@ -62,3 +62,7 @@ jobs:
       - name: Run tests for Contentstack Branches
         working-directory: ./packages/contentstack-branches
         run: npm run test:unit
+
+      - name: Run tests for Contentstack Query Export
+        working-directory: ./packages/contentstack-query-export
+        run: npm run test:unit

.talismanrc

@@ -1,86 +1,130 @@
 fileignoreconfig:
   - filename: packages/contentstack-import/src/utils/import-config-handler.ts
     checksum: 3194f537cee8041f07a7ea91cdc6351c84e400766696d9c3cf80b98f99961f76
-  - filename: pnpm-lock.yaml
-    checksum: 3e5093383a595967f411433e1e5aa84f94bed84f2a6ba8d1af3075e24a6863e3
   - filename: packages/contentstack-export/src/export/modules/environments.ts
     checksum: a92c5de7ed8e80f08f911727973a66e0416b4a52265c275d1d25c3095f912811
   - filename: packages/contentstack-import/src/utils/backup-handler.ts
     checksum: 9a892b5c4b5aac230fb5969e7f34afdac0b6f96208e64bf9d1195468c935c66c
   - filename: packages/contentstack-import/test/unit/utils/backup-handler.test.ts
     checksum: 69860727e9b3099d8e1e95db2af17fc8b161684f675477981d27877cd8e1b3bb
+  - filename: packages/contentstack-query-export/.env-example
+    checksum: 922c7aa9c788ab60b987de2b0a2aee6d90843c463a8bbc29201e4efe31081187
+  - filename: pnpm-lock.yaml
+    checksum: 3d2eaabf1df366efee1759156465c6aefa68f30d372717de2cdc3e41946aa3d8
+  - filename: packages/contentstack-import/src/utils/build-import-spaces-options.ts
+    checksum: fe0cb6cb5903515982af1e3642f2a19233207d35f13dc205cebeda0aa399f8b5
+  - filename: packages/contentstack-export/src/export/modules/stack.ts
+    checksum: 00774a601a5d2b4a47a91fe5bbb0ea9c93c48fa785ee9887c0d74a6b6ec21296
   - filename: packages/contentstack-export/src/types/default-config.ts
     checksum: 5f0b0bb753242356edacb802241ec937a7741647813f9f347837368f08265667
-  - filename: packages/contentstack-export/src/types/index.ts
-    checksum: fa36c236abac338b03bf307102a99f25dddac9afe75b6b34fb82e318e7759799
   - filename: packages/contentstack-asset-management/.eslintrc
     checksum: 136f03481c8c59575d2eafd4c78d105119f85fb10fe88e02af8cffaf3eb7c090
-  - filename: packages/contentstack-asset-management/src/import/asset-types.ts
-    checksum: f65307b45623e2d0f17c2b0e26c34f92509850739757a0a9357a48a1c3e2234f
-  - filename: packages/contentstack-audit/test/unit/logger-config.js
-    checksum: 493e2e65939325f48d354469f409f1dbf84462adca995ed3a78461e80148d309
-  - filename: packages/contentstack-export/test/unit/export/module-exporter.test.ts
-    checksum: 67b70c93ed679ccb2c61d0c277380676e33c91da8a423f948e81937e5d1d9479
-  - filename: packages/contentstack-asset-management/src/types/asset-management-api.ts
-    checksum: 6629720575ab48371734d9455d591a431604b5afb2c5c682816e1571377a43ab
-  - filename: packages/contentstack-export/test/unit/export/modules/assets.test.ts
-    checksum: c4dc86b0973af171a11884e0bff9bb9ce5e41df68906d924588c0bf51b19ae9b
-  - filename: packages/contentstack-export/test/unit/export/modules/base-class.test.ts
-    checksum: 893a09567def9768c63310326e3bd35c2570bc436a9b9013147c6d383c949e11
+  - filename: packages/contentstack-export/src/types/index.ts
+    checksum: fa36c236abac338b03bf307102a99f25dddac9afe75b6b34fb82e318e7759799
+  - filename: packages/contentstack-export/src/config/index.ts
+    checksum: ae655e25cefff007c4ae4006c67b1529951350d9d2a3d179ef0a80d3da326d5a
+  - filename: packages/contentstack-branches/README.md
+    checksum: 2978e9a9c151cbbafb5dd542edf6815ccec12172ae4ca114a6c4e5e73a85a2b5
   - filename: packages/contentstack-branches/src/branch/diff-handler.ts
     checksum: 3cd4d26a2142cab7cbf2094c9251e028467d17d6a1ed6daf22f21975133805f1
-  - filename: packages/contentstack-audit/test/unit/base-command.test.ts
-    checksum: 4208fae6e7cf1aeeb2b936d119c85cdc40e5e3560c7207e04bb94ba3e0305557
-  - filename: packages/contentstack-export/test/unit/export/modules/marketplace-apps.test.ts
-    checksum: 299b8f60cce1f64be7c20786d6a7c9c370474b97b06d1846114a76a70ec20cf7
-  - filename: packages/contentstack-audit/src/modules/assets.ts
-    checksum: b8b727867f8f6fb52ba18c33d158e1ee7bce9a15153c45becba6f73da16b5fcb
   - filename: packages/contentstack-export/src/export/modules/assets.ts
     checksum: 1d0ec8a15b35fb71261556e1982f53e7c940ddde49497f64d7a6fd7a7707bae4
+  - filename: packages/contentstack-asset-management/src/import/asset-types.ts
+    checksum: 479dc445d8abe15664cca14e22ddcb0469e7f5e47d0b4f26b735b2b0c23a5b41
+  - filename: packages/contentstack-asset-management/src/import/spaces.ts
+    checksum: c3e97e8099ba81899c104a5b35c7a5cb70d10efb5bd9a507044b843ea1a9a976
+  - filename: packages/contentstack-query-export/skills/framework/SKILL.md
+    checksum: b45c4bc28025292c168053e95a3c570b9d67500e0ee5241553089bca6914bb3f
+  - filename: packages/contentstack-query-export/src/types/index.ts
+    checksum: 686c5ed7fadb6620201dc3f1ed19c5ba94afd73ad165c33379b8b33dec81e519
+  - filename: packages/contentstack-query-export/test/unit/query-parser-simple.test.ts
+    checksum: d187ad885a914b70406e343a92ad3ee1ca3c30207b0d8b040f36c6f287da3a6c
+  - filename: packages/contentstack-query-export/skills/code-review/SKILL.md
+    checksum: 1c1cb0b1ce20114b9e855278a63c098d87f9302f093b08eb7f05f667840b6166
+  - filename: packages/contentstack-query-export/src/commands/cm/stacks/export-query.ts
+    checksum: 7642419baffc58871fafd9b1811b875e6f9e3e3c0a7d24e8508d137f14414574
+  - filename: packages/contentstack-query-export/test/unit/query-executor.test.ts
+    checksum: afa11e89e913b05f4e8475aa27cf6de5ffd870da1c7e75dd59d864d268d11a1b
+  - filename: packages/contentstack-query-export/src/core/query-executor.ts
+    checksum: a6bd72f954dc7343a93c3e405c1bbe8f354daa051a2f7dcbf776d3ddf9faa51b
+  - filename: packages/contentstack-asset-management/test/unit/utils/export-helpers.test.ts
+    checksum: 0e8751163491fc45e7ae3999282d336ae1ab8a9f88e601cbb85b4f44e8db96b8
+  - filename: packages/contentstack-export/test/unit/export/modules/base-class.test.ts
+    checksum: 893a09567def9768c63310326e3bd35c2570bc436a9b9013147c6d383c949e11
+  - filename: packages/contentstack-import/src/types/default-config.ts
+    checksum: 1c09acba953cfd7058a3e0d63f0a9bfbb8f28e903538eaa015fdc611402bbd4f
+  - filename: packages/contentstack-query-export/test/unit/referenced-asset-handler.test.ts
+    checksum: 3d19ad04a0306be741f9acd3a2d164d19e2b3803efc0a50342b156e8686c8b0c
   - filename: packages/contentstack-asset-management/src/types/export-types.ts
     checksum: 48add19a8466083905e15d6a8a925cd5341fa56cb945f91e411ffee9cd08975b
-  - filename: packages/contentstack-export/test/unit/export/modules/stack.test.ts
-    checksum: 79876b8f635037a2d8ba38dac055e7625bf85db6a3cf5729434e6a97e44857d6
   - filename: packages/contentstack-asset-management/src/export/base.ts
-    checksum: 0fee8bb293b841dcf59ac5c566cb1b1b43a43e27041e7a9cdbee6f0e436c9598
-  - filename: packages/contentstack-export/src/config/index.ts
-    checksum: ae655e25cefff007c4ae4006c67b1529951350d9d2a3d179ef0a80d3da326d5a
-  - filename: packages/contentstack-branches/src/branch/merge-handler.ts
-    checksum: 4fd8dba9b723733530b9ba12e81e1d3e5d60b73ac4c082defb10593f257bb133
-  - filename: packages/contentstack-asset-management/src/utils/asset-management-api-adapter.ts
-    checksum: 256ddcfbb10ee4ccfac2ea5c2d733199f8830a78896196d1e965109942b234e8
-  - filename: packages/contentstack-import/src/types/default-config.ts
-    checksum: 1c09acba953cfd7058a3e0d63f0a9bfbb8f28e903538eaa015fdc611402bbd4f
+    checksum: 9b6517336220c61daff94edc71af453ad38c85cd1d6dcf6f0f5c47625c2180a6
+  - filename: packages/contentstack-asset-management/src/import/base.ts
+    checksum: 0ac8dba5c5db698cdcaee19203db416554e27221d8ae515bd22006cec8733b3a
+  - filename: packages/contentstack-asset-management/src/import/fields.ts
+    checksum: cef6b63729834167a3b1fa78c19bf5af843c33c280f327b9b538b29998046d29
   - filename: packages/contentstack-asset-management/src/utils/export-helpers.ts
     checksum: 1a0a04d5d86a07307122c5b160d8c3a831f0e17b7a1d2b5aaf16b1a73e231981
-  - filename: packages/contentstack-import/src/utils/build-import-spaces-options.ts
-    checksum: fe0cb6cb5903515982af1e3642f2a19233207d35f13dc205cebeda0aa399f8b5
+  - filename: packages/contentstack-asset-management/src/import/assets.ts
+    checksum: ed6af5d798282808c09643e1dcd1eaede89ce2b09bd0425998af64849b4f3f61
+  - filename: packages/contentstack-asset-management/src/types/asset-management-api.ts
+    checksum: 6629720575ab48371734d9455d591a431604b5afb2c5c682816e1571377a43ab
   - filename: packages/contentstack-branches/src/commands/cm/branches/merge-status.ts
     checksum: 6e5b959ddcc5ff68e03c066ea185fcf6c6e57b1819069730340af35aad8a93a8
-  - filename: packages/contentstack-asset-management/src/import/spaces.ts
-    checksum: e607b8a9e42ffab01ba328272cf27106ed2728856ecbe0d6ed791e72d70a27fe
-  - filename: packages/contentstack-asset-management/src/import/assets.ts
-    checksum: 20d51c63e9c00783caa3eba9239879e687b34637105c9539be667439e9fa64ab
   - filename: packages/contentstack-branches/src/utils/create-branch.ts
     checksum: d0613295ee26f7a77d026e40db0a4ab726fabd0a74965f729f1a66d1ef14768f
-  - filename: packages/contentstack-asset-management/src/import/base.ts
-    checksum: 0c7ff03a094e9d84710752ee875421e9a21dcc088f56286aa172a96127ad5f8e
-  - filename: packages/contentstack-asset-management/test/unit/utils/asset-management-api-adapter.test.ts
-    checksum: ff688f37f40de3f7cbef378ec682ca1167720d902d8d84370464af7feb36c124
-  - filename: packages/contentstack-asset-management/src/import/fields.ts
-    checksum: 09f528b7af3db71f4d939f3768c4760a95c2593c3ee93a7cb568d41f1dbaa71c
-  - filename: packages/contentstack-asset-management/test/unit/utils/export-helpers.test.ts
-    checksum: 0e8751163491fc45e7ae3999282d336ae1ab8a9f88e601cbb85b4f44e8db96b8
-  - filename: packages/contentstack-export/src/export/modules/stack.ts
-    checksum: 00774a601a5d2b4a47a91fe5bbb0ea9c93c48fa785ee9887c0d74a6b6ec21296
-  - filename: packages/contentstack-audit/test/unit/modules/entries.test.ts
-    checksum: aaf2e125c5e93ab15364e41559390502a18b83a4b3de5879c02572969381c0a6
+  - filename: packages/contentstack-branches/src/branch/merge-handler.ts
+    checksum: 4fd8dba9b723733530b9ba12e81e1d3e5d60b73ac4c082defb10593f257bb133
+  - filename: packages/contentstack-asset-management/src/utils/asset-management-api-adapter.ts
+    checksum: 256ddcfbb10ee4ccfac2ea5c2d733199f8830a78896196d1e965109942b234e8
   - filename: packages/contentstack-asset-management/test/unit/export/base.test.ts
     checksum: 164fc2e5a4337a2739903499b66eecc66a85bb9b50aa2e71079bdd046a195a94
-  - filename: skills/code-review/SKILL.md
-    checksum: 29673e16f6b41fcec7fa236912e7f72b920ed4a3d9a66a89308b4a058b247f3e
+  - filename: packages/contentstack-export/test/unit/export/modules/assets.test.ts
+    checksum: c4dc86b0973af171a11884e0bff9bb9ce5e41df68906d924588c0bf51b19ae9b
+  - filename: packages/contentstack-asset-management/test/unit/utils/asset-management-api-adapter.test.ts
+    checksum: ff688f37f40de3f7cbef378ec682ca1167720d902d8d84370464af7feb36c124
+  - filename: packages/contentstack-export/test/unit/export/modules/stack.test.ts
+    checksum: 79876b8f635037a2d8ba38dac055e7625bf85db6a3cf5729434e6a97e44857d6
+  - filename: packages/contentstack-export/test/unit/export/module-exporter.test.ts
+    checksum: 67b70c93ed679ccb2c61d0c277380676e33c91da8a423f948e81937e5d1d9479
+  - filename: packages/contentstack-query-export/src/utils/common-helper.ts
+    checksum: 924a9fbc57dd774a7957870d63366ffc16cd4242dbe684321b9b52a888cfa455
+  - filename: packages/contentstack-export/test/unit/export/modules/marketplace-apps.test.ts
+    checksum: 299b8f60cce1f64be7c20786d6a7c9c370474b97b06d1846114a76a70ec20cf7
+  - filename: packages/contentstack-query-export/src/utils/config-handler.ts
+    checksum: 2a17dfe46ff5e77bb585013719065db0b513b21d700eb54e6615e78a6811f885
+  - filename: packages/contentstack-query-export/.eslintrc
+    checksum: b34756122b251dc2feedc7c7b98a7772d4d763bc468c8291be483ae2ac3471be
+  - filename: packages/contentstack-query-export/test/config.json
+    checksum: 792e177efa078e31aa05a5136807fd1fed4b6ea7a4cd44d69353edd8b96ff33f
+  - filename: packages/contentstack-query-export/test/unit/common-helper.test.ts
+    checksum: c1d023d8c23e0400805448eb1466da5cb1fe891b6e838100fb12cbc7e1514a59
+  - filename: packages/contentstack-query-export/src/utils/logger.ts
+    checksum: de6dd816bc534aaddf9adbe4e1db935f152d32eedaad5b76445f4affa836fcc9
+  - filename: packages/contentstack-query-export/src/utils/dependency-resolver.ts
+    checksum: 79e3f53778385e964efa2a407b80a7f624a20e536ad576b684fe51cb224ed701
+  - filename: packages/contentstack-audit/test/unit/logger-config.js
+    checksum: 493e2e65939325f48d354469f409f1dbf84462adca995ed3a78461e80148d309
+  - filename: packages/contentstack-audit/test/unit/base-command.test.ts
+    checksum: 4208fae6e7cf1aeeb2b936d119c85cdc40e5e3560c7207e04bb94ba3e0305557
+  - filename: packages/contentstack-audit/src/modules/assets.ts
+    checksum: 551156796b5cd447a9abb580e95734198d33047d550258361cdd05c0cc9ce041
+  - filename: packages/contentstack-query-export/test/unit/content-type-helper.test.ts
+    checksum: 1b4b9724a1281032605b61f007f7a7da080731bd9e0e4b2c4bc00b212ff30242
+  - filename: packages/contentstack-query-export/test/unit/config-handler.test.ts
+    checksum: a1077cb686431fea29de839762dbc16c951b6d61171f525e311e4a34182b0d08
   - filename: skills/contentstack-cli/SKILL.md
     checksum: 36762d43bbacedd0b344f9d4f1179a88e3dbc7e2467341ba42198dcd1bf9e40c
+  - filename: skills/code-review/SKILL.md
+    checksum: 29673e16f6b41fcec7fa236912e7f72b920ed4a3d9a66a89308b4a058b247f3e
+  - filename: packages/contentstack-query-export/README.md
+    checksum: 9be27e9a5f027f2bbbbcc6d4c706b19071cf40f596ce3e778f33ea7579a52626
+  - filename: packages/contentstack-query-export/test/unit/module-exporter.test.ts
+    checksum: e27fab52e65a8d5430d268f3562a823828e9e3dd9eb9569342f1cdb83eef9ea3
   - filename: skills/testing/SKILL.md
     checksum: ee1c82f1bb51860cb26fb9f112a53df0127e316fcb22a094034024741251fa3c
+  - filename: packages/contentstack-query-export/test/unit/dependency-resolver.test.ts
+    checksum: 749931f9ae23ba044e19774ea802627220fd8bffa7d6fe7b9666e866189c3854
+  - filename: packages/contentstack-audit/test/unit/modules/entries.test.ts
+    checksum: aaf2e125c5e93ab15364e41559390502a18b83a4b3de5879c02572969381c0a6
 version: '1.0'

packages/contentstack-audit/README.md

@@ -19,7 +19,7 @@ $ npm install -g @contentstack/cli-audit
 $ csdx COMMAND
 running command...
 $ csdx (--version|-v)
-@contentstack/cli-audit/2.0.0-beta.6 darwin-arm64 node-v24.13.0
+@contentstack/cli-audit/2.0.0-beta.11 darwin-arm64 node-v22.13.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-bootstrap/README.md

@@ -15,7 +15,7 @@ $ npm install -g @contentstack/cli-cm-bootstrap
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-bootstrap/2.0.0-beta.11 darwin-arm64 node-v24.13.0
+@contentstack/cli-cm-bootstrap/2.0.0-beta.16 darwin-arm64 node-v22.13.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-branches/README.md

@@ -37,7 +37,7 @@ $ npm install -g @contentstack/cli-cm-branches
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-branches/2.0.0-beta.2 darwin-arm64 node-v24.13.0
+@contentstack/cli-cm-branches/2.0.0-beta.6 darwin-arm64 node-v22.13.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-export/README.md

@@ -48,7 +48,7 @@ $ npm install -g @contentstack/cli-cm-export
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-export/2.0.0-beta.11 darwin-arm64 node-v24.13.0
+@contentstack/cli-cm-export/2.0.0-beta.16 darwin-arm64 node-v22.13.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-export/src/commands/cm/stacks/export.ts

@@ -14,6 +14,7 @@ import {
   getSessionLogPath,
   CLIProgressManager,
   clearProgressModuleSetting,
+  loadChalk,
 } from '@contentstack/cli-utilities';
 
 import { ModuleExporter } from '../../../export';
@@ -87,6 +88,7 @@ export default class ExportCommand extends Command {
   };
 
   async run(): Promise<void> {
+    await loadChalk();
     let exportDir: string = pathValidator('logs');
     try {
       const { flags } = await this.parse(ExportCommand);
@@ -103,9 +105,7 @@ export default class ExportCommand extends Command {
       const moduleExporter = new ModuleExporter(managementAPIClient, exportConfig);
       await moduleExporter.start();
       const sessionLogPath = getSessionLogPath();
-      log.success(
-        `The content of the stack ${exportConfig.apiKey} has been exported successfully!`,
-      );
+      log.success(`The content of the stack ${exportConfig.apiKey} has been exported successfully!`);
       log.info(`The exported content has been stored at '${exportDir}'`, exportConfig.context);
       log.success(`The log has been stored at '${sessionLogPath}'`, exportConfig.context);
 

packages/contentstack-import/README.md

@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-import/2.0.0-beta.11 darwin-arm64 node-v24.13.0
+@contentstack/cli-cm-import/2.0.0-beta.16 darwin-arm64 node-v22.13.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

packages/contentstack-import/test/unit/import/module-importer.test.ts

@@ -3,7 +3,6 @@ import sinon from 'sinon';
 import { ImportConfig, Modules } from '../../../src/types';
 import { configHandler } from '@contentstack/cli-utilities';
 import ModuleImporter from '../../../src/import/module-importer';
-import * as utilsModule from '../../../src/utils';
 
 describe('ModuleImporter', () => {
   let moduleImporter: ModuleImporter;
@@ -94,12 +93,11 @@ describe('ModuleImporter', () => {
     const backupHandlerModule = require('../../../src/utils/backup-handler');
     backupHandlerStub = sandbox.stub(backupHandlerModule, 'default').resolves('/test/backup');
 
-    // Stub on the same `../utils` barrel ModuleImporter imports from — stubbing `common-helper`
-    // directly can miss the binding CI uses (re-exports), so the real `masterLocalDetails` runs.
-    masterLocalDetailsStub = sandbox.stub(utilsModule, 'masterLocalDetails').resolves({ code: 'en-us' });
-
-    const sanitizeStackModule = require('../../../src/utils/common-helper');
-    sanitizeStackStub = sandbox.stub(sanitizeStackModule, 'sanitizeStack').resolves();
+    // Stub on `common-helper`: ts-node emits `export *` on the utils barrel as non-configurable getters,
+    // which Sinon cannot stub; the barrel getters forward to the same live binding as common-helper.
+    const commonHelperModule = require('../../../src/utils/common-helper');
+    masterLocalDetailsStub = sandbox.stub(commonHelperModule, 'masterLocalDetails').resolves({ code: 'en-us' });
+    sanitizeStackStub = sandbox.stub(commonHelperModule, 'sanitizeStack').resolves();
 
     const setupBranchModule = require('../../../src/utils/setup-branch');
     setupBranchConfigStub = sandbox.stub(setupBranchModule, 'setupBranchConfig').resolves();