@forge/api 2.7.0-next.0 → 2.8.0-next.0

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @forge/api
 
+## 2.8.0-next.0
+
+### Minor Changes
+
+- 95913f6: Call product APIs via proxy on Node runtime
+
+## 2.7.0
+
+### Minor Changes
+
+- b3ee297: Unblock valid property API keys and handled error propagation
+
+### Patch Changes
+
+- Updated dependencies [3c3c42b]
+  - @forge/storage@1.3.0
+
 ## 2.7.0-next.0
 
 ### Minor Changes

package/out/api/fetch.d.ts

@@ -0,0 +1,14 @@
+/// <reference types="node" />
+import { RequestInfo, RequestInit, Response } from 'node-fetch';
+import { Url } from 'url';
+import { FetchAPI } from '..';
+declare type FetchFunction = (url: RequestInfo | Url, options: RequestInit | undefined) => Promise<Response>;
+export interface ProxyInformation {
+    token: string;
+    url: string;
+}
+export declare const createProxyFetch: (provider: 'app' | 'user' | undefined, remote: 'jira' | 'confluence' | 'stargate') => FetchFunction;
+export declare function getNodeRuntimeAPI(): FetchAPI;
+export declare function getSandboxRuntimeAPI(): FetchAPI | null;
+export {};
+//# sourceMappingURL=fetch.d.ts.map

package/out/api/fetch.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetch.d.ts","sourceRoot":"","sources":["../../src/api/fetch.ts"],"names":[],"mappings":";AAAA,OAAc,EAAE,WAAW,EAAE,WAAW,EAAE,QAAQ,EAAoB,MAAM,YAAY,CAAC;AACzF,OAAO,EAAE,GAAG,EAAE,MAAM,KAAK,CAAC;AAE1B,OAAO,EAAE,QAAQ,EAAE,MAAM,IAAI,CAAC;AAG9B,aAAK,aAAa,GAAG,CAAC,GAAG,EAAE,WAAW,GAAG,GAAG,EAAE,OAAO,EAAE,WAAW,GAAG,SAAS,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;AAErG,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;CACb;AAED,eAAO,MAAM,gBAAgB,aACjB,KAAK,GAAG,MAAM,GAAG,SAAS,UAC5B,MAAM,GAAG,YAAY,GAAG,UAAU,KACzC,aAiBF,CAAC;AAOF,wBAAgB,iBAAiB,IAAI,QAAQ,CAiB5C;AAED,wBAAgB,oBAAoB,IAAI,QAAQ,GAAG,IAAI,CAOtD"}

package/out/api/fetch.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSandboxRuntimeAPI = exports.getNodeRuntimeAPI = exports.createProxyFetch = void 0;
+const tslib_1 = require("tslib");
+const node_fetch_1 = tslib_1.__importStar(require("node-fetch"));
+const _1 = require(".");
+const polyfill_response_1 = require("./polyfill-response");
+const createProxyFetch = (provider, remote) => {
+    return (url, options) => {
+        const proxy = global.proxyInfo;
+        const request = new node_fetch_1.Request(url, options);
+        const headers = new node_fetch_1.Headers(request.headers);
+        headers.set('Forge-Proxy-Target-Relative', request.url);
+        headers.set('Forge-Proxy-Authorization', `Bearer ${proxy.token}`);
+        const proxyRequest = new node_fetch_1.Request(`${proxy.url}/fpp/provider/${provider}/remote/${remote}`, Object.assign(Object.assign({}, request), { headers }));
+        return (0, node_fetch_1.default)(proxyRequest);
+    };
+};
+exports.createProxyFetch = createProxyFetch;
+const throwNotImplementedError = () => {
+    throw new Error('not implemented');
+};
+function getNodeRuntimeAPI() {
+    return {
+        fetch: throwNotImplementedError,
+        requestJira: throwNotImplementedError,
+        requestConfluence: throwNotImplementedError,
+        asUser: () => ({
+            requestJira: (0, _1.wrapRequestProduct)((0, exports.createProxyFetch)('user', 'jira')),
+            requestConfluence: (0, _1.wrapRequestProduct)((0, exports.createProxyFetch)('user', 'confluence')),
+            requestGraph: (0, _1.wrapRequestGraph)((0, exports.createProxyFetch)('user', 'stargate')),
+            withProvider: throwNotImplementedError
+        }),
+        asApp: () => ({
+            requestJira: (0, _1.wrapRequestProduct)((0, exports.createProxyFetch)('app', 'jira')),
+            requestConfluence: (0, _1.wrapRequestProduct)((0, exports.createProxyFetch)('app', 'confluence')),
+            requestGraph: (0, _1.wrapRequestGraph)((0, exports.createProxyFetch)('app', 'stargate'))
+        })
+    };
+}
+exports.getNodeRuntimeAPI = getNodeRuntimeAPI;
+function getSandboxRuntimeAPI() {
+    const { api: globalAPI } = global;
+    if (globalAPI && Object.keys(globalAPI).length) {
+        return (0, _1.wrapFetchApiMethods)(globalAPI, polyfill_response_1.transformResponse);
+    }
+    else {
+        return null;
+    }
+}
+exports.getSandboxRuntimeAPI = getSandboxRuntimeAPI;

