erii 2.0.3 → 2.0.5

package/dist/utils/convert.js

@@ -8,10 +8,10 @@ function toCamelCase(str) {
 }
 exports.toCamelCase = toCamelCase;
 function toKebabCase(str) {
-    return str[0].toLowerCase() +
+    return (str[0].toLowerCase() +
         str
             .slice(1, str.length)
-            .replace(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`);
+            .replace(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`));
 }
 exports.toKebabCase = toKebabCase;
 function convertObjectKey(before) {
@@ -19,10 +19,25 @@ function convertObjectKey(before) {
 }
 exports.convertObjectKey = convertObjectKey;
 function createCamelProxifiedObject(before) {
+    const originalObject = before;
     return new Proxy(before, {
         get: (target, key) => {
             var _a;
-            return (_a = target[key]) !== null && _a !== void 0 ? _a : target[toKebabCase(key)];
+            return (_a = originalObject[key]) !== null && _a !== void 0 ? _a : originalObject[toKebabCase(key)];
+        },
+        set: (target, key, value) => {
+            // 如果赋值的是camel case的key，而驼峰形式key是从kebab case的key proxy来的 则赋值其kebab case形式的key的值
+            if (!key.includes("-") &&
+                (originalObject[key] === undefined ||
+                    originalObject[key] === null) &&
+                originalObject[toKebabCase(key)] !== undefined &&
+                originalObject[toKebabCase(key)] !== null) {
+                target[toKebabCase(key)] = value;
+            }
+            else {
+                target[key] = value;
+            }
+            return value;
         },
     });
 }

package/dist/utils/convert.js.map

@@ -1 +1 @@
-{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../src/utils/convert.ts"],"names":[],"mappings":";;;AAAA,SAAgB,WAAW,CAAC,GAAW;IACnC,OAAO,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC,EAAE,EAAE,EAAE;QACvC,OAAO,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;AACP,CAAC;AAJD,kCAIC;AAED,SAAgB,WAAW,CAAC,GAAW;IACnC,OAAO,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE;QACvB,GAAG;aACE,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC;aACpB,OAAO,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC,CAAC;AACvE,CAAC;AALD,kCAKC;AAED,SAAgB,gBAAgB,CAAC,MAAgC;IAC7D,OAAO,MAAM,CAAC,WAAW,CACrB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC,CAC1E,CAAC;AACN,CAAC;AAJD,4CAIC;AAED,SAAgB,0BAA0B,CAAC,MAAgC;IACvE,OAAO,IAAI,KAAK,CAAC,MAAM,EAAE;QACrB,GAAG,EAAE,CAAC,MAAqB,EAAE,GAAW,EAAE,EAAE;;YACxC,aAAO,MAAM,CAAC,GAAG,CAAC,mCAAI,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;QACnD,CAAC;KACJ,CAAC,CAAC;AACP,CAAC;AAND,gEAMC"}
+{"version":3,"file":"convert.js","sourceRoot":"","sources":["../../src/utils/convert.ts"],"names":[],"mappings":";;;AAAA,SAAgB,WAAW,CAAC,GAAW;IACnC,OAAO,GAAG,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC,EAAE,EAAE,EAAE;QACvC,OAAO,EAAE,CAAC,WAAW,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;IAC7C,CAAC,CAAC,CAAC;AACP,CAAC;AAJD,kCAIC;AAED,SAAgB,WAAW,CAAC,GAAW;IACnC,OAAO,CACH,GAAG,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE;QACpB,GAAG;aACE,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,CAAC;aACpB,OAAO,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,IAAI,MAAM,CAAC,WAAW,EAAE,EAAE,CAAC,CACjE,CAAC;AACN,CAAC;AAPD,kCAOC;AAED,SAAgB,gBAAgB,CAAC,MAAgC;IAC7D,OAAO,MAAM,CAAC,WAAW,CACrB,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,EAAE,KAAK,CAAC,CAAC,CAC1E,CAAC;AACN,CAAC;AAJD,4CAIC;AAED,SAAgB,0BAA0B,CAAC,MAAgC;IACvE,MAAM,cAAc,GAAG,MAAM,CAAC;IAC9B,OAAO,IAAI,KAAK,CAAC,MAAM,EAAE;QACrB,GAAG,EAAE,CAAC,MAAqB,EAAE,GAAW,EAAE,EAAE;;YACxC,aAAO,cAAc,CAAC,GAAG,CAAC,mCAAI,cAAc,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;QACnE,CAAC;QACD,GAAG,EAAE,CAAC,MAAqB,EAAE,GAAW,EAAE,KAAU,EAAE,EAAE;YACpD,+EAA+E;YAC/E,IACI,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC;gBAClB,CAAC,cAAc,CAAC,GAAG,CAAC,KAAK,SAAS;oBAC9B,cAAc,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC;gBACjC,cAAc,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,SAAS;gBAC9C,cAAc,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,KAAK,IAAI,EAC3C;gBACE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,GAAG,KAAK,CAAC;aACpC;iBAAM;gBACH,MAAM,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC;aACvB;YACD,OAAO,KAAK,CAAC;QACjB,CAAC;KACJ,CAAC,CAAC;AACP,CAAC;AAtBD,gEAsBC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "erii",
-  "version": "2.0.3",
+  "version": "2.0.5",
   "description": "",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -20,8 +20,8 @@
   "dependencies": {
     "chalk": "^2.4.1",
     "clui": "^0.3.6",
-    "validator": "^10.2.0",
-    "yargs-parser": "^13.1.2"
+    "validator": "^13.7.0",
+    "yargs-parser": "^21.0.0"
   },
   "devDependencies": {
     "@types/node": "^10.17.48",

package/src/utils/convert.ts

@@ -5,10 +5,12 @@ export function toCamelCase(str: string) {
 }
 
 export function toKebabCase(str: string) {
-    return str[0].toLowerCase() +
+    return (
+        str[0].toLowerCase() +
         str
             .slice(1, str.length)
-            .replace(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`);
+            .replace(/[A-Z]/g, (letter) => `-${letter.toLowerCase()}`)
+    );
 }
 
 export function convertObjectKey(before: { [index: string]: any }) {
@@ -18,9 +20,25 @@ export function convertObjectKey(before: { [index: string]: any }) {
 }
 
 export function createCamelProxifiedObject(before: { [index: string]: any }) {
+    const originalObject = before;
     return new Proxy(before, {
         get: (target: typeof before, key: string) => {
-            return target[key] ?? target[toKebabCase(key)];
+            return originalObject[key] ?? originalObject[toKebabCase(key)];
+        },
+        set: (target: typeof before, key: string, value: any) => {
+            // 如果赋值的是camel case的key，而驼峰形式key是从kebab case的key proxy来的 则赋值其kebab case形式的key的值
+            if (
+                !key.includes("-") &&
+                (originalObject[key] === undefined ||
+                    originalObject[key] === null) &&
+                originalObject[toKebabCase(key)] !== undefined &&
+                originalObject[toKebabCase(key)] !== null
+            ) {
+                target[toKebabCase(key)] = value;
+            } else {
+                target[key] = value;
+            }
+            return value;
         },
     });
 }