Unminify CDS extractor bundle

Author: data-douser

extractors/cds/tools/dist/cds-extractor.bundle.js

@@ -62,7 +62,9 @@ const buildOptions = {
   logLevel: 'info',
   // Ensure proper module resolution
   mainFields: ['main', 'module'],
-  minify: true,
+  minifyIdentifiers: false,
+  minifySyntax: false,
+  minifyWhitespace: false,
   outfile: 'dist/cds-extractor.bundle.js',
   platform: 'node',
   // Plugin to handle shell-quote module resolution
@@ -71,6 +73,7 @@ const buildOptions = {
   resolveExtensions: ['.ts', '.js'],
   sourcemap: true,
   target: NODE_VERSION_TARGET,
+  treeShaking: true,
 };
 
 async function build() {

extractors/cds/tools/dist/cds-extractor.bundle.js.map

@@ -1,8 +1,6 @@
 import { execFileSync } from 'child_process';
 import { resolve } from 'path';
 
-import { quote } from 'shell-quote';
-
 import { cdsExtractorLog } from './logging';
 
 /**
@@ -36,9 +34,6 @@ function addDiagnostic(
   logPrefix: string,
 ): boolean {
   try {
-    // Use shell-quote to safely escape the message
-    const escapedMessage = quote([message]);
-
     execFileSync(codeqlExePath, [
       'database',
       'add-diagnostic',
@@ -47,7 +42,7 @@ function addDiagnostic(
       `--source-id=${sourceId}`,
       `--source-name=${sourceName}`,
       `--severity=${severity}`,
-      `--markdown-message=${escapedMessage.slice(1, -1)}`, // Remove the added quotes from shell-quote
+      `--markdown-message=${message}`,
       `--file-path=${resolve(filePath)}`,
       '--',
       `${process.env.CODEQL_EXTRACTOR_CDS_WIP_DATABASE ?? ''}`,

extractors/cds/tools/esbuild.config.mjs

@@ -1,7 +1,5 @@
 import { execSync } from 'child_process';
 
-import { quote } from 'shell-quote';
-
 import type { SemanticVersion } from './types';
 import { cdsExtractorLog } from '../logging';
 
@@ -11,6 +9,9 @@ import { cdsExtractorLog } from '../logging';
  */
 const availableVersionsCache = new Map<string, string[]>();
 
+// Define the set of allowed npm packages for which we cache versions.
+type CachedPackageName = '@sap/cds' | '@sap/cds-dk';
+
 /**
  * Cache statistics for debugging purposes
  */
@@ -128,11 +129,12 @@ export function findBestAvailableVersion(
 }
 
 /**
- * Get available versions for an npm package with caching to avoid duplicate npm view calls
- * @param packageName Name of the npm package
+ * Get available versions for an npm package with caching to avoid duplicate
+ * calls of the `npm view` command.
+ * @param packageName The {@link CachedPackageName} for which to get versions
  * @returns Array of available version strings
  */
-export function getAvailableVersions(packageName: string): string[] {
+export function getAvailableVersions(packageName: CachedPackageName): string[] {
   // Check cache first
   if (availableVersionsCache.has(packageName)) {
     cacheStats.hits++;
@@ -142,9 +144,7 @@ export function getAvailableVersions(packageName: string): string[] {
   // Cache miss - fetch from npm
   cacheStats.misses++;
   try {
-    // Use shell-quote to properly escape the package name to prevent injection
-    const escapedPackageName = quote([packageName]);
-    const output = execSync(`npm view ${escapedPackageName} versions --json`, {
+    const output = execSync(`npm view ${packageName} versions --json`, {
       encoding: 'utf8',
       timeout: 30000, // 30 second timeout
     });

extractors/cds/tools/src/diagnostics.ts

@@ -70,7 +70,7 @@ describe('diagnostics', () => {
 
       // Mock error during execution
       (childProcess.execFileSync as jest.Mock).mockImplementation(() => {
-        throw new Error('Failed to add diagnostic');
+        throw new Error('Message: Failed to add diagnostic');
       });
 
       // Mock console.error
@@ -94,7 +94,7 @@ describe('diagnostics', () => {
   describe('addJavaScriptExtractorDiagnostic', () => {
     it('should add JavaScript extractor diagnostic successfully', () => {
       const filePath = '/path/to/source/root';
-      const errorMessage = 'JavaScript extractor failed';
+      const errorMessage = 'Message: JavaScript extracutor failed';
       const codeqlExePath = '/path/to/codeql';
 
       // Mock process.env to include necessary environment variable

extractors/cds/tools/src/packageManager/versionResolver.ts

@@ -5,7 +5,7 @@ const os = require('os');
 const path = require('path');
 
 const DEFAULT_TIMEOUT_MS = 5000; // Default timeout for execution in milliseconds
-const MAX_BUNDLE_SIZE_MB = 50; // Set a reasonable max bundle size
+const MAX_BUNDLE_SIZE_MB = 0.5; // We expect the bundle to be quite small
 
 const bundlePath = path.join(__dirname, 'dist', 'cds-extractor.bundle.js');