@webda/core 3.11.2 → 3.12.0
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/lib/core.d.ts +1 -1
- package/lib/core.js +2 -2
- package/lib/core.js.map +1 -1
- package/lib/index.d.ts +0 -3
- package/lib/index.js +14 -17
- package/lib/index.js.map +1 -1
- package/lib/models/coremodel.d.ts +116 -6
- package/lib/models/coremodel.js +88 -11
- package/lib/models/coremodel.js.map +1 -1
- package/lib/models/user.d.ts +13 -0
- package/lib/models/user.js +20 -0
- package/lib/models/user.js.map +1 -1
- package/lib/queues/pubsubservice.d.ts +20 -0
- package/lib/queues/pubsubservice.js +27 -0
- package/lib/queues/pubsubservice.js.map +1 -1
- package/lib/queues/queueservice.d.ts +0 -12
- package/lib/queues/queueservice.js +4 -26
- package/lib/queues/queueservice.js.map +1 -1
- package/lib/services/cloudbinary.js.map +1 -1
- package/lib/services/configuration.d.ts +3 -2
- package/lib/services/configuration.js +4 -2
- package/lib/services/configuration.js.map +1 -1
- package/lib/services/cryptoservice.d.ts +49 -1
- package/lib/services/cryptoservice.js +123 -4
- package/lib/services/cryptoservice.js.map +1 -1
- package/lib/services/cryptoservice.spec.js +40 -0
- package/lib/services/cryptoservice.spec.js.map +1 -1
- package/lib/services/prometheus.spec.js +1 -1
- package/lib/services/prometheus.spec.js.map +1 -1
- package/lib/services/service.d.ts +18 -1
- package/lib/services/service.js +24 -0
- package/lib/services/service.js.map +1 -1
- package/lib/services/service.spec.js +8 -0
- package/lib/services/service.spec.js.map +1 -1
- package/lib/stores/file.js +0 -9
- package/lib/stores/file.js.map +1 -1
- package/lib/stores/file.spec.js +9 -0
- package/lib/stores/file.spec.js.map +1 -1
- package/lib/stores/memory.js +2 -0
- package/lib/stores/memory.js.map +1 -1
- package/lib/stores/store.d.ts +40 -2
- package/lib/stores/store.js +108 -44
- package/lib/stores/store.js.map +1 -1
- package/lib/stores/store.spec.js +2 -2
- package/lib/stores/store.spec.js.map +1 -1
- package/lib/stores/webdaql/query.d.ts +82 -13
- package/lib/stores/webdaql/query.js +131 -3
- package/lib/stores/webdaql/query.js.map +1 -1
- package/lib/stores/webdaql/query.spec.js +27 -0
- package/lib/stores/webdaql/query.spec.js.map +1 -1
- package/lib/test.js +2 -1
- package/lib/test.js.map +1 -1
- package/lib/utils/context.d.ts +5 -1
- package/lib/utils/context.js +14 -8
- package/lib/utils/context.js.map +1 -1
- package/lib/utils/context.spec.js +15 -0
- package/lib/utils/context.spec.js.map +1 -1
- package/lib/utils/logger.d.ts +1 -1
- package/lib/utils/logger.js +3 -0
- package/lib/utils/logger.js.map +1 -1
- package/lib/utils/serializers.d.ts +5 -0
- package/lib/utils/serializers.js +22 -0
- package/lib/utils/serializers.js.map +1 -1
- package/lib/utils/serializers.spec.js +57 -1
- package/lib/utils/serializers.spec.js.map +1 -1
- package/package.json +6 -5
- package/webda.module.json +14 -113
- package/lib/services/echo.d.ts +0 -45
- package/lib/services/echo.js +0 -49
- package/lib/services/echo.js.map +0 -1
- package/lib/services/echo.spec.d.ts +0 -1
- package/lib/services/echo.spec.js +0 -47
- package/lib/services/echo.spec.js.map +0 -1
- package/lib/services/proxy.d.ts +0 -197
- package/lib/services/proxy.js +0 -336
- package/lib/services/proxy.js.map +0 -1
- package/lib/services/proxy.spec.d.ts +0 -1
- package/lib/services/proxy.spec.js +0 -188
- package/lib/services/proxy.spec.js.map +0 -1
- package/lib/services/version.d.ts +0 -34
- package/lib/services/version.js +0 -53
- package/lib/services/version.js.map +0 -1
- package/lib/services/version.spec.d.ts +0 -1
- package/lib/services/version.spec.js +0 -24
- package/lib/services/version.spec.js.map +0 -1
|
@@ -1,188 +0,0 @@
|
|
|
1
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
-
};
|
|
7
|
-
import { suite, test } from "@testdeck/mocha";
|
|
8
|
-
import * as assert from "assert";
|
|
9
|
-
import { EventEmitter } from "events";
|
|
10
|
-
import * as http from "http";
|
|
11
|
-
import sinon from "sinon";
|
|
12
|
-
import { WebSocket, WebSocketServer } from "ws";
|
|
13
|
-
import { WebdaError } from "../errors.js";
|
|
14
|
-
import { WebdaTest } from "../test.js";
|
|
15
|
-
import { HttpContext } from "../utils/httpcontext.js";
|
|
16
|
-
import { createHttpHeader, ProxyService } from "./proxy.js";
|
|
17
|
-
let WSProxyTest = class WSProxyTest extends WebdaTest {
|
|
18
|
-
cov() {
|
|
19
|
-
assert.strictEqual(createHttpHeader("plop", { test: ["1", "2"] }), `plop\r\ntest: 1\r\ntest: 2\r\n\r\n`);
|
|
20
|
-
}
|
|
21
|
-
async wsProxy() {
|
|
22
|
-
const proxyService = new ProxyService(this.webda, "proxy", {
|
|
23
|
-
url: "/proxy",
|
|
24
|
-
backend: "http://localhost:28888/"
|
|
25
|
-
});
|
|
26
|
-
const socket = new EventEmitter();
|
|
27
|
-
socket.destroy = sinon.stub();
|
|
28
|
-
socket.end = sinon.stub();
|
|
29
|
-
proxyService.proxyWS({ url: "/toto" }, socket, undefined);
|
|
30
|
-
assert.ok(!socket.destroy.calledOnce);
|
|
31
|
-
proxyService.proxyWS({ url: "/proxy/", method: "POST" }, socket, undefined);
|
|
32
|
-
assert.ok(socket.destroy.calledOnce);
|
|
33
|
-
socket.destroy.resetHistory();
|
|
34
|
-
proxyService.proxyWS({ url: "/proxy/", method: "GET", headers: {} }, socket, undefined);
|
|
35
|
-
assert.ok(socket.destroy.calledOnce);
|
|
36
|
-
socket.destroy.resetHistory();
|
|
37
|
-
proxyService.proxyWS({ url: "/proxy/", method: "GET", headers: { upgrade: "toto" } }, socket, undefined);
|
|
38
|
-
assert.ok(socket.destroy.calledOnce);
|
|
39
|
-
const proxyRequestSocket = new EventEmitter();
|
|
40
|
-
proxyRequestSocket.end = sinon.stub();
|
|
41
|
-
const createRequest = sinon.stub(proxyService, "createWSRequest").callsFake(() => {
|
|
42
|
-
return proxyRequestSocket;
|
|
43
|
-
});
|
|
44
|
-
const ctx = await this.newContext();
|
|
45
|
-
await proxyService.rawProxyWS(ctx, "", socket);
|
|
46
|
-
proxyRequestSocket.emit("error");
|
|
47
|
-
assert.ok(socket.end.calledOnce);
|
|
48
|
-
socket.write = sinon.stub();
|
|
49
|
-
proxyRequestSocket.emit("response", {
|
|
50
|
-
pipe: sinon.stub(),
|
|
51
|
-
headers: {},
|
|
52
|
-
httpVersion: "1.0",
|
|
53
|
-
statusCode: 200,
|
|
54
|
-
statusMessage: "OK"
|
|
55
|
-
});
|
|
56
|
-
assert.ok(socket.write.calledOnce);
|
|
57
|
-
createRequest.restore();
|
|
58
|
-
return new Promise(async (resolve, reject) => {
|
|
59
|
-
try {
|
|
60
|
-
console.log("WS server constructor");
|
|
61
|
-
const wss = new WebSocketServer({ port: 28888 });
|
|
62
|
-
wss.on("connection", function connection(ws) {
|
|
63
|
-
ws.on("error", console.error);
|
|
64
|
-
ws.on("message", function message(data) {
|
|
65
|
-
console.log("received: %s", data);
|
|
66
|
-
ws.send(data);
|
|
67
|
-
});
|
|
68
|
-
ws.send("something");
|
|
69
|
-
});
|
|
70
|
-
this.registerService(proxyService);
|
|
71
|
-
await proxyService.resolve().init();
|
|
72
|
-
console.log("Http server constructor");
|
|
73
|
-
const httpServer = http
|
|
74
|
-
.createServer((req, res) => {
|
|
75
|
-
console.log("Got request", req.url);
|
|
76
|
-
})
|
|
77
|
-
.listen("28887");
|
|
78
|
-
this.webda.emit("Webda.Init.Http", httpServer);
|
|
79
|
-
// @ts-ignore
|
|
80
|
-
this.webda.getContextFromRequest = async (req, res) => this.webda.newWebContext(new HttpContext("localhost", "GET", "/proxy/", "http", "28887", req.headers), res, true);
|
|
81
|
-
const ws = new WebSocket("ws://localhost:28887/proxy/");
|
|
82
|
-
ws.on("error", console.error);
|
|
83
|
-
ws.on("open", function open() {
|
|
84
|
-
console.log("connected");
|
|
85
|
-
ws.send(Date.now());
|
|
86
|
-
});
|
|
87
|
-
ws.on("close", function close() {
|
|
88
|
-
console.log("disconnected");
|
|
89
|
-
});
|
|
90
|
-
ws.on("message", function message(data) {
|
|
91
|
-
if (isNaN(data)) {
|
|
92
|
-
return;
|
|
93
|
-
}
|
|
94
|
-
console.log(`Round-trip time: ${Date.now() - data} ms`);
|
|
95
|
-
ws.close();
|
|
96
|
-
wss.close();
|
|
97
|
-
httpServer.close();
|
|
98
|
-
resolve();
|
|
99
|
-
});
|
|
100
|
-
}
|
|
101
|
-
catch (err) {
|
|
102
|
-
console.error(err);
|
|
103
|
-
}
|
|
104
|
-
});
|
|
105
|
-
}
|
|
106
|
-
};
|
|
107
|
-
__decorate([
|
|
108
|
-
test
|
|
109
|
-
], WSProxyTest.prototype, "cov", null);
|
|
110
|
-
__decorate([
|
|
111
|
-
test
|
|
112
|
-
], WSProxyTest.prototype, "wsProxy", null);
|
|
113
|
-
WSProxyTest = __decorate([
|
|
114
|
-
suite
|
|
115
|
-
], WSProxyTest);
|
|
116
|
-
let ProxyTest = class ProxyTest extends WebdaTest {
|
|
117
|
-
async before() {
|
|
118
|
-
await super.before();
|
|
119
|
-
this.fakeServe();
|
|
120
|
-
}
|
|
121
|
-
fakeServe() {
|
|
122
|
-
this.server = http
|
|
123
|
-
.createServer((req, res) => {
|
|
124
|
-
if (req.url === "/plop404") {
|
|
125
|
-
res.writeHead(404);
|
|
126
|
-
res.end();
|
|
127
|
-
return;
|
|
128
|
-
}
|
|
129
|
-
else if (req.url === "/plop500") {
|
|
130
|
-
res.end();
|
|
131
|
-
return;
|
|
132
|
-
}
|
|
133
|
-
res.writeHead(200, { "X-URL": req.url });
|
|
134
|
-
// Just simple echo
|
|
135
|
-
req.pipe(res);
|
|
136
|
-
})
|
|
137
|
-
.listen(28888);
|
|
138
|
-
}
|
|
139
|
-
after() {
|
|
140
|
-
this.server?.close();
|
|
141
|
-
}
|
|
142
|
-
async proxy() {
|
|
143
|
-
const proxyService = new ProxyService(this.webda, "proxy", {
|
|
144
|
-
url: "/proxy",
|
|
145
|
-
backend: "http://localhost:28888/"
|
|
146
|
-
});
|
|
147
|
-
this.registerService(proxyService);
|
|
148
|
-
await proxyService.resolve().init();
|
|
149
|
-
this.webda.getRouter().remapRoutes();
|
|
150
|
-
let ctx = await this.newContext();
|
|
151
|
-
ctx.getHttpContext().setClientIp("127.0.0.1");
|
|
152
|
-
let exec = this.getExecutor(ctx, "test.webda.io", "PUT", "/proxy/test/plop", "Bouzouf");
|
|
153
|
-
await exec.execute(ctx);
|
|
154
|
-
assert.notStrictEqual(ctx.getStream().size(), 0);
|
|
155
|
-
assert.strictEqual(ctx.getResponseBody().toString(), "Bouzouf");
|
|
156
|
-
exec = this.getExecutor(ctx, "test.webda.io", "PUT", "/proxy/test/plop/toto?query=1&query2=test,test2", "Bouzouf");
|
|
157
|
-
await exec.execute(ctx);
|
|
158
|
-
assert.notStrictEqual(ctx.getStream().size(), 0);
|
|
159
|
-
assert.strictEqual(ctx.getResponseBody().toString(), "Bouzouf");
|
|
160
|
-
assert.strictEqual(ctx.getResponseHeaders()["x-url"], "/test/plop/toto?query=1&query2=test,test2");
|
|
161
|
-
exec = this.getExecutor(ctx, "test.webda.io", "GET", "/proxy/plop404", "Bouzouf");
|
|
162
|
-
await exec.execute(ctx);
|
|
163
|
-
proxyService.getParameters().backend = "http://256.256.256.256/";
|
|
164
|
-
exec = this.getExecutor(ctx, "test.webda.io", "GET", "/proxy/webda", "Bouzouf");
|
|
165
|
-
await exec.execute(ctx);
|
|
166
|
-
proxyService.getParameters().backend = "https://www.loopingz.com/";
|
|
167
|
-
exec = this.getExecutor(ctx, "test.webda.io", "GET", "/proxy/webda", "Bouzouf");
|
|
168
|
-
await exec.execute(ctx);
|
|
169
|
-
proxyService.getParameters().requireAuthentication = true;
|
|
170
|
-
await assert.rejects(() => this.execute(ctx, "test.webda.io", "GET", "/proxy"), WebdaError.Unauthorized);
|
|
171
|
-
ctx.reinit();
|
|
172
|
-
ctx.getSession().login("test", "test");
|
|
173
|
-
await this.execute(ctx, "test.webda.io", "GET", "/proxy", undefined, {
|
|
174
|
-
"x-forwarded-for": "10.0.0.8"
|
|
175
|
-
});
|
|
176
|
-
//assert.strictEqual(ctx.getResponseHeaders()["x-forwarded-for"], "127.0.0.1, 10.0.0.8");
|
|
177
|
-
// cov
|
|
178
|
-
proxyService.getParameters().url = undefined;
|
|
179
|
-
proxyService.resolve();
|
|
180
|
-
}
|
|
181
|
-
};
|
|
182
|
-
__decorate([
|
|
183
|
-
test
|
|
184
|
-
], ProxyTest.prototype, "proxy", null);
|
|
185
|
-
ProxyTest = __decorate([
|
|
186
|
-
suite
|
|
187
|
-
], ProxyTest);
|
|
188
|
-
//# sourceMappingURL=proxy.spec.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"proxy.spec.js","sourceRoot":"","sources":["../../src/services/proxy.spec.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,34 +0,0 @@
|
|
|
1
|
-
import { OperationContext, Service, ServiceParameters } from "../index.js";
|
|
2
|
-
/**
|
|
3
|
-
* Version parameters
|
|
4
|
-
*/
|
|
5
|
-
export declare class VersionServiceParameters extends ServiceParameters {
|
|
6
|
-
/**
|
|
7
|
-
* To force version otherwise would read from package.json
|
|
8
|
-
*/
|
|
9
|
-
version?: string;
|
|
10
|
-
/**
|
|
11
|
-
* @default /version
|
|
12
|
-
*/
|
|
13
|
-
url?: string;
|
|
14
|
-
}
|
|
15
|
-
/**
|
|
16
|
-
* Display the version of the app on a route
|
|
17
|
-
* @WebdaModda VersionService
|
|
18
|
-
*/
|
|
19
|
-
export declare class VersionService<T extends VersionServiceParameters = VersionServiceParameters> extends Service<T> {
|
|
20
|
-
/**
|
|
21
|
-
* @inheritdoc
|
|
22
|
-
*/
|
|
23
|
-
initRoutes(): void;
|
|
24
|
-
/**
|
|
25
|
-
* @inheritdoc
|
|
26
|
-
*/
|
|
27
|
-
loadParameters(params: any): VersionServiceParameters;
|
|
28
|
-
/**
|
|
29
|
-
* Serve the version of the app
|
|
30
|
-
*
|
|
31
|
-
* @param ctx
|
|
32
|
-
*/
|
|
33
|
-
version(ctx: OperationContext): void;
|
|
34
|
-
}
|
package/lib/services/version.js
DELETED
|
@@ -1,53 +0,0 @@
|
|
|
1
|
-
import { Service, ServiceParameters } from "../index.js";
|
|
2
|
-
/**
|
|
3
|
-
* Version parameters
|
|
4
|
-
*/
|
|
5
|
-
export class VersionServiceParameters extends ServiceParameters {
|
|
6
|
-
}
|
|
7
|
-
/**
|
|
8
|
-
* Display the version of the app on a route
|
|
9
|
-
* @WebdaModda VersionService
|
|
10
|
-
*/
|
|
11
|
-
export class VersionService extends Service {
|
|
12
|
-
/**
|
|
13
|
-
* @inheritdoc
|
|
14
|
-
*/
|
|
15
|
-
initRoutes() {
|
|
16
|
-
super.initRoutes();
|
|
17
|
-
this.addRoute(this.parameters.url, ["GET"], this.version, {
|
|
18
|
-
get: {
|
|
19
|
-
summary: "Get the version of the application",
|
|
20
|
-
responses: {
|
|
21
|
-
200: {
|
|
22
|
-
description: "Version of the application",
|
|
23
|
-
content: {
|
|
24
|
-
"text/plain": {
|
|
25
|
-
schema: {
|
|
26
|
-
type: "string"
|
|
27
|
-
}
|
|
28
|
-
}
|
|
29
|
-
}
|
|
30
|
-
}
|
|
31
|
-
}
|
|
32
|
-
}
|
|
33
|
-
});
|
|
34
|
-
}
|
|
35
|
-
/**
|
|
36
|
-
* @inheritdoc
|
|
37
|
-
*/
|
|
38
|
-
loadParameters(params) {
|
|
39
|
-
params.version = params.version || this.getWebda().getApplication().getPackageDescription().version;
|
|
40
|
-
params.url = params.url || "/version";
|
|
41
|
-
return new VersionServiceParameters(params);
|
|
42
|
-
}
|
|
43
|
-
/**
|
|
44
|
-
* Serve the version of the app
|
|
45
|
-
*
|
|
46
|
-
* @param ctx
|
|
47
|
-
*/
|
|
48
|
-
version(ctx) {
|
|
49
|
-
ctx.setHeader("Content-Type", "text/plain");
|
|
50
|
-
ctx.write(this.parameters.version);
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
//# sourceMappingURL=version.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"version.js","sourceRoot":"","sources":["../../src/services/version.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,OAAO,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAExE;;GAEG;AACH,MAAM,OAAO,wBAAyB,SAAQ,iBAAiB;CAS9D;AAED;;;GAGG;AACH,MAAM,OAAO,cAA8E,SAAQ,OAAU;IAC3G;;OAEG;IACH,UAAU;QACR,KAAK,CAAC,UAAU,EAAE,CAAC;QACnB,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE;YACxD,GAAG,EAAE;gBACH,OAAO,EAAE,oCAAoC;gBAC7C,SAAS,EAAE;oBACT,GAAG,EAAE;wBACH,WAAW,EAAE,4BAA4B;wBACzC,OAAO,EAAE;4BACP,YAAY,EAAE;gCACZ,MAAM,EAAE;oCACN,IAAI,EAAE,QAAQ;iCACf;6BACF;yBACF;qBACF;iBACF;aACF;SACF,CAAC,CAAC;IACL,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,MAAW;QACxB,MAAM,CAAC,OAAO,GAAG,MAAM,CAAC,OAAO,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC,cAAc,EAAE,CAAC,qBAAqB,EAAE,CAAC,OAAO,CAAC;QACpG,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,UAAU,CAAC;QACtC,OAAO,IAAI,wBAAwB,CAAC,MAAM,CAAC,CAAC;IAC9C,CAAC;IAED;;;;OAIG;IACH,OAAO,CAAC,GAAqB;QAC3B,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;QAC5C,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IACrC,CAAC;CACF"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export {};
|
|
@@ -1,24 +0,0 @@
|
|
|
1
|
-
var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
|
|
2
|
-
var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
|
|
3
|
-
if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
|
|
4
|
-
else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
|
|
5
|
-
return c > 3 && r && Object.defineProperty(target, key, r), r;
|
|
6
|
-
};
|
|
7
|
-
import { suite, test } from "@testdeck/mocha";
|
|
8
|
-
import * as assert from "assert";
|
|
9
|
-
import { WebdaTest } from "../test.js";
|
|
10
|
-
let VersionTest = class VersionTest extends WebdaTest {
|
|
11
|
-
async normal() {
|
|
12
|
-
let ctx = await this.newContext();
|
|
13
|
-
await this.getExecutor(ctx, "webda.io", "GET", "/version").execute(ctx);
|
|
14
|
-
// Version within package.json of test/ folder
|
|
15
|
-
assert.strictEqual(ctx.getResponseBody(), "1.1.0");
|
|
16
|
-
}
|
|
17
|
-
};
|
|
18
|
-
__decorate([
|
|
19
|
-
test
|
|
20
|
-
], VersionTest.prototype, "normal", null);
|
|
21
|
-
VersionTest = __decorate([
|
|
22
|
-
suite
|
|
23
|
-
], VersionTest);
|
|
24
|
-
//# sourceMappingURL=version.spec.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"version.spec.js","sourceRoot":"","sources":["../../src/services/version.spec.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,KAAK,MAAM,MAAM,QAAQ,CAAC;AACjC,OAAO,EAAE,SAAS,EAAE,MAAM,SAAS,CAAC;AAGpC,IAAM,WAAW,GAAjB,MAAM,WAAY,SAAQ,SAAS;IAE3B,AAAN,KAAK,CAAC,MAAM;QACV,IAAI,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,EAAE,CAAC;QAClC,MAAM,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,UAAU,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QACxE,8CAA8C;QAC9C,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,OAAO,CAAC,CAAC;IACrD,CAAC;CACF,CAAA;AANO;IADL,IAAI;yCAMJ;AAPG,WAAW;IADhB,KAAK;GACA,WAAW,CAQhB"}
|