@tsed/schema 6.125.2 → 6.125.3

package/lib/cjs/utils/concatPath.js

@@ -2,7 +2,22 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.concatPath = void 0;
 function concatPath(basePath, path) {
-    return ((basePath || "") + (path || "")).replace(/\/\//gi, "/");
+    if (basePath instanceof RegExp || path instanceof RegExp) {
+        if (!basePath) {
+            return path;
+        }
+        if (!path) {
+            return basePath;
+        }
+        const r1 = basePath instanceof RegExp ? basePath : new RegExp(basePath, "gi");
+        const r2 = path instanceof RegExp ? path : new RegExp(path, "gi");
+        return new RegExp(r1.source + r2.source, (r1.global ? "g" : "") + (r1.ignoreCase ? "i" : "") + (r1.multiline ? "m" : ""));
+    }
+    if (basePath && path && basePath.endsWith("/") && path.startsWith("/")) {
+        path = path.slice(1);
+    }
+    const result = (basePath || "") + (path || "");
+    return result.endsWith("/") && result.length > 1 ? result.slice(0, -1) : result;
 }
 exports.concatPath = concatPath;
 //# sourceMappingURL=concatPath.js.map

package/lib/cjs/utils/concatPath.js.map

@@ -1 +1 @@
-{"version":3,"file":"concatPath.js","sourceRoot":"","sources":["../../../src/utils/concatPath.ts"],"names":[],"mappings":";;;AAAA,SAAgB,UAAU,CAAC,QAA4B,EAAE,IAAwB;IAC/E,OAAO,CAAC,CAAC,QAAQ,IAAI,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;AAClE,CAAC;AAFD,gCAEC","sourcesContent":["export function concatPath(basePath: string | undefined, path: string | undefined): string {\n  return ((basePath || \"\") + (path || \"\")).replace(/\\/\\//gi, \"/\");\n}\n"]}
+{"version":3,"file":"concatPath.js","sourceRoot":"","sources":["../../../src/utils/concatPath.ts"],"names":[],"mappings":";;;AAAA,SAAgB,UAAU,CAAC,QAAqC,EAAE,IAAiC;IACjG,IAAI,QAAQ,YAAY,MAAM,IAAI,IAAI,YAAY,MAAM,EAAE;QACxD,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,IAAI,CAAC;SACb;QAED,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,QAAQ,CAAC;SACjB;QAED,MAAM,EAAE,GAAG,QAAQ,YAAY,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC9E,MAAM,EAAE,GAAG,IAAI,YAAY,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAElE,OAAO,IAAI,MAAM,CAAC,EAAE,CAAC,MAAM,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;KAC3H;IAED,IAAI,QAAQ,IAAI,IAAI,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACtE,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACtB;IAED,MAAM,MAAM,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IAE/C,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AAClF,CAAC;AAvBD,gCAuBC","sourcesContent":["export function concatPath(basePath: string | undefined | RegExp, path: string | undefined | RegExp): any {\n  if (basePath instanceof RegExp || path instanceof RegExp) {\n    if (!basePath) {\n      return path;\n    }\n\n    if (!path) {\n      return basePath;\n    }\n\n    const r1 = basePath instanceof RegExp ? basePath : new RegExp(basePath, \"gi\");\n    const r2 = path instanceof RegExp ? path : new RegExp(path, \"gi\");\n\n    return new RegExp(r1.source + r2.source, (r1.global ? \"g\" : \"\") + (r1.ignoreCase ? \"i\" : \"\") + (r1.multiline ? \"m\" : \"\"));\n  }\n\n  if (basePath && path && basePath.endsWith(\"/\") && path.startsWith(\"/\")) {\n    path = path.slice(1);\n  }\n\n  const result = (basePath || \"\") + (path || \"\");\n\n  return result.endsWith(\"/\") && result.length > 1 ? result.slice(0, -1) : result;\n}\n"]}

package/lib/esm/utils/concatPath.js

@@ -1,4 +1,19 @@
 export function concatPath(basePath, path) {
-    return ((basePath || "") + (path || "")).replace(/\/\//gi, "/");
+    if (basePath instanceof RegExp || path instanceof RegExp) {
+        if (!basePath) {
+            return path;
+        }
+        if (!path) {
+            return basePath;
+        }
+        const r1 = basePath instanceof RegExp ? basePath : new RegExp(basePath, "gi");
+        const r2 = path instanceof RegExp ? path : new RegExp(path, "gi");
+        return new RegExp(r1.source + r2.source, (r1.global ? "g" : "") + (r1.ignoreCase ? "i" : "") + (r1.multiline ? "m" : ""));
+    }
+    if (basePath && path && basePath.endsWith("/") && path.startsWith("/")) {
+        path = path.slice(1);
+    }
+    const result = (basePath || "") + (path || "");
+    return result.endsWith("/") && result.length > 1 ? result.slice(0, -1) : result;
 }
 //# sourceMappingURL=concatPath.js.map

package/lib/esm/utils/concatPath.js.map

@@ -1 +1 @@
-{"version":3,"file":"concatPath.js","sourceRoot":"","sources":["../../../src/utils/concatPath.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,UAAU,CAAC,QAA4B,EAAE,IAAwB;IAC/E,OAAO,CAAC,CAAC,QAAQ,IAAI,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;AAClE,CAAC","sourcesContent":["export function concatPath(basePath: string | undefined, path: string | undefined): string {\n  return ((basePath || \"\") + (path || \"\")).replace(/\\/\\//gi, \"/\");\n}\n"]}
+{"version":3,"file":"concatPath.js","sourceRoot":"","sources":["../../../src/utils/concatPath.ts"],"names":[],"mappings":"AAAA,MAAM,UAAU,UAAU,CAAC,QAAqC,EAAE,IAAiC;IACjG,IAAI,QAAQ,YAAY,MAAM,IAAI,IAAI,YAAY,MAAM,EAAE;QACxD,IAAI,CAAC,QAAQ,EAAE;YACb,OAAO,IAAI,CAAC;SACb;QAED,IAAI,CAAC,IAAI,EAAE;YACT,OAAO,QAAQ,CAAC;SACjB;QAED,MAAM,EAAE,GAAG,QAAQ,YAAY,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QAC9E,MAAM,EAAE,GAAG,IAAI,YAAY,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAElE,OAAO,IAAI,MAAM,CAAC,EAAE,CAAC,MAAM,GAAG,EAAE,CAAC,MAAM,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;KAC3H;IAED,IAAI,QAAQ,IAAI,IAAI,IAAI,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACtE,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACtB;IAED,MAAM,MAAM,GAAG,CAAC,QAAQ,IAAI,EAAE,CAAC,GAAG,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC;IAE/C,OAAO,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AAClF,CAAC","sourcesContent":["export function concatPath(basePath: string | undefined | RegExp, path: string | undefined | RegExp): any {\n  if (basePath instanceof RegExp || path instanceof RegExp) {\n    if (!basePath) {\n      return path;\n    }\n\n    if (!path) {\n      return basePath;\n    }\n\n    const r1 = basePath instanceof RegExp ? basePath : new RegExp(basePath, \"gi\");\n    const r2 = path instanceof RegExp ? path : new RegExp(path, \"gi\");\n\n    return new RegExp(r1.source + r2.source, (r1.global ? \"g\" : \"\") + (r1.ignoreCase ? \"i\" : \"\") + (r1.multiline ? \"m\" : \"\"));\n  }\n\n  if (basePath && path && basePath.endsWith(\"/\") && path.startsWith(\"/\")) {\n    path = path.slice(1);\n  }\n\n  const result = (basePath || \"\") + (path || \"\");\n\n  return result.endsWith(\"/\") && result.length > 1 ? result.slice(0, -1) : result;\n}\n"]}

package/lib/types/domain/JsonOperationRoute.d.ts

@@ -8,9 +8,9 @@ export declare class JsonOperationRoute<Entity extends JsonMethodStore = JsonMet
     readonly basePath?: string;
     readonly paramsTypes: Record<string, boolean>;
     constructor(options: Partial<JsonOperationRoute>);
-    get url(): string;
+    get url(): any;
     get path(): string | RegExp | undefined;
-    get fullPath(): string;
+    get fullPath(): any;
     get method(): string;
     get isFinal(): boolean;
     get name(): string;

package/lib/types/utils/concatPath.d.ts

@@ -1 +1 @@
-export declare function concatPath(basePath: string | undefined, path: string | undefined): string;
+export declare function concatPath(basePath: string | undefined | RegExp, path: string | undefined | RegExp): any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tsed/schema",
-  "version": "6.125.2",
+  "version": "6.125.3",
   "description": "JsonSchema module for Ts.ED Framework",
   "private": false,
   "source": "./src/index.ts",
@@ -32,7 +32,7 @@
     "tsed"
   ],
   "dependencies": {
-    "@tsed/openspec": "6.125.2",
+    "@tsed/openspec": "6.125.3",
     "change-case": "^4.1.2",
     "fs-extra": "^10.0.1",
     "json-schema": "0.4.0",
@@ -42,8 +42,8 @@
   },
   "devDependencies": {
     "@apidevtools/swagger-parser": "10.0.3",
-    "@tsed/core": "6.125.2",
-    "@tsed/openspec": "6.125.2",
+    "@tsed/core": "6.125.3",
+    "@tsed/openspec": "6.125.3",
     "@types/fs-extra": "9.0.13",
     "@types/json-schema": "7.0.11",
     "@types/micromatch": "4.0.2",
@@ -51,8 +51,8 @@
     "api-spec-converter": "2.12.0"
   },
   "peerDependencies": {
-    "@tsed/core": "^6.125.2",
-    "@tsed/openspec": "^6.125.2"
+    "@tsed/core": "^6.125.3",
+    "@tsed/openspec": "^6.125.3"
   },
   "peerDependenciesMeta": {
     "@tsed/openspec": {