@apexdevtools/apex-parser 3.0.0 → 3.1.0

package/lib/index.d.ts

@@ -1,9 +1,25 @@
-export * from './ApexLexer';
-export * from './ApexParser';
-export * from './CaseInsensitiveInputStream';
-export * from './ThrowingErrorListener';
-export * from './ApexParserListener';
-export * from './ApexParserVisitor';
-export { CommonTokenStream } from 'antlr4ts';
-export { ParseTreeWalker } from 'antlr4ts/tree/ParseTreeWalker';
-export declare function check(): void;
+export * from "./ApexLexer";
+export * from "./ApexParser";
+export * from "./CaseInsensitiveInputStream";
+export * from "./ThrowingErrorListener";
+export * from "./ApexParserListener";
+export * from "./ApexParserVisitor";
+export { CommonTokenStream } from "antlr4ts";
+export { ParseTreeWalker } from "antlr4ts/tree/ParseTreeWalker";
+interface ParseCheckError {
+    path: string;
+    error: string;
+}
+interface CheckResult {
+    status: number;
+    errors: ParseCheckError[];
+}
+interface ProjectCheckResult {
+    name: string;
+    path: string;
+    pkg?: string;
+    status: number;
+    errors: ParseCheckError[];
+}
+export declare function check(pathStr?: string): Promise<CheckResult>;
+export declare function checkProject(pathStr?: string): Promise<ProjectCheckResult[]>;

package/lib/index.js

@@ -40,8 +40,17 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.check = exports.ParseTreeWalker = exports.CommonTokenStream = void 0;
+exports.checkProject = exports.check = exports.ParseTreeWalker = exports.CommonTokenStream = void 0;
 const path_1 = require("path");
 const dir = require("node-dir");
 const ApexLexer_1 = require("./ApexLexer");
@@ -50,7 +59,6 @@ const CaseInsensitiveInputStream_1 = require("./CaseInsensitiveInputStream");
 const antlr4ts_1 = require("antlr4ts");
 const ThrowingErrorListener_1 = require("./ThrowingErrorListener");
 const fs_1 = require("fs");
-const fs_2 = require("fs");
 __exportStar(require("./ApexLexer"), exports);
 __exportStar(require("./ApexParser"), exports);
 __exportStar(require("./CaseInsensitiveInputStream"), exports);
@@ -61,14 +69,64 @@ var antlr4ts_2 = require("antlr4ts");
 Object.defineProperty(exports, "CommonTokenStream", { enumerable: true, get: function () { return antlr4ts_2.CommonTokenStream; } });
 var ParseTreeWalker_1 = require("antlr4ts/tree/ParseTreeWalker");
 Object.defineProperty(exports, "ParseTreeWalker", { enumerable: true, get: function () { return ParseTreeWalker_1.ParseTreeWalker; } });
-function check() {
-    const path = (0, path_1.resolve)(process.argv[1] || process.cwd());
-    dir.files(path, function (err, files) {
-        if (err)
-            throw err;
+function check(pathStr) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const path = (0, path_1.resolve)(pathStr || process.argv[1] || process.cwd());
+        const result = {
+            status: 0,
+            errors: []
+        };
+        if (!(0, fs_1.existsSync)(path)) {
+            console.log(`Path does not exist, aborting: ${path}`);
+            result.status = 2;
+        }
+        else {
+            try {
+                yield parseFiles(path);
+            }
+            catch (err) {
+                console.log(`Error processing: ${path}`);
+                console.log(err);
+                result.status = 1;
+            }
+        }
+        process.exitCode = result.status;
+        return result;
+    });
+}
+exports.check = check;
+function checkProject(pathStr) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const path = (0, path_1.resolve)(pathStr || process.argv[1] || process.cwd());
+        const name = (0, path_1.basename)(path);
+        const project = findProjectFile(path, 1);
+        const packages = getProjectPackages(project);
+        if (packages.length == 0) {
+            console.log(`[${name}]: No valid SFDX project, checking all cls files`);
+            const result = yield check(path);
+            return [Object.assign({ name, path: "." }, result)];
+        }
+        const projectDir = (0, path_1.dirname)(project);
+        const projectResult = yield Promise.all(packages
+            .map((pkg) => __awaiter(this, void 0, void 0, function* () {
+            console.log(`[${name}]: Checking package "${pkg}"`);
+            const pkgPath = (0, path_1.resolve)(projectDir, pkg);
+            const result = yield check(pkgPath);
+            return Object.assign({ name,
+                pkg, path: (0, path_1.relative)(path, pkgPath) }, result);
+        })));
+        process.exitCode = Math.max(...projectResult.map(r => r.status));
+        return projectResult;
+    });
+}
+exports.checkProject = checkProject;
+function parseFiles(path) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const files = yield dir.promiseFiles(path);
         let parsedCount = 0;
+        const errors = [];
         files.filter(name => name.endsWith(".cls")).forEach(file => {
-            if ((0, fs_2.lstatSync)(file).isFile()) {
+            if ((0, fs_1.lstatSync)(file).isFile()) {
                 const content = (0, fs_1.readFileSync)(file);
                 const lexer = new ApexLexer_1.ApexLexer(new CaseInsensitiveInputStream_1.CaseInsensitiveInputStream(antlr4ts_1.CharStreams.fromString(content.toString())));
                 const tokens = new antlr4ts_1.CommonTokenStream(lexer);
@@ -79,14 +137,44 @@ function check() {
                     parser.compilationUnit();
                 }
                 catch (err) {
-                    console.log(`Error parsing ${file}`);
+                    console.log(`Error parsing: ${file}`);
                     console.log(err);
+                    errors.push({
+                        path: (0, path_1.relative)(path, file),
+                        error: JSON.stringify(err)
+                    });
                 }
                 parsedCount += 1;
             }
         });
-        console.log(`Parsed ${parsedCount} files`);
+        console.log(`Parsed ${parsedCount} files in: ${path}`);
+        return errors;
     });
 }
