Commit cffae6b3 authored by nanahira's avatar nanahira

no longer think it depends on satori

parent b5c6ec15
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
}, },
"peerDependencies": { "peerDependencies": {
"@satorijs/core": "^1.3.1", "@satorijs/core": "^1.3.1",
"@satorijs/satori": "^1.3.1" "koishi": "^4.9.7"
} }
}, },
"node_modules/@ampproject/remapping": { "node_modules/@ampproject/remapping": {
...@@ -1074,6 +1074,40 @@ ...@@ -1074,6 +1074,40 @@
"node": ">= 8.0.0" "node": ">= 8.0.0"
} }
}, },
"node_modules/@koishijs/core": {
"version": "4.9.7",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.9.7.tgz",
"integrity": "sha512-jmt6BKvH0az25z/BJs4SNFn9dvx7Ji3TjIRl5AtvagO0bzOQfbn1Tavhtfn3sHVJqQUQIZQcFR3969G4dvchhA==",
"peer": true,
"dependencies": {
"@koishijs/utils": "^6.2.4",
"@minatojs/core": "^1.3.2",
"@satorijs/core": "^1.3.1",
"cordis": "^2.5.0",
"cosmokit": "^1.3.3"
}
},
"node_modules/@koishijs/utils": {
"version": "6.2.4",
"resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-6.2.4.tgz",
"integrity": "sha512-AfZA1TX8oOQCNFTOmG5cBRPC0YbSUPgbUYkninFg8F2sp98C8VSn1hua1OVjCM5zC9XISWtj5QpKJHPJRIa+BA==",
"peer": true,
"dependencies": {
"cosmokit": "^1.3.3",
"inaba": "^1.1.1",
"reggol": "^1.3.1",
"schemastery": "^3.5.4"
}
},
"node_modules/@minatojs/core": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/@minatojs/core/-/core-1.3.2.tgz",
"integrity": "sha512-hEMzHobEqY8yD3M5lLiUjfsvNV4NTLBZJkKNJ4wTi+zhm4LbDmaJpV0LoUtgzl8v0SE79gBYZGXNhkeMg/cX0w==",
"peer": true,
"dependencies": {
"cosmokit": "^1.3.3"
}
},
"node_modules/@nodelib/fs.scandir": { "node_modules/@nodelib/fs.scandir": {
"version": "2.1.5", "version": "2.1.5",
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
...@@ -3344,6 +3378,12 @@ ...@@ -3344,6 +3378,12 @@
"node": ">=0.8.19" "node": ">=0.8.19"
} }
}, },
"node_modules/inaba": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/inaba/-/inaba-1.1.1.tgz",
"integrity": "sha512-VYgrcz9EwjHELNU74R/p81U/G00u8KuFzao43pyNp7UZix+NY78eUzBy1Ks0tSgxgia+luJMvTD67vV02pk9yg==",
"peer": true
},
"node_modules/inflation": { "node_modules/inflation": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/inflation/-/inflation-2.0.0.tgz", "resolved": "https://registry.npmjs.org/inflation/-/inflation-2.0.0.tgz",
...@@ -4272,6 +4312,22 @@ ...@@ -4272,6 +4312,22 @@
"node": ">= 0.8" "node": ">= 0.8"
} }
}, },
"node_modules/koishi": {
"version": "4.9.7",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.9.7.tgz",
"integrity": "sha512-InvvfPx5sqRkgOlTWksQu1dWjASCcf92guRGQmm+UIqZh0GBTJi+uFmpAMPA/E+nHOoLDOy/U9DVtpSPipi2+g==",
"peer": true,
"dependencies": {
"@koishijs/core": "^4.9.7",
"@koishijs/utils": "^6.2.4",
"@satorijs/satori": "^1.3.1",
"file-type": "^16.5.4",
"ns-require": "^1.1.4"
},
"engines": {
"node": ">=12.0.0"
}
},
"node_modules/leven": { "node_modules/leven": {
"version": "3.1.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
...@@ -4535,6 +4591,12 @@ ...@@ -4535,6 +4591,12 @@
"node": ">=8" "node": ">=8"
} }
}, },
"node_modules/ns-require": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/ns-require/-/ns-require-1.1.4.tgz",
"integrity": "sha512-Zk25pQj4u5i6DS0vaNO5aSSXewybVqqVVjz8AOxFy9DNPtmu3jlexMz6kUXLV2oB+X6iQeAnHXSzj5Qz/IeDaQ==",
"peer": true
},
"node_modules/object-inspect": { "node_modules/object-inspect": {
"version": "1.12.2", "version": "1.12.2",
"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
...@@ -6876,6 +6938,40 @@ ...@@ -6876,6 +6938,40 @@
"path-to-regexp": "^6.1.0" "path-to-regexp": "^6.1.0"
} }
}, },
"@koishijs/core": {
"version": "4.9.7",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.9.7.tgz",
"integrity": "sha512-jmt6BKvH0az25z/BJs4SNFn9dvx7Ji3TjIRl5AtvagO0bzOQfbn1Tavhtfn3sHVJqQUQIZQcFR3969G4dvchhA==",
"peer": true,
"requires": {
"@koishijs/utils": "^6.2.4",
"@minatojs/core": "^1.3.2",
"@satorijs/core": "^1.3.1",
"cordis": "^2.5.0",
"cosmokit": "^1.3.3"
}
},
"@koishijs/utils": {
"version": "6.2.4",
"resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-6.2.4.tgz",
"integrity": "sha512-AfZA1TX8oOQCNFTOmG5cBRPC0YbSUPgbUYkninFg8F2sp98C8VSn1hua1OVjCM5zC9XISWtj5QpKJHPJRIa+BA==",
"peer": true,
"requires": {
"cosmokit": "^1.3.3",
"inaba": "^1.1.1",
"reggol": "^1.3.1",
"schemastery": "^3.5.4"
}
},
"@minatojs/core": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/@minatojs/core/-/core-1.3.2.tgz",
"integrity": "sha512-hEMzHobEqY8yD3M5lLiUjfsvNV4NTLBZJkKNJ4wTi+zhm4LbDmaJpV0LoUtgzl8v0SE79gBYZGXNhkeMg/cX0w==",
"peer": true,
"requires": {
"cosmokit": "^1.3.3"
}
},
"@nodelib/fs.scandir": { "@nodelib/fs.scandir": {
"version": "2.1.5", "version": "2.1.5",
"resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
...@@ -8588,6 +8684,12 @@ ...@@ -8588,6 +8684,12 @@
"integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
"dev": true "dev": true
}, },
"inaba": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/inaba/-/inaba-1.1.1.tgz",
"integrity": "sha512-VYgrcz9EwjHELNU74R/p81U/G00u8KuFzao43pyNp7UZix+NY78eUzBy1Ks0tSgxgia+luJMvTD67vV02pk9yg==",
"peer": true
},
"inflation": { "inflation": {
"version": "2.0.0", "version": "2.0.0",
"resolved": "https://registry.npmjs.org/inflation/-/inflation-2.0.0.tgz", "resolved": "https://registry.npmjs.org/inflation/-/inflation-2.0.0.tgz",
...@@ -9306,6 +9408,19 @@ ...@@ -9306,6 +9408,19 @@
"koa-compose": "^4.1.0" "koa-compose": "^4.1.0"
} }
}, },
"koishi": {
"version": "4.9.7",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.9.7.tgz",
"integrity": "sha512-InvvfPx5sqRkgOlTWksQu1dWjASCcf92guRGQmm+UIqZh0GBTJi+uFmpAMPA/E+nHOoLDOy/U9DVtpSPipi2+g==",
"peer": true,
"requires": {
"@koishijs/core": "^4.9.7",
"@koishijs/utils": "^6.2.4",
"@satorijs/satori": "^1.3.1",
"file-type": "^16.5.4",
"ns-require": "^1.1.4"
}
},
"leven": { "leven": {
"version": "3.1.0", "version": "3.1.0",
"resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
...@@ -9514,6 +9629,12 @@ ...@@ -9514,6 +9629,12 @@
"path-key": "^3.0.0" "path-key": "^3.0.0"
} }
}, },
"ns-require": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/ns-require/-/ns-require-1.1.4.tgz",
"integrity": "sha512-Zk25pQj4u5i6DS0vaNO5aSSXewybVqqVVjz8AOxFy9DNPtmu3jlexMz6kUXLV2oB+X6iQeAnHXSzj5Qz/IeDaQ==",
"peer": true
},
"object-inspect": { "object-inspect": {
"version": "1.12.2", "version": "1.12.2",
"resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz", "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.12.2.tgz",
......
...@@ -63,6 +63,6 @@ ...@@ -63,6 +63,6 @@
}, },
"peerDependencies": { "peerDependencies": {
"@satorijs/core": "^1.3.1", "@satorijs/core": "^1.3.1",
"@satorijs/satori": "^1.3.1" "koishi": "^4.9.7"
} }
} }
...@@ -11,7 +11,7 @@ import { ...@@ -11,7 +11,7 @@ import {
SchemaProperty, SchemaProperty,
} from 'cordis-decorators'; } from 'cordis-decorators';
import PluginClass = PluginRegistrar.PluginClass; import PluginClass = PluginRegistrar.PluginClass;
import { Context, Dict } from '@satorijs/satori'; import { Context, Dict } from 'koishi';
function MappedConfig< function MappedConfig<
Ctx extends Context, Ctx extends Context,
......
import { BasePlugin, PartialDeep, PluginRegistrar } from 'cordis-decorators'; import { BasePlugin, PartialDeep, PluginRegistrar } from 'cordis-decorators';
import { selectContext, Selection } from '../utility/select-context'; import { selectContext, Selection } from '../utility/select-context';
import PluginClass = PluginRegistrar.PluginClass; import PluginClass = PluginRegistrar.PluginClass;
import { Context, Dict } from '@satorijs/satori'; import { Context, Dict } from 'koishi';
import { defaultRegistrarS } from '../registrar'; import { defaultRegistrarS } from '../registrar';
import { ClonePlugin } from '../utility/clone-plugin'; import { ClonePlugin } from '../utility/clone-plugin';
import ClassPluginConfig = PluginRegistrar.ClassPluginConfig; import ClassPluginConfig = PluginRegistrar.ClassPluginConfig;
......
...@@ -7,7 +7,7 @@ import { ...@@ -7,7 +7,7 @@ import {
PluginRegistrar, PluginRegistrar,
} from 'cordis-decorators'; } from 'cordis-decorators';
import PluginClass = PluginRegistrar.PluginClass; import PluginClass = PluginRegistrar.PluginClass;
import { Context, Dict } from '@satorijs/satori'; import { Context, Dict } from 'koishi';
import _ from 'lodash'; import _ from 'lodash';
type UnionToIntersection<T> = (T extends any ? (x: T) => any : never) extends ( type UnionToIntersection<T> = (T extends any ? (x: T) => any : never) extends (
......
...@@ -11,7 +11,7 @@ import { selectContext, Selection } from '../utility/select-context'; ...@@ -11,7 +11,7 @@ import { selectContext, Selection } from '../utility/select-context';
import { ClonePlugin } from '../utility/clone-plugin'; import { ClonePlugin } from '../utility/clone-plugin';
import PluginClass = PluginRegistrar.PluginClass; import PluginClass = PluginRegistrar.PluginClass;
import { defaultRegistrarS } from '../registrar'; import { defaultRegistrarS } from '../registrar';
import { Context, Schema } from '@satorijs/satori'; import { Context, Schema } from 'koishi';
import ClassPluginConfig = PluginRegistrar.ClassPluginConfig; import ClassPluginConfig = PluginRegistrar.ClassPluginConfig;
import { UsingService, Apply } from 'cordis-decorators/dist/src/decorators'; import { UsingService, Apply } from 'cordis-decorators/dist/src/decorators';
......
import { Context } from '@satorijs/satori'; import { Context } from 'koishi';
import { Registrar } from 'cordis-decorators'; import { Registrar } from 'cordis-decorators';
import WebSocket from 'ws'; import WebSocket from 'ws';
......
import { Context, makeArray, MaybeArray } from '@satorijs/satori'; import { Context, makeArray, MaybeArray } from 'koishi';
const selectors = [ const selectors = [
'user', 'user',
......
import { Context } from '@satorijs/satori'; import { Context } from 'koishi';
import { MapPlugin, MergePlugin } from '../src/plugin-operators'; import { MapPlugin, MergePlugin } from '../src/plugin-operators';
import { SchemaProperty } from 'cordis-decorators'; import { SchemaProperty } from 'cordis-decorators';
import { DefinePlugin, StarterPlugin, UseEvent } from './utility/decorators'; import { DefinePlugin, StarterPlugin, UseEvent } from './utility/decorators';
......
import { RegisterSchema, SchemaProperty } from 'cordis-decorators'; import { RegisterSchema, SchemaProperty } from 'cordis-decorators';
import { DefinePlugin, StarterPlugin, UseEvent } from './utility/decorators'; import { DefinePlugin, StarterPlugin, UseEvent } from './utility/decorators';
import { MultiInstancePlugin } from '../src/plugin-operators'; import { MultiInstancePlugin } from '../src/plugin-operators';
import { Context, Schema } from '@satorijs/satori'; import { Context, Schema } from 'koishi';
declare module 'cordis' { declare module 'cordis' {
interface Events<C> { interface Events<C> {
......
import { OnGuild, OnPlatform } from '../src/decorators'; import { OnGuild, OnPlatform } from '../src/decorators';
import { Context, Session } from '@satorijs/satori'; import { Context, Session } from 'koishi';
import { defaultRegistrarS } from '../src/registrar'; import { defaultRegistrarS } from '../src/registrar';
@OnPlatform('discord') @OnPlatform('discord')
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment