@vscode/vsce 3.9.3-7 → 3.9.3-9

package/out/package.js

@@ -65,7 +65,7 @@ const cp = __importStar(require("child_process"));
 const yazl = __importStar(require("yazl"));
 const nls_1 = require("./nls");
 const util = __importStar(require("./util"));
-const glob_1 = require("glob");
+const tinyglobby_1 = require("tinyglobby");
 const minimatch_1 = require("minimatch");
 const parse5_1 = require("parse5");
 const marked_1 = require("marked");
@@ -1285,9 +1285,46 @@ const defaultIgnore = [
     '**/.vscode-test/**',
     '**/.vscode-test-web/**',
 ];
+/**
+ * `tinyglobby` skips symbolic links altogether when `followSymbolicLinks` is disabled, while
+ * vsce treats them as regular files instead (see the `--follow-symlinks` option). Presenting
+ * symbolic links to the crawler as regular files keeps them in the result without recursing
+ * into symlinked directories.
+ */
+const symlinksAsFilesFileSystem = {
+    readdir: (dir, options, callback) => fs.readdir(dir, options, (err, entries) => callback(err, err ? entries : entries.map(asFile))),
+    readdirSync: (dir, options) => fs.readdirSync(dir, options).map(asFile),
+};
+function asFile(entry) {
+    if (!entry.isSymbolicLink()) {
+        return entry;
+    }
+    return Object.create(entry, {
+        isFile: { value: () => true },
+        isDirectory: { value: () => false },
+        isSymbolicLink: { value: () => false },
+    });
+}
+/**
+ * `glob` matched patterns case-insensitively on Windows and macOS and case-sensitively
+ * everywhere else, based on `process.platform` rather than on the actual filesystem.
+ * `tinyglobby` always matches case-sensitively, so this keeps the previous behaviour, which
+ * matters for the `node_modules` folder being ignored regardless of how it is cased on disk.
+ * Keep this keyed off the platform: probing the filesystem instead would change what is
+ * packaged on case-sensitive macOS volumes and case-insensitive Linux mounts.
+ */
+const caseSensitiveMatch = process.platform !== 'win32' && process.platform !== 'darwin';
 async function collectAllFiles(cwd, dependencies, dependencyEntryPoints, followSymlinks = true) {
     const deps = await (0, npm_1.getDependencies)(cwd, dependencies, dependencyEntryPoints);
-    const promises = deps.map(dep => (0, glob_1.glob)('**', { cwd: dep, nodir: true, follow: followSymlinks, dot: true, ignore: 'node_modules/**' }).then(files => files.map(f => path.relative(cwd, path.join(dep, f))).map(f => f.replace(/\\/g, '/'))));
+    const promises = deps.map(dep => (0, tinyglobby_1.glob)('**', {
+        cwd: dep,
+        onlyFiles: true,
+        followSymbolicLinks: followSymlinks,
+        fs: followSymlinks ? undefined : symlinksAsFilesFileSystem,
+        caseSensitiveMatch,
+        dot: true,
+        ignore: ['node_modules/**'],
+    }).then(files => files.map(f => path.relative(cwd, path.join(dep, f))).map(f => f.replace(/\\/g, '/'))));
     return Promise.all(promises).then(util.flatten);
 }
 function getDependenciesOption(options) {

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-7",
+	"version": "3.9.3-9",
 	"description": "VS Code Extensions Manager",
 	"repository": {
 		"type": "git",
@@ -41,16 +41,17 @@
 	"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",
 		"cockatiel": "^3.1.2",
 		"commander": "^12.1.0",
 		"form-data": "^4.0.0",
-		"glob": "^13.0.6",
 		"hosted-git-info": "^4.0.2",
 		"jsonc-parser": "^3.2.0",
 		"leven": "^3.1.0",
@@ -61,6 +62,7 @@
 		"parse5": "^8.0.1",
 		"read": "^1.0.7",
 		"semver": "^7.5.2",
+		"tinyglobby": "^0.2.17",
 		"typed-rest-client": "^1.8.4",
 		"url-join": "^4.0.1",
 		"xml2js": "^0.5.0",
@@ -73,6 +75,7 @@
 		"@types/mime": "^1",
 		"@types/mocha": "^7.0.2",
 		"@types/node": "^22.0.0",
+		"@types/picomatch": "^4.0.3",
 		"@types/read": "^0.0.28",
 		"@types/semver": "^6.0.0",
 		"@types/url-join": "^4.0.1",