@archtx/procedures 4.1.0 → 5.0.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@archtx/procedures",
-  "version": "4.1.0",
+  "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/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,6 +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> =