Use standard src/tests paths.

Signed-off-by: dblock <[email protected]>
opensearch-project · May 13, 2024 · 2aa4911 · 2aa4911
1 parent 6348527
commit 2aa4911
Show file tree

Hide file tree

Showing 84 changed files with 47 additions and 52 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -5,19 +5,16 @@ on:
     branches: ['**']
     paths:
       - 'spec/**'
-      - 'tools/linter/**'
+      - 'src/linter/**'
   pull_request:
     branches: ['**']
     paths:
       - 'spec/**'
-      - 'tools/linter/**'
+      - 'src/linter/**'
 
 jobs:
   lint-spec:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: tools
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3

diff --git a/.github/workflows/tools.yml b/.github/workflows/tools.yml
@@ -4,18 +4,15 @@ on:
   push:
     branches: ['**']
     paths:
-      - 'tools/**'
+      - 'src/**'
   pull_request:
     branches: ['**']
     paths:
-      - 'tools/**'
+      - 'src/**'
 
 jobs:
   tools-tests:
     runs-on: ubuntu-latest
-    defaults:
-      run:
-        working-directory: tools
     steps:
       - uses: actions/checkout@v3
       - uses: actions/setup-node@v3

diff --git a/DEVELOPER_GUIDE.md b/DEVELOPER_GUIDE.md
@@ -118,12 +118,12 @@ This repository includes several OpenAPI Specification Extensions to fill in any
 
 ## Tools
 