-exports.check = check;
+function findProjectFile(wd, depth) {
+    const proj = "sfdx-project.json";
+    const files = (0, fs_1.readdirSync)(wd).filter(i => !(/(^|\/)\.[^\/\.]/g).test(i));
+    if (files.includes(proj)) {
+        return (0, path_1.resolve)(wd, proj);
+    }
+    if (depth) {
+        const dirs = files.map(f => (0, path_1.resolve)(wd, f)).filter(f => (0, fs_1.lstatSync)(f).isDirectory());
+        const newDepth = depth - 1;
+        for (const d of dirs) {
+            const p = findProjectFile(d, newDepth);
+            if (p) {
+                return p;
+            }
+        }
+    }
+    return undefined;
+}
+function getProjectPackages(projectFilePath) {
+    if (!projectFilePath) {
+        return [];
+    }
+    const config = JSON.parse((0, fs_1.readFileSync)(projectFilePath, { encoding: "utf8" }));
+    const packages = config.packageDirectories || [];
+    return packages.flatMap((p) => p.path ? p.path.replace(/\\/g, "/") : []);
+}
 //# sourceMappingURL=index.js.map

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;;;;;;;;;;;;;EA0BE;;;;;;;;;;;;;;;;;AAEF,+BAA8B;AAC9B,gCAA+B;AAC/B,2CAAwC;AACxC,6CAAyC;AACzC,6EAAyE;AACzE,uCAA0D;AAC1D,mEAAgE;AAChE,2BAAkC;AAClC,2BAA+B;AAE/B,8CAA2B;AAC3B,+CAA4B;AAC5B,+DAA4C;AAC5C,0DAAuC;AACvC,uDAAoC;AACpC,sDAAmC;AACnC,qCAA0C;AAAlC,6GAAA,iBAAiB,OAAA;AACzB,iEAA6D;AAArD,kHAAA,eAAe,OAAA;AAEvB,SAAgB,KAAK;IACjB,MAAM,IAAI,GAAG,IAAA,cAAO,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;IAEtD,GAAG,CAAC,KAAK,CAAC,IAAI,EAAE,UAAS,GAAG,EAAE,KAAK;QAC/B,IAAI,GAAG;YAAE,MAAM,GAAG,CAAC;QAEnB,IAAI,WAAW,GAAG,CAAC,CAAC;QACpB,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACvD,IAAI,IAAA,cAAS,EAAC,IAAI,CAAC,CAAC,MAAM,EAAE,EAAE;gBAC1B,MAAM,OAAO,GAAG,IAAA,iBAAY,EAAC,IAAI,CAAC,CAAC;gBACnC,MAAM,KAAK,GAAG,IAAI,qBAAS,CAAC,IAAI,uDAA0B,CAAC,sBAAW,CAAC,UAAU,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;gBACxG,MAAM,MAAM,GAAI,IAAI,4BAAiB,CAAC,KAAK,CAAC,CAAC;gBAE7C,MAAM,MAAM,GAAG,IAAI,uBAAU,CAAC,MAAM,CAAC,CAAC;gBACtC,MAAM,CAAC,oBAAoB,EAAE,CAAC;gBAC9B,MAAM,CAAC,gBAAgB,CAAC,IAAI,6CAAqB,EAAE,CAAC,CAAC;gBACrD,IAAI;oBACA,MAAM,CAAC,eAAe,EAAE,CAAC;iBAC5B;gBAAC,OAAO,GAAG,EAAE;oBACV,OAAO,CAAC,GAAG,CAAC,iBAAiB,IAAI,EAAE,CAAC,CAAC;oBACrC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;iBACpB;gBACD,WAAW,IAAI,CAAC,CAAC;aACpB;QACL,CAAC,CAAC,CAAA;QACF,OAAO,CAAC,GAAG,CAAC,UAAU,WAAW,QAAQ,CAAC,CAAC;IAC/C,CAAC,CAAC,CAAA;AACN,CAAC;AA3BD,sBA2BC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,18 +1,21 @@
 {
   "name": "@apexdevtools/apex-parser",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "author": "Apex Dev Tools Team <apexdevtools@gmail.com> (https://github.com/apex-dev-tools)",
   "bugs": "https://github.com/apex-dev-tools/apex-parser/issues",
   "description": "Javascript parser for Salesforce Apex Language",
   "main": "lib/index.js",
   "license": "BSD-3-Clause",
   "scripts": {
-    "build": "npm run antlr4ts && cp ../README.md . && tsc",
-    "test": "jest --config jestconfig.json lib",
     "antlr4ts": "npm run antlr-build && npm run antlr-patch",
     "antlr-build": "(cd antlr; antlr4ts -visitor -o ../src ApexLexer.g4 ApexParser.g4)",
     "antlr-patch": "node patch",
-    "check": "node -e require(\"./lib/index.js\").check()'"
+    "build": "npm run clean && npm run antlr4ts && cp ../*.md . && tsc",
+    "check": "node -e 'require(\"./lib/index.js\").check()'",
+    "clean": "rm -rf lib",
+    "test": "jest --config jestconfig.json lib",
+    "test-samples": "jest --config sys.jestconfig.json lib",
+    "test-snapshot": "npm run test-samples -- --updateSnapshot"
   },
   "files": [
     "lib/**/*"