@dxos/util 0.7.5-main.9d2a38b → 0.7.5-main.b19bfc8

package/src/types.ts

@@ -10,8 +10,6 @@ export type MaybeProvider<T, V = void> = T | ((arg: V) => T);
 
 export type MaybePromise<T> = T | Promise<T>;
 
-export type MakeOptional<Type, Key extends keyof Type> = Omit<Type, Key> & Partial<Pick<Type, Key>>;
-
 export type GuardedType<T> = T extends (value: any) => value is infer R ? R : never;
 
 export type DeepReadonly<T> = {
@@ -24,6 +22,22 @@ export type DeepReadonly<T> = {
 
 export type DeepWriteable<T> = { -readonly [K in keyof T]: T[K] extends object ? DeepWriteable<T[K]> : T[K] };
 
+/**
+ * Simplifies type (copied from effect).
+ */
+export type Simplify<A> = { [K in keyof A]: A[K] } extends infer B ? B : never;
+
+/**
+ * Replace types of specified keys.
+ */
+export type Specialize<T, U> = Simplify<Omit<T, keyof U> & U>;
+
+/**
+ * Make specified keys optional.
+ */
+// TODO(burdon): Wrapping with Simplify fails.
+export type MakeOptional<T, K extends keyof T> = Omit<T, K> & Partial<Pick<T, K>>;
+
 /**
  * All types that evaluate to false when cast to a boolean.
  */
@@ -34,12 +48,8 @@ export type Falsy = false | 0 | '' | null | undefined;
  * NOTE: To filter by type:
  * items.filter((item: any): item is RangeSet<Decoration> => item instanceof RangeSet)
  */
-// TODO(burdon): Reconcile names and variants.
 export const isNotFalsy = <T>(value: T): value is Exclude<T, Falsy> => !!value;
-export const nonNullable = <T>(value: T): value is NonNullable<T> => value !== null && value !== undefined;
-export const isNotNullOrUndefined = <T>(value: T): value is Exclude<T, null | undefined> => value != null;
-// export const isNotNullish = <T>(value: T | null | undefined): value is T => value !== undefined && value !== null;
-export const boolGuard = <T>(value: T | null | undefined): value is T => Boolean(value);
+export const isNonNullable = <T>(value: T | null | undefined): value is T => value != null;
 
 // TODO(burdon): Replace use of setTimeout everywhere?
 //  Would remove the need to cancel (and associated errors), but would change the operation of the code

package/dist/types/src/disposition.d.ts

@@ -1,15 +0,0 @@
-/**
- * Determines priority order.
- *
- * - `static` - Remain in natural order.
- * - `hoist` - Placed before `static`.
- * - `fallback` - Placed after `static`.
- */
-export type Disposition = 'static' | 'hoist' | 'fallback';
-/**
- * Sorting function for sorting by disposition.
- */
-export declare const byDisposition: <T extends {
-    disposition?: Disposition;
-}>(a: T, b: T) => 0 | 1 | -1;
-//# sourceMappingURL=disposition.d.ts.map

package/dist/types/src/disposition.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"disposition.d.ts","sourceRoot":"","sources":["../../../src/disposition.ts"],"names":[],"mappings":"AAIA;;;;;;GAMG;AACH,MAAM,MAAM,WAAW,GAAG,QAAQ,GAAG,OAAO,GAAG,UAAU,CAAC;AAE1D;;GAEG;AACH,eAAO,MAAM,aAAa,GAAI,CAAC,SAAS;IAAE,WAAW,CAAC,EAAE,WAAW,CAAA;CAAE,KAAK,CAAC,KAAK,CAAC,eAahF,CAAC"}

package/dist/types/src/disposition.test.d.ts

@@ -1,2 +0,0 @@
-export {};
-//# sourceMappingURL=disposition.test.d.ts.map

package/dist/types/src/disposition.test.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"disposition.test.d.ts","sourceRoot":"","sources":["../../../src/disposition.test.ts"],"names":[],"mappings":""}

package/src/disposition.test.ts

