@webtypen/webframez-core 0.3.17 → 0.3.18
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/Router/Router.js +8 -8
- package/package.json +1 -1
- package/src/Router/Router.ts +9 -9
package/dist/Router/Router.js
CHANGED
|
@@ -180,17 +180,17 @@ class RouterFacade {
|
|
|
180
180
|
// Extract wildcard parameters
|
|
181
181
|
let wildcardIndex = paramNames.length + 1;
|
|
182
182
|
wildcards.forEach((wildcard, index) => {
|
|
183
|
-
if (wildcard ===
|
|
184
|
-
params[
|
|
183
|
+
if (wildcard === "/**") {
|
|
184
|
+
params["wildcard"] = match[wildcardIndex] || "";
|
|
185
185
|
}
|
|
186
|
-
else if (wildcard ===
|
|
187
|
-
params[
|
|
186
|
+
else if (wildcard === "/*") {
|
|
187
|
+
params["splat"] = match[wildcardIndex] || "";
|
|
188
188
|
}
|
|
189
|
-
else if (wildcard ===
|
|
190
|
-
params[
|
|
189
|
+
else if (wildcard === "**") {
|
|
190
|
+
params["wildcard"] = match[wildcardIndex] || "";
|
|
191
191
|
}
|
|
192
|
-
else if (wildcard ===
|
|
193
|
-
params[
|
|
192
|
+
else if (wildcard === "*") {
|
|
193
|
+
params["splat"] = match[wildcardIndex] || "";
|
|
194
194
|
}
|
|
195
195
|
wildcardIndex++;
|
|
196
196
|
});
|
package/package.json
CHANGED
package/src/Router/Router.ts
CHANGED
|
@@ -212,14 +212,14 @@ class RouterFacade {
|
|
|
212
212
|
// Extract wildcard parameters
|
|
213
213
|
let wildcardIndex = paramNames.length + 1;
|
|
214
214
|
wildcards.forEach((wildcard, index) => {
|
|
215
|
-
if (wildcard ===
|
|
216
|
-
params[
|
|
217
|
-
} else if (wildcard ===
|
|
218
|
-
params[
|
|
219
|
-
} else if (wildcard ===
|
|
220
|
-
params[
|
|
221
|
-
} else if (wildcard ===
|
|
222
|
-
params[
|
|
215
|
+
if (wildcard === "/**") {
|
|
216
|
+
params["wildcard"] = match[wildcardIndex] || "";
|
|
217
|
+
} else if (wildcard === "/*") {
|
|
218
|
+
params["splat"] = match[wildcardIndex] || "";
|
|
219
|
+
} else if (wildcard === "**") {
|
|
220
|
+
params["wildcard"] = match[wildcardIndex] || "";
|
|
221
|
+
} else if (wildcard === "*") {
|
|
222
|
+
params["splat"] = match[wildcardIndex] || "";
|
|
223
223
|
}
|
|
224
224
|
wildcardIndex++;
|
|
225
225
|
});
|
|
@@ -245,7 +245,7 @@ class RouterFacade {
|
|
|
245
245
|
routeObj.path
|
|
246
246
|
.replace(/\/:\w+\?/g, "(?:/([^/]+))?")
|
|
247
247
|
.replace(/\/:\w+/g, "/([^/]+)")
|
|
248
|
-
.replace(/\/\*\*/g, "/(.*)")
|
|
248
|
+
.replace(/\/\*\*/g, "/(.*)") // Catchall wildcard: /**
|
|
249
249
|
.replace(/\/\*/g, "/([^/]*)")
|
|
250
250
|
.replace(/\*\*/g, "(.*)")
|
|
251
251
|
.replace(/\*/g, "([^/]*)")
|