@devicecloud.dev/dcd 1.0.11 → 2.0.0-rc.3

package/dist/commands/cloud.d.ts

@@ -1,4 +1,5 @@
 import { Command } from '@oclif/core';
+export declare const mimeTypeLookupByExtension: Record<string, string>;
 export declare enum EiOSDevices {
     'ipad-pro-6th-gen' = "ipad-pro-6th-gen",
     'iphone-13' = "iphone-13",
@@ -23,6 +24,8 @@ export default class Cloud extends Command {
     static description: string;
     static examples: string[];
     static flags: {
+        'additional-app-binary-ids': import("@oclif/core/lib/interfaces").OptionFlag<string[], import("@oclif/core/lib/interfaces").CustomOptions>;
+        'additional-app-files': import("@oclif/core/lib/interfaces").OptionFlag<string[], import("@oclif/core/lib/interfaces").CustomOptions>;
         'android-api-level': import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         'android-device': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
         apiKey: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;

package/dist/commands/cloud.js

@@ -1,18 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EiOSDevices = void 0;
+exports.EiOSDevices = exports.mimeTypeLookupByExtension = void 0;
 /* eslint-disable complexity */
 const core_1 = require("@oclif/core");
 const cli_ux_1 = require("@oclif/core/lib/cli-ux");
 const errors_1 = require("@oclif/core/lib/errors");
-const supabase_js_1 = require("@supabase/supabase-js");
-const file_1 = require("@web-std/file");
-const promises_1 = require("node:fs/promises");
 const path = require("node:path");
 const constants_1 = require("../constants");
 const methods_1 = require("../methods");
 const plan_1 = require("../plan");
-const mimeTypeLookupByExtension = {
+exports.mimeTypeLookupByExtension = {
     apk: 'application/vnd.android.package-archive',
     yaml: 'application/x-yaml',
     zip: 'application/zip',
@@ -58,16 +55,20 @@ class Cloud extends core_1.Command {
             }
             await (0, methods_1.versionCheck)(this.config.version);
             const { args, flags, raw } = await this.parse(Cloud);
-            const { 'android-api-level': androidApiLevel, 'android-device': androidDevice, apiKey, apiUrl, 'app-binary-id': appBinaryId, 'app-file': appFile, arm64, async, 'device-locale': deviceLocale, 'download-artifacts': downloadArtifacts, env, 'exclude-flows': excludeFlows, 'exclude-tags': excludeTags, flows, 'google-play': googlePlay, 'include-tags': includeTags, 'ios-device': iOSDevice, 'ios-version': iOSVersion, 'maestro-version': maestroVersion, name, orientation, quiet, ...rest } = flags;
+            const { 'additional-app-binary-ids': nonFlatAdditionalAppBinaryIds, 'additional-app-files': nonFlatAdditionalAppFiles, 'android-api-level': androidApiLevel, 'android-device': androidDevice, apiKey, apiUrl, 'app-binary-id': appBinaryId, 'app-file': appFile, arm64, async, 'device-locale': deviceLocale, 'download-artifacts': downloadArtifacts, env, 'exclude-flows': excludeFlows, 'exclude-tags': excludeTags, flows, 'google-play': googlePlay, 'include-tags': includeTags, 'ios-device': iOSDevice, 'ios-version': iOSVersion, 'maestro-version': maestroVersion, name, orientation, quiet, ...rest } = flags;
             if (arm64) {
                 (0, cli_ux_1.info)('Contact hello@devicecloud.dev to enquire about arm64 devices');
                 (0, cli_ux_1.exit)();
             }
+            if (!apiKey)
+                throw new Error('You must provide an API key');
+            const additionalAppBinaryIds = nonFlatAdditionalAppBinaryIds?.flat();
+            const additionalAppFiles = nonFlatAdditionalAppFiles?.flat();
             const { firstFile, secondFile } = args;
             let finalBinaryId = appBinaryId;
+            let finalAdditionalBinaryIds = additionalAppBinaryIds;
             const finalAppFile = appFile ?? firstFile;
             let flowFile = flows ?? secondFile;
-            let metadata;
             if (appBinaryId) {
                 if (secondFile) {
                     throw new Error('You cannot provide both an appBinaryId and a binary file');
@@ -100,6 +101,18 @@ class Cloud extends core_1.Command {
                 process.exit(2);
             }
             const { allExcludeTags, allIncludeTags, flowsToRun: testFileNames, referencedFiles, sequence, } = executionPlan;
+            const pathsShortestToLongest = [
+                ...testFileNames,
+                ...referencedFiles,
+            ].sort((a, b) => a.split(path.sep).length - b.split(path.sep).length);
+            let commonRoot = path.parse(process.cwd()).root;
+            const folders = pathsShortestToLongest[0].split(path.sep);
+            for (const [index] of folders.entries()) {
+                const folderPath = folders.slice(0, index + 1).join(path.sep);
+                const isRoot = pathsShortestToLongest.every((file) => file.startsWith(folderPath));
+                if (isRoot)
+                    commonRoot = folderPath;
+            }
             const { continueOnFailure = true, flows: sequentialFlows = [] } = sequence ?? {};
             if (!appBinaryId) {
                 if (!(flowFile && finalAppFile)) {
@@ -112,6 +125,7 @@ class Cloud extends core_1.Command {
                     await (0, methods_1.verifyAppZip)(finalAppFile);
                 }
             }
+            await (0, methods_1.verifyAdditionalAppFiles)(additionalAppFiles);
             const flagLogs = [];
             for (const [k, v] of Object.entries(flags)) {
                 if (v && v.toString().length > 0) {
@@ -123,6 +137,8 @@ class Cloud extends core_1.Command {
         Submitting new job
       → Flow(s): ${flowFile}
       → App: ${appBinaryId || finalAppFile}
+      ${Boolean(additionalAppBinaryIds || additionalAppFiles) &&
+                `→ Additional app(s): ${additionalAppBinaryIds} ${additionalAppFiles}`}
 
         With options
       → ${flagLogs.join(`
@@ -130,69 +146,18 @@ class Cloud extends core_1.Command {
 
       `);
             if (!finalBinaryId) {
-                core_1.ux.action.start('Uploading binary', 'Initializing', { stdout: true });
-                const { id, message, path, token } = await (0, methods_1.typeSafePost)(apiUrl, '/uploads/getBinaryUploadUrl', {
-                    body: JSON.stringify({
-                        platform: finalAppFile?.endsWith('.apk') ? 'android' : 'ios',
-                    }),
-                    headers: {
-                        'content-type': 'application/json',
-                        'x-app-api-key': apiKey,
-                    },
-                });
-                finalBinaryId = id;
-                if (!path)
-                    throw new Error(message);
-                let file;
-                if (finalAppFile?.endsWith('.app')) {
-                    const zippedAppBlob = await (0, methods_1.compressFolderToBlob)(finalAppFile);
-                    const filePath = finalAppFile + '.zip';
-                    file = new file_1.File([zippedAppBlob], filePath);
-                }
-                else {
-                    const binaryBlob = new Blob([await (0, promises_1.readFile)(finalAppFile)], {
-                        type: mimeTypeLookupByExtension[finalAppFile.split('.').pop()],
-                    });
-                    file = new file_1.File([binaryBlob], finalAppFile);
-                }
-                try {
-                    metadata = finalAppFile?.endsWith('.apk')
-                        ? await (0, methods_1.extractAppMetadataAndroid)(finalAppFile)
-                        : finalAppFile?.endsWith('.zip')
-                            ? await (0, methods_1.extractAppMetadataIosZip)(finalAppFile)
-                            : await (0, methods_1.extractAppMetadataIos)(finalAppFile);
-                }
-                catch {
-                    this.warn('Failed to extract app metadata, please share with support@devicecloud.dev so we can improve our parsing.');
-                }
-                // this needs to made nicer by using envs or maybe fetching the keys from the getSignedURL call
-                const SB = {
-                    dev: {
-                        SUPABASE_KEY: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImxibXNvd2VodGp3bnFsdXJwZW1iIiwicm9sZSI6ImFub24iLCJpYXQiOjE3MDkyMTg0ODcsImV4cCI6MjAyNDc5NDQ4N30.zeLTMAuZ_WwYvGdeP0kdvL_Zrs-RQee5APPyxmWq7qQ',
-                        SUPABASE_URL: 'https://lbmsowehtjwnqlurpemb.supabase.co',
-                    },
-                    prod: {
-                        SUPABASE_KEY: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InBneWRucGhiaW1ldGluc2dma2JvIiwicm9sZSI6ImFub24iLCJpYXQiOjE3MDc1OTQzNDYsImV4cCI6MjAyMzE3MDM0Nn0.hAYOMFxxwX1exkQkY9xyQJGC_GhGnyogkj2N-kBkMI8',
-                        SUPABASE_URL: 'https://pgydnphbimetinsgfkbo.supabase.co',
-                    },
-                };
-                const { SUPABASE_KEY, SUPABASE_URL } = SB[apiUrl === 'https://api.devicecloud.dev' ? 'prod' : 'dev'];
-                const supabase = (0, supabase_js_1.createClient)(SUPABASE_URL, SUPABASE_KEY);
-                const uploadToUrl = await supabase.storage
-                    .from('organizations')
-                    .uploadToSignedUrl(path, token, file);
-                if (uploadToUrl.error)
-                    throw new Error(uploadToUrl.error);
-                const { error } = await (0, methods_1.typeSafePost)(apiUrl, '/uploads/finaliseUpload', {
-                    body: JSON.stringify({ id, metadata, path }),
-                    headers: {
-                        'content-type': 'application/json',
-                        'x-app-api-key': apiKey,
-                    },
-                });
-                if (error)
-                    throw new Error(error);
-                core_1.ux.action.stop(`\nBinary uploaded with id: ${finalBinaryId}`);
+                if (!finalAppFile)
+                    throw new Error('You must provide either an app binary id or an app file');
+                const binaryId = await (0, methods_1.uploadBinary)(finalAppFile, apiUrl, apiKey);
+                finalBinaryId = binaryId;
+            }
+            let uploadedBinaryIds = [];
+            if (additionalAppFiles?.length) {
+                uploadedBinaryIds = await (0, methods_1.uploadBinaries)(additionalAppFiles, apiUrl, apiKey);
+                finalAdditionalBinaryIds = [
+                    ...finalAdditionalBinaryIds,
+                    ...uploadedBinaryIds,
+                ];
             }
             const testFormData = new FormData();
             // eslint-disable-next-line unicorn/no-array-reduce
@@ -210,17 +175,18 @@ class Cloud extends core_1.Command {
                     ...testFileNames,
                     ...sequentialFlows,
                 ]),
-            ]);
+            ], commonRoot);
             const blob = new Blob([buffer], {
-                type: mimeTypeLookupByExtension.zip,
+                type: exports.mimeTypeLookupByExtension.zip,
             });
             testFormData.set('file', blob, 'flowFile.zip');
             testFormData.set('appBinaryId', finalBinaryId);
-            testFormData.set('testFileNames', JSON.stringify(testFileNames));
+            testFormData.set('testFileNames', JSON.stringify(testFileNames.map((t) => t.replaceAll(commonRoot, '.'))));
             testFormData.set('sequentialFlows', JSON.stringify(sequentialFlows));
             testFormData.set('env', JSON.stringify(envObject));
             testFormData.set('googlePlay', googlePlay ? 'true' : 'false');
             testFormData.set('config', JSON.stringify({
+                additionalAppBinaryIds: finalAdditionalBinaryIds,
                 allExcludeTags,
                 allIncludeTags,
                 continueOnFailure,
@@ -228,6 +194,7 @@ class Cloud extends core_1.Command {
                 maestroVersion,
                 orientation,
                 raw,
+                uploadedBinaryIds,
                 version: this.config.version,
             }));
             if (androidApiLevel)

package/dist/constants.d.ts

@@ -1,5 +1,7 @@
 import { EiOSDevices } from './commands/cloud';
 export declare const flags: {
+    'additional-app-binary-ids': import("@oclif/core/lib/interfaces").OptionFlag<string[], import("@oclif/core/lib/interfaces").CustomOptions>;
+    'additional-app-files': import("@oclif/core/lib/interfaces").OptionFlag<string[], import("@oclif/core/lib/interfaces").CustomOptions>;
     'android-api-level': import("@oclif/core/lib/interfaces").OptionFlag<number | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
     'android-device': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
     apiKey: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;

package/dist/constants.js

@@ -3,6 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.iOSCompatibilityLookup = exports.flags = void 0;
 const core_1 = require("@oclif/core");
 exports.flags = {
+    'additional-app-binary-ids': core_1.Flags.string({
+        default: [],
+        description: 'The ID of the additional app binary(s) previously uploaded to devicecloud.dev to install before execution',
+        multiple: true,
+        multipleNonGreedy: true,
+        parse: (input) => input.split(','),
+    }),
+    'additional-app-files': core_1.Flags.file({
+        default: [],
+        description: 'Additional app binary(s) to install before execution',
+        multiple: true,
+        multipleNonGreedy: true,
+        parse: (input) => input.split(','),
+    }),
     'android-api-level': core_1.Flags.integer({
         description: '[Android only] Android API level to run your flow against',
         options: ['33', '34'],

package/dist/index.js

@@ -1,5 +1,4 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.run = void 0;
 var core_1 = require("@oclif/core");
 Object.defineProperty(exports, "run", { enumerable: true, get: function () { return core_1.run; } });

package/dist/methods.d.ts

@@ -1,4 +1,3 @@
-/// <reference types="node" />
 import * as archiver from 'archiver';
 import { paths } from '../../api/schema.types';
 import { TAppMetadata } from './types';
@@ -18,8 +17,11 @@ export declare const typeSafeGet: <T extends keyof paths>(baseUrl: string, path:
 export declare const toBuffer: (archive: archiver.Archiver) => Promise<Buffer>;
 export declare const compressDir: (sourceDir: string) => Promise<Buffer>;
 export declare const compressFolderToBlob: (sourceDir: string) => Promise<Blob>;
-export declare const compressFilesFromRelativePath: (path: string, files: string[]) => Promise<Buffer>;
+export declare const compressFilesFromRelativePath: (path: string, files: string[], commonRoot: string) => Promise<Buffer>;
 export declare const verifyAppZip: (zipPath: string) => Promise<void>;
 export declare const extractAppMetadataAndroid: (appFilePath: string) => Promise<TAppMetadata>;
 export declare const extractAppMetadataIosZip: (appFilePath: string) => Promise<TAppMetadata>;
 export declare const extractAppMetadataIos: (appFolderPath: string) => Promise<TAppMetadata>;
+export declare const uploadBinary: (filePath: string, apiUrl: string, apiKey: string) => Promise<string>;
+export declare const uploadBinaries: (finalAppFiles: string[], apiUrl: string, apiKey: string) => Promise<string[]>;
+export declare const verifyAdditionalAppFiles: (appFiles: string[] | undefined) => Promise<void>;

package/dist/methods.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.extractAppMetadataIos = exports.extractAppMetadataIosZip = exports.extractAppMetadataAndroid = exports.verifyAppZip = exports.compressFilesFromRelativePath = exports.compressFolderToBlob = exports.compressDir = exports.toBuffer = exports.typeSafeGet = exports.typeSafePostDownload = exports.typeSafePost = exports.versionCheck = void 0;
-const cli_ux_1 = require("@oclif/core/lib/cli-ux");
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
+exports.verifyAdditionalAppFiles = exports.uploadBinaries = exports.uploadBinary = exports.extractAppMetadataIos = exports.extractAppMetadataIosZip = exports.extractAppMetadataAndroid = exports.verifyAppZip = exports.compressFilesFromRelativePath = exports.compressFolderToBlob = exports.compressDir = exports.toBuffer = exports.typeSafeGet = exports.typeSafePostDownload = exports.typeSafePost = exports.versionCheck = void 0;
+const core_1 = require("@oclif/core");
+const supabase_js_1 = require("@supabase/supabase-js");
+// required polyfill for node 18
+const file_1 = require("@web-std/file");
 // @ts-ignore
 const AppInfoParser = require("app-info-parser");
 const archiver = require("archiver");
@@ -14,6 +16,7 @@ const node_stream_1 = require("node:stream");
 const promises_2 = require("node:stream/promises");
 const StreamZip = require("node-stream-zip");
 const plist_1 = require("plist");
+const cloud_1 = require("./commands/cloud");
 const PERMITTED_EXTENSIONS = new Set([
     'yml',
     'yaml',
@@ -29,7 +32,7 @@ const versionCheck = async (currentVersion) => {
     const versionResponseJson = await versionResponse.json();
     const latestVersion = versionResponseJson.version;
     if (latestVersion !== currentVersion) {
-        (0, cli_ux_1.warn)(`
+        core_1.ux.warn(`
 -------------------
 A new version of the devicecloud.dev CLI is available: ${latestVersion}
 Run 'npm install -g @devicecloud.dev/dcd@latest' to update to the latest version
@@ -118,7 +121,7 @@ const compressFolderToBlob = async (sourceDir) => {
     return new Blob([buffer], { type: 'application/zip' });
 };
 exports.compressFolderToBlob = compressFolderToBlob;
-const compressFilesFromRelativePath = async (path, files) => {
+const compressFilesFromRelativePath = async (path, files, commonRoot) => {
     const archive = archiver('zip', {
         zlib: { level: 9 },
     });
@@ -126,7 +129,9 @@ const compressFilesFromRelativePath = async (path, files) => {
         throw err;
     });
     for (const file of files) {
-        archive.file(nodePath.resolve(path, file), { name: file });
+        archive.file(nodePath.resolve(path, file), {
+            name: file.replace(commonRoot, ''),
+        });
     }
     const buffer = await (0, exports.toBuffer)(archive);
     // await writeFile('./my-zip.zip', buffer);
@@ -200,3 +205,84 @@ const extractAppMetadataIos = async (appFolderPath) => {
     return { appId, platform: 'ios' };
 };
 exports.extractAppMetadataIos = extractAppMetadataIos;
+const uploadBinary = async (filePath, apiUrl, apiKey) => {
+    core_1.ux.action.start('Uploading binary', 'Initializing', { stdout: true });
+    const { id, message, path, token } = await (0, exports.typeSafePost)(apiUrl, '/uploads/getBinaryUploadUrl', {
+        body: JSON.stringify({
+            platform: filePath?.endsWith('.apk') ? 'android' : 'ios',
+        }),
+        headers: {
+            'content-type': 'application/json',
+            'x-app-api-key': apiKey,
+        },
+    });
+    if (!path)
+        throw new Error(message);
+    let file;
+    if (filePath?.endsWith('.app')) {
+        const zippedAppBlob = await (0, exports.compressFolderToBlob)(filePath);
+        file = new file_1.File([zippedAppBlob], filePath + '.zip');
+    }
+    else {
+        const binaryBlob = new Blob([await (0, promises_1.readFile)(filePath)], {
+            type: cloud_1.mimeTypeLookupByExtension[filePath.split('.').pop()],
+        });
+        file = new file_1.File([binaryBlob], filePath);
+    }
+    let metadata;
+    try {
+        metadata = filePath?.endsWith('.apk')
+            ? await (0, exports.extractAppMetadataAndroid)(filePath)
+            : filePath?.endsWith('.zip')
+                ? await (0, exports.extractAppMetadataIosZip)(filePath)
+                : await (0, exports.extractAppMetadataIos)(filePath);
+    }
+    catch {
+        core_1.ux.warn('Failed to extract app metadata, please share with support@devicecloud.dev so we can improve our parsing.');
+    }
+    // this needs to made nicer by using envs or maybe fetching the keys from the getSignedURL call
+    const SB = {
+        dev: {
+            SUPABASE_KEY: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6ImxibXNvd2VodGp3bnFsdXJwZW1iIiwicm9sZSI6ImFub24iLCJpYXQiOjE3MDkyMTg0ODcsImV4cCI6MjAyNDc5NDQ4N30.zeLTMAuZ_WwYvGdeP0kdvL_Zrs-RQee5APPyxmWq7qQ',
+            SUPABASE_URL: 'https://lbmsowehtjwnqlurpemb.supabase.co',
+        },
+        prod: {
+            SUPABASE_KEY: 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJzdXBhYmFzZSIsInJlZiI6InBneWRucGhiaW1ldGluc2dma2JvIiwicm9sZSI6ImFub24iLCJpYXQiOjE3MDc1OTQzNDYsImV4cCI6MjAyMzE3MDM0Nn0.hAYOMFxxwX1exkQkY9xyQJGC_GhGnyogkj2N-kBkMI8',
+            SUPABASE_URL: 'https://pgydnphbimetinsgfkbo.supabase.co',
+        },
+    };
+    const { SUPABASE_KEY, SUPABASE_URL } = SB[apiUrl === 'https://api.devicecloud.dev' ? 'prod' : 'dev'];
+    const supabase = (0, supabase_js_1.createClient)(SUPABASE_URL, SUPABASE_KEY);
+    const uploadToUrl = await supabase.storage
+        .from('organizations')
+        .uploadToSignedUrl(path, token, file);
+    if (uploadToUrl.error)
+        throw new Error(uploadToUrl.error);
+    const { error } = await (0, exports.typeSafePost)(apiUrl, '/uploads/finaliseUpload', {
+        body: JSON.stringify({ id, metadata, path }),
+        headers: {
+            'content-type': 'application/json',
+            'x-app-api-key': apiKey,
+        },
+    });
+    if (error)
+        throw new Error(error);
+    core_1.ux.action.stop(`\nBinary uploaded with id: ${id}`);
+    return id;
+};
+exports.uploadBinary = uploadBinary;
+const uploadBinaries = async (finalAppFiles, apiUrl, apiKey) => Promise.all(finalAppFiles.map((f) => (0, exports.uploadBinary)(f, apiUrl, apiKey)));
+exports.uploadBinaries = uploadBinaries;
+const verifyAdditionalAppFiles = async (appFiles) => {
+    if (appFiles?.length) {
+        if (!appFiles.every((f) => ['apk', '.app', '.zip'].some((ext) => f.endsWith(ext)))) {
+            throw new Error('App file must be a .apk for android or .app/.zip file for iOS');
+        }
+        await Promise.all(appFiles.map(async (f) => {
+            if (f.endsWith('.zip')) {
+                await (0, exports.verifyAppZip)(f);
+            }
+        }));
+    }
+};
+exports.verifyAdditionalAppFiles = verifyAdditionalAppFiles;

package/dist/plan.js

@@ -1,56 +1,70 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.plan = void 0;
+exports.plan = plan;
 const glob_1 = require("glob");
 const fs = require("node:fs");
 const path = require("node:path");
 const planMethods_1 = require("./planMethods");
-async function plan(input, includeTags, excludeTags, excludeFlows) {
-    if (!fs.existsSync(input)) {
-        throw new Error(`Flow path does not exist: ${path.resolve(input)}`);
-    }
-    if (fs.lstatSync(input).isFile()) {
-        const directory = path.dirname(input) + '/';
-        const { config, testSteps } = (0, planMethods_1.readTestYamlFileAsJson)(input);
+async function checkDependencies(input) {
+    const checkedDependencies = [];
+    const uncheckedDependencies = [input];
+    while (uncheckedDependencies.length > 0) {
+        const fileToCheck = uncheckedDependencies.shift();
+        const { config, testSteps } = (0, planMethods_1.readTestYamlFileAsJson)(fileToCheck);
         const { allErrors, allFiles } = (0, planMethods_1.processDependencies)({
             config,
-            directory,
-            input,
+            input: fileToCheck,
             testSteps,
         });
         if (allErrors.length > 0) {
-            throw new Error('The following flow files are not present in the provided directory: \n' +
+            throw new Error('The following flow files are not present in the filesystem: \n' +
                 allErrors.join('\n'));
         }
+        for (const file of allFiles) {
+            if (!(0, planMethods_1.isFlowFile)(file)) {
+                // js/media files don't have dependencies
+                checkedDependencies.push(file);
+            }
+            if (!checkedDependencies.includes(file)) {
+                uncheckedDependencies.push(file);
+            }
+        }
+        if (!checkedDependencies.includes(fileToCheck)) {
+            checkedDependencies.push(fileToCheck);
+        }
+    }
+    return checkedDependencies;
+}
+function filterFlowFiles(unfilteredFlowFiles, excludeFlows) {
+    if (excludeFlows) {
+        return unfilteredFlowFiles.filter((file) => !excludeFlows.some((flow) => file.startsWith(path.resolve(flow))));
+    }
+    return unfilteredFlowFiles;
+}
+function getWorkspaceConfig(input, unfilteredFlowFiles) {
+    const configFilePath = unfilteredFlowFiles.find((file) => file === input + 'config.yaml' || file === input + 'config.yml');
+    return configFilePath
+        ? (0, planMethods_1.readYamlFileAsJson)(configFilePath)
+        : {};
+}
+async function plan(input, includeTags, excludeTags, excludeFlows) {
+    if (!fs.existsSync(input)) {
+        throw new Error(`Flow path does not exist: ${path.resolve(input)}`);
+    }
+    if (fs.lstatSync(input).isFile()) {
+        const checkedDependancies = await checkDependencies(input);
         return {
-            flowsToRun: [input.split('/').pop() ?? input],
-            referencedFiles: [...new Set(allFiles)],
+            flowsToRun: [input],
+            referencedFiles: [...new Set(checkedDependancies)],
             totalFlowFiles: 1,
         };
     }
-    // raw list of all yaml files beneath entry point
-    let unfilteredFlowFiles = await (0, planMethods_1.walk)(input, planMethods_1.isFlowFile);
+    let unfilteredFlowFiles = await (0, planMethods_1.readDirectory)(input, planMethods_1.isFlowFile);
     if (unfilteredFlowFiles.length === 0) {
         throw new Error(`Flow directory does not contain any Flow files: ${path.resolve(input)}`);
     }
-    // filter out files that match the exclude list
-    if (excludeFlows) {
-        for (const flow of excludeFlows) {
-            unfilteredFlowFiles = unfilteredFlowFiles.filter((file) => !file.startsWith(path.resolve(flow)));
-        }
-    }
-    // if config file present at top level, use it
-    const configFilePath = unfilteredFlowFiles.find((file) => file === input + 'config.yaml' || file === input + 'config.yml');
-    // remove all config files from the list to prevent processing them
-    unfilteredFlowFiles = unfilteredFlowFiles.filter((file) => !(file.endsWith('config.yaml') || file.endsWith('config.yml')));
-    const cleanPath = path.normalize(input);
-    const relativeFilePaths = unfilteredFlowFiles.map((file) => file.replace(cleanPath, ''));
-    const topLevelFlowFiles = relativeFilePaths.filter((file) => !file.includes('/'));
-    const workspaceConfig = configFilePath
-        ? (0, planMethods_1.readYamlFileAsJson)(configFilePath)
-        : {};
-    // list of relative file paths from search
-    let unsortedFlowFiles = topLevelFlowFiles;
+    unfilteredFlowFiles = filterFlowFiles(unfilteredFlowFiles, excludeFlows);
+    const workspaceConfig = getWorkspaceConfig(input, unfilteredFlowFiles);
     if (workspaceConfig.flows) {
         const globs = workspaceConfig.flows.map((glob) => glob);
         const matchedFiles = await (0, glob_1.glob)(globs, {
@@ -58,49 +72,25 @@ async function plan(input, includeTags, excludeTags, excludeFlows) {
             nodir: true,
         });
         // overwrite the list of files with the globbed ones
-        unsortedFlowFiles = matchedFiles.filter((file) => file !== 'config.yaml' &&
-            (file.endsWith('.yaml') || file.endsWith('.yml')));
+        unfilteredFlowFiles = matchedFiles
+            .filter((file) => file !== 'config.yaml' &&
+            (file.endsWith('.yaml') || file.endsWith('.yml')))
+            .map((file) => path.resolve(input, file));
     }
-    if (unsortedFlowFiles.length === 0) {
+    if (unfilteredFlowFiles.length === 0) {
         const error = workspaceConfig.flows
             ? new Error(`Flow inclusion pattern(s) did not match any Flow files:\n${workspaceConfig.flows.join('\n')}`)
-            : new Error(`Top-level directory does not contain any Flows: ${path.resolve(input)}`);
+            : new Error(`Workspace does not contain any Flows: ${path.resolve(input)}`);
         throw error;
     }
+    const configPerFlowFile = 
     // eslint-disable-next-line unicorn/no-array-reduce
-    const { configPerFlowFile } = unsortedFlowFiles.reduce((acc, filePath) => {
-        const { config } = (0, planMethods_1.readTestYamlFileAsJson)(cleanPath + filePath);
-        acc.configPerFlowFile[filePath] = config;
+    unfilteredFlowFiles.reduce((acc, filePath) => {
+        const { config } = (0, planMethods_1.readTestYamlFileAsJson)(filePath);
+        acc[filePath] = config;
         return acc;
-    }, {
-        configPerFlowFile: {},
-    });
-    // eslint-disable-next-line unicorn/no-array-reduce
-    const { testStepsPerFlowFile } = unfilteredFlowFiles.reduce((acc, filePath) => {
-        const { testSteps } = (0, planMethods_1.readTestYamlFileAsJson)(filePath);
-        acc.testStepsPerFlowFile[filePath] = testSteps;
-        return acc;
-    }, {
-        testStepsPerFlowFile: {},
-    });
-    let errors = [];
-    let allFiles = [];
-    for (const [filePath, testSteps] of Object.entries(testStepsPerFlowFile)) {
-        if (!testSteps)
-            break;
-        const { allErrors: errs, allFiles: deps } = (0, planMethods_1.processDependencies)({
-            config: configPerFlowFile[path.relative(cleanPath, filePath)],
-            directory: cleanPath,
-            input: filePath,
-            testSteps,
-        });
-        allFiles = [...allFiles, ...deps];
-        errors = [...errors, ...errs];
-    }
-    if (errors.length > 0) {
-        throw new Error('The following flow files are not present in the provided directory: \n' +
-            errors.join('\n'));
-    }
+    }, {});
+    const allFiles = await Promise.all(unfilteredFlowFiles.map((filePath) => checkDependencies(filePath))).then((results) => [...new Set(results.flat())]);
     const allIncludeTags = [
         ...includeTags,
         ...(workspaceConfig.includeTags || []),
@@ -109,7 +99,7 @@ async function plan(input, includeTags, excludeTags, excludeFlows) {
         ...excludeTags,
         ...(workspaceConfig.excludeTags || []),
     ];
-    const allFlows = unsortedFlowFiles.filter((filePath) => {
+    const allFlows = unfilteredFlowFiles.filter((filePath) => {
         const config = configPerFlowFile[filePath];
         const tags = config?.tags || [];
         return ((allIncludeTags.length === 0 ||
@@ -142,4 +132,3 @@ async function plan(input, includeTags, excludeTags, excludeFlows) {
         totalFlowFiles: unfilteredFlowFiles.length,
     };
 }
-exports.plan = plan;

package/dist/planMethods.d.ts

@@ -10,18 +10,17 @@ export declare const readTestYamlFileAsJson: (filePath: string) => {
     config: null;
     testSteps: Record<string, unknown>[];
 };
-export declare function walk(dir: string, filterFunction?: (filePath: string) => boolean): Promise<string[]>;
-export declare const checkIfFilesExistInWorkspace: (commandName: string, command: Record<string, string> | string | string[], filePath: string, cleanPath: string) => {
+export declare function readDirectory(dir: string, filterFunction?: (filePath: string) => boolean): Promise<string[]>;
+export declare const checkIfFilesExistInWorkspace: (commandName: string, command: Record<string, string> | string | string[], absoluteFilePath: string) => {
     errors: string[];
     files: string[];
 };
 interface IProcessDependencies {
     config?: Record<string, unknown> | null;
-    directory: string;
     input: string;
     testSteps: Record<string, unknown>[];
 }
-export declare const processDependencies: ({ config, directory, input, testSteps, }: IProcessDependencies) => {
+export declare const processDependencies: ({ config, input, testSteps, }: IProcessDependencies) => {
     allErrors: string[];
     allFiles: string[];
 };

package/dist/planMethods.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processDependencies = exports.checkIfFilesExistInWorkspace = exports.walk = exports.readTestYamlFileAsJson = exports.readYamlFileAsJson = exports.isFlowFile = exports.getFlowsToRunInSequence = void 0;
+exports.processDependencies = exports.checkIfFilesExistInWorkspace = exports.readTestYamlFileAsJson = exports.readYamlFileAsJson = void 0;
+exports.getFlowsToRunInSequence = getFlowsToRunInSequence;
+exports.isFlowFile = isFlowFile;
+exports.readDirectory = readDirectory;
 /* eslint-disable unicorn/filename-case */
 const yaml = require("js-yaml");
 const fs = require("node:fs");
@@ -28,11 +31,9 @@ function getFlowsToRunInSequence(paths, flowOrder) {
         return [];
     }
 }
-exports.getFlowsToRunInSequence = getFlowsToRunInSequence;
 function isFlowFile(filePath) {
     return filePath.endsWith('.yaml') || filePath.endsWith('.yml');
 }
-exports.isFlowFile = isFlowFile;
 const readYamlFileAsJson = (filePath) => {
     const yamlText = fs.readFileSync(filePath, 'utf8');
     return yaml.load(yamlText);
@@ -55,13 +56,11 @@ const readTestYamlFileAsJson = (filePath) => {
     return { config: null, testSteps };
 };
 exports.readTestYamlFileAsJson = readTestYamlFileAsJson;
-async function walk(dir, filterFunction) {
+async function readDirectory(dir, filterFunction) {
     const readDirResult = await fs.promises.readdir(dir);
     const files = await Promise.all(readDirResult.map(async (file) => {
         const filePath = path.join(dir, file);
         const stats = await fs.promises.stat(filePath);
-        if (stats.isDirectory())
-            return walk(filePath, filterFunction);
         if (stats.isFile())
             if (filterFunction) {
                 if (filterFunction(filePath))
@@ -73,22 +72,22 @@ async function walk(dir, filterFunction) {
     }));
     return files.flat().filter(Boolean);
 }
-exports.walk = walk;
-const checkIfFilesExistInWorkspace = (commandName, command, filePath, cleanPath) => {
+const checkIfFilesExistInWorkspace = (commandName, command, absoluteFilePath) => {
     const errors = [];
     const files = [];
-    const directory = path.dirname(filePath);
-    const buildError = (error) => `Flow file "${filePath.replace(cleanPath, './')}" has a command "${commandName}" that references a ${error} ${JSON.stringify(command)}`;
+    const directory = path.dirname(absoluteFilePath);
+    const buildError = (error) => `Flow file "${absoluteFilePath}" has a command "${commandName}" that references a ${error} ${JSON.stringify(command)}`;
     const processFilePath = (relativePath) => {
         const absoluteFilePath = path.resolve(directory, relativePath);
-        const error = checkFile(absoluteFilePath, cleanPath);
+        const error = checkFile(absoluteFilePath);
         if (error)
             errors.push(buildError(error));
-        files.push(absoluteFilePath.replace(cleanPath, './'));
+        files.push(absoluteFilePath);
     };
     // simple command
-    if (typeof command === 'string')
-        processFilePath(command);
+    if (typeof command === 'string') {
+        processFilePath(path.normalize(directory + '/' + command));
+    }
     // array command
     if (Array.isArray(command)) {
         for (const file of command) {
@@ -102,13 +101,11 @@ const checkIfFilesExistInWorkspace = (commandName, command, filePath, cleanPath)
     return { errors, files };
 };
 exports.checkIfFilesExistInWorkspace = checkIfFilesExistInWorkspace;
-const checkFile = (filePath, cleanPath) => {
+const checkFile = (filePath) => {
     if (!fs.existsSync(filePath))
         return `non-existent file`;
-    if (!filePath.startsWith(cleanPath))
-        return `file outside the workspace`;
 };
-const checkStepsArray = (steps, input, directory) => {
+const checkStepsArray = (steps, absoluteFilePath) => {
     let errors = [];
     let files = [];
     for (const command of steps) {
@@ -116,14 +113,14 @@ const checkStepsArray = (steps, input, directory) => {
             continue;
         for (const [commandName, commandValue] of Object.entries(command)) {
             if (commandsThatRequireFiles.has(commandName)) {
-                const { errors: newErrors, files: newFiles } = (0, exports.checkIfFilesExistInWorkspace)(commandName, commandValue, path.normalize(input), directory);
+                const { errors: newErrors, files: newFiles } = (0, exports.checkIfFilesExistInWorkspace)(commandName, commandValue, path.normalize(absoluteFilePath));
                 errors = [...errors, ...newErrors];
                 files = [...files, ...newFiles];
             }
             const nestedCommands = typeof commandValue === 'object' &&
                 commandValue.commands;
             if (nestedCommands) {
-                const { errors: newErrors, files: newFiles } = checkStepsArray(nestedCommands, input, directory);
+                const { errors: newErrors, files: newFiles } = checkStepsArray(nestedCommands, absoluteFilePath);
                 errors = [...errors, ...newErrors];
                 files = [...files, ...newFiles];
             }
@@ -131,7 +128,7 @@ const checkStepsArray = (steps, input, directory) => {
     }
     return { errors, files };
 };
-const processDependencies = ({ config, directory, input, testSteps, }) => {
+const processDependencies = ({ config, input, testSteps, }) => {
     let allErrors = [];
     let allFiles = [];
     const { onFlowComplete, onFlowStart } = config ?? {};
@@ -142,7 +139,7 @@ const processDependencies = ({ config, directory, input, testSteps, }) => {
         stepsArray.push(onFlowComplete);
     for (const [index, steps] of stepsArray.entries()) {
         try {
-            const { errors, files } = checkStepsArray(steps, input, directory);
+            const { errors, files } = checkStepsArray(steps, input);
             allErrors = [...allErrors, ...errors];
             allFiles = [...allFiles, ...files];
         }

package/oclif.manifest.json

@@ -19,6 +19,22 @@
         "<%= config.bin %> <%= command.id %>"
       ],
       "flags": {
+        "additional-app-binary-ids": {
+          "description": "The ID of the additional app binary(s) previously uploaded to devicecloud.dev to install before execution",
+          "name": "additional-app-binary-ids",
+          "default": [],
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        },
+        "additional-app-files": {
+          "description": "Additional app binary(s) to install before execution",
+          "name": "additional-app-files",
+          "default": [],
+          "hasDynamicHelp": false,
+          "multiple": true,
+          "type": "option"
+        },
         "android-api-level": {
           "description": "[Android only] Android API level to run your flow against",
           "name": "android-api-level",
@@ -275,5 +291,5 @@
       ]
     }
   },
-  "version": "1.0.11"
+  "version": "2.0.0-rc.3"
 }

package/package.json

@@ -64,10 +64,6 @@
     ]
   },
   "private": false,
-  "repository": {
-    "type": "git",
-    "url": "@devicecloud.dev/dcd"
-  },
   "scripts": {
     "dcd": "./bin/dev.js",
     "prod": "./bin/run.js",
@@ -80,7 +76,7 @@
     "test": "mocha --forbid-only \"test/**/*.test.ts\"",
     "version": "oclif readme && git add README.md"
   },
-  "version": "1.0.11",
+  "version": "2.0.0-rc.3",
   "bugs": {
     "url": "https://discord.gg/gm3mJwcNw8"
   },