pmcf 2.32.2 → 2.32.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.32.2",
+  "version": "2.32.3",
   "publishConfig": {
     "access": "public"
   },
@@ -39,7 +39,7 @@
   },
   "dependencies": {
     "ip-utilties": "^1.3.1",
-    "npm-pkgbuild": "^18.0.1",
+    "npm-pkgbuild": "^18.1.0",
     "pacc": "^3.4.0",
     "pkg-dir": "^8.0.0"
   },

package/src/base.mjs

@@ -1,7 +1,7 @@
 import { join } from "node:path";
 import { allOutputs } from "npm-pkgbuild";
 import { getAttribute } from "pacc";
-import { addType, primitives } from "./types.mjs";
+import { addType, primitives, typeFactory } from "./types.mjs";
 
 const BaseTypeDefinition = {
   name: "base",
@@ -201,12 +201,13 @@ export class Base {
           if (value instanceof property.type[0].clazz) {
             assign(property, value);
           } else {
-            const factory =
-              property.type[0].factoryFor?.(this, value) || property.type[0].clazz;
-
             assign(
               property,
-              new factory(this.ownerFor(property, value), value)
+              typeFactory(
+                property.type[0],
+                this.ownerFor(property, value),
+                value
+              )
             );
           }
           break;

package/src/root.mjs

@@ -1,7 +1,7 @@
 import { readFile, glob } from "node:fs/promises";
 import { join } from "node:path";
 import { Location } from "./location.mjs";
-import { addType, types, resolveTypeLinks } from "./types.mjs";
+import { addType, types, resolveTypeLinks, typeFactory } from "./types.mjs";
 
 const RootTypeDefinition = {
   name: "root",
@@ -49,8 +49,7 @@ export class Root extends Location {
     const fullName = this.fullName + "/" + name;
     data.name = fullName.substring(owner.fullName.length + 1);
 
-    const object = new type.clazz(owner, data);
-
+    const object = typeFactory(type, owner, data);
     this.addTypeObject(type.clazz.typeName, name, object);
     return object;
   }

package/src/types.mjs

@@ -83,3 +83,8 @@ export function resolveTypeLinks() {
     }
   }
 }
+
+export function typeFactory(type, owner, data) {
+  const factory = type.factoryFor?.(owner, data) || type.clazz;
+  return new factory(owner, data);
+}

package/types/root.d.mts

@@ -283,7 +283,7 @@ export class Root extends Location {
     constructor(directory: any);
     get fullName(): string;
     get root(): this;
-    _load(name: any, type: any): any;
+    _load(name: any, type: any): Promise<any>;
     load(name: any, options: any): any;
     loadAll(): Promise<void>;
 }

package/types/types.d.mts

@@ -1,4 +1,5 @@
 export function addType(clazz: any): void;
 export function resolveTypeLinks(): void;
+export function typeFactory(type: any, owner: any, data: any): any;
 export const types: {};
 export const primitives: Set<string>;