@devicecloud.dev/dcd 4.1.1 → 4.1.2-beta.1

package/dist/commands/cloud.js

@@ -308,7 +308,7 @@ class Cloud extends core_1.Command {
                 if (debug) {
                     this.log('DEBUG: Generating execution plan...');
                 }
-                executionPlan = await (0, plan_1.plan)(flowFile, includeTags.flat(), excludeTags.flat(), excludeFlows.flat(), configFile);
+                executionPlan = await (0, plan_1.plan)(flowFile, includeTags.flat(), excludeTags.flat(), excludeFlows.flat(), configFile, debug);
                 if (debug) {
                     this.log(`DEBUG: Execution plan generated`);
                     this.log(`DEBUG: Total flow files: ${executionPlan.totalFlowFiles}`);

package/dist/plan.d.ts

@@ -35,5 +35,5 @@ interface IFlowSequence {
     continueOnFailure?: boolean;
     flows: string[];
 }
-export declare function plan(input: string, includeTags: string[], excludeTags: string[], excludeFlows?: string[], configFile?: string): Promise<IExecutionPlan>;
+export declare function plan(input: string, includeTags: string[], excludeTags: string[], excludeFlows?: string[], configFile?: string, debug?: boolean): Promise<IExecutionPlan>;
 export {};

package/dist/plan.js

@@ -64,7 +64,7 @@ function extractDeviceCloudOverrides(config) {
     }
     return overrides;
 }
-async function plan(input, includeTags, excludeTags, excludeFlows, configFile) {
+async function plan(input, includeTags, excludeTags, excludeFlows, configFile, debug = false) {
     const normalizedInput = path.normalize(input);
     const flowMetadata = {};
     if (!fs.existsSync(normalizedInput)) {
@@ -189,12 +189,30 @@ async function plan(input, includeTags, excludeTags, excludeFlows, configFile) {
         const config = configPerFlowFile[filePath];
         const name = config?.name || path.parse(filePath).name;
         acc[name] = filePath;
+        if (debug) {
+            console.log(`[DEBUG] Flow name mapping: "${name}" -> ${filePath}`);
+        }
         return acc;
     }, {});
+    if (debug && workspaceConfig.executionOrder?.flowsOrder) {
+        console.log('[DEBUG] executionOrder.flowsOrder:', workspaceConfig.executionOrder.flowsOrder);
+        console.log('[DEBUG] Available flow names:', Object.keys(pathsByName));
+    }
     const flowsToRunInSequence = workspaceConfig.executionOrder?.flowsOrder
-        ?.map((flowOrder) => flowOrder.replace('.yaml', '').replace('.yml', '')) // support case where ext is left on
-        ?.map((flowOrder) => (0, planMethods_1.getFlowsToRunInSequence)(pathsByName, [flowOrder]))
+        ?.map((flowOrder) => {
+        // Strip .yaml/.yml extension only from the END of the string
+        // This supports flowsOrder entries like "my_test.yml" matching "my_test"
+        // while preserving extensions in the middle like "(file.yml) Name"
+        const normalizedFlowOrder = flowOrder.replace(/\.ya?ml$/i, '');
+        if (debug && flowOrder !== normalizedFlowOrder) {
+            console.log(`[DEBUG] Stripping trailing extension: "${flowOrder}" -> "${normalizedFlowOrder}"`);
+        }
+        return (0, planMethods_1.getFlowsToRunInSequence)(pathsByName, [normalizedFlowOrder], debug);
+    })
         .flat() || [];
+    if (debug) {
+        console.log(`[DEBUG] Sequential flows resolved: ${flowsToRunInSequence.length} flow(s)`);
+    }
     const normalFlows = allFlows
         .filter((flow) => !flowsToRunInSequence.includes(flow))
         .sort((a, b) => a.localeCompare(b));

package/dist/planMethods.d.ts

@@ -1,6 +1,6 @@
 export declare function getFlowsToRunInSequence(paths: {
     [key: string]: string;
-}, flowOrder: string[]): string[];
+}, flowOrder: string[], debug?: boolean): string[];
 export declare function isFlowFile(filePath: string): boolean;
 export declare const readYamlFileAsJson: (filePath: string) => unknown;
 export declare const readTestYamlFileAsJson: (filePath: string) => {

package/dist/planMethods.js

@@ -9,25 +9,50 @@ const yaml = require("js-yaml");
 const fs = require("node:fs");
 const path = require("node:path");
 const commandsThatRequireFiles = new Set(['addMedia', 'runFlow', 'runScript']);
-function getFlowsToRunInSequence(paths, flowOrder) {
-    if (flowOrder.length === 0)
+function getFlowsToRunInSequence(paths, flowOrder, debug = false) {
+    if (flowOrder.length === 0) {
+        if (debug) {
+            console.log('[DEBUG] getFlowsToRunInSequence: flowOrder is empty, returning []');
+        }
         return [];
+    }
     const orderSet = new Set(flowOrder);
-    const namesInOrder = Object.keys(paths).filter((key) => orderSet.has(key));
-    if (namesInOrder.length === 0)
+    const availableNames = Object.keys(paths);
+    if (debug) {
+        console.log(`[DEBUG] getFlowsToRunInSequence: Looking for flows in order: [${[...orderSet].join(', ')}]`);
+        console.log(`[DEBUG] getFlowsToRunInSequence: Available flow names: [${availableNames.join(', ')}]`);
+    }
+    const namesInOrder = availableNames.filter((key) => orderSet.has(key));
+    if (debug) {
+        console.log(`[DEBUG] getFlowsToRunInSequence: Matched ${namesInOrder.length} flow(s): [${namesInOrder.join(', ')}]`);
+    }
+    if (namesInOrder.length === 0) {
+        const notFound = [...orderSet].filter((item) => !availableNames.includes(item));
+        if (debug) {
+            console.log(`[DEBUG] getFlowsToRunInSequence: No flows matched, not found: [${notFound.join(', ')}]`);
+        }
         return [];
+    }
     const result = [...orderSet].filter((item) => namesInOrder.includes(item));
     if (result.length === 0) {
-        throw new Error(`Could not find flows needed for execution in order: ${[...orderSet]
-            .filter((item) => !namesInOrder.includes(item))
-            .join(', ')}`);
+        const notFound = [...orderSet].filter((item) => !namesInOrder.includes(item));
+        throw new Error(`Could not find flows needed for execution in order: ${notFound.join(', ')}\n\nAvailable flow names:\n${availableNames.join('\n')}`);
     }
     else if (flowOrder
         .slice(0, result.length)
         .every((value, index) => value === result[index])) {
-        return result.map((item) => paths[item]);
+        const resolvedPaths = result.map((item) => paths[item]);
+        if (debug) {
+            console.log(`[DEBUG] getFlowsToRunInSequence: Order matches, returning ${resolvedPaths.length} path(s)`);
+        }
+        return resolvedPaths;
     }
     else {
+        if (debug) {
+            console.log('[DEBUG] getFlowsToRunInSequence: Order does not match, returning []');
+            console.log(`[DEBUG] Expected order: [${flowOrder.slice(0, result.length).join(', ')}]`);
+            console.log(`[DEBUG] Actual result: [${result.join(', ')}]`);
+        }
         return [];
     }
 }

package/oclif.manifest.json

@@ -579,5 +579,5 @@
       ]
     }
   },
-  "version": "4.1.1"
+  "version": "4.1.2-beta.1"
 }

package/package.json

@@ -72,7 +72,7 @@
     "type": "git",
     "url": "https://devicecloud.dev"
   },
-  "version": "4.1.1",
+  "version": "4.1.2-beta.1",
   "bugs": {
     "url": "https://discord.gg/gm3mJwcNw8"
   },