feat(tag): Generate assertion for Object Type Application (#17)

* fix(npm): make build script cross-platform * feat(generator): generate assertion for Object Type Application
azu · Jan 18, 2017 · 1a0625b · 1a0625b
1 parent dc27e1e
commit 1a0625b
Show file tree

Hide file tree

Showing 4 changed files with 117 additions and 91 deletions.
diff --git a/package.json b/package.json
@@ -22,7 +22,7 @@
     "test": "test"
   },
   "scripts": {
-    "build": "NODE_ENV=production babel src --out-dir lib --source-maps",
+    "build": "cross-env NODE_ENV=production babel src --out-dir lib --source-maps",
     "watch": "babel src --out-dir lib --watch --source-maps",
     "prepublish": "npm run --if-present build",
     "test": "mocha"
@@ -44,6 +44,7 @@
     "babel-traverse": "^6.7.3",
     "babel-types": "^6.7.2",
     "babylon": "^6.7.0",
+    "cross-env": "^3.1.4",
     "escodegen": "^1.8.0",
     "esprima": "^3.1.1",
     "estraverse": "^4.2.0",

diff --git a/src/AssertGenerator.js b/src/AssertGenerator.js
@@ -88,29 +88,32 @@ export default class AssertGenerator {
         }, typeNode);
         const generator = new Generator(node);
         const tagType = typeNode.type.type;
-        if (tagType === "NameExpression") {
-            return NameExpression(node, generator);
-        } else if (tagType === "AllLiteral") {
-            return AllLiteral(node, generator);
-        } else if (tagType === "FunctionType") {
-            return FunctionType(node, generator);
-        } else if (tagType === "RecordType") {
-            return RecordType(node, generator);
-        } else if (tagType === "UnionType") {
-            return UnionType(node, generator);
-        } else if (tagType === "TypeApplication") {
-            return TypeApplication(node, generator);
-        } else if (tagType === "RestType") {
-            return RestType(node, generator);
-        } else if (tagType === "NullableType") {
-            return NullableType(node, generator);
-        } else if (tagType === "NonNullableType") {
-            return NonNullableType(node, generator);
+        switch (tagType) {
+            case "NameExpression":
+                return NameExpression(node, generator);
+            case "AllLiteral":
+                return AllLiteral(node, generator);
+            case "FunctionType":
+                return FunctionType(node, generator);
+            case "RecordType":
+                return RecordType(node, generator);
+            case "UnionType":
+                return UnionType(node, generator);
+            case "TypeApplication":
+                return TypeApplication(node, generator);
+            case "RestType":
+                return RestType(node, generator);
+            case "NullableType":
+                return NullableType(node, generator);
+            case "NonNullableType":
+                return NonNullableType(node, generator);
+            default:
+                return;
         }
     }
 
     /**
-     * @param tagNode tagNode is defined by doctorin
+     * @param tagNode tagNode is defined by doctrine
      * @param {CodeGenerator} Generator
      * @return {string|undefined} return assertion code string
      * Reference https://esdoc.org/tags.html#type-syntax
@@ -128,24 +131,27 @@ export default class AssertGenerator {
         }
         const generator = new Generator(tagNode);
         const tagType = tagNode.type.type;
-        if (tagType === "NameExpression") {
-            return NameExpression(tagNode, generator);
-        } else if (tagType === "AllLiteral") {
-            return AllLiteral(tagNode, generator);
-        } else if (tagType === "FunctionType") {
-            return FunctionType(tagNode, generator);
-        } else if (tagType === "RecordType") {
-            return RecordType(tagNode, generator);
-        } else if (tagType === "UnionType") {
-            return UnionType(tagNode, generator);
-        } else if (tagType === "TypeApplication") {
-            return TypeApplication(tagNode, generator);
-        } else if (tagType === "RestType") {
-            return RestType(tagNode, generator);
-        } else if (tagType === "NullableType") {
-            return NullableType(tagNode, generator);
-        } else if (tagType === "NonNullableType") {
-            return NonNullableType(tagNode, generator);
+        switch (tagType) {
+            case "NameExpression":
+                return NameExpression(tagNode, generator);
+            case "AllLiteral":
+                return AllLiteral(tagNode, generator);
+            case "FunctionType":
+                return FunctionType(tagNode, generator);
+            case "RecordType":
+                return RecordType(tagNode, generator);
+            case "UnionType":
+                return UnionType(tagNode, generator);
+            case "TypeApplication":
+                return TypeApplication(tagNode, generator);
+            case "RestType":
+                return RestType(tagNode, generator);
+            case "NullableType":
+                return NullableType(tagNode, generator);
+            case "NonNullableType":
+                return NonNullableType(tagNode, generator);
+            default:
+                return;
         }
     }
-};
+}
diff --git a/src/tag/TypeApplication.js b/src/tag/TypeApplication.js
@@ -2,6 +2,7 @@
 "use strict";
 import {Expression} from "./Expression";
 // @param {Array.<string>}
+// @param {Object<string,number>}
 /**
  * @return {string|undefined}
  */
@@ -25,5 +26,12 @@ export function TypeApplication(tag, CodeGenerator) {
         } else {
             return CodeGenerator.assert(`Array.isArray(${tag.name})`);
         }
+    } else if (expectedType === "Object") {
+        const applications = tag.type.applications;
+        if (applications && applications.length === 2) {
+            const expression = Expression(`${tag.name}`, {name: "object"});
+            const itemExpression = Expression(`${tag.name}[key]`, applications[1]);
+            return CodeGenerator.assert(`${expression} && Object.keys(${tag.name}).every(function(key) { return (${itemExpression}); })`);
+        }
     }
 }