@jayfong/x-server 2.27.0 → 2.28.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/lib/_cjs/core/define_cron.js +1 -1
  2. package/lib/core/define_cron.js +1 -1
  3. package/lib/types/index.d.ts +38 -8
  4. package/package.json +2 -3
package/lib/_cjs/core/define_cron.js CHANGED
@@ -4,7 +4,7 @@ exports.__esModule = true;
4
4
  exports.defineCron = defineCron;
5
5
  var _cron = require("cron");
6
6
  function defineCron(options) {
7
- return new _cron.CronJob({
7
+ return _cron.CronJob.from({
8
8
  cronTime: options.expression,
9
9
  runOnInit: options.runOnInit,
10
10
  start: true,
package/lib/core/define_cron.js CHANGED
@@ -1,6 +1,6 @@
1
1
  import { CronJob } from 'cron';
2
2
  export function defineCron(options) {
3
- return new CronJob({
3
+ return CronJob.from({
4
4
  cronTime: options.expression,
5
5
  runOnInit: options.runOnInit,
6
6
  start: true,
package/lib/types/index.d.ts CHANGED
@@ -6,6 +6,13 @@ export type MakeDtoRequired<TRawData extends Record<any, any>, TPickKey extends
6
6
  ] extends [never] ? keyof TRawData : TPickKey>, TPartialKey>, [
7
7
  TOverride
8
8
  ] extends [never] ? {} : TOverride>>;
9
+ export type MakeDtoRequiredByExclude<TRawData extends Record<any, any>, TExcludeKey extends keyof TRawData = never, TPartialKey extends Exclude<keyof TRawData, TExcludeKey> = never, TOverride extends {
10
+ [K in Exclude<keyof TRawData, TExcludeKey>]?: any;
11
+ } = never> = Simplify<Merge<PartialBy<Omit<RequiredDeep<TRawData>, [
12
+ TExcludeKey
13
+ ] extends [never] ? never : TExcludeKey>, TPartialKey>, [
14
+ TOverride
15
+ ] extends [never] ? {} : TOverride>>;
9
16
  export type MakeDtoPartial<TRawData extends Record<any, any>, TPickKey extends keyof TRawData = never, TRequiredKey extends [TPickKey] extends [never] ? keyof TRawData : TPickKey = never, TOverride extends {
10
17
  [K in [TPickKey] extends [never] ? keyof TRawData : TPickKey]?: any;
11
18
  } = never> = Simplify<Merge<RequiredBy<Pick<Partial<TRawData>, [
@@ -13,14 +20,7 @@ export type MakeDtoPartial<TRawData extends Record<any, any>, TPickKey extends k
13
20
  ] extends [never] ? keyof TRawData : TPickKey>, TRequiredKey>, [
14
21
  TOverride
15
22
  ] extends [never] ? {} : TOverride>>;
16
- export type MakeDtoExcludeRequired<TRawData extends Record<any, any>, TExcludeKey extends keyof TRawData = never, TPartialKey extends Exclude<keyof TRawData, TExcludeKey> = never, TOverride extends {
17
- [K in Exclude<keyof TRawData, TExcludeKey>]?: any;
18
- } = never> = Simplify<Merge<PartialBy<Omit<RequiredDeep<TRawData>, [
19
- TExcludeKey
20
- ] extends [never] ? never : TExcludeKey>, TPartialKey>, [
21
- TOverride
22
- ] extends [never] ? {} : TOverride>>;
23
- export type MakeDtoExcludePartial<TRawData extends Record<any, any>, TExcludeKey extends keyof TRawData = never, TRequiredKey extends Exclude<keyof TRawData, TExcludeKey> = never, TOverride extends {
23
+ export type MakeDtoPartialByExclude<TRawData extends Record<any, any>, TExcludeKey extends keyof TRawData = never, TRequiredKey extends Exclude<keyof TRawData, TExcludeKey> = never, TOverride extends {
24
24
  [K in Exclude<keyof TRawData, TExcludeKey>]?: any;
25
25
  } = never> = Simplify<Merge<RequiredBy<Omit<Partial<TRawData>, [
26
26
  TExcludeKey
@@ -32,8 +32,38 @@ export type MakeDtoExclude<TRawData extends Record<any, any>, TExcludeKey extend
32
32
  } = never> = Simplify<Merge<OmitStrict<TRawData, TExcludeKey>, [
33
33
  TOverride
34
34
  ] extends [never] ? {} : TOverride>>;
35
+ export type MakeDtoExcludeWithRequired<TRawData extends Record<any, any>, TExcludeKey extends keyof TRawData, TRequiredKey extends Exclude<keyof TRawData, TExcludeKey> = never, TOverride extends {
36
+ [K in Exclude<keyof TRawData, TExcludeKey>]?: any;
37
+ } = never> = Simplify<Merge<RequiredBy<OmitStrict<TRawData, TExcludeKey>, TRequiredKey>, [
38
+ TOverride
39
+ ] extends [never] ? {} : TOverride>>;
40
+ export type MakeDtoExcludeWithPartial<TRawData extends Record<any, any>, TExcludeKey extends keyof TRawData, TPartialKey extends Exclude<keyof TRawData, TExcludeKey> = never, TOverride extends {
41
+ [K in Exclude<keyof TRawData, TExcludeKey>]?: any;
42
+ } = never> = Simplify<Merge<PartialBy<OmitStrict<TRawData, TExcludeKey>, TPartialKey>, [
43
+ TOverride
44
+ ] extends [never] ? {} : TOverride>>;
45
+ export type MakeDtoExcludeWithRequiredAndPartial<TRawData extends Record<any, any>, TExcludeKey extends keyof TRawData, TRequiredKey extends Exclude<keyof TRawData, TExcludeKey> = never, TPartialKey extends Exclude<Exclude<keyof TRawData, TExcludeKey>, TRequiredKey> = never, TOverride extends {
46
+ [K in Exclude<keyof TRawData, TExcludeKey>]?: any;
47
+ } = never> = Simplify<Merge<PartialBy<RequiredBy<OmitStrict<TRawData, TExcludeKey>, TRequiredKey>, TPartialKey>, [
48
+ TOverride
49
+ ] extends [never] ? {} : TOverride>>;
35
50
  export type MakeDtoInclude<TRawData extends Record<any, any>, TIncludeKey extends keyof TRawData, TOverride extends {
36
51
  [K in TIncludeKey]?: any;
37
52
  } = never> = Simplify<Merge<Pick<TRawData, TIncludeKey>, [
38
53
  TOverride
39
54
  ] extends [never] ? {} : TOverride>>;
55
+ export type MakeDtoIncludeWithRequired<TRawData extends Record<any, any>, TIncludeKey extends keyof TRawData, TRequiredKey extends TIncludeKey = never, TOverride extends {
56
+ [K in TIncludeKey]?: any;
57
+ } = never> = Simplify<Merge<RequiredBy<Pick<TRawData, TIncludeKey>, TRequiredKey>, [
58
+ TOverride
59
+ ] extends [never] ? {} : TOverride>>;
60
+ export type MakeDtoIncludeWithPartial<TRawData extends Record<any, any>, TIncludeKey extends keyof TRawData, TPartialKey extends TIncludeKey = never, TOverride extends {
61
+ [K in TIncludeKey]?: any;
62
+ } = never> = Simplify<Merge<PartialBy<Pick<TRawData, TIncludeKey>, TPartialKey>, [
63
+ TOverride
64
+ ] extends [never] ? {} : TOverride>>;
65
+ export type MakeDtoIncludeWithRequiredAndPartial<TRawData extends Record<any, any>, TIncludeKey extends keyof TRawData, TRequiredKey extends TIncludeKey = never, TPartialKey extends Exclude<TIncludeKey, TRequiredKey> = never, TOverride extends {
66
+ [K in TIncludeKey]?: any;
67
+ } = never> = Simplify<Merge<PartialBy<RequiredBy<Pick<TRawData, TIncludeKey>, TRequiredKey>, TPartialKey>, [
68
+ TOverride
69
+ ] extends [never] ? {} : TOverride>>;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@jayfong/x-server",
3
- "version": "2.27.0",
3
+ "version": "2.28.1",
4
4
  "license": "ISC",
5
5
  "sideEffects": false,
6
6
  "main": "lib/_cjs/index.js",
@@ -25,7 +25,6 @@
25
25
  "@fastify/websocket": "^8.1.0",
26
26
  "@prisma/client": "^4.8.0",
27
27
  "@types/busboy": "^0.3.2",
28
- "@types/cron": "^2.0.0",
29
28
  "@types/http-errors": "^1.8.2",
30
29
  "@types/jsonwebtoken": "^8.5.8",
31
30
  "@types/nodemailer": "^6.4.4",
@@ -36,7 +35,7 @@
36
35
  "chokidar": "^3.5.3",
37
36
  "comment-parser": "^1.3.1",
38
37
  "compressing": "^1.5.1",
39
- "cron": "^2.3.1",
38
+ "cron": "^3.1.6",
40
39
  "cuid": "^2.1.8",
41
40
  "debug": "^4.3.4",
42
41
  "esbuild": "^0.18.11",