@forge/lint 6.0.3-next.12 → 6.0.3-next.13

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @forge/lint
 
+## 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

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.12",
+  "version": "6.0.3-next.13",
   "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.11",
+    "@forge/cli-shared": "9.3.0-next.12",
     "@forge/csp": "6.2.0",
     "@forge/egress": "3.0.0",
-    "@forge/manifest": "13.3.0-next.7",
+    "@forge/manifest": "13.3.0-next.8",
     "@typescript-eslint/typescript-estree": "^5.62.0",
     "array.prototype.flatmap": "^1.3.3",
     "@atlassian/atlassian-openapi": "^1.0.6",