@lijuhong1981/jscheck 1.0.2 → 1.0.4

package/index.js

@@ -1,4 +1,6 @@
 import Check from "./src/Check.js";
+import defined from "./src/defined.js";
+import definedValue from "./src/definedValue.js";
 import isArray from "./src/isArray.js";
 import isBoolean from "./src/isBoolean.js";
 import isFunction from "./src/isFunction.js";
@@ -7,11 +9,13 @@ import isNumber from "./src/isNumber.js";
 import isObject from "./src/isObject.js";
 import isString from "./src/isString.js";
 import isTypedArray from "./src/isTypedArray.js";
-import isDefined from "./src/isDefined.js";
 import isValid from "./src/isValid.js";
+import getValidValue from "./src/getValidValue.js";
 
 export default Check;
 export {
+    defined,
+    definedValue,
     isArray,
     isBoolean,
     isFunction,
@@ -20,6 +24,6 @@ export {
     isObject,
     isString,
     isTypedArray,
-    isDefined,
     isValid,
+    getValidValue,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lijuhong1981/jscheck",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "",
   "main": "index.js",
   "module": "index.js",

package/src/Check.js

@@ -1,4 +1,4 @@
-import isDefined from "./isDefined.js";
+import defined from "./defined.js";
 import isValid from "./isValid.js";
 
 const Check = {};
@@ -24,8 +24,8 @@ function getFailedTypeErrorMessage(actual, expected, name) {
     );
 }
 
-Check.isDefined = function (name, test) {
-    if (!isDefined(test)) {
+Check.defined = function (name, test) {
+    if (!defined(test)) {
         throw new Error(getUndefinedErrorMessage(name));
     }
 };

package/src/defined.js

@@ -0,0 +1,5 @@
+function defined(value) {
+    return value !== undefined && value !== null;
+};
+
+export default defined;

package/src/definedValue.js

@@ -0,0 +1,10 @@
+import defined from "./defined.js";
+
+function definedValue(...args) {
+    for (let i = 0; i < args.length; i++) {
+        if (defined(args[i]))
+            return args[i];
+    }
+};
+
+export default definedValue;

package/src/getValidValue.js

@@ -0,0 +1,10 @@
+import isValid from "./isValid.js";
+
+function getValidValue(...args) {
+    for (let i = 0; i < args.length; i++) {
+        if (isValid(args[i]))
+            return args[i];
+    }
+};
+
+export default getValidValue;

package/src/isDefined.js

@@ -1,5 +0,0 @@
-function isDefined(value) {
-    return value !== undefined && value !== null;
-};
-
-export default isDefined;