-x flag runs a replace against all files if a directory is given, not just html files

Author: cullenjett

README.md

@@ -11,7 +11,7 @@ npm install -g quickbase-cli
 ```
 
 ## Usage
-quickbase-cli can be used for basic QuickBase code page development. It's possible to use quickbase-cli with modern SPA cli tools (angular cli, create-react-app, vue cli, etc.), but there are some pretty significant caveats. Check out the `qb deploy` command options (`-x` specifically) for details.
+quickbase-cli can be used for basic QuickBase code page development. It's probably possible to use quickbase-cli with modern SPA cli tools (angular cli, create-react-app, vue cli, etc.), but I haven't actually tried it so let me know how it goes.
 
 There are three commands available for quickbase-cli:
 - qb init
@@ -72,8 +72,8 @@ This will upload the file(s) at `<file path or directory>` to the QuickBase appl
 **THAT WAS AN IMPORTANT FACT, PAY ATTENTION WHEN RUNNING `qb deploy` -- DON'T UPLOAD YOUR NODE_MODULES DIRECTORY TO QUICKBASE...**
 
 There are two optional flags that can be passed to `qb deploy`. You can use them individually or multiple at a time:
-- `-w` (or `--watch`): watch for changes to `<file path or directory>` and deploy to QuickBase on change. After the initial deploy only the file that changes will be uploaded to QuickBase.
-- `-x` (or `--replace`): If you pass a directory to `qb deploy` then all .html files will run through a regex to replace asset file includes (i.e. `<script src="bundle.js"></script>` and/or `<link href="bundle.css"/>`) with their new QuickBase urls (`<script src="realm.quickbase.com/db/dbayemay?a=dbpage&pageID=123"></script>`). **Only .html files will have asset paths replaced, which means any asset paths inside your javascript (including React `<img />` src attributes) won't be replaced.** This is a good chunk of effort to implement efficiently, so I'll leave that as a potential path to greatness for anyone willing to put in the effort (PRs are always welcome).
+- `-w` (or `--watch`): watch for changes to `<file path or directory>` and deploy to QuickBase on change. After the initial deploy only the file that changes will be uploaded to QuickBase unless the `-x` flag is also passed, in which case the entire `<file path or directory>` source will be uploaded.
+- `-x` (or `--replace`): If you pass a directory to `qb deploy` then all files will run through a regex to replace asset file includes (i.e. `<script src="bundle.js"></script>`, `<link href="bundle.css"/>`, etc.) with their new QuickBase urls (`<script src="realm.quickbase.com/db/dbayemay?a=dbpage&pageID=123"></script>`). This is in no way an optimized command, so I'd avoid running it on YUGE directories.
 
 ### qb new (mostly useless)
 ```bash
@@ -94,4 +94,4 @@ For now this is only a wrapper around `git clone`. After you pull down a repo yo
 
 * ~~Moves are being made to add cool shit like a build process, global defaults, awesome starter templates, and pulling down existing code files from QuickBase. They're not out yet, so for now you're on your own.~~
 
-* I no longer work with QuickBase applications, so the cool shit I had planned won't happen unless someone submits some dope ass pull requests.
+* I no longer work with QuickBase applications, so the cool shit I had planned won't happen unless someone submits some dope pull requests.

bin/qb-deploy.js

@@ -7,10 +7,14 @@ const fs = require('fs');
 const path = require('path');
 const program = require('commander');
 const watch = require('chokidar').watch;
+const util = require('util');
 
 const ApiClient = require('../lib/api');
 const { getFiles } = require('../lib/get-files');
 
