style: 💄 run formatter

Author: streamich

src/jtd/types.ts

@@ -7,8 +7,7 @@ export type JtdForm =
   | JtdElementsForm
   | JtdPropertiesForm
   | JtdValuesForm
-  | JtdDiscriminatorForm
-  ;
+  | JtdDiscriminatorForm;
 
 export interface JtdFormBase {
   metadata?: Record<string, unknown>;
@@ -38,8 +37,7 @@ export type JtdType =
   | 'int32'
   | 'uint32'
   | 'string'
-  | 'timestamp'
-  ;
+  | 'timestamp';
 
 export interface JtdEnumForm extends JtdFormBase {
   enum: string[];

src/schema/schema.ts

@@ -312,14 +312,13 @@ export type Schema = JsonSchema | RefSchema | OrSchema | AnySchema | FunctionSch
 
 export type NoT<T extends TType> = Omit<T, 'kind'>;
 
-export type TypeOf<T> =
-  T extends OrSchema<any>
-    ? TypeOfValue<T['types'][number]>
-    : T extends RefSchema<infer U>
-      ? TypeOf<U>
-      : T extends AnySchema
-        ? unknown
-        : TypeOfValue<T>;
+export type TypeOf<T> = T extends OrSchema<any>
+  ? TypeOfValue<T['types'][number]>
+  : T extends RefSchema<infer U>
+    ? TypeOf<U>
+    : T extends AnySchema
+      ? unknown
+      : TypeOfValue<T>;
 
 export type TypeOfValue<T> = T extends BooleanSchema
   ? boolean

src/system/__tests__/demo.ts

@@ -4,21 +4,13 @@ const createTypes = (system: TypeSystem) => {
   const t = system.t;
 
   // prettier-ignore
-  const MuCollection = t.Object(
-    t.prop('id', t.str),
-    t.propOpt('name', t.str),
-  );
+  const MuCollection = t.Object(t.prop('id', t.str), t.propOpt('name', t.str));
 
   // prettier-ignore
-  const MuBlock = t.Object(
-    t.prop('id', t.str),
-    t.prop('data', t.any),
-  );
+  const MuBlock = t.Object(t.prop('id', t.str), t.prop('data', t.any));
 
   // prettier-ignore
-  const MuBlockCreateRequest = t.Object(
-    t.propOpt('id', t.str),
-  );
+  const MuBlockCreateRequest = t.Object(t.propOpt('id', t.str));
   const MuBlockCreateResponse = t.Object(t.prop('block', t.Ref<typeof MuBlock>('MuBlock')));
   const MuBlockNew = t.Function(MuBlockCreateRequest, MuBlockCreateResponse);
 

src/system/types.ts

@@ -16,11 +16,10 @@ export interface CustomValidator {
 
 export type TypeOfAlias<T> = T extends TypeAlias<any, infer T> ? T : T extends Type ? T : never;
 
-export type ResolveType<T> =
-  T extends TypeAlias<any, infer T>
+export type ResolveType<T> = T extends TypeAlias<any, infer T>
+  ? TypeOf<SchemaOf<T>>
+  : T extends Type
     ? TypeOf<SchemaOf<T>>
-    : T extends Type
-      ? TypeOf<SchemaOf<T>>
-      : T extends Schema
-        ? TypeOf<T>
-        : never;
+    : T extends Schema
+      ? TypeOf<T>
+      : never;

src/type/classes/AbstractType.ts

@@ -1,7 +1,10 @@
 import type * as schema from '../../schema';
 import {RandomJson} from '@jsonjoy.com/util/lib/json-random';
 import type {Printable} from 'tree-dump/lib/types';
-import {ValidatorCodegenContext, type ValidatorCodegenContextOptions} from '../../codegen/validator/ValidatorCodegenContext';
+import {
+  ValidatorCodegenContext,
+  type ValidatorCodegenContextOptions,
+} from '../../codegen/validator/ValidatorCodegenContext';
 import type {JsonTypeValidator, ValidationPath} from '../../codegen/validator/types';
 import {
   JsonTextEncoderCodegenContext,

src/type/types.ts

@@ -26,12 +26,11 @@ export type Type =
 export type SchemaOf<T extends Type | Type[]> = T extends BaseType<infer U> ? U : never;
 export type SchemaOfMap<M extends Record<string, Type>> = {[K in keyof M]: SchemaOf<M[K]>};
 
-export type SchemaOfObjectFieldType<F> =
-  F extends classes.ObjectOptionalFieldType<infer K, infer V>
-    ? schema.ObjectOptionalFieldSchema<K, SchemaOf<V>>
-    : F extends classes.ObjectFieldType<infer K, infer V>
-      ? schema.ObjectFieldSchema<K, SchemaOf<V>>
-      : never;
+export type SchemaOfObjectFieldType<F> = F extends classes.ObjectOptionalFieldType<infer K, infer V>
+  ? schema.ObjectOptionalFieldSchema<K, SchemaOf<V>>
+  : F extends classes.ObjectFieldType<infer K, infer V>
+    ? schema.ObjectFieldSchema<K, SchemaOf<V>>
+    : never;
 
 export type SchemaOfObjectFields<F> = {[K in keyof F]: SchemaOfObjectFieldType<F[K]>};