@naturalcycles/nodejs-lib 12.90.1 → 12.90.3

package/dist/stream/transform/transformMap.d.ts

@@ -1,4 +1,4 @@
-import { AbortableAsyncMapper, AsyncPredicate, CommonLogger, ErrorMode } from '@naturalcycles/js-lib';
+import { AbortableAsyncMapper, AsyncPredicate, CommonLogger, END, ErrorMode, SKIP } from '@naturalcycles/js-lib';
 import { TransformTyped } from '../stream.model';
 export interface TransformMapOptions<IN = any, OUT = IN> {
     /**
@@ -50,4 +50,4 @@ export interface TransformMapOptions<IN = any, OUT = IN> {
  *
  * If an Array is returned by `mapper` - it will be flattened and multiple results will be emitted from it. Tested by Array.isArray().
  */
-export declare function transformMap<IN = any, OUT = IN>(mapper: AbortableAsyncMapper<IN, OUT>, opt?: TransformMapOptions<IN, OUT>): TransformTyped<IN, OUT>;
+export declare function transformMap<IN = any, OUT = IN>(mapper: AbortableAsyncMapper<IN, OUT | typeof SKIP | typeof END>, opt?: TransformMapOptions<IN, OUT>): TransformTyped<IN, OUT>;

package/dist/stream/transform/transformMapSync.d.ts

@@ -1,4 +1,4 @@
-import { CommonLogger, ErrorMode, Mapper, Predicate } from '@naturalcycles/js-lib';
+import { CommonLogger, END, ErrorMode, Mapper, Predicate, SKIP } from '@naturalcycles/js-lib';
 import { AbortableTransform } from '../pipeline/pipeline';
 import { TransformTyped } from '../stream.model';
 export interface TransformMapSyncOptions<IN = any, OUT = IN> {
@@ -42,4 +42,4 @@ export declare class TransformMapSync extends AbortableTransform {
  * Sync (not async) version of transformMap.
  * Supposedly faster, for cases when async is not needed.
  */
-export declare function transformMapSync<IN = any, OUT = IN>(mapper: Mapper<IN, OUT>, opt?: TransformMapSyncOptions): TransformTyped<IN, OUT>;
+export declare function transformMapSync<IN = any, OUT = IN>(mapper: Mapper<IN, OUT | typeof SKIP | typeof END>, opt?: TransformMapSyncOptions): TransformTyped<IN, OUT>;

package/dist/util/lruMemoCache.d.ts

@@ -1,6 +1,6 @@
 import { MemoCache } from '@naturalcycles/js-lib';
-import * as LRUCache from 'lru-cache';
-export type LRUMemoCacheOptions<KEY, VALUE> = Partial<LRUCache.Options<KEY, VALUE>>;
+import LRUCache from 'lru-cache';
+export type LRUMemoCacheOptions<KEY, VALUE> = Partial<LRUCache.Options<KEY, VALUE, any>>;
 /**
  * @example
  * Use it like this:

package/dist/util/lruMemoCache.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LRUMemoCache = void 0;
-const LRUCache = require("lru-cache");
+const lru_cache_1 = require("lru-cache");
 /**
  * @example
  * Use it like this:
@@ -11,7 +11,7 @@ const LRUCache = require("lru-cache");
  */
 class LRUMemoCache {
     constructor(opt) {
-        this.lru = new LRUCache({
+        this.lru = new lru_cache_1.default({
             max: 100,
             ...opt,
         });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "12.90.1",
+  "version": "12.90.3",
   "scripts": {
     "prepare": "husky install",
     "docs-serve": "vuepress dev docs",
@@ -33,7 +33,7 @@
     "got": "^11.0.1",
     "joi": "17.4.2",
     "jsonwebtoken": "^9.0.0",
-    "lru-cache": "^7.4.0",
+    "lru-cache": "^8.0.4",
     "move-file": "^2.0.0",
     "through2-concurrent": "^2.0.0",
     "yargs": "^17.0.0"

package/src/stream/transform/transformMap.ts

@@ -75,7 +75,7 @@ export interface TransformMapOptions<IN = any, OUT = IN> {
  * If an Array is returned by `mapper` - it will be flattened and multiple results will be emitted from it. Tested by Array.isArray().
  */
 export function transformMap<IN = any, OUT = IN>(
-  mapper: AbortableAsyncMapper<IN, OUT>,
+  mapper: AbortableAsyncMapper<IN, OUT | typeof SKIP | typeof END>,
   opt: TransformMapOptions<IN, OUT> = {},
 ): TransformTyped<IN, OUT> {
   const {

package/src/stream/transform/transformMapSync.ts

@@ -61,7 +61,7 @@ export class TransformMapSync extends AbortableTransform {}
  * Supposedly faster, for cases when async is not needed.
  */
 export function transformMapSync<IN = any, OUT = IN>(
-  mapper: Mapper<IN, OUT>,
+  mapper: Mapper<IN, OUT | typeof SKIP | typeof END>,
   opt: TransformMapSyncOptions = {},
 ): TransformTyped<IN, OUT> {
   let index = -1

package/src/util/lruMemoCache.ts

@@ -1,8 +1,8 @@
 import { MemoCache } from '@naturalcycles/js-lib'
-import * as LRUCache from 'lru-cache'
+import LRUCache from 'lru-cache'
 
 // Partial, to be able to provide default `max`
-export type LRUMemoCacheOptions<KEY, VALUE> = Partial<LRUCache.Options<KEY, VALUE>>
+export type LRUMemoCacheOptions<KEY, VALUE> = Partial<LRUCache.Options<KEY, VALUE, any>>
 
 /**
  * @example
@@ -13,13 +13,13 @@ export type LRUMemoCacheOptions<KEY, VALUE> = Partial<LRUCache.Options<KEY, VALU
  */
 export class LRUMemoCache<KEY = any, VALUE = any> implements MemoCache<KEY, VALUE> {
   constructor(opt: LRUMemoCacheOptions<KEY, VALUE>) {
-    this.lru = new LRUCache<KEY, VALUE>({
+    this.lru = new LRUCache<any, any>({
       max: 100,
       ...opt,
     })
   }
 
-  private lru!: LRUCache<KEY, VALUE>
+  private lru!: LRUCache<any, any>
 
   has(k: any): boolean {
     return this.lru.has(k)