@bemedev/typings 1.1.4 → 1.1.6

package/lib/types.d.ts

@@ -66,7 +66,7 @@ export type IntersectionCustom<T extends ObjectMapS[]> = T extends [
     ...infer Rest extends ObjectMapS[]
 ] ? First & IntersectionCustom<Rest> : unknown;
 type _ObjectT = __ObjectT | Optional | ArrayCustom;
-export type PrimitiveObjectT = SoRa<Types | (PrimitiveObjectMapS & Partial<Record<typeof PARTIAL, never>>) | ArrayCustom<Types | PrimitiveObjectMapS> | Optional<Types | PrimitiveObjectMapS> | UnionCustom<Types[] | PrimitiveObjectMapS[]> | PartialCustom<PrimitiveObjectMapS>>;
+export type PrimitiveObjectT = SoRa<PrimitiveT | PrimitiveObjectMapS | ArrayCustom<PrimitiveT | PrimitiveObjectMapS> | Optional<PrimitiveT | PrimitiveObjectMapS> | UnionCustom<(PrimitiveObjectMapS | PrimitiveT)[]> | PartialCustom<PrimitiveObjectMapS>>;
 export interface PrimitiveObjectMapS {
     [key: Keys]: PrimitiveObjectT;
 }
@@ -85,18 +85,17 @@ type ReduceTupleU<T extends AnyArray> = T extends [
     infer First,
     ...infer Rest extends AnyArray
 ] ? [Undefiny<First>, ...ReduceTupleU<Rest>] : T[number] extends never ? [] : T['length'] extends 0 ? [] : number extends T['length'] ? T : Undefiny<T[number]>[];
-type EmptyObject = {};
+export type EmptyObject = Record<string, never>;
 type __TransformUnion<T extends UnionCustom> = T extends UnionCustom<infer TCustom> ? Omit<T, typeof UNION> extends infer Ot ? Equals<Ot, EmptyObject> extends true ? TransformT<TCustom[number]> : TransformT<TCustom[number]> & TransformT<Ot> : never : never;
-type HasUndefined<T> = unknown extends T ? false : OptionalHelperClass extends T ? true : false;
-type UndefinyObject<T extends object> = {
+type HasUndefined<T> = unknown extends T ? false : Equals<EmptyObject, T> extends true ? false : OptionalHelperClass extends T ? true : false;
+type _UndefinyObject<T extends object> = {
     [K in keyof T as HasUndefined<T[K]> extends true ? never : K]: Undefiny<T[K]>;
 } & {
     [K in keyof T as HasUndefined<T[K]> extends true ? K : never]?: Undefiny<T[K]>;
-} extends infer F ? {
-    [K in keyof F]: F[K];
-} : never;
-type Undefiny<T, U = Exclude<T, OptionalHelperClass>> = U extends AnyArray ? ReduceTupleU<U> : U extends Ru ? UndefinyObject<U> : U;
-type TransformT<T> = Equals<ObjectMapS, T> extends true ? object : T extends Types ? TransformTypes<T> : T extends ArrayCustom<infer A> ? TransformT<A>[] : T extends UnionCustom ? __TransformUnion<T> : T extends SoRaCustom<infer TSoA> ? SoRa<TransformT<TSoA>> : T extends SoaCustom<infer TSoA> ? SoA<TransformT<TSoA>> : T extends Custom<infer TCustom> ? TCustom : T extends AnyArray<ObjectT> ? ReduceTuple2<T> : T extends PartialCustom<infer TPartial> ? Partial<TransformT<TPartial>> : T extends Optional<infer TOptional> ? TransformT<TOptional> | OptionalHelperClass : Undefiny<{
+};
+type UndefinyObject<T extends object> = _UndefinyObject<T>;
+type Undefiny<T, U = Exclude<T, OptionalHelperClass>> = U extends AnyArray ? ReduceTupleU<U> : U extends TrueObject ? UndefinyObject<U> : U;
+type TransformT<T> = Equals<EmptyObject, T> extends true ? EmptyObject : Equals<ObjectMapS, T> extends true ? object : PrimitiveObjectT extends T ? PrimitiveObject : T extends Types ? TransformTypes<T> : T extends ArrayCustom<infer A> ? TransformT<A>[] : T extends UnionCustom ? __TransformUnion<T> : T extends SoRaCustom<infer TSoA> ? SoRa<TransformT<TSoA>> : T extends SoaCustom<infer TSoA> ? SoA<TransformT<TSoA>> : T extends Custom<infer TCustom> ? TCustom : T extends AnyArray<ObjectT> ? ReduceTuple2<T> : T extends PartialCustom<infer TPartial> ? Partial<TransformT<TPartial>> : T extends Optional<infer TOptional> ? TransformT<TOptional> | OptionalHelperClass : Undefiny<{
     [K in keyof T]: TransformT<T[K]>;
 }>;
 export type StandardHelper<T1 = any, T2 = any> = {
@@ -112,17 +111,30 @@ export type StandardOutput<T = any> = {
         };
     };
 };
