@eclipse-che/che-devworkspace-generator 0.0.1-638fadc → 0.0.1-6ef61ae

package/lib/bitbucket/bitbucket-module.d.ts

@@ -0,0 +1,12 @@
+/**********************************************************************
+ * Copyright (c) 2023 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+import { ContainerModule } from 'inversify';
+declare const bitbucketModule: ContainerModule;
+export { bitbucketModule };

package/lib/bitbucket/bitbucket-module.js

@@ -0,0 +1,21 @@
+"use strict";
+exports.__esModule = true;
+exports.bitbucketModule = void 0;
+/**********************************************************************
+ * Copyright (c) 2023 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+var inversify_1 = require("inversify");
+var bitbucket_resolver_1 = require("./bitbucket-resolver");
+var types_1 = require("../types");
+var Resolver = types_1.TYPES.Resolver;
+var bitbucketModule = new inversify_1.ContainerModule(function (bind) {
+    bind(Resolver).to(bitbucket_resolver_1.BitbucketResolver).inSingletonScope();
+});
+exports.bitbucketModule = bitbucketModule;
+//# sourceMappingURL=bitbucket-module.js.map

package/lib/bitbucket/bitbucket-module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bitbucket-module.js","sourceRoot":"","sources":["../../src/bitbucket/bitbucket-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;yEAQyE;AACzE,uCAAwD;AAExD,2DAAyD;AACzD,kCAAiC;AAEzB,IAAA,QAAQ,GAAK,aAAK,SAAV,CAAW;AAE3B,IAAM,eAAe,GAAG,IAAI,2BAAe,CAAC,UAAC,IAAqB;IAChE,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,sCAAiB,CAAC,CAAC,gBAAgB,EAAE,CAAC;AAC1D,CAAC,CAAC,CAAC;AAEM,0CAAe"}

package/lib/bitbucket/bitbucket-resolver.d.ts

@@ -0,0 +1,17 @@
+/**********************************************************************
+ * Copyright (c) 2023 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+import { Url } from '../resolve/url';
+import { Resolver } from '../resolve/resolver';
+export declare class BitbucketResolver implements Resolver {
+    static readonly BITBUCKET_URL_PATTERN: RegExp;
+    isValid(url: string): boolean;
+    resolve(url: string): Url;
+    private getGroup;
+}

package/lib/bitbucket/bitbucket-resolver.js

@@ -0,0 +1,56 @@
+"use strict";
+/**********************************************************************
+ * Copyright (c) 2023 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+exports.__esModule = true;
+exports.BitbucketResolver = void 0;
+var bitbucket_url_1 = require("./bitbucket-url");
+var inversify_1 = require("inversify");
+var BitbucketResolver = /** @class */ (function () {
+    function BitbucketResolver() {
+    }
+    BitbucketResolver_1 = BitbucketResolver;
+    BitbucketResolver.prototype.isValid = function (url) {
+        return BitbucketResolver_1.BITBUCKET_URL_PATTERN.test(url);
+    };
+    BitbucketResolver.prototype.resolve = function (url) {
+        var match = BitbucketResolver_1.BITBUCKET_URL_PATTERN.exec(url);
+        if (!match) {
+            throw new Error("Invalid bitbucket URL: " + url);
+        }
+        var workspaceId = this.getGroup(match, 'workspaceId');
+        var repoName = this.getGroup(match, 'repoName');
+        if (/^[\w-][\w.-]*?\.git$/.test(repoName)) {
+            repoName = repoName.substring(0, repoName.length - 4);
+        }
+        var branchName = this.getGroup(match, 'branchName', 'HEAD');
+        return new bitbucket_url_1.BitbucketUrl(workspaceId, repoName, branchName);
+    };
+    BitbucketResolver.prototype.getGroup = function (match, groupName, defaultValue) {
+        if (match.groups && match.groups[groupName]) {
+            return match.groups[groupName];
+        }
+        return defaultValue;
+    };
+    var BitbucketResolver_1;
+    // eslint-disable-next-line max-len
+    BitbucketResolver.BITBUCKET_URL_PATTERN = /^https:\/\/.*@?bitbucket\.org\/(?<workspaceId>[^\/]+)\/(?<repoName>[^\/]+)(\/(src|branch)\/(?<branchName>[^\/]+))?\/?$/;
+    BitbucketResolver = BitbucketResolver_1 = __decorate([
+        (0, inversify_1.injectable)()
+    ], BitbucketResolver);
+    return BitbucketResolver;
+}());
+exports.BitbucketResolver = BitbucketResolver;
+//# sourceMappingURL=bitbucket-resolver.js.map

