Merge branch 'main' of https://github.com/microsoft/BotFramework-Composer into release/2.1.0

Author: Srinaath Ravichandran

Composer/packages/server/package.json

@@ -66,7 +66,6 @@
     "ts-node": "^8.4.1"
   },
   "dependencies": {
-    "@apidevtools/json-schema-ref-parser": "^9.0.9",
     "@azure/cognitiveservices-qnamaker": "^3.2.0",
     "@bfc/client": "*",
     "@bfc/extension": "*",

Composer/packages/server/src/models/bot/botProject.ts

@@ -32,7 +32,6 @@ import { DefaultSettingManager } from '../settings/defaultSettingManager';
 import log from '../../logger';
 import { BotProjectService } from '../../services/project';
 import AssetService from '../../services/asset';
-import { bundleSchema } from '../utilities/bundleSchema';
 
 import {
   BotStructureFilesPatterns,
@@ -203,8 +202,6 @@ export class BotProject implements IBotProject {
     this.settings = await this.getEnvSettings(false);
     this.files = await this._getFiles();
     this.readme = await this._getReadme();
-
-    await this._bundleSchemas();
   };
 
   public getProject = () => {
@@ -1105,25 +1102,4 @@ export class BotProject implements IBotProject {
       }
     }
   };
-
-  private _bundleSchemas = async () => {
-    const schemas: FileInfo[] = [];
-    this.files.forEach((file) => {
-      if (file.name.endsWith('.schema')) {
-        schemas.push(file);
-      }
-    });
-
-    debug('Bundling %d schemas.', schemas.length);
-
-    await Promise.all(
-      schemas.map(async (s) => {
-        const bundled = await bundleSchema(s.path);
-
-        if (bundled) {
-          s.content = bundled;
-        }
-      })
-    );
-  };
 }

Composer/packages/server/src/models/utilities/bundleSchema.ts

@@ -83,6 +83,8 @@ const LuisIntentEditor: React.FC<FieldProps<string>> = (props) => {
       return;
     }
 
+    if (newValue === placeholder || newValue === inlineModePlaceholder) return;
+
     const newIntent = { Name: intentName, Body: newValue };
     shellApi
       .debouncedUpdateLuIntent(luIntent?.fileId ?? luFile.id, intentName, newIntent)

Composer/packages/ui-plugins/luis/src/LuisIntentEditor.tsx

