@contentstack/cli-cm-import 1.30.2 → 1.31.1

package/README.md

@@ -47,7 +47,7 @@ $ npm install -g @contentstack/cli-cm-import
 $ csdx COMMAND
 running command...
 $ csdx (--version)
-@contentstack/cli-cm-import/1.30.2 linux-x64 node-v22.21.1
+@contentstack/cli-cm-import/1.31.1 linux-x64 node-v22.21.1
 $ csdx --help [COMMAND]
 USAGE
   $ csdx COMMAND

package/lib/config/index.js

@@ -33,6 +33,7 @@ const config = {
             'stack',
             'assets',
             'taxonomies',
+            'composable-studio',
             'extensions',
             'marketplace-apps',
             'global-fields',
@@ -44,7 +45,6 @@ const config = {
             'variant-entries',
             'labels',
             'webhooks',
-            'composable-studio',
         ],
         locales: {
             dirName: 'locales',

package/lib/import/modules/composable-studio.d.ts

@@ -7,6 +7,7 @@ export default class ImportComposableStudio {
     private apiClient;
     private envUidMapperPath;
     private envUidMapper;
+    private projectMapperPath;
     constructor({ importConfig }: ModuleClassParams);
     /**
      * Entry point for Studio import

package/lib/import/modules/composable-studio.js

@@ -12,6 +12,7 @@ class ImportComposableStudio {
         this.composableStudioConfig = importConfig.modules['composable-studio'];
         // Setup paths
         this.composableStudioPath = (0, node_path_1.join)(this.importConfig.backupDir, this.composableStudioConfig.dirName);
+        this.projectMapperPath = (0, node_path_1.join)(this.importConfig.backupDir, 'mapper', this.composableStudioConfig.dirName);
         this.composableStudioFilePath = (0, node_path_1.join)(this.composableStudioPath, this.composableStudioConfig.fileName);
         this.envUidMapperPath = (0, node_path_1.join)(this.importConfig.backupDir, 'mapper', 'environments', 'uid-mapping.json');
         this.envUidMapper = {};
@@ -179,6 +180,12 @@ class ImportComposableStudio {
             if (response.status >= 200 && response.status < 300) {
                 projectCreated = true;
                 cli_utilities_1.log.debug(`Project created successfully with UID: ${(_c = response.data) === null || _c === void 0 ? void 0 : _c.uid}`, this.importConfig.context);
+                // Create mapper directory if it doesn't exist
+                await utils_1.fsUtil.makeDirectory(this.projectMapperPath);
+                // write the project to file
+                const projectFileSuccessPath = (0, node_path_1.join)(this.projectMapperPath, this.composableStudioConfig.fileName);
+                utils_1.fsUtil.writeFile(projectFileSuccessPath, response.data);
+                cli_utilities_1.log.debug(`Project written to: ${projectFileSuccessPath}`, this.importConfig.context);
             }
             else {
                 throw new Error(`API call failed with status ${response.status}: ${JSON.stringify(response.data)}`);

package/lib/import/modules/content-types.d.ts

@@ -34,6 +34,8 @@ export default class ContentTypesImport extends BaseClass {
     taxonomies: Record<string, unknown>;
     private extPendingPath;
     private isExtensionsUpdate;
+    private composableStudioSuccessPath;
+    private composableStudioExportPath;
     constructor({ importConfig, stackAPIClient }: ModuleClassParams);
     start(): Promise<any>;
     seedCTs(): Promise<any>;

package/lib/import/modules/content-types.js

@@ -34,6 +34,15 @@ class ContentTypesImport extends base_class_1.default {
             ['schema.json', 'true'],
             ['.DS_Store', 'true'],
         ]);
+        // Initialize composable studio paths if config exists
+        if (this.importConfig.modules['composable-studio']) {
+            this.composableStudioSuccessPath = path.join((0, cli_utilities_1.sanitizePath)(this.importConfig.data), 'mapper', this.importConfig.modules['composable-studio'].dirName, this.importConfig.modules['composable-studio'].fileName);
+            this.composableStudioExportPath = path.join((0, cli_utilities_1.sanitizePath)(this.importConfig.data), this.importConfig.modules['composable-studio'].dirName, this.importConfig.modules['composable-studio'].fileName);
+        }
+        else {
+            this.composableStudioSuccessPath = '';
+            this.composableStudioExportPath = '';
+        }
         this.cTs = [];
         this.createdCTs = [];
         this.titleToUIdMap = new Map();
@@ -59,6 +68,28 @@ class ContentTypesImport extends base_class_1.default {
             return;
         }
         cli_utilities_1.log.debug(`Found ${this.cTs.length} content types to import`, this.importConfig.context);
+        // If success file doesn't exist but export file does, skip the composition content type
+        // Only check if composable studio paths are configured
+        if (this.composableStudioSuccessPath &&
+            this.composableStudioExportPath &&
+            !utils_1.fileHelper.fileExistsSync(this.composableStudioSuccessPath) &&
+            utils_1.fileHelper.fileExistsSync(this.composableStudioExportPath)) {
+            const exportedProject = utils_1.fileHelper.readFileSync(this.composableStudioExportPath);
+            if (exportedProject === null || exportedProject === void 0 ? void 0 : exportedProject.contentTypeUid) {
+                const originalCount = this.cTs.length;
+                this.cTs = this.cTs.filter((ct) => {
+                    const shouldSkip = ct.uid === exportedProject.contentTypeUid;
+                    if (shouldSkip) {
+                        cli_utilities_1.log.info(`Skipping content type '${ct.uid}' as Composable Studio project was not created successfully`, this.importConfig.context);
+                    }
+                    return !shouldSkip;
+                });
+                const skippedCount = originalCount - this.cTs.length;
+                if (skippedCount > 0) {
+                    cli_utilities_1.log.debug(`Filtered out ${skippedCount} composition content type(s) from import`, this.importConfig.context);
+                }
+            }
+        }
         await utils_1.fsUtil.makeDirectory(this.cTsMapperPath);
         cli_utilities_1.log.debug('Created content types mapper directory.', this.importConfig.context);
         this.installedExtensions = (utils_1.fsUtil.readFile(this.marketplaceAppMapperPath) || { extension_uid: {} }).extension_uid;

package/lib/import/modules/entries.d.ts

@@ -38,6 +38,8 @@ export default class EntriesImport extends BaseClass {
         locale: string;
         entry_uid: string;
     }>;
+    private composableStudioSuccessPath;
+    private composableStudioExportPath;
     constructor({ importConfig, stackAPIClient }: ModuleClassParams);
     start(): Promise<any>;
     /**

package/lib/import/modules/entries.js

@@ -31,6 +31,15 @@ class EntriesImport extends base_class_1.default {
         this.entriesPath = path.resolve((0, cli_utilities_1.sanitizePath)(importConfig.data), (0, cli_utilities_1.sanitizePath)(this.entriesConfig.dirName));
         this.cTsPath = path.resolve((0, cli_utilities_1.sanitizePath)(importConfig.data), (0, cli_utilities_1.sanitizePath)(importConfig.modules['content-types'].dirName));
         this.localesPath = path.resolve((0, cli_utilities_1.sanitizePath)(importConfig.data), (0, cli_utilities_1.sanitizePath)(importConfig.modules.locales.dirName), (0, cli_utilities_1.sanitizePath)(importConfig.modules.locales.fileName));
+        // Initialize composable studio paths if config exists
+        if (this.importConfig.modules['composable-studio']) {
+            this.composableStudioSuccessPath = path.join((0, cli_utilities_1.sanitizePath)(this.importConfig.data), 'mapper', this.importConfig.modules['composable-studio'].dirName, this.importConfig.modules['composable-studio'].fileName);
+            this.composableStudioExportPath = path.join((0, cli_utilities_1.sanitizePath)(this.importConfig.data), this.importConfig.modules['composable-studio'].dirName, this.importConfig.modules['composable-studio'].fileName);
+        }
+        else {
+            this.composableStudioSuccessPath = '';
+            this.composableStudioExportPath = '';
+        }
         this.importConcurrency = this.entriesConfig.importConcurrency || importConfig.importConcurrency;
         this.entriesUidMapper = {};
         this.modifiedCTs = [];
@@ -52,6 +61,28 @@ class EntriesImport extends base_class_1.default {
                 return;
             }
             cli_utilities_1.log.debug(`Found ${this.cTs.length} content types for entry import`, this.importConfig.context);
+            // If success file doesn't exist but export file does, skip the composition entries
+            // Only check if composable studio paths are configured
+            if (this.composableStudioSuccessPath &&
+                this.composableStudioExportPath &&
+                !utils_1.fileHelper.fileExistsSync(this.composableStudioSuccessPath) &&
+                utils_1.fileHelper.fileExistsSync(this.composableStudioExportPath)) {
+                const exportedProject = utils_1.fileHelper.readFileSync(this.composableStudioExportPath);
+                if (exportedProject === null || exportedProject === void 0 ? void 0 : exportedProject.contentTypeUid) {
+                    const originalCount = this.cTs.length;
+                    this.cTs = this.cTs.filter((ct) => {
+                        const shouldSkip = ct.uid === exportedProject.contentTypeUid;
+                        if (shouldSkip) {
+                            cli_utilities_1.log.info(`Skipping entries for content type '${ct.uid}' as Composable Studio project was not created successfully`, this.importConfig.context);
+                        }
+                        return !shouldSkip;
+                    });
+                    const skippedCount = originalCount - this.cTs.length;
+                    if (skippedCount > 0) {
+                        cli_utilities_1.log.debug(`Filtered out ${skippedCount} composition content type(s) from entry import`, this.importConfig.context);
+                    }
+                }
+            }
             this.installedExtensions = (utils_1.fsUtil.readFile(this.marketplaceAppMapperPath) || { extension_uid: {} }).extension_uid;
             cli_utilities_1.log.debug('Loaded installed extensions for entry processing.', this.importConfig.context);
             this.assetUidMapper = utils_1.fsUtil.readFile(this.assetUidMapperPath) || {};

package/oclif.manifest.json

@@ -212,5 +212,5 @@
       ]
     }
   },
-  "version": "1.30.2"
+  "version": "1.31.1"
 }

package/package.json

@@ -1,14 +1,14 @@
 {
   "name": "@contentstack/cli-cm-import",
   "description": "Contentstack CLI plugin to import content into stack",
-  "version": "1.30.2",
+  "version": "1.31.1",
   "author": "Contentstack",
   "bugs": "https://github.com/contentstack/cli/issues",
   "dependencies": {
-    "@contentstack/cli-audit": "~1.16.2",
+    "@contentstack/cli-audit": "~1.17.0",
     "@contentstack/cli-command": "~1.7.1",
-    "@contentstack/cli-utilities": "~1.16.0",
-    "@contentstack/management": "~1.22.0",
+    "@contentstack/cli-utilities": "~1.16.1",
+    "@contentstack/management": "~1.27.3",
     "@contentstack/cli-variants": "~1.3.6",
     "@oclif/core": "^4.3.0",
     "big-json": "^3.2.0",