Cherry-pick ES6 targeting and big-integer addition to master

libraries/adaptive-expressions/package.json

@@ -26,6 +26,7 @@
     "@types/xmldom": "^0.1.29",
     "antlr4ts": "0.5.0-alpha.1",
     "atob": "^2.1.2",
+    "big-integer": "^1.6.48",
     "jspath": "^0.4.0",
     "lodash": "^4.17.15",
     "lru-cache": "^5.1.1",

libraries/adaptive-expressions/src/expressionFunctions.ts

@@ -20,6 +20,7 @@ import {convertCSharpDateTimeToMomentJS} from './datetimeFormatConverter';
 import {MemoryInterface, SimpleObjectMemory, StackedMemory} from './memory';
 import {Options} from './options';
 import atob = require('atob');
+import bigInt = require('big-integer')
 
 /**
  * Verify the result of an expression is of the appropriate type and return a string if not.
@@ -52,12 +53,12 @@ export class ExpressionFunctions {
     /**
      * constant of converting unix timestamp to ticks
      */
-    public static readonly UnixMilliSecondToTicksConstant: bigint = 621355968000000000n;
+    public static readonly UnixMilliSecondToTicksConstant: bigInt.BigInteger = bigInt('621355968000000000');
 
     /**
      * Constant to convert between ticks and ms.
      */
