@snyk/fix 1.714.0 → 1.718.0

package/dist/plugins/python/handlers/fail-if-no-updates-applied.d.ts

@@ -0,0 +1,2 @@
+import { FixChangesSummary } from '../../../types';
+export declare function failIfNoUpdatesApplied(changes: FixChangesSummary[]): void;

package/dist/plugins/python/handlers/{ensure-has-updates.js → fail-if-no-updates-applied.js}

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ensureHasUpdates = void 0;
+exports.failIfNoUpdatesApplied = void 0;
 const debugLib = require("debug");
 const no_fixes_applied_1 = require("../../../lib/errors/no-fixes-applied");
 const attempted_changes_summary_1 = require("./attempted-changes-summary");
 const debug = debugLib('snyk-fix:python:ensure-changes-applied');
-function ensureHasUpdates(changes) {
+function failIfNoUpdatesApplied(changes) {
     if (!changes.length) {
         throw new no_fixes_applied_1.NoFixesCouldBeAppliedError();
     }
@@ -17,5 +17,5 @@ function ensureHasUpdates(changes) {
         throw new no_fixes_applied_1.NoFixesCouldBeAppliedError(reason, tip);
     }
 }
-exports.ensureHasUpdates = ensureHasUpdates;
-//# sourceMappingURL=ensure-has-updates.js.map
+exports.failIfNoUpdatesApplied = failIfNoUpdatesApplied;
+//# sourceMappingURL=fail-if-no-updates-applied.js.map

package/dist/plugins/python/handlers/fail-if-no-updates-applied.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fail-if-no-updates-applied.js","sourceRoot":"","sources":["../../../../src/plugins/python/handlers/fail-if-no-updates-applied.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAElC,2EAAkF;AAElF,2EAAiE;AAEjE,MAAM,KAAK,GAAG,QAAQ,CAAC,wCAAwC,CAAC,CAAC;AAEjE,SAAgB,sBAAsB,CAAC,OAA4B;IACjE,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACnB,MAAM,IAAI,6CAA0B,EAAE,CAAC;KACxC;IACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,8CAAkB,CAAC,CAAC,CAAC,CAAC,EAAE;QAC/C,KAAK,CAAC,qDAAqD,CAAC,CAAC;QAC7D,6EAA6E;QAC7E,QAAQ;QACR,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,CAAoB,CAAC;QACtD,MAAM,IAAI,6CAA0B,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KACnD;AACH,CAAC;AAXD,wDAWC"}

package/dist/plugins/python/handlers/pipenv-pipfile/update-dependencies/generate-upgrades.d.ts

@@ -0,0 +1,4 @@
+import { EntityToFix } from '../../../../../types';
+export declare function generateUpgrades(entity: EntityToFix): {
+    upgrades: string[];
+};

package/dist/plugins/python/handlers/pipenv-pipfile/update-dependencies/generate-upgrades.js

@@ -0,0 +1,19 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateUpgrades = void 0;
+const standardize_package_name_1 = require("../../../standardize-package-name");
+const validate_required_data_1 = require("../../validate-required-data");
+function generateUpgrades(entity) {
+    const { remediation } = validate_required_data_1.validateRequiredData(entity);
+    const { pin: pins } = remediation;
+    const upgrades = [];
+    for (const pkgAtVersion of Object.keys(pins)) {
+        const pin = pins[pkgAtVersion];
+        const newVersion = pin.upgradeTo.split('@')[1];
+        const [pkgName] = pkgAtVersion.split('@');
+        upgrades.push(`${standardize_package_name_1.standardizePackageName(pkgName)}==${newVersion}`);
+    }
+    return { upgrades };
+}
+exports.generateUpgrades = generateUpgrades;
+//# sourceMappingURL=generate-upgrades.js.map

package/dist/plugins/python/handlers/pipenv-pipfile/update-dependencies/generate-upgrades.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate-upgrades.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/pipenv-pipfile/update-dependencies/generate-upgrades.ts"],"names":[],"mappings":";;;AACA,gFAA2E;AAC3E,yEAAoE;AAEpE,SAAgB,gBAAgB,CAAC,MAAmB;IAClD,MAAM,EAAE,WAAW,EAAE,GAAG,6CAAoB,CAAC,MAAM,CAAC,CAAC;IACrD,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;IAElC,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/B,MAAM,UAAU,GAAG,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,MAAM,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1C,QAAQ,CAAC,IAAI,CAAC,GAAG,iDAAsB,CAAC,OAAO,CAAC,KAAK,UAAU,EAAE,CAAC,CAAC;KACpE;IACD,OAAO,EAAE,QAAQ,EAAE,CAAC;AACtB,CAAC;AAZD,4CAYC"}

package/dist/plugins/python/handlers/pipenv-pipfile/update-dependencies/index.d.ts

@@ -1,6 +1,3 @@
 import { PluginFixResponse } from '../../../../types';
 import { EntityToFix, FixOptions } from '../../../../../types';
 export declare function updateDependencies(entity: EntityToFix, options: FixOptions): Promise<PluginFixResponse>;
-export declare function generateUpgrades(entity: EntityToFix): {
-    upgrades: string[];
-};

package/dist/plugins/python/handlers/pipenv-pipfile/update-dependencies/index.js

@@ -1,43 +1,32 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateUpgrades = exports.updateDependencies = void 0;
+exports.updateDependencies = void 0;
 const debugLib = require("debug");
+const fail_if_no_updates_applied_1 = require("../../fail-if-no-updates-applied");
 const no_fixes_applied_1 = require("../../../../../lib/errors/no-fixes-applied");
-const standardize_package_name_1 = require("../../../standardize-package-name");
-const validate_required_data_1 = require("../../validate-required-data");
-const ensure_has_updates_1 = require("../../ensure-has-updates");
+const generate_upgrades_1 = require("./generate-upgrades");
 const pipenv_add_1 = require("./pipenv-add");
 const debug = debugLib('snyk-fix:python:Pipfile');
+function chooseFixStrategy(options) {
+    return options.sequentialFix ? fixSequentially : fixAll;
+}
 async function updateDependencies(entity, options) {
-    const handlerResult = await fixAll(entity, options);
+    const handlerResult = await chooseFixStrategy(options)(entity, options);
     return handlerResult;
 }
 exports.updateDependencies = updateDependencies;
-function generateUpgrades(entity) {
-    const { remediation } = validate_required_data_1.validateRequiredData(entity);
-    const { pin: pins } = remediation;
-    const upgrades = [];
-    for (const pkgAtVersion of Object.keys(pins)) {
-        const pin = pins[pkgAtVersion];
-        const newVersion = pin.upgradeTo.split('@')[1];
-        const [pkgName] = pkgAtVersion.split('@');
-        upgrades.push(`${standardize_package_name_1.standardizePackageName(pkgName)}==${newVersion}`);
-    }
-    return { upgrades };
-}
-exports.generateUpgrades = generateUpgrades;
 async function fixAll(entity, options) {
     const handlerResult = {
         succeeded: [],
         failed: [],
         skipped: [],
     };
-    const { upgrades } = await generateUpgrades(entity);
-    if (!upgrades.length) {
-        throw new no_fixes_applied_1.NoFixesCouldBeAppliedError('Failed to calculate package updates to apply');
-    }
     const changes = [];
     try {
+        const { upgrades } = await generate_upgrades_1.generateUpgrades(entity);
+        if (!upgrades.length) {
+            throw new no_fixes_applied_1.NoFixesCouldBeAppliedError('Failed to calculate package updates to apply');
+        }
         // TODO: for better support we need to:
         // 1. parse the manifest and extract original requirements, version spec etc
         // 2. swap out only the version and retain original spec
@@ -47,7 +36,7 @@ async function fixAll(entity, options) {
         if (upgrades.length) {
             changes.push(...(await pipenv_add_1.pipenvAdd(entity, options, upgrades)));
         }
-        ensure_has_updates_1.ensureHasUpdates(changes);
+        fail_if_no_updates_applied_1.failIfNoUpdatesApplied(changes);
         handlerResult.succeeded.push({
             original: entity,
             changes,
@@ -63,4 +52,44 @@ async function fixAll(entity, options) {
     }
     return handlerResult;
 }
+async function fixSequentially(entity, options) {
+    const handlerResult = {
+        succeeded: [],
+        failed: [],
+        skipped: [],
+    };
+    const { upgrades } = await generate_upgrades_1.generateUpgrades(entity);
+    // TODO: for better support we need to:
+    // 1. parse the manifest and extract original requirements, version spec etc
+    // 2. swap out only the version and retain original spec
+    // 3. re-lock the lockfile
+    // at the moment we do not parse Pipfile and therefore can't tell the difference
+    // between prod & dev updates
+    const changes = [];
+    try {
+        if (!upgrades.length) {
+            throw new no_fixes_applied_1.NoFixesCouldBeAppliedError('Failed to calculate package updates to apply');
+        }
+        // update prod dependencies first
+        if (upgrades.length) {
+            for (const upgrade of upgrades) {
+                changes.push(...(await pipenv_add_1.pipenvAdd(entity, options, [upgrade])));
+            }
+        }
+        fail_if_no_updates_applied_1.failIfNoUpdatesApplied(changes);
+        handlerResult.succeeded.push({
+            original: entity,
+            changes,
+        });
+    }
+    catch (error) {
+        debug(`Failed to fix ${entity.scanResult.identity.targetFile}.\nERROR: ${error}`);
+        handlerResult.failed.push({
+            original: entity,
+            tip: error.tip,
+            error,
+        });
+    }
+    return handlerResult;
+}
 //# sourceMappingURL=index.js.map

package/dist/plugins/python/handlers/pipenv-pipfile/update-dependencies/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/pipenv-pipfile/update-dependencies/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAQlC,iFAAwF;AACxF,gFAA2E;AAC3E,yEAAoE;AAEpE,iEAA4D;AAC5D,6CAAyC;AAEzC,MAAM,KAAK,GAAG,QAAQ,CAAC,yBAAyB,CAAC,CAAC;AAE3C,KAAK,UAAU,kBAAkB,CACtC,MAAmB,EACnB,OAAmB;IAEnB,MAAM,aAAa,GAAG,MAAM,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACpD,OAAO,aAAa,CAAC;AACvB,CAAC;AAND,gDAMC;AAED,SAAgB,gBAAgB,CAAC,MAAmB;IAClD,MAAM,EAAE,WAAW,EAAE,GAAG,6CAAoB,CAAC,MAAM,CAAC,CAAC;IACrD,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,WAAW,CAAC;IAElC,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/B,MAAM,UAAU,GAAG,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,MAAM,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC1C,QAAQ,CAAC,IAAI,CAAC,GAAG,iDAAsB,CAAC,OAAO,CAAC,KAAK,UAAU,EAAE,CAAC,CAAC;KACpE;IACD,OAAO,EAAE,QAAQ,EAAE,CAAC;AACtB,CAAC;AAZD,4CAYC;AAED,KAAK,UAAU,MAAM,CACnB,MAAmB,EACnB,OAAmB;IAEnB,MAAM,aAAa,GAAsB;QACvC,SAAS,EAAE,EAAE;QACb,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,EAAE;KACZ,CAAC;IACF,MAAM,EAAE,QAAQ,EAAE,GAAG,MAAM,gBAAgB,CAAC,MAAM,CAAC,CAAC;IACpD,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE;QACpB,MAAM,IAAI,6CAA0B,CAClC,8CAA8C,CAC/C,CAAC;KACH;IACD,MAAM,OAAO,GAAwB,EAAE,CAAC;IACxC,IAAI;QACF,uCAAuC;QACvC,4EAA4E;QAC5E,wDAAwD;QACxD,0BAA0B;QAC1B,mFAAmF;QACnF,iCAAiC;QACjC,IAAI,QAAQ,CAAC,MAAM,EAAE;YACnB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,sBAAS,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;SAC/D;QAED,qCAAgB,CAAC,OAAO,CAAC,CAAC;QAC1B,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC;YAC3B,QAAQ,EAAE,MAAM;YAChB,OAAO;SACR,CAAC,CAAC;KACJ;IAAC,OAAO,KAAK,EAAE;QACd,KAAK,CACH,iBAAiB,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,aAAa,KAAK,EAAE,CAC3E,CAAC;QACF,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC;YACxB,QAAQ,EAAE,MAAM;YAChB,KAAK;YACL,GAAG,EAAE,KAAK,CAAC,GAAG;SACf,CAAC,CAAC;KACJ;IACD,OAAO,aAAa,CAAC;AACvB,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/pipenv-pipfile/update-dependencies/index.ts"],"names":[],"mappings":"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"}

package/dist/plugins/python/handlers/poetry/update-dependencies/generate-upgrades.d.ts

@@ -0,0 +1,5 @@
+import { EntityToFix } from '../../../../../types';
+export declare function generateUpgrades(entity: EntityToFix): Promise<{
+    upgrades: string[];
+    devUpgrades: string[];
+}>;

package/dist/plugins/python/handlers/poetry/update-dependencies/generate-upgrades.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.generateUpgrades = void 0;
+const pathLib = require("path");
+const toml = require("toml");
+const debugLib = require("debug");
+const validate_required_data_1 = require("../../validate-required-data");
+const standardize_package_name_1 = require("../../../standardize-package-name");
+const debug = debugLib('snyk-fix:python:Poetry');
+async function generateUpgrades(entity) {
+    var _a, _b;
+    const { remediation, targetFile } = validate_required_data_1.validateRequiredData(entity);
+    const pins = remediation.pin;
+    const targetFilePath = pathLib.resolve(entity.workspace.path, targetFile);
+    const { dir } = pathLib.parse(targetFilePath);
+    const pyProjectTomlRaw = await entity.workspace.readFile(pathLib.resolve(dir, 'pyproject.toml'));
+    const pyProjectToml = toml.parse(pyProjectTomlRaw);
+    const prodTopLevelDeps = Object.keys((_a = pyProjectToml.tool.poetry.dependencies) !== null && _a !== void 0 ? _a : {}).map((dep) => standardize_package_name_1.standardizePackageName(dep));
+    const devTopLevelDeps = Object.keys((_b = pyProjectToml.tool.poetry['dev-dependencies']) !== null && _b !== void 0 ? _b : {}).map((dep) => standardize_package_name_1.standardizePackageName(dep));
+    const upgrades = [];
+    const devUpgrades = [];
+    for (const pkgAtVersion of Object.keys(pins)) {
+        const pin = pins[pkgAtVersion];
+        const newVersion = pin.upgradeTo.split('@')[1];
+        const [pkgName] = pkgAtVersion.split('@');
+        const upgrade = `${standardize_package_name_1.standardizePackageName(pkgName)}==${newVersion}`;
+        if (pin.isTransitive || prodTopLevelDeps.includes(pkgName)) {
+            // transitive and it could have come from a dev or prod dep
+            // since we can't tell right now let be pinned into production deps
+            upgrades.push(upgrade);
+        }
+        else if (prodTopLevelDeps.includes(pkgName)) {
+            upgrades.push(upgrade);
+        }
+        else if (entity.options.dev && devTopLevelDeps.includes(pkgName)) {
+            devUpgrades.push(upgrade);
+        }
+        else {
+            debug(`Could not determine what type of upgrade ${upgrade} is. When choosing between: transitive upgrade, production or dev direct upgrade. `);
+        }
+    }
+    return { upgrades, devUpgrades };
+}
+exports.generateUpgrades = generateUpgrades;
+//# sourceMappingURL=generate-upgrades.js.map

package/dist/plugins/python/handlers/poetry/update-dependencies/generate-upgrades.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"generate-upgrades.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/poetry/update-dependencies/generate-upgrades.ts"],"names":[],"mappings":";;;AAAA,gCAAgC;AAChC,6BAA6B;AAE7B,kCAAkC;AAIlC,yEAAoE;AACpE,gFAA2E;AAE3E,MAAM,KAAK,GAAG,QAAQ,CAAC,wBAAwB,CAAC,CAAC;AAe1C,KAAK,UAAU,gBAAgB,CACpC,MAAmB;;IAEnB,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,6CAAoB,CAAC,MAAM,CAAC,CAAC;IACjE,MAAM,IAAI,GAAG,WAAW,CAAC,GAAG,CAAC;IAE7B,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;IAC1E,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;IAC9C,MAAM,gBAAgB,GAAG,MAAM,MAAM,CAAC,SAAS,CAAC,QAAQ,CACtD,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,gBAAgB,CAAC,CACvC,CAAC;IACF,MAAM,aAAa,GAAkB,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAElE,MAAM,gBAAgB,GAAG,MAAM,CAAC,IAAI,OAClC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,mCAAI,EAAE,CAC7C,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,iDAAsB,CAAC,GAAG,CAAC,CAAC,CAAC;IAC5C,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,OACjC,aAAa,CAAC,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,mCAAI,EAAE,CACpD,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,iDAAsB,CAAC,GAAG,CAAC,CAAC,CAAC;IAE5C,MAAM,QAAQ,GAAa,EAAE,CAAC;IAC9B,MAAM,WAAW,GAAa,EAAE,CAAC;IACjC,KAAK,MAAM,YAAY,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QAC5C,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,CAAC,CAAC;QAC/B,MAAM,UAAU,GAAG,GAAG,CAAC,SAAS,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/C,MAAM,CAAC,OAAO,CAAC,GAAG,YAAY,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE1C,MAAM,OAAO,GAAG,GAAG,iDAAsB,CAAC,OAAO,CAAC,KAAK,UAAU,EAAE,CAAC;QAEpE,IAAI,GAAG,CAAC,YAAY,IAAI,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YAC1D,2DAA2D;YAC3D,mEAAmE;YACnE,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACxB;aAAM,IAAI,gBAAgB,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YAC7C,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SACxB;aAAM,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,IAAI,eAAe,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE;YAClE,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;SAC3B;aAAM;YACL,KAAK,CACH,4CAA4C,OAAO,oFAAoF,CACxI,CAAC;SACH;KACF;IACD,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;AACnC,CAAC;AA5CD,4CA4CC"}

package/dist/plugins/python/handlers/poetry/update-dependencies/index.d.ts

@@ -1,7 +1,3 @@
 import { PluginFixResponse } from '../../../../types';
 import { EntityToFix, FixOptions } from '../../../../../types';
 export declare function updateDependencies(entity: EntityToFix, options: FixOptions): Promise<PluginFixResponse>;
-export declare function generateUpgrades(entity: EntityToFix): Promise<{
-    upgrades: string[];
-    devUpgrades: string[];
-}>;

package/dist/plugins/python/handlers/poetry/update-dependencies/index.js

@@ -1,100 +1,46 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateUpgrades = exports.updateDependencies = void 0;
-const pathLib = require("path");
-const toml = require("toml");
+exports.updateDependencies = void 0;
 const debugLib = require("debug");
-const poetryFix = require("@snyk/fix-poetry");
+const generate_upgrades_1 = require("./generate-upgrades");
+const poetry_add_1 = require("./poetry-add");
 const no_fixes_applied_1 = require("../../../../../lib/errors/no-fixes-applied");
-const command_failed_to_run_error_1 = require("../../../../../lib/errors/command-failed-to-run-error");
-const validate_required_data_1 = require("../../validate-required-data");
-const standardize_package_name_1 = require("../../../standardize-package-name");
-const attempted_changes_summary_1 = require("../../attempted-changes-summary");
-const ensure_has_updates_1 = require("../../ensure-has-updates");
+const fail_if_no_updates_applied_1 = require("../../fail-if-no-updates-applied");
 const debug = debugLib('snyk-fix:python:Poetry');
+function chooseFixStrategy(options) {
+    return options.sequentialFix ? fixSequentially : fixAll;
+}
 async function updateDependencies(entity, options) {
-    const handlerResult = await fixAll(entity, options);
+    const handlerResult = await chooseFixStrategy(options)(entity, options);
     return handlerResult;
 }
 exports.updateDependencies = updateDependencies;
-async function generateUpgrades(entity) {
-    var _a, _b;
-    const { remediation, targetFile } = validate_required_data_1.validateRequiredData(entity);
-    const pins = remediation.pin;
-    const targetFilePath = pathLib.resolve(entity.workspace.path, targetFile);
-    const { dir } = pathLib.parse(targetFilePath);
-    const pyProjectTomlRaw = await entity.workspace.readFile(pathLib.resolve(dir, 'pyproject.toml'));
-    const pyProjectToml = toml.parse(pyProjectTomlRaw);
-    const prodTopLevelDeps = Object.keys((_a = pyProjectToml.tool.poetry.dependencies) !== null && _a !== void 0 ? _a : {}).map((dep) => standardize_package_name_1.standardizePackageName(dep));
-    const devTopLevelDeps = Object.keys((_b = pyProjectToml.tool.poetry['dev-dependencies']) !== null && _b !== void 0 ? _b : {}).map((dep) => standardize_package_name_1.standardizePackageName(dep));
-    const upgrades = [];
-    const devUpgrades = [];
-    for (const pkgAtVersion of Object.keys(pins)) {
-        const pin = pins[pkgAtVersion];
-        const newVersion = pin.upgradeTo.split('@')[1];
-        const [pkgName] = pkgAtVersion.split('@');
-        const upgrade = `${standardize_package_name_1.standardizePackageName(pkgName)}==${newVersion}`;
-        if (pin.isTransitive || prodTopLevelDeps.includes(pkgName)) {
-            // transitive and it could have come from a dev or prod dep
-            // since we can't tell right now let be pinned into production deps
-            upgrades.push(upgrade);
-        }
-        else if (prodTopLevelDeps.includes(pkgName)) {
-            upgrades.push(upgrade);
-        }
-        else if (entity.options.dev && devTopLevelDeps.includes(pkgName)) {
-            devUpgrades.push(upgrade);
-        }
-        else {
-            debug(`Could not determine what type of upgrade ${upgrade} is. When choosing between: transitive upgrade, production or dev direct upgrade. `);
-        }
-    }
-    return { upgrades, devUpgrades };
-}
-exports.generateUpgrades = generateUpgrades;
-function throwPoetryError(stderr, command) {
-    const ALREADY_UP_TO_DATE = 'No dependencies to install or update';
-    const INCOMPATIBLE_PYTHON = new RegExp(/Python requirement (.*) is not compatible/g, 'gm');
-    const SOLVER_PROBLEM = /SolverProblemError(.* version solving failed)/gms;
-    const incompatiblePythonError = INCOMPATIBLE_PYTHON.exec(stderr);
-    if (incompatiblePythonError) {
-        throw new command_failed_to_run_error_1.CommandFailedError(`The current project's Python requirement ${incompatiblePythonError[1]} is not compatible with some of the required packages`, command);
-    }
-    const solverProblemError = SOLVER_PROBLEM.exec(stderr);
-    if (solverProblemError) {
-        throw new command_failed_to_run_error_1.CommandFailedError(solverProblemError[0].trim(), command);
-    }
-    if (stderr.includes(ALREADY_UP_TO_DATE)) {
-        throw new command_failed_to_run_error_1.CommandFailedError('No dependencies could be updated as they seem to be at the correct versions. Make sure installed dependencies in the environment match those in the lockfile by running `poetry update`', command);
-    }
-    throw new no_fixes_applied_1.NoFixesCouldBeAppliedError();
-}
 async function fixAll(entity, options) {
     const handlerResult = {
         succeeded: [],
         failed: [],
         skipped: [],
     };
-    const { upgrades, devUpgrades } = await generateUpgrades(entity);
-    if (![...upgrades, ...devUpgrades].length) {
-        throw new no_fixes_applied_1.NoFixesCouldBeAppliedError('Failed to calculate package updates to apply');
-    }
+    const { upgrades, devUpgrades } = await generate_upgrades_1.generateUpgrades(entity);
     // TODO: for better support we need to:
     // 1. parse the manifest and extract original requirements, version spec etc
     // 2. swap out only the version and retain original spec
     // 3. re-lock the lockfile
     const changes = [];
     try {
+        if (![...upgrades, ...devUpgrades].length) {
+            throw new no_fixes_applied_1.NoFixesCouldBeAppliedError('Failed to calculate package updates to apply');
+        }
         // update prod dependencies first
         if (upgrades.length) {
-            changes.push(...(await poetryAdd(entity, options, upgrades)));
+            changes.push(...(await poetry_add_1.poetryAdd(entity, options, upgrades)));
         }
         // update dev dependencies second
         if (devUpgrades.length) {
             const installDev = true;
-            changes.push(...(await poetryAdd(entity, options, devUpgrades, installDev)));
+            changes.push(...(await poetry_add_1.poetryAdd(entity, options, devUpgrades, installDev)));
         }
-        ensure_has_updates_1.ensureHasUpdates(changes);
+        fail_if_no_updates_applied_1.failIfNoUpdatesApplied(changes);
         handlerResult.succeeded.push({
             original: entity,
             changes,
@@ -110,29 +56,49 @@ async function fixAll(entity, options) {
     }
     return handlerResult;
 }
-async function poetryAdd(entity, options, upgrades, dev) {
-    var _a;
+async function fixSequentially(entity, options) {
+    const handlerResult = {
+        succeeded: [],
+        failed: [],
+        skipped: [],
+    };
+    const { upgrades, devUpgrades } = await generate_upgrades_1.generateUpgrades(entity);
+    // TODO: for better support we need to:
+    // 1. parse the manifest and extract original requirements, version spec etc
+    // 2. swap out only the version and retain original spec
+    // 3. re-lock the lockfile
     const changes = [];
-    let poetryCommand;
-    const { remediation, targetFile } = validate_required_data_1.validateRequiredData(entity);
     try {
-        const targetFilePath = pathLib.resolve(entity.workspace.path, targetFile);
-        const { dir } = pathLib.parse(targetFilePath);
-        if (!options.dryRun && upgrades.length) {
-            const res = await poetryFix.poetryAdd(dir, upgrades, {
-                dev,
-                python: (_a = entity.options.command) !== null && _a !== void 0 ? _a : undefined,
-            });
-            if (res.exitCode !== 0) {
-                poetryCommand = res.command;
-                throwPoetryError(res.stderr ? res.stderr : res.stdout, res.command);
+        if (![...upgrades, ...devUpgrades].length) {
+            throw new no_fixes_applied_1.NoFixesCouldBeAppliedError('Failed to calculate package updates to apply');
+        }
+        // update prod dependencies first
+        if (upgrades.length) {
+            for (const upgrade of upgrades) {
+                changes.push(...(await poetry_add_1.poetryAdd(entity, options, [upgrade])));
             }
         }
-        changes.push(...attempted_changes_summary_1.generateSuccessfulChanges(upgrades, remediation.pin));
+        // update dev dependencies second
+        if (devUpgrades.length) {
+            for (const upgrade of devUpgrades) {
+                const installDev = true;
+                changes.push(...(await poetry_add_1.poetryAdd(entity, options, [upgrade], installDev)));
+            }
+        }
+        fail_if_no_updates_applied_1.failIfNoUpdatesApplied(changes);
+        handlerResult.succeeded.push({
+            original: entity,
+            changes,
+        });
     }
     catch (error) {
-        changes.push(...attempted_changes_summary_1.generateFailedChanges(upgrades, remediation.pin, error, poetryCommand));
+        debug(`Failed to fix ${entity.scanResult.identity.targetFile}.\nERROR: ${error}`);
+        handlerResult.failed.push({
+            original: entity,
+            tip: error.tip,
+            error,
+        });
     }
-    return changes;
+    return handlerResult;
 }
 //# sourceMappingURL=index.js.map

package/dist/plugins/python/handlers/poetry/update-dependencies/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/poetry/update-dependencies/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/poetry/update-dependencies/index.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAQlC,2DAAuD;AACvD,6CAAyC;AACzC,iFAAwF;AACxF,iFAA0E;AAE1E,MAAM,KAAK,GAAG,QAAQ,CAAC,wBAAwB,CAAC,CAAC;AAEjD,SAAS,iBAAiB,CAAC,OAAmB;IAC5C,OAAO,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,MAAM,CAAC;AAC1D,CAAC;AAEM,KAAK,UAAU,kBAAkB,CACtC,MAAmB,EACnB,OAAmB;IAEnB,MAAM,aAAa,GAAG,MAAM,iBAAiB,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IACxE,OAAO,aAAa,CAAC;AACvB,CAAC;AAND,gDAMC;AAED,KAAK,UAAU,MAAM,CACnB,MAAmB,EACnB,OAAmB;IAEnB,MAAM,aAAa,GAAsB;QACvC,SAAS,EAAE,EAAE;QACb,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,EAAE;KACZ,CAAC;IACF,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,MAAM,oCAAgB,CAAC,MAAM,CAAC,CAAC;IAEjE,uCAAuC;IACvC,4EAA4E;IAC5E,wDAAwD;IACxD,0BAA0B;IAC1B,MAAM,OAAO,GAAwB,EAAE,CAAC;IACxC,IAAI;QACF,IAAI,CAAC,CAAC,GAAG,QAAQ,EAAE,GAAG,WAAW,CAAC,CAAC,MAAM,EAAE;YACzC,MAAM,IAAI,6CAA0B,CAClC,8CAA8C,CAC/C,CAAC;SACH;QACD,iCAAiC;QACjC,IAAI,QAAQ,CAAC,MAAM,EAAE;YACnB,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,sBAAS,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC;SAC/D;QAED,iCAAiC;QACjC,IAAI,WAAW,CAAC,MAAM,EAAE;YACtB,MAAM,UAAU,GAAG,IAAI,CAAC;YACxB,OAAO,CAAC,IAAI,CACV,GAAG,CAAC,MAAM,sBAAS,CAAC,MAAM,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,CAAC,CAAC,CAC/D,CAAC;SACH;QAED,mDAAsB,CAAC,OAAO,CAAC,CAAC;QAChC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC;YAC3B,QAAQ,EAAE,MAAM;YAChB,OAAO;SACR,CAAC,CAAC;KACJ;IAAC,OAAO,KAAK,EAAE;QACd,KAAK,CACH,iBAAiB,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,aAAa,KAAK,EAAE,CAC3E,CAAC;QACF,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC;YACxB,QAAQ,EAAE,MAAM;YAChB,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,KAAK;SACN,CAAC,CAAC;KACJ;IACD,OAAO,aAAa,CAAC;AACvB,CAAC;AAED,KAAK,UAAU,eAAe,CAC5B,MAAmB,EACnB,OAAmB;IAEnB,MAAM,aAAa,GAAsB;QACvC,SAAS,EAAE,EAAE;QACb,MAAM,EAAE,EAAE;QACV,OAAO,EAAE,EAAE;KACZ,CAAC;IACF,MAAM,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,MAAM,oCAAgB,CAAC,MAAM,CAAC,CAAC;IACjE,uCAAuC;IACvC,4EAA4E;IAC5E,wDAAwD;IACxD,0BAA0B;IAC1B,MAAM,OAAO,GAAwB,EAAE,CAAC;IACxC,IAAI;QACF,IAAI,CAAC,CAAC,GAAG,QAAQ,EAAE,GAAG,WAAW,CAAC,CAAC,MAAM,EAAE;YACzC,MAAM,IAAI,6CAA0B,CAClC,8CAA8C,CAC/C,CAAC;SACH;QACD,iCAAiC;QACjC,IAAI,QAAQ,CAAC,MAAM,EAAE;YACnB,KAAK,MAAM,OAAO,IAAI,QAAQ,EAAE;gBAC9B,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,MAAM,sBAAS,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;aAChE;SACF;QAED,iCAAiC;QACjC,IAAI,WAAW,CAAC,MAAM,EAAE;YACtB,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE;gBACjC,MAAM,UAAU,GAAG,IAAI,CAAC;gBACxB,OAAO,CAAC,IAAI,CACV,GAAG,CAAC,MAAM,sBAAS,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,OAAO,CAAC,EAAE,UAAU,CAAC,CAAC,CAC7D,CAAC;aACH;SACF;QACD,mDAAsB,CAAC,OAAO,CAAC,CAAC;QAChC,aAAa,CAAC,SAAS,CAAC,IAAI,CAAC;YAC3B,QAAQ,EAAE,MAAM;YAChB,OAAO;SACR,CAAC,CAAC;KACJ;IAAC,OAAO,KAAK,EAAE;QACd,KAAK,CACH,iBAAiB,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,UAAU,aAAa,KAAK,EAAE,CAC3E,CAAC;QACF,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC;YACxB,QAAQ,EAAE,MAAM;YAChB,GAAG,EAAE,KAAK,CAAC,GAAG;YACd,KAAK;SACN,CAAC,CAAC;KACJ;IACD,OAAO,aAAa,CAAC;AACvB,CAAC"}

package/dist/plugins/python/handlers/poetry/update-dependencies/poetry-add.d.ts

@@ -0,0 +1,2 @@
+import { EntityToFix, FixChangesSummary, FixOptions } from '../../../../../types';
+export declare function poetryAdd(entity: EntityToFix, options: FixOptions, upgrades: string[], dev?: boolean): Promise<FixChangesSummary[]>;

package/dist/plugins/python/handlers/poetry/update-dependencies/poetry-add.js

@@ -0,0 +1,53 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.poetryAdd = void 0;
+const pathLib = require("path");
+const poetryFix = require("@snyk/fix-poetry");
+const validate_required_data_1 = require("../../validate-required-data");
+const attempted_changes_summary_1 = require("../../attempted-changes-summary");
+const command_failed_to_run_error_1 = require("../../../../../lib/errors/command-failed-to-run-error");
+const no_fixes_applied_1 = require("../../../../../lib/errors/no-fixes-applied");
+async function poetryAdd(entity, options, upgrades, dev) {
+    var _a;
+    const changes = [];
+    let poetryCommand;
+    const { remediation, targetFile } = validate_required_data_1.validateRequiredData(entity);
+    try {
+        const targetFilePath = pathLib.resolve(entity.workspace.path, targetFile);
+        const { dir } = pathLib.parse(targetFilePath);
+        if (!options.dryRun && upgrades.length) {
+            const res = await poetryFix.poetryAdd(dir, upgrades, {
+                dev,
+                python: (_a = entity.options.command) !== null && _a !== void 0 ? _a : undefined,
+            });
+            if (res.exitCode !== 0) {
+                poetryCommand = res.command;
+                throwPoetryError(res.stderr ? res.stderr : res.stdout, res.command);
+            }
+        }
+        changes.push(...attempted_changes_summary_1.generateSuccessfulChanges(upgrades, remediation.pin));
+    }
+    catch (error) {
+        changes.push(...attempted_changes_summary_1.generateFailedChanges(upgrades, remediation.pin, error, poetryCommand));
+    }
+    return changes;
+}
+exports.poetryAdd = poetryAdd;
+function throwPoetryError(stderr, command) {
+    const ALREADY_UP_TO_DATE = 'No dependencies to install or update';
+    const INCOMPATIBLE_PYTHON = new RegExp(/Python requirement (.*) is not compatible/g, 'gm');
+    const SOLVER_PROBLEM = /SolverProblemError(.* version solving failed)/gms;
+    const incompatiblePythonError = INCOMPATIBLE_PYTHON.exec(stderr);
+    if (incompatiblePythonError) {
+        throw new command_failed_to_run_error_1.CommandFailedError(`The current project's Python requirement ${incompatiblePythonError[1]} is not compatible with some of the required packages`, command);
+    }
+    const solverProblemError = SOLVER_PROBLEM.exec(stderr);
+    if (solverProblemError) {
+        throw new command_failed_to_run_error_1.CommandFailedError(solverProblemError[0].trim(), command);
+    }
+    if (stderr.includes(ALREADY_UP_TO_DATE)) {
+        throw new command_failed_to_run_error_1.CommandFailedError('No dependencies could be updated as they seem to be at the correct versions. Make sure installed dependencies in the environment match those in the lockfile by running `poetry update`', command);
+    }
+    throw new no_fixes_applied_1.NoFixesCouldBeAppliedError();
+}
+//# sourceMappingURL=poetry-add.js.map

package/dist/plugins/python/handlers/poetry/update-dependencies/poetry-add.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"poetry-add.js","sourceRoot":"","sources":["../../../../../../src/plugins/python/handlers/poetry/update-dependencies/poetry-add.ts"],"names":[],"mappings":";;;AAAA,gCAAgC;AAEhC,8CAA8C;AAO9C,yEAAoE;AACpE,+EAGyC;AACzC,uGAA2F;AAC3F,iFAAwF;AAEjF,KAAK,UAAU,SAAS,CAC7B,MAAmB,EACnB,OAAmB,EACnB,QAAkB,EAClB,GAAa;;IAEb,MAAM,OAAO,GAAwB,EAAE,CAAC;IACxC,IAAI,aAAa,CAAC;IAClB,MAAM,EAAE,WAAW,EAAE,UAAU,EAAE,GAAG,6CAAoB,CAAC,MAAM,CAAC,CAAC;IACjE,IAAI;QACF,MAAM,cAAc,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;QAC1E,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;QAC9C,IAAI,CAAC,OAAO,CAAC,MAAM,IAAI,QAAQ,CAAC,MAAM,EAAE;YACtC,MAAM,GAAG,GAAG,MAAM,SAAS,CAAC,SAAS,CAAC,GAAG,EAAE,QAAQ,EAAE;gBACnD,GAAG;gBACH,MAAM,QAAE,MAAM,CAAC,OAAO,CAAC,OAAO,mCAAI,SAAS;aAC5C,CAAC,CAAC;YACH,IAAI,GAAG,CAAC,QAAQ,KAAK,CAAC,EAAE;gBACtB,aAAa,GAAG,GAAG,CAAC,OAAO,CAAC;gBAC5B,gBAAgB,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,OAAO,CAAC,CAAC;aACrE;SACF;QACD,OAAO,CAAC,IAAI,CAAC,GAAG,qDAAyB,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;KACvE;IAAC,OAAO,KAAK,EAAE;QACd,OAAO,CAAC,IAAI,CACV,GAAG,iDAAqB,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,EAAE,KAAK,EAAE,aAAa,CAAC,CAC1E,CAAC;KACH;IACD,OAAO,OAAO,CAAC;AACjB,CAAC;AA7BD,8BA6BC;AAED,SAAS,gBAAgB,CAAC,MAAc,EAAE,OAAgB;IACxD,MAAM,kBAAkB,GAAG,sCAAsC,CAAC;IAClE,MAAM,mBAAmB,GAAG,IAAI,MAAM,CACpC,4CAA4C,EAC5C,IAAI,CACL,CAAC;IACF,MAAM,cAAc,GAAG,kDAAkD,CAAC;IAE1E,MAAM,uBAAuB,GAAG,mBAAmB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACjE,IAAI,uBAAuB,EAAE;QAC3B,MAAM,IAAI,gDAAkB,CAC1B,4CAA4C,uBAAuB,CAAC,CAAC,CAAC,uDAAuD,EAC7H,OAAO,CACR,CAAC;KACH;IACD,MAAM,kBAAkB,GAAG,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;IACvD,IAAI,kBAAkB,EAAE;QACtB,MAAM,IAAI,gDAAkB,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,EAAE,OAAO,CAAC,CAAC;KACrE;IAED,IAAI,MAAM,CAAC,QAAQ,CAAC,kBAAkB,CAAC,EAAE;QACvC,MAAM,IAAI,gDAAkB,CAC1B,yLAAyL,EACzL,OAAO,CACR,CAAC;KACH;IACD,MAAM,IAAI,6CAA0B,EAAE,CAAC;AACzC,CAAC"}

package/dist/types.d.ts

@@ -190,6 +190,7 @@ export interface FixOptions {
     dryRun?: boolean;
     quiet?: boolean;
     stripAnsi?: boolean;
+    sequentialFix?: boolean;
 }
 export interface FixedMeta {
     fixed: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snyk/fix",
-  "version": "1.714.0",
+  "version": "1.718.0",
   "description": "Snyk fix library and utility",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -56,5 +56,5 @@
     "registry": "https://registry.npmjs.org/",
     "access": "public"
   },
-  "gitHead": "f2b60ae4b1add40ca54312f0ab6ca37283a8fd88"
+  "gitHead": "a7838dae9aa9474464b4e0d8cd2c0e88d65391f5"
 }

package/dist/plugins/python/handlers/ensure-has-updates.d.ts

@@ -1,2 +0,0 @@
-import { FixChangesSummary } from '../../../types';
-export declare function ensureHasUpdates(changes: FixChangesSummary[]): void;

package/dist/plugins/python/handlers/ensure-has-updates.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ensure-has-updates.js","sourceRoot":"","sources":["../../../../src/plugins/python/handlers/ensure-has-updates.ts"],"names":[],"mappings":";;;AAAA,kCAAkC;AAElC,2EAAkF;AAElF,2EAAiE;AAEjE,MAAM,KAAK,GAAG,QAAQ,CAAC,wCAAwC,CAAC,CAAC;AAEjE,SAAgB,gBAAgB,CAAC,OAA4B;IAC3D,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE;QACnB,MAAM,IAAI,6CAA0B,EAAE,CAAC;KACxC;IACD,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,8CAAkB,CAAC,CAAC,CAAC,CAAC,EAAE;QAC/C,KAAK,CAAC,qDAAqD,CAAC,CAAC;QAC7D,6EAA6E;QAC7E,QAAQ;QACR,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC,CAAC,CAAoB,CAAC;QACtD,MAAM,IAAI,6CAA0B,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;KACnD;AACH,CAAC;AAXD,4CAWC"}