clean up

microsoft · Dec 17, 2020 · 1565649 · 1565649
1 parent c33295c
commit 1565649
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 3 deletions.
diff --git a/Composer/packages/client/src/recoilModel/dispatchers/__tests__/lg.test.tsx b/Composer/packages/client/src/recoilModel/dispatchers/__tests__/lg.test.tsx
@@ -42,6 +42,7 @@ const lgFiles = [
     content: `\r\n# Hello\r\n-hi`,
     templates: [{ name: 'Hello', body: '-hi', parameters: [] }],
     diagnostics: [],
+    imports: [],
     allTemplates: [{ name: 'Hello', body: '-hi', parameters: [] }],
   },
 ] as LgFile[];

diff --git a/Composer/packages/client/src/recoilModel/selectors/__test__/dialogImports.test.tsx b/Composer/packages/client/src/recoilModel/selectors/__test__/dialogImports.test.tsx
@@ -1,7 +1,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT License.
 
-import { LgFile } from '@bfc/shared';
+import { lgUtil } from '@bfc/indexers';
+
 import { getBaseName } from '../../../utils/fileUtil';
 import { getLanguageFileImports } from '../dialogImports';
 
@@ -38,7 +39,14 @@ const files = [
 
 describe('dialogImports selectors', () => {
   it('should follow all imports and list all unique imports', () => {
-    const getFile = (id) => files.find((f) => getBaseName(f.id) === id) as LgFile;
+    const getFile = (id) => {
+      const file = files.find((f) => getBaseName(f.id) === id);
+      if (file) {
+        return lgUtil.parse(file.id, file.content, []);
+      } else {
+        throw new Error(`file ${id} not found`);
+      }
+    };
 
     const fileImports = getLanguageFileImports('name1', getFile);
     expect(fileImports).toEqual([

diff --git a/Composer/packages/client/src/recoilModel/selectors/dialogImports.ts b/Composer/packages/client/src/recoilModel/selectors/dialogImports.ts
@@ -37,7 +37,7 @@ export const getLanguageFileImports = <T extends LgFile | LuFile | QnAFile>(
       return {
         displayName: item.description,
         importPath: item.path,
-        id: item.id,
+        id: getBaseName(item.id),
       };
     });
 

diff --git a/Composer/packages/lib/indexers/src/utils/lgUtil.ts b/Composer/packages/lib/indexers/src/utils/lgUtil.ts
@@ -14,6 +14,7 @@ import isEmpty from 'lodash/isEmpty';
 import { SourceRange } from 'botbuilder-lg/lib/sourceRange';
 
 import { lgIndexer } from '../lgIndexer';
+
 import { getFileName } from './help';
 
 // NOTE: LGDiagnostic is defined in PascalCase which should be corrected