@forge/lint 2.0.1-next.3 → 3.0.0-next.7

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 (7) hide show
  1. package/CHANGELOG.md +34 -0
  2. package/out/lint/lint.d.ts.map +1 -1
  3. package/out/lint/lint.js +3 -1
  4. package/out/lint/linters/permission-linter/verifiers/content-property-verifier.d.ts +6 -1
  5. package/out/lint/linters/permission-linter/verifiers/content-property-verifier.d.ts.map +1 -1
  6. package/out/lint/linters/permission-linter/verifiers/content-property-verifier.js +66 -16
  7. package/package.json +3 -3
package/CHANGELOG.md CHANGED
@@ -1,10 +1,44 @@
1
1
  # @forge/lint
2
2
 
3
+ ## 3.0.0-next.7
4
+
5
+ ### Patch Changes
6
+
7
+ - Updated dependencies [7b2d17a]
8
+ - @forge/manifest@3.1.0-next.6
9
+ - @forge/cli-shared@2.2.1-next.6
10
+
11
+ ## 3.0.0-next.6
12
+
13
+ ### Major Changes
14
+
15
+ - 4922d09: Only errors set the process exitCode to 1, warnings do not anymore.
16
+
17
+ ## 2.0.1-next.5
18
+
19
+ ### Patch Changes
20
+
21
+ - Updated dependencies [f6901fd]
22
+ - @forge/manifest@3.1.0-next.5
23
+ - @forge/cli-shared@2.2.1-next.5
24
+
25
+ ## 2.0.1-next.4
26
+
27
+ ### Patch Changes
28
+
29
+ - 2e70a0b: Accept both granular and deprecated scopes when verifying scopes required for Content Properties.
30
+ - Updated dependencies [d3ccc04]
31
+ - @forge/manifest@3.1.0-next.4
32
+ - @forge/cli-shared@2.2.1-next.4
33
+
3
34
  ## 2.0.1-next.3
4
35
 
5
36
  ### Patch Changes
6
37
 
7
38
  - 1f7c428: Accept both deprecated scopes and granular scopes when verifying scopes required for REST product endpoints.
39
+ - Updated dependencies [debe251]
40
+ - @forge/manifest@3.1.0-next.3
41
+ - @forge/cli-shared@2.2.1-next.3
8
42
 
9
43
  ## 2.0.1-next.2
10
44
 
package/out/lint/lint.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../../src/lint/lint.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,IAAI,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,MAAM,IAAI,CAAC;AAIpB,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAkB,MAAM,oBAAoB,CAAC;AAQxG,qBAAa,iBAAkB,SAAQ,KAAK;CAAG;AAE/C,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,iBAAiB,WAAY,UAAU,eAAe,UAAU,EAAE,4BAAuB,IA6CrG,CAAC;AAEF,eAAO,MAAM,YAAY,gBAAiB,UAAU,EAAE,KAAG,YAQxD,CAAC;AAEF,eAAO,MAAM,eAAe,aAChB,MAAM,UACR,OAAO,QAAQ,oBACN,OAAO,EAAE,CAAC,QAAQ,CAAC,aAAa,KAChD,OAAO,CAAC,SAAS,CAOnB,CAAC;AAEF,eAAO,MAAM,IAAI,gBACF,MAAM,EAAE,YACX,QAAQ,eACL,MAAM,UACX,UAAU,6BAhBR,MAAM,UACR,OAAO,QAAQ,oBACN,OAAO,EAAE,CAAC,QAAQ,CAAC,aAAa,KAChD,OAAO,CAAC,SAAS,CAAC,YAeV,eAAe,EAAE,KAOzB,OAAO,CAAC,UAAU,EAAE,CAmCtB,CAAC;AAEF,eAAO,MAAM,QAAQ,WACX,UAAU,WACV,eAAe,KACtB,OAAO,CAAC,UAAU,EAAE,CAGtB,CAAC"}
1
+ {"version":3,"file":"lint.d.ts","sourceRoot":"","sources":["../../src/lint/lint.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,IAAI,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC7D,OAAO,EAAE,MAAM,IAAI,CAAC;AAIpB,OAAO,EAAE,QAAQ,EAAE,MAAM,UAAU,CAAC;AACpC,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,UAAU,EAAE,UAAU,EAAkB,MAAM,oBAAoB,CAAC;AAQxG,qBAAa,iBAAkB,SAAQ,KAAK;CAAG;AAE/C,MAAM,WAAW,WAAW;IAC1B,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,YAAY;IAC3B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,iBAAiB,WAAY,UAAU,eAAe,UAAU,EAAE,4BAAuB,IA+CrG,CAAC;AAEF,eAAO,MAAM,YAAY,gBAAiB,UAAU,EAAE,KAAG,YAQxD,CAAC;AAEF,eAAO,MAAM,eAAe,aAChB,MAAM,UACR,OAAO,QAAQ,oBACN,OAAO,EAAE,CAAC,QAAQ,CAAC,aAAa,KAChD,OAAO,CAAC,SAAS,CAOnB,CAAC;AAEF,eAAO,MAAM,IAAI,gBACF,MAAM,EAAE,YACX,QAAQ,eACL,MAAM,UACX,UAAU,6BAhBR,MAAM,UACR,OAAO,QAAQ,oBACN,OAAO,EAAE,CAAC,QAAQ,CAAC,aAAa,KAChD,OAAO,CAAC,SAAS,CAAC,YAeV,eAAe,EAAE,KAOzB,OAAO,CAAC,UAAU,EAAE,CAmCtB,CAAC;AAEF,eAAO,MAAM,QAAQ,WACX,UAAU,WACV,eAAe,KACtB,OAAO,CAAC,UAAU,EAAE,CAGtB,CAAC"}
package/out/lint/lint.js CHANGED
@@ -55,7 +55,9 @@ exports.reportLintResults = (logger, lintResults, showSummary = true) => {
55
55
  logger.info(cli_shared_1.Text.lint.noFixableProblems);
56
56
  }
57
57
  }
