refactor: array-fns :)

package.json

···
 		"@atcute/tid": "^1.0.2",
 		"@floating-ui/dom": "^1.6.13",
 		"@floating-ui/utils": "^0.2.9",
+		"@mary/array-fns": "npm:@jsr/mary__array-fns@^0.1.0",
 		"@mary/async-iterator-fns": "npm:@jsr/mary__async-iterator-fns@^0.1.1",
 		"@mary/date-fns": "npm:@jsr/mary__date-fns@^0.1.2",
 		"@mary/events": "npm:@jsr/mary__events@^0.1.0",

pnpm-lock.yaml

···
       '@floating-ui/utils':
         specifier: ^0.2.9
         version: 0.2.9(patch_hash=1cf283fbaa686f96f7b3029bbc0955bff698af6f4a75ba6c276ad1a7a7c40aea)
+      '@mary/array-fns':
+        specifier: npm:@jsr/mary__array-fns@^0.1.0
+        version: '@jsr/mary__array-fns@0.1.0'
       '@mary/async-iterator-fns':
         specifier: npm:@jsr/mary__async-iterator-fns@^0.1.1
         version: '@jsr/mary__async-iterator-fns@0.1.1'
···
 
   '@jridgewell/trace-mapping@0.3.9':
     resolution: {integrity: sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==}