package/lib/bitbucket/bitbucket-resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bitbucket-resolver.js","sourceRoot":"","sources":["../../src/bitbucket/bitbucket-resolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;;;;;;;AAEzE,iDAA+C;AAC/C,uCAAuC;AAKvC;IAAA;IA6BA,CAAC;0BA7BY,iBAAiB;IAK5B,mCAAO,GAAP,UAAQ,GAAW;QACjB,OAAO,mBAAiB,CAAC,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAC3D,CAAC;IAED,mCAAO,GAAP,UAAQ,GAAW;QACjB,IAAM,KAAK,GAAG,mBAAiB,CAAC,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAChE,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,4BAA0B,GAAK,CAAC,CAAC;SAClD;QACD,IAAM,WAAW,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;QACxD,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAChD,IAAI,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACzC,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;SACvD;QACD,IAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;QAC9D,OAAO,IAAI,4BAAY,CAAC,WAAW,EAAE,QAAQ,EAAE,UAAU,CAAC,CAAC;IAC7D,CAAC;IAEO,oCAAQ,GAAhB,UAAiB,KAAsB,EAAE,SAAiB,EAAE,YAAqB;QAC/E,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;YAC3C,OAAO,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;SAChC;QACD,OAAO,YAAY,CAAC;IACtB,CAAC;;IA3BD,mCAAmC;IACnB,uCAAqB,GACnC,wHAAyH,CAAA;IAHhH,iBAAiB;QAD7B,IAAA,sBAAU,GAAE;OACA,iBAAiB,CA6B7B;IAAD,wBAAC;CAAA,AA7BD,IA6BC;AA7BY,8CAAiB"}

package/lib/bitbucket/bitbucket-url.d.ts

@@ -0,0 +1,22 @@
+/**********************************************************************
+ * Copyright (c) 2023 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+import { Url } from '../resolve/url';
+export declare class BitbucketUrl implements Url {
+    private readonly workspaceId;
+    private readonly repoName;
+    private readonly branchName;
+    private static readonly BITBUCKET_URL;
+    constructor(workspaceId: string, repoName: string, branchName: string);
+    getContentUrl(path: string): string;
+    getUrl(): string;
+    getCloneUrl(): string;
+    getRepoName(): string;
+    getBranchName(): string;
+}

package/lib/bitbucket/bitbucket-url.js

@@ -0,0 +1,38 @@
+"use strict";
+/**********************************************************************
+ * Copyright (c) 2023 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+exports.__esModule = true;
+exports.BitbucketUrl = void 0;
+var BitbucketUrl = /** @class */ (function () {
+    function BitbucketUrl(workspaceId, repoName, branchName) {
+        this.workspaceId = workspaceId;
+        this.repoName = repoName;
+        this.branchName = branchName;
+    }
+    BitbucketUrl.prototype.getContentUrl = function (path) {
+        return BitbucketUrl.BITBUCKET_URL + "/" + this.workspaceId + "/" + this.repoName + "/raw/" + this.branchName + "/" + path;
+    };
+    BitbucketUrl.prototype.getUrl = function () {
+        return BitbucketUrl.BITBUCKET_URL + "/" + this.workspaceId + "/" + this.repoName + "/src/" + this.branchName;
+    };
+    BitbucketUrl.prototype.getCloneUrl = function () {
+        return BitbucketUrl.BITBUCKET_URL + "/" + this.workspaceId + "/" + this.repoName + ".git";
+    };
+    BitbucketUrl.prototype.getRepoName = function () {
+        return this.repoName;
+    };
+    BitbucketUrl.prototype.getBranchName = function () {
+        return this.branchName;
+    };
+    BitbucketUrl.BITBUCKET_URL = 'https://bitbucket.org';
+    return BitbucketUrl;
+}());
+exports.BitbucketUrl = BitbucketUrl;
+//# sourceMappingURL=bitbucket-url.js.map

package/lib/bitbucket/bitbucket-url.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bitbucket-url.js","sourceRoot":"","sources":["../../src/bitbucket/bitbucket-url.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;AAIzE;IAGE,sBACmB,WAAmB,EACnB,QAAgB,EAChB,UAAkB;QAFlB,gBAAW,GAAX,WAAW,CAAQ;QACnB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,eAAU,GAAV,UAAU,CAAQ;IAClC,CAAC;IAEJ,oCAAa,GAAb,UAAc,IAAY;QACxB,OAAU,YAAY,CAAC,aAAa,SAAI,IAAI,CAAC,WAAW,SAAI,IAAI,CAAC,QAAQ,aAAQ,IAAI,CAAC,UAAU,SAAI,IAAM,CAAC;IAC7G,CAAC;IAED,6BAAM,GAAN;QACE,OAAU,YAAY,CAAC,aAAa,SAAI,IAAI,CAAC,WAAW,SAAI,IAAI,CAAC,QAAQ,aAAQ,IAAI,CAAC,UAAY,CAAC;IACrG,CAAC;IAED,kCAAW,GAAX;QACE,OAAU,YAAY,CAAC,aAAa,SAAI,IAAI,CAAC,WAAW,SAAI,IAAI,CAAC,QAAQ,SAAM,CAAC;IAClF,CAAC;IAED,kCAAW,GAAX;QACE,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,oCAAa,GAAb;QACE,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IA1BuB,0BAAa,GAAG,uBAAuB,CAAC;IA2BlE,mBAAC;CAAA,AA5BD,IA4BC;AA5BY,oCAAY"}

