@forge/lint 6.0.3-next.2 → 6.0.3-next.20

package/CHANGELOG.md

@@ -1,5 +1,140 @@
 # @forge/lint
 
+## 6.0.3-next.20
+
+### Patch Changes
+
+- Updated dependencies [87d2d74]
+  - @forge/csp@6.3.0-next.0
+
+## 6.0.3-next.19
+
+### Patch Changes
+
+- Updated dependencies [4404f62]
+  - @forge/manifest@13.3.0-next.10
+  - @forge/cli-shared@9.3.0-next.18
+
+## 6.0.3-next.18
+
+### Patch Changes
+
+- Updated dependencies [8d20095]
+  - @forge/cli-shared@9.3.0-next.17
+
+## 6.0.3-next.17
+
+### Patch Changes
+
+- Updated dependencies [905d8c5]
+  - @forge/cli-shared@9.3.0-next.16
+
+## 6.0.3-next.16
+
+### Patch Changes
+
+- Updated dependencies [52e074e]
+  - @forge/cli-shared@9.3.0-next.15
+
+## 6.0.3-next.15
+
+### Patch Changes
+
+- Updated dependencies [c8105d8]
+- Updated dependencies [3e8de63]
+  - @forge/cli-shared@9.3.0-next.14
+  - @forge/manifest@13.3.0-next.9
+
+## 6.0.3-next.14
+
+### Patch Changes
+
+- Updated dependencies [8a9e608]
+  - @forge/cli-shared@9.3.0-next.13
+
+## 6.0.3-next.13
+
+### Patch Changes
+
+- 4b90a07: Lint target directory when using the manual packaging
+- Updated dependencies [4b90a07]
+  - @forge/manifest@13.3.0-next.8
+  - @forge/cli-shared@9.3.0-next.12
+
+## 6.0.3-next.12
+
+### Patch Changes
+
+- Updated dependencies [18b920d]
+  - @forge/cli-shared@9.3.0-next.11
+
+## 6.0.3-next.11
+
+### Patch Changes
+
+- 0f6f64f: Fix linter setup to support multi-entry resource bundling for Frame component
+
+## 6.0.3-next.10
+
+### Patch Changes
+
+- Updated dependencies [bc2d278]
+  - @forge/cli-shared@9.3.0-next.10
+
+## 6.0.3-next.9
+
+### Patch Changes
+
+- Updated dependencies [a36d70b]
+  - @forge/cli-shared@9.3.0-next.9
+
+## 6.0.3-next.8
+
+### Patch Changes
+
+- Updated dependencies [89ccb1e]
+  - @forge/manifest@13.3.0-next.7
+  - @forge/cli-shared@9.3.0-next.8
+
+## 6.0.3-next.7
+
+### Patch Changes
+
+- Updated dependencies [e7bfe5e]
+  - @forge/cli-shared@9.3.0-next.7
+  - @forge/manifest@13.3.0-next.6
+
+## 6.0.3-next.6
+
+### Patch Changes
+
+- Updated dependencies [0949833]
+  - @forge/cli-shared@9.3.0-next.6
+
+## 6.0.3-next.5
+
+### Patch Changes
+
+- Updated dependencies [d1610cc]
+  - @forge/manifest@13.3.0-next.5
+  - @forge/cli-shared@9.3.0-next.5
+
+## 6.0.3-next.4
+
+### Patch Changes
+
+- Updated dependencies [c3a0f20]
+  - @forge/manifest@13.3.0-next.4
+  - @forge/cli-shared@9.3.0-next.4
+
+## 6.0.3-next.3
+
+### Patch Changes
+
+- Updated dependencies [498fda5]
+  - @forge/manifest@13.3.0-next.3
+  - @forge/cli-shared@9.3.0-next.3
+
 ## 6.0.3-next.2
 
 ### Patch Changes

package/out/lint/linters/frame-component-linter/verifiers/frame-component-verifier.d.ts

@@ -3,11 +3,11 @@ import { LintClass, LintResultRule } from '../../../linter-interface';
 import { BaseLintIssueVerifier, LintIssueVerifier } from '../../verifier-interface';
 import { type FrameResourceInfo } from '../frame-component-interface';
 export declare class FrameComponentVerifier extends BaseLintIssueVerifier implements LintIssueVerifier<FrameResourceInfo[]> {
-    private possibleFrameResourceKeys;
+    private entryKeysByResourceKey;
     constructor(environment: string, manifest: Manifest);
     protected getLintClass(): LintClass;
     process(frameResources: FrameResourceInfo[]): Promise<LintResultRule[]>;
     private isValidFrameResourceKey;
-    private getPossibleFrameResourceKeysFromManifest;
+    private getEntryKeysByResourceKeyFromManifest;
 }
 //# sourceMappingURL=frame-component-verifier.d.ts.map

