@nestia/sdk 2.3.7 → 2.3.8-dev.20231109
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/analyses/GenericAnalyzer.js +4 -2
- package/lib/analyses/GenericAnalyzer.js.map +1 -1
- package/lib/analyses/ImportAnalyzer.js +3 -2
- package/lib/analyses/ImportAnalyzer.js.map +1 -1
- package/package.json +1 -1
- package/src/analyses/GenericAnalyzer.ts +8 -4
- package/src/analyses/ImportAnalyzer.ts +3 -3
|
@@ -14,14 +14,16 @@ var GenericAnalyzer;
|
|
|
14
14
|
}
|
|
15
15
|
GenericAnalyzer.analyze = analyze;
|
|
16
16
|
function explore(checker, dict, classNode) {
|
|
17
|
+
var _a;
|
|
17
18
|
if (classNode.heritageClauses === undefined)
|
|
18
19
|
return;
|
|
19
20
|
for (const heritage of classNode.heritageClauses)
|
|
20
21
|
for (const hType of heritage.types) {
|
|
21
22
|
// MUST BE CLASS
|
|
22
23
|
const expression = checker.getTypeAtLocation(hType.expression);
|
|
23
|
-
const superNode = expression.symbol.getDeclarations()[0];
|
|
24
|
-
if (
|
|
24
|
+
const superNode = (_a = expression.symbol.getDeclarations()) === null || _a === void 0 ? void 0 : _a[0];
|
|
25
|
+
if (superNode === undefined ||
|
|
26
|
+
!typescript_1.default.isClassDeclaration(superNode))
|
|
25
27
|
continue;
|
|
26
28
|
// SPECIFY GENERICS
|
|
27
29
|
const usages = hType.typeArguments || [];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"GenericAnalyzer.js","sourceRoot":"","sources":["../../src/analyses/GenericAnalyzer.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA4B;AAE5B,IAAiB,eAAe,
|
|
1
|
+
{"version":3,"file":"GenericAnalyzer.js","sourceRoot":"","sources":["../../src/analyses/GenericAnalyzer.ts"],"names":[],"mappings":";;;;;;AAAA,4DAA4B;AAE5B,IAAiB,eAAe,CAsD/B;AAtDD,WAAiB,eAAe;IAG5B,SAAgB,OAAO,CACnB,OAAuB,EACvB,SAA8B;QAE9B,MAAM,IAAI,GAAe,IAAI,OAAO,EAAE,CAAC;QACvC,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;QAClC,OAAO,IAAI,CAAC;IAChB,CAAC;IAPe,uBAAO,UAOtB,CAAA;IAED,SAAS,OAAO,CACZ,OAAuB,EACvB,IAAgB,EAChB,SAA8B;;QAE9B,IAAI,SAAS,CAAC,eAAe,KAAK,SAAS;YAAE,OAAO;QAEpD,KAAK,MAAM,QAAQ,IAAI,SAAS,CAAC,eAAe;YAC5C,KAAK,MAAM,KAAK,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;gBACjC,gBAAgB;gBAChB,MAAM,UAAU,GAAY,OAAO,CAAC,iBAAiB,CACjD,KAAK,CAAC,UAAU,CACnB,CAAC;gBACF,MAAM,SAAS,GACX,MAAA,UAAU,CAAC,MAAM,CAAC,eAAe,EAAE,0CAAG,CAAC,CAAC,CAAC;gBAE7C,IACI,SAAS,KAAK,SAAS;oBACvB,CAAC,oBAAE,CAAC,kBAAkB,CAAC,SAAS,CAAC;oBAEjC,SAAS;gBAEb,mBAAmB;gBACnB,MAAM,MAAM,GACR,KAAK,CAAC,aAAa,IAAI,EAAE,CAAC;gBAC9B,MAAM,UAAU,GACZ,SAAS,CAAC,cAAc,IAAI,EAAE,CAAC;gBAEnC,UAAU,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;oBAChC,MAAM,SAAS,GAAY,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;oBAC5D,MAAM,SAAS,GACX,MAAM,CAAC,KAAK,CAAC,KAAK,SAAS;wBACvB,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;wBAC1C,CAAC,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC,OAAQ,CAAC,CAAC;oBAEpD,IAAI,CAAC,GAAG,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;gBACnC,CAAC,CAAC,CAAC;gBAEH,wBAAwB;gBACxB,OAAO,CAAC,OAAO,EAAE,IAAI,EAAE,SAAS,CAAC,CAAC;YACtC,CAAC;IACT,CAAC;AACL,CAAC,EAtDgB,eAAe,+BAAf,eAAe,QAsD/B"}
|
|
@@ -38,7 +38,8 @@ var ImportAnalyzer;
|
|
|
38
38
|
return generic[0];
|
|
39
39
|
}
|
|
40
40
|
function get_name(symbol) {
|
|
41
|
-
|
|
41
|
+
var _a, _b;
|
|
42
|
+
return explore_name(symbol.escapedName.toString(), (_b = (_a = symbol.getDeclarations()) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.parent);
|
|
42
43
|
}
|
|
43
44
|
/* ---------------------------------------------------------
|
|
44
45
|
ESCAPED TEXT WITH IMPORT STATEMENTS
|
|
@@ -85,7 +86,7 @@ var ImportAnalyzer;
|
|
|
85
86
|
: name;
|
|
86
87
|
}
|
|
87
88
|
function explore_name(name, decl) {
|
|
88
|
-
return typescript_1.default.isModuleBlock(decl)
|
|
89
|
+
return decl && typescript_1.default.isModuleBlock(decl)
|
|
89
90
|
? explore_name(`${decl.parent.name.getFullText().trim()}.${name}`, decl.parent.parent)
|
|
90
91
|
: name;
|
|
91
92
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ImportAnalyzer.js","sourceRoot":"","sources":["../../src/analyses/ImportAnalyzer.ts"],"names":[],"mappings":";;;;;;AACA,oDAAiD;AACjD,4DAA4B;AAK5B,IAAiB,cAAc,CAsJ9B;AAtJD,WAAiB,cAAc;IAQ3B,SAAgB,OAAO,CACnB,OAAuB,EACvB,WAAuC,EACvC,UAAsB,EACtB,IAAa;QAEb,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;QAC/B,oBAAoB,CAAC,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,IAAI,CAAC,CAAC;QAE7D,IAAI,CAAC;YACD,OAAO;gBACH,IAAI;gBACJ,QAAQ,EAAE,oBAAoB,CAC1B,OAAO,EACP,WAAW,EACX,UAAU,EACV,IAAI,CACP;aACJ,CAAC;QACN,CAAC;QAAC,WAAM,CAAC;YACL,OAAO,IAAI,CAAC;QAChB,CAAC;IACL,CAAC;IAtBe,sBAAO,UAsBtB,CAAA;IAED;;gEAE4D;IAC5D,SAAS,QAAQ,CAAC,OAAuB,EAAE,IAAa;QACpD,MAAM,MAAM,GAA0B,IAAI,CAAC,SAAS,EAAE,CAAC;QACvD,OAAO,MAAM,IAAI,QAAQ,CAAC,MAAM,CAAC,KAAK,SAAS;YAC3C,CAAC,CAAC,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC;YAC/B,CAAC,CAAC,IAAI,CAAC;IACf,CAAC;IAED,SAAS,cAAc,CAAC,OAAuB,EAAE,IAAa;QAC1D,MAAM,OAAO,GAAuB,OAAO,CAAC,gBAAgB,CACxD,IAAwB,CAC3B,CAAC;QACF,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC;YACpB,MAAM,IAAI,KAAK,CACX,0DAA0D,CAC7D,CAAC;QACN,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC;IACtB,CAAC;IAED,SAAS,QAAQ,CAAC,MAAiB
|
|
1
|
+
{"version":3,"file":"ImportAnalyzer.js","sourceRoot":"","sources":["../../src/analyses/ImportAnalyzer.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -25,10 +25,14 @@ export namespace GenericAnalyzer {
|
|
|
25
25
|
const expression: ts.Type = checker.getTypeAtLocation(
|
|
26
26
|
hType.expression,
|
|
27
27
|
);
|
|
28
|
-
const superNode: ts.Declaration =
|
|
29
|
-
expression.symbol.getDeclarations()
|
|
30
|
-
|
|
31
|
-
if (
|
|
28
|
+
const superNode: ts.Declaration | undefined =
|
|
29
|
+
expression.symbol.getDeclarations()?.[0];
|
|
30
|
+
|
|
31
|
+
if (
|
|
32
|
+
superNode === undefined ||
|
|
33
|
+
!ts.isClassDeclaration(superNode)
|
|
34
|
+
)
|
|
35
|
+
continue;
|
|
32
36
|
|
|
33
37
|
// SPECIFY GENERICS
|
|
34
38
|
const usages: ReadonlyArray<ts.TypeNode> =
|
|
@@ -61,7 +61,7 @@ export namespace ImportAnalyzer {
|
|
|
61
61
|
function get_name(symbol: ts.Symbol): string {
|
|
62
62
|
return explore_name(
|
|
63
63
|
symbol.escapedName.toString(),
|
|
64
|
-
symbol.getDeclarations()
|
|
64
|
+
symbol.getDeclarations()?.[0]?.parent,
|
|
65
65
|
);
|
|
66
66
|
}
|
|
67
67
|
|
|
@@ -147,8 +147,8 @@ export namespace ImportAnalyzer {
|
|
|
147
147
|
: name;
|
|
148
148
|
}
|
|
149
149
|
|
|
150
|
-
function explore_name(name: string, decl
|
|
151
|
-
return ts.isModuleBlock(decl)
|
|
150
|
+
function explore_name(name: string, decl?: ts.Node): string {
|
|
151
|
+
return decl && ts.isModuleBlock(decl)
|
|
152
152
|
? explore_name(
|
|
153
153
|
`${decl.parent.name.getFullText().trim()}.${name}`,
|
|
154
154
|
decl.parent.parent,
|