routup 0.3.1 → 0.3.2
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/path/matcher.d.ts +4 -4
- package/dist/path/matcher.d.ts.map +1 -1
- package/dist/path/matcher.js.map +1 -1
- package/dist/path/type.d.ts +2 -0
- package/dist/path/type.d.ts.map +1 -1
- package/dist/route/module.d.ts +3 -1
- package/dist/route/module.d.ts.map +1 -1
- package/dist/route/module.js +8 -4
- package/dist/route/module.js.map +1 -1
- package/package.json +2 -2
package/dist/path/matcher.d.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
|
-
import { Key
|
|
1
|
+
import { Key } from 'path-to-regexp';
|
|
2
2
|
import { Path } from '../type';
|
|
3
|
-
import { PathMatcherExecResult } from './type';
|
|
3
|
+
import { PathMatcherExecResult, PathMatcherOptions } from './type';
|
|
4
4
|
export declare class PathMatcher {
|
|
5
5
|
path: Path;
|
|
6
6
|
regexp: RegExp;
|
|
7
7
|
regexpKeys: Key[];
|
|
8
|
-
regexpOptions:
|
|
9
|
-
constructor(path: Path, options?:
|
|
8
|
+
regexpOptions: PathMatcherOptions;
|
|
9
|
+
constructor(path: Path, options?: PathMatcherOptions);
|
|
10
10
|
test(path: string): boolean;
|
|
11
11
|
exec(path: string): PathMatcherExecResult | undefined;
|
|
12
12
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matcher.d.ts","sourceRoot":"","sources":["../../src/path/matcher.ts"],"names":[],"mappings":"AAOA,OAAO,EACH,GAAG,
|
|
1
|
+
{"version":3,"file":"matcher.d.ts","sourceRoot":"","sources":["../../src/path/matcher.ts"],"names":[],"mappings":"AAOA,OAAO,EACH,GAAG,EACN,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAC/B,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,MAAM,QAAQ,CAAC;AAUnE,qBAAa,WAAW;IACpB,IAAI,EAAE,IAAI,CAAC;IAEX,MAAM,EAAG,MAAM,CAAC;IAEhB,UAAU,EAAG,GAAG,EAAE,CAAM;IAExB,aAAa,EAAE,kBAAkB,CAAC;gBAEtB,IAAI,EAAE,IAAI,EAAE,OAAO,CAAC,EAAE,kBAAkB;IAWpD,IAAI,CAAC,IAAI,EAAE,MAAM;IASjB,IAAI,CAAC,IAAI,EAAE,MAAM,GAAI,qBAAqB,GAAG,SAAS;CA2CzD"}
|
package/dist/path/matcher.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"matcher.js","sourceRoot":"","sources":["../../src/path/matcher.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,mDAEwB;AAIxB,SAAS,WAAW,CAAC,GAAY;IAC7B,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7C,OAAO,GAAG,CAAC;KACd;IAED,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAC;AACnC,CAAC;AAED,MAAa,WAAW;IASpB,YAAY,IAAU,EAAE,
|
|
1
|
+
{"version":3,"file":"matcher.js","sourceRoot":"","sources":["../../src/path/matcher.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,mDAEwB;AAIxB,SAAS,WAAW,CAAC,GAAY;IAC7B,IAAI,OAAO,GAAG,KAAK,QAAQ,IAAI,GAAG,CAAC,MAAM,KAAK,CAAC,EAAE;QAC7C,OAAO,GAAG,CAAC;KACd;IAED,OAAO,kBAAkB,CAAC,GAAG,CAAC,CAAC;AACnC,CAAC;AAED,MAAa,WAAW;IASpB,YAAY,IAAU,EAAE,OAA4B;QAJpD,eAAU,GAAW,EAAE,CAAC;QAKpB,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC;QACjB,IAAI,CAAC,aAAa,GAAG,OAAO,IAAI,EAAE,CAAC;QAEnC,IAAI,IAAI,YAAY,MAAM,EAAE;YACxB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;SACtB;aAAM;YACH,IAAI,CAAC,MAAM,GAAG,IAAA,6BAAY,EAAC,IAAI,EAAE,IAAI,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;SAC9D;IACL,CAAC;IAED,IAAI,CAAC,IAAY;QACb,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,KAAK,GAAG,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,KAAK,KAAK,CAAC;QACxE,IAAI,SAAS,EAAE;YACX,OAAO,IAAI,CAAC;SACf;QAED,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAClC,CAAC;IAED,IAAI,CAAC,IAAY;QACb,IAAI,KAAK,GAA4B,IAAI,CAAC;QAE1C,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,KAAK,GAAG,IAAI,IAAI,CAAC,aAAa,CAAC,GAAG,KAAK,KAAK,CAAC;QACxE,IAAI,SAAS,EAAE;YACX,OAAO;gBACH,IAAI,EAAE,GAAG;gBACT,MAAM,EAAE,EAAE;aACb,CAAC;SACL;QAED,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAE/B,IAAI,CAAC,KAAK,EAAE;YACR,OAAO,SAAS,CAAC;SACpB;QAED,IAAI,IAAI,CAAC,IAAI,YAAY,MAAM,EAAE;YAC7B,OAAO;gBACH,IAAI;gBACJ,MAAM,EAAE;oBACJ,CAAC,EAAE,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;iBAC3B;aACJ,CAAC;SACL;QAED,MAAM,MAAM,GAA6B,EAAE,CAAC;QAE5C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACnC,MAAM,GAAG,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACnC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;YACtB,MAAM,GAAG,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YAElC,IAAI,OAAO,GAAG,KAAK,WAAW,EAAE;gBAC5B,MAAM,CAAC,IAAI,CAAC,GAAG,GAAG,CAAC;aACtB;SACJ;QAED,OAAO;YACH,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC;YACd,MAAM,EAAE,MAAM;SACjB,CAAC;IACN,CAAC;CACJ;AAxED,kCAwEC"}
|
package/dist/path/type.d.ts
CHANGED
package/dist/path/type.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../src/path/type.ts"],"names":[],"mappings":"AAOA,oBAAY,qBAAqB,GAAG;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAC9B,CAAC"}
|
|
1
|
+
{"version":3,"file":"type.d.ts","sourceRoot":"","sources":["../../src/path/type.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,YAAY,EAAE,qBAAqB,EAAE,MAAM,gBAAgB,CAAC;AAErE,oBAAY,kBAAkB,GAAG,qBAAqB,GAAG,YAAY,CAAC;AAEtE,oBAAY,qBAAqB,GAAG;IAChC,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAA;CAC9B,CAAC"}
|
package/dist/route/module.d.ts
CHANGED
|
@@ -1,12 +1,13 @@
|
|
|
1
1
|
import { Method } from '../constants';
|
|
2
2
|
import { Handler } from '../handler';
|
|
3
3
|
import { Layer } from '../layer';
|
|
4
|
-
import { PathMatcher } from '../path';
|
|
4
|
+
import { PathMatcher, PathMatcherOptions } from '../path';
|
|
5
5
|
import { DispatcherMeta, Next, Path, Request, Response } from '../type';
|
|
6
6
|
export declare class Route {
|
|
7
7
|
readonly '@instanceof': symbol;
|
|
8
8
|
path: Path;
|
|
9
9
|
protected pathMatcher: PathMatcher;
|
|
10
|
+
protected pathMatcherOptions: PathMatcherOptions;
|
|
10
11
|
protected layers: Record<string, Layer[]>;
|
|
11
12
|
constructor(path: Path);
|
|
12
13
|
matchPath(path: string): boolean;
|
|
@@ -18,5 +19,6 @@ export declare class Route {
|
|
|
18
19
|
put(...handlers: Handler[]): void;
|
|
19
20
|
patch(...handlers: Handler[]): void;
|
|
20
21
|
delete(...handlers: Handler[]): void;
|
|
22
|
+
private isStrictPath;
|
|
21
23
|
}
|
|
22
24
|
//# sourceMappingURL=module.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/route/module.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../../src/route/module.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AACtC,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,SAAS,CAAC;AAC1D,OAAO,EACH,cAAc,EACd,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAChC,MAAM,SAAS,CAAC;AAEjB,qBAAa,KAAK;IACd,QAAQ,CAAC,aAAa,SAAuB;IAEtC,IAAI,EAAG,IAAI,CAAC;IAEnB,SAAS,CAAC,WAAW,EAAG,WAAW,CAAC;IAEpC,SAAS,CAAC,kBAAkB,EAAG,kBAAkB,CAAC;IAElD,SAAS,CAAC,MAAM,EAAG,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,CAAM;gBAIpC,IAAI,EAAE,IAAI;IAStB,SAAS,CAAC,IAAI,EAAE,MAAM,GAAI,OAAO;IAIjC,WAAW,CAAC,MAAM,EAAE,MAAM,GAAI,OAAO;IAMrC,QAAQ,CACJ,GAAG,EAAE,OAAO,EACZ,GAAG,EAAE,QAAQ,EACb,IAAI,EAAE,cAAc,EACpB,IAAI,EAAE,IAAI,GACV,IAAI;IA+CR,QAAQ,CAAC,MAAM,EAAE,GAAG,MAAM,EAAE,EAAE,GAAG,QAAQ,EAAE,OAAO,EAAE;IAcpD,GAAG,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE;IAI1B,IAAI,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE;IAI3B,GAAG,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE;IAI1B,KAAK,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE;IAI5B,MAAM,CAAC,GAAG,QAAQ,EAAE,OAAO,EAAE;IAM7B,OAAO,CAAC,YAAY;CAIvB"}
|
package/dist/route/module.js
CHANGED
|
@@ -17,7 +17,8 @@ class Route {
|
|
|
17
17
|
this['@instanceof'] = Symbol.for('Route');
|
|
18
18
|
this.layers = {};
|
|
19
19
|
this.path = path;
|
|
20
|
-
this.
|
|
20
|
+
this.pathMatcherOptions = { end: true, strict: this.isStrictPath() };
|
|
21
|
+
this.pathMatcher = new path_1.PathMatcher(path, this.pathMatcherOptions);
|
|
21
22
|
}
|
|
22
23
|
// --------------------------------------------------
|
|
23
24
|
matchPath(path) {
|
|
@@ -61,9 +62,7 @@ class Route {
|
|
|
61
62
|
register(method, ...handlers) {
|
|
62
63
|
this.layers[method] = [];
|
|
63
64
|
for (let i = 0; i < handlers.length; i++) {
|
|
64
|
-
const layer = new layer_1.Layer(this.path,
|
|
65
|
-
end: true,
|
|
66
|
-
}, handlers[i]);
|
|
65
|
+
const layer = new layer_1.Layer(this.path, this.pathMatcherOptions, handlers[i]);
|
|
67
66
|
this.layers[method].push(layer);
|
|
68
67
|
}
|
|
69
68
|
}
|
|
@@ -82,6 +81,11 @@ class Route {
|
|
|
82
81
|
delete(...handlers) {
|
|
83
82
|
return this.register(constants_1.Method.DELETE, ...handlers);
|
|
84
83
|
}
|
|
84
|
+
// --------------------------------------------------
|
|
85
|
+
isStrictPath() {
|
|
86
|
+
return typeof this.path !== 'string' ||
|
|
87
|
+
(this.path !== '/' && this.path.length !== 0);
|
|
88
|
+
}
|
|
85
89
|
}
|
|
86
90
|
exports.Route = Route;
|
|
87
91
|
//# sourceMappingURL=module.js.map
|
package/dist/route/module.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/route/module.ts"],"names":[],"mappings":";AAAA;;;;;GAKG;;;AAEH,+BAA6B;AAC7B,4CAAsC;AAEtC,oCAAiC;AACjC,
|
|
1
|
+
{"version":3,"file":"module.js","sourceRoot":"","sources":["../../src/route/module.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "routup",
|
|
3
|
-
"version": "0.3.
|
|
3
|
+
"version": "0.3.2",
|
|
4
4
|
"description": "Routup is a minimalistic http based routing framework.",
|
|
5
5
|
"main": "./dist/index.js",
|
|
6
6
|
"typings": "dist/index.d.ts",
|
|
@@ -52,5 +52,5 @@
|
|
|
52
52
|
"path-to-regexp": "^6.2.1",
|
|
53
53
|
"smob": "^0.0.6"
|
|
54
54
|
},
|
|
55
|
-
"gitHead": "
|
|
55
|
+
"gitHead": "e9f6b3269eb4c3489bfab77864863709e2508925"
|
|
56
56
|
}
|