@dxos/protobuf-compiler 2.33.5-dev.cca7f139 → 2.33.5-dev.cf9f6681
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/src/configure.d.ts +1 -1
- package/dist/src/configure.d.ts.map +1 -1
- package/dist/src/configure.js +2 -2
- package/dist/src/configure.js.map +1 -1
- package/dist/src/generator/declaration-generator.d.ts +1 -1
- package/dist/src/generator/declaration-generator.d.ts.map +1 -1
- package/dist/src/generator/declaration-generator.js +8 -6
- package/dist/src/generator/declaration-generator.js.map +1 -1
- package/dist/src/generator/doc-comment.d.ts +1 -1
- package/dist/src/generator/doc-comment.d.ts.map +1 -1
- package/dist/src/generator/doc-comment.js +1 -3
- package/dist/src/generator/doc-comment.js.map +1 -1
- package/dist/src/generator/enum.d.ts +1 -1
- package/dist/src/generator/enum.d.ts.map +1 -1
- package/dist/src/generator/enum.js +6 -4
- package/dist/src/generator/enum.js.map +1 -1
- package/dist/src/generator/field.d.ts +2 -2
- package/dist/src/generator/field.d.ts.map +1 -1
- package/dist/src/generator/field.js +12 -8
- package/dist/src/generator/field.js.map +1 -1
- package/dist/src/generator/file-generator.d.ts +3 -3
- package/dist/src/generator/file-generator.d.ts.map +1 -1
- package/dist/src/generator/file-generator.js +19 -21
- package/dist/src/generator/file-generator.js.map +1 -1
- package/dist/src/generator/index.js +5 -1
- package/dist/src/generator/index.js.map +1 -1
- package/dist/src/generator/message.d.ts +1 -1
- package/dist/src/generator/message.d.ts.map +1 -1
- package/dist/src/generator/message.js +9 -5
- package/dist/src/generator/message.js.map +1 -1
- package/dist/src/generator/serializer-definition-generator.d.ts +2 -1
- package/dist/src/generator/serializer-definition-generator.d.ts.map +1 -1
- package/dist/src/generator/serializer-definition-generator.js +7 -3
- package/dist/src/generator/serializer-definition-generator.js.map +1 -1
- package/dist/src/generator/service.d.ts +2 -2
- package/dist/src/generator/service.d.ts.map +1 -1
- package/dist/src/generator/service.js +15 -15
- package/dist/src/generator/service.js.map +1 -1
- package/dist/src/generator/types.d.ts +2 -2
- package/dist/src/generator/types.d.ts.map +1 -1
- package/dist/src/generator/types.js +13 -11
- package/dist/src/generator/types.js.map +1 -1
- package/dist/src/module-specifier.js +4 -4
- package/dist/src/module-specifier.js.map +1 -1
- package/dist/src/namespaces.d.ts +10 -10
- package/dist/src/namespaces.d.ts.map +1 -1
- package/dist/src/namespaces.js +31 -35
- package/dist/src/namespaces.js.map +1 -1
- package/dist/src/namespaces.test.js +5 -1
- package/dist/src/namespaces.test.js.map +1 -1
- package/dist/src/parser/index.js +5 -1
- package/dist/src/parser/index.js.map +1 -1
- package/dist/src/parser/resolver.d.ts +1 -1
- package/dist/src/parser/resolver.d.ts.map +1 -1
- package/dist/src/parser/resolver.js +2 -2
- package/dist/src/parser/resolver.js.map +1 -1
- package/dist/src/parser/substitutions-parser.d.ts +1 -1
- package/dist/src/parser/substitutions-parser.d.ts.map +1 -1
- package/dist/src/parser/substitutions-parser.js +9 -5
- package/dist/src/parser/substitutions-parser.js.map +1 -1
- package/dist/src/protobuf-json.d.ts +1 -1
- package/dist/src/protobuf-json.d.ts.map +1 -1
- package/dist/src/protobuf-json.js +3 -5
- package/dist/src/protobuf-json.js.map +1 -1
- package/dist/src/type-generator.d.ts +2 -2
- package/dist/src/type-generator.d.ts.map +1 -1
- package/dist/src/type-generator.js +16 -7
- package/dist/src/type-generator.js.map +1 -1
- package/dist/src/util.d.ts +1 -1
- package/dist/src/util.d.ts.map +1 -1
- package/dist/src/util.js +2 -2
- package/dist/src/util.js.map +1 -1
- package/dist/test/proto/gen/dxos/test.d.ts +8 -8
- package/dist/test/proto/gen/dxos/test.d.ts.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/src/configure.ts +2 -2
- package/src/generator/declaration-generator.ts +15 -17
- package/src/generator/doc-comment.ts +4 -6
- package/src/generator/enum.ts +9 -11
- package/src/generator/field.ts +4 -4
- package/src/generator/file-generator.ts +28 -41
- package/src/generator/message.ts +4 -4
- package/src/generator/serializer-definition-generator.ts +2 -6
- package/src/generator/service.ts +22 -26
- package/src/generator/types.ts +16 -18
- package/src/module-specifier.ts +4 -4
- package/src/namespaces.ts +18 -26
- package/src/parser/resolver.ts +2 -2
- package/src/parser/substitutions-parser.ts +4 -4
- package/src/protobuf-json.ts +3 -5
- package/src/type-generator.ts +12 -6
- package/src/util.ts +2 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/generator/service.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE
|
|
1
|
+
{"version":3,"file":"service.js","sourceRoot":"","sources":["../../../src/generator/service.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,7 +2,7 @@ import * as protobufjs from 'protobufjs';
|
|
|
2
2
|
import * as ts from 'typescript';
|
|
3
3
|
import { SubstitutionsMap } from '../parser';
|
|
4
4
|
declare type PbType = protobufjs.Enum | protobufjs.Type | string;
|
|
5
|
-
export declare
|
|
6
|
-
export declare
|
|
5
|
+
export declare const types: (type: PbType, containingObject: protobufjs.ReflectionObject, subs: SubstitutionsMap) => ts.TypeNode;
|
|
6
|
+
export declare const getTypeReference: (to: protobufjs.ReflectionObject, from?: protobufjs.ReflectionObject) => ts.TypeReferenceNode;
|
|
7
7
|
export {};
|
|
8
8
|
//# sourceMappingURL=types.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/generator/types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,UAAU,MAAM,YAAY,CAAC;AACzC,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAUjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;
|
|
1
|
+
{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/generator/types.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,UAAU,MAAM,YAAY,CAAC;AACzC,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAUjC,OAAO,EAAE,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAoD7C,aAAK,MAAM,GAAG,UAAU,CAAC,IAAI,GAAG,UAAU,CAAC,IAAI,GAAG,MAAM,CAAA;AAExD,eAAO,MAAM,KAAK,SAAU,MAAM,oBAAoB,WAAW,gBAAgB,QAAQ,gBAAgB,gBAUxG,CAAC;AAEF,eAAO,MAAM,gBAAgB,OAAQ,WAAW,gBAAgB,SAAS,WAAW,gBAAgB,yBAWnG,CAAC"}
|
|
@@ -4,7 +4,11 @@
|
|
|
4
4
|
//
|
|
5
5
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
6
6
|
if (k2 === undefined) k2 = k;
|
|
7
|
-
Object.
|
|
7
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
8
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
9
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
10
|
+
}
|
|
11
|
+
Object.defineProperty(o, k2, desc);
|
|
8
12
|
}) : (function(o, m, k, k2) {
|
|
9
13
|
if (k2 === undefined) k2 = k;
|
|
10
14
|
o[k2] = m[k];
|
|
@@ -26,10 +30,8 @@ exports.getTypeReference = exports.types = void 0;
|
|
|
26
30
|
const ts = __importStar(require("typescript"));
|
|
27
31
|
const namespaces_1 = require("../namespaces");
|
|
28
32
|
const f = ts.factory;
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
}
|
|
32
|
-
function getPrimitiveType(type) {
|
|
33
|
+
const createSubstitutionsReference = (type) => f.createTypeReferenceNode(f.createIdentifier('ReturnType'), [f.createIndexedAccessTypeNode(f.createIndexedAccessTypeNode(f.createTypeQueryNode(f.createIdentifier('substitutions')), f.createLiteralTypeNode(f.createStringLiteral(type))), f.createLiteralTypeNode(f.createStringLiteral('decode')))]);
|
|
34
|
+
const getPrimitiveType = (type) => {
|
|
33
35
|
switch (type) {
|
|
34
36
|
case 'double':
|
|
35
37
|
return f.createKeywordTypeNode(ts.SyntaxKind.NumberKeyword);
|
|
@@ -64,8 +66,8 @@ function getPrimitiveType(type) {
|
|
|
64
66
|
default:
|
|
65
67
|
return f.createKeywordTypeNode(ts.SyntaxKind.UnknownKeyword);
|
|
66
68
|
}
|
|
67
|
-
}
|
|
68
|
-
|
|
69
|
+
};
|
|
70
|
+
const types = (type, containingObject, subs) => {
|
|
69
71
|
if (typeof type === 'string') {
|
|
70
72
|
return getPrimitiveType(type);
|
|
71
73
|
}
|
|
@@ -76,11 +78,11 @@ function types(type, containingObject, subs) {
|
|
|
76
78
|
return createSubstitutionsReference(type.fullName.slice(1));
|
|
77
79
|
}
|
|
78
80
|
else {
|
|
79
|
-
return getTypeReference(type, containingObject);
|
|
81
|
+
return (0, exports.getTypeReference)(type, containingObject);
|
|
80
82
|
}
|
|
81
|
-
}
|
|
83
|
+
};
|
|
82
84
|
exports.types = types;
|
|
83
|
-
|
|
85
|
+
const getTypeReference = (to, from) => {
|
|
84
86
|
const toNamespace = (0, namespaces_1.getNamespaceName)(to);
|
|
85
87
|
const fromNamespace = from && (0, namespaces_1.getNamespaceName)(from);
|
|
86
88
|
if (fromNamespace && (0, namespaces_1.namesEqual)(toNamespace, fromNamespace)) {
|
|
@@ -91,6 +93,6 @@ function getTypeReference(to, from) {
|
|
|
91
93
|
const name = [(0, namespaces_1.getSafeNamespaceIdentifier)(toNamespace), ...(0, namespaces_1.getFullNestedTypeName)(to)];
|
|
92
94
|
return f.createTypeReferenceNode((0, namespaces_1.convertNameToIdentifier)(name));
|
|
93
95
|
}
|
|
94
|
-
}
|
|
96
|
+
};
|
|
95
97
|
exports.getTypeReference = getTypeReference;
|
|
96
98
|
//# sourceMappingURL=types.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/generator/types.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE
|
|
1
|
+
{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/generator/types.ts"],"names":[],"mappings":"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"}
|
|
@@ -47,20 +47,20 @@ class ModuleSpecifier {
|
|
|
47
47
|
}
|
|
48
48
|
exports.ModuleSpecifier = ModuleSpecifier;
|
|
49
49
|
exports.CODEC_MODULE = new ModuleSpecifier('@dxos/codec-protobuf', __dirname);
|
|
50
|
-
|
|
50
|
+
const normalizeRelativePath = (path) => {
|
|
51
51
|
if (!path.startsWith('.')) {
|
|
52
52
|
return `./${path}`;
|
|
53
53
|
}
|
|
54
54
|
else {
|
|
55
55
|
return path;
|
|
56
56
|
}
|
|
57
|
-
}
|
|
58
|
-
|
|
57
|
+
};
|
|
58
|
+
const removeExtension = (path, extension) => {
|
|
59
59
|
if (path.endsWith(extension)) {
|
|
60
60
|
return path.slice(0, -extension.length);
|
|
61
61
|
}
|
|
62
62
|
else {
|
|
63
63
|
return path;
|
|
64
64
|
}
|
|
65
|
-
}
|
|
65
|
+
};
|
|
66
66
|
//# sourceMappingURL=module-specifier.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"module-specifier.js","sourceRoot":"","sources":["../../src/module-specifier.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,+BAAqD;AAErD;;GAEG;AACH,MAAa,eAAe;IAS1B,YACkB,IAAY,EACZ,WAAmB;QADnB,SAAI,GAAJ,IAAI,CAAQ;QACZ,gBAAW,GAAX,WAAW,CAAQ;QAEnC,IAAA,gBAAM,EAAC,IAAA,iBAAU,EAAC,WAAW,CAAC,CAAC,CAAC;IAClC,CAAC;IAbD,MAAM,CAAC,mBAAmB,CAAE,IAAY,EAAE,OAAe;QACvD,kBAAkB;QAClB,MAAM,YAAY,GAAG,IAAA,eAAQ,EAAC,OAAO,EAAE,IAAA,cAAO,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;QAC/D,MAAM,WAAW,GAAG,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,YAAY,EAAE,CAAC;QAEtF,OAAO,IAAI,eAAe,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IASD,UAAU;QACR,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;IAED,eAAe,CAAE,aAAqB;QACpC,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE;YACrB,OAAO,IAAI,CAAC,IAAI,CAAC;SAClB;aAAM;YACL,MAAM,YAAY,GAAG,qBAAqB,CAAC,IAAA,eAAQ,EAAC,aAAa,EAAE,IAAA,cAAO,EAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC1G,KAAK,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;gBAChC,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oBAC9B,OAAO,eAAe,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;iBAC3C;aACF;YACD,OAAO,YAAY,CAAC;SACrB;IACH,CAAC;IAED,OAAO;QACL,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IACnE,CAAC;CACF;AArCD,0CAqCC;AAEY,QAAA,YAAY,GAAG,IAAI,eAAe,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAC;AAEnF,
|
|
1
|
+
{"version":3,"file":"module-specifier.js","sourceRoot":"","sources":["../../src/module-specifier.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,oDAA4B;AAC5B,+BAAqD;AAErD;;GAEG;AACH,MAAa,eAAe;IAS1B,YACkB,IAAY,EACZ,WAAmB;QADnB,SAAI,GAAJ,IAAI,CAAQ;QACZ,gBAAW,GAAX,WAAW,CAAQ;QAEnC,IAAA,gBAAM,EAAC,IAAA,iBAAU,EAAC,WAAW,CAAC,CAAC,CAAC;IAClC,CAAC;IAbD,MAAM,CAAC,mBAAmB,CAAE,IAAY,EAAE,OAAe;QACvD,kBAAkB;QAClB,MAAM,YAAY,GAAG,IAAA,eAAQ,EAAC,OAAO,EAAE,IAAA,cAAO,EAAC,OAAO,EAAE,IAAI,CAAC,CAAC,CAAC;QAC/D,MAAM,WAAW,GAAG,YAAY,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,KAAK,YAAY,EAAE,CAAC;QAEtF,OAAO,IAAI,eAAe,CAAC,WAAW,EAAE,OAAO,CAAC,CAAC;IACnD,CAAC;IASD,UAAU;QACR,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;IACpC,CAAC;IAED,eAAe,CAAE,aAAqB;QACpC,IAAI,IAAI,CAAC,UAAU,EAAE,EAAE;YACrB,OAAO,IAAI,CAAC,IAAI,CAAC;SAClB;aAAM;YACL,MAAM,YAAY,GAAG,qBAAqB,CAAC,IAAA,eAAQ,EAAC,aAAa,EAAE,IAAA,cAAO,EAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YAC1G,KAAK,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,KAAK,CAAC,EAAE;gBAChC,IAAI,YAAY,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;oBAC9B,OAAO,eAAe,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;iBAC3C;aACF;YACD,OAAO,YAAY,CAAC;SACrB;IACH,CAAC;IAED,OAAO;QACL,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,KAAK,EAAE,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC;IACnE,CAAC;CACF;AArCD,0CAqCC;AAEY,QAAA,YAAY,GAAG,IAAI,eAAe,CAAC,sBAAsB,EAAE,SAAS,CAAC,CAAC;AAEnF,MAAM,qBAAqB,GAAG,CAAC,IAAY,EAAE,EAAE;IAC7C,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACzB,OAAO,KAAK,IAAI,EAAE,CAAC;KACpB;SAAM;QACL,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AAEF,MAAM,eAAe,GAAG,CAAC,IAAY,EAAE,SAAiB,EAAE,EAAE;IAC1D,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE;QAC5B,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;KACzC;SAAM;QACL,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC"}
|
package/dist/src/namespaces.d.ts
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import * as pb from 'protobufjs';
|
|
2
2
|
import * as ts from 'typescript';
|
|
3
3
|
export declare type DeclarationFullName = string[];
|
|
4
|
-
export declare
|
|
5
|
-
export declare
|
|
6
|
-
export declare
|
|
7
|
-
export declare
|
|
8
|
-
export declare
|
|
9
|
-
export declare
|
|
10
|
-
export declare
|
|
11
|
-
export declare
|
|
12
|
-
export declare
|
|
13
|
-
export declare
|
|
4
|
+
export declare const getFullNestedTypeName: (type: pb.ReflectionObject) => DeclarationFullName;
|
|
5
|
+
export declare const getNamespaceName: (type: pb.ReflectionObject) => DeclarationFullName;
|
|
6
|
+
export declare const getRelativeName: (target: DeclarationFullName, base: DeclarationFullName) => DeclarationFullName;
|
|
7
|
+
export declare const convertNameToIdentifier: (name: DeclarationFullName) => ts.QualifiedName | ts.Identifier;
|
|
8
|
+
export declare const stringifyFullyQualifiedName: (name: DeclarationFullName) => string;
|
|
9
|
+
export declare const normalizeFullyQualifiedName: (name: string) => string;
|
|
10
|
+
export declare const parseFullyQualifiedName: (name: string) => DeclarationFullName;
|
|
11
|
+
export declare const namesEqual: (a: DeclarationFullName, b: DeclarationFullName) => boolean;
|
|
12
|
+
export declare const getSafeNamespaceIdentifier: (name: DeclarationFullName) => string;
|
|
13
|
+
export declare const splitSchemaIntoNamespaces: (root: pb.Namespace) => Map<string, pb.ReflectionObject[]>;
|
|
14
14
|
//# sourceMappingURL=namespaces.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"namespaces.d.ts","sourceRoot":"","sources":["../../src/namespaces.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAIjC,oBAAY,mBAAmB,GAAG,MAAM,EAAE,CAAC;AAE3C,
|
|
1
|
+
{"version":3,"file":"namespaces.d.ts","sourceRoot":"","sources":["../../src/namespaces.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AACjC,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAIjC,oBAAY,mBAAmB,GAAG,MAAM,EAAE,CAAC;AAE3C,eAAO,MAAM,qBAAqB,SAAU,GAAG,gBAAgB,wBAM9D,CAAC;AAIF,eAAO,MAAM,gBAAgB,SAAU,GAAG,gBAAgB,wBAUzD,CAAC;AAEF,eAAO,MAAM,eAAe,iFAS3B,CAAC;AAEF,eAAO,MAAM,uBAAuB,iCAAgC,GAAG,aAAa,GAAG,GAAG,UAMzF,CAAC;AAEF,eAAO,MAAM,2BAA2B,uCAAgD,CAAC;AAEzF,eAAO,MAAM,2BAA2B,SAAU,MAAM,WAMvD,CAAC;AAEF,eAAO,MAAM,uBAAuB,SAAU,MAAM,wBAGnD,CAAC;AAEF,eAAO,MAAM,UAAU,6DAAgH,CAAC;AAExI,eAAO,MAAM,0BAA0B,uCAAgD,CAAC;AAExF,eAAO,MAAM,yBAAyB,SAAU,GAAG,SAAS,KAAG,IAAI,MAAM,EAAE,GAAG,gBAAgB,EAAE,CAuB/F,CAAC"}
|
package/dist/src/namespaces.js
CHANGED
|
@@ -4,7 +4,11 @@
|
|
|
4
4
|
//
|
|
5
5
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
6
6
|
if (k2 === undefined) k2 = k;
|
|
7
|
-
Object.
|
|
7
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
8
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
9
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
10
|
+
}
|
|
11
|
+
Object.defineProperty(o, k2, desc);
|
|
8
12
|
}) : (function(o, m, k, k2) {
|
|
9
13
|
if (k2 === undefined) k2 = k;
|
|
10
14
|
o[k2] = m[k];
|
|
@@ -30,83 +34,75 @@ const assert_1 = __importDefault(require("assert"));
|
|
|
30
34
|
const pb = __importStar(require("protobufjs"));
|
|
31
35
|
const ts = __importStar(require("typescript"));
|
|
32
36
|
const f = ts.factory;
|
|
33
|
-
|
|
37
|
+
const getFullNestedTypeName = (type) => {
|
|
34
38
|
if (type.parent && type.parent instanceof pb.Type) {
|
|
35
|
-
return [...getFullNestedTypeName(type.parent), type.name];
|
|
39
|
+
return [...(0, exports.getFullNestedTypeName)(type.parent), type.name];
|
|
36
40
|
}
|
|
37
41
|
else {
|
|
38
42
|
return [type.name];
|
|
39
43
|
}
|
|
40
|
-
}
|
|
44
|
+
};
|
|
41
45
|
exports.getFullNestedTypeName = getFullNestedTypeName;
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
}
|
|
45
|
-
function getNamespaceName(type) {
|
|
46
|
+
const isType = (obj) => obj instanceof pb.Type || obj instanceof pb.Enum || obj instanceof pb.Service;
|
|
47
|
+
const getNamespaceName = (type) => {
|
|
46
48
|
if (type.parent) {
|
|
47
49
|
if (!isType(type)) {
|
|
48
|
-
return [...getNamespaceName(type.parent), type.name];
|
|
50
|
+
return [...(0, exports.getNamespaceName)(type.parent), type.name];
|
|
49
51
|
}
|
|
50
52
|
else {
|
|
51
|
-
return getNamespaceName(type.parent);
|
|
53
|
+
return (0, exports.getNamespaceName)(type.parent);
|
|
52
54
|
}
|
|
53
55
|
}
|
|
54
56
|
else {
|
|
55
57
|
return [];
|
|
56
58
|
}
|
|
57
|
-
}
|
|
59
|
+
};
|
|
58
60
|
exports.getNamespaceName = getNamespaceName;
|
|
59
|
-
|
|
61
|
+
const getRelativeName = (target, base) => {
|
|
60
62
|
// TODO(marik-d): Optimization: Remove recursion.
|
|
61
63
|
if (target.length === 1 || base.length === 1) {
|
|
62
64
|
return target;
|
|
63
65
|
}
|
|
64
66
|
else if (target[0] === base[0]) {
|
|
65
|
-
return getRelativeName(target.slice(1), base.slice(1));
|
|
67
|
+
return (0, exports.getRelativeName)(target.slice(1), base.slice(1));
|
|
66
68
|
}
|
|
67
69
|
else {
|
|
68
70
|
return target;
|
|
69
71
|
}
|
|
70
|
-
}
|
|
72
|
+
};
|
|
71
73
|
exports.getRelativeName = getRelativeName;
|
|
72
|
-
|
|
74
|
+
const convertNameToIdentifier = (name) => {
|
|
73
75
|
if (name.length === 1) {
|
|
74
76
|
return f.createIdentifier(name[0]);
|
|
75
77
|
}
|
|
76
78
|
else {
|
|
77
|
-
return f.createQualifiedName(convertNameToIdentifier(name.slice(0, -1)), name[name.length - 1]);
|
|
79
|
+
return f.createQualifiedName((0, exports.convertNameToIdentifier)(name.slice(0, -1)), name[name.length - 1]);
|
|
78
80
|
}
|
|
79
|
-
}
|
|
81
|
+
};
|
|
80
82
|
exports.convertNameToIdentifier = convertNameToIdentifier;
|
|
81
|
-
|
|
82
|
-
return name.join('.');
|
|
83
|
-
}
|
|
83
|
+
const stringifyFullyQualifiedName = (name) => name.join('.');
|
|
84
84
|
exports.stringifyFullyQualifiedName = stringifyFullyQualifiedName;
|
|
85
|
-
|
|
85
|
+
const normalizeFullyQualifiedName = (name) => {
|
|
86
86
|
if (name.startsWith('.')) {
|
|
87
87
|
return name.slice(1);
|
|
88
88
|
}
|
|
89
89
|
else {
|
|
90
90
|
return name;
|
|
91
91
|
}
|
|
92
|
-
}
|
|
92
|
+
};
|
|
93
93
|
exports.normalizeFullyQualifiedName = normalizeFullyQualifiedName;
|
|
94
|
-
|
|
95
|
-
const norm = normalizeFullyQualifiedName(name);
|
|
94
|
+
const parseFullyQualifiedName = (name) => {
|
|
95
|
+
const norm = (0, exports.normalizeFullyQualifiedName)(name);
|
|
96
96
|
return norm.split('.');
|
|
97
|
-
}
|
|
97
|
+
};
|
|
98
98
|
exports.parseFullyQualifiedName = parseFullyQualifiedName;
|
|
99
|
-
|
|
100
|
-
return a.length === b.length && a.every((_, i) => a[i] === b[i]);
|
|
101
|
-
}
|
|
99
|
+
const namesEqual = (a, b) => a.length === b.length && a.every((_, i) => a[i] === b[i]);
|
|
102
100
|
exports.namesEqual = namesEqual;
|
|
103
|
-
|
|
104
|
-
return name.join('_');
|
|
105
|
-
}
|
|
101
|
+
const getSafeNamespaceIdentifier = (name) => name.join('_');
|
|
106
102
|
exports.getSafeNamespaceIdentifier = getSafeNamespaceIdentifier;
|
|
107
|
-
|
|
103
|
+
const splitSchemaIntoNamespaces = (root) => {
|
|
108
104
|
const res = new Map();
|
|
109
|
-
const namespace = normalizeFullyQualifiedName(root.fullName);
|
|
105
|
+
const namespace = (0, exports.normalizeFullyQualifiedName)(root.fullName);
|
|
110
106
|
for (const obj of root.nestedArray) {
|
|
111
107
|
if (isType(obj)) {
|
|
112
108
|
if (!res.has(namespace)) {
|
|
@@ -116,7 +112,7 @@ function splitSchemaIntoNamespaces(root) {
|
|
|
116
112
|
entry.push(obj);
|
|
117
113
|
}
|
|
118
114
|
else if (obj instanceof pb.Namespace) {
|
|
119
|
-
const nested = splitSchemaIntoNamespaces(obj);
|
|
115
|
+
const nested = (0, exports.splitSchemaIntoNamespaces)(obj);
|
|
120
116
|
for (const [namespace, values] of nested) {
|
|
121
117
|
(0, assert_1.default)(!res.has(namespace));
|
|
122
118
|
res.set(namespace, values);
|
|
@@ -124,6 +120,6 @@ function splitSchemaIntoNamespaces(root) {
|
|
|
124
120
|
}
|
|
125
121
|
}
|
|
126
122
|
return res;
|
|
127
|
-
}
|
|
123
|
+
};
|
|
128
124
|
exports.splitSchemaIntoNamespaces = splitSchemaIntoNamespaces;
|
|
129
125
|
//# sourceMappingURL=namespaces.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"namespaces.js","sourceRoot":"","sources":["../../src/namespaces.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE
|
|
1
|
+
{"version":3,"file":"namespaces.js","sourceRoot":"","sources":["../../src/namespaces.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,oDAA4B;AAC5B,+CAAiC;AACjC,+CAAiC;AAEjC,MAAM,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC;AAId,MAAM,qBAAqB,GAAG,CAAC,IAAyB,EAAuB,EAAE;IACtF,IAAI,IAAI,CAAC,MAAM,IAAI,IAAI,CAAC,MAAM,YAAY,EAAE,CAAC,IAAI,EAAE;QACjD,OAAO,CAAC,GAAG,IAAA,6BAAqB,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;KAC3D;SAAM;QACL,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;KACpB;AACH,CAAC,CAAC;AANW,QAAA,qBAAqB,yBAMhC;AAEF,MAAM,MAAM,GAAG,CAAC,GAAwB,EAA2C,EAAE,CAAC,GAAG,YAAY,EAAE,CAAC,IAAI,IAAI,GAAG,YAAY,EAAE,CAAC,IAAI,IAAI,GAAG,YAAY,EAAE,CAAC,OAAO,CAAC;AAE7J,MAAM,gBAAgB,GAAG,CAAC,IAAyB,EAAuB,EAAE;IACjF,IAAI,IAAI,CAAC,MAAM,EAAE;QACf,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YACjB,OAAO,CAAC,GAAG,IAAA,wBAAgB,EAAC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;SACtD;aAAM;YACL,OAAO,IAAA,wBAAgB,EAAC,IAAI,CAAC,MAAM,CAAC,CAAC;SACtC;KACF;SAAM;QACL,OAAO,EAAE,CAAC;KACX;AACH,CAAC,CAAC;AAVW,QAAA,gBAAgB,oBAU3B;AAEK,MAAM,eAAe,GAAG,CAAC,MAA2B,EAAE,IAAyB,EAAuB,EAAE;IAC7G,iDAAiD;IACjD,IAAI,MAAM,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QAC5C,OAAO,MAAM,CAAC;KACf;SAAM,IAAI,MAAM,CAAC,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,EAAE;QAChC,OAAO,IAAA,uBAAe,EAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;KACxD;SAAM;QACL,OAAO,MAAM,CAAC;KACf;AACH,CAAC,CAAC;AATW,QAAA,eAAe,mBAS1B;AAEK,MAAM,uBAAuB,GAAG,CAAC,IAAyB,EAAoC,EAAE;IACrG,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACrB,OAAO,CAAC,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;KACpC;SAAM;QACL,OAAO,CAAC,CAAC,mBAAmB,CAAC,IAAA,+BAAuB,EAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;KACjG;AACH,CAAC,CAAC;AANW,QAAA,uBAAuB,2BAMlC;AAEK,MAAM,2BAA2B,GAAG,CAAC,IAAyB,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAA5E,QAAA,2BAA2B,+BAAiD;AAElF,MAAM,2BAA2B,GAAG,CAAC,IAAY,EAAE,EAAE;IAC1D,IAAI,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;QACxB,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;KACtB;SAAM;QACL,OAAO,IAAI,CAAC;KACb;AACH,CAAC,CAAC;AANW,QAAA,2BAA2B,+BAMtC;AAEK,MAAM,uBAAuB,GAAG,CAAC,IAAY,EAAuB,EAAE;IAC3E,MAAM,IAAI,GAAG,IAAA,mCAA2B,EAAC,IAAI,CAAC,CAAC;IAC/C,OAAO,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AACzB,CAAC,CAAC;AAHW,QAAA,uBAAuB,2BAGlC;AAEK,MAAM,UAAU,GAAG,CAAC,CAAsB,EAAE,CAAsB,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAA3H,QAAA,UAAU,cAAiH;AAEjI,MAAM,0BAA0B,GAAG,CAAC,IAAyB,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAA3E,QAAA,0BAA0B,8BAAiD;AAEjF,MAAM,yBAAyB,GAAG,CAAC,IAAkB,EAAsC,EAAE;IAClG,MAAM,GAAG,GAAG,IAAI,GAAG,EAAiC,CAAC;IAErD,MAAM,SAAS,GAAG,IAAA,mCAA2B,EAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAE7D,KAAK,MAAM,GAAG,IAAI,IAAI,CAAC,WAAW,EAAE;QAClC,IAAI,MAAM,CAAC,GAAG,CAAC,EAAE;YACf,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;gBACvB,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,EAAE,CAAC,CAAC;aACxB;YACD,MAAM,KAAK,GAAG,GAAG,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC;YAElC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;SACjB;aAAM,IAAI,GAAG,YAAY,EAAE,CAAC,SAAS,EAAE;YACtC,MAAM,MAAM,GAAG,IAAA,iCAAyB,EAAC,GAAG,CAAC,CAAC;YAC9C,KAAK,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,IAAI,MAAM,EAAE;gBACxC,IAAA,gBAAM,EAAC,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC;gBAC5B,GAAG,CAAC,GAAG,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC;aAC5B;SACF;KACF;IAED,OAAO,GAAG,CAAC;AACb,CAAC,CAAC;AAvBW,QAAA,yBAAyB,6BAuBpC"}
|
|
@@ -4,7 +4,11 @@
|
|
|
4
4
|
//
|
|
5
5
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
6
6
|
if (k2 === undefined) k2 = k;
|
|
7
|
-
Object.
|
|
7
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
8
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
9
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
10
|
+
}
|
|
11
|
+
Object.defineProperty(o, k2, desc);
|
|
8
12
|
}) : (function(o, m, k, k2) {
|
|
9
13
|
if (k2 === undefined) k2 = k;
|
|
10
14
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"namespaces.test.js","sourceRoot":"","sources":["../../src/namespaces.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE
|
|
1
|
+
{"version":3,"file":"namespaces.test.js","sourceRoot":"","sources":["../../src/namespaces.test.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,+BAA4B;AAC5B,+CAAiC;AAEjC,2CAAqD;AACrD,6CAAyD;AACzD,qCAA4C;AAE5C,IAAA,yBAAgB,GAAE,CAAC;AACnB,IAAA,kCAAsB,GAAE,CAAC;AAEzB,IAAI,CAAC,kBAAkB,EAAE,KAAK,IAAI,EAAE;IAClC,MAAM,IAAI,GAAG,MAAM,EAAE,CAAC,IAAI,CAAC,IAAA,WAAI,EAAC,SAAS,EAAE,4BAA4B,CAAC,CAAC,CAAC;IAC1E,MAAM,UAAU,GAAG,IAAA,sCAAyB,EAAC,IAAI,CAAC,CAAC;IAEnD,MAAM,CAAC,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC;QACnD,WAAW;QACX,eAAe;QACf,sBAAsB;QACtB,mBAAmB;QACnB,iBAAiB;KAClB,CAAC,IAAI,EAAE,CAAC,CAAC;AACZ,CAAC,CAAC,CAAC"}
|
package/dist/src/parser/index.js
CHANGED
|
@@ -4,7 +4,11 @@
|
|
|
4
4
|
//
|
|
5
5
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
6
6
|
if (k2 === undefined) k2 = k;
|
|
7
|
-
Object.
|
|
7
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
8
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
9
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
10
|
+
}
|
|
11
|
+
Object.defineProperty(o, k2, desc);
|
|
8
12
|
}) : (function(o, m, k, k2) {
|
|
9
13
|
if (k2 === undefined) k2 = k;
|
|
10
14
|
o[k2] = m[k];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/parser/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/parser/index.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;AAEF,6CAA2B;AAC3B,yDAAuC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
export declare type ProtoResolver = (origin: string, target: string) => string | null;
|
|
2
2
|
export declare function createProtoResolver(original: ProtoResolver): ProtoResolver;
|
|
3
|
-
export declare
|
|
3
|
+
export declare const registerResolver: () => void;
|
|
4
4
|
//# sourceMappingURL=resolver.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../../src/parser/resolver.ts"],"names":[],"mappings":"AAQA,oBAAY,aAAa,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;AAE9E,wBAAgB,mBAAmB,CAAE,QAAQ,EAAE,aAAa,GAAG,aAAa,CAyB3E;AAGD,
|
|
1
|
+
{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../../src/parser/resolver.ts"],"names":[],"mappings":"AAQA,oBAAY,aAAa,GAAG,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,MAAM,GAAG,IAAI,CAAC;AAE9E,wBAAgB,mBAAmB,CAAE,QAAQ,EAAE,aAAa,GAAG,aAAa,CAyB3E;AAGD,eAAO,MAAM,gBAAgB,YAE5B,CAAC"}
|
|
@@ -37,8 +37,8 @@ function createProtoResolver(original) {
|
|
|
37
37
|
}
|
|
38
38
|
exports.createProtoResolver = createProtoResolver;
|
|
39
39
|
const resovler = createProtoResolver(protobufjs_1.default.Root.prototype.resolvePath);
|
|
40
|
-
|
|
40
|
+
const registerResolver = () => {
|
|
41
41
|
protobufjs_1.default.Root.prototype.resolvePath = resovler;
|
|
42
|
-
}
|
|
42
|
+
};
|
|
43
43
|
exports.registerResolver = registerResolver;
|
|
44
44
|
//# sourceMappingURL=resolver.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../../src/parser/resolver.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,2BAAgC;AAChC,+BAAqC;AACrC,4DAA4B;AAI5B,SAAgB,mBAAmB,CAAE,QAAuB;IAC1D,OAAO,UAAqB,MAAM,EAAE,MAAM;QACxC,MAAM,eAAe,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAC5D,IAAI,eAAe,IAAI,IAAA,eAAU,EAAC,eAAe,CAAC,EAAE;YAClD,OAAO,eAAe,CAAC;SACxB;QAED,IAAI,MAAW,CAAC;QAChB,IAAI;YACF,8DAA8D;YAC9D,MAAM,GAAG,OAAO,CAAC,IAAA,WAAI,EAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;SAChD;QAAC,WAAM;YACN,MAAM,GAAG,SAAS,CAAC;SACpB;QAED,IAAI,MAAM,EAAE;YACV,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,QAAQ,EAAE;gBACvC,MAAM,IAAI,KAAK,CAAC,YAAY,MAAM,oCAAoC,CAAC,CAAC;aACzE;YAED,OAAO,OAAO,CAAC,OAAO,CAAC,IAAA,WAAI,EAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;SACrF;aAAM;YACL,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;SAC9D;IACH,CAAC,CAAC;AACJ,CAAC;AAzBD,kDAyBC;AAED,MAAM,QAAQ,GAAG,mBAAmB,CAAC,oBAAE,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../../src/parser/resolver.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;AAEF,2BAAgC;AAChC,+BAAqC;AACrC,4DAA4B;AAI5B,SAAgB,mBAAmB,CAAE,QAAuB;IAC1D,OAAO,UAAqB,MAAM,EAAE,MAAM;QACxC,MAAM,eAAe,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,CAAC;QAC5D,IAAI,eAAe,IAAI,IAAA,eAAU,EAAC,eAAe,CAAC,EAAE;YAClD,OAAO,eAAe,CAAC;SACxB;QAED,IAAI,MAAW,CAAC;QAChB,IAAI;YACF,8DAA8D;YAC9D,MAAM,GAAG,OAAO,CAAC,IAAA,WAAI,EAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;SAChD;QAAC,WAAM;YACN,MAAM,GAAG,SAAS,CAAC;SACpB;QAED,IAAI,MAAM,EAAE;YACV,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,QAAQ,EAAE;gBACvC,MAAM,IAAI,KAAK,CAAC,YAAY,MAAM,oCAAoC,CAAC,CAAC;aACzE;YAED,OAAO,OAAO,CAAC,OAAO,CAAC,IAAA,WAAI,EAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,CAAC,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;SACrF;aAAM;YACL,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,KAAK,EAAE,CAAC,IAAA,cAAO,EAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC;SAC9D;IACH,CAAC,CAAC;AACJ,CAAC;AAzBD,kDAyBC;AAED,MAAM,QAAQ,GAAG,mBAAmB,CAAC,oBAAE,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC,CAAC;AAC7D,MAAM,gBAAgB,GAAG,GAAG,EAAE;IACnC,oBAAE,CAAC,IAAI,CAAC,SAAS,CAAC,WAAW,GAAG,QAAQ,CAAC;AAC3C,CAAC,CAAC;AAFW,QAAA,gBAAgB,oBAE3B"}
|
|
@@ -11,5 +11,5 @@ export declare type SubstitutionsMap = Partial<Record<string, string>>;
|
|
|
11
11
|
/**
|
|
12
12
|
* Parse a protobuf-substitutions file and return a map of protobuf FQN => Typescript identifier.
|
|
13
13
|
*/
|
|
14
|
-
export declare
|
|
14
|
+
export declare const parseSubstitutionsFile: (fileName: string) => SubstitutionsMap;
|
|
15
15
|
//# sourceMappingURL=substitutions-parser.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"substitutions-parser.d.ts","sourceRoot":"","sources":["../../../src/parser/substitutions-parser.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC;IACxB,MAAM,EAAE,eAAe,CAAC;CACzB;AAED;;GAEG;AACH,oBAAY,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;AAW9D;;GAEG;AACH,
|
|
1
|
+
{"version":3,"file":"substitutions-parser.d.ts","sourceRoot":"","sources":["../../../src/parser/substitutions-parser.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,MAAM,YAAY,CAAC;AAEjC,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,EAAE,CAAC,YAAY,CAAC;IACxB,MAAM,EAAE,eAAe,CAAC;CACzB;AAED;;GAEG;AACH,oBAAY,gBAAgB,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC,CAAA;AAW9D;;GAEG;AACH,eAAO,MAAM,sBAAsB,aAAc,MAAM,KAAG,gBAoBzD,CAAC"}
|
|
@@ -4,7 +4,11 @@
|
|
|
4
4
|
//
|
|
5
5
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
6
6
|
if (k2 === undefined) k2 = k;
|
|
7
|
-
Object.
|
|
7
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
8
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
9
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
10
|
+
}
|
|
11
|
+
Object.defineProperty(o, k2, desc);
|
|
8
12
|
}) : (function(o, m, k, k2) {
|
|
9
13
|
if (k2 === undefined) k2 = k;
|
|
10
14
|
o[k2] = m[k];
|
|
@@ -25,16 +29,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
25
29
|
exports.parseSubstitutionsFile = void 0;
|
|
26
30
|
const ts_morph_1 = require("ts-morph");
|
|
27
31
|
const ts = __importStar(require("typescript"));
|
|
28
|
-
|
|
32
|
+
const getSubstitutionType = (substitutionProperty, typeChecker) => {
|
|
29
33
|
const substitutionType = typeChecker.getTypeOfSymbolAtLocation(substitutionProperty, substitutionProperty.getValueDeclarationOrThrow());
|
|
30
34
|
const decode = substitutionType.getPropertyOrThrow('decode');
|
|
31
35
|
const decodeType = typeChecker.getTypeOfSymbolAtLocation(decode, decode.getValueDeclarationOrThrow());
|
|
32
36
|
return decodeType.getCallSignatures()[0].getReturnType();
|
|
33
|
-
}
|
|
37
|
+
};
|
|
34
38
|
/**
|
|
35
39
|
* Parse a protobuf-substitutions file and return a map of protobuf FQN => Typescript identifier.
|
|
36
40
|
*/
|
|
37
|
-
|
|
41
|
+
const parseSubstitutionsFile = (fileName) => {
|
|
38
42
|
const project = new ts_morph_1.Project({
|
|
39
43
|
tsConfigFilePath: ts.findConfigFile(fileName, ts.sys.fileExists)
|
|
40
44
|
});
|
|
@@ -51,6 +55,6 @@ function parseSubstitutionsFile(fileName) {
|
|
|
51
55
|
substitutions[name] = type.getText();
|
|
52
56
|
}
|
|
53
57
|
return substitutions;
|
|
54
|
-
}
|
|
58
|
+
};
|
|
55
59
|
exports.parseSubstitutionsFile = parseSubstitutionsFile;
|
|
56
60
|
//# sourceMappingURL=substitutions-parser.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"substitutions-parser.js","sourceRoot":"","sources":["../../../src/parser/substitutions-parser.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE
|
|
1
|
+
{"version":3,"file":"substitutions-parser.js","sourceRoot":"","sources":["../../../src/parser/substitutions-parser.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;AAEF,uCAAwD;AACxD,+CAAiC;AAcjC,MAAM,mBAAmB,GAAG,CAAC,oBAA4B,EAAE,WAAwB,EAAE,EAAE;IACrF,MAAM,gBAAgB,GAAG,WAAW,CAAC,yBAAyB,CAAC,oBAAoB,EAAE,oBAAoB,CAAC,0BAA0B,EAAE,CAAC,CAAC;IAExI,MAAM,MAAM,GAAG,gBAAgB,CAAC,kBAAkB,CAAC,QAAQ,CAAC,CAAC;IAC7D,MAAM,UAAU,GAAG,WAAW,CAAC,yBAAyB,CAAC,MAAM,EAAE,MAAM,CAAC,0BAA0B,EAAE,CAAC,CAAC;IAEtG,OAAO,UAAU,CAAC,iBAAiB,EAAE,CAAC,CAAC,CAAC,CAAC,aAAa,EAAE,CAAC;AAC3D,CAAC,CAAC;AAEF;;GAEG;AACI,MAAM,sBAAsB,GAAG,CAAC,QAAgB,EAAoB,EAAE;IAC3E,MAAM,OAAO,GAAG,IAAI,kBAAO,CAAC;QAC1B,gBAAgB,EAAE,EAAE,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,CAAC,GAAG,CAAC,UAAU,CAAC;KACjE,CAAC,CAAC;IACH,MAAM,UAAU,GAAG,OAAO,CAAC,mBAAmB,CAAC,QAAQ,CAAC,CAAC;IACzD,OAAO,CAAC,6BAA6B,EAAE,CAAC;IACxC,MAAM,WAAW,GAAG,OAAO,CAAC,cAAc,EAAE,CAAC;IAE7C,MAAM,YAAY,GAAG,UAAU,CAAC,6BAA6B,EAAE,CAAC;IAChE,MAAM,YAAY,GAAG,YAAY,CAAC,eAAe,EAAE,CAAC;IACpD,MAAM,UAAU,GAAG,WAAW,CAAC,yBAAyB,CAAC,YAAY,EAAE,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC;IAExF,MAAM,aAAa,GAA2B,EAAE,CAAC;IACjD,KAAK,MAAM,YAAY,IAAI,UAAU,CAAC,aAAa,EAAE,EAAE;QACrD,MAAM,IAAI,GAAG,YAAY,CAAC,OAAO,EAAE,CAAC;QACpC,MAAM,IAAI,GAAG,mBAAmB,CAAC,YAAY,EAAE,WAAW,CAAC,CAAC;QAC5D,aAAa,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,EAAE,CAAC;KACtC;IAED,OAAO,aAAa,CAAC;AACvB,CAAC,CAAC;AApBW,QAAA,sBAAsB,0BAoBjC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protobuf-json.d.ts","sourceRoot":"","sources":["../../src/protobuf-json.ts"],"names":[],"mappings":"AAIA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAsBlC,
|
|
1
|
+
{"version":3,"file":"protobuf-json.d.ts","sourceRoot":"","sources":["../../src/protobuf-json.ts"],"names":[],"mappings":"AAIA,OAAO,QAAQ,MAAM,YAAY,CAAC;AAsBlC,eAAO,MAAM,qBAAqB,SAAU,SAAS,IAAI,KAAG,GAAmE,CAAC"}
|
|
@@ -4,7 +4,7 @@
|
|
|
4
4
|
//
|
|
5
5
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
6
|
exports.serializeSchemaToJson = void 0;
|
|
7
|
-
|
|
7
|
+
const postprocessProtobufJson = (protobufJson) => {
|
|
8
8
|
if (!protobufJson.nested) {
|
|
9
9
|
return protobufJson;
|
|
10
10
|
}
|
|
@@ -15,9 +15,7 @@ function postprocessProtobufJson(protobufJson) {
|
|
|
15
15
|
...protobufJson,
|
|
16
16
|
nested: newNested
|
|
17
17
|
};
|
|
18
|
-
}
|
|
19
|
-
|
|
20
|
-
return postprocessProtobufJson(root.toJSON({ keepComments: true }));
|
|
21
|
-
}
|
|
18
|
+
};
|
|
19
|
+
const serializeSchemaToJson = (root) => postprocessProtobufJson(root.toJSON({ keepComments: true }));
|
|
22
20
|
exports.serializeSchemaToJson = serializeSchemaToJson;
|
|
23
21
|
//# sourceMappingURL=protobuf-json.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"protobuf-json.js","sourceRoot":"","sources":["../../src/protobuf-json.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AASF,
|
|
1
|
+
{"version":3,"file":"protobuf-json.js","sourceRoot":"","sources":["../../src/protobuf-json.ts"],"names":[],"mappings":";AAAA,EAAE;AACF,0BAA0B;AAC1B,EAAE;;;AASF,MAAM,uBAAuB,GAAG,CAAC,YAA0B,EAAgB,EAAE;IAC3E,IAAI,CAAC,YAAY,CAAC,MAAM,EAAE;QACxB,OAAO,YAAY,CAAC;KACrB;IAED,MAAM,SAAS,GAAG,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,MAAM,CAAC;SACrE,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;SACxC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,EAAE,uBAAuB,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;IAEjE,OAAO;QACL,GAAG,YAAY;QACf,MAAM,EAAE,SAAS;KAClB,CAAC;AACJ,CAAC,CAAC;AAEK,MAAM,qBAAqB,GAAG,CAAC,IAAmB,EAAO,EAAE,CAAC,uBAAuB,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;AAAnH,QAAA,qBAAqB,yBAA8F"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import pb from 'protobufjs';
|
|
2
2
|
import { ModuleSpecifier } from './module-specifier';
|
|
3
3
|
import { SubstitutionsMap } from './parser';
|
|
4
|
-
export declare
|
|
4
|
+
export declare const parseAndGenerateSchema: (substitutionsModule: ModuleSpecifier | undefined, protoFiles: string[], outDirPath: string) => Promise<void>;
|
|
5
5
|
export interface GenerateSchemaOptions {
|
|
6
6
|
schema: pb.Root;
|
|
7
7
|
outDir: string;
|
|
@@ -13,5 +13,5 @@ export interface GenerateSchemaOptions {
|
|
|
13
13
|
/**
|
|
14
14
|
* Generate typescript definitions for a given schema and write them to `options.outDir`.
|
|
15
15
|
*/
|
|
16
|
-
export declare
|
|
16
|
+
export declare const generateSchema: (options: GenerateSchemaOptions) => void;
|
|
17
17
|
//# sourceMappingURL=type-generator.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"type-generator.d.ts","sourceRoot":"","sources":["../../src/type-generator.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,YAAY,CAAC;AAM5B,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAA4C,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAKtF,
|
|
1
|
+
{"version":3,"file":"type-generator.d.ts","sourceRoot":"","sources":["../../src/type-generator.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,MAAM,YAAY,CAAC;AAM5B,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAErD,OAAO,EAA4C,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAKtF,eAAO,MAAM,sBAAsB,wBAA+B,eAAe,GAAG,SAAS,cAAc,MAAM,EAAE,cAAc,MAAM,kBAsBtI,CAAC;AAEF,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,EAAE,CAAC,IAAI,CAAA;IACf,MAAM,EAAE,MAAM,CAAA;IACd,aAAa,CAAC,EAAE;QACd,GAAG,EAAE,gBAAgB,CAAC;QACtB,MAAM,EAAE,eAAe,CAAA;KACxB,CAAA;CACF;AAED;;GAEG;AACH,eAAO,MAAM,cAAc,YAAa,qBAAqB,SA8B5D,CAAC"}
|
|
@@ -4,7 +4,11 @@
|
|
|
4
4
|
//
|
|
5
5
|
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
6
6
|
if (k2 === undefined) k2 = k;
|
|
7
|
-
Object.
|
|
7
|
+
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
8
|
+
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
9
|
+
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
10
|
+
}
|
|
11
|
+
Object.defineProperty(o, k2, desc);
|
|
8
12
|
}) : (function(o, m, k, k2) {
|
|
9
13
|
if (k2 === undefined) k2 = k;
|
|
10
14
|
o[k2] = m[k];
|
|
@@ -37,11 +41,16 @@ const namespaces_1 = require("./namespaces");
|
|
|
37
41
|
const parser_1 = require("./parser");
|
|
38
42
|
(0, parser_1.registerResolver)();
|
|
39
43
|
(0, configure_1.preconfigureProtobufjs)();
|
|
40
|
-
async
|
|
44
|
+
const parseAndGenerateSchema = async (substitutionsModule, protoFiles, outDirPath) => {
|
|
41
45
|
const substitutions = substitutionsModule ? (0, parser_1.parseSubstitutionsFile)(substitutionsModule.resolve()) : {};
|
|
42
|
-
logger_1.logger.logParsedSubstitutions(substitutions);
|
|
43
46
|
const root = await protobufjs_1.default.load(protoFiles);
|
|
44
|
-
|
|
47
|
+
for (const fqn of Object.keys(substitutions)) {
|
|
48
|
+
if (!root.lookup(fqn)) {
|
|
49
|
+
throw new Error(`No protobuf definition found matching the substitution: ${fqn}`);
|
|
50
|
+
}
|
|
51
|
+
}
|
|
52
|
+
logger_1.logger.logParsedSubstitutions(substitutions);
|
|
53
|
+
await (0, exports.generateSchema)({
|
|
45
54
|
schema: root,
|
|
46
55
|
outDir: outDirPath,
|
|
47
56
|
substitutions: substitutions
|
|
@@ -51,12 +60,12 @@ async function parseAndGenerateSchema(substitutionsModule, protoFiles, outDirPat
|
|
|
51
60
|
}
|
|
52
61
|
: undefined
|
|
53
62
|
});
|
|
54
|
-
}
|
|
63
|
+
};
|
|
55
64
|
exports.parseAndGenerateSchema = parseAndGenerateSchema;
|
|
56
65
|
/**
|
|
57
66
|
* Generate typescript definitions for a given schema and write them to `options.outDir`.
|
|
58
67
|
*/
|
|
59
|
-
|
|
68
|
+
const generateSchema = (options) => {
|
|
60
69
|
var _a, _b, _c, _d;
|
|
61
70
|
const namespaces = (0, namespaces_1.splitSchemaIntoNamespaces)(options.schema);
|
|
62
71
|
const printer = ts.createPrinter();
|
|
@@ -72,6 +81,6 @@ function generateSchema(options) {
|
|
|
72
81
|
const generatedSourceFile = (0, file_generator_1.createIndexSourceFile)((_d = options.substitutions) === null || _d === void 0 ? void 0 : _d.module, options.schema, options.outDir, Array.from(namespaces.keys()));
|
|
73
82
|
const source = printer.printFile(generatedSourceFile);
|
|
74
83
|
(0, fs_1.writeFileSync)((0, path_1.join)(options.outDir, 'index.ts'), source);
|
|
75
|
-
}
|
|
84
|
+
};
|
|
76
85
|
exports.generateSchema = generateSchema;
|
|
77
86
|
//# sourceMappingURL=type-generator.js.map
|