@kontent-ai/migration-toolkit 2.1.1 → 2.2.1

package/lib/import/importers/workflow-importer.ts

@@ -1,13 +1,15 @@
-import { ManagementClient, SharedModels, WorkflowModels } from '@kontent-ai/management-sdk';
+import { LanguageVariantModels, ManagementClient, SharedModels, WorkflowModels } from '@kontent-ai/management-sdk';
+import { match } from 'ts-pattern';
 import {
     Logger,
-    runMapiRequestAsync,
     LogSpinnerData,
     MigrationItem,
+    MigrationItemVersion,
+    runMapiRequestAsync,
+    ShortestPathResult,
     workflowHelper as workflowHelperInit,
-    MigrationItemVersion
+    WorkflowStep
 } from '../../core/index.js';
-import { match } from 'ts-pattern';
 
 export function workflowImporter(config: {
     readonly logger: Logger;
@@ -19,6 +21,9 @@ export function workflowImporter(config: {
     const publishLanguageVariantAsync = async (data: {
         readonly logSpinner: LogSpinnerData;
         readonly migrationItem: MigrationItem;
+        readonly languageVariant: Readonly<LanguageVariantModels.ContentItemLanguageVariant>;
+        readonly workflowCodename: string;
+        readonly stepCodename: string;
     }): Promise<void> => {
         await runMapiRequestAsync({
             logger: config.logger,
@@ -38,6 +43,16 @@ export function workflowImporter(config: {
         });
     };
 
+    const getPreviousToPublishStep = (
+        workflow: Readonly<WorkflowModels.Workflow>,
+        variantStep: WorkflowStep,
+        publishStep: WorkflowStep
+    ): ShortestPathResult => {
+        const steps = workflowHelper.findShortestPathBetweenSteps(workflow, variantStep, publishStep);
+
+        return steps[steps.length - 2];
+    };
+
     const unpublishLanguageVariantAsync = async (data: {
         readonly logSpinner: LogSpinnerData;
         readonly migrationItem: MigrationItem;
@@ -331,12 +346,29 @@ export function workflowImporter(config: {
         readonly stepCodename: string;
         readonly migrationItem: MigrationItem;
         readonly migrationItemVersion: MigrationItemVersion;
+        readonly languageVariant: Readonly<LanguageVariantModels.ContentItemLanguageVariant>;
     }): Promise<void> => {
         return await match(data.stepCodename)
             .returnType<Promise<void>>()
             .when(
                 (stepCodename) => workflowHelper.isPublishedStepByCodename(stepCodename),
-                async () => await publishLanguageVariantAsync(data)
+                async () => {
+                    const { workflow, step: publishStep } = workflowHelper.getWorkflowAndStepByCodenames({
+                        workflowCodename: data.workflowCodename,
+                        stepCodename: data.stepCodename
+                    });
+                    const variantStep = workflowHelper.getWorkflowStepById(
+                        workflow,
+                        data.languageVariant.workflow.stepIdentifier.id as string
+                    );
+                    const previousToPublishStep = getPreviousToPublishStep(workflow, variantStep, publishStep);
+
+                    if (previousToPublishStep) {
+                        await changeWorkflowOfLanguageVariantAsync({ ...data, stepCodename: previousToPublishStep.stepCodename });
+                    }
+
+                    await publishLanguageVariantAsync(data);
+                }
             )
             .when(
                 (stepCodename) => workflowHelper.isArchivedStepByCodename(stepCodename),

package/lib/metadata.ts

@@ -1,6 +1,6 @@
 
 export const libMetadata = {
 	name: '@kontent-ai/migration-toolkit',
-    timestamp: 'Tue, 08 Oct 2024 13:54:56 GMT',
-    version: '2.1.1'
+    timestamp: 'Tue, 29 Oct 2024 12:01:52 GMT',
+    version: '2.2.1'
 };

package/lib/toolkit/export.ts

@@ -1,6 +1,6 @@
-import { libMetadata } from '../metadata.js';
 import { MigrationData, executeWithTrackingAsync } from '../core/index.js';
 import { ExportConfig, exportManager } from '../export/index.js';
+import { libMetadata } from '../metadata.js';
 
 export async function exportAsync(config: ExportConfig): Promise<MigrationData> {
     return await executeWithTrackingAsync({
@@ -16,6 +16,7 @@ export async function exportAsync(config: ExportConfig): Promise<MigrationData>
         },
         func: async () => {
             return await exportManager(config).exportAsync();
-        }
+        },
+        logger: config.logger
     });
 }

package/lib/toolkit/file.ts

@@ -38,7 +38,8 @@ export async function storeAsync(config: StoreConfig): Promise<void> {
             } else {
                 throw Error(`Cannot store '${filename}' on File system because the provided zip is not a Buffer`);
             }
-        }
+        },
+        logger: config.logger
     });
 }
 
@@ -60,6 +61,7 @@ export async function extractAsync(config: ExtractConfig): Promise<MigrationData
         func: async () => {
             const fileData = await fileManager(logger).loadFileAsync(filename);
             return await zipManager(logger).parseZipAsync(fileData);
-        }
+        },
+        logger: config.logger
     });
 }

