feat(projection): allow properties as projections

kantord · Oct 10, 2018 · 14a281f · 14a281f
1 parent c1b096c
commit 14a281f
Show file tree

Hide file tree

Showing 6 changed files with 164 additions and 85 deletions.
diff --git a/src/__tests__/__snapshots__/interpreter.test.js.snap b/src/__tests__/__snapshots__/interpreter.test.js.snap
@@ -41,6 +41,8 @@ exports[`interpreter correct target code {"foo": ("bar" | "baz")} 1`] = `"(funct
 
 exports[`interpreter correct target code {"foo": ("bar" | "baz")}["foo"] 1`] = `"(function(_) { return (function(input) { return _.projection((_.objectify([[\\"foo\\",((function (input) {return \\"baz\\"})(\\"bar\\"))]])), [\\"foo\\"])})})"`;
 
+exports[`interpreter correct target code {"foo": [{"bar": "baz"}]} | $.foo[0].bar 1`] = `"(function(_) { return (function(input) { return (function (input) {return _.projection(input.foo, [0]).bar})((_.objectify([[\\"foo\\",[(_.objectify([[\\"bar\\",\\"baz\\"]]))]]])))})})"`;
+
 exports[`interpreter correct target code {"original": $.foo} | {"new": $} 1`] = `"(function(_) { return (function(input) { return (function (input) {return (_.objectify([[\\"new\\",input]]))})((_.objectify([[\\"original\\",input.foo]])))})})"`;
 
 exports[`interpreter correct target code false | true 1`] = `"(function(_) { return (function(input) { return (function (input) {return true})(false)})})"`;
@@ -93,17 +95,7 @@ exports[`interpreter correct target tree .apple.pear 1`] = `
 Object {
   "status": true,
   "value": Object {
-    "end": Object {
-      "column": 12,
-      "line": 1,
-      "offset": 11,
-    },
     "name": "valueProp",
-    "start": Object {
-      "column": 1,
-      "line": 1,
-      "offset": 0,
-    },
     "value": Object {
       "left": Object {
         "name": "inputProp",
@@ -119,17 +111,7 @@ exports[`interpreter correct target tree .apple.pear.bar 1`] = `
 Object {
   "status": true,
   "value": Object {
-    "end": Object {
-      "column": 16,
-      "line": 1,
-      "offset": 15,
-    },
     "name": "valueProp",
-    "start": Object {
-      "column": 1,
-      "line": 1,
-      "offset": 0,
-    },
     "value": Object {
       "left": Object {
         "name": "inputProp",
@@ -994,17 +976,17 @@ Object {
 }
 `;
 
-exports[`interpreter correct target tree {"original": $.foo} | {"new": $} 1`] = `
+exports[`interpreter correct target tree {"foo": [{"bar": "baz"}]} | $.foo[0].bar 1`] = `
 Object {
   "status": true,
   "value": Object {
     "name": "pipe",
     "value": Object {
       "left": Object {
         "end": Object {
-          "column": 20,
+          "column": 26,
           "line": 1,
-          "offset": 19,
+          "offset": 25,
         },
         "name": "object",
         "start": Object {
@@ -1018,20 +1000,128 @@ Object {
             "value": Array [
               Object {
                 "name": "primitive",
-                "value": "\\"original\\"",
+                "value": "\\"foo\\"",
               },
               Object {
                 "end": Object {
-                  "column": 19,
+                  "column": 25,
                   "line": 1,
-                  "offset": 18,
+                  "offset": 24,
                 },
+                "name": "list",
+                "start": Object {
+                  "column": 9,
+                  "line": 1,
+                  "offset": 8,
+                },
+                "value": Array [
+                  Object {
+                    "end": Object {
+                      "column": 24,
+                      "line": 1,
+                      "offset": 23,
+                    },
+                    "name": "object",
+                    "start": Object {
+                      "column": 10,
+                      "line": 1,
+                      "offset": 9,
+                    },
+                    "value": Array [
+                      Object {
+                        "name": "tuple",
+                        "value": Array [
+                          Object {
+                            "name": "primitive",
+                            "value": "\\"bar\\"",
+                          },
+                          Object {
+                            "name": "primitive",
+                            "value": "\\"baz\\"",
+                          },
+                        ],
+                      },
+                    ],
+                  },
+                ],
+              },
+            ],
+          },
+        ],
+      },
+      "right": Object {
+        "name": "valueProp",
+        "value": Object {
+          "left": Object {
+            "name": "projection",
+            "value": Object {
+              "left": Object {
                 "name": "valueProp",
+                "value": Object {
+                  "left": Object {
+                    "name": "input",
+                    "value": "$",
+                  },
+                  "right": ".foo",
+                },
+              },
+              "right": Object {
+                "end": Object {
+                  "column": 37,
+                  "line": 1,
+                  "offset": 36,
+                },
+                "name": "list",
                 "start": Object {
-                  "column": 14,
+                  "column": 34,
                   "line": 1,
-                  "offset": 13,
+                  "offset": 33,
                 },
+                "value": Array [
+                  Object {
+                    "name": "primitive",
+                    "value": "0",
+                  },
+                ],
+              },
+            },
+          },
+          "right": ".bar",
+        },
+      },
+    },
+  },
+}
+`;
+
+exports[`interpreter correct target tree {"original": $.foo} | {"new": $} 1`] = `
+Object {
+  "status": true,
+  "value": Object {
+    "name": "pipe",
+    "value": Object {
+      "left": Object {
+        "end": Object {
+          "column": 20,
+          "line": 1,
+          "offset": 19,
+        },
+        "name": "object",
+        "start": Object {
+          "column": 1,
+          "line": 1,
+          "offset": 0,
+        },
+        "value": Array [
+          Object {
+            "name": "tuple",
+            "value": Array [
+              Object {
+                "name": "primitive",
+                "value": "\\"original\\"",
+              },
+              Object {
+                "name": "valueProp",
                 "value": Object {
                   "left": Object {
                     "name": "input",
@@ -1149,17 +1239,7 @@ Object {
                     "value": "\\"original\\"",
                   },
                   Object {
-                    "end": Object {
-                      "column": 28,
-                      "line": 1,
-                      "offset": 27,
-                    },
                     "name": "valueProp",
-                    "start": Object {
-                      "column": 23,
-                      "line": 1,
-                      "offset": 22,
-                    },
                     "value": Object {
                       "left": Object {
                         "name": "input",
@@ -1217,17 +1297,7 @@ Object {
                     "value": "\\"original\\"",
                   },
                   Object {
-                    "end": Object {
-                      "column": 28,
-                      "line": 1,
-                      "offset": 27,
-                    },
                     "name": "valueProp",
-                    "start": Object {
-                      "column": 23,
-                      "line": 1,
-                      "offset": 22,
-                    },
                     "value": Object {
                       "left": Object {
                         "name": "input",

diff --git a/src/__tests__/interpreter.test.js b/src/__tests__/interpreter.test.js
@@ -154,6 +154,10 @@ const tests = [
   {
     sourceCode: `[0,1,"foo"][1,2][1,1][0]`,
     output: 'foo'
+  },
+  {
+    sourceCode: `{"foo": [{"bar": "baz"}]} | $.foo[0].bar`,
+    output: 'baz'
   }
 ]
 

diff --git a/src/parsers/__tests__/valueProp.test.js b/src/parsers/__tests__/valueProp.test.js
@@ -1,4 +1,4 @@
-import parser from '../valueProp'
+import parser from '../projection'
 
 describe('valueProp parser', () => {
   it('parses .bar.foo', () => {

diff --git a/src/parsers/projectable.js b/src/parsers/projectable.js
@@ -1,9 +1,5 @@
 import P from 'parsimmon'
-import ValuePropParser from './valueProp'
 import ValueParser from './value'
 import ObjectParser from './object'
 
-export default P.alt(
-  ValuePropParser,
-  P.alt(ObjectParser, ValueParser)
-)
+export default P.alt(ObjectParser, ValueParser)
diff --git a/src/parsers/projection.js b/src/parsers/projection.js
@@ -5,32 +5,60 @@ import P from 'parsimmon'
 import type {
   ListNodeType,
   ProjectionNodeType,
+  ValuePropNodeType,
   ProjectableNodeType
 } from '../types'
 
+type WrappedProjectionNodeType =
+  | {name: 'projection', value: ListNodeType}
+  | {name: 'valueProp', value: string};
+
 const unpackOne = (
-  projectable: ProjectableNodeType | ProjectionNodeType,
-  projection: ListNodeType
-): ProjectionNodeType => ({
-  name: 'projection',
-  value: {
-    left: projectable,
-    right: projection
-  }
-})
+  projectable: ProjectableNodeType | ProjectionNodeType | ValuePropNodeType,
+  projection: WrappedProjectionNodeType
+): ProjectionNodeType | ValuePropNodeType | ProjectableNodeType =>
+  projection.name === 'projection'
+    ? {
+      name: 'projection',
+      value: {
+        left: projectable,
+        right: projection.value
+      }
+    }
+    : projection.name === 'valueProp'
+      ? {
+        name: 'valueProp',
+        value: {
+          left: projectable,
+          right: projection.value
+        }
+      }
+      : projectable
 
 const unpack = ([projectable, projections]: [
   ProjectableNodeType,
-  Array<ListNodeType>
-]): ProjectionNodeType | ProjectableNodeType =>
+  Array<WrappedProjectionNodeType>
+]): ProjectionNodeType | ValuePropNodeType | ProjectableNodeType =>
   projections.reduce(unpackOne, projectable)
 
 const ProjectionParser = P.lazy((): mixed => {
   const ProjectableParser = require('./projectable').default
   const ListParser = require('./list').default
+  const PropertyParser = P.regexp(/(\.[$A-Z_][0-9A-Z_$]*)+/i)
   return P.seq(
     ProjectableParser.skip(P.optWhitespace),
-    ListParser.skip(P.optWhitespace).atLeast(1)
+    P.alt(
+      ListParser.map((x: ListNodeType): WrappedProjectionNodeType => ({
+        value: x,
+        name: 'projection'
+      })),
+      PropertyParser.map((x: string): WrappedProjectionNodeType => ({
+        value: x,
+        name: 'valueProp'
+      }))
+    )
+      .skip(P.optWhitespace)
+      .atLeast(1)
   ).map(unpack)
 })
 

diff --git a/src/parsers/valueProp.js b/src/parsers/valueProp.js