-    public static readonly MillisecondToTick: bigint = 10000n;
+    public static readonly MillisecondToTickConstant: bigInt.BigInteger = bigInt('10000');
 
     /**
      * Read only Dictionary of built in functions.
@@ -1693,12 +1694,12 @@ export class ExpressionFunctions {
 
     private static ticks(timeStamp: string): {value: any; error: string} {
         let parsed: any;
-        let result: BigInt;
+        let result: any;
         let error: string;
         ({value: parsed, error} = ExpressionFunctions.parseTimestamp(timeStamp));
         if (!error) {
             const unixMilliSec: number = parseInt(parsed.format('x'), 10);
-            result = this.UnixMilliSecondToTicksConstant + BigInt(unixMilliSec) * this.MillisecondToTick;
+            result = this.UnixMilliSecondToTicksConstant.add(bigInt(unixMilliSec).times(this.MillisecondToTickConstant));
         }
 
         return {value: result, error};
@@ -2508,13 +2509,16 @@ export class ExpressionFunctions {
                         let error: string;
                         let arg: any = args[0];
                         if (typeof arg === 'number') {
-                            arg = BigInt(arg)
+                            arg = bigInt(arg);
+                        }
+                        if (typeof arg === 'string') {
+                            arg = bigInt(arg);
                         }
-                        if (typeof arg !== 'bigint') {
-                            error = `formatTicks first argument ${arg} is not a number`;
+                        if (!bigInt.isInstance(arg)) {
+                            error = `formatTicks first argument ${arg} is not a number, numeric string or bigInt`;
                         } else {
                             // Convert to ms
-                            arg = Number((arg - this.UnixMilliSecondToTicksConstant) / this.MillisecondToTick);
+                            arg = ((arg.subtract(this.UnixMilliSecondToTicksConstant)).divide(this.MillisecondToTickConstant)).toJSNumber();
                         }
 
                         let value: any;

libraries/adaptive-expressions/tests/expressionParser.test.js

@@ -4,6 +4,7 @@ const {Expression, SimpleObjectMemory, ExpressionFunctions, Options} = require('
 var {TimexProperty} = require('@microsoft/recognizers-text-data-types-timex-expression');
 const assert = require('assert');
 const moment = require('moment');
+const bigInt = require('big-integer')
 
 const one = ['one'];
 const oneTwo = ['one', 'two'];
@@ -506,7 +507,7 @@ const dataSource = [
     ['startOfDay(\'2018-03-15T13:30:30.000Z\')', '2018-03-15T00:00:00.000+00:00'],
     ['startOfHour(\'2018-03-15T13:30:30.000Z\')', '2018-03-15T13:00:00.000+00:00'],
     ['startOfMonth(\'2018-03-15T13:30:30.000Z\')', '2018-03-01T00:00:00.000+00:00'],
-    ['ticks(\'2018-01-01T08:00:00.000Z\')', 636503904000000000],
+    ['ticks(\'2018-01-01T08:00:00.000Z\')', bigInt('636503904000000000')],
 
     //URI parsing functions tests
     ['uriHost(\'https://www.localhost.com:8080\')', 'www.localhost.com'],
@@ -728,7 +729,7 @@ const scope = {
     timestampObj: new Date('2018-03-15T13:00:00.000Z'),
     unixTimestamp: 1521118800,
     unixTimestampFraction: 1521118800.5,
-    ticks: BigInt(637243624200000000),
+    ticks: bigInt('637243624200000000'),
     user:
     {
         income: 110.0,
@@ -914,8 +915,9 @@ var assertObjectEquals = (actual, expected) => {
         for (let i = 0; i < actual.length; i++) {
             assertObjectEquals(actual[i], expected[i], `actual is: ${actual[i]}, expected is ${expected[i]}`);
         }
+    } else if (bigInt.isInstance(actual) && bigInt.isInstance(expected)) {
+        assert(actual.equals(expected), `actual is: ${actual}, expected is ${expected}`);
     }
-
     else {
         assert.equal(actual, expected, `actual is: ${actual}, expected is ${expected}`);
     }

libraries/adaptive-expressions/tsconfig.json

@@ -1,10 +1,11 @@
 {
     "compilerOptions": {
-      "target": "ESNext",
+      "target": "es6",
       "lib": ["es2015", "dom"],
       "module": "commonjs",
       "declaration": true,
       "declarationMap": true,
+      "downlevelIteration": true,
       "sourceMap": true,
       "esModuleInterop": true,
       "outDir": "./lib",

libraries/botbuilder-dialogs-adaptive-tests/tsconfig.json

@@ -1,6 +1,7 @@
 {
   "compilerOptions": {
-    "target": "ESNext",
+    "target": "es6",
+    "lib": ["es2015", "dom"],
     "module": "commonjs",
     "declaration": true,
     "sourceMap": true,

libraries/botbuilder-dialogs-adaptive/package.json

@@ -45,7 +45,7 @@
     "ts-node": "^4.1.0"
   },
   "scripts": {
-    "test": "tsc && tsc tests/*.ts && nyc mocha tests/",
+    "test": "tsc && tsc ./tests/expressionProperty.test.ts && nyc mocha tests/",
     "build": "tsc",
     "build-docs": "typedoc --theme markdown --entryPoint botbuilder-dialogs-adaptive --excludePrivate --includeDeclarations --ignoreCompilerErrors --module amd --out ..\\..\\doc\\botbuilder-dialogs .\\lib\\index.d.ts --hideGenerator --name \"Bot Builder SDK - Dialogs\" --readme none",
     "clean": "erase /q /s .\\lib",

libraries/botbuilder-dialogs-adaptive/tsconfig.json

@@ -1,13 +1,13 @@
 {
   "compilerOptions": {
-    "target": "ESNext",
+    "target": "es6",
+    "lib": ["es2015", "dom"],
     "module": "commonjs",
     "declaration": true,
     "sourceMap": true,
     "outDir": "./lib",
     "rootDir": "./src",
-    "types" : ["node"],
-    "lib": ["es2020.string"]
+    "types" : ["node"]
   },
   "include": [
     "src/**/*"

libraries/botbuilder-dialogs-declarative/tsconfig.json

@@ -1,6 +1,7 @@
 {
   "compilerOptions": {
-    "target": "ESNext",
+    "target": "es6",
+    "lib": ["es2015", "dom"],
     "module": "commonjs",
     "declaration": true,
     "sourceMap": true,