valdres 0.2.0-alpha.61 → 0.2.0-alpha.63

package/dist/index.js

@@ -235,14 +235,7 @@ var findClosestStoreWithAtomInitialized = (atom, data) => {
   return findClosestStoreWithAtomInitialized(atom, data.parent);
 };
 
-// src/lib/initSelector.ts
-class SuspendAndWaitForResolveError extends Error {
-  promise;
-  constructor(promise) {
-    super();
-    this.promise = promise;
-  }
-}
+// src/errors/lib/generateSelectorTrace.ts
 var generateSelectorTrace = (selectors) => {
   const lastIndex = selectors.length - 1;
   return [...selectors].reverse().map((selector, index) => {
@@ -258,21 +251,46 @@ var generateSelectorTrace = (selectors) => {
 `);
 };
 
-class CircularDependencyError extends Error {
+// src/errors/SelectorEvaluationError.ts
+class SelectorEvaluationError extends Error {
   selectors;
-  constructor() {
+  constructor(cause) {
+    console.log("EIGIL`1: asdfasdfasdf");
     super();
+    console.log("EIGIL: asdfasdfasdf");
+    this.cause = cause;
     this.selectors = [];
   }
   track(selector) {
     this.selectors.push(selector);
   }
+  get message() {
+    const firstSelectorName = this.selectors[0].name ?? "Anonymous Selector";
+    return `Selector eval crashed in '${firstSelectorName}'
+${generateSelectorTrace(this.selectors)}`;
+  }
+}
+
+// src/errors/SelectorCircularDependencyError.ts
+class SelectorCircularDependencyError extends SelectorEvaluationError {
+  constructor() {
+    super();
+  }
   get message() {
     const firstSelectorName = this.selectors[0].name ?? "Anonymous Selector";
     return `Circular dependency detected in '${firstSelectorName}'
 ${generateSelectorTrace(this.selectors)}`;
   }
 }
+
+// src/lib/initSelector.ts
+class SuspendAndWaitForResolveError extends Error {
+  promise;
+  constructor(promise) {
+    super();
+    this.promise = promise;
+  }
+}
 var getOrInitConsumersSet = (state, data) => {
   const set = data.stateConsumers.get(state);
   if (set)
@@ -284,7 +302,7 @@ var getOrInitConsumersSet = (state, data) => {
 var evaluateSelector = (selector, data, circularDependencyMap = new WeakSet) => {
   const updatedDependencies = new Set;
   if (circularDependencyMap.has(selector)) {
-    throw new CircularDependencyError;
+    throw new SelectorCircularDependencyError;
   }
   circularDependencyMap.add(selector);
   let result;
@@ -299,8 +317,10 @@ var evaluateSelector = (selector, data, circularDependencyMap = new WeakSet) =>
   } catch (error) {
     if (error instanceof SuspendAndWaitForResolveError) {
       result = error;
-    } else {
+    } else if (error instanceof SelectorEvaluationError) {
       throw error;
+    } else {
+      throw new SelectorEvaluationError(error);
     }
   }
   const currentDependencies = data.stateDependencies.get(selector) ?? new Set;
@@ -337,7 +357,7 @@ var initSelector = (selector, data, circularDependencySet = new WeakSet) => {
   try {
     tmpValue = evaluateSelector(selector, data, circularDependencySet);
   } catch (e) {
-    if (e instanceof CircularDependencyError)
+    if (e instanceof SelectorEvaluationError)
       e.track(selector);
     throw e;
   }

package/dist/types/src/errors/SelectorCircularDependencyError.d.ts

@@ -0,0 +1,5 @@
+import { SelectorEvaluationError } from "./SelectorEvaluationError";
+export declare class SelectorCircularDependencyError extends SelectorEvaluationError {
+    constructor();
+    get message(): string;
+}

package/dist/types/src/errors/SelectorEvaluationError.d.ts

@@ -0,0 +1,7 @@
+import type { Selector } from "../types/Selector";
+export declare class SelectorEvaluationError extends Error {
+    selectors: any[];
+    constructor(cause?: any);
+    track(selector: Selector<any>): void;
+    get message(): string;
+}

package/dist/types/src/errors/lib/generateSelectorTrace.d.ts

@@ -0,0 +1,2 @@
+import type { Selector } from "../../types/Selector";
+export declare const generateSelectorTrace: (selectors: Selector[]) => string;

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "valdres",
-    "version": "0.2.0-alpha.61",
+    "version": "0.2.0-alpha.63",
     "license": "MIT",
     "author": {
         "name": "Eigil Sagafos"
@@ -36,5 +36,5 @@
         "access": "public",
         "registry": "https://registry.npmjs.org/"
     },
-    "gitHead": "083c7d5aa913e9a641d1456e82276c20d8162f0e"
+    "gitHead": "67a3f371cec994d7f7a83931e625d85cf156c21d"
 }