@esportsplus/reactivity 0.28.0 → 0.28.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/build/compiler/array.js +23 -2
- package/package.json +1 -1
- package/src/compiler/array.ts +31 -2
package/build/compiler/array.js
CHANGED
|
@@ -1,6 +1,19 @@
|
|
|
1
1
|
import { ts } from '@esportsplus/typescript';
|
|
2
2
|
import { ast } from '@esportsplus/typescript/compiler';
|
|
3
3
|
import { COMPILER_NAMESPACE, COMPILER_TYPES } from '../constants.js';
|
|
4
|
+
function getElementTypeText(typeNode, sourceFile) {
|
|
5
|
+
if (ts.isArrayTypeNode(typeNode)) {
|
|
6
|
+
return typeNode.elementType.getText(sourceFile);
|
|
7
|
+
}
|
|
8
|
+
if (ts.isTypeReferenceNode(typeNode) &&
|
|
9
|
+
ts.isIdentifier(typeNode.typeName) &&
|
|
10
|
+
typeNode.typeName.text === 'Array' &&
|
|
11
|
+
typeNode.typeArguments &&
|
|
12
|
+
typeNode.typeArguments.length > 0) {
|
|
13
|
+
return typeNode.typeArguments[0].getText(sourceFile);
|
|
14
|
+
}
|
|
15
|
+
return null;
|
|
16
|
+
}
|
|
4
17
|
function isReactiveCall(node) {
|
|
5
18
|
return ts.isIdentifier(node.expression) && node.expression.text === 'reactive';
|
|
6
19
|
}
|
|
@@ -8,14 +21,22 @@ function visit(ctx, node) {
|
|
|
8
21
|
if (ts.isCallExpression(node) && isReactiveCall(node) && node.arguments.length > 0) {
|
|
9
22
|
let arg = node.arguments[0], expression = ts.isAsExpression(arg) ? arg.expression : arg;
|
|
10
23
|
if (ts.isArrayLiteralExpression(expression)) {
|
|
24
|
+
let elementType = null;
|
|
25
|
+
if (ts.isAsExpression(arg) && arg.type) {
|
|
26
|
+
elementType = getElementTypeText(arg.type, ctx.sourceFile);
|
|
27
|
+
}
|
|
28
|
+
else if (node.parent && ts.isVariableDeclaration(node.parent) && node.parent.type) {
|
|
29
|
+
elementType = getElementTypeText(node.parent.type, ctx.sourceFile);
|
|
30
|
+
}
|
|
11
31
|
if (node.parent && ts.isVariableDeclaration(node.parent) && ts.isIdentifier(node.parent.name)) {
|
|
12
32
|
ctx.bindings.set(node.parent.name.text, COMPILER_TYPES.Array);
|
|
13
33
|
}
|
|
34
|
+
let typeParam = elementType ? `<${elementType}>` : '';
|
|
14
35
|
ctx.replacements.push({
|
|
15
36
|
node,
|
|
16
37
|
generate: (sf) => expression.elements.length > 0
|
|
17
|
-
? ` new ${COMPILER_NAMESPACE}.ReactiveArray(...${expression.getText(sf)})`
|
|
18
|
-
: ` new ${COMPILER_NAMESPACE}.ReactiveArray()`
|
|
38
|
+
? ` new ${COMPILER_NAMESPACE}.ReactiveArray${typeParam}(...${expression.getText(sf)})`
|
|
39
|
+
: ` new ${COMPILER_NAMESPACE}.ReactiveArray${typeParam}()`
|
|
19
40
|
});
|
|
20
41
|
}
|
|
21
42
|
}
|
package/package.json
CHANGED
package/src/compiler/array.ts
CHANGED
|
@@ -13,6 +13,24 @@ interface VisitContext {
|
|
|
13
13
|
}
|
|
14
14
|
|
|
15
15
|
|
|
16
|
+
function getElementTypeText(typeNode: ts.TypeNode, sourceFile: ts.SourceFile): string | null {
|
|
17
|
+
if (ts.isArrayTypeNode(typeNode)) {
|
|
18
|
+
return typeNode.elementType.getText(sourceFile);
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
if (
|
|
22
|
+
ts.isTypeReferenceNode(typeNode) &&
|
|
23
|
+
ts.isIdentifier(typeNode.typeName) &&
|
|
24
|
+
typeNode.typeName.text === 'Array' &&
|
|
25
|
+
typeNode.typeArguments &&
|
|
26
|
+
typeNode.typeArguments.length > 0
|
|
27
|
+
) {
|
|
28
|
+
return typeNode.typeArguments[0].getText(sourceFile);
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
return null;
|
|
32
|
+
}
|
|
33
|
+
|
|
16
34
|
function isReactiveCall(node: ts.CallExpression): boolean {
|
|
17
35
|
return ts.isIdentifier(node.expression) && node.expression.text === 'reactive';
|
|
18
36
|
}
|
|
@@ -23,15 +41,26 @@ function visit(ctx: VisitContext, node: ts.Node): void {
|
|
|
23
41
|
expression = ts.isAsExpression(arg) ? arg.expression : arg;
|
|
24
42
|
|
|
25
43
|
if (ts.isArrayLiteralExpression(expression)) {
|
|
44
|
+
let elementType: string | null = null;
|
|
45
|
+
|
|
46
|
+
if (ts.isAsExpression(arg) && arg.type) {
|
|
47
|
+
elementType = getElementTypeText(arg.type, ctx.sourceFile);
|
|
48
|
+
}
|
|
49
|
+
else if (node.parent && ts.isVariableDeclaration(node.parent) && node.parent.type) {
|
|
50
|
+
elementType = getElementTypeText(node.parent.type, ctx.sourceFile);
|
|
51
|
+
}
|
|
52
|
+
|
|
26
53
|
if (node.parent && ts.isVariableDeclaration(node.parent) && ts.isIdentifier(node.parent.name)) {
|
|
27
54
|
ctx.bindings.set(node.parent.name.text, COMPILER_TYPES.Array);
|
|
28
55
|
}
|
|
29
56
|
|
|
57
|
+
let typeParam = elementType ? `<${elementType}>` : '';
|
|
58
|
+
|
|
30
59
|
ctx.replacements.push({
|
|
31
60
|
node,
|
|
32
61
|
generate: (sf) => expression.elements.length > 0
|
|
33
|
-
? ` new ${COMPILER_NAMESPACE}.ReactiveArray(...${expression.getText(sf)})`
|
|
34
|
-
: ` new ${COMPILER_NAMESPACE}.ReactiveArray()`
|
|
62
|
+
? ` new ${COMPILER_NAMESPACE}.ReactiveArray${typeParam}(...${expression.getText(sf)})`
|
|
63
|
+
: ` new ${COMPILER_NAMESPACE}.ReactiveArray${typeParam}()`
|
|
35
64
|
});
|
|
36
65
|
}
|
|
37
66
|
}
|