@thzero/library_server_validation_joi 0.17.8 → 0.17.10

package/README.md

@@ -1,15 +1,15 @@
-![GitHub package.json version](https://img.shields.io/github/package-json/v/thzero/library_server_validation_joi)
-![David](https://img.shields.io/david/thzero/library_server_validation_joi)
-[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-
-# library_server_validation_joi
-
-## Requirements
-
-### NodeJs
-
-[NodeJs](https://nodejs.org) version 18+
-
-### Installation
-
-[![NPM](https://nodei.co/npm/@thzero/library_server_validation_joi.png?compact=true)](https://npmjs.org/package/@thzero/library_server_validation_joi)
+![GitHub package.json version](https://img.shields.io/github/package-json/v/thzero/library_server_validation_joi)
+![David](https://img.shields.io/david/thzero/library_server_validation_joi)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+
+# library_server_validation_joi
+
+## Requirements
+
+### NodeJs
+
+[NodeJs](https://nodejs.org) version 18+
+
+### Installation
+
+[![NPM](https://nodei.co/npm/@thzero/library_server_validation_joi.png?compact=true)](https://npmjs.org/package/@thzero/library_server_validation_joi)

package/gamer.js

@@ -1,46 +1,46 @@
-import Joi from 'joi';
-import JoiDate from '@joi/date';
-Joi.extend(JoiDate);
-
-import JoiBaseValidationService from './index.js';
-
-class GamerJoiValidationService extends JoiBaseValidationService {
-	_gamerId = Joi.string()
-		.trim()
-		.alphanum();
-		//.regex(/^[a-zA-Z0-9]+(['"_\-a-zA-Z0-9]*)*$/);
-
-	_gamerTagFull = Joi.string()
-		.trim()
-		//.alphanum()
-		.regex(/^[a-zA-Z0-9]+(['"_\-a-zA-Z0-9 ]*)*$/)
-		.min(3)
-		.max(30);
-
-	_gamerTagPartial = Joi.string()
-		.trim()
-		//.alphanum()
-		.regex(/^[a-zA-Z0-9]+(['"_\-a-zA-Z0-9]*)*$/)
-		.min(3)
-		.max(30);
-
-	_settingGamerSchema = Joi.object({
-		gamerTag: this._gamerTagFull.allow(null).allow(''),
-		gamerTagSearch: this._gamerTagFull.allow(null).allow('')
-	});
-
-	gamerIdSchema = this._gamerId.required();
-
-	gamerTagSchema = this._gamerTagPartial.required();
-
-	settingSchema() {
-		const validation = super.settingSchema();
-		return validation.concat(this._settingGamerSchema);
-	}
-
-	settingSchema() {
-		return this._settingGamerSchema;
-	}
-}
-
-export default GamerJoiValidationService;
+import Joi from 'joi';
+import JoiDate from '@joi/date';
+Joi.extend(JoiDate);
+
+import JoiBaseValidationService from './index.js';
+
+class GamerJoiValidationService extends JoiBaseValidationService {
+	_gamerId = Joi.string()
+		.trim()
+		.alphanum();
+		//.regex(/^[a-zA-Z0-9]+(['"_\-a-zA-Z0-9]*)*$/);
+
+	_gamerTagFull = Joi.string()
+		.trim()
+		//.alphanum()
+		.regex(/^[a-zA-Z0-9]+(['"_\-a-zA-Z0-9 ]*)*$/)
+		.min(3)
+		.max(30);
+
+	_gamerTagPartial = Joi.string()
+		.trim()
+		//.alphanum()
+		.regex(/^[a-zA-Z0-9]+(['"_\-a-zA-Z0-9]*)*$/)
+		.min(3)
+		.max(30);
+
+	_settingGamerSchema = Joi.object({
+		gamerTag: this._gamerTagFull.allow(null).allow(''),
+		gamerTagSearch: this._gamerTagFull.allow(null).allow('')
+	});
+
+	gamerIdSchema = this._gamerId.required();
+
+	gamerTagSchema = this._gamerTagPartial.required();
+
+	settingSchema() {
+		const validation = super.settingSchema();
+		return validation.concat(this._settingGamerSchema);
+	}
+
+	settingSchema() {
+		return this._settingGamerSchema;
+	}
+}
+
+export default GamerJoiValidationService;

package/index.js

@@ -1,143 +1,143 @@
-import Joi from 'joi';
-import JoiDate from '@joi/date';
-Joi.extend(JoiDate);
-
-import BaseValidationService from '@thzero/library_common_service/service/validation.js';
-
-class JoiBaseValidationService extends BaseValidationService {
-	check(correlationId, schema, value, context, prefix) {
-		const { error, valueO } = schema.validate(value, context);
-		return this._validateError(correlationId, error, prefix);
-	}
-
-	_validateError(correlationId, error, prefix) {
-		if (!error)
-			return this._success(correlationId);
-
-		const response = this._error('JoiBaseValidationService', '_validateError', null, null, null, null, correlationId);
-
-		if (error) {
-			for (const temp of error.details) {
-				response.add(temp.message, temp.context.key, temp.context.key, temp.type, null, prefix);
-				this._logger.warn2(null, temp);
-			}
-		}
-
-		return response;
-	}
-
-	_boolean = Joi.boolean();
-	_dateIso = Joi.date().iso();
-
-	_description = Joi.string()
-		.regex(/^[!@#$%^&*()_\-\+=\[\]{}|\\:;"'<>,.?\/a-zA-Z0-9 (\r|\n)*$/)]*$/);
-
-	_extendedNameBase = Joi.string()
-		.trim()
-		//.alphanum()
-		.regex(/^[a-zA-Z0-9]+(['"._\-a-zA-Z0-9 :;,\(\\+)@]*)*$/);
-
-	_extendedName = this._extendedNameBase
-		.min(3)
-		.max(50);
-
-	_email = Joi.string().trim().email({ minDomainSegments: 2, tlds: { allow: ['com', 'net', 'org', 'edu'] } });
-
-	_externalId = Joi.string()
-		.trim()
-		.alphanum()
-		.min(3)
-		.max(30);
-	// _id = Joi.string().trim().guid();
-	_id = Joi.string()
-		.trim()
-		.alphanum()
-		.min(20)
-		.max(30);
-
-	_name = Joi.string()
-		.trim()
-		//.alphanum()
-		.regex(/^[a-zA-Z0-9]+(['"._\-a-zA-Z0-9 ]*)*$/)
-		.min(3)
-		.max(30);
-	_nameLong = Joi.string()
-		.trim()
-		//.alphanum()
-		.regex(/^[a-zA-Z0-9]+(['"._\-a-zA-Z0-9]*)*$/)
-		.min(3)
-		.max(50);
-
-	_number = Joi.number();
-
-	_roles = Joi.string()
-		.trim()
-		//.alphanum()
-		.regex(/^[a-zA-Z0-9]+([_\-a-zA-Z0-9]*)*$/)
-		.min(3)
-		.max(30);
-
-	_tagLine = Joi.string()
-		.trim()
-		//.alphanum()
-		.regex(/^[a-zA-Z0-9]+(['",.!& _\-a-zA-Z0-9 ]*)*$/)
-		.min(3)
-		.max(90)
-		.allow('');
-
-	_timestamp = Joi.date().timestamp();
-
-	_url = Joi.string()
-		.trim()
-		.min(3)
-		.max(255)
-		.uri();
-
-	_username = Joi.string()
-		.trim()
-		.alphanum()
-		.min(3)
-		.max(30);
-	_userpicture = Joi.string().trim().uri();
-
-	externalIdSchema = this._externalId.required();
-
-	idSchema = this._id.required();
-
-	nameSchema = this._name;
-
-	externalUserSchema = Joi.object({
-		id: this._externalId.required(),
-		name: this._name.allow(null),
-		email: this._email.allow(null),
-		picture: this._userpicture.allow(null),
-	});
-
-	settingsRefreshSchema = Joi.object({
-		userId: this._externalId.required()
-	});
-
-	settingRequestSchema() {
-		return Joi.object({
-			userId: this._id.required(),
-			settings: this.settingSchema().required()
-		});
-	}
-
-	settingSchema() {
-		return Joi.object({});
-	}
-
-	userSchema = Joi.object({
-		id: this._externalId.required(),
-	});
-
-	userUpdateSchema = Joi.object({
-		id: this._externalId.required(),
-		email: this._email.allow(null),
-		roles: Joi.array().items(this._roles).allow(null),
-		updatedTimestamp: this._timestamp.required()
-	});
-}
-
-export default JoiBaseValidationService;
+import Joi from 'joi';
+import JoiDate from '@joi/date';
+Joi.extend(JoiDate);
+
+import BaseValidationService from '@thzero/library_common_service/service/validation.js';
+
+class JoiBaseValidationService extends BaseValidationService {
+	check(correlationId, schema, value, context, prefix) {
+		const { error, valueO } = schema.validate(value, context);
+		return this._validateError(correlationId, error, prefix);
+	}
+
+	_validateError(correlationId, error, prefix) {
+		if (!error)
+			return this._success(correlationId);
+
+		const response = this._error('JoiBaseValidationService', '_validateError', null, null, null, null, correlationId);
+
+		if (error) {
+			for (const temp of error.details) {
+				response.add(temp.message, temp.context.key, temp.context.key, temp.type, null, prefix);
+				this._logger.warn2(null, temp);
+			}
+		}
+
+		return response;
+	}
+
+	_boolean = Joi.boolean();
+	_dateIso = Joi.date().iso();
+
+	_description = Joi.string()
+		.regex(/^[!@#$%^&*()_\-\+=\[\]{}|\\:;"'<>,.?\/a-zA-Z0-9 (\r|\n)*$/)]*$/);
+
+	_extendedNameBase = Joi.string()
+		.trim()
+		//.alphanum()
+		.regex(/^[a-zA-Z0-9]+(['"._\-a-zA-Z0-9 :;,\(\\+)@]*)*$/);
+
+	_extendedName = this._extendedNameBase
+		.min(3)
+		.max(50);
+
+	_email = Joi.string().trim().email({ minDomainSegments: 2, tlds: { allow: ['com', 'net', 'org', 'edu'] } });
+
+	_externalId = Joi.string()
+		.trim()
+		.alphanum()
+		.min(3)
+		.max(30);
+	// _id = Joi.string().trim().guid();
+	_id = Joi.string()
+		.trim()
+		.alphanum()
+		.min(20)
+		.max(30);
+
+	_name = Joi.string()
+		.trim()
+		//.alphanum()
+		.regex(/^[a-zA-Z0-9]+(['"._\-a-zA-Z0-9 ]*)*$/)
+		.min(3)
+		.max(30);
+	_nameLong = Joi.string()
+		.trim()
+		//.alphanum()
+		.regex(/^[a-zA-Z0-9]+(['"._\-a-zA-Z0-9]*)*$/)
+		.min(3)
+		.max(50);
+
+	_number = Joi.number();
+
+	_roles = Joi.string()
+		.trim()
+		//.alphanum()
+		.regex(/^[a-zA-Z0-9]+([_\-a-zA-Z0-9]*)*$/)
+		.min(3)
+		.max(30);
+
+	_tagLine = Joi.string()
+		.trim()
+		//.alphanum()
+		.regex(/^[a-zA-Z0-9]+(['",.!& _\-a-zA-Z0-9 ]*)*$/)
+		.min(3)
+		.max(90)
+		.allow('');
+
+	_timestamp = Joi.date().timestamp();
+
+	_url = Joi.string()
+		.trim()
+		.min(3)
+		.max(255)
+		.uri();
+
+	_username = Joi.string()
+		.trim()
+		.alphanum()
+		.min(3)
+		.max(30);
+	_userpicture = Joi.string().trim().uri();
+
+	externalIdSchema = this._externalId.required();
+
+	idSchema = this._id.required();
+
+	nameSchema = this._name;
+
+	externalUserSchema = Joi.object({
+		id: this._externalId.required(),
+		name: this._name.allow(null),
+		email: this._email.allow(null),
+		picture: this._userpicture.allow(null),
+	});
+
+	settingsRefreshSchema = Joi.object({
+		userId: this._externalId.required()
+	});
+
+	settingRequestSchema() {
+		return Joi.object({
+			userId: this._id.required(),
+			settings: this.settingSchema().required()
+		});
+	}
+
+	settingSchema() {
+		return Joi.object({});
+	}
+
+	userSchema = Joi.object({
+		id: this._externalId.required(),
+	});
+
+	userUpdateSchema = Joi.object({
+		id: this._externalId.required(),
+		email: this._email.allow(null),
+		roles: Joi.array().items(this._roles).allow(null),
+		updatedTimestamp: this._timestamp.required()
+	});
+}
+
+export default JoiBaseValidationService;

package/license.md

@@ -1,9 +1,9 @@
-MIT License
-
-Copyright (c) 2020-2023 thZero.com
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
+MIT License
+
+Copyright (c) 2020-2024 thZero.com
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/news/index.js

@@ -1,59 +1,59 @@
-import Joi from 'joi';
-
-import LibraryServerConstants from '@thzero/library_server/constants.js';
-
-import JoiBaseValidationService from '../index.js';
-
-class BaseNewsJoiBaseValidationService extends JoiBaseValidationService {
-	getNewsSchema() {
-		return this.newsSchema;
-	}
-
-	getNewsUpdateSchema() {
-		return this.newsUpdateSchema;
-	}
-
-	getNewStatus() {
-		return LibraryServerConstants.NewsStatus;
-	}
-
-	getNewsTypes() {
-		return LibraryServerConstants.NewsTypes;
-	}
-
-	_newsArticle = Joi.string()
-		.regex(/^[!@#$%^&*()_\-\+=\[\]{}|\\:;"'<>,.?\/a-zA-Z0-9 (\r|\n)*$/)]*$/);
-	_newsStatus = Joi.string().valid(...Object.values(this.getNewStatus()));
-	_newsTitle = Joi.string()
-		//.alphanum()
-		.regex(/^[a-zA-Z0-9]+(['",.!& _\-a-zA-Z0-9 ]*)*$/)
-		.min(3)
-		.max(90);
-	_newsType = Joi.string().valid(...Object.values(this.getNewsTypes()));
-
-	newsSchema = Joi.object({
-		article: this._newsArticle.required(),
-		requiresAuth: Joi.boolean(),
-		sticky: Joi.boolean(),
-		status: this._newsStatus.required(),
-		timestamp: this._timestamp.required(),
-		title: this._newsTitle.required(),
-		type: this._newsType.required()
-	});
-
-	newsUpdateSchema = Joi.object({
-		id: this._id.required(),
-		article: this._newsArticle.required(),
-		requiresAuth: Joi.boolean(),
-		sticky: Joi.boolean(),
-		status: this._newsStatus.required(),
-		timestamp: this._timestamp.required(),
-		title: this._newsTitle.required(),
-		type: this._newsType.required(),
-		updatedTimestamp: this._timestamp.required()
-	});
-
-	newsTimestampSchema = this._timestamp;//ValidationService._dateIso;
-}
-
-export default BaseNewsJoiBaseValidationService;
+import Joi from 'joi';
+
+import LibraryServerConstants from '@thzero/library_server/constants.js';
+
+import JoiBaseValidationService from '../index.js';
+
+class BaseNewsJoiBaseValidationService extends JoiBaseValidationService {
+	getNewsSchema() {
+		return this.newsSchema;
+	}
+
+	getNewsUpdateSchema() {
+		return this.newsUpdateSchema;
+	}
+
+	getNewStatus() {
+		return LibraryServerConstants.NewsStatus;
+	}
+
+	getNewsTypes() {
+		return LibraryServerConstants.NewsTypes;
+	}
+
+	_newsArticle = Joi.string()
+		.regex(/^[!@#$%^&*()_\-\+=\[\]{}|\\:;"'<>,.?\/a-zA-Z0-9 (\r|\n)*$/)]*$/);
+	_newsStatus = Joi.string().valid(...Object.values(this.getNewStatus()));
+	_newsTitle = Joi.string()
+		//.alphanum()
+		.regex(/^[a-zA-Z0-9]+(['",.!& _\-a-zA-Z0-9 ]*)*$/)
+		.min(3)
+		.max(90);
+	_newsType = Joi.string().valid(...Object.values(this.getNewsTypes()));
+
+	newsSchema = Joi.object({
+		article: this._newsArticle.required(),
+		requiresAuth: Joi.boolean(),
+		sticky: Joi.boolean(),
+		status: this._newsStatus.required(),
+		timestamp: this._timestamp.required(),
+		title: this._newsTitle.required(),
+		type: this._newsType.required()
+	});
+
+	newsUpdateSchema = Joi.object({
+		id: this._id.required(),
+		article: this._newsArticle.required(),
+		requiresAuth: Joi.boolean(),
+		sticky: Joi.boolean(),
+		status: this._newsStatus.required(),
+		timestamp: this._timestamp.required(),
+		title: this._newsTitle.required(),
+		type: this._newsType.required(),
+		updatedTimestamp: this._timestamp.required()
+	});
+
+	newsTimestampSchema = this._timestamp;//ValidationService._dateIso;
+}
+
+export default BaseNewsJoiBaseValidationService;

package/openSource.js

@@ -1,46 +1,46 @@
-export default () => {
-    return [
-		{
-			category: 'server',
-			name: '@joi/date',
-			url: 'https://github.com/hapijs/joi-date',
-			licenseName: 'MIT',
-			licenseUrl: 'https://github.com/hapijs/joi-date/blob/master/LICENSE.md'
-		},
-        {
-            category: 'server',
-            name: '@thzero/library_common',
-            url: 'https://github.com/thzero/library_common',
-            licenseName: 'MIT',
-            licenseUrl: 'https://github.com/thzero/library_common/blob/master/license.md'
-        },
-        {
-            category: 'server',
-            name: '@thzero/library_common_service',
-            url: 'https://github.com/thzero/library_common_service',
-            licenseName: 'MIT',
-            licenseUrl: 'https://github.com/thzero/library_common_service/blob/master/license.md'
-        },
-        {
-            category: 'server',
-            name: '@thzero/library_service',
-            url: 'https://github.com/thzero/library_service',
-            licenseName: 'MIT',
-            licenseUrl: 'https://github.com/thzero/library_service/blob/master/license.md'
-        },
-		{
-			category: 'server',
-			name: '@thzero/library_server_validation_joi',
-			url: 'https://github.com/thzero/library_server_validation_joi',
-			licenseName: 'MIT',
-			licenseUrl: 'https://github.com/thzero/library_server_validation_joi/blob/master/license.md'
-		},
-		{
-			category: 'server',
-			name: 'joi',
-			url: 'https://github.com/hapijs/joi',
-			licenseName: 'MIT',
-			licenseUrl: 'https://github.com/hapijs/joi/blob/master/LICENSE.md'
-		}
-    ];
+export default () => {
+    return [
+		{
+			category: 'server',
+			name: '@joi/date',
+			url: 'https://github.com/hapijs/joi-date',
+			licenseName: 'MIT',
+			licenseUrl: 'https://github.com/hapijs/joi-date/blob/master/LICENSE.md'
+		},
+        {
+            category: 'server',
+            name: '@thzero/library_common',
+            url: 'https://github.com/thzero/library_common',
+            licenseName: 'MIT',
+            licenseUrl: 'https://github.com/thzero/library_common/blob/master/license.md'
+        },
+        {
+            category: 'server',
+            name: '@thzero/library_common_service',
+            url: 'https://github.com/thzero/library_common_service',
+            licenseName: 'MIT',
+            licenseUrl: 'https://github.com/thzero/library_common_service/blob/master/license.md'
+        },
+        {
+            category: 'server',
+            name: '@thzero/library_service',
+            url: 'https://github.com/thzero/library_service',
+            licenseName: 'MIT',
+            licenseUrl: 'https://github.com/thzero/library_service/blob/master/license.md'
+        },
+		{
+			category: 'server',
+			name: '@thzero/library_server_validation_joi',
+			url: 'https://github.com/thzero/library_server_validation_joi',
+			licenseName: 'MIT',
+			licenseUrl: 'https://github.com/thzero/library_server_validation_joi/blob/master/license.md'
+		},
+		{
+			category: 'server',
+			name: 'joi',
+			url: 'https://github.com/hapijs/joi',
+			licenseName: 'MIT',
+			licenseUrl: 'https://github.com/hapijs/joi/blob/master/LICENSE.md'
+		}
+    ];
 }

package/package.json

@@ -1,35 +1,36 @@
-{
-  "name": "@thzero/library_server_validation_joi",
-  "type": "module",
-  "version": "0.17.8",
-  "version_major": 0,
-  "version_minor": 17,
-  "version_patch": 8,
-  "version_date": "12/08/2023",
-  "author": "thZero",
-  "license": "MIT",
-  "repository": {
-    "type": "git",
-    "url": "git+https://github.com/thzero/library_server_validation_joi.git"
-  },
-  "bugs": {
-    "url": "https://github.com/thzero/library_server_validation_joi/issues"
-  },
-  "homepage": "https://github.com/thzero/library_server_validation_joi#readme",
-  "engines": {
-    "node": ">=12.8.3"
-  },
-  "scripts": {
-    "cli-update": "library-cli --updateversion --pi",
-    "test": "echo \"Error: no test specified\" && exit 1"
-  },
-  "dependencies": {
-    "@joi/date": "^2.1.0",
-    "joi": "^17.11.0"
-  },
-  "peerDependencies": {
-    "@thzero/library_common": "^0.17",
-    "@thzero/library_common_service": "^0.17",
-    "@thzero/library_server": "^0.17"
-  }
+{
+  "name": "@thzero/library_server_validation_joi",
+  "type": "module",
+  "version": "0.17.10",
+  "version_major": 0,
+  "version_minor": 17,
+  "version_patch": 10,
+  "version_date": "01/01/2024",
+  "author": "thZero",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/thzero/library_server_validation_joi.git"
+  },
+  "bugs": {
+    "url": "https://github.com/thzero/library_server_validation_joi/issues"
+  },
+  "homepage": "https://github.com/thzero/library_server_validation_joi#readme",
+  "engines": {
+    "node": ">=12.8.3"
+  },
+  "scripts": {
+    "cli-update": "library-cli --updateversion --pi",
+    "test": "echo \"Error: no test specified\" && exit 1"
+  },
+  "dependencies": {
+    "@joi/date": "^2.1.0",
+    "joi": "^17.11.0",
+    "moment": ">=2.29.4"
+  },
+  "peerDependencies": {
+    "@thzero/library_common": "^0.17",
+    "@thzero/library_common_service": "^0.17",
+    "@thzero/library_server": "^0.17"
+  }
 }