@axinom/mosaic-cli 0.18.4 → 0.18.5-rc.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/commands/msg-codegen/codegen.d.ts +4 -4
- package/dist/commands/msg-codegen/codegen.js +66 -229
- package/dist/commands/msg-codegen/codegen.js.map +1 -1
- package/dist/commands/msg-codegen/presets.d.ts +21 -0
- package/dist/commands/msg-codegen/presets.js +119 -0
- package/dist/commands/msg-codegen/presets.js.map +1 -0
- package/dist/commands/msg-codegen/utils.d.ts +56 -0
- package/dist/commands/msg-codegen/utils.js +220 -0
- package/dist/commands/msg-codegen/utils.js.map +1 -0
- package/dist/commands/msg-diff/msg-diff.d.ts +3 -3
- package/dist/commands/msg-diff/msg-diff.js +28 -15
- package/dist/commands/msg-diff/msg-diff.js.map +1 -1
- package/package.json +7 -7
- package/src/commands/msg-codegen/codegen.ts +84 -248
- package/src/commands/msg-codegen/presets.ts +138 -0
- package/src/commands/msg-codegen/utils.ts +258 -0
- package/src/commands/msg-diff/msg-diff.spec.ts +44 -27
- package/src/commands/msg-diff/msg-diff.ts +48 -22
- package/src/commands/msg-diff/test-resources/0/1-asyncapi.yml +2 -2
- package/src/commands/msg-diff/test-resources/0/2-asyncapi.yml +2 -2
- package/src/commands/msg-diff/test-resources/1/1-asyncapi.yml +1 -1
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import { ConstrainedObjectPropertyModel } from '@asyncapi/modelina';
|
|
2
|
+
import { AsyncAPIDocumentInterface, ChannelInterface, MessageInterface, SpecTypesV2 } from '@asyncapi/parser';
|
|
3
|
+
export declare function getRelativeDir(from: string, to: string): string;
|
|
4
|
+
export declare function getMessageTitle(message: MessageInterface): string;
|
|
5
|
+
/**
|
|
6
|
+
* Retrieve Service Title from AsyncAPI document.
|
|
7
|
+
* As Title returned value set in info.title property of document.
|
|
8
|
+
* @param asyncAPIDocument - AsyncAPI document.
|
|
9
|
+
*/
|
|
10
|
+
export declare function getServiceTitle(asyncAPIDocument: AsyncAPIDocumentInterface): string;
|
|
11
|
+
/**
|
|
12
|
+
* Retrieve Service Id from AsyncAPI document.
|
|
13
|
+
* As Id returned value set in extension property `x-service-id`.
|
|
14
|
+
* If extension property is not set - returned Service Title in lower-kebab-case.
|
|
15
|
+
* @param asyncAPIDocument - AsyncAPI document.
|
|
16
|
+
*/
|
|
17
|
+
export declare function getServiceId(asyncAPIDocument: AsyncAPIDocumentInterface): string;
|
|
18
|
+
/**
|
|
19
|
+
* Retrieves whether a channel is for subscribing or publishing.
|
|
20
|
+
* Currently, only channels with a single operation are supported.
|
|
21
|
+
* @param channel - Channel object.
|
|
22
|
+
*/
|
|
23
|
+
export declare function getChannelAction(channel: ChannelInterface): 'subscribe' | 'publish';
|
|
24
|
+
/**
|
|
25
|
+
* Retrieves the payload model name for a channel.
|
|
26
|
+
* Currently, only channels with a single message are supported.
|
|
27
|
+
* @param channel - Channel object.
|
|
28
|
+
*/
|
|
29
|
+
export declare function getPayloadTitle(channel: ChannelInterface): string | undefined;
|
|
30
|
+
/**
|
|
31
|
+
* Converts a path into a POSIX path by replacing current path separator with `/`.
|
|
32
|
+
* @param p - Path to convert.
|
|
33
|
+
*/
|
|
34
|
+
export declare function toPosixPath(p: string): string;
|
|
35
|
+
/**
|
|
36
|
+
* Generating the path prefix for model.
|
|
37
|
+
* model name ends with "command" - prefix "commands"
|
|
38
|
+
* model name ends with "event" - prefix "events"
|
|
39
|
+
* default prefix "types"
|
|
40
|
+
* @param modelName - name of the model, defined in json schema, or AsyncAPI document
|
|
41
|
+
*/
|
|
42
|
+
export declare function getModelPathPrefix(modelName: string): string;
|
|
43
|
+
export declare function removeXParserProperties(obj: SpecTypesV2.AsyncAPISchemaObject): SpecTypesV2.AsyncAPISchemaObject;
|
|
44
|
+
/**
|
|
45
|
+
* Replaces the `any` type in a type string.
|
|
46
|
+
*/
|
|
47
|
+
export declare function replaceAnyType(type: string, replacement: string): string;
|
|
48
|
+
export declare function indexOfNullPlain(model: ConstrainedObjectPropertyModel): number;
|
|
49
|
+
export declare function indexOfNullUnion(model: ConstrainedObjectPropertyModel): number;
|
|
50
|
+
export declare function indexOfNullOneOf(model: ConstrainedObjectPropertyModel): number;
|
|
51
|
+
export declare function indexOfNullArrayPlain(model: ConstrainedObjectPropertyModel): number;
|
|
52
|
+
export declare function indexOfNullArrayUnion(model: ConstrainedObjectPropertyModel): number;
|
|
53
|
+
export declare function indexOfNullArrayOneOf(model: ConstrainedObjectPropertyModel): number;
|
|
54
|
+
export declare function indexOfNullObjectProperty(model: ConstrainedObjectPropertyModel): number;
|
|
55
|
+
export declare function indexOfNullArrayProperty(model: ConstrainedObjectPropertyModel): number;
|
|
56
|
+
export declare function ensureNullable(type: string, index: number): string;
|
|
@@ -0,0 +1,220 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
exports.ensureNullable = exports.indexOfNullArrayProperty = exports.indexOfNullObjectProperty = exports.indexOfNullArrayOneOf = exports.indexOfNullArrayUnion = exports.indexOfNullArrayPlain = exports.indexOfNullOneOf = exports.indexOfNullUnion = exports.indexOfNullPlain = exports.replaceAnyType = exports.removeXParserProperties = exports.getModelPathPrefix = exports.toPosixPath = exports.getPayloadTitle = exports.getChannelAction = exports.getServiceId = exports.getServiceTitle = exports.getMessageTitle = exports.getRelativeDir = void 0;
|
|
4
|
+
const modelina_1 = require("@asyncapi/modelina");
|
|
5
|
+
const fs = require("fs");
|
|
6
|
+
const path = require("path");
|
|
7
|
+
function getRelativeDir(from, to) {
|
|
8
|
+
return fs.statSync(to).isFile()
|
|
9
|
+
? path.dirname(path.relative(from, to))
|
|
10
|
+
: path.relative(from, to);
|
|
11
|
+
}
|
|
12
|
+
exports.getRelativeDir = getRelativeDir;
|
|
13
|
+
function getMessageTitle(message) {
|
|
14
|
+
var _a, _b, _c, _d, _e, _f;
|
|
15
|
+
const messageTitle = (_d = (_b = (_a = message.payload()) === null || _a === void 0 ? void 0 : _a.title()) !== null && _b !== void 0 ? _b : (_c = message.extensions().get('x-parser-message-name')) === null || _c === void 0 ? void 0 : _c.value()) !== null && _d !== void 0 ? _d : (_f = (_e = message.payload()) === null || _e === void 0 ? void 0 : _e.extensions().get('x-parser-schema-id')) === null || _f === void 0 ? void 0 : _f.value();
|
|
16
|
+
if (messageTitle === undefined) {
|
|
17
|
+
throw new Error('Unable to determine message title.');
|
|
18
|
+
}
|
|
19
|
+
return messageTitle;
|
|
20
|
+
}
|
|
21
|
+
exports.getMessageTitle = getMessageTitle;
|
|
22
|
+
/**
|
|
23
|
+
* Retrieve Service Title from AsyncAPI document.
|
|
24
|
+
* As Title returned value set in info.title property of document.
|
|
25
|
+
* @param asyncAPIDocument - AsyncAPI document.
|
|
26
|
+
*/
|
|
27
|
+
function getServiceTitle(asyncAPIDocument) {
|
|
28
|
+
return asyncAPIDocument.info().title();
|
|
29
|
+
}
|
|
30
|
+
exports.getServiceTitle = getServiceTitle;
|
|
31
|
+
/**
|
|
32
|
+
* Retrieve Service Id from AsyncAPI document.
|
|
33
|
+
* As Id returned value set in extension property `x-service-id`.
|
|
34
|
+
* If extension property is not set - returned Service Title in lower-kebab-case.
|
|
35
|
+
* @param asyncAPIDocument - AsyncAPI document.
|
|
36
|
+
*/
|
|
37
|
+
function getServiceId(asyncAPIDocument) {
|
|
38
|
+
var _a, _b;
|
|
39
|
+
const serviceId = (_b = (_a = asyncAPIDocument.extensions().get('x-service-id')) === null || _a === void 0 ? void 0 : _a.value()) !== null && _b !== void 0 ? _b : asyncAPIDocument.info().title();
|
|
40
|
+
return modelina_1.FormatHelpers.toParamCase(serviceId);
|
|
41
|
+
}
|
|
42
|
+
exports.getServiceId = getServiceId;
|
|
43
|
+
/**
|
|
44
|
+
* Retrieves whether a channel is for subscribing or publishing.
|
|
45
|
+
* Currently, only channels with a single operation are supported.
|
|
46
|
+
* @param channel - Channel object.
|
|
47
|
+
*/
|
|
48
|
+
function getChannelAction(channel) {
|
|
49
|
+
const operations = channel.operations();
|
|
50
|
+
if (operations.length === 0) {
|
|
51
|
+
throw new Error('Channel has no operations');
|
|
52
|
+
}
|
|
53
|
+
if (operations.length > 1) {
|
|
54
|
+
throw new Error('Channel has more than one operation');
|
|
55
|
+
}
|
|
56
|
+
const action = operations[0].action();
|
|
57
|
+
if (action !== 'subscribe' && action !== 'publish') {
|
|
58
|
+
throw new Error(`Channel has unsupported action: ${action}`);
|
|
59
|
+
}
|
|
60
|
+
return action;
|
|
61
|
+
}
|
|
62
|
+
exports.getChannelAction = getChannelAction;
|
|
63
|
+
/**
|
|
64
|
+
* Retrieves the payload model name for a channel.
|
|
65
|
+
* Currently, only channels with a single message are supported.
|
|
66
|
+
* @param channel - Channel object.
|
|
67
|
+
*/
|
|
68
|
+
function getPayloadTitle(channel) {
|
|
69
|
+
var _a;
|
|
70
|
+
const messages = channel.messages();
|
|
71
|
+
if (messages.length === 0) {
|
|
72
|
+
throw new Error('Channel has no messages');
|
|
73
|
+
}
|
|
74
|
+
if (messages.length > 1) {
|
|
75
|
+
throw new Error('Channel has more than one message');
|
|
76
|
+
}
|
|
77
|
+
return (_a = messages[0].payload()) === null || _a === void 0 ? void 0 : _a.title();
|
|
78
|
+
}
|
|
79
|
+
exports.getPayloadTitle = getPayloadTitle;
|
|
80
|
+
/**
|
|
81
|
+
* Converts a path into a POSIX path by replacing current path separator with `/`.
|
|
82
|
+
* @param p - Path to convert.
|
|
83
|
+
*/
|
|
84
|
+
function toPosixPath(p) {
|
|
85
|
+
return path.posix.join(...p.split(path.sep));
|
|
86
|
+
}
|
|
87
|
+
exports.toPosixPath = toPosixPath;
|
|
88
|
+
/**
|
|
89
|
+
* Generating the path prefix for model.
|
|
90
|
+
* model name ends with "command" - prefix "commands"
|
|
91
|
+
* model name ends with "event" - prefix "events"
|
|
92
|
+
* default prefix "types"
|
|
93
|
+
* @param modelName - name of the model, defined in json schema, or AsyncAPI document
|
|
94
|
+
*/
|
|
95
|
+
function getModelPathPrefix(modelName) {
|
|
96
|
+
return modelName
|
|
97
|
+
? modelName.toLowerCase().endsWith('command')
|
|
98
|
+
? 'commands'
|
|
99
|
+
: modelName.toLowerCase().endsWith('event')
|
|
100
|
+
? 'events'
|
|
101
|
+
: 'types'
|
|
102
|
+
: 'types';
|
|
103
|
+
}
|
|
104
|
+
exports.getModelPathPrefix = getModelPathPrefix;
|
|
105
|
+
function removeXParserProperties(obj) {
|
|
106
|
+
if (Array.isArray(obj)) {
|
|
107
|
+
return obj.map(removeXParserProperties);
|
|
108
|
+
}
|
|
109
|
+
else if (obj !== null && typeof obj === 'object') {
|
|
110
|
+
const newObj = {};
|
|
111
|
+
for (const [key, value] of Object.entries(obj)) {
|
|
112
|
+
if (!key.startsWith('x-parser-')) {
|
|
113
|
+
newObj[key] = removeXParserProperties(value);
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
return newObj;
|
|
117
|
+
}
|
|
118
|
+
else {
|
|
119
|
+
return obj;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
exports.removeXParserProperties = removeXParserProperties;
|
|
123
|
+
/**
|
|
124
|
+
* Replaces the `any` type in a type string.
|
|
125
|
+
*/
|
|
126
|
+
function replaceAnyType(type, replacement) {
|
|
127
|
+
const pattern = /\b(any)\b/g;
|
|
128
|
+
return type.replace(pattern, replacement);
|
|
129
|
+
}
|
|
130
|
+
exports.replaceAnyType = replaceAnyType;
|
|
131
|
+
function indexOfNullPlain(model) {
|
|
132
|
+
var _a;
|
|
133
|
+
if (model.property instanceof modelina_1.ConstrainedMetaModel &&
|
|
134
|
+
((_a = model.property.originalInput) === null || _a === void 0 ? void 0 : _a.nullable) === true) {
|
|
135
|
+
return 1; // Append null to the end of the type.
|
|
136
|
+
}
|
|
137
|
+
return -1;
|
|
138
|
+
}
|
|
139
|
+
exports.indexOfNullPlain = indexOfNullPlain;
|
|
140
|
+
function indexOfNullUnion(model) {
|
|
141
|
+
var _a, _b, _c;
|
|
142
|
+
if (model.property instanceof modelina_1.ConstrainedUnionModel) {
|
|
143
|
+
return (_c = (_b = (_a = model.property.originalInput) === null || _a === void 0 ? void 0 : _a.type) === null || _b === void 0 ? void 0 : _b.indexOf('null')) !== null && _c !== void 0 ? _c : -1;
|
|
144
|
+
}
|
|
145
|
+
return -1;
|
|
146
|
+
}
|
|
147
|
+
exports.indexOfNullUnion = indexOfNullUnion;
|
|
148
|
+
function indexOfNullOneOf(model) {
|
|
149
|
+
var _a, _b, _c;
|
|
150
|
+
if (model.property instanceof modelina_1.ConstrainedUnionModel) {
|
|
151
|
+
const types = (_b = (_a = model.property.originalInput) === null || _a === void 0 ? void 0 : _a.oneOf) === null || _b === void 0 ? void 0 : _b.map((m) => m.type);
|
|
152
|
+
return (_c = types === null || types === void 0 ? void 0 : types.indexOf('null')) !== null && _c !== void 0 ? _c : -1;
|
|
153
|
+
}
|
|
154
|
+
return -1;
|
|
155
|
+
}
|
|
156
|
+
exports.indexOfNullOneOf = indexOfNullOneOf;
|
|
157
|
+
function indexOfNullArrayPlain(model) {
|
|
158
|
+
var _a, _b;
|
|
159
|
+
if (model.property instanceof modelina_1.ConstrainedArrayModel &&
|
|
160
|
+
((_b = (_a = model.property.originalInput) === null || _a === void 0 ? void 0 : _a.items) === null || _b === void 0 ? void 0 : _b.nullable) === true) {
|
|
161
|
+
return 1; // Append null to the end of the type.
|
|
162
|
+
}
|
|
163
|
+
return -1;
|
|
164
|
+
}
|
|
165
|
+
exports.indexOfNullArrayPlain = indexOfNullArrayPlain;
|
|
166
|
+
function indexOfNullArrayUnion(model) {
|
|
167
|
+
var _a, _b, _c, _d;
|
|
168
|
+
if (model.property instanceof modelina_1.ConstrainedArrayModel) {
|
|
169
|
+
return (_d = (_c = (_b = (_a = model.property.originalInput) === null || _a === void 0 ? void 0 : _a.items) === null || _b === void 0 ? void 0 : _b.type) === null || _c === void 0 ? void 0 : _c.indexOf('null')) !== null && _d !== void 0 ? _d : -1;
|
|
170
|
+
}
|
|
171
|
+
return -1;
|
|
172
|
+
}
|
|
173
|
+
exports.indexOfNullArrayUnion = indexOfNullArrayUnion;
|
|
174
|
+
function indexOfNullArrayOneOf(model) {
|
|
175
|
+
var _a, _b, _c, _d;
|
|
176
|
+
if (model.property instanceof modelina_1.ConstrainedArrayModel) {
|
|
177
|
+
const types = (_c = (_b = (_a = model.property.originalInput) === null || _a === void 0 ? void 0 : _a.items) === null || _b === void 0 ? void 0 : _b.oneOf) === null || _c === void 0 ? void 0 : _c.map((m) => m.type);
|
|
178
|
+
return (_d = types === null || types === void 0 ? void 0 : types.indexOf('null')) !== null && _d !== void 0 ? _d : -1;
|
|
179
|
+
}
|
|
180
|
+
return -1;
|
|
181
|
+
}
|
|
182
|
+
exports.indexOfNullArrayOneOf = indexOfNullArrayOneOf;
|
|
183
|
+
function indexOfNullObjectProperty(model) {
|
|
184
|
+
if (indexOfNullPlain(model) > -1) {
|
|
185
|
+
return indexOfNullPlain(model);
|
|
186
|
+
}
|
|
187
|
+
if (indexOfNullUnion(model) > -1) {
|
|
188
|
+
return indexOfNullUnion(model);
|
|
189
|
+
}
|
|
190
|
+
if (indexOfNullOneOf(model) > -1) {
|
|
191
|
+
return indexOfNullOneOf(model);
|
|
192
|
+
}
|
|
193
|
+
return -1;
|
|
194
|
+
}
|
|
195
|
+
exports.indexOfNullObjectProperty = indexOfNullObjectProperty;
|
|
196
|
+
function indexOfNullArrayProperty(model) {
|
|
197
|
+
if (indexOfNullArrayPlain(model) > -1) {
|
|
198
|
+
return indexOfNullArrayPlain(model);
|
|
199
|
+
}
|
|
200
|
+
if (indexOfNullArrayUnion(model) > -1) {
|
|
201
|
+
return indexOfNullArrayUnion(model);
|
|
202
|
+
}
|
|
203
|
+
if (indexOfNullArrayOneOf(model) > -1) {
|
|
204
|
+
return indexOfNullArrayOneOf(model);
|
|
205
|
+
}
|
|
206
|
+
return -1;
|
|
207
|
+
}
|
|
208
|
+
exports.indexOfNullArrayProperty = indexOfNullArrayProperty;
|
|
209
|
+
function ensureNullable(type, index) {
|
|
210
|
+
const types = type.split('|').map((t) => t.trim());
|
|
211
|
+
if (types[index] === 'any') {
|
|
212
|
+
types[index] = replaceAnyType(types[index], 'null');
|
|
213
|
+
}
|
|
214
|
+
else {
|
|
215
|
+
types.splice(index, 0, 'null');
|
|
216
|
+
}
|
|
217
|
+
return types.join(' | ');
|
|
218
|
+
}
|
|
219
|
+
exports.ensureNullable = ensureNullable;
|
|
220
|
+
//# sourceMappingURL=utils.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/commands/msg-codegen/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { AsyncAPIDocumentInterface, ChannelInterface } from '@asyncapi/parser';
|
|
2
2
|
import { MessageDiffOptions } from './message-diff-options';
|
|
3
3
|
/**
|
|
4
4
|
* Diff results. Each file (asyncapi document or payload) is classified to one of 'skipped', 'same', 'changed' or 'breaking'.
|
|
@@ -54,7 +54,7 @@ export declare class MessageDiff {
|
|
|
54
54
|
* Compare asyncapi documents using AsyncAPI Diff: https://github.com/asyncapi/diff
|
|
55
55
|
* Note: non standard rules are defined in file: asyncapi-override.ts
|
|
56
56
|
*/
|
|
57
|
-
documentDiff(document1:
|
|
57
|
+
documentDiff(document1: AsyncAPIDocumentInterface, document2: AsyncAPIDocumentInterface): Promise<keyof Results>;
|
|
58
58
|
/**
|
|
59
59
|
* Compare payload schemas using JsonSchema Diff: https://www.npmjs.com/package/json-schema-diff
|
|
60
60
|
* NOTE: It might be possible to define rules for asyncapi-diff to compare properties in message schemas but
|
|
@@ -64,6 +64,6 @@ export declare class MessageDiff {
|
|
|
64
64
|
* Only schema version http://json-schema.org/draft-07/schema# is supported.
|
|
65
65
|
* If any other version is used (in local file or git) then the comparison result will be 'skipped'.
|
|
66
66
|
*/
|
|
67
|
-
payloadDiff(channel1:
|
|
67
|
+
payloadDiff(channel1: ChannelInterface | undefined, channel2: ChannelInterface | undefined): Promise<keyof Results>;
|
|
68
68
|
}
|
|
69
69
|
export {};
|
|
@@ -133,8 +133,12 @@ class MessageDiff {
|
|
|
133
133
|
let document2;
|
|
134
134
|
// load asyncapi document from git
|
|
135
135
|
try {
|
|
136
|
-
const
|
|
137
|
-
|
|
136
|
+
const parser = new parser_1.default();
|
|
137
|
+
const { document, diagnostics } = yield (0, parser_1.fromFile)(parser, file1).parse();
|
|
138
|
+
if (!document) {
|
|
139
|
+
throw `Error parsing ${file1}: ${diagnostics}`;
|
|
140
|
+
}
|
|
141
|
+
document1 = document;
|
|
138
142
|
}
|
|
139
143
|
catch (e) {
|
|
140
144
|
throw `Error reading ${file1}: ${e}`;
|
|
@@ -146,8 +150,12 @@ class MessageDiff {
|
|
|
146
150
|
this.results.breaking++;
|
|
147
151
|
return;
|
|
148
152
|
}
|
|
149
|
-
const
|
|
150
|
-
|
|
153
|
+
const parser = new parser_1.default();
|
|
154
|
+
const { document, diagnostics } = yield (0, parser_1.fromFile)(parser, file2).parse();
|
|
155
|
+
if (!document) {
|
|
156
|
+
throw `Error parsing ${file2}: ${diagnostics}`;
|
|
157
|
+
}
|
|
158
|
+
document2 = document;
|
|
151
159
|
}
|
|
152
160
|
catch (e) {
|
|
153
161
|
throw `Error reading ${file2}: ${e}`;
|
|
@@ -159,12 +167,12 @@ class MessageDiff {
|
|
|
159
167
|
const channels2 = document2.channels();
|
|
160
168
|
// diff payloads for channels which exist in both documents
|
|
161
169
|
// removed / renamed channels are already marked as breaking
|
|
162
|
-
for (const
|
|
163
|
-
if (
|
|
170
|
+
for (const channel1 of channels1) {
|
|
171
|
+
if (channels2.has(channel1.id()) === false) {
|
|
164
172
|
continue;
|
|
165
173
|
}
|
|
166
|
-
console.log(`Comparing payload for channel ${
|
|
167
|
-
const channel2 = channels2
|
|
174
|
+
console.log(`Comparing payload for channel ${channel1.id()} in document ${file2}. Changes from branch ${this.branch}`);
|
|
175
|
+
const channel2 = channels2.get(channel1.id());
|
|
168
176
|
const resultKey = yield this.payloadDiff(channel1, channel2);
|
|
169
177
|
this.results[resultKey]++;
|
|
170
178
|
}
|
|
@@ -219,23 +227,28 @@ class MessageDiff {
|
|
|
219
227
|
payloadDiff(channel1, channel2) {
|
|
220
228
|
return tslib_1.__awaiter(this, void 0, void 0, function* () {
|
|
221
229
|
const getChannelPayload = (channel) => {
|
|
222
|
-
|
|
223
|
-
|
|
224
|
-
|
|
230
|
+
if (channel === undefined) {
|
|
231
|
+
return undefined;
|
|
232
|
+
}
|
|
233
|
+
const messages = channel.messages();
|
|
234
|
+
if (messages.length > 1) {
|
|
235
|
+
throw new Error(`Channel ${channel.id()} has more than one message. This is currently not supported.`);
|
|
236
|
+
}
|
|
237
|
+
return messages[0].payload();
|
|
225
238
|
};
|
|
226
239
|
const schema1 = getChannelPayload(channel1);
|
|
227
240
|
const schema2 = getChannelPayload(channel2);
|
|
228
241
|
if (schema1 === undefined) {
|
|
229
|
-
throw `Could not find payload schema in ${this.branch}
|
|
242
|
+
throw new Error(`Could not find payload schema in ${this.branch}`);
|
|
230
243
|
}
|
|
231
244
|
if (schema2 === undefined) {
|
|
232
|
-
throw `Could not find payload schema
|
|
245
|
+
throw new Error(`Could not find payload schema`);
|
|
233
246
|
}
|
|
234
247
|
let result;
|
|
235
248
|
try {
|
|
236
249
|
result = yield jsonSchemaDiff.diffSchemas({
|
|
237
|
-
sourceSchema: schema1,
|
|
238
|
-
destinationSchema: schema2,
|
|
250
|
+
sourceSchema: schema1.json(),
|
|
251
|
+
destinationSchema: schema2.json(),
|
|
239
252
|
});
|
|
240
253
|
}
|
|
241
254
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"msg-diff.js","sourceRoot":"","sources":["../../../src/commands/msg-diff/msg-diff.ts"],"names":[],"mappings":";;;;AAAA,uDAAuD;AACvD,+BAA+B;AAC/B,yCAAsD;AACtD,
|
|
1
|
+
{"version":3,"file":"msg-diff.js","sourceRoot":"","sources":["../../../src/commands/msg-diff/msg-diff.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axinom/mosaic-cli",
|
|
3
|
-
"version": "0.18.
|
|
3
|
+
"version": "0.18.5-rc.1",
|
|
4
4
|
"description": "The Axinom Mosaic CLI",
|
|
5
5
|
"author": "Axinom",
|
|
6
6
|
"license": "PROPRIETARY",
|
|
@@ -30,11 +30,11 @@
|
|
|
30
30
|
"lint": "eslint . --ext .ts,.tsx,.js --color --cache"
|
|
31
31
|
},
|
|
32
32
|
"dependencies": {
|
|
33
|
-
"@asyncapi/diff": "^0.4.
|
|
34
|
-
"@asyncapi/modelina": "^
|
|
35
|
-
"@asyncapi/parser": "^
|
|
36
|
-
"@axinom/mosaic-id-link-be": "^0.13.
|
|
37
|
-
"@axinom/mosaic-service-common": "^0.
|
|
33
|
+
"@asyncapi/diff": "^0.4.1",
|
|
34
|
+
"@asyncapi/modelina": "^1.8.4",
|
|
35
|
+
"@asyncapi/parser": "^2.0.2",
|
|
36
|
+
"@axinom/mosaic-id-link-be": "^0.13.3-rc.1",
|
|
37
|
+
"@axinom/mosaic-service-common": "^0.34.0-rc.1",
|
|
38
38
|
"@graphql-inspector/core": "^3.1.2",
|
|
39
39
|
"@stoplight/spectral": "^5.9.1",
|
|
40
40
|
"chalk": "^4.1.0",
|
|
@@ -65,5 +65,5 @@
|
|
|
65
65
|
"publishConfig": {
|
|
66
66
|
"access": "public"
|
|
67
67
|
},
|
|
68
|
-
"gitHead": "
|
|
68
|
+
"gitHead": "aa98a4a89a48ff7650a40acfec9a5b24c90d9c01"
|
|
69
69
|
}
|