Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion rosidl_gen/generator.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "rosidl-generator",
"version": "0.5.0",
"version": "0.5.1",
"description": "Generate JavaScript object from ROS IDL(.msg) files",
"main": "index.js",
"authors": [
Expand Down
4 changes: 4 additions & 0 deletions rosidl_gen/templates/message.dot
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,10 @@ class {{=arrayWrapper}} {
get classType() {
return {{=arrayWrapper}};
}

toPlainObject(enableTypedArray) {
return translator.toPlainObject(this, enableTypedArray);
}
}

{{? it.spec.constants != undefined && it.spec.constants.length}}
Expand Down
5 changes: 1 addition & 4 deletions test/test-array-data.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@ const deepEqual = require('deep-equal');
const rclnodejs = require('../index.js');
const translator = require('../rosidl_gen/message_translator.js');
const arrayGen = require('./array_generator.js');

function isTypedArray(v) {
return ArrayBuffer.isView(v) && !(v instanceof DataView);
}
const { isTypedArray } = require('./utils.js');

describe('rclnodejs message communication', function () {
this.timeout(60 * 1000);
Expand Down
13 changes: 6 additions & 7 deletions test/test-message-properties-validation.js
Original file line number Diff line number Diff line change
Expand Up @@ -175,13 +175,12 @@ describe('Rclnodejs message properities validation', function () {
// Assign the property with a plain object.
left[i] = testData.value[i];
if (typeof left[i].toPlainObject === 'function') {
assert.ok(deepEqual(testData.value[i], left[i].toPlainObject()));
} else if (left[i].classType && left[i].classType.isROSArray) {
left[i].data.forEach((value, index) => {
assert.ok(
deepEqual(testData.value[i][index], value.toPlainObject())
);
});
assert.ok(
deepEqual(
testData.value[i],
left[i].toPlainObject(/*enableTypedArray=*/ true)
)
);
} else {
assert.ok(deepEqual(testData.value[i], left[i]));
}
Expand Down
5 changes: 0 additions & 5 deletions test/test-message-translator-complex.js
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,9 @@

'use strict';

const assert = require('assert');
const rclnodejs = require('../index.js');
const deepEqual = require('deep-equal');

function isTypedArray(v) {
return ArrayBuffer.isView(v) && !(v instanceof DataView);
}

describe('Rclnodejs message translation: complex types', function () {
this.timeout(60 * 1000);

Expand Down
5 changes: 1 addition & 4 deletions test/test-message-translator-primitive.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,7 @@
const rclnodejs = require('../index.js');
const deepEqual = require('deep-equal');
const arrayGen = require('./array_generator.js');

function isTypedArray(v) {
return ArrayBuffer.isView(v) && !(v instanceof DataView);
}
const { isTypedArray } = require('./utils.js');

/* eslint-disable camelcase */
/* eslint-disable indent */
Expand Down
5 changes: 5 additions & 0 deletions test/utils.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,10 +85,15 @@ function createDelay(millis) {
return new Promise((resolve) => setTimeout(resolve, millis));
}

function isTypedArray(v) {
return ArrayBuffer.isView(v) && !(v instanceof DataView);
}

module.exports = {
assertMember: assertMember,
assertThrowsError: assertThrowsError,
createDelay: createDelay,
getAvailablePath: getAvailablePath,
launchPythonProcess: launchPythonProcess,
isTypedArray: isTypedArray,
};
Loading