@pristine-ts/networking 0.0.234 → 0.0.236
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/lib/cjs/nodes/method-router.node.js +7 -0
- package/dist/lib/cjs/nodes/method-router.node.js.map +1 -1
- package/dist/lib/cjs/nodes/path-router.node.js +20 -3
- package/dist/lib/cjs/nodes/path-router.node.js.map +1 -1
- package/dist/lib/cjs/nodes/router.node.js.map +1 -1
- package/dist/lib/esm/nodes/method-router.node.js +7 -0
- package/dist/lib/esm/nodes/method-router.node.js.map +1 -1
- package/dist/lib/esm/nodes/path-router.node.js +20 -3
- package/dist/lib/esm/nodes/path-router.node.js.map +1 -1
- package/dist/lib/esm/nodes/router.node.js.map +1 -1
- package/dist/types/nodes/method-router.node.d.ts +4 -0
- package/dist/types/nodes/path-router.node.d.ts +4 -0
- package/dist/types/nodes/router.node.d.ts +4 -0
- package/package.json +6 -6
|
@@ -35,6 +35,13 @@ class MethodRouterNode extends router_node_1.RouterNode {
|
|
|
35
35
|
isCatchAll() {
|
|
36
36
|
return false;
|
|
37
37
|
}
|
|
38
|
+
/**
|
|
39
|
+
* This method will return true if the node contains a route parameter in the whole path.
|
|
40
|
+
*/
|
|
41
|
+
containsRouteParameterInPath() {
|
|
42
|
+
var _a, _b;
|
|
43
|
+
return (_b = (_a = this.parent) === null || _a === void 0 ? void 0 : _a.containsRouteParameterInPath()) !== null && _b !== void 0 ? _b : false;
|
|
44
|
+
}
|
|
38
45
|
/**
|
|
39
46
|
* This method adds all the required nodes to match the splitPaths and the method.
|
|
40
47
|
* Since a MethodRouterNode is a leaf node, you can't add anything after it, this method therefore doesn't do anything.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"method-router.node.js","sourceRoot":"","sources":["../../../../src/nodes/method-router.node.ts"],"names":[],"mappings":";;;AAAA,+CAAyC;AAIzC,qFAA6E;AAE7E;;;GAGG;AACH,MAAa,gBAAiB,SAAQ,wBAAU;IAC5C;;;;;OAKG;IACH,YAAmB,MAAsB,EAAkB,MAA2B,EAAkB,KAAY,EAAkB,aAAqB;QACvJ,KAAK,EAAE,CAAC;QAD+C,WAAM,GAAN,MAAM,CAAqB;QAAkB,UAAK,GAAL,KAAK,CAAO;QAAkB,kBAAa,GAAb,aAAa,CAAQ;QAGvJ,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,MAA2B;QAC/B,OAAO,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC;IAClC,CAAC;IAED;;OAEG;IACH,UAAU;QACN,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;;;;;OAMG;IACH,GAAG,CAAC,UAAoB,EAAE,MAA2B,EAAE,KAAY;QAC/D,MAAM,IAAI,oDAAuB,CAAC,uDAAuD,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IAChI,CAAC;IAED;;;;;;;;OAQG;IACH,IAAI,CAAC,UAAoB,EAAE,MAA2B;QAClD,IAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE;YACxC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;SAC7C;QAED,OAAO,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3E,CAAC;CACJ;
|
|
1
|
+
{"version":3,"file":"method-router.node.js","sourceRoot":"","sources":["../../../../src/nodes/method-router.node.ts"],"names":[],"mappings":";;;AAAA,+CAAyC;AAIzC,qFAA6E;AAE7E;;;GAGG;AACH,MAAa,gBAAiB,SAAQ,wBAAU;IAC5C;;;;;OAKG;IACH,YAAmB,MAAsB,EAAkB,MAA2B,EAAkB,KAAY,EAAkB,aAAqB;QACvJ,KAAK,EAAE,CAAC;QAD+C,WAAM,GAAN,MAAM,CAAqB;QAAkB,UAAK,GAAL,KAAK,CAAO;QAAkB,kBAAa,GAAb,aAAa,CAAQ;QAGvJ,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,MAA2B;QAC/B,OAAO,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC;IAClC,CAAC;IAED;;OAEG;IACH,UAAU;QACN,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;OAEG;IACH,4BAA4B;;QACxB,OAAO,MAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,4BAA4B,EAAE,mCAAI,KAAK,CAAC;IAChE,CAAC;IAED;;;;;;OAMG;IACH,GAAG,CAAC,UAAoB,EAAE,MAA2B,EAAE,KAAY;QAC/D,MAAM,IAAI,oDAAuB,CAAC,uDAAuD,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IAChI,CAAC;IAED;;;;;;;;OAQG;IACH,IAAI,CAAC,UAAoB,EAAE,MAA2B;QAClD,IAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE;YACxC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;SAC7C;QAED,OAAO,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3E,CAAC;CACJ;AA/DD,4CA+DC"}
|
|
@@ -84,6 +84,7 @@ class PathRouterNode extends router_node_1.RouterNode {
|
|
|
84
84
|
* @param method The http method for which to find a node.
|
|
85
85
|
*/
|
|
86
86
|
find(splitPaths, method) {
|
|
87
|
+
var _a;
|
|
87
88
|
// If splitPaths is 0 or if the first path doesn't match this current node, we return
|
|
88
89
|
if (splitPaths.length < 1 || this.matches(splitPaths[0]) === false) {
|
|
89
90
|
return null;
|
|
@@ -102,9 +103,13 @@ class PathRouterNode extends router_node_1.RouterNode {
|
|
|
102
103
|
}
|
|
103
104
|
// Having all the found children, we can only return one, so let's return the most appropriate one.
|
|
104
105
|
// If a the parent of the Method is not a catch-all, this is the one we should return.
|
|
105
|
-
const
|
|
106
|
-
if (
|
|
107
|
-
|
|
106
|
+
const nonCatchAllNodes = foundChildren.filter(node => { var _a; return ((_a = node.parent) === null || _a === void 0 ? void 0 : _a.isCatchAll()) === false; });
|
|
107
|
+
if (nonCatchAllNodes != undefined && nonCatchAllNodes.length > 0) {
|
|
108
|
+
if (nonCatchAllNodes.length === 1) {
|
|
109
|
+
return nonCatchAllNodes[0];
|
|
110
|
+
}
|
|
111
|
+
// If we have more than one nonCatchAllNode, we should return in priority the one that does not contain a parameter in its whole path.
|
|
112
|
+
return (_a = nonCatchAllNodes.find(node => node.containsRouteParameterInPath() === false)) !== null && _a !== void 0 ? _a : nonCatchAllNodes[0];
|
|
108
113
|
}
|
|
109
114
|
// If there is more than one catch-all, we will return the one that is the furthest from the top (this is the most specific)
|
|
110
115
|
return foundChildren.sort((a, b) => { var _a, _b; return (((_a = b.levelFromRoot) !== null && _a !== void 0 ? _a : 0) - ((_b = a.levelFromRoot) !== null && _b !== void 0 ? _b : 0)); })[0];
|
|
@@ -148,6 +153,18 @@ class PathRouterNode extends router_node_1.RouterNode {
|
|
|
148
153
|
isRouteParameter() {
|
|
149
154
|
return url_util_1.UrlUtil.isPathARouteParameter(this.path);
|
|
150
155
|
}
|
|
156
|
+
/**
|
|
157
|
+
* This method returns whether or not this pathRouterNode contains a route parameter in the whole path including all its parents.
|
|
158
|
+
*/
|
|
159
|
+
containsRouteParameterInPath() {
|
|
160
|
+
if (url_util_1.UrlUtil.isPathARouteParameter(this.path)) {
|
|
161
|
+
return true;
|
|
162
|
+
}
|
|
163
|
+
if (this.parent === undefined) {
|
|
164
|
+
return false;
|
|
165
|
+
}
|
|
166
|
+
return this.parent.containsRouteParameterInPath();
|
|
167
|
+
}
|
|
151
168
|
/**
|
|
152
169
|
* This method returns whether the current path matches a path. We have to check if this node is a RouteParameter
|
|
153
170
|
* since if it is, it will match it
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path-router.node.js","sourceRoot":"","sources":["../../../../src/nodes/path-router.node.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"path-router.node.js","sourceRoot":"","sources":["../../../../src/nodes/path-router.node.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.node.js","sourceRoot":"","sources":["../../../../src/nodes/router.node.ts"],"names":[],"mappings":";;;AAGA;;;GAGG;AACH,MAAsB,UAAU;IAAhC;QAMI;;WAEG;QACH,aAAQ,GAAiB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"router.node.js","sourceRoot":"","sources":["../../../../src/nodes/router.node.ts"],"names":[],"mappings":";;;AAGA;;;GAGG;AACH,MAAsB,UAAU;IAAhC;QAMI;;WAEG;QACH,aAAQ,GAAiB,EAAE,CAAC;IAqChC,CAAC;CAAA;AA9CD,gCA8CC"}
|
|
@@ -32,6 +32,13 @@ export class MethodRouterNode extends RouterNode {
|
|
|
32
32
|
isCatchAll() {
|
|
33
33
|
return false;
|
|
34
34
|
}
|
|
35
|
+
/**
|
|
36
|
+
* This method will return true if the node contains a route parameter in the whole path.
|
|
37
|
+
*/
|
|
38
|
+
containsRouteParameterInPath() {
|
|
39
|
+
var _a, _b;
|
|
40
|
+
return (_b = (_a = this.parent) === null || _a === void 0 ? void 0 : _a.containsRouteParameterInPath()) !== null && _b !== void 0 ? _b : false;
|
|
41
|
+
}
|
|
35
42
|
/**
|
|
36
43
|
* This method adds all the required nodes to match the splitPaths and the method.
|
|
37
44
|
* Since a MethodRouterNode is a leaf node, you can't add anything after it, this method therefore doesn't do anything.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"method-router.node.js","sourceRoot":"","sources":["../../../../src/nodes/method-router.node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAIzC,OAAO,EAAC,uBAAuB,EAAC,MAAM,sCAAsC,CAAC;AAE7E;;;GAGG;AACH,MAAM,OAAO,gBAAiB,SAAQ,UAAU;IAC5C;;;;;OAKG;IACH,YAAmB,MAAsB,EAAkB,MAA2B,EAAkB,KAAY,EAAkB,aAAqB;QACvJ,KAAK,EAAE,CAAC;QAD+C,WAAM,GAAN,MAAM,CAAqB;QAAkB,UAAK,GAAL,KAAK,CAAO;QAAkB,kBAAa,GAAb,aAAa,CAAQ;QAGvJ,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,MAA2B;QAC/B,OAAO,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC;IAClC,CAAC;IAED;;OAEG;IACH,UAAU;QACN,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;;;;;OAMG;IACH,GAAG,CAAC,UAAoB,EAAE,MAA2B,EAAE,KAAY;QAC/D,MAAM,IAAI,uBAAuB,CAAC,uDAAuD,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IAChI,CAAC;IAED;;;;;;;;OAQG;IACH,IAAI,CAAC,UAAoB,EAAE,MAA2B;QAClD,IAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE;YACxC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;SAC7C;QAED,OAAO,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3E,CAAC;CACJ"}
|
|
1
|
+
{"version":3,"file":"method-router.node.js","sourceRoot":"","sources":["../../../../src/nodes/method-router.node.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AAIzC,OAAO,EAAC,uBAAuB,EAAC,MAAM,sCAAsC,CAAC;AAE7E;;;GAGG;AACH,MAAM,OAAO,gBAAiB,SAAQ,UAAU;IAC5C;;;;;OAKG;IACH,YAAmB,MAAsB,EAAkB,MAA2B,EAAkB,KAAY,EAAkB,aAAqB;QACvJ,KAAK,EAAE,CAAC;QAD+C,WAAM,GAAN,MAAM,CAAqB;QAAkB,UAAK,GAAL,KAAK,CAAO;QAAkB,kBAAa,GAAb,aAAa,CAAQ;QAGvJ,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACzB,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,MAA2B;QAC/B,OAAO,IAAI,CAAC,MAAM,KAAK,MAAM,CAAC;IAClC,CAAC;IAED;;OAEG;IACH,UAAU;QACN,OAAO,KAAK,CAAC;IACjB,CAAC;IAED;;OAEG;IACH,4BAA4B;;QACxB,OAAO,MAAA,MAAA,IAAI,CAAC,MAAM,0CAAE,4BAA4B,EAAE,mCAAI,KAAK,CAAC;IAChE,CAAC;IAED;;;;;;OAMG;IACH,GAAG,CAAC,UAAoB,EAAE,MAA2B,EAAE,KAAY;QAC/D,MAAM,IAAI,uBAAuB,CAAC,uDAAuD,EAAE,UAAU,EAAE,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,CAAC;IAChI,CAAC;IAED;;;;;;;;OAQG;IACH,IAAI,CAAC,UAAoB,EAAE,MAA2B;QAClD,IAAG,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE,EAAE;YACxC,OAAO,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;SAC7C;QAED,OAAO,CAAC,UAAU,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC;IAC3E,CAAC;CACJ"}
|
|
@@ -81,6 +81,7 @@ export class PathRouterNode extends RouterNode {
|
|
|
81
81
|
* @param method The http method for which to find a node.
|
|
82
82
|
*/
|
|
83
83
|
find(splitPaths, method) {
|
|
84
|
+
var _a;
|
|
84
85
|
// If splitPaths is 0 or if the first path doesn't match this current node, we return
|
|
85
86
|
if (splitPaths.length < 1 || this.matches(splitPaths[0]) === false) {
|
|
86
87
|
return null;
|
|
@@ -99,9 +100,13 @@ export class PathRouterNode extends RouterNode {
|
|
|
99
100
|
}
|
|
100
101
|
// Having all the found children, we can only return one, so let's return the most appropriate one.
|
|
101
102
|
// If a the parent of the Method is not a catch-all, this is the one we should return.
|
|
102
|
-
const
|
|
103
|
-
if (
|
|
104
|
-
|
|
103
|
+
const nonCatchAllNodes = foundChildren.filter(node => { var _a; return ((_a = node.parent) === null || _a === void 0 ? void 0 : _a.isCatchAll()) === false; });
|
|
104
|
+
if (nonCatchAllNodes != undefined && nonCatchAllNodes.length > 0) {
|
|
105
|
+
if (nonCatchAllNodes.length === 1) {
|
|
106
|
+
return nonCatchAllNodes[0];
|
|
107
|
+
}
|
|
108
|
+
// If we have more than one nonCatchAllNode, we should return in priority the one that does not contain a parameter in its whole path.
|
|
109
|
+
return (_a = nonCatchAllNodes.find(node => node.containsRouteParameterInPath() === false)) !== null && _a !== void 0 ? _a : nonCatchAllNodes[0];
|
|
105
110
|
}
|
|
106
111
|
// If there is more than one catch-all, we will return the one that is the furthest from the top (this is the most specific)
|
|
107
112
|
return foundChildren.sort((a, b) => { var _a, _b; return (((_a = b.levelFromRoot) !== null && _a !== void 0 ? _a : 0) - ((_b = a.levelFromRoot) !== null && _b !== void 0 ? _b : 0)); })[0];
|
|
@@ -145,6 +150,18 @@ export class PathRouterNode extends RouterNode {
|
|
|
145
150
|
isRouteParameter() {
|
|
146
151
|
return UrlUtil.isPathARouteParameter(this.path);
|
|
147
152
|
}
|
|
153
|
+
/**
|
|
154
|
+
* This method returns whether or not this pathRouterNode contains a route parameter in the whole path including all its parents.
|
|
155
|
+
*/
|
|
156
|
+
containsRouteParameterInPath() {
|
|
157
|
+
if (UrlUtil.isPathARouteParameter(this.path)) {
|
|
158
|
+
return true;
|
|
159
|
+
}
|
|
160
|
+
if (this.parent === undefined) {
|
|
161
|
+
return false;
|
|
162
|
+
}
|
|
163
|
+
return this.parent.containsRouteParameterInPath();
|
|
164
|
+
}
|
|
148
165
|
/**
|
|
149
166
|
* This method returns whether the current path matches a path. We have to check if this node is a RouteParameter
|
|
150
167
|
* since if it is, it will match it
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"path-router.node.js","sourceRoot":"","sources":["../../../../src/nodes/path-router.node.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"path-router.node.js","sourceRoot":"","sources":["../../../../src/nodes/path-router.node.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"router.node.js","sourceRoot":"","sources":["../../../../src/nodes/router.node.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,MAAM,OAAgB,UAAU;IAAhC;QAMI;;WAEG;QACH,aAAQ,GAAiB,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"router.node.js","sourceRoot":"","sources":["../../../../src/nodes/router.node.ts"],"names":[],"mappings":"AAGA;;;GAGG;AACH,MAAM,OAAgB,UAAU;IAAhC;QAMI;;WAEG;QACH,aAAQ,GAAiB,EAAE,CAAC;IAqChC,CAAC;CAAA"}
|
|
@@ -27,6 +27,10 @@ export declare class MethodRouterNode extends RouterNode {
|
|
|
27
27
|
* A MethodRouterNode is never a catch-all node.
|
|
28
28
|
*/
|
|
29
29
|
isCatchAll(): boolean;
|
|
30
|
+
/**
|
|
31
|
+
* This method will return true if the node contains a route parameter in the whole path.
|
|
32
|
+
*/
|
|
33
|
+
containsRouteParameterInPath(): boolean;
|
|
30
34
|
/**
|
|
31
35
|
* This method adds all the required nodes to match the splitPaths and the method.
|
|
32
36
|
* Since a MethodRouterNode is a leaf node, you can't add anything after it, this method therefore doesn't do anything.
|
|
@@ -45,6 +45,10 @@ export declare class PathRouterNode extends RouterNode {
|
|
|
45
45
|
* This method returns whether or not this pathRouterNode represents a route parameter, e.g.: /{id} or /:id
|
|
46
46
|
*/
|
|
47
47
|
isRouteParameter(): boolean;
|
|
48
|
+
/**
|
|
49
|
+
* This method returns whether or not this pathRouterNode contains a route parameter in the whole path including all its parents.
|
|
50
|
+
*/
|
|
51
|
+
containsRouteParameterInPath(): boolean;
|
|
48
52
|
/**
|
|
49
53
|
* This method returns whether the current path matches a path. We have to check if this node is a RouteParameter
|
|
50
54
|
* since if it is, it will match it
|
|
@@ -40,4 +40,8 @@ export declare abstract class RouterNode {
|
|
|
40
40
|
* This method will return true if the node is a catch-all path.
|
|
41
41
|
*/
|
|
42
42
|
abstract isCatchAll(): boolean;
|
|
43
|
+
/**
|
|
44
|
+
* This method will return true if the node contains a route parameter in the whole path.
|
|
45
|
+
*/
|
|
46
|
+
abstract containsRouteParameterInPath(): boolean;
|
|
43
47
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@pristine-ts/networking",
|
|
3
|
-
"version": "0.0.
|
|
3
|
+
"version": "0.0.236",
|
|
4
4
|
"description": "",
|
|
5
5
|
"module": "dist/lib/esm/networking.module.js",
|
|
6
6
|
"main": "dist/lib/cjs/networking.module.js",
|
|
@@ -20,10 +20,10 @@
|
|
|
20
20
|
"access": "public"
|
|
21
21
|
},
|
|
22
22
|
"dependencies": {
|
|
23
|
-
"@pristine-ts/common": "^0.0.
|
|
24
|
-
"@pristine-ts/core": "^0.0.
|
|
25
|
-
"@pristine-ts/security": "^0.0.
|
|
26
|
-
"@pristine-ts/telemetry": "^0.0.
|
|
23
|
+
"@pristine-ts/common": "^0.0.236",
|
|
24
|
+
"@pristine-ts/core": "^0.0.236",
|
|
25
|
+
"@pristine-ts/security": "^0.0.236",
|
|
26
|
+
"@pristine-ts/telemetry": "^0.0.236",
|
|
27
27
|
"lodash": "^4.17.21"
|
|
28
28
|
},
|
|
29
29
|
"jest": {
|
|
@@ -60,5 +60,5 @@
|
|
|
60
60
|
"src/*.{js,ts}"
|
|
61
61
|
]
|
|
62
62
|
},
|
|
63
|
-
"gitHead": "
|
|
63
|
+
"gitHead": "ea89d0634c81a6f58465dac01e81b9ce79b94524"
|
|
64
64
|
}
|