@forge/lint 3.2.2-next.2 → 3.2.2-next.3

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @forge/lint
 
+## 3.2.2-next.3
+
+### Patch Changes
+
+- Updated dependencies [6728c67]
+  - @forge/manifest@4.0.0-next.3
+  - @forge/cli-shared@2.6.2-next.3
+
 ## 3.2.2-next.2
 
 ### Patch Changes

package/out/lint/linters/manifest-linter/abstract-manifest-linter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"abstract-manifest-linter.d.ts","sourceRoot":"","sources":["../../../../src/lint/linters/manifest-linter/abstract-manifest-linter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAGf,wBAAwB,EACxB,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,YAAY,EAAa,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzG,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,qBAAa,sBAAuB,SAAQ,cAAc;IAG5C,OAAO,CAAC,QAAQ,CAAC,IAAI;IAFjC,OAAO,CAAC,SAAS,CAAsC;gBAE1B,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,UAAU;IAItE,OAAO,CAAC,mBAAmB;IAmB3B,YAAY,IAAI,kBAAkB,CAAC,GAAG,CAAC,GAAG,SAAS;IAInD,gBAAgB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAUzC,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAK1B,SAAS,CAAC,QAAQ,IACd,CAAC,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE,QAAQ,EAAE,cAAc,EAAE,EAAE,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC,GACtG,SAAS;IAIb,SAAS,CAAC,kBAAkB,CAAC,OAAO,EAAE,wBAAwB,CAAC,GAAG,CAAC,GAAG,qBAAqB,EAAE;CAG9F"}
+{"version":3,"file":"abstract-manifest-linter.d.ts","sourceRoot":"","sources":["../../../../src/lint/linters/manifest-linter/abstract-manifest-linter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,eAAe,EAGf,wBAAwB,EACxB,kBAAkB,EAClB,qBAAqB,EACtB,MAAM,iBAAiB,CAAC;AACzB,OAAO,EAAE,UAAU,EAAE,cAAc,EAAE,YAAY,EAAa,UAAU,EAAE,MAAM,wBAAwB,CAAC;AACzG,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,qBAAa,sBAAuB,SAAQ,cAAc;IAG5C,OAAO,CAAC,QAAQ,CAAC,IAAI;IAFjC,OAAO,CAAC,SAAS,CAAsC;gBAE1B,IAAI,EAAE,eAAe,EAAE,MAAM,EAAE,UAAU;IAItE,OAAO,CAAC,mBAAmB;IAmB3B,YAAY,IAAI,kBAAkB,CAAC,GAAG,CAAC,GAAG,SAAS;IAI7C,gBAAgB,IAAI,OAAO,CAAC,UAAU,EAAE,CAAC;IAU/C,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAK1B,SAAS,CAAC,QAAQ,IACd,CAAC,CAAC,MAAM,EAAE,cAAc,EAAE,EAAE,QAAQ,EAAE,cAAc,EAAE,EAAE,KAAK,EAAE,YAAY,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC,GACtG,SAAS;IAIb,SAAS,CAAC,kBAAkB,CAAC,OAAO,EAAE,wBAAwB,CAAC,GAAG,CAAC,GAAG,qBAAqB,EAAE;CAG9F"}

package/out/lint/linters/manifest-linter/abstract-manifest-linter.js

@@ -27,12 +27,12 @@ class AbstractManifestLinter extends abstract_linter_1.AbstractLinter {
     getProcessor() {
         return this.processor;
     }
-    batchExecuteImpl() {
+    async batchExecuteImpl() {
         if (!this.processor) {
             throw new Error('Bootstrap failed');
         }
-        const results = this.processor.process();
-        return Promise.resolve([this.mapManifestResponse(results, this.getFixer())]);
+        const results = await this.processor.process();
+        return [this.mapManifestResponse(results, this.getFixer())];
     }
     bootstrap() {
         this.processor = manifest_1.ProcessorBuilder.instance().withValidation(this.type).build();

package/out/lint/linters/permission-linter/verifiers/content-property-verifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"content-property-verifier.d.ts","sourceRoot":"","sources":["../../../../../src/lint/linters/permission-linter/verifiers/content-property-verifier.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEtE,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AACpF,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAoB,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEnE,eAAO,MAAM,gCAAgC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAyD3F,CAAC;AAEF,qBAAa,uBACX,SAAQ,qBACR,YAAW,iBAAiB,CAAC,sBAAsB,EAAE,CAAC;IACtD,SAAS,CAAC,YAAY,IAAI,SAAS;IAItB,OAAO,CAAC,QAAQ,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAuBnF,OAAO,CAAC,gBAAgB;CAKzB"}
+{"version":3,"file":"content-property-verifier.d.ts","sourceRoot":"","sources":["../../../../../src/lint/linters/permission-linter/verifiers/content-property-verifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAEtE,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AACpF,OAAO,EAAE,sBAAsB,EAAE,MAAM,uBAAuB,CAAC;AAC/D,OAAO,EAAoB,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEnE,eAAO,MAAM,gCAAgC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAyD3F,CAAC;AAEF,qBAAa,uBACX,SAAQ,qBACR,YAAW,iBAAiB,CAAC,sBAAsB,EAAE,CAAC;IACtD,SAAS,CAAC,YAAY,IAAI,SAAS;IAItB,OAAO,CAAC,QAAQ,EAAE,sBAAsB,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAsBnF,OAAO,CAAC,gBAAgB;CAKzB"}

package/out/lint/linters/permission-linter/verifiers/content-property-verifier.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ContentPropertyVerifier = exports.CONTENT_PROPERTY_PERMISSIONS_MAP = void 0;
-const cli_shared_1 = require("@forge/cli-shared");
 const linter_interface_1 = require("../../../linter-interface");
 const text_1 = require("../../../text");
 const verifier_interface_1 = require("../../verifier-interface");
@@ -69,20 +68,24 @@ class ContentPropertyVerifier extends verifier_interface_1.BaseLintIssueVerifier
         return linter_interface_1.LintClass.Error;
     }
     async process(apiCalls) {
-        const lintErrors = apiCalls
-            .map((apiCall) => (Object.assign(Object.assign({}, apiCall), { missingScopes: this.getMissingScopes(apiCall) })))
-            .filter(({ missingScopes }) => missingScopes.length)
-            .map(({ context, method, line, column, missingScopes }) => missingScopes.map((missingScope) => ({
-            class: this.getLintClass(),
-            message: text_1.messages.verifiers.contentProperty.message(context, method, missingScope),
-            reference: text_1.messages.verifiers.contentProperty.reference,
-            column,
-            line,
-            metadata: {
-                missingPermission: missingScope
+        const lintErrors = [];
+        for (const apiCall of apiCalls) {
+            const missingScopes = await this.getMissingScopes(apiCall);
+            for (const missingScope of missingScopes) {
+                const { context, method, line, column } = apiCall;
+                lintErrors.push({
+                    class: this.getLintClass(),
+                    message: text_1.messages.verifiers.contentProperty.message(context, method, missingScope),
+                    reference: text_1.messages.verifiers.contentProperty.reference,
+                    column,
+                    line,
+                    metadata: {
+                        missingPermission: missingScope
+                    }
+                });
             }
-        })));
-        return cli_shared_1.flat(lintErrors);
+        }
+        return lintErrors;
     }
     getMissingScopes({ context, method }) {
         var _a, _b;

package/out/lint/linters/permission-linter/verifiers/product-verifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"product-verifier.d.ts","sourceRoot":"","sources":["../../../../../src/lint/linters/permission-linter/verifiers/product-verifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAGpF,OAAO,EAAE,cAAc,IAAI,QAAQ,EAAoB,MAAM,iBAAiB,CAAC;AAE/E,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,CAAC;AAE7D,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,CAAC,MAAM,EAAE,MAAM,GAAG;QAChB,QAAQ,EAAE,aAAa,EAAE,CAAC;QAC1B,2BAA2B,CAAC,EAAE,qBAAqB,EAAE,CAAC;KACvD,CAAC;CACH;AAED,UAAU,aAAa;IACrB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAC9B;AAED,oBAAY,uBAAuB,GAAG,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAEjE,qBAAa,eAAgB,SAAQ,qBAAsB,YAAW,iBAAiB,CAAC,OAAO,EAAE,CAAC;IAI9F,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAHxB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,QAAQ,EACD,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,MAAM;IAKlC,SAAS,CAAC,YAAY,IAAI,SAAS;IAItB,OAAO,CAAC,QAAQ,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAoC3E,OAAO,CAAC,aAAa;IAerB,OAAO,CAAC,0BAA0B;IAOlC,OAAO,CAAC,iBAAiB;IAqBzB,OAAO,CAAC,aAAa;CAWtB"}
+{"version":3,"file":"product-verifier.d.ts","sourceRoot":"","sources":["../../../../../src/lint/linters/permission-linter/verifiers/product-verifier.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAChE,OAAO,EAAE,iBAAiB,EAAE,qBAAqB,EAAE,MAAM,0BAA0B,CAAC;AAGpF,OAAO,EAAE,cAAc,IAAI,QAAQ,EAAoB,MAAM,iBAAiB,CAAC;AAE/E,OAAO,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAC;AAC5C,OAAO,qBAAqB,GAAG,OAAO,CAAC,qBAAqB,CAAC;AAE7D,MAAM,WAAW,aAAa;IAC5B,YAAY,EAAE,MAAM,CAAC;IACrB,OAAO,EAAE,WAAW,CAAC;CACtB;AAED,MAAM,WAAW,WAAW;IAC1B,CAAC,MAAM,EAAE,MAAM,GAAG;QAChB,QAAQ,EAAE,aAAa,EAAE,CAAC;QAC1B,2BAA2B,CAAC,EAAE,qBAAqB,EAAE,CAAC;KACvD,CAAC;CACH;AAED,UAAU,aAAa;IACrB,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CAC9B;AAED,oBAAY,uBAAuB,GAAG,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC;AAEjE,qBAAa,eAAgB,SAAQ,qBAAsB,YAAW,iBAAiB,CAAC,OAAO,EAAE,CAAC;IAI9F,OAAO,CAAC,QAAQ,CAAC,OAAO;IACxB,OAAO,CAAC,QAAQ,CAAC,OAAO;gBAHxB,WAAW,EAAE,MAAM,EACnB,QAAQ,EAAE,QAAQ,EACD,OAAO,EAAE,uBAAuB,EAChC,OAAO,EAAE,MAAM;IAKlC,SAAS,CAAC,YAAY,IAAI,SAAS;IAItB,OAAO,CAAC,QAAQ,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAuC3E,OAAO,CAAC,aAAa;IAerB,OAAO,CAAC,0BAA0B;IAOlC,OAAO,CAAC,iBAAiB;IAqBzB,OAAO,CAAC,aAAa;CAWtB"}

package/out/lint/linters/permission-linter/verifiers/product-verifier.js

@@ -18,18 +18,21 @@ class ProductVerifier extends verifier_interface_1.BaseLintIssueVerifier {
         return linter_interface_1.LintClass.Error;
     }
     async process(apiCalls) {
+        var _a;
         const rules = [];
         const lintCriteriaMatches = new Set();
-        apiCalls.forEach((apiCall) => {
+        for (const apiCall of apiCalls) {
             const apiCallLookupResult = this.lookupApiCall(apiCall);
-            apiCallLookupResult && lintCriteriaMatches.add(apiCallLookupResult);
-        });
-        lintCriteriaMatches.forEach((apiCall) => {
-            const missingScopes = this.getMissingPermissionScopes(apiCall);
-            missingScopes.forEach((permission) => {
-                var _a;
-                if (!(apiCall === null || apiCall === void 0 ? void 0 : apiCall.regex))
-                    return;
+            if (apiCallLookupResult) {
+                lintCriteriaMatches.add(apiCallLookupResult);
+            }
+        }
+        for (const apiCall of lintCriteriaMatches) {
+            if (!(apiCall === null || apiCall === void 0 ? void 0 : apiCall.regex)) {
+                continue;
+            }
+            const missingScopes = await this.getMissingPermissionScopes(apiCall);
+            for (const permission of missingScopes) {
                 rules.push({
                     class: this.getLintClass(),
                     message: text_1.messages.verifiers.product.message(cli_shared_1.capitalise(this.product), apiCall.method.toUpperCase(), (_a = this.pathMap.get(apiCall.regex)) === null || _a === void 0 ? void 0 : _a.originalPath, permission),
@@ -40,8 +43,8 @@ class ProductVerifier extends verifier_interface_1.BaseLintIssueVerifier {
                         missingPermission: permission
                     }
                 });
-            });
-        });
+            }
+        }
         return rules;
     }
     lookupApiCall(apiCall) {

package/out/lint/linters/permission-linter/verifiers/ui-hook-verifier.js

@@ -30,7 +30,7 @@ class UIHookVerifier extends verifier_interface_1.BaseLintIssueVerifier {
             const requiredPermissions = FORGE_UI_HOOK_PERMISSIONS[apiCall.hookName];
             if (!requiredPermissions)
                 return rules;
-            const missingPermissions = manifest_1.getMissingScopes((_a = this.manifest.permissions) === null || _a === void 0 ? void 0 : _a.scopes, requiredPermissions);
+            const missingPermissions = await manifest_1.getMissingScopes((_a = this.manifest.permissions) === null || _a === void 0 ? void 0 : _a.scopes, requiredPermissions);
             missingPermissions.forEach((perm) => rules.push(this.getHookRule(apiCall, perm)));
         }
         return rules;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/lint",
-  "version": "3.2.2-next.2",
+  "version": "3.2.2-next.3",
   "description": "Linting for forge apps",
   "main": "out/index.js",
   "license": "UNLICENSED",
@@ -15,9 +15,9 @@
     "@types/node-fetch": "^2.5.7"
   },
   "dependencies": {
-    "@forge/cli-shared": "2.6.2-next.2",
+    "@forge/cli-shared": "2.6.2-next.3",
     "@forge/csp": "1.11.0",
-    "@forge/manifest": "3.11.0-next.2",
+    "@forge/manifest": "4.0.0-next.3",
     "@typescript-eslint/typescript-estree": "^3.5.0",
     "cross-spawn": "^7.0.1",
     "node-fetch": "2.6.1",