guess-js-deps-bash 0.1.68 → 0.1.70

package/guess-js-deps.sh

@@ -7,15 +7,19 @@ function guess_js_deps () {
 
   local SELFPATH="$(readlink -m "$BASH_SOURCE"/..)"
   #cd -- "$SELFPATH" || return $?
-  source "$SELFPATH"/lib_dict_util.sh --lib || exit $?
-  source "$SELFPATH"/lib_path_util.sh --lib || exit $?
+  source -- "$SELFPATH"/lib_dict_util.sh --lib || exit $?
+  source -- "$SELFPATH"/lib_path_util.sh --lib || exit $?
 
   # import AUTOGUESS_SHEBANG_CMDS and AUTOGUESS_BUILD_UTIL_CMDS:
-  source "$SELFPATH"/autoguess_config.txt --lib || exit $?
+  source -- "$SELFPATH"/autoguess_config.txt --lib || exit $?
 
   local DBGLV="${DEBUGLEVEL:-0}"
   local COLORIZE_DIFF="$(can_haz_cmd colordiff)"
   local MANI_BFN='package.json'
+
+  local SAFE_PLAIN_MODULE_ID_RGX='[a-z][a-z0-9_.-]*'
+  sanity_check_safe_plain_module_id_rgx || return $?
+
   local KNOWN_DEP_TYPES=(
     dep
     devDep
@@ -24,9 +28,10 @@ function guess_js_deps () {
   local -A CFG=(
     [runmode]='cmp'
     )
-  local POS_ARGN=( runmode )
+  local POS_ARGN=( runmode + )
   local POS_ARGS=()
   parse_cli_opts "$@" || return $?
+  set -- "${POS_ARGS[@]}"
 
   local OUTPUT_MODE=( fail 'Unsupported output mode. This is a bug.' )
   case "${CFG[runmode]}" in
@@ -44,7 +49,7 @@ function guess_js_deps () {
     why ) debug_why "$@"; return $?;;
     manif ) read_json_subtree "$@"; return $?;;
 
-    list-files )      find_scannable_files_in_project; return $?;;
+    list-js-files )   find_project_files_with_potential_js_code; return $?;;
     scan-all )        scan_all_scannable_files_in_project; return $?;;
     scan-imports )    warn_no_args find_imports_in_files "$@"; return $?;;
     scan-known )      scan_manifest_deps; return $?;;
@@ -61,6 +66,42 @@ function guess_js_deps () {
 }
 
 
