better license; formatter; remove old svelte stuff

Author: mProjectsCode

Makefile

@@ -2,7 +2,7 @@ wasm:
 	cd data-wasm && make
 
 data:
-	cd data && make
+	cd data && make -B
 
 format:
 	cd data && make format

data-lib/src/common.rs

@@ -1,5 +1,3 @@
-use std::hash::Hash;
-
 use hashbrown::HashMap;
 use serde::{Deserialize, Serialize};
 use tsify::Tsify;

data-lib/src/license.rs

@@ -37,4 +37,4 @@ pub struct Licenses {
     pub conditions: Vec<String>,
     pub limitations: Vec<String>,
     pub descriptions: LicenseDescriptionNested,
-}
+}

data-lib/src/plugin/data_array.rs

@@ -4,15 +4,12 @@ use wasm_bindgen::prelude::wasm_bindgen;
 
 use crate::{
     common::{
-        CountMonthlyDataPoint, DownloadDataPoint, HallOfFameDataPoint,
-        InactivityByReleaseDataPoint, IndividualDownloadDataPoint, OverviewDataPoint,
-        RemovedByReleaseDataPoint, increment_named_data_points, to_percentage,
+        increment_named_data_points, to_percentage, CountMonthlyDataPoint, DownloadDataPoint, HallOfFameDataPoint, InactivityByReleaseDataPoint, IndividualDownloadDataPoint, OverviewDataPoint, RemovedByReleaseDataPoint
     },
     date::Date,
     license::Licenses,
     plugin::{
-        NamedDataPoint, PluginData, PluginExtraData, PluginLicenseDataPoints, PluginRepoDataPoints,
-        full::FullPluginData,
+        full::FullPluginData, LicenseInfo, NamedDataPoint, PluginData, PluginExtraData, PluginLicenseDataPoints, PluginRepoDataPoints
     },
 };
 
@@ -513,22 +510,32 @@ impl PluginDataArrayView {
                 return;
             };
 
