Skip to content

fix: rename ambiguous variable declarations in destructuring assignments #466

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
StorytellerCZ merged 2 commits into from
Feb 13, 2025
Merged

fix: rename ambiguous variable declarations in destructuring assignments #466

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
869be22
fix: rename ambiguous variable declarations in destructuring assignments
jankapunkt Feb 7, 2025
81078b5
fix: use correct default assign for validatedArgs
jankapunkt Feb 7, 2025
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
19 changes: 10 additions & 9 deletions package/collection2/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,14 +180,15 @@ function getArgumentsAndValidationContext(methodName, args, async) {
}

let validationContext = {};
let validatedArgs = args;
if (this._c2 && options.bypassCollection2 !== true) {
let userId = null;
try {
// https://github.com/aldeed/meteor-collection2/issues/175
userId = Meteor.userId();
} catch (err) {}

[args, validationContext] = doValidate(
[validatedArgs, validationContext] = doValidate(
this,
methodName,
args,
Expand All @@ -197,17 +198,17 @@ function getArgumentsAndValidationContext(methodName, args, async) {
async
);

if (!args) {
if (!validatedArgs) {
// doValidate already called the callback or threw the error, so we're done.
// But insert should always return an ID to match core behavior.
return isInsertType(methodName) ? this._makeNewID() : undefined;
}
} else {
// We still need to adjust args because insert does not take options
if (isInsertType(methodName) && typeof args[1] !== 'function') args.splice(1, 1);
if (isInsertType(methodName) && typeof validatedArgs[1] !== 'function') validatedArgs.splice(1, 1);
}

return [args, validationContext];
return [validatedArgs, validationContext];
}

function _methodMutation(async, methodName) {
Expand All @@ -217,13 +218,13 @@ function getArgumentsAndValidationContext(methodName, args, async) {

if (!_super) return;
Mongo.Collection.prototype[methodName] = function (...args) {
[args, validationContext] = getArgumentsAndValidationContext.call(this, methodName, args, async);
const [validatedArgs, validationContext] = getArgumentsAndValidationContext.call(this, methodName, args, async);

if (async && !Meteor.isFibersDisabled) {
try {
this[methodName.replace('Async', '')].isCalledFromAsync = true;
_super.isCalledFromAsync = true;
return Promise.resolve(_super.apply(this, args));
return Promise.resolve(_super.apply(this, validatedArgs));
} catch (err) {
if (this._c2) {
const addValidationErrorsPropName =
Expand All @@ -239,18 +240,18 @@ function getArgumentsAndValidationContext(methodName, args, async) {
}
}
} else {
return _super.apply(this, args);
return _super.apply(this, validatedArgs);
}
};
}

function _methodMutationAsync(methodName) {
const _super = Mongo.Collection.prototype[methodName];
Mongo.Collection.prototype[methodName] = async function (...args) {
[args, validationContext] = getArgumentsAndValidationContext.call(this, methodName, args, true);
const [validatedArgs, validationContext] = getArgumentsAndValidationContext.call(this, methodName, args, true);

try {
return await _super.apply(this, args);
return await _super.apply(this, validatedArgs);
} catch (err) {
if (this._c2) {
const addValidationErrorsPropName =
Expand Down