@forge/cli-shared 0.0.0-experimental-d8cea00 → 0.0.0-experimental-64caa5a

package/CHANGELOG.md

@@ -1,15 +1,402 @@
 # @forge/cli-shared
 
-## 0.0.0-experimental-d8cea00
+## 0.0.0-experimental-64caa5a
+
+### Minor Changes
+
+- f4c23d3: Support workspace installation for Forge App
+- 5bf2ff0: Add support for workspace app installation and upgrade
+- b63af27: Refactor templates code to be more generic in order to ease implementing other templating methods
+
+### Patch Changes
+
+- 2338be5: Handle the manifest case of remotes found in the egress permissions section when installing an app
+- Updated dependencies [bd6e025]
+- Updated dependencies [a0a2c5b]
+- Updated dependencies [22a488e]
+- Updated dependencies [62089be]
+- Updated dependencies [689c09b]
+- Updated dependencies [b97660c]
+- Updated dependencies [7c0d2ee]
+- Updated dependencies [06209fc]
+- Updated dependencies [d3afe01]
+- Updated dependencies [dfe9dd8]
+- Updated dependencies [91ea057]
+- Updated dependencies [3010f0e]
+- Updated dependencies [2b7c32b]
+- Updated dependencies [92d081d]
+- Updated dependencies [d3c8c8d]
+- Updated dependencies [36c7c8f]
+- Updated dependencies [d2f6992]
+- Updated dependencies [a017696]
+- Updated dependencies [0a7725f]
+- Updated dependencies [af1473c]
+- Updated dependencies [e4a14c7]
+- Updated dependencies [2bb89c5]
+- Updated dependencies [0a39c43]
+  - @forge/manifest@0.0.0-experimental-64caa5a
+
+## 2.2.0-next.16
+
+### Minor Changes
+
+- b63af27: Refactor templates code to be more generic in order to ease implementing other templating methods
+
+### Patch Changes
+
+- Updated dependencies [e4a14c7]
+  - @forge/manifest@2.6.0-next.15
+
+## 2.1.6-next.15
+
+### Patch Changes
+
+- Updated dependencies [2b7c32b]
+  - @forge/manifest@2.6.0-next.14
+
+## 2.1.6-next.14
+
+### Patch Changes
+
+- Updated dependencies [a0a2c5b]
+- Updated dependencies [689c09b]
+- Updated dependencies [92d081d]
+- Updated dependencies [36c7c8f]
+  - @forge/manifest@2.6.0-next.13
+
+## 2.1.6-next.13
+
+### Patch Changes
+
+- Updated dependencies [62089be]
+  - @forge/manifest@2.6.0-next.12
+
+## 2.1.6-next.12
+
+### Patch Changes
+
+- Updated dependencies [dfe9dd8]
+- Updated dependencies [d3c8c8d]
+- Updated dependencies [0a7725f]
+- Updated dependencies [2bb89c5]
+  - @forge/manifest@2.6.0-next.11
+
+## 2.1.6-next.11
+
+### Patch Changes
+
+- Updated dependencies [bd6e025]
+- Updated dependencies [d2f6992]
+  - @forge/manifest@2.6.0-next.10
+
+## 2.1.6-next.10
+
+### Patch Changes
+
+- Updated dependencies [22a488ec]
+  - @forge/manifest@2.6.0-next.9
+
+## 2.1.6-next.9
+
+### Patch Changes
+
+- Updated dependencies [c0e5696]
+- Updated dependencies [7c0d2ee]
+  - @forge/manifest@2.6.0-next.8
+
+## 2.1.6-next.8
+
+### Patch Changes
+
+- Updated dependencies [d3afe01]
+  - @forge/manifest@2.6.0-next.7
+
+## 2.1.6-next.7
+
+### Patch Changes
+
+- Updated dependencies [cdd8645]
+- Updated dependencies [b97660c]
+  - @forge/manifest@2.6.0-next.6
+
+## 2.1.6-next.6
+
+### Patch Changes
+
+- Updated dependencies [0a39c43]
+  - @forge/manifest@2.6.0-next.5
+
+## 2.1.6-next.5
+
+### Patch Changes
+
+- Updated dependencies [91ea057]
+  - @forge/manifest@2.5.1-next.4
+
+## 2.1.6-next.4
+
+### Patch Changes
+
+- Updated dependencies [3010f0e]
+  - @forge/manifest@2.5.1-next.3
+
+## 2.1.6-next.3
+
+### Patch Changes
+
+- Updated dependencies [a017696]
+  - @forge/manifest@2.5.1-next.2
+
+## 2.1.6-next.2
+
+### Patch Changes
+
+- Updated dependencies [af1473c]
+  - @forge/manifest@2.5.1-next.1
+
+## 2.1.6-next.1
+
+### Patch Changes
+
+- Updated dependencies [06209fc]
+  - @forge/manifest@2.5.1-next.0
+
+## 2.1.6-next.0
+
+### Patch Changes
+
+- 2338be5: Handle the manifest case of remotes found in the egress permissions section when installing an app
+
+## 2.1.5
+
+### Patch Changes
+
+- Updated dependencies [4de9850]
+- Updated dependencies [70e9c8c]
+- Updated dependencies [fde4ba7]
+- Updated dependencies [601527b]
+- Updated dependencies [755e35e]
+- Updated dependencies [a5656f6]
+- Updated dependencies [cc8799c]
+- Updated dependencies [f5eb8e0]
+- Updated dependencies [f013199]
+- Updated dependencies [78d682f]
+- Updated dependencies [70e9c8c]
+- Updated dependencies [dec8066]
+- Updated dependencies [0e82242]
+  - @forge/manifest@2.5.0
+
+## 2.1.5-next.10
+
+### Patch Changes
+
+- Updated dependencies [fde4ba7]
+  - @forge/manifest@2.5.0-next.10
+
+## 2.1.5-next.9
+
+### Patch Changes
+
+- Updated dependencies [601527b]
+  - @forge/manifest@2.5.0-next.9
+
+## 2.1.5-next.8
+
+### Patch Changes
+
+- Updated dependencies [a5656f6]
+- Updated dependencies [78d682f]
+  - @forge/manifest@2.5.0-next.8
+
+## 2.1.5-next.7
+
+### Patch Changes
+
+- Updated dependencies [cc8799c]
+  - @forge/manifest@2.5.0-next.7
+
+## 2.1.5-next.6
+
+### Patch Changes
+
+- Updated dependencies [0e82242]
+  - @forge/manifest@2.5.0-next.6
+
+## 2.1.5-next.5
+
+### Patch Changes
+
+- Updated dependencies [f5eb8e0]
+  - @forge/manifest@2.5.0-next.5
+
+## 2.1.5-next.4
+
+### Patch Changes
+
+- Updated dependencies [4de9850]
+  - @forge/manifest@2.5.0-next.4
+
+## 2.1.5-next.3
+
+### Patch Changes
+
+- Updated dependencies [dec8066]
+  - @forge/manifest@2.5.0-next.3
+
+## 2.1.5-next.2
+
+### Patch Changes
+
+- Updated dependencies [755e35e]
+- Updated dependencies [f013199]
+  - @forge/manifest@2.5.0-next.2
+
+## 2.1.5-next.1
+
+### Patch Changes
+
+- Updated dependencies [66f60f9]
+  - @forge/manifest@2.5.0-next.1
+
+## 2.1.5-next.0
+
+### Patch Changes
+
+- Updated dependencies [bc0c83b]
+  - @forge/manifest@2.4.1-next.0
+
+## 2.1.4
+
+### Patch Changes
+
+- Updated dependencies [fbcb4a3]
+- Updated dependencies [4608ccd]
+- Updated dependencies [0bc8683]
+- Updated dependencies [f08a9cb]
+- Updated dependencies [e28cc2c]
+- Updated dependencies [b415d76]
+- Updated dependencies [b91d511]
+- Updated dependencies [daa138b]
+- Updated dependencies [33cbdba]
+- Updated dependencies [ee3919d]
+- Updated dependencies [ba6d463]
+- Updated dependencies [1d7f9f1]
+- Updated dependencies [82167f3]
+- Updated dependencies [873f913]
+- Updated dependencies [a9bdd4f]
+- Updated dependencies [2ea75dd]
+  - @forge/manifest@2.4.0
+  - @forge/util@1.0.1
+
+## 2.1.4-next.9
+
+### Patch Changes
+
+- Updated dependencies [ba6d463]
+  - @forge/manifest@2.4.0-next.9
+
+## 2.1.4-next.8
+
+### Patch Changes
+
+- Updated dependencies [e28cc2c]
+- Updated dependencies [ee3919d]
+  - @forge/manifest@2.4.0-next.8
+
+## 2.1.4-next.7
+
+### Patch Changes
+
+- Updated dependencies [daa138b]
+- Updated dependencies [2ea75dd]
+  - @forge/manifest@2.4.0-next.7
+
+## 2.1.4-next.6
+
+### Patch Changes
+
+- Updated dependencies [f08a9cb]
+- Updated dependencies [873f913]
+  - @forge/manifest@2.4.0-next.6
+
+## 2.1.4-next.5
+
+### Patch Changes
+
+- Updated dependencies [fbcb4a3]
+- Updated dependencies [a9bdd4f]
+  - @forge/manifest@2.4.0-next.5
+
+## 2.1.4-next.4
+
+### Patch Changes
+
+- Updated dependencies [0bc8683]
+  - @forge/manifest@2.3.1-next.4
+
+## 2.1.4-next.3
+
+### Patch Changes
+
+- Updated dependencies [1d7f9f1]
+  - @forge/manifest@2.3.1-next.3
+
+## 2.1.4-next.2
+
+### Patch Changes
+
+- Updated dependencies [b415d76]
+- Updated dependencies [33cbdba]
+  - @forge/manifest@2.3.1-next.2
+
+## 2.1.4-next.1
+
+### Patch Changes
+
+- Updated dependencies [4608ccd]
+- Updated dependencies [b91d511]
+  - @forge/util@1.0.1-next.0
+  - @forge/manifest@2.3.1-next.1
+
+## 2.1.4-next.0
+
+### Patch Changes
+
+- Updated dependencies [82167f3]
+  - @forge/manifest@2.3.1-next.0
+
+## 2.1.3
 
 ### Patch Changes
 
 - 962582f: Remove ts-ignore and fix complex union type error related to MutationResult generic.
