@forge/storage 0.0.0-experimental-819498d → 0.0.0-experimental-490cfcf

package/CHANGELOG.md

@@ -1,10 +1,54 @@
 # @forge/storage
 
-## 0.0.0-experimental-819498d
+## 0.0.0-experimental-490cfcf
 
 ### Minor Changes
 
-- 78effb2: Remove engines.node declaration
+- 21e392d: Added new filters for Early Access Program
+
+## 1.2.0-next.0
+
+### Minor Changes
+
+- 21e392d: Added new filters for Early Access Program
+
+## 1.1.0
+
+### Minor Changes
+
+- 0d7fe27: Support secret storage API
+
+## 1.1.0-next.0
+
+### Minor Changes
+
+- 0d7fe27: Support secret storage API
+
+## 1.0.5
+
+### Patch Changes
+
+- 0700578: Fix GraphQL query naming convention
+
+## 1.0.5-next.0
+
+### Patch Changes
+
+- 0700578: Fix GraphQL query naming convention
+
+## 1.0.4
+
+### Patch Changes
+
+- 5ff60ec: FRGE-273 Remove engines for storage and resolver
+
+## 1.0.4-next.0
+
+### Patch Changes
+
+- 5ff60ec: FRGE-273 Remove engines for storage and resolver
+
+## 1.0.3
 
 ### Patch Changes
 

package/out/__test__/global-storage.test.js

@@ -56,7 +56,8 @@ describe('GlobalStorage', () => {
             const returnedValue = await globalStorage.get('testKey');
             verifyApiClientCalledWith(apiClientMock, {
                 contextAri,
-                key: 'testKey'
+                key: 'testKey',
+                encrypted: false
             });
             expect(returnedValue).toEqual('testValue');
         });
@@ -72,7 +73,8 @@ describe('GlobalStorage', () => {
             const returnedValue = await globalStorage.get('testKey');
             verifyApiClientCalledWith(apiClientMock, {
                 contextAri,
-                key: 'testKey'
+                key: 'testKey',
+                encrypted: false
             });
             expect(returnedValue).toEqual(undefined);
         });
@@ -88,7 +90,8 @@ describe('GlobalStorage', () => {
             const returnedValue = await globalStorage.get('testKey');
             verifyApiClientCalledWith(apiClientMock, {
                 contextAri,
-                key: 'testKey'
+                key: 'testKey',
+                encrypted: false
             });
             expect(returnedValue).toEqual(0);
         });
@@ -104,7 +107,8 @@ describe('GlobalStorage', () => {
             const returnedValue = await globalStorage.get('testKey');
             verifyApiClientCalledWith(apiClientMock, {
                 contextAri,
-                key: 'testKey'
+                key: 'testKey',
+                encrypted: false
             });
             expect(returnedValue).toEqual('');
         });
@@ -139,6 +143,25 @@ describe('GlobalStorage', () => {
             await expect(response).rejects.toThrow(errors_1.APIError.forUnexpected('Response text was not a valid JSON: test'));
         });
     });
+    describe('get secret', () => {
+        it('should call the storage API, passing the provided key and returning the stored value', async () => {
+            const apiClientMock = getApiClientMock({
+                data: {
+                    appStoredEntity: {
+                        value: 'testValue'
+                    }
+                }
+            });
+            const globalStorage = getStorage(apiClientMock);
+            const returnedValue = await globalStorage.getSecret('testKey');
+            verifyApiClientCalledWith(apiClientMock, {
+                contextAri,
+                key: 'testKey',
+                encrypted: true
+            });
+            expect(returnedValue).toEqual('testValue');
+        });
+    });
     describe('set', () => {
         it('should call the storage API, passing the provided key and value', async () => {
             const apiClientMock = getApiClientMock({
@@ -156,7 +179,8 @@ describe('GlobalStorage', () => {
                 input: {
                     contextAri,
                     key: 'testKey',
-                    value: 'testValue'
+                    value: 'testValue',
+                    encrypted: false
                 }
             });
         });
@@ -199,7 +223,31 @@ describe('GlobalStorage', () => {
                 input: {
                     contextAri,
                     key: 'testKey',
-                    value: 'testValue'
+                    value: 'testValue',
+                    encrypted: false
+                }
+            });
+        });
+    });
+    describe('set secret', () => {
+        it('should call the storage API, passing the provided key and value', async () => {
+            const apiClientMock = getApiClientMock({
+                data: {
+                    appStorage: {
+                        setAppStoredEntity: {
+                            success: true
+                        }
+                    }
+                }
+            });
+            const globalStorage = getStorage(apiClientMock);
+            await globalStorage.setSecret('testKey', 'testValue');
+            verifyApiClientCalledWith(apiClientMock, {
+                input: {
+                    contextAri,
+                    key: 'testKey',
+                    value: 'testValue',
+                    encrypted: true
                 }
             });
         });
@@ -220,7 +268,8 @@ describe('GlobalStorage', () => {
             verifyApiClientCalledWith(apiClientMock, {
                 input: {
                     contextAri,
-                    key: 'testKey'
+                    key: 'testKey',
+                    encrypted: false
                 }
             });
         });
@@ -248,6 +297,28 @@ describe('GlobalStorage', () => {
             await expect(response).rejects.toThrow(errors_1.APIError.forStatus(400));
         });
     });
