type-plus 4.0.0 → 4.1.0

package/ts/object/index.ts

@@ -1,35 +1,35 @@
-export * from '../object/IsDisjoint'
-export * from './ANotB'
-export * from './AnyRecord'
-export * from './everyKey'
-export * from './ExcludePropType'
-export * from './facade'
-export * from './filterKey'
-export * from './findKey'
-export * from './forEachKey'
-export * from './getField'
-export * from './hasKey'
-export * from './hasProperty'
-export * from './IsRecord'
-export * from './KeyofOptional'
-export * from './KeysWithDiffType'
-export * from './KeyTypes'
-export * from './KnownKeys'
-export * from './mapKey'
-export * from './mapProperties'
-export * from './omit'
-export * from './OptionalKeys'
-export * from './Partial'
-export * from './pick'
-export * from './RecursiveIntersect'
-export * from './RecursivePartial'
-export * from './RecursiveRequired'
-export * from './reduceKey'
-export * from './replaceProperty'
-export * from './Required'
-export * from './RequiredKeys'
-export * from './someKey'
-export * from './SpreadRecord'
-export * from './typeOverrideIncompatible'
-export * from './ValueOf'
-
+export type { ANotB, BNotA, LeftJoin } from './ANotB'
+export type { AnyRecord } from './AnyRecord'
+export * from './everyKey'
+export type { ExcludePropType } from './ExcludePropType'
+export * from './facade'
+export * from './filterKey'
+export * from './findKey'
+export * from './forEachKey'
+export * from './getField'
+export * from './hasKey'
+export * from './hasProperty'
+export type { IsDisjoint } from './IsDisjoint'
+export type { IsRecord } from './IsRecord'
+export type { KeysOfOptional } from './KeyofOptional'
+export type { KeysWithDiffType } from './KeysWithDiffType'
+export type { KeyTypes } from './KeyTypes'
+export type { KnownKeys } from './KnownKeys'
+export * from './mapKey'
+export * from './mapProperties'
+export * from './omit'
+export type { OptionalKeys } from './OptionalKeys'
+export type { PartialExcept, PartialOmit, PartialPick } from './Partial'
+export * from './pick'
+export type { RecursiveIntersect } from './RecursiveIntersect'
+export type { RecursivePartial } from './RecursivePartial'
+export type { RecursiveRequired } from './RecursiveRequired'
+export * from './reduceKey'
+export * from './replaceProperty'
+export type { RequiredExcept, RequiredPick } from './Required'
+export type { RequiredKeys } from './RequiredKeys'
+export * from './someKey'
+export * from './split'
+export type { SpreadRecord } from './SpreadRecord'
+export * from './typeOverrideIncompatible'
+export type { ValueOf } from './ValueOf'

package/ts/object/split.spec.ts

@@ -0,0 +1,54 @@
+import { isType, split } from '..'
+
+const target = { a: 0, b: '', c: false }
+test('can use undefined as default', () => {
+  const [{ a }] = split(target, { a: undefined })
+
+  isType.equal<true, typeof a, number | undefined>()
+  expect(a).toBe(0)
+})
+
+test('can specify default with the same type', () => {
+  const [{ a }] = split(target, { a: 2 })
+
+  isType.equal<true, typeof a, number>()
+  expect(a).toBe(0)
+})
+
+test('can specify default as one of the intersect types', () => {
+  const [a] = split({ a: undefined as number | string | undefined }, { a: '2' })
+
+  isType.equal<true, typeof a, { a: number | string }>()
+  expect(a).toEqual({ a: '2' })
+})
+
+test('get remaining props in the last entry', () => {
+  const [, r] = split(target, { a: undefined })
+
+  isType.equal<true, typeof r, { b: string, c: boolean }>()
+  expect(r).toEqual({ b: '', c: false })
+})
+
+test('work with simple Record', () => {
+  const [a] = split({} as Record<string, string>, { a: 'a' })
+
+  isType.equal<true, typeof a, { a: string }>()
+  expect(a).toEqual({ a: 'a' })
+})
+
+test('can specify multiple splitters', () => {
+  const t = { r: 'r' } as { a?: string, b?: string, c?: string, r?: string }
+  const [a, b, c, r] = split(t,
+    { a: 'a' },
+    { b: 'b' },
+    { c: 'c' }
+  )
+  isType.equal<true, typeof a, { a: string }>()
+  isType.equal<true, typeof b, { b: string }>()
+  isType.equal<true, typeof c, { c: string }>()
+  isType.equal<true, typeof r, { r?: string | undefined }>()
+  expect(a).toEqual({ a: 'a' })
+  expect(b).toEqual({ b: 'b' })
+  expect(c).toEqual({ c: 'c' })
+  expect(r).toEqual({ r: 'r' })
+})

