x_ite 8.7.9 → 8.8.0

package/src/x_ite/Base/X3DObject.js

@@ -47,6 +47,7 @@
 
 import Generator    from "../InputOutput/Generator.js";
 import MapUtilities from "../../standard/Utility/MapUtilities.js";
+import DEVELOPMENT  from "../DEVELOPMENT.js";
 
 const
    _name      = Symbol (),
@@ -56,38 +57,37 @@ const
 
 function X3DObject () { }
 
-X3DObject .prototype =
+Object .assign (X3DObject .prototype,
 {
-   constructor: X3DObject,
    [_name]: "",
    [_interests]: new Map (),
    [_values]: [ ],
    [_userData]: new Map (),
-   getId: function ()
+   getId ()
    {
       return X3DObject .getId (this);
    },
-   getTypeName: function ()
+   getTypeName ()
    {
-      return "X3DObject";
+      return this .constructor .typeName;
    },
-   setName: function (value)
+   setName (value)
    {
       this [_name] = value;
    },
-   getName: function ()
+   getName ()
    {
       return this [_name];
    },
-   getDisplayName: function ()
+   getDisplayName ()
    {
       return this [_name];
    },
-   hasInterest: function (callbackName, object)
+   hasInterest (callbackName, object)
    {
       return this [_interests] .has (X3DObject .getInterestId (callbackName, object));
    },
-   addInterest: function (callbackName, object, ... args)
+   addInterest (callbackName, object, ... args)
    {
       if (this [_interests] === X3DObject .prototype [_interests])
       {
@@ -101,15 +101,15 @@ X3DObject .prototype =
 
       this [_interests] .set (interestId, callback .bind (object, ... args, this));
    },
-   removeInterest: function (callbackName, object)
+   removeInterest (callbackName, object)
    {
       this [_interests] .delete (X3DObject .getInterestId (callbackName, object));
    },
-   getInterests: function ()
+   getInterests ()
    {
       return this [_interests];
    },
-   processInterests: function ()
+   processInterests ()
    {
       if (this [_interests] .size)
       {
@@ -117,22 +117,22 @@ X3DObject .prototype =
             interest ();
       }
    },
-   getUserData: function (key)
+   getUserData (key)
    {
       return this [_userData] .get (key);
    },
-   setUserData: function (key, value)
+   setUserData (key, value)
    {
       if (this [_userData] === X3DObject .prototype [_userData])
          this [_userData] = new Map ();
 
       this [_userData] .set (key, value);
    },
-   removeUserData: function (key)
+   removeUserData (key)
    {
       this [_userData] .delete (key);
    },
-   toString: function (options = Object .prototype)
+   toString (options = Object .prototype)
    {
       const generator = new Generator (options);
 
@@ -143,7 +143,7 @@ X3DObject .prototype =
 
       return generator .string;
    },
-   toVRMLString: function  (options = Object .prototype)
+   toVRMLString  (options = Object .prototype)
    {
       const generator = new Generator (options);
 
@@ -154,7 +154,7 @@ X3DObject .prototype =
 
       return generator .string;
    },
-   toXMLString: function  (options = Object .prototype)
+   toXMLString  (options = Object .prototype)
    {
       const generator = new Generator (options);
 
@@ -165,7 +165,7 @@ X3DObject .prototype =
 
       return generator .string;
    },
-   toJSONString: function (options = Object .prototype)
+   toJSONString (options = Object .prototype)
    {
       const generator = new Generator (options);
 
@@ -176,32 +176,62 @@ X3DObject .prototype =
 
       return generator .string;
    },
-   toStream: function (generator)
+   toStream (generator)
    {
-      generator .string = `[object ${this .getTypeName ()}]`;
+      generator .string = Object .prototype .toString .call (this);
    },
-   dispose: function ()
+   dispose ()
    {
       this [_interests] .clear ();
       this [_userData]  .clear ();
    },
-};
+});
 
 for (const key of Reflect .ownKeys (X3DObject .prototype))
    Object .defineProperty (X3DObject .prototype, key, { enumerable: false });
 