@@ -1,98 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-import { describe, it, expect } from 'vitest';
-
-import { byDisposition, type Disposition } from './disposition';
-
-type TestItem = {
-  id: number;
-  disposition?: Disposition;
-};
-
-describe('byDisposition', () => {
-  it('should keep items with same disposition in their original order', () => {
-    const items: TestItem[] = [
-      { id: 1, disposition: 'static' },
-      { id: 2, disposition: 'static' },
-      { id: 3, disposition: 'hoist' },
-      { id: 4, disposition: 'hoist' },
-      { id: 5, disposition: 'fallback' },
-      { id: 6, disposition: 'fallback' },
-    ];
-
-    const sorted = [...items].sort(byDisposition);
-
-    // Check that items with the same disposition maintain relative order
-    expect(sorted.findIndex((item) => item.id === 3)).toBeLessThan(sorted.findIndex((item) => item.id === 4));
-    expect(sorted.findIndex((item) => item.id === 1)).toBeLessThan(sorted.findIndex((item) => item.id === 2));
-    expect(sorted.findIndex((item) => item.id === 5)).toBeLessThan(sorted.findIndex((item) => item.id === 6));
-  });
-
-  it('should place "hoist" items before "static" items', () => {
-    const items: TestItem[] = [
-      { id: 1, disposition: 'static' },
-      { id: 2, disposition: 'hoist' },
-    ];
-
-    const sorted = [...items].sort(byDisposition);
-    expect(sorted[0].disposition).toBe('hoist');
-    expect(sorted[1].disposition).toBe('static');
-  });
-
-  it('should place "fallback" items after "static" items', () => {
-    const items: TestItem[] = [
-      { id: 1, disposition: 'fallback' },
-      { id: 2, disposition: 'static' },
-    ];
-
-    const sorted = [...items].sort(byDisposition);
-    expect(sorted[0].disposition).toBe('static');
-    expect(sorted[1].disposition).toBe('fallback');
-  });
-
-  it('should treat items without disposition as "static"', () => {
-    const items: TestItem[] = [{ id: 1 }, { id: 2, disposition: 'hoist' }, { id: 3, disposition: 'fallback' }];
-
-    const sorted = [...items].sort(byDisposition);
-    expect(sorted[0].disposition).toBe('hoist');
-    expect(sorted[1].disposition).toBeUndefined();
-    expect(sorted[2].disposition).toBe('fallback');
-  });
-
-  it('should correctly sort mixed dispositions', () => {
-    const items: TestItem[] = [
-      { id: 1, disposition: 'fallback' },
-      { id: 2, disposition: 'static' },
-      { id: 3, disposition: 'hoist' },
-      { id: 4 }, // implicit static
-      { id: 5, disposition: 'hoist' },
-      { id: 6, disposition: 'fallback' },
-    ];
-
-    const sorted = [...items].sort(byDisposition);
-
-    // All hoisted items should come first
-    expect(sorted[0].disposition).toBe('hoist');
-    expect(sorted[1].disposition).toBe('hoist');
-
-    // Static items (including undefined) should be in the middle
-    expect(sorted[2].disposition).toBe('static');
-    expect(sorted[3].disposition).toBeUndefined();
-
-    // Fallback items should be last
-    expect(sorted[4].disposition).toBe('fallback');
-    expect(sorted[5].disposition).toBe('fallback');
-  });
-
-  it('should handle empty arrays', () => {
-    const items: TestItem[] = [];
-    expect(() => [...items].sort(byDisposition)).not.toThrow();
-  });
-
-  it('should handle single item arrays', () => {
-    const items: TestItem[] = [{ id: 1, disposition: 'static' }];
-    expect(() => [...items].sort(byDisposition)).not.toThrow();
-  });
-});

package/src/disposition.ts

@@ -1,30 +0,0 @@
-//
-// Copyright 2025 DXOS.org
-//
-
-/**
- * Determines priority order.
- *
- * - `static` - Remain in natural order.
- * - `hoist` - Placed before `static`.
- * - `fallback` - Placed after `static`.
- */
-export type Disposition = 'static' | 'hoist' | 'fallback';
-
-/**
- * Sorting function for sorting by disposition.
- */
-export const byDisposition = <T extends { disposition?: Disposition }>(a: T, b: T) => {
-  const aDisposition = a.disposition ?? 'static';
-  const bDisposition = b.disposition ?? 'static';
-
-  if (aDisposition === bDisposition) {
-    return 0;
-  } else if (aDisposition === 'hoist' || bDisposition === 'fallback') {
-    return -1;
-  } else if (bDisposition === 'hoist' || aDisposition === 'fallback') {
-    return 1;
-  }
-
-  return 0;
-};