feat: add support for nested arrays

gajus · Dec 9, 2018 · 86773fb · 86773fb
1 parent 148a558
commit 86773fb
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 27 deletions.
diff --git a/package.json b/package.json
@@ -10,31 +10,31 @@
     ]
   },
   "dependencies": {
-    "ajv": "^6.5.5",
+    "ajv": "^6.6.1",
     "es6-error": "^4.1.1",
     "nearley": "^2.15.1",
-    "roarr": "^2.11.8"
+    "roarr": "^2.11.9"
   },
   "description": "A declarative function composition and evaluation engine.",
   "devDependencies": {
-    "@babel/cli": "^7.1.5",
-    "@babel/core": "^7.1.6",
-    "@babel/node": "^7.0.0",
-    "@babel/plugin-transform-flow-strip-types": "^7.1.6",
-    "@babel/preset-env": "^7.1.6",
+    "@babel/cli": "^7.2.0",
+    "@babel/core": "^7.2.0",
+    "@babel/node": "^7.2.0",
+    "@babel/plugin-transform-flow-strip-types": "^7.2.0",
+    "@babel/preset-env": "^7.2.0",
     "@babel/register": "^7.0.0",
-    "@babel/types": "^7.1.6",
+    "@babel/types": "^7.2.0",
     "ava": "^1.0.0-rc.2",
     "babel-plugin-istanbul": "^5.1.0",
     "babel-plugin-transform-export-default-name": "^2.0.4",
     "coveralls": "^3.0.2",
-    "eslint": "^5.9.0",
-    "eslint-config-canonical": "^13.0.0",
-    "flow-bin": "^0.86.0",
+    "eslint": "^5.10.0",
+    "eslint-config-canonical": "^15.0.1",
+    "flow-bin": "^0.87.0",
     "flow-copy-source": "^2.0.2",
-    "husky": "^1.1.4",
+    "husky": "^1.2.0",
     "nyc": "^13.1.0",
-    "semantic-release": "^15.12.0",
+    "semantic-release": "^15.12.4",
     "sinon": "^7.1.1"
   },
   "engines": {

diff --git a/src/factories/createQuery.js b/src/factories/createQuery.js
@@ -37,6 +37,12 @@ const createQuery = (denormalizedQuery: DenormalizedQueryType): QueryType => {
           operator: 'PIPELINE'
         });
       }
+    } else if (Array.isArray(maybeExpression)) {
+      const children = createQuery(maybeExpression);
+
+      commands.push({
+        margeChildren: children
+      });
     } else {
       const adoption = maybeExpression;
 
@@ -49,7 +55,7 @@ const createQuery = (denormalizedQuery: DenormalizedQueryType): QueryType => {
       }
 
       commands.push({
-        children
+        namedChildren: children
       });
     }
   }

diff --git a/src/index.js b/src/index.js
@@ -38,18 +38,26 @@ const play = (instructions, startValue, subroutines, bindle: Object, handleResul
 
     const nextOperator: OperatorType | null = instructions[index] && instructions[index].operator || null;
 
-    if (instruction.children) {
+    if (instruction.namedChildren) {
       const children = {};
 
-      const childrenNames = Object.keys(instruction.children);
+      const childrenNames = Object.keys(instruction.namedChildren);
 
       for (const childName of childrenNames) {
-        children[childName] = play(instruction.children[childName], result, subroutines, bindle, handleResult);
+        children[childName] = play(instruction.namedChildren[childName], result, subroutines, bindle, handleResult);
       }
 
       const remainingInstructions = instructions.slice(index);
 
-      return play(remainingInstructions, children['0'] ? children['0'] : children, subroutines, bindle, handleResult);
+      return play(remainingInstructions, children, subroutines, bindle, handleResult);
+    } else if (instruction.margeChildren) {
+      let value = result;
+
+      value = play(instruction.margeChildren, value, subroutines, bindle, handleResult);
+
+      const remainingInstructions = instructions.slice(index);
+
+      return play(remainingInstructions, value, subroutines, bindle, handleResult);
     }
 
     const lastResult = result;

diff --git a/src/types.js b/src/types.js
@@ -12,8 +12,8 @@ export type OperatorType = 'PIPELINE' | 'AGGREGATE_PIPELINE';
 
 export type DenormalizedQueryType =
   QueryInstructionType |
-  $ReadOnlyArray<QueryInstructionType | QueryChildrenType> |
-  QueryChildrenType;
+  QueryChildrenType |
+  $ReadOnlyArray<DenormalizedQueryType>;
 
 export type SubroutineInstructionType = {|
   +subroutine: string,
@@ -24,14 +24,19 @@ export type OperatorInstructionType = {|
   +operator: OperatorType
 |};
 
-export type AdoptionInstructionType = {|
-  +children: {
+export type MergeAdoptionInstructionType = {|
+  +margeChildren: QueryType
+|};
+
+export type NamedAdoptionInstructionType = {|
+  +namedChildren: {
     +[key: string]: QueryType
   }
 |};
 
 export type InstructionType =
-  AdoptionInstructionType |
+  MergeAdoptionInstructionType |
+  NamedAdoptionInstructionType |
   SubroutineInstructionType |
   OperatorInstructionType;
 

diff --git a/test/pianola/factories/createQuery.js b/test/pianola/factories/createQuery.js
@@ -92,7 +92,7 @@ test('converts simple object command into "adopt" subroutine (string expression)
       operator: 'PIPELINE'
     },
     {
-      children: {
+      namedChildren: {
         baz: [
           {
             subroutine: 'baz0',
@@ -140,7 +140,7 @@ test('converts simple object command into "adopt" subroutine (string expression)
       operator: 'PIPELINE'
     },
     {
-      children: {
+      namedChildren: {
         baz: [
           {
             subroutine: 'baz',
@@ -149,7 +149,7 @@ test('converts simple object command into "adopt" subroutine (string expression)
         ],
         qux: [
           {
-            children: {
+            namedChildren: {
               quux: [
                 {
                   subroutine: 'quux',
@@ -196,7 +196,7 @@ test('converts simple object command into "adopt" subroutine (array expression)'
       operator: 'PIPELINE'
     },
     {
-      children: {
+      namedChildren: {
         baz: [
           {
             subroutine: 'baz0',