fix: remove accidental dependency on s-ng-dev-utils

simontonsoftware · Jun 26, 2019 · 659833c · 659833c
1 parent 4bc1838
commit 659833c
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
     "@angular/platform-browser": "~8.0.0",
     "@angular/platform-browser-dynamic": "~8.0.0",
     "@angular/router": "~8.0.0",
-    "micro-dash": "^6.0.0",
+    "micro-dash": "^6.3.0",
     "rxjs": "~6.4.0",
     "tslib": "^1.9.0",
     "zone.js": "~0.9.1"
@@ -49,7 +49,7 @@
     "ng-packagr": "^5.1.0",
     "prettier": "^1.14.2",
     "protractor": "~5.4.0",
-    "s-ng-dev-utils": "^0.7.0",
+    "s-ng-dev-utils": "^0.8.0",
     "standard-version": "^6.0.1",
     "ts-node": "~7.0.0",
     "tsickle": "^0.35.0",

diff --git a/projects/s-rxjs-utils/package.json b/projects/s-rxjs-utils/package.json
@@ -5,7 +5,7 @@
   "repository": "simontonsoftware/s-rxjs-utils",
   "license": "MIT",
   "peerDependencies": {
-    "micro-dash": ">=6.0.0 <7.0.0",
+    "micro-dash": ">=6.3.0 <7.0.0",
     "rxjs": ">=6.4.0 <7.0.0"
   }
 }
diff --git a/projects/s-rxjs-utils/src/lib/operators/distinct-until-keys-changed.spec.ts b/projects/s-rxjs-utils/src/lib/operators/distinct-until-keys-changed.spec.ts
@@ -1,5 +1,4 @@
 import { Subject } from "rxjs";
-import { ObjectWith } from "s-ng-dev-utils";
 import {
   subscribeWithStubs,
   testCompletionPropagation,
@@ -10,7 +9,7 @@ import { distinctUntilKeysChanged } from "./distinct-until-keys-changed";
 
 describe("distinctUntilKeysChanged()", () => {
   it("only emits when the keys of the object change", () => {
-    const source = new Subject<ObjectWith<number>>();
+    const source = new Subject<Record<string, number>>();
     const sub = subscribeWithStubs(source.pipe(distinctUntilKeysChanged()));
 
     source.next({ a: 1, b: 2 });

diff --git a/projects/s-rxjs-utils/src/lib/operators/distinct-until-keys-changed.ts b/projects/s-rxjs-utils/src/lib/operators/distinct-until-keys-changed.ts
@@ -14,7 +14,7 @@ import { isSetEqual } from "../../to-replace/is-set-equal";
 export function distinctUntilKeysChanged<
   T extends object
 >(): MonoTypeOperatorFunction<T> {
-  let lastKeySet: Set<string> | undefined;
+  let lastKeySet: Set<string | keyof T> | undefined;
   return filter((value) => {
     const keySet = new Set(keys(value));
     if (lastKeySet && isSetEqual(keySet, lastKeySet)) {

diff --git a/projects/s-rxjs-utils/src/lib/operators/map-and-cache-object-elements.spec.ts b/projects/s-rxjs-utils/src/lib/operators/map-and-cache-object-elements.spec.ts
@@ -1,6 +1,6 @@
 import { identity } from "micro-dash";
 import { Subject } from "rxjs";
-import { expectSingleCallAndReset, ObjectWith } from "s-ng-dev-utils";
+import { expectSingleCallAndReset } from "s-ng-dev-utils";
 import {
   expectPipeResult,
   testCompletionPropagation,
@@ -11,6 +11,8 @@ import {
 import { mapAndCacheArrayElements } from "./map-and-cache-array-elements";
 import { mapAndCacheObjectElements } from "./map-and-cache-object-elements";
 
+type ObjectWith<T> = Record<string, T>;
+
 describe("mapAndCacheObjectElements()", () => {
   it("maps over the object using the given function", async () => {
     await expectPipeResult<ObjectWith<number>, number[]>(

diff --git a/projects/s-rxjs-utils/src/lib/operators/map-and-cache-object-elements.ts b/projects/s-rxjs-utils/src/lib/operators/map-and-cache-object-elements.ts
@@ -1,10 +1,9 @@
 import { OperatorFunction } from "rxjs";
-import { NumberKeyedObject } from "s-ng-dev-utils";
 import { mapAndCacheElements } from "./map-and-cache-elements";
 
 type ObjectIteratee<T, O> = <K extends keyof T>(
   item: T[K],
-  key: T extends NumberKeyedObject ? string : K,
+  key: number extends keyof T ? string : K,
 ) => O;
 
 /**

diff --git a/yarn.lock b/yarn.lock
@@ -4892,10 +4892,10 @@ methods@~1.1.2:
   resolved "https://registry.yarnpkg.com/methods/-/methods-1.1.2.tgz#5529a4d67654134edcc5266656835b0f851afcee"
   integrity sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=
 
-micro-dash@^6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/micro-dash/-/micro-dash-6.0.0.tgz#9473dcd24c714a96d5fd7400a8fa10aecf2328f1"
-  integrity sha512-eVRIkQs6T09GmD9uVAMeOG+1HkTJgLotDWjBkkegJC+YVmQtU4RbJwDnaftFsiaFKjSENzfJNDl7AP+83Oxzow==
+micro-dash@^6.3.0:
+  version "6.3.0"
+  resolved "https://registry.yarnpkg.com/micro-dash/-/micro-dash-6.3.0.tgz#20700ecb7618c84390326d4a8adf87d68f06ebe8"
+  integrity sha512-SEWwU3MCzIBpKpYQSaDc9pNLcLQlxnwzRG2mYOMNNJc1O5ZceDCHQq8GABPzrvAFO6GAMFqqdXcY6v3lAVRXsw==
   dependencies:
     tslib "^1.9.0"
     utility-types "^3.4.1"
@@ -6599,10 +6599,10 @@ rxjs@^6.0.0, rxjs@^6.4.0:
   dependencies:
     tslib "^1.9.0"
 
-s-ng-dev-utils@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/s-ng-dev-utils/-/s-ng-dev-utils-0.7.0.tgz#fedc96512fd8b2f57d6deed59a4ecb32e361b9b2"
-  integrity sha512-pmAcXzM/GCez46mO2AOpMyTLTY4GEla2v4p065OKn4avAUbse0H5GQXQQDC9kRYdh6a7EzH7VEehpn7JwFMcbA==
+s-ng-dev-utils@^0.8.0:
+  version "0.8.0"
+  resolved "https://registry.yarnpkg.com/s-ng-dev-utils/-/s-ng-dev-utils-0.8.0.tgz#5847ddf282029a9a88fd56e8b33a253dd950762c"
+  integrity sha512-/O/clTjxvweUOTyqRAicA0gDaYGXCkVC1H+CEAwpvR2aPDA+y0pRB+QMEOiw7le/3uoEO7j1DTpA6TIXWX7UHQ==
   dependencies:
     tslib "^1.9.0"
     tslint-config-prettier "^1.18.0"