type-plus 4.13.0 → 4.13.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (24) hide show
  1. package/README.md +2 -1
  2. package/cjs/predicates/isType.d.ts +10 -1
  3. package/cjs/predicates/isType.d.ts.map +1 -1
  4. package/cjs/predicates/isType.js +3 -3
  5. package/cjs/predicates/isType.js.map +1 -1
  6. package/cjs/predicates/isType.spec.js +9 -0
  7. package/cjs/predicates/isType.spec.js.map +1 -1
  8. package/cjs/utils/index.d.ts +20 -1
  9. package/cjs/utils/index.d.ts.map +1 -1
  10. package/cjs/utils/index.spec.js +8 -0
  11. package/cjs/utils/index.spec.js.map +1 -1
  12. package/esm/predicates/isType.d.ts +10 -1
  13. package/esm/predicates/isType.d.ts.map +1 -1
  14. package/esm/predicates/isType.js +3 -3
  15. package/esm/predicates/isType.js.map +1 -1
  16. package/esm/predicates/isType.spec.js +9 -0
  17. package/esm/predicates/isType.spec.js.map +1 -1
  18. package/esm/utils/index.d.ts +20 -1
  19. package/esm/utils/index.d.ts.map +1 -1
  20. package/esm/utils/index.spec.js +8 -0
  21. package/esm/utils/index.spec.js.map +1 -1
  22. package/package.json +3 -3
  23. package/ts/predicates/isType.ts +14 -5
  24. package/ts/utils/index.ts +21 -1
package/README.md CHANGED
@@ -380,7 +380,8 @@ JSONTypes.get<string>(someJson, 'a', 'b', 1, 'c') // miku
380
380
  - `BNotA<A, B>`: flip of `ANotB`
381
381
  - `as<T>(subject)`: assert `subject` as `T`. Avoid ASI issues such as `;(x as T).abc`
382
382
  - `asAny(subject)`: assert `subject` as `any`. Avoid ASI issue such as `;(x as any).abc`
