@skipruntime/core 0.0.5 → 0.0.10

package/src/errors.ts

@@ -1 +1,46 @@
-export class UnknownCollectionError extends Error {}
+/**
+ * Umbrella type for run-time errors thrown by the Skip runtime.
+ * @hideconstructor
+ */
+export class SkipError extends Error {}
+
+/**
+ * Exception indicating an attempted read/write to a collection that does not exist.
+ * @hideconstructor
+ */
+export class SkipUnknownCollectionError extends SkipError {}
+
+/**
+ * Exception indicating an attempted read/write to a resource that does not exist.
+ * @hideconstructor
+ */
+export class SkipUnknownResourceError extends SkipError {}
+
+/**
+ * Exception indicating a malformed REST query to a Skip service.
+ * @hideconstructor
+ */
+export class SkipRESTError extends SkipError {}
+
+/**
+ * Exception indicating that a fetch returned an HTTP status outside of the 200-299 range.
+ * @hideconstructor
+ */
+export class SkipFetchError extends SkipError {}
+
+/**
+ * Exception indicating a non-top-level class being used as a mapper/reducer/etc.
+ *
+ * The Skip runtime requires that these classes be defined at the top-level, so that their names can be used to generate cache keys and the like.
+ * @hideconstructor
+ */
+export class SkipClassNameError extends SkipError {}
+
+/**
+ * Exception indicating a key did not have a unique value.
+ *
+ * Some collections are used to associate each key to a unique value.
+ * When this expectation is not met (a key is associated to either zero or multiple values), operations such as `getUnique` throw `SkipNonUniqueValueError`.
+ * @hideconstructor
+ */
+export class SkipNonUniqueValueError extends SkipError {}

package/src/index.ts

@@ -23,7 +23,6 @@ import { sknative } from "@skiplang/std";
 
 import type * as Internal from "./internal.js";
 import {
-  NonUniqueValueException,
   type CollectionUpdate,
   type Context,
   type EagerCollection,
@@ -39,9 +38,14 @@ import {
   type Resource,
   type SkipService,
   type Watermark,
-} from "@skipruntime/api";
+} from "./api.js";
 
-import { UnknownCollectionError } from "./errors.js";
+import {
+  SkipClassNameError,
+  SkipError,
+  SkipNonUniqueValueError,
+  SkipUnknownCollectionError,
+} from "./errors.js";
 import {
   ResourceBuilder,
   type Notifier,
@@ -50,8 +54,10 @@ import {
   type FromBinding,
 } from "./binding.js";
 
-export { UnknownCollectionError, sk_freeze, isSkManaged };
+export { sk_freeze, isSkManaged };
 export { Sum, Min, Max, Count } from "./utils.js";
+export * from "./api.js";
+export * from "./errors.js";
 
 export type JSONMapper = Mapper<Json, Json, Json, Json>;
 export type JSONLazyCompute = LazyCompute<Json, Json>;
@@ -140,7 +146,7 @@ class LazyCollectionImpl<K extends Json, V extends Json>
         this.refs.skjson.exportJSON(key),
       ),
     ) as Nullable<V & DepSafe>;
-    if (v == null) throw new NonUniqueValueException();
+    if (v == null) throw new SkipNonUniqueValueError();
     return v;
   }
 }
@@ -173,7 +179,7 @@ class EagerCollectionImpl<K extends Json, V extends Json>
         this.refs.skjson.exportJSON(key),
       ),
     ) as Nullable<V & DepSafe>;
-    if (v == null) throw new NonUniqueValueException();
+    if (v == null) throw new SkipNonUniqueValueError();
     return v;
   }
 
