diff --git a/package-lock.json b/package-lock.json index 43ca7a32..cc385417 100644 --- a/package-lock.json +++ b/package-lock.json @@ -120,6 +120,12 @@ "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" } + }, + "commander": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.0.tgz", + "integrity": "sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==", + "dev": true } } }, @@ -140,6 +146,11 @@ "version": "14.14.45", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.45.tgz", "integrity": "sha512-DssMqTV9UnnoxDWu959sDLZzfvqCF0qDNRjaWeYSui9xkFe61kKo4l1TWNTQONpuXEm+gLMRvdlzvNHBamzmEw==" + }, + "flatted": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz", + "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==" } } }, @@ -535,10 +546,9 @@ "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" }, "commander": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-6.2.0.tgz", - "integrity": "sha512-zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q==", - "dev": true + "version": "8.1.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-8.1.0.tgz", + "integrity": "sha512-mf45ldcuHSYShkplHHGKWb4TrmwQadxOn7v4WuhDJy0ZVoY5JFajaRDKD0PNe5qXzBX0rhovjTnP6Kz9LETcuA==" }, "compare-func": { "version": "2.0.0", @@ -932,9 +942,9 @@ "dev": true }, "flatted": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.1.1.tgz", - "integrity": "sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA==" + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz", + "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==" }, "fs-extra": { "version": "9.1.0", diff --git a/package.json b/package.json index 1caf5200..ee0744f1 100644 --- a/package.json +++ b/package.json @@ -24,7 +24,9 @@ }, "dependencies": { "@openstapps/logger": "0.7.0", + "commander": "8.1.0", "deepmerge": "4.2.2", + "flatted": "3.2.2", "got": "11.8.2", "typedoc": "0.18.0", "typescript": "3.8.3" diff --git a/src/cli.ts b/src/cli.ts index 260cccc9..51884e8b 100644 --- a/src/cli.ts +++ b/src/cli.ts @@ -18,8 +18,8 @@ import {readFileSync, writeFileSync} from 'fs'; import got from 'got'; import {resolve} from 'path'; import {exit} from 'process'; -import {getProjectReflection} from './project-reflection'; import {generateTemplate} from './mapping'; +import {getProjectReflection} from './project-reflection'; // handle unhandled promise rejections process.on('unhandledRejection', async (reason: unknown) => { diff --git a/src/mapping.ts b/src/mapping.ts index 532e7e32..ef2ca312 100644 --- a/src/mapping.ts +++ b/src/mapping.ts @@ -28,11 +28,11 @@ import { TypeParameterType, UnionType, } from 'typedoc/dist/lib/models'; -import {AggregationSchema, ESNestedAggregation} from './types/aggregation'; import {fieldmap, filterableMap, filterableTagName} from './config/fieldmap'; import {premaps} from './config/premap'; import {settings} from './config/settings'; import {dynamicTypes, ElasticsearchDataType, typemap} from './config/typemap'; +import {AggregationSchema, ESNestedAggregation} from './types/aggregation'; import { ElasticsearchDynamicTemplate, ElasticsearchObject, diff --git a/src/project-reflection.ts b/src/project-reflection.ts index 1504de7b..9e6f35f3 100644 --- a/src/project-reflection.ts +++ b/src/project-reflection.ts @@ -12,11 +12,11 @@ * You should have received a copy of the GNU General Public License along with * this program. If not, see . */ -import {existsSync, PathLike} from "fs"; -import {join, sep} from "path"; -import {platform} from "os"; -import {Logger} from "@openstapps/logger"; -import {Application, ProjectReflection} from "typedoc"; +import {Logger} from '@openstapps/logger'; +import {existsSync, PathLike} from 'fs'; +import {platform} from 'os'; +import {join, sep} from 'path'; +import {Application, ProjectReflection} from 'typedoc'; import {ModuleKind, ScriptTarget} from 'typescript'; /**