pmcf 1.29.0 → 1.30.1

package/README.md

@@ -16,6 +16,10 @@
 
 # API
 
+<!-- Generated by documentation.js. Update this documentation by updating the source code. -->
+
+## Table of Contents
+
 # install
 
 With [npm](http://npmjs.org) do:

package/bin/pmcf-host-defs

@@ -6,7 +6,7 @@ import { Host } from "pmcf";
 import { writeLines, sectionLines } from "../src/utils.mjs";
 import { prepare } from "../src/cmd.mjs";
 
-const { root, args, options } = prepare();
+const { root, args, options } = await prepare();
 
 const hostName = args[0];
 

package/bin/pmcf-info

@@ -1,13 +1,11 @@
 #!/usr/bin/env node
 import { prepare } from "../src/cmd.mjs";
-const { root, args } = prepare();
-
-await root.loadAll();
+const { root, args } = await prepare();
 
 const objectName = args[0];
 
 if (objectName) {
-  const object = await root.named(objectName);
+  const object = root.named(objectName);
   console.log(object.toJSON());
 } else {
   for await (const location of root.locations()) {

package/bin/pmcf-location-defs

@@ -6,9 +6,7 @@ import { Location } from "pmcf";
 import { writeLines, sectionLines } from "../src/utils.mjs";
 import { prepare } from "../src/cmd.mjs";
 
-const { root, args, options } = prepare();
-
-await root.loadAll();
+const { root, args, options } = await prepare();
 
 const location = await root.load(args[0], { type: Location });
 

package/bin/pmcf-named-defs

@@ -9,9 +9,7 @@ import {
 } from "../src/utils.mjs";
 import { prepare } from "../src/cmd.mjs";
 
-const { root, args, options } = prepare();
-
-await root.loadAll();
+const { root, args, options } = await prepare();
 
 const owner = await root.load(args[0]);
 const updates = [

package/bin/pmcf-network

@@ -2,7 +2,7 @@
 
 import { prepare } from "../src/cmd.mjs";
 
-const { root, args } = prepare();
+const { root, args } = await prepare();
 
 const location = await root.load(args[0]);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.29.0",
+  "version": "1.30.1",
   "publishConfig": {
     "access": "public"
   },

package/src/base.mjs

@@ -9,7 +9,7 @@ export class Base {
   static get typeName() {
     return "base";
   }
-  
+
   static get pluralTypeName() {
     return this.typeName + "s";
   }
@@ -112,7 +112,7 @@ export class Base {
           return new Set([...object].map(e => this.expand(e)));
         }
 
-      /*return Object.fromEntries(
+        /*return Object.fromEntries(
           Object.entries(object).map(([k, v]) => [k, this.expand(v)])
         );*/
     }

package/src/cmd.mjs

@@ -2,14 +2,14 @@ import { parseArgs } from "node:util";
 import { argv, cwd, env } from "node:process";
 import { Root } from "./model.mjs";
 
-export function prepare() {
+export async function prepare() {  
   const { values, positionals } = parseArgs({
     args: argv.slice(2),
     options: {
       root: {
         type: "string",
-        short: "w",
-        default: env.PMCF_WORLD || cwd()
+        short: "r",
+        default: env.PMCF_ROOT || cwd()
       },
       output: {
         type: "string",
@@ -22,5 +22,7 @@ export function prepare() {
 
   const root = new Root(values.root);
 
+  await root.loadAll();
+  
   return { root, options: values, args: positionals };
 }

package/src/model.mjs

@@ -534,5 +534,5 @@ export class NetworkInterface extends Base {
   }
 }
 
-const _types = [Location, Network, Subnet, Host, Cluster, Service, DNSService];
+const _types = [Location, Network, Subnet, Host, Cluster, Service, DNSService, NetworkInterface];
 const _typesByName = Object.fromEntries(_types.map(t => [t.typeName, t]));

package/types/cmd.d.mts

@@ -1,9 +1,9 @@
-export function prepare(): {
+export function prepare(): Promise<{
     root: Root;
     options: {
         root: string;
         output: string;
     };
     args: string[];
-};
+}>;
 import { Root } from "./model.mjs";

package/types/model.d.mts

@@ -1,6 +1,6 @@
 export class Root extends Owner {
     static get types(): {
-        [k: string]: typeof DNSService | typeof Subnet | typeof Cluster | typeof Service | typeof Host;
+        [k: string]: typeof DNSService | typeof Subnet | typeof Cluster | typeof Service | typeof Host | typeof NetworkInterface;
     };
     constructor(directory: any);
     get fullName(): string;