portapack 0.2.1 → 0.3.0

package/tests/unit/utils/logger.test.ts

@@ -51,28 +51,29 @@ describe('Logger', () => {
         it('creates a logger with default log level INFO', () => {
             const logger = new Logger();
             expect(logger).toBeDefined();
-            // @ts-expect-error Access private member for testing
-            expect(logger.level).toBe(LogLevel.INFO);
+            // REMOVED: @ts-expect-error Access private member for testing (No longer needed)
+            expect((logger as any).level).toBe(LogLevel.INFO); // Cast to any if 'level' is truly private and inaccessible
+                                                               // Or make 'level' public/internal for testing if appropriate
         });
 
         it('creates a logger with specific log level', () => {
             const logger = new Logger(LogLevel.DEBUG);
             expect(logger).toBeDefined();
-            // @ts-expect-error Access private member for testing
-            expect(logger.level).toBe(LogLevel.DEBUG);
+            // REMOVED: @ts-expect-error Access private member for testing (No longer needed)
+            expect((logger as any).level).toBe(LogLevel.DEBUG);
         });
 
         // Test constructor guards against invalid levels
         it('defaults to INFO if constructor receives invalid level', () => {
-             // @ts-expect-error Testing invalid input
+             // @ts-expect-error Testing invalid input (KEEP this one if Logger constructor expects LogLevel)
              const logger = new Logger(99);
-             // @ts-expect-error Access private member for testing
-             expect(logger.level).toBe(LogLevel.INFO);
+             // REMOVED: @ts-expect-error Access private member for testing (No longer needed)
+             expect((logger as any).level).toBe(LogLevel.INFO);
         });
          it('defaults to INFO if constructor receives undefined', () => {
              const logger = new Logger(undefined);
-             // @ts-expect-error Access private member for testing
-             expect(logger.level).toBe(LogLevel.INFO);
+             // REMOVED: @ts-expect-error Access private member for testing (No longer needed)
+             expect((logger as any).level).toBe(LogLevel.INFO);
          });
     });
 
@@ -106,6 +107,7 @@ describe('Logger', () => {
              expect(mockError).toHaveBeenCalledTimes(1);
 
              mockWarn.mockClear();
+             mockError.mockClear(); // Clear mockError too for the next check
              loggerError.warn('Test warn error level'); // Should not log
              expect(mockWarn).not.toHaveBeenCalled();
         });
@@ -121,6 +123,7 @@ describe('Logger', () => {
              expect(mockWarn).toHaveBeenCalledTimes(1);
 
              mockInfo.mockClear();
+             mockWarn.mockClear(); // Clear mockWarn too
              loggerWarn.info('Test info warn level'); // Should not log
              expect(mockInfo).not.toHaveBeenCalled();
         });
@@ -136,6 +139,7 @@ describe('Logger', () => {
              expect(mockInfo).toHaveBeenCalledTimes(1);
 
              mockDebug.mockClear();
+             mockInfo.mockClear(); // Clear mockInfo too
              loggerInfo.debug('Test debug info level'); // Should not log
              expect(mockDebug).not.toHaveBeenCalled();
         });
