pmcf 2.36.2 → 2.37.0

package/bin/pmcf-package

@@ -1,19 +1,27 @@
 #!/usr/bin/env node
 
-import { join } from "node:path";
+import { join, resolve } from "node:path";
 import { readFile, mkdtemp } from "node:fs/promises";
 import { tmpdir } from "node:os";
-import { env } from "node:process";
+import { cwd, env } from "node:process";
 import { packageDirectory } from "pkg-dir";
 import { createPublishingDetails } from "npm-pkgbuild";
 import { prepare } from "../src/cli.mjs";
 import { asArray } from "../src/utils.mjs";
 
-const { root, args, options } = await prepare();
+const { root, args, options } = await prepare({
+  publish: {
+    type: "string"
+  },
+  output: {
+    type: "string",
+    short: "o"
+  }
+});
 
-if (!options.output) {
-  options.output = await mkdtemp(join(tmpdir(), "pmcf"));
-}
+options.output = options.output
+  ? resolve(cwd(), options.output)
+  : await mkdtemp(join(tmpdir(), "pmcf"));
 
 const pkgDir = await packageDirectory({ cwd: options.root });
 const pkg = JSON.parse(await readFile(join(pkgDir, "package.json"), "utf8"));
@@ -43,7 +51,7 @@ for (const name of args) {
       const output = new outputFactory(properties);
 
       const artifact = await output.create(
-        sources.map(source=>source[Symbol.asyncIterator]()),
+        sources.map(source => source[Symbol.asyncIterator]()),
         [],
         publishingDetails,
         options

package/package.json

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

package/src/cli.mjs

@@ -1,5 +1,4 @@
 import { parseArgs } from "node:util";
-import { resolve } from "node:path";
 import { argv, cwd, env } from "node:process";
 import { Root } from "./module.mjs";
 
@@ -17,26 +16,15 @@ export async function prepare(options = {}) {
         type: "boolean",
         default: false
       },
-      publish: {
-        type: "string"
-      },
       root: {
         type: "string",
         short: "r",
         default: env.PMCF_ROOT || cwd()
-      },
-      output: {
-        type: "string",
-        short: "o"
       }
     },
     allowPositionals: true
   });
 
-  if (values.output) {
-    values.output = resolve(cwd(), values.output);
-  }
-
   const root = new Root(values.root);
 
   await root.loadAll();

package/src/endpoint.mjs

@@ -53,3 +53,12 @@ export class DomainNameEndpoint {
     return `${this.address}[${this.port}]`;
   }
 }
+
+export class HTTPEndpoint {
+  constructor(service, url, data) {
+    this.service = service;
+    this.url = url;
+    Object.assign(this, data);
+  }
+
+}

package/src/service.mjs

@@ -10,6 +10,9 @@ import {
 } from "./dns-utils.mjs";
 
 const ServiceTypes = {
+  "pacman-repo": {
+    extends: ["https"]
+  },
   ntp: { endpoints: [{ protocol: "udp", port: 123, tls: false }] },
   dns: { endpoints: [{ protocol: "udp", port: 53, tls: false }] },
   ldap: { endpoints: [{ protocol: "tcp", port: 389, tls: false }] },
@@ -22,7 +25,6 @@ const ServiceTypes = {
   http3: {
     extends: ["https"],
     type: "https",
-    endpoints: [{ protocol: "tcp", port: 443, tls: true }],
     dnsRecord: {
       type: "HTTPS",
       parameters: { "no-default-alpn": undefined, alpn: "h3" }
@@ -61,6 +63,23 @@ const ServiceTypes = {
   }
 };
 
+function serviceTypeEndpoints(type) {
+  let st = ServiceTypes[type];
+  if (st) {
+    if (st.extends) {
+      let ste = ServiceTypes[st.extends];
+
+      if (ste.endpoints) {
+        return st.endpoints
+          ? [...st.endpoints, ...ste.endpoints]
+          : ste.endpoints;
+      }
+    }
+
+    return st.endpoints;
+  }
+}
+
 export const endpointProperties = {
   port: { type: "number", collection: false, writeable: true },
   protocol: {
@@ -173,7 +192,7 @@ export class Service extends Base {
         ? { type: this.type }
         : { type: this.type, port: this._port };
 
-    const data = ServiceTypes[this.type]?.endpoints || [
+    const data = serviceTypeEndpoints(this.type) || [
       {
         tls: false
       }
@@ -318,9 +337,9 @@ export function serviceEndpoints(sources, options = {}) {
 
   const res = [...new Set(options.select ? all.map(options.select) : all)];
 
-  if(options.limit < res.length) {
+  if (options.limit < res.length) {
     res.length = options.limit;
   }
-  
+
   return options.join ? res.join(options.join) : res;
 }

package/types/cli.d.mts

@@ -3,9 +3,7 @@ export function prepare(options?: {}): Promise<{
     options: {
         verbose: boolean;
         dry: boolean;
-        publish: string;
         root: string;
-        output: string;
     };
     args: string[];
 }>;

package/types/endpoint.d.mts

@@ -18,3 +18,8 @@ export class DomainNameEndpoint {
     get address(): any;
     toString(): string;
 }
+export class HTTPEndpoint {
+    constructor(service: any, url: any, data: any);
+    service: any;
+    url: any;
+}