@naturalcycles/nodejs-lib 13.13.0 → 13.14.0

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

@@ -14,6 +14,7 @@ export declare const percentageSchema: NumberSchema<number>;
 export declare const dateStringSchema: StringSchema<string>;
 export declare const binarySchema: import("joi").BinarySchema<Buffer>;
 export declare const dateObjectSchema: ObjectSchema<any>;
+export declare const dateIntervalStringSchema: StringSchema<string>;
 /**
  * Allows all values of a String Enum.
  */

package/dist/validation/joi/joi.shared.schemas.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.baseDBEntitySchema = exports.ipAddressSchema = exports.utcOffsetSchema = exports.userAgentSchema = exports.semVerSchema = exports.SEM_VER_REGEX = exports.emailSchema = exports.verSchema = exports.unixTimestampMillis2000Schema = exports.unixTimestampMillisSchema = exports.unixTimestamp2000Schema = exports.unixTimestampSchema = exports.slugSchema = exports.SLUG_REGEX = exports.idBase64UrlSchema = exports.idBase64Schema = exports.idBase62Schema = exports.idSchema = exports.jwtSchema = exports.JWT_REGEX = exports.base64UrlSchema = exports.base64Schema = exports.base62Schema = exports.BASE64URL_REGEX = exports.BASE64_REGEX = exports.BASE62_REGEX = exports.anyObjectSchema = exports.anySchema = exports.oneOfSchema = exports.objectSchema = exports.arraySchema = exports.urlSchema = exports.numberEnumKeySchema = exports.numberEnumValueSchema = exports.stringEnumKeySchema = exports.stringEnumValueSchema = exports.dateObjectSchema = exports.binarySchema = exports.dateStringSchema = exports.percentageSchema = exports.integerSchema = exports.numberSchemaTyped = exports.numberSchema = exports.stringSchemaTyped = exports.stringSchema = exports.booleanDefaultToFalseSchema = exports.booleanSchema = void 0;
+exports.baseDBEntitySchema = exports.ipAddressSchema = exports.utcOffsetSchema = exports.userAgentSchema = exports.semVerSchema = exports.SEM_VER_REGEX = exports.emailSchema = exports.verSchema = exports.unixTimestampMillis2000Schema = exports.unixTimestampMillisSchema = exports.unixTimestamp2000Schema = exports.unixTimestampSchema = exports.slugSchema = exports.SLUG_REGEX = exports.idBase64UrlSchema = exports.idBase64Schema = exports.idBase62Schema = exports.idSchema = exports.jwtSchema = exports.JWT_REGEX = exports.base64UrlSchema = exports.base64Schema = exports.base62Schema = exports.BASE64URL_REGEX = exports.BASE64_REGEX = exports.BASE62_REGEX = exports.anyObjectSchema = exports.anySchema = exports.oneOfSchema = exports.objectSchema = exports.arraySchema = exports.urlSchema = exports.numberEnumKeySchema = exports.numberEnumValueSchema = exports.stringEnumKeySchema = exports.stringEnumValueSchema = exports.dateIntervalStringSchema = exports.dateObjectSchema = exports.binarySchema = exports.dateStringSchema = exports.percentageSchema = exports.integerSchema = exports.numberSchemaTyped = exports.numberSchema = exports.stringSchemaTyped = exports.stringSchema = exports.booleanDefaultToFalseSchema = exports.booleanSchema = void 0;
 const js_lib_1 = require("@naturalcycles/js-lib");
 const joi_extensions_1 = require("./joi.extensions");
 exports.booleanSchema = joi_extensions_1.Joi.boolean();
@@ -16,6 +16,10 @@ exports.percentageSchema = joi_extensions_1.Joi.number().integer().min(0).max(10
 exports.dateStringSchema = exports.stringSchema.dateString();
 exports.binarySchema = joi_extensions_1.Joi.binary();
 exports.dateObjectSchema = joi_extensions_1.Joi.object().instance(Date);
+const DATE_INTERVAL_REGEX = /^\d{4}-\d{2}-\d{2}\/\d{4}-\d{2}-\d{2}$/;
+exports.dateIntervalStringSchema = exports.stringSchema.regex(DATE_INTERVAL_REGEX).messages({
+    'string.pattern.base': `must be a DateInterval string`,
+});
 /**
  * Allows all values of a String Enum.
  */

package/dist/validation/joi/string.extensions.js

@@ -41,10 +41,10 @@ function stringExtensions(joi) {
                     let { min, max } = args;
                     // Today allows +-14 hours gap to account for different timezones
                     if (max === 'today') {
-                        max = (0, js_lib_1.localTimeNow)().add(14, 'hour').toISODate();
+                        max = (0, js_lib_1.localTimeNow)().plus(14, 'hour').toISODate();
                     }
                     if (min === 'today') {
-                        min = (0, js_lib_1.localTimeNow)().subtract(14, 'hour').toISODate();
+                        min = (0, js_lib_1.localTimeNow)().minus(14, 'hour').toISODate();
                     }
                     // console.log('min/max', min, max)
                     const m = /^(\d{4})-(\d{2})-(\d{2})$/.exec(v);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@naturalcycles/nodejs-lib",
-  "version": "13.13.0",
+  "version": "13.14.0",
   "scripts": {
     "prepare": "husky",
     "docs-serve": "vuepress dev docs",

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

@@ -24,6 +24,11 @@ export const dateStringSchema = stringSchema.dateString()
 export const binarySchema = Joi.binary()
 export const dateObjectSchema = Joi.object().instance(Date)
 
+const DATE_INTERVAL_REGEX = /^\d{4}-\d{2}-\d{2}\/\d{4}-\d{2}-\d{2}$/
+export const dateIntervalStringSchema = stringSchema.regex(DATE_INTERVAL_REGEX).messages({
+  'string.pattern.base': `must be a DateInterval string`,
+})
+
 /**
  * Allows all values of a String Enum.
  */

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

@@ -51,10 +51,10 @@ export function stringExtensions(joi: typeof Joi): Extension {
 
           // Today allows +-14 hours gap to account for different timezones
           if (max === 'today') {
-            max = localTimeNow().add(14, 'hour').toISODate()
+            max = localTimeNow().plus(14, 'hour').toISODate()
           }
           if (min === 'today') {
-            min = localTimeNow().subtract(14, 'hour').toISODate()
+            min = localTimeNow().minus(14, 'hour').toISODate()
           }
           // console.log('min/max', min, max)