@initx-plugin/cp 0.0.5 → 0.0.6

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { InitxHandler } from '@initx-plugin/types';
+import { InitxHandler } from '@initx-plugin/core';
 
 declare enum CpType {
     SSH = "ssh"

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { InitxHandler } from '@initx-plugin/types';
+import { InitxHandler } from '@initx-plugin/core';
 
 declare enum CpType {
     SSH = "ssh"

package/dist/index.mjs

@@ -1,22 +1,40 @@
 import os from 'node:os';
 import { existsSync, readFileSync } from 'node:fs';
 import { resolve } from 'node:path';
-import { copy } from 'copy-paste';
+import clipboard from 'clipboardy';
 import { log } from '@initx-plugin/utils';
 
 class InitxHandler {
-  async run(value, ...rest) {
-    const tests = Array.isArray(this.matchers) ? this.matchers : [this.matchers];
-    const passed = tests.some((test) => {
+  async run(value, ...others) {
+    if (this.isObject(this.matchers)) {
+      const keys = Object.keys(this.matchers);
+      for (let i = 0; i < keys.length; i++) {
+        const matcher = this.matchers[keys[i]];
+        const isPassed2 = this.isPassed(matcher, value);
+        if (isPassed2) {
+          this.handle(value, keys[i], ...others);
+          break;
+        }
+      }
+      return;
+    }
+    const isPassed = this.isPassed(this.matchers, value);
+    if (!isPassed) {
+      return;
+    }
+    await this.handle(value, ...others);
+  }
+  isObject(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+  }
+  isPassed(matchers, value) {
+    const tests = Array.isArray(matchers) ? matchers : [matchers];
+    return tests.some((test) => {
       if (typeof test === "string") {
         return test === value;
       }
       return test.test(value);
     });
-    if (!passed) {
-      return;
-    }
-    await this.handle(value, ...rest);
   }
 }
 
@@ -53,19 +71,11 @@ class CpHandler extends InitxHandler {
       return;
     }
     const publicKey = readFileSync(publicKeyPath, "utf8");
-    await this.copy(publicKey);
+    this.copy(publicKey);
     log.success("Public key copied to clipboard");
   }
   copy(content) {
-    return new Promise((resolve, reject) => {
-      copy(content, (err) => {
-        if (err) {
-          reject(err);
-          return;
-        }
-        resolve(true);
-      });
-    });
+    clipboard.writeSync(content);
   }
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@initx-plugin/cp",
   "type": "module",
-  "version": "0.0.5",
+  "version": "0.0.6",
   "description": "initx plugin, copy some text to clipboard",
   "author": "imba97",
   "license": "MIT",
@@ -23,12 +23,12 @@
     "dist"
   ],
   "dependencies": {
-    "copy-paste": "^1.5.3",
-    "@initx-plugin/utils": "0.0.5"
+    "clipboardy": "^4.0.0",
+    "@initx-plugin/utils": "0.0.6"
   },
   "devDependencies": {
     "@types/copy-paste": "^1.1.33",
-    "@initx-plugin/types": "0.0.5"
+    "@initx-plugin/core": "0.0.6"
   },
   "scripts": {
     "stub": "unbuild --stub",