jsxpression 0.1.27 → 0.1.29
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/README.md +155 -188
- package/lib/analyze/analysis-report.d.ts +2 -2
- package/lib/analyze/analysis-report.d.ts.map +1 -1
- package/lib/analyze/analysis-report.js +4 -0
- package/lib/analyze/analysis-report.js.map +1 -1
- package/lib/analyze/data/data-access.d.ts.map +1 -1
- package/lib/analyze/data/data-access.js +45 -82
- package/lib/analyze/data/data-access.js.map +1 -1
- package/lib/analyze/data/method-calls.d.ts.map +1 -1
- package/lib/analyze/data/method-calls.js +4 -3
- package/lib/analyze/data/method-calls.js.map +1 -1
- package/lib/analyze/data/utils.d.ts +2 -3
- package/lib/analyze/data/utils.d.ts.map +1 -1
- package/lib/analyze/data/utils.js +10 -36
- package/lib/analyze/data/utils.js.map +1 -1
- package/lib/analyze/jsx/element-attributes.d.ts +1 -1
- package/lib/analyze/jsx/element-attributes.d.ts.map +1 -1
- package/lib/analyze/jsx/element-attributes.js +13 -3
- package/lib/analyze/jsx/element-attributes.js.map +1 -1
- package/lib/analyze/jsx/element-children.d.ts +1 -1
- package/lib/analyze/jsx/element-children.d.ts.map +1 -1
- package/lib/analyze/jsx/element-children.js +16 -5
- package/lib/analyze/jsx/element-children.js.map +1 -1
- package/lib/analyze/jsx/element-tags.d.ts +1 -1
- package/lib/analyze/jsx/element-tags.d.ts.map +1 -1
- package/lib/analyze/jsx/element-tags.js +12 -2
- package/lib/analyze/jsx/element-tags.js.map +1 -1
- package/lib/analyze/security/analyze.d.ts.map +1 -1
- package/lib/analyze/security/analyze.js +2 -4
- package/lib/analyze/security/analyze.js.map +1 -1
- package/lib/analyze/security/call-expressions.d.ts +2 -2
- package/lib/analyze/security/call-expressions.d.ts.map +1 -1
- package/lib/analyze/security/call-expressions.js +21 -5
- package/lib/analyze/security/call-expressions.js.map +1 -1
- package/lib/analyze/security/declarations.d.ts +1 -1
- package/lib/analyze/security/declarations.d.ts.map +1 -1
- package/lib/analyze/security/declarations.js +22 -2
- package/lib/analyze/security/declarations.js.map +1 -1
- package/lib/analyze/security/expressions.d.ts.map +1 -1
- package/lib/analyze/security/expressions.js +10 -2
- package/lib/analyze/security/expressions.js.map +1 -1
- package/lib/analyze/security/identifiers.d.ts +2 -2
- package/lib/analyze/security/identifiers.d.ts.map +1 -1
- package/lib/analyze/security/identifiers.js +159 -19
- package/lib/analyze/security/identifiers.js.map +1 -1
- package/lib/builtins.d.ts.map +1 -1
- package/lib/builtins.js +5 -0
- package/lib/builtins.js.map +1 -1
- package/lib/codegen/schema/utils.d.ts.map +1 -1
- package/lib/codegen/schema/utils.js +7 -1
- package/lib/codegen/schema/utils.js.map +1 -1
- package/lib/compile/compile.d.ts.map +1 -1
- package/lib/compile/compile.js +131 -61
- package/lib/compile/compile.js.map +1 -1
- package/lib/evaluate/evaluate.d.ts +3 -3
- package/lib/evaluate/evaluate.d.ts.map +1 -1
- package/lib/evaluate/evaluate.js +28 -7
- package/lib/evaluate/evaluate.js.map +1 -1
- package/lib/jsx.d.ts +2 -19
- package/lib/jsx.d.ts.map +1 -1
- package/lib/jsx.js +0 -6
- package/lib/jsx.js.map +1 -1
- package/lib/parse/parse.d.ts.map +1 -1
- package/lib/parse/parse.js +4 -3
- package/lib/parse/parse.js.map +1 -1
- package/lib/render.d.ts +4 -4
- package/lib/render.d.ts.map +1 -1
- package/lib/render.js +7 -9
- package/lib/render.js.map +1 -1
- package/lib/schema.d.ts +2 -7
- package/lib/schema.d.ts.map +1 -1
- package/lib/schema.js +0 -43
- package/lib/schema.js.map +1 -1
- package/lib/traverse.d.ts +4 -4
- package/lib/traverse.d.ts.map +1 -1
- package/lib/traverse.js +118 -40
- package/lib/traverse.js.map +1 -1
- package/lib/validate.d.ts +1 -1
- package/lib/validate.js +1 -1
- package/package.json +4 -3
- package/src/analyze/analysis-report.ts +6 -2
- package/src/analyze/analyze.test.ts +108 -69
- package/src/analyze/data/data-access.ts +45 -90
- package/src/analyze/data/method-calls.ts +4 -3
- package/src/analyze/data/utils.ts +11 -40
- package/src/analyze/jsx/element-attributes.ts +24 -9
- package/src/analyze/jsx/element-children.ts +20 -6
- package/src/analyze/jsx/element-tags.ts +15 -3
- package/src/analyze/security/analyze.ts +1 -3
- package/src/analyze/security/call-expressions.ts +37 -17
- package/src/analyze/security/declarations.ts +35 -9
- package/src/analyze/security/expressions.ts +17 -3
- package/src/analyze/security/identifiers.ts +172 -28
- package/src/builtins.ts +6 -0
- package/src/codegen/generate-typescript-definitions.test.ts +16 -23
- package/src/codegen/schema/utils.ts +9 -1
- package/src/compile/compile.test.ts +153 -30
- package/src/compile/compile.ts +163 -73
- package/src/evaluate/evaluate.test.ts +276 -14
- package/src/evaluate/evaluate.ts +34 -10
- package/src/jsx.ts +2 -31
- package/src/parse/parse.test.ts +4 -4
- package/src/parse/parse.ts +4 -3
- package/src/render.test.ts +476 -27
- package/src/render.ts +7 -14
- package/src/schema.ts +1 -55
- package/src/traverse.ts +135 -49
- package/src/validate.ts +1 -1
- package/LICENSE +0 -21
- package/lib/analyze/analyze.test.d.ts +0 -2
- package/lib/analyze/analyze.test.d.ts.map +0 -1
- package/lib/analyze/analyze.test.js +0 -763
- package/lib/analyze/analyze.test.js.map +0 -1
- package/lib/analyze/security/member-access.d.ts +0 -6
- package/lib/codegen/generate-typescript-definitions.test.d.ts +0 -2
- package/lib/codegen/generate-typescript-definitions.test.d.ts.map +0 -1
- package/lib/codegen/generate-typescript-definitions.test.js +0 -649
- package/lib/codegen/generate-typescript-definitions.test.js.map +0 -1
- package/lib/compile/compile.test.d.ts +0 -2
- package/lib/compile/compile.test.d.ts.map +0 -1
- package/lib/compile/compile.test.js +0 -146
- package/lib/compile/compile.test.js.map +0 -1
- package/lib/evaluate/evaluate.test.d.ts +0 -2
- package/lib/evaluate/evaluate.test.d.ts.map +0 -1
- package/lib/evaluate/evaluate.test.js +0 -260
- package/lib/evaluate/evaluate.test.js.map +0 -1
- package/lib/parse/parse.test.d.ts +0 -2
- package/lib/parse/parse.test.d.ts.map +0 -1
- package/lib/parse/parse.test.js +0 -80
- package/lib/parse/parse.test.js.map +0 -1
- package/lib/render.test.d.ts +0 -2
- package/lib/render.test.d.ts.map +0 -1
- package/lib/render.test.js +0 -301
- package/lib/render.test.js.map +0 -1
- package/lib/traverse.test.d.ts +0 -2
- package/lib/traverse.test.d.ts.map +0 -1
- package/lib/traverse.test.js +0 -84
- package/lib/traverse.test.js.map +0 -1
- package/lib/types.d.ts +0 -12
- package/src/analyze/security/member-access.ts +0 -35
- package/src/types.ts +0 -17
|
@@ -1,9 +1,10 @@
|
|
|
1
1
|
import { traverse } from "../../traverse.js";
|
|
2
2
|
import { AnalysisReport } from "../analysis-report.js";
|
|
3
|
-
import { isSimpleDataAccess, extractPath,
|
|
3
|
+
import { isSimpleDataAccess, extractPath, validateSchemaPath } from "./utils.js";
|
|
4
4
|
import { getNodeRange } from "../utils.js";
|
|
5
5
|
export function analyzeDataAccess(ast, schema, validationContext) {
|
|
6
6
|
const analysisReport = new AnalysisReport();
|
|
7
|
+
const dataKeys = new Set(Object.keys(schema.data ?? {}));
|
|
7
8
|
const dataPaths = new Set();
|
|
8
9
|
const arrowFunctionContexts = new Map();
|
|
9
10
|
// First pass: collect all data paths and arrow function contexts (including nested ones)
|
|
@@ -55,9 +56,9 @@ export function analyzeDataAccess(ast, schema, validationContext) {
|
|
|
55
56
|
}
|
|
56
57
|
traverse(ast, {
|
|
57
58
|
MemberExpression(node) {
|
|
58
|
-
if (isSimpleDataAccess(node)) {
|
|
59
|
+
if (isSimpleDataAccess(node, dataKeys)) {
|
|
59
60
|
const path = extractPath(node);
|
|
60
|
-
if (path[0]
|
|
61
|
+
if (dataKeys.has(path[0])) {
|
|
61
62
|
dataPaths.add(path.join("."));
|
|
62
63
|
}
|
|
63
64
|
}
|
|
@@ -65,6 +66,7 @@ export function analyzeDataAccess(ast, schema, validationContext) {
|
|
|
65
66
|
});
|
|
66
67
|
// Collect all arrow function contexts including nested ones
|
|
67
68
|
collectArrowFunctionContexts(ast);
|
|
69
|
+
const parentMap = buildParentMap(ast);
|
|
68
70
|
const validatablePaths = new Set();
|
|
69
71
|
for (const path of dataPaths) {
|
|
70
72
|
let hasLongerPath = false;
|
|
@@ -81,12 +83,12 @@ export function analyzeDataAccess(ast, schema, validationContext) {
|
|
|
81
83
|
// Second pass: validate with context awareness
|
|
82
84
|
traverse(ast, {
|
|
83
85
|
MemberExpression(node) {
|
|
84
|
-
const parent =
|
|
86
|
+
const parent = parentMap.get(node);
|
|
85
87
|
if (parent && parent.type === "CallExpression" && parent.callee === node) {
|
|
86
88
|
return;
|
|
87
89
|
}
|
|
88
90
|
// Check if this is inside an arrow function with parameter context
|
|
89
|
-
const arrowFunctionContext =
|
|
91
|
+
const arrowFunctionContext = findEnclosingArrowContext(node, arrowFunctionContexts);
|
|
90
92
|
if (arrowFunctionContext && node.object.type === "Identifier") {
|
|
91
93
|
const paramType = arrowFunctionContext.get(node.object.name);
|
|
92
94
|
if (paramType) {
|
|
@@ -94,13 +96,12 @@ export function analyzeDataAccess(ast, schema, validationContext) {
|
|
|
94
96
|
return;
|
|
95
97
|
}
|
|
96
98
|
}
|
|
97
|
-
if (isSimpleDataAccess(node)) {
|
|
99
|
+
if (isSimpleDataAccess(node, dataKeys)) {
|
|
98
100
|
const path = extractPath(node);
|
|
99
|
-
if (path[0]
|
|
101
|
+
if (dataKeys.has(path[0])) {
|
|
100
102
|
const pathString = path.join(".");
|
|
101
103
|
if (validatablePaths.has(pathString)) {
|
|
102
|
-
|
|
103
|
-
validateSchemaPath(schemaPath, schema, analysisReport, node, validationContext);
|
|
104
|
+
validateSchemaPath(path, schema, analysisReport, node, validationContext);
|
|
104
105
|
}
|
|
105
106
|
}
|
|
106
107
|
}
|
|
@@ -108,52 +109,28 @@ export function analyzeDataAccess(ast, schema, validationContext) {
|
|
|
108
109
|
});
|
|
109
110
|
return analysisReport;
|
|
110
111
|
}
|
|
111
|
-
function
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
|
|
116
|
-
|
|
117
|
-
|
|
118
|
-
if (result?.found) {
|
|
119
|
-
return { arrowFunction: node, depth: result.depth };
|
|
112
|
+
function findEnclosingArrowContext(targetNode, arrowFunctionContexts) {
|
|
113
|
+
let best = null;
|
|
114
|
+
for (const arrowFn of arrowFunctionContexts.keys()) {
|
|
115
|
+
if (targetNode.start >= arrowFn.start && targetNode.end <= arrowFn.end) {
|
|
116
|
+
const size = arrowFn.end - arrowFn.start;
|
|
117
|
+
if (!best || size < best.size) {
|
|
118
|
+
best = { arrowFn, size };
|
|
120
119
|
}
|
|
121
120
|
}
|
|
122
|
-
for (const key of Object.keys(node)) {
|
|
123
|
-
const value = node[key];
|
|
124
|
-
if (value && typeof value === "object") {
|
|
125
|
-
if (Array.isArray(value)) {
|
|
126
|
-
for (const child of value) {
|
|
127
|
-
if (child && typeof child === "object" && child.type) {
|
|
128
|
-
const result = findInNode(child, depth);
|
|
129
|
-
if (result?.found || result?.arrowFunction) {
|
|
130
|
-
return result;
|
|
131
|
-
}
|
|
132
|
-
}
|
|
133
|
-
}
|
|
134
|
-
}
|
|
135
|
-
else if (value.type) {
|
|
136
|
-
const result = findInNode(value, depth);
|
|
137
|
-
if (result?.found || result?.arrowFunction) {
|
|
138
|
-
return result;
|
|
139
|
-
}
|
|
140
|
-
}
|
|
141
|
-
}
|
|
142
|
-
}
|
|
143
|
-
return null;
|
|
144
121
|
}
|
|
145
|
-
|
|
146
|
-
return result?.arrowFunction ? arrowFunctionContexts.get(result.arrowFunction) || null : null;
|
|
122
|
+
return best ? arrowFunctionContexts.get(best.arrowFn) || null : null;
|
|
147
123
|
}
|
|
148
124
|
function getArrayElementTypeFromCall(node, schema, arrowFunctionContexts) {
|
|
149
125
|
const { callee } = node;
|
|
126
|
+
const dataKeys = new Set(Object.keys(schema.data ?? {}));
|
|
150
127
|
if (callee.type !== "MemberExpression") {
|
|
151
128
|
return null;
|
|
152
129
|
}
|
|
153
|
-
if (isSimpleDataAccess(callee)) {
|
|
130
|
+
if (isSimpleDataAccess(callee, dataKeys)) {
|
|
154
131
|
const path = extractPath(callee);
|
|
155
|
-
if (path[0]
|
|
156
|
-
const schemaPath = path.slice(
|
|
132
|
+
if (dataKeys.has(path[0])) {
|
|
133
|
+
const schemaPath = path.slice(0, -1); // Remove method name
|
|
157
134
|
const arraySchema = getSchemaAtPath(schemaPath, schema);
|
|
158
135
|
if (arraySchema?.type === "array") {
|
|
159
136
|
return getArrayElementType(arraySchema);
|
|
@@ -176,13 +153,6 @@ function getArrayElementTypeFromCall(node, schema, arrowFunctionContexts) {
|
|
|
176
153
|
return getArrayElementType(propertySchema);
|
|
177
154
|
}
|
|
178
155
|
}
|
|
179
|
-
// Fallback: try to find any matching property in schema
|
|
180
|
-
if (propertyName === "items" || propertyName === "employees") {
|
|
181
|
-
const itemsArraySchema = findArrayPropertyInSchema(schema, propertyName);
|
|
182
|
-
if (itemsArraySchema) {
|
|
183
|
-
return getArrayElementType(itemsArraySchema);
|
|
184
|
-
}
|
|
185
|
-
}
|
|
186
156
|
}
|
|
187
157
|
}
|
|
188
158
|
return null;
|
|
@@ -206,36 +176,6 @@ function isNodeInsideArrowFunction(targetNode, arrowFunction) {
|
|
|
206
176
|
}
|
|
207
177
|
return false;
|
|
208
178
|
}
|
|
209
|
-
function findArrayPropertyInSchema(schema, propertyName) {
|
|
210
|
-
function searchInObject(obj) {
|
|
211
|
-
if (!obj || typeof obj !== "object")
|
|
212
|
-
return null;
|
|
213
|
-
if (obj.type === "object" && obj.shape) {
|
|
214
|
-
// Check if this object has the property we're looking for
|
|
215
|
-
if (obj.shape[propertyName] && obj.shape[propertyName].type === "array") {
|
|
216
|
-
return obj.shape[propertyName];
|
|
217
|
-
}
|
|
218
|
-
// Recursively search in nested objects
|
|
219
|
-
for (const key of Object.keys(obj.shape)) {
|
|
220
|
-
const result = searchInObject(obj.shape[key]);
|
|
221
|
-
if (result)
|
|
222
|
-
return result;
|
|
223
|
-
}
|
|
224
|
-
}
|
|
225
|
-
if (obj.type === "array" && obj.shape) {
|
|
226
|
-
return searchInObject(obj.shape);
|
|
227
|
-
}
|
|
228
|
-
return null;
|
|
229
|
-
}
|
|
230
|
-
if (!schema.data)
|
|
231
|
-
return null;
|
|
232
|
-
for (const key of Object.keys(schema.data)) {
|
|
233
|
-
const result = searchInObject(schema.data[key]);
|
|
234
|
-
if (result)
|
|
235
|
-
return result;
|
|
236
|
-
}
|
|
237
|
-
return null;
|
|
238
|
-
}
|
|
239
179
|
function getSchemaAtPath(path, schema) {
|
|
240
180
|
if (!schema.data || path.length === 0) {
|
|
241
181
|
return schema.data;
|
|
@@ -268,4 +208,27 @@ function validateParameterAccess(node, paramType, analysisReport, validationCont
|
|
|
268
208
|
export function getArrayElementType(schema) {
|
|
269
209
|
return schema.shape || null;
|
|
270
210
|
}
|
|
211
|
+
function buildParentMap(ast) {
|
|
212
|
+
const map = new Map();
|
|
213
|
+
function visit(node, parent) {
|
|
214
|
+
if (!node || typeof node !== "object" || !node.type)
|
|
215
|
+
return;
|
|
216
|
+
map.set(node, parent);
|
|
217
|
+
for (const key of Object.keys(node)) {
|
|
218
|
+
const value = node[key];
|
|
219
|
+
if (value && typeof value === "object") {
|
|
220
|
+
if (Array.isArray(value)) {
|
|
221
|
+
for (const child of value) {
|
|
222
|
+
visit(child, node);
|
|
223
|
+
}
|
|
224
|
+
}
|
|
225
|
+
else {
|
|
226
|
+
visit(value, node);
|
|
227
|
+
}
|
|
228
|
+
}
|
|
229
|
+
}
|
|
230
|
+
}
|
|
231
|
+
visit(ast, null);
|
|
232
|
+
return map;
|
|
233
|
+
}
|
|
271
234
|
//# sourceMappingURL=data-access.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-access.js","sourceRoot":"","sources":["../../../src/analyze/data/data-access.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAG7C,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,
|
|
1
|
+
{"version":3,"file":"data-access.js","sourceRoot":"","sources":["../../../src/analyze/data/data-access.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"method-calls.d.ts","sourceRoot":"","sources":["../../../src/analyze/data/method-calls.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAErC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAIvD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,iBAAiB,GAAG,cAAc,
|
|
1
|
+
{"version":3,"file":"method-calls.d.ts","sourceRoot":"","sources":["../../../src/analyze/data/method-calls.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAErC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAE9C,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAC7D,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAIvD,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,iBAAiB,GAAG,cAAc,CAuFrH"}
|
|
@@ -5,15 +5,16 @@ import { isSimpleDataAccess, extractPath, validateSchemaPath } from "./utils.js"
|
|
|
5
5
|
import { getNodeRange } from "../utils.js";
|
|
6
6
|
export function analyzeMethodCalls(ast, schema, validationContext) {
|
|
7
7
|
const analysisReport = new AnalysisReport();
|
|
8
|
+
const dataKeys = new Set(Object.keys(schema.data ?? {}));
|
|
8
9
|
traverse(ast, {
|
|
9
10
|
CallExpression(node) {
|
|
10
11
|
const { callee, arguments: args } = node;
|
|
11
12
|
if (callee.type === "MemberExpression" && !callee.computed && callee.property.type === "Identifier") {
|
|
12
13
|
const method = callee.property.name;
|
|
13
|
-
if (isSimpleDataAccess(callee)) {
|
|
14
|
+
if (isSimpleDataAccess(callee, dataKeys)) {
|
|
14
15
|
const path = extractPath(callee);
|
|
15
|
-
if (path[0]
|
|
16
|
-
const schemaPath = path.slice(
|
|
16
|
+
if (dataKeys.has(path[0])) {
|
|
17
|
+
const schemaPath = path.slice(0, -1);
|
|
17
18
|
if (schemaPath.length > 0) {
|
|
18
19
|
validateSchemaPath(schemaPath, schema, analysisReport, callee, validationContext);
|
|
19
20
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"method-calls.js","sourceRoot":"","sources":["../../../src/analyze/data/method-calls.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,eAAe,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,mBAAmB,CAAC;AAE/F,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAE3C,MAAM,UAAU,kBAAkB,CAAC,GAAY,EAAE,MAAc,EAAE,iBAAoC;IACnG,MAAM,cAAc,GAAG,IAAI,cAAc,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"method-calls.js","sourceRoot":"","sources":["../../../src/analyze/data/method-calls.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,9 @@
|
|
|
1
|
-
import type { MemberExpression
|
|
1
|
+
import type { MemberExpression } from "acorn";
|
|
2
2
|
import { Schema } from "../../schema.js";
|
|
3
3
|
import { AnalysisReport } from "../analysis-report.js";
|
|
4
4
|
import { ValidationContext } from "../validation-context.js";
|
|
5
|
-
export declare function isSimpleDataAccess(node: MemberExpression): boolean;
|
|
5
|
+
export declare function isSimpleDataAccess(node: MemberExpression, dataKeys: ReadonlySet<string>): boolean;
|
|
6
6
|
export declare function extractPath(node: MemberExpression): string[];
|
|
7
|
-
export declare function getParentNode(targetNode: any, ast: Program): any | null;
|
|
8
7
|
export declare function getAvailablePropsAtPath(path: string[], depth: number, schemaData: any): string[];
|
|
9
8
|
export declare function validateSchemaPath(path: string[], schema: Schema, analysisReport: AnalysisReport, node: MemberExpression, validationContext: ValidationContext): void;
|
|
10
9
|
//# sourceMappingURL=utils.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/analyze/data/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/analyze/data/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,OAAO,CAAC;AAO9C,OAAO,EAAE,MAAM,EAAuC,MAAM,iBAAiB,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAE7D,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,OAAO,CA8BjG;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,gBAAgB,GAAG,MAAM,EAAE,CA0B5D;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,GAAG,GAAG,MAAM,EAAE,CAuBhG;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,MAAM,EAAE,EACd,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,cAAc,EAC9B,IAAI,EAAE,gBAAgB,EACtB,iBAAiB,EAAE,iBAAiB,GACnC,IAAI,CAqKN"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { isAllowedOnArray, isAllowedOnString, getAvailableArrayMembers, getAvailableStringMembers, } from "../../builtins.js";
|
|
2
2
|
import { getNodeRange } from "../utils.js";
|
|
3
|
-
export function isSimpleDataAccess(node) {
|
|
3
|
+
export function isSimpleDataAccess(node, dataKeys) {
|
|
4
4
|
if (node.computed) {
|
|
5
5
|
return node.property.type === "Literal" && typeof node.property.value === "number";
|
|
6
6
|
}
|
|
@@ -10,7 +10,7 @@ export function isSimpleDataAccess(node) {
|
|
|
10
10
|
let current = node.object;
|
|
11
11
|
while (current) {
|
|
12
12
|
if (current.type === "Identifier") {
|
|
13
|
-
return current.name
|
|
13
|
+
return dataKeys.has(current.name);
|
|
14
14
|
}
|
|
15
15
|
if (current.type === "MemberExpression") {
|
|
16
16
|
if (current.computed) {
|
|
@@ -52,32 +52,6 @@ export function extractPath(node) {
|
|
|
52
52
|
}
|
|
53
53
|
return path;
|
|
54
54
|
}
|
|
55
|
-
export function getParentNode(targetNode, ast) {
|
|
56
|
-
let parent = null;
|
|
57
|
-
function traverseForParent(node, currentParent = null) {
|
|
58
|
-
if (node === targetNode) {
|
|
59
|
-
parent = currentParent;
|
|
60
|
-
return;
|
|
61
|
-
}
|
|
62
|
-
for (const key of Object.keys(node)) {
|
|
63
|
-
const value = node[key];
|
|
64
|
-
if (value && typeof value === "object") {
|
|
65
|
-
if (Array.isArray(value)) {
|
|
66
|
-
value.forEach((child) => {
|
|
67
|
-
if (child && typeof child === "object" && child.type) {
|
|
68
|
-
traverseForParent(child, node);
|
|
69
|
-
}
|
|
70
|
-
});
|
|
71
|
-
}
|
|
72
|
-
else if (value.type) {
|
|
73
|
-
traverseForParent(value, node);
|
|
74
|
-
}
|
|
75
|
-
}
|
|
76
|
-
}
|
|
77
|
-
}
|
|
78
|
-
traverseForParent(ast);
|
|
79
|
-
return parent;
|
|
80
|
-
}
|
|
81
55
|
export function getAvailablePropsAtPath(path, depth, schemaData) {
|
|
82
56
|
if (!schemaData || depth < 0) {
|
|
83
57
|
return schemaData ? Object.keys(schemaData) : [];
|
|
@@ -105,19 +79,19 @@ export function validateSchemaPath(path, schema, analysisReport, node, validatio
|
|
|
105
79
|
}
|
|
106
80
|
let current = schemaData[path[0]];
|
|
107
81
|
if (!current) {
|
|
108
|
-
analysisReport.addIssue("INVALID_DATA_ACCESS", `Property '
|
|
82
|
+
analysisReport.addIssue("INVALID_DATA_ACCESS", `Property '${path[0]}' does not exist in schema`, getNodeRange(node), validationContext.getSnapshot(), Object.keys(schemaData));
|
|
109
83
|
return;
|
|
110
84
|
}
|
|
111
85
|
const elementAccessFlags = getElementAccessFlags(node, path.length);
|
|
112
86
|
for (let i = 1; i < path.length; i++) {
|
|
113
87
|
const prop = path[i];
|
|
114
|
-
const isElementAccess = elementAccessFlags[i];
|
|
88
|
+
const isElementAccess = elementAccessFlags[i - 1];
|
|
115
89
|
if (current.type === "array") {
|
|
116
90
|
if (!isElementAccess) {
|
|
117
91
|
if (isAllowedOnArray(prop)) {
|
|
118
92
|
return;
|
|
119
93
|
}
|
|
120
|
-
const accessedPath = [
|
|
94
|
+
const accessedPath = [...path.slice(0, i), prop].join(".");
|
|
121
95
|
analysisReport.addIssue("INVALID_DATA_ACCESS", `Property '${accessedPath}' does not exist on array type`, getNodeRange(node), validationContext.getSnapshot(), getAvailableArrayMembers());
|
|
122
96
|
return;
|
|
123
97
|
}
|
|
@@ -131,7 +105,7 @@ export function validateSchemaPath(path, schema, analysisReport, node, validatio
|
|
|
131
105
|
if (!next) {
|
|
132
106
|
const paths = path.slice(0, i + 1);
|
|
133
107
|
const suggestions = Object.keys(elementType.shape);
|
|
134
|
-
analysisReport.addIssue("INVALID_DATA_ACCESS", `Property '
|
|
108
|
+
analysisReport.addIssue("INVALID_DATA_ACCESS", `Property '${paths.join(".")}' does not exist in schema`, getNodeRange(node), validationContext.getSnapshot(), suggestions);
|
|
135
109
|
return;
|
|
136
110
|
}
|
|
137
111
|
current = next;
|
|
@@ -141,7 +115,7 @@ export function validateSchemaPath(path, schema, analysisReport, node, validatio
|
|
|
141
115
|
if (isAllowedOnArray(prop)) {
|
|
142
116
|
return;
|
|
143
117
|
}
|
|
144
|
-
const accessedPath = [
|
|
118
|
+
const accessedPath = [...path.slice(0, i), prop].join(".");
|
|
145
119
|
analysisReport.addIssue("INVALID_DATA_ACCESS", `Property '${accessedPath}' does not exist on array type`, getNodeRange(node), validationContext.getSnapshot(), getAvailableArrayMembers());
|
|
146
120
|
return;
|
|
147
121
|
}
|
|
@@ -149,7 +123,7 @@ export function validateSchemaPath(path, schema, analysisReport, node, validatio
|
|
|
149
123
|
if (isAllowedOnString(prop)) {
|
|
150
124
|
return;
|
|
151
125
|
}
|
|
152
|
-
const accessedPath = [
|
|
126
|
+
const accessedPath = [...path.slice(0, i), prop].join(".");
|
|
153
127
|
analysisReport.addIssue("INVALID_DATA_ACCESS", `Property '${accessedPath}' does not exist on string type`, getNodeRange(node), validationContext.getSnapshot(), getAvailableStringMembers());
|
|
154
128
|
return;
|
|
155
129
|
}
|
|
@@ -160,7 +134,7 @@ export function validateSchemaPath(path, schema, analysisReport, node, validatio
|
|
|
160
134
|
if (isAllowedOnString(prop)) {
|
|
161
135
|
return;
|
|
162
136
|
}
|
|
163
|
-
const accessedPath = [
|
|
137
|
+
const accessedPath = [...path.slice(0, i), prop].join(".");
|
|
164
138
|
analysisReport.addIssue("INVALID_DATA_ACCESS", `Property '${accessedPath}' does not exist on string type`, getNodeRange(node), validationContext.getSnapshot(), getAvailableStringMembers());
|
|
165
139
|
return;
|
|
166
140
|
}
|
|
@@ -172,7 +146,7 @@ export function validateSchemaPath(path, schema, analysisReport, node, validatio
|
|
|
172
146
|
if (!current) {
|
|
173
147
|
const availableProps = getAvailablePropsAtPath(path, i - 1, schemaData);
|
|
174
148
|
const paths = path.slice(0, i + 1);
|
|
175
|
-
analysisReport.addIssue("INVALID_DATA_ACCESS", `Property '
|
|
149
|
+
analysisReport.addIssue("INVALID_DATA_ACCESS", `Property '${paths.join(".")}' does not exist in schema`, getNodeRange(node), validationContext.getSnapshot(), availableProps);
|
|
176
150
|
}
|
|
177
151
|
}
|
|
178
152
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/analyze/data/utils.ts"],"names":[],"mappings":"AACA,OAAO,EACL,gBAAgB,EAChB,iBAAiB,EACjB,wBAAwB,EACxB,yBAAyB,GAC1B,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAG3C,MAAM,UAAU,kBAAkB,CAAC,IAAsB;
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/analyze/data/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Program } from "acorn";
|
|
2
2
|
import { type Schema } from "../../schema.js";
|
|
3
|
-
import { ValidationContext } from "../validation-context.js";
|
|
4
3
|
import { AnalysisReport } from "../analysis-report.js";
|
|
4
|
+
import type { ValidationContext } from "../validation-context.js";
|
|
5
5
|
export declare function analyzeElementAttributes(ast: Program, schema: Schema, validationContext: ValidationContext): AnalysisReport;
|
|
6
6
|
//# sourceMappingURL=element-attributes.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"element-attributes.d.ts","sourceRoot":"","sources":["../../../src/analyze/jsx/element-attributes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAErC,OAAO,
|
|
1
|
+
{"version":3,"file":"element-attributes.d.ts","sourceRoot":"","sources":["../../../src/analyze/jsx/element-attributes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAErC,OAAO,EAML,KAAK,MAAM,EACZ,MAAM,iBAAiB,CAAC;AAEzB,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAElE,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,iBAAiB,GACnC,cAAc,CA+GhB"}
|
|
@@ -1,14 +1,24 @@
|
|
|
1
|
-
import { traverse } from "../../traverse.js";
|
|
2
|
-
import { isAttributeAllowed, getAllowedAttributes, getRequiredAttributes, getAttributeSchema, getEnumValues, } from "../../schema.js";
|
|
3
1
|
import { isJsxAttribute, isJsxExpressionContainer } from "../../jsx.js";
|
|
2
|
+
import { getAllowedAttributes, getAttributeSchema, getEnumValues, getRequiredAttributes, isAttributeAllowed, } from "../../schema.js";
|
|
3
|
+
import { traverse } from "../../traverse.js";
|
|
4
4
|
import { AnalysisReport } from "../analysis-report.js";
|
|
5
|
-
import {
|
|
5
|
+
import { getAttributeSimilarityMatchers, getBestSimilarityMatcherSuggestion, getNodeRange } from "../utils.js";
|
|
6
6
|
export function analyzeElementAttributes(ast, schema, validationContext) {
|
|
7
7
|
const analysisReport = new AnalysisReport();
|
|
8
|
+
const localFunctionNames = new Set();
|
|
9
|
+
for (const stmt of ast.body) {
|
|
10
|
+
if (stmt.type === "FunctionDeclaration" && stmt.id) {
|
|
11
|
+
localFunctionNames.add(stmt.id.name);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
8
14
|
traverse(ast, {
|
|
9
15
|
JSXElement(node) {
|
|
10
16
|
const tagName = node.openingElement.name.name;
|
|
11
17
|
validationContext.enterElement(tagName);
|
|
18
|
+
if (localFunctionNames.has(tagName)) {
|
|
19
|
+
validationContext.exitElement();
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
12
22
|
const currentContext = validationContext.getSnapshot();
|
|
13
23
|
const allowedAttributes = getAllowedAttributes(schema, tagName);
|
|
14
24
|
const requiredAttributes = getRequiredAttributes(schema, tagName);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"element-attributes.js","sourceRoot":"","sources":["../../../src/analyze/jsx/element-attributes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"element-attributes.js","sourceRoot":"","sources":["../../../src/analyze/jsx/element-attributes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { Program } from "acorn";
|
|
2
2
|
import { type Schema } from "../../schema.js";
|
|
3
|
-
import { ValidationContext } from "../validation-context.js";
|
|
4
3
|
import { AnalysisReport } from "../analysis-report.js";
|
|
4
|
+
import type { ValidationContext } from "../validation-context.js";
|
|
5
5
|
export declare function analyzeElementChildren(ast: Program, schema: Schema, validationContext: ValidationContext): AnalysisReport;
|
|
6
6
|
//# sourceMappingURL=element-children.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"element-children.d.ts","sourceRoot":"","sources":["../../../src/analyze/jsx/element-children.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAErC,OAAO,
|
|
1
|
+
{"version":3,"file":"element-children.d.ts","sourceRoot":"","sources":["../../../src/analyze/jsx/element-children.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AAErC,OAAO,EAAqC,KAAK,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEjF,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAEvD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAElE,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,MAAM,EACd,iBAAiB,EAAE,iBAAiB,GACnC,cAAc,CAkGhB"}
|
|
@@ -1,14 +1,24 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { isJsxElement, isJsxFragment, isJsxLeafNode, isJsxText } from "../../jsx.js";
|
|
2
2
|
import { getAllowedChildren, isSelfClosing } from "../../schema.js";
|
|
3
|
-
import {
|
|
3
|
+
import { traverse } from "../../traverse.js";
|
|
4
4
|
import { AnalysisReport } from "../analysis-report.js";
|
|
5
|
-
import {
|
|
5
|
+
import { getBestSimilarityMatcherSuggestion, getElementSimilarityMatchers, getNodeRange } from "../utils.js";
|
|
6
6
|
export function analyzeElementChildren(ast, schema, validationContext) {
|
|
7
7
|
const analysisReport = new AnalysisReport();
|
|
8
|
+
const localFunctionNames = new Set();
|
|
9
|
+
for (const stmt of ast.body) {
|
|
10
|
+
if (stmt.type === "FunctionDeclaration" && stmt.id) {
|
|
11
|
+
localFunctionNames.add(stmt.id.name);
|
|
12
|
+
}
|
|
13
|
+
}
|
|
8
14
|
traverse(ast, {
|
|
9
15
|
JSXElement(node) {
|
|
10
16
|
const parentTag = node.openingElement.name.name;
|
|
11
17
|
validationContext.enterElement(parentTag);
|
|
18
|
+
if (localFunctionNames.has(parentTag)) {
|
|
19
|
+
validationContext.exitElement();
|
|
20
|
+
return;
|
|
21
|
+
}
|
|
12
22
|
const currentContext = validationContext.getSnapshot();
|
|
13
23
|
const allowedChildren = getAllowedChildren(schema, parentTag);
|
|
14
24
|
if (!allowedChildren) {
|
|
@@ -35,6 +45,9 @@ export function analyzeElementChildren(ast, schema, validationContext) {
|
|
|
35
45
|
for (const child of node.children) {
|
|
36
46
|
if (isJsxElement(child)) {
|
|
37
47
|
const childTag = child.openingElement.name.name;
|
|
48
|
+
if (localFunctionNames.has(childTag)) {
|
|
49
|
+
continue;
|
|
50
|
+
}
|
|
38
51
|
if (!allowedChildren.includes(childTag)) {
|
|
39
52
|
const elementSimilarityMatchers = getElementSimilarityMatchers(childTag, allowedChildren);
|
|
40
53
|
const bestSimilarityMatcherSuggestion = getBestSimilarityMatcherSuggestion(childTag, allowedChildren);
|
|
@@ -53,8 +66,6 @@ export function analyzeElementChildren(ast, schema, validationContext) {
|
|
|
53
66
|
else if (isJsxText(child)) {
|
|
54
67
|
const hasContent = child.value.trim().length > 0;
|
|
55
68
|
if (!hasContent) {
|
|
56
|
-
// Allow whitespace-only text nodes (very common in JSX formatting)
|
|
57
|
-
continue;
|
|
58
69
|
}
|
|
59
70
|
}
|
|
60
71
|
}
|