feat: separate logger package

.nycrc.json

@@ -1,5 +1,6 @@
 {
   "exclude": [
-    ".yarn/**"
+    ".yarn/**",
+    "scripts"
   ]
 }

packages/cordis/package.json

@@ -1,17 +1,21 @@
 {
   "name": "cordis",
   "description": "CLI for cordis loader",
+  "version": "3.8.2",
   "type": "module",
-  "version": "3.8.0",
-  "main": "lib/index.js",
+  "main": "lib/index.cjs",
+  "module": "lib/index.mjs",
   "types": "lib/index.d.ts",
-  "bin": "lib/bin/cordis.js",
+  "bin": "lib/bin/cordis.mjs",
   "exports": {
-    ".": "./lib/index.js",
-    "./cli": "./lib/cli.js",
-    "./logger": "./lib/logger.js",
-    "./worker": "./lib/worker/index.js",
-    "./worker/main": "./lib/worker/main.js",
+    ".": {
+      "require": "./lib/index.cjs",
+      "import": "./lib/index.mjs",
+      "types": "./lib/index.d.ts"
+    },
+    "./cli": "./lib/cli.mjs",
+    "./worker": "./lib/worker/index.mjs",
+    "./worker/main": "./lib/worker/main.mjs",
     "./src/*": "./src/*",
     "./package.json": "./package.json"
   },
@@ -26,21 +30,23 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/cordisjs/cordis.git",
+    "url": "git+https://github.com/cordiverse/cordis.git",
     "directory": "packages/cli"
   },
   "bugs": {
-    "url": "https://github.com/cordisjs/cordis/issues"
+    "url": "https://github.com/cordiverse/cordis/issues"
   },
