@feathersjs/typebox - npm Package Compare versions

Comparing version 5.0.0-pre.35 to 5.0.0-pre.36

CHANGELOG.md

@@ -6,2 +6,10 @@ # Change Log
 
+# [5.0.0-pre.36](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.35...v5.0.0-pre.36) (2023-01-29)
+
+### Bug Fixes
+
+- **configuration:** Add pool and connection object to SQL database default configuration ([#3023](https://github.com/feathersjs/feathers/issues/3023)) ([092c749](https://github.com/feathersjs/feathers/commit/092c749d43f7da4d019576d1210fe7d3719a44a2))
+- **schema:** Fix TypeBox extension value query syntax inference ([#3010](https://github.com/feathersjs/feathers/issues/3010)) ([f1c7a76](https://github.com/feathersjs/feathers/commit/f1c7a76586bbb8aed66ef866c3dcd666d79f3a24))
+- Update all dependencies ([#3024](https://github.com/feathersjs/feathers/issues/3024)) ([283dc47](https://github.com/feathersjs/feathers/commit/283dc4798d85584bc031e6e54b83b4ea77d1edd0))
+
 # [5.0.0-pre.35](https://github.com/feathersjs/feathers/compare/v5.0.0-pre.34...v5.0.0-pre.35) (2023-01-12)
@@ -8,0 +16,0 @@

lib/default-schemas.d.ts

@@ -33,3 +33,13 @@ import { Static } from '@sinclair/typebox';
     client: import("@sinclair/typebox").TString<string>;
-    connection: import("@sinclair/typebox").TString<string>;
+    connection: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString<string>, import("@sinclair/typebox").TPartial<import("@sinclair/typebox").TObject<{
+        host: import("@sinclair/typebox").TString<string>;
+        port: import("@sinclair/typebox").TNumber;
+        user: import("@sinclair/typebox").TString<string>;
+        password: import("@sinclair/typebox").TString<string>;
+        database: import("@sinclair/typebox").TString<string>;
+    }>>]>;
+    pool: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
+        min: import("@sinclair/typebox").TNumber;
+        max: import("@sinclair/typebox").TNumber;
+    }>>;
 }>>;
@@ -74,17 +84,57 @@ export declare const defaultAppConfiguration: import("@sinclair/typebox").TObject<{
         client: import("@sinclair/typebox").TString<string>;
-        connection: import("@sinclair/typebox").TString<string>;
+        connection: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString<string>, import("@sinclair/typebox").TPartial<import("@sinclair/typebox").TObject<{
+            host: import("@sinclair/typebox").TString<string>;
+            port: import("@sinclair/typebox").TNumber;
+            user: import("@sinclair/typebox").TString<string>;
+            password: import("@sinclair/typebox").TString<string>;
+            database: import("@sinclair/typebox").TString<string>;
+        }>>]>;
+        pool: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
+            min: import("@sinclair/typebox").TNumber;
+            max: import("@sinclair/typebox").TNumber;
+        }>>;
     }>>;
     postgresql: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
         client: import("@sinclair/typebox").TString<string>;
-        connection: import("@sinclair/typebox").TString<string>;
+        connection: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString<string>, import("@sinclair/typebox").TPartial<import("@sinclair/typebox").TObject<{
+            host: import("@sinclair/typebox").TString<string>;
+            port: import("@sinclair/typebox").TNumber;
+            user: import("@sinclair/typebox").TString<string>;
+            password: import("@sinclair/typebox").TString<string>;
+            database: import("@sinclair/typebox").TString<string>;
+        }>>]>;
+        pool: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
+            min: import("@sinclair/typebox").TNumber;
+            max: import("@sinclair/typebox").TNumber;
+        }>>;
     }>>;
     sqlite: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
         client: import("@sinclair/typebox").TString<string>;
-        connection: import("@sinclair/typebox").TString<string>;
+        connection: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString<string>, import("@sinclair/typebox").TPartial<import("@sinclair/typebox").TObject<{
+            host: import("@sinclair/typebox").TString<string>;
+            port: import("@sinclair/typebox").TNumber;
+            user: import("@sinclair/typebox").TString<string>;
+            password: import("@sinclair/typebox").TString<string>;
+            database: import("@sinclair/typebox").TString<string>;
+        }>>]>;
+        pool: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
+            min: import("@sinclair/typebox").TNumber;
+            max: import("@sinclair/typebox").TNumber;
+        }>>;
     }>>;
     mssql: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
         client: import("@sinclair/typebox").TString<string>;
-        connection: import("@sinclair/typebox").TString<string>;
+        connection: import("@sinclair/typebox").TUnion<[import("@sinclair/typebox").TString<string>, import("@sinclair/typebox").TPartial<import("@sinclair/typebox").TObject<{
+            host: import("@sinclair/typebox").TString<string>;
+            port: import("@sinclair/typebox").TNumber;
+            user: import("@sinclair/typebox").TString<string>;
+            password: import("@sinclair/typebox").TString<string>;
+            database: import("@sinclair/typebox").TString<string>;
+        }>>]>;
+        pool: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TObject<{
+            min: import("@sinclair/typebox").TNumber;
+            max: import("@sinclair/typebox").TNumber;
+        }>>;
     }>>;
 }>;
 export type DefaultAppConfiguration = Static<typeof defaultAppConfiguration>;

