@foxglove/schemas 0.4.0 → 0.6.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.
Files changed (264) hide show
  1. package/.vscode/settings.json +1 -1
  2. package/dist/cjs/schemas/typescript/ArrowPrimitive.d.ts +18 -0
  3. package/dist/cjs/schemas/typescript/ArrowPrimitive.d.ts.map +1 -0
  4. package/dist/cjs/schemas/typescript/ArrowPrimitive.js +4 -0
  5. package/dist/cjs/schemas/typescript/ArrowPrimitive.js.map +1 -0
  6. package/dist/cjs/schemas/typescript/CameraCalibration.d.ts +2 -0
  7. package/dist/cjs/schemas/typescript/CameraCalibration.d.ts.map +1 -1
  8. package/dist/cjs/schemas/typescript/CompressedImage.d.ts +2 -0
  9. package/dist/cjs/schemas/typescript/CompressedImage.d.ts.map +1 -1
  10. package/dist/cjs/schemas/typescript/CubePrimitive.d.ts +13 -0
  11. package/dist/cjs/schemas/typescript/CubePrimitive.d.ts.map +1 -0
  12. package/dist/cjs/schemas/typescript/CubePrimitive.js +4 -0
  13. package/dist/cjs/schemas/typescript/CubePrimitive.js.map +1 -0
  14. package/dist/cjs/schemas/typescript/CylinderPrimitive.d.ts +17 -0
  15. package/dist/cjs/schemas/typescript/CylinderPrimitive.d.ts.map +1 -0
  16. package/dist/cjs/schemas/typescript/CylinderPrimitive.js +4 -0
  17. package/dist/cjs/schemas/typescript/CylinderPrimitive.js.map +1 -0
  18. package/dist/cjs/schemas/typescript/KeyValuePair.d.ts +8 -0
  19. package/dist/cjs/schemas/typescript/KeyValuePair.d.ts.map +1 -0
  20. package/dist/cjs/schemas/typescript/KeyValuePair.js +4 -0
  21. package/dist/cjs/schemas/typescript/KeyValuePair.js.map +1 -0
  22. package/dist/cjs/schemas/typescript/LinePrimitive.d.ts +28 -0
  23. package/dist/cjs/schemas/typescript/LinePrimitive.d.ts.map +1 -0
  24. package/dist/cjs/schemas/typescript/LinePrimitive.js +4 -0
  25. package/dist/cjs/schemas/typescript/LinePrimitive.js.map +1 -0
  26. package/dist/cjs/schemas/typescript/LineType.d.ts +10 -0
  27. package/dist/cjs/schemas/typescript/LineType.d.ts.map +1 -0
  28. package/dist/cjs/schemas/typescript/LineType.js +15 -0
  29. package/dist/cjs/schemas/typescript/LineType.js.map +1 -0
  30. package/dist/cjs/schemas/typescript/ModelPrimitive.d.ts +21 -0
  31. package/dist/cjs/schemas/typescript/ModelPrimitive.d.ts.map +1 -0
  32. package/dist/cjs/schemas/typescript/ModelPrimitive.js +4 -0
  33. package/dist/cjs/schemas/typescript/ModelPrimitive.js.map +1 -0
  34. package/dist/cjs/schemas/typescript/RawImage.d.ts +2 -0
  35. package/dist/cjs/schemas/typescript/RawImage.d.ts.map +1 -1
  36. package/dist/cjs/schemas/typescript/SceneEntity.d.ts +43 -0
  37. package/dist/cjs/schemas/typescript/SceneEntity.d.ts.map +1 -0
  38. package/dist/cjs/schemas/typescript/SceneEntity.js +4 -0
  39. package/dist/cjs/schemas/typescript/SceneEntity.js.map +1 -0
  40. package/dist/cjs/schemas/typescript/SceneEntityDeletion.d.ts +12 -0
  41. package/dist/cjs/schemas/typescript/SceneEntityDeletion.d.ts.map +1 -0
  42. package/dist/cjs/schemas/typescript/SceneEntityDeletion.js +4 -0
  43. package/dist/cjs/schemas/typescript/SceneEntityDeletion.js.map +1 -0
  44. package/dist/cjs/schemas/typescript/SceneEntityDeletionType.d.ts +8 -0
  45. package/dist/cjs/schemas/typescript/SceneEntityDeletionType.d.ts.map +1 -0
  46. package/dist/cjs/schemas/typescript/SceneEntityDeletionType.js +13 -0
  47. package/dist/cjs/schemas/typescript/SceneEntityDeletionType.js.map +1 -0
  48. package/dist/cjs/schemas/typescript/SceneUpdate.d.ts +10 -0
  49. package/dist/cjs/schemas/typescript/SceneUpdate.d.ts.map +1 -0
  50. package/dist/cjs/schemas/typescript/SceneUpdate.js +4 -0
  51. package/dist/cjs/schemas/typescript/SceneUpdate.js.map +1 -0
  52. package/dist/cjs/schemas/typescript/SpherePrimitive.d.ts +13 -0
  53. package/dist/cjs/schemas/typescript/SpherePrimitive.d.ts.map +1 -0
  54. package/dist/cjs/schemas/typescript/SpherePrimitive.js +4 -0
  55. package/dist/cjs/schemas/typescript/SpherePrimitive.js.map +1 -0
  56. package/dist/cjs/schemas/typescript/TextPrimitive.d.ts +18 -0
  57. package/dist/cjs/schemas/typescript/TextPrimitive.d.ts.map +1 -0
  58. package/dist/cjs/schemas/typescript/TextPrimitive.js +4 -0
  59. package/dist/cjs/schemas/typescript/TextPrimitive.js.map +1 -0
  60. package/dist/cjs/schemas/typescript/TriangleListPrimitive.d.ts +21 -0
  61. package/dist/cjs/schemas/typescript/TriangleListPrimitive.d.ts.map +1 -0
  62. package/dist/cjs/schemas/typescript/TriangleListPrimitive.js +4 -0
  63. package/dist/cjs/schemas/typescript/TriangleListPrimitive.js.map +1 -0
  64. package/dist/cjs/schemas/typescript/index.d.ts +14 -0
  65. package/dist/cjs/schemas/typescript/index.d.ts.map +1 -1
  66. package/dist/cjs/schemas/typescript/index.js +14 -0
  67. package/dist/cjs/schemas/typescript/index.js.map +1 -1
  68. package/dist/cjs/src/generateJsonSchema.test.js +71 -71
  69. package/dist/cjs/src/generateProto.d.ts.map +1 -1
  70. package/dist/cjs/src/generateProto.js +21 -3
  71. package/dist/cjs/src/generateProto.js.map +1 -1
  72. package/dist/cjs/src/generateProto.test.js +26 -26
  73. package/dist/cjs/src/generateRos.js +3 -3
  74. package/dist/cjs/src/generateRos.js.map +1 -1
  75. package/dist/cjs/src/generateRos.test.js +116 -116
  76. package/dist/cjs/src/generateTypeScript.test.js +4 -4
  77. package/dist/cjs/src/schemas.d.ts +15 -1
  78. package/dist/cjs/src/schemas.d.ts.map +1 -1
  79. package/dist/cjs/src/schemas.js +559 -79
  80. package/dist/cjs/src/schemas.js.map +1 -1
  81. package/dist/cjs/src/schemas.test.js +17 -0
  82. package/dist/cjs/src/schemas.test.js.map +1 -1
  83. package/dist/cjs/src/testFixtures.d.ts.map +1 -1
  84. package/dist/cjs/src/testFixtures.js +1 -0
  85. package/dist/cjs/src/testFixtures.js.map +1 -1
  86. package/dist/cjs/src/types.d.ts +19 -17
  87. package/dist/cjs/src/types.d.ts.map +1 -1
  88. package/dist/esm/schemas/typescript/ArrowPrimitive.d.ts +18 -0
  89. package/dist/esm/schemas/typescript/ArrowPrimitive.d.ts.map +1 -0
  90. package/dist/esm/schemas/typescript/ArrowPrimitive.js +3 -0
  91. package/dist/esm/schemas/typescript/ArrowPrimitive.js.map +1 -0
  92. package/dist/esm/schemas/typescript/CameraCalibration.d.ts +2 -0
  93. package/dist/esm/schemas/typescript/CameraCalibration.d.ts.map +1 -1
  94. package/dist/esm/schemas/typescript/CompressedImage.d.ts +2 -0
  95. package/dist/esm/schemas/typescript/CompressedImage.d.ts.map +1 -1
  96. package/dist/esm/schemas/typescript/CubePrimitive.d.ts +13 -0
  97. package/dist/esm/schemas/typescript/CubePrimitive.d.ts.map +1 -0
  98. package/dist/esm/schemas/typescript/CubePrimitive.js +3 -0
  99. package/dist/esm/schemas/typescript/CubePrimitive.js.map +1 -0
  100. package/dist/esm/schemas/typescript/CylinderPrimitive.d.ts +17 -0
  101. package/dist/esm/schemas/typescript/CylinderPrimitive.d.ts.map +1 -0
  102. package/dist/esm/schemas/typescript/CylinderPrimitive.js +3 -0
  103. package/dist/esm/schemas/typescript/CylinderPrimitive.js.map +1 -0
  104. package/dist/esm/schemas/typescript/KeyValuePair.d.ts +8 -0
  105. package/dist/esm/schemas/typescript/KeyValuePair.d.ts.map +1 -0
  106. package/dist/esm/schemas/typescript/KeyValuePair.js +3 -0
  107. package/dist/esm/schemas/typescript/KeyValuePair.js.map +1 -0
  108. package/dist/esm/schemas/typescript/LinePrimitive.d.ts +28 -0
  109. package/dist/esm/schemas/typescript/LinePrimitive.d.ts.map +1 -0
  110. package/dist/esm/schemas/typescript/LinePrimitive.js +3 -0
  111. package/dist/esm/schemas/typescript/LinePrimitive.js.map +1 -0
  112. package/dist/esm/schemas/typescript/LineType.d.ts +10 -0
  113. package/dist/esm/schemas/typescript/LineType.d.ts.map +1 -0
  114. package/dist/esm/schemas/typescript/LineType.js +12 -0
  115. package/dist/esm/schemas/typescript/LineType.js.map +1 -0
  116. package/dist/esm/schemas/typescript/ModelPrimitive.d.ts +21 -0
  117. package/dist/esm/schemas/typescript/ModelPrimitive.d.ts.map +1 -0
  118. package/dist/esm/schemas/typescript/ModelPrimitive.js +3 -0
  119. package/dist/esm/schemas/typescript/ModelPrimitive.js.map +1 -0
  120. package/dist/esm/schemas/typescript/RawImage.d.ts +2 -0
  121. package/dist/esm/schemas/typescript/RawImage.d.ts.map +1 -1
  122. package/dist/esm/schemas/typescript/SceneEntity.d.ts +43 -0
  123. package/dist/esm/schemas/typescript/SceneEntity.d.ts.map +1 -0
  124. package/dist/esm/schemas/typescript/SceneEntity.js +3 -0
  125. package/dist/esm/schemas/typescript/SceneEntity.js.map +1 -0
  126. package/dist/esm/schemas/typescript/SceneEntityDeletion.d.ts +12 -0
  127. package/dist/esm/schemas/typescript/SceneEntityDeletion.d.ts.map +1 -0
  128. package/dist/esm/schemas/typescript/SceneEntityDeletion.js +3 -0
  129. package/dist/esm/schemas/typescript/SceneEntityDeletion.js.map +1 -0
  130. package/dist/esm/schemas/typescript/SceneEntityDeletionType.d.ts +8 -0
  131. package/dist/esm/schemas/typescript/SceneEntityDeletionType.d.ts.map +1 -0
  132. package/dist/esm/schemas/typescript/SceneEntityDeletionType.js +10 -0
  133. package/dist/esm/schemas/typescript/SceneEntityDeletionType.js.map +1 -0
  134. package/dist/esm/schemas/typescript/SceneUpdate.d.ts +10 -0
  135. package/dist/esm/schemas/typescript/SceneUpdate.d.ts.map +1 -0
  136. package/dist/esm/schemas/typescript/SceneUpdate.js +3 -0
  137. package/dist/esm/schemas/typescript/SceneUpdate.js.map +1 -0
  138. package/dist/esm/schemas/typescript/SpherePrimitive.d.ts +13 -0
  139. package/dist/esm/schemas/typescript/SpherePrimitive.d.ts.map +1 -0
  140. package/dist/esm/schemas/typescript/SpherePrimitive.js +3 -0
  141. package/dist/esm/schemas/typescript/SpherePrimitive.js.map +1 -0
  142. package/dist/esm/schemas/typescript/TextPrimitive.d.ts +18 -0
  143. package/dist/esm/schemas/typescript/TextPrimitive.d.ts.map +1 -0
  144. package/dist/esm/schemas/typescript/TextPrimitive.js +3 -0
  145. package/dist/esm/schemas/typescript/TextPrimitive.js.map +1 -0
  146. package/dist/esm/schemas/typescript/TriangleListPrimitive.d.ts +21 -0
  147. package/dist/esm/schemas/typescript/TriangleListPrimitive.d.ts.map +1 -0
  148. package/dist/esm/schemas/typescript/TriangleListPrimitive.js +3 -0
  149. package/dist/esm/schemas/typescript/TriangleListPrimitive.js.map +1 -0
  150. package/dist/esm/schemas/typescript/index.d.ts +14 -0
  151. package/dist/esm/schemas/typescript/index.d.ts.map +1 -1
  152. package/dist/esm/schemas/typescript/index.js +14 -0
  153. package/dist/esm/schemas/typescript/index.js.map +1 -1
  154. package/dist/esm/src/generateJsonSchema.test.js +71 -71
  155. package/dist/esm/src/generateProto.d.ts.map +1 -1
  156. package/dist/esm/src/generateProto.js +21 -3
  157. package/dist/esm/src/generateProto.js.map +1 -1
  158. package/dist/esm/src/generateProto.test.js +26 -26
  159. package/dist/esm/src/generateRos.js +4 -4
  160. package/dist/esm/src/generateRos.js.map +1 -1
  161. package/dist/esm/src/generateRos.test.js +116 -116
  162. package/dist/esm/src/generateTypeScript.test.js +4 -4
  163. package/dist/esm/src/schemas.d.ts +15 -1
  164. package/dist/esm/src/schemas.d.ts.map +1 -1
  165. package/dist/esm/src/schemas.js +559 -79
  166. package/dist/esm/src/schemas.js.map +1 -1
  167. package/dist/esm/src/schemas.test.js +17 -0
  168. package/dist/esm/src/schemas.test.js.map +1 -1
  169. package/dist/esm/src/testFixtures.d.ts.map +1 -1
  170. package/dist/esm/src/testFixtures.js +1 -0
  171. package/dist/esm/src/testFixtures.js.map +1 -1
  172. package/dist/esm/src/types.d.ts +19 -17
  173. package/dist/esm/src/types.d.ts.map +1 -1
  174. package/jest.config.json +8 -8
  175. package/package.json +18 -18
  176. package/schemas/README.md +1069 -13
  177. package/schemas/jsonschema/ArrowPrimitive.json +96 -0
  178. package/schemas/jsonschema/CameraCalibration.json +4 -0
  179. package/schemas/jsonschema/CompressedImage.json +4 -0
  180. package/schemas/jsonschema/CubePrimitive.json +99 -0
  181. package/schemas/jsonschema/CylinderPrimitive.json +107 -0
  182. package/schemas/jsonschema/KeyValuePair.json +16 -0
  183. package/schemas/jsonschema/LinePrimitive.json +167 -0
  184. package/schemas/jsonschema/ModelPrimitive.json +116 -0
  185. package/schemas/jsonschema/RawImage.json +4 -0
  186. package/schemas/jsonschema/SceneEntity.json +1012 -0
  187. package/schemas/jsonschema/SceneEntityDeletion.json +44 -0
  188. package/schemas/jsonschema/SceneUpdate.json +1070 -0
  189. package/schemas/jsonschema/SpherePrimitive.json +99 -0
  190. package/schemas/jsonschema/TextPrimitive.json +96 -0
  191. package/schemas/jsonschema/TriangleListPrimitive.json +138 -0
  192. package/schemas/proto/foxglove/ArrowPrimitive.proto +29 -0
  193. package/schemas/proto/foxglove/CameraCalibration.proto +3 -0
  194. package/schemas/proto/foxglove/CompressedImage.proto +3 -0
  195. package/schemas/proto/foxglove/CubePrimitive.proto +21 -0
  196. package/schemas/proto/foxglove/CylinderPrimitive.proto +27 -0
  197. package/schemas/proto/foxglove/KeyValuePair.proto +14 -0
  198. package/schemas/proto/foxglove/LinePrimitive.proto +49 -0
  199. package/schemas/proto/foxglove/ModelPrimitive.proto +33 -0
  200. package/schemas/proto/foxglove/RawImage.proto +3 -0
  201. package/schemas/proto/foxglove/SceneEntity.proto +62 -0
  202. package/schemas/proto/foxglove/SceneEntityDeletion.proto +27 -0
  203. package/schemas/proto/foxglove/SceneUpdate.proto +17 -0
  204. package/schemas/proto/foxglove/SpherePrimitive.proto +21 -0
  205. package/schemas/proto/foxglove/TextPrimitive.proto +29 -0
  206. package/schemas/proto/foxglove/TriangleListPrimitive.proto +29 -0
  207. package/schemas/ros1/ArrowPrimitive.msg +22 -0
  208. package/schemas/ros1/CameraCalibration.msg +3 -0
  209. package/schemas/ros1/CompressedImage.msg +3 -0
  210. package/schemas/ros1/CubePrimitive.msg +13 -0
  211. package/schemas/ros1/CylinderPrimitive.msg +19 -0
  212. package/schemas/ros1/KeyValuePair.msg +10 -0
  213. package/schemas/ros1/LinePrimitive.msg +39 -0
  214. package/schemas/ros1/ModelPrimitive.msg +25 -0
  215. package/schemas/ros1/RawImage.msg +3 -0
  216. package/schemas/ros1/SceneEntity.msg +46 -0
  217. package/schemas/ros1/SceneEntityDeletion.msg +19 -0
  218. package/schemas/ros1/SceneUpdate.msg +10 -0
  219. package/schemas/ros1/SpherePrimitive.msg +13 -0
  220. package/schemas/ros1/TextPrimitive.msg +22 -0
  221. package/schemas/ros1/TriangleListPrimitive.msg +21 -0
  222. package/schemas/ros2/ArrowPrimitive.msg +22 -0
  223. package/schemas/ros2/CameraCalibration.msg +3 -0
  224. package/schemas/ros2/CompressedImage.msg +3 -0
  225. package/schemas/ros2/CubePrimitive.msg +13 -0
  226. package/schemas/ros2/CylinderPrimitive.msg +19 -0
  227. package/schemas/ros2/KeyValuePair.msg +10 -0
  228. package/schemas/ros2/LinePrimitive.msg +39 -0
  229. package/schemas/ros2/ModelPrimitive.msg +25 -0
  230. package/schemas/ros2/RawImage.msg +3 -0
  231. package/schemas/ros2/SceneEntity.msg +46 -0
  232. package/schemas/ros2/SceneEntityDeletion.msg +19 -0
  233. package/schemas/ros2/SceneUpdate.msg +10 -0
  234. package/schemas/ros2/SpherePrimitive.msg +13 -0
  235. package/schemas/ros2/TextPrimitive.msg +22 -0
  236. package/schemas/ros2/TriangleListPrimitive.msg +21 -0
  237. package/schemas/typescript/ArrowPrimitive.ts +25 -0
  238. package/schemas/typescript/CameraCalibration.ts +3 -0
  239. package/schemas/typescript/CompressedImage.ts +3 -0
  240. package/schemas/typescript/CubePrimitive.ts +17 -0
  241. package/schemas/typescript/CylinderPrimitive.ts +23 -0
  242. package/schemas/typescript/KeyValuePair.ts +10 -0
  243. package/schemas/typescript/LinePrimitive.ts +37 -0
  244. package/schemas/typescript/LineType.ts +13 -0
  245. package/schemas/typescript/ModelPrimitive.ts +29 -0
  246. package/schemas/typescript/RawImage.ts +3 -0
  247. package/schemas/typescript/SceneEntity.ts +58 -0
  248. package/schemas/typescript/SceneEntityDeletion.ts +16 -0
  249. package/schemas/typescript/SceneEntityDeletionType.ts +10 -0
  250. package/schemas/typescript/SceneUpdate.ts +13 -0
  251. package/schemas/typescript/SpherePrimitive.ts +17 -0
  252. package/schemas/typescript/TextPrimitive.ts +25 -0
  253. package/schemas/typescript/TriangleListPrimitive.ts +27 -0
  254. package/schemas/typescript/index.ts +14 -0
  255. package/src/generateJsonSchema.test.ts +71 -71
  256. package/src/generateProto.test.ts +26 -26
  257. package/src/generateProto.ts +33 -4
  258. package/src/generateRos.test.ts +116 -116
  259. package/src/generateRos.ts +6 -6
  260. package/src/generateTypeScript.test.ts +4 -4
  261. package/src/schemas.test.ts +19 -0
  262. package/src/schemas.ts +608 -79
  263. package/src/testFixtures.ts +1 -0
  264. package/src/types.ts +14 -11
