@archtx/procedures 4.0.1 → 5.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@archtx/procedures",
-  "version": "4.0.1",
+  "version": "5.0.0",
   "description": "Procedure generator for @archtx",
   "main": "dist/exports.js",
   "types": "dist/exports.d.ts",
@@ -29,11 +29,11 @@
     "ajv-formats": "^3.0.1"
   },
   "peerDependencies": {
-    "@sinclair/typebox": "^0.34.28",
+    "typebox": "^1.0.30",
     "suretype": "^3.3.1"
   },
   "devDependencies": {
-    "@sinclair/typebox": "^0.34.28",
+    "typebox": "^1.0.30",
     "@types/jest": "^29.5.11",
     "@typescript-eslint/eslint-plugin": "^5.48.1",
     "@typescript-eslint/parser": "^5.48.1",

package/src/index.ts

@@ -5,7 +5,7 @@ import {
 } from './errors.js'
 import { ProcedureCodes } from './procedure-codes.js'
 import { computeSchema } from './schema/compute-schema.js'
-import { TJSONSchema, TSchemaLib } from './schema/types.js'
+import { Prettify, TJSONSchema, TSchemaLib } from './schema/types.js'
 
 export type TNoContextProvided = unknown
 
@@ -47,7 +47,7 @@ export function Procedures<TContext = TNoContextProvided>(
     {
       name: string
       config: TProcedureRegistration['config']
-      handler: (ctx: TContext, args: any) => Promise<any>
+      handler: (ctx: Prettify<TContext>, args: any) => Promise<any>
     }
   > = new Map()
 
@@ -56,21 +56,21 @@ export function Procedures<TContext = TNoContextProvided>(
     config: {
       description?: string
       hook?: (
-        ctx: TContext & TLocalContext,
+        ctx: Prettify<TContext & TLocalContext>,
         args: TSchemaLib<TArgs>,
-      ) => Promise<TLocalHook>
+      ) => Promise<Prettify<TLocalHook>>
       schema?: {
         args?: TArgs
         data?: TData
       }
     },
     handler: (
-      ctx: TContext & TLocalContext & TLocalHook,
+      ctx: Prettify<TContext & TLocalContext & TLocalHook>,
       args: TSchemaLib<TArgs>,
     ) => Promise<TSchemaLib<TData>>,
   ): {
     [K in TName | `${TName}_Info`]: K extends TName
-      ? (ctx: TContext, args: TSchemaLib<TArgs>) => Promise<TSchemaLib<TData>>
+      ? (ctx: Prettify<TContext>, args: TSchemaLib<TArgs>) => Promise<TSchemaLib<TData>>
       : {
           description?: string
           schema: {
@@ -92,7 +92,7 @@ export function Procedures<TContext = TNoContextProvided>(
         },
       },
 
-      handler: async (ctx: TContext, args: TSchemaLib<TArgs>) => {
+      handler: async (ctx: Prettify<TContext>, args: TSchemaLib<TArgs>) => {
         try {
           if (validations?.args) {
             const { errors } = validations.args(args)
@@ -143,7 +143,7 @@ export function Procedures<TContext = TNoContextProvided>(
               ...ctx,
               ...localCtx,
               ...computedLocalHook,
-            } as TContext & TLocalContext & TLocalHook,
+            } as Prettify<TContext & TLocalContext & TLocalHook>,
             args,
           )
         } catch (error: any) {

package/src/schema/compute-schema.test.ts

@@ -1,5 +1,5 @@
 import { describe, it, expect } from 'vitest'
-import { Type } from '@sinclair/typebox'
+import { Type } from 'typebox'
 import { v } from 'suretype'
 import { computeSchema } from './compute-schema.js'
 import { ProcedureRegistrationError } from '../errors.js'

package/src/schema/extract-json-schema.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, test } from 'vitest'
-import { Type } from '@sinclair/typebox'
+import { Type } from 'typebox'
 import { v } from 'suretype'
 import { extractJsonSchema } from './extract-json-schema.js'
 

package/src/schema/parser.test.ts

@@ -1,7 +1,7 @@
 import { describe, expect, test } from 'vitest'
 import { extractSingleJsonSchema, v } from 'suretype'
 import { schemaParser } from './parser.js'
-import { Type } from '@sinclair/typebox'
+import { Type } from 'typebox'
 
 describe('schemaParser', () => {
   test('it parses args to json-schema', async () => {

package/src/schema/resolve-schema-lib.test.ts

@@ -1,6 +1,6 @@
 import { describe, expect, test } from 'vitest'
 import { isSuretypeSchema, isTypeboxSchema } from './resolve-schema-lib.js'
-import { Type } from '@sinclair/typebox'
+import { Type } from 'typebox'
 import { v } from 'suretype'
 
 describe('lib schema resolvers', () => {

package/src/schema/resolve-schema-lib.ts

@@ -1,23 +1,29 @@
-import { Static } from '@sinclair/typebox'
 import { CoreValidator } from 'suretype'
+import { Type } from 'typebox'
 
-export type IsTypeboxSchema<TSchema> =
-  TSchema extends {static: unknown, params: unknown} ? true
-    : false;
-
-export function isTypeboxSchema(
-  schema: any,
-): schema is Static<any> {
-  return typeof schema === 'object' && Symbol.for('TypeBox.Kind') in schema;
+export type IsTypeboxSchema<TSchema> = TSchema extends {
+  static: unknown
+  params: unknown
 }
+  ? true
+  : false
 
-export type IsSuretypeSchema<TSchema> =
-  TSchema extends {required: () => object, nullable?: never} ? true
-    : false;
+export function isTypeboxSchema(schema: any): schema is Type.TSchema {
+  return (
+    //  typebox v1
+    (typeof schema === 'object' && '~kind' in schema) ||
+    // @sinclair/typebox v0.3x
+    (typeof schema === 'object' && Symbol.for('TypeBox.Kind') in schema)
+  )
+}
 
-export function isSuretypeSchema(
-  schema: any,
-): schema is CoreValidator<any> {
-  return typeof schema === 'object' && 'getJsonSchemaObject' in schema;
+export type IsSuretypeSchema<TSchema> = TSchema extends {
+  required: () => object
+  nullable?: never
 }
+  ? true
+  : false
 
+export function isSuretypeSchema(schema: any): schema is CoreValidator<any> {
+  return typeof schema === 'object' && 'getJsonSchemaObject' in schema
+}

package/src/schema/types.ts

@@ -1,5 +1,6 @@
+/* eslint-disable @typescript-eslint/ban-types */
 import { CoreValidator, TypeOf } from 'suretype'
-import { Static, TSchema } from '@sinclair/typebox'
+import { Static, TSchema } from 'typebox'
 
 // Determine if the generic "SchemaLibType" is Suretype's CoreValidator or Typebox's TSchema
 export type TSchemaLib<SchemaLibType> =
@@ -10,3 +11,7 @@ export type TSchemaLib<SchemaLibType> =
       : unknown
 
 export type TJSONSchema = Record<string, any>
+
+export type Prettify<TObject> = {
+  [Key in keyof TObject]: TObject[Key]
+} & {}