-export type inferO<T extends ObjectT = ObjectT> = ObjectT extends T ? unknown : T extends Optional<infer U> ? TransformT<U> | undefined : TransformT<T>;
+export type PrimitiveObject = SoRa<Primitive | PrimitiveObjectMap>;
+export interface PrimitiveObjectMap {
+    [key: Keys]: PrimitiveObject;
+}
+type _inferO<T extends ObjectT = ObjectT> = ObjectT extends T ? unknown : T extends Optional<infer U> ? TransformT<U> | undefined : TransformT<T>;
+type ReduceArraySimple<T extends any[]> = T extends [
+    infer First,
+    ...infer Rest extends any[]
+] ? [Simplify<First>, ...ReduceArraySimple<Rest>] : number extends T['length'] ? Simplify<T[number]>[] : T;
+export type Simplify<T> = unknown extends T ? T : T extends Primitive ? T : T extends any[] ? ReduceArraySimple<T> : T extends TrueObject ? {
+    [K in keyof T]: Simplify<T[K]>;
+} : T & {};
+export type inferO<T extends POS> = Simplify<_inferO<T>>;
 export type inferSh<T extends ObjectT = ObjectT> = _Sh<T, inferO<T>>;
-export type inferT<T extends StandardOutput = StandardOutput> = Exclude<T[typeof STANDARD_KEY]['types'], undefined>['output'];
+type _inferT<T extends StandardOutput = StandardOutput> = Exclude<T[typeof STANDARD_KEY]['types'], undefined>['output'];
+export type inferT<T extends StandardOutput = StandardOutput> = _inferT<T>;
 export type ProduceObject<T extends ObjectT = ObjectT> = T;
 export type FnBasic<Main extends Fn, Tr extends object> = Tr & Main;
 type ReduceTupleSafePre<T extends ReadonlyArray<ObjectT>> = T extends readonly [
     infer First extends ObjectT,
     ...infer Rest extends ReadonlyArray<ObjectT>
 ] ? readonly [SafePre<First>, ...ReduceTupleSafePre<Rest>] : [];
-type _SafePre<T extends ObjectT> = PrimitiveObjectT extends T ? PrimitiveObjectT : PrimitiveT extends T ? PrimitiveT : T extends Types ? T : T extends PartialCustom<infer TPartial> ? Partial<SafePre<TPartial>> : T extends ArrayCustom<infer A> ? SafePre<A>[] : T extends Optional<infer TOptional> ? SafePre<TOptional> | undefined : T extends SoRaCustom<infer TSoRa> ? SoRa<SafePre<TSoRa>> : T extends SoaCustom<infer TSoA> ? SoA<SafePre<TSoA>> : T extends Custom ? T : T extends AnyArray<ObjectT> ? ReduceTupleSafePre<T> : PrimitiveObjectMapS extends T ? PrimitiveObjectMapS : ObjectMapS extends T ? ObjectMapS : T extends ObjectMapS ? {
-    [K in keyof T]: SafePre<T[K]>;
-} : T;
+type _SafePre<T extends ObjectT> = PrimitiveObjectT extends T ? PrimitiveObjectT : PrimitiveT extends T ? PrimitiveT : T extends Types ? T : T extends PartialCustom<infer TPartial> ? Partial<_SafePre<TPartial>> : T extends ArrayCustom<infer A> ? _SafePre<A>[] : T extends Optional<infer TOptional> ? _SafePre<TOptional> | undefined : T extends SoRaCustom<infer TSoRa> ? SoRa<_SafePre<TSoRa>> : T extends SoaCustom<infer TSoA> ? SoA<_SafePre<TSoA>> : T extends Custom ? T : T extends AnyArray<ObjectT> ? ReduceTupleSafePre<T> : PrimitiveObjectMapS extends T ? PrimitiveObjectMapS : ObjectMapS extends T ? ObjectMapS : {
+    [K in keyof T]: T[K] extends infer Tk extends ObjectT ? _SafePre<Tk> : T[K];
+};
 export type SafePre<T extends ObjectT> = Extract<_SafePre<T>, ObjectT>;
 export * from './standard.types';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bemedev/typings",
-  "version": "1.1.4",
+  "version": "1.1.6",
   "description": "Typings by variables",
   "author": {
     "email": "bri_lvi@icloud.com",
@@ -68,10 +68,11 @@
     "node": ">=24"
   },
   "scripts": {
+    "prune": "pnpm store prune",
     "build": "pnpm rm:lib && pnpm run rolldown",
-    "_ci": "pnpm run config:off && pnpm run lint && pnpm run test",
+    "_ci": "pnpm clean --lockfile && pnpm run config:off && pnpm run lint && pnpm run test",
     "ci": "CI_START=$(date +%s) && pnpm run _ci && pnpm run p-q && echo \"\n✅ CI takes $(($(date +%s) - CI_START))s\n\"",
-    "ci:admin": "CI_START=$(date +%s) && pnpm run rm && pnpm run upgrade:fast && pnpm run _ci && echo \"\n✅ Admin CI takes $(($(date +%s) - CI_START))s\n\"",
+    "ci:admin": "CI_START=$(date +%s) && pnpm run prune && pnpm run rm && pnpm run upgrade:fast && pnpm run _ci && echo \"\n✅ Admin CI takes $(($(date +%s) - CI_START))s\n\"",
     "clean": "pnpm run rm && pnpm run config",
     "config": "pnpm install",
     "config:off": "pnpm run config --offline",