relation-matcher 1.0.10 → 1.0.12

package/src/types/return.ts

@@ -1,71 +1,67 @@
-import type { TInputBase, TJoinedFromBase, TOutputBase } from "./generic-bases";
-import type { RelationMapRoot } from "./inputs";
-import type { ExtendsNull, NoUnderscore, Simplify } from "./utils";
-
-export type RelationMapperReturnRoot<
-	TInput extends TInputBase,
-	TOutput extends RelationMapRoot<TInput>,
-> = Simplify<
-	{
-		[inputKey in keyof TInput]: ExtendsNull<
-			TInput[TOutput["base"]]
-		> extends true
-			? Simplify<
-					TInput[TOutput["base"]] &
-						RelationMapperReturnJoinRoot<TInput, TOutput, inputKey>
-				> | null
-			: Simplify<
-					TInput[TOutput["base"]] &
-						RelationMapperReturnJoinRoot<TInput, TOutput, inputKey>
-				>;
-	}[keyof TInput]
->;
-
-export type RelationMapperReturnJoinRoot<
-	TInput extends TInputBase,
-	TOutput extends RelationMapRoot<TInput>,
-	TInputKey extends keyof TInput,
-> = {
-	[outputKey in NoUnderscore<keyof TOutput>]: Simplify<
-		RelationMapperReturn<
-			TInput,
-			TInput[TInputKey],
-			TOutput[`_${outputKey}`]
-		>
-	>;
-};
-
-/** Fill current object with value specified in base */
-export type RelationMapperReturn<
-	TInput extends TInputBase,
-	TJoinedFrom extends TJoinedFromBase,
-	TOutput extends TOutputBase<TInput, TJoinedFrom>,
-> = TOutput["joinType"] extends "array"
-	? Array<
-			Simplify<
-				TInput[TOutput["base"]] &
-					RelationMapperReturnJoin<TInput, TJoinedFrom, TOutput>
-			>
-		>
-	: ExtendsNull<TInput[TOutput["base"]]> extends true
-		? Simplify<
-				TInput[TOutput["base"]] &
-					RelationMapperReturnJoin<TInput, TJoinedFrom, TOutput>
-			> | null
-		: Simplify<
-				TInput[TOutput["base"]] &
-					RelationMapperReturnJoin<TInput, TJoinedFrom, TOutput>
-			>;
-
-/** Takes underscored values (joins) and replaces their values with the actual output. */
-export type RelationMapperReturnJoin<
-	TInput extends TInputBase,
-	TJoinedFrom extends TJoinedFromBase,
-	TOutput extends TOutputBase<TInput, TJoinedFrom>,
-> = {
-	[k in NoUnderscore<keyof TOutput>]: RelationMapperReturn<
-		TInput,
-		TJoinedFrom,
-		TOutput[`_${k}`]
-	>;
-};
+import type { TInputBase, TJoinedFromBase, TOutputBase } from "./generic-bases";
+import type { RelationMapRoot } from "./inputs";
+import type { ExtendsNull, NoUnderscore, Simplify } from "./utils";
+
+export type RelationMapperReturnRoot<
+	TInput extends TInputBase,
+	TOutput extends RelationMapRoot<TInput>,
+> = Simplify<
+	ExtendsNull<TInput[TOutput["base"]]> extends true
+		?
+				| (TInput[TOutput["base"]] &
+						RelationMapperReturnJoinRoot<
+							TInput,
+							TOutput,
+							TOutput["base"]
+						>)
+				| null
+		: TInput[TOutput["base"]] &
+				RelationMapperReturnJoinRoot<TInput, TOutput, TOutput["base"]>
+>;
+
+export type RelationMapperReturnJoinRoot<
+	TInput extends TInputBase,
+	TOutput extends RelationMapRoot<TInput>,
+	TInputKey extends keyof TInput,
+> = {
+	[outputKey in NoUnderscore<keyof TOutput>]: RelationMapperReturn<
+		TInput,
+		TInput[TInputKey],
+		TOutput[`_${outputKey}`]
+	>;
+};
+
+/** Fill current object with value specified in base */
+export type RelationMapperReturn<
+	TInput extends TInputBase,
+	TJoinedFrom extends TJoinedFromBase,
+	TOutput extends TOutputBase<TInput, TJoinedFrom>,
+> = TOutput["joinType"] extends "array"
+	? Array<
+			Simplify<
+				TInput[TOutput["base"]] &
+					RelationMapperReturnJoin<TInput, TJoinedFrom, TOutput>
+			>
+		>
+	: ExtendsNull<TInput[TOutput["base"]]> extends true
+		? Simplify<
+				TInput[TOutput["base"]] &
+					RelationMapperReturnJoin<TInput, TJoinedFrom, TOutput>
+			> | null
+		: Simplify<
+				TInput[TOutput["base"]] &
+					RelationMapperReturnJoin<TInput, TJoinedFrom, TOutput>
+			>;
+
+/** Takes underscored values (joins) and replaces their values with the actual output. */
+export type RelationMapperReturnJoin<
+	TInput extends TInputBase,
+	TJoinedFrom extends TJoinedFromBase,
+	TOutput extends TOutputBase<TInput, TJoinedFrom>,
+> = {
+	[k in NoUnderscore<keyof TOutput>]: RelationMapperReturn<
+		TInput,
+		TJoinedFrom,
+		TOutput[`_${k}`]
+	>;
+};

package/src/types/typetest.ts

