markdown-magic 3.3.0 → 3.3.2

package/lib/cli.js

@@ -1,184 +1,37 @@
-
 const path = require('path')
-const isGlob = require('is-glob')
-const isValidFilePath = require('is-valid-path')
 const { loadConfig } = require('./utils/load-config')
 const { findUp } = require('./utils/fs')
 const { markdownMagic } = require('./')
 const { parse } = require('oparser')
-const { deepLog } = require('./utils/logs')
-const { REGEX_REGEX, escapeRegexString } = require('./utils/regex')
-const { getFirstCharacter, isUpperCase } = require('./utils/text')
+const { getGlobGroupsFromArgs } = require('./globparse')
+// const { deepLog } = require('./utils/logs')
+// const { uxParse } = require('./argparse/argparse')
 const argv = process.argv.slice(2)
 const cwd = process.cwd()
 const defaultConfigPath = 'md.config.js'
 
-const ARRAY_REGEX = /^\[(.*)\]$/
-const NOT_OBJECT_LIKE = /^{[^:,]*}/
-const IS_KEY_VALUE_NON_ARRAY = /^([A-Za-z0-9_]*)=\s?([^\[\{]]*)([^\[\{]*)$/
-
-function isArrayLike(str) {
-  if (typeof str !== 'string') return false
-  return Boolean(ARRAY_REGEX.test(str))
-}
-
 async function getBaseDir(opts = {}) {
   const { currentDir = cwd } = opts
   const gitDir = await findUp(currentDir, '.git')
   return (gitDir) ? path.dirname(gitDir) : currentDir
 }
 
-function stringLooksLikeFile(value) {
-  return !value.match(/^-+/) // isn't option looking
-  && isValidFilePath(value)
-  && (
-    path.basename(value).indexOf('.') > -1 // has period
-    || getFirstCharacter(value) === '_' // starts with _
-    // || isUpperCase(value) // is all caps
-    )
+function findSingleDashStrings(arr) {
+  return arr.filter(str => str.match(/^-[^-]/))
 }
 
-function getValue(val) {
-  return (val[1] !== '=') ? val[1] : val[0]
-}
-
-function trimLeadingDashes(value) {
-  return value.replace(/^-+/, '')
-}
-
-function removeNodeModules(value = '') {
-  if (typeof value !== 'string') {
-    return true
-  }
-  return !value.match(/node_modules\//)
-}
-
-function coerceStringToRegex(str) {
-  const isRegex = str.match(REGEX_REGEX)
-  if (!isRegex) {
-    return str
-  }
-  const [ _match, pattern, flags ] = isRegex
-  return new RegExp(escapeRegexString(pattern), flags)
-}
-
-function convertToArray(str = '') {
-  const { fixedArray } = parse(`fixedArray=${str}`)
-  return (fixedArray || [])
-}
-
-function addValue(value, currentCollection) {
-  if (isArrayLike(value)) {
-    const array = convertToArray(value)
-    // uniquify returned array
-    return Array.from(new Set(currentCollection.concat(array)))
-  }
-  if (currentCollection.indexOf(value) > -1) {
-    return currentCollection
-  }
-  return currentCollection.concat(value)
-}
-
-/*
-node ./cli.js test/fixtures/md/**.md debug --transform test/fixtures/md/transform-**.md 1233535235 = hahah funky=hi --ignore test/fixtures/output/**.md --lol --whatever test/fixtures/md/syntax-**.md --foo=bar --fun lol.md what=no.md x 'xno.md' what
-*/
-function getGlobGroupsFromArgs(args, opts = {}) {
-  const globKeys = opts.globKeys || []
-  let preceding = ['', '']
-  let collection = []
-  let globGroups = []
-  let reserved = []
-  let otherOpts = []
-  let /** @type {string|undefined} */ cacheKey = ''
-  // console.log('args', args)
-  for (let i = 0; i < args.length; i++) {
-    const isLastArg = (args.length - 1) === i
-    const arg = args[i]
-    const prevArg = args[i - 1]
-    const looksLikeFile = stringLooksLikeFile(arg) // @TODO verify file exists?
-    
-    // console.log('arg', arg)
-    // console.log('looksLikeFile', looksLikeFile) 
-    // console.log('collection', collection)
-
-    // console.log('cacheKey', cacheKey)
-
-    if (looksLikeFile && typeof cacheKey !== 'undefined') {      
-      // @TODO verify file exists?
-      collection.push(arg)
-    } else if (arg.match(/^-+/) && !arg.match(/=/)) {
-      cacheKey = arg
-      // console.log('cacheKey', cacheKey)
-      // console.log('collection', collection)
-      // console.log('arg', arg)
-      if (collection.length) {
-        const val = getValue(preceding)
-        // console.log('val', val)
-        reserved.push(val)
-        globGroups.push({
-          key: trimLeadingDashes(val),
-          rawKey: val,
-          values: collection.filter(removeNodeModules).map((x) => coerceStringToRegex(x))
-        })
-        collection = []
-      }
-      preceding = [ prevArg, arg ]
-    } else if (cacheKey && arg.match(/=/)) {
-      // console.log('FOOO', arg)
-      cacheKey = undefined
-    }
-
-    const cleanKey = trimLeadingDashes(cacheKey || '')
-    const isDefinedGlobKey = globKeys.includes(cleanKey) || globKeys.includes(cacheKey)
-    // console.log(`isDefinedGlobKey: ${cleanKey}`, isDefinedGlobKey)
-    if (isDefinedGlobKey && (isGlob(arg) || looksLikeFile)) {
-      /*
-      console.log('ADD collection.push', arg)
-      /** */
-      collection = addValue(arg, collection)
-    } else {
-      if (!cacheKey && isGlob(arg) && !arg.match(/=/) || (arg.match(NOT_OBJECT_LIKE) && !isArrayLike(arg))) {
-        // console.log('GLOB MATCH', arg, isGlob(arg))
-        collection = addValue(arg, collection)
-      } else if (!looksLikeFile) {
-        /* Pass through non matching args */
-        /*
-        console.log('ADD otherOpts', arg)
-        /** */
-        if (arg.match(IS_KEY_VALUE_NON_ARRAY)) {
-          // quote quote wrap
-          otherOpts.push(arg.replace(IS_KEY_VALUE_NON_ARRAY, '$1="$2$3"'))
-        } else {
-          otherOpts.push(arg)
-        }
-
-      }
-    }
-    
-    // console.log('end', collection)
-    if (isLastArg && collection.length) {
-      // console.log('isLastArg', isLastArg)
-      const val = getValue(preceding)
-      reserved.push(val)
-      globGroups.push({
-        key: trimLeadingDashes(val),
-        rawKey: val,
-        values: collection.filter(removeNodeModules).map((x) => coerceStringToRegex(x)),
-        // last: 'last'
-      })
-      collection = []
-    }
-  }
-
-  return {
-    globGroups,
-    otherOpts: otherOpts.filter((opt) => !reserved.includes(opt))
-  }
-}
-
-async function runCli(options = {}) {
+async function runCli(options = {}, rawArgv) {
   let configFile
   let opts = {}
+
+  /*
+  const result = uxParse(rawArgv)
+  console.log('───────────────────────────────')
+  deepLog(result)
+  process.exit(1)
+  // process.exit(1)
+  /** */
+
   /*
   console.log('argv', argv)
   console.log('options', options)
@@ -199,7 +52,71 @@ async function runCli(options = {}) {
     console.log('globGroups', globGroups)
     console.log('globParse', globParse)
     // deepLog(globParse)
+    process.exit(1)
     /** */
+    /* Parse for weird CLI inputs */
+
+    /* Handle -- and - flags */
+    let newArray = [] 
+    for (let i = 0; i < otherOpts.length; i++) {
+      const curr = otherOpts[i]
+      const prev = newArray[i - 1]
+      const next = otherOpts[i + 1] || ''
+      const isLast = otherOpts.length === i + 1
+      // console.log('curr', curr)
+      // console.log('prev', prev)
+      if (curr.match(/^-+/)) {
+        const cleanX = curr.replace(/^-+/, '')
+        if (next.match(/^-+/) || isLast) {
+          newArray.push(cleanX + '= true ')
+          continue
+        }
+        // If the current option is the last option, don't add an equal sign
+        const equal = (cleanX.indexOf('=') === -1 || isLast) ? '=' : ' '
+        const final = cleanX + equal
+        newArray.push(final)
+        continue
+      }
+      if (prev && prev.match(/=\s?$/) && (curr.match(/^\s?=/) || curr.trim() === '=')) {
+        continue
+      }
+      newArray.push(curr + ' ')
+    }
+
+    const optString = newArray.join('')
+    const extraParse = parse(optString)
+    const singleDashStrings = findSingleDashStrings(otherOpts).map((x) => x.replace(/^-+/, ''))
+    // console.log('singleDashStrings', singleDashStrings)
+    // console.log('before options', options)
+    // console.log('before extraParse', extraParse)
+    
+    const STRIP_SINGLE_DASH_OPTIONS = true
+    if (STRIP_SINGLE_DASH_OPTIONS && singleDashStrings.length) {
+      for (let i = 0; i < singleDashStrings.length; i++) {
+        const word = singleDashStrings[i]
+        // Loop over all letters of single dash options -word and remove any corresponding letter: true
+        for (let j = 0; j < word.length; j++) {
+          const letter = word[j]
+          if (options[letter]) {
+            delete options[letter]
+          }
+        }
+      }
+      // console.log('after options', options)
+    }
+
+    if (extraParse.test) {
+      /*
+      console.log('optStringArr', newArray)
+      console.log('optString', optString)
+      console.log('otherOpts strings', otherOpts)
+      console.log('nicely handed CLI args')
+      console.log('extraParse', extraParse)
+      process.exit(1)
+      /** */
+    }
+  
+
     if (globGroups.length) {
       const globGroupByKey = globGroups.reduce((acc, curr, i) => {
         acc[curr.key] = globGroups[i]
@@ -228,36 +145,6 @@ async function runCli(options = {}) {
       /** */
     }
 
-    /* Parse for weird CLI inputs */
-
-    /* Handle -- and - flags */
-    let newArray = [] 
-    for (let i = 0; i < otherOpts.length; i++) {
-      const curr = otherOpts[i]
-      const prev = newArray[i - 1]
-      if (curr.match(/^-+/)) {
-        const cleanX = curr.replace(/^-+/, '')
-        const equal = (cleanX.indexOf('=') === -1) ? '=' : ' '
-        newArray.push(cleanX + equal)
-        continue
-      }
-      if (prev && prev.match(/=\s?$/) && (curr.match(/^\s?=/) || curr.trim() === '=')) {
-        continue
-      }
-      newArray.push(curr + ' ')
-    }
-
-    const optString = newArray.join('')
-    const extraParse = parse(optString)
-    /*
-    console.log('optStringArr', newArray)
-    console.log('optString', optString)
-    console.log('otherOpts strings', otherOpts)
-    console.log('nicely handed CLI args')
-    console.log('extraParse', extraParse)
-    process.exit(1)
-    /** */
-
     if (extraParse.file) {
       options.files = options.files.concat(extraParse.file)
       delete extraParse.file
@@ -307,6 +194,7 @@ async function runCli(options = {}) {
     mergedConfig.outputDir = mergedConfig.output || mergedConfig.outputDir
   }
   /*
+  console.log('rawArgv', rawArgv)
   console.log('mergedConfig', mergedConfig)
   process.exit(1)
   // return