Merge branch 'main' of https://github.com/photostructure/fs-metadata

photostructure · Nov 18, 2024 · 4643aae · 4643aae
2 parents 4e8a62f + 117d1b5
commit 4643aae
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/binding.gyp b/binding.gyp
@@ -16,7 +16,7 @@
         "<!(node -p \"require('node-addon-api').gyp\")"
       ],
       "defines": [
-        "NAPI_DISABLE_CPP_EXCEPTIONS"
+        "NAPI_CPP_EXCEPTIONS"
       ],
       "conditions": [
         [
@@ -78,6 +78,20 @@
             "sources": [
               "src/darwin/fs_meta.cpp"
             ],
+            "xcode_settings": {
+              "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
+              "CLANG_CXX_LIBRARY": "libc++",
+              "MACOSX_DEPLOYMENT_TARGET": "10.15"
+            },
+            "cflags!": [ "-fno-exceptions" ],
+            "cflags_cc!": [ "-fno-exceptions" ],
+            "cflags": [
+              "-fexceptions",
+              "-fPIC"
+            ],
+            "cflags_cc": [
+              "-fexceptions"
+            ],
             "link_settings": {
               "libraries": [
                 "DiskArbitration.framework",
@@ -90,4 +104,4 @@
       ]
     }
   ]
-}
+}
diff --git a/package.json b/package.json
@@ -26,7 +26,6 @@
     "clean": "run-p clean:*",
     "clean:dist": "rm -rf dist build",
     "clean:gyp": "node-gyp clean",
-    "prebuild": "npm run clean",
     "build": "run-p build:*",
     "prebuild:gyp": "node scripts/configure.js",
     "build:gyp": "node-gyp rebuild",
@@ -40,7 +39,7 @@
     "test": "run-s test:*",
     "test:jest": "jest",
     "test:memory": "cross-env TEST_MEMORY=1 node --expose-gc node_modules/jest/bin/jest.js src/__tests__/memory.test.ts",
-    "it": "run-s fmt lint build test",
+    "it": "run-s clean fmt lint build test",
     "lint": "eslint",
     "lint:fix": "eslint --fix",
     "fmt": "run-p fmt:*",

diff --git a/src/__tests__/fs_metadata.test.ts b/src/__tests__/fs_metadata.test.ts
@@ -153,14 +153,16 @@ describe("Filesystem Metadata", () => {
     afterEach(() => {
       delete process.env.TEST_DELAY;
     });
-    it("should throw TimeoutError if timeoutMs=1", async () => {
-      const rootPath = isWindows ? "C:\\" : "/";
-      await expect(getVolumeMountPoints({ timeoutMs: 1 })).rejects.toThrow(
+    const rootPath = isWindows ? "C:\\" : "/";
+    it("should handle getVolumeMountPoints() timeout", async () => {
+      expect(getVolumeMountPoints({ timeoutMs: 1 })).rejects.toThrow(
+        TimeoutError,
+      );
+    });
+    it("should handle getVolumeMetadata() timeout", async () => {
+      expect(getVolumeMetadata(rootPath, { timeoutMs: 1 })).rejects.toThrow(
         TimeoutError,
       );
-      await expect(
-        getVolumeMetadata(rootPath, { timeoutMs: 1 }),
-      ).rejects.toThrow(TimeoutError);
     });
   });