-- Updated dependencies [0fe60df]
+- Updated dependencies [f3c0748]
 - Updated dependencies [bd2be7f]
+- Updated dependencies [46240f3]
+- Updated dependencies [18c799a]
+- Updated dependencies [5ed2e3a]
 - Updated dependencies [7cfcd6c]
 - Updated dependencies [f0d3871]
-  - @forge/manifest@0.0.0-experimental-d8cea00
+- Updated dependencies [9b09fef]
+  - @forge/manifest@2.3.0
+
+## 2.1.3-next.4
+
+### Patch Changes
+
+- Updated dependencies [46240f3]
+- Updated dependencies [5ed2e3a]
+  - @forge/manifest@2.3.0-next.3
+
+## 2.1.3-next.3
+
+### Patch Changes
+
+- Updated dependencies [f3c0748]
+- Updated dependencies [18c799a]
+- Updated dependencies [7cfcd6c]
+- Updated dependencies [9b09fef]
+  - @forge/manifest@2.3.0-next.2
 
 ## 2.1.3-next.2
 

package/out/apps/template.d.ts

@@ -11,15 +11,17 @@ export interface TemplateDownloader {
 export interface TemplateExtractor {
     extract(zipFile: string, destDirectory: string): Promise<void>;
 }
-export interface Templater {
-    downloadAndExtract(template: string, directory: string): Promise<void>;
+export interface TemplateLister {
     getAvailableTemplates(): Promise<string[]>;
 }
+export interface Templater extends TemplateLister {
+    downloadAndExtract(template: string, directory: string): Promise<void>;
+}
 export declare class BitbucketTemplateDownloader implements TemplateDownloader {
     download(template: string, zipFile: string): Promise<void>;
     private buildZipUrl;
 }
-export declare class BitbucketTemplateExtractor implements TemplateExtractor {
+export declare class ZipTemplateExtractor implements TemplateExtractor {
     private readonly zipAccessor;
     constructor(zipAccessor: ZipAccessor);
     extract(zipFile: string, destDirectory: string): Promise<void>;
@@ -28,11 +30,15 @@ export declare class BitbucketTemplateExtractor implements TemplateExtractor {
 export declare class TemplateFetchError extends Error {
     constructor();
 }
-export declare class BitbucketTemplater implements Templater {
+export declare class BitbucketTemplateLister implements TemplateLister {
+    getAvailableTemplates(): Promise<string[]>;
+}
+export declare class ComposableTemplater implements Templater {
     private readonly downloader;
     private readonly extractor;
+    private readonly lister;
     private readonly logger;
-    constructor(downloader: TemplateDownloader, extractor: TemplateExtractor, logger: Logger);
+    constructor(downloader: TemplateDownloader, extractor: TemplateExtractor, lister: TemplateLister, logger: Logger);
     downloadAndExtract(template: string, directory: string): Promise<void>;
     getAvailableTemplates(): Promise<string[]>;
 }

package/out/apps/template.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../src/apps/template.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAK/B,qBAAa,eAAgB,SAAQ,KAAK;gBAC5B,QAAQ,EAAE,MAAM;CAG7B;AAED,qBAAa,2BAA4B,SAAQ,KAAK;CAAG;AAEzD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5D;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAChE;AAED,MAAM,WAAW,SAAS;IACxB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACvE,qBAAqB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CAC5C;AAED,qBAAa,2BAA4B,YAAW,kBAAkB;IACvD,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBvE,OAAO,CAAC,WAAW;CAGpB;AAED,qBAAa,0BAA2B,YAAW,iBAAiB;IACtD,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAAX,WAAW,EAAE,WAAW;IAExC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAc7D,2BAA2B;CAqB1C;AAED,qBAAa,kBAAmB,SAAQ,KAAK;;CAI5C;AAED,qBAAa,kBAAmB,YAAW,SAAS;IAEhD,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAFN,UAAU,EAAE,kBAAkB,EAC9B,SAAS,EAAE,iBAAiB,EAC5B,MAAM,EAAE,MAAM;IAGpB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBtE,qBAAqB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAgBxD"}
+{"version":3,"file":"template.d.ts","sourceRoot":"","sources":["../../src/apps/template.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,OAAO,CAAC;AAK/B,qBAAa,eAAgB,SAAQ,KAAK;gBAC5B,QAAQ,EAAE,MAAM;CAG7B;AAED,qBAAa,2BAA4B,SAAQ,KAAK;CAAG;AAEzD,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC5D;AAED,MAAM,WAAW,iBAAiB;IAChC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAChE;AAED,MAAM,WAAW,cAAc;IAC7B,qBAAqB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC;CAC5C;AAED,MAAM,WAAW,SAAU,SAAQ,cAAc;IAC/C,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACxE;AAED,qBAAa,2BAA4B,YAAW,kBAAkB;IACvD,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBvE,OAAO,CAAC,WAAW;CAGpB;AAED,qBAAa,oBAAqB,YAAW,iBAAiB;IAChD,OAAO,CAAC,QAAQ,CAAC,WAAW;gBAAX,WAAW,EAAE,WAAW;IAExC,OAAO,CAAC,OAAO,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAc7D,2BAA2B;CAqB1C;AAED,qBAAa,kBAAmB,SAAQ,KAAK;;CAI5C;AAED,qBAAa,uBAAwB,YAAW,cAAc;IAC/C,qBAAqB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAgBxD;AAED,qBAAa,mBAAoB,YAAW,SAAS;IAEjD,OAAO,CAAC,QAAQ,CAAC,UAAU;IAC3B,OAAO,CAAC,QAAQ,CAAC,SAAS;IAC1B,OAAO,CAAC,QAAQ,CAAC,MAAM;IACvB,OAAO,CAAC,QAAQ,CAAC,MAAM;gBAHN,UAAU,EAAE,kBAAkB,EAC9B,SAAS,EAAE,iBAAiB,EAC5B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,MAAM;IAEpB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAsBnF,qBAAqB,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;CAG3C"}

package/out/apps/template.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.BitbucketTemplater = exports.TemplateFetchError = exports.BitbucketTemplateExtractor = exports.BitbucketTemplateDownloader = exports.InvalidTemplateArchiveError = exports.NoTemplateError = void 0;
+exports.ComposableTemplater = exports.BitbucketTemplateLister = exports.TemplateFetchError = exports.ZipTemplateExtractor = exports.BitbucketTemplateDownloader = exports.InvalidTemplateArchiveError = exports.NoTemplateError = void 0;
 const tslib_1 = require("tslib");
 const fs_1 = tslib_1.__importDefault(require("fs"));
 const fs_extra_1 = require("fs-extra");
@@ -41,7 +41,7 @@ class BitbucketTemplateDownloader {
     }
 }
 exports.BitbucketTemplateDownloader = BitbucketTemplateDownloader;
-class BitbucketTemplateExtractor {
+class ZipTemplateExtractor {
     constructor(zipAccessor) {
         this.zipAccessor = zipAccessor;
     }
@@ -73,17 +73,34 @@ class BitbucketTemplateExtractor {
         }
     }
 }
-exports.BitbucketTemplateExtractor = BitbucketTemplateExtractor;
+exports.ZipTemplateExtractor = ZipTemplateExtractor;
 class TemplateFetchError extends Error {
     constructor() {
         super(ui_1.Text.error.templateFetchFailed);
     }
 }
 exports.TemplateFetchError = TemplateFetchError;
-class BitbucketTemplater {
-    constructor(downloader, extractor, logger) {
+class BitbucketTemplateLister {
+    async getAvailableTemplates() {
+        try {
+            const res = await node_fetch_1.default(`https://api.bitbucket.org/2.0/repositories/atlassian?q=project.key=%22${BITBUCKET_PROJECT}%22&sort=name&pagelen=50`);
+            if (!res.ok) {
+                throw new TemplateFetchError();
+            }
+            const json = await res.json();
+            return json.values.map((repo) => repo.name);
+        }
+        catch (e) {
+            throw new TemplateFetchError();
+        }
+    }
+}
+exports.BitbucketTemplateLister = BitbucketTemplateLister;
+class ComposableTemplater {
+    constructor(downloader, extractor, lister, logger) {
         this.downloader = downloader;
         this.extractor = extractor;
+        this.lister = lister;
         this.logger = logger;
     }
     async downloadAndExtract(template, directory) {
@@ -105,18 +122,8 @@ class BitbucketTemplater {
             fs_1.default.unlinkSync(zipFile);
         }
     }
-    async getAvailableTemplates() {
-        try {
-            const res = await node_fetch_1.default(`https://api.bitbucket.org/2.0/repositories/atlassian?q=project.key=%22${BITBUCKET_PROJECT}%22&sort=name&pagelen=50`);
-            if (!res.ok) {
-                throw new TemplateFetchError();
-            }
-            const json = await res.json();
-            return json.values.map((repo) => repo.name);
-        }
-        catch (e) {
-            throw new TemplateFetchError();
-        }
+    getAvailableTemplates() {
+        return this.lister.getAvailableTemplates();
     }
 }
-exports.BitbucketTemplater = BitbucketTemplater;
+exports.ComposableTemplater = ComposableTemplater;

package/out/config/config-file.d.ts

@@ -1,7 +1,7 @@
 import { Document } from 'yaml';
 import { FileSystemReader, FileSystemWriter } from '../file-system';
 import { ConfigReader, ConfigWriter } from './';
-import { ManifestSchema, Resources } from '@forge/manifest';
+import { ManifestSchema, Resources } from '@forge/manifest/out/schema/manifest';
 export declare class ResourceDefinitionMissingError extends Error {
     constructor(resources: string[]);
 }
@@ -27,6 +27,8 @@ export declare class ConfigFile implements ConfigReader, ConfigWriter, ConfigInt
     writeToConfigFile<K extends string, V>(configKey: K, config: V): Promise<void>;
     private getHostedResourceKeys;
     private findMissingResources;
+    private getRemoteFromEgressPermission;
+    private instanceOfRemote;
     getEgressPermissions(): Promise<{
         type: string;
         domains: string[] | undefined;

package/out/config/config-file.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"config-file.d.ts","sourceRoot":"","sources":["../../src/config/config-file.ts"],"names":[],"mappings":"AAAA,OAAa,EAAwB,QAAQ,EAAE,MAAM,MAAM,CAAC;AAI5D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAoB,MAAM,IAAI,CAAC;AAGlE,OAAO,EAAW,cAAc,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAGrE,qBAAa,8BAA+B,SAAQ,KAAK;gBAC3C,SAAS,EAAE,MAAM,EAAE;CAGhC;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACzC,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CACtC;AAED,oBAAY,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;AACpC,oBAAY,YAAY,GAAG,UAAU,GAAG,SAAS,CAAC;AAClD,MAAM,WAAW,eAAgB,SAAQ,QAAQ;IAC/C,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED,qBAAa,UAAW,YAAW,YAAY,EAAE,YAAY,EAAE,gBAAgB;IACjE,OAAO,CAAC,QAAQ,CAAC,UAAU;IAAoB,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAzD,UAAU,EAAE,gBAAgB,EAAmB,UAAU,EAAE,gBAAgB;IAE3F,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IASxC,UAAU,IAAI,OAAO,CAAC,cAAc,CAAC;IAUrC,oBAAoB,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC;IAW5D,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC;IAMjD,OAAO,CAAC,kBAAkB;IAmBb,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAapD,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAe3F,OAAO,CAAC,qBAAqB;IAY7B,OAAO,CAAC,oBAAoB;IAKf,oBAAoB,IAAI,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;KAAE,EAAE,CAAC;IAsClF,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAe1E,YAAY,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IA0B1C,aAAa,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAI1D"}
+{"version":3,"file":"config-file.d.ts","sourceRoot":"","sources":["../../src/config/config-file.ts"],"names":[],"mappings":"AAAA,OAAa,EAAwB,QAAQ,EAAE,MAAM,MAAM,CAAC;AAI5D,OAAO,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAGpE,OAAO,EAAE,YAAY,EAAE,YAAY,EAAoB,MAAM,IAAI,CAAC;AAGlE,OAAO,EAEL,cAAc,EACd,SAAS,EAMV,MAAM,qCAAqC,CAAC;AAE7C,qBAAa,8BAA+B,SAAQ,KAAK;gBAC3C,SAAS,EAAE,MAAM,EAAE;CAGhC;AAED,MAAM,WAAW,gBAAgB;IAC/B,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC;IACzC,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC,CAAC;CACtC;AAED,oBAAY,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;AACpC,oBAAY,YAAY,GAAG,UAAU,GAAG,SAAS,CAAC;AAClD,MAAM,WAAW,eAAgB,SAAQ,QAAQ;IAC/C,YAAY,EAAE,YAAY,CAAC;CAC5B;AAED,qBAAa,UAAW,YAAW,YAAY,EAAE,YAAY,EAAE,gBAAgB;IACjE,OAAO,CAAC,QAAQ,CAAC,UAAU;IAAoB,OAAO,CAAC,QAAQ,CAAC,UAAU;gBAAzD,UAAU,EAAE,gBAAgB,EAAmB,UAAU,EAAE,gBAAgB;IAE3F,cAAc,IAAI,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IASxC,UAAU,IAAI,OAAO,CAAC,cAAc,CAAC;IAUrC,oBAAoB,IAAI,OAAO,CAAC,QAAQ,CAAC,MAAM,GAAG,SAAS,CAAC;IAW5D,gBAAgB,IAAI,OAAO,CAAC,OAAO,CAAC;IAMjD,OAAO,CAAC,kBAAkB;IAmBb,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAapD,iBAAiB,CAAC,CAAC,SAAS,MAAM,EAAE,CAAC,EAAE,SAAS,EAAE,CAAC,EAAE,MAAM,EAAE,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAe3F,OAAO,CAAC,qBAAqB;IAY7B,OAAO,CAAC,oBAAoB;IAK5B,OAAO,CAAC,6BAA6B;IAYrC,OAAO,CAAC,gBAAgB;IAIX,oBAAoB,IAAI,OAAO,CAAC;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,MAAM,EAAE,GAAG,SAAS,CAAA;KAAE,EAAE,CAAC;IAoClF,gBAAgB,IAAI,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,IAAI,EAAE,MAAM,CAAA;KAAE,CAAC,CAAC;IAe1E,YAAY,IAAI,OAAO,CAAC,eAAe,EAAE,CAAC;IA0B1C,aAAa,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;CAI1D"}

package/out/config/config-file.js

@@ -112,8 +112,22 @@ class ConfigFile {
         const missing = resourceKeys.filter((resourceKey) => !resources.some(({ key }) => resourceKey === key));
         return missing;
     }
+    getRemoteFromEgressPermission(remoteEgressPermission, remotes) {
+        if (!remotes) {
+            return remoteEgressPermission;
+        }
+        for (const remote of remotes) {
+            if (remote.key === remoteEgressPermission) {
+                return new url_1.URL(remote.baseUrl).hostname;
+            }
+        }
+        return remoteEgressPermission;
+    }
+    instanceOfRemote(remote) {
+        return typeof remote !== 'string' && 'remote' in remote;
+    }
     async getEgressPermissions() {
-        const { permissions } = await this.readConfig();
+        const { permissions, remotes } = await this.readConfig();
         const egressPermissions = permissions === null || permissions === void 0 ? void 0 : permissions.external;
         if (!egressPermissions) {
             return [];
@@ -126,9 +140,11 @@ class ConfigFile {
             return ({
                 type: typePrefix ? `${typePrefix}_${entry[0]}` : entry[0],
                 domains: (_a = entry[1]) === null || _a === void 0 ? void 0 : _a.map((url) => {
-                    let domain = url;
+                    let domain = this.instanceOfRemote(url) ? url.remote : url;
                     try {
-                        domain = new url_1.URL(url).hostname;
+                        domain = this.instanceOfRemote(url)
+                            ? this.getRemoteFromEgressPermission(url.remote, remotes)
+                            : new url_1.URL(url).hostname;
                     }
                     catch (e) {
                     }
@@ -137,9 +153,7 @@ class ConfigFile {
             });
         });
         const egressUrls = getDomainsFromPermissions(otherEgress);
-        const fetchUrls = fetchEgress
-            ? getDomainsFromPermissions(fetchEgress, 'fetch')
-            : [];
+        const fetchUrls = fetchEgress ? getDomainsFromPermissions(fetchEgress, 'fetch') : [];
         return [...egressUrls, ...fetchUrls];
     }
     async getAuthProviders() {