58
- process.exitCode = 1;
58
+ if (numErrors) {
59
+ process.exitCode = 1;
60
+ }
59
61
  }
60
62
  };
61
63
  exports.problemCount = (lintResults) => {
package/out/lint/linters/permission-linter/verifiers/content-property-verifier.d.ts CHANGED
@@ -1,10 +1,15 @@
1
1
  import { LintClass, LintResultRule } from '../../../linter-interface';
2
2
  import { BaseLintIssueVerifier, LintIssueVerifier } from '../../verifier-interface';
3
3
  import { ContentPropertyApiCall } from '../api-call-interface';
4
- export declare const CONTENT_PROPERTY_PERMISSIONS_MAP: Record<string, Record<string, string[]>>;
4
+ declare type ContentPropertyPermissions = {
5
+ current: string[];
6
+ deprecated: string[];
7
+ };
8
+ export declare const CONTENT_PROPERTY_PERMISSIONS_MAP: Record<string, Record<string, ContentPropertyPermissions>>;
5
9
  export declare class ContentPropertyVerifier extends BaseLintIssueVerifier implements LintIssueVerifier<ContentPropertyApiCall[]> {
6
10
  protected getLintClass(): LintClass;
7
11
  process(apiCalls: ContentPropertyApiCall[]): Promise<LintResultRule[]>;
8
12
  private getMissingScopes;
9
13
  }
14
+ export {};
10
15
  //# sourceMappingURL=content-property-verifier.d.ts.map
package/out/lint/linters/permission-linter/verifiers/content-property-verifier.d.ts.map CHANGED
@@ -1 +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;AAE/D,eAAO,MAAM,gCAAgC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAqBrF,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;CAQzB"}
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;AAE/D,aAAK,0BAA0B,GAAG;IAChC,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,EAAE,MAAM,EAAE,CAAC;CACtB,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAyDvG,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;CAyBzB"}
package/out/lint/linters/permission-linter/verifiers/content-property-verifier.js CHANGED
@@ -7,24 +7,60 @@ const text_1 = require("../../../text");
7
7
  const verifier_interface_1 = require("../../verifier-interface");
8
8
  exports.CONTENT_PROPERTY_PERMISSIONS_MAP = {
9
9
  onJiraIssue: {
10
- get: ['read:jira-work'],
11
- set: ['write:jira-work'],
12
- delete: ['write:jira-work']
10
+ get: {
11
+ current: ['read:issue.property:jira'],
12
+ deprecated: ['read:jira-work']
13
+ },
14
+ set: {
15
+ current: ['write:issue.property:jira'],
16
+ deprecated: ['write:jira-work']
17
+ },
18
+ delete: {
19
+ current: ['delete:issue.property:jira'],
20
+ deprecated: ['write:jira-work']
21
+ }
13
22
  },
14
23
  onJiraProject: {
15
- get: ['read:jira-work'],
16
- set: ['manage:jira-project'],
17
- delete: ['manage:jira-project']
24
+ get: {
25
+ current: ['read:project.property:jira'],
26
+ deprecated: ['read:jira-work']
27
+ },
28
+ set: {
29
+ current: ['write:project.property:jira'],
30
+ deprecated: ['manage:jira-project']
31
+ },
32
+ delete: {
33
+ current: ['delete:project.property:jira'],
34
+ deprecated: ['manage:jira-project']
35
+ }
18
36
  },
19
37
  onConfluencePage: {
20
- get: ['read:confluence-props'],
21
- set: ['read:confluence-props', 'write:confluence-props'],
22
- delete: ['write:confluence-props']
38
+ get: {
39
+ current: ['read:content-details:confluence'],
40
+ deprecated: ['read:confluence-props']
41
+ },
42
+ set: {
43
+ current: ['read:content.property:confluence', 'write:content.property:confluence'],
44
+ deprecated: ['read:confluence-props', 'write:confluence-props']
45
+ },
46
+ delete: {
47
+ current: ['write:content.property:confluence'],
48
+ deprecated: ['write:confluence-props']
49
+ }
23
50
  },
24
51
  onConfluenceSpace: {
25
- get: ['read:confluence-props'],
26
- set: ['read:confluence-props', 'write:confluence-props'],
27
- delete: ['write:confluence-props']
52
+ get: {
53
+ current: ['read:content-details:confluence'],
54
+ deprecated: ['read:confluence-props']
55
+ },
56
+ set: {
57
+ current: ['read:space.property:confluence', 'write:space.property:confluence'],
58
+ deprecated: ['read:confluence-props', 'write:confluence-props']
59
+ },
60
+ delete: {
61
+ current: ['write:space.property:confluence'],
62
+ deprecated: ['write:confluence-props']
63
+ }
28
64
  }
29
65
  };
30
66
  class ContentPropertyVerifier extends verifier_interface_1.BaseLintIssueVerifier {
@@ -50,10 +86,24 @@ class ContentPropertyVerifier extends verifier_interface_1.BaseLintIssueVerifier
50
86
  getMissingScopes({ context, method }) {
51
87
  var _a, _b;
52
88
  const existingScopes = (_b = (_a = this.manifest) === null || _a === void 0 ? void 0 : _a.permissions) === null || _b === void 0 ? void 0 : _b.scopes;
53
- const requiredScopes = exports.CONTENT_PROPERTY_PERMISSIONS_MAP[context][method];
54
- if (!existingScopes)
55
- return requiredScopes;
56
- return requiredScopes.filter((requiredScope) => !existingScopes.includes(requiredScope));
89
+ const requiredScopesCurrent = exports.CONTENT_PROPERTY_PERMISSIONS_MAP[context][method]['current'];
90
+ const requiredScopesDeprecated = exports.CONTENT_PROPERTY_PERMISSIONS_MAP[context][method]['deprecated'];
91
+ const missingCurrentPerms = requiredScopesCurrent.filter((perm) => !(existingScopes === null || existingScopes === void 0 ? void 0 : existingScopes.includes(perm)));
92
+ if (missingCurrentPerms.length == 0)
93
+ return [];
94
+ let missingDeprecatedPerms = null;
95
+ if (requiredScopesDeprecated) {
96
+ missingDeprecatedPerms = requiredScopesDeprecated.filter((perm) => !(existingScopes === null || existingScopes === void 0 ? void 0 : existingScopes.includes(perm)));
97
+ if (missingDeprecatedPerms.length == 0)
98
+ return [];
99
+ }
100
+ if (missingCurrentPerms.length < requiredScopesCurrent.length) {
101
+ return missingCurrentPerms;
102
+ }
103
+ if (missingDeprecatedPerms && missingDeprecatedPerms.length < requiredScopesDeprecated.length) {
104
+ return missingDeprecatedPerms;
105
+ }
106
+ return requiredScopesCurrent;
57
107
  }
58
108
  }
59
109
  exports.ContentPropertyVerifier = ContentPropertyVerifier;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@forge/lint",
3
- "version": "2.0.1-next.3",
3
+ "version": "3.0.0-next.7",
4
4
  "description": "Linting for forge apps",
5
5
  "main": "out/index.js",
6
6
  "license": "UNLICENSED",
@@ -15,9 +15,9 @@
15
15
  "@types/node-fetch": "^2.5.7"
16
16
  },
17
17
  "dependencies": {
18
- "@forge/cli-shared": "2.2.1-next.2",
18
+ "@forge/cli-shared": "2.2.1-next.6",
19
19
  "@forge/csp": "1.9.0",
20
- "@forge/manifest": "3.1.0-next.2",
20
+ "@forge/manifest": "3.1.0-next.6",
21
21
  "@typescript-eslint/typescript-estree": "^3.5.0",
22
22
  "cross-spawn": "^7.0.1",
23
23
  "node-fetch": "^2.6.1",