npm - @forge/lint - Versions diffs - 3.1.3-next.3 → 3.2.0 - Mend

@forge/lint 3.1.3-next.3 → 3.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,33 @@
 # @forge/lint
+## 3.2.0
+### Minor Changes
+- 8309725: FORGEPAPA-959 - Add support for linting against JSW and JSM open api
+### Patch Changes
+- 7fe19b4: More resilient linting against handler exports
+- Updated dependencies [69f42bd]
+- Updated dependencies [b447be2]
+- Updated dependencies [4285fc3]
+- Updated dependencies [74e00c8]
+  - @forge/cli-shared@2.6.0
+  - @forge/manifest@3.9.0
+## 3.2.0-next.5
+### Minor Changes
+- 8309725: FORGEPAPA-959 - Add support for linting against JSW and JSM open api
+## 3.1.3-next.4
+### Patch Changes
+- 7fe19b40: More resilient linting against handler exports
 ## 3.1.3-next.3
 ### Patch Changes

package/out/lint/linters/handler-linter/visitors/exported-function-node-visitor.d.ts CHANGED Viewed

@@ -3,5 +3,12 @@ import { NodeVisitor } from '../../node-visitor-interface';
 import { ExportedMethod } from '../exported-method-interface';
 export declare class ExportedFunctionNodeVisitor implements NodeVisitor<ExportedMethod> {
     visit(node: TSESTree.Node, _parent: TSESTree.Node | undefined, callback: (exportedMethod: ExportedMethod) => void): void;
+    private visitSpecifiedNamedExports;
+    private visitInlineNamedExport;
+    private visitObjectAssignmentExpression;
+    private visitMemberExpression;
+    private tryAddObjectExpressionPropertiesExportedMethods;
+    private createExportedMethod;
+    private isExports;
 }
 //# sourceMappingURL=exported-function-node-visitor.d.ts.map