package/lib/bitbucket-server/bitbucket-server-module.d.ts

@@ -0,0 +1,12 @@
+/**********************************************************************
+ * Copyright (c) 2023 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+import { ContainerModule } from 'inversify';
+declare const bitbucketServerModule: ContainerModule;
+export { bitbucketServerModule };

package/lib/bitbucket-server/bitbucket-server-module.js

@@ -0,0 +1,21 @@
+"use strict";
+exports.__esModule = true;
+exports.bitbucketServerModule = void 0;
+/**********************************************************************
+ * Copyright (c) 2023 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+var inversify_1 = require("inversify");
+var bitbucket_server_resolver_1 = require("./bitbucket-server-resolver");
+var types_1 = require("../types");
+var Resolver = types_1.TYPES.Resolver;
+var bitbucketServerModule = new inversify_1.ContainerModule(function (bind) {
+    bind(Resolver).to(bitbucket_server_resolver_1.BitbucketServerResolver).inSingletonScope();
+});
+exports.bitbucketServerModule = bitbucketServerModule;
+//# sourceMappingURL=bitbucket-server-module.js.map

package/lib/bitbucket-server/bitbucket-server-module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bitbucket-server-module.js","sourceRoot":"","sources":["../../src/bitbucket-server/bitbucket-server-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;yEAQyE;AACzE,uCAAwD;AAExD,yEAAsE;AACtE,kCAAiC;AAEzB,IAAA,QAAQ,GAAK,aAAK,SAAV,CAAW;AAE3B,IAAM,qBAAqB,GAAG,IAAI,2BAAe,CAAC,UAAC,IAAqB;IACtE,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,mDAAuB,CAAC,CAAC,gBAAgB,EAAE,CAAC;AAChE,CAAC,CAAC,CAAC;AAEM,sDAAqB"}

package/lib/bitbucket-server/bitbucket-server-resolver.d.ts

@@ -0,0 +1,17 @@
+/**********************************************************************
+ * Copyright (c) 2023 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+import { Url } from '../resolve/url';
+import { Resolver } from '../resolve/resolver';
+export declare class BitbucketServerResolver implements Resolver {
+    static readonly BITBUCKET_URL_PATTERNS: RegExp[];
+    isValid(url: string): boolean;
+    resolve(url: string): Url;
+    private getGroup;
+}

package/lib/bitbucket-server/bitbucket-server-resolver.js

@@ -0,0 +1,64 @@
+"use strict";
+/**********************************************************************
+ * Copyright (c) 2023 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    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;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+exports.__esModule = true;
+exports.BitbucketServerResolver = void 0;
+var bitbucket_server_url_1 = require("./bitbucket-server-url");
+var inversify_1 = require("inversify");
+var BitbucketServerResolver = /** @class */ (function () {
+    function BitbucketServerResolver() {
+    }
+    BitbucketServerResolver_1 = BitbucketServerResolver;
+    BitbucketServerResolver.prototype.isValid = function (url) {
+        return BitbucketServerResolver_1.BITBUCKET_URL_PATTERNS.some(function (p) { return p.test(url); });
+    };
+    BitbucketServerResolver.prototype.resolve = function (url) {
+        var regExp = BitbucketServerResolver_1.BITBUCKET_URL_PATTERNS.find(function (p) { return p.test(url); });
+        if (!regExp) {
+            throw new Error("Invalid bitbucket-server URL: " + url);
+        }
+        var match = regExp.exec(url);
+        var scheme = this.getGroup(match, 'scheme');
+        var hostName = this.getGroup(match, 'host');
+        var user = this.getGroup(match, 'user');
+        var project = this.getGroup(match, 'project');
+        var repo = this.getGroup(match, 'repo');
+        var branch = this.getGroup(match, 'branch');
+        if (branch !== undefined && branch.startsWith('refs%2Fheads%2F')) {
+            branch = branch.substring(15);
+        }
+        return new bitbucket_server_url_1.BitbucketServerUrl(scheme, hostName, user, project, repo, branch);
+    };
+    BitbucketServerResolver.prototype.getGroup = function (match, groupName) {
+        if (match.groups && match.groups[groupName]) {
+            return match.groups[groupName];
+        }
+    };
+    var BitbucketServerResolver_1;
+    // eslint-disable-next-line max-len
+    BitbucketServerResolver.BITBUCKET_URL_PATTERNS = [
+        /^(?<scheme>https?):\/\/(?<host>.*)\/scm\/~(?<user>[^\/]+)\/(?<repo>.*).git$/,
+        /^(?<scheme>https?):\/\/(?<host>.*)\/users\/(?<user>[^\/]+)\/repos\/(?<repo>[^\/]+)\/browse(\?at=(?<branch>.*))?$/,
+        /^(?<scheme>https?):\/\/(?<host>.*)\/scm\/(?<project>[^\/~]+)\/(?<repo>[^\/]+).git$/,
+        /^(?<scheme>https?):\/\/(?<host>.*)\/projects\/(?<project>[^\/]+)\/repos\/(?<repo>[^\/]+)\/browse(\?at=(?<branch>.*))?$/,
+    ];
+    BitbucketServerResolver = BitbucketServerResolver_1 = __decorate([
+        (0, inversify_1.injectable)()
+    ], BitbucketServerResolver);
+    return BitbucketServerResolver;
+}());
+exports.BitbucketServerResolver = BitbucketServerResolver;
+//# sourceMappingURL=bitbucket-server-resolver.js.map