-Object .defineProperty (X3DObject .prototype, Symbol .toStringTag,
+Object .defineProperties (X3DObject .prototype,
 {
-   get: function () { return this .getTypeName (); },
+   [Symbol .toStringTag]:
+   {
+      get () { return this .getTypeName (); },
+   },
 });
 
 Object .assign (X3DObject,
 {
-   getId: (function ()
+   getId: DEVELOPMENT ? (function ()
+   {
+      const
+         map      = new WeakMap (),
+         cache    = [ ],
+         registry = new FinalizationRegistry (id => cache .push (id));
+
+      let counter = BigInt (0);
+
+      return function (object)
+      {
+         const id = map .get (object);
+
+         if (id !== undefined)
+         {
+            return id;
+         }
+         else
+         {
+            const id = cache .pop () ?? ++ counter;
+
+            map .set (object, id);
+            registry .register (object, id);
+
+            return id;
+         }
+      };
+   })() : (function ()
    {
       const map = new WeakMap ();
 
-      let counter = 0; // In the future we can use a bigint here (0n).
+      let counter = 0;
 
       return function (object)
       {
@@ -215,9 +245,9 @@ Object .assign (X3DObject,
          return counter;
       };
    })(),
-   getInterestId: function (callbackName, object)
+   getInterestId (callbackName, object)
    {
-      return this .getId (object) + "." + this .getId (object [callbackName]);
+      return `${this .getId (object)}.${this .getId (object [callbackName])}`;
    },
 });
 

package/src/x_ite/Base/X3DObjectArrayField.js

@@ -50,11 +50,13 @@ import X3DArrayField from "./X3DArrayField.js";
 
 const
    _target = Symbol (),
-   _proxy  = Symbol ();
+   _proxy  = Symbol (),
+   _insert = Symbol (),
+   _erase  = Symbol ();
 
 const handler =
 {
-   get: function (target, key)
+   get (target, key)
    {
       const value = target [key];
 
@@ -80,7 +82,7 @@ const handler =
          }
       }
    },
-   set: function (target, key, value)
+   set (target, key, value)
    {
       if (key in target)
       {
@@ -99,18 +101,18 @@ const handler =
 
       return true;
    },
-   has: function (target, key)
+   has (target, key)
    {
       if (Number .isInteger (+key))
          return key < target .getValue () .length;
 
       return key in target;
    },
-   ownKeys: function (target)
+   ownKeys (target)
    {
       return Object .keys (target .getValue ());
    },
-   getOwnPropertyDescriptor: function (target, key)
+   getOwnPropertyDescriptor (target, key)
    {
       if (typeof key !== "string")
          return;
@@ -124,27 +126,23 @@ const handler =
 
 function X3DObjectArrayField (value)
 {
-   X3DArrayField .call (this, [ ]);
-
    const proxy = new Proxy (this, handler);
 
+   X3DArrayField .call (this, [ ]);
+
    this [_target] = this;
    this [_proxy]  = proxy;
 
-   if (value [0] instanceof Array)
-      value = value [0];
-
    this .push (... value);
 
    return proxy;
 }
 
-X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .prototype),
+Object .assign (Object .setPrototypeOf (X3DObjectArrayField .prototype, X3DArrayField .prototype),
 {
-   constructor: X3DObjectArrayField,
    [_target]: null,
    [_proxy]: null,
-   [Symbol .iterator]: function* ()
+   *[Symbol .iterator] ()
    {
       const
          target = this [_target],
@@ -153,11 +151,11 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
       for (const value of array)
          yield value .valueOf ();
    },
-   getTarget: function ()
+   getTarget ()
    {
       return this [_target];
    },
-   copy: function ()
+   copy ()
    {
       const
          target = this [_target],
@@ -169,7 +167,7 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
 
       return copy;
    },
-   equals: function (array)
+   equals (array)
    {
       const
          target = this [_target],
@@ -191,11 +189,11 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
 
       return true;
    },
-   isDefaultValue: function ()
+   isDefaultValue ()
    {
       return this .length === 0;
    },
-   set: function (value)
+   set (value)
    {
       const
          target    = this [_target],
@@ -207,14 +205,14 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
       for (let i = 0; i < newLength; ++ i)
          array [i] .set (value [i] instanceof X3DField ? value [i] .getValue () : value [i]);
    },
-   setValue: function (value)
+   setValue (value)
    {
       const target = this [_target];
 
       target .set (value instanceof X3DObjectArrayField ? value .getValue () : value);
       target .addEvent ();
    },
-   unshift: function (value)
+   unshift (value)
    {
       const
          target = this [_target],
@@ -233,7 +231,7 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
 
       return array .length;
    },
-   shift: function ()
+   shift ()
    {
       const
          target = this [_target],
@@ -251,7 +249,7 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
          return result;
       }
    },
-   push: function (value)
+   push (value)
    {
       const
          target = this [_target],
@@ -270,7 +268,7 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
 
       return array .length;
    },
-   pop: function ()
+   pop ()
    {
       const
          target = this [_target],
@@ -288,36 +286,37 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
          return result;
       }
    },
-   splice: function (index, deleteCount, ... insertValues)
+   splice (index, deleteCount, ... insertValues)
    {
       const
          target = this [_target],
-         array  = target .getValue ();
+         array  = target .getValue (),
+         length = array .length;
 
-      if (index > array .length)
-         index = array .length;
+      if (arguments .length === 0)
+         return new (target .constructor) ();
 
-      if (index + deleteCount > array .length)
-         deleteCount = array .length - index;
+      if (arguments .length < 2)
+         deleteCount = length;
 
-      const result = target .erase (index, index + deleteCount);
+      const result = target [_erase] (index, deleteCount);
 
       if (insertValues .length)
-         target .insert (index, insertValues, 0, insertValues .length);
+         target [_insert] (index, insertValues);
 
       return result;
    },
-   insert: function (index, array, first, last)
+   [_insert] (index, array)
    {
       const
          target = this [_target],
          args   = [ ];
 
-      for (let i = first; i < last; ++ i)
+      for (const value of array)
       {
          const field = new (target .getSingleType ()) ();
 
-         field .setValue (array [i]);
+         field .setValue (value);
          target .addChildObject (field);
          args .push (field);
       }
@@ -325,46 +324,12 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
       target .getValue () .splice (index, 0, ... args);
       target .addEvent ();
    },
-   remove: function (first, last, value)
-   {
-      const
-         target = this [_target],
-         array  = target .getValue (),
-         cmp    = typeof value === "function" ? value : v => v === value;
-
-      first = array .findIndex ((current, index) => index >= first && cmp (current .valueOf ()));
-
-      if (first !== -1)
-      {
-         for (let i = first; ++ i < last; )
-         {
-            const current = array [i];
-
-            if (!cmp (current .valueOf ()))
-            {
-               const tmp = array [first];
-
-               array [first ++] = current;
-               array [i]        = tmp;
-            }
-         }
-      }
-      else
-      {
-         first = last;
-      }
-
-      if (first !== last)
-         target .addEvent ();
-
-      return first;
-   },
-   erase: function (first, last)
+   [_erase] (index, deleteCount)
    {
       const
          target = this [_target],
-         values = target .getValue () .splice (first, last - first),
-         result = new (target .constructor) (values);
+         values = target .getValue () .splice (index, deleteCount),
+         result = new (target .constructor) (... values);
 
       for (const value of values)
          target .removeChildObject (value);
@@ -373,7 +338,7 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
 
       return result;
    },
-   resize: function (size, value, silently)
+   resize (size, value, silently)
    {
       const
          target = this [_target],
@@ -407,16 +372,16 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
             target .addEvent ();
       }
    },
-   addChildObject: function (value)
+   addChildObject (value)
    {
       value .addParent (this [_proxy]);
    },
-   removeChildObject: function (value)
+   removeChildObject (value)
    {
       value .removeParent (this [_proxy]);
       value .dispose ();
    },
-   reverse: function ()
+   reverse ()
    {
       const target = this [_target];
 
@@ -425,7 +390,7 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
 
       return target [_proxy];
    },
-   sort: function (compareFn)
+   sort (compareFn)
    {
       const target = this [_target];
 
@@ -434,7 +399,7 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
 
       return target [_proxy];
    },
-   toStream: function (generator)
+   toStream (generator)
    {
       const
          target = this [_target],
@@ -487,11 +452,11 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
          }
       }
    },
-   toVRMLStream: function (generator)
+   toVRMLStream (generator)
    {
       this .toStream (generator);
    },
-   toXMLStream: function (generator)
+   toXMLStream (generator)
    {
       const
          target = this [_target],
@@ -515,7 +480,7 @@ X3DObjectArrayField .prototype = Object .assign (Object .create (X3DArrayField .
          generator .PopUnitCategory ();
       }
    },
-   toJSONStream: function (generator)
+   toJSONStream (generator)
    {
       const
          target = this [_target],
@@ -566,8 +531,8 @@ for (const key of Reflect .ownKeys (X3DObjectArrayField .prototype))
 
 Object .defineProperty (X3DObjectArrayField .prototype, "length",
 {
-   get: function () { return this [_target] .getValue () .length; },
-   set: function (value) { this [_target] .resize (value); },
+   get () { return this [_target] .getValue () .length; },
+   set (value) { this [_target] .resize (value); },
 });
 
 export default X3DObjectArrayField;