@dynamicweb/cli 1.0.1 → 1.0.3

package/bin/commands/env.js

@@ -40,15 +40,27 @@ export function envCommand() {
 }
 
 export async function setupEnv(argv) {
-    let env;
-    if (getConfig().env) {
+    let env = {};
+    let askEnv = true;
+
+    if (argv.host) {
+        askEnv = false;
+        env.host = argv.host;
+        if (argv.protocol) {
+            env.protocol = argv.protocol;
+        } else {
+            env.protocol = 'https';
+        }
+    }
+
+    if (askEnv && getConfig().env) {
         env = getConfig().env[argv.env] || getConfig().env[getConfig()?.current?.env];
         if (!env.protocol) {
             console.log('Protocol for environment not set, defaulting to https');
             env.protocol = 'https';
         }
     }
-    if (!env) {
+    else if (askEnv) {
         console.log('Current environment not set, please set it')
         await interactiveEnv(argv, {
             environment: {

package/bin/commands/files.js

@@ -35,19 +35,28 @@ export function filesCommand() {
                 type: 'boolean',
                 describe: 'Imports the file at [dirPath] to [outPath]'
             })
+            .option('overwrite', {
+                alias: 'o',
+                type: 'boolean',
+                describe: 'Used with import, will overwrite existing files at destrination if set to true'
+            })
+            .option('createEmpty', {
+                type: 'boolean',
+                describe: 'Used with import, will create a file even if its empty'
+            })
             .option('includeFiles', {
                 alias: 'f',
                 type: 'boolean',
-                describe: 'Includes files in list of directories and files'
+                describe: 'Used with export, includes files in list of directories and files'
             })
             .option('recursive', {
                 alias: 'r',
                 type: 'boolean',
-                describe: 'Handles all directories recursively'
+                describe: 'Used with list, import and export, handles all directories recursively'
             })
             .option('raw', {
                 type: 'boolean',
-                describe: 'Keeps zip file instead of unpacking it'
+                describe: 'Used with export, keeps zip file instead of unpacking it'
             })
             .option('iamstupid', {
                 type: 'boolean',
@@ -91,12 +100,61 @@ async function handleFiles(argv) {
         }
     } else if (argv.import) {
         if (argv.dirPath && argv.outPath) {
-            let resolvedPath = path.resolve(argv.dirPath)
-            await uploadFile(env, user, resolvedPath, argv.outPath);
+            let resolvedPath = path.resolve(argv.dirPath);
+            let files;
+            if (!argv.overwrite) {
+                files = (await getFilesStructure(env, user, argv.outPath, argv.recursive, true)).model;
+            }
+            if (argv.recursive) {
+                await processDirectory(env, user, resolvedPath, argv.outPath, files, resolvedPath, argv.createEmpty, true);
+            } else {
+                let filesInDir = getFilesInDirectory(resolvedPath);
+                if (files)
+                    filesInDir = getFilesNotInData(filesInDir, files.files.data, resolvedPath);
+                await uploadFiles(env, user, filesInDir, argv.outPath, argv.createEmpty);
+            }
         }
     }
 }
 
+function convertToDataFormat(filePath, resolvedPath) {
+    const relativePath = `/Files${filePath.substring(resolvedPath.length)}`;
+    return path.format(path.parse(relativePath)).replace(/\\/g, '/');
+}
+
+function getFilesNotInData(filesInDir, data, resolvedPath) {
+    const existingPaths = data.map(file => file.filePath);
+    return filesInDir.filter(filePath => {
+        const convertedPath = convertToDataFormat(filePath, resolvedPath);
+        return !existingPaths.includes(convertedPath);
+    });
+}
+
+function getFilesInDirectory(dirPath) {
+    return fs.readdirSync(dirPath)
+            .map(file => path.join(dirPath, file))
+            .filter(file => fs.statSync(file).isFile());
+}
+
+async function processDirectory(env, user, dirPath, outPath, files, originalDir, createEmpty, isRoot = false) {
+    let filesInDir = getFilesInDirectory(dirPath);
+    let missingFiles;
+    if (files === undefined)
+        missingFiles = filesInDir;
+    else
+        missingFiles = getFilesNotInData(filesInDir, files.files.data, originalDir);
+    if (missingFiles.length > 0)
+        await uploadFiles(env, user, missingFiles, isRoot ? outPath : path.join(outPath, path.basename(dirPath)), createEmpty);
+
+    const subDirectories = fs.readdirSync(dirPath)
+                            .map(subDir => path.join(dirPath, subDir))
+                            .filter(subDir => fs.statSync(subDir).isDirectory());
+    for (let subDir of subDirectories) {
+        const remoteSubDir = files?.directories.find(dir => dir.name === path.basename(subDir));
+        await processDirectory(env, user, subDir, isRoot ? outPath : path.join(outPath, path.basename(dirPath)), remoteSubDir, originalDir, createEmpty);
+    }
+}
+
 function resolveTree(dirs, indentLevel, parentHasFiles) {
     let end = `└──`
     let mid = `├──`
@@ -208,12 +266,15 @@ async function getFilesStructure(env, user, dirPath, recursive, includeFiles) {
     }
 }
 
-export async function uploadFile(env, user, localFilePath, destinationPath) {
-    console.log('Uploading file')
+export async function uploadFiles(env, user, localFilePaths, destinationPath, createEmpty = false) {
+    console.log('Uploading files')
     let form = new FormData();
     form.append('path', destinationPath);
-    form.append('files', fs.createReadStream(localFilePath));
-    let res = await fetch(`${env.protocol}://${env.host}/Admin/Api/Upload`, {
+    localFilePaths.forEach((localPath, index) => {
+        console.log(localPath)
+        form.append('files', fs.createReadStream(path.resolve(localPath)));
+    });
+    let res = await fetch(`${env.protocol}://${env.host}/Admin/Api/Upload?` + new URLSearchParams({"createEmptyFiles": createEmpty}), {
         method: 'POST',
         body: form,
         headers: {
@@ -223,7 +284,7 @@ export async function uploadFile(env, user, localFilePath, destinationPath) {
     });
     if (res.ok) {
         if (env.verbose) console.log(await res.json())
-        console.log(`File uploaded`)
+        console.log(`Files uploaded`)
     }
     else {
         console.log(res)

package/bin/commands/install.js

@@ -2,7 +2,7 @@ import fetch from 'node-fetch';
 import path from 'path';
 import { setupEnv, getAgent } from './env.js';
 import { setupUser } from './login.js';
-import { uploadFile } from './files.js';
+import { uploadFiles } from './files.js';
 
 export function installCommand() {
     return {
@@ -25,7 +25,7 @@ async function handleInstall(argv) {
     let env = await setupEnv(argv);
     let user = await setupUser(argv, env);
     let resolvedPath = path.resolve(argv.filePath)
-    await uploadFile(env, user, resolvedPath, 'System/AddIns/Local');
+    await uploadFiles(env, user, [resolvedPath], 'System/AddIns/Local');
     await installAddin(env, user, resolvedPath)
 }
 

package/bin/commands/login.js

@@ -18,11 +18,24 @@ export function loginCommand() {
 }
 
 export async function setupUser(argv, env) {
-    let user;
-    if (env.users) {
+    let user = {};
+    let askLogin = true;
+
+    if (argv.apiKey) {
+        user.apiKey = argv.apiKey;
+        askLogin = false;
+    }
+
+    if (!user.apiKey && env.users) {
         user = env.users[argv.user] || env.users[env.current.user];
+        askLogin = false;
     }
-    if (!user) {
+
+    if (askLogin && argv.host) {
+        console.log('Please add an --apiKey to the command as overriding the host requires that.')
+        process.exit();
+    }
+    else if (askLogin) {
         console.log('Current user not set, please login')
         await interactiveLogin(argv, {
             environment: {
@@ -42,6 +55,7 @@ export async function setupUser(argv, env) {
         })
         user = env.users[env.current.user];
     }
+
     return user;
 }
 

package/bin/index.js

@@ -31,6 +31,15 @@ yargs(hideBin(process.argv))
         type: 'boolean',
         description: 'Run with verbose logging'
     })
+    .option('protocol', {
+        description: 'Allows setting the protocol used, only used together with --host, defaulting to https'
+    })
+    .option('host', {
+        description: 'Allows setting the host used, only allowed if an --apiKey is specified'
+    })
+    .option('apiKey', {
+        description: 'Allows setting the apiKey for an environmentless execution of the CLI command'
+    })
     .demandCommand()
     .parse()
 

package/package.json

@@ -2,7 +2,7 @@
   "name": "@dynamicweb/cli",
   "type": "module",
   "description": "Dynamicweb CLI is a commandline tool for interacting with Dynamicweb 10 solutions.",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "main": "bin/index.js",
   "files": [
     "bin/*"