-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
fix: numeric literals can be set as object keys and used to access objects #3498
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.
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
base: develop
Are you sure you want to change the base?
Changes from 3 commits
cedc04f
70de523
384e0fe
90cb3f6
349f39d
eafba64
e8377d1
9d854ba
f95f57f
8edbfe4
12b23bf
59060fd
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| module.exports = { | ||
| semi: false, | ||
| singleQuote: true, | ||
| trailingComma: 'none' | ||
| trailingComma: 'none', | ||
| endOfLine: 'auto' | ||
| } | ||
codegiyu marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -6,6 +6,7 @@ import { | |
| isIndexNode, | ||
| isNode, | ||
| isObjectNode, | ||
| isOperatorNode, | ||
| isParenthesisNode, | ||
| isSymbolNode | ||
| } from '../../utils/is.js' | ||
|
|
@@ -93,6 +94,15 @@ export const createAccessorNode = /* #__PURE__ */ factory(name, dependencies, ({ | |
| const evalObject = this.object._compile(math, argNames) | ||
| const evalIndex = this.index._compile(math, argNames) | ||
|
|
||
| // If index contains operator node, evaluate result of the operation and access object with result | ||
| if (isOperatorNode(this.index.dimensions[0]) && isObjectNode(this.object)) { | ||
|
||
| const operatorNode = this.index.dimensions[0] | ||
| return function evalAccessorNode (scope, args, context) { | ||
| const result = operatorNode._compile(math, argNames)(scope, args, context) | ||
| return getSafeProperty(evalObject(scope, args, context), String(result)) | ||
| } | ||
| } | ||
|
|
||
| if (this.index.isObjectProperty()) { | ||
| const prop = this.index.getObjectProperty() | ||
| return function evalAccessorNode (scope, args, context) { | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,5 @@ | ||
| import { factory } from '../utils/factory.js' | ||
| import { isAccessorNode, isConstantNode, isFunctionNode, isOperatorNode, isSymbolNode, rule2Node } from '../utils/is.js' | ||
| import { isAccessorNode, isConstantNode, isFunctionNode, isObjectNode, isOperatorNode, isSymbolNode, rule2Node } from '../utils/is.js' | ||
| import { deepMap } from '../utils/collection.js' | ||
| import { safeNumberType } from '../utils/number.js' | ||
| import { hasOwnProperty } from '../utils/object.js' | ||
|
|
@@ -1413,6 +1413,12 @@ export const createParse = /* #__PURE__ */ factory(name, dependencies, ({ | |
| closeParams(state) | ||
| getToken(state) | ||
|
|
||
| // If param value is number and node is object node, make param value a string | ||
| if (typeof params[0].value === 'number' && isObjectNode(node) && params.length === 1 && isConstantNode(params[0])) { | ||
| // Number constructor is first used to manage situations of numbers with preceding zero digit(s) | ||
| params[0].value = String(Number(params[0].value)) | ||
|
||
| } | ||
|
|
||
| node = new AccessorNode(node, new IndexNode(params)) | ||
| } else { | ||
| // dot notation like variable.prop | ||
|
|
@@ -1615,11 +1621,11 @@ export const createParse = /* #__PURE__ */ factory(name, dependencies, ({ | |
| // parse key | ||
| if (state.token === '"' || state.token === "'") { | ||
| key = parseStringToken(state, state.token) | ||
| } else if (state.tokenType === TOKENTYPE.SYMBOL || (state.tokenType === TOKENTYPE.DELIMITER && state.token in NAMED_DELIMITERS)) { | ||
| key = state.token | ||
| } else if (state.tokenType === TOKENTYPE.SYMBOL || (state.tokenType === TOKENTYPE.DELIMITER && state.token in NAMED_DELIMITERS) || state.tokenType === TOKENTYPE.NUMBER) { | ||
| key = state.tokenType === TOKENTYPE.NUMBER ? String(Number(state.token)) : state.token | ||
| getToken(state) | ||
| } else { | ||
| throw createSyntaxError(state, 'Symbol or string expected as object key') | ||
| throw createSyntaxError(state, 'Symbol, numeric literal or string expected as object key') | ||
| } | ||
|
|
||
| // parse key/value separator | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.