Version 3.7.0-beta.6

Removed the Vue 2 compatibility work-arounds and the exported setArrayItem function

Author: chrishamm

README.md

@@ -4,13 +4,7 @@ TypeScript implementation of the Duet3D Object Model.
 
 ## Installation
 
-Install via `npm install @duet3d/objectmodel`. Users of Vue 2 must also run this command after the first import:
-
-```
-globalThis._duetModelSetArray = (array, index, value) => Vue.set(array, index, value);
-```
-
-This is required to make sure that change events for arrays are correctly fired.
+Install via `npm install @duet3d/objectmodel`.
 
 ## Bug reports
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@duet3d/objectmodel",
-  "version": "3.7.0-beta.5",
+  "version": "3.7.0-beta.6",
   "description": "TypeScript implementation of the Duet3D Object Model",
   "type": "module",
   "main": "dist/index.js",

src/ModelCollection.ts

@@ -1,6 +1,5 @@
 import { isModelObject } from "./ModelObject";
 import type { IModelObject } from "./ModelObject";
-import { setArrayItem } from "./index";
 
 /**
  * Internal interface for the model collection class
@@ -67,20 +66,20 @@ export class ModelCollection<T extends IModelObject | null> extends Array<T> imp
             if (currentItem === null) {
                 const newItem = jsonElement[i];
                 if (newItem instanceof that.$itemConstructor) {
-                    setArrayItem(this, i, jsonElement[i]);
+                    this[i] = jsonElement[i];
                 } else {
                     const refItem = new that.$itemConstructor();
-                    setArrayItem(this, i, refItem!.update(newItem));
+                    this[i] = refItem!.update(newItem) as T;
                 }
             } else if (isModelObject(currentItem)) {
                 const newItem = currentItem.update(jsonElement[i]);
                 if (currentItem !== newItem) {
-                    setArrayItem(this, i, newItem);
+                    this[i] = newItem as T;
                 }
             } else {
                 const newItem = jsonElement[i];
                 if (currentItem !== newItem) {
-                    setArrayItem(this, i, newItem);
+                    this[i] = newItem;
                 }
             }
         }

src/ModelObject.ts

@@ -1,4 +1,4 @@
-import { ModelCollection, setArrayItem } from "./index";
+import { ModelCollection } from "./index";
 
 /**
  * Interface for updating model objects using JSON data
@@ -63,11 +63,11 @@ export abstract class ModelObject implements IModelObject {
                         for (let i = 0; i < Math.min(prop.length, value.length); i++) {
                             const propItem = prop[i];
                             if (propItem === null) {
-                                setArrayItem(prop, i, value[i]);
+                                prop[i] = value[i];
                             } else {
                                 const newItem = value[i];
                                 if (propItem !== newItem) {
-                                    setArrayItem(prop, i, newItem);
+                                    prop[i] = newItem;
                                 }
                             }
                         }

src/index.ts

@@ -28,14 +28,3 @@ export * from "./ObjectModel";
 // Expose ObjectModel as default export
 import ObjectModel from "./ObjectModel";
 export default ObjectModel;
-
-// Unfortunately we need to define a way to update arrays to remain compatible with Vue 2 (due to IE11).
-// This will become obsolete as soon as DWC is upgraded to Vue 3, but that isn't going to happen anytime soon.
-// Until then a Vue 2 user would have to call something like this on initialization to work around this limitation:
-// globalThis._duetModelSetArray = (array, index, value) => Vue.set(array, index, value);
-// or in TypeScript
-// (globalThis as any)._duetModelSetArray = (array: object, index: string | number, value: any) => Vue.set(array, index, value);
-(globalThis as any)._duetModelSetArray = (array: Array<any>, index: number, value: any) => array[index] = value;
-export function setArrayItem(array: Array<any>, index: number, value: any) {
-	(globalThis as any)._duetModelSetArray(array, index, value);
-}