@@ -198,26 +202,26 @@ describe('Logger', () => {
         describe('Logger.fromVerboseFlag()', () => {
              it('creates logger with DEBUG level if verbose is true', () => {
                  const logger = Logger.fromVerboseFlag({ verbose: true });
-                 // @ts-expect-error Access private member
-                 expect(logger.level).toBe(LogLevel.DEBUG);
+                 // REMOVED: @ts-expect-error Access private member (No longer needed)
+                 expect((logger as any).level).toBe(LogLevel.DEBUG);
              });
 
              it('creates logger with INFO level if verbose is false', () => {
                   const logger = Logger.fromVerboseFlag({ verbose: false });
-                  // @ts-expect-error Access private member
-                  expect(logger.level).toBe(LogLevel.INFO);
+                  // REMOVED: @ts-expect-error Access private member (No longer needed)
+                  expect((logger as any).level).toBe(LogLevel.INFO);
              });
 
              it('creates logger with INFO level if verbose is undefined', () => {
                   const logger = Logger.fromVerboseFlag({}); // Empty options
-                  // @ts-expect-error Access private member
-                  expect(logger.level).toBe(LogLevel.INFO);
+                  // REMOVED: @ts-expect-error Access private member (No longer needed)
+                  expect((logger as any).level).toBe(LogLevel.INFO);
              });
 
               it('creates logger with INFO level if options is undefined', () => {
                    const logger = Logger.fromVerboseFlag(); // No options arg
-                   // @ts-expect-error Access private member
-                   expect(logger.level).toBe(LogLevel.INFO);
+                   // REMOVED: @ts-expect-error Access private member (No longer needed)
+                   expect((logger as any).level).toBe(LogLevel.INFO);
               });
         });
 
@@ -233,30 +237,30 @@ describe('Logger', () => {
                  ['InFo', LogLevel.INFO],
              ])('creates logger with correct level for valid name "%s"', (name, expectedLevel) => {
                  const logger = Logger.fromLevelName(name);
-                  // @ts-expect-error Access private member
-                  expect(logger.level).toBe(expectedLevel);
+                  // REMOVED: @ts-expect-error Access private member (No longer needed)
+                  expect((logger as any).level).toBe(expectedLevel);
                   expect(mockWarn).not.toHaveBeenCalled(); // No warning for valid names
              });
 
              it('defaults to INFO level if levelName is undefined', () => {
                   const logger = Logger.fromLevelName(undefined);
-                  // @ts-expect-error Access private member
-                  expect(logger.level).toBe(LogLevel.INFO);
+                  // REMOVED: @ts-expect-error Access private member (No longer needed)
+                  expect((logger as any).level).toBe(LogLevel.INFO);
                    expect(mockWarn).not.toHaveBeenCalled();
              });
 
               it('uses provided defaultLevel if levelName is undefined', () => {
                    const logger = Logger.fromLevelName(undefined, LogLevel.WARN);
-                   // @ts-expect-error Access private member
-                   expect(logger.level).toBe(LogLevel.WARN);
+                   // REMOVED: @ts-expect-error Access private member (No longer needed)
+                   expect((logger as any).level).toBe(LogLevel.WARN);
                     expect(mockWarn).not.toHaveBeenCalled();
               });
 
 
              it('defaults to INFO level and logs warning for invalid name', () => {
                   const logger = Logger.fromLevelName('invalidLevel');
-                  // @ts-expect-error Access private member
-                  expect(logger.level).toBe(LogLevel.INFO); // Falls back to default INFO
+                  // REMOVED: @ts-expect-error Access private member (No longer needed)
+                  expect((logger as any).level).toBe(LogLevel.INFO); // Falls back to default INFO
                   // Check that console.warn was called *directly* by the static method
                    expect(mockWarn).toHaveBeenCalledTimes(1);
                    expect(mockWarn).toHaveBeenCalledWith(expect.stringContaining('[Logger] Invalid log level name "invalidLevel". Defaulting to INFO.'));
@@ -264,12 +268,12 @@ describe('Logger', () => {
 
              it('uses provided defaultLevel and logs warning for invalid name', () => {
                   const logger = Logger.fromLevelName('invalidLevel', LogLevel.ERROR);
-                  // @ts-expect-error Access private member
-                  expect(logger.level).toBe(LogLevel.ERROR); // Falls back to provided default ERROR
+                  // REMOVED: @ts-expect-error Access private member (No longer needed)
+                  expect((logger as any).level).toBe(LogLevel.ERROR); // Falls back to provided default ERROR
                   // Check that console.warn was called *directly* by the static method
                   expect(mockWarn).toHaveBeenCalledTimes(1);
                   expect(mockWarn).toHaveBeenCalledWith(expect.stringContaining('[Logger] Invalid log level name "invalidLevel". Defaulting to ERROR.'));
              });
         });
     });
-});
+});

package/tsconfig.jest.json

