mny

compose-dev.yaml

@@ -1,12 +1,11 @@
 services:
   app:
     entrypoint:
-    - sleep
-    - infinity
+      - sleep
+      - infinity
     image: docker/dev-environments-javascript:stable-1
     init: true
     volumes:
-    - type: bind
-      source: /var/run/docker.sock
-      target: /var/run/docker.sock
-
+      - type: bind
+        source: /var/run/docker.sock
+        target: /var/run/docker.sock

lib/ajv/index.ts

@@ -3,7 +3,10 @@ import { basename } from 'node:path'
 
 import { TRPCError } from '@trpc/server'
 import Ajv from 'ajv'
-import localize from 'ajv-i18n/localize/ru'
+import ajvErrors from 'ajv-errors'
+import ajvFormats from 'ajv-formats'
+import ajvI18n from 'ajv-i18n'
+import ajvKeywords from 'ajv-keywords'
 import consola from 'consola'
 import glob from 'fast-glob'
 
@@ -26,8 +29,12 @@ export async function createAjv() {
     messages: false,
     verbose: true,
     allowDate: true,
+    parseDate: true,
     addUsedSchema: true,
     validateFormats: true,
+    inlineRefs: true,
+    passContext: true,
+    timestamp: 'date',
   })
 
   const files = await glob('*.json', {
@@ -43,27 +50,26 @@ export async function createAjv() {
     return { ...schema, $id: schemaId }
   }))
 
+  ajvKeywords(ajv)
+  ajvFormats(ajv)
+  ajvErrors(ajv)
+
   ajv.addSchema(schemas)
   ajv.addSchema(userSchema, 'User')
-  // const test = ajv.getSchema('User')
-  // logger.info(test?.schemaEnv)
 
   function validateSchema(schemaId: string, data: unknown) {
     const valid = ajv.validate(schemaId, data)
 
     if (!valid) {
-      localize(ajv.errors)
+      ajvI18n.ru(ajv.errors)
 
       throw new TRPCError({
         cause: ajv.errors,
         code: 'BAD_REQUEST',
-        message: ajv.errorsText(
-          ajv.errors,
-          {
-            separator: '\n',
-            dataVar: 'data',
-          },
-        ),
+        message: ajv.errorsText(ajv.errors, {
+          separator: '\n',
+          dataVar: 'data',
+        }),
       })
     }
   }

lib/ajv/schema.ts

@@ -4,6 +4,7 @@ import type { TestUserInfo } from 'types'
 export const userSchema: JSONSchemaType<{
   status: string
   info?: TestUserInfo
+  date: string
 }> = {
   type: 'object',
   properties: {
@@ -13,6 +14,10 @@ export const userSchema: JSONSchemaType<{
     info: {
       $ref: 'TestUserInfo',
     },
+    date: {
+      type: 'string',
+      format: 'date-time',
+    },
   },
   required: ['status'],
   additionalProperties: false,

lib/jose/keys.ts

@@ -1,6 +1,6 @@
 import { readFile } from 'node:fs/promises'
 
-import * as jose from 'jose'
+import { createLocalJWKSet, importJWK } from 'jose'
 
 import type { KeyPair } from './types'
 
@@ -13,10 +13,10 @@ export const keys2: KeyPair = JSON.parse(await readFile(
   'utf8',
 ))
 
-export const keys1Private = await jose.importJWK(keys1.privateKey)
-export const keys2Private = await jose.importJWK(keys2.privateKey)
+export const keys1Private = await importJWK(keys1.privateKey)
+export const keys2Private = await importJWK(keys2.privateKey)
 
-export const jwks = jose.createLocalJWKSet({
+export const jwks = createLocalJWKSet({
   keys: [
     keys1.publicKey,
     keys2.publicKey,

lib/jose/sign.ts

@@ -1,6 +1,7 @@
-import * as jose from 'jose'
+import { SignJWT, importJWK, jwtVerify } from 'jose'
 
 import type { KeyPair } from './types'
+import type { JWTPayload, JWTVerifyGetKey, VerifyOptions } from 'jose'
 
 const alg = 'ES256'
 const options = {
@@ -10,29 +11,28 @@ const options = {
 
 export async function sign(
   keyPair: KeyPair,
-  payload: jose.JWTPayload,
+  payload: JWTPayload,
 ) {
   const { privateKey } = keyPair
-  const keys1Private = await jose.importJWK(privateKey)
+  const { kid } = privateKey
 
-  return new jose.SignJWT(payload)
+  const signKey = await importJWK(privateKey)
+
+  return new SignJWT(payload)
     .setIssuer(options.issuer)
     .setAudience(options.audience)
-    .setProtectedHeader({
-      alg,
-      kid: 'key1',
-    })
+    .setProtectedHeader({ alg, kid })
     .setExpirationTime('10m')
     .setIssuedAt()
-    .sign(keys1Private)
+    .sign(signKey)
 }
 
 export async function verify(
   jwt: string,
-  keySet: jose.JWTVerifyGetKey,
-  verifyOptions?: jose.VerifyOptions,
+  keySet: JWTVerifyGetKey,
+  verifyOptions?: VerifyOptions,
 ) {
-  const { payload } = await jose.jwtVerify(
+  const { payload } = await jwtVerify(
     jwt,
     keySet,
     verifyOptions,

lib/mongo/index.ts → lib/mongodb/index.ts

@@ -4,7 +4,6 @@ import { MongoClient } from 'mongodb'
 const logger = consola.withTag('mongodb')
 export async function createMongoDBStore() {
   const client = new MongoClient('mongodb://root:example@mongodb:27017')
-
   await client.connect()
 
   const db = client.db('testSozdev')

lib/quicktype/index.ts

@@ -1,4 +1,3 @@
-'fast-glob'
 import {
   FetchingJSONSchemaStore,
   InputData,
@@ -7,37 +6,30 @@ import {
 } from 'quicktype-core'
 
 import type {
+  JSONSchemaSourceData,
   Options,
   TargetLanguage,
 } from 'quicktype-core'
 
-export interface IQucktypeData {
-  typeName: string
-  jsonString: string
-}
-
 export async function quicktypeMultipleJSONSchema(
-  targetLanguage: string | TargetLanguage,
-  data: IQucktypeData[],
+  lang: string | TargetLanguage,
+  data: JSONSchemaSourceData[],
   options: Omit<Partial<Options>, 'inputData'>,
 ) {
-  const inputData = new InputData()
-
   const jsonInput = new JSONSchemaInput(new FetchingJSONSchemaStore())
+  await Promise.all(
+    data.map(({ name, schema }) => jsonInput.addSource({
+      name,
+      schema,
+    })),
+  )
 
-  for (const { typeName, jsonString } of data) {
-    await jsonInput.addSource({
-      name: typeName,
-      schema: jsonString,
-    })
-  }
-
+  const inputData = new InputData()
   inputData.addInput(jsonInput)
 
   return quicktypeMultiFile({
+    lang,
     inputData,
-    lang: targetLanguage,
-    outputFilename: 'index',
     ...options,
   })
 }

lib/superjson/index.ts

@@ -1,8 +1,6 @@
-import superjson from 'superjson'
+import json from 'superjson'
 
-import type { DataTransformer } from '@trpc/server'
+import type { DataTransformerOptions } from '@trpc/server'
 
-export const transformer: DataTransformer = {
-  serialize: (obj: unknown) => superjson.stringify(obj),
-  deserialize: (obj: string) => superjson.parse(obj),
-}
+export const superjson = json as DataTransformerOptions
+export const transformer = undefined