chore: add @koishijs/segment

.mocharc.js

@@ -4,6 +4,7 @@ const specs = [
   'community/chai-shape/tests/*.spec.ts',
   'community/schemastery/tests/*.spec.ts',
   'packages/core/tests/*.spec.ts',
+  'packages/segment/tests/*.spec.ts',
   'packages/utils/tests/*.spec.ts',
   'plugins/a11y/admin/tests/*.spec.ts',
   'plugins/a11y/rate-limit/tests/*.spec.ts',

build/dtsc.ts

@@ -1,6 +1,6 @@
 /* eslint-disable no-cond-assign */
 
-import { spawnAsync, cwd, getPackages, PackageJson, requireSafe } from './utils'
+import { cwd, getPackages, PackageJson, requireSafe, spawnAsync } from './utils'
 import { EOL } from 'os'
 import { resolve } from 'path'
 import fs from 'fs-extra'

packages/core/package.json

@@ -37,7 +37,7 @@
     "chai-shape": "^1.0.0"
   },
   "dependencies": {
-    "@koishijs/utils": "^5.0.1",
+    "@koishijs/utils": "^5.1.0",
     "fastest-levenshtein": "^1.0.12",
     "schemastery": "^2.4.2"
   }

packages/koishi/package.json

@@ -34,7 +34,7 @@
   "dependencies": {
     "@koa/router": "^10.1.1",
     "@koishijs/core": "^4.2.2",
-    "@koishijs/utils": "^5.0.1",
+    "@koishijs/utils": "^5.1.0",
     "@types/koa": "*",
     "@types/koa__router": "*",
     "@types/ws": "^8.2.2",

packages/segment/package.json

@@ -0,0 +1,30 @@
+{
+  "name": "@koishijs/segment",
+  "description": "Segment Manipulation",
+  "version": "1.0.0",
+  "main": "lib/node.js",
+  "module": "lib/browser.js",
+  "typings": "lib/index.d.ts",
+  "files": [
+    "lib"
+  ],
+  "author": "Shigma <shigma10826@gmail.com>",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/koishijs/koishi.git"
+  },
+  "bugs": {
+    "url": "https://github.com/koishijs/koishi/issues"
+  },
+  "homepage": "https://koishi.js.org/api/utils.html",
+  "keywords": [
+    "bot",
+    "qqbot",
+    "cqhttp",
+    "coolq",
+    "chatbot",
+    "koishi",
+    "utilities"
+  ]
+}

packages/utils/src/segment.ts → packages/segment/src/index.ts

@@ -1,12 +1,26 @@
-import { Awaitable, Dict, isType } from './misc'
+type Dict<T = any> = { [key: string]: T }
+type Awaitable<T> = [T] extends [Promise<unknown>] ? T : T | Promise<T>
+
+type Global = NodeJS.Global & Window & typeof globalThis
+
+type GlobalClass = {
+  [K in keyof Global]: Global[K] extends new (...args: any[]) => infer T ? T : never
+}
+
+const root: any = typeof self !== 'undefined' ? self : global
+
+function isType<K extends keyof GlobalClass>(type: K, value: any): value is GlobalClass[K] {
+  return type in root && value instanceof root[type]
+    || Object.prototype.toString.call(value).slice(8, -1) === type
+}
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-export interface segment {
+interface segment {
   type: string
   data: segment.Data
 }
 
-export function segment(type: string, data: segment.Data = {}) {
+function segment(type: string, data: segment.Data = {}) {
   if (type === 'text') return segment.escape(String(data.content))
   let output = '[CQ:' + type
   for (const key in data) {
@@ -18,7 +32,7 @@ export function segment(type: string, data: segment.Data = {}) {
 // eslint-disable-next-line @typescript-eslint/naming-convention
 type primitive = string | number | boolean
 
-export namespace segment {
+namespace segment {
   export type Chain = segment.Parsed[]
   export type Data = Dict<primitive>
   export type Transformer = string | ((data: Dict<string>, index: number, chain: Chain) => string)
@@ -134,4 +148,4 @@ export namespace segment {
   export const file = createAssetFactory('file')
 }
 
-export { segment as s }
+export = segment

packages/utils/tests/segment.spec.ts → packages/segment/tests/segment.spec.ts

@@ -1,5 +1,6 @@
 import { segment } from 'koishi'
 import { expect } from 'chai'
+import {} from 'chai-shape'
 
 describe('Segment API', () => {
   it('segment.escape()', () => {

packages/segment/tsconfig.json

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

packages/utils/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@koishijs/utils",
   "description": "Utilities for Koishi",
-  "version": "5.0.1",
+  "version": "5.1.0",
   "main": "lib/node.js",
   "module": "lib/browser.js",
   "typings": "lib/index.d.ts",
@@ -32,6 +32,7 @@
     "@types/supports-color": "^8.1.1"
   },
   "dependencies": {
+    "@koishijs/segment": "^1.0.0",
     "supports-color": "^8.1.0"
   }
 }

packages/utils/src/index.ts

@@ -1,7 +1,10 @@
+import segment from '@koishijs/segment'
+
+export { segment, segment as s }
+
 export * from './logger'
 export * from './misc'
 export * from './observe'
 export * from './random'
-export * from './segment'
 export * from './string'
 export * from './time'

plugins/frontend/client/client/components/chat/content.vue

@@ -13,7 +13,7 @@
 
 <script lang="ts" setup>
 
-import { segment } from '@koishijs/utils'
+import segment from '@koishijs/segment'
 import KImage from './image.vue'
 
 defineProps<{

plugins/frontend/client/client/components/chat/panel.vue

@@ -23,7 +23,7 @@
 <script lang="ts" setup>
 
 import { ref } from 'vue'
-import { segment } from '@koishijs/utils'
+import segment from '@koishijs/segment'
 import VirtualList from './list.vue'
 
 const emit = defineEmits(['send', 'click', 'paste', 'update:activeKey'])

plugins/frontend/client/package.json

@@ -35,7 +35,7 @@
     "build"
   ],
   "dependencies": {
-    "@koishijs/components": "^1.0.0",
+    "@koishijs/segments": "^1.0.0",
     "@types/marked": "^4.0.1",
     "@vitejs/plugin-vue": "^2.0.1",
     "@vueuse/core": "^7.5.3",