package/lib/bitbucket-server/bitbucket-server-resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bitbucket-server-resolver.js","sourceRoot":"","sources":["../../src/bitbucket-server/bitbucket-server-resolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;;;;;;;AAEzE,+DAA4D;AAC5D,uCAAuC;AAKvC;IAAA;IAoCA,CAAC;gCApCY,uBAAuB;IASlC,yCAAO,GAAP,UAAQ,GAAW;QACjB,OAAO,yBAAuB,CAAC,sBAAsB,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAX,CAAW,CAAC,CAAC;IAC/E,CAAC;IAED,yCAAO,GAAP,UAAQ,GAAW;QACjB,IAAM,MAAM,GAAG,yBAAuB,CAAC,sBAAsB,CAAC,IAAI,CAAC,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAX,CAAW,CAAC,CAAC;QACrF,IAAI,CAAC,MAAM,EAAE;YACX,MAAM,IAAI,KAAK,CAAC,mCAAiC,GAAK,CAAC,CAAC;SACzD;QACD,IAAM,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC/B,IAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC9C,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC9C,IAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC1C,IAAM,OAAO,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC;QAChD,IAAM,IAAI,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC1C,IAAI,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC5C,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE;YAChE,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;SAC/B;QACD,OAAO,IAAI,yCAAkB,CAAC,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,CAAC;IAC/E,CAAC;IAEO,0CAAQ,GAAhB,UAAiB,KAAsB,EAAE,SAAiB;QACxD,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;YAC3C,OAAO,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;SAChC;IACH,CAAC;;IAlCD,mCAAmC;IACnB,8CAAsB,GAAa;QACjD,6EAA6E;QAC7E,kHAAkH;QAClH,oFAAoF;QACpF,wHAAwH;KACxH,CAAA;IAPS,uBAAuB;QADnC,IAAA,sBAAU,GAAE;OACA,uBAAuB,CAoCnC;IAAD,8BAAC;CAAA,AApCD,IAoCC;AApCY,0DAAuB"}

package/lib/bitbucket-server/bitbucket-server-url.d.ts

@@ -0,0 +1,24 @@
+/**********************************************************************
+ * Copyright (c) 2023 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+import { Url } from '../resolve/url';
+export declare class BitbucketServerUrl implements Url {
+    private readonly scheme;
+    private readonly hostName;
+    private readonly user;
+    private readonly project;
+    private readonly repo;
+    private readonly branch;
+    constructor(scheme: string, hostName: string, user: string | undefined, project: string | undefined, repo: string, branch: string | undefined);
+    getContentUrl(path: string): string;
+    getUrl(): string;
+    getCloneUrl(): string;
+    getRepoName(): string;
+    getBranchName(): string;
+}

package/lib/bitbucket-server/bitbucket-server-url.js

@@ -0,0 +1,43 @@
+"use strict";
+/**********************************************************************
+ * Copyright (c) 2023 Red Hat, Inc.
+ *
+ * This program and the accompanying materials are made
+ * available under the terms of the Eclipse Public License 2.0
+ * which is available at https://www.eclipse.org/legal/epl-2.0/
+ *
+ * SPDX-License-Identifier: EPL-2.0
+ ***********************************************************************/
+exports.__esModule = true;
+exports.BitbucketServerUrl = void 0;
+var BitbucketServerUrl = /** @class */ (function () {
+    function BitbucketServerUrl(scheme, hostName, user, project, repo, branch) {
+        this.scheme = scheme;
+        this.hostName = hostName;
+        this.user = user;
+        this.project = project;
+        this.repo = repo;
+        this.branch = branch;
+    }
+    BitbucketServerUrl.prototype.getContentUrl = function (path) {
+        var isUser = this.user !== undefined;
+        return this.scheme + "://" + this.hostName + "/" + (isUser ? 'users' : 'projects') + "/" + (isUser ? this.user : this.project) + "/repos/" + this.repo + "/raw/" + path + (this.branch !== undefined ? '?/at=' + this.branch : '');
+    };
+    BitbucketServerUrl.prototype.getUrl = function () {
+        var isUser = this.user !== undefined;
+        return this.scheme + "://" + this.hostName + "/" + (isUser ? 'users' : 'projects') + "/" + (isUser ? this.user : this.project) + "/repos/" + this.repo + (this.branch !== undefined ? '/browse?at=' + this.branch : '');
+    };
+    BitbucketServerUrl.prototype.getCloneUrl = function () {
+        var isUser = this.user !== undefined;
+        return this.scheme + "://" + this.hostName + "/scm/" + (isUser ? '~' + this.user : this.project.toLowerCase()) + "/" + this.repo + ".git";
+    };
+    BitbucketServerUrl.prototype.getRepoName = function () {
+        return this.repo;
+    };
+    BitbucketServerUrl.prototype.getBranchName = function () {
+        return this.branch;
+    };
+    return BitbucketServerUrl;
+}());
+exports.BitbucketServerUrl = BitbucketServerUrl;
+//# sourceMappingURL=bitbucket-server-url.js.map