package/out/api/index.d.ts

@@ -1,6 +1,8 @@
 import { RequestInfo, RequestInit } from 'node-fetch';
-import { FetchAPI } from '..';
-export { transformResponse } from './polyfill-response';
-export declare type FetchWrapper = (fetchApi: Function) => (url: RequestInfo, init?: RequestInit) => any;
+import { FetchAPI, FetchMethod, RequestProductMethod, FetchMethodAllowingRoute, APIResponse } from '..';
+export declare type FetchWrapper = (fetchApi: Function) => (url: RequestInfo, init?: RequestInit) => Promise<APIResponse>;
+export declare const wrapRequestGraph: (requestGraphApi: FetchMethod) => (query: string, variables?: any, headers?: {}) => Promise<APIResponse>;
+export declare const wrapRequestProduct: (x: FetchMethod) => RequestProductMethod;
+export declare const wrapWithRouteUnwrapper: (x: FetchMethod) => FetchMethodAllowingRoute;
 export declare const wrapFetchApiMethods: (api: any, wrapFetch: FetchWrapper) => FetchAPI;
 //# sourceMappingURL=index.d.ts.map

package/out/api/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EACL,QAAQ,EAQT,MAAM,IAAI,CAAC;AACZ,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAIxD,oBAAY,YAAY,GAAG,CAAC,QAAQ,EAAE,QAAQ,KAAK,CAAC,GAAG,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,WAAW,KAAK,GAAG,CAAC;AAsBjG,eAAO,MAAM,mBAAmB,QAAS,GAAG,aAAa,YAAY,KAAG,QA+BvE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACtD,OAAO,EACL,QAAQ,EAER,WAAW,EAEX,oBAAoB,EACpB,wBAAwB,EAGxB,WAAW,EACZ,MAAM,IAAI,CAAC;AAIZ,oBAAY,YAAY,GAAG,CAAC,QAAQ,EAAE,QAAQ,KAAK,CAAC,GAAG,EAAE,WAAW,EAAE,IAAI,CAAC,EAAE,WAAW,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;AAElH,eAAO,MAAM,gBAAgB,oBAAqB,WAAW,aAAa,MAAM,cAAc,GAAG,uCAQ7F,CAAC;AAEL,eAAO,MAAM,kBAAkB,EAAE,CAAC,CAAC,EAAE,WAAW,KAAK,oBAGpD,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,CAAC,CAAC,EAAE,WAAW,KAAK,wBAGxD,CAAC;AAEF,eAAO,MAAM,mBAAmB,QAAS,GAAG,aAAa,YAAY,KAAG,QA+BvE,CAAC"}

package/out/api/index.js

