@bratel/dgit 0.0.14 → 0.0.15

package/lib/cmd/action.js

@@ -10,7 +10,8 @@ const MAX_TEXT_ELLIPSIS = 30;
 function DownloadAction(githubLink, cmd) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         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;
         if (githubLink && (0, utils_1.isHttpsLink)(githubLink)) {
@@ -56,6 +57,7 @@ function DownloadAction(githubLink, cmd) {
                 parallelLimit: Number(parallelLimit.trim()),
                 exclude: excludeList,
                 include: includeList,
+                exactMatch,
             }, {
                 beforeLoadTree() {
                     spinner.start();

package/lib/cmd/main.js

@@ -29,6 +29,7 @@ program
     .option('-t --token, <token>', 'specified git account personal access token.')
     .option('-e --exclude, <relativePath,...,relativePath>', 'indicates which file paths need to be excluded in the current directory.')
     .option('-i --include, <relativePath,...,relativePath>', 'indicates which files need to be included in the exclusion file list.')
+    .option('--exact-match', 'enable exact path matching instead of prefix matching.')
     .option('--log', 'output dgit internal log details.')
     .option('--log-prefix, <log>', 'dgit internal log prefix.')
     .option('--proxy, <proxyHttp>', 'dgit proxy download url.')

package/lib/cmd/type.d.ts

@@ -17,6 +17,7 @@ export interface CommandInfo {
     log?: boolean;
     logPrefix?: string;
     proxy?: string;
+    exactMatch?: boolean;
 }
 export interface DownloadPromptInfo {
     dest: string;

package/lib/dgit.js

@@ -13,6 +13,7 @@ const UserAgent = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36
 const DEFAULT_PARALLEL_LIMIT = 10;
 const MAX_PARALLEL_LIMIT = 100;
 const JSON_STRINGIFY_PADDING = 2;
+// https://deepwiki.com/search/python-node-treepythonjula-pyt_e06e7d62-6a9a-4d4b-9e74-0a1cf32f4946?mode=fast
 function dgit(repoOption, dPath, dgitOptions, hooks) {
     return tslib_1.__awaiter(this, void 0, void 0, function* () {
         const { username, password, token, githubLink, proxy = '', } = repoOption;
@@ -28,7 +29,7 @@ function dgit(repoOption, dPath, dgitOptions, hooks) {
             throw new Error('invalid repo option.');
         }
         const logger = (0, log_1.createLogger)(dgitOptions);
-        const { exclude = [], include = [] } = dgitOptions || {};
+        const { exclude = [], include = [], exactMatch = false } = dgitOptions || {};
         let { parallelLimit = DEFAULT_PARALLEL_LIMIT } = dgitOptions || {};
         if (!parallelLimit || parallelLimit <= 0) {
             logger('parallelLimit value is invalid.');
@@ -82,7 +83,15 @@ function dgit(repoOption, dPath, dgitOptions, hooks) {
             const includeTreeNodeList = treeNodeList.filter((node) => {
                 const nPath = node_path_1.default.resolve(__dirname, node.path);
                 const rPath = node_path_1.default.resolve(__dirname, relativePath);
-                if (!nPath.startsWith(rPath) || node.type !== 'blob') {
+                let pathMatch;
+                if (exactMatch) {
+                    // 精确匹配：路径完全相等或者路径后跟分隔符
+                    pathMatch = nPath === rPath || nPath.startsWith(rPath + node_path_1.default.sep) || nPath.startsWith(`${rPath}/`);
+                }
+                else {
+                    pathMatch = nPath.startsWith(rPath);
+                }
+                if (!pathMatch || node.type !== 'blob') {
                     return false;
                 }
                 if (exclude.some(v => nPath.startsWith(node_path_1.default.resolve(rPath, v)))

package/lib/repo.d.ts

@@ -1,4 +1,4 @@
-declare function 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/type.d.ts

@@ -6,6 +6,7 @@ export interface DgitGlobalOption {
     logPrefix?: string;
     exclude?: GithubRelativePath[];
     include?: GithubRelativePath[];
+    exactMatch?: boolean;
 }
 export interface PrivateOption {
     username?: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bratel/dgit",
-  "version": "0.0.14",
+  "version": "0.0.15",
   "description": "@dking/hasaki-cli init application",
   "publishConfig": {
     "access": "public"
@@ -59,6 +59,16 @@
     "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"

package/src/cmd/action.ts

@@ -29,6 +29,7 @@ async function DownloadAction(githubLink: string | undefined, cmd: Command & Com
     include = '',
     log = false,
     logPrefix = '[dgit-logger]',
+    exactMatch = false, // 是否精确匹配
   } = cmd;
 
   const {
@@ -92,6 +93,7 @@ async function DownloadAction(githubLink: string | undefined, cmd: Command & Com
         parallelLimit: Number(parallelLimit.trim()),
         exclude: excludeList,
         include: includeList,
+        exactMatch,
       },
       {
         beforeLoadTree() {

package/src/cmd/main.ts

@@ -49,6 +49,7 @@ program
     '-i --include, <relativePath,...,relativePath>',
     'indicates which files need to be included in the exclusion file list.',
   )
+  .option('--exact-match', 'enable exact path matching instead of prefix matching.')
   .option('--log', 'output dgit internal log details.')
   .option('--log-prefix, <log>', 'dgit internal log prefix.')
   .option('--proxy, <proxyHttp>', 'dgit proxy download url.')

package/src/cmd/type.ts

@@ -18,6 +18,7 @@ export interface CommandInfo {
   log?: boolean;
   logPrefix?: string;
   proxy?: string;
+  exactMatch?: boolean;
 }
 
 export interface DownloadPromptInfo {

package/src/dgit.ts

@@ -23,6 +23,7 @@ const DEFAULT_PARALLEL_LIMIT = 10;
 const MAX_PARALLEL_LIMIT = 100;
 const JSON_STRINGIFY_PADDING = 2;
 
+// https://deepwiki.com/search/python-node-treepythonjula-pyt_e06e7d62-6a9a-4d4b-9e74-0a1cf32f4946?mode=fast
 async function dgit(repoOption: RepoOptionType, dPath: string, dgitOptions?: DgitGlobalOption, hooks?: DgitLifeCycle & DgitLoadGitTree): Promise<void> {
   const {
     username,
@@ -53,7 +54,7 @@ async function dgit(repoOption: RepoOptionType, dPath: string, dgitOptions?: Dgi
 
   const logger = createLogger(dgitOptions);
 
-  const { exclude = [], include = [] } = dgitOptions || {};
+  const { exclude = [], include = [], exactMatch = false } = dgitOptions || {};
 
   let { parallelLimit = DEFAULT_PARALLEL_LIMIT } = dgitOptions || {};
   if (!parallelLimit || parallelLimit <= 0) {
@@ -131,7 +132,15 @@ async function dgit(repoOption: RepoOptionType, dPath: string, dgitOptions?: Dgi
     const includeTreeNodeList = treeNodeList.filter((node) => {
       const nPath = path.resolve(__dirname, node.path);
       const rPath = path.resolve(__dirname, relativePath);
-      if (!nPath.startsWith(rPath) || node.type !== 'blob') {
+      let pathMatch: boolean;
+      if (exactMatch) {
+        // 精确匹配：路径完全相等或者路径后跟分隔符
+        pathMatch = nPath === rPath || nPath.startsWith(rPath + path.sep) || nPath.startsWith(`${rPath}/`);
+      }
+      else {
+        pathMatch = nPath.startsWith(rPath);
+      }
+      if (!pathMatch || node.type !== 'blob') {
         return false;
       }
       if (

package/src/repo.ts

@@ -1,4 +1,4 @@
-function repoUtils(owner: string, repoName: string, ref: string, proxy: string) {
+function repoUtils(owner: string, repoName: string, ref: string, proxy: string | null) {
   return {
     getRepoTreeUrl: () => `https://api.github.com/repos/${owner}/${repoName}/git/trees/${ref}?recursive=1`,
     getDownloadUrl: (path: string) => `${proxy ? `${proxy}/` : ''}https://raw.githubusercontent.com/${owner}/${repoName}/${ref}/${path}`,

package/src/type.ts

@@ -7,6 +7,7 @@ export interface DgitGlobalOption {
   logPrefix?: string;
   exclude?: GithubRelativePath[];
   include?: GithubRelativePath[];
+  exactMatch?: boolean; // 精确匹配，比如只匹配mingw-w64-python，不去匹配mingw-w64-python-*
 }
 
 export interface PrivateOption {

package/tsconfig.json

@@ -2,7 +2,7 @@
   "compilerOptions": {
     /* Basic Options */
     // "incremental": true,                   /* Enable incremental compilation */
-    "target": "ES2015", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
+    "target": "ES2016", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
 
     "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
     // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
@@ -65,6 +65,9 @@
     "allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
     "esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
   },
+  "ts-node": {
+    "files": true
+  },
   "include": [
     "src/**/*"
   ],