pmcf 4.17.3 → 4.18.0

package/bin/pmcf-info

@@ -1,26 +1,18 @@
 #!/usr/bin/env node
 import { prepare } from "../src/cli.mjs";
 
-const { root, args, options } = await prepare({
-  service: {
-    type: "string"
-  },
-  address: {
-    type: "boolean"
-  }
-});
+const { root, args, options } = await prepare({});
 
 for (const name of args) {
-  const object = await root.load(name);
-  if (options.service) {
-    for (const service of root.findServices(`type="${options.service}"`)) {
-      console.log(service.toString());
-    }
-  } else if (options.address) {
-    for (const na of object.networkAddresses()) {
-      console.log(na.toString());
-    }
-  } else {
-    console.log(object.toJSON());
+  const [path, expression] = name.split("?");
+
+  const object = await root.load(path);
+
+  let result = object.expression(expression);
+
+  if (result instanceof Iterator) {
+    result = Array.from(result);
   }
+
+  console.log(result);
 }

package/package.json

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

package/src/base.mjs

@@ -148,8 +148,13 @@ export class Base {
                     this[name].add(value);
                   }
                 } else if (current instanceof Map) {
-                  // TODO
-                  this[name] = value;
+                  const keyName = attribute.type.key;
+                  if (keyName) {
+                    current.set(value[keyName], value);
+                  } else {
+                    // TODO
+                    this[name] = value;
+                  }
                 } else {
                   this.error("Unknown collection type", name, current);
                 }
@@ -566,6 +571,7 @@ export class Base {
       sources: [],
       outputs: this.outputs,
       properties: {
+        name: `${this.typeName}-${this.owner.name}-${this.name}`,
         access: "private",
         dependencies: this.depends,
         groups: [this.type]

package/src/host.mjs

@@ -409,34 +409,30 @@ export class Host extends ServiceOwner {
   }
 
   async *preparePackages(dir) {
-    const pkgName = `${this.typeName}-${this.owner.name}-${this.name}`;
-    let packageData = {
-      sources: [
-        await Array.fromAsync(this.templateContent()),
-        new FileContentProvider(
-          { dir: this.directory, pattern: "*.pub" },
-          { destination: "/etc/ssh/", mode: 0o644 }
-        ),
-        new FileContentProvider(
-          { dir: this.directory, pattern: "*_key" },
-          { destination: "/etc/ssh/", mode: 0o600 }
-        ),
-        new FileContentProvider({ dir, pattern: ["**/*", "**/.ssh/*"] })
+    const packageData = this.packageData;
+    packageData.sources.push(
+      await Array.fromAsync(this.templateContent()),
+      new FileContentProvider(
+        { dir: this.directory, pattern: "*.pub" },
+        { destination: "/etc/ssh/", mode: 0o644 }
+      ),
+      new FileContentProvider(
+        { dir: this.directory, pattern: "*_key" },
+        { destination: "/etc/ssh/", mode: 0o600 }
+      ),
+      new FileContentProvider({ dir, pattern: ["**/*", "**/.ssh/*"] })
+    );
+
+    Object.assign(packageData.properties, {
+      description: `${this.typeName} definitions for ${this.fullName}`,
+      dependencies: [
+        `${this.location.typeName}-${this.location.name}`,
+        ...this.depends
       ],
-      outputs: this.outputs,
-      properties: {
-        name: pkgName,
-        description: `${this.typeName} definitions for ${this.fullName}`,
-        access: "private",
-        dependencies: [
-          `${this.location.typeName}-${this.location.name}`,
-          ...this.depends
-        ],
-        provides: [...this.provides],
-        replaces: [...this.replaces],
-        backup: "root/.ssh/known_hosts"
-      }
-    };
+      provides: [...this.provides],
+      replaces: [...this.replaces],
+      backup: "root/.ssh/known_hosts"
+    });
 
     await loadHooks(
       packageData,
@@ -484,7 +480,7 @@ export class Host extends ServiceOwner {
           name: `${this.typeName}-extra-${this.owner.name}-${this.name}`,
           description: `additional files for ${this.fullName}`,
           access: "private",
-          dependencies: [pkgName]
+          dependencies: [packageData.properties.name]
         }
       };
     }

package/src/owner.mjs

@@ -169,7 +169,7 @@ export class Owner extends Base {
     return this.typeNamed("location", name);
   }
 
-  locations() {
+  get locations() {
     return this.typeList("location");
   }
 

package/src/services/alpm.mjs

@@ -11,6 +11,7 @@ import { ServiceTypeDefinition, Service } from "../service.mjs";
 const ALPMRepositoryTypeDefinition = {
   name: "alpm_repository",
   extends: Base.typeDefinition,
+  key: "name",
   attributes: {
     name: name_attribute_writable,
     base: string_attribute_writable,
@@ -26,6 +27,9 @@ class ALPMRepository extends Base {
   static get typeDefinition() {
     return ALPMRepositoryTypeDefinition;
   }
+
+  architectures = new Set();
+  
 }
 
 const ALPMServiceTypeDefinition = {
@@ -56,9 +60,5 @@ export class ALPMService extends Service {
     return ALPMServiceTypeDefinition;
   }
 
-  _repositories = new Map();
-
-  set repositories(repository) {
-    this._repositories.set(repository.name, repository);
-  }
+  repositories = new Map();
 }

package/types/base.d.mts

@@ -135,6 +135,7 @@ export class Base {
         sources: any[];
         outputs: Set<typeof import("npm-pkgbuild").DEBIAN | typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").OCI | typeof import("npm-pkgbuild").DOCKER>;
         properties: {
+            name: string;
             access: string;
             dependencies: any;
             groups: any[];

package/types/host.d.mts

@@ -261,16 +261,13 @@ export class Host extends ServiceOwner {
     get subnets(): Set<any>;
     publicKey(type?: string): Promise<string>;
     preparePackages(dir: any): AsyncGenerator<{
-        sources: (FileContentProvider | ContentProvider[])[];
+        sources: any[];
         outputs: Set<typeof import("npm-pkgbuild").DEBIAN | typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").OCI | typeof import("npm-pkgbuild").DOCKER>;
         properties: {
             name: string;
-            description: string;
             access: string;
-            dependencies: any[];
-            provides: any[];
-            replaces: any[];
-            backup: string;
+            dependencies: any;
+            groups: any[];
         };
     } | {
         sources: FileContentProvider[];

package/types/owner.d.mts

@@ -192,7 +192,7 @@ export class Owner extends Base {
     addObject(object: any): void;
     findServices(filter: any): Generator<any, void, any>;
     locationNamed(name: any): any;
-    locations(): any;
+    get locations(): any;
     hostNamed(name: any): any;
     directHosts(): Set<any>;
     hosts(): Set<any>;

package/types/service.d.mts

@@ -662,6 +662,7 @@ export class Service extends Base {
         sources: any[];
         outputs: Set<typeof import("npm-pkgbuild").DEBIAN | typeof import("npm-pkgbuild").ARCH | typeof import("npm-pkgbuild").OCI | typeof import("npm-pkgbuild").DOCKER>;
         properties: {
+            name: string;
             access: string;
             dependencies: any;
             groups: any[];

package/types/services/alpm.d.mts

@@ -799,8 +799,7 @@ export class ALPMService extends Service {
             extends: string[];
         };
     };
-    _repositories: Map<any, any>;
-    set repositories(repository: any);
+    repositories: Map<any, any>;
 }
 import { Service } from "../service.mjs";
 import { Base } from "pmcf";