@@ -1,34 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.wrapFetchApiMethods = void 0;
-var polyfill_response_1 = require("./polyfill-response");
-Object.defineProperty(exports, "transformResponse", { enumerable: true, get: function () { return polyfill_response_1.transformResponse; } });
+exports.wrapFetchApiMethods = exports.wrapWithRouteUnwrapper = exports.wrapRequestProduct = exports.wrapRequestGraph = void 0;
 const safeUrl_1 = require("../safeUrl");
 const wrapRequestGraph = (requestGraphApi) => (query, variables, headers = {}) => requestGraphApi('/graphql', {
     method: 'POST',
     headers: Object.assign(Object.assign({}, headers), { 'Content-Type': 'application/json' }),
     body: JSON.stringify(Object.assign({ query }, (variables ? { variables } : {})))
 });
+exports.wrapRequestGraph = wrapRequestGraph;
 const wrapRequestProduct = (requestProduct) => (path, init) => {
-    const safeUrl = safeUrl_1.requireSafeUrl(path);
+    const safeUrl = (0, safeUrl_1.requireSafeUrl)(path);
     return requestProduct(safeUrl.value, init);
 };
+exports.wrapRequestProduct = wrapRequestProduct;
 const wrapWithRouteUnwrapper = (fetch) => (path, init) => {
-    const stringPath = safeUrl_1.isRoute(path) ? path.value : path;
+    const stringPath = (0, safeUrl_1.isRoute)(path) ? path.value : path;
     return fetch(stringPath, init);
 };
