Use core library shared methods

open-audio-stack · Nov 13, 2024 · c33eeb7 · c33eeb7
1 parent 353b2b0
commit c33eeb7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 64 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -55,7 +55,7 @@
     "vitest": "^2.1.4"
   },
   "dependencies": {
-    "@open-audio-stack/core": "^0.0.10",
+    "@open-audio-stack/core": "^0.0.13",
     "chalk": "^5.3.0"
   },
   "repository": {

diff --git a/src/index.ts b/src/index.ts
@@ -1,9 +1,9 @@
-import chalk from 'chalk';
 import {
   dirCreate,
   dirRead,
   fileJsonCreate,
   fileReadYaml,
+  logReport,
   pathGetSlug,
   pathGetVersion,
   Config,
@@ -48,30 +48,10 @@ export function generateYaml(
     const pkgSlug: string = pathGetSlug(subPath);
     const pkgVersion: string = pathGetVersion(subPath);
     const pkgFile = fileReadYaml(filePath) as PluginInterface | PresetInterface | ProjectInterface;
+
     const errors: PackageValidationError[] = registry.packageVersionValidate(pkgFile);
     const recs: PackageValidationRec[] = registry.packageVersionRecommendations(pkgFile);
-    if (errors.length > 0) {
-      console.log(chalk.red(`X ${pkgSlug} | ${pkgVersion} | ${filePath}`));
-      errors.forEach(error => {
-        console.log(
-          chalk.red(
-            `- ${error.field} (${error.error}) received '${error.valueReceived}' expected '${error.valueExpected}'`,
-          ),
-        );
-      });
-      if (recs.length > 0) {
-        recs.forEach(rec => {
-          console.log(chalk.yellow(`- ${rec.field} ${rec.rec}`));
-        });
-      }
-    } else {
-      console.log(chalk.green(`✓ ${pkgSlug} | ${pkgVersion} | ${filePath}`));
-      if (recs.length > 0) {
-        recs.forEach(rec => {
-          console.log(chalk.yellow(`- ${rec.field} ${rec.rec}`));
-        });
-      }
-    }
+    logReport(`${pkgSlug} | ${pkgVersion} | ${filePath}`, errors, recs);
     registry.packageVersionAdd(pkgSlug, pkgVersion, pkgFile);
 
     dirCreate(`${pathOut}/${pathType}/${pkgSlug}/${pkgVersion}`);

diff --git a/src/validate.ts b/src/validate.ts
@@ -4,10 +4,9 @@ import {
   dirExists,
   fileCreate,
   fileExists,
-  fileHash,
   fileReadYaml,
-  fileSize,
-  PackageValidation,
+  fileValidateMetadata,
+  logReport,
   PackageValidationError,
   pathGetExt,
   pathGetSlug,
@@ -17,7 +16,6 @@ import {
   PresetFile,
   ProjectFile,
 } from '@open-audio-stack/core';
-import chalk from 'chalk';
 import path from 'path';
 
 const DIR_DOWNLOADS: string = 'downloads';
@@ -49,37 +47,8 @@ if (ext === 'yaml') {
       fileCreate(fileLocalPath, fileBuffer);
     }
 
-    // Validate file vs metadata
-    const errors: PackageValidationError[] = [];
-    if (file.hash !== fileHash(fileLocalPath)) {
-      errors.push({
-        field: 'hash',
-        error: PackageValidation.INVALID_VALUE,
-        valueExpected: fileHash(fileLocalPath),
-        valueReceived: file.hash,
-      });
-    }
-    if (file.size !== fileSize(fileLocalPath)) {
-      errors.push({
-        field: 'size',
-        error: PackageValidation.INVALID_VALUE,
-        valueExpected: String(fileSize(fileLocalPath)),
-        valueReceived: String(file.size),
-      });
-    }
-
-    // Output errors
-    if (errors.length > 0) {
-      console.log(chalk.red(`X ${pkgSlug} | ${pkgVersion} | ${fileLocalPath}`));
-      errors.forEach(error => {
-        console.log(
-          chalk.red(
-            `- ${error.field} (${error.error}) received '${error.valueReceived}' expected '${error.valueExpected}'`,
-          ),
-        );
-      });
-    } else {
-      console.log(chalk.green(`✓ ${pkgSlug} | ${pkgVersion} | ${fileLocalPath}`));
-    }
+    // Validate file vs metadata and output errors
+    const errors: PackageValidationError[] = fileValidateMetadata(fileLocalPath, file);
+    logReport(`${pkgSlug} | ${pkgVersion} | ${fileLocalPath}`, errors);
   }
 }