@foxglove/schemas 1.9.0 → 1.10.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 (65) hide show
  1. package/dist/internal/generateFlatbufferSchema.d.ts.map +1 -1
  2. package/dist/internal/generateFlatbufferSchema.js +12 -2
  3. package/dist/internal/generateFlatbufferSchema.js.map +1 -1
  4. package/dist/internal/generateFlatbufferSchema.test.js +9 -0
  5. package/dist/internal/generateFlatbufferSchema.test.js.map +1 -1
  6. package/dist/internal/generateJsonSchema.js +1 -1
  7. package/dist/internal/generateJsonSchema.js.map +1 -1
  8. package/dist/internal/generateJsonSchema.test.js +12 -0
  9. package/dist/internal/generateJsonSchema.test.js.map +1 -1
  10. package/dist/internal/generateMarkdown.d.ts.map +1 -1
  11. package/dist/internal/generateMarkdown.js +9 -1
  12. package/dist/internal/generateMarkdown.js.map +1 -1
  13. package/dist/internal/generateOmgIdl.d.ts.map +1 -1
  14. package/dist/internal/generateOmgIdl.js +14 -3
  15. package/dist/internal/generateOmgIdl.js.map +1 -1
  16. package/dist/internal/generateOmgIdl.test.js +12 -0
  17. package/dist/internal/generateOmgIdl.test.js.map +1 -1
  18. package/dist/internal/generateProto.d.ts.map +1 -1
  19. package/dist/internal/generateProto.js +9 -1
  20. package/dist/internal/generateProto.js.map +1 -1
  21. package/dist/internal/generateProto.test.js +9 -0
  22. package/dist/internal/generateProto.test.js.map +1 -1
  23. package/dist/internal/generatePyclass.d.ts.map +1 -1
  24. package/dist/internal/generatePyclass.js +10 -7
  25. package/dist/internal/generatePyclass.js.map +1 -1
  26. package/dist/internal/generatePyclass.test.js +14 -2
  27. package/dist/internal/generatePyclass.test.js.map +1 -1
  28. package/dist/internal/generateRos.d.ts.map +1 -1
  29. package/dist/internal/generateRos.js +6 -1
  30. package/dist/internal/generateRos.js.map +1 -1
  31. package/dist/internal/generateRos.test.js +141 -0
  32. package/dist/internal/generateRos.test.js.map +1 -1
  33. package/dist/internal/generateSdkCpp.d.ts.map +1 -1
  34. package/dist/internal/generateSdkCpp.js +4 -1
  35. package/dist/internal/generateSdkCpp.js.map +1 -1
  36. package/dist/internal/generateSdkRustCTypes.js +5 -5
  37. package/dist/internal/generateSdkRustCTypes.js.map +1 -1
  38. package/dist/internal/generateTypeScript.d.ts.map +1 -1
  39. package/dist/internal/generateTypeScript.js +20 -3
  40. package/dist/internal/generateTypeScript.js.map +1 -1
  41. package/dist/internal/generateTypeScript.test.js +18 -0
  42. package/dist/internal/generateTypeScript.test.js.map +1 -1
  43. package/dist/internal/schemas.d.ts.map +1 -1
  44. package/dist/internal/schemas.js +21 -3
  45. package/dist/internal/schemas.js.map +1 -1
  46. package/dist/internal/schemas.test.js +2 -2
  47. package/dist/internal/schemas.test.js.map +1 -1
  48. package/dist/internal/testFixtures.d.ts.map +1 -1
  49. package/dist/internal/testFixtures.js +18 -0
  50. package/dist/internal/testFixtures.js.map +1 -1
  51. package/dist/internal/types.d.ts +2 -0
  52. package/dist/internal/types.d.ts.map +1 -1
  53. package/dist/jsonschema/index.d.ts +60 -0
  54. package/dist/jsonschema/index.d.ts.map +1 -1
  55. package/dist/jsonschema/index.js +78 -11
  56. package/dist/jsonschema/index.js.map +1 -1
  57. package/dist/types/CameraCalibration.d.ts +2 -0
  58. package/dist/types/CameraCalibration.d.ts.map +1 -1
  59. package/dist/types/FrameTransform.d.ts +11 -3
  60. package/dist/types/FrameTransform.d.ts.map +1 -1
  61. package/dist/types/ImageAnnotations.d.ts +3 -0
  62. package/dist/types/ImageAnnotations.d.ts.map +1 -1
  63. package/dist/types/LocationFix.d.ts +4 -1
  64. package/dist/types/LocationFix.d.ts.map +1 -1
  65. package/package.json +1 -1
@@ -1 +1 @@
1
- {"version":3,"file":"generateFlatbufferSchema.d.ts","sourceRoot":"","sources":["../../src/internal/generateFlatbufferSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EAErB,cAAc,EACf,MAAM,SAAS,CAAC;AAGjB,eAAO,MAAM,cAAc,wIAQ1B,CAAC;AAEF,eAAO,MAAM,OAAO,wNASnB,CAAC;AAEF,eAAO,MAAM,WAAW,iRAUvB,CAAC;AAmBF;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,qBAAqB,GAAG,MAAM,CAKjF;AAYD,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,cAAc,EACtB,WAAW,EAAE,kBAAkB,EAAE,GAChC,MAAM,CA4HR"}
1
+ {"version":3,"file":"generateFlatbufferSchema.d.ts","sourceRoot":"","sources":["../../src/internal/generateFlatbufferSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,qBAAqB,EAErB,cAAc,EACf,MAAM,SAAS,CAAC;AAGjB,eAAO,MAAM,cAAc,wIAQ1B,CAAC;AAEF,eAAO,MAAM,OAAO,wNASnB,CAAC;AAEF,eAAO,MAAM,WAAW,iRAUvB,CAAC;AAmBF;;GAEG;AACH,wBAAgB,2BAA2B,CAAC,MAAM,EAAE,qBAAqB,GAAG,MAAM,CAKjF;AAYD,wBAAgB,mBAAmB,CACjC,MAAM,EAAE,cAAc,EACtB,WAAW,EAAE,kBAAkB,EAAE,GAChC,MAAM,CAsIR"}
@@ -96,7 +96,12 @@ function generateFlatbuffers(schema, nestedEnums) {
96
96
  }
97
97
  });
