@quanxiaoxiao/datav 0.1.1 → 0.2.0

package/README.md

@@ -138,3 +138,53 @@ select({
   age: 33,
 }); // { "name": "quan_xx", "age": 34 }
 ```
+
+```javascript
+const ret = select(
+  {
+    type: 'object',
+    properties: {
+      count: {
+        type: 'integer',
+      },
+      list: {
+        type: 'array',
+        properties: {
+          token: ['.', {
+            type: 'string',
+            resolve: (d) => `${d.name}_${d.age}`,
+          }],
+          name: {
+            type: 'string',
+          },
+        },
+      },
+    },
+  },
+)({
+  count: 20,
+  list: [
+    {
+      name: 'big',
+      age: 11,
+    },
+    {
+      name: 'bar',
+      age: 22,
+    },
+  ],
+});
+assert.deepEqual(ret, {
+  count: 20,
+  list: [
+    {
+      name: 'big',
+      token: 'big_11',
+    },
+    {
+      name: 'bar',
+      token: 'bar_22',
+    },
+  ],
+});
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@quanxiaoxiao/datav",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "type": "module",
   "scripts": {
     "test": "node --test"

package/src/getValueOfPathname.mjs

@@ -1,5 +1,3 @@
-import _ from 'lodash';
-
 const walk = (obj, nameList) => {
   const [dataKey, ...other] = nameList;
   if (Array.isArray(obj)) {
@@ -30,7 +28,7 @@ export default (obj, pathname) => {
   if (typeof pathname !== 'string' || (/\.$/.test(pathname) && pathname !== '.')) {
     throw new Error('pathname invalid');
   }
-  if (!Array.isArray(obj) && !_.isPlainObject(obj)) {
+  if (!obj) {
     return null;
   }
   let str = pathname;

package/src/select/index.mjs

@@ -66,6 +66,14 @@ function select(express) {
     console.warn('data type `array` or `object` unspport resolve');
   }
   if (express.type === 'object') {
+    if (_.isEmpty(express.properties)) {
+      return (v) => {
+        if (!_.isPlainObject(v)) {
+          return {};
+        }
+        return v;
+      };
+    }
     return walkWithObject(express.properties);
   }
   if (Array.isArray(express.properties)) {

package/src/select/index.test.mjs

@@ -123,8 +123,7 @@ test('select > index, type with object', () => {
     'obj',
     {
       type: 'object',
-      properties: {
-      },
+      properties: {},
     },
   ])({
     name: 'quan',
@@ -134,7 +133,36 @@ test('select > index, type with object', () => {
       age: '33.3',
       big: 'foo',
     },
+  }), {
+    name: 'xxx',
+    age: '33.3',
+    big: 'foo',
+  });
+  assert.deepEqual(select([
+    'obj',
+    {
+      type: 'object',
+      properties: {},
+    },
+  ])({
+    name: 'quan',
+    age: '22.5',
+    obj: 'aaa',
   }), {});
+  assert.deepEqual(select(
+    {
+      type: 'object',
+      properties: {},
+    },
+  )({
+    name: 'quan',
+    age: '22.5',
+    obj: 'aaa',
+  }), {
+    name: 'quan',
+    age: '22.5',
+    obj: 'aaa',
+  });
   assert.deepEqual(select([
     'obj',
     {
@@ -759,3 +787,53 @@ test('select > index, resolve', () => {
     { name: 'aaa', resolve: 'resolve' },
   );
 });
+
+test('select > index, resolve pathList', () => {
+  const ret = select(
+    {
+      type: 'object',
+      properties: {
+        count: {
+          type: 'integer',
+        },
+        list: {
+          type: 'array',
+          properties: {
+            token: ['.', {
+              type: 'string',
+              resolve: (d) => `${d.name}_${d.age}`,
+            }],
+            name: {
+              type: 'string',
+            },
+          },
+        },
+      },
+    },
+  )({
+    count: 20,
+    list: [
+      {
+        name: 'big',
+        age: 11,
+      },
+      {
+        name: 'bar',
+        age: 22,
+      },
+    ],
+  });
+  assert.deepEqual(ret, {
+    count: 20,
+    list: [
+      {
+        name: 'big',
+        token: 'big_11',
+      },
+      {
+        name: 'bar',
+        token: 'bar_22',
+      },
+    ],
+  });
+});