package/ts/object/split.ts

@@ -0,0 +1,191 @@
+import { AnyRecord, Omit, reduceByKey } from '..'
+
+type Splitter<T extends AnyRecord> = Partial<{ [k in keyof T]: T[k] | undefined }>
+type Split<T extends AnyRecord, S extends AnyRecord> = { [k in keyof S]: NonNullable<T[k]> | S[k] }
+
+export function split<
+  T extends AnyRecord,
+  S1 extends Splitter<T>
+>(target: T, split1: S1): [
+    Split<T, S1>,
+    Omit<T, keyof S1>
+  ]
+export function split<
+  T extends AnyRecord,
+  S1 extends Splitter<T>,
+  S2 extends Splitter<T>,
+  >(target: T, split1: S1, split2: S2): [
+    Split<T, S1>,
+    Split<T, S2>,
+    Omit<T, keyof S1 | keyof S2>
+  ]
+export function split<
+  T extends AnyRecord,
+  S1 extends Splitter<T>,
+  S2 extends Splitter<T>,
+  S3 extends Splitter<T>,
+  >(target: T, splitter1: S1, splitter2: S2, splitter3: S3): [
+    Split<T, S1>,
+    Split<T, S2>,
+    Split<T, S3>,
+    Omit<T, keyof S1 | keyof S2 | keyof S3>
+  ]
+export function split<
+  T extends AnyRecord,
+  S1 extends Splitter<T>,
+  S2 extends Splitter<T>,
+  S3 extends Splitter<T>,
+  S4 extends Splitter<T>,
+  >(target: T,
+    splitter1: S1,
+    splitter2: S2,
+    splitter3: S3,
+    splitter4: S4,
+): [
+    Split<T, S1>,
+    Split<T, S2>,
+    Split<T, S3>,
+    Split<T, S4>,
+    Omit<T, keyof S1 | keyof S2 | keyof S3 | keyof S4>
+  ]
+export function split<
+  T extends AnyRecord,
+  S1 extends Splitter<T>,
+  S2 extends Splitter<T>,
+  S3 extends Splitter<T>,
+  S4 extends Splitter<T>,
+  S5 extends Splitter<T>,
+  >(target: T,
+    splitter1: S1,
+    splitter2: S2,
+    splitter3: S3,
+    splitter4: S4,
+    splitter5: S5,
+): [
+    Split<T, S1>,
+    Split<T, S2>,
+    Split<T, S3>,
+    Split<T, S4>,
+    Split<T, S5>,
+    Omit<T, keyof S1 | keyof S2 | keyof S3 | keyof S4 | keyof S5>
+  ]
+export function split<
+  T extends AnyRecord,
+  S1 extends Splitter<T>,
+  S2 extends Splitter<T>,
+  S3 extends Splitter<T>,
+  S4 extends Splitter<T>,
+  S5 extends Splitter<T>,
+  S6 extends Splitter<T>,
+  >(target: T,
+    splitter1: S1,
+    splitter2: S2,
+    splitter3: S3,
+    splitter4: S4,
+    splitter5: S5,
+    splitter6: S6,
+): [
+    Split<T, S1>,
+    Split<T, S2>,
+    Split<T, S3>,
+    Split<T, S4>,
+    Split<T, S5>,
+    Split<T, S6>,
+    Omit<T, keyof S1 | keyof S2 | keyof S3 | keyof S4 | keyof S5 | keyof S6>
+  ]
+export function split<
+  T extends AnyRecord,
+  S1 extends Splitter<T>,
+  S2 extends Splitter<T>,
+  S3 extends Splitter<T>,
+  S4 extends Splitter<T>,
+  S5 extends Splitter<T>,
+  S6 extends Splitter<T>,
+  S7 extends Splitter<T>,
+  >(target: T,
+    splitter1: S1,
+    splitter2: S2,
+    splitter3: S3,
+    splitter4: S4,
+    splitter5: S5,
+    splitter6: S6,
+    splitter7: S7,
+): [
+    Split<T, S1>,
+    Split<T, S2>,
+    Split<T, S3>,
+    Split<T, S4>,
+    Split<T, S5>,
+    Split<T, S6>,
+    Split<T, S7>,
+    Omit<T, keyof S1 | keyof S2 | keyof S3 | keyof S4 | keyof S5 | keyof S6 | keyof S7>
+  ]
+export function split<
+  T extends AnyRecord,
+  S1 extends Splitter<T>,
+  S2 extends Splitter<T>,
+  S3 extends Splitter<T>,
+  S4 extends Splitter<T>,
+  S5 extends Splitter<T>,
+  S6 extends Splitter<T>,
+  S7 extends Splitter<T>,
+  S8 extends Splitter<T>,
+  >(target: T,
+    splitter1: S1,
+    splitter2: S2,
+    splitter3: S3,
+    splitter4: S4,
+    splitter5: S5,
+    splitter6: S6,
+    splitter7: S7,
+    splitter8: S8,
+): [
+    Split<T, S1>,
+    Split<T, S2>,
+    Split<T, S3>,
+    Split<T, S4>,
+    Split<T, S5>,
+    Split<T, S6>,
+    Split<T, S7>,
+    Split<T, S8>,
+    Omit<T, keyof S1 | keyof S2 | keyof S3 | keyof S4 | keyof S5 | keyof S6 | keyof S7 | keyof S8>
+  ]
+export function split<
+  T extends AnyRecord,
+  S1 extends Splitter<T>,
+  S2 extends Splitter<T>,
+  S3 extends Splitter<T>,
+  S4 extends Splitter<T>,
+  S5 extends Splitter<T>,
+  S6 extends Splitter<T>,
+  S7 extends Splitter<T>,
+  S8 extends Splitter<T>,
+  S9 extends Splitter<T>,
+  >(target: T,
+    splitter1: S1,
+    splitter2: S2,
+    splitter3: S3,
+    splitter4: S4,
+    splitter5: S5,
+    splitter6: S6,
+    splitter7: S7,
+    splitter8: S8,
+    splitter9: S9,
+): [
+    Split<T, S1>,
+    Split<T, S2>,
+    Split<T, S3>,
+    Split<T, S4>,
+    Split<T, S5>,
+    Split<T, S6>,
+    Split<T, S7>,
+    Split<T, S8>,
+    Split<T, S9>,
+    Omit<T, keyof S1 | keyof S2 | keyof S3 | keyof S4 | keyof S5 | keyof S6 | keyof S7 | keyof S8 | keyof S9>
+  ]
+export function split(target: AnyRecord, ...splitters: AnyRecord[]): AnyRecord[] {
+  const keyMap: AnyRecord = {}
+  const s = splitters.map(s => reduceByKey(s, (p, k) => (keyMap[k] = true, p[k] = target[k] ?? s[k], p), {} as AnyRecord))
+  const r = reduceByKey(target, (p, k) => keyMap[k] ? p : (p[k] = target[k], p), {} as AnyRecord)
+  return [...s, r]
+}

