drivelist - npm Package Compare versions

Comparing version 9.0.2 to 9.1.0-apfs-is-virtual-19fca449f721d6dd09a957101e79940d8592233d

CHANGELOG.md

@@ -7,2 +7,8 @@ # Change Log
 
+# v9.1.0
+## (2020-08-06)
+
+* Load bindings once [Alexis Svinartchouk]
+* Mark APFS media as virtual and assign its mountpoints to the source drive [Alexis Svinartchouk]
+
 # v9.0.2
@@ -9,0 +15,0 @@ ## (2020-05-29)

js/index.d.ts

@@ -29,7 +29,3 @@ export interface Mountpoint {
  * @summary List available drives
- * @function
- * @public
  *
- * @returns {Promise} <Drive>[]
- *
  * @example
@@ -36,0 +32,0 @@ * const drivelist = require('drivelist');

js/index.js

@@ -25,9 +25,37 @@ "use strict";
 const lsblk_1 = require("./lsblk");
+const drivelistBindings = bindings('drivelist');
+function bindingsList() {
+    return new Promise((resolve, reject) => {
+        drivelistBindings.list((error, drives) => {
+            if (error != null) {
+                reject(error);
+            }
+            else {
+                resolve(drives);
+            }
+        });
+    });
+}
+function handleApfs(disks) {
+    const apfs = [];
+    const other = [];
+    for (const disk of disks) {
+        if (disk.description === 'AppleAPFSMedia') {
+            apfs.push(disk);
+        }
+        else {
+            other.push(disk);
+        }
+    }
+    for (const disk of apfs) {
+        const source = other.find((d) => d.devicePath === disk.devicePath && !d.isVirtual);
+        if (source !== undefined) {
+            source.mountpoints.push(...disk.mountpoints);
+            disk.isVirtual = true;
+        }
+    }
+}
 /**
  * @summary List available drives
- * @function
- * @public
  *
- * @returns {Promise} <Drive>[]
- *
  * @example
@@ -43,14 +71,10 @@ * const drivelist = require('drivelist');
     const plat = os_1.platform();
-    if (plat === 'win32' || plat === 'darwin') {
-        return new Promise((resolve, reject) => {
-            bindings('drivelist').list((error, drives) => {
-                if (error != null) {
-                    reject(error);
-                }
-                else {
-                    resolve(drives);
-                }
-            });
-        });
+    if (plat === 'win32') {
+        return await bindingsList();
     }
+    else if (plat === 'darwin') {
+        const disks = await bindingsList();
+        handleApfs(disks);
+        return disks;
+    }
     else if (plat === 'linux') {
@@ -57,0 +81,0 @@ return await lsblk_1.lsblk();

lib/index.ts

@@ -54,9 +54,40 @@ /*
 
+const drivelistBindings = bindings('drivelist');
+
+function bindingsList(): Promise<Drive[]> {
+	return new Promise((resolve, reject) => {
+		drivelistBindings.list((error: Error, drives: Drive[]) => {
+			if (error != null) {
+				reject(error);
+			} else {
+				resolve(drives);
+			}
+		});
+	});
+}
+
+function handleApfs(disks: Drive[]): void {
+	const apfs: Drive[] = [];
+	const other: Drive[] = [];
+	for (const disk of disks) {
+		if (disk.description === 'AppleAPFSMedia') {
+			apfs.push(disk);
+		} else {
+			other.push(disk);
+		}
+	}
+	for (const disk of apfs) {
+		const source = other.find(
+			(d) => d.devicePath === disk.devicePath && !d.isVirtual,
+		);
+		if (source !== undefined) {
+			source.mountpoints.push(...disk.mountpoints);
+			disk.isVirtual = true;
+		}
+	}
+}
+
 /**
  * @summary List available drives
- * @function
- * @public
  *
- * @returns {Promise} <Drive>[]
- *
  * @example
@@ -72,12 +103,8 @@ * const drivelist = require('drivelist');
 	const plat = platform();
-	if (plat === 'win32' || plat === 'darwin') {
-		return new Promise((resolve, reject) => {
-			bindings('drivelist').list((error: Error, drives: Drive[]) => {
-				if (error != null) {
-					reject(error);
-				} else {
-					resolve(drives);
-				}
-			});
-		});
+	if (plat === 'win32') {
+		return await bindingsList();
+	} else if (plat === 'darwin') {
+		const disks = await bindingsList();
+		handleApfs(disks);
+		return disks;
 	} else if (plat === 'linux') {
@@ -84,0 +111,0 @@ return await lsblk();

package.json

 {
   "name": "drivelist",
-  "version": "9.0.2",
+  "version": "9.1.0-apfs-is-virtual-19fca449f721d6dd09a957101e79940d8592233d",
   "description": "List all connected drives in your computer, in all major operating systems",
@@ -5,0 +5,0 @@ "main": "js/index.js",

README.md

@@ -169,7 +169,5 @@ <!-- Make sure you edit doc/README.hbs rather than README.md because the latter is auto-generated -->
 
-### drivelist~list() ⇒ <code>Promise</code>
+### drivelist~list()
 **Kind**: inner method of [<code>drivelist</code>](#module_drivelist)  
 **Summary**: List available drives  
-**Returns**: <code>Promise</code> - <Drive>[]  
-**Access**: public  
 **Example**  
@@ -176,0 +174,0 @@ ```js

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

No v1

Quality

Package is not semver >=1. This means it is not stable and does not support ^ ranges.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

117001

increased by1.85%

Lines of code

999

increased by4.61%

Worsened metrics

Number of low quality alerts

1

increased byInfinity%

Number of lines in readme file

216

decreased by-0.92%

No dependency changes