pnpm update 対応

.tool-versions

@@ -1 +1 @@
-nodejs 20.12.2
+nodejs 20.13.0

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@luco-inc/pnpm-license-exporter",
-  "version": "3.0.4",
+  "version": "3.0.5",
   "description": "Dependencies license exporter for projects using pnpm.",
   "license": "MIT",
   "type": "module",

src/pnpm/export-license/types/export-licenses.types.ts

@@ -5,7 +5,8 @@ export type PnpmPackageInfo = {
   author: string;
   description: string;
   homepage: string;
-  path: string;
+  path?: string;
+  paths?: string[];
 };
 
 export type PnpmLicenses = {
@@ -15,9 +16,9 @@ export type PnpmLicenses = {
 export type ExportedPnpmPackageInfo = {
   licenseTxt?: string;
   // path property is only not exported
-} & Omit<PnpmPackageInfo, 'path'>;
+} & Omit<PnpmPackageInfo, 'path' | 'paths'>;
 
-export type LicensePackageInfo = Omit<PnpmPackageInfo, 'path'>;
+export type LicensePackageInfo = Omit<PnpmPackageInfo, 'path' | 'paths'>;
 
 export type LicensePackageKey = keyof LicensePackageInfo;
 

src/pnpm/export-license/utils/build-exported-pnpm-package-info.ts

@@ -1,9 +1,10 @@
 import type { PnpmPackageInfo, ExportedPnpmPackageInfo } from '../types/export-licenses.types';
 
-export function buildExportedPnpmPackageInfo(pnpmPackage: PnpmPackageInfo, licenseTxt: undefined | string): ExportedPnpmPackageInfo {
+export function buildExportedPnpmPackageInfo(
+  pnpmPackage: PnpmPackageInfo,
+  licenseTxt: undefined | string
+): ExportedPnpmPackageInfo {
   // remove path property
-  const { path, ...PnpmPackageInfo } = pnpmPackage;
-  return licenseTxt === undefined
-    ? PnpmPackageInfo
-    : { ...PnpmPackageInfo, licenseTxt };
-}
+  const { path, paths, ...PnpmPackageInfo } = pnpmPackage;
+  return licenseTxt === undefined ? PnpmPackageInfo : { ...PnpmPackageInfo, licenseTxt };
+}

src/pnpm/export-license/utils/find-license-dirent.ts

@@ -2,9 +2,6 @@ import type { Dirent } from 'node:fs';
 import { readdir } from 'node:fs/promises';
 
 export async function findLicenseDirent(pnpmPackagePath: string): Promise<Dirent | undefined> {
-  if (!pnpmPackagePath) {
-    return undefined;
-  }
   const dirents = await readdir(pnpmPackagePath, { withFileTypes: true });
   return dirents.find((dirent) => dirent.name.toLowerCase().includes('license'));
 }

src/pnpm/export-license/utils/search-license.util.ts

@@ -11,9 +11,9 @@ export function searchLicense(
       async (
         pnpmPackage
       ): Promise<ExportedPnpmPackageInfo | undefined | (ExportedPnpmPackageInfo | undefined)[]> => {
-        if (Array.isArray(pnpmPackage.path)) {
+        if (pnpmPackage.paths) {
           return await Promise.all(
-            pnpmPackage.path.map(async (path) => {
+            pnpmPackage.paths.map(async (path) => {
               const licenseDirent = await findLicenseDirent(path);
               if (licenseDirent === undefined) {
                 return undefined;
@@ -25,7 +25,7 @@ export function searchLicense(
               return buildExportedPnpmPackageInfo(pnpmPackage, licenseTxt);
             })
           );
-        } else {
+        } else if (pnpmPackage.path) {
           const licenseDirent = await findLicenseDirent(pnpmPackage.path);
           if (licenseDirent === undefined) {
             return undefined;
@@ -35,6 +35,8 @@ export function searchLicense(
             licensePath: `${pnpmPackage.path}/${licenseDirent.name}`,
           });
           return buildExportedPnpmPackageInfo(pnpmPackage, licenseTxt);
+        } else {
+          return undefined;
         }
       }
     )