package/lib/bitbucket-server/bitbucket-server-url.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"bitbucket-server-url.js","sourceRoot":"","sources":["../../src/bitbucket-server/bitbucket-server-url.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;AAIzE;IACE,4BACmB,MAAc,EACd,QAAgB,EAChB,IAAwB,EACxB,OAA2B,EAC3B,IAAY,EACZ,MAA0B;QAL1B,WAAM,GAAN,MAAM,CAAQ;QACd,aAAQ,GAAR,QAAQ,CAAQ;QAChB,SAAI,GAAJ,IAAI,CAAoB;QACxB,YAAO,GAAP,OAAO,CAAoB;QAC3B,SAAI,GAAJ,IAAI,CAAQ;QACZ,WAAM,GAAN,MAAM,CAAoB;IAC1C,CAAC;IAEJ,0CAAa,GAAb,UAAc,IAAY;QACxB,IAAM,MAAM,GAAG,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;QACvC,OAAU,IAAI,CAAC,MAAM,WAAM,IAAI,CAAC,QAAQ,UAAI,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,WACvE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,gBACzB,IAAI,CAAC,IAAI,aAAQ,IAAI,IAAG,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAE,CAAC;IAC7F,CAAC;IAED,mCAAM,GAAN;QACE,IAAM,MAAM,GAAG,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;QACvC,OAAU,IAAI,CAAC,MAAM,WAAM,IAAI,CAAC,QAAQ,UAAI,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,UAAU,WACvE,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,gBACzB,IAAI,CAAC,IAAI,IAAG,IAAI,CAAC,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAE,CAAC;IACvF,CAAC;IAED,wCAAW,GAAX;QACE,IAAM,MAAM,GAAG,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC;QACvC,OAAU,IAAI,CAAC,MAAM,WAAM,IAAI,CAAC,QAAQ,cAAQ,MAAM,CAAC,CAAC,CAAC,GAAG,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,UACnG,IAAI,CAAC,IAAI,SACL,CAAC;IACT,CAAC;IAED,wCAAW,GAAX;QACE,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,0CAAa,GAAb;QACE,OAAO,IAAI,CAAC,MAAM,CAAC;IACrB,CAAC;IACH,yBAAC;AAAD,CAAC,AAtCD,IAsCC;AAtCY,gDAAkB"}

package/lib/generate.d.ts

@@ -9,8 +9,8 @@
  ***********************************************************************/
 import { DevfileContext } from './api/devfile-context';
 export declare class Generate {
-    static readonly MERGE_CONTRIBUTION = "controller.devfile.io/merge-contribution";
     private devContainerComponentFinder;
     generate(devfileContent: string, editorContent: string, outputFile?: string, injectDefaultComponent?: string, defaultComponentImage?: string): Promise<DevfileContext>;
     generateContent(devfileContent: string, editorContent: string, injectDefaultComponent?: string, defaultComponentImage?: string): Promise<DevfileContext>;
+    private createDevWorkspaceMetadata;
 }

package/lib/generate.js

