trm-core 6.1.0 → 6.1.2

package/dist/manifest/Manifest.js

@@ -371,7 +371,8 @@ class Manifest {
                 }
                 catch (e) { }
             }
-            manifestClone.authors = aAuthors;
+            aAuthors = aAuthors.filter(o => !o.name && !o.email);
+            manifestClone.authors = Array.from(new Map(aAuthors.map(o => [`${o.name}${o.email}`, o])).values());
             if (manifestClone.authors.length === 0) {
                 delete manifestClone.authors;
             }
@@ -391,7 +392,9 @@ class Manifest {
             for (var originalKeyword of originalKeywords) {
                 try {
                     originalKeyword = originalKeyword.replace(/\s/g, '').toLowerCase();
-                    manifestClone.keywords.push(originalKeyword);
+                    if (!originalKeyword || !manifestClone.keywords.includes(originalKeyword)) {
+                        manifestClone.keywords.push(originalKeyword);
+                    }
                 }
                 catch (e) { }
             }
@@ -413,10 +416,15 @@ class Manifest {
                         if (semver.validRange(originalDependency.version)) {
                             dependency.version = originalDependency.version;
                             dependency.integrity = originalDependency.integrity;
+                            if (!dependency.integrity) {
+                                throw new Error(`Dependency ${dependency.name} is missing its integrity.`);
+                            }
                             if (originalDependency.registry) {
                                 dependency.registry = originalDependency.registry;
                             }
-                            manifestClone.dependencies.push(dependency);
+                            if (!manifestClone.dependencies.find(o => o.name === dependency.name && o.registry === dependency.registry)) {
+                                manifestClone.dependencies.push(dependency);
+                            }
                         }
                     }
                 }
@@ -429,9 +437,21 @@ class Manifest {
         else {
             delete manifestClone.dependencies;
         }
-        if (!manifestClone.sapEntries) {
+        if (!manifestClone.sapEntries || typeof manifestClone.sapEntries !== 'object') {
             delete manifestClone.sapEntries;
         }
+        else {
+            for (const key in manifestClone.sapEntries) {
+                if (!Array.isArray(manifestClone.sapEntries[key])) {
+                    throw new Error(`Invalid structure in SAP entries declaration.`);
+                }
+                for (const item of manifestClone.sapEntries[key]) {
+                    if (typeof item !== 'object' || item === null) {
+                        throw new Error(`Invalid structure in SAP entries declaration.`);
+                    }
+                }
+            }
+        }
         if (manifestClone.distFolder) {
             try {
                 manifestClone.distFolder = manifestClone.distFolder.replace(/^\//, '');
@@ -603,7 +623,7 @@ class Manifest {
         if (sAuthors) {
             sAuthors.split(',').forEach(s => {
                 if (s) {
-                    const match = sAuthors.trim().match(/^(.*?)(?:\s*<([^>]+)>)?$/);
+                    const match = s.trim().match(/^(.*?)(?:\s*<([^>]+)>)?$/);
                     if (match && match.length >= 3) {
                         authors.push({
                             name: match[1] ? match[1].trim() : undefined,
@@ -617,11 +637,11 @@ class Manifest {
     }
     static stringKeywordsToArray(sKeywords) {
         if (sKeywords) {
-            sKeywords.split(',').map(s => {
+            return sKeywords.split(',').map(s => {
                 if (s) {
                     return s.trim();
                 }
-            });
+            }).filter(k => k !== undefined);
         }
         else {
             return [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "trm-core",
-  "version": "6.1.0",
+  "version": "6.1.2",
   "description": "TRM (Transport Request Manager) Core",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",