@rsdk/common 6.0.0-next.1 → 6.0.0-next.11

package/dist/index.d.ts

@@ -5,5 +5,5 @@ export * from './time';
 export * from './functions';
 export * from './size';
 export * from './strings';
-export * from './observable';
 export * from './parsers';
+export * from './validation';

package/dist/index.js

@@ -21,6 +21,6 @@ __exportStar(require("./time"), exports);
 __exportStar(require("./functions"), exports);
 __exportStar(require("./size"), exports);
 __exportStar(require("./strings"), exports);
-__exportStar(require("./observable"), exports);
 __exportStar(require("./parsers"), exports);
+__exportStar(require("./validation"), exports);
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,0CAAwB;AACxB,4CAA0B;AAC1B,yCAAuB;AACvB,8CAA4B;AAC5B,yCAAuB;AACvB,4CAA0B;AAC1B,+CAA6B;AAC7B,4CAA0B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,0CAAwB;AACxB,0CAAwB;AACxB,4CAA0B;AAC1B,yCAAuB;AACvB,8CAA4B;AAC5B,yCAAuB;AACvB,4CAA0B;AAC1B,4CAA0B;AAC1B,+CAA6B"}

package/dist/validation/index.d.ts

@@ -0,0 +1 @@
+export * from './typebox.validator';

package/dist/{observable → validation}/index.js

@@ -14,5 +14,5 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./observable-to-async-iterable"), exports);
+__exportStar(require("./typebox.validator"), exports);
 //# sourceMappingURL=index.js.map

package/dist/validation/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/validation/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,sDAAoC"}

package/dist/validation/typebox.validator.d.ts

@@ -0,0 +1,26 @@
+import type { TSchema } from '@sinclair/typebox';
+import type { ValueError } from '@sinclair/typebox/compiler';
+/**
+ * Wrapper around Typebox's type validation.
+ *
+ * @example
+ * ```ts
+ * const validator = new Validator(t.Object({ name: t.String() }));
+ * const { isValid, errors } = validator.run({ name: 'John' });
+ * ...
+ * ```
+ */
+export declare class TypeBoxValidator<T extends TSchema> {
+    private readonly validator;
+    constructor(schema: T);
+    /**
+     * Run the validator on the given data.
+     *
+     * @param data - The data to validate.
+     * @returns The validation result.
+     */
+    check(data: unknown): {
+        isValid: boolean;
+        errors: ValueError[];
+    };
+}

package/dist/validation/typebox.validator.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TypeBoxValidator = void 0;
+const compiler_1 = require("@sinclair/typebox/compiler");
+/**
+ * Wrapper around Typebox's type validation.
+ *
+ * @example
+ * ```ts
+ * const validator = new Validator(t.Object({ name: t.String() }));
+ * const { isValid, errors } = validator.run({ name: 'John' });
+ * ...
+ * ```
+ */
+class TypeBoxValidator {
+    validator;
+    constructor(schema) {
+        this.validator = compiler_1.TypeCompiler.Compile(schema);
+    }
+    /**
+     * Run the validator on the given data.
+     *
+     * @param data - The data to validate.
+     * @returns The validation result.
+     */
+    check(data) {
+        /**
+         * TODO: При случае, придумать, как нормально распечатывать ошибки для union'ов.
+         * Сейчас они ужасно неинформативные.
+         */
+        return {
+            isValid: this.validator.Check(data),
+            errors: [...this.validator.Errors(data)],
+        };
+    }
+}
+exports.TypeBoxValidator = TypeBoxValidator;
+//# sourceMappingURL=typebox.validator.js.map

