Migrate expression namespace to adaptive-expressions

lerna.json

@@ -9,7 +9,7 @@
     "libraries/botbuilder-dialogs",
     "libraries/botbuilder-testing",
     "libraries/botbuilder-lg",
-    "libraries/botframework-expressions",
+    "libraries/adaptive-expressions",
     "libraries/botframework-config",
     "libraries/botframework-connector",
     "libraries/botframework-schema",

libraries/botframework-expressions/package.json → libraries/adaptive-expressions/package.json

@@ -1,5 +1,5 @@
 {
-  "name": "botframework-expressions",
+  "name": "adaptive-expressions",
   "author": "Microsoft Corp.",
   "description": "Common Expression Language",
   "version": "4.1.6",
@@ -42,7 +42,7 @@
     "build": "tsc",
     "test": "tsc && nyc mocha tests/ --timeout 60000",
     "clean": "erase /q /s .\\lib",
-    "build-docs": "typedoc --theme markdown --entryPoint botframework-expressions --excludePrivate --includeDeclarations --ignoreCompilerErrors --module amd --out ..\\..\\doc\\botframework-expressions .\\lib\\index.d.ts --hideGenerator --name \"Bot Builder SDK - Expression\" --readme none",
+    "build-docs": "typedoc --theme markdown --entryPoint adaptive-expressions --excludePrivate --includeDeclarations --ignoreCompilerErrors --module amd --out ..\\..\\doc\\adaptive-expressions .\\lib\\index.d.ts --hideGenerator --name \"Bot Builder SDK - Expression\" --readme none",
     "set-version": "npm version --allow-same-version ${Version}"
   },
   "files": [

libraries/botframework-expressions/src/builtInFunction.ts → libraries/adaptive-expressions/src/builtInFunction.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/commonRegex.ts → libraries/adaptive-expressions/src/commonRegex.ts

@@ -1,5 +1,5 @@
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/constant.ts → libraries/adaptive-expressions/src/constant.ts

@@ -1,5 +1,5 @@
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/expression.ts → libraries/adaptive-expressions/src/expression.ts

@@ -1,5 +1,5 @@
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/expressionEvaluator.ts → libraries/adaptive-expressions/src/expressionEvaluator.ts

@@ -1,5 +1,5 @@
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/expressionParser.ts → libraries/adaptive-expressions/src/expressionParser.ts

@@ -1,5 +1,5 @@
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/expressionType.ts → libraries/adaptive-expressions/src/expressionType.ts

@@ -1,5 +1,5 @@
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/extensions.ts → libraries/adaptive-expressions/src/extensions.ts

@@ -1,5 +1,5 @@
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/formatConverter.ts → libraries/adaptive-expressions/src/formatConverter.ts

@@ -1,6 +1,6 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/generated/CommonRegexLexer.ts → libraries/adaptive-expressions/src/generated/CommonRegexLexer.ts

@@ -1,5 +1,5 @@
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/generated/CommonRegexListener.ts → libraries/adaptive-expressions/src/generated/CommonRegexListener.ts

@@ -1,5 +1,5 @@
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/generated/CommonRegexParser.ts → libraries/adaptive-expressions/src/generated/CommonRegexParser.ts

@@ -1,5 +1,5 @@
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/generated/CommonRegexVisitor.ts → libraries/adaptive-expressions/src/generated/CommonRegexVisitor.ts

@@ -1,5 +1,5 @@
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/generated/index.ts → libraries/adaptive-expressions/src/generated/index.ts

@@ -1,6 +1,6 @@
 
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/index.ts → libraries/adaptive-expressions/src/index.ts

@@ -1,5 +1,5 @@
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/memory/composedMemory.ts → libraries/adaptive-expressions/src/memory/composedMemory.ts

@@ -2,7 +2,7 @@
 import { MemoryInterface } from './memoryInterface';
 
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/memory/index.ts → libraries/adaptive-expressions/src/memory/index.ts

@@ -1,6 +1,6 @@
 
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/memory/memoryInterface.ts → libraries/adaptive-expressions/src/memory/memoryInterface.ts

@@ -1,6 +1,6 @@
 
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/memory/simpleObjectMemory.ts → libraries/adaptive-expressions/src/memory/simpleObjectMemory.ts

@@ -2,7 +2,7 @@ import { MemoryInterface } from './memoryInterface';
 import { Extensions } from '../extensions';
 
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/memory/stackedMemory.ts → libraries/adaptive-expressions/src/memory/stackedMemory.ts

@@ -2,7 +2,7 @@
 import { MemoryInterface } from './memoryInterface';
 
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/parser/expressionEngine.ts → libraries/adaptive-expressions/src/parser/expressionEngine.ts

@@ -1,6 +1,6 @@
 
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/parser/generated/ExpressionLexer.ts → libraries/adaptive-expressions/src/parser/generated/ExpressionLexer.ts

@@ -1,5 +1,5 @@
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/parser/generated/ExpressionListener.ts → libraries/adaptive-expressions/src/parser/generated/ExpressionListener.ts

@@ -1,5 +1,5 @@
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/parser/generated/ExpressionParser.ts → libraries/adaptive-expressions/src/parser/generated/ExpressionParser.ts

@@ -1,5 +1,5 @@
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/parser/generated/ExpressionVisitor.ts → libraries/adaptive-expressions/src/parser/generated/ExpressionVisitor.ts

@@ -1,5 +1,5 @@
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/parser/generated/index.ts → libraries/adaptive-expressions/src/parser/generated/index.ts

@@ -1,6 +1,6 @@
 
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/parser/index.ts → libraries/adaptive-expressions/src/parser/index.ts

@@ -1,6 +1,6 @@
 
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/parser/parseErrorListener.ts → libraries/adaptive-expressions/src/parser/parseErrorListener.ts

@@ -1,5 +1,5 @@
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/parser/util.ts → libraries/adaptive-expressions/src/parser/util.ts

@@ -1,6 +1,6 @@
 
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botframework-expressions/src/timeZoneConverter.ts → libraries/adaptive-expressions/src/timeZoneConverter.ts

@@ -1,5 +1,5 @@
 /**
- * @module botframework-expressions
+ * @module adaptive-expressions
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.

libraries/botbuilder-lg/package.json

@@ -20,7 +20,7 @@
   "typings": "./lib/index.d.ts",
   "dependencies": {
     "antlr4ts": "0.5.0-alpha.1",
-    "botframework-expressions": "4.1.6",
+    "adaptive-expressions": "4.1.6",
     "lodash": "^4.17.11",
     "uuid": "^3.3.3",
     "botbuilder-core": "4.1.6"

libraries/botbuilder-lg/src/analyzer.ts

@@ -8,7 +8,7 @@
  */
 // tslint:disable-next-line: no-submodule-imports
 import { AbstractParseTreeVisitor, TerminalNode } from 'antlr4ts/tree';
-import { Expression, ExpressionEngine, ExpressionParserInterface, Extensions } from 'botframework-expressions';
+import { Expression, ExpressionEngine, ExpressionParserInterface, Extensions } from 'adaptive-expressions';
 import { keyBy } from 'lodash';
 import { EvaluationTarget } from './evaluationTarget';
 import { Evaluator } from './evaluator';

libraries/botbuilder-lg/src/customizedMemory.ts

@@ -1,12 +1,12 @@
 /**
- * @module botframework-expressions
+ * @module botbuilder-lg
  */
 /**
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
 
-import { MemoryInterface, SimpleObjectMemory } from 'botframework-expressions';
+import { MemoryInterface, SimpleObjectMemory } from 'adaptive-expressions';
 
 export class CustomizedMemory implements MemoryInterface {
 

libraries/botbuilder-lg/src/evaluator.ts

@@ -8,11 +8,10 @@
  */
 // tslint:disable-next-line: no-submodule-imports
 import { AbstractParseTreeVisitor, TerminalNode } from 'antlr4ts/tree';
-import { BuiltInFunctions, Constant, EvaluatorLookup, Expression, ExpressionEngine, ExpressionEvaluator, ExpressionType, ReturnType } from 'botframework-expressions';
+import { BuiltInFunctions, Constant, EvaluatorLookup, Expression, ExpressionEngine, ExpressionEvaluator, ExpressionType, ReturnType, SimpleObjectMemory } from 'adaptive-expressions';
 import { keyBy } from 'lodash';
 import { CustomizedMemory } from './customizedMemory';
 import { EvaluationTarget } from './evaluationTarget';
-import { SimpleObjectMemory } from 'botframework-expressions';
 import * as lp from './generated/LGFileParser';
 import { LGFileParserVisitor } from './generated/LGFileParserVisitor';
 import { LGTemplate } from './lgTemplate';

libraries/botbuilder-lg/src/expander.ts

@@ -8,7 +8,7 @@
  */
 // tslint:disable-next-line: no-submodule-imports
 import { AbstractParseTreeVisitor, TerminalNode } from 'antlr4ts/tree';
-import { BuiltInFunctions, EvaluatorLookup, Expression, ExpressionEngine, ExpressionEvaluator, ReturnType } from 'botframework-expressions';
+import { BuiltInFunctions, EvaluatorLookup, Expression, ExpressionEngine, ExpressionEvaluator, ReturnType } from 'adaptive-expressions';
 import { keyBy } from 'lodash';
 import { v4 as uuid } from 'uuid';
 import { EvaluationTarget } from './evaluationTarget';

libraries/botbuilder-lg/src/mslgTool.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-import { ExpressionEngine } from 'botframework-expressions';
+import { ExpressionEngine } from 'adaptive-expressions';
 import { Analyzer } from './analyzer';
 import { Diagnostic } from './diagnostic';
 import { Expander } from './expander';

libraries/botbuilder-lg/src/staticChecker.ts

@@ -8,7 +8,7 @@
 // tslint:disable-next-line: no-submodule-imports
 import { ParserRuleContext } from 'antlr4ts';
 import { AbstractParseTreeVisitor, TerminalNode } from 'antlr4ts/tree';
-import { ExpressionEngine, ExpressionParserInterface } from 'botframework-expressions';
+import { ExpressionEngine, ExpressionParserInterface } from 'adaptive-expressions';
 import * as fs from 'fs';
 import { keyBy } from 'lodash';
 import * as path from 'path';

libraries/botbuilder-lg/src/templateEngine.ts

@@ -5,7 +5,7 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-import { ExpressionEngine, MemoryInterface} from 'botframework-expressions';
+import { ExpressionEngine, MemoryInterface} from 'adaptive-expressions';
 import * as fs from 'fs';
 import * as path from 'path';
 import { Analyzer, AnalyzerResult } from './analyzer';

libraries/botbuilder-lg/tests/lg.test.js

@@ -1,5 +1,5 @@
 const { TemplateEngine, LGParser } = require('../');
-const { SimpleObjectMemory } = require('botframework-expressions');
+const { SimpleObjectMemory } = require('adaptive-expressions');
 const assert = require('assert');
 const fs = require('fs');
 

package.json

@@ -14,7 +14,7 @@
     "build-docs": "lerna run build-docs",
     "eslint": "eslint  ./libraries/*/src/*.ts ./libraries/*/src/**/*.ts",
     "eslint-fix": "eslint  ./libraries/*/src/*.ts ./libraries/*/src/**/*.ts --fix",
-    "set-dependency-versions": "node tools/util/updateDependenciesInPackageJsons.js ./libraries ${Version} ${PreviewPackageVersion} botframework-expressions botbuilder-lg botframework-streaming botbuilder botbuilder-ai botbuilder-dialogs botbuilder-core botbuilder-applicationinsights botbuilder-testing botframework-connector botframework-config botframework-schema testbot && node tools/util/updateDependenciesInPackageJsons.js ./transcripts ${Version} botbuilder botbuilder-ai botbuilder-dialogs",
+    "set-dependency-versions": "node tools/util/updateDependenciesInPackageJsons.js ./libraries ${Version} ${PreviewPackageVersion} adaptive-expressions botbuilder-lg botframework-streaming botbuilder botbuilder-ai botbuilder-dialogs botbuilder-core botbuilder-applicationinsights botbuilder-testing botframework-connector botframework-config botframework-schema testbot && node tools/util/updateDependenciesInPackageJsons.js ./transcripts ${Version} botbuilder botbuilder-ai botbuilder-dialogs",
     "update-versions": "lerna run set-version && npm run set-dependency-versions"
   },
   "dependencies": {

tools/util/updateDependenciesInPackageJsons.js

@@ -9,12 +9,12 @@ var rootPath = myArgs[0];
 var newVersion = myArgs[1];
 var previewVersion = myArgs[2] || process.env.PreviewPackageVersion;
 // This is a hack to deal with the inconsistencies between CI and daily builds right now
-if(previewVersion === 'botframework-expressions') {
+if(previewVersion === 'adaptive-expressions') {
     previewVersion = undefined;
 }
 var previewPackages = {
     'botbuilder-lg': true,
-    'botframework-expressions': true
+    'adaptive-expressions': true
 }
 var dependencies = myArgs.slice(previewVersion ? 3 : 2);
 console.log('newVersion =', newVersion);