package/out/lint/linters/handler-linter/visitors/exported-function-node-visitor.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"exported-function-node-visitor.d.ts","sourceRoot":"","sources":["../../../../../src/lint/linters/handler-linter/visitors/exported-function-node-visitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAkB,MAAM,sCAAsC,CAAC;AAEhF,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D,qBAAa,2BAA4B,YAAW,WAAW,CAAC,cAAc,CAAC;IACtE,KAAK,CACV,IAAI,EAAE,QAAQ,CAAC,IAAI,EACnB,OAAO,EAAE,QAAQ,CAAC,IAAI,GAAG,SAAS,EAClC,QAAQ,EAAE,CAAC,cAAc,EAAE,cAAc,KAAK,IAAI,GACjD,IAAI;~~CA4IR~~"}
1	+ {"version":3,"file":"exported-function-node-visitor.d.ts","sourceRoot":"","sources":["../../../../../src/lint/linters/handler-linter/visitors/exported-function-node-visitor.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAkB,MAAM,sCAAsC,CAAC;AAEhF,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE9D,qBAAa,2BAA4B,YAAW,WAAW,CAAC,cAAc,CAAC;IACtE,KAAK,CACV,IAAI,EAAE,QAAQ,CAAC,IAAI,EACnB,OAAO,EAAE,QAAQ,CAAC,IAAI,GAAG,SAAS,EAClC,QAAQ,EAAE,CAAC,cAAc,EAAE,cAAc,KAAK,IAAI,GACjD,IAAI;IAuCP,OAAO,CAAC,0BAA0B;IAelC,OAAO,CAAC,sBAAsB;IAkC9B,OAAO,CAAC,+BAA+B;IAkBvC,OAAO,CAAC,qBAAqB;IAS7B,OAAO,CAAC,+CAA+C;IAavD,OAAO,CAAC,oBAAoB;IAO5B,OAAO,CAAC,SAAS;CAUlB"}

package/out/lint/linters/handler-linter/visitors/exported-function-node-visitor.js CHANGED Viewed

@@ -4,78 +4,73 @@ exports.ExportedFunctionNodeVisitor = void 0;
 const typescript_estree_1 = require("@typescript-eslint/typescript-estree");
 class ExportedFunctionNodeVisitor {
     visit(node, _parent, callback) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u;
         if (node.type === typescript_estree_1.AST_NODE_TYPES.MemberExpression &&
             node.object &&
-            (node === null || node === void 0 ? void 0 : node.property.type) === typescript_estree_1.AST_NODE_TYPES.Identifier) {
-            if (node.object.type === typescript_estree_1.AST_NODE_TYPES.MemberExpression) {
-                if (((_a = node.object) === null || _a === void 0 ? void 0 : _a.object.type) === typescript_estree_1.AST_NODE_TYPES.Identifier && ((_b = node.object) === null || _b === void 0 ? void 0 : _b.object.name) === 'module') {
-                    if (((_c = node.object) === null || _c === void 0 ? void 0 : _c.property.type) === typescript_estree_1.AST_NODE_TYPES.Identifier && ((_d = node.object) === null || _d === void 0 ? void 0 : _d.property.name) === 'exports') {
-                        const exportedMethod = Object.assign({ method: node.property.name }, node.property.loc.start);
-                        return callback(exportedMethod);
-                    }
-                }
-            }
-            if (node.object.type === typescript_estree_1.AST_NODE_TYPES.Identifier && node.object.name === 'exports') {
-                if (node.property.type === typescript_estree_1.AST_NODE_TYPES.Identifier) {
-                    const exportedMethod = Object.assign({ method: node.property.name }, node.property.loc.start);
-                    return callback(exportedMethod);
-                }
-            }
+            node.property.type === typescript_estree_1.AST_NODE_TYPES.Identifier) {
+            this.visitMemberExpression(node, callback);
         }
         if (node.type === typescript_estree_1.AST_NODE_TYPES.AssignmentExpression && node.operator === '=') {
-            if (((_e = node.left) === null || _e === void 0 ? void 0 : _e.type) === typescript_estree_1.AST_NODE_TYPES.MemberExpression && ((_f = node.left) === null || _f === void 0 ? void 0 : _f.object) && ((_g = node.left) === null || _g === void 0 ? void 0 : _g.property)) {
-                if (((_h = node.left) === null || _h === void 0 ? void 0 : _h.object.type) === typescript_estree_1.AST_NODE_TYPES.Identifier && ((_j = node.left) === null || _j === void 0 ? void 0 : _j.object.name) === 'module') {
-                    if (((_k = node.left) === null || _k === void 0 ? void 0 : _k.property.type) === typescript_estree_1.AST_NODE_TYPES.Identifier && ((_l = node.left) === null || _l === void 0 ? void 0 : _l.property.name) === 'exports') {
-                        ((_m = node.right) === null || _m === void 0 ? void 0 : _m.properties).forEach((property) => {
-                            if (property.key.type === typescript_estree_1.AST_NODE_TYPES.Identifier) {
-                                const exportedMethod = Object.assign({ method: property.key.name }, property.key.loc.start);
-                                return callback(exportedMethod);
-                            }
-                        });
-                    }
-                }
-            }
-            if (((_o = node.left) === null || _o === void 0 ? void 0 : _o.type) === typescript_estree_1.AST_NODE_TYPES.Identifier && ((_p = node.left) === null || _p === void 0 ? void 0 : _p.name) === 'exports') {
-                ((_q = node.right) === null || _q === void 0 ? void 0 : _q.properties).forEach((property) => {
-                    if (property.key.type === typescript_estree_1.AST_NODE_TYPES.Identifier) {
-                        const exportedMethod = Object.assign({ method: property.key.name }, property.key.loc.start);
-                        return callback(exportedMethod);
-                    }
-                });
-            }
+            this.visitObjectAssignmentExpression(node, callback);
         }
         if (node.type === typescript_estree_1.AST_NODE_TYPES.ExportNamedDeclaration) {
             if (node.declaration) {
-                if (((_r = node.declaration) === null || _r === void 0 ? void 0 : _r.type) === typescript_estree_1.AST_NODE_TYPES.VariableDeclaration) {
-                    node.declaration.declarations.forEach((declarator) => {
-                        if (declarator.id && declarator.id.type === typescript_estree_1.AST_NODE_TYPES.Identifier) {
-                            const exportedMethod = Object.assign({ method: declarator.id.name }, declarator.id.loc.start);
-                            return callback(exportedMethod);
-                        }
-                    });
-                }
-                else if (((_s = node.declaration) === null || _s === void 0 ? void 0 : _s.type) === typescript_estree_1.AST_NODE_TYPES.FunctionDeclaration) {
-                    if (((_t = node.declaration) === null || _t === void 0 ? void 0 : _t.id) && ((_u = node.declaration) === null || _u === void 0 ? void 0 : _u.id.type) === typescript_estree_1.AST_NODE_TYPES.Identifier) {
-                        const exportedMethod = Object.assign({ method: node.declaration.id.name }, node.declaration.id.loc.start);
-                        return callback(exportedMethod);
-                    }
-                }
+                this.visitInlineNamedExport(node, callback);
             }
             else {
-                node.specifiers.forEach((specifier) => {
-                    if (specifier.type === typescript_estree_1.AST_NODE_TYPES.ExportSpecifier &&
-                        specifier.exported.type === typescript_estree_1.AST_NODE_TYPES.Identifier) {
-                        const exportedMethod = Object.assign({ method: specifier.exported.name }, node.loc.start);
-                        return callback(exportedMethod);
-                    }
-                    if (specifier.type === typescript_estree_1.AST_NODE_TYPES.ExportSpecifier && specifier.local.type === typescript_estree_1.AST_NODE_TYPES.Identifier) {
-                        const exportedMethod = Object.assign({ method: specifier.local.name }, node.loc.start);
-                        return callback(exportedMethod);
-                    }
-                });
+                node.specifiers.forEach((specifier) => this.visitSpecifiedNamedExports(node, specifier, callback));
             }
         }
     }
+    visitSpecifiedNamedExports(node, specifier, callback) {
+        if (specifier.type === typescript_estree_1.AST_NODE_TYPES.ExportSpecifier && specifier.local.type === typescript_estree_1.AST_NODE_TYPES.Identifier) {
+            callback(this.createExportedMethod(specifier.exported.name, Object.assign({}, node.loc.start)));
+        }
+    }
+    visitInlineNamedExport(node, callback) {
+        var _a, _b, _c, _d;
+        if (((_a = node.declaration) === null || _a === void 0 ? void 0 : _a.type) === typescript_estree_1.AST_NODE_TYPES.VariableDeclaration) {
+            node.declaration.declarations.forEach((declarator) => {
+                if (declarator.id && declarator.id.type === typescript_estree_1.AST_NODE_TYPES.Identifier) {
+                    callback(this.createExportedMethod(declarator.id.name, Object.assign({}, declarator.id.loc.start)));
+                }
+            });
+        }
+        else if (((_b = node.declaration) === null || _b === void 0 ? void 0 : _b.type) === typescript_estree_1.AST_NODE_TYPES.FunctionDeclaration) {
+            if (((_c = node.declaration) === null || _c === void 0 ? void 0 : _c.id) && ((_d = node.declaration) === null || _d === void 0 ? void 0 : _d.id.type) === typescript_estree_1.AST_NODE_TYPES.Identifier) {
+                callback(this.createExportedMethod(node.declaration.id.name, Object.assign({}, node.declaration.id.loc.start)));
+            }
+        }
+    }
+    visitObjectAssignmentExpression(node, callback) {
+        if (this.isExports(node.left)) {
+            this.tryAddObjectExpressionPropertiesExportedMethods(node, callback);
+        }
+    }
+    visitMemberExpression(node, callback) {
+        if (node.property.type === typescript_estree_1.AST_NODE_TYPES.Identifier && this.isExports(node.object)) {
+            callback(this.createExportedMethod(node.property.name, Object.assign({}, node.property.loc.start)));
+        }
+    }
+    tryAddObjectExpressionPropertiesExportedMethods(node, callback) {
+        var _a, _b;
+        if (((_a = node.right) === null || _a === void 0 ? void 0 : _a.type) === typescript_estree_1.AST_NODE_TYPES.ObjectExpression) {
+            (_b = node.right.properties) === null || _b === void 0 ? void 0 : _b.forEach((property) => {
+                if (property.key.type === typescript_estree_1.AST_NODE_TYPES.Identifier) {
+                    callback(this.createExportedMethod(property.key.name, Object.assign({}, property.key.loc.start)));
+                }
+            });
+        }
+    }
+    createExportedMethod(method, location) {
+        return Object.assign({ method }, location);
+    }
+    isExports(node) {
+        return ((node.type === typescript_estree_1.AST_NODE_TYPES.MemberExpression &&
+            node.object.type === typescript_estree_1.AST_NODE_TYPES.Identifier &&
+            node.object.name === 'module' &&
+            node.property.type === typescript_estree_1.AST_NODE_TYPES.Identifier &&
+            node.property.name === 'exports') ||
+            ((node === null || node === void 0 ? void 0 : node.type) === typescript_estree_1.AST_NODE_TYPES.Identifier && (node === null || node === void 0 ? void 0 : node.name) === 'exports'));
+    }
 }
 exports.ExportedFunctionNodeVisitor = ExportedFunctionNodeVisitor;