383
- - `EitherAnd<A, B, [C, D]>`: combines 2 to 4 types as `A | B | (A & B)`. This is useful for combining options.
383
+ - `EitherAnd<A, B, [C, D]>`: combines 2 to 4 types as `A | B | (A & B)`. This is useful for combining options. **Deprecated**. Renamed to `EitherOrBoth`.
384
+ - `EitherOrBoth<A, B, [C, D]>`: combines 2 to 4 types as `A | B | (A & B)`. This is useful for combining options. [video](https://youtu.be/jBxx03NT4Ik)
384
385
  - `Except<T, K>`: Deprecated. Same as `Omit<T, K>`.
385
386
  - `ExcludePropType<T, U>`: excludes type `U` from properties in `T`.
386
387
  - `KeyofOptional<T>`: `keyof` that works with `Record<any, any> | undefined`.
package/cjs/predicates/isType.d.ts CHANGED
@@ -1,8 +1,17 @@
1
1
  import { AnyConstructor } from '../class/index.js';
2
2
  import type { Equal } from './Equal.js';
3
+ /**
4
+ * Is the subject of type T
5
+ */
3
6
  export declare function isType<T>(subject: T): subject is T;
4
- export declare function isType<T>(subject: unknown, validator: (s: T) => boolean): subject is T;
7
+ /**
8
+ * Is the subject a class of T
9
+ */
5
10
  export declare function isType<T extends AnyConstructor>(subject: unknown, constructor: T): subject is InstanceType<T>;
11
+ /**
12
+ * Is the subject of type T, satisfying the supplied validator
13
+ */
14
+ export declare function isType<T>(subject: unknown, validator: (s: T) => unknown): subject is T;
6
15
  export declare namespace isType {
7
16
  var t: <T extends true>(subject?: T | undefined) => boolean;
8
17
  var f: <T extends false>(subject?: T | undefined) => boolean;
package/cjs/predicates/isType.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"isType.d.ts","sourceRoot":"","sources":["../../ts/predicates/isType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAiB,MAAM,mBAAmB,CAAA;AACjE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAEvC,wBAAgB,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,IAAI,CAAC,CAAA;AACnD,wBAAgB,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,GAAG,OAAO,IAAI,CAAC,CAAA;AACvF,wBAAgB,MAAM,CAAC,CAAC,SAAS,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,GAAG,OAAO,IAAI,YAAY,CAAC,CAAC,CAAC,CAAA;yBAA9F,MAAM"}
1
+ {"version":3,"file":"isType.d.ts","sourceRoot":"","sources":["../../ts/predicates/isType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAiB,MAAM,mBAAmB,CAAA;AACjE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAEvC;;GAEG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,IAAI,CAAC,CAAA;AACnD;;GAEG;AACH,wBAAgB,MAAM,CAAC,CAAC,SAAS,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,GAAG,OAAO,IAAI,YAAY,CAAC,CAAC,CAAC,CAAA;AAC9G;;GAEG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,GAAG,OAAO,IAAI,CAAC,CAAA;yBAAvE,MAAM"}
package/cjs/predicates/isType.js CHANGED
@@ -7,7 +7,7 @@ function isType(subject, validator) {
7
7
  if ((0, index_js_1.isConstructor)(validator))
8
8
  return subject instanceof validator;
9
9
  else
10
- return validator(subject);
10
+ return !!validator(subject);
11
11
  }
12
12
  return true;
13
13
  }
@@ -19,8 +19,8 @@ isType.f = function (subject) {
19
19
  return subject === undefined || subject === false;
20
20
  };
21
21
  /**
22
- * are types A and B equals/not equals.
23
- * Slightly easier to use then `isType.t<>()` and `isType.f<>()`,
22
+ * Are types A and B equals/not equals.
23
+ * Easier to use then `isType.t<>()` and `isType.f<>()`,
24
24
  * when doing type level only equality comparison as you don't have to import `Equal<>`.
25
25
  */
26
26
  // eslint-disable-next-line @typescript-eslint/no-unused-vars
package/cjs/predicates/isType.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"isType.js","sourceRoot":"","sources":["../../ts/predicates/isType.ts"],"names":[],"mappings":";;;AAAA,8CAAiE;AAMjE,SAAgB,MAAM,CAAC,OAAgB,EAAE,SAAsD;IAC7F,IAAI,SAAS,EAAE;QACb,IAAI,IAAA,wBAAa,EAAC,SAAS,CAAC;YAC1B,OAAO,OAAO,YAAY,SAAS,CAAA;;YAEnC,OAAO,SAAS,CAAC,OAAO,CAAC,CAAA;KAC5B;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AARD,wBAQC;AAED,MAAM,CAAC,CAAC,GAAG,UAA0B,OAAW;IAC9C,OAAO,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI,CAAA;AAClD,CAAC,CAAA;AACD,MAAM,CAAC,CAAC,GAAG,UAA2B,OAAW;IAC/C,OAAO,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,KAAK,CAAA;AACnD,CAAC,CAAA;AAED;;;;GAIG;AACH,6DAA6D;AAC7D,MAAM,CAAC,KAAK,GAAG,cAA2C,CAAC,CAAA"}
1
+ {"version":3,"file":"isType.js","sourceRoot":"","sources":["../../ts/predicates/isType.ts"],"names":[],"mappings":";;;AAAA,8CAAiE;AAejE,SAAgB,MAAM,CAAC,OAAgB,EAAE,SAAsD;IAC7F,IAAI,SAAS,EAAE;QACb,IAAI,IAAA,wBAAa,EAAC,SAAS,CAAC;YAC1B,OAAO,OAAO,YAAY,SAAS,CAAA;;YAEnC,OAAO,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;KAC9B;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AARD,wBAQC;AAED,MAAM,CAAC,CAAC,GAAG,UAA0B,OAAW;IAC9C,OAAO,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI,CAAA;AAClD,CAAC,CAAA;AACD,MAAM,CAAC,CAAC,GAAG,UAA2B,OAAW;IAC/C,OAAO,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,KAAK,CAAA;AACnD,CAAC,CAAA;AAED;;;;GAIG;AACH,6DAA6D;AAC7D,MAAM,CAAC,KAAK,GAAG,cAA2C,CAAC,CAAA"}
package/cjs/predicates/isType.spec.js CHANGED
@@ -36,6 +36,15 @@ describe('isType()', function () {
36
36
  (0, index_js_1.assertType)(s);
37
37
  }
38
38
  });
