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

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';

package/dist/plan.js

@@ -1,49 +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 { 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,
-            input,
+            input: fileToCheck,
             testSteps,
         });
         if (allErrors.length > 0) {
             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],
-            referencedFiles: [...new Set(allFiles)],
+            referencedFiles: [...new Set(checkedDependancies)],
             totalFlowFiles: 1,
         };
     }
-    // raw list of all yaml files in workspace directory
     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 workspaceConfig = configFilePath
-        ? (0, planMethods_1.readYamlFileAsJson)(configFilePath)
-        : {};
+    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, {
@@ -62,34 +83,14 @@ async function plan(input, includeTags, excludeTags, excludeFlows) {
             : new Error(`Workspace does not contain any Flows: ${path.resolve(input)}`);
         throw error;
     }
-    const { configPerFlowFile, testStepsPerFlowFile } = 
+    const configPerFlowFile = 
     // eslint-disable-next-line unicorn/no-array-reduce
     unfilteredFlowFiles.reduce((acc, filePath) => {
-        const { config, testSteps } = (0, planMethods_1.readTestYamlFileAsJson)(filePath);
-        acc.configPerFlowFile[filePath] = config;
-        acc.testStepsPerFlowFile[filePath] = testSteps;
+        const { config } = (0, planMethods_1.readTestYamlFileAsJson)(filePath);
+        acc[filePath] = config;
         return acc;
-    }, {
-        configPerFlowFile: {},
-        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[filePath],
-            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 || []),
@@ -131,4 +132,3 @@ async function plan(input, includeTags, excludeTags, excludeFlows) {
         totalFlowFiles: unfilteredFlowFiles.length,
     };
 }
-exports.plan = plan;

package/dist/planMethods.js

@@ -1,6 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.processDependencies = exports.checkIfFilesExistInWorkspace = exports.readDirectory = 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);
@@ -71,7 +72,6 @@ async function readDirectory(dir, filterFunction) {
     }));
     return files.flat().filter(Boolean);
 }
-exports.readDirectory = readDirectory;
 const checkIfFilesExistInWorkspace = (commandName, command, absoluteFilePath) => {
     const errors = [];
     const files = [];
@@ -85,8 +85,9 @@ const checkIfFilesExistInWorkspace = (commandName, command, absoluteFilePath) =>
         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) {

package/oclif.manifest.json

@@ -291,5 +291,5 @@
       ]
     }
   },
-  "version": "2.0.0-rc.2"
+  "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": "2.0.0-rc.2",
+  "version": "2.0.0-rc.3",
   "bugs": {
     "url": "https://discord.gg/gm3mJwcNw8"
   },