fix(boolean,integer): Support integer and boolean values (#26)

* fix(integer): Support integer values

* fix(boolean): also fix booleans

example/env.yml

@@ -7,6 +7,9 @@ default_env: &default_env
     value: ${cred:IDSFJKLJ}
     optional: true
   TEST: ${poop:hello}
+  INTEGER_VALUE: 3000
+  BOOLEAN_TRUE_VALUE: true
+  BOOLEAN_FALSE_VALUE: false
 
 sandbox:
   <<: *default_env

src/inputParser.ts

@@ -14,7 +14,7 @@ export function parse(contents: string, stage?: string): InputDocument {
   const keys = Object.keys(document);
   for (const key of keys) {
     const value = document[key];
-    if (typeof value === 'string') {
+    if (typeof value === 'string' || typeof value === 'number' || typeof value === 'boolean') {
       result[key] = { value: value };
     } else if (value.optional && value.value) {
       result[key] = {

src/rewriter.ts

@@ -1,4 +1,4 @@
-import { Document, InputDocument, Config } from './types';
+import { Document, InputDocument, Config, Primitive } from './types';
 
 export class Rewriter {
   constructor(private config: Config) { }
@@ -13,17 +13,21 @@ export class Rewriter {
     return result;
   }
 
-  private async rewriteValue(value: string): Promise<string> {
-    const regex = new RegExp('\\${([a-z]+):(.*)}');
-    const results = value.match(regex);
-    const resolverName = results && results[1];
-    const innerValue = results ? results[2] : value;
-    const resolver = this.getResolver(resolverName);
-    if (!resolver) {
-      throw new Error(`Could not locate resolver for value ${value}`);
+  private async rewriteValue(value: Primitive): Promise<Primitive> {
+    if (typeof value === 'string') {
+      const regex = new RegExp('\\${([a-z]+):(.*)}');
+      const results = value.match(regex);
+      const resolverName = results && results[1];
+      const innerValue = results ? results[2] : value;
+      const resolver = this.getResolver(resolverName);
+      if (!resolver) {
+        throw new Error(`Could not locate resolver for value ${value}`);
+      }
+      const result = await resolver(innerValue, this.config);
+      return result;
+    } else {
+      return value;
     }
-    const result = await resolver(innerValue, this.config);
-    return result;
   }
 
   private getResolver(name: string) {

src/types.ts

@@ -2,11 +2,13 @@ export type ResolverFunction = (arg: string, config: Config) => Promise<string>;
 export type ResolverMap = {
   [name: string]: ResolverFunction
 };
-export type Document = { [name: string]: string }
+
+export type Primitive = string | number | boolean;
+export type Document = { [name: string]: Primitive }
 
 export class InputDocument {
   [name: string]: {
-    value: string;
+    value: Primitive;
     optional?: boolean
   }
 }

src/utils.ts

@@ -3,11 +3,11 @@ import * as fs from 'fs';
 import { Document, InputDocument, Config } from './types';
 import { resolvers } from './resolvers';
 
-export function writeFile(document: { [name: string]: string }) {
+export function writeFile(document: Document) {
   let output = '';
   const keys = Object.keys(document);
   for (const key of keys) {
-    if (document[key]) {
+    if (document[key] !== undefined) {
       output += `${key}=${document[key]}\n`;
     }
   }
@@ -20,7 +20,7 @@ export function validateOutput(input: InputDocument, output: Document): string[]
   const keys = Object.keys(input);
   for (const key of keys) {
     if (!input[key].optional) {
-      if (!(key in output) || !(output[key])) {
+      if (!(key in output) || output[key] === undefined) {
         errors.push(`${key} is a required variable but is not specified in result`);
       }
     }