npm-pkgbuild 22.1.17 → 22.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "npm-pkgbuild",
-  "version": "22.1.17",
+  "version": "22.2.0",
   "publishConfig": {
     "access": "public",
     "provenance": false
@@ -61,7 +61,7 @@
     "key-value-transformer": "^3.3.2",
     "npm-package-walker": "^8.0.11",
     "npm-packlist": "^11.3.0",
-    "pacc": "^11.12.4",
+    "pacc": "^11.12.6",
     "package-directory": "^8.2.0",
     "pacote": "^22.0.0",
     "picomatch": "^4.0.7",

package/src/output/alpm.mjs

@@ -15,13 +15,13 @@ import {
   equalSeparatedKeyValuePairOptions,
   Uint8ArraysToLines
 } from "key-value-transformer";
+import { Packager } from "./packager.mjs";
 import {
-  Packager,
   pkgbuild_version_attribute,
   pkgbuild_description_attribute,
   pkgbuild_name_attribute,
   dependency_attribute_collection_writable
-} from "./packager.mjs";
+} from "../types.mjs";
 import {
   copyEntries,
   fieldProvider,
@@ -88,49 +88,94 @@ export class ALPM extends Packager {
    * https://www.archlinux.org/pacman/PKGBUILD.5.html
    */
   static attributes = {
-    Maintainer: {
+    name: {
+      ...pkgbuild_name_attribute,
+      collection: true,
+      externalName: "pkgname"
+    },
+    description: { ...pkgbuild_description_attribute, externalName: "pkgdesc" },
+    version: { ...pkgbuild_version_attribute, externalName: "pkgver" },
+    maintainer: {
       ...string_collection_attribute_writable,
-      name: "Maintainer",
-      alias: "maintainer",
-      prefix: "# "
+      externalName: "Maintainer",
+      name: "maintainer",
+      prefix: "# ",
+      skipEmpty: true
     },
     packager: {
       ...string_collection_attribute_writable,
       name: "packager",
-      alias: "maintainer"
+      alias: "maintainer",
+      skipEmpty: true
     },
-    pkgname: { ...pkgbuild_name_attribute, name: "pkgname", collection: true },
-    pkgver: { ...pkgbuild_version_attribute, name: "pkgver" },
-    pkgrel: {
+    release: {
       ...integer_attribute,
-      name: "pkgrel",
-      alias: "release",
+      name: "release",
+      externalName: "pkgrel",
       default: 1,
       mandatory: true
     },
     epoch: { ...integer_attribute, name: "epoch", default: 0 },
-    pkgdesc: { ...pkgbuild_description_attribute, name: "pkgdesc" },
-    url: { ...string_attribute, name: "url", alias: "homepage" },
+    url: {
+      ...string_attribute,
+      name: "url",
+      alias: "homepage",
+      skipEmpty: true
+    },
     license: {
       ...string_collection_attribute_writable,
       name: "license",
-      mandatory: true
+      skipEmpty: true
+    },
+    install: { ...string_attribute, name: "install", skipEmpty: true },
+    changelog: { ...string_attribute, name: "changelog", skipEmpty: true },
+    source: {
+      ...string_collection_attribute_writable,
+      name: "source",
+      skipEmpty: true
     },
-    install: { ...string_attribute, name: "install" },
-    changelog: { ...string_attribute, name: "changelog" },
-    source: { ...string_collection_attribute_writable, name: "source" },
     validpgpkeys: {
       ...string_collection_attribute_writable,
-      name: "validpgpkeys"
+      name: "validpgpkeys",
+      skipEmpty: true
+    },
+    noextract: { ...default_attribute, name: "noextract", skipEmpty: true },
+    cksums: {
+      ...string_collection_attribute_writable,
+      name: "cksums",
+      skipEmpty: true
+    },
+    md5sums: {
+      ...string_collection_attribute_writable,
+      name: "md5sums",
+      default: ["SKIP"]
+      // skipEmpty: true
+    },
+    sha1sums: {
+      ...string_collection_attribute_writable,
+      name: "sha1sums",
+      skipEmpty: true
+    },
+    sha256sums: {
+      ...string_collection_attribute_writable,
+      name: "sha256sums",
+      skipEmpty: true
+    },
+    sha384sums: {
+      ...string_collection_attribute_writable,
+      name: "sha384sums",
+      skipEmpty: true
+    },
+    sha512sums: {
+      ...string_collection_attribute_writable,
+      name: "sha512sums",
+      skipEmpty: true
+    },
+    groups: {
+      ...string_collection_attribute_writable,
+      name: "groups",
+      skipEmpty: true
     },
-    noextract: { ...default_attribute, name: "noextract" },
-    cksums: { ...string_collection_attribute_writable, name: "cksums" },
-    md5sums: { ...string_collection_attribute_writable, name: "md5sums" },
-    sha1sums: { ...string_collection_attribute_writable, name: "sha1sums" },
-    sha256sums: { ...string_collection_attribute_writable, name: "sha256sums" },
-    sha384sums: { ...string_collection_attribute_writable, name: "sha384sums" },
-    sha512sums: { ...string_collection_attribute_writable, name: "sha512sums" },
-    groups: { ...string_collection_attribute_writable, name: "groups" },
     arch: {
       ...string_collection_attribute_writable,
       name: "arch",
@@ -142,34 +187,43 @@ export class ALPM extends Packager {
       name: "backup",
       skipEmpty: true
     },
-    depends: {
-      ...dependency_attribute_collection_writable /*, alias: "dependencies" */,
-      name: "depends"
+    dependencies: {
+      ...dependency_attribute_collection_writable,
+      name: "dependencies",
+      externalName: "depends",
+      skipEmpty: true
     },
     makedepends: {
       ...dependency_attribute_collection_writable,
-      name: "makedepends"
+      name: "makedepends",
+      skipEmpty: true
     },
     checkdepends: {
       ...dependency_attribute_collection_writable,
-      name: "checkdepends"
+      name: "checkdepends",
+      skipEmpty: true
     },
     optdepends: {
       ...dependency_attribute_collection_writable,
-      name: "optdepends"
+      name: "optdepends",
+      skipEmpty: true
     },
     conflicts: {
       ...dependency_attribute_collection_writable,
       name: "conflicts",
       skipEmpty: true
     },
-    provides: { ...dependency_attribute_collection_writable, name: "provides" },
+    provides: {
+      ...dependency_attribute_collection_writable,
+      name: "provides",
+      skipEmpty: true
+    },
     replaces: {
       ...dependency_attribute_collection_writable,
       name: "replaces",
       skipEmpty: true
     },
-    options: { ...default_attribute, name: "options" }
+    options: { ...default_attribute, name: "options", skipEmpty: true }
   };
 
   static async prepare(options = {}, variant = {}) {
@@ -209,8 +263,8 @@ export class ALPM extends Packager {
   }
 
   get packageFileName() {
-    const p = this.properties;
-    return `${p.name}-${p.version}-${p.release}-${p.arch}${this.fileNameExtension}`;
+    const p = this.externalProperties;
+    return `${p.pkgname}-${p.pkgver}-${p.pkgrel}-${p.arch}${this.fileNameExtension}`;
   }
 
   dependencyExpression(name, expression) {
@@ -220,9 +274,9 @@ export class ALPM extends Packager {
   async create(sources, transformer, publishingDetails, options, expander) {
     const { properties, staging, destination } = await this.prepare(options);
 
-    if (properties.source) {
+    /*if (properties.source) {
       properties.md5sums = ["SKIP"];
-    }
+    }*/
     if (properties.hooks) {
       properties.install = `${properties.name}.install`;
 
@@ -287,18 +341,18 @@ package() {
       join(staging, "src"),
       expander
     )) {
-      if(file.destination !== '../PKGBUILD') {
-      if (file.owner || file.group) {
-        permission.push(
-          `    chown ${[file.owner ?? "", file.group ?? ""].join(":")} \"$pkgdir/${file.destination}\"`
-        );
-      }
-      const mode = (await file.mode) & 0o7777;
-      if (mode) {
-        permission.push(
-          `    chmod ${Number(mode).toString(8)} \"$pkgdir/${file.destination}\"`
-        );
-      }
+      if (file.destination !== "../PKGBUILD") {
+        if (file.owner || file.group) {
+          permission.push(
+            `    chown ${[file.owner ?? "", file.group ?? ""].join(":")} \"$pkgdir/${file.destination}\"`
+          );
+        }
+        const mode = (await file.mode) & 0o7777;
+        if (mode) {
+          permission.push(
+            `    chmod ${Number(mode).toString(8)} \"$pkgdir/${file.destination}\"`
+          );
+        }
       }
 
       if (options.verbose) {

package/src/output/debian.mjs

@@ -6,7 +6,7 @@ import {
   yesno_attribute_writable,
   string_attribute_writable,
   string_collection_attribute_writable,
-  toExternal
+  types
 } from "pacc";
 import { ContentEntry, IteratorContentEntry } from "content-entry";
 import {
@@ -14,15 +14,15 @@ import {
   createPropertiesTransformer
 } from "content-entry-transform";
 import { keyValueTransformer, Uint8ArraysToLines } from "key-value-transformer";
+import { Packager } from "./packager.mjs";
+import { copyEntries, fieldProvider, aggregate } from "../util.mjs";
 import {
-  Packager,
   pkgbuild_version_attribute,
   pkgbuild_description_attribute,
   pkgbuild_name_attribute,
   dependency_attribute_collection_writable,
   architectureType
-} from "./packager.mjs";
-import { copyEntries, fieldProvider, aggregate } from "../util.mjs";
+} from "../types.mjs";
 
 const debian_dependency_attribute_collection_writable = {
   ...dependency_attribute_collection_writable,
@@ -52,85 +52,129 @@ export class DEBIAN extends Packager {
    * @see https://linux.die.net/man/5/deb-control
    */
   static attributes = {
-    Package: {
+    name: {
       ...pkgbuild_name_attribute,
-      name: "Package",
-      set: v => v.toLowerCase()
+      externalName: "Package",
+      type: types["lowercase-string"]
     },
-    Version: { ...pkgbuild_version_attribute, name: "Version" },
-    Maintainer: {
+    description: {
+      ...pkgbuild_description_attribute,
+      externalName: "Description",
+      skipEmpty: true
+    },
+    version: { ...pkgbuild_version_attribute, externalName: "Version" },
+    maintainer: {
       ...string_attribute_writable,
-      name: "Maintainer",
-      alias: "maintainer",
+      name: "maintainer",
+      externalName: "Maintainer",
       mandatory: true
     },
-    Description: { ...pkgbuild_description_attribute, name: "Description" },
-    Section: { ...string_attribute_writable, name: "Section", alias: "groups" },
-    Priority: { ...string_attribute_writable, name: "Priority" },
-    Essential: { ...yesno_attribute_writable, name: "Essential" },
-    Origin: { ...string_attribute_writable, name: "Origin" },
-    Architecture: {
+    arch: {
       ...string_attribute_writable,
-      name: "Architecture",
-      alias: "arch",
+      name: "arch",
+      externalName: "Architecture",
       default: "all",
       mandatory: true,
       type: architectureType,
       mapping: { aarch64: "arm64" }
     },
-    Homepage: {
+    groups: {
+      ...string_attribute_writable,
+      name: "groups",
+      externalName: "Section",
+      skipEmpty: true
+    },
+    Priority: {
+      ...string_attribute_writable,
+      name: "Priority",
+      skipEmpty: true
+    },
+    Essential: {
+      ...yesno_attribute_writable,
+      name: "Essential",
+      skipEmpty: true
+    },
+    Origin: { ...string_attribute_writable, name: "Origin", skipEmpty: true },
+    homepage: {
       ...string_attribute_writable,
-      name: "Homepage",
-      alias: "homepage"
+      name: "homepage",
+      externalName: "Homepage",
+      skipEmpty: true
     },
-    Bugs: { ...string_attribute_writable, name: "Bugs", alias: "bugs" },
-    Depends: {
+    Bugs: {
+      ...string_attribute_writable,
+      name: "bugs",
+      externalName: "Bugs",
+      skipEmpty: true
+    },
+    dependencies: {
       ...debian_dependency_attribute_collection_writable,
-      name: "Depends"
+      name: "dependencies",
+      externalName: "Depends",
+      skipEmpty: true
     },
     "Pre-Depends": {
       ...debian_dependency_attribute_collection_writable,
-      name: "Pre-Depends"
+      name: "Pre-Depends",
+      skipEmpty: true
     },
     "Build-Depends": {
       ...debian_dependency_attribute_collection_writable,
-      name: "Build-Depends"
+      name: "Build-Depends",
+      skipEmpty: true
     },
     "Build-Depends-Indep": {
       ...debian_dependency_attribute_collection_writable,
-      name: "Build-Depends-Indep"
+      name: "Build-Depends-Indep",
+      skipEmpty: true
     },
     "Build-Depends-Arch": {
       ...debian_dependency_attribute_collection_writable,
-      name: "Build-Depends-Arch"
+      name: "Build-Depends-Arch",
+      skipEmpty: true
     },
     Recommends: {
       ...debian_dependency_attribute_collection_writable,
-      name: "Recommends"
+      name: "Recommends",
+      skipEmpty: true
     },
     Suggests: {
       ...debian_dependency_attribute_collection_writable,
-      name: "Suggests"
+      name: "Suggests",
+      skipEmpty: true
     },
     Provides: {
       ...debian_dependency_attribute_collection_writable,
-      name: "Provides"
+      name: "Provides",
+      skipEmpty: true
     },
     Breaks: {
       ...debian_dependency_attribute_collection_writable,
-      name: "Breaks"
+      name: "Breaks",
+      skipEmpty: true
     },
     Replaces: {
       ...debian_dependency_attribute_collection_writable,
-      name: "Replaces"
+      name: "Replaces",
+      skipEmpty: true
+    },
+    source: {
+      ...string_attribute_writable,
+      name: "source",
+      externalName: "Source",
+      skipEmpty: true
     },
-    Source: { ...string_attribute_writable, name: "Source", alias: "source" },
     Uploaders: {
       ...string_collection_attribute_writable,
       name: "Uploaders",
-      mandatory: false
+      mandatory: false,
+      skipEmpty: true
     },
-    "Installed-Size": { ...integer_attribute_writable, name: "Installed-Size" }
+    "Installed-Size": {
+      ...integer_attribute_writable,
+      name: "Installed-Size",
+      skipEmpty: true
+    }
   };
 
   /**
@@ -153,13 +197,8 @@ export class DEBIAN extends Packager {
   }
 
   get packageFileName() {
-    const p = this.properties;
-
-    // TODO utility to provide final values
-    const arch = toExternal(p.arch, this.attributes.Architecture);
-
-    // @ts-ignore
-    return `${p.name}_${p.version}_${arch}${this.constructor.fileNameExtension}`;
+    const p = this.externalProperties;
+    return `${p.Package}_${p.Version}_${p.Architecture}${this.constructor.fileNameExtension}`;
   }
 
   /**
@@ -192,10 +231,7 @@ export class DEBIAN extends Packager {
       )
     );
 
-    const depends = this.makeDepends(properties.dependencies);
-    if (depends.length) {
-      properties.Depends = depends;
-    }
+    properties.dependencies = this.makeDepends(properties.dependencies);
 
     const fp = fieldProvider(properties, this.attributes);
 

package/src/output/docker.mjs

@@ -12,10 +12,12 @@ import {
 } from "key-value-transformer";
 import {
   Packager,
+} from "./packager.mjs";
+import {
   pkgbuild_version_attribute,
   pkgbuild_description_attribute,
   pkgbuild_name_attribute
-} from "./packager.mjs";
+} from "../types.mjs";
 import {
   fieldProvider,
   copyEntries,

package/src/output/packager.mjs

@@ -2,14 +2,7 @@ import { join } from "node:path";
 import { tmpdir } from "node:os";
 import { mkdtemp, mkdir } from "node:fs/promises";
 import { createReadStream } from "node:fs";
-import {
-  expand,
-  expandContextDoubbleCurly,
-  string_collection_attribute_writable,
-  name_attribute,
-  description_attribute,
-  version_attribute_writable
-} from "pacc";
+import { expand, expandContextDoubbleCurly, iterateToExternal } from "pacc";
 import { StringContentEntry } from "content-entry";
 import { publish } from "../publish.mjs";
 import {
@@ -58,7 +51,7 @@ export class Packager {
     return false;
   }
 
-  #properties;
+  properties;
   #prepared;
 
   /**
@@ -66,7 +59,13 @@ export class Packager {
    * @param {Object} properties
    */
   constructor(properties) {
-    this.#properties = { ...properties, type: this.constructor.name };
+    this.properties = { ...properties, type: this.constructor.name };
+  }
+
+  get externalProperties() {
+    return Object.fromEntries([
+      ...iterateToExternal(this.properties, this.constructor.attributes)
+    ]);
   }
 
   /**
@@ -165,41 +164,6 @@ export class Packager {
     return this.constructor.attributes;
   }
 
-  get properties() {
-    const properties = this.#properties;
-
-    for (const [name, field] of Object.entries(this.attributes)) {
-      if (field.set) {
-        if (properties[name] !== undefined) {
-          properties[name] = field.set(properties[name]);
-        } else if (
-          field.alias !== undefined &&
-          properties[field.alias] !== undefined
-        ) {
-          properties[field.alias] = field.set(properties[field.alias]);
-        }
-      }
-
-      const e = properties[field.alias || name];
-
-      if (e !== undefined) {
-        properties[name] = field.set ? field.set(e) : e;
-      } else {
-        if (field.default !== undefined) {
-          const vak = field.alias || name;
-          if (
-            (Array.isArray(properties[vak]) && properties[vak].length === 0) ||
-            properties[vak] === undefined
-          ) {
-            properties[vak] = field.default;
-          }
-        }
-      }
-    }
-
-    return properties;
-  }
-
   /**
    * Create tmp directory.
    * @return {Promise<string>} directory path
@@ -225,9 +189,9 @@ export class Packager {
 
     const out = {
       properties: this.properties,
-      destination: options.destination || tmpdir,
+      destination: options.destination ?? tmpdir,
       tmpdir,
-      staging: options.staging || tmpdir
+      staging: options.staging ?? tmpdir
     };
 
     // @ts-ignore
@@ -273,65 +237,3 @@ export class Packager {
     return publish(artifact, publishingDetails, this.properties, logger);
   }
 }
-
-export const pkgbuild_name_attribute = {
-  ...name_attribute,
-  alias: "name",
-  mandatory: true,
-  pattern: /^[a-z_][a-z0-9_\-]*$/i
-};
-
-export const dependency_type = {
-  name: "dependency",
-  primitive: false,
-  toExternal: (value, attribute) => {
-    switch (typeof value) {
-      case "string":
-      case "undefined":
-        return value;
-    }
-
-    if (Array.isArray(value)) {
-      return value;
-    }
-
-    return Object.entries(value).map(([name, expression]) =>
-      typeof expression === "string" ? `${name}${expression}` : name
-    );
-  }
-};
-
-export const architectureType = {
-  name: "dependency",
-  primitive: true,
-
-  toInternal: (value, attribute) => {
- //   console.log("architectureType toInternal", value);
-    return value;
-  },
-
-  toExternal: (value, attribute) => {
-  //  console.log("architectureType toExternal", value);
-    return attribute.mapping[value] ?? value;
-  }
-};
-
-export const dependency_attribute_collection_writable = {
-  ...string_collection_attribute_writable,
-  type: dependency_type,
-  separator: " ",
-  pattern: /^[a-z_][a-z0-9_\-]*$/i
-};
-
-export const pkgbuild_version_attribute = {
-  ...version_attribute_writable,
-  alias: "version",
-  mandatory: true,
-  set: v => v.replace("-semantic-release", "")
-};
-
-export const pkgbuild_description_attribute = {
-  ...description_attribute,
-  alias: "description",
-  mandatory: true
-};

package/src/output/rpm.mjs

@@ -15,12 +15,12 @@ import {
   colonSeparatedKeyValuePairOptionsDoublingKeys,
   Uint8ArraysToLines
 } from "key-value-transformer";
+import { Packager } from "./packager.mjs";
 import {
-  Packager,
   pkgbuild_version_attribute,
   pkgbuild_description_attribute,
   pkgbuild_name_attribute
-} from "./packager.mjs";
+} from "../types.mjs";
 import {
   copyEntries,
   fieldProvider,
@@ -61,30 +61,30 @@ export class RPM extends Packager {
    * @see https://rpm-packaging-guide.github.io
    */
   static attributes = {
-    Name: { ...pkgbuild_name_attribute, name: "Name" },
-    Summary: { ...pkgbuild_description_attribute, name: "Summary" },
-    License: {
+    name: { ...pkgbuild_name_attribute, externalName: "Name" },
+    description: { ...pkgbuild_description_attribute, externalName: "Summary" },
+    license: {
       ...string_attribute,
-      name: "License",
-      alias: "license",
+      name: "license",
+      externalName: "License",
       mandatory: true
     },
-    Version: { ...pkgbuild_version_attribute, name: "Version" },
-    Release: {
+    version: { ...pkgbuild_version_attribute, externalName: "Version" },
+    release: {
       ...integer_attribute,
-      name: "Release",
-      alias: "release",
+      externalName: "Release",
+      name: "release",
       default: 1,
       mandatory: true
     },
-    Source0: { ...string_attribute, name: "Source0", alias: "source" },
-    Group: { ...string_attribute, name: "Group", alias: "groups" },
-    Packager: { ...string_attribute, name: "Packager", alias: "maintainer" },
-    Vendor: { ...string_attribute, name: "Vendor", alias: "vendor" },
-    BuildArch: {
+    source: { ...string_attribute, externalName: "Source0", name: "source" },
+    groups: { ...string_attribute, externalName: "Group", name: "groups" },
+    maintainer: { ...string_attribute, name: "maintainer", externalName: "Packager" },
+    vendor: { ...string_attribute, externalName: "Vendor", name: "vendor" },
+    arch: {
       ...string_attribute,
-      name: "BuildArch",
-      alias: "arch",
+      externalName: "BuildArch",
+      name: "arch",
       default: "noarch",
       mandatory: true
     },

package/src/types.mjs

@@ -0,0 +1,75 @@
+import {
+  types,
+  string_collection_attribute_writable,
+  name_attribute,
+  description_attribute,
+  version_attribute_writable
+} from "pacc";
+
+export const pkgbuild_name_attribute = {
+  ...name_attribute,
+  mandatory: true,
+  pattern: /^[a-z_][a-z0-9_\-]*$/i
+};
+
+export const dependency_type = {
+  name: "dependency",
+  primitive: false,
+  toExternal: (value, attribute) => {
+    switch (typeof value) {
+      case "string":
+      case "undefined":
+        return value;
+    }
+
+    if (Array.isArray(value)) {
+      if (value.length === 0 && attribute.skipEmpty) {
+        return undefined;
+      }
+
+      return value;
+    }
+
+    return Object.entries(value).map(([name, expression]) =>
+      typeof expression === "string" ? `${name}${expression}` : name
+    );
+  }
+};
+
+export const architectureType = {
+  name: "architecture",
+  primitive: true,
+
+  toInternal: (value, attribute) => {
+    //   console.log("architectureType toInternal", value);
+    return value;
+  },
+
+  toExternal: (value, attribute) => {
+    //  console.log("architectureType toExternal", value);
+    return attribute.mapping[value] ?? value;
+  }
+};
+
+export const dependency_attribute_collection_writable = {
+  ...string_collection_attribute_writable,
+  type: dependency_type,
+  separator: " ",
+  pattern: /^[a-z_][a-z0-9_\-]*$/i
+};
+
+export const pkgbuild_version_attribute = {
+  ...version_attribute_writable,
+  mandatory: true,
+  type: {
+    ...types.string,
+    toExternal: (value, attribute) => {
+      return value.replace("-semantic-release", "");
+    }
+  }
+};
+
+export const pkgbuild_description_attribute = {
+  ...description_attribute,
+  mandatory: true
+};

package/src/util.mjs

@@ -3,7 +3,7 @@ import { mkdir } from "node:fs/promises";
 import { pipeline } from "node:stream/promises";
 import { Readable } from "node:stream";
 import { createWriteStream } from "node:fs";
-import { toExternal, asArray } from "pacc";
+import { asArray, iterateToExternal } from "pacc";
 import { ContentEntry } from "content-entry";
 import { aggregateFifo } from "aggregate-async-iterator";
 
@@ -150,39 +150,20 @@ export function fieldProvider(properties, attributes) {
   }
 
   return function* controlProperties(k, v, presentKeys) {
-    if (k === undefined) {
-      for (const [name, attribute] of Object.entries(attributes)) {
-        if (!presentKeys.has(name)) {
-          let value = properties[attribute.alias || name];
-          if (
-            value === undefined ||
-            (attribute.collection && value.size === 0)
-          ) {
-            if (attribute.default === undefined) {
-              if (attribute.mandatory) {
-                console.error(`Missing value for mandatory attribute ${name}`);
-              }
-              if (attribute.skipEmpty) {
-                continue;
-              }
-            } else {
-              yield [name, toExternal(attribute.default, attribute)];
-            }
-          } else {
-            if (attribute.mapping) {
-              const mappedValue = attribute.mapping[value];
-              if (mappedValue !== undefined) {
-                value = mappedValue;
-              }
-            }
-
-            yield [name, av(attribute, toExternal(value, attribute))];
-          }
-        }
-      }
-    } else {
-      const attribute = attributes[k];
-      yield [k, av(attribute, toExternal(properties[k] ?? v, attribute))];
+    let filter;
+
+    if (k) {
+      filter = attribute => attribute.name === k;
+    }
+
+    for (const [name, value] of iterateToExternal(
+      properties,
+      attributes,
+      filter
+    )) {
+      //if (!presentKeys.has(name)) { }
+
+      yield [name, value];
     }
   };
 }