@@ -11,12 +11,10 @@ import { valueTypeDefinitions } from '../schema';
 
 export const ValueRefField: React.FC<FieldProps> = ({ description, id, label, value, required, onChange }) => {
   const options = useMemo<IDropdownOption[]>(() => {
-    return Object.entries(valueTypeDefinitions || {})
-      .filter(([key]) => key !== 'equalsExpression') // a value must be a type, not just an expression
-      .map(([key, value]) => ({
-        key: `#/definitions/${key}`,
-        text: value?.title || startCase(key),
-      }));
+    return Object.entries(valueTypeDefinitions || {}).map(([key, value]) => ({
+      key: `#/definitions/${key}`,
+      text: value?.title || startCase(key),
+    }));
   }, []);
 
   const handleChange = (_: React.FormEvent<HTMLDivElement>, option?: IDropdownOption) => {

Composer/packages/ui-plugins/schema-editor/src/Fields/ValueRefField.tsx

@@ -52,6 +52,14 @@ export const schema = (): JSONSchema7 => ({
 });
 
 export const valueTypeDefinitions: { [key: string]: JSONSchema7 } = {
+  expression: {
+    $role: 'expression',
+    type: 'string',
+    title: formatMessage('Expression'),
+    description: formatMessage('Expression to evaluate.'),
+    pattern: '^.*\\S.*',
+    examples: ['user.age > 13'],
+  },
   equalsExpression: {
     $role: 'expression',
     type: 'string',
@@ -60,9 +68,26 @@ export const valueTypeDefinitions: { [key: string]: JSONSchema7 } = {
     pattern: '^=.*\\S.*',
     examples: ['=user.name'],
   },
+  condition: {
+    $role: 'expression',
+    title: formatMessage('Boolean condition'),
+    description: formatMessage('Boolean constant or expression to evaluate.'),
+    oneOf: [
+      {
+        $ref: '#/definitions/expression',
+      },
+      {
+        type: 'boolean',
+        title: formatMessage('Boolean'),
+        description: formatMessage('Boolean value.'),
+        default: true,
+        examples: [false],
+      },
+    ],
+  },
   booleanExpression: {
     $role: 'expression',
-    title: formatMessage('Boolean'),
+    title: formatMessage('Boolean or expression'),
     description: formatMessage('Boolean constant or expression to evaluate.'),
     oneOf: [
       {
@@ -80,7 +105,7 @@ export const valueTypeDefinitions: { [key: string]: JSONSchema7 } = {
   },
   numberExpression: {
     $role: 'expression',
-    title: formatMessage('Number'),
+    title: formatMessage('Number or expression'),
     description: formatMessage('Number constant or expression to evaluate.'),
     oneOf: [
       {
@@ -98,7 +123,7 @@ export const valueTypeDefinitions: { [key: string]: JSONSchema7 } = {
   },
   integerExpression: {
     $role: 'expression',
-    title: formatMessage('Integer'),
+    title: formatMessage('Integer or expression'),
     description: formatMessage('Integer constant or expression to evaluate.'),
     oneOf: [
       {
@@ -116,7 +141,7 @@ export const valueTypeDefinitions: { [key: string]: JSONSchema7 } = {
   },
   stringExpression: {
     $role: 'expression',
-    title: formatMessage('String'),
+    title: formatMessage('String or expression'),
     description: formatMessage('Interpolated string or expression to evaluate.'),
     oneOf: [
       {
@@ -134,7 +159,7 @@ export const valueTypeDefinitions: { [key: string]: JSONSchema7 } = {
   },
   arrayExpression: {
     $role: 'expression',
-    title: formatMessage('Array'),
+    title: formatMessage('Array or expression'),
     description: formatMessage('Array or expression to evaluate.'),
     oneOf: [
       {
@@ -149,7 +174,7 @@ export const valueTypeDefinitions: { [key: string]: JSONSchema7 } = {
   },
   objectExpression: {
     $role: 'expression',
-    title: formatMessage('Object'),
+    title: formatMessage('Object or expression'),
     description: formatMessage('Object or expression to evaluate.'),
     oneOf: [
       {
@@ -164,7 +189,7 @@ export const valueTypeDefinitions: { [key: string]: JSONSchema7 } = {
   },
   valueExpression: {
     $role: 'expression',
-    title: formatMessage('Any'),
+    title: formatMessage('Any or expression'),
     description: formatMessage('Any constant or expression to evaluate.'),
     oneOf: [
       {

Composer/packages/ui-plugins/schema-editor/src/schema.ts

@@ -30,16 +30,6 @@
     call-me-maybe "^1.0.1"
     js-yaml "^3.13.1"
 
-"@apidevtools/json-schema-ref-parser@^9.0.9":
-  version "9.0.9"
-  resolved "https://registry.yarnpkg.com/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.9.tgz#d720f9256e3609621280584f2b47ae165359268b"
-  integrity sha512-GBD2Le9w2+lVFoc4vswGI/TjkNIZSVp7+9xPf+X3uidBfWnAeUWmquteSyt0+VCrhNMWj/FTABISQrD3Z/YA+w==
-  dependencies:
-    "@jsdevtools/ono" "^7.1.3"
-    "@types/json-schema" "^7.0.6"
-    call-me-maybe "^1.0.1"
-    js-yaml "^4.1.0"
-
 "@apidevtools/openapi-schemas@^2.0.4":
   version "2.1.0"
   resolved "https://botbuilder.myget.org/F/botframework-cli/npm/@apidevtools/openapi-schemas/-/@apidevtools/openapi-schemas-2.1.0.tgz#9fa08017fb59d80538812f03fc7cac5992caaa17"
@@ -5330,7 +5320,7 @@
     jest-diff "^26.0.0"
     pretty-format "^26.0.0"
 
-"@types/json-schema@*", "@types/json-schema@^7.0.6":
+"@types/json-schema@*":
   version "7.0.7"
   resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
   integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
@@ -15575,13 +15565,6 @@ js-yaml@^3.13.1:
     argparse "^1.0.7"
     esprima "^4.0.0"
 
-js-yaml@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
-  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
-  dependencies:
-    argparse "^2.0.1"
-
 jsbn@~0.1.0:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"