github/meteor
1
1
Fork 0
mirror of https://github.com/meteor/meteor.git synced 2026-05-02 03:01:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Have CS.Input convert to real PackageConstraints

Browse Source 
It caused an exception in an app when a "fake" PackageConstraint made
it into conflict explanation.
This commit is contained in:
David Greenspan
2015-03-06 16:29:56 -08:00
parent e27840aa24
commit ade555d903
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
packages/constraint-solver/constraint-solver-input.js
View File

@@ -8,6 +8,21 @@ CS.Input = function (dependencies, constraints, catalogCache, options) {
var self = this;
options = options || {};
// PackageConstraints passed in from the tool to us (where we are a
// uniloaded package) will have constructors that we don't recognize
// because they come from a different copy of package-version-parser!
// Convert them to our PackageConstraint class if necessary. (This is
// just top-level constraints from .meteor/packages or running from
// checkout, so it's not a lot of data.)
check(constraints, [PackageConstraintType]);
constraints = _.map(constraints, function (c) {
if (c instanceof PV.PackageConstraint) {
return c;
} else {
return PV.parsePackageConstraint(c.toString());
}
});
self.dependencies = dependencies;
self.constraints = constraints;
self.upgrade = options.upgrade || [];
@@ -16,7 +31,7 @@ CS.Input = function (dependencies, constraints, catalogCache, options) {
self.allowIncompatibleUpdate = options.allowIncompatibleUpdate || false;
check(self.dependencies, [String]);
check(self.constraints, [PackageConstraintType]);
check(self.constraints, [PV.PackageConstraint]);
check(self.upgrade, [String]);
check(self.anticipatedPrereleases,
Match.ObjectWithValues(Match.ObjectWithValues(Boolean)));
@@ -123,12 +138,11 @@ CS.Input.fromJSONable = function (obj) {
});
};
// PackageConstraints and VersionConstraints passed in from the tool
// to us (where we are a uniloaded package) will have constructors
// that we don't recognize because they come from a different copy of
// package-version-parser! In addition, objects with constructors
// Type description of PackageConstraint that doesn't rely on the constructor
// being correct. Unrelatedly, objects with constructors (any constructors)
// can't be checked by "check" in the same way as plain objects, so we
// have to resort to examining the fields explicitly.
var VersionConstraintType = Match.OneOf(
PV.VersionConstraint,
Match.Where(function (vc) {
@@ -139,7 +153,6 @@ var VersionConstraintType = Match.OneOf(
}]);
return vc.constructor !== Object;
}));
var PackageConstraintType = Match.OneOf(
PV.PackageConstraint,
Match.Where(function (c) {
@@ -148,6 +161,3 @@ var PackageConstraintType = Match.OneOf(
check(c.versionConstraint, VersionConstraintType);
return c.constructor !== Object;
}));
CS.Input.VersionConstraintType = VersionConstraintType;
CS.Input.PackageConstraintType = PackageConstraintType;

2
packages/constraint-solver/solver.js
View File

@@ -799,6 +799,6 @@ CS.Solver.Constraint = function (fromVar, toPackage, vConstraint, conflictVar) {
// top-level constraint
check(this.fromVar, Match.OneOf(String, null));
check(this.toPackage, String); // package name
check(this.vConstraint, CS.Input.VersionConstraintType);
check(this.vConstraint, PV.VersionConstraint);
check(this.conflictVar, String);
};