@@ -211,7 +217,9 @@ class EagerCollectionImpl<K extends Json, V extends Json>
     const mapperObj = new mapper(...mapperParams);
     Object.freeze(mapperObj);
     if (!mapperObj.constructor.name) {
-      throw new Error("Mapper classes must be defined at top-level.");
+      throw new SkipClassNameError(
+        "Mapper classes must be defined at top-level.",
+      );
     }
     const skmapper = this.refs.binding.SkipRuntime_createMapper(
       this.refs.handles.register(mapperObj),
@@ -241,10 +249,14 @@ class EagerCollectionImpl<K extends Json, V extends Json>
       Object.freeze(reducerObj);
 
       if (!mapperObj.constructor.name) {
-        throw new Error("Mapper classes must be defined at top-level.");
+        throw new SkipClassNameError(
+          "Mapper classes must be defined at top-level.",
+        );
       }
       if (!reducerObj.constructor.name) {
-        throw new Error("Reducer classes must be defined at top-level.");
+        throw new SkipClassNameError(
+          "Reducer classes must be defined at top-level.",
+        );
       }
 
       const skmapper = this.refs.binding.SkipRuntime_createMapper(
@@ -283,7 +295,9 @@ class EagerCollectionImpl<K extends Json, V extends Json>
     const reducerObj = new reducer(...reducerParams);
     Object.freeze(reducerObj);
     if (!reducerObj.constructor.name) {
-      throw new Error("Reducer classes must be defined at top-level.");
+      throw new SkipClassNameError(
+        "Reducer classes must be defined at top-level.",
+      );
     }
     if (sknative in reducerObj && typeof reducerObj[sknative] == "string") {
       return this.derive<K, Accum>(
@@ -338,11 +352,11 @@ class CollectionWriter<K extends Json, V extends Json> {
         isInit,
       );
     };
-    if (this.refs.needGC()) {
-      this.refs.runWithGC(update_);
-    } else {
-      update_();
-    }
+    const errorHdl = this.refs.needGC()
+      ? this.refs.runWithGC(update_)
+      : update_();
+
+    if (errorHdl) throw this.refs.handles.deleteHandle(errorHdl);
   }
 
   loading(): void {
@@ -351,8 +365,10 @@ class CollectionWriter<K extends Json, V extends Json> {
         this.collection,
       );
     };
-    if (this.refs.needGC()) this.refs.runWithGC(loading_);
-    else loading_();
+    const errorHdl = this.refs.needGC()
+      ? this.refs.runWithGC(loading_)
+      : loading_();
+    if (errorHdl) throw this.refs.handles.deleteHandle(errorHdl);
   }
 
   error(error: Json): void {
@@ -362,8 +378,10 @@ class CollectionWriter<K extends Json, V extends Json> {
         this.refs.skjson.exportJSON(error),
       );
     };
-    if (this.refs.needGC()) this.refs.runWithGC(error_);
-    else error_();
+    const errorHdl = this.refs.needGC()
+      ? this.refs.runWithGC(error_)
+      : error_();
+    if (errorHdl) throw this.refs.handles.deleteHandle(errorHdl);
   }
 }
 
@@ -385,7 +403,9 @@ class ContextImpl extends SkManaged implements Context {
     const computeObj = new compute(...mapperParams);
     Object.freeze(computeObj);
     if (!computeObj.constructor.name) {
-      throw new Error("LazyCompute classes must be defined at top-level.");
+      throw new SkipClassNameError(
+        "LazyCompute classes must be defined at top-level.",
+      );
     }
     const skcompute = this.refs.binding.SkipRuntime_createLazyCompute(
       this.refs.handles.register(computeObj),
@@ -447,15 +467,19 @@ class AllChecker<K extends Json, V extends Json> implements Checker {
   ) {}
 
   check(request: string): void {
-    const result = this.service.getAll<K, V>(
-      this.resource,
-      this.params,
-      request,
-    );
-    if (result.errors.length > 0) {
-      this.executor.reject(new Error(JSON.stringify(result.errors)));
-    } else {
-      this.executor.resolve(result.payload);
+    try {
+      const result = this.service.getAll<K, V>(
+        this.resource,
+        this.params,
+        request,
+      );
+      if (result.errors.length > 0) {
+        this.executor.reject(new Error(JSON.stringify(result.errors)));
+      } else {
+        this.executor.resolve(result.payload);
+      }
+    } catch (ex: unknown) {
+      this.executor.reject(ex);
     }
   }
 }
@@ -470,16 +494,20 @@ class OneChecker<K extends Json, V extends Json> implements Checker {
   ) {}
 
   check(request: string): void {
-    const result = this.service.getArray<K, V>(
-      this.resource,
-      this.key,
-      this.params,
-      request,
-    );
-    if (result.errors.length > 0) {
-      this.executor.reject(new Error(JSON.stringify(result.errors)));
-    } else {
-      this.executor.resolve(result.payload);
+    try {
+      const result = this.service.getArray<K, V>(
+        this.resource,
+        this.key,
+        this.params,
+        request,
+      );
+      if (result.errors.length > 0) {
+        this.executor.reject(new Error(JSON.stringify(result.errors)));
+      } else {
+        this.executor.resolve(result.payload);
+      }
+    } catch (ex: unknown) {
+      this.executor.reject(ex);
     }
   }
 }
@@ -631,11 +659,11 @@ export class ServiceInstance {
       );
     });
     if (session == -1n) {
-      throw new UnknownCollectionError(
+      throw new SkipUnknownCollectionError(
         `Unknown resource instance '${resourceInstanceId}'`,
       );
     } else if (session < 0n) {
-      throw new Error("Unknown error");
+      throw new SkipError("Unknown error");
     }
     return session as SubscriptionID;
   }
