pmcf 3.10.2 → 3.10.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "3.10.2",
+  "version": "3.10.4",
   "publishConfig": {
     "access": "public"
   },
@@ -53,7 +53,7 @@
   "dependencies": {
     "ip-utilties": "^1.4.9",
     "npm-pkgbuild": "^18.2.30",
-    "pacc": "^4.16.1",
+    "pacc": "^4.17.0",
     "package-directory": "^8.1.0"
   },
   "devDependencies": {

package/src/base.mjs

@@ -3,6 +3,7 @@ import { allOutputs } from "npm-pkgbuild";
 import {
   getAttribute,
   baseTypes,
+  attributeIterator,
   name_attribute_writable,
   string_attribute,
   string_attribute_writable,
@@ -228,8 +229,9 @@ export class Base {
       this._properties = data.properties;
     }
 
-    for (const [name, attribute] of Object.entries(type.attributes)) {
+    for (const [path, attribute] of attributeIterator(type.attributes)) {
       if (attribute.writable) {
+        const name = path.join(".");
         const value = this.expand(data[name]);
 
         if (attribute.collection) {

package/src/owner.mjs

@@ -1,7 +1,6 @@
 import { normalizeCIDR, familyIP } from "ip-utilties";
 import {
   string_collection_attribute_writable,
-  string_attribute,
   string_attribute_writable,
   email_attribute
 } from "pacc";

package/src/root.mjs

@@ -80,10 +80,12 @@ export class Root extends Location {
     for (const type of Object.values(types).sort(
       (a, b) => b.priority - a.priority
     )) {
-      for await (const name of glob(type.clazz.fileNameGlob, {
-        cwd: this.directory
-      })) {
-        await this.load(name, { type });
+      if (type.clazz) {
+        for await (const name of glob(type.clazz.fileNameGlob, {
+          cwd: this.directory
+        })) {
+          await this.load(name, { type });
+        }
       }
     }
 

package/src/types.mjs

@@ -1,9 +1,7 @@
-import { baseTypes } from "pacc";
+import { baseTypes, attributeIterator, types } from "pacc";
 import { asArray } from "./utils.mjs";
 import { addServiceTypes } from "./service-types.mjs";
-
-export const types = {};
-
+export { types };
 export function addType(clazz) {
   const type = clazz.typeDefinition;
 
@@ -22,12 +20,16 @@ export function addType(clazz) {
 
 export function resolveTypeLinks() {
   for (const type of Object.values(types)) {
-    type.owners = type.owners.map(owner =>
-      typeof owner === "string" ? types[owner] : owner
-    );
-
-    for (const [name, attribute] of Object.entries(type.attributes)) {
-      attribute.name = name;
+    if (type.owners) {
+      type.owners = type.owners.map(owner =>
+        typeof owner === "string" ? types[owner] : owner
+      );
+    }
+    else {
+      type.owners = [];
+    }
+    for (const [path, attribute] of attributeIterator(type.attributes)) {
+      attribute.name = path.join(".");
       if (attribute.isKey) {
         type.identifier = attribute;
       }
@@ -43,12 +45,7 @@ export function resolveTypeLinks() {
             if (t) {
               ts.push(t);
             } else {
-              console.error(
-                "Unknown type",
-                attribute.type,
-                type.name,
-                name
-              );
+              console.error("Unknown type", attribute.type, type.name, name);
             }
           }
         } else {

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 { types };
+import { types } from "pacc";