Add JSON report and update concordialang dependencies

thiagodp · Apr 1, 2021 · 5bbf4e1 · 5bbf4e1
1 parent 8d52d27
commit 5bbf4e1
Show file tree

Hide file tree

Showing 59 changed files with 2,859 additions and 1,233 deletions.
diff --git a/__tests__/SimpleCompiler.ts b/__tests__/SimpleCompiler.ts
@@ -1,5 +1,6 @@
 import * as fs from 'fs';
 import { resolve } from 'path';
+import { promisify } from 'util';
 
 import { DEFAULT_DIR_LANGUAGE, DEFAULT_ENCODING } from '../modules/app/default-options';
 import { Document, FileInfo } from '../modules/ast';
@@ -11,7 +12,7 @@ import { NLPBasedSentenceRecognizer } from '../modules/nlp/NLPBasedSentenceRecog
 import { NLPTrainer } from '../modules/nlp/NLPTrainer';
 import { Parser } from '../modules/parser/Parser';
 import { AugmentedSpec } from '../modules/req/AugmentedSpec';
-import { FSFileHandler } from '../modules/util/file/FSFileHandler';
+import { FSFileHandler } from '../modules/util/fs/FSFileHandler';
 
 /**
  * Useful for testing purposes.
@@ -27,7 +28,7 @@ export class SimpleCompiler {
 
 	langDir = resolve( this.dir, DEFAULT_DIR_LANGUAGE );
 
-    fileHandler = new FSFileHandler( fs, DEFAULT_ENCODING );
+    fileHandler = new FSFileHandler( fs, promisify, DEFAULT_ENCODING );
 
     langLoader: LanguageContentLoader = new JsonLanguageContentLoader(
         this.langDir,

diff --git a/__tests__/compiler/SingleFileCompiler.spec.ts b/__tests__/compiler/SingleFileCompiler.spec.ts
@@ -1,5 +1,6 @@
 import * as fs from 'fs';
 import { resolve } from 'path';
+import { promisify } from 'util';
 
 import { DEFAULT_DIR_LANGUAGE } from '../../modules/app/default-options';
 import { Document } from '../../modules/ast/Document';
@@ -10,7 +11,7 @@ import { Lexer } from '../../modules/lexer/Lexer';
 import { NLPBasedSentenceRecognizer } from '../../modules/nlp/NLPBasedSentenceRecognizer';
 import { NLPTrainer } from '../../modules/nlp/NLPTrainer';
 import { Parser } from '../../modules/parser/Parser';
-import { FSFileHandler } from '../../modules/util/file/FSFileHandler';
+import { FSFileHandler } from '../../modules/util/fs/FSFileHandler';
 
 describe( 'SingleFileCompiler', () => {
 
@@ -19,7 +20,7 @@ describe( 'SingleFileCompiler', () => {
 	const dir = resolve( process.cwd(), 'dist/' );
 	const langDir = resolve( dir, DEFAULT_DIR_LANGUAGE );
 
-    const fileHandler = new FSFileHandler( fs );
+    const fileHandler = new FSFileHandler( fs, promisify );
     const langLoader: LanguageContentLoader =
         new JsonLanguageContentLoader( langDir, {}, fileHandler, fileHandler );
 

diff --git a/__tests__/db/AlaSqlDatabaseInterface.spec.ts b/__tests__/db/AlaSqlDatabaseInterface.spec.ts
@@ -1,5 +1,6 @@
 import * as fs from 'fs';
 import { resolve } from 'path';
+import { promisify } from 'util';
 
 import { DEFAULT_DIR_LANGUAGE, DEFAULT_LANGUAGE } from '../../modules/app/default-options';
 import { Database, DatabaseProperties, DatabaseProperty, Document, Table } from '../../modules/ast';
@@ -8,7 +9,7 @@ import { JsonLanguageContentLoader, LanguageContentLoader } from '../../modules/
 import { Lexer } from '../../modules/lexer/Lexer';
 import { Parser } from '../../modules/parser/Parser';
 import { NodeTypes } from '../../modules/req/NodeTypes';
-import { FSFileHandler } from '../../modules/util/file/FSFileHandler';
+import { FSFileHandler } from '../../modules/util/fs/FSFileHandler';
 
 describe( 'AlaSqlDatabaseInterface', () => {
 
@@ -18,7 +19,7 @@ describe( 'AlaSqlDatabaseInterface', () => {
 	const langDir = resolve( dir, DEFAULT_DIR_LANGUAGE );
 
     let parser = new Parser();
-    const fileHandler = new FSFileHandler( fs );
+    const fileHandler = new FSFileHandler( fs, promisify );
     const langLoader: LanguageContentLoader =
         new JsonLanguageContentLoader( langDir, {}, fileHandler, fileHandler );
     let lexer: Lexer = new Lexer( DEFAULT_LANGUAGE, langLoader );

diff --git a/__tests__/db/database-package-manager.spec.ts b/__tests__/db/database-package-manager.spec.ts
@@ -1,7 +1,9 @@
 import { fs, vol } from 'memfs';
 import * as path from 'path';
+import { promisify } from 'util';
+
 import { allInstalledDatabases, databasePackageNameFor } from '../../modules/db/database-package-manager';
-import { FSDirSearcher } from '../../modules/util/file';
+import { FSDirSearcher } from '../../modules/util/fs/FSDirSearcher';
 
 describe( 'database-package-manager', () => {
 
@@ -25,7 +27,7 @@ describe( 'database-package-manager', () => {
 		vol.mkdirpSync( path.join( localModulesDir, 'database-js' ) );
 		vol.mkdirpSync( path.join( localModulesDir, 'database-js-json' ) );
 
-		const s = new FSDirSearcher( fs );
+		const s = new FSDirSearcher( fs, promisify );
 		const r = await allInstalledDatabases( localModulesDir, s );
 
 		expect( r.length ).toEqual( 1 );

diff --git a/__tests__/language/LanguageManager.spec.ts b/__tests__/language/LanguageManager.spec.ts
@@ -3,7 +3,7 @@ import { join, resolve } from 'path';
 
 import { DEFAULT_DIR_LANGUAGE } from '../../modules/app/default-options';
 import { LanguageManager } from '../../modules/language/LanguageManager';
-import { FSFileSearcher } from '../../modules/util/file/FSFileSearcher';
+import { FSFileSearcher } from '../../modules/util/fs/FSFileSearcher';
 
 describe( 'LanguageManager', () => {
 

diff --git a/__tests__/language/locale-manager.spec.ts b/__tests__/language/locale-manager.spec.ts
@@ -1,7 +1,9 @@
 import { fs, vol } from 'memfs';
 import * as path from 'path';
+import { promisify } from 'util';
+
 import { installedDateLocales } from '../../modules/language/locale-manager';
-import { FSDirSearcher } from '../../modules/util/file';
+import { FSDirSearcher } from '../../modules/util/fs/FSDirSearcher';
 
 describe( 'locale-manager', () => {
 
@@ -28,7 +30,7 @@ describe( 'locale-manager', () => {
 		vol.mkdirpSync( path.join( localeDir, enUS ) );
 		vol.mkdirpSync( path.join( localeDir, ptBR ) );
 
-		const s = new FSDirSearcher( fs );
+		const s = new FSDirSearcher( fs, promisify );
 		const r = await installedDateLocales( localModulesDir, s, path );
 
 		expect( r.length ).toEqual( 2 );

diff --git a/__tests__/lexer/Lexer.spec.ts b/__tests__/lexer/Lexer.spec.ts
@@ -1,18 +1,19 @@
 import * as fs from 'fs';
 import { resolve } from 'path';
+import { promisify } from 'util';
 
 import { DEFAULT_DIR_LANGUAGE, DEFAULT_LANGUAGE } from '../../modules/app/default-options';
 import { JsonLanguageContentLoader, LanguageContentLoader } from '../../modules/language';
 import { Lexer } from '../../modules/lexer/Lexer';
 import { NodeTypes } from '../../modules/req/NodeTypes';
-import { FSFileHandler } from '../../modules/util/file/FSFileHandler';
+import { FSFileHandler } from '../../modules/util/fs/FSFileHandler';
 
 describe( 'Lexer', () => {
 
 	const dir = resolve( process.cwd(), 'dist/' );
 	const langDir = resolve( dir, DEFAULT_DIR_LANGUAGE );
 
-    const fileHandler = new FSFileHandler( fs );
+    const fileHandler = new FSFileHandler( fs, promisify );
 
     const langLoader: LanguageContentLoader = new JsonLanguageContentLoader(
         langDir,

diff --git a/__tests__/nlp/DatabasePropertyRecognizer.spec.ts b/__tests__/nlp/DatabasePropertyRecognizer.spec.ts
@@ -1,12 +1,13 @@
 import * as fs from 'fs';
 import { resolve } from 'path';
+import { promisify } from 'util';
 
 import { DEFAULT_DIR_LANGUAGE } from '../../modules/app/default-options';
 import { DatabaseProperty } from '../../modules/ast';
 import { JsonLanguageContentLoader, LanguageContentLoader } from '../../modules/language';
 import { DatabasePropertyRecognizer, NLP, NLPTrainer } from '../../modules/nlp';
 import { NodeTypes } from '../../modules/req/NodeTypes';
-import { FSFileHandler } from '../../modules/util/file/FSFileHandler';
+import { FSFileHandler } from '../../modules/util/fs/FSFileHandler';
 
 describe( 'DatabasePropertyRecognizer', () => {
 
@@ -17,7 +18,7 @@ describe( 'DatabasePropertyRecognizer', () => {
 	const dir = resolve( process.cwd(), 'dist/' );
 	const langDir = resolve( dir, DEFAULT_DIR_LANGUAGE );
 
-    const fileHandler = new FSFileHandler( fs );
+    const fileHandler = new FSFileHandler( fs, promisify );
     const langLoader: LanguageContentLoader =
         new JsonLanguageContentLoader( langDir, {}, fileHandler, fileHandler );
 

diff --git a/__tests__/nlp/UIPropertyRecognizer.spec.ts b/__tests__/nlp/UIPropertyRecognizer.spec.ts
@@ -1,12 +1,13 @@
 import * as fs from 'fs';
 import { resolve } from 'path';
+import { promisify } from 'util';
 
+import { DEFAULT_DIR_LANGUAGE } from '../../modules/app/default-options';
 import { UIProperty } from '../../modules/ast/UIProperty';
 import { JsonLanguageContentLoader, LanguageContentLoader } from '../../modules/language';
 import { NLP, NLPTrainer, UIPropertyRecognizer } from '../../modules/nlp';
 import { NodeTypes } from '../../modules/req/NodeTypes';
-import { FSFileHandler } from '../../modules/util/file/FSFileHandler';
-import { DEFAULT_DIR_LANGUAGE } from '../../modules/app/default-options';
+import { FSFileHandler } from '../../modules/util/fs/FSFileHandler';
 
 describe( 'UIPropertyRecognizer', () => {
 
@@ -17,7 +18,7 @@ describe( 'UIPropertyRecognizer', () => {
 	const dir = resolve( process.cwd(), 'dist/' );
 	const langDir = resolve( dir, DEFAULT_DIR_LANGUAGE );
 
-    const fileHandler = new FSFileHandler( fs );
+    const fileHandler = new FSFileHandler( fs, promisify );
     const langLoader: LanguageContentLoader =
         new JsonLanguageContentLoader( langDir, {}, fileHandler, fileHandler );
 

diff --git a/__tests__/nlp/en/date.spec.ts b/__tests__/nlp/en/date.spec.ts
@@ -1,11 +1,12 @@
 import { Clock, DateTimeFormatter, LocalDate } from '@js-joda/core';
 import * as fs from 'fs';
 import { resolve } from 'path';
+import { promisify } from 'util';
 
 import { DEFAULT_DIR_LANGUAGE } from '../../../modules/app/default-options';
 import { JsonLanguageContentLoader, LanguageContentLoader } from '../../../modules/language';
 import { Entities, NLP, NLPResult, NLPTrainer } from '../../../modules/nlp';
-import { FSFileHandler } from '../../../modules/util/file/FSFileHandler';
+import { FSFileHandler } from '../../../modules/util/fs/FSFileHandler';
 import { shouldHaveUIEntities } from '../entity-util';
 
 describe( 'nlp.en.date', () => {
@@ -18,7 +19,7 @@ describe( 'nlp.en.date', () => {
 	const dir = resolve( process.cwd(), 'dist/' );
 	const langDir = resolve( dir, DEFAULT_DIR_LANGUAGE );
 
-    const fileHandler = new FSFileHandler( fs );
+    const fileHandler = new FSFileHandler( fs, promisify );
     const langLoader: LanguageContentLoader = new JsonLanguageContentLoader(
         langDir,
         {},

diff --git a/__tests__/nlp/en/datetime.spec.ts b/__tests__/nlp/en/datetime.spec.ts
@@ -1,11 +1,12 @@
 import { Clock, DateTimeFormatter, LocalDateTime } from '@js-joda/core';
 import * as fs from 'fs';
 import { resolve } from 'path';
+import { promisify } from 'util';
 
 import { DEFAULT_DIR_LANGUAGE } from '../../../modules/app/default-options';
 import { JsonLanguageContentLoader, LanguageContentLoader } from '../../../modules/language';
 import { Entities, Intents, NLP, NLPResult, NLPTrainer } from '../../../modules/nlp';
-import { FSFileHandler } from '../../../modules/util/file/FSFileHandler';
+import { FSFileHandler } from '../../../modules/util/fs/FSFileHandler';
 import { shouldHaveUIEntities, shouldNotHaveEntities } from '../entity-util';
 
 describe( 'nlp.en.datetime', () => {
@@ -18,7 +19,7 @@ describe( 'nlp.en.datetime', () => {
 	const dir = resolve( process.cwd(), 'dist/' );
 	const langDir = resolve( dir, DEFAULT_DIR_LANGUAGE );
 
-    const fileHandler = new FSFileHandler( fs );
+    const fileHandler = new FSFileHandler( fs, promisify );
     const langLoader: LanguageContentLoader = new JsonLanguageContentLoader(
         langDir,
         {},

diff --git a/__tests__/nlp/en/time.spec.ts b/__tests__/nlp/en/time.spec.ts
@@ -1,11 +1,12 @@
 import { Clock, DateTimeFormatter, LocalTime } from '@js-joda/core';
 import * as fs from 'fs';
 import { resolve } from 'path';
+import { promisify } from 'util';
 
 import { DEFAULT_DIR_LANGUAGE } from '../../../modules/app/default-options';
 import { JsonLanguageContentLoader, LanguageContentLoader } from '../../../modules/language';
 import { Entities, Intents, NLP, NLPResult, NLPTrainer } from '../../../modules/nlp';
-import { FSFileHandler } from '../../../modules/util/file/FSFileHandler';
+import { FSFileHandler } from '../../../modules/util/fs/FSFileHandler';
 import { shouldHaveUIEntities, shouldNotHaveEntities } from '../entity-util';
 
 describe( 'nlp.en.time', () => {
@@ -18,7 +19,7 @@ describe( 'nlp.en.time', () => {
 	const dir = resolve( process.cwd(), 'dist/' );
 	const langDir = resolve( dir, DEFAULT_DIR_LANGUAGE );
 
-    const fileHandler = new FSFileHandler( fs );
+    const fileHandler = new FSFileHandler( fs, promisify );
     const langLoader: LanguageContentLoader = new JsonLanguageContentLoader(
         langDir,
         {},

diff --git a/__tests__/nlp/pt/date.spec.ts b/__tests__/nlp/pt/date.spec.ts
@@ -1,12 +1,13 @@
 import { Clock, DateTimeFormatter, LocalDate } from '@js-joda/core';
 import * as fs from 'fs';
 import { resolve } from 'path';
+import { promisify } from 'util';
 
 import { DEFAULT_DIR_LANGUAGE } from '../../../modules/app/default-options';
 import { JsonLanguageContentLoader, LanguageContentLoader } from '../../../modules/language';
 import { Intents, NLP, NLPResult, NLPTrainer } from '../../../modules/nlp';
 import { Entities } from '../../../modules/nlp/Entities';
-import { FSFileHandler } from '../../../modules/util/file';
+import { FSFileHandler } from '../../../modules/util/fs/FSFileHandler';
 import { shouldHaveUIEntities, shouldNotHaveEntities } from '../entity-util';
 
 describe( 'nlp.pt.date', () => {
@@ -19,7 +20,7 @@ describe( 'nlp.pt.date', () => {
 	const dir = resolve( process.cwd(), 'dist/' );
 	const langDir = resolve( dir, DEFAULT_DIR_LANGUAGE );
 
-    const fileHandler = new FSFileHandler( fs );
+    const fileHandler = new FSFileHandler( fs, promisify );
     const langLoader: LanguageContentLoader = new JsonLanguageContentLoader(
         langDir,
         {},

diff --git a/__tests__/nlp/pt/datetime.spec.ts b/__tests__/nlp/pt/datetime.spec.ts
@@ -1,11 +1,12 @@
 import { Clock, DateTimeFormatter, LocalDateTime } from '@js-joda/core';
 import * as fs from 'fs';
 import { resolve } from 'path';
+import { promisify } from 'util';
 
 import { DEFAULT_DIR_LANGUAGE } from '../../../modules/app/default-options';
 import { JsonLanguageContentLoader, LanguageContentLoader } from '../../../modules/language';
 import { Entities, Intents, NLP, NLPResult, NLPTrainer } from '../../../modules/nlp';
-import { FSFileHandler } from '../../../modules/util/file/FSFileHandler';
+import { FSFileHandler } from '../../../modules/util/fs/FSFileHandler';
 import { shouldHaveUIEntities, shouldNotHaveEntities } from '../entity-util';
 
 
@@ -19,7 +20,7 @@ describe( 'nlp.pt.datetime', () => {
 	const dir = resolve( process.cwd(), 'dist/' );
 	const langDir = resolve( dir, DEFAULT_DIR_LANGUAGE );
 
-    const fileHandler = new FSFileHandler( fs );
+    const fileHandler = new FSFileHandler( fs, promisify );
     const langLoader: LanguageContentLoader = new JsonLanguageContentLoader(
         langDir,
         {},

diff --git a/__tests__/nlp/pt/testcase.spec.ts b/__tests__/nlp/pt/testcase.spec.ts
@@ -1,11 +1,12 @@
 import * as fs from 'fs';
 import { resolve } from 'path';
+import { promisify } from 'util';
 
 import { DEFAULT_DIR_LANGUAGE } from '../../../modules/app/default-options';
 import { JsonLanguageContentLoader, LanguageContentLoader } from '../../../modules/language';
 import { Intents, NLP, NLPResult, NLPTrainer } from '../../../modules/nlp';
 import { Entities } from '../../../modules/nlp/Entities';
-import { FSFileHandler } from '../../../modules/util/file';
+import { FSFileHandler } from '../../../modules/util/fs/FSFileHandler';
 import { shouldHaveTestCaseEntities } from '../entity-util';
 
 describe( 'nlp.pt.testcase', () => {
@@ -16,7 +17,7 @@ describe( 'nlp.pt.testcase', () => {
 	const dir = resolve( process.cwd(), 'dist/' );
 	const langDir = resolve( dir, DEFAULT_DIR_LANGUAGE );
 
-    const fileHandler = new FSFileHandler( fs );
+    const fileHandler = new FSFileHandler( fs, promisify );
     const langLoader: LanguageContentLoader = new JsonLanguageContentLoader(
         langDir,
         {},

diff --git a/__tests__/nlp/pt/time.spec.ts b/__tests__/nlp/pt/time.spec.ts
@@ -1,12 +1,13 @@
 import { Clock, DateTimeFormatter, LocalTime } from '@js-joda/core';
 import * as fs from 'fs';
 import { resolve } from 'path';
+import { promisify } from 'util';
 
 import { DEFAULT_DIR_LANGUAGE } from '../../../modules/app/default-options';
 import { JsonLanguageContentLoader, LanguageContentLoader } from '../../../modules/language';
 import { Intents, NLP, NLPResult, NLPTrainer } from '../../../modules/nlp';
 import { Entities } from '../../../modules/nlp/Entities';
-import { FSFileHandler } from '../../../modules/util/file';
+import { FSFileHandler } from '../../../modules/util/fs/FSFileHandler';
 import { shouldHaveUIEntities, shouldNotHaveEntities } from '../entity-util';
 
 describe( 'nlp.pt.time', () => {
@@ -19,7 +20,7 @@ describe( 'nlp.pt.time', () => {
 	const dir = resolve( process.cwd(), 'dist/' );
 	const langDir = resolve( dir, DEFAULT_DIR_LANGUAGE );
 
-    const fileHandler = new FSFileHandler( fs );
+    const fileHandler = new FSFileHandler( fs, promisify );
     const langLoader: LanguageContentLoader = new JsonLanguageContentLoader(
         langDir,
         {},

diff --git a/__tests__/nlp/pt/ui.spec.ts b/__tests__/nlp/pt/ui.spec.ts
@@ -1,11 +1,12 @@
 import * as fs from 'fs';
 import { resolve } from 'path';
+import { promisify } from 'util';
 
 import { DEFAULT_DIR_LANGUAGE } from '../../../modules/app/default-options';
 import { JsonLanguageContentLoader, LanguageContentLoader } from '../../../modules/language';
 import { Intents, NLP, NLPTrainer } from '../../../modules/nlp';
 import { Entities } from '../../../modules/nlp/Entities';
-import { FSFileHandler } from '../../../modules/util/file';
+import { FSFileHandler } from '../../../modules/util/fs/FSFileHandler';
 import { shouldHaveUIEntities } from '../entity-util';
 
 describe( 'nlp.pt.ui', () => {
@@ -16,7 +17,7 @@ describe( 'nlp.pt.ui', () => {
 	const dir = resolve( process.cwd(), 'dist/' );
 	const langDir = resolve( dir, DEFAULT_DIR_LANGUAGE );
 
-    const fileHandler = new FSFileHandler( fs );
+    const fileHandler = new FSFileHandler( fs, promisify );
     const langLoader: LanguageContentLoader = new JsonLanguageContentLoader(
         langDir,
         {},