@@ -708,7 +736,7 @@ class ValuesImpl<T> implements Values<T> {
     const value = this.skjson.importOptJSON(
       this.binding.SkipRuntime_NonEmptyIterator__uniqueValue(this.pointer),
     ) as Nullable<T & DepSafe>;
-    if (value == null) throw new NonUniqueValueException();
+    if (value == null) throw new SkipNonUniqueValueError();
     return value;
   }
 
@@ -963,6 +991,7 @@ export class ToBinding {
   SkipRuntime_ExternalService__subscribe(
     sksupplier: Handle<ExternalService>,
     writerId: string,
+    instance: string,
     resource: string,
     skparams: Pointer<Internal.CJObject>,
   ): void {
@@ -970,7 +999,7 @@ export class ToBinding {
     const supplier = this.handles.get(sksupplier);
     const writer = new CollectionWriter(writerId, this.refs());
     const params = skjson.importJSON(skparams, true) as Json;
-    supplier.subscribe(resource, params, {
+    supplier.subscribe(instance, resource, params, {
       update: writer.update.bind(writer),
       error: writer.error.bind(writer),
       loading: writer.loading.bind(writer),
@@ -979,13 +1008,10 @@ export class ToBinding {
 
   SkipRuntime_ExternalService__unsubscribe(
     sksupplier: Handle<ExternalService>,
-    resource: string,
-    skparams: Pointer<Internal.CJObject>,
+    instance: string,
   ): void {
-    const skjson = this.getJsonConverter();
     const supplier = this.handles.get(sksupplier);
-    const params = skjson.importJSON(skparams, true) as Json;
-    supplier.unsubscribe(resource, params);
+    supplier.unsubscribe(instance);
   }
 
   SkipRuntime_ExternalService__shutdown(

package/src/utils.ts

@@ -1,6 +1,5 @@
-import type { Nullable } from "@skip-wasm/std";
-import { type NativeStub, sknative } from "@skiplang/std";
-import type { Reducer, Json } from "@skipruntime/api";
+import { type NativeStub, type Nullable, sknative } from "@skiplang/std";
+import type { Reducer, Json } from "./api.js";
 
 /**
  * `Reducer` to maintain the sum of input values.

package/src/binding.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.ResourceBuilder = void 0;
-var ResourceBuilder = /** @class */ (function () {
-    function ResourceBuilder(builder) {
-        this.builder = builder;
-    }
-    ResourceBuilder.prototype.build = function (parameters) {
-        var builder = this.builder;
-        return new builder(parameters);
-    };
-    return ResourceBuilder;
-}());
-exports.ResourceBuilder = ResourceBuilder;

package/src/errors.js

@@ -1,26 +0,0 @@
-"use strict";
-var __extends = (this && this.__extends) || (function () {
-    var extendStatics = function (d, b) {
-        extendStatics = Object.setPrototypeOf ||
-            ({ __proto__: [] } instanceof Array && function (d, b) { d.__proto__ = b; }) ||
-            function (d, b) { for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p]; };
-        return extendStatics(d, b);
-    };
-    return function (d, b) {
-        if (typeof b !== "function" && b !== null)
-            throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
-        extendStatics(d, b);
-        function __() { this.constructor = d; }
-        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-    };
-})();
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.UnknownCollectionError = void 0;
-var UnknownCollectionError = /** @class */ (function (_super) {
-    __extends(UnknownCollectionError, _super);
-    function UnknownCollectionError() {
-        return _super !== null && _super.apply(this, arguments) || this;
-    }
-    return UnknownCollectionError;
-}(Error));
-exports.UnknownCollectionError = UnknownCollectionError;