Remove EngineType property

src/lockfile/constants.rs

@@ -19,7 +19,6 @@ pub const PEER_DEPENDENCIES_META: &str = "peerDependenciesMeta";
 // packages
 pub const PACKAGES: &str = "packages";
 pub const RESOLUTION: &str = "resolution";
-pub const ENGINES: &str = "engines";
 
 pub const OPTIONAL: &str = "optional";
 pub const OS: &str = "os";

src/lockfile/lockfile_structure.rs

@@ -1,10 +1,10 @@
 use crate::lockfile::constants::{
-    AUTO_INSTALL_PEERS, CPU, DEPENDENCIES, DEV_DEPENDENCIES, ENGINES, EXCLUDE_LINKS_FROM_LOCKFILE,
+    AUTO_INSTALL_PEERS, CPU, DEPENDENCIES, DEV_DEPENDENCIES, EXCLUDE_LINKS_FROM_LOCKFILE,
     HAS_BIN, LOCKFILE_VERSION, OPTIONAL, OPT_DEPENDENCIES, OS, PACKAGES, PEER_DEPENDENCIES,
     PEER_DEPENDENCIES_META, PEER_SUFFIX_MAX_LENGTH, RESOLUTION, SETTINGS, SNAPSHOTS, SPECIFIER,
     VERSION,
 };
-use crate::package::{EnginesType, PackageMetaHandler};
+use crate::package::PackageMetaHandler;
 use serde::{Deserialize, Serialize};
 use std::collections::{BTreeMap, HashMap};
 
@@ -348,51 +348,6 @@ impl LockfileStructure {
             })
         }
 
-        if !snapshot {
-            if let Some(engines) = &p.1.engines {
-                match engines {
-                    EnginesType::EngineMap(engines) => match engines.len() == 1 {
-                        true => {
-                            let engine_val = engines.iter().next().unwrap();
-                            let node = format!(
-                                "{{{}: {}}}",
-                                engine_val.0,
-                                Self::format_string(engine_val.1)
-                            );
-                            packages_serialized.push_str(&Self::format_line(
-                                ENGINES,
-                                Some(&node),
-                                index + 1,
-                            ));
-                        }
-                        false => {
-                            packages_serialized.push_str(&Self::format_line(
-                                ENGINES,
-                                None,
-                                index + 1,
-                            ));
-
-                            engines.iter().for_each(|e| {
-                                packages_serialized.push_str(&Self::format_line(
-                                    e.0,
-                                    Some(e.1),
-                                    index + 2,
-                                ))
-                            })
-                        }
-                    },
-                    EnginesType::Engine(e) => {
-                        let engines = Self::format_inline_vector(e);
-                        packages_serialized.push_str(&Self::format_line(
-                            ENGINES,
-                            Some(&engines),
-                            index + 1,
-                        ));
-                    }
-                }
-            }
-        }
-
         if let Some(cpu) = &p.1.cpu {
             packages_serialized.push_str(&Self::format_line(
                 CPU,
@@ -502,7 +457,7 @@ impl Default for LockfileStructure {
         };
 
         LockfileStructure {
-            lockfile_version: "9.0".to_string(),
+            lockfile_version: "1.0".to_string(),
             importers: None,
             ignored_optional_dependencies: None,
             overrides: None,

src/package/mod.rs

@@ -9,7 +9,6 @@ mod registry;
 pub use full_package::FullPackage;
 pub use json::PackageJson;
 pub use npm_package::BinType;
-pub use npm_package::EnginesType;
 pub use npm_package::NpmPackage;
 pub use package_recorder::PackageMetaHandler;
 pub use package_recorder::PackageMetaRecorder;

src/package/npm_package.rs

@@ -32,8 +32,7 @@ pub struct NpmPackage {
     pub licenses: Option<Vec<License>>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub license: Option<LicenseType>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub funding: Option<FundingType>,
+
     #[serde(skip_serializing_if = "Option::is_none")]
     pub files: Option<String>,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -58,8 +57,7 @@ pub struct NpmPackage {
     pub optional_dependencies: Option<HashMap<String, String>>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub overrides: Option<HashMap<String, String>>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub engines: Option<EnginesType>,
+
     #[serde(skip_serializing_if = "Option::is_none")]
     pub os: Option<Vec<String>>,
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -73,21 +71,6 @@ pub struct NpmPackage {
     pub depth_traces: Option<Vec<Vec<RegistryKey>>>,
 }
 
-#[derive(Deserialize, Serialize, Debug, Clone)]
-#[serde(untagged)]
-pub enum EnginesType {
-    EngineMap(HashMap<String, String>),
-    Engine(Vec<String>),
-}
-
-#[derive(Deserialize, Serialize, Debug, Clone)]
-#[serde(untagged)]
-pub enum FundingType {
-    Funding(Funding),
-    FundingVec(Vec<Funding>),
-    String(String),
-}
-
 #[derive(Deserialize, Serialize, Debug, Clone)]
 pub struct Funding {
     r#type: Option<String>,
@@ -108,7 +91,7 @@ impl From<NpmPackage> for PackageMetaRecorder {
             peer_dependencies_meta: val.peer_dependencies_meta,
             dependencies: val.dependencies,
             cpu: val.cpu,
-            engines: val.engines,
+
             os: val.os,
             bin: val.bin.clone(),
             depth_traces: val.depth_traces,

src/package/package_recorder.rs

@@ -1,6 +1,6 @@
 use crate::cache::{RegistryKey, DEP_CACHE_FOLDER};
 use crate::fs::get_config_dir;
-use crate::package::npm_package::{EnginesType, PeerDependencyMeta};
+use crate::package::npm_package::PeerDependencyMeta;
 use crate::package::BinType;
 use serde::{Deserialize, Serialize};
 use std::collections::HashMap;
@@ -12,7 +12,6 @@ pub struct PackageMetaRecorder {
     pub name: String,
     pub version: String,
     pub resolution: Option<PackageResolution>,
-    pub engines: Option<EnginesType>,
     pub peer_dependencies: Option<HashMap<String, String>>,
     pub has_bin: Option<bool>,
     pub peer_dependencies_meta: Option<HashMap<String, PeerDependencyMeta>>,
@@ -53,7 +52,6 @@ impl From<PackageMetaRecorder> for PackageMetaHandler {
             os: val.os,
             cpu: val.cpu,
             has_bin: val.has_bin,
-            engines: val.engines,
             peer_dependencies: val.peer_dependencies,
             peer_dependencies_meta: val.peer_dependencies_meta,
             dependencies: val.dependencies,
@@ -68,8 +66,7 @@ impl From<PackageMetaRecorder> for PackageMetaHandler {
 pub struct PackageMetaHandler {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub resolution: Option<PackageResolution>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub engines: Option<EnginesType>,
+
     #[serde(skip_serializing_if = "Option::is_none")]
     pub peer_dependencies: Option<HashMap<String, String>>,
     #[serde(skip_serializing_if = "Option::is_none")]