@devicecloud.dev/dcd 0.0.5 → 0.0.7

package/dist/commands/cloud.js

@@ -51,6 +51,7 @@ class Cloud extends core_1.Command {
     static flags = constants_1.flags;
     async run() {
         try {
+            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, env, 'exclude-tags': excludeTags, flows, 'google-play': googlePlay, 'include-tags': includeTags, 'ios-device': iOSDevice, 'ios-version': iOSVersion, name, orientation, ...rest } = flags;
             if (arm64) {
@@ -177,6 +178,7 @@ class Cloud extends core_1.Command {
                 continueOnFailure,
                 orientation,
                 raw,
+                version: this.config.version,
             }));
             if (androidApiLevel)
                 testFormData.set('androidApiLevel', androidApiLevel.toString());
@@ -204,7 +206,7 @@ class Cloud extends core_1.Command {
                 .map((r) => r.test_file_name)
                 .join(', ')}\n`);
             (0, cli_ux_1.info)('Run triggered, you can access the results at:');
-            const url = `https://console.devicecloud.dev/results/${results[0].test_upload_id}/${results[0].id}`;
+            const url = `https://console.devicecloud.dev/results?upload=${results[0].test_upload_id}&result=${results[0].id}`;
             core_1.ux.url(url, url);
             if (async) {
                 (0, cli_ux_1.info)('Not waiting for results as async flag is set to true');

package/dist/methods.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import * as archiver from 'archiver';
 import { paths } from '../../api/schema.types';
+export declare const versionCheck: (currentVersion: string) => Promise<void>;
 export declare const typeSafePost: <T extends keyof paths>(baseUrl: string, path: string, init?: {
     body?: FormData;
     headers?: HeadersInit;

package/dist/methods.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.verifyAppZip = exports.compressFilesFromRelativePath = exports.compressFolderToBlob = exports.compressDir = exports.toBuffer = exports.typeSafeGet = exports.typeSafePost = void 0;
+exports.verifyAppZip = exports.compressFilesFromRelativePath = exports.compressFolderToBlob = exports.compressDir = exports.toBuffer = exports.typeSafeGet = exports.typeSafePost = exports.versionCheck = void 0;
+const cli_ux_1 = require("@oclif/core/lib/cli-ux");
 const archiver = require("archiver");
 // import { writeFile } from 'node:fs/promises';
 const nodePath = require("node:path");
@@ -16,6 +17,20 @@ const PERMITTED_EXTENSIONS = new Set([
     'mp4',
     'js',
 ]);
+const versionCheck = async (currentVersion) => {
+    const versionResponse = await fetch('https://registry.npmjs.org/@devicecloud.dev/dcd/latest');
+    const versionResponseJson = await versionResponse.json();
+    const latestVersion = versionResponseJson.version;
+    if (latestVersion !== currentVersion) {
+        (0, cli_ux_1.warn)(`
+-------------------
+A new version of the devicecloud.dev CLI is available: ${latestVersion}
+Run 'npm install -g @devicecloud.dev/dcd' to update to the latest version
+-------------------
+`);
+    }
+};
+exports.versionCheck = versionCheck;
 const typeSafePost = async (baseUrl, path, init) => {
     const res = await fetch(baseUrl + path, { ...init, method: 'POST' });
     if (!res.ok) {

package/dist/plan.js

@@ -12,15 +12,15 @@ async function plan(input, includeTags, excludeTags) {
     if (fs.lstatSync(input).isFile()) {
         const directory = path.dirname(input) + '/';
         const { config, testSteps } = (0, planMethods_1.readTestYamlFileAsJson)(input);
-        const { allFiles, errors } = (0, planMethods_1.processDependencies)({
+        const { allErrors, allFiles } = (0, planMethods_1.processDependencies)({
             config,
             directory,
             input,
             testSteps,
         });
-        if (errors.length > 0) {
+        if (allErrors.length > 0) {
             throw new Error('The following flow files are not present in the provided directory: \n' +
-                errors.join('\n'));
+                allErrors.join('\n'));
         }
         return {
             flowsToRun: [input.split('/').pop() ?? input],
@@ -78,7 +78,7 @@ async function plan(input, includeTags, excludeTags) {
     for (const [filePath, testSteps] of Object.entries(testStepsPerFlowFile)) {
         if (!testSteps)
             break;
-        const { allFiles: deps, errors: errs } = (0, planMethods_1.processDependencies)({
+        const { allErrors: errs, allFiles: deps } = (0, planMethods_1.processDependencies)({
             config: configPerFlowFile[path.relative(cleanPath, filePath)],
             directory: cleanPath,
             input: filePath,

package/dist/planMethods.d.ts

@@ -22,7 +22,7 @@ interface IProcessDependencies {
     testSteps: Record<string, unknown>[];
 }
 export declare const processDependencies: ({ config, directory, input, testSteps, }: IProcessDependencies) => {
+    allErrors: string[];
     allFiles: string[];
-    errors: string[];
 };
 export {};

package/dist/planMethods.js

@@ -108,8 +108,31 @@ const checkFile = (filePath, cleanPath) => {
     if (!filePath.startsWith(cleanPath))
         return `file outside the workspace`;
 };
-const processDependencies = ({ config, directory, input, testSteps, }) => {
+const checkStepsArray = (steps, input, directory) => {
     let errors = [];
+    let files = [];
+    for (const command of steps) {
+        if (typeof command === 'string')
+            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);
+                errors = [...errors, ...newErrors];
+                files = [...files, ...newFiles];
+            }
+            const nestedCommands = typeof commandValue === 'object' &&
+                commandValue.commands;
+            if (nestedCommands) {
+                const { errors: newErrors, files: newFiles } = checkStepsArray(nestedCommands, input, directory);
+                errors = [...errors, ...newErrors];
+                files = [...files, ...newFiles];
+            }
+        }
+    }
+    return { errors, files };
+};
+const processDependencies = ({ config, directory, input, testSteps, }) => {
+    let allErrors = [];
     let allFiles = [];
     const { onFlowComplete, onFlowStart } = config ?? {};
     const stepsArray = [testSteps];
@@ -117,19 +140,17 @@ const processDependencies = ({ config, directory, input, testSteps, }) => {
         stepsArray.push(onFlowStart);
     if (onFlowComplete)
         stepsArray.push(onFlowComplete);
-    for (const steps of stepsArray) {
-        for (const command of steps) {
-            if (typeof command === 'string')
-                continue;
-            for (const [commandName, commandValue] of Object.entries(command)) {
-                if (commandsThatRequireFiles.has(commandName)) {
-                    const { errors: newErrors, files } = (0, exports.checkIfFilesExistInWorkspace)(commandName, commandValue, path.normalize(input), directory);
-                    errors = [...errors, ...newErrors];
-                    allFiles = [...allFiles, ...files];
-                }
-            }
+    for (const [index, steps] of stepsArray.entries()) {
+        try {
+            const { errors, files } = checkStepsArray(steps, input, directory);
+            allErrors = [...allErrors, ...errors];
+            allFiles = [...allFiles, ...files];
+        }
+        catch {
+            const location = ['Test Steps', 'On Flow Start', 'On Flow Complete'][index];
+            throw new Error(`Error processing dependencies for file ${input} in the ${location} section. Expected an array of steps but received: ${JSON.stringify(steps)}`);
         }
     }
-    return { allFiles, errors };
+    return { allErrors, allFiles };
 };
 exports.processDependencies = processDependencies;

package/oclif.manifest.json

@@ -220,5 +220,5 @@
       ]
     }
   },
-  "version": "0.0.5"
+  "version": "0.0.7"
 }

package/package.json

@@ -73,7 +73,7 @@
     "test": "mocha --forbid-only \"test/**/*.test.ts\"",
     "version": "oclif readme && git add README.md"
   },
-  "version": "0.0.5",
+  "version": "0.0.7",
   "bugs": {
     "url": "https://discord.gg/gm3mJwcNw8"
   },