+
+  '@jsr/mary__array-fns@0.1.0':
+    resolution: {integrity: sha512-rG8Ng1Arl86T1Lv4of4LC8OcdpGxcxG/j8K01K6lyG0lI9imLT7e6FknuMVs5MQ5jH6NUBYnPOfmVAv4sd/OkA==, tarball: https://npm.jsr.io/~/11/@jsr/mary__array-fns/0.1.0.tgz}
 
   '@jsr/mary__async-iterator-fns@0.1.1':
     resolution: {integrity: sha512-ef/TDpu6yGTAb4fbGEjSFPO7u49WrxJeXa9T6fvmjlpEfR84qxrjTR6MEUQ1hMySD0+O9yQKvBl/KL5x7K9+iA==, tarball: https://npm.jsr.io/~/11/@jsr/mary__async-iterator-fns/0.1.1.tgz}
···
     dependencies:
       '@jridgewell/resolve-uri': 3.1.2
       '@jridgewell/sourcemap-codec': 1.5.0
+
+  '@jsr/mary__array-fns@0.1.0': {}
 
   '@jsr/mary__async-iterator-fns@0.1.1': {}
 

src/api/moderation/labeler.ts

···
 import type { AppBskyLabelerDefs } from '@atcute/client/lexicons';
-
-import { mapDefined } from '~/lib/utils/misc';
+import { mapDefined } from '@mary/array-fns';
 
 import type { LabelDefinitionMapping, ModerationLabeler } from '.';
 import {

src/api/queries/bookmark-feed.ts

···
 import { tokenize } from '@atcute/bluesky-search-parser';
 import type { AppBskyFeedDefs } from '@atcute/client/lexicons';
+import { mapDefined } from '@mary/array-fns';
 import { filter, map, take, toArray } from '@mary/async-iterator-fns';
 import { createInfiniteQuery, createQuery } from '@mary/solid-query';
 
···
 import { createSearchPredicate } from '~/lib/aglais-bookmarks/search';
 import { useAgent } from '~/lib/states/agent';
 import { useBookmarks } from '~/lib/states/bookmarks';
-import { mapDefined } from '~/lib/utils/misc';
 
 export const createBookmarkFolderMetaQuery = (tagId: () => string) => {
 	const bookmarks = useBookmarks();

src/api/queries/notification-feed.tsx

···
 import { createSignal } from 'solid-js';
 
 import type { AppBskyFeedDefs, AppBskyNotificationListNotifications } from '@atcute/client/lexicons';
+import { chunked, mapDefined } from '@mary/array-fns';
 import { type QueryFunctionContext as QC, createInfiniteQuery, useQueryClient } from '@mary/solid-query';
 
 import { useAgent } from '~/lib/states/agent';
-import { mapDefined } from '~/lib/utils/misc';
 
 import { dequal } from '../utils/dequal';
-import { chunked } from '../utils/misc';
 import { resetInfiniteData } from '../utils/query';
 import { parseAtUri } from '../utils/strings';
 

src/api/queries/timeline.ts

···
 	AppBskyFeedPost,
 	At,
 } from '@atcute/client/lexicons';
+import { type FalsyValue, definite } from '@mary/array-fns';
 import { type InfiniteData, createInfiniteQuery, createQuery, useQueryClient } from '@mary/solid-query';
 
 import { globalEvents } from '~/globals/events';
···
 /// Timeline filters
 type FilterFn<T> = (data: T) => boolean;
 
-const combine = <T>(filters: Array<undefined | false | FilterFn<T>>): FilterFn<T> | undefined => {
-	const filtered = filters.filter((filter): filter is FilterFn<T> => !!filter);
+const combine = <T>(filters: Array<FalsyValue | FilterFn<T>>): FilterFn<T> | undefined => {
+	const filtered = definite(filters);
 	const len = filtered.length;
 
 	// if (len === 1) {

src/api/utils/misc.ts

···
 export const getCurrentDate = () => {
 	return new Date().toISOString();
 };
-
-export const chunked = <T>(arr: T[], size: number): T[][] => {
-	const chunks: T[][] = [];
-
-	for (let i = 0, il = arr.length; i < il; i += size) {
-		chunks.push(arr.slice(i, i + size));
-	}
-
-	return chunks;
-};

src/components/bookmarks/add-post-to-folder-dialog.tsx

···
 import { For, createMemo } from 'solid-js';
 
 import type { AppBskyFeedDefs } from '@atcute/client/lexicons';
+import { intersection } from '@mary/array-fns';
 import { useQueryClient } from '@mary/solid-query';
 
 import { createBookmarkMetaQuery } from '~/api/queries/bookmark';
···
 		const existing = entry.data.item;
 
 		// Prune folders that we don't recognize
-		const availableFolderIds = new Set(meta.data!.tags.map((tag) => tag.id));
-		const intersect = new Set(folderIds()).intersection(availableFolderIds);
+		const availableFolderIds = meta.data!.tags.map((tag) => tag.id);
+		const intersect = intersection(folderIds(), availableFolderIds);
 
 		await db.put('bookmarks', {
 			view: post,

src/components/composer/dialogs/language-select-dialog.tsx

···
 import { For, createMemo, createSignal, untrack } from 'solid-js';
 
+import { mapDefined } from '@mary/array-fns';
+
 import { dequal } from '~/api/utils/dequal';
 
 import { useModalContext } from '~/globals/modals';
 
 import { LANGUAGE_CODES, getEnglishLanguageName, getNativeLanguageName } from '~/lib/intl/languages';
-import { mapDefined } from '~/lib/utils/misc';
 
 import Button from '../../button';
 import * as Dialog from '../../dialog';

src/components/composer/gifs/gif-search-dialog.tsx

···
 import { For, Match, Switch, createSignal } from 'solid-js';
 
+import { chunked } from '@mary/array-fns';
+
 import { type Gif, createGifSearchQuery } from '~/api/queries/composer-gif';
-import { chunked } from '~/api/utils/misc';
 
 import { useModalContext } from '~/globals/modals';
 

src/components/date-picker/date-picker.tsx

···
 import { createMemo } from 'solid-js';
 
+import { chunked } from '@mary/array-fns';
 import {
 	addDays,
 	addMonths,
···
 	startOfMonth,
 	startOfWeek,
 } from '@mary/date-fns';
-
-import { chunked } from '~/api/utils/misc';
 
 import { createDerivedSignal } from '~/lib/hooks/derived-signal';
 

src/components/threads/post-translation.tsx

···
 import { Match, Switch, createMemo, createSignal } from 'solid-js';
 
 import { XRPC, simpleFetchHandler } from '@atcute/client';
+import { sampleOne } from '@mary/array-fns';
 import { createQuery } from '@mary/solid-query';
 
 import { systemLanguages } from '~/globals/locales';
···
 import { createDerivedSignal } from '~/lib/hooks/derived-signal';
 import { getEnglishLanguageName } from '~/lib/intl/languages';
 import { useSession } from '~/lib/states/session';
-import { pickRandom } from '~/lib/utils/misc';
 
 import CircularProgressView from '~/components/circular-progress-view';
 
···
 			return previous;
 		}
 
-		return pickRandom(instances);
+		return sampleOne(instances)!;
 	});
 
 	const query = createQuery(() => {

src/components/threads/thread-lines.tsx

···
 import { type JSX, createMemo } from 'solid-js';
 
+import { mapDefined } from '@mary/array-fns';
+
 import { LineType } from '~/api/models/post-thread';
 import { EQUALS_DEQUAL } from '~/api/utils/dequal';
 
-import { mapDefined, on } from '~/lib/utils/misc';
+import { on } from '~/lib/utils/misc';
 
 export interface ThreadLinesProps {
 	lines: LineType[] | undefined;

src/globals/locales.ts

···
-import { uniq } from '~/lib/utils/misc';
+import { unique } from '@mary/array-fns';
 
-export const systemLanguages = uniq(navigator.languages.map((lang) => lang.split('-')[0]));
+export const systemLanguages = unique(navigator.languages.map((lang) => lang.split('-')[0]));
 
 export const primarySystemLanguage = systemLanguages[0];

src/lib/aglais-bookmarks/search.ts

···
 import type { Token } from '@atcute/bluesky-search-parser';
 import type { AppBskyFeedDefs, AppBskyFeedPost } from '@atcute/client/lexicons';
+import { mapDefined } from '@mary/array-fns';
 
 import { DID_RE, HANDLE_RE } from '~/api/utils/strings';
 
 import { parseEndDate, parseStartDate, splitFilters } from '../bsky/search';
-import { mapDefined } from '../utils/misc';
 import { escapeRegex } from '../utils/regex';
 
 export const createSearchPredicate = (tokens: Token[]) => {

src/lib/states/moderation.tsx

···
 import { unwrap } from 'solid-js/store';
 
 import type { AppBskyLabelerDefs, At } from '@atcute/client/lexicons';
+import { mapDefined } from '@mary/array-fns';
 import { createQueries } from '@mary/solid-query';
 
 import { BLUESKY_MODERATION_DID } from '~/api/defaults';
···
 
 import { createBatchedFetch } from '~/lib/utils/batch-fetch';
 import { assert } from '~/lib/utils/invariant';
-import { mapDefined } from '~/lib/utils/misc';
 
 import { useAgent } from './agent';
 import { useSession } from './session';

src/lib/states/session.tsx

···
 import { type FetchHandler, type FetchHandlerObject, XRPC, XRPCError } from '@atcute/client';
 import type { At } from '@atcute/client/lexicons';
 import { OAuthUserAgent, deleteStoredSession, getSession } from '@atcute/oauth-browser-client';
+import { mapDefined } from '@mary/array-fns';
 
 import { BLUESKY_MODERATION_DID } from '~/api/defaults';
 
···
 import type { PerAccountPreferenceSchema } from '../preferences/account';
 import type { AccountData } from '../preferences/sessions';
 import { assert } from '../utils/invariant';
-import { mapDefined } from '../utils/misc';
 
 export interface CurrentAccountState {
 	readonly did: At.DID;
···
 
 				const filters = preferences.moderation.keywords;
 
-				const times = [...mapDefined(filters, (filter) => filter.expires)];
+				const times = mapDefined(filters, (filter) => filter.expires);
 
 				const nextAt = times.reduce((time, x) => (x < time ? x : time), Infinity);
 

src/lib/utils/misc.ts

···
 
 import { replaceEqualDeep } from '@mary/solid-query';
 
-export const mapDefined = <T, R>(array: T[], mapper: (value: T) => R | undefined): R[] => {
-	var mapped: R[] = [];
-
-	var idx = 0;
-	var len = array.length;
-	var temp: R | undefined;
-
-	for (; idx < len; idx++) {
-		if ((temp = mapper(array[idx])) !== undefined) {
-			mapped.push(temp);
-		}
-	}
-
-	return mapped;
-};
-
 const _on = <T, R>(accessor: () => T, callback: (value: T) => R): (() => R) => {
 	return () => {
 		const value = accessor();
···
 };
 
 export const requestIdle = typeof requestIdleCallback === 'function' ? requestIdleCallback : setTimeout;
-
-export const uniq = <T>(items: T[]): T[] => {
-	return Array.from(new Set(items));
-};
-
-export const pickRandom = <T>(items: T[]): T => {
-	return items[(Math.random() * items.length) | 0];
-};
 
 export const isSetEqual = <T>(a: Set<T>, b: Set<T>): boolean => {
 	if (a.size !== b.size) {

src/views/profile-labels.tsx

···
 import { Match, Show, Switch, createMemo } from 'solid-js';
 
 import type { At } from '@atcute/client/lexicons';
+import { mapDefined } from '@mary/array-fns';
 
 import {
 	GLOBAL_LABELS,
···
 import { Key } from '~/lib/keyed';
 import { useParams, useTitle } from '~/lib/navigation/router';
 import { useSession } from '~/lib/states/session';
-import { mapDefined } from '~/lib/utils/misc';
 
 import Avatar from '~/components/avatar';
 import * as Boxed from '~/components/boxed';

src/views/settings-content-translation-exclusion.tsx

···
 import { For, Show, createMemo, createSignal, untrack } from 'solid-js';
 
+import { mapDefined } from '@mary/array-fns';
+
 import { LANGUAGE_CODES, getEnglishLanguageName, getNativeLanguageName } from '~/lib/intl/languages';
 import { useTitle } from '~/lib/navigation/router';
 import { useSession } from '~/lib/states/session';
-import { mapDefined } from '~/lib/utils/misc';
 
 import * as Boxed from '~/components/boxed';
 import EndOfListView from '~/components/end-of-list-view';

src/views/settings-content-translation.tsx

···
 import { For } from 'solid-js';
 
+import { mapDefined } from '@mary/array-fns';
+
 import { googleLanguages } from '~/api/basa/languages';
 
 import { openModal } from '~/globals/modals';
···
 import { getEnglishLanguageName } from '~/lib/intl/languages';
 import { useTitle } from '~/lib/navigation/router';
 import { useSession } from '~/lib/states/session';
-import { mapDefined } from '~/lib/utils/misc';
 
 import * as Boxed from '~/components/boxed';
 import IconButton from '~/components/icon-button';

src/views/settings-content.tsx

···
 import { batch } from 'solid-js';
 
+import { mapDefined } from '@mary/array-fns';
+
 import { dequal } from '~/api/utils/dequal';
 
 import { openModal } from '~/globals/modals';
···
 	toPersistedThreadgate,
 } from '~/lib/preferences/snippets/composer';
 import { useSession } from '~/lib/states/session';
-import { mapDefined } from '~/lib/utils/misc';
 
 import * as Boxed from '~/components/boxed';
 import ComposedInteractionDialogLazy from '~/components/composer/dialogs/composed-interaction-dialog-lazy';