address pr feedback

Author: bmiddha

.github/workflows/ci.yml

@@ -95,3 +95,7 @@ jobs:
       - name: Rush test (rush-lib)
         run: node ${{ github.workspace }}/repo-a/apps/rush/lib/start-dev.js test --verbose --production --timeline
         working-directory: repo-b
+
+      - name: Rush test (rush-lib) again to verify build cache hits
+        run: node ${{ github.workspace }}/repo-a/apps/rush/lib/start-dev.js test --verbose --production --timeline
+        working-directory: repo-b

apps/zipsync/eslint.config.js

@@ -13,9 +13,6 @@ module.exports = [
       parserOptions: {
         tsconfigRootDir: __dirname
       }
-    },
-    rules: {
-      'no-console': 'off'
     }
   }
 ];

apps/zipsync/package.json

@@ -21,13 +21,11 @@
     "@rushstack/node-core-library": "workspace:*",
     "@rushstack/terminal": "workspace:*",
     "@rushstack/ts-command-line": "workspace:*",
-    "semver": "~7.5.4",
     "typescript": "~5.8.2",
     "@rushstack/lookup-by-path": "workspace:*"
   },
   "devDependencies": {
     "@rushstack/heft": "workspace:*",
-    "@types/semver": "7.5.0",
     "eslint": "~9.25.1",
     "local-node-rig": "workspace:*"
   }

apps/zipsync/src/ZipSyncCommandLineParser.ts

@@ -10,7 +10,6 @@ import type {
   CommandLineChoiceParameter
 } from '@rushstack/ts-command-line/lib/index';
 import { InternalError } from '@rushstack/node-core-library/lib/InternalError';
-import { Colorize } from '@rushstack/terminal/lib/Colorize';
 import type { ConsoleTerminalProvider } from '@rushstack/terminal/lib/ConsoleTerminalProvider';
 import type { ITerminal } from '@rushstack/terminal/lib/ITerminal';
 
@@ -110,11 +109,7 @@ export class ZipSyncCommandLineParser extends CommandLineParser {
         compression: (this._compressionParameter.value as 'store' | 'deflate' | 'auto' | undefined) ?? 'auto'
       });
     } catch (error) {
-      if (this._debugParameter.value) {
-        console.error('\n' + error.stack);
-      } else {
-        console.error('\n' + Colorize.red('ERROR: ' + error.message.trim()));
-      }
+      this._terminal.writeErrorLine('\n' + error.stack);
     }
   }
 }

apps/zipsync/src/benchmark.test.ts

@@ -1,5 +1,6 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
+/* eslint-disable no-console */
 
 import { execSync } from 'child_process';
 import { tmpdir } from 'os';

apps/zipsync/src/crc32.test.ts

