@vscode/vsce 3.9.3-8 → 3.9.3-9

package/out/secretLint.js

@@ -41,6 +41,7 @@ exports.lintText = lintText;
 exports.getRuleNameFromRuleId = getRuleNameFromRuleId;
 exports.prettyPrintLintResult = prettyPrintLintResult;
 const chalk_1 = __importDefault(require("chalk"));
+const os = __importStar(require("os"));
 const path = __importStar(require("path"));
 const url_1 = require("url");
 const util_1 = require("./util");
@@ -79,59 +80,92 @@ const dotEnvRules = [
         id: "@secretlint/secretlint-rule-no-dotenv"
     }
 ];
-async function getEngine(scanSecrets, scanDotEnv) {
-    const { createEngine } = require("@secretlint/node");
+async function getConfig(scanSecrets, scanDotEnv) {
+    const [{ creator: recommend }, { creator: noDotenv }] = await Promise.all([
+        importSecretLintRule("@secretlint/secretlint-rule-preset-recommend"),
+        importSecretLintRule("@secretlint/secretlint-rule-no-dotenv")
+    ]);
     const rules = [];
     if (scanSecrets) {
-        rules.push(...secretsScanningRules);
+        rules.push({
+            ...secretsScanningRules[0],
+            rule: recommend
+        });
     }
     if (scanDotEnv) {
-        rules.push(...dotEnvRules);
+        rules.push({
+            ...dotEnvRules[0],
+            rule: noDotenv
+        });
     }
-    const lintOptions = {
-        configFileJSON: { rules: rules },
-        formatter: "json",
-        color: true,
-        maskSecrets: false
-    };
-    const engine = await createEngine(lintOptions);
-    return engine;
+    return { rules };
+}
+function importSecretLintRule(packageName) {
+    return import(packageName);
+}
+async function mapConcurrently(values, mapper) {
+    const results = new Array(values.length);
+    let nextIndex = 0;
+    async function worker() {
+        while (nextIndex < values.length) {
+            const index = nextIndex++;
+            results[index] = await mapper(values[index]);
+        }
+    }
+    const workerCount = Math.min(os.availableParallelism(), values.length);
+    await Promise.all(Array.from({ length: workerCount }, worker));
+    return results;
 }
 async function lintFiles(filePaths, scanSecrets, scanDotEnv) {
-    const engine = await getEngine(scanSecrets, scanDotEnv);
-    let engineResult;
+    let results;
     try {
-        engineResult = await engine.executeOnFiles({
-            filePathList: filePaths
-        });
+        const [{ lintSource }, { createRawSource }, config] = await Promise.all([
+            import("@secretlint/core"),
+            import("@secretlint/source-creator"),
+            getConfig(scanSecrets, scanDotEnv)
+        ]);
+        results = await mapConcurrently(filePaths, async (filePath) => lintSource({
+            source: await createRawSource(filePath),
+            options: {
+                config,
+                maskSecrets: false
+            }
+        }));
     }
     catch (error) {
         util_1.log.error('Error occurred while scanning secrets (files):', error);
         process.exit(1);
     }
-    return parseResult(engineResult);
+    return parseResult(results);
 }
 async function lintText(content, fileName, scanSecrets, scanDotEnv) {
-    const engine = await getEngine(scanSecrets, scanDotEnv);
-    let engineResult;
+    let result;
     try {
-        engineResult = await engine.executeOnContent({
-            content,
-            filePath: fileName
+        const [{ lintSource }, config] = await Promise.all([
+            import("@secretlint/core"),
+            getConfig(scanSecrets, scanDotEnv)
+        ]);
+        result = await lintSource({
+            source: {
+                content,
+                filePath: fileName,
+                ext: path.extname(fileName),
+                contentType: "text"
+            },
+            options: {
+                config,
+                maskSecrets: false
+            }
         });
     }
     catch (error) {
         util_1.log.error('Error occurred while scanning secrets (content):', error);
         process.exit(1);
     }
-    return parseResult(engineResult);
+    return parseResult([result]);
 }
-function parseResult(result) {
-    const output = JSON.parse(result.output);
-    if (!Array.isArray(output) || !output.every(isSecretLintFileResult)) {
-        throw new Error("Unexpected output from secretlint");
-    }
-    const results = output.flatMap(fileResult => fileResult.messages.map((message) => ({
+function parseResult(fileResults) {
+    const results = fileResults.flatMap(fileResult => fileResult.messages.map((message) => ({
         message: message.message,
         ruleId: message.ruleParentId ? `${message.ruleParentId} > ${message.ruleId}` : message.ruleId,
         level: message.severity === "info" ? "note" : message.severity,
@@ -143,31 +177,10 @@ function parseResult(result) {
         endLine: fixLine(message.loc.end.line),
         endColumn: fixColumn(message.loc.end.column)
     })));
-    return { ok: result.ok, results };
-}
-function isSecretLintFileResult(value) {
-    return isRecord(value)
-        && typeof value.filePath === "string"
-        && Array.isArray(value.messages)
-        && value.messages.every(isSecretLintMessage);
-}
-function isSecretLintMessage(value) {
-    return isRecord(value)
-        && typeof value.message === "string"
-        && typeof value.ruleId === "string"
-        && (value.ruleParentId === undefined || typeof value.ruleParentId === "string")
-        && isRecord(value.loc)
-        && isSecretLintPosition(value.loc.start)
-        && isSecretLintPosition(value.loc.end)
-        && (value.severity === "error" || value.severity === "warning" || value.severity === "info");
-}
-function isSecretLintPosition(value) {
-    return isRecord(value)
-        && (value.line === null || typeof value.line === "number")
-        && (value.column === null || typeof value.column === "number");
-}
-function isRecord(value) {
-    return typeof value === "object" && value !== null;
+    return {
+        ok: !fileResults.some(fileResult => fileResult.messages.some(message => message.severity === "error")),
+        results
+    };
 }
 function fixLine(value) {
     return value === null ? undefined : value === 0 ? 1 : value;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vscode/vsce",
-	"version": "3.9.3-8",
+	"version": "3.9.3-9",
 	"description": "VS Code Extensions Manager",
 	"repository": {
 		"type": "git",
@@ -41,9 +41,11 @@
 	"dependencies": {
 		"@azure/identity": "^4.1.0",
 		"@napi-rs/keyring": "^1.3.0",
-		"@secretlint/node": "^10.1.2",
+		"@secretlint/core": "^10.1.2",
 		"@secretlint/secretlint-rule-no-dotenv": "^10.1.2",
 		"@secretlint/secretlint-rule-preset-recommend": "^10.1.2",
+		"@secretlint/source-creator": "^10.1.2",
+		"@secretlint/types": "^10.1.2",
 		"@vscode/vsce-sign": "^2.0.0",
 		"azure-devops-node-api": "^12.5.0",
 		"chalk": "^4.1.2",