98
98
  // `///` comments required to show up in compiled flatbuffer schemas
99
- definition = `/// ${schema.description}\nenum ${schema.name} : ubyte {\n ${fields.join("\n\n ")}\n}\n`;
99
+ const enumDescriptionLines = schema.description
100
+ .trim()
101
+ .split("\n")
102
+ .map((line) => `/// ${line}`)
103
+ .join("\n");
104
+ definition = `${enumDescriptionLines}\nenum ${schema.name} : ubyte {\n ${fields.join("\n\n ")}\n}\n`;
100
105
  break;
101
106
  }
102
107
  case "message": {
@@ -165,7 +170,12 @@ function generateFlatbuffers(schema, nestedEnums) {
165
170
  // convert field.name to lowercase for flatbuffer compilation compliance
166
171
  } ${field.name.toLowerCase()}:${isArray ? `[${type}]` : type}${defaultValue ? ` = ${defaultValue}` : ""} (id: ${fieldId});`;
167
172
  });
168
- definition = `${enumDefinitions.join("\n\n")}/// ${schema.description}\ntable ${schema.name} {\n${fields.join("\n\n")}\n}\n\nroot_type ${schema.name};`;
173
+ const tableDescriptionLines = schema.description
174
+ .trim()
175
+ .split("\n")
176
+ .map((line) => `/// ${line}`)
177
+ .join("\n");
178
+ definition = `${enumDefinitions.join("\n\n")}${tableDescriptionLines}\ntable ${schema.name} {\n${fields.join("\n\n")}\n}\n\nroot_type ${schema.name};`;
169
179
  break;
170
180
  }
171
181
  }
