@forge/cache 0.7.5-next.0 → 0.7.5-next.1

package/out/__test__/cache.test.js

@@ -56,7 +56,6 @@ describe('createFetch', () => {
         await expect((0, cache_1.createFetchRmsRuntimeV2)()).rejects.toThrowError(new Error('RMS config not available.'));
     });
     it('creates a fetch that adds the right headers and url', async () => {
-        var _a;
         global['__forge_runtime__'] = {
             proxy: {
                 token: 'token',
@@ -73,10 +72,10 @@ describe('createFetch', () => {
         };
         const fetch = (0, cache_1.createFetchRmsRuntimeV2)();
         await fetch('path');
-        const [absoluteUrl, options] = (_a = fetchMock.mock.lastCall) !== null && _a !== void 0 ? _a : ['', {}];
+        const [absoluteUrl, options] = fetchMock.mock.lastCall ?? ['', {}];
         expect(absoluteUrl.toString()).toEqual('https://rms/path');
-        expect((options === null || options === void 0 ? void 0 : options.agent)['passthrough']['keepAlive']).toBeTruthy();
-        expect(options === null || options === void 0 ? void 0 : options.headers).toMatchObject({
+        expect((options?.agent)['passthrough']['keepAlive']).toBeTruthy();
+        expect(options?.headers).toMatchObject({
             Authorization: 'Bearer token',
             Host: 'rockmelon-storage.dev.atl-paas.net',
             'x-b3-traceid': 'trace-id-test',

package/out/cache.js

@@ -19,6 +19,7 @@ async function getResponseBody(response) {
 }
 exports.getResponseBody = getResponseBody;
 class Cache {
+    client;
     constructor(client) {
         this.client = client;
     }
@@ -32,11 +33,11 @@ class Cache {
         };
     }
     async set(key, value, opt) {
-        const response = await this.client('rms/store/set', this.buildRequest(Object.assign({ key, value }, opt)));
+        const response = await this.client('rms/store/set', this.buildRequest({ key, value, ...opt }));
         await getResponseBody(response);
     }
     async setIfNotExists(key, value, opt) {
-        const response = await this.client('rms/store/setnx', this.buildRequest(Object.assign({ key, value }, opt)));
+        const response = await this.client('rms/store/setnx', this.buildRequest({ key, value, ...opt }));
         const { response: result } = await getResponseBody(response);
         return result;
     }
@@ -46,7 +47,7 @@ class Cache {
         return result;
     }
     async getAndSet(key, value, opt) {
-        const response = await this.client('rms/store/getset', this.buildRequest(Object.assign({ key, value }, opt)));
+        const response = await this.client('rms/store/getset', this.buildRequest({ key, value, ...opt }));
         const { response: result } = await getResponseBody(response);
         return result;
     }
@@ -88,26 +89,34 @@ class Cache {
 }
 exports.Cache = Cache;
 function getFetchRmsRuntimeV1() {
-    var _a;
-    return (_a = global.api) === null || _a === void 0 ? void 0 : _a.requestRmsStore;
+    return global.api?.requestRmsStore;
 }
 exports.getFetchRmsRuntimeV1 = getFetchRmsRuntimeV1;
 function createFetchRmsRuntimeV2() {
     const agent = new https_1.Agent({ keepAlive: true });
     return async function (path, options) {
         const { proxy, rms, tracing } = (0, api_1.__getRuntime)();
-        if (!(rms === null || rms === void 0 ? void 0 : rms.url) || !(rms === null || rms === void 0 ? void 0 : rms.host)) {
+        if (!rms?.url || !rms?.host) {
             throw new Error('RMS config not available.');
         }
         const rmsAgent = new String('FORGE_PRODUCT_REQUEST');
         rmsAgent['passthrough'] = agent;
-        return await (0, node_fetch_1.default)(new URL(path, 'https://rms/'), Object.assign(Object.assign({}, options), { agent: rmsAgent, headers: Object.assign(Object.assign({}, options === null || options === void 0 ? void 0 : options.headers), { Authorization: `Bearer ${proxy.token}`, Host: rms.host, 'x-b3-traceid': tracing.traceId, 'x-b3-spanid': tracing.spanId }) }));
+        return await (0, node_fetch_1.default)(new URL(path, 'https://rms/'), {
+            ...options,
+            agent: rmsAgent,
+            headers: {
+                ...options?.headers,
+                Authorization: `Bearer ${proxy.token}`,
+                Host: rms.host,
+                'x-b3-traceid': tracing.traceId,
+                'x-b3-spanid': tracing.spanId
+            }
+        });
     };
 }
 exports.createFetchRmsRuntimeV2 = createFetchRmsRuntimeV2;
 function connect() {
-    var _a;
-    const fetch = (_a = getFetchRmsRuntimeV1()) !== null && _a !== void 0 ? _a : createFetchRmsRuntimeV2();
+    const fetch = getFetchRmsRuntimeV1() ?? createFetchRmsRuntimeV2();
     return new Cache(fetch);
 }
 exports.connect = connect;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cache",
-  "version": "0.7.5-next.0",
+  "version": "0.7.5-next.1",
   "description": "Forge Cache methods",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -20,6 +20,6 @@
     "node-fetch": "2.7.0"
   },
   "dependencies": {
-    "@forge/api": "^3.4.1-next.0"
+    "@forge/api": "^3.5.0-next.1"
   }
 }