+    describe('delete secret', () => {
+        it('should call the storage API, passing the provided key', async () => {
+            const apiClientMock = getApiClientMock({
+                data: {
+                    appStorage: {
+                        deleteAppStoredEntity: {
+                            success: true
+                        }
+                    }
+                }
+            });
+            const globalStorage = getStorage(apiClientMock);
+            await globalStorage.deleteSecret('testKey');
+            verifyApiClientCalledWith(apiClientMock, {
+                input: {
+                    contextAri,
+                    key: 'testKey',
+                    encrypted: true
+                }
+            });
+        });
+    });
     describe('list', () => {
         it('should call the storage API with the provided parameters', async () => {
             const apiClientMock = getApiClientMock({

package/out/__test__/list-api.test.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const query_api_1 = require("../query-api");
 const conditions_1 = require("../conditions");
+const conditions_2 = require("../eap/conditions");
 describe('DefaultQueryBuilder', () => {
     function newGlobalStorage() {
         return {
@@ -48,6 +49,45 @@ describe('DefaultQueryBuilder', () => {
             cursor: 'cursor'
         }));
     });
+    it('should allow specifying a "starts with" condition', async () => {
+        const globalStorage = newGlobalStorage();
+        await new query_api_1.DefaultQueryBuilder(globalStorage).where('key', conditions_1.startsWith('test')).getMany();
+        expect(globalStorage.list).toHaveBeenCalledWith(expect.objectContaining({
+            where: [
+                {
+                    field: 'key',
+                    condition: 'STARTS_WITH',
+                    value: 'test'
+                }
+            ]
+        }));
+    });
+    it('should allow specifying a "not equal to" condition', async () => {
+        const globalStorage = newGlobalStorage();
+        await new query_api_1.DefaultQueryBuilder(globalStorage).where('key', conditions_2.notEqualTo(['test', 'test2'])).getMany();
+        expect(globalStorage.list).toHaveBeenCalledWith(expect.objectContaining({
+            where: [
+                {
+                    field: 'key',
+                    condition: 'NOT_EQUAL_TO',
+                    value: ['test', 'test2']
+                }
+            ]
+        }));
+    });
+    it('should allow specifying an "is in" condition', async () => {
+        const globalStorage = newGlobalStorage();
+        await new query_api_1.DefaultQueryBuilder(globalStorage).where('key', conditions_2.isIn(['test', 'test2'])).getMany();
+        expect(globalStorage.list).toHaveBeenCalledWith(expect.objectContaining({
+            where: [
+                {
+                    field: 'key',
+                    condition: 'IN',
+                    value: ['test', 'test2']
+                }
+            ]
+        }));
+    });
     it('should allow specifying a condition', async () => {
         const globalStorage = newGlobalStorage();
         await new query_api_1.DefaultQueryBuilder(globalStorage).where('key', conditions_1.startsWith('test')).getMany();

package/out/eap/conditions.d.ts

@@ -0,0 +1,4 @@
+import { Predicate } from '../storage-adapter';
+export declare function notEqualTo(value: string[]): Predicate;
+export declare function isIn(values: string[]): Predicate;
+//# sourceMappingURL=conditions.d.ts.map

package/out/eap/conditions.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"conditions.d.ts","sourceRoot":"","sources":["../../src/eap/conditions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAC;AAC/C,wBAAgB,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,GAAG,SAAS,CAKrD;AAED,wBAAgB,IAAI,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,SAAS,CAKhD"}

package/out/eap/conditions.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isIn = exports.notEqualTo = void 0;
+function notEqualTo(value) {
+    return {
+        condition: 'NOT_EQUAL_TO',
+        value
+    };
+}
+exports.notEqualTo = notEqualTo;
+function isIn(values) {
+    return {
+        condition: 'IN',
+        value: values
+    };
+}
+exports.isIn = isIn;

package/out/eap/index.d.ts

@@ -0,0 +1,2 @@
+export * from './conditions';
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/eap/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC"}

package/out/eap/index.js

@@ -0,0 +1,4 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+tslib_1.__exportStar(require("./conditions"), exports);

package/out/global-storage.d.ts

@@ -15,9 +15,13 @@ export declare class GlobalStorage implements StorageAdapter {
     constructor(getAppContextAri: (() => string) | string, apiClient: FetchMethod);
     private doGetAppContextAri;
     get(key: string): Promise<any>;
+    getSecret(key: string): Promise<any>;
     list(options: ListOptions): Promise<ListResults>;
     set(key: string, value: any): Promise<void>;
+    setSecret(key: string, value: any): Promise<void>;
     delete(key: string): Promise<void>;
+    deleteSecret(key: string): Promise<void>;
+    private getInternal;
     private buildRequest;
     private query;
     private mutation;

package/out/global-storage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"global-storage.d.ts","sourceRoot":"","sources":["../src/global-storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,WAAW,EAAE,MAAM,SAAS,CAAC;AAGnD,OAAO,EAA8C,WAAW,EAAuB,MAAM,WAAW,CAAC;AACzG,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,UAAU,WAAW;IACnB,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,GAAG,CAAA;KAAE,EAAE,CAAC;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AA4CD,qBAAa,aAAc,YAAW,cAAc;IAEtC,OAAO,CAAC,gBAAgB;IAA2B,OAAO,CAAC,SAAS;IADhF,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA6B;gBAClC,gBAAgB,EAAE,CAAC,MAAM,MAAM,CAAC,GAAG,MAAM,EAAU,SAAS,EAAE,WAAW;IAE7F,OAAO,CAAC,kBAAkB;IAIpB,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAU9B,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAqBhD,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAK3C,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKxC,OAAO,CAAC,YAAY;YAUN,KAAK;YAML,QAAQ;CAiBvB"}
+{"version":3,"file":"global-storage.d.ts","sourceRoot":"","sources":["../src/global-storage.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,WAAW,EAAE,MAAM,SAAS,CAAC;AAGnD,OAAO,EAA8C,WAAW,EAAuB,MAAM,WAAW,CAAC;AACzG,OAAO,EAAE,cAAc,EAAE,MAAM,mBAAmB,CAAC;AAEnD,UAAU,WAAW;IACnB,OAAO,EAAE;QAAE,GAAG,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,GAAG,CAAA;KAAE,EAAE,CAAC;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AA4CD,qBAAa,aAAc,YAAW,cAAc;IAEtC,OAAO,CAAC,gBAAgB;IAA2B,OAAO,CAAC,SAAS;IADhF,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAA6B;gBAClC,gBAAgB,EAAE,CAAC,MAAM,MAAM,CAAC,GAAG,MAAM,EAAU,SAAS,EAAE,WAAW;IAE7F,OAAO,CAAC,kBAAkB;IAIpB,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAI9B,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAIpC,IAAI,CAAC,OAAO,EAAE,WAAW,GAAG,OAAO,CAAC,WAAW,CAAC;IAqBhD,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAK3C,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC;IAKjD,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAKlC,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAKhC,WAAW;IAUzB,OAAO,CAAC,YAAY;YAUN,KAAK;YAML,QAAQ;CAiBvB"}

package/out/global-storage.js

@@ -34,9 +34,10 @@ class GlobalStorage {
         return typeof this.getAppContextAri === 'function' ? this.getAppContextAri() : this.getAppContextAri;
     }
     async get(key) {
-        const requestBody = queries_1.getQuery(this.doGetAppContextAri(), key);
-        const { appStoredEntity: { value } } = await this.query(requestBody);
-        return value !== null && value !== void 0 ? value : undefined;
+        return this.getInternal(key, false);
+    }
+    async getSecret(key) {
+        return this.getInternal(key, true);
     }
     async list(options) {
         const requestBody = process.env.IS_CLEANUP_FUNCTION === 'true'
@@ -54,13 +55,26 @@ class GlobalStorage {
         };
     }
     async set(key, value) {
-        const requestBody = queries_1.setQuery(this.doGetAppContextAri(), key, value);
+        const requestBody = queries_1.setQuery(this.doGetAppContextAri(), key, value, false);
+        await this.mutation(requestBody, 'setAppStoredEntity');
+    }
+    async setSecret(key, value) {
+        const requestBody = queries_1.setQuery(this.doGetAppContextAri(), key, value, true);
         await this.mutation(requestBody, 'setAppStoredEntity');
     }
     async delete(key) {
-        const requestBody = queries_1.deleteQuery(this.doGetAppContextAri(), key);
+        const requestBody = queries_1.deleteQuery(this.doGetAppContextAri(), key, false);
         await this.mutation(requestBody, 'deleteAppStoredEntity');
     }
+    async deleteSecret(key) {
+        const requestBody = queries_1.deleteQuery(this.doGetAppContextAri(), key, true);
+        await this.mutation(requestBody, 'deleteAppStoredEntity');
+    }
+    async getInternal(key, encrypted) {
+        const requestBody = queries_1.getQuery(this.doGetAppContextAri(), key, encrypted);
+        const { appStoredEntity: { value } } = await this.query(requestBody);
+        return value !== null && value !== void 0 ? value : undefined;
+    }
     buildRequest(requestBody) {
         return {
             method: 'POST',

package/out/index.d.ts

@@ -7,6 +7,9 @@ export declare const getStorageInstanceWithQuery: (adapter: GlobalStorage) => {
     get: (key: string) => Promise<any>;
     set: (key: string, value: any) => Promise<void>;
     delete: (key: string) => Promise<void>;
+    getSecret: (key: string) => Promise<any>;
+    setSecret: (key: string, value: any) => Promise<void>;
+    deleteSecret: (key: string) => Promise<void>;
     query: () => DefaultQueryBuilder;
 };
 export { GlobalStorage } from './global-storage';

package/out/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD,oBAAY,WAAW,GAAG,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,aAAa,GAAG,IAAI,GAAG,QAAQ,GAAG,YAAY,CAAC,CAAC;AAC3G,oBAAY,WAAW,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;AAEnF,eAAO,MAAM,2BAA2B,YAAa,aAAa;;;;;CAOjE,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE5G,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAEnD,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAElD,oBAAY,WAAW,GAAG,IAAI,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,GAAG,aAAa,GAAG,IAAI,GAAG,QAAQ,GAAG,YAAY,CAAC,CAAC;AAC3G,oBAAY,WAAW,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,KAAK,OAAO,CAAC,WAAW,CAAC,CAAC;AAEnF,eAAO,MAAM,2BAA2B,YAAa,aAAa;;;;;;;;CAUjE,CAAC;AAEF,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AAEjD,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAE1C,OAAO,EAAE,YAAY,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAE5G,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC"}

package/out/index.js

@@ -7,6 +7,9 @@ exports.getStorageInstanceWithQuery = (adapter) => {
         get: adapter.get.bind(adapter),
         set: adapter.set.bind(adapter),
         delete: adapter.delete.bind(adapter),
+        getSecret: adapter.getSecret.bind(adapter),
+        setSecret: adapter.setSecret.bind(adapter),
+        deleteSecret: adapter.deleteSecret.bind(adapter),
         query: () => new query_api_1.DefaultQueryBuilder(adapter)
     };
 };

package/out/queries.d.ts

@@ -1,15 +1,27 @@
-export declare const getQuery: (contextAri: string, key: string) => {
+export declare const getQuery: (contextAri: string, key: string, encrypted: boolean) => {
     query: string;
     variables: {
         contextAri: string;
         key: string;
+        encrypted: boolean;
     };
 };
-export interface WhereClause {
+export interface StartsWithClause {
     field: string;
     condition: 'STARTS_WITH';
     value: string;
 }
+export interface NotEqualToClause {
+    field: string;
+    condition: 'NOT_EQUAL_TO';
+    value: string[];
+}
+export interface InClause {
+    field: string;
+    condition: 'IN';
+    value: string[];
+}
+export declare type WhereClause = StartsWithClause | NotEqualToClause | InClause;
 export interface ListOptions {
     where?: Array<WhereClause>;
     cursor?: string;
@@ -33,22 +45,24 @@ export declare const listQueryForCleanup: (contextAri: string, options: ListOpti
         limit: number | null;
     };
 };
-export declare const setQuery: (contextAri: string, key: string, value: any) => {
+export declare const setQuery: (contextAri: string, key: string, value: any, encrypted: boolean) => {
     query: string;
     variables: {
         input: {
             contextAri: string;
             key: string;
             value: any;
+            encrypted: boolean;
         };
     };
 };
-export declare const deleteQuery: (contextAri: string, key: string) => {
+export declare const deleteQuery: (contextAri: string, key: string, encrypted: boolean) => {
     query: string;
     variables: {
         input: {
             contextAri: string;
             key: string;
+            encrypted: boolean;
         };
     };
 };

package/out/queries.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../src/queries.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,QAAQ,eAAgB,MAAM,OAAO,MAAM;;;;;;CAatD,CAAC;AAEH,MAAM,WAAW,WAAW;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,aAAa,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,SAAS,eAAgB,MAAM,WAAW,WAAW;;;;;;;;CAuBhE,CAAC;AAEH,eAAO,MAAM,mBAAmB,eAAgB,MAAM,WAAW,WAAW;;;;;;;;CAuB1E,CAAC;AAEH,eAAO,MAAM,QAAQ,eAAgB,MAAM,OAAO,MAAM,SAAS,GAAG;;;;;;;;;CAwBlE,CAAC;AAEH,eAAO,MAAM,WAAW,eAAgB,MAAM,OAAO,MAAM;;;;;;;;CAuBzD,CAAC"}
+{"version":3,"file":"queries.d.ts","sourceRoot":"","sources":["../src/queries.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,QAAQ,eAAgB,MAAM,OAAO,MAAM,aAAa,OAAO;;;;;;;CAc1E,CAAC;AAEH,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,aAAa,CAAC;IACzB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,gBAAgB;IAC/B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,cAAc,CAAC;IAC1B,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,MAAM,WAAW,QAAQ;IACvB,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,IAAI,CAAC;IAChB,KAAK,EAAE,MAAM,EAAE,CAAC;CACjB;AAED,oBAAY,WAAW,GAAG,gBAAgB,GAAG,gBAAgB,GAAG,QAAQ,CAAC;AAEzE,MAAM,WAAW,WAAW;IAC1B,KAAK,CAAC,EAAE,KAAK,CAAC,WAAW,CAAC,CAAC;IAC3B,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED,eAAO,MAAM,SAAS,eAAgB,MAAM,WAAW,WAAW;;;;;;;;CAuBhE,CAAC;AAEH,eAAO,MAAM,mBAAmB,eAAgB,MAAM,WAAW,WAAW;;;;;;;;CAuB1E,CAAC;AAEH,eAAO,MAAM,QAAQ,eAAgB,MAAM,OAAO,MAAM,SAAS,GAAG,aAAa,OAAO;;;;;;;;;;CAyBtF,CAAC;AAEH,eAAO,MAAM,WAAW,eAAgB,MAAM,OAAO,MAAM,aAAa,OAAO;;;;;;;;;CAwB7E,CAAC"}

package/out/queries.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteQuery = exports.setQuery = exports.listQueryForCleanup = exports.listQuery = exports.getQuery = void 0;
-exports.getQuery = (contextAri, key) => ({
+exports.getQuery = (contextAri, key, encrypted) => ({
     query: `
-    query Get($contextAri: ID!, $key: ID!) {
-      appStoredEntity(contextAri: $contextAri, key: $key) {
+    query forge_app_getApplicationStorageEntity($contextAri: ID!, $key: ID!, $encrypted: Boolean!) {
+      appStoredEntity(contextAri: $contextAri, key: $key, encrypted: $encrypted) {
         key
         value
       }
@@ -12,14 +12,15 @@ exports.getQuery = (contextAri, key) => ({
   `,
     variables: {
         contextAri,
-        key
+        key,
+        encrypted
     }
 });
 exports.listQuery = (contextAri, options) => {
     var _a, _b, _c;
     return ({
         query: `
-    query List($contextAri: ID!, $where: [AppStoredEntityFilter!], $cursor: String, $limit: Int) {
+    query forge_app_getApplicationStorageEntities($contextAri: ID!, $where: [AppStoredEntityFilter!], $cursor: String, $limit: Int) {
       appStoredEntities(contextAri: $contextAri, where: $where, after: $cursor, first: $limit) {
         edges {
           node {
@@ -44,7 +45,7 @@ exports.listQueryForCleanup = (contextAri, options) => {
     var _a, _b, _c;
     return ({
         query: `
-    query List($contextAri: ID!, $where: [AppStoredEntityFilter!], $cursor: String, $limit: Int) {
+    query forge_app_getApplicationStorageEntitiesForCleanup($contextAri: ID!, $where: [AppStoredEntityFilter!], $cursor: String, $limit: Int) {
       appStoredEntitiesForCleanup(contextAri: $contextAri, where: $where, after: $cursor, first: $limit) {
         edges {
           node {
@@ -65,9 +66,9 @@ exports.listQueryForCleanup = (contextAri, options) => {
         }
     });
 };
-exports.setQuery = (contextAri, key, value) => ({
+exports.setQuery = (contextAri, key, value, encrypted) => ({
     query: `
-    mutation Set($input: SetAppStoredEntityMutationInput!) {
+    mutation forge_app_setApplicationStorageEntity($input: SetAppStoredEntityMutationInput!) {
       appStorage{
         setAppStoredEntity(input: $input) {
           success
@@ -86,13 +87,14 @@ exports.setQuery = (contextAri, key, value) => ({
         input: {
             contextAri,
             key,
-            value
+            value,
+            encrypted
         }
     }
 });
-exports.deleteQuery = (contextAri, key) => ({
+exports.deleteQuery = (contextAri, key, encrypted) => ({
     query: `
-    mutation Delete($input: DeleteAppStoredEntityMutationInput!) {
+    mutation forge_app_deleteApplicationStorageEntity($input: DeleteAppStoredEntityMutationInput!) {
       appStorage {
         deleteAppStoredEntity(input: $input) {
           success
@@ -110,7 +112,8 @@ exports.deleteQuery = (contextAri, key) => ({
     variables: {
         input: {
             contextAri,
-            key
+            key,
+            encrypted
         }
     }
 });

package/out/query-api.d.ts

@@ -5,7 +5,7 @@ export declare class DefaultQueryBuilder implements QueryBuilder {
     private globalStorage;
     private queryOptions;
     constructor(globalStorage: Pick<GlobalStorage, 'list'>, queryOptions?: ListOptions);
-    where(field: 'key', { condition, value }: Condition): QueryBuilder;
+    where(field: 'key', where: Condition): QueryBuilder;
     cursor(cursor: string): QueryBuilder;
     limit(limit: number): QueryBuilder;
     getOne(): Promise<Result | undefined>;

package/out/query-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query-api.d.ts","sourceRoot":"","sources":["../src/query-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEhF,qBAAa,mBAAoB,YAAW,YAAY;IAC1C,OAAO,CAAC,aAAa;IAA+B,OAAO,CAAC,YAAY;gBAAhE,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,EAAU,YAAY,GAAE,WAAgB;IAEtG,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,SAAS,EAAE,KAAK,EAAE,EAAE,SAAS,GAAG,YAAY;IAalE,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAOpC,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY;IAO5B,MAAM,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAQrC,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC;CAGrC"}
+{"version":3,"file":"query-api.d.ts","sourceRoot":"","sources":["../src/query-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,WAAW,CAAC;AACxC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAC;AAEhF,qBAAa,mBAAoB,YAAW,YAAY;IAC1C,OAAO,CAAC,aAAa;IAA+B,OAAO,CAAC,YAAY;gBAAhE,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,EAAU,YAAY,GAAE,WAAgB;IAEtG,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,KAAK,EAAE,SAAS,GAAG,YAAY;IAYnD,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY;IAOpC,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY;IAO5B,MAAM,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAQrC,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC;CAGrC"}

package/out/query-api.js

@@ -6,13 +6,9 @@ class DefaultQueryBuilder {
         this.globalStorage = globalStorage;
         this.queryOptions = queryOptions;
     }
-    where(field, { condition, value }) {
+    where(field, where) {
         return new DefaultQueryBuilder(this.globalStorage, Object.assign(Object.assign({}, this.queryOptions), { where: [
-                {
-                    field,
-                    condition,
-                    value
-                }
+                Object.assign({ field }, where)
             ] }));
     }
     cursor(cursor) {

package/out/storage-adapter.d.ts

@@ -2,15 +2,27 @@ export interface StorageAdapter {
     get(key: string): Promise<any>;
     set(key: string, value: any): Promise<void>;
     delete(key: string): Promise<void>;
+    getSecret(key: string): Promise<any>;
+    setSecret(key: string, value: any): Promise<void>;
+    deleteSecret(key: string): Promise<void>;
 }
 export interface QueryApi {
     query(): QueryBuilder;
 }
 export declare type Value = string;
-export interface Predicate {
+export interface StartsWith {
     condition: 'STARTS_WITH';
     value: Value;
 }
+export interface NotEqualTo {
+    condition: 'NOT_EQUAL_TO';
+    value: Value[];
+}
+export interface In {
+    condition: 'IN';
+    value: Value[];
+}
+export declare type Predicate = StartsWith | NotEqualTo | In;
 export declare type Condition = Predicate;
 export interface QueryBuilder {
     where(field: 'key', condition: Condition): QueryBuilder;

package/out/storage-adapter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storage-adapter.d.ts","sourceRoot":"","sources":["../src/storage-adapter.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC/B,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5C,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,QAAQ;IACvB,KAAK,IAAI,YAAY,CAAC;CACvB;AAED,oBAAY,KAAK,GAAG,MAAM,CAAC;AAC3B,MAAM,WAAW,SAAS;IACxB,SAAS,EAAE,aAAa,CAAC;IACzB,KAAK,EAAE,KAAK,CAAC;CACd;AACD,oBAAY,SAAS,GAAG,SAAS,CAAC;AAElC,MAAM,WAAW,YAAY;IAC3B,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,GAAG,YAAY,CAAC;IACxD,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAAC;IACrC,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY,CAAC;IACnC,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC,CAAC;IAC/B,MAAM,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CACvC;AAED,MAAM,WAAW,MAAM;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB"}
+{"version":3,"file":"storage-adapter.d.ts","sourceRoot":"","sources":["../src/storage-adapter.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,cAAc;IAC7B,GAAG,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IAC/B,GAAG,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5C,MAAM,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IACnC,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC;IACrC,SAAS,CAAC,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,GAAG,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;IAClD,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;CAC1C;AAED,MAAM,WAAW,QAAQ;IACvB,KAAK,IAAI,YAAY,CAAC;CACvB;AAED,oBAAY,KAAK,GAAG,MAAM,CAAC;AAC3B,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,aAAa,CAAC;IACzB,KAAK,EAAE,KAAK,CAAC;CACd;AACD,MAAM,WAAW,UAAU;IACzB,SAAS,EAAE,cAAc,CAAC;IAC1B,KAAK,EAAE,KAAK,EAAE,CAAC;CAChB;AACD,MAAM,WAAW,EAAE;IACjB,SAAS,EAAE,IAAI,CAAC;IAChB,KAAK,EAAE,KAAK,EAAE,CAAC;CAChB;AAED,oBAAY,SAAS,GAAG,UAAU,GAAG,UAAU,GAAG,EAAE,CAAC;AACrD,oBAAY,SAAS,GAAG,SAAS,CAAC;AAElC,MAAM,WAAW,YAAY;IAC3B,KAAK,CAAC,KAAK,EAAE,KAAK,EAAE,SAAS,EAAE,SAAS,GAAG,YAAY,CAAC;IACxD,MAAM,CAAC,MAAM,EAAE,MAAM,GAAG,YAAY,CAAC;IACrC,KAAK,CAAC,KAAK,EAAE,MAAM,GAAG,YAAY,CAAC;IACnC,OAAO,IAAI,OAAO,CAAC,UAAU,CAAC,CAAC;IAC/B,MAAM,IAAI,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC,CAAC;CACvC;AAED,MAAM,WAAW,MAAM;IACrB,GAAG,EAAE,MAAM,CAAC;IACZ,KAAK,EAAE,MAAM,CAAC;CACf;AAED,MAAM,WAAW,UAAU;IACzB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/storage",
-  "version": "0.0.0-experimental-819498d",
+  "version": "0.0.0-experimental-490cfcf",
   "description": "Forge Storage methods",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -16,7 +16,7 @@
   },
   "devDependencies": {
     "@types/node": "^12.12.63",
-    "node-fetch": "^2.6.1",
-    "@types/node-fetch": "^2.5.7"
+    "@types/node-fetch": "^2.5.7",
+    "node-fetch": "2.6.1"
   }
 }