Resource/Validator interface

Composer/packages/client/src/pages/language-generation/table-view.js

@@ -47,7 +47,7 @@ export default function TableView(props) {
       setTemplates(allTemplates);
     } else {
       const dialogsTemplates = [];
-      activeDialog.lgTemplates.forEach(item => {
+      activeDialog.referredLGTemplates.forEach(item => {
         const template = allTemplates.find(t => t.Name === item);
         if (template) {
           dialogsTemplates.push(template);
@@ -167,7 +167,7 @@ export default function TableView(props) {
       // build usedIn map
       templates.forEach(template => {
         templateUsedInDialogMap[template.Name] = dialogs.reduce((result, dialog) => {
-          if (dialog.lgTemplates.indexOf(template.Name) !== -1) {
+          if (dialog.referredLGTemplates.indexOf(template.Name) !== -1) {
             result.push(dialog.id);
           }
           return result;

Composer/packages/client/src/pages/language-understanding/table-view.js

@@ -48,7 +48,7 @@ export default function TableView(props) {
             name,
             phrases: [utterance.text],
             fileId: luFile.id,
-            used: luDialog.luIntents.indexOf(name) !== -1, // used by it's dialog or not
+            used: luDialog.referredLUIntents.indexOf(name) !== -1, // used by it's dialog or not
             state,
           });
         }

Composer/packages/client/src/store/types.ts

@@ -92,7 +92,8 @@ export interface DialogInfo {
   isRoot: boolean;
   content: any;
   diagnostics: string[];
-  luFile: string;
+  referredLUFile: string;
+  referredLUIntents: string[];
   triggers: ITrigger[];
 }
 
@@ -105,10 +106,6 @@ export interface Utterance {
   text: string;
 }
 
-export interface LuDiagnostic {
-  text: string;
-}
-
 export interface LuFile {
   id: string;
   relativePath: string;
@@ -119,7 +116,7 @@ export interface LuFile {
       utterances: Utterance[];
     };
   };
-  diagnostics: LuDiagnostic[];
+  diagnostics: Diagnostic[];
 }
 
 export interface LgFile {
@@ -154,3 +151,31 @@ export interface DesignPageLocation {
   focused: string;
   promptTab?: PromptTab;
 }
+
+export interface Diagnostic {
+  severity: DiagnosticSeverity;
+  message: string;
+
+  source: string;
+
+  range?: Range;
+  path?: string;
+  code?: string;
+}
+
+export interface Range {
+  start: Position;
+  end: Position;
+}
+
+export interface Position {
+  line: number;
+  character: number;
+}
+
+export enum DiagnosticSeverity {
+  Error = 0,
+  Warning = 1,
+  Information = 2,
+  Hint = 3,
+}

Composer/packages/client/src/utils/luUtil.ts

@@ -1,21 +1,21 @@
-import { LuFile, DialogInfo, LuDiagnostic } from '../store/types';
+import { LuFile, DialogInfo, Diagnostic } from '../store/types';
 
 export function getReferredFiles(luFiles: LuFile[], dialogs: DialogInfo[]) {
   return luFiles.filter(file => {
-    if (dialogs.findIndex(dialog => dialog.luFile === file.id) !== -1) {
+    if (dialogs.findIndex(dialog => dialog.referredLUFile === file.id) !== -1) {
       return true;
     }
     return false;
   });
 }
 
-export function isValid(diagnostics: LuDiagnostic[]) {
+export function isValid(diagnostics: Diagnostic[]) {
   return diagnostics.length === 0;
 }
 
-export function combineMessage(diagnostics: LuDiagnostic[]) {
+export function combineMessage(diagnostics: Diagnostic[]) {
   return diagnostics.reduce((msg, d) => {
-    msg += `${d.text}\n`;
+    msg += `${d.message}\n`;
     return msg;
   }, '');
 }

Composer/packages/server/__tests__/models/bot/botProject.test.ts

@@ -3,6 +3,7 @@ import fs from 'fs';
 import { Path } from '../../../src/utility/path';
 import { BotProject } from '../../../src/models/bot/botProject';
 import { LocationRef, FileInfo } from '../../../src/models/bot/interface';
+import { LGResource, LUResource } from '../../../src/models/resource';
 
 import DIALOG_TEMPLATE from './../../../src/store/dialogTemplate.json';
 
@@ -31,8 +32,8 @@ describe('index', () => {
     expect(project.luFiles.length).toBe(3);
 
     // find out lg templates used in
-    expect(project.dialogs.find((d: { isRoot: boolean }) => d.isRoot).lgTemplates.length).toBe(3);
-    expect(project.dialogs.find((d: { isRoot: boolean }) => d.isRoot).lgTemplates.join(',')).toBe(
+    expect(project.dialogs.find((d: { isRoot: boolean }) => d.isRoot).referredLGTemplates.length).toBe(3);
+    expect(project.dialogs.find((d: { isRoot: boolean }) => d.isRoot).referredLGTemplates.join(',')).toBe(
       ['hello', 'bye', 'ShowImage'].join(',')
     );
 
@@ -143,9 +144,9 @@ describe('lg operation', () => {
     const dir = 'root';
     const content = '# hello \n - hello';
     const lgFiles = await proj.createLgFile(id, content, dir);
-    const result = lgFiles.find(f => f.id === id);
+    const result = lgFiles.find(f => f.id === id) as LGResource;
 
-    expect(proj.files.length).toEqual(8);
+    expect(proj.resources.length).toEqual(8);
     expect(lgFiles.length).toEqual(2);
 
     expect(result).not.toBeUndefined();
@@ -159,9 +160,9 @@ describe('lg operation', () => {
     const id = 'root';
     const content = '# hello \n - hello2';
     const lgFiles = await proj.updateLgFile(id, content);
-    const result = lgFiles.find(f => f.id === id);
+    const result = lgFiles.find(f => f.id === id) as LGResource;
 
-    expect(proj.files.length).toEqual(8);
+    expect(proj.resources.length).toEqual(8);
     expect(lgFiles.length).toEqual(2);
 
     expect(result).not.toBeUndefined();
@@ -171,19 +172,12 @@ describe('lg operation', () => {
     }
   });
 
-  it('should throw error when lg content is invalid', async () => {
-    const id = 'root';
-    const content = '# hello \n hello3';
-
-    await expect(proj.updateLgFile(id, content)).rejects.toThrow();
-  });
-
   it('should delete lg file and update index', async () => {
     const id = 'root';
     const lgFiles = await proj.removeLgFile(id);
-    const result = lgFiles.find(f => f.id === id);
+    const result = lgFiles.find(f => f.id === id) as LGResource;
 
-    expect(proj.files.length).toEqual(7);
+    expect(proj.resources.length).toEqual(7);
     expect(lgFiles.length).toEqual(1);
 
     expect(result).toBeUndefined();
@@ -206,9 +200,9 @@ describe('lu operation', () => {
     const dir = 'root';
     const content = '## hello \n - hello';
     const luFiles = await proj.createLuFile(id, content, dir);
-    const result = luFiles.find(f => f.id === id);
+    const result = luFiles.find(f => f.id === id) as LUResource;
 
-    expect(proj.files.length).toEqual(8);
+    expect(proj.resources.length).toEqual(8);
     expect(luFiles.length).toEqual(4);
 
     expect(result).not.toBeUndefined();
@@ -222,9 +216,9 @@ describe('lu operation', () => {
     const id = 'root';
     const content = '## hello \n - hello2';
     const luFiles = await proj.updateLuFile(id, content);
-    const result = luFiles.find(f => f.id === id);
+    const result = luFiles.find(f => f.id === id) as LUResource;
 
-    expect(proj.files.length).toEqual(8);
+    expect(proj.resources.length).toEqual(8);
     expect(luFiles.length).toEqual(4);
 
     expect(result).not.toBeUndefined();
@@ -234,19 +228,12 @@ describe('lu operation', () => {
     }
   });
 
-  it('should throw error when lu content is invalid', async () => {
-    const id = 'root';
-    const content = 'hello \n hello3';
-
-    await expect(proj.updateLuFile(id, content)).rejects.toThrow();
-  });
-
   it('should delete lu file and update index', async () => {
     const id = 'root';
     const luFiles = await proj.removeLuFile(id);
-    const result = luFiles.find(f => f.id === id);
+    const result = luFiles.find(f => f.id === id) as LUResource;
 
-    expect(proj.files.length).toEqual(7);
+    expect(proj.resources.length).toEqual(7);
     expect(luFiles.length).toEqual(3);
 
     expect(result).toBeUndefined();

Composer/packages/server/__tests__/models/bot/luisPublisher.test.ts

@@ -50,16 +50,16 @@ describe('get unpublishedFiles', () => {
     const luPublisher = new LuPublisher(botDir, storage);
     await luPublisher.loadStatus(['bot1/a.lu', 'bot1/b.lu']); // relative path is key
 
-    let files = await luPublisher.getUnpublisedFiles(lufiles);
+    let files = lufiles.filter(x => luPublisher.isUnPublished(x.relativePath));
     expect(files.length).toBe(2);
     const curTime = Date.now();
     luPublisher.status['bot1/a.lu'].lastPublishTime = curTime; // assumming we publish a.lu
     luPublisher.status['bot1/b.lu'].lastPublishTime = curTime; // and b.lu
-    files = await luPublisher.getUnpublisedFiles(lufiles);
+    files = lufiles.filter(x => luPublisher.isUnPublished(x.relativePath));
     expect(files.length).toBe(0);
 
     await luPublisher.onFileChange('bot1/a.lu', FileUpdateType.UPDATE);
-    files = await luPublisher.getUnpublisedFiles(lufiles);
+    files = lufiles.filter(x => luPublisher.isUnPublished(x.relativePath));
     expect(files.length).toBe(1);
   });
 });