removed not retired functions and added enhanced parse date function

ppaska · ppaska · commit f41feca7c732 · 2019-11-30T21:42:37.000Z
diff --git a/src/eval/common.ts b/src/eval/common.ts
@@ -52,4 +52,75 @@ export function sliceBlock(instuctionLines: CodeLine[], start: number): CodeLine
         .findIndex((cl, i) => i > start && getLineIndent(cl.line) < blockLineIndent)
 
     return instuctionLines.slice(start, blockEndIndex > 0 ? blockEndIndex : undefined)
-}
+}
+
+export function parseDatetimeOrNull(value: string | Date): Date | null {
+    if (!value) { return null; }
+    if (value instanceof Date && !isNaN(value.valueOf())) { return value; }
+    // only string values can be converted to Date
+    if (typeof value !== 'string') { return null; }
+  
+    const strValue = String(value);
+    if (!strValue.length) { return null; }
+  
+    const parseMonth = (mm: string): number => {
+      if (!mm || !mm.length) {
+        return NaN;
+      }
+  
+      const m = parseInt(mm, 10);
+      if (!isNaN(m)) {
+        return m - 1;
+      }
+  
+      // make sure english months are coming through
+      if (mm.startsWith('jan')) { return 0; }
+      if (mm.startsWith('feb')) { return 1; }
+      if (mm.startsWith('mar')) { return 2; }
+      if (mm.startsWith('apr')) { return 3; }
+      if (mm.startsWith('may')) { return 4; }
+      if (mm.startsWith('jun')) { return 5; }
+      if (mm.startsWith('jul')) { return 6; }
+      if (mm.startsWith('aug')) { return 7; }
+      if (mm.startsWith('sep')) { return 8; }
+      if (mm.startsWith('oct')) { return 9; }
+      if (mm.startsWith('nov')) { return 10; }
+      if (mm.startsWith('dec')) { return 11; }
+  
+      return NaN;
+    };
+  
+    const correctYear = (yy: number) => {
+      if (yy < 100) {
+        return yy < 68 ? yy + 2000 : yy + 1900;
+      } else {
+        return yy;
+      }
+    };
+  
+    const validDateOrNull =
+      (yyyy: number, month: number, day: number, hours: number, mins: number, ss: number): Date | null => {
+        if (month > 11 || day > 31 || hours >= 60 || mins >= 60 || ss >= 60) { return null; }
+  
+        const dd = new Date(yyyy, month, day, hours, mins, ss, 0);
+        return !isNaN(dd.valueOf()) ? dd : null;
+      };
+  
+    const strTokens = strValue.replace('T', ' ').toLowerCase().split(/[: /-]/);
+    const dt = strTokens.map(parseFloat);
+  
+    // try ISO first
+    let d = validDateOrNull(dt[0], dt[1] - 1, dt[2], dt[3] || 0, dt[4] || 0, dt[5] || 0);
+    if (d) { return d; }
+  
+    // then UK
+    d = validDateOrNull(correctYear(dt[2]), parseMonth(strTokens[1]), dt[0], dt[3] || 0, dt[4] || 0, dt[5] || 0);
+    if (d) { return d; }
+  
+    // then US
+    d = validDateOrNull(correctYear(dt[2]), parseMonth(strTokens[0]), correctYear(dt[1]), dt[3] || 0, dt[4] || 0, dt[5] || 0);
+    if (d) { return d; }
+  
+    return null;
+  }
+  
diff --git a/src/interpreter.ts b/src/interpreter.ts
@@ -1,7 +1,7 @@
 import { Tokenizer, CodeLine, PackageToImport } from './tokenizer';
 import {
     BlockContext, AnyFunc,
-    EvalCodeBlock, EvalInstruction, EvalExpression, getLineIndent, sliceBlock
+    EvalCodeBlock, EvalInstruction, EvalExpression, getLineIndent, sliceBlock, parseDatetimeOrNull
 } from './eval/index';
 
 export { PackageToImport } from './tokenizer';
@@ -18,17 +18,16 @@ function range(start: number, stop: number = NaN, step: number = 1): number[] {
     }
     return arr;
 }
-// methods like: AND, OR are temporary until we have () support
-// setPropertValue, getPropertValue should be replaced with native way e.g. obj[name] = 22
+
 const INITIAL_SCOPE = {
-    dateTime: (d: number | string | any = null) => d ? new Date(d) : new Date(),
+    dateTime: (str: number | string | any = null) => (str && str.length)
+        ? parseDatetimeOrNull(str) || new Date() : new Date(),
     range: range,
     print: (...args: any[]) => { console.log(...args); return args.length > 0 ? args[0] : null; },
     isNull: (v: any, defValue: any = null): boolean | any => defValue === null ? v === null : v || defValue,
+
     AND: (...args: boolean[]): boolean => !(args || []).filter(r => !r).length,
     OR: (...args: boolean[]): boolean => !!(args || []).filter(r => r).length,
-    setPropertValue: (obj: any, propName: string, value: any | null) => obj[propName] = value,
-    getPropertValue: (obj: any, propName: string): any | null => obj[propName],
     deleteProperty: (obj: any, propName: string): boolean => delete obj[propName],
     Math: Math,
     Object: Object,
