diff --git a/package-lock.json b/package-lock.json index 29cba2338..6ef8ca241 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9051,6 +9051,10 @@ "webapi-parser": "^0.5.0" } }, + "node_modules/parserapiv3": { + "resolved": "packages/parser", + "link": true + }, "node_modules/patch-text": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/patch-text/-/patch-text-1.0.2.tgz", @@ -12015,11 +12019,11 @@ "dependencies": { "@asyncapi/avro-schema-parser": "^3.0.3", "@asyncapi/openapi-schema-parser": "^3.0.4", - "@asyncapi/parser": "file:../parser", "@asyncapi/protobuf-schema-parser": "^3.0.0", "@asyncapi/raml-dt-schema-parser": "^4.0.4", "parserapiv1": "npm:@asyncapi/parser@^2.1.0", - "parserapiv2": "npm:@asyncapi/parser@3.0.0-next-major-spec.8" + "parserapiv2": "npm:@asyncapi/parser@3.0.0-next-major-spec.8", + "parserapiv3": "file:../parser" }, "devDependencies": { "@jest/types": "^29.0.2", diff --git a/packages/multi-parser/jest.config.ts b/packages/multi-parser/jest.config.ts index ec7f1cd2a..53bedc3cb 100644 --- a/packages/multi-parser/jest.config.ts +++ b/packages/multi-parser/jest.config.ts @@ -22,7 +22,7 @@ const config: Config.InitialOptions = { 'src/**' ], moduleNameMapper: { - '^@asyncapi/parser$': path.resolve(__dirname, '../parser') + '^parserapiv3$': path.resolve(__dirname, '../parser') } }; diff --git a/packages/multi-parser/package.json b/packages/multi-parser/package.json index b6dd86026..031f2e824 100644 --- a/packages/multi-parser/package.json +++ b/packages/multi-parser/package.json @@ -45,7 +45,7 @@ "@asyncapi/raml-dt-schema-parser": "^4.0.4", "parserapiv1": "npm:@asyncapi/parser@^2.1.0", "parserapiv2": "npm:@asyncapi/parser@3.0.0-next-major-spec.8", - "@asyncapi/parser": "file:../parser" + "parserapiv3": "file:../parser" }, "devDependencies": { diff --git a/packages/multi-parser/src/convert.ts b/packages/multi-parser/src/convert.ts index 5ca12044c..f8916e6a4 100644 --- a/packages/multi-parser/src/convert.ts +++ b/packages/multi-parser/src/convert.ts @@ -1,14 +1,14 @@ import { createAsyncAPIDocument as createAsyncAPIDocumentParserV1 } from 'parserapiv1'; import { createAsyncAPIDocument as createAsyncAPIDocumentParserV2 } from 'parserapiv2'; -import { createAsyncAPIDocument as createAsyncAPIDocumentParserV3 } from '@asyncapi/parser/esm/index'; +import { createAsyncAPIDocument as createAsyncAPIDocumentParserV3 } from 'parserapiv3/esm/index'; import type { AsyncAPIDocumentInterface as AsyncAPIDocumentInterfaceParserV1 } from 'parserapiv1'; import type { AsyncAPIDocumentInterface as AsyncAPIDocumentInterfaceParserV2 } from 'parserapiv2'; -import type { AsyncAPIDocumentInterface as AsyncAPIDocumentInterfaceParserV3 } from '@asyncapi/parser/esm/index'; +import type { AsyncAPIDocumentInterface as AsyncAPIDocumentInterfaceParserV3 } from 'parserapiv3/esm/index'; import type { DetailedAsyncAPI as DetailedAsyncAPIParserV1 } from 'parserapiv1/esm/types'; import type { DetailedAsyncAPI as DetailedAsyncAPIParserV2 } from 'parserapiv2/esm/types'; -import type { DetailedAsyncAPI as DetailedAsyncAPIParserV3 } from '@asyncapi/parser/esm/types'; +import type { DetailedAsyncAPI as DetailedAsyncAPIParserV3 } from 'parserapiv3/esm/types'; export type AsyncAPIDocument = AsyncAPIDocumentInterfaceParserV1 | AsyncAPIDocumentInterfaceParserV2 | AsyncAPIDocumentInterfaceParserV3; diff --git a/packages/multi-parser/src/parse.ts b/packages/multi-parser/src/parse.ts index 73df755ec..9569b3502 100644 --- a/packages/multi-parser/src/parse.ts +++ b/packages/multi-parser/src/parse.ts @@ -1,6 +1,6 @@ import { Parser as ParserV1 } from 'parserapiv1'; import { Parser as ParserV2 } from 'parserapiv2'; -import { Parser as ParserV3 } from '@asyncapi/parser/esm/index'; +import { Parser as ParserV3 } from 'parserapiv3/esm/index'; import { AvroSchemaParser } from '@asyncapi/avro-schema-parser'; import { OpenAPISchemaParser } from '@asyncapi/openapi-schema-parser'; @@ -9,7 +9,7 @@ import { ProtoBuffSchemaParser } from '@asyncapi/protobuf-schema-parser'; import type { ParserOptions as ParserOptionsParserV1 } from 'parserapiv1/esm/parser'; import type { ParserOptions as ParserOptionsParserV2 } from 'parserapiv2/esm/parser'; -import type { ParserOptions as ParserOptionsParserV3 } from '@asyncapi/parser/esm/parser'; +import type { ParserOptions as ParserOptionsParserV3 } from 'parserapiv3/esm/parser'; export type ParserOptions = ParserOptionsParserV1 | ParserOptionsParserV2 | ParserOptionsParserV3; export type Options = { diff --git a/packages/multi-parser/test/convert.spec.ts b/packages/multi-parser/test/convert.spec.ts index bf89f70e7..82b4acfd1 100644 --- a/packages/multi-parser/test/convert.spec.ts +++ b/packages/multi-parser/test/convert.spec.ts @@ -1,7 +1,7 @@ import { Parser as ParserV1 } from 'parserapiv1'; import { Parser as ParserV2 } from 'parserapiv2'; -import { Parser as ParserV3 } from '@asyncapi/parser/esm/index'; +import { Parser as ParserV3 } from 'parserapiv3/esm/index'; import { AsyncAPIDocument, ConvertDocumentParserAPIVersion } from '../src/convert'; diff --git a/packages/multi-parser/test/parse.spec.ts b/packages/multi-parser/test/parse.spec.ts index 58674eb20..303516c1f 100644 --- a/packages/multi-parser/test/parse.spec.ts +++ b/packages/multi-parser/test/parse.spec.ts @@ -1,7 +1,7 @@ import { Parser as ParserV1 } from 'parserapiv1'; import { Parser as ParserV2 } from 'parserapiv2'; -import { Parser as ParserV3 } from '@asyncapi/parser/esm/index'; +import { Parser as ParserV3 } from 'parserapiv3/esm/index'; import { AvroSchemaParser } from '@asyncapi/avro-schema-parser'; import { OpenAPISchemaParser } from '@asyncapi/openapi-schema-parser';