package/out/lint/linters/permission-linter/permission-linter.d.ts CHANGED Viewed

@@ -22,6 +22,8 @@ interface PermissionLintCriteriaMatches {
 export declare class PermissionLinter extends BaseLinter<ApiCall, PermissionLintCriteriaMatches, ApiCall[]> {
     private manifest;
     static JIRA_CACHE_KEY: string;
+    static JSM_CACHE_KEY: string;
+    static JSW_CACHE_KEY: string;
     static CONFLUENCE_CACHE_KEY: string;
     private jira?;
     private confluence?;

package/out/lint/linters/permission-linter/permission-linter.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"permission-linter.d.ts","sourceRoot":"","sources":["../../../../src/lint/linters/permission-linter/permission-linter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,IAAI,QAAQ,EAAe,MAAM,iBAAiB,CAAC;AAE/E,OAAO,UAAU,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAClF,OAAO,EACL,OAAO,EAEP,eAAe,EACf,cAAc,EACd,cAAc,EACd,aAAa,EACd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAML,WAAW,EAGZ,MAAM,aAAa,CAAC;AAUrB,UAAU,aAAa;IACrB,KAAK,EAAE;QACL,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;KAC7B,CAAC;CACH;AAED,eAAO,MAAM,mBAAmB,eAAe,CAAC;AAKhD,eAAO,MAAM,sBAAsB,WACzB,cAAc,EAAE,YACd,cAAc,EAAE,mBACT,mBAAmB,GAAG,gCAAgC,GAAG,+BAA+B,uCAExG,GAAG,CAAC,MAAM,CAkBZ,CAAC;AAEF,eAAO,MAAM,qBAAqB,WACxB,cAAc,EAAE,YACd,cAAc,EAAE,SACnB,YAAY,KAClB,OAAO,CAAC,YAAY,CAsEtB,CAAC;AAEF,UAAU,6BAA6B;IACrC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,EAAE,CAAC;IACzB,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,IAAI,EAAE,cAAc,EAAE,CAAC;IACvB,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,QAAQ,EAAE,eAAe,EAAE,CAAC;CAC7B;AAED,qBAAa,gBAAiB,SAAQ,UAAU,CAAC,OAAO,EAAE,6BAA6B,EAAE,OAAO,EAAE,CAAC;~~IAQhE~~,OAAO,CAAC,QAAQ;~~IAPjD~~,MAAM,CAAC,cAAc,SAAgC;IACrD,MAAM,CAAC,oBAAoB,SAAsC;IAEjE,OAAO,CAAC,IAAI,CAAC,CAA0B;IACvC,OAAO,CAAC,UAAU,CAAC,CAA0B;IAC7C,OAAO,CAAC,KAAK,CAAC,CAAa;gBAEf,WAAW,EAAE,MAAM,EAAU,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU;IAIlE,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;~~IA4CvC~~,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAajD,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,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAsB3D,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAWtE,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAKrE,OAAO,CAAC,YAAY;CAarB"}
1	+ {"version":3,"file":"permission-linter.d.ts","sourceRoot":"","sources":["../../../../src/lint/linters/permission-linter/permission-linter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,cAAc,IAAI,QAAQ,EAAe,MAAM,iBAAiB,CAAC;AAE/E,OAAO,UAAU,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,YAAY,EAAE,UAAU,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AAClF,OAAO,EACL,OAAO,EAEP,eAAe,EACf,cAAc,EACd,cAAc,EACd,aAAa,EACd,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EAML,WAAW,EAGZ,MAAM,aAAa,CAAC;AAUrB,UAAU,aAAa;IACrB,KAAK,EAAE;QACL,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC;KAC7B,CAAC;CACH;AAED,eAAO,MAAM,mBAAmB,eAAe,CAAC;AAKhD,eAAO,MAAM,sBAAsB,WACzB,cAAc,EAAE,YACd,cAAc,EAAE,mBACT,mBAAmB,GAAG,gCAAgC,GAAG,+BAA+B,uCAExG,GAAG,CAAC,MAAM,CAkBZ,CAAC;AAEF,eAAO,MAAM,qBAAqB,WACxB,cAAc,EAAE,YACd,cAAc,EAAE,SACnB,YAAY,KAClB,OAAO,CAAC,YAAY,CAsEtB,CAAC;AAEF,UAAU,6BAA6B;IACrC,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,EAAE,CAAC;IACzB,UAAU,EAAE,cAAc,EAAE,CAAC;IAC7B,IAAI,EAAE,cAAc,EAAE,CAAC;IACvB,OAAO,EAAE,cAAc,EAAE,CAAC;IAC1B,MAAM,EAAE,aAAa,EAAE,CAAC;IACxB,QAAQ,EAAE,eAAe,EAAE,CAAC;CAC7B;AAED,qBAAa,gBAAiB,SAAQ,UAAU,CAAC,OAAO,EAAE,6BAA6B,EAAE,OAAO,EAAE,CAAC;IAUhE,OAAO,CAAC,QAAQ;IATjD,MAAM,CAAC,cAAc,SAAgC;IACrD,MAAM,CAAC,aAAa,SAA+B;IACnD,MAAM,CAAC,aAAa,SAA+B;IACnD,MAAM,CAAC,oBAAoB,SAAsC;IAEjE,OAAO,CAAC,IAAI,CAAC,CAA0B;IACvC,OAAO,CAAC,UAAU,CAAC,CAA0B;IAC7C,OAAO,CAAC,KAAK,CAAC,CAAa;gBAEf,WAAW,EAAE,MAAM,EAAU,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,UAAU;IAIlE,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IAgEvC,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAajD,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,oBAAoB,CAAC,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;IAsB3D,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAWtE,mBAAmB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAKrE,OAAO,CAAC,YAAY;CAarB"}

package/out/lint/linters/permission-linter/permission-linter.js CHANGED Viewed

@@ -84,20 +84,29 @@ class PermissionLinter extends base_linter_1.default {
         this.cache = cli_shared_1.CachedConf.getCache(CACHE_KEY);
         const LOCAL_CONF_SWAGGER = process.env.LOCAL_CONF_SWAGGER;
         const LOCAL_JIRA_SWAGGER = process.env.LOCAL_JIRA_SWAGGER;
+        const LOCAL_JSM_SWAGGER = process.env.LOCAL_JSM_SWAGGER;
+        const LOCAL_JSW_SWAGGER = process.env.LOCAL_JSW_SWAGGER;
         const USE_LOCAL_SWAGGER = process.env.USE_LOCAL_SWAGGER;
         let swaggerFiles;
-        if (USE_LOCAL_SWAGGER && LOCAL_CONF_SWAGGER && LOCAL_JIRA_SWAGGER) {
-            swaggerFiles = [this.getProductPathsFile(LOCAL_JIRA_SWAGGER), this.getProductPathsFile(LOCAL_CONF_SWAGGER)];
+        if (USE_LOCAL_SWAGGER && LOCAL_CONF_SWAGGER && LOCAL_JIRA_SWAGGER && LOCAL_JSM_SWAGGER && LOCAL_JSW_SWAGGER) {
+            swaggerFiles = [
+                this.getProductPathsFile(LOCAL_JIRA_SWAGGER),
+                this.getProductPathsFile(LOCAL_JSM_SWAGGER),
+                this.getProductPathsFile(LOCAL_JSW_SWAGGER),
+                this.getProductPathsFile(LOCAL_CONF_SWAGGER)
+            ];
         }
         else {
             swaggerFiles = [
                 this.getProductPaths(PermissionLinter.JIRA_CACHE_KEY, 'https://developer.atlassian.com/cloud/jira/platform/swagger-v3.v3.json'),
+                this.getProductPaths(PermissionLinter.JSM_CACHE_KEY, 'https://developer.atlassian.com/cloud/jira/service-desk/swagger.v3.json'),
+                this.getProductPaths(PermissionLinter.JSW_CACHE_KEY, 'https://developer.atlassian.com/cloud/jira/software/swagger.v3.json'),
                 this.getProductPaths(PermissionLinter.CONFLUENCE_CACHE_KEY, 'https://developer.atlassian.com/cloud/confluence/swagger.v3.json')
             ];
         }
-        const [jira, confluence] = await Promise.all(swaggerFiles);
-        this.jira = this.processPaths(jira.paths);
-        this.confluence = this.processPaths(confluence.paths);
+        const [jiraSwagger, jsmSwagger, jswSwagger, confluenceSwagger] = await Promise.all(swaggerFiles);
+        this.jira = this.processPaths(Object.assign(Object.assign(Object.assign({}, jiraSwagger.paths), jsmSwagger.paths), jswSwagger.paths));
+        this.confluence = this.processPaths(confluenceSwagger.paths);
         this.nodeVisitors = [
             new visitors_1.ProductNodeVisitor(),
             new visitors_1.UIHookNodeVisitor(),
@@ -176,4 +185,6 @@ class PermissionLinter extends base_linter_1.default {
 }
 exports.PermissionLinter = PermissionLinter;
 PermissionLinter.JIRA_CACHE_KEY = 'permissions-jira-cache-key';
+PermissionLinter.JSM_CACHE_KEY = 'permissions-jsm-cache-key';
+PermissionLinter.JSW_CACHE_KEY = 'permissions-jsw-cache-key';
 PermissionLinter.CONFLUENCE_CACHE_KEY = 'permissions-confluence-cache-key';

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@forge/lint",
-  "version": "3.1.3-next.3",
+  "version": "3.2.0",
   "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.0-next.3",
+    "@forge/cli-shared": "2.6.0",
     "@forge/csp": "1.11.0",
-    "@forge/manifest": "3.9.0-next.2",
+    "@forge/manifest": "3.9.0",
     "@typescript-eslint/typescript-estree": "^3.5.0",
     "cross-spawn": "^7.0.1",
     "node-fetch": "2.6.1",