@shivaedev/quality 0.73.1 → 0.73.2
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/CHANGELOG.md +8 -0
- package/dist/adapters/buildEntryPaths.js +1 -1
- package/dist/adapters/buildEntryPaths.js.map +1 -1
- package/dist/adapters/buildHelper.d.ts.map +1 -1
- package/dist/adapters/buildHelper.js +22 -13
- package/dist/adapters/buildHelper.js.map +1 -1
- package/dist/adapters/bundlerEntries.d.ts.map +1 -1
- package/dist/adapters/bundlerEntries.js +2 -1
- package/dist/adapters/bundlerEntries.js.map +1 -1
- package/dist/adapters/foreignCallback.d.ts.map +1 -1
- package/dist/adapters/foreignCallback.js +40 -8
- package/dist/adapters/foreignCallback.js.map +1 -1
- package/dist/adapters/mappedBuildBindings.d.ts +1 -1
- package/dist/adapters/mappedBuildBindings.d.ts.map +1 -1
- package/dist/adapters/mappedBuildBindings.js +27 -3
- package/dist/adapters/mappedBuildBindings.js.map +1 -1
- package/dist/adapters/ownedServiceParameters.d.ts.map +1 -1
- package/dist/adapters/ownedServiceParameters.js +6 -1
- package/dist/adapters/ownedServiceParameters.js.map +1 -1
- package/package.json +1 -1
- package/src/adapters/buildEntryPaths.ts +1 -1
- package/src/adapters/buildHelper.ts +25 -13
- package/src/adapters/bundlerEntries.ts +2 -1
- package/src/adapters/foreignCallback.ts +44 -9
- package/src/adapters/mappedBuildBindings.ts +28 -3
- package/src/adapters/ownedServiceParameters.ts +8 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,13 @@
|
|
|
1
1
|
# Changelog
|
|
2
2
|
|
|
3
|
+
## 0.73.2 - 2026-11-07
|
|
4
|
+
|
|
5
|
+
### Fixed
|
|
6
|
+
|
|
7
|
+
- `code/unused`: Follow Rolldown helpers through package import aliases and local config helpers, and resolve `import.meta.dirname` from the file that contains it.
|
|
8
|
+
- `effect/service-parameters`: Recognize host callbacks whose property type unions a function with an object hook.
|
|
9
|
+
- `effect/service-parameters`: Keep owned service state recognized when imported `Effect.fn` operations pass it through helpers across files.
|
|
10
|
+
|
|
3
11
|
## 0.73.1 - 2026-11-07
|
|
4
12
|
|
|
5
13
|
### Changed
|
|
@@ -59,7 +59,7 @@ export function buildEntryPaths(expression, cwd, file, active = new Set(), bindi
|
|
|
59
59
|
}
|
|
60
60
|
if ((ts.isIdentifier(node) && node.text === "__dirname")
|
|
61
61
|
|| (ts.isPropertyAccessExpression(node) && node.expression.kind === ts.SyntaxKind.MetaProperty && node.name.text === "dirname")) {
|
|
62
|
-
return [posix.dirname(
|
|
62
|
+
return [posix.dirname(posix.resolve(cwd, node.getSourceFile().fileName))];
|
|
63
63
|
}
|
|
64
64
|
return ts.isCallExpression(node) ? pathFromCall(node, cwd, file, paths) : valuesOf(node).flatMap(paths);
|
|
65
65
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildEntryPaths.js","sourceRoot":"","sources":["../../src/adapters/buildEntryPaths.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAsB,eAAe,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChG,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAEzD,SAAS,YAAY,CACpB,IAAuB,EACvB,GAAW,EACX,IAAY,EACZ,KAAuD;IAEvD,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,KAAK,aAAa,IAAI,IAAI,CAAC,SAAS,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAChF,OAAO,CAAC,GAAG,CAAC,CAAC;IACd,CAAC;IACD,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,QAAQ,EAAE,MAAM,KAAK,UAAU,IAAI,QAAQ,CAAC,IAAI,KAAK,eAAe,IAAI,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;QAC7G,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;QACnC,OAAO,EAAE,CAAC,0BAA0B,CAAC,QAAQ,CAAC;eAC1C,EAAE,CAAC,cAAc,CAAC,QAAQ,CAAC,UAAU,CAAC;eACtC,QAAQ,CAAC,UAAU,CAAC,YAAY,KAAK,EAAE,CAAC,UAAU,CAAC,aAAa;eAChE,QAAQ,CAAC,IAAI,CAAC,IAAI,KAAK,KAAK;YAC/B,CAAC,CAAC,CAAC,IAAI,CAAC;YACR,CAAC,CAAC,EAAE,CAAC;IACP,CAAC;IACD,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,SAAS,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC;QACrI,OAAO,EAAE,CAAC;IACX,CAAC;IACD,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;IACxC,IAAI,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,EAAE,CAAC;QAC7C,OAAO,EAAE,CAAC;IACX,CAAC;IACD,MAAM,MAAM,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC5B,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACjC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,GAAG,EAAE,GAAG,MAAM,CAAC,CAAC,CAAC;IACxC,CAAC;IACD,IAAI,QAAQ,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QACjC,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACzC,CAAC;IACD,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC;AAChC,CAAC;AAED,SAAS,QAAQ,CAAC,IAAmB;IACpC,IAAI,EAAE,CAAC,wBAAwB,CAAC,IAAI,CAAC,EAAE,CAAC;QACvC,OAAO,IAAI,CAAC,QAAQ,CAAC;IACtB,CAAC;IACD,IAAI,CAAC,EAAE,CAAC,yBAAyB,CAAC,IAAI,CAAC,EAAE,CAAC;QACzC,OAAO,EAAE,CAAC;IACX,CAAC;IACD,MAAM,KAAK,GAAG,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IACtC,OAAO,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,EAAE,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;AACjJ,CAAC;AAED,MAAM,UAAU,eAAe,CAC9B,UAAyB,EACzB,GAAW,EACX,IAAY,EACZ,MAAM,GAAyB,IAAI,GAAG,EAAE,EACxC,QAAQ,GAAkB,IAAI,GAAG,EAAE;IAEnC,MAAM,IAAI,GAAG,eAAe,CAAC,UAAU,EAAE,IAAI,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC;IAC9D,IAAI,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;QACtB,OAAO,EAAE,CAAC;IACX,CAAC;IACD,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,GAAG,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;IAC3C,SAAS,KAAK,CAAC,KAAoB;QAClC,OAAO,eAAe,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;IAC7D,CAAC;IACD,IAAI,EAAE,CAAC,mBAAmB,CAAC,IAAI,CAAC,EAAE,CAAC;QAClC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACpB,CAAC;IACD,IAAI,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;IAC/B,CAAC;IACD,IACC,CAAC,EAAE,CAAC,YAAY,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,IAAI,KAAK,WAAW,CAAC;WACjD,CAAC,EAAE,CAAC,0BAA0B,CAAC,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,EAAE,CAAC,UAAU,CAAC,YAAY,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,SAAS,CAAC,EAC9H,CAAC;QACF,OAAO,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"buildEntryPaths.js","sourceRoot":"","sources":["../../src/adapters/buildEntryPaths.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildHelper.d.ts","sourceRoot":"","sources":["../../src/adapters/buildHelper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,KAAK,aAAa,EAAmB,MAAM,8BAA8B,CAAC;AAGnF,KAAK,MAAM,GAAG,EAAE,CAAC,mBAAmB,GAAG,EAAE,CAAC,kBAAkB,GAAG,EAAE,CAAC,aAAa,CAAC;AAEhF,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,cAAc,EAAE,QAAQ,EAAE,aAAa,GAAG,aAAa,CAS9G;
|
|
1
|
+
{"version":3,"file":"buildHelper.d.ts","sourceRoot":"","sources":["../../src/adapters/buildHelper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,KAAK,aAAa,EAAmB,MAAM,8BAA8B,CAAC;AAGnF,KAAK,MAAM,GAAG,EAAE,CAAC,mBAAmB,GAAG,EAAE,CAAC,kBAAkB,GAAG,EAAE,CAAC,aAAa,CAAC;AAEhF,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE,CAAC,cAAc,EAAE,QAAQ,EAAE,aAAa,GAAG,aAAa,CAS9G;AAkDD,wBAAgB,WAAW,CAAC,IAAI,EAAE,EAAE,CAAC,cAAc,EAAE,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,EAAE,QAAQ,EAAE,aAAa,GAAG,MAAM,GAAG,SAAS,CAM7I"}
|
|
@@ -31,25 +31,34 @@ function declared(scope, name) {
|
|
|
31
31
|
}
|
|
32
32
|
return undefined;
|
|
33
33
|
}
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
return expression;
|
|
34
|
+
function localHelper(expression, call) {
|
|
35
|
+
if (!ts.isIdentifier(expression)) {
|
|
36
|
+
return undefined;
|
|
38
37
|
}
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
return helper;
|
|
44
|
-
}
|
|
38
|
+
for (let scope = call.parent; scope !== undefined; scope = scope.parent) {
|
|
39
|
+
const helper = ts.isSourceFile(scope) || ts.isBlock(scope) ? declared(scope, expression.text) : undefined;
|
|
40
|
+
if (helper !== undefined) {
|
|
41
|
+
return helper;
|
|
45
42
|
}
|
|
46
43
|
}
|
|
44
|
+
return undefined;
|
|
45
|
+
}
|
|
46
|
+
function importedHelper(call, sources) {
|
|
47
47
|
const imported = importedCall(call);
|
|
48
|
-
if (imported === undefined || !imported.module.startsWith(".")) {
|
|
48
|
+
if (imported === undefined || !(imported.module.startsWith(".") || imported.module.startsWith("#"))) {
|
|
49
49
|
return undefined;
|
|
50
50
|
}
|
|
51
|
-
const
|
|
52
|
-
|
|
51
|
+
const modulePath = imported.module.startsWith("#")
|
|
52
|
+
? imported.module.slice(1)
|
|
53
|
+
: posix.join(posix.dirname(call.getSourceFile().fileName), imported.module);
|
|
54
|
+
const source = sources.get(modulePath) ?? [...sources.values()].find((candidate) => candidate.fileName.replaceAll("\\", "/").endsWith(`/${modulePath}`));
|
|
53
55
|
return source === undefined ? undefined : declared(source, imported.name);
|
|
54
56
|
}
|
|
57
|
+
export function buildHelper(call, sources, bindings) {
|
|
58
|
+
const expression = buildEntryValue(call.expression, new Set(), bindings);
|
|
59
|
+
if (ts.isArrowFunction(expression) || ts.isFunctionExpression(expression)) {
|
|
60
|
+
return expression;
|
|
61
|
+
}
|
|
62
|
+
return localHelper(expression, call) ?? importedHelper(call, sources);
|
|
63
|
+
}
|
|
55
64
|
//# sourceMappingURL=buildHelper.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"buildHelper.js","sourceRoot":"","sources":["../../src/adapters/buildHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAsB,eAAe,EAAE,MAAM,8BAA8B,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAIzD,MAAM,UAAU,cAAc,CAAC,MAAc,EAAE,IAAuB,EAAE,QAAuB;IAC9F,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;IACrC,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC;QAC9D,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,WAAW,CAAC;QAC7D,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACzB,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,KAAK,EAAE,IAAI,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC;QACxE,CAAC;IACF,CAAC;IACD,OAAO,UAAU,CAAC;AACnB,CAAC;AAED,SAAS,QAAQ,CAAC,KAA+B,EAAE,IAAY;IAC9D,KAAK,MAAM,SAAS,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;QAC1C,IAAI,EAAE,CAAC,qBAAqB,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,EAAE,CAAC;YAC1E,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,CAAC;YACvC,KAAK,MAAM,WAAW,IAAI,SAAS,CAAC,eAAe,CAAC,YAAY,EAAE,CAAC;gBAClE,MAAM,KAAK,GAAG,WAAW,CAAC,WAAW,CAAC;gBACtC,IACC,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC;uBAC9B,WAAW,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI;uBAC9B,KAAK,KAAK,SAAS;uBACnB,CAAC,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,EAC/D,CAAC;oBACF,OAAO,KAAK,CAAC;gBACd,CAAC;YACF,CAAC;QACF,CAAC;IACF,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AAED,
|
|
1
|
+
{"version":3,"file":"buildHelper.js","sourceRoot":"","sources":["../../src/adapters/buildHelper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAsB,eAAe,EAAE,MAAM,8BAA8B,CAAC;AACnF,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AAIzD,MAAM,UAAU,cAAc,CAAC,MAAc,EAAE,IAAuB,EAAE,QAAuB;IAC9F,MAAM,UAAU,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;IACrC,KAAK,MAAM,CAAC,KAAK,EAAE,SAAS,CAAC,IAAI,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC;QAC9D,MAAM,KAAK,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,IAAI,SAAS,CAAC,WAAW,CAAC;QAC7D,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;YACzB,UAAU,CAAC,GAAG,CAAC,SAAS,EAAE,eAAe,CAAC,KAAK,EAAE,IAAI,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC,CAAC;QACxE,CAAC;IACF,CAAC;IACD,OAAO,UAAU,CAAC;AACnB,CAAC;AAED,SAAS,QAAQ,CAAC,KAA+B,EAAE,IAAY;IAC9D,KAAK,MAAM,SAAS,IAAI,KAAK,CAAC,UAAU,EAAE,CAAC;QAC1C,IAAI,EAAE,CAAC,qBAAqB,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,EAAE,CAAC;YAC1E,OAAO,SAAS,CAAC;QAClB,CAAC;QACD,IAAI,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC,EAAE,CAAC;YACvC,KAAK,MAAM,WAAW,IAAI,SAAS,CAAC,eAAe,CAAC,YAAY,EAAE,CAAC;gBAClE,MAAM,KAAK,GAAG,WAAW,CAAC,WAAW,CAAC;gBACtC,IACC,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC;uBAC9B,WAAW,CAAC,IAAI,CAAC,IAAI,KAAK,IAAI;uBAC9B,KAAK,KAAK,SAAS;uBACnB,CAAC,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,oBAAoB,CAAC,KAAK,CAAC,CAAC,EAC/D,CAAC;oBACF,OAAO,KAAK,CAAC;gBACd,CAAC;YACF,CAAC;QACF,CAAC;IACF,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AAED,SAAS,WAAW,CAAC,UAAyB,EAAE,IAAuB;IACtE,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,UAAU,CAAC,EAAE,CAAC;QAClC,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,KAAK,IAAI,KAAK,GAAwB,IAAI,CAAC,MAAM,EAAE,KAAK,KAAK,SAAS,EAAE,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QAC9F,MAAM,MAAM,GAAG,EAAE,CAAC,YAAY,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;QAC1G,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;YAC1B,OAAO,MAAM,CAAC;QACf,CAAC;IACF,CAAC;IACD,OAAO,SAAS,CAAC;AAClB,CAAC;AAED,SAAS,cAAc,CAAC,IAAuB,EAAE,OAA2C;IAC3F,MAAM,QAAQ,GAAG,YAAY,CAAC,IAAI,CAAC,CAAC;IACpC,IAAI,QAAQ,KAAK,SAAS,IAAI,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;QACrG,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,MAAM,UAAU,GAAG,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC;QACjD,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;QAC1B,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAC;IAC7E,MAAM,MAAM,GACX,OAAO,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC,QAAQ,CAAC,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC;IAC3I,OAAO,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,CAAC,CAAC;AAC3E,CAAC;AAED,MAAM,UAAU,WAAW,CAAC,IAAuB,EAAE,OAA2C,EAAE,QAAuB;IACxH,MAAM,UAAU,GAAG,eAAe,CAAC,IAAI,CAAC,UAAU,EAAE,IAAI,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC;IACzE,IAAI,EAAE,CAAC,eAAe,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC,oBAAoB,CAAC,UAAU,CAAC,EAAE,CAAC;QAC3E,OAAO,UAAU,CAAC;IACnB,CAAC;IACD,OAAO,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,IAAI,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;AACvE,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundlerEntries.d.ts","sourceRoot":"","sources":["../../src/adapters/bundlerEntries.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,YAAY,CAAC;AAM5B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAgD3C,wBAAgB,cAAc,CAC7B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC,UAAU,CAAa,GACrD,SAAS,MAAM,EAAE,
|
|
1
|
+
{"version":3,"file":"bundlerEntries.d.ts","sourceRoot":"","sources":["../../src/adapters/bundlerEntries.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,YAAY,CAAC;AAM5B,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAgD3C,wBAAgB,cAAc,CAC7B,IAAI,EAAE,UAAU,EAChB,IAAI,EAAE,MAAM,EACZ,SAAS,EAAE,MAAM,EACjB,OAAO,GAAE,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC,UAAU,CAAa,GACrD,SAAS,MAAM,EAAE,CAgCnB"}
|
|
@@ -56,7 +56,7 @@ export function bundlerEntries(file, root, directory, sources = new Map()) {
|
|
|
56
56
|
if (ts.isFunctionLike(node)) {
|
|
57
57
|
const body = callbackBody(node);
|
|
58
58
|
if (body !== undefined) {
|
|
59
|
-
for (const mapped of mappedBuildBindings(node, bindings)) {
|
|
59
|
+
for (const mapped of mappedBuildBindings(node, bindings, sources)) {
|
|
60
60
|
visit(body, mapped, active);
|
|
61
61
|
}
|
|
62
62
|
}
|
|
@@ -66,6 +66,7 @@ export function bundlerEntries(file, root, directory, sources = new Map()) {
|
|
|
66
66
|
entries.push(...entriesOf(node, posix.join(root, node.getSourceFile().fileName), posix.join(root, directory), bindings).map((path) => posix.relative(root, path)));
|
|
67
67
|
const helper = buildHelper(node, sources, bindings);
|
|
68
68
|
if (helper?.body !== undefined && !active.has(helper)) {
|
|
69
|
+
entries.push(posix.relative(root, posix.resolve(root, helper.getSourceFile().fileName)));
|
|
69
70
|
visit(helper.body, buildArguments(helper, node, bindings), new Set([...active, helper]));
|
|
70
71
|
}
|
|
71
72
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"bundlerEntries.js","sourceRoot":"","sources":["../../src/adapters/bundlerEntries.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"bundlerEntries.js","sourceRoot":"","sources":["../../src/adapters/bundlerEntries.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"foreignCallback.d.ts","sourceRoot":"","sources":["../../src/adapters/foreignCallback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,GAAG,OAAO,CAGhE;
|
|
1
|
+
{"version":3,"file":"foreignCallback.d.ts","sourceRoot":"","sources":["../../src/adapters/foreignCallback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,EAAE,CAAC,WAAW,GAAG,OAAO,CAGhE;AAmCD,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,EAAE,CAAC,WAAW,EAAE,IAAI,EAAE,EAAE,CAAC,IAAI,GAAG,EAAE,CAAC,IAAI,GAAG,SAAS,CAWlG;AAkCD,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,EAAE,CAAC,WAAW,EAAE,SAAS,EAAE,EAAE,CAAC,oBAAoB,GAAG,OAAO,CAc7G"}
|
|
@@ -3,14 +3,17 @@ export function foreignDeclaration(node) {
|
|
|
3
3
|
const file = node.getSourceFile().fileName.replaceAll("\\", "/");
|
|
4
4
|
return file.includes("/node_modules/") && !/\/(?:effect|@effect|@shivaedev)\//u.test(file);
|
|
5
5
|
}
|
|
6
|
-
function
|
|
6
|
+
function methodTypes(checker, type, name) {
|
|
7
7
|
if (type === undefined) {
|
|
8
|
-
return
|
|
8
|
+
return [];
|
|
9
9
|
}
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
10
|
+
return (type.isUnionOrIntersection() ? type.types : [type]).flatMap((part) => {
|
|
11
|
+
const property = part.getProperty(name);
|
|
12
|
+
return property === undefined ? [] : [checker.getTypeOfSymbol(property)];
|
|
13
|
+
});
|
|
14
|
+
}
|
|
15
|
+
function methodType(checker, type, name) {
|
|
16
|
+
return methodTypes(checker, type, name)[0];
|
|
14
17
|
}
|
|
15
18
|
function methodName(node) {
|
|
16
19
|
return node.name.getText().replace(/^['"]|['"]$/gu, "");
|
|
@@ -41,10 +44,39 @@ export function contextualCallbackType(checker, node) {
|
|
|
41
44
|
}
|
|
42
45
|
return implementedMethodType(checker, node);
|
|
43
46
|
}
|
|
47
|
+
function callbackSignatures(checker, type) {
|
|
48
|
+
const members = type.isUnionOrIntersection() ? type.types : [type];
|
|
49
|
+
return members.flatMap((member) => {
|
|
50
|
+
const callable = checker.getNonNullableType(member).getCallSignatures();
|
|
51
|
+
if (callable.length > 0) {
|
|
52
|
+
return callable;
|
|
53
|
+
}
|
|
54
|
+
const handler = member.getProperty("handler");
|
|
55
|
+
return handler === undefined ? [] : callbackSignatures(checker, checker.getTypeOfSymbol(handler));
|
|
56
|
+
});
|
|
57
|
+
}
|
|
58
|
+
function contextualCallbackTypes(checker, node) {
|
|
59
|
+
if (ts.isArrowFunction(node) || ts.isFunctionExpression(node)) {
|
|
60
|
+
const contextual = checker.getContextualType(node);
|
|
61
|
+
return contextual === undefined ? [] : [contextual];
|
|
62
|
+
}
|
|
63
|
+
if (!ts.isMethodDeclaration(node)) {
|
|
64
|
+
return [];
|
|
65
|
+
}
|
|
66
|
+
if (ts.isObjectLiteralExpression(node.parent)) {
|
|
67
|
+
return methodTypes(checker, checker.getContextualType(node.parent), methodName(node));
|
|
68
|
+
}
|
|
69
|
+
if (!ts.isClassLike(node.parent) || node.name === undefined) {
|
|
70
|
+
return [];
|
|
71
|
+
}
|
|
72
|
+
return (node.parent.heritageClauses ?? [])
|
|
73
|
+
.filter((clause) => clause.token === ts.SyntaxKind.ImplementsKeyword)
|
|
74
|
+
.flatMap((clause) => clause.types)
|
|
75
|
+
.flatMap((typeNode) => methodTypes(checker, checker.getTypeAtLocation(typeNode), methodName(node)));
|
|
76
|
+
}
|
|
44
77
|
export function foreignCallbackParameter(checker, parameter) {
|
|
45
78
|
const fn = parameter.parent;
|
|
46
|
-
|
|
47
|
-
if ((context === undefined ? [] : checker.getNonNullableType(context).getCallSignatures()).some((signature) => signature.declaration !== undefined && foreignDeclaration(signature.declaration))) {
|
|
79
|
+
if (contextualCallbackTypes(checker, fn).some((type) => callbackSignatures(checker, type).some((signature) => signature.declaration !== undefined && foreignDeclaration(signature.declaration)))) {
|
|
48
80
|
return true;
|
|
49
81
|
}
|
|
50
82
|
if (!((ts.isArrowFunction(fn) || ts.isFunctionExpression(fn)) && ts.isCallExpression(fn.parent) && fn.parent.arguments.includes(fn))) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"foreignCallback.js","sourceRoot":"","sources":["../../src/adapters/foreignCallback.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAE5B,MAAM,UAAU,kBAAkB,CAAC,IAAoB;IACtD,MAAM,IAAI,GAAG,IAAI,CAAC,aAAa,EAAE,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;IACjE,OAAO,IAAI,CAAC,QAAQ,CAAC,gBAAgB,CAAC,IAAI,CAAC,oCAAoC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;AAC5F,CAAC;AAED,SAAS,
|
|
1
|
+
{"version":3,"file":"foreignCallback.js","sourceRoot":"","sources":["../../src/adapters/foreignCallback.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
1
|
import ts from "typescript";
|
|
2
2
|
import { type BuildBindings } from "#adapters/buildEntryValue.ts";
|
|
3
|
-
export declare function mappedBuildBindings(node: ts.Node, bindings: BuildBindings): readonly BuildBindings[];
|
|
3
|
+
export declare function mappedBuildBindings(node: ts.Node, bindings: BuildBindings, sources: ReadonlyMap<string, ts.SourceFile>): readonly BuildBindings[];
|
|
4
4
|
//# sourceMappingURL=mappedBuildBindings.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mappedBuildBindings.d.ts","sourceRoot":"","sources":["../../src/adapters/mappedBuildBindings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,KAAK,aAAa,EAAmB,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"mappedBuildBindings.d.ts","sourceRoot":"","sources":["../../src/adapters/mappedBuildBindings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,KAAK,aAAa,EAAmB,MAAM,8BAA8B,CAAC;AAkBnF,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,EAAE,QAAQ,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,SAAS,aAAa,EAAE,CAuBjJ"}
|
|
@@ -1,6 +1,21 @@
|
|
|
1
1
|
import ts from "typescript";
|
|
2
2
|
import { buildEntryValue } from "#adapters/buildEntryValue.ts";
|
|
3
|
-
|
|
3
|
+
import { buildArguments, buildHelper } from "#adapters/buildHelper.ts";
|
|
4
|
+
function returnedValue(helper) {
|
|
5
|
+
if (helper.body === undefined) {
|
|
6
|
+
return undefined;
|
|
7
|
+
}
|
|
8
|
+
if (ts.isBlock(helper.body)) {
|
|
9
|
+
for (const statement of helper.body.statements) {
|
|
10
|
+
if (ts.isReturnStatement(statement) && statement.expression !== undefined) {
|
|
11
|
+
return statement.expression;
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
return undefined;
|
|
15
|
+
}
|
|
16
|
+
return helper.body;
|
|
17
|
+
}
|
|
18
|
+
export function mappedBuildBindings(node, bindings, sources) {
|
|
4
19
|
if (!((ts.isArrowFunction(node) || ts.isFunctionExpression(node)) && ts.isCallExpression(node.parent))) {
|
|
5
20
|
return [bindings];
|
|
6
21
|
}
|
|
@@ -9,10 +24,19 @@ export function mappedBuildBindings(node, bindings) {
|
|
|
9
24
|
if (!ts.isPropertyAccessExpression(callee) || callee.name.text !== "map" || parameter === undefined) {
|
|
10
25
|
return [bindings];
|
|
11
26
|
}
|
|
12
|
-
|
|
27
|
+
let array = buildEntryValue(callee.expression, new Set(), bindings);
|
|
28
|
+
let arrayBindings = bindings;
|
|
29
|
+
if (ts.isCallExpression(array)) {
|
|
30
|
+
const helper = buildHelper(array, sources, bindings);
|
|
31
|
+
const returned = helper === undefined ? undefined : returnedValue(helper);
|
|
32
|
+
if (helper !== undefined && returned !== undefined) {
|
|
33
|
+
arrayBindings = buildArguments(helper, array, bindings);
|
|
34
|
+
array = buildEntryValue(returned, new Set(), arrayBindings);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
13
37
|
if (!ts.isArrayLiteralExpression(array)) {
|
|
14
38
|
return [bindings];
|
|
15
39
|
}
|
|
16
|
-
return array.elements.map((element) => new Map([...
|
|
40
|
+
return array.elements.map((element) => new Map([...arrayBindings, [parameter, buildEntryValue(element, new Set(), arrayBindings)]]));
|
|
17
41
|
}
|
|
18
42
|
//# sourceMappingURL=mappedBuildBindings.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mappedBuildBindings.js","sourceRoot":"","sources":["../../src/adapters/mappedBuildBindings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAsB,eAAe,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"mappedBuildBindings.js","sourceRoot":"","sources":["../../src/adapters/mappedBuildBindings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAsB,eAAe,EAAE,MAAM,8BAA8B,CAAC;AACnF,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AAEvE,SAAS,aAAa,CAAC,MAAyE;IAC/F,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE,CAAC;QAC/B,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,IAAI,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC;QAC7B,KAAK,MAAM,SAAS,IAAI,MAAM,CAAC,IAAI,CAAC,UAAU,EAAE,CAAC;YAChD,IAAI,EAAE,CAAC,iBAAiB,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,UAAU,KAAK,SAAS,EAAE,CAAC;gBAC3E,OAAO,SAAS,CAAC,UAAU,CAAC;YAC7B,CAAC;QACF,CAAC;QACD,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,OAAO,MAAM,CAAC,IAAI,CAAC;AACpB,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,IAAa,EAAE,QAAuB,EAAE,OAA2C;IACtH,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,oBAAoB,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,CAAC,gBAAgB,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC;QACxG,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnB,CAAC;IACD,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC,UAAU,CAAC;IACtC,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IACrC,IAAI,CAAC,EAAE,CAAC,0BAA0B,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,KAAK,KAAK,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;QACrG,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnB,CAAC;IACD,IAAI,KAAK,GAAG,eAAe,CAAC,MAAM,CAAC,UAAU,EAAE,IAAI,GAAG,EAAE,EAAE,QAAQ,CAAC,CAAC;IACpE,IAAI,aAAa,GAAG,QAAQ,CAAC;IAC7B,IAAI,EAAE,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAC;QACrD,MAAM,QAAQ,GAAG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC1E,IAAI,MAAM,KAAK,SAAS,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YACpD,aAAa,GAAG,cAAc,CAAC,MAAM,EAAE,KAAK,EAAE,QAAQ,CAAC,CAAC;YACxD,KAAK,GAAG,eAAe,CAAC,QAAQ,EAAE,IAAI,GAAG,EAAE,EAAE,aAAa,CAAC,CAAC;QAC7D,CAAC;IACF,CAAC;IACD,IAAI,CAAC,EAAE,CAAC,wBAAwB,CAAC,KAAK,CAAC,EAAE,CAAC;QACzC,OAAO,CAAC,QAAQ,CAAC,CAAC;IACnB,CAAC;IACD,OAAO,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,aAAa,EAAE,CAAC,SAAS,EAAE,eAAe,CAAC,OAAO,EAAE,IAAI,GAAG,EAAE,EAAE,aAAa,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AACtI,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ownedServiceParameters.d.ts","sourceRoot":"","sources":["../../src/adapters/ownedServiceParameters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"ownedServiceParameters.d.ts","sourceRoot":"","sources":["../../src/adapters/ownedServiceParameters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAwD5B,wBAAgB,sBAAsB,CAAC,OAAO,EAAE,EAAE,CAAC,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,CAAC,UAAU,EAAE,eA8D7E,EAAE,CAAC,oBAAoB,KAAG,OAAO,CACpD"}
|
|
@@ -22,10 +22,15 @@ function wrappedCallArguments(checker, parameter, sources) {
|
|
|
22
22
|
if (symbol === undefined) {
|
|
23
23
|
return undefined;
|
|
24
24
|
}
|
|
25
|
+
function resolvedSymbol(value) {
|
|
26
|
+
return value !== undefined && value.flags & ts.SymbolFlags.Alias ? checker.getAliasedSymbol(value) : value;
|
|
27
|
+
}
|
|
25
28
|
const arguments_ = [];
|
|
26
29
|
for (const source of sources) {
|
|
27
30
|
function visit(node) {
|
|
28
|
-
if (ts.isCallExpression(node)
|
|
31
|
+
if (ts.isCallExpression(node)
|
|
32
|
+
&& ts.isIdentifier(node.expression)
|
|
33
|
+
&& resolvedSymbol(checker.getSymbolAtLocation(node.expression)) === resolvedSymbol(symbol)) {
|
|
29
34
|
const argument = node.arguments[callback.parameters.indexOf(parameter)];
|
|
30
35
|
if (argument !== undefined) {
|
|
31
36
|
arguments_.push(argument);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ownedServiceParameters.js","sourceRoot":"","sources":["../../src/adapters/ownedServiceParameters.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,YAAY,CAAC;AAC5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,+BAA+B,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,wBAAwB,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAC/F,OAAO,EAAE,SAAS,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAE3E,SAAS,oBAAoB,CAC5B,OAAuB,EACvB,SAAkC,EAClC,OAAiC;IAEjC,MAAM,QAAQ,GAAG,SAAS,CAAC,MAAM,CAAC;IAClC,IACC,CAAC,CACA,CAAC,EAAE,CAAC,eAAe,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,oBAAoB,CAAC,QAAQ,CAAC,CAAC;WAChE,EAAE,CAAC,gBAAgB,CAAC,QAAQ,CAAC,MAAM,CAAC;WACpC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAC/C,EACA,CAAC;QACF,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC;IAChC,IAAI,CAAC,CAAC,EAAE,CAAC,gBAAgB,CAAC,OAAO,CAAC,UAAU,CAAC,IAAI,SAAS,CAAC,OAAO,EAAE,OAAO,CAAC,UAAU,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC;QAC3G,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,MAAM,WAAW,GAAG,OAAO,CAAC,MAAM,CAAC;IACnC,IAAI,CAAC,CAAC,EAAE,CAAC,qBAAqB,CAAC,WAAW,CAAC,IAAI,WAAW,CAAC,WAAW,KAAK,OAAO,IAAI,EAAE,CAAC,YAAY,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;QAC1H,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,MAAM,MAAM,GAAG,OAAO,CAAC,mBAAmB,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IAC7D,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO,SAAS,CAAC;IAClB,CAAC;IACD,MAAM,UAAU,GAAoB,EAAE,CAAC;IACvC,KAAK,MAAM,MAAM,IAAI,OAAO,EAAE,CAAC;QAC9B,SAAS,KAAK,CAAC,IAAa;YAC3B,
|
|
1
|
+
{"version":3,"file":"ownedServiceParameters.js","sourceRoot":"","sources":["../../src/adapters/ownedServiceParameters.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/quality",
|
|
3
|
-
"version": "0.73.
|
|
3
|
+
"version": "0.73.2",
|
|
4
4
|
"description": "Repository quality gate with typed rules, a baseline of existing debt and a registry of reasoned exceptions",
|
|
5
5
|
"homepage": "https://github.com/ShivaeDev/platform/tree/main/packages/quality#readme",
|
|
6
6
|
"bugs": {
|
|
@@ -75,7 +75,7 @@ export function buildEntryPaths(
|
|
|
75
75
|
(ts.isIdentifier(node) && node.text === "__dirname")
|
|
76
76
|
|| (ts.isPropertyAccessExpression(node) && node.expression.kind === ts.SyntaxKind.MetaProperty && node.name.text === "dirname")
|
|
77
77
|
) {
|
|
78
|
-
return [posix.dirname(
|
|
78
|
+
return [posix.dirname(posix.resolve(cwd, node.getSourceFile().fileName))];
|
|
79
79
|
}
|
|
80
80
|
return ts.isCallExpression(node) ? pathFromCall(node, cwd, file, paths) : valuesOf(node).flatMap(paths);
|
|
81
81
|
}
|
|
@@ -38,24 +38,36 @@ function declared(scope: ts.SourceFile | ts.Block, name: string): Helper | undef
|
|
|
38
38
|
return undefined;
|
|
39
39
|
}
|
|
40
40
|
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
return expression;
|
|
41
|
+
function localHelper(expression: ts.Expression, call: ts.CallExpression): Helper | undefined {
|
|
42
|
+
if (!ts.isIdentifier(expression)) {
|
|
43
|
+
return undefined;
|
|
45
44
|
}
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
return helper;
|
|
51
|
-
}
|
|
45
|
+
for (let scope: ts.Node | undefined = call.parent; scope !== undefined; scope = scope.parent) {
|
|
46
|
+
const helper = ts.isSourceFile(scope) || ts.isBlock(scope) ? declared(scope, expression.text) : undefined;
|
|
47
|
+
if (helper !== undefined) {
|
|
48
|
+
return helper;
|
|
52
49
|
}
|
|
53
50
|
}
|
|
51
|
+
return undefined;
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
function importedHelper(call: ts.CallExpression, sources: ReadonlyMap<string, ts.SourceFile>): Helper | undefined {
|
|
54
55
|
const imported = importedCall(call);
|
|
55
|
-
if (imported === undefined || !imported.module.startsWith(".")) {
|
|
56
|
+
if (imported === undefined || !(imported.module.startsWith(".") || imported.module.startsWith("#"))) {
|
|
56
57
|
return undefined;
|
|
57
58
|
}
|
|
58
|
-
const
|
|
59
|
-
|
|
59
|
+
const modulePath = imported.module.startsWith("#")
|
|
60
|
+
? imported.module.slice(1)
|
|
61
|
+
: posix.join(posix.dirname(call.getSourceFile().fileName), imported.module);
|
|
62
|
+
const source =
|
|
63
|
+
sources.get(modulePath) ?? [...sources.values()].find((candidate) => candidate.fileName.replaceAll("\\", "/").endsWith(`/${modulePath}`));
|
|
60
64
|
return source === undefined ? undefined : declared(source, imported.name);
|
|
61
65
|
}
|
|
66
|
+
|
|
67
|
+
export function buildHelper(call: ts.CallExpression, sources: ReadonlyMap<string, ts.SourceFile>, bindings: BuildBindings): Helper | undefined {
|
|
68
|
+
const expression = buildEntryValue(call.expression, new Set(), bindings);
|
|
69
|
+
if (ts.isArrowFunction(expression) || ts.isFunctionExpression(expression)) {
|
|
70
|
+
return expression;
|
|
71
|
+
}
|
|
72
|
+
return localHelper(expression, call) ?? importedHelper(call, sources);
|
|
73
|
+
}
|
|
@@ -68,7 +68,7 @@ export function bundlerEntries(
|
|
|
68
68
|
if (ts.isFunctionLike(node)) {
|
|
69
69
|
const body = callbackBody(node);
|
|
70
70
|
if (body !== undefined) {
|
|
71
|
-
for (const mapped of mappedBuildBindings(node, bindings)) {
|
|
71
|
+
for (const mapped of mappedBuildBindings(node, bindings, sources)) {
|
|
72
72
|
visit(body, mapped, active);
|
|
73
73
|
}
|
|
74
74
|
}
|
|
@@ -82,6 +82,7 @@ export function bundlerEntries(
|
|
|
82
82
|
);
|
|
83
83
|
const helper = buildHelper(node, sources, bindings);
|
|
84
84
|
if (helper?.body !== undefined && !active.has(helper)) {
|
|
85
|
+
entries.push(posix.relative(root, posix.resolve(root, helper.getSourceFile().fileName)));
|
|
85
86
|
visit(helper.body, buildArguments(helper, node, bindings), new Set([...active, helper]));
|
|
86
87
|
}
|
|
87
88
|
}
|
|
@@ -5,14 +5,18 @@ export function foreignDeclaration(node: ts.Declaration): boolean {
|
|
|
5
5
|
return file.includes("/node_modules/") && !/\/(?:effect|@effect|@shivaedev)\//u.test(file);
|
|
6
6
|
}
|
|
7
7
|
|
|
8
|
-
function
|
|
8
|
+
function methodTypes(checker: ts.TypeChecker, type: ts.Type | undefined, name: string): readonly ts.Type[] {
|
|
9
9
|
if (type === undefined) {
|
|
10
|
-
return
|
|
10
|
+
return [];
|
|
11
11
|
}
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
12
|
+
return (type.isUnionOrIntersection() ? type.types : [type]).flatMap((part) => {
|
|
13
|
+
const property = part.getProperty(name);
|
|
14
|
+
return property === undefined ? [] : [checker.getTypeOfSymbol(property)];
|
|
15
|
+
});
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
function methodType(checker: ts.TypeChecker, type: ts.Type | undefined, name: string): ts.Type | undefined {
|
|
19
|
+
return methodTypes(checker, type, name)[0];
|
|
16
20
|
}
|
|
17
21
|
|
|
18
22
|
function methodName(node: ts.MethodDeclaration): string {
|
|
@@ -47,12 +51,43 @@ export function contextualCallbackType(checker: ts.TypeChecker, node: ts.Node):
|
|
|
47
51
|
return implementedMethodType(checker, node);
|
|
48
52
|
}
|
|
49
53
|
|
|
54
|
+
function callbackSignatures(checker: ts.TypeChecker, type: ts.Type): readonly ts.Signature[] {
|
|
55
|
+
const members = type.isUnionOrIntersection() ? type.types : [type];
|
|
56
|
+
return members.flatMap((member) => {
|
|
57
|
+
const callable = checker.getNonNullableType(member).getCallSignatures();
|
|
58
|
+
if (callable.length > 0) {
|
|
59
|
+
return callable;
|
|
60
|
+
}
|
|
61
|
+
const handler = member.getProperty("handler");
|
|
62
|
+
return handler === undefined ? [] : callbackSignatures(checker, checker.getTypeOfSymbol(handler));
|
|
63
|
+
});
|
|
64
|
+
}
|
|
65
|
+
|
|
66
|
+
function contextualCallbackTypes(checker: ts.TypeChecker, node: ts.Node): readonly ts.Type[] {
|
|
67
|
+
if (ts.isArrowFunction(node) || ts.isFunctionExpression(node)) {
|
|
68
|
+
const contextual = checker.getContextualType(node);
|
|
69
|
+
return contextual === undefined ? [] : [contextual];
|
|
70
|
+
}
|
|
71
|
+
if (!ts.isMethodDeclaration(node)) {
|
|
72
|
+
return [];
|
|
73
|
+
}
|
|
74
|
+
if (ts.isObjectLiteralExpression(node.parent)) {
|
|
75
|
+
return methodTypes(checker, checker.getContextualType(node.parent), methodName(node));
|
|
76
|
+
}
|
|
77
|
+
if (!ts.isClassLike(node.parent) || node.name === undefined) {
|
|
78
|
+
return [];
|
|
79
|
+
}
|
|
80
|
+
return (node.parent.heritageClauses ?? [])
|
|
81
|
+
.filter((clause) => clause.token === ts.SyntaxKind.ImplementsKeyword)
|
|
82
|
+
.flatMap((clause) => clause.types)
|
|
83
|
+
.flatMap((typeNode) => methodTypes(checker, checker.getTypeAtLocation(typeNode), methodName(node)));
|
|
84
|
+
}
|
|
85
|
+
|
|
50
86
|
export function foreignCallbackParameter(checker: ts.TypeChecker, parameter: ts.ParameterDeclaration): boolean {
|
|
51
87
|
const fn = parameter.parent;
|
|
52
|
-
const context = contextualCallbackType(checker, fn);
|
|
53
88
|
if (
|
|
54
|
-
(
|
|
55
|
-
(signature) => signature.declaration !== undefined && foreignDeclaration(signature.declaration),
|
|
89
|
+
contextualCallbackTypes(checker, fn).some((type) =>
|
|
90
|
+
callbackSignatures(checker, type).some((signature) => signature.declaration !== undefined && foreignDeclaration(signature.declaration)),
|
|
56
91
|
)
|
|
57
92
|
) {
|
|
58
93
|
return true;
|
|
@@ -1,7 +1,23 @@
|
|
|
1
1
|
import ts from "typescript";
|
|
2
2
|
import { type BuildBindings, buildEntryValue } from "#adapters/buildEntryValue.ts";
|
|
3
|
+
import { buildArguments, buildHelper } from "#adapters/buildHelper.ts";
|
|
3
4
|
|
|
4
|
-
|
|
5
|
+
function returnedValue(helper: ts.FunctionDeclaration | ts.FunctionExpression | ts.ArrowFunction): ts.Expression | undefined {
|
|
6
|
+
if (helper.body === undefined) {
|
|
7
|
+
return undefined;
|
|
8
|
+
}
|
|
9
|
+
if (ts.isBlock(helper.body)) {
|
|
10
|
+
for (const statement of helper.body.statements) {
|
|
11
|
+
if (ts.isReturnStatement(statement) && statement.expression !== undefined) {
|
|
12
|
+
return statement.expression;
|
|
13
|
+
}
|
|
14
|
+
}
|
|
15
|
+
return undefined;
|
|
16
|
+
}
|
|
17
|
+
return helper.body;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
export function mappedBuildBindings(node: ts.Node, bindings: BuildBindings, sources: ReadonlyMap<string, ts.SourceFile>): readonly BuildBindings[] {
|
|
5
21
|
if (!((ts.isArrowFunction(node) || ts.isFunctionExpression(node)) && ts.isCallExpression(node.parent))) {
|
|
6
22
|
return [bindings];
|
|
7
23
|
}
|
|
@@ -10,9 +26,18 @@ export function mappedBuildBindings(node: ts.Node, bindings: BuildBindings): rea
|
|
|
10
26
|
if (!ts.isPropertyAccessExpression(callee) || callee.name.text !== "map" || parameter === undefined) {
|
|
11
27
|
return [bindings];
|
|
12
28
|
}
|
|
13
|
-
|
|
29
|
+
let array = buildEntryValue(callee.expression, new Set(), bindings);
|
|
30
|
+
let arrayBindings = bindings;
|
|
31
|
+
if (ts.isCallExpression(array)) {
|
|
32
|
+
const helper = buildHelper(array, sources, bindings);
|
|
33
|
+
const returned = helper === undefined ? undefined : returnedValue(helper);
|
|
34
|
+
if (helper !== undefined && returned !== undefined) {
|
|
35
|
+
arrayBindings = buildArguments(helper, array, bindings);
|
|
36
|
+
array = buildEntryValue(returned, new Set(), arrayBindings);
|
|
37
|
+
}
|
|
38
|
+
}
|
|
14
39
|
if (!ts.isArrayLiteralExpression(array)) {
|
|
15
40
|
return [bindings];
|
|
16
41
|
}
|
|
17
|
-
return array.elements.map((element) => new Map([...
|
|
42
|
+
return array.elements.map((element) => new Map([...arrayBindings, [parameter, buildEntryValue(element, new Set(), arrayBindings)]]));
|
|
18
43
|
}
|
|
@@ -31,10 +31,17 @@ function wrappedCallArguments(
|
|
|
31
31
|
if (symbol === undefined) {
|
|
32
32
|
return undefined;
|
|
33
33
|
}
|
|
34
|
+
function resolvedSymbol(value: ts.Symbol | undefined): ts.Symbol | undefined {
|
|
35
|
+
return value !== undefined && value.flags & ts.SymbolFlags.Alias ? checker.getAliasedSymbol(value) : value;
|
|
36
|
+
}
|
|
34
37
|
const arguments_: ts.Expression[] = [];
|
|
35
38
|
for (const source of sources) {
|
|
36
39
|
function visit(node: ts.Node): void {
|
|
37
|
-
if (
|
|
40
|
+
if (
|
|
41
|
+
ts.isCallExpression(node)
|
|
42
|
+
&& ts.isIdentifier(node.expression)
|
|
43
|
+
&& resolvedSymbol(checker.getSymbolAtLocation(node.expression)) === resolvedSymbol(symbol)
|
|
44
|
+
) {
|
|
38
45
|
const argument = node.arguments[callback.parameters.indexOf(parameter)];
|
|
39
46
|
if (argument !== undefined) {
|
|
40
47
|
arguments_.push(argument);
|