@vscode/vsce 3.0.1-2 → 3.0.1-4

package/out/package.js

@@ -1449,7 +1449,7 @@ async function ls(options = {}) {
     const manifest = await readManifest(cwd);
     const files = await listFiles({ ...options, cwd, manifest });
     if (options.tree) {
-        const printableFileStructure = await util.generateFileStructureTree(getDefaultPackageName(manifest, options), files.map(f => ({ origin: f, tree: f })));
+        const printableFileStructure = await util.generateFileStructureTree(getDefaultPackageName(manifest, options), files.map(f => ({ origin: path.join(cwd, f), tree: f })));
         console.log(printableFileStructure.join('\n'));
     }
     else {
@@ -1491,15 +1491,28 @@ async function printAndValidatePackagedFiles(files, cwd, manifest, options) {
     // Throw an error if the extension uses the files property in package.json and 
     // the package does not include at least one file for each include pattern
     else if (manifest.files !== undefined && manifest.files.length > 0 && !options.allowUnusedFilesPattern) {
-        const originalFilePaths = files.map(f => util.vsixPathToFilePath(f.path));
-        const unusedIncludePatterns = manifest.files.filter(includePattern => !originalFilePaths.some(filePath => (0, minimatch_1.default)(filePath, includePattern, MinimatchOptions)));
+        const localPaths = files.filter(f => !isInMemoryFile(f)).map(f => util.normalize(f.localPath));
+        const filesIncludePatterns = manifest.files.map(includePattern => util.normalize(path.join(cwd, includePattern)));
+        const unusedIncludePatterns = filesIncludePatterns.filter(includePattern => {
+            // Check if the pattern provided by the user matches any file in the package
+            if (localPaths.some(localFilePath => (0, minimatch_1.default)(localFilePath, includePattern, MinimatchOptions))) {
+                return false;
+            }
+            // Check if the pattern provided by the user matches any folder in the package
+            if (!/(^|\/)[^/]*\*[^/]*$/.test(includePattern)) {
+                includePattern = (/\/$/.test(includePattern) ? `${includePattern}**` : `${includePattern}/**`);
+                return !localPaths.some(localFilePath => (0, minimatch_1.default)(localFilePath, includePattern, MinimatchOptions));
+            }
+            // Pattern does not match any file or folder
+            return true;
+        });
         if (unusedIncludePatterns.length > 0) {
             let message = '';
             message += `The following include patterns in the ${chalk_1.default.bold('"files"')} property in package.json do not match any files packaged in the extension:\n`;
             message += unusedIncludePatterns.map(p => `  - ${p}`).join('\n');
             message += '\nRemove any include pattern which is not needed.\n';
             message += `\n=> Run ${chalk_1.default.bold('vsce ls --tree')} to see all included files.\n`;
-            message += `=> Use ${chalk_1.default.bold('--allow-unused-files-patterns')} to skip this check`;
+            message += `=> Use ${chalk_1.default.bold('--allow-unused-files-pattern')} to skip this check`;
             util.log.error(message);
             process.exit(1);
         }
@@ -1507,7 +1520,7 @@ async function printAndValidatePackagedFiles(files, cwd, manifest, options) {
     // Print the files included in the package
     const printableFileStructure = await util.generateFileStructureTree(getDefaultPackageName(manifest, options), files.map(f => ({
         // File path relative to the extension root
-        origin: util.vsixPathToFilePath(f.path),
+        origin: !isInMemoryFile(f) ? f.localPath : util.vsixPathToFilePath(f.path),
         // File path in the VSIX
         tree: f.path
     })), 35 // Print up to 35 files/folders

package/out/util.js

@@ -281,6 +281,9 @@ async function generateFileStructureTree(rootFolder, filePaths, printLinesLimit
         const parts = filePath.split('/');
         let currentLevel = folderTree;
         parts.forEach(part => {
+            if (currentLevel === undefined) {
+                throw new Error(`currentLevel is undefined for ${part} in ${filePath}`);
+            }
             if (typeof currentLevel[part] === 'number') {
                 currentLevel[part] = size;
             }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vscode/vsce",
-	"version": "3.0.1-2",
+	"version": "3.0.1-4",
 	"description": "VS Code Extensions Manager",
 	"repository": {
 		"type": "git",