@ihk-gfi/lux-components-update 11.14.0 → 13.0.0

package/src/utility/dependencies.js

@@ -19,10 +19,10 @@ var NodeDependencyType;
  * @param name
  */
 function hasPackageJsonDependency(tree, name) {
-    const packageJsonNode = json_1.readJson(tree, '/package.json');
+    const packageJsonNode = (0, json_1.readJson)(tree, '/package.json');
     let dependency = undefined;
     [NodeDependencyType.Default, NodeDependencyType.Dev, NodeDependencyType.Optional, NodeDependencyType.Peer].forEach((depType) => {
-        let node = jsonc_parser_1.findNodeAtLocation(packageJsonNode, [depType.toString(), name]);
+        let node = (0, jsonc_parser_1.findNodeAtLocation)(packageJsonNode, [depType.toString(), name]);
         if (node) {
             dependency = {
                 type: depType,
@@ -40,10 +40,10 @@ exports.hasPackageJsonDependency = hasPackageJsonDependency;
  * @param name
  */
 function getPackageJsonDependency(tree, name) {
-    const packageJsonNode = json_1.readJson(tree, '/package.json');
+    const packageJsonNode = (0, json_1.readJson)(tree, '/package.json');
     let dependency = null;
     [NodeDependencyType.Default, NodeDependencyType.Dev, NodeDependencyType.Optional, NodeDependencyType.Peer].forEach((depType) => {
-        let node = jsonc_parser_1.findNodeAtLocation(packageJsonNode, [depType.toString(), name]);
+        let node = (0, jsonc_parser_1.findNodeAtLocation)(packageJsonNode, [depType.toString(), name]);
         if (node) {
             dependency = {
                 type: depType,
@@ -56,7 +56,7 @@ function getPackageJsonDependency(tree, name) {
         return dependency;
     }
     else {
-        throw logging_1.formattedSchematicsException(`Dependency ${name} nicht in der package.json gefunden.`);
+        throw (0, logging_1.formattedSchematicsException)(`Dependency ${name} nicht in der package.json gefunden.`);
     }
 }
 exports.getPackageJsonDependency = getPackageJsonDependency;
@@ -86,32 +86,34 @@ exports.updateDependencyDev = updateDependencyDev;
  * @param dependency
  */
 function updatePackageJsonDependency(tree, dependency) {
-    const packageJsonAsNode = json_1.readJson(tree, '/package.json');
-    let node = jsonc_parser_1.findNodeAtLocation(packageJsonAsNode, [dependency.type.toString(), dependency.name]);
+    const packageJsonAsNode = (0, json_1.readJson)(tree, '/package.json');
+    let node = (0, jsonc_parser_1.findNodeAtLocation)(packageJsonAsNode, [dependency.type.toString(), dependency.name]);
     if (node) {
         if (node && node.value !== dependency.version) {
-            logging_1.logInfo(`Dependency ` +
+            (0, logging_1.logInfo)(`Dependency ` +
                 chalk.yellowBright(`${dependency.name}`) +
                 ` ${node.value} wird ersetzt durch ${dependency.version}.`);
         }
     }
     else {
-        logging_1.logInfo(`Dependency ` +
+        (0, logging_1.logInfo)(`Dependency ` +
             chalk.yellowBright(`${dependency.name}`) +
             ` ${dependency.version} wird im Abschnitt ${dependency.type} hinzugefügt.`);
     }
     if (!node || node.value !== dependency.version) {
-        const packageJonsAsString = json_1.readJsonAsString(tree, '/package.json');
-        const edits = jsonc_parser_1.modify(packageJonsAsString, [dependency.type.toString(), dependency.name], dependency.version, { formattingOptions: json_1.jsonFormattingOptions });
+        const packageJonsAsString = (0, json_1.readJsonAsString)(tree, '/package.json');
+        const edits = (0, jsonc_parser_1.modify)(packageJonsAsString, [dependency.type.toString(), dependency.name], dependency.version, { formattingOptions: json_1.jsonFormattingOptions });
         if (edits) {
-            tree.overwrite('/package.json', jsonc_parser_1.applyEdits(packageJonsAsString, edits));
+            tree.overwrite('/package.json', (0, jsonc_parser_1.applyEdits)(packageJonsAsString, edits));
         }
     }
 }
 exports.updatePackageJsonDependency = updatePackageJsonDependency;
 function deletePackageJsonDependency(tree, context, dependency) {
-    files_1.deleteLineFromFile(tree, context, '/package.json', dependency.name);
-    logging_1.logInfo(`Dependency ` + chalk.yellowBright(`${dependency.name}`) + ` wurde aus dem Abschnitt ${dependency.type} gelöscht.`);
+    const changed = (0, files_1.deleteLineFromFile)(tree, context, '/package.json', dependency.name, false);
+    if (changed) {
+        (0, logging_1.logInfo)(`Dependency ` + chalk.yellowBright(`${dependency.name}`) + ` wurde aus dem Abschnitt ${dependency.type} gelöscht.`);
+    }
 }
 exports.deletePackageJsonDependency = deletePackageJsonDependency;
 //# sourceMappingURL=dependencies.js.map

package/src/utility/dependencies.js.map

@@ -1 +1 @@
-{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["dependencies.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"dependencies.js","sourceRoot":"","sources":["dependencies.ts"],"names":[],"mappings":"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"}

package/src/utility/dependencies.ts

@@ -134,9 +134,11 @@ export function updatePackageJsonDependency(tree: Tree, dependency: NodeDependen
 }
 
 export function deletePackageJsonDependency(tree: Tree, context: SchematicContext, dependency: NodeDependency) {
-  deleteLineFromFile(tree, context, '/package.json', dependency.name);
-  logInfo(
-    `Dependency ` + chalk.yellowBright(`${dependency.name}`) + ` wurde aus dem Abschnitt ${dependency.type} gelöscht.`
-  );
+  const changed = deleteLineFromFile(tree, context, '/package.json', dependency.name, false);
+  if (changed) {
+    logInfo(
+        `Dependency ` + chalk.yellowBright(`${ dependency.name }`) + ` wurde aus dem Abschnitt ${ dependency.type } gelöscht.`
+    );
+  }
 }
 

package/src/utility/files.d.ts

@@ -8,7 +8,7 @@ import { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
  * @param filePath
  * @param searchString
  */
-export declare function deleteLineFromFile(tree: Tree, context: SchematicContext, filePath: string, searchString: string): void;
+export declare function deleteLineFromFile(tree: Tree, context: SchematicContext, filePath: string, searchString: string, withLog?: boolean): boolean;
 /**
  * Schreibt die übergebenen Zeilen in die Datei.
  * Wenn die Datei existiert, wird der neue Inhalt am Ende der Datei angehangen.
@@ -32,6 +32,10 @@ export declare function iterateFilesAndModifyContent(tree: Tree, rootPath: strin
 /**
  * Diese Methode ersetzt die angegebene Dateien. Sollten diese nicht existieren, werden sie neu angelegt.
  *
+ * Beispiele:
+ *   moveFilesToDirectory(options, 'files/locale', 'src/locale')
+ *   moveFilesToDirectory(options, 'files/root', '/')
+ *
  * @param options Die Optionen.
  * @param sourcePath Ein Quellpfad (z.B. files/theming für alle Dateien unter /theming).
  * @param targetPath Ein Zielpfad (z.B. src/theming/).

package/src/utility/files.js

@@ -12,7 +12,8 @@ const logging_1 = require("./logging");
  * @param filePath
  * @param searchString
  */
-function deleteLineFromFile(tree, context, filePath, searchString) {
+function deleteLineFromFile(tree, context, filePath, searchString, withLog = true) {
+    let changed = false;
     const fileContent = tree.read(filePath);
     if (fileContent) {
         // String der Datei erhalten
@@ -53,14 +54,20 @@ function deleteLineFromFile(tree, context, filePath, searchString) {
             content = content.replace(new RegExp('\r\n', 'g'), '\r\n');
             content = content.replace(new RegExp('\r\n\r\n', 'g'), '\r\n');
             tree.overwrite(filePath, content);
+            changed = true;
         }
         else {
-            logging_1.logInfo(`Die Datei "${filePath}" enthält den String "${searchString}" nicht.`);
+            if (withLog) {
+                (0, logging_1.logInfo)(`Die Datei "${filePath}" enthält den String "${searchString}" nicht.`);
+            }
         }
     }
     else {
-        logging_1.logInfo(`Die Datei "${filePath}" wurde nicht gefunden.`);
+        if (withLog) {
+            (0, logging_1.logInfo)(`Die Datei "${filePath}" wurde nicht gefunden.`);
+        }
     }
+    return changed;
 }
 exports.deleteLineFromFile = deleteLineFromFile;
 /**
@@ -82,11 +89,11 @@ function writeLinesToFile(tree, context, filePath, ...lines) {
     });
     if (fileContent !== null) {
         tree.overwrite(filePath, fileContent.toString() + '\r\n' + content);
-        logging_1.logInfo(`Überschreibe die Datei "${filePath}".`);
+        (0, logging_1.logInfo)(`Überschreibe die Datei "${filePath}".`);
     }
     else {
         tree.create(filePath, content);
-        logging_1.logInfo(`Erstelle die Datei "${filePath}" und füge Inhalt hinzu.`);
+        (0, logging_1.logInfo)(`Erstelle die Datei "${filePath}" und füge Inhalt hinzu.`);
     }
 }
 exports.writeLinesToFile = writeLinesToFile;
@@ -134,6 +141,10 @@ exports.iterateFilesAndModifyContent = iterateFilesAndModifyContent;
 /**
  * Diese Methode ersetzt die angegebene Dateien. Sollten diese nicht existieren, werden sie neu angelegt.
  *
+ * Beispiele:
+ *   moveFilesToDirectory(options, 'files/locale', 'src/locale')
+ *   moveFilesToDirectory(options, 'files/root', '/')
+ *
  * @param options Die Optionen.
  * @param sourcePath Ein Quellpfad (z.B. files/theming für alle Dateien unter /theming).
  * @param targetPath Ein Zielpfad (z.B. src/theming/).
@@ -147,23 +158,23 @@ function moveFilesToDirectory(options, sourcePath, targetPath) {
             sourcePath = '/' + sourcePath;
         }
         targetPath = (options.path ? options.path : '') + targetPath;
-        const templateSource = schematics_1.apply(schematics_1.url('.' + sourcePath), [
-            schematics_1.template(Object.assign(Object.assign({}, core_1.strings), options)),
-            schematics_1.forEach((file) => {
+        const templateSource = (0, schematics_1.apply)((0, schematics_1.url)('.' + sourcePath), [
+            (0, schematics_1.template)(Object.assign(Object.assign({}, core_1.strings), options)),
+            (0, schematics_1.forEach)((file) => {
                 let newTargetPath = targetPath + file.path;
                 newTargetPath = newTargetPath.replace('//', '/');
                 if (tree.exists(newTargetPath)) {
                     tree.overwrite(newTargetPath, file.content);
-                    logging_1.logInfo(`Datei '${newTargetPath}' aktualisiert.`);
+                    (0, logging_1.logInfo)(`Datei '${newTargetPath}' aktualisiert.`);
                 }
                 else {
                     tree.create(newTargetPath, file.content);
-                    logging_1.logInfo(`Datei '${newTargetPath}' angelegt.`);
+                    (0, logging_1.logInfo)(`Datei '${newTargetPath}' angelegt.`);
                 }
                 return null;
             })
         ]);
-        return schematics_1.mergeWith(templateSource, schematics_1.MergeStrategy.Overwrite);
+        return (0, schematics_1.mergeWith)(templateSource, schematics_1.MergeStrategy.Overwrite);
     };
 }
 exports.moveFilesToDirectory = moveFilesToDirectory;
@@ -188,7 +199,7 @@ function deleteFilesInDirectory(options, path, exclude) {
             dir.subfiles.forEach((filePath) => {
                 if (!exclude.find((excludeFilePath) => excludeFilePath === filePath)) {
                     tree.delete(path + filePath);
-                    logging_1.logInfo(filePath + ' gelöscht.');
+                    (0, logging_1.logInfo)(filePath + ' gelöscht.');
                 }
             });
         }
@@ -257,7 +268,7 @@ function findModule(host, generateDir, moduleExt = '.module.ts', routingModuleEx
         const filteredMatches = allMatches.filter((p) => !p.endsWith(routingModuleExt));
         foundRoutingModule = foundRoutingModule || allMatches.length !== filteredMatches.length;
         if (filteredMatches.length == 1) {
-            return core_1.join(dir.path, filteredMatches[0]);
+            return (0, core_1.join)(dir.path, filteredMatches[0]);
         }
         else if (filteredMatches.length > 1) {
             throw new Error('More than one module matches. Use skip-import option to skip importing ' +
@@ -280,17 +291,17 @@ exports.findModule = findModule;
  */
 function deleteFile(options, targetPath) {
     return (tree, context) => {
-        logging_1.logInfoWithDescriptor('Lösche Datei ' + targetPath + '.');
+        (0, logging_1.logInfoWithDescriptor)('Lösche Datei ' + targetPath + '.');
         if (!targetPath.startsWith('/')) {
             targetPath = '/' + targetPath;
         }
         targetPath = (options.path ? options.path : '') + targetPath;
         if (tree.exists(targetPath)) {
             tree.delete(targetPath);
-            logging_1.logSuccess(targetPath + ' erfolgreich gelöscht.');
+            (0, logging_1.logSuccess)(targetPath + ' erfolgreich gelöscht.');
         }
         else {
-            logging_1.logSuccess(targetPath + ' konnte nicht gefunden werden.');
+            (0, logging_1.logSuccess)(targetPath + ' konnte nicht gefunden werden.');
         }
         return tree;
     };

package/src/utility/files.js.map

@@ -1 +1 @@
-{"version":3,"file":"files.js","sourceRoot":"","sources":["files.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"files.js","sourceRoot":"","sources":["files.ts"],"names":[],"mappings":"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"}

package/src/utility/files.ts

@@ -21,7 +21,9 @@ import { logInfo, logInfoWithDescriptor, logSuccess } from './logging';
  * @param filePath
  * @param searchString
  */
-export function deleteLineFromFile(tree: Tree, context: SchematicContext, filePath: string, searchString: string) {
+export function deleteLineFromFile(tree: Tree, context: SchematicContext, filePath: string, searchString: string, withLog = true) {
+  let changed = false;
+
   const fileContent: Buffer | null = tree.read(filePath);
   if (fileContent) {
     // String der Datei erhalten
@@ -68,12 +70,19 @@ export function deleteLineFromFile(tree: Tree, context: SchematicContext, filePa
       content = content.replace(new RegExp('\r\n\r\n', 'g'), '\r\n');
 
       tree.overwrite(filePath, content);
+      changed = true;
     } else {
-      logInfo(`Die Datei "${filePath}" enthält den String "${searchString}" nicht.`);
+      if (withLog) {
+        logInfo(`Die Datei "${ filePath }" enthält den String "${ searchString }" nicht.`);
+      }
     }
   } else {
-    logInfo(`Die Datei "${filePath}" wurde nicht gefunden.`);
+    if (withLog) {
+      logInfo(`Die Datei "${ filePath }" wurde nicht gefunden.`);
+    }
   }
+
+  return changed;
 }
 
 /**
@@ -157,6 +166,10 @@ export function iterateFilesAndModifyContent(
 /**
  * Diese Methode ersetzt die angegebene Dateien. Sollten diese nicht existieren, werden sie neu angelegt.
  *
+ * Beispiele:
+ *   moveFilesToDirectory(options, 'files/locale', 'src/locale')
+ *   moveFilesToDirectory(options, 'files/root', '/')
+ *
  * @param options Die Optionen.
  * @param sourcePath Ein Quellpfad (z.B. files/theming für alle Dateien unter /theming).
  * @param targetPath Ein Zielpfad (z.B. src/theming/).

package/src/utility/html.js

@@ -1,8 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeAttribute = exports.updateAttribute = exports.renameAttribute = exports.appendAttribute = exports.addAttribute = exports.CheerioInfo = void 0;
+const util_1 = require("./util");
 const cheerio = require('cheerio');
-const luxCherioParserOptions = { xmlMode: true, decodeEntities: false, selfClosingTags: false };
+const luxCheerioParserOptions = { xmlMode: true, decodeEntities: false, selfClosingTags: false };
+const emptyPlaceholderToken = '@20c44b9d-45e1-447a-a141-1de0695c9c35@';
 class CheerioInfo {
     constructor(content) {
         this.content = content;
@@ -19,14 +21,16 @@ exports.CheerioInfo = CheerioInfo;
  * @param attrValue
  */
 function addAttribute(content, selector, attrName, attrValue) {
-    const $ = cheerio.load(content, luxCherioParserOptions);
-    const result = new CheerioInfo(content);
+    let newContent = preProcessing(content);
+    const $ = cheerio.load(newContent, luxCheerioParserOptions);
+    const result = new CheerioInfo(newContent);
     $(selector).each(function (i, elem) {
-        $(elem).attr(attrName, attrValue);
+        $(elem).attr(attrName, attrValue ? attrValue : emptyPlaceholderToken);
         result.updated = true;
     });
     if (result.updated) {
         result.content = $.xml();
+        result.content = postProcessing(result.content);
     }
     return result;
 }
@@ -40,14 +44,34 @@ exports.addAttribute = addAttribute;
  * @param attrValue
  */
 function appendAttribute(content, selector, attrName, attrValue) {
-    const $ = cheerio.load(content, luxCherioParserOptions);
-    const result = new CheerioInfo(content);
+    let newContent = preProcessing(content);
+    const $ = cheerio.load(newContent, luxCheerioParserOptions);
+    const result = new CheerioInfo(newContent);
     $(selector).each(function (i, elem) {
-        $(elem).attr(attrName, $(elem).attr(attrName) + attrValue);
-        result.updated = true;
+        const attrNameNoBinding = attrName;
+        if ($(elem).attr(attrNameNoBinding)) {
+            $(elem).attr(attrNameNoBinding, $(elem).attr(attrNameNoBinding) + attrValue);
+            result.updated = true;
+        }
+        const attrNameDataBinding = '[' + attrName + ']';
+        if ($(elem).attr(attrNameDataBinding)) {
+            $(elem).attr(attrNameDataBinding, $(elem).attr(attrNameDataBinding) + attrValue);
+            result.updated = true;
+        }
+        const attrNameTwoWayBinding = '[(' + attrName + ')]';
+        if ($(elem).attr(attrNameTwoWayBinding)) {
+            $(elem).attr(attrNameTwoWayBinding, $(elem).attr(attrNameTwoWayBinding) + attrValue);
+            result.updated = true;
+        }
+        const attrNameEventBinding = '(' + attrName + ')';
+        if ($(elem).attr(attrNameEventBinding)) {
+            $(elem).attr(attrNameEventBinding, $(elem).attr(attrNameEventBinding) + attrValue);
+            result.updated = true;
+        }
     });
     if (result.updated) {
         result.content = $.xml();
+        result.content = postProcessing(result.content);
     }
     return result;
 }
@@ -61,15 +85,16 @@ exports.appendAttribute = appendAttribute;
  * @param attrNameNew Ein beliebiger neuer Attributname.
  */
 function renameAttribute(content, selector, attrNameOld, attrNameNew) {
-    const $ = cheerio.load(content, luxCherioParserOptions);
-    const result = new CheerioInfo(content);
+    let newContent = preProcessing(content);
+    const $ = cheerio.load(newContent, luxCheerioParserOptions);
+    const result = new CheerioInfo(newContent);
     $(selector).each(function (i, elem) {
         const attrNameNoBindingOld = attrNameOld;
         const attrNameNoBindingNew = attrNameNew;
         const attrValueNoBinding = $(elem).attr(attrNameNoBindingOld);
         if (attrValueNoBinding) {
             $(elem).removeAttr(attrNameNoBindingOld);
-            $(elem).attr(attrNameNoBindingNew, attrValueNoBinding);
+            $(elem).attr(attrNameNoBindingNew, attrValueNoBinding ? attrValueNoBinding : emptyPlaceholderToken);
             result.updated = true;
         }
         const attrNameDataBindingOld = '[' + attrNameOld + ']';
@@ -77,7 +102,7 @@ function renameAttribute(content, selector, attrNameOld, attrNameNew) {
         const attrNameDataBindingValue = $(elem).attr(attrNameDataBindingOld);
         if (attrNameDataBindingValue) {
             $(elem).removeAttr(attrNameDataBindingOld);
-            $(elem).attr(attrNameDataBindingNew, attrNameDataBindingValue);
+            $(elem).attr(attrNameDataBindingNew, attrNameDataBindingValue ? attrNameDataBindingValue : emptyPlaceholderToken);
             result.updated = true;
         }
         const attrNameTwoWayBindingOld = '[(' + attrNameOld + ')]';
@@ -85,7 +110,7 @@ function renameAttribute(content, selector, attrNameOld, attrNameNew) {
         const attrValueTwoWayBinding = $(elem).attr(attrNameTwoWayBindingOld);
         if (attrValueTwoWayBinding) {
             $(elem).removeAttr(attrNameTwoWayBindingOld);
-            $(elem).attr(attrNameTwoWayBindingNew, attrValueTwoWayBinding);
+            $(elem).attr(attrNameTwoWayBindingNew, attrValueTwoWayBinding ? attrValueTwoWayBinding : emptyPlaceholderToken);
             result.updated = true;
         }
         const attrNameEventBindingOld = '(' + attrNameOld + ')';
@@ -93,12 +118,13 @@ function renameAttribute(content, selector, attrNameOld, attrNameNew) {
         const attrValueEventBinding = $(elem).attr(attrNameEventBindingOld);
         if (attrValueEventBinding) {
             $(elem).removeAttr(attrNameEventBindingOld);
-            $(elem).attr(attrNameEventBindingNew, attrValueEventBinding);
+            $(elem).attr(attrNameEventBindingNew, attrValueEventBinding ? attrValueEventBinding : emptyPlaceholderToken);
             result.updated = true;
         }
     });
     if (result.updated) {
         result.content = $.xml();
+        result.content = postProcessing(result.content);
     }
     return result;
 }
@@ -112,32 +138,34 @@ exports.renameAttribute = renameAttribute;
  * @param attrValue Ein beliebiger Wert.
  */
 function updateAttribute(content, selector, attrName, attrValue) {
-    const $ = cheerio.load(content, luxCherioParserOptions);
-    const result = new CheerioInfo(content);
+    let newContent = preProcessing(content);
+    const $ = cheerio.load(newContent, luxCheerioParserOptions);
+    const result = new CheerioInfo(newContent);
     $(selector).each(function (i, elem) {
         const attrNameNoBinding = attrName;
         if ($(elem).attr(attrNameNoBinding)) {
-            $(elem).attr(attrNameNoBinding, attrValue);
+            $(elem).attr(attrNameNoBinding, attrValue ? attrValue : emptyPlaceholderToken);
             result.updated = true;
         }
         const attrNameDataBinding = '[' + attrName + ']';
         if ($(elem).attr(attrNameDataBinding)) {
-            $(elem).attr(attrNameDataBinding, attrValue);
+            $(elem).attr(attrNameDataBinding, attrValue ? attrValue : emptyPlaceholderToken);
             result.updated = true;
         }
         const attrNameTwoWayBinding = '[(' + attrName + ')]';
         if ($(elem).attr(attrNameTwoWayBinding)) {
-            $(elem).attr(attrNameTwoWayBinding, attrValue);
+            $(elem).attr(attrNameTwoWayBinding, attrValue ? attrValue : emptyPlaceholderToken);
             result.updated = true;
         }
         const attrNameEventBinding = '(' + attrName + ')';
         if ($(elem).attr(attrNameEventBinding)) {
-            $(elem).attr(attrNameEventBinding, attrValue);
+            $(elem).attr(attrNameEventBinding, attrValue ? attrValue : emptyPlaceholderToken);
             result.updated = true;
         }
     });
     if (result.updated) {
         result.content = $.xml();
+        result.content = postProcessing(result.content);
     }
     return result;
 }
@@ -150,34 +178,69 @@ exports.updateAttribute = updateAttribute;
  * @param attrName Ein beliebiger Attributname (z.B. luxListItem).
  */
 function removeAttribute(content, selector, attrName) {
-    const $ = cheerio.load(content, luxCherioParserOptions);
-    const result = new CheerioInfo(content);
+    let newContent = preProcessing(content);
+    const $ = cheerio.load(newContent, luxCheerioParserOptions);
+    const result = new CheerioInfo(newContent);
     $(selector).each(function (i, elem) {
         const attrNameNoBinding = attrName;
+        let updated = false;
         if ($(elem).attr(attrNameNoBinding)) {
             $(elem).removeAttr(attrNameNoBinding);
-            result.updated = true;
+            updated = true;
         }
         const attrNameDataBinding = '[' + attrName + ']';
         if ($(elem).attr(attrNameDataBinding)) {
             $(elem).removeAttr(attrNameDataBinding);
-            result.updated = true;
+            updated = true;
         }
         const attrNameTwoWayBinding = '[(' + attrName + ')]';
         if ($(elem).attr(attrNameTwoWayBinding)) {
             $(elem).removeAttr(attrNameTwoWayBinding);
-            result.updated = true;
+            updated = true;
         }
         const attrNameEventBinding = '(' + attrName + ')';
         if ($(elem).attr(attrNameEventBinding)) {
             $(elem).removeAttr(attrNameEventBinding);
+            updated = true;
+        }
+        if (updated) {
             result.updated = true;
         }
     });
     if (result.updated) {
         result.content = $.xml();
+        result.content = postProcessing(result.content);
     }
     return result;
 }
 exports.removeAttribute = removeAttribute;
+function preProcessing(content) {
+    return (0, util_1.replaceAll)(content, '=""', `="${emptyPlaceholderToken}"`);
+}
+function postProcessing(content) {
+    let resultContent = content;
+    // Entferne alle leeren Werte die von Cheerio hinzugefügt wurden.
+    resultContent = (0, util_1.replaceAll)(resultContent, `=""`, '');
+    // Setze alle Attribute wieder auf leer (="") die initial bereits leer waren oder gezielt auf leer gesetzt wurden.
+    resultContent = (0, util_1.replaceAll)(resultContent, `${emptyPlaceholderToken}`, '');
+    // Entferne alle Closing-Tags von den Void-Tags.
+    resultContent = (0, util_1.replaceAll)(resultContent, '</input>', '');
+    resultContent = (0, util_1.replaceAll)(resultContent, '</area>', '');
+    resultContent = (0, util_1.replaceAll)(resultContent, '</br>', '');
+    resultContent = (0, util_1.replaceAll)(resultContent, '</base>', '');
+    resultContent = (0, util_1.replaceAll)(resultContent, '</col>', '');
+    resultContent = (0, util_1.replaceAll)(resultContent, '</embed>', '');
+    resultContent = (0, util_1.replaceAll)(resultContent, '</hr>', '');
+    resultContent = (0, util_1.replaceAll)(resultContent, '</img>', '');
+    resultContent = (0, util_1.replaceAll)(resultContent, '</link>', '');
+    resultContent = (0, util_1.replaceAll)(resultContent, '</meta>', '');
+    resultContent = (0, util_1.replaceAll)(resultContent, '</param>', '');
+    resultContent = (0, util_1.replaceAll)(resultContent, '</source>', '');
+    resultContent = (0, util_1.replaceAll)(resultContent, '</track>', '');
+    resultContent = (0, util_1.replaceAll)(resultContent, '</wbr>', '');
+    return resultContent;
+}
+const getAllAttributes = function (node) {
+    return node.attributes || Object.keys(node.attribs).map((name) => ({ name, value: node.attribs[name] }));
+};
 //# sourceMappingURL=html.js.map

package/src/utility/html.js.map

@@ -1 +1 @@
-{"version":3,"file":"html.js","sourceRoot":"","sources":["html.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"html.js","sourceRoot":"","sources":["html.ts"],"names":[],"mappings":"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"}