package/dist/validation/typebox.validator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"typebox.validator.js","sourceRoot":"","sources":["../../src/validation/typebox.validator.ts"],"names":[],"mappings":";;;AAEA,yDAA0D;AAE1D;;;;;;;;;GASG;AACH,MAAa,gBAAgB;IACV,SAAS,CAAe;IAEzC,YAAY,MAAS;QACnB,IAAI,CAAC,SAAS,GAAG,uBAAY,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,IAAa;QACjB;;;WAGG;QACH,OAAO;YACL,OAAO,EAAE,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC;YACnC,MAAM,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC;SACzC,CAAC;IACJ,CAAC;CACF;AAvBD,4CAuBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rsdk/common",
-  "version": "6.0.0-next.1",
+  "version": "6.0.0-next.11",
   "description": "Useful common classes, functions and types",
   "license": "Apache License 2.0",
   "publishConfig": {
@@ -13,8 +13,13 @@
   "scripts": {
     "prepublishOnly": "npm run build"
   },
-  "dependencies": {
-    "rxjs": "^7.8.1"
+  "peerDependencies": {
+    "@sinclair/typebox": "^0.34.9"
   },
-  "gitHead": "3114a76df17cf98d6f3cbb8a931599a883af6783"
+  "peerDependenciesMeta": {
+    "@sinclair/typebox": {
+      "optional": true
+    }
+  },
+  "gitHead": "e4a3d962f23e2c4ea39ec08e07628290f54812a6"
 }

package/src/index.ts

@@ -5,5 +5,5 @@ export * from './time';
 export * from './functions';
 export * from './size';
 export * from './strings';
-export * from './observable';
 export * from './parsers';
+export * from './validation';

package/src/validation/index.ts

@@ -0,0 +1 @@
+export * from './typebox.validator';

package/src/validation/typebox.validator.ts

@@ -0,0 +1,38 @@
+import type { TSchema } from '@sinclair/typebox';
+import type { TypeCheck, ValueError } from '@sinclair/typebox/compiler';
+import { TypeCompiler } from '@sinclair/typebox/compiler';
+
+/**
+ * Wrapper around Typebox's type validation.
+ *
+ * @example
+ * ```ts
+ * const validator = new Validator(t.Object({ name: t.String() }));
+ * const { isValid, errors } = validator.run({ name: 'John' });
+ * ...
+ * ```
+ */
+export class TypeBoxValidator<T extends TSchema> {
+  private readonly validator: TypeCheck<T>;
+
+  constructor(schema: T) {
+    this.validator = TypeCompiler.Compile(schema);
+  }
+
+  /**
+   * Run the validator on the given data.
+   *
+   * @param data - The data to validate.
+   * @returns The validation result.
+   */
+  check(data: unknown): { isValid: boolean; errors: ValueError[] } {
+    /**
+     * TODO: При случае, придумать, как нормально распечатывать ошибки для union'ов.
+     * Сейчас они ужасно неинформативные.
+     */
+    return {
+      isValid: this.validator.Check(data),
+      errors: [...this.validator.Errors(data)],
+    };
+  }
+}

package/dist/observable/index.d.ts

@@ -1 +0,0 @@
-export * from './observable-to-async-iterable';

package/dist/observable/index.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/observable/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA,iEAA+C"}

package/dist/observable/observable-to-async-iterable.d.ts

@@ -1,7 +0,0 @@
-import type { Observable } from 'rxjs';
-export type Callback = (value?: any) => any;
-/**
- * Утилита для создания асинк итератора из обзервабл
- * поиском "observableToAsyncIterable" можно найти тесты в которых есть пример использования
- */
-export declare function observableToAsyncIterable<T>(observable: Observable<T>): AsyncIterableIterator<T>;

package/dist/observable/observable-to-async-iterable.js

@@ -1,107 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.observableToAsyncIterable = observableToAsyncIterable;
-/**
- * Утилита для создания асинк итератора из обзервабл
- * поиском "observableToAsyncIterable" можно найти тесты в которых есть пример использования
- */
-function observableToAsyncIterable(observable) {
-    const pullQueue = [];
-    const pushQueue = [];
-    let listening = true;
-    const pushValue = (value) => {
-        if (pullQueue.length > 0) {
-            // It is safe to use the ! operator here as we check the length.
-            pullQueue.shift()({
-                value,
-                done: false,
-            });
-        }
-        else {
-            pushQueue.push({
-                value,
-                done: false,
-            });
-        }
-    };
-    const pushError = (error) => {
-        if (pullQueue.length > 0) {
-            // It is safe to use the ! operator here as we check the length.
-            pullQueue.shift()({
-                value: { errors: [error] },
-                done: false,
-            });
-        }
-        else {
-            pushQueue.push({
-                value: { errors: [error] },
-                done: false,
-            });
-        }
-    };
-    const pushDone = () => {
-        if (pullQueue.length > 0) {
-            // It is safe to use the ! operator here as we check the length.
-            pullQueue.shift()({ done: true });
-        }
-        else {
-            pushQueue.push({ done: true });
-        }
-    };
-    const pullValue = () => new Promise((resolve) => {
-        if (pushQueue.length > 0) {
-            const element = pushQueue.shift();
-            // either {value: {errors: [...]}} or {value: ...}
-            resolve(element);
-        }
-        else {
-            pullQueue.push(resolve);
-        }
-    });
-    const subscription = observable.subscribe({
-        next(value) {
-            pushValue(value);
-        },
-        error(err) {
-            pushError(err);
-        },
-        complete() {
-            pushDone();
-        },
-    });
-    const emptyQueue = () => {
-        if (listening) {
-            listening = false;
-            subscription.unsubscribe();
-            for (const resolve of pullQueue) {
-                resolve({
-                    value: undefined,
-                    done: true,
-                });
-            }
-            pullQueue.length = 0;
-            pushQueue.length = 0;
-        }
-    };
-    return {
-        next() {
-            // return is a defined method, so it is safe to call it.
-            return listening ? pullValue() : this.return();
-        },
-        return() {
-            emptyQueue();
-            return Promise.resolve({
-                value: undefined,
-                done: true,
-            });
-        },
-        throw(error) {
-            emptyQueue();
-            return Promise.reject(error);
-        },
-        [Symbol.asyncIterator]() {
-            return this;
-        },
-    };
-}
-//# sourceMappingURL=observable-to-async-iterable.js.map

package/dist/observable/observable-to-async-iterable.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"observable-to-async-iterable.js","sourceRoot":"","sources":["../../src/observable/observable-to-async-iterable.ts"],"names":[],"mappings":"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"}