@@ -63,6 +63,14 @@ type B = RelationMapperReturnRoot<
 			joinsFrom: "clerk_id";
 			joinsTo: "user_clerk_id";
 			joinType: "single";
+
+			_user: {
+				base: "user";
+				id: "clerk_id";
+				joinsFrom: "user_clerk_id";
+				joinsTo: "clerk_id";
+				joinType: "array";
+			};
 		};
 	}
 >;

package/src/types/utils.ts

@@ -1,28 +1,28 @@
-export type Simplify<T> = {
-	[k in keyof T]: T[k];
-} & {};
-
-export type DeepSimplify<TInput, TDontSimplify> = {
-	[k in keyof TInput]: TInput[k] extends TDontSimplify
-		? TInput[k]
-		: DeepSimplify<TInput[k], TDontSimplify>;
-} & {};
-
-export type NoUnderscore<T extends string | number | symbol> =
-	T extends `_${infer Result}` ? Result : never;
-
-export type DeepNonNullable<T extends object> = {
-	[k in keyof T]: T[k] extends infer NonNull | null ? NonNull : T[k];
-};
-
-export type ArrayOrSingle<
-	T,
-	TType extends "single" | "array",
-> = TType extends "array" ? Array<T> : T;
-
-export type IsNullIfNull<
-	TIsNull extends object | null,
-	TReturn extends object | never = never,
-> = TIsNull extends infer T ? (T & TReturn) | null : TIsNull & TReturn;
-
-export type ExtendsNull<T> = null extends T ? true : false;
+export type Simplify<T> = {
+	[k in keyof T]: T[k];
+} & {};
+
+export type DeepSimplify<TInput, TDontSimplify> = {
+	[k in keyof TInput]: TInput[k] extends TDontSimplify
+		? TInput[k]
+		: DeepSimplify<TInput[k], TDontSimplify>;
+} & {};
+
+export type NoUnderscore<T extends string | number | symbol> =
+	T extends `_${infer Result}` ? Result : never;
+
+export type DeepNonNullable<T extends object> = {
+	[k in keyof T]: T[k] extends infer NonNull | null ? NonNull : T[k];
+};
+
+export type ArrayOrSingle<
+	T,
+	TType extends "single" | "array",
+> = TType extends "array" ? Array<T> : T;
+
+export type IsNullIfNull<
+	TIsNull extends object | null,
+	TReturn extends object | never = never,
+> = TIsNull extends infer T ? (T & TReturn) | null : TIsNull & TReturn;
+
+export type ExtendsNull<T> = null extends T ? true : false;

package/src/utils/invertInput.ts

@@ -1,28 +1,28 @@
-import type { TInputBase } from "~/types/generic-bases";
-
-export type InvertedInput<TInput extends TInputBase = TInputBase> = Record<
-	keyof TInput,
-	TInput[keyof TInput][]
->;
-
-const invertInput = <TInput extends TInputBase>(
-	inputs: TInputBase[],
-): InvertedInput<TInput> => {
-	const invertedInput = inputs.reduce<InvertedInput<TInput>>((final, row) => {
-		Object.entries(row).forEach(([header, value]) => {
-			if (final[header]) {
-				if (value) final[header].push(value as TInput[keyof TInput]);
-			} else {
-				final[header as keyof TInput] = value
-					? [value as TInput[keyof TInput]]
-					: [];
-			}
-		});
-
-		return final;
-	}, {} as InvertedInput<TInput>);
-
-	return invertedInput;
-};
-
-export default invertInput;
+import type { TInputBase } from "~/types/generic-bases";
+
+export type InvertedInput<TInput extends TInputBase = TInputBase> = Record<
+	keyof TInput,
+	TInput[keyof TInput][]
+>;
+
+const invertInput = <TInput extends TInputBase>(
+	inputs: TInputBase[],
+): InvertedInput<TInput> => {
+	const invertedInput = inputs.reduce<InvertedInput<TInput>>((final, row) => {
+		Object.entries(row).forEach(([header, value]) => {
+			if (final[header]) {
+				if (value) final[header].push(value as TInput[keyof TInput]);
+			} else {
+				final[header as keyof TInput] = value
+					? [value as TInput[keyof TInput]]
+					: [];
+			}
+		});
+
+		return final;
+	}, {} as InvertedInput<TInput>);
+
+	return invertedInput;
+};
+
+export default invertInput;

package/src/utils/keys.ts

@@ -1 +1 @@
-export const getJoinFinalKey = (key: string) => key.substring(1);
+export const getJoinFinalKey = (key: string) => key.substring(1);

package/src/utils/matcher.ts

@@ -1,8 +1,8 @@
-import type { TInputBase } from "~/types/generic-bases";
-import type { InvertedInput } from "./invertInput";
-import type { Output } from "~/types/generic-less";
-
-export const matcherFunc =
-	<TInput extends TInputBase>(row: TInput[keyof TInput], value: Output) =>
-	(item: InvertedInput[keyof InvertedInput][number]) =>
-		row?.[value.joinsFrom as string] === item?.[value.joinsTo as string];
+import type { TInputBase } from "~/types/generic-bases";
+import type { InvertedInput } from "./invertInput";
+import type { Output } from "~/types/generic-less";
+
+export const matcherFunc =
+	<TInput extends TInputBase>(row: TInput[keyof TInput], value: Output) =>
+	(item: InvertedInput[keyof InvertedInput][number]) =>
+		row?.[value.joinsFrom as string] === item?.[value.joinsTo as string];