Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions packages/zpm-config/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,8 @@ impl<'de, T: FromFileString + Deserialize<'de>> Deserialize<'de> for Interpolate
#[serde(untagged)]
enum StringOrAnything<T> {
String(String),
Integer(i64),
Float(f64),
Anything(T),
}

Expand All @@ -135,6 +137,22 @@ impl<'de, T: FromFileString + Deserialize<'de>> Deserialize<'de> for Interpolate
Ok(Interpolated::new(hydrated))
},

StringOrAnything::Integer(value) => {
let hydrated
= T::from_file_string(&value.to_string())
.map_err(de::Error::custom)?;

Ok(Interpolated::new(hydrated))
},

StringOrAnything::Float(value) => {
let hydrated
= T::from_file_string(&value.to_string())
.map_err(de::Error::custom)?;

Ok(Interpolated::new(hydrated))
},

StringOrAnything::Anything(anything) => {
Ok(Interpolated::new(anything))
},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
const {
fs: {writeFile},
} = require(`pkg-tests-core`);

describe(`Features`, () => {
describe(`npmMinimalAgeGate and npmPreapprovedPackages`, () => {
describe(`add`, () => {
Expand Down Expand Up @@ -142,6 +146,22 @@ describe(`Features`, () => {
);
});
describe(`install`, () => {
test(
`it should parse numeric npmMinimalAgeGate from .yarnrc.yml`,
makeTemporaryEnv({
dependencies: {[`release-date`]: `^1.0.0`},
}, async ({path, run, source}) => {
await writeFile(`${path}/.yarnrc.yml`, `npmMinimalAgeGate: 0\n`);

await run(`install`);

await expect(source(`require('release-date/package.json')`)).resolves.toMatchObject({
name: `release-date`,
version: `1.1.1`,
});
}),
);

test(
`it should fail when trying to install exact version that is too new`,
makeTemporaryEnv({
Expand Down