Skip to content

K
Koishi Thirdeye
Commit 001fc21f authored by nanahira's avatar nanahira
Browse files
Options

yeah the rename thing

parent a1ad3565
Hide whitespace changes
Inline Side-by-side
Showing with 89 additions and 90 deletions
package-lock.json
View file @ 001fc21f
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
"dependencies": { "dependencies": {
"@types/koa": "^2.13.4", "@types/koa": "^2.13.4",
"@types/koa__router": "^8.0.11", "@types/koa__router": "^8.0.11",
"cosmotype-decorators": "^2.0.5",
"koishi-decorators": "^2.0.1", "koishi-decorators": "^2.0.1",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"minato-decorators": "^2.0.6",
"reflect-metadata": "^0.1.13", "reflect-metadata": "^0.1.13",
"schemastery-gen": "^3.1.13", "schemastery-gen": "^3.1.13",
"typed-reflector": "^1.0.10" "typed-reflector": "^1.0.10"
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
"ws": "^8.2.3" "ws": "^8.2.3"
}, },
"peerDependencies": { "peerDependencies": {
"koishi": "^4.6.2", "koishi": "^4.7.0",
"schemastery": "^3.1.0" "schemastery": "^3.1.0"
} }
}, },
...@@ -1028,14 +1028,14 @@ ...@@ -1028,14 +1028,14 @@
} }
}, },
"node_modules/@koishijs/core": { "node_modules/@koishijs/core": {
"version": "4.6.2", "version": "4.7.0",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.6.2.tgz", "resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.7.0.tgz",
"integrity": "sha512-GM0497Bd5BDPXuzJMppJik+Zb55bbLTX14aJmkFgPW9maU9oz3ZZRW+EeMpFK449fPG83P2UsIulJHNbD5L/hQ==", "integrity": "sha512-MCF8eJaDV8Bw74N3GesFMaxBmRfrUCvez4SwAPkODjRk2uuQpmnxKCAOJu/AFxyyLLg/vQNTGUMG4mPW8RDIyA==",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"@koishijs/utils": "^5.4.2", "@koishijs/utils": "^5.4.3",
"cosmotype": "^1.0.9",
"fastest-levenshtein": "^1.0.12", "fastest-levenshtein": "^1.0.12",
"minato": "^1.0.10",
"ns-require": "^1.1.2" "ns-require": "^1.1.2"
}, },
"engines": { "engines": {
...@@ -1062,14 +1062,14 @@ ...@@ -1062,14 +1062,14 @@
"peer": true "peer": true
}, },
"node_modules/@koishijs/utils": { "node_modules/@koishijs/utils": {
"version": "5.4.2", "version": "5.4.3",
"resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-5.4.2.tgz", "resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-5.4.3.tgz",
"integrity": "sha512-cUwrqVQqTM/F2DZO9APEDlfz2mrUe5L7b2pYmhaTi8Pggk9kT78hvBx4fnLWrHiFV3BPuikghqZSfkladFcugw==", "integrity": "sha512-AzkApepb76zEEPNHmWrr1pXCc1DpCpaxL15nANoNMBS+G/2WNaJqUEyZoPQrhWlQzov3MWIzn8KeR4Xl75T4Gg==",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"@koishijs/segment": "^1.1.1", "@koishijs/segment": "^1.1.1",
"cosmokit": "^1.1.2", "cosmokit": "^1.1.2",
"reggol": "^1.0.2", "reggol": "^1.0.3",
"schemastery": "^3.3.3", "schemastery": "^3.3.3",
"supports-color": "^8.1.1" "supports-color": "^8.1.1"
} }
...@@ -2300,28 +2300,6 @@ ...@@ -2300,28 +2300,6 @@
"integrity": "sha512-cSNrcyxZ3GT+tjSlUzWIzMiK7Wndq1Nm/2tlRhT65RXltSIcH5zaHdmnz1TnIhLuOViaO9qfSdnRPzxNkxMv0g==", "integrity": "sha512-cSNrcyxZ3GT+tjSlUzWIzMiK7Wndq1Nm/2tlRhT65RXltSIcH5zaHdmnz1TnIhLuOViaO9qfSdnRPzxNkxMv0g==",
"peer": true "peer": true
}, },
"node_modules/cosmotype": {
"version": "1.0.9",
"resolved": "https://registry.npmjs.org/cosmotype/-/cosmotype-1.0.9.tgz",
"integrity": "sha512-ot2m5LYBj9UNFvYpQNQ28hWYDG4GWmym094us2HNn6qgYzvALmjs4FxEVBsjA+VBnIf3ykuMGRYcex5cqZTvJQ==",
"peer": true,
"dependencies": {
"cosmokit": "^1.1.2",
"ns-require": "^1.1.2"
}
},
"node_modules/cosmotype-decorators": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/cosmotype-decorators/-/cosmotype-decorators-2.0.5.tgz",
"integrity": "sha512-Y+OXs405l6T+IUk59CtvG3y8LU7CCTITKWLfafEm8wVUAJFMTJGKh63HtZmmq9rKl/qM3RuHG12DZA9SZvsrAg==",
"dependencies": {
"lodash": "^4.17.21",
"typed-reflector": "^1.0.10"
},
"peerDependencies": {
"cosmotype": "^1.0.3"
}
},
"node_modules/cross-spawn": { "node_modules/cross-spawn": {
"version": "7.0.3", "version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
...@@ -4770,14 +4748,14 @@ ...@@ -4770,14 +4748,14 @@
} }
}, },
"node_modules/koishi": { "node_modules/koishi": {
"version": "4.6.2", "version": "4.7.0",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.6.2.tgz", "resolved": "https://registry.npmjs.org/koishi/-/koishi-4.7.0.tgz",
"integrity": "sha512-vgjKxSJxAOsFwBnO097d8Oo8AC0jTvdfrsAHgu8u1d3DDJkHzUr8vQEjcJjvAp411Ev5VIvswFeSpeTVWDv6VA==", "integrity": "sha512-aCtfE+QydqbcpoOspOp/QCY1CAXieqnPIR101eKtODgrPBHUVc8XbXbkqGAzx6c2kr6wC7mE4ZLBgECqGBn7tw==",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"@koa/router": "^10.1.1", "@koa/router": "^10.1.1",
"@koishijs/core": "^4.6.2", "@koishijs/core": "^4.7.0",
"@koishijs/utils": "^5.4.2", "@koishijs/utils": "^5.4.3",
"@types/koa": "*", "@types/koa": "*",
"@types/koa__router": "*", "@types/koa__router": "*",
"@types/ws": "^8.5.3", "@types/ws": "^8.5.3",
...@@ -4788,7 +4766,7 @@ ...@@ -4788,7 +4766,7 @@
"parseurl": "^1.3.3", "parseurl": "^1.3.3",
"path-to-regexp": "^6.2.0", "path-to-regexp": "^6.2.0",
"proxy-agent": "^5.0.0", "proxy-agent": "^5.0.0",
"ws": "^8.5.0" "ws": "^8.6.0"
}, },
"engines": { "engines": {
"node": ">=12.0.0" "node": ">=12.0.0"
...@@ -5002,6 +4980,28 @@ ...@@ -5002,6 +4980,28 @@
"node": ">=6" "node": ">=6"
} }
}, },
"node_modules/minato": {
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/minato/-/minato-1.0.10.tgz",
"integrity": "sha512-1R3cTrtz/xZocWBfmgHsNy6V/nILjyMksKDuGtvqjjToImdgqkQrHmW2ZpdOJaaXM/apivY/KqMEf0o0jksKkw==",
"peer": true,
"dependencies": {
"cosmokit": "^1.1.2",
"ns-require": "^1.1.2"
}
},
"node_modules/minato-decorators": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/minato-decorators/-/minato-decorators-2.0.6.tgz",
"integrity": "sha512-bDdAbIbcKN0ZJZhw6IOOHZF0LyDXwTHfd2FY5nwO+aqw2IQDztSHAvnxMWT+vWzjqF+xcdQY9WdWffQJ2lX9bg==",
"dependencies": {
"lodash": "^4.17.21",
"typed-reflector": "^1.0.10"
},
"peerDependencies": {
"minato": "^1.0.10"
}
},
"node_modules/minimatch": { "node_modules/minimatch": {
"version": "3.0.4", "version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
...@@ -5679,9 +5679,9 @@ ...@@ -5679,9 +5679,9 @@
} }
}, },
"node_modules/reggol": { "node_modules/reggol": {
"version": "1.0.2", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/reggol/-/reggol-1.0.2.tgz", "resolved": "https://registry.npmjs.org/reggol/-/reggol-1.0.3.tgz",
"integrity": "sha512-BP7gx5nUBntWChG4x/yf7xLdpxy1R5PMtF/LJlOsz+XkWtip4YVNkQp2Flmio9hXSc2UxrwUyP0WrQ1M/FFWXw==", "integrity": "sha512-91bFsIEaw3IKoMt7JQz703yuEgdcbbKBTJbeVyFMrZwA93wCU/ByDvhwDfvVWXjvLqwRuFOfhV1pkxvAgdkVZQ==",
"peer": true, "peer": true,
"dependencies": { "dependencies": {
"cosmokit": "^1.1.2", "cosmokit": "^1.1.2",
...@@ -6765,9 +6765,9 @@ ...@@ -6765,9 +6765,9 @@
} }
}, },
"node_modules/ws": { "node_modules/ws": {
"version": "8.5.0", "version": "8.6.0",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz", "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz",
"integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==", "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==",
"engines": { "engines": {
"node": ">=10.0.0" "node": ">=10.0.0"
}, },
...@@ -7627,14 +7627,14 @@ ...@@ -7627,14 +7627,14 @@
} }
}, },
"@koishijs/core": { "@koishijs/core": {
"version": "4.6.2", "version": "4.7.0",
"resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.6.2.tgz", "resolved": "https://registry.npmjs.org/@koishijs/core/-/core-4.7.0.tgz",
"integrity": "sha512-GM0497Bd5BDPXuzJMppJik+Zb55bbLTX14aJmkFgPW9maU9oz3ZZRW+EeMpFK449fPG83P2UsIulJHNbD5L/hQ==", "integrity": "sha512-MCF8eJaDV8Bw74N3GesFMaxBmRfrUCvez4SwAPkODjRk2uuQpmnxKCAOJu/AFxyyLLg/vQNTGUMG4mPW8RDIyA==",
"peer": true, "peer": true,
"requires": { "requires": {
"@koishijs/utils": "^5.4.2", "@koishijs/utils": "^5.4.3",
"cosmotype": "^1.0.9",
"fastest-levenshtein": "^1.0.12", "fastest-levenshtein": "^1.0.12",
"minato": "^1.0.10",
"ns-require": "^1.1.2" "ns-require": "^1.1.2"
} }
}, },
...@@ -7655,14 +7655,14 @@ ...@@ -7655,14 +7655,14 @@
"peer": true "peer": true
}, },
"@koishijs/utils": { "@koishijs/utils": {
"version": "5.4.2", "version": "5.4.3",
"resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-5.4.2.tgz", "resolved": "https://registry.npmjs.org/@koishijs/utils/-/utils-5.4.3.tgz",
"integrity": "sha512-cUwrqVQqTM/F2DZO9APEDlfz2mrUe5L7b2pYmhaTi8Pggk9kT78hvBx4fnLWrHiFV3BPuikghqZSfkladFcugw==", "integrity": "sha512-AzkApepb76zEEPNHmWrr1pXCc1DpCpaxL15nANoNMBS+G/2WNaJqUEyZoPQrhWlQzov3MWIzn8KeR4Xl75T4Gg==",
"peer": true, "peer": true,
"requires": { "requires": {
"@koishijs/segment": "^1.1.1", "@koishijs/segment": "^1.1.1",
"cosmokit": "^1.1.2", "cosmokit": "^1.1.2",
"reggol": "^1.0.2", "reggol": "^1.0.3",
"schemastery": "^3.3.3", "schemastery": "^3.3.3",
"supports-color": "^8.1.1" "supports-color": "^8.1.1"
}, },
...@@ -8654,25 +8654,6 @@ ...@@ -8654,25 +8654,6 @@
"integrity": "sha512-cSNrcyxZ3GT+tjSlUzWIzMiK7Wndq1Nm/2tlRhT65RXltSIcH5zaHdmnz1TnIhLuOViaO9qfSdnRPzxNkxMv0g==", "integrity": "sha512-cSNrcyxZ3GT+tjSlUzWIzMiK7Wndq1Nm/2tlRhT65RXltSIcH5zaHdmnz1TnIhLuOViaO9qfSdnRPzxNkxMv0g==",
"peer": true "peer": true
}, },
"cosmotype": {
"version": "1.0.9",
"resolved": "https://registry.npmjs.org/cosmotype/-/cosmotype-1.0.9.tgz",
"integrity": "sha512-ot2m5LYBj9UNFvYpQNQ28hWYDG4GWmym094us2HNn6qgYzvALmjs4FxEVBsjA+VBnIf3ykuMGRYcex5cqZTvJQ==",
"peer": true,
"requires": {
"cosmokit": "^1.1.2",
"ns-require": "^1.1.2"
}
},
"cosmotype-decorators": {
"version": "2.0.5",
"resolved": "https://registry.npmjs.org/cosmotype-decorators/-/cosmotype-decorators-2.0.5.tgz",
"integrity": "sha512-Y+OXs405l6T+IUk59CtvG3y8LU7CCTITKWLfafEm8wVUAJFMTJGKh63HtZmmq9rKl/qM3RuHG12DZA9SZvsrAg==",
"requires": {
"lodash": "^4.17.21",
"typed-reflector": "^1.0.10"
}
},
"cross-spawn": { "cross-spawn": {
"version": "7.0.3", "version": "7.0.3",
"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
...@@ -10512,14 +10493,14 @@ ...@@ -10512,14 +10493,14 @@
} }
}, },
"koishi": { "koishi": {
"version": "4.6.2", "version": "4.7.0",
"resolved": "https://registry.npmjs.org/koishi/-/koishi-4.6.2.tgz", "resolved": "https://registry.npmjs.org/koishi/-/koishi-4.7.0.tgz",
"integrity": "sha512-vgjKxSJxAOsFwBnO097d8Oo8AC0jTvdfrsAHgu8u1d3DDJkHzUr8vQEjcJjvAp411Ev5VIvswFeSpeTVWDv6VA==", "integrity": "sha512-aCtfE+QydqbcpoOspOp/QCY1CAXieqnPIR101eKtODgrPBHUVc8XbXbkqGAzx6c2kr6wC7mE4ZLBgECqGBn7tw==",
"peer": true, "peer": true,
"requires": { "requires": {
"@koa/router": "^10.1.1", "@koa/router": "^10.1.1",
"@koishijs/core": "^4.6.2", "@koishijs/core": "^4.7.0",
"@koishijs/utils": "^5.4.2", "@koishijs/utils": "^5.4.3",
"@types/koa": "*", "@types/koa": "*",
"@types/koa__router": "*", "@types/koa__router": "*",
"@types/ws": "^8.5.3", "@types/ws": "^8.5.3",
...@@ -10530,7 +10511,7 @@ ...@@ -10530,7 +10511,7 @@
"parseurl": "^1.3.3", "parseurl": "^1.3.3",
"path-to-regexp": "^6.2.0", "path-to-regexp": "^6.2.0",
"proxy-agent": "^5.0.0", "proxy-agent": "^5.0.0",
"ws": "^8.5.0" "ws": "^8.6.0"
} }
}, },
"koishi-decorators": { "koishi-decorators": {
...@@ -10692,6 +10673,25 @@ ...@@ -10692,6 +10673,25 @@
"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
"dev": true "dev": true
}, },
"minato": {
"version": "1.0.10",
"resolved": "https://registry.npmjs.org/minato/-/minato-1.0.10.tgz",
"integrity": "sha512-1R3cTrtz/xZocWBfmgHsNy6V/nILjyMksKDuGtvqjjToImdgqkQrHmW2ZpdOJaaXM/apivY/KqMEf0o0jksKkw==",
"peer": true,
"requires": {
"cosmokit": "^1.1.2",
"ns-require": "^1.1.2"
}
},
"minato-decorators": {
"version": "2.0.6",
"resolved": "https://registry.npmjs.org/minato-decorators/-/minato-decorators-2.0.6.tgz",
"integrity": "sha512-bDdAbIbcKN0ZJZhw6IOOHZF0LyDXwTHfd2FY5nwO+aqw2IQDztSHAvnxMWT+vWzjqF+xcdQY9WdWffQJ2lX9bg==",
"requires": {
"lodash": "^4.17.21",
"typed-reflector": "^1.0.10"
}
},
"minimatch": { "minimatch": {
"version": "3.0.4", "version": "3.0.4",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz", "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
...@@ -11200,9 +11200,9 @@ ...@@ -11200,9 +11200,9 @@
"dev": true "dev": true
}, },
"reggol": { "reggol": {
"version": "1.0.2", "version": "1.0.3",
"resolved": "https://registry.npmjs.org/reggol/-/reggol-1.0.2.tgz", "resolved": "https://registry.npmjs.org/reggol/-/reggol-1.0.3.tgz",
"integrity": "sha512-BP7gx5nUBntWChG4x/yf7xLdpxy1R5PMtF/LJlOsz+XkWtip4YVNkQp2Flmio9hXSc2UxrwUyP0WrQ1M/FFWXw==", "integrity": "sha512-91bFsIEaw3IKoMt7JQz703yuEgdcbbKBTJbeVyFMrZwA93wCU/ByDvhwDfvVWXjvLqwRuFOfhV1pkxvAgdkVZQ==",
"peer": true, "peer": true,
"requires": { "requires": {
"cosmokit": "^1.1.2", "cosmokit": "^1.1.2",
...@@ -11999,9 +11999,9 @@ ...@@ -11999,9 +11999,9 @@
} }
}, },
"ws": { "ws": {
"version": "8.5.0", "version": "8.6.0",
"resolved": "https://registry.npmjs.org/ws/-/ws-8.5.0.tgz", "resolved": "https://registry.npmjs.org/ws/-/ws-8.6.0.tgz",
"integrity": "sha512-BWX0SWVgLPzYwF8lTzEy1egjhS4S4OEAHfsO8o65WOVsrnSRGaSiUaa9e0ggGlkMTtBlmOpEXiie9RUcBO86qg==", "integrity": "sha512-AzmM3aH3gk0aX7/rZLYvjdvZooofDu3fFOzGqcSnQ1tOcTWwhM/o+q++E8mAyVVIyUdajrkzWUGftaVSDLn1bw==",
"requires": {} "requires": {}
}, },
"xml-name-validator": { "xml-name-validator": {
......
package.json
View file @ 001fc21f
...@@ -50,9 +50,9 @@ ...@@ -50,9 +50,9 @@
"dependencies": { "dependencies": {
"@types/koa": "^2.13.4", "@types/koa": "^2.13.4",
"@types/koa__router": "^8.0.11", "@types/koa__router": "^8.0.11",
"cosmotype-decorators": "^2.0.5",
"koishi-decorators": "^2.0.1", "koishi-decorators": "^2.0.1",
"lodash": "^4.17.21", "lodash": "^4.17.21",
"minato-decorators": "^2.0.6",
"reflect-metadata": "^0.1.13", "reflect-metadata": "^0.1.13",
"schemastery-gen": "^3.1.13", "schemastery-gen": "^3.1.13",
"typed-reflector": "^1.0.10" "typed-reflector": "^1.0.10"
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
"testEnvironment": "node" "testEnvironment": "node"
}, },
"peerDependencies": { "peerDependencies": {
"koishi": "^4.6.2", "koishi": "^4.7.0",
"schemastery": "^3.1.0" "schemastery": "^3.1.0"
} }
} }
src/cosmotype-exports.ts
View file @ 001fc21f
import { ModelDecorators } from 'cosmotype-decorators'; import { ModelDecorators } from 'minato-decorators';
import { Tables } from 'koishi'; import { Tables } from 'koishi';
export * from 'cosmotype-decorators';
const decorators = new ModelDecorators<Tables>(); const decorators = new ModelDecorators<Tables>();
export const DefineModel = decorators.DefineModel; export const DefineModel = decorators.DefineModel;
......
src/decorators.ts
View file @ 001fc21f
...@@ -14,7 +14,7 @@ import { ...@@ -14,7 +14,7 @@ import {
SystemInjectFun, SystemInjectFun,
} from './def'; } from './def';
import { TopLevelAction } from 'koishi-decorators'; import { TopLevelAction } from 'koishi-decorators';
import { ModelClassType, ModelRegistrar } from 'cosmotype-decorators'; import { ModelClassType, ModelRegistrar } from 'minato-decorators';
import { ClassType } from 'schemastery-gen'; import { ClassType } from 'schemastery-gen';
// Export all koishi-decorator decorators // Export all koishi-decorator decorators
......
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