1 files changed, 7 insertions, 11 deletions
diff --git a/src/flatmatter.ts b/src/flatmatter.ts
index f152400..fc14699 100644
--- a/src/flatmatter.ts
+++ b/src/flatmatter.ts
@@ -138,13 +138,9 @@ export default class FlatMatter {
      * @returns {boolean}
      */
     private isPipedValue(value: string): boolean {
-        for (const part of this.composePipedValueParts(value)) {
-            if (!this.isSimpleValue(part) && !this.isFunctionValue(part)) {
-                return false;
-            }
-        }
-
-        return true;
+        return this.composePipedValueParts(value).every(part => {
+            return this.isSimpleValue(part) || this.isFunctionValue(part)
+        });
     }
 
     /**
@@ -188,12 +184,12 @@ export default class FlatMatter {
             return value === "true";
         }
 
-        if (!Number.isNaN(parseFloat(value))) {
-            return parseFloat(value);
+        if (!Number.isNaN(parseInt(value)) && value.indexOf('.') === -1) {
+            return parseInt(value);
         }
 
-        if (!Number.isNaN(parseInt(value))) {
-            return parseInt(value);
+        if (!Number.isNaN(parseFloat(value)) && value.indexOf('.') !== -1) {
+            return parseFloat(value);
         }
 
         return trimChar(value, '"');