+const readFile = util.promisify(fs.readFile);
+const stat = util.promisify(fs.stat);
+
 program
   .option('-w, --watch', 'deploy files on change')
   .option(
@@ -30,13 +34,18 @@ if (program.watch) {
   console.log(`Watching for file changes in ${sourceArg}`);
 
   watch(sourceArg, {}).on('change', fileName => {
-    console.log(`\nChange detected in ${fileName}. Deploying...`);
-    qbDeploy(fileName);
+    console.log(`\nChange detected in ${fileName}`);
+    program.replace
+      ? qbDeploy(sourceArg)
+      : qbDeploy(fileName);
   });
 }
 
-function qbDeploy(source) {
-  let isFile = fs.statSync(source).isFile();
+async function qbDeploy(source) {
+  console.log('Uploading files to QuickBase...');
+
+  const stats = await fs.statSync(source);
+  const isFile = stats.isFile();
 
   if (isFile) {
     return uploadToQuickbase(source)
@@ -48,24 +57,14 @@ function qbDeploy(source) {
 
   if (!isFile) {
     getFiles(source).then(files => {
-      const { htmlFiles, assetFiles } = files;
-
-      const uploadHtmlFiles = program.replace
-        ? replaceUrlsAndUpload(htmlFiles, assetFiles)
-        : htmlFiles.map(htmlFile => uploadToQuickbase(htmlFile));
-
-      const uploadAssetFiles = assetFiles.map(assetFile =>
-        uploadToQuickbase(assetFile)
-      );
+      const uploadPromises = program.replace
+        ? files.map(file => replaceUrlsAndUpload(file, files))
+        : files.map(file => uploadToQuickbase(file));
 
-      const uploadAllFiles = uploadHtmlFiles.concat(uploadAssetFiles);
-
-      return Promise.all(uploadAllFiles)
+      return Promise.all(uploadPromises)
         .then(res =>
           console.log(
-            `Successfully uploaded to QuickBase:\n=> ${htmlFiles
-              .concat(assetFiles)
-              .join('\n=> ')}`
+            `Successfully uploaded to QuickBase:\n=> ${files.join('\n=> ')}`
           )
         )
         .catch(err => console.error(err));
@@ -90,23 +89,22 @@ function uploadToQuickbase(file, fileContents) {
   return api.uploadPage(codePageName, fileContents);
 }
 
-function replaceUrlsAndUpload(htmlFiles, assetFiles) {
-  return htmlFiles.map(htmlFile => {
-    let htmlContent = fs.readFileSync(htmlFile, 'utf-8');
+async function replaceUrlsAndUpload(file, allFiles) {
+  let fileContents = await readFile(file, 'utf-8');
 
-    assetFiles.forEach(assetFile => {
+  allFiles.forEach(assetFile => {
+    if (file !== assetFile) {
       const fileName = path.basename(assetFile);
       const regex = new RegExp(`("|')[^"]*${fileName}("|')`, 'g');
 
-      htmlContent = htmlContent.replace(
+      fileContents = fileContents.replace(
         regex,
         generateCustomPageUrl(path.basename(assetFile))
       );
-    });
-
-    console.log(htmlContent);
-    return uploadToQuickbase(htmlFile, htmlContent);
+    }
   });
+
+  return uploadToQuickbase(file, fileContents);
 }
 
 function generateCustomPageUrl(fileName) {

lib/find-config.js

@@ -1,12 +1,19 @@
-let fs = require('fs');
-let path = require('path');
+const fs = require('fs');
+const path = require('path');
 
 const CONFIG_FILE_NAME = 'quickbase-cli.config.js';
 
-const findConfig = source => {
+const findConfig = (source, count = 1) => {
+  if (count > 10) {
+    console.log(
+      'Couldn\'t find a "quickbase-cli.config.js" file. Make sure you\'ve run "qb init" in the root of your app.'
+    );
+    process.exit(1);
+  }
+
   source = path.resolve(source);
 
-  let isFile = fs.statSync(source).isFile();
+  const isFile = fs.statSync(source).isFile();
   let children, parentDir;
 
   if (isFile) {
@@ -17,12 +24,12 @@ const findConfig = source => {
     children = fs.readdirSync(source);
   }
 
-  let configFile = children.find(file => file == CONFIG_FILE_NAME);
+  const configFile = children.find(file => file == CONFIG_FILE_NAME);
 
   if (configFile) {
     return path.join(parentDir, CONFIG_FILE_NAME);
   } else {
-    return findConfig(path.join(source, '..'));
+    return findConfig(path.join(source, '..'), count + 1);
   }
 };
 

lib/get-files.js

@@ -6,16 +6,11 @@ const readdir = util.promisify(fs.readdir);
 const stat = util.promisify(fs.stat);
 
 async function getFiles(source) {
-  const files = {
-    htmlFiles: [],
-    assetFiles: []
-  };
+  const files = [];
 
   await traverse(source, filePath => {
-    if (path.extname(filePath) == '.html') {
-      files.htmlFiles.push(filePath);
-    } else if (path.basename(filePath) !== 'quickbase-cli.config.js') {
-      files.assetFiles.push(filePath);
+    if (path.basename(filePath) !== 'quickbase-cli.config.js') {
+      files.push(filePath);
     }
   });