pacc 9.2.12 → 9.2.14

package/README.md

@@ -831,6 +831,9 @@ Type: [Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Globa
 
 *   `name` **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
 *   `primitive` **[boolean](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Boolean)?** 
+*   `extends` **[Type](#type)?** 
+*   `members` **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)<[Type](#type)>?**&#x20;
+*   `clazz` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)?**&#x20;
 *   `toInternal` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)?**&#x20;
 *   `toExternal` **[Function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Statements/function)?**&#x20;
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pacc",
-  "version": "9.2.12",
+  "version": "9.2.14",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -43,13 +43,13 @@
   },
   "devDependencies": {
     "@mitata/counters": "^0.0.8",
-    "aggregated-map": "^1.0.3",
+    "aggregated-map": "^1.0.4",
     "ava": "^8.0.1",
     "browser-ava": "^2.3.61",
     "c8": "^11.0.0",
     "documentation": "^14.0.3",
     "mitata": "^1.0.34",
-    "semantic-release": "^25.0.3",
+    "semantic-release": "^25.0.5",
     "typescript": "^6.0.3"
   },
   "overrides": {

package/src/expand.mjs

@@ -159,7 +159,7 @@ export function expand(object, context) {
       return object;
     }
 
-    if (typeof object.valueOf === "function") {
+    if(Object.prototype.toString.call(object) !== '[object Object]') {
       return object;
     }
 
@@ -185,7 +185,6 @@ export function expand(object, context) {
       }
     }
 
-    console.log(newObject);
     return newObject;
   }
 

package/src/types.mjs

@@ -6,6 +6,9 @@ import { parseBytes } from "./bytes.mjs";
  * @typedef {Object} Type
  * @property {string} name
  * @property {boolean} [primitive]
+ * @property {Type} [extends]
+ * @property {Set<Type>} [members]
+ * @property {Function} [clazz]
  * @property {Function} [toInternal]
  * @property {Function} [toExternal]
  */
@@ -121,28 +124,11 @@ function raiseOnUnknownType(type, origin) {
 }
 
 export function addType(type) {
-  if (type.typeDefinition) {
-    const clazz = type;
-    type = type.typeDefinition;
-    type.clazz = clazz;
-  } else {
-    if (!!type?.constructor.name) {
-      const clazz = type;
-      type.clazz = clazz;
-    }
-  }
-
-  if (type.specializationOf) {
-    type.specializationOf.specializations[type.name] = type;
-  }
-
-  type.owners ||= [];
-
   switch (typeof type.extends) {
     case "undefined":
-      const ex = Object.getPrototypeOf(type.clazz);
+      const ex = Object.getPrototypeOf(type.clazz || type);
       if (ex?.name) {
-        type.extends = ex.typeDefinition || ex;
+        type.extends = ex;
       }
       break;
 
@@ -151,14 +137,19 @@ export function addType(type) {
       break;
   }
 
-  if (!types[type.name]) {
-    types[type.name] = type;
+  if (type.specializationOf) {
+    type.specializationOf.specializations[type.name] = type;
   }
 
-  if (types[type.name] !== type) {
-    return Object.assign(types[type.name], type);
-  }
+  type.owners ||= [];
 
+  if (!types[type.name]) {
+    types[type.name] = type;
+  } else {
+    if (types[type.name] !== type) {
+      return Object.assign(types[type.name], type);
+    }
+  }
   return type;
 }
 
@@ -213,7 +204,7 @@ export function resolveTypeLinks() {
 }
 
 export function typeFactory(type, owner, data) {
-  const factory = type.factoryFor?.(owner, data) || type.clazz;
+  const factory = type.factoryFor?.(owner, data) || type.clazz || type;
   const object = new factory(owner);
 
   object.read(data);

package/types/types.d.mts

@@ -64,6 +64,9 @@ export const types: {
 export type Type = {
     name: string;
     primitive?: boolean | undefined;
+    extends?: Type | undefined;
+    members?: Set<Type> | undefined;
+    clazz?: Function | undefined;
     toInternal?: Function | undefined;
     toExternal?: Function | undefined;
 };