39
+ it('can use a truthy validator', function () {
40
+ var s = { a: 1 };
41
+ if ((0, index_js_1.isType)(s, function (s) { return s.a; })) {
42
+ (0, index_js_1.assertType)(s);
43
+ }
44
+ else {
45
+ (0, index_js_1.assertType)(s);
46
+ }
47
+ });
39
48
  });
40
49
  describe('with class', function () {
41
50
  test('Class as validator', function () {
package/cjs/predicates/isType.spec.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"isType.spec.js","sourceRoot":"","sources":["../../ts/predicates/isType.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"isType.spec.js","sourceRoot":"","sources":["../../ts/predicates/isType.spec.ts"],"names":[],"mappings":"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"}
package/cjs/utils/index.d.ts CHANGED
@@ -19,5 +19,24 @@ export type { Widen } from './Widen.js';
19
19
  * config({ src: 'src', minify: false })
20
20
  * config({ minify: false }) // INVALID
21
21
  */
22
- export declare type EitherAnd<A, B, C = void, D = void> = C extends void ? A | B | A & B : (D extends void ? A | B | C | A & B | A & C | B & C | A & B & C : A | B | C | D | A & B | A & C | A & D | B & C | B & D | C & D | A & B & C | A & B & D | A & C & D | B & C & D | A & B & C & D);
22
+ export declare type EitherOrBoth<A, B, C = void, D = void> = C extends void ? A | B | A & B : (D extends void ? A | B | C | A & B | A & C | B & C | A & B & C : A | B | C | D | A & B | A & C | A & D | B & C | B & D | C & D | A & B & C | A & B & D | A & C & D | B & C & D | A & B & C & D);
23
+ /**
24
+ * `A` | `B` | `A & B`.
25
+ * Supports up to 4 types, and it is composable.
26
+ * This is useful when you want to compose multiple options together,
27
+ * while preserving their required field and structure.
28
+ * If the types overlaps each other, you may run into some corner cases.
29
+ * But in general usage it should work as expected.
30
+ * @deprecated renamed to `EitherOrBoth`
31
+ * @example
32
+ * type A = { src: string, minify?: boolean }
33
+ * type B = { logLevel: number }
34
+ * function config(options: EitherAnd<A, B>) { }
35
+ *
36
+ * config({ logLevel: 1 })
37
+ * config({ src: 'src' })
38
+ * config({ src: 'src', minify: false })
39
+ * config({ minify: false }) // INVALID
40
+ */
41
+ export declare type EitherAnd<A, B, C = void, D = void> = EitherOrBoth<A, B, C, D>;
23
42
  //# sourceMappingURL=index.d.ts.map
package/cjs/utils/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../ts/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,YAAY,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,YAAY,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAEvC;;;;;;;;;;;;;;;;GAgBG;AACH,oBAAY,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,SAAS,IAAI,GAC5D,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GACb,CAAC,CAAC,SAAS,IAAI,GACb,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAC7C,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GACf,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAC7C,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAC7C,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CACd,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../ts/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,YAAY,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,YAAY,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAEvC;;;;;;;;;;;;;;;;GAgBG;AACH,oBAAY,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,SAAS,IAAI,GAC/D,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GACb,CAAC,CAAC,SAAS,IAAI,GACb,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAC7C,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GACf,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAC7C,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAC7C,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CACd,CAAA;AAEH;;;;;;;;;;;;;;;;;GAiBG;AACF,oBAAY,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,IAAI,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA"}
package/cjs/utils/index.spec.js CHANGED
@@ -77,5 +77,13 @@ describe('Either<A, B>', function () {
77
77
  index_js_1.isType.equal();
78
78
  index_js_1.isType.equal();
79
79
  });
80
+ it('can be assigned as in-generics as function/promise return type', function () {
81
+ function config(_) { }
82
+ config({ a: 1 });
83
+ function configF(_) { }
84
+ configF(function () { return ({ a: 1 }); });
85
+ function configP(_) { }
86
+ configP(function () { return Promise.resolve({ a: 1 }); });
87
+ });
80
88
  });
81
89
  //# sourceMappingURL=index.spec.js.map
package/cjs/utils/index.spec.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.spec.js","sourceRoot":"","sources":["../../ts/utils/index.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.spec.js","sourceRoot":"","sources":["../../ts/utils/index.spec.ts"],"names":[],"mappings":"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"}
package/esm/predicates/isType.d.ts CHANGED
@@ -1,8 +1,17 @@
1
1
  import { AnyConstructor } from '../class/index.js';
2
2
  import type { Equal } from './Equal.js';
3
+ /**
4
+ * Is the subject of type T
5
+ */
3
6
  export declare function isType<T>(subject: T): subject is T;
4
- export declare function isType<T>(subject: unknown, validator: (s: T) => boolean): subject is T;
7
+ /**
8
+ * Is the subject a class of T
9
+ */
5
10
  export declare function isType<T extends AnyConstructor>(subject: unknown, constructor: T): subject is InstanceType<T>;
11
+ /**
12
+ * Is the subject of type T, satisfying the supplied validator
13
+ */
14
+ export declare function isType<T>(subject: unknown, validator: (s: T) => unknown): subject is T;
6
15
  export declare namespace isType {
7
16
  var t: <T extends true>(subject?: T | undefined) => boolean;
8
17
  var f: <T extends false>(subject?: T | undefined) => boolean;
package/esm/predicates/isType.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"isType.d.ts","sourceRoot":"","sources":["../../ts/predicates/isType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAiB,MAAM,mBAAmB,CAAA;AACjE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAEvC,wBAAgB,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,IAAI,CAAC,CAAA;AACnD,wBAAgB,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,GAAG,OAAO,IAAI,CAAC,CAAA;AACvF,wBAAgB,MAAM,CAAC,CAAC,SAAS,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,GAAG,OAAO,IAAI,YAAY,CAAC,CAAC,CAAC,CAAA;yBAA9F,MAAM"}
1
+ {"version":3,"file":"isType.d.ts","sourceRoot":"","sources":["../../ts/predicates/isType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAiB,MAAM,mBAAmB,CAAA;AACjE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAEvC;;GAEG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,GAAG,OAAO,IAAI,CAAC,CAAA;AACnD;;GAEG;AACH,wBAAgB,MAAM,CAAC,CAAC,SAAS,cAAc,EAAE,OAAO,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC,GAAG,OAAO,IAAI,YAAY,CAAC,CAAC,CAAC,CAAA;AAC9G;;GAEG;AACH,wBAAgB,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC,EAAE,CAAC,KAAK,OAAO,GAAG,OAAO,IAAI,CAAC,CAAA;yBAAvE,MAAM"}
package/esm/predicates/isType.js CHANGED
@@ -4,7 +4,7 @@ export function isType(subject, validator) {
4
4
  if (isConstructor(validator))
5
5
  return subject instanceof validator;
6
6
  else
7
- return validator(subject);
7
+ return !!validator(subject);
8
8
  }
9
9
  return true;
10
10
  }
@@ -15,8 +15,8 @@ isType.f = function (subject) {
15
15
  return subject === undefined || subject === false;
16
16
  };
17
17
  /**
18
- * are types A and B equals/not equals.
19
- * Slightly easier to use then `isType.t<>()` and `isType.f<>()`,
18
+ * Are types A and B equals/not equals.
19
+ * Easier to use then `isType.t<>()` and `isType.f<>()`,
20
20
  * when doing type level only equality comparison as you don't have to import `Equal<>`.
21
21
  */
22
22
  // eslint-disable-next-line @typescript-eslint/no-unused-vars
package/esm/predicates/isType.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"isType.js","sourceRoot":"","sources":["../../ts/predicates/isType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAMjE,MAAM,UAAU,MAAM,CAAC,OAAgB,EAAE,SAAsD;IAC7F,IAAI,SAAS,EAAE;QACb,IAAI,aAAa,CAAC,SAAS,CAAC;YAC1B,OAAO,OAAO,YAAY,SAAS,CAAA;;YAEnC,OAAO,SAAS,CAAC,OAAO,CAAC,CAAA;KAC5B;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,CAAC,CAAC,GAAG,UAA0B,OAAW;IAC9C,OAAO,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI,CAAA;AAClD,CAAC,CAAA;AACD,MAAM,CAAC,CAAC,GAAG,UAA2B,OAAW;IAC/C,OAAO,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,KAAK,CAAA;AACnD,CAAC,CAAA;AAED;;;;GAIG;AACH,6DAA6D;AAC7D,MAAM,CAAC,KAAK,GAAG,cAA2C,CAAC,CAAA"}
1
+ {"version":3,"file":"isType.js","sourceRoot":"","sources":["../../ts/predicates/isType.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAejE,MAAM,UAAU,MAAM,CAAC,OAAgB,EAAE,SAAsD;IAC7F,IAAI,SAAS,EAAE;QACb,IAAI,aAAa,CAAC,SAAS,CAAC;YAC1B,OAAO,OAAO,YAAY,SAAS,CAAA;;YAEnC,OAAO,CAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;KAC9B;IACD,OAAO,IAAI,CAAA;AACb,CAAC;AAED,MAAM,CAAC,CAAC,GAAG,UAA0B,OAAW;IAC9C,OAAO,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,IAAI,CAAA;AAClD,CAAC,CAAA;AACD,MAAM,CAAC,CAAC,GAAG,UAA2B,OAAW;IAC/C,OAAO,OAAO,KAAK,SAAS,IAAI,OAAO,KAAK,KAAK,CAAA;AACnD,CAAC,CAAA;AAED;;;;GAIG;AACH,6DAA6D;AAC7D,MAAM,CAAC,KAAK,GAAG,cAA2C,CAAC,CAAA"}
package/esm/predicates/isType.spec.js CHANGED
@@ -34,6 +34,15 @@ describe('isType()', () => {
34
34
  assertType(s);
35
35
  }
36
36
  });
37
+ it('can use a truthy validator', () => {
38
+ const s = { a: 1 };
39
+ if (isType(s, s => s.a)) {
40
+ assertType(s);
41
+ }
42
+ else {
43
+ assertType(s);
44
+ }
45
+ });
37
46
  });
38
47
  describe('with class', () => {
39
48
  test('Class as validator', () => {
package/esm/predicates/isType.spec.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"isType.spec.js","sourceRoot":"","sources":["../../ts/predicates/isType.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"isType.spec.js","sourceRoot":"","sources":["../../ts/predicates/isType.spec.ts"],"names":[],"mappings":"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"}
package/esm/utils/index.d.ts CHANGED
@@ -19,5 +19,24 @@ export type { Widen } from './Widen.js';
19
19
  * config({ src: 'src', minify: false })
20
20
  * config({ minify: false }) // INVALID
21
21
  */
22
- export declare type EitherAnd<A, B, C = void, D = void> = C extends void ? A | B | A & B : (D extends void ? A | B | C | A & B | A & C | B & C | A & B & C : A | B | C | D | A & B | A & C | A & D | B & C | B & D | C & D | A & B & C | A & B & D | A & C & D | B & C & D | A & B & C & D);
22
+ export declare type EitherOrBoth<A, B, C = void, D = void> = C extends void ? A | B | A & B : (D extends void ? A | B | C | A & B | A & C | B & C | A & B & C : A | B | C | D | A & B | A & C | A & D | B & C | B & D | C & D | A & B & C | A & B & D | A & C & D | B & C & D | A & B & C & D);
23
+ /**
24
+ * `A` | `B` | `A & B`.
25
+ * Supports up to 4 types, and it is composable.
26
+ * This is useful when you want to compose multiple options together,
27
+ * while preserving their required field and structure.
28
+ * If the types overlaps each other, you may run into some corner cases.
29
+ * But in general usage it should work as expected.
30
+ * @deprecated renamed to `EitherOrBoth`
31
+ * @example
32
+ * type A = { src: string, minify?: boolean }
33
+ * type B = { logLevel: number }
34
+ * function config(options: EitherAnd<A, B>) { }
35
+ *
36
+ * config({ logLevel: 1 })
37
+ * config({ src: 'src' })
38
+ * config({ src: 'src', minify: false })
39
+ * config({ minify: false }) // INVALID
40
+ */
41
+ export declare type EitherAnd<A, B, C = void, D = void> = EitherOrBoth<A, B, C, D>;
23
42
  //# sourceMappingURL=index.d.ts.map
package/esm/utils/index.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../ts/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,YAAY,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,YAAY,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAEvC;;;;;;;;;;;;;;;;GAgBG;AACH,oBAAY,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,SAAS,IAAI,GAC5D,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GACb,CAAC,CAAC,SAAS,IAAI,GACb,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAC7C,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GACf,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAC7C,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAC7C,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CACd,CAAA"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../ts/utils/index.ts"],"names":[],"mappings":"AAAA,cAAc,SAAS,CAAA;AACvB,YAAY,EAAE,OAAO,EAAE,MAAM,cAAc,CAAA;AAC3C,YAAY,EAAE,YAAY,EAAE,MAAM,mBAAmB,CAAA;AACrD,YAAY,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AAEvC;;;;;;;;;;;;;;;;GAgBG;AACH,oBAAY,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,IAAI,CAAC,SAAS,IAAI,GAC/D,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GACb,CAAC,CAAC,SAAS,IAAI,GACb,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAC7C,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GACf,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAC7C,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,GAC7C,CAAC,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CACd,CAAA;AAEH;;;;;;;;;;;;;;;;;GAiBG;AACF,oBAAY,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,GAAG,IAAI,EAAE,CAAC,GAAG,IAAI,IAAI,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA"}
package/esm/utils/index.spec.js CHANGED
@@ -75,5 +75,13 @@ describe('Either<A, B>', () => {
75
75
  isType.equal();
76
76
  isType.equal();
77
77
  });
78
+ it('can be assigned as in-generics as function/promise return type', () => {
79
+ function config(_) { }
80
+ config({ a: 1 });
81
+ function configF(_) { }
82
+ configF(() => ({ a: 1 }));
83
+ function configP(_) { }
84
+ configP(() => Promise.resolve({ a: 1 }));
85
+ });
78
86
  });
79
87
  //# sourceMappingURL=index.spec.js.map
package/esm/utils/index.spec.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.spec.js","sourceRoot":"","sources":["../../ts/utils/index.spec.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.spec.js","sourceRoot":"","sources":["../../ts/utils/index.spec.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "type-plus",
3
- "version": "4.13.0",
3
+ "version": "4.13.2",
4
4
  "description": "Provides additional types for TypeScript.",
5
5
  "homepage": "https://github.com/unional/type-plus",
6
6
  "bugs": {
@@ -84,9 +84,9 @@
84
84
  "tslib": "^2.4.0",
85
85
  "typedoc": "^0.23.0",
86
86
  "typedoc-plugin-extras": "^2.2.3",
87
- "typescript": "4.8.3"
87
+ "typescript": "4.8.4"
88
88
  },
89
- "packageManager": "yarn@3.2.3",
89
+ "packageManager": "yarn@3.2.4",
90
90
  "size-limit": [
91
91
  {
92
92
  "path": "./cjs/index.js",
package/ts/predicates/isType.ts CHANGED
@@ -1,15 +1,24 @@
1
1
  import { AnyConstructor, isConstructor } from '../class/index.js'
2
2
  import type { Equal } from './Equal.js'
3
3
 
4
+ /**
5
+ * Is the subject of type T
6
+ */
4
7
  export function isType<T>(subject: T): subject is T
5
- export function isType<T>(subject: unknown, validator: (s: T) => boolean): subject is T
8
+ /**
9
+ * Is the subject a class of T
10
+ */
6
11
  export function isType<T extends AnyConstructor>(subject: unknown, constructor: T): subject is InstanceType<T>
7
- export function isType(subject: unknown, validator?: AnyConstructor | ((s: unknown) => boolean)) {
12
+ /**
13
+ * Is the subject of type T, satisfying the supplied validator
14
+ */
15
+ export function isType<T>(subject: unknown, validator: (s: T) => unknown): subject is T
16
+ export function isType(subject: unknown, validator?: AnyConstructor | ((s: unknown) => unknown)) {
8
17
  if (validator) {
9
18
  if (isConstructor(validator))
10
19
  return subject instanceof validator
11
20
  else
12
- return validator(subject)
21
+ return !!validator(subject)
13
22
  }
14
23
  return true
15
24
  }
@@ -22,8 +31,8 @@ isType.f = function <T extends false>(subject?: T) {
22
31
  }
23
32
 
24
33
  /**
25
- * are types A and B equals/not equals.
26
- * Slightly easier to use then `isType.t<>()` and `isType.f<>()`,
34
+ * Are types A and B equals/not equals.
35
+ * Easier to use then `isType.t<>()` and `isType.f<>()`,
27
36
  * when doing type level only equality comparison as you don't have to import `Equal<>`.
28
37
  */
29
38
  // eslint-disable-next-line @typescript-eslint/no-unused-vars
package/ts/utils/index.ts CHANGED
@@ -20,7 +20,7 @@ export type { Widen } from './Widen.js'
20
20
  * config({ src: 'src', minify: false })
21
21
  * config({ minify: false }) // INVALID
22
22
  */
23
- export type EitherAnd<A, B, C = void, D = void> = C extends void
23
+ export type EitherOrBoth<A, B, C = void, D = void> = C extends void
24
24
  ? A | B | A & B
25
25
  : (D extends void
26
26
  ? A | B | C | A & B | A & C | B & C | A & B & C
@@ -29,3 +29,23 @@ export type EitherAnd<A, B, C = void, D = void> = C extends void
29
29
  A & B & C | A & B & D | A & C & D | B & C & D |
30
30
  A & B & C & D
31
31
  )
32
+
33
+ /**
34
+ * `A` | `B` | `A & B`.
35
+ * Supports up to 4 types, and it is composable.
36
+ * This is useful when you want to compose multiple options together,
37
+ * while preserving their required field and structure.
38
+ * If the types overlaps each other, you may run into some corner cases.
39
+ * But in general usage it should work as expected.
40
+ * @deprecated renamed to `EitherOrBoth`
41
+ * @example
42
+ * type A = { src: string, minify?: boolean }
43
+ * type B = { logLevel: number }
44
+ * function config(options: EitherAnd<A, B>) { }
45
+ *
46
+ * config({ logLevel: 1 })
47
+ * config({ src: 'src' })
48
+ * config({ src: 'src', minify: false })
49
+ * config({ minify: false }) // INVALID
50
+ */
51
+ export type EitherAnd<A, B, C = void, D = void> = EitherOrBoth<A, B, C, D>