-We authored a number of tools to merge and lint specs that live in [tools](tools). All tools have tests (run with `npm run test`) and a linter (run with `npm run lint`).
+We authored a number of tools to merge and lint specs that live in [src](./src/). All tools have tests (run with `npm run test`) and a linter (run with `npm run lint`).
 
 ### Merger
 
 The spec merger "builds", aka combines all `.yaml` files in a spec folder into a complete OpenAPI spec. A [workflow](./.github/workflows/build.yml) performs this task on the [spec folder](spec) of this repo then publishes the output into [releases](https://github.com/opensearch-project/opensearch-api-specification/releases).
 
 ### Linter
 
-The spec linter that validates every `.yaml` file in the `./spec` folder to assure that they follow the guidelines we have set. Check out the [Linter README](tools/README.md#spec-linter) for more information on how to run it locally. Make sure to run the linter before submitting a PR.
+The spec linter that validates every `.yaml` file in the `./spec` folder to assure that they follow the guidelines we have set. Check out the [Linter README](src/README.md#spec-linter) for more information on how to run it locally. Make sure to run the linter before submitting a PR.
diff --git a/jest.config.js b/jest.config.js
@@ -1,5 +1,6 @@
 /** @type {import('ts-jest').JestConfigWithTsJest} */
 module.exports = {
   preset: 'ts-jest',
-  testEnvironment: 'node'
+  testEnvironment: 'node',
+  moduleDirectories: ['node_modules', 'src']
 }
diff --git a/package.json b/package.json
@@ -5,8 +5,8 @@
   "author": "opensearch-project",
   "license": "Apache-2.0",
   "scripts": {
-    "merge": "ts-node tools/merger/merge.ts",
-    "lint:spec": "ts-node tools/linter/lint.ts",
+    "merge": "ts-node src/merger/merge.ts",
+    "lint:spec": "ts-node src/linter/lint.ts",
     "lint": "eslint .",
     "test": "jest"
   },

diff --git a/tools/README.md → src/README.md b/tools/README.md → src/README.md
diff --git a/tools/helpers.ts → src/helpers.ts b/tools/helpers.ts → src/helpers.ts
diff --git a/tools/linter/InlineObjectSchemaValidator.ts → src/linter/InlineObjectSchemaValidator.ts b/tools/linter/InlineObjectSchemaValidator.ts → src/linter/InlineObjectSchemaValidator.ts
diff --git a/tools/linter/SchemaRefsValidator.ts → src/linter/SchemaRefsValidator.ts b/tools/linter/SchemaRefsValidator.ts → src/linter/SchemaRefsValidator.ts
diff --git a/tools/linter/SpecValidator.ts → src/linter/SpecValidator.ts b/tools/linter/SpecValidator.ts → src/linter/SpecValidator.ts
diff --git a/tools/linter/components/InfoFile.ts → src/linter/components/InfoFile.ts b/tools/linter/components/InfoFile.ts → src/linter/components/InfoFile.ts
diff --git a/tools/linter/components/NamespaceFile.ts → src/linter/components/NamespaceFile.ts b/tools/linter/components/NamespaceFile.ts → src/linter/components/NamespaceFile.ts
diff --git a/tools/linter/components/NamespacesFolder.ts → src/linter/components/NamespacesFolder.ts b/tools/linter/components/NamespacesFolder.ts → src/linter/components/NamespacesFolder.ts
diff --git a/tools/linter/components/Operation.ts → src/linter/components/Operation.ts b/tools/linter/components/Operation.ts → src/linter/components/Operation.ts
diff --git a/tools/linter/components/OperationGroup.ts → src/linter/components/OperationGroup.ts b/tools/linter/components/OperationGroup.ts → src/linter/components/OperationGroup.ts
diff --git a/tools/linter/components/Schema.ts → src/linter/components/Schema.ts b/tools/linter/components/Schema.ts → src/linter/components/Schema.ts
diff --git a/tools/linter/components/SchemaFile.ts → src/linter/components/SchemaFile.ts b/tools/linter/components/SchemaFile.ts → src/linter/components/SchemaFile.ts
diff --git a/tools/linter/components/SchemasFolder.ts → src/linter/components/SchemasFolder.ts b/tools/linter/components/SchemasFolder.ts → src/linter/components/SchemasFolder.ts
diff --git a/...er/components/SupersededOperationsFile.ts → ...er/components/SupersededOperationsFile.ts b/...er/components/SupersededOperationsFile.ts → ...er/components/SupersededOperationsFile.ts
diff --git a/...s/linter/components/base/FileValidator.ts → src/linter/components/base/FileValidator.ts b/...s/linter/components/base/FileValidator.ts → src/linter/components/base/FileValidator.ts
diff --git a/...linter/components/base/FolderValidator.ts → ...linter/components/base/FolderValidator.ts b/...linter/components/base/FolderValidator.ts → ...linter/components/base/FolderValidator.ts
diff --git a/...s/linter/components/base/ValidatorBase.ts → src/linter/components/base/ValidatorBase.ts b/...s/linter/components/base/ValidatorBase.ts → src/linter/components/base/ValidatorBase.ts
diff --git a/tools/linter/lint.ts → src/linter/lint.ts b/tools/linter/lint.ts → src/linter/lint.ts
diff --git a/tools/linter/utils/SpecificationVisitor.ts → src/linter/utils/SpecificationVisitor.ts b/tools/linter/utils/SpecificationVisitor.ts → src/linter/utils/SpecificationVisitor.ts
diff --git a/tools/linter/utils/index.ts → src/linter/utils/index.ts b/tools/linter/utils/index.ts → src/linter/utils/index.ts
diff --git a/tools/merger/GlobalParamsGenerator.ts → src/merger/GlobalParamsGenerator.ts b/tools/merger/GlobalParamsGenerator.ts → src/merger/GlobalParamsGenerator.ts
diff --git a/tools/merger/OpenApiMerger.ts → src/merger/OpenApiMerger.ts b/tools/merger/OpenApiMerger.ts → src/merger/OpenApiMerger.ts
diff --git a/tools/merger/OpenDistro.ts → src/merger/OpenDistro.ts b/tools/merger/OpenDistro.ts → src/merger/OpenDistro.ts
diff --git a/tools/merger/SupersededOpsGenerator.ts → src/merger/SupersededOpsGenerator.ts b/tools/merger/SupersededOpsGenerator.ts → src/merger/SupersededOpsGenerator.ts
diff --git a/tools/merger/merge.ts → src/merger/merge.ts b/tools/merger/merge.ts → src/merger/merge.ts
@@ -5,7 +5,7 @@ import { resolve } from 'path'
 const command = new Command()
   .description('Merges the multi-file OpenSearch spec into a single file for programmatic use.')
   .addOption(new Option('-s, --source <path>', 'path to the root folder of the multi-file spec').default(resolve(__dirname, '../../spec')))
-  .addOption(new Option('-o, --output <path>', 'output file name').default(resolve(__dirname, '.././build/opensearch-openapi.yaml')))
+  .addOption(new Option('-o, --output <path>', 'output file name').default(resolve(__dirname, '../../build/opensearch-openapi.yaml')))
   .allowExcessArguments(false)
   .parse()
 

diff --git a/tools/types.ts → src/types.ts b/tools/types.ts → src/types.ts
diff --git a/tests/tools/linter/InfoFile.test.ts → tests/linter/InfoFile.test.ts b/tests/tools/linter/InfoFile.test.ts → tests/linter/InfoFile.test.ts
@@ -1,7 +1,7 @@
-import InfoFile from '../../../tools/linter/components/InfoFile'
+import InfoFile from 'linter/components/InfoFile'
 
 test('validate()', () => {
-  const validator = new InfoFile('./tests/tools/linter/fixtures/_info.yaml')
+  const validator = new InfoFile('./tests/linter/fixtures/_info.yaml')
   expect(validator.validate()).toEqual([
     {
       file: 'fixtures/_info.yaml',

diff --git a/...inter/InlineObjectSchemaValidator.test.ts → ...inter/InlineObjectSchemaValidator.test.ts b/...inter/InlineObjectSchemaValidator.test.ts → ...inter/InlineObjectSchemaValidator.test.ts
@@ -1,9 +1,9 @@
-import SchemasFolder from '../../../tools/linter/components/SchemasFolder'
-import NamespacesFolder from '../../../tools/linter/components/NamespacesFolder'
-import InlineObjectSchemaValidator from '../../../tools/linter/InlineObjectSchemaValidator'
+import SchemasFolder from 'linter/components/SchemasFolder'
+import NamespacesFolder from 'linter/components/NamespacesFolder'
+import InlineObjectSchemaValidator from 'linter/InlineObjectSchemaValidator'
 
 test('validate()', () => {
-  const root_folder = './tests/tools/linter/fixtures/inline_object_schema_validator'
+  const root_folder = './tests/linter/fixtures/inline_object_schema_validator'
   const namespaces_folder = new NamespacesFolder(`${root_folder}/namespaces`)
   const schemas_folder = new SchemasFolder(`${root_folder}/schemas`)
   const validator = new InlineObjectSchemaValidator(namespaces_folder, schemas_folder)

diff --git a/tests/tools/linter/NamespaceFile.test.ts → tests/linter/NamespaceFile.test.ts b/tests/tools/linter/NamespaceFile.test.ts → tests/linter/NamespaceFile.test.ts
diff --git a/tests/tools/linter/NamespacesFolder.test.ts → tests/linter/NamespacesFolder.test.ts b/tests/tools/linter/NamespacesFolder.test.ts → tests/linter/NamespacesFolder.test.ts
@@ -1,7 +1,7 @@
-import NamespacesFolder from '../../../tools/linter/components/NamespacesFolder'
+import NamespacesFolder from 'linter/components/NamespacesFolder'
 
 test('validate() - When there invalid files', () => {
-  const validator = new NamespacesFolder('./tests/tools/linter/fixtures/folder_validators/namespaces/invalid_files')
+  const validator = new NamespacesFolder('./tests/linter/fixtures/folder_validators/namespaces/invalid_files')
   expect(validator.validate()).toEqual([
     {
       file: 'invalid_files/indices.txt',
@@ -37,7 +37,7 @@ test('validate() - When there invalid files', () => {
 })
 
 test('validate() - When the files are valid but the folder is not', () => {
-  const validator = new NamespacesFolder('./tests/tools/linter/fixtures/folder_validators/namespaces/invalid_folder')
+  const validator = new NamespacesFolder('./tests/linter/fixtures/folder_validators/namespaces/invalid_folder')
   expect(validator.validate()).toEqual([
     {
       file: 'invalid_folder/',

diff --git a/tests/tools/linter/Operation.test.ts → tests/linter/Operation.test.ts b/tests/tools/linter/Operation.test.ts → tests/linter/Operation.test.ts
diff --git a/tests/tools/linter/OperationGroup.test.ts → tests/linter/OperationGroup.test.ts b/tests/tools/linter/OperationGroup.test.ts → tests/linter/OperationGroup.test.ts
diff --git a/tests/tools/linter/Schema.test.ts → tests/linter/Schema.test.ts b/tests/tools/linter/Schema.test.ts → tests/linter/Schema.test.ts
diff --git a/tests/tools/linter/SchemaFile.test.ts → tests/linter/SchemaFile.test.ts b/tests/tools/linter/SchemaFile.test.ts → tests/linter/SchemaFile.test.ts
diff --git a/.../tools/linter/SchemaRefsValidator.test.ts → tests/linter/SchemaRefsValidator.test.ts b/.../tools/linter/SchemaRefsValidator.test.ts → tests/linter/SchemaRefsValidator.test.ts
@@ -1,9 +1,9 @@
-import SchemasFolder from '../../../tools/linter/components/SchemasFolder'
-import NamespacesFolder from '../../../tools/linter/components/NamespacesFolder'
-import SchemaRefsValidator from '../../../tools/linter/SchemaRefsValidator'
+import SchemasFolder from 'linter/components/SchemasFolder'
+import NamespacesFolder from 'linter/components/NamespacesFolder'
+import SchemaRefsValidator from 'linter/SchemaRefsValidator'
 
 test('validate()', () => {
-  const root_folder = './tests/tools/linter/fixtures/schema_refs_validator'
+  const root_folder = './tests/linter/fixtures/schema_refs_validator'
   const namespaces_folder = new NamespacesFolder(`${root_folder}/namespaces`)
   const schemas_folder = new SchemasFolder(`${root_folder}/schemas`)
   const validator = new SchemaRefsValidator(namespaces_folder, schemas_folder)

diff --git a/tests/tools/linter/SpecValidator.test.ts → tests/linter/SpecValidator.test.ts b/tests/tools/linter/SpecValidator.test.ts → tests/linter/SpecValidator.test.ts
@@ -1,7 +1,7 @@
-import SpecValidator from '../../../tools/linter/SpecValidator'
+import SpecValidator from 'linter/SpecValidator'
 
 test('validate()', () => {
-  const validator = new SpecValidator('./tests/tools/linter/fixtures/empty')
+  const validator = new SpecValidator('./tests/linter/fixtures/empty')
   expect(validator.validate()).toEqual([])
 
   validator.namespaces_folder.validate = jest.fn().mockReturnValue([{ file: 'namespaces/', message: 'namespace error' }])

diff --git a/...s/linter/SupersededOperationsFile.test.ts → ...s/linter/SupersededOperationsFile.test.ts b/...s/linter/SupersededOperationsFile.test.ts → ...s/linter/SupersededOperationsFile.test.ts
@@ -1,7 +1,7 @@
-import SupersededOperationsFile from '../../../tools/linter/components/SupersededOperationsFile'
+import SupersededOperationsFile from 'linter/components/SupersededOperationsFile'
 
 test('validate()', () => {
-  const validator = new SupersededOperationsFile('./tests/tools/linter/fixtures/_superseded_operations.yaml')
+  const validator = new SupersededOperationsFile('./tests/linter/fixtures/_superseded_operations.yaml')
   expect(validator.validate()).toEqual([
     {
       file: 'fixtures/_superseded_operations.yaml',

diff --git a/.../tools/linter/factories/namespace_file.ts → tests/linter/factories/namespace_file.ts b/.../tools/linter/factories/namespace_file.ts → tests/linter/factories/namespace_file.ts
@@ -1,9 +1,9 @@
-import NamespaceFile from '../../../../tools/linter/components/NamespaceFile'
+import NamespaceFile from 'linter/components/NamespaceFile'
 import { type OpenAPIV3 } from 'openapi-types'
 import { mocked_operation_group } from './operation_group'
 
 export function namespace_file (fixture_file: string): NamespaceFile {
-  return new NamespaceFile(`./tests/tools/linter/fixtures/file_validators/namespaces/${fixture_file}`)
+  return new NamespaceFile(`./tests/linter/fixtures/file_validators/namespaces/${fixture_file}`)
 }
 
 interface MockedReturnedValues {

diff --git a/tests/tools/linter/factories/operation.ts → tests/linter/factories/operation.ts b/tests/tools/linter/factories/operation.ts → tests/linter/factories/operation.ts
@@ -1,5 +1,5 @@
-import Operation from '../../../../tools/linter/components/Operation'
-import { type OperationSpec } from '../../../../tools/types'
+import Operation from 'linter/components/Operation'
+import { type OperationSpec } from 'types'
 
 export function operation (spec: Record<string, any>, file_name = 'indices.yaml'): Operation {
   return new Operation(`namespaces/${file_name}`, '/{index}/something/{abc_xyz}', 'post', spec as OperationSpec)

diff --git a/...tools/linter/factories/operation_group.ts → tests/linter/factories/operation_group.ts b/...tools/linter/factories/operation_group.ts → tests/linter/factories/operation_group.ts
@@ -1,4 +1,4 @@
-import OperationGroup from '../../../../tools/linter/components/OperationGroup'
+import OperationGroup from 'linter/components/OperationGroup'
 import { operation, mocked_operation } from './operation'
 
 export function operation_group (operation_specs: Array<Record<string, any>>): OperationGroup {

diff --git a/tests/tools/linter/factories/schema.ts → tests/linter/factories/schema.ts b/tests/tools/linter/factories/schema.ts → tests/linter/factories/schema.ts
@@ -1,4 +1,4 @@
-import Schema from '../../../../tools/linter/components/Schema'
+import Schema from 'linter/components/Schema'
 import { type OpenAPIV3 } from 'openapi-types'
 
 export function schema (name: string, spec: Record<string, any> = {}): Schema {

diff --git a/tests/tools/linter/factories/schema_file.ts → tests/linter/factories/schema_file.ts b/tests/tools/linter/factories/schema_file.ts → tests/linter/factories/schema_file.ts
@@ -1,8 +1,8 @@
 import { mocked_schema } from './schema'
-import SchemaFile from '../../../../tools/linter/components/SchemaFile'
+import SchemaFile from 'linter/components/SchemaFile'
 
 export function schema_file (fixture: string): SchemaFile {
-  return new SchemaFile(`./tests/tools/linter/fixtures/file_validators/schemas/${fixture}`)
+  return new SchemaFile(`./tests/linter/fixtures/file_validators/schemas/${fixture}`)
 }
 
 interface MockedReturnedValues {

diff --git a/tests/tools/linter/fixtures/_info.yaml → tests/linter/fixtures/_info.yaml b/tests/tools/linter/fixtures/_info.yaml → tests/linter/fixtures/_info.yaml
diff --git a/...nter/fixtures/_superseded_operations.yaml → ...nter/fixtures/_superseded_operations.yaml b/...nter/fixtures/_superseded_operations.yaml → ...nter/fixtures/_superseded_operations.yaml
diff --git a/tests/tools/linter/fixtures/empty/_info.yaml → tests/linter/fixtures/empty/_info.yaml b/tests/tools/linter/fixtures/empty/_info.yaml → tests/linter/fixtures/empty/_info.yaml
diff --git a/...ixtures/empty/_superseded_operations.yaml → ...ixtures/empty/_superseded_operations.yaml b/...ixtures/empty/_superseded_operations.yaml → ...ixtures/empty/_superseded_operations.yaml
diff --git a/...linter/fixtures/empty/namespaces/.gitkeep → ...linter/fixtures/empty/namespaces/.gitkeep b/...linter/fixtures/empty/namespaces/.gitkeep → ...linter/fixtures/empty/namespaces/.gitkeep
diff --git a/...er/fixtures/empty/opensearch-openapi.yaml → ...er/fixtures/empty/opensearch-openapi.yaml b/...er/fixtures/empty/opensearch-openapi.yaml → ...er/fixtures/empty/opensearch-openapi.yaml
diff --git a/...ls/linter/fixtures/empty/schemas/.gitkeep → tests/linter/fixtures/empty/schemas/.gitkeep b/...ls/linter/fixtures/empty/schemas/.gitkeep → tests/linter/fixtures/empty/schemas/.gitkeep
diff --git a/...res/file_validators/namespaces/empty.yaml → ...res/file_validators/namespaces/empty.yaml b/...res/file_validators/namespaces/empty.yaml → ...res/file_validators/namespaces/empty.yaml
diff --git a/...dators/namespaces/invalid_components.yaml → ...dators/namespaces/invalid_components.yaml b/...dators/namespaces/invalid_components.yaml → ...dators/namespaces/invalid_components.yaml
diff --git a/...ile_validators/schemas/_common.empty.yaml → ...ile_validators/schemas/_common.empty.yaml b/...ile_validators/schemas/_common.empty.yaml → ...ile_validators/schemas/_common.empty.yaml
diff --git a/...idators/namespaces/invalid_files/cat.yaml → ...idators/namespaces/invalid_files/cat.yaml b/...idators/namespaces/invalid_files/cat.yaml → ...idators/namespaces/invalid_files/cat.yaml
diff --git a/.../namespaces/invalid_files/dup_path_a.yaml → .../namespaces/invalid_files/dup_path_a.yaml b/.../namespaces/invalid_files/dup_path_a.yaml → .../namespaces/invalid_files/dup_path_a.yaml
diff --git a/.../namespaces/invalid_files/dup_path_b.yaml → .../namespaces/invalid_files/dup_path_b.yaml b/.../namespaces/invalid_files/dup_path_b.yaml → .../namespaces/invalid_files/dup_path_b.yaml
diff --git a/.../namespaces/invalid_files/dup_path_c.yaml → .../namespaces/invalid_files/dup_path_c.yaml b/.../namespaces/invalid_files/dup_path_c.yaml → .../namespaces/invalid_files/dup_path_c.yaml
diff --git a/...tors/namespaces/invalid_files/indices.txt → ...tors/namespaces/invalid_files/indices.txt b/...tors/namespaces/invalid_files/indices.txt → ...tors/namespaces/invalid_files/indices.txt
diff --git a/...amespaces/invalid_files/invalid_spec.yaml → ...amespaces/invalid_files/invalid_spec.yaml b/...amespaces/invalid_files/invalid_spec.yaml → ...amespaces/invalid_files/invalid_spec.yaml
diff --git a/...amespaces/invalid_files/invalid_yaml.yaml → ...amespaces/invalid_files/invalid_yaml.yaml b/...amespaces/invalid_files/invalid_yaml.yaml → ...amespaces/invalid_files/invalid_yaml.yaml
diff --git a/...dators/namespaces/invalid_folder/cat.yaml → ...dators/namespaces/invalid_folder/cat.yaml b/...dators/namespaces/invalid_folder/cat.yaml → ...dators/namespaces/invalid_folder/cat.yaml
diff --git a/...namespaces/invalid_folder/dup_path_a.yaml → ...namespaces/invalid_folder/dup_path_a.yaml b/...namespaces/invalid_folder/dup_path_a.yaml → ...namespaces/invalid_folder/dup_path_a.yaml
diff --git a/...namespaces/invalid_folder/dup_path_b.yaml → ...namespaces/invalid_folder/dup_path_b.yaml b/...namespaces/invalid_folder/dup_path_b.yaml → ...namespaces/invalid_folder/dup_path_b.yaml
diff --git a/...namespaces/invalid_folder/dup_path_c.yaml → ...namespaces/invalid_folder/dup_path_c.yaml b/...namespaces/invalid_folder/dup_path_c.yaml → ...namespaces/invalid_folder/dup_path_c.yaml
diff --git a/...ject_schema_validator/namespaces/ops.yaml → ...ject_schema_validator/namespaces/ops.yaml b/...ject_schema_validator/namespaces/ops.yaml → ...ject_schema_validator/namespaces/ops.yaml
diff --git a/...ect_schema_validator/schemas/schemas.yaml → ...ect_schema_validator/schemas/schemas.yaml b/...ect_schema_validator/schemas/schemas.yaml → ...ect_schema_validator/schemas/schemas.yaml
diff --git a/...ma_refs_validator/namespaces/indices.yaml → ...ma_refs_validator/namespaces/indices.yaml b/...ma_refs_validator/namespaces/indices.yaml → ...ma_refs_validator/namespaces/indices.yaml
diff --git a/...chema_refs_validator/schemas/animals.yaml → ...chema_refs_validator/schemas/animals.yaml b/...chema_refs_validator/schemas/animals.yaml → ...chema_refs_validator/schemas/animals.yaml
diff --git a/...schema_refs_validator/schemas/others.yaml → ...schema_refs_validator/schemas/others.yaml b/...schema_refs_validator/schemas/others.yaml → ...schema_refs_validator/schemas/others.yaml
diff --git a/tests/merger/OpenApiMerger.test.ts b/tests/merger/OpenApiMerger.test.ts
@@ -0,0 +1,10 @@
+import OpenApiMerger from 'merger/OpenApiMerger'
+import fs from 'fs'
+
+test('merge()', async () => {
+  const merger = new OpenApiMerger('./tests/merger/fixtures/spec/')
+  merger.merge('./tests/merger/opensearch-openapi.yaml')
+  expect(fs.readFileSync('./tests/merger/fixtures/expected.yaml', 'utf8'))
+    .toEqual(fs.readFileSync('./tests/merger/opensearch-openapi.yaml', 'utf8'))
+  fs.unlinkSync('./tests/merger/opensearch-openapi.yaml')
+})
diff --git a/tests/tools/merger/fixtures/expected.yaml → tests/merger/fixtures/expected.yaml b/tests/tools/merger/fixtures/expected.yaml → tests/merger/fixtures/expected.yaml
diff --git a/...ger/fixtures/spec/_global_parameters.yaml → ...ger/fixtures/spec/_global_parameters.yaml b/...ger/fixtures/spec/_global_parameters.yaml → ...ger/fixtures/spec/_global_parameters.yaml
diff --git a/tests/tools/merger/fixtures/spec/_info.yaml → tests/merger/fixtures/spec/_info.yaml b/tests/tools/merger/fixtures/spec/_info.yaml → tests/merger/fixtures/spec/_info.yaml
diff --git a/...fixtures/spec/_superseded_operations.yaml → ...fixtures/spec/_superseded_operations.yaml b/...fixtures/spec/_superseded_operations.yaml → ...fixtures/spec/_superseded_operations.yaml
diff --git a/...ger/fixtures/spec/namespaces/indices.yaml → ...ger/fixtures/spec/namespaces/indices.yaml b/...ger/fixtures/spec/namespaces/indices.yaml → ...ger/fixtures/spec/namespaces/indices.yaml
diff --git a/...ger/fixtures/spec/namespaces/shelter.yaml → ...ger/fixtures/spec/namespaces/shelter.yaml b/...ger/fixtures/spec/namespaces/shelter.yaml → ...ger/fixtures/spec/namespaces/shelter.yaml
diff --git a/...merger/fixtures/spec/schemas/actions.yaml → ...merger/fixtures/spec/schemas/actions.yaml b/...merger/fixtures/spec/schemas/actions.yaml → ...merger/fixtures/spec/schemas/actions.yaml
diff --git a/...merger/fixtures/spec/schemas/animals.yaml → ...merger/fixtures/spec/schemas/animals.yaml b/...merger/fixtures/spec/schemas/animals.yaml → ...merger/fixtures/spec/schemas/animals.yaml
diff --git a/tests/tools/merger/OpenApiMerger.test.ts b/tests/tools/merger/OpenApiMerger.test.ts
diff --git a/tsconfig.json b/tsconfig.json
@@ -28,7 +28,7 @@
     "module": "commonjs",                                /* Specify what module code is generated. */
     // "rootDir": "./",                                  /* Specify the root folder within your source files. */
     // "moduleResolution": "node10",                     /* Specify how TypeScript looks up a file from a given module specifier. */
-    // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
+    "baseUrl": "./src",                                  /* Specify the base directory to resolve non-relative module names. */
     // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
     // "rootDirs": [],                                   /* Allow multiple folders to be treated as one when resolving modules. */
     // "typeRoots": [],                                  /* Specify multiple folders that act like './node_modules/@types'. */