Fixed issues with new error set implementation (#332)

chung-leong · Apr 8, 2024 · be4e71e · be4e71e
1 parent 78b34c7
commit be4e71e
Show file tree

Hide file tree

Showing 9 changed files with 25,445 additions and 11,527 deletions.
diff --git a/node-zigar-addon/src/addon.js.txt b/node-zigar-addon/src/addon.js.txt
diff --git a/node-zigar/test/sample-modules/node-zigar-addon/linux.x64.node b/node-zigar/test/sample-modules/node-zigar-addon/linux.x64.node
diff --git a/node-zigar/test/zig-samples/with-config/lib/node-zigar-addon/linux.x64.node b/node-zigar/test/zig-samples/with-config/lib/node-zigar-addon/linux.x64.node
diff --git a/zigar-compiler/dist/index.cjs b/zigar-compiler/dist/index.cjs
diff --git a/zigar-compiler/dist/index.js b/zigar-compiler/dist/index.js
diff --git a/zigar-compiler/test/integration/type-handling/error-set/as-static-variables.zig b/zigar-compiler/test/integration/type-handling/error-set/as-static-variables.zig
@@ -13,6 +13,11 @@ pub const NormalError = error{
     OutOfMemory,
 };
 
+pub const CommonError = error{
+    OutOfMemory,
+    NoMoreBeer,
+};
+
 pub const PossibleError = NormalError || StrangeError;
 
 pub var error_var = NormalError.FileNotFound;

diff --git a/zigar-compiler/test/integration/type-handling/error-set/tests.js b/zigar-compiler/test/integration/type-handling/error-set/tests.js
@@ -19,14 +19,16 @@ export function addTests(importModule, options) {
         NormalError,
         StrangeError,
         PossibleError,
+        CommonError,
         print,
       } = await importTest('as-static-variables');
       expect(NormalError.OutOfMemory).to.be.instanceOf(Error);
-      expect(NormalError.OutOfMemory).to.be.instanceOf(NormalError);
-      expect(PossibleError.OutOfMemory).to.be.instanceOf(PossibleError);
+      expect(NormalError.OutOfMemory in NormalError).to.be.true;
+      expect(NormalError.OutOfMemory).to.equal(PossibleError.OutOfMemory);
+      expect(PossibleError.OutOfMemory in PossibleError).to.be.true;
       expect(StrangeError.SystemIsOnFire).to.equal(PossibleError.SystemIsOnFire);
-      expect(StrangeError.SystemIsOnFire).to.be.instanceOf(PossibleError);
-      expect(() => StrangeError.SystemIsOnFire.$ = StrangeError.SystemIsOnFire).to.throw(TypeError);
+      expect(StrangeError.SystemIsOnFire in PossibleError).to.be.true;
+      expect(StrangeError.NoMoreBeer).to.equal(CommonError.NoMoreBeer);
       expect(module.error_var).to.equal(NormalError.FileNotFound);
       const [ before ] = await capture(() => print());
       expect(before).to.equal('error.FileNotFound');