-exports.wrapFetchApiMethods = (api, wrapFetch) => {
+exports.wrapWithRouteUnwrapper = wrapWithRouteUnwrapper;
+const wrapFetchApiMethods = (api, wrapFetch) => {
     return {
-        fetch: wrapWithRouteUnwrapper(wrapFetch(api.fetch)),
-        requestJira: wrapRequestProduct(wrapFetch(api.requestJira)),
-        requestConfluence: wrapRequestProduct(wrapFetch(api.requestConfluence)),
+        fetch: (0, exports.wrapWithRouteUnwrapper)(wrapFetch(api.fetch)),
+        requestJira: (0, exports.wrapRequestProduct)(wrapFetch(api.requestJira)),
+        requestConfluence: (0, exports.wrapRequestProduct)(wrapFetch(api.requestConfluence)),
         asUser: () => ({
-            requestJira: wrapRequestProduct(wrapFetch(api.asUser().requestJira)),
-            requestConfluence: wrapRequestProduct(wrapFetch(api.asUser().requestConfluence)),
-            requestGraph: wrapRequestGraph(wrapFetch(api.asUser().requestGraph)),
+            requestJira: (0, exports.wrapRequestProduct)(wrapFetch(api.asUser().requestJira)),
+            requestConfluence: (0, exports.wrapRequestProduct)(wrapFetch(api.asUser().requestConfluence)),
+            requestGraph: (0, exports.wrapRequestGraph)(wrapFetch(api.asUser().requestGraph)),
             withProvider: (provider, remoteName, tokenId) => {
                 const { hasCredentials, requestCredentials, listCredentials, fetch: withProviderFetch } = api.asUser().withProvider(provider, remoteName, tokenId);
-                const wrappedRequestRemote = wrapWithRouteUnwrapper(wrapFetch(withProviderFetch));
+                const wrappedRequestRemote = (0, exports.wrapWithRouteUnwrapper)(wrapFetch(withProviderFetch));
                 return {
                     hasCredentials,
                     requestCredentials,
@@ -38,9 +39,10 @@ exports.wrapFetchApiMethods = (api, wrapFetch) => {
             }
         }),
         asApp: () => ({
-            requestJira: wrapRequestProduct(wrapFetch(api.asApp().requestJira)),
-            requestConfluence: wrapRequestProduct(wrapFetch(api.asApp().requestConfluence)),
-            requestGraph: wrapRequestGraph(wrapFetch(api.asApp().requestGraph))
+            requestJira: (0, exports.wrapRequestProduct)(wrapFetch(api.asApp().requestJira)),
+            requestConfluence: (0, exports.wrapRequestProduct)(wrapFetch(api.asApp().requestConfluence)),
+            requestGraph: (0, exports.wrapRequestGraph)(wrapFetch(api.asApp().requestGraph))
         })
     };
 };
+exports.wrapFetchApiMethods = wrapFetchApiMethods;

package/out/api/polyfill-response.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"polyfill-response.d.ts","sourceRoot":"","sources":["../../src/api/polyfill-response.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,GAAG,CAAC;AAEjC,eAAO,MAAM,iBAAiB,EAAE,YAM/B,CAAC"}
+{"version":3,"file":"polyfill-response.d.ts","sourceRoot":"","sources":["../../src/api/polyfill-response.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,MAAM,GAAG,CAAC;AAGjC,eAAO,MAAM,iBAAiB,EAAE,YAM/B,CAAC"}

package/out/api/polyfill-response.js

@@ -2,7 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.transformResponse = void 0;
 const node_fetch_1 = require("node-fetch");
-exports.transformResponse = (fetchApi) => async (url, init) => {
+const transformResponse = (fetchApi) => async (url, init) => {
     const response = await fetchApi(url, init);
     return Object.assign(Object.assign({}, response), { headers: new node_fetch_1.Headers(response.headers) });
 };
+exports.transformResponse = transformResponse;

package/out/authorization/index.d.ts

@@ -1,7 +1,7 @@
 export declare const authorize: () => {
-    readonly onJira: (projectPermissionsInput: import("@forge/auth/out/jira").ProjectPermission[]) => Promise<import("@forge/auth/out/jira").ProjectPermissionResponse[]>;
-    readonly onJiraProject: (projects: string | number | (string | number)[]) => Record<string, import("@forge/auth/out/types").PermissionCheck>;
-    readonly onJiraIssue: (issues: string | number | (string | number)[]) => Record<string, import("@forge/auth/out/types").PermissionCheck>;
-    readonly onConfluenceContent: (contentId: string | number) => Record<string, import("@forge/auth/out/types").PermissionCheck>;
+    readonly onJira: (projectPermissionsInput: import("packages/forge-auth/out/jira").ProjectPermission[]) => Promise<import("packages/forge-auth/out/jira").ProjectPermissionResponse[]>;
+    readonly onJiraProject: (projects: import("packages/forge-auth/out/jira").Id | import("packages/forge-auth/out/jira").Id[]) => Record<string, import("packages/forge-auth/out/types").PermissionCheck>;
+    readonly onJiraIssue: (issues: import("packages/forge-auth/out/jira").Id | import("packages/forge-auth/out/jira").Id[]) => Record<string, import("packages/forge-auth/out/types").PermissionCheck>;
+    readonly onConfluenceContent: (contentId: string | number) => Record<string, import("packages/forge-auth/out/types").PermissionCheck>;
 };
 //# sourceMappingURL=index.d.ts.map

package/out/authorization/index.js

@@ -3,15 +3,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.authorize = void 0;
 const auth_1 = require("@forge/auth");
 const api = global.api;
-exports.authorize = () => {
+const authorize = () => {
     if (!process.env.__CURRENT_USER_ACCOUNT_ID)
         throw new Error(`Couldn’t find the accountId of the invoking user. This API can only be used inside user-invoked modules.`);
     const accountId = process.env.__CURRENT_USER_ACCOUNT_ID;
-    return Object.assign(Object.assign({}, auth_1.authorizeConfluenceWithFetch(async (path, opts) => {
+    return Object.assign(Object.assign({}, (0, auth_1.authorizeConfluenceWithFetch)(async (path, opts) => {
         const res = await api.asUser().requestConfluence(path, opts);
         return res.json();
-    }, accountId)), auth_1.authorizeJiraWithFetch(async (path, opts) => {
+    }, accountId)), (0, auth_1.authorizeJiraWithFetch)(async (path, opts) => {
         const res = await api.asUser().requestJira(path, opts);
         return res.json();
     }, accountId));
 };
+exports.authorize = authorize;

package/out/index.d.ts.map

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

package/out/index.js

@@ -1,14 +1,15 @@
 "use strict";
+var _a, _b, _c, _d;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.webTrigger = exports.properties = exports.storage = exports.store = exports.requestConfluence = exports.requestJira = exports.fetch = exports.authorize = exports.asApp = exports.asUser = exports.privacy = void 0;
+exports.assumeTrustedRoute = exports.route = exports.startsWith = exports.webTrigger = exports.properties = exports.storage = exports.store = exports.requestConfluence = exports.requestJira = exports.fetch = exports.authorize = exports.asApp = exports.asUser = exports.privacy = void 0;
 const storage_1 = require("@forge/storage");
-const api_1 = require("./api");
 const authorization_1 = require("./authorization");
 Object.defineProperty(exports, "authorize", { enumerable: true, get: function () { return authorization_1.authorize; } });
 const properties_1 = require("./properties");
 const privacy_1 = require("./privacy");
 const webTrigger_1 = require("./webTrigger");
 Object.defineProperty(exports, "webTrigger", { enumerable: true, get: function () { return webTrigger_1.webTrigger; } });
+const fetch_1 = require("./api/fetch");
 function withDeprecatedMessage(method, message) {
     const wrappedMethod = (...args) => {
         console.warn(message);
@@ -16,16 +17,16 @@ function withDeprecatedMessage(method, message) {
     };
     return wrappedMethod;
 }
-const FetchAPI = api_1.wrapFetchApiMethods(global.api, api_1.transformResponse);
-const asUser = FetchAPI.asUser;
+const fetchAPI = (_a = (0, fetch_1.getSandboxRuntimeAPI)()) !== null && _a !== void 0 ? _a : (0, fetch_1.getNodeRuntimeAPI)();
+const asUser = fetchAPI.asUser;
 exports.asUser = asUser;
-const asApp = FetchAPI.asApp;
+const asApp = fetchAPI.asApp;
 exports.asApp = asApp;
-const fetch = FetchAPI.fetch;
+const fetch = fetchAPI.fetch;
 exports.fetch = fetch;
-const requestJira = FetchAPI.requestJira;
+const requestJira = fetchAPI.requestJira;
 exports.requestJira = requestJira;
-const requestConfluence = FetchAPI.requestConfluence;
+const requestConfluence = fetchAPI.requestConfluence;
 exports.requestConfluence = requestConfluence;
 const deprecatedPropertiesApi = Object.entries(properties_1.propertiesApi)
     .map(([name, method]) => {
@@ -37,13 +38,13 @@ const deprecatedPropertiesApi = Object.entries(properties_1.propertiesApi)
     .reduce((acc, next) => Object.assign(acc, next), {});
 const store = deprecatedPropertiesApi;
 exports.store = store;
-const storage = storage_1.getStorageInstanceWithQuery(new storage_1.GlobalStorage(global.api.__getAppAri, global.api.asApp().__requestAtlassian));
+const storage = (0, storage_1.getStorageInstanceWithQuery)(new storage_1.GlobalStorage((_b = global.api) === null || _b === void 0 ? void 0 : _b.__getAppAri, (_c = global.api) === null || _c === void 0 ? void 0 : _c.asApp().__requestAtlassian));
 exports.storage = storage;
 const properties = properties_1.propertiesApi;
 exports.properties = properties;
-const API = Object.assign(Object.assign({}, FetchAPI), { store: Object.assign({}, store) });
+const API = Object.assign(Object.assign({}, fetchAPI), { store: Object.assign({}, store) });
 exports.privacy = {
-    reportPersonalData: privacy_1.createReportPersonalData(global.api.asApp().__requestAtlassian)
+    reportPersonalData: (0, privacy_1.createReportPersonalData)((_d = global.api) === null || _d === void 0 ? void 0 : _d.asApp().__requestAtlassian)
 };
 exports.default = API;
 var storage_2 = require("@forge/storage");

package/out/privacy/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/privacy/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,KAAK,CAAC;AAElC,eAAO,MAAM,GAAG,yBAAyB,CAAC;AAC1C,eAAO,MAAM,KAAK,KAAK,CAAC;AAExB,oBAAY,OAAO,GAAG;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AAC/D,oBAAY,aAAa,GAAG;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAA;CAAE,CAAC;AAEhF,eAAO,MAAM,wBAAwB,2BACX,MAAM,QAAQ,WAAW,KAAK,OAAO,CAAC,WAAW,CAAC,gBAEnC,OAAO,EAAE,KAAG,OAAO,CAAC,aAAa,EAAE,CAqB3E,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/privacy/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,WAAW,EAAE,MAAM,KAAK,CAAC;AAElC,eAAO,MAAM,GAAG,yBAAyB,CAAC;AAC1C,eAAO,MAAM,KAAK,KAAK,CAAC;AAExB,oBAAY,OAAO,GAAG;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,MAAM,CAAA;CAAE,CAAC;AAC/D,oBAAY,aAAa,GAAG;IAAE,SAAS,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,SAAS,GAAG,QAAQ,CAAA;CAAE,CAAC;AAEhF,eAAO,MAAM,wBAAwB,2BACX,MAAM,QAAQ,WAAW,KAAK,QAAQ,WAAW,CAAC,gBAEnC,OAAO,EAAE,KAAG,QAAQ,aAAa,EAAE,CAqB3E,CAAC"}

package/out/privacy/index.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createReportPersonalData = exports.LIMIT = exports.URL = void 0;
 exports.URL = '/app/report-accounts';
 exports.LIMIT = 90;
-exports.createReportPersonalData = (requestAtlassian) => {
+const createReportPersonalData = (requestAtlassian) => {
     return function fetchUpdates(accounts) {
         if (accounts.length === 0) {
             return Promise.resolve([]);
@@ -24,3 +24,4 @@ exports.createReportPersonalData = (requestAtlassian) => {
         return Promise.all([request, fetchUpdates(accounts.slice(exports.LIMIT))]).then(([first, second]) => first.concat(second));
     };
 };
+exports.createReportPersonalData = createReportPersonalData;

package/out/properties/confluence-page.js

@@ -5,7 +5,7 @@ const safeUrl_1 = require("../safeUrl");
 const confluence_versioned_storage_1 = require("./confluence-versioned-storage");
 class ConfluencePageStorage extends confluence_versioned_storage_1.ConfluenceVersionedStorage {
     constructor(pageId, apiClient) {
-        const storageApiPath = (key) => safeUrl_1.route `/wiki/rest/api/content/${pageId}/property/${key}`;
+        const storageApiPath = (key) => (0, safeUrl_1.route) `/wiki/rest/api/content/${pageId}/property/${key}`;
         super(storageApiPath, apiClient);
     }
     async set(key, value) {

package/out/properties/confluence-space.js

@@ -5,7 +5,7 @@ const safeUrl_1 = require("../safeUrl");
 const confluence_versioned_storage_1 = require("./confluence-versioned-storage");
 class ConfluenceSpaceStorage extends confluence_versioned_storage_1.ConfluenceVersionedStorage {
     constructor(spaceId, apiClient) {
-        const storageApiPath = (key) => safeUrl_1.route `/wiki/rest/api/space/${spaceId}/property/${key}`;
+        const storageApiPath = (key) => (0, safeUrl_1.route) `/wiki/rest/api/space/${spaceId}/property/${key}`;
         super(storageApiPath, apiClient);
     }
     async set(key, value) {

package/out/properties/index.js

@@ -9,15 +9,15 @@ const confluence_space_1 = require("./confluence-space");
 const sanitized_key_1 = require("./sanitized-key");
 const getPropertiesInstance = (adapter) => {
     const storage = {
-        get: (key) => adapter.get(sanitized_key_1.sanitizedKey(key)),
-        set: (key, value) => adapter.set(sanitized_key_1.sanitizedKey(key), value),
-        delete: (key) => adapter.delete(sanitized_key_1.sanitizedKey(key))
+        get: (key) => adapter.get((0, sanitized_key_1.sanitizedKey)(key)),
+        set: (key, value) => adapter.set((0, sanitized_key_1.sanitizedKey)(key), value),
+        delete: (key) => adapter.delete((0, sanitized_key_1.sanitizedKey)(key))
     };
     return storage;
 };
 exports.propertiesApi = {
-    onJiraIssue: (issueKey) => getPropertiesInstance(new jira_issue_1.JiraIssueStorage(sanitized_key_1.sanitizedKey(issueKey), index_1.asApp().requestJira)),
-    onJiraProject: (projectKey) => getPropertiesInstance(new jira_project_1.JiraProjectStorage(projectKey, index_1.asApp().requestJira)),
-    onConfluencePage: (pageId) => getPropertiesInstance(new confluence_page_1.ConfluencePageStorage(sanitized_key_1.sanitizedKey(pageId), index_1.asApp().requestConfluence)),
-    onConfluenceSpace: (spaceId) => getPropertiesInstance(new confluence_space_1.ConfluenceSpaceStorage(sanitized_key_1.sanitizedKey(spaceId), index_1.asApp().requestConfluence))
+    onJiraIssue: (issueKey) => getPropertiesInstance(new jira_issue_1.JiraIssueStorage((0, sanitized_key_1.sanitizedKey)(issueKey), (0, index_1.asApp)().requestJira)),
+    onJiraProject: (projectKey) => getPropertiesInstance(new jira_project_1.JiraProjectStorage(projectKey, (0, index_1.asApp)().requestJira)),
+    onConfluencePage: (pageId) => getPropertiesInstance(new confluence_page_1.ConfluencePageStorage((0, sanitized_key_1.sanitizedKey)(pageId), (0, index_1.asApp)().requestConfluence)),
+    onConfluenceSpace: (spaceId) => getPropertiesInstance(new confluence_space_1.ConfluenceSpaceStorage((0, sanitized_key_1.sanitizedKey)(spaceId), (0, index_1.asApp)().requestConfluence))
 };

package/out/properties/jira-issue.js

@@ -5,7 +5,7 @@ const product_scoped_storage_1 = require("./product-scoped-storage");
 const safeUrl_1 = require("../safeUrl");
 class JiraIssueStorage extends product_scoped_storage_1.ProductScopedStorage {
     constructor(issueKey, apiClient) {
-        const storageApiPath = (key) => safeUrl_1.route `/rest/api/3/issue/${issueKey}/properties/${key}`;
+        const storageApiPath = (key) => (0, safeUrl_1.route) `/rest/api/3/issue/${issueKey}/properties/${key}`;
         super(storageApiPath, apiClient);
     }
 }

package/out/properties/jira-project.js

@@ -5,7 +5,7 @@ const product_scoped_storage_1 = require("./product-scoped-storage");
 const safeUrl_1 = require("../safeUrl");
 class JiraProjectStorage extends product_scoped_storage_1.ProductScopedStorage {
     constructor(projectKey, apiClient) {
-        const storageApiPath = (key) => safeUrl_1.route `/rest/api/3/project/${projectKey}/properties/${key}`;
+        const storageApiPath = (key) => (0, safeUrl_1.route) `/rest/api/3/project/${projectKey}/properties/${key}`;
         super(storageApiPath, apiClient);
     }
 }

package/out/properties/product-scoped-storage.d.ts

@@ -9,7 +9,7 @@ export declare class ProductScopedStorage implements StorageAdapter {
     set(key: string, value: any): Promise<void>;
     delete(key: string): Promise<void>;
     protected buildSetRequestOptions(requestBody: any, requestMethod: 'PUT' | 'POST'): {
-        method: "POST" | "PUT";
+        method: "PUT" | "POST";
         body: string;
         headers: {
             'content-type': string;

package/out/properties/sanitized-key.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sanitizedKey = void 0;
-exports.sanitizedKey = (input) => {
+const sanitizedKey = (input) => {
     const regex = /^(~)?[A-Za-z0-9_\-\.]+$/;
     if (!regex.test(input)) {
         throw new Error('Invalid context/property key');
     }
     return input;
 };
+exports.sanitizedKey = sanitizedKey;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/api",
-  "version": "2.7.0-next.0",
+  "version": "2.8.0-next.0",
   "description": "Forge API methods",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -16,7 +16,7 @@
   },
   "dependencies": {
     "@forge/auth": "^0.0.1",
-    "@forge/storage": "^1.3.0-next.0",
+    "@forge/storage": "^1.3.0",
     "@types/node-fetch": "^2.5.7",
     "node-fetch": "2.6.1"
   }