@dynamicweb/cli 1.0.9 → 1.0.11

package/bin/commands/files.js

@@ -112,7 +112,7 @@ async function handleFiles(argv) {
 }
 
 function getFilesInDirectory(dirPath) {
-    return fs.readdirSync(dirPath)
+    return fs.statSync(dirPath).isFile() ? [ dirPath ] : fs.readdirSync(dirPath)
             .map(file => path.join(dirPath, file))
             .filter(file => fs.statSync(file).isFile());
 }
@@ -283,13 +283,14 @@ export function resolveFilePath(filePath) {
         console.log('Could not find any files with the name ' + filePath);
         process.exit(1);
     }
-    return resolvedPath;
+    return path.join(p.dir, resolvedPath);
 }
 
 function wildcardToRegExp(wildcard) {
     return new RegExp('^' + wildcard
       .replace(/\./g, '\\.')
       .replace(/\*/g, '.*')
+      .replace(/\+/g, '.+')
       .replace(/\?/g, '.')
       + '$');
 }

package/bin/commands/query.js

@@ -54,16 +54,25 @@ async function getProperties(argv) {
     })
     if (res.ok) {
         let body = await res.json()
-        return body.model.propertyNames
+        if (body.model.properties.groups === undefined) {
+            console.log('Unable to fetch query parameters');
+            process.exit(1);
+        }
+        return body.model.properties.groups.filter(g => g.name === 'Properties')[0].fields.map(field => `${field.name} (${field.typeName})`)
     }
-    console.log(res)
+    console.log('Unable to fetch query parameters');
+    console.log(res);
+    process.exit(1);
 }
 
 async function getQueryParams(argv) {
     let params = {}
     if (argv.interactive) {
         let props = { interactive: { default: true }}
-        Array.from(await getProperties(argv)).forEach(p => props[p] = { type: 'input', prompt: 'if-no-arg'})
+        let properties = await getProperties(argv);
+        console.log('The following properties will be requested:')
+        console.log(properties)
+        Array.from(properties).forEach(p => props[p] = { type: 'input', prompt: 'if-no-arg'})
         await yargsInteractive()
         .interactive(props)
         .then((result) => {

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.9",
+  "version": "1.0.11",
   "main": "bin/index.js",
   "files": [
     "bin/*"