-  "homepage": "https://github.com/cordisjs/cordis",
+  "homepage": "https://github.com/cordiverse/cordis",
   "keywords": [
     "cordis",
     "loader",
     "cli"
   ],
   "dependencies": {
-    "@cordisjs/core": "3.8.0",
-    "@cordisjs/loader": "^0.4.0",
+    "@cordisjs/core": "3.8.2",
+    "@cordisjs/loader": "^0.4.2",
+    "@cordisjs/logger": "^0.2.0",
+    "@cordisjs/timer": "^0.3.0",
     "cac": "^6.7.14",
     "cosmokit": "^1.5.2",
     "kleur": "^4.1.5",

packages/cordis/src/index.ts

@@ -1 +1,30 @@
+import * as core from '@cordisjs/core'
+import * as logger from '@cordisjs/logger'
+import timer from '@cordisjs/timer'
+
 export * from '@cordisjs/core'
+
+export { Logger } from '@cordisjs/logger'
+
+export class Service<C extends Context = Context> extends core.Service<C> {
+  public logger: logger.Logger
+
+  constructor(ctx: C, name: string, immediate?: boolean) {
+    super(ctx, name, immediate)
+    this.logger = ctx.logger(name)
+  }
+}
+
+export class Context extends core.Context {
+  constructor() {
+    super()
+
+    this.provide('logger', undefined, true)
+    this.provide('timer', undefined, true)
+
+    this.plugin(logger)
+    this.plugin(timer)
+  }
+}
+
+export default function () {}

packages/cordis/src/worker/daemon.ts

@@ -1,4 +1,4 @@
-import { Context } from '@cordisjs/core'
+import { Context } from '../index.ts'
 
 export interface Config {
   execArgv?: string[]

packages/cordis/src/worker/logger.ts

@@ -1,4 +1,4 @@
-import { apply as logger, Logger } from '../logger.js'
+import { Logger } from '@cordisjs/logger'
 import { Context } from '@cordisjs/core'
 
 declare module '@cordisjs/loader' {
@@ -23,11 +23,6 @@ export interface Config {
 }
 
 export function apply(ctx: Context, config: Config = {}) {
-  ctx.provide('logger', undefined, true)
-  ctx.provide('timer', undefined, true)
-
-  ctx.plugin(logger)
-
   function handleException(error: any) {
     new Logger('app').error(error)
     process.exit(1)

packages/core/README.md

@@ -1,9 +1,9 @@
 # Cordis
 
-[![Codecov](https://img.shields.io/codecov/c/github/cordisjs/cordis?style=flat-square)](https://codecov.io/gh/cordisjs/cordis)
+[![Codecov](https://img.shields.io/codecov/c/github/cordiverse/cordis?style=flat-square)](https://codecov.io/gh/cordiverse/cordis)
 [![downloads](https://img.shields.io/npm/dm/cordis?style=flat-square)](https://www.npmjs.com/package/cordis)
 [![npm](https://img.shields.io/npm/v/cordis?style=flat-square)](https://www.npmjs.com/package/cordis)
-[![GitHub](https://img.shields.io/github/license/cordisjs/cordis?style=flat-square)](https://github.com/cordisjs/cordis/blob/master/LICENSE)
+[![GitHub](https://img.shields.io/github/license/cordiverse/cordis?style=flat-square)](https://github.com/cordiverse/cordis/blob/master/LICENSE)
 
 Cordis is an AOP framework for modern JavaScript applications. You can think of it as a kind of meta-framework as developers can build their own frameworks on top of it.
 

packages/core/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cordisjs/core",
   "description": "AOP Framework for Modern JavaScript Applications",
-  "version": "3.8.0",
+  "version": "3.8.2",
   "sideEffects": false,
   "type": "module",
   "main": "lib/index.cjs",
@@ -22,13 +22,13 @@
   ],
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/cordisjs/cordis.git",
+    "url": "git+https://github.com/cordiverse/cordis.git",
     "directory": "packages/core"
   },
   "bugs": {
-    "url": "https://github.com/cordisjs/cordis/issues"
+    "url": "https://github.com/cordiverse/cordis/issues"
   },
-  "homepage": "https://github.com/cordisjs/cordis",
+  "homepage": "https://github.com/cordiverse/cordis",
   "author": "Shigma <shigma10826@gmail.com>",
   "license": "MIT",
   "dependencies": {

packages/hmr/package.json

@@ -13,11 +13,11 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/cordisjs/cordis.git",
+    "url": "git+https://github.com/cordiverse/cordis.git",
     "directory": "packages/hmr"
   },
   "bugs": {
-    "url": "https://github.com/cordisjs/cordis/issues"
+    "url": "https://github.com/cordiverse/cordis/issues"
   },
   "homepage": "https://cordis.moe/",
   "keywords": [
@@ -38,11 +38,11 @@
     }
   },
   "peerDependencies": {
-    "cordis": "^3.8.0"
+    "cordis": "^3.8.2"
   },
   "devDependencies": {
     "@types/babel__code-frame": "^7.0.6",
-    "cordis": "^3.8.0",
+    "cordis": "^3.8.2",
     "esbuild": "^0.18.20"
   },
   "dependencies": {

packages/loader/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cordisjs/loader",
   "description": "Loader for cordis",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "type": "module",
   "module": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -22,13 +22,13 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/cordisjs/cordis.git",
+    "url": "git+https://github.com/cordiverse/cordis.git",
     "directory": "packages/loader"
   },
   "bugs": {
-    "url": "https://github.com/cordisjs/cordis/issues"
+    "url": "https://github.com/cordiverse/cordis/issues"
   },
-  "homepage": "https://github.com/cordisjs/cordis",
+  "homepage": "https://github.com/cordiverse/cordis",
   "keywords": [
     "cordis",
     "loader",
@@ -37,10 +37,10 @@
     "service"
   ],
   "devDependencies": {
-    "@cordisjs/core": "^3.8.0"
+    "@cordisjs/core": "^3.8.2"
   },
   "peerDependencies": {
-    "@cordisjs/core": "^3.8.0"
+    "@cordisjs/core": "^3.8.2"
   },
   "dependencies": {
     "cosmokit": "^1.5.2",

packages/logger/package.json

@@ -0,0 +1,44 @@
+{
+  "name": "@cordisjs/logger",
+  "description": "Logger service for cordis",
+  "version": "0.2.0",
+  "type": "module",
+  "main": "lib/index.cjs",
+  "module": "lib/index.mjs",
+  "types": "lib/index.d.ts",
+  "exports": {
+    ".": {
+      "require": "./lib/index.cjs",
+      "import": "./lib/index.mjs",
+      "types": "./lib/index.d.ts"
+    },
+    "./package.json": "./package.json"
+  },
+  "files": [
+    "lib",
+    "src"
+  ],
+  "author": "Shigma <shigma10826@gmail.com>",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/cordiverse/cordis.git",
+    "directory": "packages/logger"
+  },
+  "bugs": {
+    "url": "https://github.com/cordiverse/cordis/issues"
+  },
+  "homepage": "https://github.com/cordiverse/cordis",
+  "keywords": [
+    "cordis",
+    "logger",
+    "service",
+    "plugin"
+  ],
+  "devDependencies": {
+    "@cordisjs/core": "^3.8.2"
+  },
+  "peerDependencies": {
+    "@cordisjs/core": "^3.8.2"
+  }
+}

packages/logger/readme.md

@@ -0,0 +1 @@
+# @cordisjs/logger

packages/cordis/src/logger.ts → packages/logger/src/index.ts

@@ -15,6 +15,8 @@ interface LoggerService {
 }
 
 export function apply(ctx: Context) {
+  ctx.on('fork', () => {})
+
   ctx.root.baseDir = globalThis.process?.cwd() || ''
 
   ctx.provide('logger', undefined, true)

packages/logger/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../../tsconfig.base",
+  "compilerOptions": {
+    "rootDir": "src",
+    "outDir": "lib",
+  },
+  "include": [
+    "src",
+  ],
+}

packages/timer/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cordisjs/timer",
   "description": "Timer service for cordis",
-  "version": "0.2.3",
+  "version": "0.3.0",
   "type": "module",
   "main": "lib/index.cjs",
   "module": "lib/index.mjs",
@@ -22,23 +22,23 @@
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/cordisjs/std.git",
+    "url": "git+https://github.com/cordiverse/cordis.git",
     "directory": "packages/timer"
   },
   "bugs": {
-    "url": "https://github.com/cordisjs/std/issues"
+    "url": "https://github.com/cordiverse/cordis/issues"
   },
-  "homepage": "https://github.com/cordisjs/std",
+  "homepage": "https://github.com/cordiverse/cordis",
   "keywords": [
     "cordis",
     "timer",
     "service",
     "plugin"
   ],
   "devDependencies": {
-    "cordis": "^3.8.0"
+    "@cordisjs/core": "^3.8.2"
   },
   "peerDependencies": {
-    "cordis": "^3.8.0"
+    "@cordisjs/core": "^3.8.2"
   }
 }

packages/timer/src/index.ts

@@ -1,7 +1,7 @@
-import { Context, Service } from 'cordis'
+import { Context, Service } from '@cordisjs/core'
 import { remove } from 'cosmokit'
 
-declare module 'cordis' {
+declare module '@cordisjs/core' {
   interface Context {
     timer: TimerService
     setTimeout(callback: () => void, delay: number): () => void