Swith to @proc7ts/supply (#27)

surol · web-flow · commit e48b5a657a67 · 2021-03-11T19:47:14.000+07:00
* Switch to `@proc7ts/supply`

* Upgrade deps

* `@proc7ts/primitives` v2
diff --git a/package.json b/package.json
@@ -30,19 +30,20 @@
     }
   },
   "peerDependencies": {
-    "@proc7ts/fun-events": "^10.3.1"
+    "@proc7ts/fun-events": "^10.4.0"
   },
   "peerDependenciesMeta": {
     "@proc7ts/fun-events": {
       "optional": true
     }
   },
   "dependencies": {
-    "@proc7ts/primitives": "^1.8.1",
-    "@proc7ts/push-iterator": "^2.5.0"
+    "@proc7ts/primitives": "^2.0.0",
+    "@proc7ts/push-iterator": "^2.5.0",
+    "@proc7ts/supply": "^1.0.0"
   },
   "devDependencies": {
-    "@proc7ts/fun-events": "^10.3.1",
+    "@proc7ts/fun-events": "^10.4.0",
     "@rollup/plugin-commonjs": "^17.1.0",
     "@rollup/plugin-node-resolve": "^11.2.0",
     "@run-z/eslint-config": "^1.2.1",
@@ -51,11 +52,11 @@
     "@typescript-eslint/eslint-plugin": "^4.17.0",
     "@typescript-eslint/parser": "^4.17.0",
     "eslint": "^7.21.0",
-    "eslint-plugin-jest": "^24.1.9",
+    "eslint-plugin-jest": "^24.2.1",
     "gh-pages": "^3.1.0",
     "jest": "^26.6.3",
     "jest-junit": "^12.0.0",
-    "rollup": "^2.40.0",
+    "rollup": "^2.41.1",
     "rollup-plugin-flat-dts": "^1.0.3",
     "rollup-plugin-sourcemaps": "^0.6.3",
     "rollup-plugin-typescript2": "^0.30.0",
diff --git a/src/conventional/context-supply.spec.ts b/src/conventional/context-supply.spec.ts
@@ -1,4 +1,4 @@
-import { isAlwaysSupply, Supply, SupplyPeer } from '@proc7ts/primitives';
+import { isAlwaysSupply, Supply, SupplyPeer } from '@proc7ts/supply';
 import type { ContextValues } from '../context-values';
 import { ContextRegistry } from '../registry';
 import { ContextSupply } from './context-supply';
diff --git a/src/conventional/context-supply.ts b/src/conventional/context-supply.ts
@@ -1,5 +1,4 @@
-import type { Supply } from '@proc7ts/primitives';
-import { alwaysSupply } from '@proc7ts/primitives';
+import { alwaysSupply, Supply } from '@proc7ts/supply';
 import type { ContextRef } from '../context-ref';
 import type { ContextValueSlot } from '../key';
 import { SimpleContextKey } from '../singleton';
diff --git a/src/key/context-seeder.ts b/src/key/context-seeder.ts
@@ -1,4 +1,4 @@
-import type { Supply } from '@proc7ts/primitives';
+import type { Supply } from '@proc7ts/supply';
 import type { ContextValues } from '../context-values';
 import type { ContextValueProvider } from '../registry';
 
diff --git a/src/registry/context-builder.ts b/src/registry/context-builder.ts
@@ -1,4 +1,4 @@
-import type { Supply } from '@proc7ts/primitives';
+import type { Supply } from '@proc7ts/supply';
 import type { ContextValues } from '../context-values';
 import type { ContextRegistry } from './context-registry';
 
diff --git a/src/registry/context-registry.ts b/src/registry/context-registry.ts
@@ -1,4 +1,5 @@
-import { noop, Supply } from '@proc7ts/primitives';
+import { noop } from '@proc7ts/primitives';
+import type { Supply } from '@proc7ts/supply';
 import type { ContextValues } from '../context-values';
 import type { ContextSeedKey } from '../key';
 import { ContextKey__symbol } from '../key';
diff --git a/src/singleton/iterative-context-key.ts b/src/singleton/iterative-context-key.ts
@@ -1,4 +1,4 @@
-import { lazyValue, Supply } from '@proc7ts/primitives';
+import { lazyValue } from '@proc7ts/primitives';
 import {
   itsElements,
   itsEmpty,
@@ -8,6 +8,7 @@ import {
   PushIterable,
   valueIt,
 } from '@proc7ts/push-iterator';
+import { Supply } from '@proc7ts/supply';
 import type { ContextValues } from '../context-values';
 import type { ContextSeeder } from '../key';
 import { ContextKey, ContextSeedKey } from '../key';
diff --git a/src/singleton/simple-context-key.ts b/src/singleton/simple-context-key.ts
@@ -1,4 +1,5 @@
-import { lazyValue, noop, Supply } from '@proc7ts/primitives';
+import { lazyValue, noop } from '@proc7ts/primitives';
+import { Supply } from '@proc7ts/supply';
 import type { ContextValues } from '../context-values';
 import type { ContextSeeder } from '../key';
 import { ContextKey, ContextSeedKey } from '../key';
diff --git a/src/updatable/context-up-key.ts b/src/updatable/context-up-key.ts
@@ -10,8 +10,8 @@ import {
   translateAfter,
   ValueTracker,
 } from '@proc7ts/fun-events';
-import { Supply } from '@proc7ts/primitives';
 import { itsElements, mapIt, overElementsOf, overIterator } from '@proc7ts/push-iterator';
+import { Supply } from '@proc7ts/supply';
 import type { ContextRef } from '../context-ref';
 import type { ContextValues } from '../context-values';
 import { ContextSupply } from '../conventional';
diff --git a/src/updatable/fn-context-key.spec.ts b/src/updatable/fn-context-key.spec.ts
@@ -1,4 +1,4 @@
-import { Supply } from '@proc7ts/primitives';
+import { Supply } from '@proc7ts/supply';
 import { ContextKeyError } from '../context-key-error';
 import type { ContextValues } from '../context-values';
 import { ContextSupply } from '../conventional';
diff --git a/src/updatable/modules/context-module-usage.impl.ts b/src/updatable/modules/context-module-usage.impl.ts
@@ -8,7 +8,8 @@ import {
   trackValue,
   ValueTracker,
 } from '@proc7ts/fun-events';
-import { neverSupply, Supply, SupplyPeer, valueProvider } from '@proc7ts/primitives';
+import { noop, valueProvider } from '@proc7ts/primitives';
+import { neverSupply, Supply, SupplyPeer } from '@proc7ts/supply';
 import type { ContextRequest } from '../../context-request';
 import type { ContextValues } from '../../context-values';
 import { ContextSupply } from '../../conventional';
@@ -129,7 +130,7 @@ export class ContextModuleUsage {
 
   private _load(module: ContextModule): void {
 
-    const supply = new Supply().needs(this._rev).whenOff(error => {
+    const supply = new Supply(noop).needs(this._rev).whenOff(error => {
 
       const rev = this._rev.it;
 
@@ -167,7 +168,7 @@ export class ContextModuleUsage {
 
   private _use(handle: ContextModule.Handle, user?: SupplyPeer): ContextModule.Use {
 
-    const supply = new Supply();
+    const supply = new Supply(noop);
 
     if (user) {
       supply.needs(user);
@@ -196,7 +197,7 @@ export class ContextModuleUsage {
               ready: false,
               error,
             },
-            supply: new Supply().off(error),
+            supply: new Supply(noop).off(error),
           };
 
           rev.supply.off(error);
diff --git a/src/updatable/modules/context-module.impl.ts b/src/updatable/modules/context-module.impl.ts
@@ -1,6 +1,7 @@
 import type { OnEvent } from '@proc7ts/fun-events';
-import { isDefined, noop, setOfElements, Supply, valueProvider } from '@proc7ts/primitives';
+import { isDefined, noop, setOfElements, valueProvider } from '@proc7ts/primitives';
 import { itsElements, valueIt } from '@proc7ts/push-iterator';
+import type { Supply } from '@proc7ts/supply';
 import type { ContextRegistry } from '../../registry';
 import type { ContextUpKey } from '../context-up-key';
 import type { ContextModule } from './context-module';
diff --git a/src/updatable/modules/context-module.spec.ts b/src/updatable/modules/context-module.spec.ts
@@ -1,5 +1,6 @@
 import { onceAfter } from '@proc7ts/fun-events';
-import { asis, newPromiseResolver, noop, Supply } from '@proc7ts/primitives';
+import { asis, newPromiseResolver, noop } from '@proc7ts/primitives';
+import { Supply } from '@proc7ts/supply';
 import type { ContextValues } from '../../context-values';
 import { ContextKey__symbol } from '../../key';
 import { ContextRegistry } from '../../registry';
@@ -238,7 +239,7 @@ describe('ContextModule', () => {
     registry.provide(module);
 
     const handle = context.get(module);
-    const use = handle.use(new Supply().off('reason'));
+    const use = handle.use(new Supply(noop).off('reason'));
 
     await Promise.resolve();
     expect(await handle.read).toMatchObject({
@@ -481,7 +482,7 @@ describe('ContextModule', () => {
     const handle = context.get(module);
     const use = handle.use();
 
-    use.supply.off('reason');
+    use.supply.whenOff(noop).off('reason');
 
     expect(await handle.read).toMatchObject({
       module,
diff --git a/src/updatable/modules/context-module.ts b/src/updatable/modules/context-module.ts
@@ -1,5 +1,5 @@
 import type { AfterEvent, EventKeeper, OnEvent } from '@proc7ts/fun-events';
-import type { Supply, SupplyPeer } from '@proc7ts/primitives';
+import type { Supply, SupplyPeer } from '@proc7ts/supply';
 import type { ContextValues } from '../../context-values';
 import { ContextKey__symbol } from '../../key';
 import type { ContextRegistry, ContextValueSpec } from '../../registry';
diff --git a/src/updatable/multi-context-up-key.spec.ts b/src/updatable/multi-context-up-key.spec.ts
@@ -1,5 +1,6 @@
 import { AfterEvent, afterThe, onceAfter } from '@proc7ts/fun-events';
-import { asis, Supply } from '@proc7ts/primitives';
+import { asis } from '@proc7ts/primitives';
+import { Supply } from '@proc7ts/supply';
 import { ContextKeyError } from '../context-key-error';
 import type { ContextValues } from '../context-values';
 import { ContextSupply } from '../conventional';
diff --git a/src/updatable/single-context-up-key.spec.ts b/src/updatable/single-context-up-key.spec.ts
@@ -1,5 +1,6 @@
 import { AfterEvent, afterThe, onceAfter } from '@proc7ts/fun-events';
-import { asis, Supply } from '@proc7ts/primitives';
+import { asis } from '@proc7ts/primitives';
+import { Supply } from '@proc7ts/supply';
 import { ContextKeyError } from '../context-key-error';
 import type { ContextValues } from '../context-values';
 import { ContextSupply } from '../conventional';

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { isAlwaysSupply, Supply, SupplyPeer } from '@proc7ts/primitives';`
	`1`	`+import { isAlwaysSupply, Supply, SupplyPeer } from '@proc7ts/supply';`
`2`	`2`	`import type { ContextValues } from '../context-values';`
`3`	`3`	`import { ContextRegistry } from '../registry';`
`4`	`4`	`import { ContextSupply } from './context-supply';`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import type { Supply } from '@proc7ts/primitives';`
	`1`	`+import type { Supply } from '@proc7ts/supply';`
`2`	`2`	`import type { ContextValues } from '../context-values';`
`3`	`3`	`import type { ContextValueProvider } from '../registry';`
`4`	`4`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { Supply } from '@proc7ts/primitives';`
	`1`	`+import { Supply } from '@proc7ts/supply';`
`2`	`2`	`import { ContextKeyError } from '../context-key-error';`
`3`	`3`	`import type { ContextValues } from '../context-values';`
`4`	`4`	`import { ContextSupply } from '../conventional';`