@todesktop/shared 7.76.0 → 7.77.0

package/lib/validations.d.ts

@@ -1,5 +1,6 @@
 import * as yup from "yup";
 export declare const appTitleValidation: yup.StringSchema;
+export declare const forceVersionValidation: yup.StringSchema;
 export declare const iconValidation: yup.StringSchema;
 export declare const urlValidation: yup.StringSchema;
 export declare const urlValidationForm: yup.ObjectSchema<yup.Shape<object, {

package/lib/validations.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const yup = require("yup");
+const semver = require("semver");
 const isRegex = require("is-regex");
 exports.appTitleValidation = yup
     .string()
@@ -9,6 +10,29 @@ exports.appTitleValidation = yup
     .matches(/^[\w\-\s]+$/, "App title may contain letters, numbers, spaces and dashes only")
     .matches(/^[^\s]+(\s+[^\s]+)*$/, "App title may not begin or end with space")
     .required();
+function isNumeric(str) {
+    if (typeof str != "string")
+        return false;
+    return !isNaN(str) && !isNaN(parseFloat(str));
+}
+function isNumericSemver(value) {
+    // check if valid semver
+    if (!semver.valid(value))
+        return false;
+    // ensure that all values are numbers
+    if (!value.split(".").every((num) => isNumeric(num)))
+        return false;
+    return true;
+}
+exports.forceVersionValidation = yup
+    .string()
+    .label("App version")
+    .min(5)
+    .required()
+    .when("$currentVersion", (currentVersion, schema) => schema.test("semantic-version", "Specified app version must follow a numeric SemVer versioning scheme (e.g. 1.0.0)", (forceVersion) => {
+    return (isNumericSemver(forceVersion) &&
+        semver.gt(forceVersion, currentVersion));
+}));
 exports.iconValidation = yup
     .string()
     .label("Icon")

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@todesktop/shared",
-  "version": "7.76.0",
+  "version": "7.77.0",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -19,9 +19,11 @@
     "@types/node": "^16.4.12",
     "@types/yup": "^0.26.9",
     "is-regex": "^1.0.4",
+    "semver": "^7.3.5",
     "yup": "^0.26.10"
   },
   "devDependencies": {
+    "@types/semver": "^7.3.9",
     "app-builder-lib": "^22.10.4",
     "tslint": "^5.12.1",
     "tslint-config-prettier": "1.18.0",

package/src/validations.ts

@@ -1,4 +1,5 @@
 import * as yup from "yup";
+import * as semver from "semver";
 import * as isRegex from "is-regex";
 export const appTitleValidation = yup
   .string()
@@ -11,6 +12,39 @@ export const appTitleValidation = yup
   .matches(/^[^\s]+(\s+[^\s]+)*$/, "App title may not begin or end with space")
   .required();
 
+function isNumeric(str: string) {
+  if (typeof str != "string") return false;
+  return !isNaN(str as any) && !isNaN(parseFloat(str));
+}
+
+function isNumericSemver(value: string) {
+  // check if valid semver
+  if (!semver.valid(value)) return false;
+
+  // ensure that all values are numbers
+  if (!value.split(".").every((num) => isNumeric(num))) return false;
+
+  return true;
+}
+
+export const forceVersionValidation = yup
+  .string()
+  .label("App version")
+  .min(5)
+  .required()
+  .when("$currentVersion", (currentVersion, schema) =>
+    schema.test(
+      "semantic-version",
+      "Specified app version must follow a numeric SemVer versioning scheme (e.g. 1.0.0)",
+      (forceVersion: string) => {
+        return (
+          isNumericSemver(forceVersion) &&
+          semver.gt(forceVersion, currentVersion)
+        );
+      }
+    )
+  );
+
 export const iconValidation = yup
   .string()
   .label("Icon")