lib/default-schemas.js

@@ -44,3 +44,16 @@ "use strict";
     client: typebox_1.Type.String(),
-    connection: typebox_1.Type.String()
+    connection: typebox_1.Type.Union([
+        typebox_1.Type.String(),
+        typebox_1.Type.Partial(typebox_1.Type.Object({
+            host: typebox_1.Type.String(),
+            port: typebox_1.Type.Number(),
+            user: typebox_1.Type.String(),
+            password: typebox_1.Type.String(),
+            database: typebox_1.Type.String()
+        }))
+    ]),
+    pool: typebox_1.Type.Optional(typebox_1.Type.Object({
+        min: typebox_1.Type.Number(),
+        max: typebox_1.Type.Number()
+    }))
 }));
@@ -47,0 +60,0 @@ exports.defaultAppConfiguration = typebox_1.Type.Object({

lib/index.d.ts

@@ -52,3 +52,3 @@ import { TObject, TInteger, TOptional, TSchema, TIntersect, ObjectOptions } from '@sinclair/typebox';
     [key: string]: TSchema;
-}>(def: T, extension?: X) => TOptional<import("@sinclair/typebox").TUnion<[T, import("@sinclair/typebox").TPartial<TObject<{
+}>(def: T, extension?: X) => TOptional<import("@sinclair/typebox").TUnion<[T, import("@sinclair/typebox").TPartial<TIntersect<[TObject<{
     $gt: T;
@@ -61,3 +61,3 @@ $gte: T;
     $nin: import("@sinclair/typebox").TArray<T>;
-} & X>>]>>;
+}>, TObject<X>]>>]>>;
 /**
@@ -72,3 +72,3 @@ * Creates a Feathers query syntax schema for the properties defined in `definition`.
     [key: string]: TSchema;
-}; } : never>(definition: T, extensions?: X) => TOptional<TObject<T["properties"] extends infer T_2 ? { [K_1 in keyof T_2]: TOptional<import("@sinclair/typebox").TUnion<[T["properties"][K_1], import("@sinclair/typebox").TPartial<TObject<{
+}; } : never>(definition: T, extensions?: X) => TOptional<TObject<T["properties"] extends infer T_2 ? { [K_1 in keyof T_2]: TOptional<import("@sinclair/typebox").TUnion<[T["properties"][K_1], import("@sinclair/typebox").TPartial<TIntersect<[TObject<{
     $gt: T["properties"][K_1];
@@ -81,3 +81,3 @@ $gte: T["properties"][K_1];
     $nin: import("@sinclair/typebox").TArray<T["properties"][K_1]>;
-} & X[K_1]>>]>>; } : never>>;
+}>, TObject<X[K_1]>]>>]>>; } : never>>;
 /**
@@ -99,3 +99,3 @@ * Creates a TypeBox schema for the complete Feathers query syntax including `$limit`, $skip`, `$or`
     $select: import("@sinclair/typebox").TUnsafe<(keyof T["properties"])[]>;
-    $or: import("@sinclair/typebox").TArray<TOptional<TObject<T["properties"] extends infer T_3 ? { [K_2 in keyof T_3]: TOptional<import("@sinclair/typebox").TUnion<[T["properties"][K_2], import("@sinclair/typebox").TPartial<TObject<{
+    $or: import("@sinclair/typebox").TArray<TOptional<TObject<T["properties"] extends infer T_3 ? { [K_2 in keyof T_3]: TOptional<import("@sinclair/typebox").TUnion<[T["properties"][K_2], import("@sinclair/typebox").TPartial<TIntersect<[TObject<{
         $gt: T["properties"][K_2];
@@ -108,4 +108,4 @@ $gte: T["properties"][K_2];
         $nin: import("@sinclair/typebox").TArray<T["properties"][K_2]>;
-    } & X[K_2]>>]>>; } : never>>>;
-    $and: import("@sinclair/typebox").TArray<TOptional<TObject<T["properties"] extends infer T_3 ? { [K_2 in keyof T_3]: TOptional<import("@sinclair/typebox").TUnion<[T["properties"][K_2], import("@sinclair/typebox").TPartial<TObject<{
+    }>, TObject<X[K_2]>]>>]>>; } : never>>>;
+    $and: import("@sinclair/typebox").TArray<TOptional<TObject<T["properties"] extends infer T_3 ? { [K_2 in keyof T_3]: TOptional<import("@sinclair/typebox").TUnion<[T["properties"][K_2], import("@sinclair/typebox").TPartial<TIntersect<[TObject<{
         $gt: T["properties"][K_2];
@@ -118,4 +118,4 @@ $gte: T["properties"][K_2];
         $nin: import("@sinclair/typebox").TArray<T["properties"][K_2]>;
-    } & X[K_2]>>]>>; } : never>>>;
-}>>, TOptional<TObject<T["properties"] extends infer T_4 ? { [K_2 in keyof T_4]: TOptional<import("@sinclair/typebox").TUnion<[T["properties"][K_2], import("@sinclair/typebox").TPartial<TObject<{
+    }>, TObject<X[K_2]>]>>]>>; } : never>>>;
+}>>, TOptional<TObject<T["properties"] extends infer T_4 ? { [K_2 in keyof T_4]: TOptional<import("@sinclair/typebox").TUnion<[T["properties"][K_2], import("@sinclair/typebox").TPartial<TIntersect<[TObject<{
     $gt: T["properties"][K_2];
@@ -128,2 +128,2 @@ $gte: T["properties"][K_2];
     $nin: import("@sinclair/typebox").TArray<T["properties"][K_2]>;
-} & X[K_2]>>]>>; } : never>>]>;
+}>, TObject<X[K_2]>]>>]>>; } : never>>]>;

lib/index.js

@@ -88,12 +88,14 @@ "use strict";
     def,
-    typebox_1.Type.Partial(typebox_1.Type.Object({
-        $gt: def,
-        $gte: def,
-        $lt: def,
-        $lte: def,
-        $ne: def,
-        $in: typebox_1.Type.Array(def),
-        $nin: typebox_1.Type.Array(def),
-        ...extension
-    }), { additionalProperties: false })
+    typebox_1.Type.Partial(typebox_1.Type.Intersect([
+        typebox_1.Type.Object({
+            $gt: def,
+            $gte: def,
+            $lt: def,
+            $lte: def,
+            $ne: def,
+            $in: typebox_1.Type.Array(def),
+            $nin: typebox_1.Type.Array(def)
+        }),
+        typebox_1.Type.Object(extension)
+    ], { additionalProperties: false }))
 ]));
@@ -100,0 +102,0 @@ exports.queryProperty = queryProperty;

package.json

 {
   "name": "@feathersjs/typebox",
   "description": "TypeBox integration for @feathersjs/schema",
-  "version": "5.0.0-pre.35",
+  "version": "5.0.0-pre.36",
   "homepage": "https://feathersjs.com",
@@ -57,4 +57,4 @@ "main": "lib/",
   "dependencies": {
-    "@feathersjs/schema": "^5.0.0-pre.35",
-    "@sinclair/typebox": "^0.25.16"
+    "@feathersjs/schema": "^5.0.0-pre.36",
+    "@sinclair/typebox": "^0.25.21"
   },
@@ -68,3 +68,3 @@ "devDependencies": {
   },
-  "gitHead": "c641598d9a4de3ceda10f56cf2af288a4236b15e"
+  "gitHead": "9a107b463cc80d7f3c28553c908987e05b0b634a"
 }

README.md

@@ -21,4 +21,4 @@ # @feathersjs/typebox
 
-Copyright (c) 2022 [Feathers contributors](https://github.com/feathersjs/feathers/graphs/contributors)
+Copyright (c) 2023 [Feathers contributors](https://github.com/feathersjs/feathers/graphs/contributors)
 
 Licensed under the [MIT license](LICENSE).

src/default-schemas.ts

@@ -61,3 +61,20 @@ import { Type, Static } from '@sinclair/typebox'
     client: Type.String(),
-    connection: Type.String()
+    connection: Type.Union([
+      Type.String(),
+      Type.Partial(
+        Type.Object({
+          host: Type.String(),
+          port: Type.Number(),
+          user: Type.String(),
+          password: Type.String(),
+          database: Type.String()
+        })
+      )
+    ]),
+    pool: Type.Optional(
+      Type.Object({
+        min: Type.Number(),
+        max: Type.Number()
+      })
+    )
   })
@@ -64,0 +81,0 @@ )

src/index.ts

@@ -91,13 +91,17 @@ import { Type, TObject, TInteger, TOptional, TSchema, TIntersect, ObjectOptions } from '@sinclair/typebox'
       Type.Partial(
-        Type.Object({
-          $gt: def,
-          $gte: def,
-          $lt: def,
-          $lte: def,
-          $ne: def,
-          $in: Type.Array(def),
-          $nin: Type.Array(def),
-          ...extension
-        }),
-        { additionalProperties: false }
+        Type.Intersect(
+          [
+            Type.Object({
+              $gt: def,
+              $gte: def,
+              $lt: def,
+              $lte: def,
+              $ne: def,
+              $in: Type.Array(def),
+              $nin: Type.Array(def)
+            }),
+            Type.Object(extension)
+          ],
+          { additionalProperties: false }
+        )
       )
@@ -104,0 +108,0 @@ ])

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

49667

increased by12.83%

Lines of code

738

increased by13.19%

Dependency changes

• Updated@feathersjs/schema@^5.0.0-pre.36

• Updated@sinclair/typebox@^0.25.21