package/ts/predicates/CanAssign.ts

@@ -1,5 +1,5 @@
 import { NotExtendable } from './Extends'
-import { IsEmptyObject } from './isEmptyObject'
+import { IsEmptyObject } from './IsEmptyObject'
 
 /**
  * Can `A` assign to `B`

package/ts/predicates/index.ts

@@ -1,17 +1,17 @@
-export * from './CanAssign'
-export * from './Equal'
-export * from './Extends'
-export * from './If'
-export * from './isType'
-export * from './logical'
-export * from './isEmptyObject'
-
-import { IsExtend } from './Extends'
-
-export type IsLiteral<T extends number | string, Then = true, Else = false> = number extends T ?
-  Else :
-  string extends T ? Else : Then
-
-export type IsBoolean<T, Then = true, Else = false> = boolean extends T ? Then : Else
-
-export type IsAny<T, Then = true, Else = false> = boolean extends IsExtend<T, string> ? Then : Else
+export * from './CanAssign'
+export type { Equal, IsEqual, IsNotEqual, NotEqual } from './Equal'
+export type { Extendable, IsExtend, IsNotExtend, NotExtendable } from './Extends'
+export type { If } from './If'
+export * from './isType'
+export type { And, Not, Or, Xor } from './logical'
+export type { IsEmptyObject } from './IsEmptyObject'
+
+import { IsExtend } from './Extends'
+
+export type IsLiteral<T extends number | string, Then = true, Else = false> = number extends T ?
+  Else :
+  string extends T ? Else : Then
+
+export type IsBoolean<T, Then = true, Else = false> = boolean extends T ? Then : Else
+
+export type IsAny<T, Then = true, Else = false> = boolean extends IsExtend<T, string> ? Then : Else

package/ts/promise/index.ts

@@ -1,4 +1,4 @@
 export * from './isPromise'
-export * from './PromiseValue'
-export * from './PromiseValueMerge'
+export type { PromiseValue } from './PromiseValue'
+export type { PromiseValueMerge } from './PromiseValueMerge'
 export * from './mapSeries'

package/ts/types/index.ts

@@ -1,28 +1,28 @@
-/**
- * A turing complete solution inspired by many.
- * The types is in Pascal Cases
- * because lower case type names (e.g. true) is a reserved keyword.
- * https://github.com/microsoft/TypeScript/issues/14833
- * https://github.com/tycho01/typical
- */
-
-// export * from './BigInt'
-export * from './AllType'
-export * from './Any'
-export * from './Array'
-export * from './Boolean'
-export * from './check'
-export * from './conform'
-export * from './Generate'
-export { nil as null, Null } from './Null'
-export * from './Number'
-export { keys, object, ObjectType as Object } from './Object'
-export * from './Record'
-export * from './satisfy'
-export * from './String'
-export * from './Symbol'
-export * from './Tuple'
-export * from './types'
-export { undef as undefined, Undefined } from './Undefined'
-export * from './Union'
-export * from './Unknown'
+/**
+ * A turing complete solution inspired by many.
+ * The types is in Pascal Cases
+ * because lower case type names (e.g. true) is a reserved keyword.
+ * https://github.com/microsoft/TypeScript/issues/14833
+ * https://github.com/tycho01/typical
+ */
+
+// export * from './BigInt'
+export type { AllType } from './AllType'
+export * from './Any'
+export * from './Array'
+export * from './Boolean'
+export * from './check'
+export * from './conform'
+export type { Generate } from './Generate'
+export { nil as null, Null } from './Null'
+export * from './Number'
+export { keys, object, ObjectType as Object } from './Object'
+export * from './Record'
+export * from './satisfy'
+export * from './String'
+export * from './Symbol'
+export * from './Tuple'
+export * from './types'
+export { undef as undefined, Undefined } from './Undefined'
+export * from './Union'
+export * from './Unknown'

package/ts/utils/index.ts

@@ -1,2 +1,2 @@
-export * from './as'
-export * from './Widen'
+export * from './as'
+export type { Widen } from './Widen'

package/cjs/predicates/isEmptyObject.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"isEmptyObject.js","sourceRoot":"","sources":["../../ts/predicates/isEmptyObject.ts"],"names":[],"mappings":""}

package/esm/predicates/isEmptyObject.js

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=isEmptyObject.js.map

package/esm/predicates/isEmptyObject.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"isEmptyObject.js","sourceRoot":"","sources":["../../ts/predicates/isEmptyObject.ts"],"names":[],"mappings":""}