package/lib/toolkit/import.ts

@@ -16,6 +16,7 @@ export async function importAsync(config: ImportConfig): Promise<ImportResult> {
         },
         func: async () => {
             return await importManager(config).importAsync();
-        }
+        },
+        logger: config.logger
     });
 }

package/lib/toolkit/migrate.ts

@@ -1,4 +1,3 @@
-import { libMetadata } from '../metadata.js';
 import { IRetryStrategyOptions } from '@kontent-ai/core-sdk';
 import {
     ExternalIdGenerator,
@@ -9,9 +8,10 @@ import {
     getDefaultLogger
 } from '../core/index.js';
 import { SourceExportItem } from '../export/index.js';
+import { ImportResult } from '../import/index.js';
+import { libMetadata } from '../metadata.js';
 import { exportAsync } from './export.js';
 import { importAsync } from './import.js';
-import { ImportResult } from '../import/index.js';
 
 export interface MigrationSource extends ManagementClientConfig {
     readonly items: readonly SourceExportItem[];
@@ -64,6 +64,7 @@ export async function migrateAsync(config: MigrationConfig): Promise<MigrationRe
                 importResult,
                 migrationData
             };
-        }
+        },
+        logger: config.logger
     });
 }

package/lib/translation/transforms/import-transforms.ts

@@ -97,7 +97,7 @@ export const importTransforms: Readonly<Record<MigrationElementType, ImportTrans
             element: {
                 codename: data.elementCodename
             },
-            value: data.elementData ? +data.elementData : null
+            value: data.elementData.value ? +data.elementData.value : null
         });
     },
     rich_text: (data) => {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@kontent-ai/migration-toolkit",
-    "version": "2.1.1",
+    "version": "2.2.1",
     "description": "This program can be used to import content related data into Kontent.ai from various formats. Additionally, it can also be used to export Kontent.ai data using Delivery API.",
     "preferGlobal": true,
     "private": false,
@@ -36,6 +36,7 @@
         "test:export:cli": "tsx lib/node/cli/app export --language=x --items=x --sourceEnvironmentId=x --sourceApiKey=x",
         "test:help": "tsx lib/node/cli/app --help",
         "test:help:command": "tsx lib/node/cli/app migrate --help",
+        "test:unit": "vitest run --config=vitest.config.js",
         "lint": "npx eslint lib",
         "lint:fix": "npx eslint lib --fix",
         "clean": "tsx scripts/clean.ts",
@@ -55,36 +56,37 @@
         "@kontent-ai-consulting/tools-analytics": "0.0.7",
         "@kontent-ai/management-sdk": "7.5.1",
         "browser-or-node": "3.0.0",
+        "buffer": "6.0.3",
         "bytes": "3.1.2",
         "chalk": "5.3.0",
+        "deep-equal": "2.2.3",
         "dotenv": "16.4.5",
         "jszip": "3.10.1",
         "mime": "4.0.4",
         "ora": "8.1.0",
+        "p-limit": "6.1.0",
         "prompts": "2.4.2",
+        "ts-pattern": "5.5.0",
         "yargs": "17.7.2",
-        "p-limit": "6.1.0",
-        "deep-equal": "2.2.3",
-        "zod": "3.23.8",
-        "ts-pattern": "5.4.0",
-        "buffer": "6.0.3"
+        "zod": "3.23.8"
     },
     "devDependencies": {
-        "@eslint/js": "9.12.0",
-        "@types/deep-equal": "1.0.4",
+        "@eslint/js": "9.13.0",
         "@types/browser-or-node": "1.3.2",
         "@types/bytes": "3.1.4",
+        "@types/deep-equal": "1.0.4",
         "@types/eslint__js": "8.42.3",
-        "@types/node": "22.7.5",
+        "@types/node": "22.8.2",
         "@types/prompts": "2.4.9",
         "@types/yargs": "17.0.33",
-        "@typescript-eslint/eslint-plugin": "8.8.1",
-        "@typescript-eslint/parser": "8.8.1",
-        "eslint": "9.12.0",
+        "@typescript-eslint/eslint-plugin": "8.12.1",
+        "@typescript-eslint/parser": "8.12.1",
+        "eslint": "9.13.0",
         "standard-version": "9.5.0",
-        "tslib": "2.7.0",
-        "tsx": "4.19.1",
-        "typescript": "5.6.2",
-        "typescript-eslint": "8.8.1"
+        "tslib": "2.8.0",
+        "tsx": "4.19.2",
+        "typescript": "5.6.3",
+        "typescript-eslint": "8.12.1",
+        "vitest": "2.1.4"
     }
 }