@tachybase/resourcer 1.3.33 → 1.3.35

package/lib/resourcer.js

@@ -36,7 +36,7 @@ var import_utils = require("@tachybase/utils");
 var import_glob = require("glob");
 var import_koa_compose = __toESM(require("koa-compose"));
 var import_lodash = __toESM(require("lodash"));
-var import_path_to_regexp2 = require("path-to-regexp2");
+var import_path_to_regexp = require("path-to-regexp");
 var import_resource = __toESM(require("./resource"));
 var import_utils2 = require("./utils");
 const _Resourcer = class _Resourcer {
@@ -219,7 +219,7 @@ const _Resourcer = class _Resourcer {
         ctx.action.resourceName = params.associatedName ? `${params.associatedName}.${params.resourceName}` : params.resourceName;
         ctx.action.params.filterByTk = params.resourceIndex;
         const query = (0, import_utils2.parseQuery)(ctx.request.querystring);
-        if ((0, import_path_to_regexp2.pathToRegexp)("/resourcer/{:associatedName.}:resourceName{\\::actionName}").regexp.test(ctx.request.path)) {
+        if ((0, import_path_to_regexp.pathToRegexp)("/resourcer/{:associatedName.}:resourceName{\\::actionName}").regexp.test(ctx.request.path)) {
           ctx.action.mergeParams({
             ...query,
             ...params,

package/lib/utils.js

@@ -36,7 +36,7 @@ __export(utils_exports, {
 });
 module.exports = __toCommonJS(utils_exports);
 var import_lodash = __toESM(require("lodash"));
-var import_path_to_regexp2 = require("path-to-regexp2");
+var import_path_to_regexp = require("path-to-regexp");
 var import_qs = __toESM(require("qs"));
 function getNameByParams(params) {
   const { resourceName, associatedName } = params;
@@ -57,7 +57,7 @@ function parseRequest(request, options = {}) {
     remove: "remove",
     ...options.accessors
   };
-  const { regexp, keys } = (0, import_path_to_regexp2.pathToRegexp)("/resourcer/{:associatedName.}:resourceName{\\::actionName}");
+  const { regexp, keys } = (0, import_path_to_regexp.pathToRegexp)("/resourcer/{:associatedName.}:resourceName{\\::actionName}");
   const reqPath = decodeURI(request.path);
   const matches = regexp.exec(reqPath);
   if (matches) {
@@ -158,7 +158,7 @@ function parseRequest(request, options = {}) {
   }
   const { type = "single" } = request;
   for (const path in defaults[type]) {
-    const { regexp: regexp2, keys: keys2 } = (0, import_path_to_regexp2.pathToRegexp)(`${prefix}${path}`);
+    const { regexp: regexp2, keys: keys2 } = (0, import_path_to_regexp.pathToRegexp)(`${prefix}${path}`);
     const matches2 = regexp2.exec(reqPath);
     if (!matches2) {
       continue;

package/package.json

@@ -1,18 +1,17 @@
 {
   "name": "@tachybase/resourcer",
-  "version": "1.3.33",
+  "version": "1.3.35",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "deepmerge": "^4.3.1",
     "glob": "11.0.0",
     "koa-compose": "^4.1.0",
     "lodash": "^4.17.21",
-    "path-to-regexp2": "npm:path-to-regexp@8.2.0",
+    "path-to-regexp": "^8.2.0",
     "qs": "^6.14.0",
-    "@tachybase/utils": "1.3.33"
+    "@tachybase/utils": "1.3.35"
   },
   "devDependencies": {
     "@types/node": "20.17.10"