revisium 2.2.0 → 2.4.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/dist/e2e/utils/cli-runner.d.ts +1 -0
- package/dist/e2e/utils/cli-runner.js +3 -2
- package/dist/e2e/utils/cli-runner.js.map +1 -1
- package/dist/package.json +1 -1
- package/dist/src/commands/migration/apply-migrations.command.d.ts +2 -0
- package/dist/src/commands/migration/apply-migrations.command.js +16 -1
- package/dist/src/commands/migration/apply-migrations.command.js.map +1 -1
- package/dist/src/services/connection/connection-factory.service.d.ts +3 -0
- package/dist/src/services/connection/connection-factory.service.js +30 -5
- package/dist/src/services/connection/connection-factory.service.js.map +1 -1
- package/dist/src/services/connection/connection.service.d.ts +1 -0
- package/dist/src/services/connection/connection.service.js +3 -1
- package/dist/src/services/connection/connection.service.js.map +1 -1
- package/dist/src/services/url/url-parser.service.d.ts +1 -1
- package/dist/src/services/url/url-parser.service.js +12 -6
- package/dist/src/services/url/url-parser.service.js.map +1 -1
- package/dist/tsconfig.build.tsbuildinfo +1 -1
- package/docs/migrate-commands.md +6 -1
- package/docs/url-format.md +25 -0
- package/e2e/tests/01-auth.e2e-spec.ts +19 -0
- package/e2e/tests/03-migrate.e2e-spec.ts +49 -1
- package/e2e/utils/cli-runner.ts +11 -3
- package/package.json +1 -1
- package/src/commands/migration/apply-migrations.command.ts +14 -1
- package/src/services/connection/__tests__/connection-factory.service.spec.ts +141 -0
- package/src/services/connection/__tests__/connection.service.spec.ts +1 -0
- package/src/services/connection/connection-factory.service.ts +47 -5
- package/src/services/connection/connection.service.ts +4 -1
- package/src/services/url/__tests__/url-parser.service.spec.ts +162 -0
- package/src/services/url/url-parser.service.ts +21 -6
|
@@ -52,8 +52,9 @@ async function runCli(args, options = {}) {
|
|
|
52
52
|
});
|
|
53
53
|
}
|
|
54
54
|
function buildUrl(projectName, options = {}) {
|
|
55
|
-
const { orgId = 'admin', branch = 'master', revision, token } = options;
|
|
56
|
-
|
|
55
|
+
const { orgId = 'admin', branch = 'master', revision, token, protocol, } = options;
|
|
56
|
+
const scheme = protocol ? `revisium+${protocol}` : 'revisium';
|
|
57
|
+
let url = `${scheme}://localhost:8082/${orgId}/${projectName}/${branch}`;
|
|
57
58
|
if (revision) {
|
|
58
59
|
url += `:${revision}`;
|
|
59
60
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"cli-runner.js","sourceRoot":"","sources":["../../../e2e/utils/cli-runner.ts"],"names":[],"mappings":";;AAgBA,wBA0DC;AAED,
|
|
1
|
+
{"version":3,"file":"cli-runner.js","sourceRoot":"","sources":["../../../e2e/utils/cli-runner.ts"],"names":[],"mappings":"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"}
|
package/dist/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "revisium",
|
|
3
|
-
"version": "2.
|
|
3
|
+
"version": "2.4.0",
|
|
4
4
|
"homepage": "https://revisium.io",
|
|
5
5
|
"description": "A CLI tool for interacting with Revisium instances, providing migration management, schema export, and data export capabilities.",
|
|
6
6
|
"author": "Anton Kashirov",
|
|
@@ -5,6 +5,7 @@ import { CommitRevisionService } from 'src/services/sync';
|
|
|
5
5
|
type Options = BaseOptions & {
|
|
6
6
|
file: string;
|
|
7
7
|
commit?: boolean;
|
|
8
|
+
createProject?: boolean;
|
|
8
9
|
};
|
|
9
10
|
export declare class ApplyMigrationsCommand extends BaseCommand {
|
|
10
11
|
private readonly connectionService;
|
|
@@ -18,5 +19,6 @@ export declare class ApplyMigrationsCommand extends BaseCommand {
|
|
|
18
19
|
private get revisionScope();
|
|
19
20
|
parseFile(value: string): string;
|
|
20
21
|
parseCommit(value?: string): boolean;
|
|
22
|
+
parseCreateProject(value?: string): boolean;
|
|
21
23
|
}
|
|
22
24
|
export {};
|
|
@@ -36,7 +36,10 @@ let ApplyMigrationsCommand = class ApplyMigrationsCommand extends base_command_1
|
|
|
36
36
|
this.logger.info(`📋 Validating migration file: ${options.file}`);
|
|
37
37
|
const jsonData = await this.validateJsonFile(options.file);
|
|
38
38
|
this.logger.success('Migration file validation passed');
|
|
39
|
-
await this.connectionService.connect(
|
|
39
|
+
await this.connectionService.connect({
|
|
40
|
+
url: options.url,
|
|
41
|
+
createProject: options.createProject,
|
|
42
|
+
});
|
|
40
43
|
const countAppliedMigrations = await this.applyMigration(jsonData);
|
|
41
44
|
await this.commitRevisionService.handleCommitFlow(options.commit, 'Applied', countAppliedMigrations || 0);
|
|
42
45
|
}
|
|
@@ -99,6 +102,9 @@ let ApplyMigrationsCommand = class ApplyMigrationsCommand extends base_command_1
|
|
|
99
102
|
parseCommit(value) {
|
|
100
103
|
return (0, parse_boolean_utils_1.parseBooleanOption)(value);
|
|
101
104
|
}
|
|
105
|
+
parseCreateProject(value) {
|
|
106
|
+
return (0, parse_boolean_utils_1.parseBooleanOption)(value);
|
|
107
|
+
}
|
|
102
108
|
};
|
|
103
109
|
exports.ApplyMigrationsCommand = ApplyMigrationsCommand;
|
|
104
110
|
__decorate([
|
|
@@ -120,6 +126,15 @@ __decorate([
|
|
|
120
126
|
__metadata("design:paramtypes", [String]),
|
|
121
127
|
__metadata("design:returntype", Boolean)
|
|
122
128
|
], ApplyMigrationsCommand.prototype, "parseCommit", null);
|
|
129
|
+
__decorate([
|
|
130
|
+
(0, nest_commander_1.Option)({
|
|
131
|
+
flags: '--create-project [boolean]',
|
|
132
|
+
description: 'Automatically create the project if it does not exist (for CI/CD)',
|
|
133
|
+
}),
|
|
134
|
+
__metadata("design:type", Function),
|
|
135
|
+
__metadata("design:paramtypes", [String]),
|
|
136
|
+
__metadata("design:returntype", Boolean)
|
|
137
|
+
], ApplyMigrationsCommand.prototype, "parseCreateProject", null);
|
|
123
138
|
exports.ApplyMigrationsCommand = ApplyMigrationsCommand = __decorate([
|
|
124
139
|
(0, nest_commander_1.SubCommand)({
|
|
125
140
|
name: 'apply',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apply-migrations.command.js","sourceRoot":"","sources":["../../../../src/commands/migration/apply-migrations.command.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAA4C;AAC5C,mDAAoD;AAEpD,kDAAqE;AACrE,0DAA4D;AAC5D,kDAA0E;AAC1E,8CAA0D;AAE1D,yEAAmE;
|
|
1
|
+
{"version":3,"file":"apply-migrations.command.js","sourceRoot":"","sources":["../../../../src/commands/migration/apply-migrations.command.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,+CAA4C;AAC5C,mDAAoD;AAEpD,kDAAqE;AACrE,0DAA4D;AAC5D,kDAA0E;AAC1E,8CAA0D;AAE1D,yEAAmE;AAY5D,IAAM,sBAAsB,GAA5B,MAAM,sBAAuB,SAAQ,0BAAW;IAElC;IACA;IACA;IACA;IAJnB,YACmB,iBAAoC,EACpC,oBAA0C,EAC1C,qBAA4C,EAC5C,MAAqB;QAEtC,KAAK,EAAE,CAAC;QALS,sBAAiB,GAAjB,iBAAiB,CAAmB;QACpC,yBAAoB,GAApB,oBAAoB,CAAsB;QAC1C,0BAAqB,GAArB,qBAAqB,CAAuB;QAC5C,WAAM,GAAN,MAAM,CAAe;IAGxC,CAAC;IAED,KAAK,CAAC,GAAG,CAAC,OAAiB,EAAE,OAAgB;QAC3C,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;YAClB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;QACtD,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,iCAAiC,OAAO,CAAC,IAAI,EAAE,CAAC,CAAC;QAClE,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAC3D,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,kCAAkC,CAAC,CAAC;QAExD,MAAM,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC;YACnC,GAAG,EAAE,OAAO,CAAC,GAAG;YAChB,aAAa,EAAE,OAAO,CAAC,aAAa;SACrC,CAAC,CAAC;QAEH,MAAM,sBAAsB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,QAAQ,CAAC,CAAC;QAEnE,MAAM,IAAI,CAAC,qBAAqB,CAAC,gBAAgB,CAC/C,OAAO,CAAC,MAAM,EACd,SAAS,EACT,sBAAsB,IAAI,CAAC,CAC5B,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,gBAAgB,CAAC,QAAgB;QAC7C,IAAI,CAAC;YACH,MAAM,WAAW,GAAG,MAAM,IAAA,mBAAQ,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;YACtD,MAAM,IAAI,GAAY,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;YAE9C,OAAO,IAAI,CAAC,oBAAoB,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;QAC3D,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,IAAI,CAAC,MAAM,CAAC,KAAK,CACf,kCAAkC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,CAC3F,CAAC;YACF,MAAM,KAAK,CAAC;QACd,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,cAAc,CAAC,UAAuB;QAClD,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC5B,IAAI,CAAC,MAAM,CAAC,OAAO,CACjB,wDAAwD,CACzD,CAAC;YACF,OAAO;QACT,CAAC;QAED,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,eAAe,UAAU,CAAC,MAAM,gBAAgB,CAAC,CAAC;QAEnE,IAAI,sBAAsB,GAAG,CAAC,CAAC;QAE/B,IAAI,CAAC;YACH,KAAK,MAAM,cAAc,IAAI,UAAU,EAAE,CAAC;gBACxC,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,aAAa,CAAC,yBAAyB,CAAC;oBACjE,cAAc;iBACf,CAAC,CAAC;gBAEH,MAAM,QAAQ,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;gBAE5B,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,EAAE,CAAC;oBACjC,IAAI,CAAC,MAAM,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;oBACtC,MAAM,IAAI,KAAK,CACb,aAAa,QAAQ,CAAC,EAAE,YAAY,QAAQ,CAAC,KAAK,IAAI,eAAe,EAAE,CACxE,CAAC;gBACJ,CAAC;qBAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;oBACzC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;gBAC5C,CAAC;qBAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;oBACzC,IAAI,CAAC,MAAM,CAAC,gBAAgB,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;oBAC1C,sBAAsB,EAAE,CAAC;gBAC3B,CAAC;YACH,CAAC;YAED,IAAI,sBAAsB,GAAG,CAAC,EAAE,CAAC;gBAC/B,IAAI,CAAC,MAAM,CAAC,OAAO,CACjB,wBAAwB,sBAAsB,aAAa,CAC5D,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,MAAM,CAAC,OAAO,CACjB,sDAAsD,CACvD,CAAC;YACJ,CAAC;QACH,CAAC;QAAC,OAAO,KAAK,EAAE,CAAC;YACf,MAAM,YAAY,GAChB,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACzD,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,6BAA6B,YAAY,EAAE,CAAC,CAAC;YAC/D,MAAM,KAAK,CAAC;QACd,CAAC;QAED,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAED,IAAY,aAAa;QACvB,OAAO,IAAI,CAAC,iBAAiB,CAAC,aAAa,CAAC;IAC9C,CAAC;IAOD,SAAS,CAAC,KAAa;QACrB,OAAO,KAAK,CAAC;IACf,CAAC;IAMD,WAAW,CAAC,KAAc;QACxB,OAAO,IAAA,wCAAkB,EAAC,KAAK,CAAC,CAAC;IACnC,CAAC;IAOD,kBAAkB,CAAC,KAAc;QAC/B,OAAO,IAAA,wCAAkB,EAAC,KAAK,CAAC,CAAC;IACnC,CAAC;CACF,CAAA;AAhIY,wDAAsB;AA4GjC;IALC,IAAA,uBAAM,EAAC;QACN,KAAK,EAAE,qBAAqB;QAC5B,WAAW,EAAE,0CAA0C;QACvD,QAAQ,EAAE,IAAI;KACf,CAAC;;;;uDAGD;AAMD;IAJC,IAAA,uBAAM,EAAC;QACN,KAAK,EAAE,wBAAwB;QAC/B,WAAW,EAAE,6CAA6C;KAC3D,CAAC;;;;yDAGD;AAOD;IALC,IAAA,uBAAM,EAAC;QACN,KAAK,EAAE,4BAA4B;QACnC,WAAW,EACT,mEAAmE;KACtE,CAAC;;;;gEAGD;iCA/HU,sBAAsB;IAJlC,IAAA,2BAAU,EAAC;QACV,IAAI,EAAE,OAAO;QACb,WAAW,EAAE,sCAAsC;KACpD,CAAC;qCAGsC,8BAAiB;QACd,6BAAoB;QACnB,4BAAqB;QACpC,sBAAa;GAL7B,sBAAsB,CAgIlC"}
|
|
@@ -10,6 +10,7 @@ export interface ConnectionInfo {
|
|
|
10
10
|
}
|
|
11
11
|
export interface ConnectOptions {
|
|
12
12
|
label?: string;
|
|
13
|
+
createProject?: boolean;
|
|
13
14
|
}
|
|
14
15
|
export declare class ConnectionFactoryService {
|
|
15
16
|
private readonly urlBuilder;
|
|
@@ -17,6 +18,8 @@ export declare class ConnectionFactoryService {
|
|
|
17
18
|
constructor(urlBuilder: UrlBuilderService, logger: LoggerService);
|
|
18
19
|
createConnection(url: RevisiumUrlComplete, options?: ConnectOptions): Promise<ConnectionInfo>;
|
|
19
20
|
private createAuthenticatedClient;
|
|
21
|
+
private resolveBranchScope;
|
|
22
|
+
private isProjectNotFoundError;
|
|
20
23
|
private resolveRevisionScope;
|
|
21
24
|
private formatRevisionLabel;
|
|
22
25
|
}
|
|
@@ -26,11 +26,7 @@ let ConnectionFactoryService = class ConnectionFactoryService {
|
|
|
26
26
|
const formattedUrl = this.urlBuilder.formatAsRevisiumUrl(url);
|
|
27
27
|
this.logger.connecting(label, formattedUrl);
|
|
28
28
|
const client = await this.createAuthenticatedClient(url);
|
|
29
|
-
const branchScope = await
|
|
30
|
-
org: url.organization,
|
|
31
|
-
project: url.project,
|
|
32
|
-
branch: url.branch || 'master',
|
|
33
|
-
});
|
|
29
|
+
const branchScope = await this.resolveBranchScope(client, url, options);
|
|
34
30
|
const revisionScope = await this.resolveRevisionScope(url.revision, branchScope);
|
|
35
31
|
const revisionId = revisionScope.revisionId;
|
|
36
32
|
const revisionLabel = this.formatRevisionLabel(url.revision, branchScope.headRevisionId, branchScope.draftRevisionId, revisionId);
|
|
@@ -48,6 +44,35 @@ let ConnectionFactoryService = class ConnectionFactoryService {
|
|
|
48
44
|
this.logger.authenticated(username);
|
|
49
45
|
return client;
|
|
50
46
|
}
|
|
47
|
+
async resolveBranchScope(client, url, options) {
|
|
48
|
+
const branchOptions = {
|
|
49
|
+
org: url.organization,
|
|
50
|
+
project: url.project,
|
|
51
|
+
branch: url.branch || 'master',
|
|
52
|
+
};
|
|
53
|
+
try {
|
|
54
|
+
return await client.client.branch(branchOptions);
|
|
55
|
+
}
|
|
56
|
+
catch (error) {
|
|
57
|
+
if (options.createProject && this.isProjectNotFoundError(error)) {
|
|
58
|
+
this.logger.info(`Project "${url.project}" not found — creating automatically`);
|
|
59
|
+
await client.client
|
|
60
|
+
.org(url.organization)
|
|
61
|
+
.createProject({ projectName: url.project });
|
|
62
|
+
return client.client.branch(branchOptions);
|
|
63
|
+
}
|
|
64
|
+
if (!options.createProject && this.isProjectNotFoundError(error)) {
|
|
65
|
+
throw new Error(`Project "${url.project}" not found in organization "${url.organization}". Use --create-project to auto-create`);
|
|
66
|
+
}
|
|
67
|
+
throw error;
|
|
68
|
+
}
|
|
69
|
+
}
|
|
70
|
+
isProjectNotFoundError(error) {
|
|
71
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
72
|
+
return (message.includes('does not exist') ||
|
|
73
|
+
message.includes('not found') ||
|
|
74
|
+
message.includes('Not Found'));
|
|
75
|
+
}
|
|
51
76
|
async resolveRevisionScope(revision, branchScope) {
|
|
52
77
|
if (revision === 'draft') {
|
|
53
78
|
return branchScope.draft();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection-factory.service.js","sourceRoot":"","sources":["../../../../src/services/connection/connection-factory.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAE5C,6CAAiD;AACjD,sCAA0C;AAC1C,gCAAgE;
|
|
1
|
+
{"version":3,"file":"connection-factory.service.js","sourceRoot":"","sources":["../../../../src/services/connection/connection-factory.service.ts"],"names":[],"mappings":"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"}
|
|
@@ -5,6 +5,7 @@ import { UrlBuilderService } from '../url';
|
|
|
5
5
|
export { ConnectionInfo } from './connection-factory.service';
|
|
6
6
|
export interface ConnectionOptions {
|
|
7
7
|
url?: string;
|
|
8
|
+
createProject?: boolean;
|
|
8
9
|
}
|
|
9
10
|
export declare class ConnectionService {
|
|
10
11
|
private readonly configService;
|
|
@@ -36,7 +36,9 @@ let ConnectionService = class ConnectionService {
|
|
|
36
36
|
async connect(options = {}) {
|
|
37
37
|
const env = this.getEnvConfig();
|
|
38
38
|
const url = await this.urlBuilder.parseAndComplete(options.url, 'api', env);
|
|
39
|
-
this._connection = await this.connectionFactory.createConnection(url
|
|
39
|
+
this._connection = await this.connectionFactory.createConnection(url, {
|
|
40
|
+
createProject: options.createProject,
|
|
41
|
+
});
|
|
40
42
|
}
|
|
41
43
|
getEnvConfig() {
|
|
42
44
|
return {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"connection.service.js","sourceRoot":"","sources":["../../../../src/services/connection/connection.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2CAA+C;AAE/C,6EAGsC;AACtC,gCAAyD;
|
|
1
|
+
{"version":3,"file":"connection.service.js","sourceRoot":"","sources":["../../../../src/services/connection/connection.service.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA4C;AAC5C,2CAA+C;AAE/C,6EAGsC;AACtC,gCAAyD;AAUlD,IAAM,iBAAiB,GAAvB,MAAM,iBAAiB;IAIT;IACA;IACA;IALX,WAAW,CAA6B;IAEhD,YACmB,aAA4B,EAC5B,UAA6B,EAC7B,iBAA2C;QAF3C,kBAAa,GAAb,aAAa,CAAe;QAC5B,eAAU,GAAV,UAAU,CAAmB;QAC7B,sBAAiB,GAAjB,iBAAiB,CAA0B;IAC3D,CAAC;IAEJ,IAAW,UAAU;QACnB,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,CAAC;YACtB,MAAM,IAAI,KAAK,CAAC,mDAAmD,CAAC,CAAC;QACvE,CAAC;QACD,OAAO,IAAI,CAAC,WAAW,CAAC;IAC1B,CAAC;IAED,IAAW,aAAa;QACtB,OAAO,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC;IACvC,CAAC;IAEM,KAAK,CAAC,OAAO,CAAC,UAA6B,EAAE;QAClD,MAAM,GAAG,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;QAChC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;QAE5E,IAAI,CAAC,WAAW,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,GAAG,EAAE;YACpE,aAAa,EAAE,OAAO,CAAC,aAAa;SACrC,CAAC,CAAC;IACL,CAAC;IAEO,YAAY;QAClB,OAAO;YACL,GAAG,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,cAAc,CAAC;YACnD,KAAK,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,gBAAgB,CAAC;YACvD,MAAM,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,kBAAkB,CAAC;YAC1D,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,mBAAmB,CAAC;YAC7D,QAAQ,EAAE,IAAI,CAAC,aAAa,CAAC,GAAG,CAAS,mBAAmB,CAAC;SAC9D,CAAC;IACJ,CAAC;CACF,CAAA;AAtCY,8CAAiB;4BAAjB,iBAAiB;IAD7B,IAAA,mBAAU,GAAE;qCAKuB,sBAAa;QAChB,uBAAiB;QACV,qDAAwB;GANnD,iBAAiB,CAsC7B"}
|
|
@@ -12,7 +12,7 @@ export interface RevisiumUrl {
|
|
|
12
12
|
export declare class UrlParserService {
|
|
13
13
|
parse(input: string): RevisiumUrl;
|
|
14
14
|
buildBaseUrl(protocol: string, host: string, port?: number): string;
|
|
15
|
-
buildBaseUrlFromHost(hostWithPort: string): string;
|
|
15
|
+
buildBaseUrlFromHost(hostWithPort: string, protocolOverride?: 'http' | 'https'): string;
|
|
16
16
|
isLocalhost(host: string): boolean;
|
|
17
17
|
validatePort(port: number, context: string): void;
|
|
18
18
|
private parseRevisiumUrl;
|
|
@@ -18,6 +18,12 @@ function validatePort(port, context) {
|
|
|
18
18
|
}
|
|
19
19
|
let UrlParserService = class UrlParserService {
|
|
20
20
|
parse(input) {
|
|
21
|
+
if (input.startsWith('revisium+http://')) {
|
|
22
|
+
return this.parseRevisiumUrl(input, 'http');
|
|
23
|
+
}
|
|
24
|
+
if (input.startsWith('revisium+https://')) {
|
|
25
|
+
return this.parseRevisiumUrl(input, 'https');
|
|
26
|
+
}
|
|
21
27
|
if (input.startsWith('revisium://')) {
|
|
22
28
|
return this.parseRevisiumUrl(input);
|
|
23
29
|
}
|
|
@@ -27,14 +33,14 @@ let UrlParserService = class UrlParserService {
|
|
|
27
33
|
const portSuffix = port ? `:${port}` : '';
|
|
28
34
|
return `${protocol}://${host}${portSuffix}`;
|
|
29
35
|
}
|
|
30
|
-
buildBaseUrlFromHost(hostWithPort) {
|
|
36
|
+
buildBaseUrlFromHost(hostWithPort, protocolOverride) {
|
|
31
37
|
const [host, portStr] = hostWithPort.split(':');
|
|
32
38
|
const port = portStr ? Number.parseInt(portStr, 10) : undefined;
|
|
33
39
|
if (port !== undefined) {
|
|
34
40
|
validatePort(port, `in "${hostWithPort}"`);
|
|
35
41
|
}
|
|
36
|
-
const
|
|
37
|
-
|
|
42
|
+
const protocol = protocolOverride ??
|
|
43
|
+
(LOCALHOST_HOSTS.has(host.toLowerCase()) ? 'http' : 'https');
|
|
38
44
|
if (port) {
|
|
39
45
|
return this.buildBaseUrl(protocol, host, port);
|
|
40
46
|
}
|
|
@@ -46,8 +52,8 @@ let UrlParserService = class UrlParserService {
|
|
|
46
52
|
validatePort(port, context) {
|
|
47
53
|
validatePort(port, context);
|
|
48
54
|
}
|
|
49
|
-
parseRevisiumUrl(url) {
|
|
50
|
-
const withoutProtocol = url.replace(
|
|
55
|
+
parseRevisiumUrl(url, forceProtocol) {
|
|
56
|
+
const withoutProtocol = url.replace(/^revisium(\+https?)?:\/\//, '');
|
|
51
57
|
const [mainPart, queryString] = withoutProtocol.split('?');
|
|
52
58
|
const queryParams = this.parseQueryParams(queryString);
|
|
53
59
|
let auth;
|
|
@@ -77,7 +83,7 @@ let UrlParserService = class UrlParserService {
|
|
|
77
83
|
}
|
|
78
84
|
const pathParts = hostAndPath.split('/');
|
|
79
85
|
const hostWithPort = pathParts[0];
|
|
80
|
-
const baseUrl = this.buildBaseUrlFromHost(hostWithPort);
|
|
86
|
+
const baseUrl = this.buildBaseUrlFromHost(hostWithPort, forceProtocol);
|
|
81
87
|
const branchWithRevision = pathParts[3] || undefined;
|
|
82
88
|
let branch;
|
|
83
89
|
let revision;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"url-parser.service.js","sourceRoot":"","sources":["../../../../src/services/url/url-parser.service.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2CAA4C;AAc5C,MAAM,eAAe,GAAG,IAAI,GAAG,CAAC,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC,CAAC;AAC5D,MAAM,QAAQ,GAAG,CAAC,CAAC;AACnB,MAAM,QAAQ,GAAG,KAAK,CAAC;AAEvB,SAAS,YAAY,CAAC,IAAY,EAAE,OAAe;IACjD,IAAI,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,IAAI,GAAG,QAAQ,IAAI,IAAI,GAAG,QAAQ,EAAE,CAAC;QAC7D,MAAM,IAAI,KAAK,CACb,gBAAgB,OAAO,8BAA8B,QAAQ,QAAQ,QAAQ,EAAE,CAChF,CAAC;IACJ,CAAC;AACH,CAAC;AAGM,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;IAC3B,KAAK,CAAC,KAAa;QACjB,IAAI,KAAK,CAAC,UAAU,CAAC,aAAa,CAAC,EAAE,CAAC;YACpC,OAAO,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QACtC,CAAC;QAED,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;IACpC,CAAC;IAED,YAAY,CAAC,QAAgB,EAAE,IAAY,EAAE,IAAa;QACxD,MAAM,UAAU,GAAG,IAAI,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1C,OAAO,GAAG,QAAQ,MAAM,IAAI,GAAG,UAAU,EAAE,CAAC;IAC9C,CAAC;IAED,oBAAoB,
|
|
1
|
+
{"version":3,"file":"url-parser.service.js","sourceRoot":"","sources":["../../../../src/services/url/url-parser.service.ts"],"names":[],"mappings":"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"}
|