@@ -230,36 +230,36 @@ const deallocator = require('../../rosidl_gen/deallocator.js');
230230const translator = require('../../rosidl_gen/message_translator.js');
231231
232232{{~ it.spec.fields :field}}
233- {{? shouldRequire(it.spec.baseType, field.type)}}
234- const {{=getWrapperNameByType(field.type)}} = require('../../generated/{{=getPackageNameByType(field.type)}}/{{=getModulePathByType(field.type, it.messageInfo)}}');
235- {{?}}
233+ {{? shouldRequire(it.spec.baseType, field.type)}}
234+ const {{=getWrapperNameByType(field.type)}} = require('../../generated/{{=getPackageNameByType(field.type)}}/{{=getModulePathByType(field.type, it.messageInfo)}}');
235+ {{?}}
236236{{~}}
237237
238238{{? it.spec.msgName === 'String'}}
239239const {{=refObjectType}} = primitiveTypes.string;
240240{{??}}
241241const {{=refObjectType}} = StructType({
242- {{~ it.spec.fields :field}}
243- {{? field.type.isPrimitiveType && !field.type.isArray}}
244- {{=field.name}}: primitiveTypes.{{=field.type.type}},
245- {{?? field.type.isPrimitiveType && field.type.isArray && field.type.isFixedSizeArray}}
246- {{=field.name}}: ArrayType(primitiveTypes.{{=field.type.type}}, {{=field.type.arraySize}}),
247- {{?? !field.type.isPrimitiveType && field.type.isArray && field.type.isFixedSizeArray}}
248- {{=field.name}}: ArrayType({{=getWrapperNameByType(field.type)}}.refObjectType, {{=field.type.arraySize}}),
249- {{?? field.type.isArray}}
250- {{=field.name}}: {{=getWrapperNameByType(field.type)}}.refObjectArrayType,
251- {{?? true }}
252- {{=field.name}}: {{=getWrapperNameByType(field.type)}}.refObjectType,
253- {{?}}
254- {{~}}
242+ {{~ it.spec.fields :field}}
243+ {{? field.type.isPrimitiveType && !field.type.isArray}}
244+ {{=field.name}}: primitiveTypes.{{=field.type.type}},
245+ {{?? field.type.isPrimitiveType && field.type.isArray && field.type.isFixedSizeArray}}
246+ {{=field.name}}: ArrayType(primitiveTypes.{{=field.type.type}}, {{=field.type.arraySize}}),
247+ {{?? !field.type.isPrimitiveType && field.type.isArray && field.type.isFixedSizeArray}}
248+ {{=field.name}}: ArrayType({{=getWrapperNameByType(field.type)}}.refObjectType, {{=field.type.arraySize}}),
249+ {{?? field.type.isArray}}
250+ {{=field.name}}: {{=getWrapperNameByType(field.type)}}.refObjectArrayType,
251+ {{??}}
252+ {{=field.name}}: {{=getWrapperNameByType(field.type)}}.refObjectType,
253+ {{?}}
254+ {{~}}
255255});
256256{{?}}
257257
258258const {{=refArrayType}} = ArrayType({{=refObjectType}});
259259const {{=refObjectArrayType}} = StructType({
260260{{? usePlainTypedArray}}
261261 data: ref.refType(ref.types.{{=currentTypedArrayElementType}}),
262- {{?? true }}
262+ {{??}}
263263 data: {{=refArrayType}},
264264{{?}}
265265 size : ref.types.size_t,
@@ -322,7 +322,6 @@ class {{=objectWrapper}} {
322322 this._willCheckConsistency = willCheckConsistency;
323323 this._wrapperFields = {};
324324 this._refObject = new {{=refObjectType}}();
325-
326325 {{~ it.spec.fields :field}}
327326 {{? field.type.isArray}}
328327 this._wrapperFields.{{=field.name}} = {{=getWrapperNameByType(field.type)}}.createArray();
@@ -708,7 +707,7 @@ class {{=arrayWrapper}} {
708707 {{? usePlainTypedArray}}
709708 const buffer = Buffer.from(new Uint8Array(this._wrappers.buffer));
710709 this._refObject.data = buffer;
711- {{?? true }}
710+ {{??}}
712711 this._refObject.data = this._refArray.buffer;
713712 {{?}}
714713 }
0 commit comments