feat: upgrade minimatch dependency to 10.2.1 (#545)

hsluoyz · hsluoyz · commit 2e66ca9cea3c · 2026-02-19T21:46:21.000+08:00
diff --git a/package.json b/package.json
@@ -44,14 +44,14 @@
     "semantic-release": "^17.4.4",
     "ts-jest": "^26.5.3",
     "tslint": "^5.11.0",
-    "typescript": "^3.7.2"
+    "typescript": "^4.9.5"
   },
   "dependencies": {
     "@casbin/expression-eval": "^5.3.0",
     "await-lock": "^2.0.1",
     "buffer": "^6.0.3",
     "csv-parse": "^5.5.6",
-    "minimatch": "^7.4.2"
+    "minimatch": "^10.2.1"
   },
   "files": [
     "lib",
diff --git a/src/internalEnforcer.ts b/src/internalEnforcer.ts
@@ -34,7 +34,7 @@ export class InternalEnforcer extends CoreEnforcer {
       try {
         await this.adapter.addPolicy(sec, ptype, rule);
       } catch (e) {
-        if (e.message !== 'not implemented') {
+        if (e instanceof Error && e.message !== 'not implemented') {
           throw e;
         }
       }
@@ -74,7 +74,7 @@ export class InternalEnforcer extends CoreEnforcer {
         try {
           await this.adapter.addPolicies(sec, ptype, rules);
         } catch (e) {
-          if (e.message !== 'not implemented') {
+          if (e instanceof Error && e.message !== 'not implemented') {
             throw e;
           }
         }
@@ -121,7 +121,7 @@ export class InternalEnforcer extends CoreEnforcer {
         try {
           await this.adapter.addPolicies(sec, ptype, newRules);
         } catch (e) {
-          if (e.message !== 'not implemented') {
+          if (e instanceof Error && e.message !== 'not implemented') {
             throw e;
           }
         }
@@ -167,7 +167,7 @@ export class InternalEnforcer extends CoreEnforcer {
         try {
           await this.adapter.updatePolicy(sec, ptype, oldRule, newRule);
         } catch (e) {
-          if (e.message !== 'not implemented') {
+          if (e instanceof Error && e.message !== 'not implemented') {
             throw e;
           }
         }
@@ -208,7 +208,7 @@ export class InternalEnforcer extends CoreEnforcer {
       try {
         await this.adapter.removePolicy(sec, ptype, rule);
       } catch (e) {
-        if (e.message !== 'not implemented') {
+        if (e instanceof Error && e.message !== 'not implemented') {
           throw e;
         }
       }
@@ -246,7 +246,7 @@ export class InternalEnforcer extends CoreEnforcer {
         try {
           await this.adapter.removePolicies(sec, ptype, rules);
         } catch (e) {
-          if (e.message !== 'not implemented') {
+          if (e instanceof Error && e.message !== 'not implemented') {
             throw e;
           }
         }
@@ -288,7 +288,7 @@ export class InternalEnforcer extends CoreEnforcer {
       try {
         await this.adapter.removeFilteredPolicy(sec, ptype, fieldIndex, ...fieldValues);
       } catch (e) {
-        if (e.message !== 'not implemented') {
+        if (e instanceof Error && e.message !== 'not implemented') {
           throw e;
         }
       }
diff --git a/src/util/util.ts b/src/util/util.ts
@@ -90,22 +90,22 @@ function setEquals(a: string[], b: string[]): boolean {
 }
 
 // readFile return a promise for readFile.
-function readFile(path: string, encoding?: string): any {
+function readFile(path: string, encoding?: string): Promise<string> {
   const fs = mustGetDefaultFileSystem();
-  return new Promise((resolve, reject) => {
+  return new Promise<string>((resolve, reject) => {
     try {
-      fs.readFileSync(path, encoding || 'utf8');
-      resolve();
+      const content = fs.readFileSync(path, encoding || 'utf8') as string;
+      resolve(content);
     } catch (e) {
       reject(e);
     }
   });
 }
 
 // writeFile return a promise for writeFile.
-function writeFile(path: string, file: string, encoding?: string): any {
+function writeFile(path: string, file: string, encoding?: string): Promise<void> {
   const fs = mustGetDefaultFileSystem();
-  return new Promise((resolve, reject) => {
+  return new Promise<void>((resolve, reject) => {
     try {
       fs.writeFileSync(path, file, encoding || 'utf-8');
       resolve();
diff --git a/test/model/model.test.ts b/test/model/model.test.ts
@@ -65,8 +65,9 @@ test('TestLoadModelFromConfig', (done) => {
     }
 
     if (e instanceof Error) {
+      const error = e;
       requiredSections.forEach((n) => {
-        if (!e.message.includes(n)) {
+        if (!error.message.includes(n)) {
           throw new Error(`section name: ${sectionNameMap[n]} should be in message`);
         }
       });
diff --git a/yarn.lock b/yarn.lock
@@ -815,16 +815,6 @@
   dependencies:
     any-observable "^0.3.0"
 
-"@semantic-release/changelog@^5.0.1":
-  version "5.0.1"
-  resolved "https://registry.npmjs.org/@semantic-release/changelog/-/changelog-5.0.1.tgz#50a84b63e5d391b7debfe021421589fa2bcdafe4"
-  integrity sha512-unvqHo5jk4dvAf2nZ3aw4imrlwQ2I50eVVvq9D47Qc3R+keNqepx1vDYwkjF8guFXnOYaYcR28yrZWno1hFbiw==
-  dependencies:
-    "@semantic-release/error" "^2.1.0"
-    aggregate-error "^3.0.0"
-    fs-extra "^9.0.0"
-    lodash "^4.17.4"
-
 "@semantic-release/commit-analyzer@^8.0.0", "@semantic-release/commit-analyzer@^8.0.1":
   version "8.0.1"
   resolved "https://registry.npmjs.org/@semantic-release/commit-analyzer/-/commit-analyzer-8.0.1.tgz#5d2a37cd5a3312da0e3ac05b1ca348bf60b90bca"
@@ -838,25 +828,11 @@
     lodash "^4.17.4"
     micromatch "^4.0.2"
 
-"@semantic-release/error@^2.1.0", "@semantic-release/error@^2.2.0":
+"@semantic-release/error@^2.2.0":
   version "2.2.0"
   resolved "https://registry.npmjs.org/@semantic-release/error/-/error-2.2.0.tgz#ee9d5a09c9969eade1ec864776aeda5c5cddbbf0"
   integrity sha512-9Tj/qn+y2j+sjCI3Jd+qseGtHjOAeg7dU2/lVcqIQ9TV3QDaDXDYXcoOHU+7o2Hwh8L8ymL4gfuO7KxDs3q2zg==
 
-"@semantic-release/git@^9.0.0":
-  version "9.0.0"
-  resolved "https://registry.npmjs.org/@semantic-release/git/-/git-9.0.0.tgz#304c4883c87d095b1faaae93300f1f1e0466e9a5"
-  integrity sha512-AZ4Zha5NAPAciIJH3ipzw/WU9qLAn8ENaoVAhD6srRPxTpTzuV3NhNh14rcAo8Paj9dO+5u4rTKcpetOBluYVw==
-  dependencies:
-    "@semantic-release/error" "^2.1.0"
-    aggregate-error "^3.0.0"
-    debug "^4.0.0"
-    dir-glob "^3.0.0"
-    execa "^4.0.0"
-    lodash "^4.17.4"
-    micromatch "^4.0.0"
-    p-reduce "^2.0.0"
-
 "@semantic-release/github@^7.0.0":
   version "7.2.1"
   resolved "https://registry.npmjs.org/@semantic-release/github/-/github-7.2.1.tgz#e833245746413e0830b65112331ca0a00b35cf95"
@@ -1586,6 +1562,11 @@ balanced-match@^1.0.0:
   resolved "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
   integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
+balanced-match@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-4.0.3.tgz#6337a2f23e0604a30481423432f99eac603599f9"
+  integrity sha512-1pHv8LX9CpKut1Zp4EXey7Z8OfH11ONNH6Dhi2WDUt31VVZFXZzKwXcysBgqSumFCmR+0dqjMK5v5JiFHzi0+g==
+
 base64-js@^1.3.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
@@ -1646,12 +1627,12 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-brace-expansion@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
-  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+brace-expansion@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-5.0.2.tgz#b6c16d0791087af6c2bc463f52a8142046c06b6f"
+  integrity sha512-Pdk8c9poy+YhOgVWw1JNN22/HcivgKWwpxKq04M/jTmHyCZn12WPJebZxdjSa5TmBqISrUSgNYU3eRORljfCCw==
   dependencies:
-    balanced-match "^1.0.0"
+    balanced-match "^4.0.2"
 
 braces@^2.3.1:
   version "2.3.2"
@@ -5230,7 +5211,7 @@ micromatch@^3.0.4, micromatch@^3.1.4, micromatch@^3.1.8:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-micromatch@^4.0.0, micromatch@^4.0.2:
+micromatch@^4.0.2:
   version "4.0.4"
   resolved "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
   integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
@@ -5270,20 +5251,20 @@ min-indent@^1.0.0:
   resolved "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869"
   integrity sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==
 
+minimatch@^10.2.1:
+  version "10.2.1"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-10.2.1.tgz#9d82835834cdc85d5084dd055e9a4685fa56e5f0"
+  integrity sha512-MClCe8IL5nRRmawL6ib/eT4oLyeKMGCghibcDWK+J0hh0Q8kqSdia6BvbRMVk6mPa6WqUa5uR2oxt6C5jd533A==
+  dependencies:
+    brace-expansion "^5.0.2"
+
 minimatch@^3.0.4:
   version "3.0.4"
   resolved "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
   dependencies:
     brace-expansion "^1.1.7"
 
-minimatch@^7.4.2:
-  version "7.4.2"
-  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-7.4.2.tgz#157e847d79ca671054253b840656720cb733f10f"
-  integrity sha512-xy4q7wou3vUoC9k1xGTXc+awNdGaGVHtFUaey8tiX4H1QRc04DZ/rmDFwNm2EBsuYEhAZ6SgMmYf3InGY6OauA==
-  dependencies:
-    brace-expansion "^2.0.1"
-
 minimist-options@4.1.0:
   version "4.1.0"
   resolved "https://registry.npmjs.org/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619"
@@ -7609,10 +7590,10 @@ typedarray-to-buffer@^3.1.5:
   dependencies:
     is-typedarray "^1.0.0"
 
-typescript@^3.7.2:
-  version "3.9.9"
-  resolved "https://registry.npmjs.org/typescript/-/typescript-3.9.9.tgz#e69905c54bc0681d0518bd4d587cc6f2d0b1a674"
-  integrity sha512-kdMjTiekY+z/ubJCATUPlRDl39vXYiMV9iyeMuEuXZh2we6zz80uovNN2WlAxmmdE/Z/YQe+EbOEXB5RHEED3w==
+typescript@^4.9.5:
+  version "4.9.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
+  integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==
 
 uglify-js@^3.1.4:
   version "3.13.5"

Original file line number	Diff line number	Diff line change
`@@ -34,7 +34,7 @@ export class InternalEnforcer extends CoreEnforcer {`
`34`	`34`	`try {`
`35`	`35`	`await this.adapter.addPolicy(sec, ptype, rule);`
`36`	`36`	`} catch (e) {`
`37`		`- if (e.message !== 'not implemented') {`
	`37`	`+ if (e instanceof Error && e.message !== 'not implemented') {`
`38`	`38`	`throw e;`
`39`	`39`	`}`
`40`	`40`	`}`
`@@ -74,7 +74,7 @@ export class InternalEnforcer extends CoreEnforcer {`
`74`	`74`	`try {`
`75`	`75`	`await this.adapter.addPolicies(sec, ptype, rules);`
`76`	`76`	`} catch (e) {`
`77`		`- if (e.message !== 'not implemented') {`
	`77`	`+ if (e instanceof Error && e.message !== 'not implemented') {`
`78`	`78`	`throw e;`
`79`	`79`	`}`
`80`	`80`	`}`
`@@ -121,7 +121,7 @@ export class InternalEnforcer extends CoreEnforcer {`
`121`	`121`	`try {`
`122`	`122`	`await this.adapter.addPolicies(sec, ptype, newRules);`
`123`	`123`	`} catch (e) {`
`124`		`- if (e.message !== 'not implemented') {`
	`124`	`+ if (e instanceof Error && e.message !== 'not implemented') {`
`125`	`125`	`throw e;`
`126`	`126`	`}`
`127`	`127`	`}`
`@@ -167,7 +167,7 @@ export class InternalEnforcer extends CoreEnforcer {`
`167`	`167`	`try {`
`168`	`168`	`await this.adapter.updatePolicy(sec, ptype, oldRule, newRule);`
`169`	`169`	`} catch (e) {`
`170`		`- if (e.message !== 'not implemented') {`
	`170`	`+ if (e instanceof Error && e.message !== 'not implemented') {`
`171`	`171`	`throw e;`
`172`	`172`	`}`
`173`	`173`	`}`
`@@ -208,7 +208,7 @@ export class InternalEnforcer extends CoreEnforcer {`
`208`	`208`	`try {`
`209`	`209`	`await this.adapter.removePolicy(sec, ptype, rule);`
`210`	`210`	`} catch (e) {`
`211`		`- if (e.message !== 'not implemented') {`
	`211`	`+ if (e instanceof Error && e.message !== 'not implemented') {`
`212`	`212`	`throw e;`
`213`	`213`	`}`
`214`	`214`	`}`
`@@ -246,7 +246,7 @@ export class InternalEnforcer extends CoreEnforcer {`
`246`	`246`	`try {`
`247`	`247`	`await this.adapter.removePolicies(sec, ptype, rules);`
`248`	`248`	`} catch (e) {`
`249`		`- if (e.message !== 'not implemented') {`
	`249`	`+ if (e instanceof Error && e.message !== 'not implemented') {`
`250`	`250`	`throw e;`
`251`	`251`	`}`
`252`	`252`	`}`
`@@ -288,7 +288,7 @@ export class InternalEnforcer extends CoreEnforcer {`
`288`	`288`	`try {`
`289`	`289`	`await this.adapter.removeFilteredPolicy(sec, ptype, fieldIndex, ...fieldValues);`
`290`	`290`	`} catch (e) {`
`291`		`- if (e.message !== 'not implemented') {`
	`291`	`+ if (e instanceof Error && e.message !== 'not implemented') {`
`292`	`292`	`throw e;`
`293`	`293`	`}`
`294`	`294`	`}`
Original file line number	Diff line number	Diff line change
`@@ -65,8 +65,9 @@ test('TestLoadModelFromConfig', (done) => {`
`65`	`65`	`}`
`66`	`66`
`67`	`67`	`if (e instanceof Error) {`
	`68`	`+ const error = e;`
`68`	`69`	`requiredSections.forEach((n) => {`
`69`		`- if (!e.message.includes(n)) {`
	`70`	`+ if (!error.message.includes(n)) {`
`70`	`71`	throw new Error(`section name: ${sectionNameMap[n]} should be in message`);
`71`	`72`	`}`
`72`	`73`	`});`