@openfn/cli 1.10.1 → 1.10.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -998,6 +998,34 @@ var assertOptionsStructure = (options = {}, logger) => {
998
998
  };
999
999
  var validate_plan_default = assertWorkflowStructure;
1000
1000
 
1001
+ // src/util/override-plan-adaptors.ts
1002
+ function overridePlanAdaptors(plan, resolutions) {
1003
+ const hasRes = Object.entries(resolutions).some(
1004
+ ([key, value]) => key !== value
1005
+ );
1006
+ if (!hasRes)
1007
+ return plan;
1008
+ return {
1009
+ ...plan,
1010
+ workflow: {
1011
+ ...plan.workflow,
1012
+ steps: plan.workflow.steps.map((step) => {
1013
+ if (isJob(step))
1014
+ return {
1015
+ ...step,
1016
+ adaptors: step.adaptors?.map((a) => resolutions[a] || a)
1017
+ };
1018
+ else
1019
+ return step;
1020
+ })
1021
+ }
1022
+ };
1023
+ }
1024
+ function isJob(step) {
1025
+ return step && typeof step.expression === "string";
1026
+ }
1027
+ var override_plan_adaptors_default = overridePlanAdaptors;
1028
+
1001
1029
  // src/execute/handler.ts
1002
1030
  var matchStep = (plan, stepPattern, stepName, logger) => {
1003
1031
  try {
@@ -1027,6 +1055,7 @@ var executeHandler = async (options, logger) => {
1027
1055
  if (options.cacheSteps) {
1028
1056
  await clearCache(plan, options, logger);
1029
1057
  }
1058
+ const moduleResolutions = {};
1030
1059
  const { repoDir, monorepoPath, autoinstall } = options;
1031
1060
  if (autoinstall) {
1032
1061
  if (monorepoPath) {
@@ -1039,6 +1068,11 @@ var executeHandler = async (options, logger) => {
1039
1068
  { packages: autoInstallTargets, repoDir },
1040
1069
  logger
1041
1070
  );
1071
+ if (autoInstallTargets.length === options.adaptors.length) {
1072
+ for (let i = 0; i < autoInstallTargets.length; i++) {
1073
+ moduleResolutions[autoInstallTargets[i]] = options.adaptors[i];
1074
+ }
1075
+ }
1042
1076
  }
1043
1077
  }
1044
1078
  }
@@ -1070,6 +1104,7 @@ var executeHandler = async (options, logger) => {
1070
1104
  }
1071
1105
  }
1072
1106
  const state = await load_state_default(plan, options, logger, customStart);
1107
+ plan = override_plan_adaptors_default(plan, moduleResolutions);
1073
1108
  if (options.compile) {
1074
1109
  plan = await compile_default(plan, options, logger);
1075
1110
  } else {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@openfn/cli",
3
- "version": "1.10.1",
3
+ "version": "1.10.2",
4
4
  "description": "CLI devtools for the openfn toolchain.",
5
5
  "engines": {
6
6
  "node": ">=18",
@@ -49,10 +49,10 @@
49
49
  "ws": "^8.18.0",
50
50
  "yargs": "^17.7.2",
51
51
  "@openfn/compiler": "1.0.0",
52
- "@openfn/describe-package": "0.1.4",
52
+ "@openfn/deploy": "0.8.2",
53
53
  "@openfn/logger": "1.0.4",
54
54
  "@openfn/runtime": "1.6.1",
55
- "@openfn/deploy": "0.8.2"
55
+ "@openfn/describe-package": "0.1.4"
56
56
  },
57
57
  "files": [
58
58
  "dist",