-            let license_data = licenses
-                .licenses
-                .iter()
-                .find(|l| l.spdx_id == repo_data.license_file);
+            match &repo_data.file_license {
+                LicenseInfo::Known(name) => {
+                    let license_data = licenses
+                        .licenses
+                        .iter()
+                        .find(|l| *name == l.spdx_id);
 
-            if let Some(license_data) = license_data {
-                increment_named_data_points(&mut points.licenses, &license_data.spdx_id, 1.0);
+                    if let Some(license_data) = license_data {
+                        increment_named_data_points(&mut points.licenses, &license_data.spdx_id, 1.0);
 
-                for permission in &license_data.permissions {
-                    increment_named_data_points(&mut points.permissions, permission, 1.0);
-                }
-                for condition in &license_data.conditions {
-                    increment_named_data_points(&mut points.conditions, condition, 1.0);
+                        for permission in &license_data.permissions {
+                            increment_named_data_points(&mut points.permissions, permission, 1.0);
+                        }
+                        for condition in &license_data.conditions {
+                            increment_named_data_points(&mut points.conditions, condition, 1.0);
+                        }
+                        for limitation in &license_data.limitations {
+                            increment_named_data_points(&mut points.limitations, limitation, 1.0);
+                        }
+                    } else {
+                        // I think we should never hit this path, as we make sure that the license is known during data extraction.
+                        increment_named_data_points(&mut points.licenses, &LicenseInfo::Unrecognized.to_fancy_string(), 1.0);
+                    }
                 }
-                for limitation in &license_data.limitations {
-                    increment_named_data_points(&mut points.limitations, limitation, 1.0);
+                other => {
+                    increment_named_data_points(&mut points.licenses, &other.to_fancy_string(), 1.0);
                 }
             }
         });

data-lib/src/plugin/full.rs

@@ -5,8 +5,7 @@ use crate::{
     common::{DownloadDataPoint, EntryChangeDataPoint, VersionDataPoint},
     date::Date,
     plugin::{
-        FundingUrl, PluginData, PluginExtraData, PluginRepoData,
-        warnings::{PluginWarning, get_plugin_warnings},
+        warnings::{get_plugin_warnings, PluginWarning}, FundingUrl, LicenseInfo, PluginData, PluginExtraData, PluginRepoData
     },
 };
 
@@ -173,12 +172,12 @@ impl FullPluginData {
             .map(|v| v.initial_release_date.to_fancy_string())
     }
 
-    pub fn license_package_json(&self) -> Option<String> {
-        self.repo_data().map(|r| r.package_json_license.clone())
+    pub fn license_package_json(&self) -> String {
+        LicenseInfo::from(self.repo_data().map(|r| &r.package_json_license)).to_fancy_string()
     }
 
-    pub fn license_file(&self) -> Option<String> {
-        self.repo_data().map(|r| r.license_file.clone())
+    pub fn license_file(&self) -> String {
+        LicenseInfo::from(self.repo_data().map(|r| &r.file_license)).to_fancy_string()
     }
 
     pub fn package_managers(&self) -> Option<Vec<String>> {

data-lib/src/plugin/mod.rs

@@ -72,8 +72,10 @@ pub struct PluginRepoData {
     pub has_test_files: bool,
     pub has_beta_manifest: bool,
     pub file_type_counts: HashMap<String, usize>,
-    pub package_json_license: String,
-    pub license_file: String,
+    /// The license identifier from the package.json file.
+    pub package_json_license: LicenseInfo,
+    /// The license identifier from the LICENSE file in the repository.
+    pub file_license: LicenseInfo,
     pub manifest: PluginManifest,
 }
 
@@ -109,3 +111,49 @@ pub struct PluginLicenseDataPoints {
     limitations: Vec<NamedDataPoint>,
     descriptions: LicenseDescriptionNested,
 }
+
+#[derive(Debug, Clone, Serialize, Deserialize, PartialEq, Eq)]
+pub enum LicenseInfo {
+    Known(String),
+    ExplicitlyUnlicensed,
+    Unrecognized,
+    NotFound,
+}
+
+impl LicenseInfo {
+    pub fn to_fancy_string(&self) -> String {
+        match self {
+            LicenseInfo::Known(name) => name.clone(),
+            LicenseInfo::Unrecognized => "Unrecognized".to_string(),
+            LicenseInfo::NotFound => "Not Found".to_string(),
+            LicenseInfo::ExplicitlyUnlicensed => "Explicitly Unlicensed".to_string(),
+        }
+    }
+
+    pub fn matches(&self, other: &Self) -> bool {
+        match (self, other) {
+            (LicenseInfo::Known(name1), LicenseInfo::Known(name2)) => name1 == name2,
+            _ => true, // Unrecognized and NotFound match anything
+        }
+    }
+
+    pub fn matches_identifier(&self, other: &str) -> bool {
+        match self {
+            LicenseInfo::Known(name1) => name1 == other,
+            _ => false,
+        }
+    }
+}
+
+impl From<Option<LicenseInfo>> for LicenseInfo {
+    fn from(value: Option<LicenseInfo>) -> Self {
+        value.unwrap_or(LicenseInfo::NotFound)
+    }
+}
+
+
+impl From<Option<&LicenseInfo>> for LicenseInfo {
+    fn from(value: Option<&LicenseInfo>) -> Self {
+        value.cloned().unwrap_or(LicenseInfo::NotFound)
+    }
+}

data-lib/src/plugin/warnings.rs

@@ -1,7 +1,7 @@
 use serde::Serialize;
 use tsify::Tsify;
 
-use crate::{commit::StringCommit, date::Date, plugin::full::FullPluginData};
+use crate::{commit::StringCommit, date::Date, plugin::{full::FullPluginData, LicenseInfo}};
 
 #[derive(Tsify, Debug, Clone, Serialize)]
 #[tsify(into_wasm_abi)]
@@ -21,7 +21,7 @@ pub enum PluginWarning {
     Unlicensed(PluginWarningUnlicensed),
     NoLicense(PluginWarningNoLicense),
     MismatchedLicense(PluginWarningMismatchedLicense),
-    MissingExtendedData(PLuginWarningMissingExtendedData),
+    MissingExtendedData(PluginWarningMissingExtendedData),
     MissingRepoData(PluginWarningMissingRepoData),
 }
 
@@ -78,7 +78,7 @@ pub struct PluginWarningMismatchedLicense {
 
 #[derive(Tsify, Debug, Clone, Serialize)]
 #[tsify(into_wasm_abi)]
-pub struct PLuginWarningMissingExtendedData {
+pub struct PluginWarningMissingExtendedData {
     pub severity: PluginWarningSeverity,
 }
 
@@ -202,27 +202,20 @@ fn get_license_warnings(data: &FullPluginData, warnings: &mut Vec<PluginWarning>
         return;
     };
 
-    if repo.license_file == "explicitly unlicensed" {
+    if repo.file_license == LicenseInfo::Known("explicitly unlicensed".to_string()) {
         warnings.push(PluginWarning::Unlicensed(PluginWarningUnlicensed {
             severity: PluginWarningSeverity::CAUTION,
         }));
-    } else if repo.license_file == "no license" {
+    } else if repo.file_license == LicenseInfo::NotFound {
         warnings.push(PluginWarning::NoLicense(PluginWarningNoLicense {
             severity: PluginWarningSeverity::CAUTION,
         }));
-    } else if repo.license_file != "unknown"
-        && repo.license_file != "not found"
-        && repo.package_json_license != "unknown"
-        && repo.package_json_license != "not found"
-        && repo.package_json_license != "no license"
-        && !repo.package_json_license.starts_with(&repo.license_file)
-        && !repo.license_file.starts_with(&repo.package_json_license)
-    {
+    } else if !repo.file_license.matches(&repo.package_json_license) {
         warnings.push(PluginWarning::MismatchedLicense(
             PluginWarningMismatchedLicense {
                 severity: PluginWarningSeverity::CAUTION,
-                license_file: repo.license_file.clone(),
-                package_json_license: repo.package_json_license.clone(),
+                license_file: repo.file_license.to_fancy_string(),
+                package_json_license: repo.package_json_license.to_fancy_string(),
             },
         ));
     }
@@ -231,7 +224,7 @@ fn get_license_warnings(data: &FullPluginData, warnings: &mut Vec<PluginWarning>
 fn get_missing_warnings(data: &FullPluginData, warnings: &mut Vec<PluginWarning>) {
     if data.extended.is_none() {
         warnings.push(PluginWarning::MissingExtendedData(
-            PLuginWarningMissingExtendedData {
+            PluginWarningMissingExtendedData {
                 severity: PluginWarningSeverity::DANGER,
             },
         ));

data-lib/src/release/data_array.rs

@@ -3,7 +3,7 @@ use regex::Regex;
 use wasm_bindgen::prelude::*;
 
 use crate::{
-    common::{StackedNamedDataPoint, increment_named_data_points},
+    common::StackedNamedDataPoint,
     iter_ext::{DedupExt, GroupByExt, SortExt},
     release::{
         ChangeLogChangeCategory, ChangelogChanges, ChangelogDataPoint, GithubReleaseInfo, OS,

data/out/licenses.json

@@ -985,26 +985,26 @@
     }
   ],
   "permissions": [
-    "commercial-use",
     "private-use",
-    "modifications",
+    "distribution",
     "patent-use",
-    "distribution"
+    "commercial-use",
+    "modifications"
   ],
   "conditions": [
-    "network-use-disclose",
-    "disclose-source",
-    "include-copyright--source",
-    "same-license--library",
-    "same-license--file",
     "document-changes",
+    "same-license",
+    "same-license--file",
+    "include-copyright--source",
+    "disclose-source",
     "include-copyright",
-    "same-license"
+    "same-license--library",
+    "network-use-disclose"
   ],
   "limitations": [
+    "patent-use",
     "warranty",
     "trademark-use",
-    "patent-use",
     "liability"
   ],
   "descriptions": {