@@ -7,11 +7,11 @@ describe("generateProto", () => {
7
7
  expect(generateProto(exampleMessage, [exampleEnum])).toMatchInlineSnapshot(`
8
8
  "// Generated by https://github.com/foxglove/schemas
9
9
 
10
- syntax = \\"proto3\\";
10
+ syntax = "proto3";
11
11
 
12
- import \\"foxglove/NestedMessage.proto\\";
13
- import \\"google/protobuf/duration.proto\\";
14
- import \\"google/protobuf/timestamp.proto\\";
12
+ import "foxglove/NestedMessage.proto";
13
+ import "google/protobuf/duration.proto";
14
+ import "google/protobuf/timestamp.proto";
15
15
 
16
16
  package foxglove;
17
17
 
@@ -35,67 +35,67 @@ describe("generateProto", () => {
35
35
  bool field_boolean = 3;
36
36
 
37
37
  // bytes field
38
- bytes field_bytes = 4;
38
+ bytes field_bytes = 5;
39
39
 
40
40
  // float64 field
41
- double field_float64 = 5;
41
+ double field_float64 = 6;
42
42
 
43
43
  // uint32 field
44
- fixed32 field_uint32 = 6;
44
+ fixed32 field_uint32 = 7;
45
45
 
46
46
  // string field
47
- string field_string = 7;
47
+ string field_string = 8;
48
48
 
49
49
  // duration array field
50
- repeated google.protobuf.Duration field_duration_array = 8;
50
+ repeated google.protobuf.Duration field_duration_array = 9;
51
51
 
52
52
  // time array field
53
- repeated google.protobuf.Timestamp field_time_array = 9;
53
+ repeated google.protobuf.Timestamp field_time_array = 10;
54
54
 
55
55
  // boolean array field
56
- repeated bool field_boolean_array = 10;
56
+ repeated bool field_boolean_array = 11;
57
57
 
58
58
  // bytes array field
59
- repeated bytes field_bytes_array = 11;
59
+ repeated bytes field_bytes_array = 12;
60
60
 
61
61
  // float64 array field
62
- repeated double field_float64_array = 12;
62
+ repeated double field_float64_array = 13;
63
63
 
64
64
  // uint32 array field
65
- repeated fixed32 field_uint32_array = 13;
65
+ repeated fixed32 field_uint32_array = 14;
66
66
 
67
67
  // string array field
68
- repeated string field_string_array = 14;
68
+ repeated string field_string_array = 15;
69
69
 
70
70
  // duration fixed-length array field
71
- repeated google.protobuf.Duration field_duration_fixed_array = 15; // length 3
71
+ repeated google.protobuf.Duration field_duration_fixed_array = 16; // length 3
72
72
 
73
73
  // time fixed-length array field
74
- repeated google.protobuf.Timestamp field_time_fixed_array = 16; // length 3
74
+ repeated google.protobuf.Timestamp field_time_fixed_array = 17; // length 3
75
75
 
76
76
  // boolean fixed-length array field
77
- repeated bool field_boolean_fixed_array = 17; // length 3
77
+ repeated bool field_boolean_fixed_array = 18; // length 3
78
78
 
79
79
  // bytes fixed-length array field
80
- repeated bytes field_bytes_fixed_array = 18; // length 3
80
+ repeated bytes field_bytes_fixed_array = 19; // length 3
81
81
 
82
82
  // float64 fixed-length array field
83
- repeated double field_float64_fixed_array = 19; // length 3
83
+ repeated double field_float64_fixed_array = 20; // length 3
84
84
 
85
85
  // uint32 fixed-length array field
86
- repeated fixed32 field_uint32_fixed_array = 20; // length 3
86
+ repeated fixed32 field_uint32_fixed_array = 21; // length 3
87
87
 
88
88
  // string fixed-length array field
89
- repeated string field_string_fixed_array = 21; // length 3
89
+ repeated string field_string_fixed_array = 22; // length 3
90
90
 
91
91
  // An enum field
92
- ExampleProtoEnum field_enum = 22;
92
+ ExampleProtoEnum field_enum = 23;
93
93
 
94
94
  // An enum array field
95
- repeated ExampleProtoEnum field_enum_array = 23;
95
+ repeated ExampleProtoEnum field_enum_array = 24;
96
96
 
97
97
  // A nested field
98
- foxglove.NestedMessage field_nested = 24;
98
+ foxglove.NestedMessage field_nested = 25;
99
99
 
100
100
  // A nested array field
101
101
  // With
@@ -103,7 +103,7 @@ describe("generateProto", () => {
103
103
  // very
104
104
  // long
105
105
  // description
106
- repeated foxglove.NestedMessage field_nested_array = 25;
106
+ repeated foxglove.NestedMessage field_nested_array = 4;
107
107
  }
108
108
  "
109
109
  `);
@@ -1,4 +1,4 @@
1
- import { definitions as rosCommonDefs } from "@foxglove/rosmsg-msgs-common";
1
+ import { ros1 } from "@foxglove/rosmsg-msgs-common";
2
2
  function primitiveToRos(type, { rosVersion }) {
3
3
  switch (type) {
4
4
  case "string":
@@ -54,7 +54,7 @@ function* getSchemaDependencies(schema) {
54
54
  if (field.type.type === "nested") {
55
55
  if (field.type.schema.rosEquivalent != undefined) {
56
56
  yield { type: "ros", name: field.type.schema.rosEquivalent };
57
- yield* getRosDependencies(rosCommonDefs[field.type.schema.rosEquivalent]);
57
+ yield* getRosDependencies(ros1[field.type.schema.rosEquivalent]);
58
58
  }
59
59
  else {
60
60
  yield { type: "foxglove", schema: field.type.schema };
@@ -67,7 +67,7 @@ function* getRosDependencies(schema) {
67
67
  for (const field of schema.definitions) {
68
68
  if (field.isComplex === true) {
69
69
  yield { type: "ros", name: field.type };
70
- yield* getRosDependencies(rosCommonDefs[field.type]);
70
+ yield* getRosDependencies(ros1[field.type]);
71
71
  }
72
72
  }
73
73
  }
@@ -169,7 +169,7 @@ export function generateRosMsgMergedSchema(schema, { rosVersion }) {
169
169
  originalName: dep.name,
170
170
  rosMsgInterfaceName: dep.name,
171
171
  rosFullInterfaceName: dep.name,
172
- fields: rosCommonDefs[dep.name].definitions,
172
+ fields: ros1[dep.name].definitions,
173
173
  });
174
174
  }
175
175
  else {
@@ -1 +1 @@
1
- {"version":3,"file":"generateRos.js","sourceRoot":"","sources":["../../../src/generateRos.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generateRos.js","sourceRoot":"","sources":["../../../src/generateRos.ts"],"names":[],"mappings":"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"}