Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
K
Koishi Thirdeye
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
3rdeye
Koishi Thirdeye
Commits
7250cab8
Commit
7250cab8
authored
May 03, 2022
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rework multi plugin with factory
parent
5551d867
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
18 additions
and
39 deletions
+18
-39
src/multi-plugin.ts
src/multi-plugin.ts
+15
-14
src/plugin-factory.ts
src/plugin-factory.ts
+1
-1
src/utility/to-instance-config.ts
src/utility/to-instance-config.ts
+2
-24
No files found.
src/multi-plugin.ts
View file @
7250cab8
import
{
ClonePlugin
}
from
'
./utility/clone-plugin
'
;
import
{
Context
}
from
'
koishi
'
;
import
{
BasePlugin
,
PartialDeep
}
from
'
./base-plugin
'
;
import
{
ClassPluginConfig
,
MultiPluginConfig
,
TypeFromClass
}
from
'
./def
'
;
import
{
ClassPluginConfig
,
Instances
,
MultiPluginConfig
,
TypeFromClass
,
}
from
'
./def
'
;
import
{
ClassType
}
from
'
schemastery-gen
'
;
import
{
ToInstancesConfig
}
from
'
./utility/to-instance-config
'
;
import
Schema
from
'
schemastery
'
;
import
{
PluginSchema
,
UsingService
}
from
'
./decorators
'
;
import
{
UseEvent
}
from
'
koishi-decorators
'
;
import
{
CreatePluginFactory
}
from
'
./plugin-factory
'
;
export
class
MultiInstancePluginFramework
<
InnerPlugin
extends
new
(
ctx
:
Context
,
config
:
any
)
=>
any
,
OuterConfig
,
>
extends
BasePlugin
<
MultiPluginConfig
<
ClassPluginConfig
<
InnerPlugin
>
,
OuterConfig
>
,
MultiPluginConfig
<
ClassPluginConfig
<
InnerPlugin
>
,
PartialDeep
<
OuterConfig
>>
Instances
<
ClassPluginConfig
<
InnerPlugin
>
>
,
Instances
<
ClassPluginConfig
<
InnerPlugin
>>
>
{
instances
:
TypeFromClass
<
InnerPlugin
>
[]
=
[];
...
...
@@ -47,10 +52,7 @@ export function MultiInstancePlugin<
InnerPlugin
extends
new
(
ctx
:
Context
,
config
:
any
)
=>
any
,
OuterConfig
,
>
(
innerPlugin
:
InnerPlugin
,
outerConfig
?:
ClassType
<
OuterConfig
>
)
{
const
pluginClass
=
class
SpecificMultiInstancePlugin
extends
MultiInstancePluginFramework
<
InnerPlugin
,
OuterConfig
>
{
const
basePlugin
=
class
SpecificMultiInstancePlugin
extends
MultiInstancePluginFramework
<
InnerPlugin
>
{
_getInnerPlugin
()
{
return
innerPlugin
;
}
...
...
@@ -59,17 +61,16 @@ export function MultiInstancePlugin<
(
innerPlugin
[
'
Config
'
]
||
innerPlugin
[
'
schema
'
]
||
Schema
.
any
())
as
ClassType
<
ClassPluginConfig
<
InnerPlugin
>>
,
outerConfig
,
);
if
(
schema
)
{
PluginSchema
(
schema
)(
pluginClass
);
}
const
factory
=
CreatePluginFactory
(
basePlugin
,
schema
);
const
plugin
=
factory
(
outerConfig
);
if
(
innerPlugin
[
'
using
'
])
{
UsingService
(...(
innerPlugin
[
'
using
'
]
as
(
keyof
Context
.
Services
)[]))(
plugin
Class
,
plugin
,
);
}
return
plugin
Class
;
return
plugin
;
}
src/plugin-factory.ts
View file @
7250cab8
...
...
@@ -9,7 +9,7 @@ export function CreatePluginFactory<C, IC, P extends { config: IC }>(
):
<
S
>
(
specificConfig
?:
ClassType
<
S
>
)
=>
new
(
ctx
:
Context
,
config
:
PartialDeep
<
S
>
&
C
,
)
=>
Omit
<
C
,
'
config
'
>
&
{
)
=>
Omit
<
P
,
'
config
'
>
&
{
config
:
IC
&
S
;
};
export
function
CreatePluginFactory
(
...
...
src/utility/to-instance-config.ts
View file @
7250cab8
...
...
@@ -8,30 +8,8 @@ import { Instances, ParamsFromClass, TypeFromClass } from '../def';
export
function
ToInstancesConfig
<
Inner
extends
new
(...
args
:
any
[])
=>
any
>
(
instanceConfig
:
Inner
,
):
new
()
=>
Instances
<
TypeFromClass
<
Inner
>>
;
export
function
ToInstancesConfig
<
Inner
extends
AnyClass
,
Outer
extends
AnyClass
,
>
(
instanceConfig
:
Inner
,
outerConfig
?:
Outer
,
):
new
(...
args
:
ParamsFromClass
<
Outer
>
)
=>
Instances
<
TypeFromClass
<
Inner
>>
&
TypeFromClass
<
Outer
>
;
export
function
ToInstancesConfig
<
Inner
extends
AnyClass
,
Outer
extends
AnyClass
,
>
(
instanceConfig
:
Inner
,
outerConfig
?:
Outer
,
):
new
(...
args
:
ParamsFromClass
<
Outer
>
)
=>
Instances
<
TypeFromClass
<
Inner
>>
&
TypeFromClass
<
Outer
>
{
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
// @ts-ignore
outerConfig
??
=
class
EmptyConfig
{};
if
(
outerConfig
[
OriginalClassSym
])
{
outerConfig
=
outerConfig
[
OriginalClassSym
];
}
const
instanceConfigClass
=
class
MixedInstancesConfig
extends
outerConfig
{
):
new
()
=>
Instances
<
TypeFromClass
<
Inner
>>
{
const
instanceConfigClass
=
class
InstancesConfig
{
instances
:
TypeFromClass
<
Inner
>
[];
};
SchemaProperty
({
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment