jsxpression 0.1.40 → 0.2.0
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/lib/analyze/analysis-error.d.ts.map +1 -1
- package/lib/analyze/analysis-error.js +2 -7
- package/lib/analyze/analysis-error.js.map +1 -1
- package/lib/analyze/analysis-report.d.ts +13 -13
- package/lib/analyze/analysis-report.d.ts.map +1 -1
- package/lib/analyze/analysis-report.js +48 -45
- package/lib/analyze/analysis-report.js.map +1 -1
- package/lib/analyze/analyze.d.ts +1 -1
- package/lib/analyze/analyze.d.ts.map +1 -1
- package/lib/analyze/analyze.js +4 -4
- package/lib/analyze/analyze.js.map +1 -1
- package/lib/analyze/data/analyze.d.ts +1 -1
- package/lib/analyze/data/analyze.d.ts.map +1 -1
- package/lib/analyze/data/analyze.js +5 -5
- package/lib/analyze/data/analyze.js.map +1 -1
- package/lib/analyze/data/data-access.d.ts +1 -1
- package/lib/analyze/data/data-access.d.ts.map +1 -1
- package/lib/analyze/data/data-access.js +19 -15
- package/lib/analyze/data/data-access.js.map +1 -1
- package/lib/analyze/data/method-calls.d.ts +1 -1
- package/lib/analyze/data/method-calls.d.ts.map +1 -1
- package/lib/analyze/data/method-calls.js +5 -5
- package/lib/analyze/data/method-calls.js.map +1 -1
- package/lib/analyze/data/utils.d.ts +3 -3
- package/lib/analyze/data/utils.d.ts.map +1 -1
- package/lib/analyze/data/utils.js +6 -5
- package/lib/analyze/data/utils.js.map +1 -1
- package/lib/analyze/index.d.ts +1 -1
- package/lib/analyze/index.d.ts.map +1 -1
- package/lib/analyze/index.js +1 -1
- package/lib/analyze/index.js.map +1 -1
- package/lib/analyze/jsx/analyze.d.ts +1 -1
- package/lib/analyze/jsx/analyze.d.ts.map +1 -1
- package/lib/analyze/jsx/analyze.js +4 -4
- package/lib/analyze/jsx/analyze.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 +3 -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 +8 -9
- 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 +2 -2
- package/lib/analyze/jsx/element-tags.js.map +1 -1
- package/lib/analyze/security/analyze.d.ts +1 -1
- package/lib/analyze/security/analyze.d.ts.map +1 -1
- package/lib/analyze/security/analyze.js +4 -4
- package/lib/analyze/security/analyze.js.map +1 -1
- package/lib/analyze/security/call-expressions.d.ts +1 -1
- package/lib/analyze/security/call-expressions.d.ts.map +1 -1
- package/lib/analyze/security/call-expressions.js +3 -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 +6 -6
- package/lib/analyze/security/declarations.js.map +1 -1
- package/lib/analyze/security/expressions.d.ts +1 -1
- package/lib/analyze/security/expressions.d.ts.map +1 -1
- package/lib/analyze/security/expressions.js +3 -6
- package/lib/analyze/security/expressions.js.map +1 -1
- package/lib/analyze/security/identifiers.d.ts +1 -1
- package/lib/analyze/security/identifiers.d.ts.map +1 -1
- package/lib/analyze/security/identifiers.js +19 -22
- package/lib/analyze/security/identifiers.js.map +1 -1
- package/lib/analyze/utils.d.ts +4 -4
- package/lib/analyze/utils.d.ts.map +1 -1
- package/lib/analyze/utils.js +5 -3
- package/lib/analyze/utils.js.map +1 -1
- package/lib/analyze/validation-context.d.ts +8 -8
- package/lib/analyze/validation-context.d.ts.map +1 -1
- package/lib/analyze/validation-context.js +23 -21
- package/lib/analyze/validation-context.js.map +1 -1
- package/lib/builtins.d.ts +6 -6
- package/lib/builtins.d.ts.map +1 -1
- package/lib/builtins.js +9 -8
- package/lib/builtins.js.map +1 -1
- package/lib/codegen/builtins/builtin-types.d.ts.map +1 -1
- package/lib/codegen/builtins/builtin-types.js +9 -13
- package/lib/codegen/builtins/builtin-types.js.map +1 -1
- package/lib/codegen/generate-typescript-definitions.d.ts +18 -17
- package/lib/codegen/generate-typescript-definitions.d.ts.map +1 -1
- package/lib/codegen/generate-typescript-definitions.js +19 -23
- package/lib/codegen/generate-typescript-definitions.js.map +1 -1
- package/lib/codegen/schema/component-types.d.ts.map +1 -1
- package/lib/codegen/schema/component-types.js +7 -4
- package/lib/codegen/schema/component-types.js.map +1 -1
- package/lib/codegen/schema/data-types.d.ts.map +1 -1
- package/lib/codegen/schema/data-types.js +1 -1
- package/lib/codegen/schema/data-types.js.map +1 -1
- package/lib/codegen/schema/function-types.js.map +1 -1
- package/lib/codegen/schema/utils.d.ts +4 -3
- package/lib/codegen/schema/utils.d.ts.map +1 -1
- package/lib/codegen/schema/utils.js +12 -8
- package/lib/codegen/schema/utils.js.map +1 -1
- package/lib/compile/compilation-error.d.ts +1 -1
- package/lib/compile/compilation-error.d.ts.map +1 -1
- package/lib/compile/compilation-error.js +3 -1
- package/lib/compile/compilation-error.js.map +1 -1
- package/lib/compile/compile.d.ts.map +1 -1
- package/lib/compile/compile.js +5 -11
- package/lib/compile/compile.js.map +1 -1
- package/lib/evaluate/evaluate.d.ts +6 -6
- package/lib/evaluate/evaluate.d.ts.map +1 -1
- package/lib/evaluate/evaluate.js +2 -2
- package/lib/evaluate/evaluate.js.map +1 -1
- package/lib/evaluate/evaluation-error.d.ts.map +1 -1
- package/lib/evaluate/evaluation-error.js +1 -0
- package/lib/evaluate/evaluation-error.js.map +1 -1
- package/lib/index.d.ts.map +1 -1
- package/lib/index.js.map +1 -1
- package/lib/jsx.d.ts +3 -3
- package/lib/jsx.d.ts.map +1 -1
- package/lib/jsx.js.map +1 -1
- package/lib/parse/parse-error.d.ts.map +1 -1
- package/lib/parse/parse-error.js +1 -0
- package/lib/parse/parse-error.js.map +1 -1
- package/lib/render.d.ts +25 -33
- package/lib/render.d.ts.map +1 -1
- package/lib/render.js +21 -26
- package/lib/render.js.map +1 -1
- package/lib/schema.d.ts +9 -9
- package/lib/schema.d.ts.map +1 -1
- package/lib/schema.js +1 -1
- package/lib/schema.js.map +1 -1
- package/lib/traverse.d.ts.map +1 -1
- package/lib/traverse.js +0 -1
- package/lib/traverse.js.map +1 -1
- package/lib/validate.d.ts +14 -17
- package/lib/validate.d.ts.map +1 -1
- package/lib/validate.js +13 -14
- package/lib/validate.js.map +1 -1
- package/package.json +14 -14
- package/src/analyze/analysis-error.ts +2 -6
- package/src/analyze/analysis-report.ts +73 -62
- package/src/analyze/analyze.test.ts +14 -18
- package/src/analyze/analyze.ts +4 -4
- package/src/analyze/data/analyze.ts +5 -8
- package/src/analyze/data/data-access.ts +49 -46
- package/src/analyze/data/method-calls.ts +9 -18
- package/src/analyze/data/utils.ts +15 -19
- package/src/analyze/index.ts +1 -1
- package/src/analyze/jsx/analyze.ts +4 -4
- package/src/analyze/jsx/element-attributes.ts +6 -19
- package/src/analyze/jsx/element-children.ts +9 -13
- package/src/analyze/jsx/element-tags.ts +2 -2
- package/src/analyze/security/analyze.ts +4 -4
- package/src/analyze/security/call-expressions.ts +5 -18
- package/src/analyze/security/declarations.ts +14 -43
- package/src/analyze/security/expressions.ts +12 -49
- package/src/analyze/security/identifiers.ts +39 -41
- package/src/analyze/utils.ts +25 -19
- package/src/analyze/validation-context.ts +32 -23
- package/src/builtins.ts +28 -39
- package/src/codegen/builtins/builtin-types.ts +13 -20
- package/src/codegen/generate-typescript-definitions.test.ts +29 -29
- package/src/codegen/generate-typescript-definitions.ts +19 -23
- package/src/codegen/schema/component-types.ts +22 -12
- package/src/codegen/schema/data-types.ts +6 -6
- package/src/codegen/schema/function-types.ts +1 -1
- package/src/codegen/schema/utils.ts +24 -23
- package/src/compile/compilation-error.ts +5 -1
- package/src/compile/compile.test.ts +7 -21
- package/src/compile/compile.ts +33 -45
- package/src/evaluate/evaluate.test.ts +95 -111
- package/src/evaluate/evaluate.ts +16 -21
- package/src/evaluate/evaluation-error.ts +1 -0
- package/src/index.ts +1 -7
- package/src/jsx.ts +4 -6
- package/src/parse/parse-error.ts +1 -0
- package/src/parse/parse.test.ts +1 -1
- package/src/render.test.ts +4 -4
- package/src/render.ts +27 -39
- package/src/schema.ts +12 -12
- package/src/traverse.test.ts +6 -6
- package/src/traverse.ts +15 -16
- package/src/validate.ts +14 -17
- package/CHANGELOG.md +0 -8
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analysis-error.d.ts","sourceRoot":"","sources":["../../src/analyze/analysis-error.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"analysis-error.d.ts","sourceRoot":"","sources":["../../src/analyze/analysis-error.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAG3D,qBAAa,aAAc,SAAQ,KAAK;IACtC,MAAM,CAAC,UAAU,CAAC,MAAM,EAAE,cAAc,GAAG,aAAa,CAIvD;IAED,QAAQ,CAAC,MAAM,EAAE,cAAc,CAAC;IAEhC,YAAY,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,cAAc,EAOlD;CACF"}
|
|
@@ -1,12 +1,7 @@
|
|
|
1
|
+
// oxlint-disable-next-line functional/no-classes -- extends Error, which requires a class
|
|
1
2
|
export class AnalysisError extends Error {
|
|
2
3
|
static fromReport(report) {
|
|
3
|
-
|
|
4
|
-
if (report.errors.length === 1) {
|
|
5
|
-
message = report.errors[0].message;
|
|
6
|
-
}
|
|
7
|
-
else {
|
|
8
|
-
message = `Analysis failed (${report.errors.length} issues)`;
|
|
9
|
-
}
|
|
4
|
+
const message = report.errors.length === 1 ? report.errors[0].message : `Analysis failed (${report.errors.length} issues)`;
|
|
10
5
|
return new AnalysisError(message, report);
|
|
11
6
|
}
|
|
12
7
|
report;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analysis-error.js","sourceRoot":"","sources":["../../src/analyze/analysis-error.ts"],"names":[],"mappings":"AAEA,MAAM,OAAO,aAAc,SAAQ,KAAK;IACtC,MAAM,CAAC,UAAU,CAAC,MAAsB;QACtC,
|
|
1
|
+
{"version":3,"file":"analysis-error.js","sourceRoot":"","sources":["../../src/analyze/analysis-error.ts"],"names":[],"mappings":"AAEA,0FAA0F;AAC1F,MAAM,OAAO,aAAc,SAAQ,KAAK;IACtC,MAAM,CAAC,UAAU,CAAC,MAAsB;QACtC,MAAM,OAAO,GAAW,MAAM,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,oBAAoB,MAAM,CAAC,MAAM,CAAC,MAAM,UAAU,CAAC;QAEnI,OAAO,IAAI,aAAa,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC5C,CAAC;IAEQ,MAAM,CAAiB;IAEhC,YAAY,OAAe,EAAE,MAAsB;QACjD,KAAK,CAAC,OAAO,CAAC,CAAC;QACf,IAAI,CAAC,IAAI,GAAG,eAAe,CAAC;QAC5B,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QAErB,MAAM,gBAAgB,GAAG,KAA+E,CAAC;QACzG,gBAAgB,CAAC,iBAAiB,EAAE,CAAC,IAAI,EAAE,aAAa,CAAC,CAAC;IAC5D,CAAC;CACF"}
|
|
@@ -7,7 +7,7 @@ interface Issue {
|
|
|
7
7
|
severity: IssueSeverity;
|
|
8
8
|
custom: boolean;
|
|
9
9
|
range: Range;
|
|
10
|
-
suggestions: string
|
|
10
|
+
suggestions: Array<string>;
|
|
11
11
|
snapshot: ValidationContextSnapshot;
|
|
12
12
|
}
|
|
13
13
|
interface IssueDefinition {
|
|
@@ -16,18 +16,18 @@ interface IssueDefinition {
|
|
|
16
16
|
}
|
|
17
17
|
declare const ISSUES_DEFINITIONS: Record<string, IssueDefinition>;
|
|
18
18
|
export type IssueCode = keyof typeof ISSUES_DEFINITIONS;
|
|
19
|
-
export
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
merge(...analysisReports: AnalysisReport[]): this;
|
|
19
|
+
export interface AnalysisReport {
|
|
20
|
+
readonly issues: Array<Issue>;
|
|
21
|
+
readonly errors: Array<Issue>;
|
|
22
|
+
readonly warnings: Array<Issue>;
|
|
23
|
+
readonly infos: Array<Issue>;
|
|
24
|
+
readonly hasErrors: boolean;
|
|
25
|
+
readonly hasWarnings: boolean;
|
|
26
|
+
readonly hasInfos: boolean;
|
|
27
|
+
addIssue: (code: IssueCode, message: string, range: Range, snapshot: ValidationContextSnapshot, suggestions?: Array<string>) => void;
|
|
28
|
+
hasIssues: (minSeverity?: IssueSeverity) => boolean;
|
|
29
|
+
merge: (...analysisReports: Array<AnalysisReport>) => AnalysisReport;
|
|
31
30
|
}
|
|
31
|
+
export declare function createAnalysisReport(): AnalysisReport;
|
|
32
32
|
export {};
|
|
33
33
|
//# sourceMappingURL=analysis-report.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analysis-report.d.ts","sourceRoot":"","sources":["../../src/analyze/analysis-report.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAEzE,KAAK,aAAa,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAE/B,UAAU,KAAK;IACb,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,aAAa,CAAC;IACxB,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"analysis-report.d.ts","sourceRoot":"","sources":["../../src/analyze/analysis-report.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,YAAY,CAAC;AACxC,OAAO,KAAK,EAAE,yBAAyB,EAAE,MAAM,yBAAyB,CAAC;AAEzE,KAAK,aAAa,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;AAE/B,UAAU,KAAK;IACb,IAAI,EAAE,SAAS,CAAC;IAChB,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,aAAa,CAAC;IACxB,MAAM,EAAE,OAAO,CAAC;IAChB,KAAK,EAAE,KAAK,CAAC;IACb,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAC3B,QAAQ,EAAE,yBAAyB,CAAC;CACrC;AAED,UAAU,eAAe;IACvB,QAAQ,EAAE,aAAa,CAAC;IACxB,MAAM,EAAE,OAAO,CAAC;CACjB;AAED,QAAA,MAAM,kBAAkB,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAiJ9C,CAAC;AAEX,MAAM,MAAM,SAAS,GAAG,MAAM,OAAO,kBAAkB,CAAC;AAExD,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAChC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC,CAAC;IAC7B,QAAQ,CAAC,SAAS,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC;IAC9B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,EAAE,CAAC,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,EAAE,QAAQ,EAAE,yBAAyB,EAAE,WAAW,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC;IACrI,SAAS,EAAE,CAAC,WAAW,CAAC,EAAE,aAAa,KAAK,OAAO,CAAC;IACpD,KAAK,EAAE,CAAC,GAAG,eAAe,EAAE,KAAK,CAAC,cAAc,CAAC,KAAK,cAAc,CAAC;CACtE;AAED,wBAAgB,oBAAoB,IAAI,cAAc,CA4DrD"}
|
|
@@ -144,51 +144,54 @@ const ISSUES_DEFINITIONS = {
|
|
|
144
144
|
custom: true,
|
|
145
145
|
},
|
|
146
146
|
};
|
|
147
|
-
export
|
|
148
|
-
|
|
149
|
-
|
|
150
|
-
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
157
|
-
|
|
158
|
-
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
|
|
162
|
-
|
|
163
|
-
|
|
164
|
-
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
|
|
183
|
-
|
|
184
|
-
|
|
185
|
-
|
|
186
|
-
|
|
187
|
-
for (const
|
|
188
|
-
|
|
147
|
+
export function createAnalysisReport() {
|
|
148
|
+
const issues = [];
|
|
149
|
+
const self = {
|
|
150
|
+
get issues() {
|
|
151
|
+
return issues.slice();
|
|
152
|
+
},
|
|
153
|
+
get errors() {
|
|
154
|
+
return issues.filter((issue) => issue.severity === 3);
|
|
155
|
+
},
|
|
156
|
+
get warnings() {
|
|
157
|
+
return issues.filter((issue) => issue.severity === 2);
|
|
158
|
+
},
|
|
159
|
+
get infos() {
|
|
160
|
+
return issues.filter((issue) => issue.severity === 1);
|
|
161
|
+
},
|
|
162
|
+
get hasErrors() {
|
|
163
|
+
return self.errors.length > 0;
|
|
164
|
+
},
|
|
165
|
+
get hasWarnings() {
|
|
166
|
+
return self.warnings.length > 0;
|
|
167
|
+
},
|
|
168
|
+
get hasInfos() {
|
|
169
|
+
return self.infos.length > 0;
|
|
170
|
+
},
|
|
171
|
+
addIssue(code, message, range, snapshot, suggestions = []) {
|
|
172
|
+
const { severity, custom } = ISSUES_DEFINITIONS[code];
|
|
173
|
+
issues.push({
|
|
174
|
+
code,
|
|
175
|
+
message,
|
|
176
|
+
range,
|
|
177
|
+
snapshot,
|
|
178
|
+
suggestions,
|
|
179
|
+
severity,
|
|
180
|
+
custom,
|
|
181
|
+
});
|
|
182
|
+
},
|
|
183
|
+
hasIssues(minSeverity = 3) {
|
|
184
|
+
return issues.some((issue) => issue.severity >= minSeverity);
|
|
185
|
+
},
|
|
186
|
+
merge(...analysisReports) {
|
|
187
|
+
for (const analysisReport of analysisReports) {
|
|
188
|
+
for (const issue of analysisReport.issues) {
|
|
189
|
+
self.addIssue(issue.code, issue.message, issue.range, issue.snapshot, issue.suggestions);
|
|
190
|
+
}
|
|
189
191
|
}
|
|
190
|
-
|
|
191
|
-
|
|
192
|
-
}
|
|
192
|
+
return self;
|
|
193
|
+
},
|
|
194
|
+
};
|
|
195
|
+
return self;
|
|
193
196
|
}
|
|
194
197
|
//# sourceMappingURL=analysis-report.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analysis-report.js","sourceRoot":"","sources":["../../src/analyze/analysis-report.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"analysis-report.js","sourceRoot":"","sources":["../../src/analyze/analysis-report.ts"],"names":[],"mappings":"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"}
|
package/lib/analyze/analyze.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Program } from "acorn";
|
|
2
2
|
import type { Schema } from "../schema.js";
|
|
3
|
-
import { AnalysisReport } from "./analysis-report.js";
|
|
3
|
+
import { type AnalysisReport } from "./analysis-report.js";
|
|
4
4
|
export declare function analyze(ast: Program, schema: Schema): AnalysisReport;
|
|
5
5
|
//# sourceMappingURL=analyze.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyze.d.ts","sourceRoot":"","sources":["../../src/analyze/analyze.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,
|
|
1
|
+
{"version":3,"file":"analyze.d.ts","sourceRoot":"","sources":["../../src/analyze/analyze.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAwB,KAAK,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAKjF,wBAAgB,OAAO,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,cAAc,CAEpE"}
|
package/lib/analyze/analyze.js
CHANGED
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { analyzeSecurity } from "./security/index.js";
|
|
3
|
-
import { analyzeJsx } from "./jsx/index.js";
|
|
1
|
+
import { createAnalysisReport } from "./analysis-report.js";
|
|
4
2
|
import { analyzeData } from "./data/index.js";
|
|
3
|
+
import { analyzeJsx } from "./jsx/index.js";
|
|
4
|
+
import { analyzeSecurity } from "./security/index.js";
|
|
5
5
|
export function analyze(ast, schema) {
|
|
6
|
-
return
|
|
6
|
+
return createAnalysisReport().merge(analyzeSecurity(ast, schema), analyzeJsx(ast, schema), analyzeData(ast, schema));
|
|
7
7
|
}
|
|
8
8
|
//# sourceMappingURL=analyze.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../../src/analyze/analyze.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../../src/analyze/analyze.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAuB,MAAM,sBAAsB,CAAC;AACjF,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAC5C,OAAO,EAAE,eAAe,EAAE,MAAM,qBAAqB,CAAC;AAEtD,MAAM,UAAU,OAAO,CAAC,GAAY,EAAE,MAAc;IAClD,OAAO,oBAAoB,EAAE,CAAC,KAAK,CAAC,eAAe,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,UAAU,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC;AACvH,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { Program } from "acorn";
|
|
2
2
|
import type { Schema } from "../../schema.js";
|
|
3
|
-
import { AnalysisReport } from "../analysis-report.js";
|
|
3
|
+
import { type AnalysisReport } from "../analysis-report.js";
|
|
4
4
|
export declare function analyzeData(ast: Program, schema: Schema): AnalysisReport;
|
|
5
5
|
//# sourceMappingURL=analyze.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyze.d.ts","sourceRoot":"","sources":["../../../src/analyze/data/analyze.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,
|
|
1
|
+
{"version":3,"file":"analyze.d.ts","sourceRoot":"","sources":["../../../src/analyze/data/analyze.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC;AACrC,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAwB,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAKlF,wBAAgB,WAAW,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,GAAG,cAAc,CAIxE"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import {
|
|
3
|
-
import { analyzeMethodCalls } from "./method-calls.js";
|
|
1
|
+
import { createAnalysisReport } from "../analysis-report.js";
|
|
2
|
+
import { createValidationContext } from "../validation-context.js";
|
|
4
3
|
import { analyzeDataAccess } from "./data-access.js";
|
|
4
|
+
import { analyzeMethodCalls } from "./method-calls.js";
|
|
5
5
|
export function analyzeData(ast, schema) {
|
|
6
|
-
const validationContext =
|
|
7
|
-
return
|
|
6
|
+
const validationContext = createValidationContext();
|
|
7
|
+
return createAnalysisReport().merge(analyzeMethodCalls(ast, schema, validationContext), analyzeDataAccess(ast, schema, validationContext));
|
|
8
8
|
}
|
|
9
9
|
//# sourceMappingURL=analyze.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../../../src/analyze/data/analyze.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"analyze.js","sourceRoot":"","sources":["../../../src/analyze/data/analyze.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,oBAAoB,EAAuB,MAAM,uBAAuB,CAAC;AAClF,OAAO,EAAE,uBAAuB,EAAE,MAAM,0BAA0B,CAAC;AACnE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mBAAmB,CAAC;AAEvD,MAAM,UAAU,WAAW,CAAC,GAAY,EAAE,MAAc;IACtD,MAAM,iBAAiB,GAAG,uBAAuB,EAAE,CAAC;IAEpD,OAAO,oBAAoB,EAAE,CAAC,KAAK,CAAC,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,iBAAiB,CAAC,EAAE,iBAAiB,CAAC,GAAG,EAAE,MAAM,EAAE,iBAAiB,CAAC,CAAC,CAAC;AAC7I,CAAC"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { Program } from "acorn";
|
|
2
2
|
import type { ArrayPropertySchema, PropertySchema, Schema } from "../../schema.js";
|
|
3
|
+
import { type AnalysisReport } from "../analysis-report.js";
|
|
3
4
|
import type { ValidationContext } from "../validation-context.js";
|
|
4
|
-
import { AnalysisReport } from "../analysis-report.js";
|
|
5
5
|
export declare function analyzeDataAccess(ast: Program, schema: Schema, validationContext: ValidationContext): AnalysisReport;
|
|
6
6
|
export declare function getArrayElementType(schema: ArrayPropertySchema): PropertySchema | null;
|
|
7
7
|
//# sourceMappingURL=data-access.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-access.d.ts","sourceRoot":"","sources":["../../../src/analyze/data/data-access.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"data-access.d.ts","sourceRoot":"","sources":["../../../src/analyze/data/data-access.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAkF,OAAO,EAAE,MAAM,OAAO,CAAC;AACrH,OAAO,KAAK,EAAE,mBAAmB,EAAE,cAAc,EAAE,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAEnF,OAAO,EAAwB,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAElF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAGlE,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,iBAAiB,GAAG,cAAc,CAkIpH;AA6ID,wBAAgB,mBAAmB,CAAC,MAAM,EAAE,mBAAmB,GAAG,cAAc,GAAG,IAAI,CAEtF"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { traverse } from "../../traverse.js";
|
|
2
|
-
import {
|
|
3
|
-
import { isSimpleDataAccess, extractPath, validateSchemaPath } from "./utils.js";
|
|
2
|
+
import { createAnalysisReport } from "../analysis-report.js";
|
|
4
3
|
import { getNodeRange } from "../utils.js";
|
|
4
|
+
import { isSimpleDataAccess, extractPath, validateSchemaPath } from "./utils.js";
|
|
5
5
|
export function analyzeDataAccess(ast, schema, validationContext) {
|
|
6
|
-
const analysisReport =
|
|
6
|
+
const analysisReport = createAnalysisReport();
|
|
7
7
|
const dataKeys = new Set(Object.keys(schema.data ?? {}));
|
|
8
8
|
const dataPaths = new Set();
|
|
9
9
|
const arrowFunctionContexts = new Map();
|
|
@@ -38,17 +38,18 @@ export function analyzeDataAccess(ast, schema, validationContext) {
|
|
|
38
38
|
}
|
|
39
39
|
}
|
|
40
40
|
// Recursively traverse all child nodes
|
|
41
|
-
|
|
42
|
-
|
|
41
|
+
const record = node;
|
|
42
|
+
for (const key of Object.keys(record)) {
|
|
43
|
+
const value = record[key];
|
|
43
44
|
if (value && typeof value === "object") {
|
|
44
45
|
if (Array.isArray(value)) {
|
|
45
46
|
for (const child of value) {
|
|
46
|
-
if (child && typeof child === "object" && child
|
|
47
|
+
if (child && typeof child === "object" && child["type"]) {
|
|
47
48
|
collectArrowFunctionContexts(child);
|
|
48
49
|
}
|
|
49
50
|
}
|
|
50
51
|
}
|
|
51
|
-
else if (value
|
|
52
|
+
else if (value["type"]) {
|
|
52
53
|
collectArrowFunctionContexts(value);
|
|
53
54
|
}
|
|
54
55
|
}
|
|
@@ -84,7 +85,7 @@ export function analyzeDataAccess(ast, schema, validationContext) {
|
|
|
84
85
|
traverse(ast, {
|
|
85
86
|
MemberExpression(node) {
|
|
86
87
|
const parent = parentMap.get(node);
|
|
87
|
-
if (parent
|
|
88
|
+
if (parent?.type === "CallExpression" && parent.callee === node) {
|
|
88
89
|
return;
|
|
89
90
|
}
|
|
90
91
|
// Check if this is inside an arrow function with parameter context
|
|
@@ -119,7 +120,7 @@ function findEnclosingArrowContext(targetNode, arrowFunctionContexts) {
|
|
|
119
120
|
}
|
|
120
121
|
}
|
|
121
122
|
}
|
|
122
|
-
return best ? arrowFunctionContexts.get(best.arrowFn)
|
|
123
|
+
return best ? (arrowFunctionContexts.get(best.arrowFn) ?? null) : null;
|
|
123
124
|
}
|
|
124
125
|
function getArrayElementTypeFromCall(node, schema, arrowFunctionContexts) {
|
|
125
126
|
const { callee } = node;
|
|
@@ -147,9 +148,9 @@ function getArrayElementTypeFromCall(node, schema, arrowFunctionContexts) {
|
|
|
147
148
|
const propertyName = objectPath[1];
|
|
148
149
|
// Find the arrow function context that defines this parameter
|
|
149
150
|
const parameterType = resolveParameterType(paramName, node, arrowFunctionContexts);
|
|
150
|
-
if (parameterType
|
|
151
|
+
if (parameterType?.type === "object" && parameterType.shape) {
|
|
151
152
|
const propertySchema = parameterType.shape[propertyName];
|
|
152
|
-
if (propertySchema
|
|
153
|
+
if (propertySchema?.type === "array") {
|
|
153
154
|
return getArrayElementType(propertySchema);
|
|
154
155
|
}
|
|
155
156
|
}
|
|
@@ -178,6 +179,7 @@ function isNodeInsideArrowFunction(targetNode, arrowFunction) {
|
|
|
178
179
|
}
|
|
179
180
|
function getSchemaAtPath(path, schema) {
|
|
180
181
|
if (!schema.data || path.length === 0) {
|
|
182
|
+
// oxlint-disable-next-line typescript/no-explicit-any -- this branch returns the raw schema.data record (not a PropertySchema) when no path segments remain; preserved as-is for behavior parity
|
|
181
183
|
return schema.data;
|
|
182
184
|
}
|
|
183
185
|
let current = schema.data[path[0]];
|
|
@@ -202,7 +204,7 @@ function validateParameterAccess(node, paramType, analysisReport, validationCont
|
|
|
202
204
|
}
|
|
203
205
|
}
|
|
204
206
|
else {
|
|
205
|
-
analysisReport.addIssue("INVALID_PARAMETER_ACCESS", `Cannot access property '${propertyName}' on ${paramType.type
|
|
207
|
+
analysisReport.addIssue("INVALID_PARAMETER_ACCESS", `Cannot access property '${propertyName}' on ${paramType.type ?? "undefined"} type parameter '${node.object.name}'`, getNodeRange(node), validationContext.getSnapshot());
|
|
206
208
|
}
|
|
207
209
|
}
|
|
208
210
|
export function getArrayElementType(schema) {
|
|
@@ -211,11 +213,13 @@ export function getArrayElementType(schema) {
|
|
|
211
213
|
function buildParentMap(ast) {
|
|
212
214
|
const map = new Map();
|
|
213
215
|
function visit(node, parent) {
|
|
214
|
-
|
|
216
|
+
const record = node;
|
|
217
|
+
if (!record || typeof record !== "object" || !record["type"]) {
|
|
215
218
|
return;
|
|
219
|
+
}
|
|
216
220
|
map.set(node, parent);
|
|
217
|
-
for (const key of Object.keys(
|
|
218
|
-
const value =
|
|
221
|
+
for (const key of Object.keys(record)) {
|
|
222
|
+
const value = record[key];
|
|
219
223
|
if (value && typeof value === "object") {
|
|
220
224
|
if (Array.isArray(value)) {
|
|
221
225
|
for (const child of value) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"data-access.js","sourceRoot":"","sources":["../../../src/analyze/data/data-access.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"data-access.js","sourceRoot":"","sources":["../../../src/analyze/data/data-access.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 { type AnalysisReport } from "../analysis-report.js";
|
|
3
4
|
import type { ValidationContext } from "../validation-context.js";
|
|
4
|
-
import { AnalysisReport } from "../analysis-report.js";
|
|
5
5
|
export declare function analyzeMethodCalls(ast: Program, schema: Schema, validationContext: ValidationContext): AnalysisReport;
|
|
6
6
|
//# sourceMappingURL=method-calls.d.ts.map
|
|
@@ -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,KAAK,
|
|
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,EAAwB,KAAK,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAElF,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAGlE,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,iBAAiB,EAAE,iBAAiB,GAAG,cAAc,CA8ErH"}
|
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import { traverse } from "../../traverse.js";
|
|
2
1
|
import { isMethodAllowed, getMethodDefinition, getMethodDisplayName } from "../../builtins.js";
|
|
3
|
-
import {
|
|
4
|
-
import {
|
|
2
|
+
import { traverse } from "../../traverse.js";
|
|
3
|
+
import { createAnalysisReport } from "../analysis-report.js";
|
|
5
4
|
import { getNodeRange } from "../utils.js";
|
|
5
|
+
import { isSimpleDataAccess, extractPath, validateSchemaPath } from "./utils.js";
|
|
6
6
|
export function analyzeMethodCalls(ast, schema, validationContext) {
|
|
7
|
-
const analysisReport =
|
|
7
|
+
const analysisReport = createAnalysisReport();
|
|
8
8
|
const dataKeys = new Set(Object.keys(schema.data ?? {}));
|
|
9
9
|
traverse(ast, {
|
|
10
10
|
CallExpression(node) {
|
|
@@ -26,7 +26,7 @@ export function analyzeMethodCalls(ast, schema, validationContext) {
|
|
|
26
26
|
return;
|
|
27
27
|
}
|
|
28
28
|
const methodDef = getMethodDefinition(method);
|
|
29
|
-
if (!methodDef
|
|
29
|
+
if (!methodDef?.params) {
|
|
30
30
|
return;
|
|
31
31
|
}
|
|
32
32
|
const { params } = methodDef;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"method-calls.js","sourceRoot":"","sources":["../../../src/analyze/data/method-calls.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"method-calls.js","sourceRoot":"","sources":["../../../src/analyze/data/method-calls.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import type { Schema } from "../../schema.js";
|
|
|
3
3
|
import type { AnalysisReport } from "../analysis-report.js";
|
|
4
4
|
import type { ValidationContext } from "../validation-context.js";
|
|
5
5
|
export declare function isSimpleDataAccess(node: MemberExpression, dataKeys: ReadonlySet<string>): boolean;
|
|
6
|
-
export declare function extractPath(node: MemberExpression): string
|
|
7
|
-
export declare function getAvailablePropsAtPath(path: string
|
|
8
|
-
export declare function validateSchemaPath(path: string
|
|
6
|
+
export declare function extractPath(node: MemberExpression): Array<string>;
|
|
7
|
+
export declare function getAvailablePropsAtPath(path: Array<string>, depth: number, schemaDataParam: unknown): Array<string>;
|
|
8
|
+
export declare function validateSchemaPath(path: Array<string>, schema: Schema, analysisReport: AnalysisReport, node: MemberExpression, validationContext: ValidationContext): void;
|
|
9
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,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../src/analyze/data/utils.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAc,gBAAgB,EAA4B,MAAM,OAAO,CAAC;AAEpF,OAAO,KAAK,EAAkB,MAAM,EAAE,MAAM,iBAAiB,CAAC;AAC9D,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAC;AAE5D,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,0BAA0B,CAAC;AAElE,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,OAAO,CA8BjG;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,gBAAgB,GAAG,KAAK,CAAC,MAAM,CAAC,CA0BjE;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,eAAe,EAAE,OAAO,GAAG,KAAK,CAAC,MAAM,CAAC,CAwBnH;AAED,wBAAgB,kBAAkB,CAChC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,EACnB,MAAM,EAAE,MAAM,EACd,cAAc,EAAE,cAAc,EAC9B,IAAI,EAAE,gBAAgB,EACtB,iBAAiB,EAAE,iBAAiB,GACnC,IAAI,CAqKN"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { isAllowedOnArray, isAllowedOnString, getAvailableArrayMembers, getAvailableStringMembers
|
|
1
|
+
import { isAllowedOnArray, isAllowedOnString, getAvailableArrayMembers, getAvailableStringMembers } from "../../builtins.js";
|
|
2
2
|
import { getNodeRange } from "../utils.js";
|
|
3
3
|
export function isSimpleDataAccess(node, dataKeys) {
|
|
4
4
|
if (node.computed) {
|
|
@@ -52,7 +52,8 @@ export function extractPath(node) {
|
|
|
52
52
|
}
|
|
53
53
|
return path;
|
|
54
54
|
}
|
|
55
|
-
export function getAvailablePropsAtPath(path, depth,
|
|
55
|
+
export function getAvailablePropsAtPath(path, depth, schemaDataParam) {
|
|
56
|
+
const schemaData = schemaDataParam;
|
|
56
57
|
if (!schemaData || depth < 0) {
|
|
57
58
|
return schemaData ? Object.keys(schemaData) : [];
|
|
58
59
|
}
|
|
@@ -61,12 +62,12 @@ export function getAvailablePropsAtPath(path, depth, schemaData) {
|
|
|
61
62
|
}
|
|
62
63
|
let current = schemaData[path[0]];
|
|
63
64
|
for (let i = 1; i <= depth; i++) {
|
|
64
|
-
if (
|
|
65
|
+
if (current?.type !== "object" || !current.shape) {
|
|
65
66
|
return [];
|
|
66
67
|
}
|
|
67
68
|
current = current.shape[path[i]];
|
|
68
69
|
}
|
|
69
|
-
if (current
|
|
70
|
+
if (current?.type === "object" && current.shape) {
|
|
70
71
|
return Object.keys(current.shape);
|
|
71
72
|
}
|
|
72
73
|
return [];
|
|
@@ -154,7 +155,7 @@ function getElementAccessFlags(node, pathLength) {
|
|
|
154
155
|
const flags = Array(pathLength).fill(false);
|
|
155
156
|
const segments = [];
|
|
156
157
|
let current = node;
|
|
157
|
-
while (current
|
|
158
|
+
while (current?.type === "MemberExpression") {
|
|
158
159
|
segments.unshift({ property: current.property, computed: current.computed });
|
|
159
160
|
current = current.object;
|
|
160
161
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/analyze/data/utils.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/analyze/data/utils.ts"],"names":[],"mappings":"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"}
|