@@ -78,7 +78,6 @@ var dev_container_component_finder_1 = require("./devfile/dev-container-componen
 var Generate = /** @class */ (function () {
     function Generate() {
     }
-    Generate_1 = Generate;
     Generate.prototype.generate = function (devfileContent, editorContent, outputFile, injectDefaultComponent, defaultComponentImage) {
         return __awaiter(this, void 0, void 0, function () {
             var context, allContentArray, generatedContent;
@@ -104,14 +103,14 @@ var Generate = /** @class */ (function () {
     };
     Generate.prototype.generateContent = function (devfileContent, editorContent, injectDefaultComponent, defaultComponentImage) {
         return __awaiter(this, void 0, void 0, function () {
-            var devfile, suffix, editorDevfile, metadata, editorDevWorkspaceTemplate, devfileMetadata, devfileCopy, editorSpecContribution, devWorkspace, devWorkspaceTemplates, context, devContainer, devContainerAttributes;
+            var devfile, suffix, editorDevfile, metadata, editorDevWorkspaceTemplate, devfileMetadata, devfileCopy, editorSpecContribution, devWorkspace, devWorkspaceTemplates, context;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         devfile = jsYaml.load(devfileContent);
                         suffix = devfile.metadata.name || '';
                         editorDevfile = jsYaml.load(editorContent);
-                        metadata = editorDevfile.metadata;
+                        metadata = this.createDevWorkspaceMetadata(editorDevfile);
                         // add sufix
                         metadata.name = metadata.name + "-" + suffix;
                         delete editorDevfile.metadata;
@@ -122,7 +121,7 @@ var Generate = /** @class */ (function () {
                             metadata: metadata,
                             spec: editorDevfile
                         };
-                        devfileMetadata = devfile.metadata;
+                        devfileMetadata = this.createDevWorkspaceMetadata(devfile, true);
                         devfileCopy = Object.assign({}, devfile);
                         delete devfileCopy.schemaVersion;
                         delete devfileCopy.metadata;
@@ -150,32 +149,37 @@ var Generate = /** @class */ (function () {
                             devWorkspaceTemplates: devWorkspaceTemplates,
                             suffix: suffix
                         };
+                        // find devContainer component, add a default one if not found
                         return [4 /*yield*/, this.devContainerComponentFinder.find(context, injectDefaultComponent, defaultComponentImage)];
                     case 1:
-                        devContainer = _a.sent();
-                        if (!devContainer) {
-                            return [2 /*return*/, context];
-                        }
-                        devContainerAttributes = devContainer.attributes;
-                        if (!devContainerAttributes) {
-                            devContainerAttributes = {};
-                            devContainerAttributes[Generate_1.MERGE_CONTRIBUTION] = true;
-                            devContainer.attributes = devContainerAttributes;
-                        }
-                        else {
-                            devContainerAttributes[Generate_1.MERGE_CONTRIBUTION] = true;
-                        }
+                        // find devContainer component, add a default one if not found
+                        _a.sent();
                         return [2 /*return*/, context];
                 }
             });
         });
     };
-    var Generate_1;
-    Generate.MERGE_CONTRIBUTION = 'controller.devfile.io/merge-contribution';
+    Generate.prototype.createDevWorkspaceMetadata = function (devfile, addDevfileContent) {
+        if (addDevfileContent === void 0) { addDevfileContent = false; }
+        var devWorkspaceMetadata = {};
+        var devfileMetadata = devfile.metadata;
+        if (devfileMetadata.name) {
+            devWorkspaceMetadata.name = devfileMetadata.name;
+        }
+        if (devfileMetadata.generateName) {
+            devWorkspaceMetadata.generateName = devfileMetadata.generateName;
+        }
+        if (addDevfileContent) {
+            devWorkspaceMetadata.annotations = {
+                'che.eclipse.org/devfile': jsYaml.dump(devfile)
+            };
+        }
+        return devWorkspaceMetadata;
+    };
     __decorate([
         (0, inversify_1.inject)(dev_container_component_finder_1.DevContainerComponentFinder)
     ], Generate.prototype, "devContainerComponentFinder");
-    Generate = Generate_1 = __decorate([
+    Generate = __decorate([
         (0, inversify_1.injectable)()
     ], Generate);
     return Generate;

package/lib/generate.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate.js","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generate.js","sourceRoot":"","sources":["../src/generate.ts"],"names":[],"mappings":"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"}

package/lib/github/github-module.js

@@ -12,8 +12,10 @@ exports.githubModule = void 0;
  ***********************************************************************/
 var inversify_1 = require("inversify");
 var github_resolver_1 = require("./github-resolver");
+var types_1 = require("../types");
+var Resolver = types_1.TYPES.Resolver;
 var githubModule = new inversify_1.ContainerModule(function (bind) {
-    bind(github_resolver_1.GithubResolver).toSelf().inSingletonScope();
+    bind(Resolver).to(github_resolver_1.GithubResolver).inSingletonScope();
 });
 exports.githubModule = githubModule;
 //# sourceMappingURL=github-module.js.map

package/lib/github/github-module.js.map

@@ -1 +1 @@
-{"version":3,"file":"github-module.js","sourceRoot":"","sources":["../../src/github/github-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;yEAQyE;AACzE,uCAAwD;AAExD,qDAAmD;AAEnD,IAAM,YAAY,GAAG,IAAI,2BAAe,CAAC,UAAC,IAAqB;IAC7D,IAAI,CAAC,gCAAc,CAAC,CAAC,MAAM,EAAE,CAAC,gBAAgB,EAAE,CAAC;AACnD,CAAC,CAAC,CAAC;AAEM,oCAAY"}
+{"version":3,"file":"github-module.js","sourceRoot":"","sources":["../../src/github/github-module.ts"],"names":[],"mappings":";;;AAAA;;;;;;;;yEAQyE;AACzE,uCAAwD;AAExD,qDAAmD;AACnD,kCAAiC;AAEzB,IAAA,QAAQ,GAAK,aAAK,SAAV,CAAW;AAE3B,IAAM,YAAY,GAAG,IAAI,2BAAe,CAAC,UAAC,IAAqB;IAC7D,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,gCAAc,CAAC,CAAC,gBAAgB,EAAE,CAAC;AACvD,CAAC,CAAC,CAAC;AAEM,oCAAY"}

package/lib/github/github-resolver.d.ts

@@ -7,12 +7,11 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  ***********************************************************************/
-import { GithubUrl } from './github-url';
-/**
- * Provides a github URL object allowing to interact
- */
-export declare class GithubResolver {
+import { Url } from '../resolve/url';
+import { Resolver } from '../resolve/resolver';
+export declare class GithubResolver implements Resolver {
     static readonly GITHUB_URL_PATTERN: RegExp;
-    resolve(link: string): GithubUrl;
-    getGroup(match: RegExpExecArray, groupName: string, defaultValue?: string): string;
+    isValid(url: string): boolean;
+    resolve(link: string): Url;
+    private getGroup;
 }

package/lib/github/github-resolver.js

@@ -18,13 +18,13 @@ exports.__esModule = true;
 exports.GithubResolver = void 0;
 var github_url_1 = require("./github-url");
 var inversify_1 = require("inversify");
-/**
- * Provides a github URL object allowing to interact
- */
 var GithubResolver = /** @class */ (function () {
     function GithubResolver() {
     }
     GithubResolver_1 = GithubResolver;
+    GithubResolver.prototype.isValid = function (url) {
+        return GithubResolver_1.GITHUB_URL_PATTERN.test(url);
+    };
     GithubResolver.prototype.resolve = function (link) {
         var match = GithubResolver_1.GITHUB_URL_PATTERN.exec(link);
         if (!match) {
@@ -34,6 +34,9 @@ var GithubResolver = /** @class */ (function () {
         var hostName = this.getGroup(match, 'host');
         var repoUser = this.getGroup(match, 'repoUser');
         var repoName = this.getGroup(match, 'repoName');
+        if (/^[\w-][\w.-]*?\.git$/.test(repoName)) {
+            repoName = repoName.substring(0, repoName.length - 4);
+        }
         var branchName = this.getGroup(match, 'branchName', 'HEAD');
         var subFolder = this.getGroup(match, 'subFolder');
         return new github_url_1.GithubUrl(scheme, hostName, repoUser, repoName, branchName, subFolder);

package/lib/github/github-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"github-resolver.js","sourceRoot":"","sources":["../../src/github/github-resolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;;;;;;;AAEzE,2CAAyC;AACzC,uCAAuC;AAEvC;;GAEG;AAEH;IAAA;IAyBA,CAAC;uBAzBY,cAAc;IAKzB,gCAAO,GAAP,UAAQ,IAAY;QAClB,IAAM,KAAK,GAAG,gBAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3D,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,yBAAuB,IAAM,CAAC,CAAC;SAChD;QACD,IAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC9C,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC9C,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAClD,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAClD,IAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;QAC9D,IAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QACpD,OAAO,IAAI,sBAAS,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;IACpF,CAAC;IAED,iCAAQ,GAAR,UAAS,KAAsB,EAAE,SAAiB,EAAE,YAAqB;QACvE,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;YAC3C,OAAO,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;SAChC;QACD,OAAO,YAAY,IAAI,EAAE,CAAC;IAC5B,CAAC;;IAvBD,mCAAmC;IACnB,iCAAkB,GAChC,qKAAsK,CAAA;IAH7J,cAAc;QAD1B,IAAA,sBAAU,GAAE;OACA,cAAc,CAyB1B;IAAD,qBAAC;CAAA,AAzBD,IAyBC;AAzBY,wCAAc"}
+{"version":3,"file":"github-resolver.js","sourceRoot":"","sources":["../../src/github/github-resolver.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;;;;;;;AAEzE,2CAAyC;AACzC,uCAAuC;AAKvC;IAAA;IAgCA,CAAC;uBAhCY,cAAc;IAKzB,gCAAO,GAAP,UAAQ,GAAW;QACjB,OAAO,gBAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACrD,CAAC;IAED,gCAAO,GAAP,UAAQ,IAAY;QAClB,IAAM,KAAK,GAAG,gBAAc,CAAC,kBAAkB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QAC3D,IAAI,CAAC,KAAK,EAAE;YACV,MAAM,IAAI,KAAK,CAAC,yBAAuB,IAAM,CAAC,CAAC;SAChD;QACD,IAAM,MAAM,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QAC9C,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAC9C,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAClD,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC;QAChD,IAAI,sBAAsB,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE;YACzC,QAAQ,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,EAAE,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;SACvD;QACD,IAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,YAAY,EAAE,MAAM,CAAC,CAAC;QAC9D,IAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC,CAAC;QACpD,OAAO,IAAI,sBAAS,CAAC,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;IACpF,CAAC;IAEO,iCAAQ,GAAhB,UAAiB,KAAsB,EAAE,SAAiB,EAAE,YAAqB;QAC/E,IAAI,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE;YAC3C,OAAO,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;SAChC;QACD,OAAO,YAAY,IAAI,EAAE,CAAC;IAC5B,CAAC;;IA9BD,mCAAmC;IACnB,iCAAkB,GAChC,qKAAsK,CAAA;IAH7J,cAAc;QAD1B,IAAA,sBAAU,GAAE;OACA,cAAc,CAgC1B;IAAD,qBAAC;CAAA,AAhCD,IAgCC;AAhCY,wCAAc"}

package/lib/github/github-url.d.ts

@@ -7,10 +7,8 @@
  *
  * SPDX-License-Identifier: EPL-2.0
  ***********************************************************************/
-/**
- * Provides helper methods on top of github URL to get for example raw content of get relative links
- */
-export declare class GithubUrl {
+import { Url } from '../resolve/url';
+export declare class GithubUrl implements Url {
     private readonly scheme;
     private readonly hostName;
     private readonly repoUser;

package/lib/github/github-url.js

@@ -10,9 +10,6 @@
  ***********************************************************************/
 exports.__esModule = true;
 exports.GithubUrl = void 0;
-/**
- * Provides helper methods on top of github URL to get for example raw content of get relative links
- */
 var GithubUrl = /** @class */ (function () {
     function GithubUrl(scheme, hostName, repoUser, repoName, branchName, subFolder) {
         this.scheme = scheme;

package/lib/github/github-url.js.map

@@ -1 +1 @@
-{"version":3,"file":"github-url.js","sourceRoot":"","sources":["../../src/github/github-url.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;AAEzE;;GAEG;AACH;IACE,mBACmB,MAAc,EACd,QAAgB,EAChB,QAAgB,EAChB,QAAgB,EAChB,UAAkB,EAClB,SAAiB;QALjB,WAAM,GAAN,MAAM,CAAQ;QACd,aAAQ,GAAR,QAAQ,CAAQ;QAChB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,eAAU,GAAV,UAAU,CAAQ;QAClB,cAAS,GAAT,SAAS,CAAQ;IACjC,CAAC;IAEJ;;OAEG;IACH,iCAAa,GAAb,UAAc,IAAY;QACxB,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC1F,OAAU,IAAI,CAAC,MAAM,eAAU,QAAQ,SAAI,IAAI,CAAC,QAAQ,SAAI,IAAI,CAAC,QAAQ,SAAI,IAAI,CAAC,UAAU,SAAI,IAAM,CAAC;IACzG,CAAC;IAED,0BAAM,GAAN;QACE,OAAU,IAAI,CAAC,MAAM,WAAM,IAAI,CAAC,QAAQ,SAAI,IAAI,CAAC,QAAQ,SAAI,IAAI,CAAC,QAAQ,cAAS,IAAI,CAAC,UAAU,SAAI,IAAI,CAAC,SAAW,CAAC;IACzH,CAAC;IAED,+BAAW,GAAX;QACE,OAAU,IAAI,CAAC,MAAM,WAAM,IAAI,CAAC,QAAQ,SAAI,IAAI,CAAC,QAAQ,SAAI,IAAI,CAAC,QAAQ,SAAM,CAAC;IACnF,CAAC;IAED,+BAAW,GAAX;QACE,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,iCAAa,GAAb;QACE,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IACH,gBAAC;AAAD,CAAC,AAjCD,IAiCC;AAjCY,8BAAS"}
+{"version":3,"file":"github-url.js","sourceRoot":"","sources":["../../src/github/github-url.ts"],"names":[],"mappings":";AAAA;;;;;;;;yEAQyE;;;AAIzE;IACE,mBACmB,MAAc,EACd,QAAgB,EAChB,QAAgB,EAChB,QAAgB,EAChB,UAAkB,EAClB,SAAiB;QALjB,WAAM,GAAN,MAAM,CAAQ;QACd,aAAQ,GAAR,QAAQ,CAAQ;QAChB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,aAAQ,GAAR,QAAQ,CAAQ;QAChB,eAAU,GAAV,UAAU,CAAQ;QAClB,cAAS,GAAT,SAAS,CAAQ;IACjC,CAAC;IAEJ;;OAEG;IACH,iCAAa,GAAb,UAAc,IAAY;QACxB,IAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,KAAK,YAAY,CAAC,CAAC,CAAC,uBAAuB,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC;QAC1F,OAAU,IAAI,CAAC,MAAM,eAAU,QAAQ,SAAI,IAAI,CAAC,QAAQ,SAAI,IAAI,CAAC,QAAQ,SAAI,IAAI,CAAC,UAAU,SAAI,IAAM,CAAC;IACzG,CAAC;IAED,0BAAM,GAAN;QACE,OAAU,IAAI,CAAC,MAAM,WAAM,IAAI,CAAC,QAAQ,SAAI,IAAI,CAAC,QAAQ,SAAI,IAAI,CAAC,QAAQ,cAAS,IAAI,CAAC,UAAU,SAAI,IAAI,CAAC,SAAW,CAAC;IACzH,CAAC;IAED,+BAAW,GAAX;QACE,OAAU,IAAI,CAAC,MAAM,WAAM,IAAI,CAAC,QAAQ,SAAI,IAAI,CAAC,QAAQ,SAAI,IAAI,CAAC,QAAQ,SAAM,CAAC;IACnF,CAAC;IAED,+BAAW,GAAX;QACE,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,iCAAa,GAAb;QACE,OAAO,IAAI,CAAC,UAAU,CAAC;IACzB,CAAC;IACH,gBAAC;AAAD,CAAC,AAjCD,IAiCC;AAjCY,8BAAS"}