@@ -1 +1 @@
1
- {"version":3,"file":"generateFlatbufferSchema.js","sourceRoot":"","sources":["../../src/internal/generateFlatbufferSchema.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generateFlatbufferSchema.js","sourceRoot":"","sources":["../../src/internal/generateFlatbufferSchema.ts"],"names":[],"mappings":"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"}
@@ -110,6 +110,15 @@ describe("generateFlatbuffers", () => {
110
110
  /// long
111
111
  /// description
112
112
  field_nested_array:[foxglove.NestedMessage] (id: 24);
113
+
114
+ /// An optional string field
115
+ field_optional_string:string (id: 25);
116
+
117
+ /// An optional bool field
118
+ field_optional_bool:bool (id: 26);
119
+
120
+ /// An optional float64 field
121
+ field_optional_float64:double (id: 27);
113
122
  }
114
123
 
115
124
  root_type ExampleMessage;
@@ -1 +1 @@
1
- {"version":3,"file":"generateFlatbufferSchema.test.js","sourceRoot":"","sources":["../../src/internal/generateFlatbufferSchema.test.ts"],"names":[],"mappings":";;AAAA,yEAAiE;AACjE,iDAA6D;AAE7D,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACtC,MAAM,CAAC,IAAA,8CAAmB,EAAC,6BAAc,EAAE,CAAC,0BAAW,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA8GhF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"generateFlatbufferSchema.test.js","sourceRoot":"","sources":["../../src/internal/generateFlatbufferSchema.test.ts"],"names":[],"mappings":";;AAAA,yEAAiE;AACjE,iDAA6D;AAE7D,QAAQ,CAAC,qBAAqB,EAAE,GAAG,EAAE;IACnC,EAAE,CAAC,8BAA8B,EAAE,GAAG,EAAE;QACtC,MAAM,CAAC,IAAA,8CAAmB,EAAC,6BAAc,EAAE,CAAC,0BAAW,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAuHhF,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -92,7 +92,7 @@ function generateJsonSchema(schema) {
92
92
  $comment: "Generated by https://github.com/foxglove/foxglove-sdk",
93
93
  type: "object",
94
94
  properties,
95
- required: schema.fields.map((field) => field.name),
95
+ required: schema.fields.filter((field) => !field.optional).map((field) => field.name),
96
96
  };
97
97
  }
98
98
  //# sourceMappingURL=generateJsonSchema.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"generateJsonSchema.js","sourceRoot":"","sources":["../../src/internal/generateJsonSchema.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generateJsonSchema.js","sourceRoot":"","sources":["../../src/internal/generateJsonSchema.ts"],"names":[],"mappings":"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"}
@@ -203,6 +203,18 @@ describe("generateJsonSchema", () => {
203
203
  },
204
204
  "type": "array",
205
205
  },
206
+ "field_optional_bool": {
207
+ "description": "An optional bool field",
208
+ "type": "boolean",
209
+ },
210
+ "field_optional_float64": {
211
+ "description": "An optional float64 field",
212
+ "type": "number",
213
+ },
214
+ "field_optional_string": {
215
+ "description": "An optional string field",
216
+ "type": "string",
217
+ },
206
218
  "field_string": {
207
219
  "description": "string field",
208
220
  "type": "string",
@@ -1 +1 @@
1
- {"version":3,"file":"generateJsonSchema.test.js","sourceRoot":"","sources":["../../src/internal/generateJsonSchema.test.ts"],"names":[],"mappings":";;;AAAA,sDAAsB;AAEtB,6DAA0D;AAC1D,uCAAmD;AACnD,iDAAgD;AAEhD,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACxC,MAAM,CAAC,IAAA,uCAAkB,EAAC,6BAAc,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAsUhE,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,gCAAsB,CAAC,CAAC,CAC5C,2CAA2C,EAC3C,CAAC,MAAM,EAAE,EAAE;QACT,MAAM,GAAG,GAAG,IAAI,aAAG,EAAE,CAAC;QACtB,MAAM,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,IAAA,uCAAkB,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACtE,CAAC,CACF,CAAC;AACJ,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"generateJsonSchema.test.js","sourceRoot":"","sources":["../../src/internal/generateJsonSchema.test.ts"],"names":[],"mappings":";;;AAAA,sDAAsB;AAEtB,6DAA0D;AAC1D,uCAAmD;AACnD,iDAAgD;AAEhD,QAAQ,CAAC,oBAAoB,EAAE,GAAG,EAAE;IAClC,EAAE,CAAC,gCAAgC,EAAE,GAAG,EAAE;QACxC,MAAM,CAAC,IAAA,uCAAkB,EAAC,6BAAc,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAkVhE,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,gCAAsB,CAAC,CAAC,CAC5C,2CAA2C,EAC3C,CAAC,MAAM,EAAE,EAAE;QACT,MAAM,GAAG,GAAG,IAAI,aAAG,EAAE,CAAC;QACtB,MAAM,CAAC,GAAG,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,IAAA,uCAAkB,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IACtE,CAAC,CACF,CAAC;AACJ,CAAC,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"generateMarkdown.d.ts","sourceRoot":"","sources":["../../src/internal/generateMarkdown.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAEpE,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,QAAQ,CAAC,qBAAqB,CAAC,EACxC,KAAK,EAAE,QAAQ,CAAC,kBAAkB,CAAC,GAClC,MAAM,CAkFR"}
1
+ {"version":3,"file":"generateMarkdown.d.ts","sourceRoot":"","sources":["../../src/internal/generateMarkdown.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,SAAS,CAAC;AAEpE,wBAAgB,gBAAgB,CAC9B,OAAO,EAAE,QAAQ,CAAC,qBAAqB,CAAC,EACxC,KAAK,EAAE,QAAQ,CAAC,kBAAkB,CAAC,GAClC,MAAM,CA2FR"}
@@ -11,6 +11,13 @@ function generateMarkdown(schemas, enums) {
11
11
  See [Foxglove Schemas documentation](https://docs.foxglove.dev/docs/visualization/message-schemas/introduction).
12
12
 
13
13
  All schemas are generated from [schemas.ts](/internal/schemas.ts).`,
14
+ [
15
+ "## Optional fields",
16
+ "",
17
+ "Optional message fields may be omitted. When omitted, the consumer (e.g. a Foxglove panel) determines the behavior.",
18
+ "",
19
+ "If the IDL does not support optional fields (e.g. ROS) you must specify a value for the field.",
20
+ ].join("\n"),
14
21
  "## Contents",
15
22
  [
16
23
  ...sortedEnums.map(({ name }) => `- [enum ${name}](#enum-${name.toLowerCase()})`),
@@ -55,9 +62,10 @@ ${schema.fields
55
62
  type = field.type.name;
56
63
  break;
57
64
  }
65
+ const optionalSuffix = field.optional ? " (optional)" : "";
58
66
  return `\
59
67
  <tr>
60
- <td><code>${field.name}</code></td>
68
+ <td><code>${field.name}</code>${optionalSuffix}</td>
61
69
  <td>
62
70
 
63
71
  ${type}${arraySuffix}
@@ -1 +1 @@
1
- {"version":3,"file":"generateMarkdown.js","sourceRoot":"","sources":["../../src/internal/generateMarkdown.ts"],"names":[],"mappings":";;AAEA,4CAqFC;AArFD,SAAgB,gBAAgB,CAC9B,OAAwC,EACxC,KAAmC;IAEnC,MAAM,aAAa,GAAG,CAAC,GAAG,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAChF,MAAM,WAAW,GAAG,CAAC,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;IAE5E,OAAO;QACL;;;;;mEAK+D;QAE/D,aAAa;QAEb;YACE,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,WAAW,IAAI,WAAW,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC;YACjF,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,MAAM,IAAI,MAAM,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC;SAC1E,CAAC,IAAI,CAAC,IAAI,CAAC;QACZ,MAAM;QACN,WAAW,CAAC,GAAG,CACb,CAAC,UAAU,EAAE,EAAE,CAAC;UACZ,UAAU,CAAC,IAAI;;EAEvB,UAAU,CAAC,WAAW;;;;EAItB,UAAU,CAAC,MAAM;aAChB,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,KAAK,CAAC,IAAI,QAAQ,KAAK,CAAC,KAAK,MAAM,KAAK,CAAC,WAAW,IAAI,EAAE,EAAE,CAAC;aACjF,IAAI,CAAC,IAAI,CAAC;;CAEZ,CACI;QACD,GAAG,aAAa,CAAC,GAAG,CAClB,CAAC,MAAM,EAAE,EAAE,CAAC;KACb,MAAM,CAAC,IAAI;;EAEd,MAAM,CAAC,WAAW;;;;;;;;EAQlB,MAAM,CAAC,MAAM;aACZ,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YACb,MAAM,WAAW,GACf,OAAO,KAAK,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC;YAC1F,IAAI,IAAY,CAAC;YACjB,QAAQ,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACxB,KAAK,MAAM;oBACT,IAAI,GAAG,SAAS,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,WAAW,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC;oBACrF,MAAM;gBACR,KAAK,QAAQ;oBACX,IAAI,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,MAAM,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC;oBAC/E,MAAM;gBACR,KAAK,WAAW;oBACd,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC;oBACvB,MAAM;YACV,CAAC;YACD,OAAO;;YAEC,KAAK,CAAC,IAAI;;;EAGpB,IAAI,GAAG,WAAW;;;;;EAKlB,KAAK,CAAC,WAAW;;;MAGb,CAAC;QACL,CAAC,CAAC;aACD,IAAI,CAAC,IAAI,CAAC;SACJ,CACJ;KACF;SACE,IAAI,EAAE;SACN,IAAI,CAAC,MAAM,CAAC,CAAC;AAClB,CAAC"}
1
+ {"version":3,"file":"generateMarkdown.js","sourceRoot":"","sources":["../../src/internal/generateMarkdown.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"generateOmgIdl.d.ts","sourceRoot":"","sources":["../../src/internal/generateOmgIdl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAqB,cAAc,EAAE,MAAM,SAAS,CAAC;AAmBnF,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,qBAAqB,GAAG,MAAM,CAK7E;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CA8F7D"}
1
+ {"version":3,"file":"generateOmgIdl.d.ts","sourceRoot":"","sources":["../../src/internal/generateOmgIdl.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAqB,cAAc,EAAE,MAAM,SAAS,CAAC;AAmBnF,wBAAgB,uBAAuB,CAAC,MAAM,EAAE,qBAAqB,GAAG,MAAM,CAK7E;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAyG7D"}
@@ -41,7 +41,12 @@ function generateOmgIdl(schema) {
41
41
  return `// Value: ${value}\n ${name}${separator}`;
42
42
  }
43
43
  });
44
- definition = `// ${schema.description}\nenum ${schema.name} {\n ${fields.join("\n\n ")}\n};`;
44
+ const enumDescriptionLines = schema.description
45
+ .trim()
46
+ .split("\n")
47
+ .map((line) => `// ${line}`)
48
+ .join("\n");
49
+ definition = `${enumDescriptionLines}\nenum ${schema.name} {\n ${fields.join("\n\n ")}\n};`;
45
50
  break;
46
51
  }
47
52
  case "message": {
@@ -91,9 +96,15 @@ function generateOmgIdl(schema) {
91
96
  else if (typeof field.defaultValue === "boolean") {
92
97
  defaultAnnotation = `@default(${field.defaultValue ? "TRUE" : "FALSE"})\n `;
93
98
  }
94
- return `${comment}\n ${defaultAnnotation}${fieldType} ${field.name}${arraySize};`;
99
+ const optionalAnnotation = field.optional ? `@optional\n ` : "";
100
+ return `${comment}\n ${defaultAnnotation}${optionalAnnotation}${fieldType} ${field.name}${arraySize};`;
95
101
  });
96
- definition = `// ${schema.description}\nstruct ${omgIdlMessageSchemaName(schema)} {\n ${fields.join("\n\n ")}\n};`;
102
+ const structDescriptionLines = schema.description
103
+ .trim()
104
+ .split("\n")
105
+ .map((line) => `// ${line}`)
106
+ .join("\n");
107
+ definition = `${structDescriptionLines}\nstruct ${omgIdlMessageSchemaName(schema)} {\n ${fields.join("\n\n ")}\n};`;
97
108
  break;
98
109
  }
99
110
  }
@@ -1 +1 @@
1
- {"version":3,"file":"generateOmgIdl.js","sourceRoot":"","sources":["../../src/internal/generateOmgIdl.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generateOmgIdl.js","sourceRoot":"","sources":["../../src/internal/generateOmgIdl.ts"],"names":[],"mappings":"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"}
@@ -120,6 +120,18 @@ describe("generateOmgIdl", () => {
120
120
  // long
121
121
  // description
122
122
  sequence<NestedMessage> field_nested_array;
123
+
124
+ // An optional string field
125
+ @optional
126
+ string field_optional_string;
127
+
128
+ // An optional bool field
129
+ @optional
130
+ boolean field_optional_bool;
131
+
132
+ // An optional float64 field
133
+ @optional
134
+ double field_optional_float64;
123
135
  };
124
136
 
125
137
  };
@@ -1 +1 @@
1
- {"version":3,"file":"generateOmgIdl.test.js","sourceRoot":"","sources":["../../src/internal/generateOmgIdl.test.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generateOmgIdl.test.js","sourceRoot":"","sources":["../../src/internal/generateOmgIdl.test.ts"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"generateProto.d.ts","sourceRoot":"","sources":["../../src/internal/generateProto.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EAEtB,MAAM,SAAS,CAAC;AAuCjB,wBAAgB,aAAa,CAC3B,MAAM,EAAE,qBAAqB,EAC7B,WAAW,EAAE,kBAAkB,EAAE,GAChC,MAAM,CA4FR"}
1
+ {"version":3,"file":"generateProto.d.ts","sourceRoot":"","sources":["../../src/internal/generateProto.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAElB,qBAAqB,EAEtB,MAAM,SAAS,CAAC;AAuCjB,wBAAgB,aAAa,CAC3B,MAAM,EAAE,qBAAqB,EAC7B,WAAW,EAAE,kBAAkB,EAAE,GAChC,MAAM,CAoGR"}
@@ -74,6 +74,9 @@ function generateProto(schema, nestedEnums) {
74
74
  if (field.array != undefined) {
75
75
  qualifiers.push("repeated");
76
76
  }
77
+ else if (field.optional) {
78
+ qualifiers.push("optional");
79
+ }
77
80
  if (typeof field.array === "number") {
78
81
  lineComments.push(`length ${field.array}`);
79
82
  }
@@ -95,7 +98,12 @@ function generateProto(schema, nestedEnums) {
95
98
  .map((line) => ` // ${line}\n`)
96
99
  .join("")} ${qualifiers.join(" ")} ${field.name} = ${field.protobufFieldNumber};${lineComments.length > 0 ? " // " + lineComments.join(", ") : ""}`;
97
100
  });
98
- const definition = `// ${schema.description}\nmessage ${schema.name} {\n${enumDefinitions.join("\n\n")}${fields.join("\n\n")}\n}`;
101
+ const schemaDescription = schema.description
102
+ .trim()
103
+ .split("\n")
104
+ .map((line) => `// ${line}`)
105
+ .join("\n");
106
+ const definition = `${schemaDescription}\nmessage ${schema.name} {\n${enumDefinitions.join("\n\n")}${fields.join("\n\n")}\n}`;
99
107
  const outputSections = [
100
108
  `// Generated by https://github.com/foxglove/foxglove-sdk`,
101
109
  'syntax = "proto3";',
@@ -1 +1 @@
1
- {"version":3,"file":"generateProto.js","sourceRoot":"","sources":["../../src/internal/generateProto.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generateProto.js","sourceRoot":"","sources":["../../src/internal/generateProto.ts"],"names":[],"mappings":"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"}
@@ -107,6 +107,15 @@ describe("generateProto", () => {
107
107
  // long
108
108
  // description
109
109
  repeated foxglove.NestedMessage field_nested_array = 4;
110
+
111
+ // An optional string field
112
+ optional string field_optional_string = 26;
113
+
114
+ // An optional bool field
115
+ optional bool field_optional_bool = 27;
116
+
117
+ // An optional float64 field
118
+ optional double field_optional_float64 = 28;
110
119
  }
111
120
  "
112
121
  `);
@@ -1 +1 @@
1
- {"version":3,"file":"generateProto.test.js","sourceRoot":"","sources":["../../src/internal/generateProto.test.ts"],"names":[],"mappings":";;;AAAA,oEAAoC;AAEpC,mDAAgD;AAChD,uCAAwE;AACxE,iDAA6D;AAE7D,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;QAChC,MAAM,CAAC,IAAA,6BAAa,EAAC,6BAAc,EAAE,CAAC,0BAAW,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAsG1E,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,MAAM,IAAI,GAAG,IAAI,oBAAU,CAAC,IAAI,EAAE,CAAC;QACnC,IAAI,CAAC,OAAO,CAAC,oBAAU,CAAC,MAAM,CAAC,GAAG,CAAC,iCAAiC,CAAE,CAAC,MAAO,CAAC,CAAC;QAChF,IAAI,CAAC,OAAO,CAAC,oBAAU,CAAC,MAAM,CAAC,GAAG,CAAC,gCAAgC,CAAE,CAAC,MAAO,CAAC,CAAC;QAC/E,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,gCAAsB,CAAC,EAAE,CAAC;YAC3D,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,6BAAmB,CAAC,CAAC,MAAM,CACrD,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,gBAAgB,KAAK,MAAM,CAAC,IAAI,CAC5D,CAAC;YACF,IAAI,CAAC,GAAG,CAAC,oBAAU,CAAC,KAAK,CAAC,IAAA,6BAAa,EAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAChE,CAAC;QACD,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAChD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"generateProto.test.js","sourceRoot":"","sources":["../../src/internal/generateProto.test.ts"],"names":[],"mappings":";;;AAAA,oEAAoC;AAEpC,mDAAgD;AAChD,uCAAwE;AACxE,iDAA6D;AAE7D,QAAQ,CAAC,eAAe,EAAE,GAAG,EAAE;IAC7B,EAAE,CAAC,wBAAwB,EAAE,GAAG,EAAE;QAChC,MAAM,CAAC,IAAA,6BAAa,EAAC,6BAAc,EAAE,CAAC,0BAAW,CAAC,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KA+G1E,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kCAAkC,EAAE,GAAG,EAAE;QAC1C,MAAM,IAAI,GAAG,IAAI,oBAAU,CAAC,IAAI,EAAE,CAAC;QACnC,IAAI,CAAC,OAAO,CAAC,oBAAU,CAAC,MAAM,CAAC,GAAG,CAAC,iCAAiC,CAAE,CAAC,MAAO,CAAC,CAAC;QAChF,IAAI,CAAC,OAAO,CAAC,oBAAU,CAAC,MAAM,CAAC,GAAG,CAAC,gCAAgC,CAAE,CAAC,MAAO,CAAC,CAAC;QAC/E,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,gCAAsB,CAAC,EAAE,CAAC;YAC3D,MAAM,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,6BAAmB,CAAC,CAAC,MAAM,CACrD,CAAC,UAAU,EAAE,EAAE,CAAC,UAAU,CAAC,gBAAgB,KAAK,MAAM,CAAC,IAAI,CAC5D,CAAC;YACF,IAAI,CAAC,GAAG,CAAC,oBAAU,CAAC,KAAK,CAAC,IAAA,6BAAa,EAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC;QAChE,CAAC;QACD,MAAM,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;IAChD,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"generatePyclass.d.ts","sourceRoot":"","sources":["../../src/internal/generatePyclass.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,qBAAqB,EAErB,cAAc,EACf,MAAM,SAAS,CAAC;AAEjB;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,CAwB9C;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAK9D;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,cAAc,EAAE,GAAG,MAAM,CA+EtE;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,cAAc,EAAE,GAAG,MAAM,CA6BxE;AAiZD;;;GAGG;AACH,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,cAAc,EAAE,GAAG,MAAM,CAiBlF;AA6CD;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,cAAc,EAAE,qBAAqB,EAAE,GAAG,MAAM,CAmItF;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,cAAc,EAAE,qBAAqB,EAAE,GAAG,MAAM,CAqFrF;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,qBAAqB,EAAE,GAAG,MAAM,CAiBhF"}
1
+ {"version":3,"file":"generatePyclass.d.ts","sourceRoot":"","sources":["../../src/internal/generatePyclass.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,qBAAqB,EAErB,cAAc,EACf,MAAM,SAAS,CAAC;AAEjB;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,CAwB9C;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,MAAM,EAAE,cAAc,GAAG,MAAM,CAK9D;AAED;;GAEG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,cAAc,EAAE,GAAG,MAAM,CA+EtE;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,cAAc,EAAE,GAAG,MAAM,CA6BxE;AAoZD;;;GAGG;AACH,wBAAgB,gCAAgC,CAAC,OAAO,EAAE,cAAc,EAAE,GAAG,MAAM,CAiBlF;AA6CD;;;GAGG;AACH,wBAAgB,sBAAsB,CAAC,cAAc,EAAE,qBAAqB,EAAE,GAAG,MAAM,CAmItF;AAED;;GAEG;AACH,wBAAgB,qBAAqB,CAAC,cAAc,EAAE,qBAAqB,EAAE,GAAG,MAAM,CAqFrF;AAED;;GAEG;AACH,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,qBAAqB,EAAE,GAAG,MAAM,CAiBhF"}
@@ -222,7 +222,10 @@ function generateMessageClass(schema) {
222
222
  return `${safeRustName(field.name)}.unwrap_or_default()`;
223
223
  }
224
224
  if (field.type.name === "string") {
225
- return `${safeRustName(field.name)}.to_string()`;
225
+ // optional string is Option<&str>; convert to Option<String> for the schema struct
226
+ return field.optional
227
+ ? `${safeRustName(field.name)}.map(|s| s.to_string())`
228
+ : `${safeRustName(field.name)}.to_string()`;
226
229
  }
227
230
  return safeRustName(field.name);
228
231
  case "nested":
@@ -331,11 +334,11 @@ function isMessageSchema(schema) {
331
334
  /**
332
335
  * Get the rust type for a field.
333
336
  * Types are assumed to be owned, and wrapped in a `Vec` if the field is an array.
334
- * Nested types are optional.
337
+ * Schema-optional fields and nested fields use Option.
335
338
  */
336
339
  function rustOutputType(field) {
337
340
  const isVec = field.array != undefined;
338
- const isOpt = field.type.type === "nested";
341
+ const isOpt = (field.optional ?? false) || field.type.type === "nested";
339
342
  let type;
340
343
  switch (field.type.type) {
341
344
  case "primitive":
@@ -378,11 +381,11 @@ function rustOutputType(field) {
378
381
  }
379
382
  /**
380
383
  * Get the Python type for a constructor parameter.
381
- * All types are optional.
384
+ * Schema-optional and nested fields get Optional / None default.
382
385
  */
383
386
  function pythonCtorType(field) {
384
387
  const isVec = field.array != undefined;
385
- const isOpt = field.type.type === "nested";
388
+ const isOpt = (field.optional ?? false) || field.type.type === "nested";
386
389
  let type;
387
390
  switch (field.type.type) {
388
391
  case "primitive":
@@ -407,7 +410,7 @@ function pythonCtorType(field) {
407
410
  * Get the Python default for a constructor parameter
408
411
  */
409
412
  function pythonDefaultValue(field) {
410
- if (field.array != undefined) {
413
+ if (field.optional || field.array != undefined) {
411
414
  return "None";
412
415
  }
413
416
  switch (field.type.type) {
@@ -443,7 +446,7 @@ function rustDefaultValue(field) {
443
446
  // Special case — this is an `Option<Bound<'_, PyBytes>>`; see `rustOutputType`
444
447
  return "None";
445
448
  }
446
- if (field.array != undefined) {
449
+ if (field.optional || field.array != undefined) {
447
450
  return "None";
448
451
  }
449
452
  switch (field.type.type) {
@@ -1 +1 @@
1
- {"version":3,"file":"generatePyclass.js","sourceRoot":"","sources":["../../src/internal/generatePyclass.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"generatePyclass.js","sourceRoot":"","sources":["../../src/internal/generatePyclass.ts"],"names":[],"mappings":"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"}
@@ -67,6 +67,9 @@ describe("generatePyclass", () => {
67
67
  /// very
68
68
  /// long
69
69
  /// description
70
+ /// :param field_optional_string: An optional string field
71
+ /// :param field_optional_bool: An optional bool field
72
+ /// :param field_optional_float64: An optional float64 field
70
73
  ///
71
74
  /// See https://docs.foxglove.dev/docs/visualization/message-schemas/example-message
72
75
  #[pyclass(module = "foxglove.schemas")]
@@ -75,7 +78,7 @@ describe("generatePyclass", () => {
75
78
  #[pymethods]
76
79
  impl ExampleMessage {
77
80
  #[new]
78
- #[pyo3(signature = (*, field_duration=None, field_time=None, field_boolean=false, field_bytes=None, field_float64=0.0, field_uint32=0, field_string="", field_duration_array=None, field_time_array=None, field_boolean_array=None, field_bytes_array=None, field_float64_array=None, field_uint32_array=None, field_string_array=None, field_duration_fixed_array=None, field_time_fixed_array=None, field_boolean_fixed_array=None, field_bytes_fixed_array=None, field_float64_fixed_array=None, field_uint32_fixed_array=None, field_string_fixed_array=None, field_enum=ExampleMessageExampleEnum::A, field_enum_array=None, field_nested=None, field_nested_array=None) )]
81
+ #[pyo3(signature = (*, field_duration=None, field_time=None, field_boolean=false, field_bytes=None, field_float64=0.0, field_uint32=0, field_string="", field_duration_array=None, field_time_array=None, field_boolean_array=None, field_bytes_array=None, field_float64_array=None, field_uint32_array=None, field_string_array=None, field_duration_fixed_array=None, field_time_fixed_array=None, field_boolean_fixed_array=None, field_bytes_fixed_array=None, field_float64_fixed_array=None, field_uint32_fixed_array=None, field_string_fixed_array=None, field_enum=ExampleMessageExampleEnum::A, field_enum_array=None, field_nested=None, field_nested_array=None, field_optional_string=None, field_optional_bool=None, field_optional_float64=None) )]
79
82
  fn new(
80
83
  field_duration: Option<Duration>,
81
84
  field_time: Option<Timestamp>,
@@ -102,6 +105,9 @@ describe("generatePyclass", () => {
102
105
  field_enum_array: Option<Vec<ExampleMessageExampleEnum>>,
103
106
  field_nested: Option<NestedMessage>,
104
107
  field_nested_array: Option<Vec<NestedMessage>>,
108
+ field_optional_string: Option<&str>,
109
+ field_optional_bool: Option<bool>,
110
+ field_optional_float64: Option<f64>,
105
111
  ) -> Self {
106
112
  Self(foxglove::schemas::ExampleMessage {
107
113
  field_duration: field_duration.map(Into::into),
@@ -129,11 +135,14 @@ describe("generatePyclass", () => {
129
135
  field_enum_array: field_enum_array.unwrap_or_default().into_iter().map(|x| x as i32).collect(),
130
136
  field_nested: field_nested.map(Into::into),
131
137
  field_nested_array: field_nested_array.unwrap_or_default().into_iter().map(|x| x.into()).collect(),
138
+ field_optional_string: field_optional_string.map(|s| s.to_string()),
139
+ field_optional_bool,
140
+ field_optional_float64,
132
141
  })
133
142
  }
134
143
  fn __repr__(&self) -> String {
135
144
  format!(
136
- "ExampleMessage(field_duration={:?}, field_time={:?}, field_boolean={:?}, field_bytes={:?}, field_float64={:?}, field_uint32={:?}, field_string={:?}, field_duration_array={:?}, field_time_array={:?}, field_boolean_array={:?}, field_bytes_array={:?}, field_float64_array={:?}, field_uint32_array={:?}, field_string_array={:?}, field_duration_fixed_array={:?}, field_time_fixed_array={:?}, field_boolean_fixed_array={:?}, field_bytes_fixed_array={:?}, field_float64_fixed_array={:?}, field_uint32_fixed_array={:?}, field_string_fixed_array={:?}, field_enum={:?}, field_enum_array={:?}, field_nested={:?}, field_nested_array={:?})",
145
+ "ExampleMessage(field_duration={:?}, field_time={:?}, field_boolean={:?}, field_bytes={:?}, field_float64={:?}, field_uint32={:?}, field_string={:?}, field_duration_array={:?}, field_time_array={:?}, field_boolean_array={:?}, field_bytes_array={:?}, field_float64_array={:?}, field_uint32_array={:?}, field_string_array={:?}, field_duration_fixed_array={:?}, field_time_fixed_array={:?}, field_boolean_fixed_array={:?}, field_bytes_fixed_array={:?}, field_float64_fixed_array={:?}, field_uint32_fixed_array={:?}, field_string_fixed_array={:?}, field_enum={:?}, field_enum_array={:?}, field_nested={:?}, field_nested_array={:?}, field_optional_string={:?}, field_optional_bool={:?}, field_optional_float64={:?})",
137
146
  self.0.field_duration,
138
147
  self.0.field_time,
139
148
  self.0.field_boolean,
@@ -159,6 +168,9 @@ describe("generatePyclass", () => {
159
168
  self.0.field_enum_array,
160
169
  self.0.field_nested,
161
170
  self.0.field_nested_array,
171
+ self.0.field_optional_string,
172
+ self.0.field_optional_bool,
173
+ self.0.field_optional_float64,
162
174
  )
163
175
  }
164
176
  /// Returns the ExampleMessage schema.
@@ -1 +1 @@
1
- {"version":3,"file":"generatePyclass.test.js","sourceRoot":"","sources":["../../src/internal/generatePyclass.test.ts"],"names":[],"mappings":";;AAAA,uDAA2E;AAC3E,iDAA6D;AAE7D,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACjC,MAAM,CAAC,IAAA,uCAAqB,GAAE,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;KAcrD,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;QAC3B,MAAM,CAAC,IAAA,iCAAe,EAAC,0BAAW,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;SAUtD,CAAC,CAAC;IACT,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;QAC3C,MAAM,CAAC,IAAA,iCAAe,EAAC,6BAAc,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAqJ7D,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
1
+ {"version":3,"file":"generatePyclass.test.js","sourceRoot":"","sources":["../../src/internal/generatePyclass.test.ts"],"names":[],"mappings":";;AAAA,uDAA2E;AAC3E,iDAA6D;AAE7D,QAAQ,CAAC,iBAAiB,EAAE,GAAG,EAAE;IAC/B,EAAE,CAAC,yBAAyB,EAAE,GAAG,EAAE;QACjC,MAAM,CAAC,IAAA,uCAAqB,GAAE,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;KAcrD,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mBAAmB,EAAE,GAAG,EAAE;QAC3B,MAAM,CAAC,IAAA,iCAAe,EAAC,0BAAW,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;SAUtD,CAAC,CAAC;IACT,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,mCAAmC,EAAE,GAAG,EAAE;QAC3C,MAAM,CAAC,IAAA,iCAAe,EAAC,6BAAc,CAAC,CAAC,CAAC,qBAAqB,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;KAiK7D,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC"}
@@ -1 +1 @@
1
- {"version":3,"file":"generateRos.d.ts","sourceRoot":"","sources":["../../src/internal/generateRos.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAqB,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAG9F,OAAO,EAAwB,qBAAqB,EAAqB,MAAM,SAAS,CAAC;AAEzF,KAAK,0BAA0B,GAAG,sBAAsB,GAAG;IACzD,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AACF,KAAK,+BAA+B,GAAG;IACrC,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yEAAyE;IACzE,mBAAmB,EAAE,MAAM,CAAC;IAC5B,8GAA8G;IAC9G,oBAAoB,EAAE,MAAM,CAAC;IAC7B,MAAM,EAAE,0BAA0B,EAAE,CAAC;CACtC,CAAC;AAqBF,wBAAgB,cAAc,CAC5B,GAAG,EAAE,+BAA+B,EACpC,EAAE,UAAU,EAAE,EAAE;IAAE,UAAU,EAAE,CAAC,GAAG,CAAC,CAAA;CAAE,GACpC,MAAM,CAsCR;AAgDD,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,qBAAqB,EAC7B,EAAE,UAAU,EAAE,EAAE;IAAE,UAAU,EAAE,CAAC,GAAG,CAAC,CAAA;CAAE,GACpC,+BAA+B,CA4FjC;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,qBAAqB,EAC7B,EAAE,UAAU,EAAE,EAAE;IAAE,UAAU,EAAE,CAAC,GAAG,CAAC,CAAA;CAAE,GACpC,MAAM,CA+BR"}
1
+ {"version":3,"file":"generateRos.d.ts","sourceRoot":"","sources":["../../src/internal/generateRos.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAqB,sBAAsB,EAAE,MAAM,8BAA8B,CAAC;AAG9F,OAAO,EAAwB,qBAAqB,EAAqB,MAAM,SAAS,CAAC;AAEzF,KAAK,0BAA0B,GAAG,sBAAsB,GAAG;IACzD,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB,CAAC;AACF,KAAK,+BAA+B,GAAG;IACrC,YAAY,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,yEAAyE;IACzE,mBAAmB,EAAE,MAAM,CAAC;IAC5B,8GAA8G;IAC9G,oBAAoB,EAAE,MAAM,CAAC;IAC7B,MAAM,EAAE,0BAA0B,EAAE,CAAC;CACtC,CAAC;AAqBF,wBAAgB,cAAc,CAC5B,GAAG,EAAE,+BAA+B,EACpC,EAAE,UAAU,EAAE,EAAE;IAAE,UAAU,EAAE,CAAC,GAAG,CAAC,CAAA;CAAE,GACpC,MAAM,CA2CR;AAgDD,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,qBAAqB,EAC7B,EAAE,UAAU,EAAE,EAAE;IAAE,UAAU,EAAE,CAAC,GAAG,CAAC,CAAA;CAAE,GACpC,+BAA+B,CA4FjC;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,qBAAqB,EAC7B,EAAE,UAAU,EAAE,EAAE;IAAE,UAAU,EAAE,CAAC,GAAG,CAAC,CAAA;CAAE,GACpC,MAAM,CA+BR"}
@@ -26,7 +26,12 @@ function generateRosMsg(def, { rosVersion }) {
26
26
  let source = "";
27
27
  source += `# ${def.rosFullInterfaceName}\n`;
28
28
  if (def.description != undefined) {
29
- source += `# ${def.description}\n`;
29
+ const descriptionLines = def.description
30
+ .trim()
31
+ .split("\n")
32
+ .map((line) => `# ${line}`)
33
+ .join("\n");
34
+ source += `${descriptionLines}\n`;
30
35
  }
31
36
  source += `\n# Generated by https://github.com/foxglove/foxglove-sdk\n`;
32
37
  let prevFieldHadComment = true; // start true because of top-of-file comment