@@ -7,6 +7,7 @@ import * as zlib from 'zlib';
 describe('crc32', () => {
   it('fallbackCrc32 should match zlib.crc32', () => {
     if (!zlib.crc32) {
+      // eslint-disable-next-line no-console
       console.log('Skipping test because zlib.crc32 is not available in this Node.js version');
       return;
     }

apps/zipsync/src/crc32.ts

@@ -1,7 +1,7 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import * as zlib from 'zlib';
+import * as zlib from 'node:zlib';
 
 let crcTable: Uint32Array | undefined;
 
@@ -35,11 +35,5 @@ export function fallbackCrc32(data: Buffer<ArrayBufferLike>, value: number = 0):
   return value;
 }
 
-export function crc32Builder(data: Buffer<ArrayBufferLike>, value: number = 0): number {
-  if (zlib.crc32) {
-    return zlib.crc32(data, value);
-  } else {
-    // Fallback implementation for Node.js versions older than 20
-    return fallbackCrc32(data, value);
-  }
-}
+export const crc32Builder: (data: Buffer<ArrayBufferLike>, value?: number) => number =
+  zlib.crc32 ?? fallbackCrc32;

apps/zipsync/src/start.ts

@@ -1,10 +1,10 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
-import { version } from '../package.json';
 import { ConsoleTerminalProvider } from '@rushstack/terminal/lib/ConsoleTerminalProvider';
 import { Terminal } from '@rushstack/terminal/lib/Terminal';
 
+import { version } from '../package.json';
 import { ZipSyncCommandLineParser } from './ZipSyncCommandLineParser';
 
 const toolVersion: string = version;

apps/zipsync/src/zipSync.ts

@@ -1,11 +1,11 @@
 // Copyright (c) Microsoft Corporation. All rights reserved. Licensed under the MIT license.
 // See LICENSE in the project root for license information.
 
+import * as fs from 'node:fs';
+import * as path from 'node:path';
+import * as crypto from 'node:crypto';
+import * as zlib from 'node:zlib';
 import type { ITerminal } from '@rushstack/terminal/lib/ITerminal';
-import * as fs from 'fs';
-import * as path from 'path';
-import * as crypto from 'crypto';
-import * as zlib from 'zlib';
 import { type IReadonlyPathTrieNode, LookupByPath } from '@rushstack/lookup-by-path/lib/LookupByPath';
 import { crc32Builder } from './crc32';
 import { DISPOSE_SYMBOL, getDisposableFileHandle, type IDisposableFileHandle } from './disposableFileHandle';
@@ -24,7 +24,8 @@ import {
   type ZipMetaCompressionMethod,
   type IEndOfCentralDirectory,
   type ICentralDirectoryHeaderParseResult,
-  type IFileEntry
+  type IFileEntry,
+  dosDateTime
 } from './zipUtils';
 
 const METADATA_FILENAME: string = '__zipsync_metadata__.json';
@@ -192,7 +193,13 @@ export function zipSync<T extends IZipSyncOptions>(
       }
       currentOffset += offset;
     }
+    function writeChunksToZip(chunks: Uint8Array[]): void {
+      for (const chunk of chunks) {
+        writeChunkToZip(chunk);
+      }
+    }
 
+    const dosDateTimeNow: { time: number; date: number } = dosDateTime(new Date());
     function writeFileEntry(relativePath: string): IFileEntry {
       function isLikelyAlreadyCompressed(filename: string): boolean {
         return LIKELY_COMPRESSED_EXTENSION_REGEX.test(filename.toLowerCase());
@@ -244,10 +251,11 @@ export function zipSync<T extends IZipSyncOptions>(
         crc32: 0,
         sha1Hash: '',
         localHeaderOffset: currentOffset,
-        compressionMethod
+        compressionMethod,
+        dosDateTime: dosDateTimeNow
       };
 
-      writeChunkToZip(writeLocalFileHeader(entry));
+      writeChunksToZip(writeLocalFileHeader(entry));
 
       const sha1HashBuilder: crypto.Hash = crypto.createHash('sha1');
       let crc32: number = 0;
@@ -350,10 +358,11 @@ export function zipSync<T extends IZipSyncOptions>(
       crc32: crc32Builder(metadataBuffer),
       sha1Hash: calculateSHA1(metadataBuffer),
       localHeaderOffset: currentOffset,
-      compressionMethod: metadataCompressionMethod
+      compressionMethod: metadataCompressionMethod,
+      dosDateTime: dosDateTimeNow
     };
 
-    writeChunkToZip(writeLocalFileHeader(metadataEntry));
+    writeChunksToZip(writeLocalFileHeader(metadataEntry));
     writeChunkToZip(metadataData, metadataCompressedSize);
     writeChunkToZip(writeDataDescriptor(metadataEntry));
 
@@ -371,26 +380,15 @@ export function zipSync<T extends IZipSyncOptions>(
 
       markStart('pack.write.centralDirectory');
       const centralDirOffset: number = currentOffset;
-      let centralDirSize: number = 0;
-
       for (const entry of entries) {
-        const centralHeader: Buffer = writeCentralDirectoryHeader(entry);
-        fs.writeSync(zipFile, centralHeader);
-        centralDirSize += centralHeader.length;
+        writeChunksToZip(writeCentralDirectoryHeader(entry));
       }
-      terminal.writeDebugLine(
-        `Central directory written (offset=${centralDirOffset}, size=${centralDirSize})`
-      );
+      const centralDirSize: number = currentOffset - centralDirOffset;
       markEnd('pack.write.centralDirectory');
 
       // Write end of central directory
       markStart('pack.write.eocd');
-      const endOfCentralDir: Buffer = writeEndOfCentralDirectory(
-        centralDirOffset,
-        centralDirSize,
-        entries.length
-      );
-      fs.writeSync(zipFile, endOfCentralDir);
+      writeChunkToZip(writeEndOfCentralDirectory(centralDirOffset, centralDirSize, entries.length));
       terminal.writeDebugLine('EOCD record written');
       markEnd('pack.write.eocd');
     } finally {