@naturalcycles/nodejs-lib 13.36.0 → 13.37.1

package/dist/validation/joi/joi.shared.schemas.d.ts

@@ -1,4 +1,4 @@
-import { BaseDBEntity, NumberEnum, StringEnum, UnixTimestamp, UnixTimestampMillis } from '@naturalcycles/js-lib';
+import { BaseDBEntity, IsoDateTime, NumberEnum, StringEnum, UnixTimestamp, UnixTimestampMillis } from '@naturalcycles/js-lib';
 import { AlternativesSchema, AnySchema, ArraySchema, ObjectSchema } from 'joi';
 import { NumberSchema } from './number.extensions';
 import { StringSchema } from './string.extensions';
@@ -10,12 +10,12 @@ export declare const numberSchema: NumberSchema<number>;
 export declare const numberSchemaTyped: <T>() => NumberSchema<T>;
 export declare const integerSchema: NumberSchema<number>;
 export declare const percentageSchema: NumberSchema<number>;
-export declare const dateStringSchema: StringSchema<string>;
+export declare const dateStringSchema: StringSchema<import("@naturalcycles/js-lib").IsoDate>;
 export declare const binarySchema: import("joi").BinarySchema<Buffer>;
 export declare const dateObjectSchema: ObjectSchema<any>;
 export declare const dateIntervalStringSchema: StringSchema<string>;
 export declare const DATE_TIME_STRING_REGEX: RegExp;
-export declare const dateTimeStringSchema: StringSchema<string>;
+export declare const dateTimeStringSchema: StringSchema<IsoDateTime>;
 /**
  * Allows all values of a String Enum.
  */

package/dist/validation/joi/string.extensions.d.ts

@@ -1,10 +1,11 @@
+import { IsoDate } from '@naturalcycles/js-lib';
 import type Joi from 'joi';
 import { Extension, StringSchema as JoiStringSchema } from 'joi';
 export interface StringSchema<TSchema = string> extends JoiStringSchema<TSchema> {
-    dateString: (min?: string, max?: string) => this;
+    dateString: (min?: IsoDate | 'today', max?: IsoDate | 'today') => StringSchema<IsoDate>;
 }
 export interface JoiDateStringOptions {
-    min?: string;
-    max?: string;
+    min?: IsoDate | 'today';
+    max?: IsoDate | 'today';
 }
 export declare function stringExtensions(joi: typeof Joi): Extension;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "13.36.0",
+  "version": "13.37.1",
   "scripts": {
     "prepare": "husky",
     "build": "dev-lib build",

package/src/validation/joi/joi.shared.schemas.ts

@@ -4,6 +4,7 @@ import {
   _stringEnumKeys,
   _stringEnumValues,
   BaseDBEntity,
+  IsoDateTime,
   NumberEnum,
   StringEnum,
   UnixTimestamp,
@@ -36,7 +37,7 @@ export const DATE_TIME_STRING_REGEX =
 
 export const dateTimeStringSchema = stringSchema.regex(DATE_TIME_STRING_REGEX).messages({
   'string.pattern.base': `must be a DateTime string`,
-})
+}) as StringSchema<IsoDateTime>
 
 /**
  * Allows all values of a String Enum.

package/src/validation/joi/string.extensions.ts

@@ -1,14 +1,14 @@
-import { localTime } from '@naturalcycles/js-lib'
+import { IsoDate, localTime } from '@naturalcycles/js-lib'
 import type Joi from 'joi'
 import { Extension, StringSchema as JoiStringSchema } from 'joi'
 
 export interface StringSchema<TSchema = string> extends JoiStringSchema<TSchema> {
-  dateString: (min?: string, max?: string) => this
+  dateString: (min?: IsoDate | 'today', max?: IsoDate | 'today') => StringSchema<IsoDate>
 }
 
 export interface JoiDateStringOptions {
-  min?: string
-  max?: string
+  min?: IsoDate | 'today'
+  max?: IsoDate | 'today'
 }
 
 export function stringExtensions(joi: typeof Joi): Extension {
@@ -24,7 +24,7 @@ export function stringExtensions(joi: typeof Joi): Extension {
     },
     rules: {
       dateString: {
-        method(min?: string, max?: string) {
+        method(min?: IsoDate, max?: IsoDate) {
           return this.$_addRule({
             name: 'dateString',
             args: { min, max } satisfies JoiDateStringOptions,
@@ -101,11 +101,11 @@ function isLeapYear(year: number): boolean {
 }
 
 let lastCheckedPlus = 0
-let todayStrPlusCached: string
+let todayStrPlusCached: IsoDate
 let lastCheckedMinus = 0
-let todayStrMinusCached: string
+let todayStrMinusCached: IsoDate
 
-function getTodayStrPlus15(): string {
+function getTodayStrPlus15(): IsoDate {
   const now = Date.now()
   if (now - lastCheckedPlus < 3_600_000) {
     // cached for 1 hour
@@ -116,7 +116,7 @@ function getTodayStrPlus15(): string {
   return (todayStrPlusCached = localTime.now().plus(15, 'hour').toISODate())
 }
 
-function getTodayStrMinus15(): string {
+function getTodayStrMinus15(): IsoDate {
   const now = Date.now()
   if (now - lastCheckedMinus < 3_600_000) {
     // cached for 1 hour