package/src/observable/index.ts

@@ -1 +0,0 @@
-export * from './observable-to-async-iterable';

package/src/observable/observable-to-async-iterable.ts

@@ -1,115 +0,0 @@
-import type { Observable } from 'rxjs';
-
-export type Callback = (value?: any) => any;
-
-/**
- * Утилита для создания асинк итератора из обзервабл
- * поиском "observableToAsyncIterable" можно найти тесты в которых есть пример использования
- */
-export function observableToAsyncIterable<T>(
-  observable: Observable<T>,
-): AsyncIterableIterator<T> {
-  const pullQueue: Array<Callback> = [];
-  const pushQueue: Array<any> = [];
-
-  let listening = true;
-
-  const pushValue = (value: any): void => {
-    if (pullQueue.length > 0) {
-      // It is safe to use the ! operator here as we check the length.
-      pullQueue.shift()!({
-        value,
-        done: false,
-      });
-    } else {
-      pushQueue.push({
-        value,
-        done: false,
-      });
-    }
-  };
-
-  const pushError = (error: any): void => {
-    if (pullQueue.length > 0) {
-      // It is safe to use the ! operator here as we check the length.
-      pullQueue.shift()!({
-        value: { errors: [error] },
-        done: false,
-      });
-    } else {
-      pushQueue.push({
-        value: { errors: [error] },
-        done: false,
-      });
-    }
-  };
-
-  const pushDone = (): void => {
-    if (pullQueue.length > 0) {
-      // It is safe to use the ! operator here as we check the length.
-      pullQueue.shift()!({ done: true });
-    } else {
-      pushQueue.push({ done: true });
-    }
-  };
-
-  const pullValue = (): Promise<IteratorResult<T>> =>
-    new Promise<IteratorResult<T>>((resolve) => {
-      if (pushQueue.length > 0) {
-        const element = pushQueue.shift();
-
-        // either {value: {errors: [...]}} or {value: ...}
-        resolve(element);
-      } else {
-        pullQueue.push(resolve);
-      }
-    });
-
-  const subscription = observable.subscribe({
-    next(value: any) {
-      pushValue(value);
-    },
-    error(err: Error) {
-      pushError(err);
-    },
-    complete() {
-      pushDone();
-    },
-  });
-
-  const emptyQueue = (): void => {
-    if (listening) {
-      listening = false;
-      subscription.unsubscribe();
-      for (const resolve of pullQueue) {
-        resolve({
-          value: undefined,
-          done: true,
-        });
-      }
-      pullQueue.length = 0;
-      pushQueue.length = 0;
-    }
-  };
-
-  return {
-    next(): Promise<IteratorResult<T>> {
-      // return is a defined method, so it is safe to call it.
-      return listening ? pullValue() : this.return!();
-    },
-    return(): Promise<IteratorResult<T>> {
-      emptyQueue();
-      return Promise.resolve({
-        value: undefined,
-        done: true,
-      });
-    },
-    throw(error): Promise<IteratorResult<T>> {
-      emptyQueue();
-      return Promise.reject(error);
-    },
-    [Symbol.asyncIterator](): AsyncIterableIterator<T> {
-      return this;
-    },
-  };
-}