@initx-plugin/core 0.0.8 → 0.0.10

package/dist/index.d.mts

@@ -40,8 +40,13 @@ declare abstract class InitxHandler {
     abstract matchers: Matchers;
     abstract handle(options: InitxOptions, ...others: string[]): MaybePromise<void>;
     run(options: InitxOptions, ...others: string[]): HandlerInfo[];
+    private matchBaseMatchers;
+    private matchArrayBaseMatchers;
+    private matchTypeMatchers;
+    private isBaseMatchers;
+    private isArrayBaseMatchers;
     private isObject;
     private isPassed;
 }
 
-export { InitxHandler, type InitxOptions };
+export { type HandlerInfo, InitxHandler, type InitxOptions };

package/dist/index.d.ts

@@ -40,8 +40,13 @@ declare abstract class InitxHandler {
     abstract matchers: Matchers;
     abstract handle(options: InitxOptions, ...others: string[]): MaybePromise<void>;
     run(options: InitxOptions, ...others: string[]): HandlerInfo[];
+    private matchBaseMatchers;
+    private matchArrayBaseMatchers;
+    private matchTypeMatchers;
+    private isBaseMatchers;
+    private isArrayBaseMatchers;
     private isObject;
     private isPassed;
 }
 
-export { InitxHandler, type InitxOptions };
+export { type HandlerInfo, InitxHandler, type InitxOptions };

package/dist/index.mjs

@@ -1,30 +1,32 @@
 class InitxHandler {
   run(options, ...others) {
-    const handlers = [];
-    if (!Array.isArray(this.matchers) && this.matchers.matching && this.matchers.description && this.isPassed(this.matchers.matching, options.key)) {
-      handlers.push({
-        handler: () => this.handle(options, ...others),
-        description: this.matchers.description
-      });
-      return handlers;
+    if (this.isBaseMatchers(this.matchers)) {
+      return this.matchBaseMatchers(this.matchers, options, ...others);
+    }
+    if (this.isArrayBaseMatchers(this.matchers)) {
+      return this.matchArrayBaseMatchers(this.matchers, options, ...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 isPassed = this.isPassed(matcher.matching, options.key);
-        if (isPassed) {
-          handlers.push({
-            handler: () => this.handle(options, keys[i], ...others),
-            description: matcher.description
-          });
-          break;
-        }
-      }
-      return handlers;
+      return this.matchTypeMatchers(this.matchers, options, ...others);
+    }
+    return [];
+  }
+  // BaseMatchers
+  matchBaseMatchers(matchers, options, ...others) {
+    if (!this.isPassed(matchers.matching, options.key)) {
+      return [];
     }
-    for (let i = 0; i < this.matchers.length; i++) {
-      const matcher = this.matchers[i];
+    return [
+      {
+        handler: () => this.handle(options, ...others),
+        description: matchers.description
+      }
+    ];
+  }
+  matchArrayBaseMatchers(matchers, options, ...others) {
+    const handlers = [];
+    for (let i = 0; i < matchers.length; i++) {
+      const matcher = matchers[i];
       const isPassed = this.isPassed(matcher.matching, options.key);
       if (isPassed) {
         handlers.push({
@@ -35,6 +37,29 @@ class InitxHandler {
     }
     return handlers;
   }
+  matchTypeMatchers(matchers, options, ...others) {
+    const handlers = [];
+    const keys = Object.keys(matchers);
+    for (let i = 0; i < keys.length; i++) {
+      const matcher = matchers[keys[i]];
+      const isPassed = this.isPassed(matcher.matching, options.key);
+      if (isPassed) {
+        handlers.push({
+          handler: () => this.handle(options, keys[i], ...others),
+          description: matcher.description
+        });
+        break;
+      }
+    }
+    return handlers;
+  }
+  isBaseMatchers(matchers) {
+    const keys = Object.keys(matchers);
+    return this.isObject(matchers) && keys.length === 2 && keys.every((key) => key === "matching" || key === "description");
+  }
+  isArrayBaseMatchers(matchers) {
+    return Array.isArray(matchers) && matchers.every(this.isBaseMatchers.bind(this));
+  }
   isObject(value) {
     return typeof value === "object" && value !== null && !Array.isArray(value);
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@initx-plugin/core",
   "type": "module",
-  "version": "0.0.8",
+  "version": "0.0.10",
   "description": "core module for initx plugins",
   "author": "imba97",
   "license": "MIT",
@@ -16,7 +16,7 @@
   "keywords": [
     "initx"
   ],
-  "main": "dist/index.cjs",
+  "main": "dist/index.mjs",
   "module": "dist/index.mjs",
   "types": "dist/index.d.ts",
   "files": [

package/dist/index.cjs

@@ -1,54 +0,0 @@
-'use strict';
-
-class InitxHandler {
-  run(options, ...others) {
-    const handlers = [];
-    if (!Array.isArray(this.matchers) && this.matchers.matching && this.matchers.description && this.isPassed(this.matchers.matching, options.key)) {
-      handlers.push({
-        handler: () => this.handle(options, ...others),
-        description: this.matchers.description
-      });
-      return handlers;
-    }
-    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 isPassed = this.isPassed(matcher.matching, options.key);
-        if (isPassed) {
-          handlers.push({
-            handler: () => this.handle(options, keys[i], ...others),
-            description: matcher.description
-          });
-          break;
-        }
-      }
-      return handlers;
-    }
-    for (let i = 0; i < this.matchers.length; i++) {
-      const matcher = this.matchers[i];
-      const isPassed = this.isPassed(matcher.matching, options.key);
-      if (isPassed) {
-        handlers.push({
-          handler: () => this.handle(options, ...others),
-          description: matcher.description
-        });
-      }
-    }
-    return handlers;
-  }
-  isObject(value) {
-    return typeof value === "object" && value !== null && !Array.isArray(value);
-  }
-  isPassed(matchers, key) {
-    const tests = Array.isArray(matchers) ? matchers : [matchers];
-    return tests.some((test) => {
-      if (typeof test === "string") {
-        return test === key;
-      }
-      return test.test(key);
-    });
-  }
-}
-
-exports.InitxHandler = InitxHandler;

package/dist/index.d.cts

@@ -1,47 +0,0 @@
-type MaybeArray<T> = T | T[];
-type MaybePromise<T> = T | Promise<T>;
-interface BaseMatchers {
-    matching: MaybeArray<string | RegExp>;
-    /**
-     * Description of the handler
-     *
-     * If multiple handlers are matched, this description will be displayed
-     */
-    description: string;
-}
-type TypeMatchers = Record<string, BaseMatchers>;
-type Matchers = MaybeArray<BaseMatchers> | TypeMatchers;
-interface HandlerInfo {
-    handler: () => MaybePromise<void>;
-    description: string;
-}
-interface InitxOptions {
-    /**
-     * Matching string
-     *
-     * The key that was used to match the handler
-     */
-    key: string;
-    /**
-     * CLI options
-     *
-     * cac package parsed options
-     */
-    cliOptions: Record<string, any>;
-    /**
-     * Options list
-     *
-     * cli options list, like
-     * @example ['--global']
-     */
-    optionsList: string[];
-}
-declare abstract class InitxHandler {
-    abstract matchers: Matchers;
-    abstract handle(options: InitxOptions, ...others: string[]): MaybePromise<void>;
-    run(options: InitxOptions, ...others: string[]): HandlerInfo[];
-    private isObject;
-    private isPassed;
-}
-
-export { InitxHandler, type InitxOptions };