binary-collections 2.0.1 → 2.0.3

package/bin/kill-process

@@ -28,4 +28,7 @@ if [ -f ".env" ]; then
   export $(egrep -v '^#' .env | xargs)
 fi
 
-ps -W | grep "$1" | awk '{print $1}' | xargs kill -f;
+# ps -W | grep "$1" | awk '{print $1}' | xargs kill -f;
+
+set -e;
+ps -aux | grep "$1" | awk '{print $1}' | xargs killall -9;

package/bin/submodule

@@ -116,15 +116,24 @@ update_submodule() {
 }
 
 remove_submodule() {
-  if [[ -z $1 || $1 == "" ]]; then
+  if [[ -z $2 || $2 == "" ]]; then
     echo "input submodule path"
     read folderpath
   else
-    folderpath="$1"
+    folderpath="$2"
   fi
 
+  if [ -z $folderpath ]; then
+    echo "Folder path is empty" ;
+    exit 1;
+  fi
+
+  echo "removing submodule $folderpath"
+
   # Remove the submodule entry from .git/config
-  git submodule deinit -f $folderpath
+  if [ -d $folderpath ]; then
+    git submodule deinit -f $folderpath
+  fi
 
   # Remove the submodule directory from the superproject's .git/modules directory
   if [ -d ".git/modules/$folderpath" ]; then

package/bin/submodule-token

@@ -0,0 +1,39 @@
+#!/bin/bash -e
+
+# token remover from url repo
+
+export SCRIPT=$(realpath "$0")
+export ROOT="$(git rev-parse --show-toplevel)"
+
+git -C "${REPO_PATH}" config -f .gitmodules --get-regexp '^submodule\..*\.path$' |
+    while read -r KEY MODULE_PATH
+    do
+        # relative module path from root
+        RELATIVE_MODULE_PATH="${ROOT}/${MODULE_PATH}"
+        # cd git root dir
+        cd ${ROOT}
+
+        NAME="$(echo "${KEY}" | sed 's/^submodule\.\(.*\)\.path$/\1/')"
+
+        url_key="$(echo "${KEY}" | sed 's/\.path$/.url/')"
+        branch_key="$(echo "${KEY}" | sed 's/\.path$/.branch/')"
+
+        URL="$(git config -f .gitmodules --get "${url_key}")"
+        BRANCH="$(git config -f .gitmodules --get "${branch_key}" || echo "master")"
+
+        repo=${URL#"https://github.com/"}
+        NEW_URL="https://github.com/${repo}"
+
+        # cd and update url
+        cd $RELATIVE_MODULE_PATH
+        git remote set-url origin "$NEW_URL"
+        cd $ROOT
+
+        GIT_MODULES="${RELATIVE_MODULE_PATH}/.gitmodules"
+        if [ -f "${GIT_MODULES}" ];
+        then
+          echo "${MODULE_PATH} has submodules"
+          cd "${RELATIVE_MODULE_PATH}"
+          sh "${SCRIPT}" -cwd ${RELATIVE_MODULE_PATH}
+        fi
+    done

package/lib/del-nodemodules.js

@@ -0,0 +1,52 @@
+const glob = require('glob');
+const { fs, path } = require('sbg-utility');
+// process.cwd = () => path.resolve(__dirname + '/../../../Repositories');
+
+const globalIgnore = [
+  // ignore .git .github folder
+  '**/.git*',
+  // ignore composer folder
+  '**/vendor/**'
+];
+
+console.log('cleaning node_modules in', process.cwd());
+
+const g3 = new glob.Glob('**/node_modules', {
+  withFileTypes: false,
+  cwd: process.cwd(),
+  ignore: globalIgnore
+});
+streamDel(g3);
+
+/**
+ * glob stream handler
+ * @param {glob.Glob} globStream
+ */
+function streamDel(globStream) {
+  globStream.stream().on('data', (result) => {
+    const fullPath = path.resolve(process.cwd(), result);
+    console.log('deleting', fullPath);
+    if (fs.statSync(fullPath).isDirectory()) {
+      // delete all files each package directory
+      const subdir = fs.readdirSync(fullPath).map((dirPath) => path.resolve(fullPath, dirPath));
+      for (let i = 0; i < subdir.length; i++) {
+        const dir = subdir[i];
+        del(dir);
+      }
+    }
+    del(fullPath);
+  });
+}
+
+/**
+ * delete file recursive
+ * @param {string} fullPath
+ */
+function del(fullPath) {
+  try {
+    fs.rmSync(fullPath, { recursive: true, force: true, retryDelay: 7000 });
+    console.log('deleted', fullPath);
+  } catch (_) {
+    console.log('failed delete', fullPath);
+  }
+}

package/lib/find-node-modules.js

@@ -0,0 +1,13 @@
+const glob = require('glob');
+const path = require('path');
+// process.cwd = () => path.resolve(__dirname + '/../../../Repositories');
+
+const g3 = new glob.Glob('**/node_modules', {
+  withFileTypes: false,
+  cwd: process.cwd(),
+  ignore: ['**/.git*', '**/vendor/**']
+});
+g3.stream().on('data', (result) => {
+  const fullPath = path.resolve(process.cwd(), result);
+  console.log(fullPath);
+});

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "binary-collections",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "binary helper collections by L3n4r0x",
   "main": "index.js",
   "files": [
@@ -18,30 +18,40 @@
     "build": "node -r ts-node/register -r dotenv/config build.js && yarn run pack",
     "test": "cd test && npm install -D file:../ &&",
     "test:nrs": "npm test -- nrs build:**",
-    "pack": "node packer.js --yarn --filename=bin"
+    "pack": "node packer.js --yarn --filename=bin",
+    "update:ncu": "npx npm-check-updates -u -x jsdom,chalk,hexo,deepmerge-ts --enginesNode --root"
   },
   "keywords": [],
   "author": "",
-  "license": "ISC",
+  "license": "MIT",
   "dependencies": {
-    "execa": "^7.1.1",
-    "fs-extra": "^11.1.1",
-    "glob": "^10.2.2",
-    "minimatch": "^9.0.0",
+    "execa": "^8.0.1",
+    "fs-extra": "^11.2.0",
+    "glob": "^10.3.10",
+    "minimatch": "^9.0.3",
     "minimist": "^1.2.8",
+    "sbg-utility": "^1.1.6",
     "upath": "^2.0.1",
-    "yaml": "^2.3.1"
+    "yaml": "^2.3.4"
   },
   "packageManager": "yarn@3.6.1",
   "devDependencies": {
+    "@types/eslint": "^8",
     "@types/minimist": "^1",
-    "@types/node": "^18.16.3",
+    "@types/node": "^20.11.16",
+    "@types/prettier": "^3",
     "@types/yargs": "^17",
+    "@typescript-eslint/eslint-plugin": "^6.20.0",
+    "@typescript-eslint/parser": "^6.20.0",
     "cross-spawn": "https://github.com/dimaslanjaka/node-cross-spawn/raw/ff4b648/release/cross-spawn.tgz",
-    "dotenv": "^16.3.1",
-    "git-command-helper": "^2.0.1",
-    "ts-node": "^10.9.1",
-    "typescript": "^5.2.2"
+    "dotenv": "^16.4.1",
+    "eslint": "^8.56.0",
+    "eslint-config-prettier": "^9.1.0",
+    "eslint-plugin-prettier": "^5.1.3",
+    "git-command-helper": "^2.0.2",
+    "prettier": "^3.2.4",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.3.3"
   },
   "optionalDependencies": {
     "ansi-colors": "^4.1.3"
@@ -49,8 +59,10 @@
   "bin": {
     "clean-nodemodule": "bin/clean-nodemodule",
     "clean-nodemodules": "bin/clean-nodemodules",
+    "del-nodemodules": "lib/del-nodemodules.js",
     "dev": "bin/dev",
     "empty": "bin/empty",
+    "find-nodemodules": "lib/find-nodemodules.js",
     "git-fix-encoding": "bin/git-fix-encoding",
     "git-fix-encoding-cmd": "bin/git-fix-encoding.cmd",
     "git-reduce-size": "bin/git-reduce-size",
@@ -69,6 +81,7 @@
     "run-series": "lib/npm-run-series.js",
     "submodule": "bin/submodule",
     "submodule-install": "bin/submodule-install",
-    "submodule-remove": "bin/submodule-remove"
+    "submodule-remove": "bin/submodule-remove",
+    "submodule-token": "bin/submodule-token"
   }
 }