+function sanity_check_safe_plain_module_id_rgx () {
+  # Validate that all aspects of this regexp work correctly with the local
+  # implementation of bash, sed and grep:
+  local RGX="$SAFE_PLAIN_MODULE_ID_RGX"
+  local ACCEPT=(
+    dom80
+    highlight.js
+    )
+  local ITEM=
+  for ITEM in "${ACCEPT[@]}"; do
+    [[ "$ITEM" =~ ^$RGX$ ]]
+    [ "$?:${#BASH_REMATCH[@]}:${BASH_REMATCH[*]}" == "0:1:$ITEM" ] ||
+      return 4$(echo E: $FUNCNAME: "bash should have accepted '$ITEM'" >&2)
+    [ "$(grep -xPe "$RGX" <<<"$ITEM")" == "$ITEM" ] ||
+      return 4$(echo E: $FUNCNAME: "grep should have accepted '$ITEM'" >&2)
+    [ "$(sed -re "s~$RGX~((ok))~g" <<<"[$ITEM]")" == "[((ok))]" ] ||
+      return 4$(echo E: $FUNCNAME: "sed should have accepted '$ITEM'" >&2)
+  done
+
+  local DENY=(
+    dom80/
+    # döm80 døm80 # meh: bash is really stubborn about umlauts in A-Za-z.
+    dom∞
+    highlight.js/
+    )
+  for ITEM in "${DENY[@]}"; do
+    [[ "$ITEM" =~ ^$RGX$ ]] && return 4$(
+      echo E: $FUNCNAME: "bash should have denied '$ITEM'" >&2)
+    [ -z "$(grep -xPe "$RGX" <<<"$ITEM")" ] ||
+      return 4$(echo E: $FUNCNAME: "grep should have denied '$ITEM'" >&2)
+    [ "$(sed -re "s~$RGX~((ok))~g" <<<"[$ITEM]")" != '[((ok))]' ] ||
+      return 4$(echo E: $FUNCNAME: "sed should have denied '$ITEM'" >&2)
+  done
+}
+
+
 function parse_cli_opts () {
   local OPT=
   while [ "$#" -gt 0 ]; do
@@ -193,16 +234,46 @@ function init_resolve_cache__forced_custom () {
 }
 
 
-function find_scannable_files_in_project () {
-  local FF=(
-    -type f
-    '(' -name '*.js'
-        -o -name '*.mjs'
-        -o -name '*.jsm'
-        -o -name '*.html'
-        ')'
+function find_project_files_with_potential_js_code () {
+  local JS_FEXTS=(
+    html
+    js
+    jsm
+    mjs
     )
-  fastfind "${FF[@]}" || return $?
+  find_project_files_with_fexts "${JS_FEXTS[@]}" || return $?
+}
+
+
+function find_project_files_with_fexts () {
+  local VAL=
+  if [ -f .git/config -o -f .git ]; then
+    VAL="$*"
+    VAL="${VAL// /'|'}"
+    # Let git deal with checking worktrees, ignored directories etc.
+    ( git grep -lPe .
+      git status --porcelain -uall | cut --bytes=4-
+    ) | grep -Pe '\.('"$VAL"')$' | LANG=C sort --version-sort --unique | grep .
+    return $?
+  fi
+
+  local FIND=(
+    -xdev
+
+    # Prunes:
+    '(' -false
+      -o -name .git
+      -o -name .svn
+      -o -name node_modules
+      -o -name bower_components
+    ')' -prune ','
+
+    # Files we want:
+    -type f '(' -false )
+  for VAL in "$@"; do FIND+=( -o -name "*.$VAL" ); done
+  FIND+=( ')' )
+  find "${FIND[@]}"
+  return $?
 }
 
 
@@ -214,7 +285,7 @@ function scan_all_scannable_files_in_project () {
   fi
 
   progress 'I: Searching for JavaScript files: '
-  readarray -t IMPORTS < <(find_scannable_files_in_project)
+  readarray -t IMPORTS < <(find_project_files_with_potential_js_code)
   progress "found ${#IMPORTS[@]}"
 
   progress 'I: Searching for require()s/imports: '
@@ -275,7 +346,7 @@ function find_imports_in_project () {
 
 function find_manif_script_deps () {
   local SCRIPTS=()
-  readarray -t SCRIPTS < <(fastfind -name '*.sh')
+  readarray -t SCRIPTS < <(find_project_files_with_fexts  sh)
   ( </dev/null grep -HvPe '^\s*(#[^!]|$)' -- "${SCRIPTS[@]}"
     read_json_subtree '' .scripts | sed -nre '
       s~^\s*"([^"]+)": "~\v<manif>scripts/\1 ~p'
@@ -630,18 +701,6 @@ function node_detect_manif_version () {
 }
 
 
-function fastfind () {
-  local PRUNES=( '(' -false
-    -o -name .git
-    -o -name .svn
-    -o -name node_modules
-    -o -name bower_components
-    ')' -prune ',' )
-  find -xdev "${PRUNES[@]}" "$@"
-  return $?
-}
-
-
 function find_imports_in_files () {
   [ "$#" == 0 ] && return 0
   eval "$(init_resolve_cache)"
@@ -680,30 +739,27 @@ function remove_paths_from_module_ids () {
   # Actual subpath is optional: Trailing slash notation is used in
   # ubborg-planner-pmb's slashableImport.
 
-  sed -rf <(echo '
-    s~^((@[a-z0-9_-]+/|)([a-z0-9_-]+))'"$SUBPATH_RGX"'(\t|$)~\1\4~
-    ') -- "$@" || return $?
+  local SED='
+    s~^((@æ/|)(æ))'"$SUBPATH_RGX"'(\t|$)~\1\4~
+    '
+  SED="${SED//æ/$SAFE_PLAIN_MODULE_ID_RGX}"
+  sed -rf <(echo "$SED") -- "$@" || return $?
 }
 
 
 function find_simple_html_script_deps () {
   progress 'I: Searching for HTML files: ' >&2
-  local LIST=(
-    -type f
-    '(' -name '*.html'
-        ')'
-    )
-  readarray -t LIST < <(fastfind "${LIST[@]}")
+  readarray -t LIST < <(find_project_files_with_fexts html)
   progress "found ${#LIST[@]}" >&2
   [ "${#LIST[@]}" == 0 ] && return 0
   local SRC_FN= TAGS= DEP=
   local Q='"'
   local MODBASE_RGX='(\.*/)*node_modules/'
-  local SRC_ATTR_RX=' src="'"$MODBASE_RGX"'[^"]+"'
+  local SRC_ATTR_RX=' (src|href)="'"$MODBASE_RGX"'[^"]+"'
   for SRC_FN in "${LIST[@]}"; do
     SRC_FN="${SRC_FN#\./}"
     readarray -t LIST < <(<"$SRC_FN" tr -s '\r\n\t ' ' ' \
-      | grep -oPe '<script\b[^<>]+>' | grep -oPe "$SRC_ATTR_RX" \
+      | grep -oPe '<(script|link)\b[^<>]+>' | grep -oPe "$SRC_ATTR_RX" \
       | cut -d "$Q" -sf 2 | sed -re "s~^$MODBASE_RGX~~
       " | remove_paths_from_module_ids)
     for DEP in "${LIST[@]}"; do
@@ -738,7 +794,6 @@ function safe_pkg_names () {
     return $?
   fi
   local LN= PKG= ORG=
-  local ID_RGX='^[a-z][a-z0-9_.-]*$'
   local RV=3
   while read -r LN; do
     PKG="$LN"
@@ -751,8 +806,8 @@ function safe_pkg_names () {
         ORG="${ORG#\@}"
         ;;
     esac
-    [[ "$PKG" =~ $ID_RGX ]] || continue
-    [ -z "$ORG" ] || [[ "$ORG" =~ $ID_RGX ]] || continue
+    [[ "$PKG" =~ ^$SAFE_PLAIN_MODULE_ID_RGX$ ]] || continue
+    [ -z "$ORG" ] || [[ "$ORG" =~ ^$SAFE_PLAIN_MODULE_ID_RGX$ ]] || continue
     echo "$LN"
     RV=0
   done
@@ -828,6 +883,8 @@ function guess_one_dep_type () {
       #     as well as any subdir.
 
       *[.-]test.%JS | \
+      */.babelrc | \
+      */test/* | \
       */webpack.config.%JS | \
       . ) DEP_TYPE=devDep;;
     esac

package/package.json

@@ -1,5 +1,5 @@
 { "name": "guess-js-deps-bash",
-  "version": "0.1.68",
+  "version": "0.1.70",
   "description": "A bash attempt at npm-forgot: Guess JavaScript require() dependencies, detect their versions, compare with package.json.",
 
   "keywords": [
@@ -32,9 +32,9 @@
 
   "dependencies": {},
   "devDependencies": {
-    "eslint-config-nodejs-pmb": "^0.3.5",
+    "eslint-config-nodejs-pmb": "^0.3.6",
     "eslint-plugin-json-light-pmb": "^1.0.7",
-    "eslint-plugin-n": "^15.2.4",
+    "eslint-plugin-n": "^17.10.2",
     "eslint-pretty-pmb": "^1.0.5"
   },