@bratel/dgit 0.0.13 → 0.0.15

package/lib/log.js

@@ -1,12 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createLogger = void 0;
+exports.createLogger = createLogger;
 const DEFAULT_PREFIX = '[dgit-logger]';
-exports.createLogger = (option) => (...message) => {
-    if (option && option.log) {
-        const prefix = option ?
-            option.logPrefix || DEFAULT_PREFIX :
-            DEFAULT_PREFIX;
-        console.log(prefix, ...message, '\n');
-    }
-};
+function createLogger(option) {
+    return (...message) => {
+        if (option && option.log) {
+            const prefix = option
+                ? option.logPrefix || DEFAULT_PREFIX
+                : DEFAULT_PREFIX;
+            console.log(prefix, ...message, '\n');
+        }
+    };
+}

package/lib/repo.d.ts

@@ -1,4 +1,4 @@
-declare const repoUtils: (owner: string, repoName: string, ref: string, proxy: string) => {
+declare function repoUtils(owner: string, repoName: string, ref: string, proxy: string | null): {
     getRepoTreeUrl: () => string;
     getDownloadUrl: (path: string) => string;
 };

package/lib/repo.js

@@ -1,7 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const repoUtils = (owner, repoName, ref, proxy) => ({
-    getRepoTreeUrl: () => `https://api.github.com/repos/${owner}/${repoName}/git/trees/${ref}?recursive=1`,
-    getDownloadUrl: (path) => `${proxy ? `${proxy}/` : ''}https://raw.githubusercontent.com/${owner}/${repoName}/${ref}/${path}`,
-});
+function repoUtils(owner, repoName, ref, proxy) {
+    return {
+        getRepoTreeUrl: () => `https://api.github.com/repos/${owner}/${repoName}/git/trees/${ref}?recursive=1`,
+        getDownloadUrl: (path) => `${proxy ? `${proxy}/` : ''}https://raw.githubusercontent.com/${owner}/${repoName}/${ref}/${path}`,
+    };
+}
 exports.default = repoUtils;

package/lib/request.d.ts

@@ -1,7 +1,7 @@
-import fs from 'fs';
-import { UrlOptions, CoreOptions } from 'request';
-import { DgitGlobalOption, DgitLifeCycle } from './type';
-declare type RequestOption = UrlOptions & CoreOptions;
-export declare const requestGetPromise: (options: RequestOption, dgitOptions: DgitGlobalOption, hooks?: DgitLifeCycle | undefined) => Promise<any>;
-export declare const requestOnStream: (url: string, ws: fs.WriteStream, dgitOptions: DgitGlobalOption, hooks?: DgitLifeCycle | undefined) => void;
+import type fs from 'node:fs';
+import type { CoreOptions, UrlOptions } from 'request';
+import type { DgitGlobalOption, DgitLifeCycle } from './type';
+type RequestOption = UrlOptions & CoreOptions;
+export declare function requestGetPromise(options: RequestOption, dgitOptions: DgitGlobalOption, hooks?: DgitLifeCycle): Promise<any>;
+export declare function requestOnStream(url: string, ws: fs.WriteStream, dgitOptions: DgitGlobalOption, hooks?: DgitLifeCycle): void;
 export {};

package/lib/request.js

@@ -1,13 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.requestOnStream = exports.requestGetPromise = void 0;
+exports.requestGetPromise = requestGetPromise;
+exports.requestOnStream = requestOnStream;
 const tslib_1 = require("tslib");
 const request_1 = tslib_1.__importDefault(require("request"));
 const utils_1 = require("./cmd/utils");
 const log_1 = require("./log");
 const REQUEST_RETRY_DELAY = 1500;
 const DEFAULT_MAX_RETRY_COUNT = 5;
-const requestGet = (options, maxRetryCount, hooks) => {
+function requestGet(options, maxRetryCount, hooks) {
     const { onSuccess, onError, onFinish, onRetry, } = hooks || {};
     request_1.default.get(options, (err, _, body) => {
         if (err) {
@@ -25,33 +26,35 @@ const requestGet = (options, maxRetryCount, hooks) => {
         onSuccess && onSuccess(body);
         onFinish && onFinish();
     });
-};
-exports.requestGetPromise = (options, dgitOptions, hooks) => new Promise((resolve, reject) => {
-    const { maxRetryCount = DEFAULT_MAX_RETRY_COUNT } = dgitOptions;
-    const { onSuccess, onError, onFinish, onRetry, } = hooks || {};
-    const newHooks = {
-        onSuccess(data) {
-            resolve(data);
-            onSuccess && onSuccess(data);
-        },
-        onError(err) {
-            reject(err);
-            onError && onError(err);
-        },
-        onFinish,
-        onRetry,
-    };
-    requestGet(options, maxRetryCount, newHooks);
-});
-exports.requestOnStream = (url, ws, dgitOptions, hooks) => {
+}
+function requestGetPromise(options, dgitOptions, hooks) {
+    return new Promise((resolve, reject) => {
+        const { maxRetryCount = DEFAULT_MAX_RETRY_COUNT } = dgitOptions;
+        const { onSuccess, onError, onFinish, onRetry, } = hooks || {};
+        const newHooks = {
+            onSuccess(data) {
+                resolve(data);
+                onSuccess && onSuccess(data);
+            },
+            onError(err) {
+                reject(err);
+                onError && onError(err);
+            },
+            onFinish,
+            onRetry,
+        };
+        requestGet(options, maxRetryCount, newHooks);
+    });
+}
+function requestOnStream(url, ws, dgitOptions, hooks) {
     const { maxRetryCount = DEFAULT_MAX_RETRY_COUNT } = dgitOptions;
-    const logger = log_1.createLogger(dgitOptions);
+    const logger = (0, log_1.createLogger)(dgitOptions);
     const { onSuccess, onError, onFinish, onRetry, } = hooks || {};
     const fn = (retryCount) => {
-        const downloadUrl = utils_1.AddExtraRandomQs(url);
+        const downloadUrl = (0, utils_1.AddExtraRandomQs)(url);
         logger(` dowloading from ${downloadUrl}...`);
-        request_1.default(encodeURI(downloadUrl))
-            .on('error', err => {
+        (0, request_1.default)(encodeURI(downloadUrl))
+            .on('error', (err) => {
             if (retryCount <= 0) {
                 onError && onError(err);
                 onFinish && onFinish();
@@ -72,4 +75,4 @@ exports.requestOnStream = (url, ws, dgitOptions, hooks) => {
         logger(` ${url}, write stream failed.`);
     });
     fn(maxRetryCount);
-};
+}

package/lib/type.d.ts

@@ -1,4 +1,4 @@
-export declare type GithubRelativePath = string;
+export type GithubRelativePath = string;
 export interface DgitGlobalOption {
     maxRetryCount?: number;
     parallelLimit?: number;
@@ -6,6 +6,7 @@ export interface DgitGlobalOption {
     logPrefix?: string;
     exclude?: GithubRelativePath[];
     include?: GithubRelativePath[];
+    exactMatch?: boolean;
 }
 export interface PrivateOption {
     username?: string;

package/package.json

@@ -1,77 +1,83 @@
 {
   "name": "@bratel/dgit",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "description": "@dking/hasaki-cli init application",
-  "bin": {
-    "dgit": "./bin/cmd.js"
+  "publishConfig": {
+    "access": "public"
   },
-  "main": "./lib/dgit.js",
-  "types": "./lib/dgit.d.ts",
-  "keywords": [
-    "dgit",
-    "github download tool"
-  ],
+  "author": "JohnApache",
+  "license": "MIT",
   "repository": {
     "type": "git",
     "url": "https://github.com/lsq/dgit"
   },
-   "publishConfig": {
-    "access": "public"
+  "keywords": [
+    "dgit",
+    "github download tool"
+  ],
+  "main": "./lib/dgit.js",
+  "types": "./lib/dgit.d.ts",
+  "bin": {
+    "dgit": "./bin/cmd.js"
   },
- "author": "JohnApache",
-  "license": "MIT",
   "scripts": {
     "build:ts": "tsc --build",
-    "lint": "eslint src --ext .jsx --ext .js --ext .tsx --ext .ts --cache --fix",
-    "test:mocha": "nyc --reporter=text mocha --require ts-node/register 'test/**/*.{ts,tsx}' -t 60000",
-    "test:mocha:reporter": "nyc --reporter=lcov --reporter=text mocha --require ts-node/register 'test/**/*.{ts,tsx}' -t 60000 --reporter=mochawesome",
+    "lint": "eslint",
+    "lint:fix": "eslint src --ext .jsx --ext .js --ext .tsx --ext .ts --cache --fix",
+    "test:mocha": "nyc --reporter=text mocha --require ts-node/register test/**/*.{ts,tsx} -t 60000",
+    "test:mocha:reporter": "nyc --reporter=lcov --reporter=text mocha --require ts-node/register test/**/*.{ts,tsx} -t 60000 --reporter=mochawesome",
     "watch:ts": "tsc --watch",
     "prepublishOnly": "npm run test:mocha && npm run lint && npm run build:ts"
   },
-  "lint-staged": {
-    "**/*.{jsx,js}": [
-      "npm run lint",
-      "git add"
-    ]
+  "dependencies": {
+    "@types/async": "^3.2.25",
+    "@types/commander": "^2.12.5",
+    "@types/inquirer": "^9.0.9",
+    "@types/ora": "^3.2.0",
+    "@types/progress": "^2.0.7",
+    "@types/request": "^2.48.13",
+    "async": "^3.2.6",
+    "chalk": "^5.6.2",
+    "commander": "^14.0.2",
+    "inquirer": "^13.1.0",
+    "ora": "^9.0.0",
+    "progress": "^2.0.3",
+    "request": "^2.88.2"
+  },
+  "devDependencies": {
+    "@antfu/eslint-config": "^6.7.3",
+    "@types/chai": "^5.2.3",
+    "@types/mocha": "^10.0.10",
+    "@types/node": "^25.0.3",
+    "@typescript-eslint/parser": "^8.50.1",
+    "chai": "^6.2.2",
+    "eslint": "^9.39.2",
+    "husky": "^9.1.7",
+    "lint-staged": "^16.2.7",
+    "mocha": "^11.7.5",
+    "nyc": "^17.1.0",
+    "ts-node": "^10.9.2",
+    "typescript": "^5.9.3"
+  },
+  "overrides": {
+    "request": {
+      "form-data": "^4.0.4",
+      "tough-cookie": "^4.1.3"
+    }
+  },
+  "resolutions": {
+    "form-data": "^4.0.4",
+    "tough-cookie": "^4.1.3"
   },
   "husky": {
     "hooks": {
       "pre-commit": "lint-staged"
     }
   },
-  "devDependencies": {
-    "@dking/eslint-config-typescript": "^0.0.4",
-    "@types/chai": "^4.2.0",
-    "@types/mocha": "^5.2.7",
-    "@types/node": "^12.7.5",
-    "@typescript-eslint/eslint-plugin": "^2.13.0",
-    "@typescript-eslint/parser": "^2.13.0",
-    "chai": "^4.2.0",
-    "eslint": "^6.8.0",
-    "eslint-import-resolver-typescript": "^2.0.0",
-    "eslint-plugin-import": "^2.19.1",
-    "eslint-plugin-promise": "^4.1.1",
-    "husky": "^2.3.0",
-    "lint-staged": "^8.1.7",
-    "mocha": "^6.2.0",
-    "mochawesome": "^4.1.0",
-    "nyc": "^14.1.1",
-    "ts-node": "^8.3.0",
-    "typescript": "^3.7.4"
-  },
-  "dependencies": {
-    "@types/async": "^3.0.3",
-    "@types/commander": "^2.12.2",
-    "@types/inquirer": "^6.5.0",
-    "@types/ora": "^3.2.0",
-    "@types/progress": "^2.0.3",
-    "@types/request": "^2.48.3",
-    "async": "^3.1.0",
-    "chalk": "^3.0.0",
-    "commander": "^4.0.1",
-    "inquirer": "^7.0.0",
-    "ora": "^4.0.3",
-    "progress": "^2.0.3",
-    "request": "^2.88.0"
+  "lint-staged": {
+    "**/*.{jsx,js}": [
+      "npm run lint",
+      "git add"
+    ]
   }
 }

package/renovate.json

@@ -0,0 +1,19 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": ["config:recommended"],
+  "dependencyDashboard": true,
+  "prHourlyLimit": 2,
+  "prConcurrentLimit": 10,
+  "packageRules": [
+    {
+      "matchUpdateTypes": ["minor", "patch"],
+      "automerge": true
+    }
+  ],
+  "npm": {
+    "enabled": true
+  },
+  "github-actions": {
+    "enabled": true
+  }
+}

package/src/cmd/action.ts

@@ -1,128 +1,137 @@
-import { Command } from 'commander';
-import ora, { Ora } from 'ora';
+import type { Command } from 'commander';
+import type { Ora } from 'ora';
+import type { CommandInfo } from './type';
+import ora from 'ora';
 import ProgressBar from 'progress';
 import dgit from '../dgit';
-import {
-    ParseGithubHttpsLink, TextEllipsis, isHttpsLink,
-} from './utils';
-import { CommandInfo } from './type';
 
 import { DownloadPrompt, PasswordPrompt } from './prompt';
+import {
+  isHttpsLink,
+  ParseGithubHttpsLink,
+  TextEllipsis,
+} from './utils';
 
 const MAX_TEXT_ELLIPSIS = 30;
 
-const DownloadAction = async (
-    githubLink: string | undefined,
-    cmd: Command & CommandInfo,
-): Promise<any> => {
-    let {
-        ref = '',
-        dest = '',
-        owner = '',
-        repoName = '',
-        relativePath = '',
-        password,
-    } = cmd;
+async function DownloadAction(githubLink: string | undefined, cmd: Command & CommandInfo): Promise<any> {
+  let {
+    ref = '',
+    dest = '',
+    owner = '',
+    repoName = '',
+    relativePath = '',
+    password,
+  } = cmd;
 
-    const {
-        exclude = '',
-        include = '',
-        log = false,
-        logPrefix = '[dgit-logger]',
-    } = cmd;
+  const {
+    exclude = '',
+    include = '',
+    log = false,
+    logPrefix = '[dgit-logger]',
+    exactMatch = false, // 是否精确匹配
+  } = cmd;
 
-    const {
-        parallelLimit = '', username, token,
-    } = cmd;
-    const { proxy = '' } = cmd;
+  const {
+    parallelLimit = '',
+    username,
+    token,
+  } = cmd;
+  const {
+    proxy = '',
+  } = cmd;
 
-    if (githubLink && isHttpsLink(githubLink)) {
-        const parseResult = ParseGithubHttpsLink(githubLink);
-        ref = parseResult.ref;
-        owner = parseResult.owner;
-        repoName = parseResult.repoName;
-        relativePath = parseResult.relativePath;
-    }
+  if (githubLink && isHttpsLink(githubLink)) {
+    const parseResult = ParseGithubHttpsLink(githubLink);
+    ref = parseResult.ref;
+    owner = parseResult.owner;
+    repoName = parseResult.repoName;
+    relativePath = parseResult.relativePath;
+  }
 
-    if (username && !password) {
-        const pwdAnswer = await PasswordPrompt();
-        password = pwdAnswer.password;
-    }
+  if (username && !password) {
+    const pwdAnswer = await PasswordPrompt();
+    password = pwdAnswer.password;
+  }
 
-    const answer = await DownloadPrompt({
-        ref,
-        dest,
-        owner,
-        repoName,
-        relativePath,
-    });
+  const answer = await DownloadPrompt({
+    ref,
+    dest,
+    owner,
+    repoName,
+    relativePath,
+  });
 
-    ref = answer.ref;
-    dest = answer.dest;
-    owner = answer.owner;
-    repoName = answer.repoName;
-    relativePath = answer.relativePath;
+  ref = answer.ref;
+  dest = answer.dest;
+  owner = answer.owner;
+  repoName = answer.repoName;
+  relativePath = answer.relativePath;
 
-    const excludeList = exclude.split(',').filter(Boolean);
-    const includeList = include.split(',').filter(Boolean);
+  const excludeList = exclude.split(',').filter(Boolean);
+  const includeList = include.split(',').filter(Boolean);
 
-    const spinner: Ora = ora(' loading remote repo tree...');
-    let bar: ProgressBar;
+  const spinner: Ora = ora(' loading remote repo tree...');
+  let bar: ProgressBar;
 
-    try {
-        await dgit(
-            {
-                ref,
-                owner,
-                repoName,
-                relativePath,
-                username,
-                password,
-                token,
-                proxy,
-            },
-            dest,
-            {
-                log,
-                logPrefix,
-                parallelLimit: Number(parallelLimit.trim()),
-                exclude      : excludeList,
-                include      : includeList,
-            },
+  try {
+    await dgit(
+      {
+        ref,
+        owner,
+        repoName,
+        relativePath,
+        username,
+        password,
+        token,
+        proxy,
+      },
+      dest,
+      {
+        log,
+        logPrefix,
+        parallelLimit: Number(parallelLimit.trim()),
+        exclude: excludeList,
+        include: includeList,
+        exactMatch,
+      },
+      {
+        beforeLoadTree() {
+          spinner.start();
+        },
+        afterLoadTree() {
+          spinner.succeed(' load remote repo tree succeed! ');
+        },
+        onResolved(status) {
+          if (log)
+            return;
+          const green = '\u001B[42m \u001B[0m';
+          const red = '\u001B[41m \u001B[0m';
+          const index = 0;
+          bar = new ProgressBar(
+            ' DOWNLOAD |:bar| :current/:total :percent elapsed: :elapseds eta: :eta :file, done.',
             {
-                beforeLoadTree () {
-                    spinner.start();
-                },
-                afterLoadTree () {
-                    spinner.succeed(' load remote repo tree succeed! ');
-                },
-                onResolved (status) {
-                    if (log) return;
-                    const green = '\u001b[42m \u001b[0m';
-                    const red = '\u001b[41m \u001b[0m';
-                    const index = 0;
-                    bar = new ProgressBar(
-                        ' DOWNLOAD |:bar| :current/:total :percent elapsed: :elapseds eta: :eta :file, done.',
-                        {
-                            total     : status.totalCount,
-                            width     : 50,
-                            complete  : green,
-                            incomplete: red,
-                        },
-                    );
-                    bar.update(index);
-                },
-                onProgress (_, node) {
-                    if (log) return;
-                    bar.tick({ file: TextEllipsis(node.path, MAX_TEXT_ELLIPSIS) });
-                },
+              total: status.totalCount,
+              width: 50,
+              complete: green,
+              incomplete: red,
             },
-        );
-        spinner.succeed(' download all files succeed!');
-    } catch (error) {
-        console.error(error);
-        spinner.fail(' download files failed!');
-    }
-};
+          );
+          bar.update(index);
+        },
+        onProgress(_, node) {
+          if (log)
+            return;
+          bar.tick({ file: TextEllipsis(node.path, MAX_TEXT_ELLIPSIS) });
+        },
+      },
+    );
+    spinner.succeed(' download all files succeed!');
+  }
+  catch (error) {
+    console.error(error);
+    spinner.fail(' download files failed!');
+  }
+}
 
 export default DownloadAction;