package/out/lint/linters/frame-component-linter/verifiers/frame-component-verifier.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"frame-component-verifier.d.ts","sourceRoot":"","sources":["../../../../../src/lint/linters/frame-component-linter/verifiers/frame-component-verifier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,IAAI,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAEpF,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEtE,qBAAa,sBAAuB,SAAQ,qBAAsB,YAAW,iBAAiB,CAAC,iBAAiB,EAAE,CAAC;IACjH,OAAO,CAAC,yBAAyB,CAAc;gBAEnC,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAKnD,SAAS,CAAC,YAAY,IAAI,SAAS;IAItB,OAAO,CAAC,cAAc,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAepF,OAAO,CAAC,uBAAuB;IAO/B,OAAO,CAAC,wCAAwC;CAQjD"}
+{"version":3,"file":"frame-component-verifier.d.ts","sourceRoot":"","sources":["../../../../../src/lint/linters/frame-component-linter/verifiers/frame-component-verifier.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,IAAI,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AACtE,OAAO,EAAE,qBAAqB,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAEpF,OAAO,EAAE,KAAK,iBAAiB,EAAE,MAAM,8BAA8B,CAAC;AAEtE,qBAAa,sBAAuB,SAAQ,qBAAsB,YAAW,iBAAiB,CAAC,iBAAiB,EAAE,CAAC;IAIjH,OAAO,CAAC,sBAAsB,CAA2B;gBAE7C,WAAW,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ;IAKnD,SAAS,CAAC,YAAY,IAAI,SAAS;IAItB,OAAO,CAAC,cAAc,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAepF,OAAO,CAAC,uBAAuB;IAmB/B,OAAO,CAAC,qCAAqC;CAQ9C"}

package/out/lint/linters/frame-component-linter/verifiers/frame-component-verifier.js

@@ -5,10 +5,10 @@ const linter_interface_1 = require("../../../linter-interface");
 const verifier_interface_1 = require("../../verifier-interface");
 const text_1 = require("../../../text");
 class FrameComponentVerifier extends verifier_interface_1.BaseLintIssueVerifier {
-    possibleFrameResourceKeys;
+    entryKeysByResourceKey;
     constructor(environment, manifest) {
         super(environment, manifest);
-        this.possibleFrameResourceKeys = this.getPossibleFrameResourceKeysFromManifest();
+        this.entryKeysByResourceKey = this.getEntryKeysByResourceKeyFromManifest();
     }
     getLintClass() {
         return linter_interface_1.LintClass.Error;
@@ -31,11 +31,19 @@ class FrameComponentVerifier extends verifier_interface_1.BaseLintIssueVerifier
         if (!resourceKey) {
             return false;
         }
-        return this.possibleFrameResourceKeys.has(resourceKey);
+        const separatorIndex = resourceKey.indexOf('/');
+        if (separatorIndex === -1) {
+            const entryKeys = this.entryKeysByResourceKey.get(resourceKey);
+            return !!entryKeys && entryKeys.size === 0;
+        }
+        const key = resourceKey.slice(0, separatorIndex);
+        const entry = resourceKey.slice(separatorIndex + 1);
+        const entryKeys = this.entryKeysByResourceKey.get(key);
+        return entry.length > 0 && entryKeys !== undefined && entryKeys.has(entry);
     }
-    getPossibleFrameResourceKeysFromManifest() {
+    getEntryKeysByResourceKeyFromManifest() {
         const resources = this.manifest?.resources ?? [];
-        return new Set(resources.map(({ key }) => key));
+        return new Map(resources.map(({ key, entry }) => [key, new Set(entry ? Object.keys(entry) : [])]));
     }
 }
 exports.FrameComponentVerifier = FrameComponentVerifier;

package/out/lint/linters/handler-linter/handler-linter.d.ts

@@ -10,7 +10,8 @@ export declare class HandlerLinter extends BaseLinter<ExportedMethod, HandlerLin
     private manifest;
     constructor(environment: string, manifest: Manifest, logger: LintLogger);
     bootstrap(): Promise<void>;
-    private getHandlerFileRegex;
+    private escapeRegExp;
+    private isHandlerFile;
     private getFunctionHandlers;
     protected setupMatchesMap(filepath: string): void;
     protected filterLintInput(inputs: LintInput[]): LintInput[];

package/out/lint/linters/handler-linter/handler-linter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"handler-linter.d.ts","sourceRoot":"","sources":["../../../../src/lint/linters/handler-linter/handler-linter.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,IAAI,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAE7D,OAAO,UAAU,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAW,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAGrF,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAE/D,UAAU,0BAA0B;IAClC,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAC;IAC7B,gBAAgB,EAAE,aAAa,CAAC;CACjC;AAED,qBAAa,aAAc,SAAQ,UAAU,CAAC,cAAc,EAAE,0BAA0B,EAAE,aAAa,CAAC;IAGpG,OAAO,CAAC,QAAQ;gBADhB,WAAW,EAAE,MAAM,EACX,QAAQ,EAAE,QAAQ,EAC1B,MAAM,EAAE,UAAU;IAKP,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IASvC,OAAO,CAAC,mBAAmB,CAAqF;IAEhH,OAAO,CAAC,mBAAmB;IAc3B,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAYjD,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE;IAO3D,SAAS,CAAC,oBAAoB,CAAC,cAAc,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;CAKvF"}
+{"version":3,"file":"handler-linter.d.ts","sourceRoot":"","sources":["../../../../src/lint/linters/handler-linter/handler-linter.ts"],"names":[],"mappings":"AACA,OAAO,EAAwB,cAAc,IAAI,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAEnF,OAAO,UAAU,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAW,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAGrF,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,wBAAwB,CAAC;AAE/D,UAAU,0BAA0B;IAClC,CAAC,GAAG,EAAE,MAAM,GAAG,aAAa,CAAC;IAC7B,gBAAgB,EAAE,aAAa,CAAC;CACjC;AAED,qBAAa,aAAc,SAAQ,UAAU,CAAC,cAAc,EAAE,0BAA0B,EAAE,aAAa,CAAC;IAGpG,OAAO,CAAC,QAAQ;gBADhB,WAAW,EAAE,MAAM,EACX,QAAQ,EAAE,QAAQ,EAC1B,MAAM,EAAE,UAAU;IAKP,SAAS,IAAI,OAAO,CAAC,IAAI,CAAC;IASvC,OAAO,CAAC,YAAY,CAA2E;IAE/F,OAAO,CAAC,aAAa;IAQrB,OAAO,CAAC,mBAAmB;IAc3B,SAAS,CAAC,eAAe,CAAC,QAAQ,EAAE,MAAM,GAAG,IAAI;IAYjD,SAAS,CAAC,eAAe,CAAC,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE;IAK3D,SAAS,CAAC,oBAAoB,CAAC,cAAc,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,GAAG,IAAI;CAKvF"}

package/out/lint/linters/handler-linter/handler-linter.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.HandlerLinter = void 0;
 const tslib_1 = require("tslib");
 const cli_shared_1 = require("@forge/cli-shared");
+const manifest_1 = require("@forge/manifest");
 const base_linter_1 = tslib_1.__importDefault(require("../../base-linter"));
 const handlers_verifier_1 = require("./verifiers/handlers-verifier");
 const visitors_1 = require("./visitors");
@@ -19,7 +20,12 @@ class HandlerLinter extends base_linter_1.default {
             functionHandlers: new handlers_verifier_1.HandlersVerifier(humanReadableEnvironment, this.manifest)
         };
     }
-    getHandlerFileRegex = (fileName) => new RegExp(`^src(\/|\\\\)${fileName}\.[tj](s|sx)$`);
+    escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+    isHandlerFile(handler, filepath) {
+        const handlersDirectory = (0, manifest_1.getHandlersDirectory)(this.manifest);
+        const handlerFileRegex = new RegExp(`^${this.escapeRegExp(handlersDirectory)}(\/|\\\\)${this.escapeRegExp(handler.file)}\.[tj](s|sx)$`);
+        return handlerFileRegex.test(filepath);
+    }
     getFunctionHandlers(manifest) {
         return manifest.modules?.function
             ?.filter((funcs) => funcs.handler && funcs.handler.split('.').length === 2)
@@ -35,7 +41,7 @@ class HandlerLinter extends base_linter_1.default {
     }
     setupMatchesMap(filepath) {
         const handlers = this.getFunctionHandlers(this.manifest);
-        const filteredHandlers = handlers?.filter((handler) => this.getHandlerFileRegex(handler.file).test(filepath));
+        const filteredHandlers = handlers?.filter((handler) => this.isHandlerFile(handler, filepath));
         this.matches.set(filepath, {
             functionHandlers: {
                 expectedMethods: filteredHandlers || [],
@@ -45,7 +51,7 @@ class HandlerLinter extends base_linter_1.default {
     }
     filterLintInput(inputs) {
         const handlers = this.getFunctionHandlers(this.manifest);
-        return inputs.filter((input) => handlers?.find((handler) => this.getHandlerFileRegex(handler.file).test(input.filepath)));
+        return inputs.filter((input) => handlers?.find((handler) => this.isHandlerFile(handler, input.filepath)));
     }
     addLintCriteriaMatch(exportedMethod, filepath) {
         const criteriaMatches = this.matches.get(filepath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/lint",
-  "version": "6.0.3-next.2",
+  "version": "6.0.3-next.20",
   "description": "Linting for forge apps",
   "main": "out/index.js",
   "license": "SEE LICENSE IN LICENSE.txt",
@@ -19,10 +19,10 @@
     "eslint-plugin-import": "^2.29.1"
   },
   "dependencies": {
-    "@forge/cli-shared": "9.3.0-next.2",
-    "@forge/csp": "6.2.0",
+    "@forge/cli-shared": "9.3.0-next.18",
+    "@forge/csp": "6.3.0-next.0",
     "@forge/egress": "3.0.0",
-    "@forge/manifest": "13.3.0-next.2",
+    "@forge/manifest": "13.3.0-next.10",
     "@typescript-eslint/typescript-estree": "^5.62.0",
     "array.prototype.flatmap": "^1.3.3",
     "@atlassian/atlassian-openapi": "^1.0.6",