pkgprn 0.7.0 → 0.8.0

package/index.d.ts

@@ -23,9 +23,9 @@ declare module 'pkgprn' {
 	};
 	export type PruneOptions = {
 		profile: string;
-		flatten: string[] | boolean;
+		flatten: true | string[] | false;
 		removeSourcemaps: boolean;
-		stripComments: string | boolean;
+		stripComments: true | string[] | false;
 		optimizeFiles: boolean;
 		cleanupFiles: boolean;
 	};

package/index.js

@@ -1,33 +1,36 @@
 #!/usr/bin/env node
 import { readFile, writeFile } from 'node:fs/promises';
-import { dirname, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
+import { resolve } from 'node:path';
 
 import { createLogger } from '@niceties/logger';
 import { parseArgsPlus } from '@niceties/node-parseargs-plus';
 import { camelCase } from '@niceties/node-parseargs-plus/camel-case';
+import { customValue } from '@niceties/node-parseargs-plus/custom-value';
 import { help } from '@niceties/node-parseargs-plus/help';
 import { optionalValue } from '@niceties/node-parseargs-plus/optional-value';
+import { readPackageJson } from '@niceties/node-parseargs-plus/package-info';
 
 import { prunePkg } from './prune.js';
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
+function parseMultiString(values) {
+    const items = values
+        .flatMap(v => v.split(','))
+        .map(s => s.trim())
+        .filter(Boolean);
+    return items.length ? items : true;
+}
 
 const logger = createLogger();
 logger.update('preparing..');
 
 try {
-    const version = await getMyVersion();
+    const myPkgData = await readPackageJson(import.meta.url);
 
     logger.update('');
-    process.stdout.moveCursor?.(0, -1);
 
     const { values } = parseArgsPlus(
         {
-            name: 'pkgprn',
-            version: version ?? '<unknown>',
-            description: 'prune devDependencies and redundant scripts from package.json',
-            allowPositionals: true,
+            ...myPkgData,
             allowNegative: true,
             options: {
                 profile: {
@@ -36,10 +39,10 @@ try {
                     default: 'library',
                 },
                 flatten: {
-                    type: 'string',
+                    type:  (parseMultiString),
                     multiple: true,
                     optionalValue: true,
-                    description: 'flatten package files (use "auto" for auto-detect, or specify directories)',
+                    description: 'flatten package files (omit value to auto-detect, or specify directories)',
                 },
                 removeSourcemaps: {
                     type: 'boolean',
@@ -47,10 +50,10 @@ try {
                     default: false,
                 },
                 stripComments: {
-                    type: 'string',
+                    type:  (parseMultiString),
                     multiple: true,
                     optionalValue: true,
-                    description: 'strip comments: all (default: jsdoc,regular), jsdoc, license, regular, annotation',
+                    description: 'strip comments (omit value for defaults, or specify types: jsdoc, license, regular, annotation)',
                 },
                 optimizeFiles: {
                     type: 'boolean',
@@ -64,18 +67,13 @@ try {
                 },
             },
         },
-        [camelCase, optionalValue, help]
+        [camelCase, customValue, optionalValue, help]
     );
 
-    const flattenDirs = values.flatten
-        ?.flatMap(v => v.split(','))
-        .map(s => s.trim())
-        .filter(Boolean);
-
     const flags = {
         ...values,
-        flatten: flattenDirs?.includes('auto') || values.flatten?.includes('') ? true : flattenDirs?.length ? flattenDirs : false,
-        stripComments: values.stripComments?.length ? values.stripComments.filter(Boolean).join(',') || 'all' : false,
+        flatten: values.flatten ?? false,
+        stripComments: values.stripComments ?? false,
     };
 
     const pkg = await readPackage('.');
@@ -91,12 +89,6 @@ try {
     process.exit(255);
 }
 
-async function getMyVersion() {
-    const pkg = await readPackage(resolve(__dirname));
-
-    return pkg && 'version' in pkg && typeof pkg.version === 'string' ? pkg.version : '<unknown>';
-}
-
 async function readPackage(dir) {
     const packageFileName = resolve(dir, 'package.json');
     try {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pkgprn",
-  "version": "0.7.0",
+  "version": "0.8.0",
   "license": "MIT",
   "author": "Konstantin Shutkin",
   "bin": "./index.js",
@@ -34,6 +34,6 @@
   "dependencies": {
     "@jridgewell/sourcemap-codec": "^1.5.5",
     "@niceties/logger": "^2.1.0",
-    "@niceties/node-parseargs-plus": "^0.2.1"
+    "@niceties/node-parseargs-plus": "^0.5.0"
   }
 }

package/prune.js

@@ -88,7 +88,7 @@ export async function prunePkg(pkg, options, logger) {
     }
 
     if (options.stripComments) {
-        const typesToStrip = parseCommentTypes( (options.stripComments));
+        const typesToStrip = parseCommentTypes(options.stripComments);
         logger.update('stripping comments...');
         const allFiles = await walkDir('.', ['node_modules']);
         const jsFiles = allFiles.filter(isStrippableFile);

package/strip-comments.js

@@ -292,24 +292,17 @@ function scanTemplateTail(s, i, len, templateStack, comments) {
 }
 
 export function parseCommentTypes(value) {
-    if (value === true || value === 'all') {
+    if (value === true) {
         return new Set( (['jsdoc', 'regular']));
     }
 
     const valid =  (['jsdoc', 'license', 'regular', 'annotation']);
-    const parts = String(value)
-        .split(',')
-        .map(s => s.trim())
-        .filter(Boolean);
 
     const result = new Set();
 
-    for (const part of parts) {
-        if (part === 'all') {
-            return new Set( (['jsdoc', 'regular']));
-        }
+    for (const part of value) {
         if (!valid.includes( (part))) {
-            throw new Error(`unknown comment type "${part}" (expected: ${valid.join(', ')}, all)`);
+            throw new Error(`unknown comment type "${part}" (expected: ${valid.join(', ')})`);
         }
         result.add( (part));
     }