release: WRNexusJS 0.2.40
This commit is contained in:
@@ -816,35 +816,44 @@ export const REACTIVE_RUNTIME = String.raw`
|
||||
expression || "",
|
||||
).trim();
|
||||
|
||||
// Array literals containing spread:
|
||||
//
|
||||
// [...items, value]
|
||||
// [first, ...others]
|
||||
//
|
||||
/*
|
||||
* Array spread:
|
||||
*
|
||||
* [...openIndexes, index]
|
||||
*/
|
||||
if (
|
||||
source.charAt(0) === "[" &&
|
||||
source.charAt(source.length - 1) === "]" &&
|
||||
source.charAt(
|
||||
source.length - 1,
|
||||
) === "]" &&
|
||||
source.indexOf("...") !== -1
|
||||
) {
|
||||
var inner = source.slice(1, -1);
|
||||
var parts = splitTopLevel(inner, ",");
|
||||
var result = [];
|
||||
|
||||
var parts = splitTopLevel(
|
||||
inner,
|
||||
",",
|
||||
);
|
||||
|
||||
var values = [];
|
||||
|
||||
parts.forEach(function (part) {
|
||||
var valueSource = part.trim();
|
||||
var item = part.trim();
|
||||
|
||||
if (
|
||||
valueSource.indexOf("...") === 0
|
||||
item.slice(0, 3) === "..."
|
||||
) {
|
||||
var spreadValue =
|
||||
evaluateExpression(
|
||||
valueSource.slice(3),
|
||||
item.slice(3),
|
||||
read,
|
||||
);
|
||||
|
||||
if (Array.isArray(spreadValue)) {
|
||||
if (
|
||||
Array.isArray(spreadValue)
|
||||
) {
|
||||
Array.prototype.push.apply(
|
||||
result,
|
||||
values,
|
||||
spreadValue,
|
||||
);
|
||||
}
|
||||
@@ -852,9 +861,9 @@ export const REACTIVE_RUNTIME = String.raw`
|
||||
return;
|
||||
}
|
||||
|
||||
result.push(
|
||||
values.push(
|
||||
evaluateExpression(
|
||||
valueSource,
|
||||
item,
|
||||
read,
|
||||
),
|
||||
);
|
||||
@@ -862,71 +871,60 @@ export const REACTIVE_RUNTIME = String.raw`
|
||||
|
||||
return {
|
||||
matched: true,
|
||||
value: result,
|
||||
value: values,
|
||||
};
|
||||
}
|
||||
|
||||
// Array callback methods:
|
||||
//
|
||||
// items.filter((item) => item !== value)
|
||||
// items.map((item, index) => item.title)
|
||||
// items.some((item) => item.active)
|
||||
//
|
||||
/*
|
||||
* Array methods with expression callbacks:
|
||||
*
|
||||
* list.filter((item) => item !== value)
|
||||
* list.map((item, index) => item.title)
|
||||
*/
|
||||
var callbackMatch =
|
||||
/^([\s\S]+)\.(filter|map|some|every|find|findIndex)\(\s*\(\s*([A-Za-z_$][A-Za-z0-9_$]*)\s*(?:,\s*([A-Za-z_$][A-Za-z0-9_$]*))?\s*\)\s*=>\s*([\s\S]+)\s*\)$/.exec(
|
||||
/^([\s\S]+)\.(filter|map|some|every|find|findIndex)\(\s*(?:\(\s*([A-Za-z_$][A-Za-z0-9_$]*)\s*(?:,\s*([A-Za-z_$][A-Za-z0-9_$]*))?\s*\)|([A-Za-z_$][A-Za-z0-9_$]*))\s*=>\s*([\s\S]+)\)$/.exec(
|
||||
source,
|
||||
);
|
||||
|
||||
if (!callbackMatch) {
|
||||
callbackMatch =
|
||||
/^([\s\S]+)\.(filter|map|some|every|find|findIndex)\(\s*([A-Za-z_$][A-Za-z0-9_$]*)\s*=>\s*([\s\S]+)\s*\)$/.exec(
|
||||
source,
|
||||
);
|
||||
|
||||
if (callbackMatch) {
|
||||
callbackMatch = [
|
||||
callbackMatch[0],
|
||||
callbackMatch[1],
|
||||
callbackMatch[2],
|
||||
callbackMatch[3],
|
||||
undefined,
|
||||
callbackMatch[4],
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
if (callbackMatch) {
|
||||
var collection =
|
||||
evaluateExpression(
|
||||
callbackMatch[1],
|
||||
callbackMatch[1].trim(),
|
||||
read,
|
||||
);
|
||||
|
||||
var method = callbackMatch[2];
|
||||
var itemName = callbackMatch[3];
|
||||
var indexName = callbackMatch[4];
|
||||
var body = callbackMatch[5];
|
||||
|
||||
var itemName =
|
||||
callbackMatch[3] ||
|
||||
callbackMatch[5];
|
||||
|
||||
var indexName =
|
||||
callbackMatch[4];
|
||||
|
||||
var callbackBody =
|
||||
callbackMatch[6].trim();
|
||||
|
||||
if (!Array.isArray(collection)) {
|
||||
collection = [];
|
||||
}
|
||||
|
||||
var callback = function (
|
||||
item,
|
||||
index,
|
||||
itemValue,
|
||||
itemIndex,
|
||||
) {
|
||||
return evaluateExpression(
|
||||
body,
|
||||
callbackBody,
|
||||
function (name) {
|
||||
if (name === itemName) {
|
||||
return item;
|
||||
return itemValue;
|
||||
}
|
||||
|
||||
if (
|
||||
indexName &&
|
||||
name === indexName
|
||||
) {
|
||||
return index;
|
||||
return itemIndex;
|
||||
}
|
||||
|
||||
return read(name);
|
||||
@@ -934,22 +932,31 @@ export const REACTIVE_RUNTIME = String.raw`
|
||||
);
|
||||
};
|
||||
|
||||
var result;
|
||||
|
||||
if (method === "filter") {
|
||||
result =
|
||||
collection.filter(callback);
|
||||
} else if (method === "map") {
|
||||
result =
|
||||
collection.map(callback);
|
||||
} else if (method === "some") {
|
||||
result =
|
||||
collection.some(callback);
|
||||
} else if (method === "every") {
|
||||
result =
|
||||
collection.every(callback);
|
||||
} else if (method === "find") {
|
||||
result =
|
||||
collection.find(callback);
|
||||
} else {
|
||||
result =
|
||||
collection.findIndex(callback);
|
||||
}
|
||||
|
||||
return {
|
||||
matched: true,
|
||||
value:
|
||||
method === "filter"
|
||||
? collection.filter(callback)
|
||||
: method === "map"
|
||||
? collection.map(callback)
|
||||
: method === "some"
|
||||
? collection.some(callback)
|
||||
: method === "every"
|
||||
? collection.every(callback)
|
||||
: method === "find"
|
||||
? collection.find(callback)
|
||||
: collection.findIndex(
|
||||
callback,
|
||||
),
|
||||
value: result,
|
||||
};
|
||||
}
|
||||
|
||||
@@ -963,7 +970,10 @@ export const REACTIVE_RUNTIME = String.raw`
|
||||
// 'unsafe-eval'). Supports: literals, identifiers, member access (a.b, a[b]),
|
||||
// function/method calls, arrays, objects, arithmetic, comparison, equality,
|
||||
// logical (&& ||), unary (! - +), and the ternary operator.
|
||||
function evaluateExpression(expr, read) {
|
||||
function evaluateExpression(
|
||||
expr,
|
||||
read,
|
||||
) {
|
||||
expr = String(expr || "").trim();
|
||||
|
||||
var special =
|
||||
|
||||
Reference in New Issue
Block a user