refactor(dataarray): update/create set methods

call setData at the end of the extend function to synchronise
parameters. Check on the parameters is done through initialValues.
CellArray is adapted to the changes made. Tests updates.

Author: joannacirillo

Sources/Common/Core/DataArray/index.js

@@ -241,7 +241,7 @@ function vtkDataArray(publicAPI, model) {
   publicAPI.getNumberOfComponents = () => model.numberOfComponents;
   publicAPI.getNumberOfValues = () => model.values.length;
   publicAPI.getNumberOfTuples = () =>
-    model.values.length / model.numberOfComponents;
+    model.values ? model.values.length / model.numberOfComponents : 0;
   publicAPI.getDataType = () => model.dataType;
   /* eslint-disable no-use-before-define */
   publicAPI.newClone = () =>
@@ -262,9 +262,14 @@ function vtkDataArray(publicAPI, model) {
   };
 
   publicAPI.setData = (typedArray, numberOfComponents) => {
-    model.values = typedArray;
-    model.size = typedArray.length;
-    model.dataType = getDataType(typedArray);
+    if (typedArray) {
+      model.values = typedArray;
+      model.size = typedArray.length;
+      model.empty = model.size === 0;
+      const type = getDataType(typedArray);
+      model.dataType = type === 'Array' ? model.dataType : type;
+    }
+
     if (numberOfComponents) {
       model.numberOfComponents = numberOfComponents;
     }
@@ -313,44 +318,38 @@ function vtkDataArray(publicAPI, model) {
 // Object factory
 // ----------------------------------------------------------------------------
 
-const DEFAULT_VALUES = {
-  name: '',
-  numberOfComponents: 1,
-  size: 0,
-  dataType: DefaultDataType,
-  rangeTuple: [0, 0],
-  // values: null,
-  // ranges: null,
-};
+function defaultValues(initialValues) {
+  return {
+    name: '',
+    numberOfComponents: 1,
+    size: 0,
+    dataType: DefaultDataType,
+    rangeTuple: [0, 0],
+    // values: null,
+    // ranges: null,
+    ...initialValues,
+  };
+}
 
 // ----------------------------------------------------------------------------
 
 export function extend(publicAPI, model, initialValues = {}) {
-  Object.assign(model, DEFAULT_VALUES, initialValues);
-
-  if (!model.empty && !model.values && !model.size) {
-    throw new TypeError(
-      'Cannot create vtkDataArray object without: size > 0, values'
-    );
-  }
-
-  if (!model.values) {
-    model.values = macro.newTypedArray(model.dataType, model.size);
-  } else if (Array.isArray(model.values)) {
-    model.values = macro.newTypedArrayFrom(model.dataType, model.values);
-  }
-
-  if (model.values) {
-    model.size = model.values.length;
-    model.dataType = getDataType(model.values);
-  }
+  Object.assign(model, defaultValues(model));
 
   // Object methods
   macro.obj(publicAPI, model);
   macro.set(publicAPI, model, ['name', 'numberOfComponents']);
 
+  const type = initialValues.dataType ? initialValues.dataType : model.dataType;
+  if (!initialValues.values) {
+    initialValues.values = macro.newTypedArray(type, model.size);
+  } else if (Array.isArray(initialValues.values)) {
+    initialValues.values = macro.newTypedArrayFrom(type, initialValues.values);
+  }
+
   // Object specific methods
   vtkDataArray(publicAPI, model);
+  publicAPI.setData(initialValues.values, initialValues.numberOfComponents);
 }
 
 // ----------------------------------------------------------------------------

Sources/Common/Core/Points/index.js

@@ -89,10 +89,10 @@ const DEFAULT_VALUES = {
 
 // ----------------------------------------------------------------------------
 
-export function extend(publicAPI, model, initialValues = {}) {
-  Object.assign(model, DEFAULT_VALUES, initialValues);
+export function extend(publicAPI, model) {
+  Object.assign(model, DEFAULT_VALUES);
 
-  vtkDataArray.extend(publicAPI, model, initialValues);
+  vtkDataArray.extend(publicAPI, model);
   vtkPoints(publicAPI, model);
 }
 

Sources/Common/DataModel/Cell/index.js

@@ -129,8 +129,8 @@ const DEFAULT_VALUES = {
 
 // ----------------------------------------------------------------------------
 
-export function extend(publicAPI, model, initialValues = {}) {
-  Object.assign(model, DEFAULT_VALUES, initialValues);
+export function extend(publicAPI, model) {
+  Object.assign(model, DEFAULT_VALUES);
 
   macro.obj(publicAPI, model);
 

Sources/Common/DataModel/Cell/test/testCell.js

@@ -47,13 +47,13 @@ test('Test vtkCell initialize with pointsIds', (t) => {
 
 test('Test vtkCell deepCopy', (t) => {
   const points = vtkPoints.newInstance();
-  points.setData([0, 0, 0, 2, 0, 0, 2, 2, 0]);
+  points.setData(Float64Array.from([0, 0, 0, 2, 0, 0, 2, 2, 0]));
 
   const cell = vtkCell.newInstance();
   cell.initialize(points);
 
   const cell2 = vtkCell.newInstance();
-  cell2.deepCopy(cell);
+  cell.deepCopy(cell2);
   t.notEqual(cell2.getPoints(), points);
   t.deepEqual(cell2.getPoints().getData(), points.getData());
 

Sources/macros.js

@@ -972,7 +972,8 @@ export function newInstance(extend, className) {
     const model = {};
     const publicAPI = {};
     extend(publicAPI, model, initialValues);
-    publicAPI.set(initialValues);
+    const val = { ...initialValues, ...model };
+    publicAPI.set(val);
 
     return Object.freeze(publicAPI);
   };