pmcf 6.34.6 → 6.35.0

package/bin/pmcf-package

@@ -6,8 +6,8 @@ import { tmpdir } from "node:os";
 import { cwd, env } from "node:process";
 import { packageDirectory } from "package-directory";
 import { createPublishingDetails } from "npm-pkgbuild";
+import { asArray } from "pacc";
 import { prepare } from "../src/cli.mjs";
-import { asArray } from "../src/utils.mjs";
 
 const { root, args, options } = await prepare({
   publish: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.34.6",
+  "version": "6.35.0",
   "publishConfig": {
     "access": "public"
   },
@@ -54,7 +54,7 @@
     "content-entry-transform": "^1.7.1",
     "ip-utilties": "^3.13.0",
     "npm-pkgbuild": "^20.9.0",
-    "pacc": "^11.2.6",
+    "pacc": "^11.3.0",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.0"
   },

package/src/core-service.mjs

@@ -2,7 +2,8 @@ import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
 import {
   string_attribute_writable,
   number_attribute_writable,
-  priority_attribute
+  priority_attribute,
+  asArray
 } from "pacc";
 import {
   Base,
@@ -15,7 +16,6 @@ import {
   FAMILY_UNIX,
   FAMILY_DNS
 } from "pmcf";
-import { asArray } from "./utils.mjs";
 import {
   networkAddressAttributes,
   extends_attribute,

package/src/dns-utils.mjs

@@ -1,5 +1,5 @@
 import { decodeIPv4, decodeIPv6, FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
-import { asIterator } from "./utils.mjs";
+import { asIterator } from "pacc";
 
 const typeOrder = {
   SOA: 0,

package/src/host.mjs

@@ -7,7 +7,8 @@ import {
   string_attribute_writable,
   string_set_attribute_writable,
   number_attribute_writable,
-  priority_attribute
+  priority_attribute,
+  asArray
 } from "pacc";
 import { addresses, addType, assign } from "pmcf";
 import {
@@ -22,7 +23,6 @@ import {
   domainFromDominName,
   domainName,
   writeLines,
-  asArray,
   union
 } from "./utils.mjs";
 import { loadHooks } from "./hooks.mjs";

package/src/network-address.mjs

@@ -2,14 +2,14 @@ import {
   default_attribute,
   string_attribute,
   type_attribute,
-  getAttribute
+  getAttribute,
+  asArray
 } from "pacc";
 import { familyIP, formatCIDR, decodeIP, addressType } from "ip-utilties";
 import { Subnet } from "./subnet.mjs";
 import { Owner, addType } from "pmcf";
 import { NetworkInterface } from "./network-interfaces/network-interface.mjs";
 import { family_attribute, subnet_attribute } from "./common-attributes.mjs";
-import { asArray } from "./utils.mjs";
 /**
  *
  */

package/src/network-interfaces/skeleton.mjs

@@ -1,7 +1,7 @@
 import { join } from "node:path";
 import { AggregatedMap } from "aggregated-map";
-import { addType } from "pacc";
-import { writeLines, sectionLines, asArray } from "../utils.mjs";
+import { addType, asArray } from "pacc";
+import { writeLines, sectionLines } from "../utils.mjs";
 import { NetworkAddress, Host, cidrAddresses } from "pmcf";
 import { ServiceOwner } from "../service-owner.mjs";
 

package/src/owner.mjs

@@ -4,9 +4,10 @@ import { AggregatedMap } from "aggregated-map";
 import {
   string_set_attribute_writable,
   string_attribute_writable,
-  email_attribute
+  email_attribute,
+  asArray
 } from "pacc";
-import { asArray, union } from "./utils.mjs";
+import { union } from "./utils.mjs";
 import { ServiceOwner } from "./service-owner.mjs";
 import { Subnet, SUBNET_GLOBAL_IPV4, SUBNET_GLOBAL_IPV6 } from "./subnet.mjs";
 import {

package/src/service-types.mjs

@@ -1,6 +1,6 @@
-import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
+import { asArray } from "pacc";
+import { FAMILY_IPV6 } from "ip-utilties";
 import { FAMILY_UNIX, FAMILY_IPV4_IPV6 } from "./endpoint.mjs";
-import { asArray } from "./utils.mjs";
 
 export const ServiceTypes = {
   "alpm-repo": {

package/src/services/bind.mjs

@@ -16,7 +16,8 @@ import {
   boolean_attribute_writable_false,
   integer_attribute_writable,
   integer_attribute,
-  secret_attribute_writable
+  secret_attribute_writable,
+  asArray
 } from "pacc";
 import {
   Base,
@@ -27,7 +28,7 @@ import {
   addType,
   FAMILY_IPV4_IPV6
 } from "pmcf";
-import { yesno, writeLines, asArray } from "../utils.mjs";
+import { yesno, writeLines  } from "../utils.mjs";
 import {
   DNSRecord,
   dnsFullName,

package/src/type.mjs

@@ -1,7 +1,6 @@
-import { addType as addTypeBasic, toInternal, registerToken, DOT } from "pacc";
+import { addType as addTypeBasic, toInternal, registerToken, DOT, asArray } from "pacc";
 import { normalizeIP } from "ip-utilties";
 import { addServiceType } from "pmcf";
-import { asArray } from "./utils.mjs";
 
 const SLASH = { ...DOT, str: "/" };
 

package/src/utils.mjs

@@ -91,50 +91,6 @@ export function bridgeToJSON(bridge) {
   return [...bridge].map(n => n.fullName || `(${n})`).sort();
 }
 
-/**
- * Convert scalar or iterable into Array.
- * @param {any} value
- * @returns {Array<any>}
- */
-export function asArray(value) {
-  switch (typeof value) {
-    case "undefined":
-      return [];
-    case "object":
-      if (Array.isArray(value)) {
-        return value;
-      }
-
-      if (value instanceof Iterator || value[Symbol.iterator]) {
-        return [...value];
-      }
-  }
-
-  return [value];
-}
-
-/**
- * @param {any} value
- * @returns {Iterable<any>}
- */
-export function asIterator(value) {
-  switch (typeof value) {
-    case "undefined":
-      return [];
-    case "string":
-    case "number":
-    case "boolean":
-    case "bigint":
-      return [value];
-  }
-
-  if (value[Symbol.iterator]) {
-    return value;
-  }
-
-  return asArray(value);
-}
-
 export const filterConfigurable = attribute =>
   !attribute.private && attribute.configurable;