pmcf 1.59.13 → 1.61.0

package/bin/pmcf-diagram

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 
-import { prepare } from "../src/cmd.mjs";
+import { prepare } from "../src/cli.mjs";
 
 const { root, args } = await prepare();
 

package/bin/pmcf-info

@@ -1,5 +1,5 @@
 #!/usr/bin/env node
-import { prepare } from "../src/cmd.mjs";
+import { prepare } from "../src/cli.mjs";
 const { root, args } = await prepare();
 
 const objectName = args[0];

package/bin/pmcf-package

@@ -6,7 +6,7 @@ import { tmpdir } from "node:os";
 import { env } from "node:process";
 import { packageDirectory } from "pkg-dir";
 import { createPublishingDetails } from "npm-pkgbuild";
-import { prepare } from "../src/cmd.mjs";
+import { prepare } from "../src/cli.mjs";
 import { asArray } from "../src/utils.mjs";
 
 const { root, args, options } = await prepare();
@@ -49,11 +49,13 @@ for (const name of args) {
         options
       );
 
-      await Promise.all(
-        publishingDetails.map(publishDetail =>
-          output.publish(artifact, publishDetail)
-        )
-      );
+      if (!options.dry) {
+        await Promise.all(
+          publishingDetails.map(publishDetail =>
+            output.publish(artifact, publishDetail)
+          )
+        );
+      }
     }
   }
 }

package/package.json

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

package/src/{cmd.mjs → cli.mjs}

@@ -11,6 +11,10 @@ export async function prepare() {
         short: "v",
         default: false
       },
+      dry: {
+        type: "boolean",
+        default: false
+      },
       publish: {
         type: "string",
       },
@@ -21,8 +25,7 @@ export async function prepare() {
       },
       output: {
         type: "string",
-        short: "o",
-       // default: cwd()
+        short: "o"
       }
     },
     allowPositionals: true

package/src/cluster.mjs

@@ -11,6 +11,7 @@ const ClusterTypeDefinition = {
   priority: 0.7,
   extends: Owner.typeDefinition,
   properties: {
+    routerId: { type: "number", collection: false, writeable: true },
     masters: { type: "network_interface", collection: true, writeable: true },
     backups: { type: "network_interface", collection: true, writeable: true }
   }
@@ -19,6 +20,7 @@ const ClusterTypeDefinition = {
 export class Cluster extends Host {
   #masters = new Set();
   #backups = new Set();
+  routerId = 100;
 
   static {
     addType(this);
@@ -79,7 +81,7 @@ export class Cluster extends Host {
         cfg.push("  virtual_ipaddress {");
         cfg.push(`    ${cluster.rawAddress}`);
         cfg.push("  }");
-        cfg.push("  virtual_router_id 101");
+        cfg.push(`  virtual_router_id ${this.routerId}`);
         cfg.push("  priority 255");
         cfg.push("  advert_int 1");
         cfg.push("  authentication {");
@@ -98,7 +100,6 @@ export class Cluster extends Host {
 
       result.properties.name = name;
       result.properties.dependencies = ["keepalived"];
-      result.properties.replaces = [`${this.typeName}-${this.owner.name}-${this.name}-${ni.host.name}`];
 
       result.sources.push(
         new FileContentProvider(packageStagingDir + "/")[Symbol.asyncIterator]()

package/types/{cmd.d.mts → cli.d.mts}

@@ -2,6 +2,7 @@ export function prepare(): Promise<{
     root: Root;
     options: {
         verbose: boolean;
+        dry: boolean;
         publish: string;
         root: string;
         output: string;

package/types/cluster.d.mts

@@ -359,6 +359,11 @@ export class Cluster extends Host {
             };
         };
         properties: {
+            routerId: {
+                type: string;
+                collection: boolean;
+                writeable: boolean;
+            };
             masters: {
                 type: string;
                 collection: boolean;
@@ -371,6 +376,7 @@ export class Cluster extends Host {
             };
         };
     };
+    routerId: number;
     set masters(value: Set<any>);
     get masters(): Set<any>;
     set backups(value: Set<any>);