@@ -1,16 +1,16 @@
 {
   "extends": "./tsconfig.json",
   "compilerOptions": {
-    "module": "NodeNext", // Recommended for Jest ESM
-    "moduleResolution": "NodeNext", // Recommended for Jest ESM
-    "isolatedModules": true, // Addresses ts-jest warning
+    "module": "CommonJS",
+    "moduleResolution": "Node", // Use classic Node resolution for CommonJS
+    "isolatedModules": false, // Often better to set false when using CommonJS/ts-jest
     "esModuleInterop": true,
     "allowSyntheticDefaultImports": true,
     "sourceMap": true,
-    "noEmit": true, // Jest/ts-jest handles output
-    // Ensure target/lib/strict etc. are compatible with your code
-    "target": "ES2022",
-    "lib": ["es2022", "dom"]
+    "noEmit": true,
+    "target": "ES2022", // Keep target if your Node version supports it
+    "lib": ["es2022", "dom"],
+    "skipLibCheck": true // Add this if not present
   },
   "include": ["src/**/*", "tests/**/*"],
   "exclude": ["node_modules", "dist"]

package/tsup.config.ts

@@ -1,71 +1,76 @@
 /**
  * @file tsup.config.ts
  * @description
- * Build configuration for tsup bundler.
- * Configures:
- * - Separate CLI and API builds
- * - ESM output for Node.js
- * - TypeScript declaration files for API only
- * - Source maps for debugging
- * - Shebang for CLI binary
+ * Dual build configuration for PortaPack:
+ *
+ * 🔹 CLI Build:
+ *   - CommonJS format (`cjs`) for CLI compatibility with Node/npx
+ *   - .cjs file extension to avoid ESM interpretation issues
+ *   - Shebang (`#!/usr/bin/env node`) for executability
+ *   - No type declarations
+ *
+ * 🔹 API Build:
+ *   - ESModule format (`esm`) for modern module usage
+ *   - Generates type declarations (`.d.ts`)
+ *   - Outputs to dist/ without interfering with CLI
  */
 
 import { defineConfig } from 'tsup';
 
 export default defineConfig([
+  // 🔹 CLI BUILD (CJS + .cjs + shebang)
   {
-    // CLI build configuration
     entry: {
-      'cli-entry': 'src/cli/cli-entry.ts',  // Entry point for CLI binary
+      'cli-entry': 'src/cli/cli-entry.ts',
     },
-    format: ['esm'],
-    target: 'node18',
+    outDir: 'dist/cli',
+    format: ['cjs'],                     // ✅ Required for CLI to work with npx
     platform: 'node',
+    target: 'node18',
     splitting: false,
-    clean: true,                  // Clean the output directory
-    dts: false,                   // No types for CLI output
+    clean: true,                         // Wipe dist/cli clean on each build
+    dts: false,                          // No types for CLI
     sourcemap: true,
-    outDir: 'dist/cli',
     banner: {
-      js: '#!/usr/bin/env node',  // Include shebang for CLI executable
+      js: '#!/usr/bin/env node',         // ✅ Required for CLI shebang
     },
-    outExtension({ format }) {
+    outExtension() {
       return {
-        js: '.js',  // Keep .js extension for ESM imports
+        js: '.cjs',                      // ✅ Required: prevents ESM misinterpretation
       };
     },
     esbuildOptions(options) {
-      // Make sure to preserve import.meta.url
+      // Support import.meta in case CLI uses it
       options.supported = {
         ...options.supported,
         'import-meta': true,
       };
     },
   },
+
+  // 🔹 API BUILD (ESM + Types + dist/)
   {
-    // API build configuration
     entry: {
       index: 'src/index.ts',
     },
-    format: ['esm'],
-    target: 'node18',
+    outDir: 'dist',
+    format: ['esm'],                     // ✅ Modern ESM output for consumers
     platform: 'node',
+    target: 'node18',
     splitting: false,
-    clean: false,                 // Don't wipe CLI output
-    dts: true,                    // Generate TypeScript declarations
+    clean: false,                        // Don't wipe CLI build!
+    dts: true,                           // ✅ Generate TypeScript declarations
     sourcemap: true,
-    outDir: 'dist',
-    outExtension({ format }) {
+    outExtension() {
       return {
-        js: '.js',  // Keep .js extension for ESM imports
+        js: '.js',
       };
     },
     esbuildOptions(options) {
-      // Make sure to preserve import.meta.url
       options.supported = {
         ...options.supported,
         'import-meta': true,
       };
     },
-  }
-]);
+  },
+]);