@initx-plugin/core 0.0.22 → 0.0.23

package/dist/index.d.mts

@@ -7,14 +7,25 @@ interface PackageInfo {
     homepage?: string;
 }
 interface InitxPluginInfo {
+    /**
+     * Plugin name
+     */
+    name: string;
+    /**
+     * Plugin root path
+     */
+    root: string;
+}
+interface LoadPluginResult {
     packageInfo: PackageInfo;
     instance: InitxPlugin;
 }
 type MatchedPlugin = HandlerInfo & {
     packageInfo: PackageInfo;
 };
-declare function loadPlugins(): Promise<InitxPluginInfo[]>;
-declare function matchPlugins(plugins: InitxPluginInfo[], { key, cliOptions }: InitxBaseContext, ...others: string[]): MatchedPlugin[];
+declare function fetchPlugins(): Promise<InitxPluginInfo[]>;
+declare function loadPlugins(): Promise<LoadPluginResult[]>;
+declare function matchPlugins(plugins: LoadPluginResult[], { key, cliOptions }: InitxBaseContext, ...others: string[]): MatchedPlugin[];
 
 type MaybeArray<T> = T | T[];
 type MaybePromise<T> = T | Promise<T>;
@@ -87,4 +98,4 @@ declare abstract class InitxPlugin<TStore extends PluginStore = PluginStore> {
 declare function createStore({ name }: PackageInfo, defaultStore?: Record<string, any>): any;
 declare function writeStore({ name }: PackageInfo): void;
 
-export { type HandlerInfo, type InitxBaseContext, type InitxContext, InitxPlugin, type InitxPluginInfo, type MatchedPlugin, type PackageInfo, createStore, loadPlugins, matchPlugins, writeStore };
+export { type HandlerInfo, type InitxBaseContext, type InitxContext, InitxPlugin, type InitxPluginInfo, type LoadPluginResult, type MatchedPlugin, type PackageInfo, createStore, fetchPlugins, loadPlugins, matchPlugins, writeStore };

package/dist/index.d.ts

@@ -7,14 +7,25 @@ interface PackageInfo {
     homepage?: string;
 }
 interface InitxPluginInfo {
+    /**
+     * Plugin name
+     */
+    name: string;
+    /**
+     * Plugin root path
+     */
+    root: string;
+}
+interface LoadPluginResult {
     packageInfo: PackageInfo;
     instance: InitxPlugin;
 }
 type MatchedPlugin = HandlerInfo & {
     packageInfo: PackageInfo;
 };
-declare function loadPlugins(): Promise<InitxPluginInfo[]>;
-declare function matchPlugins(plugins: InitxPluginInfo[], { key, cliOptions }: InitxBaseContext, ...others: string[]): MatchedPlugin[];
+declare function fetchPlugins(): Promise<InitxPluginInfo[]>;
+declare function loadPlugins(): Promise<LoadPluginResult[]>;
+declare function matchPlugins(plugins: LoadPluginResult[], { key, cliOptions }: InitxBaseContext, ...others: string[]): MatchedPlugin[];
 
 type MaybeArray<T> = T | T[];
 type MaybePromise<T> = T | Promise<T>;
@@ -87,4 +98,4 @@ declare abstract class InitxPlugin<TStore extends PluginStore = PluginStore> {
 declare function createStore({ name }: PackageInfo, defaultStore?: Record<string, any>): any;
 declare function writeStore({ name }: PackageInfo): void;
 
-export { type HandlerInfo, type InitxBaseContext, type InitxContext, InitxPlugin, type InitxPluginInfo, type MatchedPlugin, type PackageInfo, createStore, loadPlugins, matchPlugins, writeStore };
+export { type HandlerInfo, type InitxBaseContext, type InitxContext, InitxPlugin, type InitxPluginInfo, type LoadPluginResult, type MatchedPlugin, type PackageInfo, createStore, fetchPlugins, loadPlugins, matchPlugins, writeStore };

package/dist/index.mjs

@@ -4,17 +4,16 @@ import fs from 'fs-extra';
 import { defu } from 'defu';
 import { c } from '@initx-plugin/utils';
 
+let rewritedCache = null;
 const INITX_DIR = path.resolve(homedir(), ".initx");
 const STORE_FILE_NAME = "store.json";
-const REWRITED_FILE_NAME = ".rewrited";
 const resolveStore = (name) => path.resolve(INITX_DIR, name, STORE_FILE_NAME);
-const resolveRewrited = (name) => path.resolve(INITX_DIR, name, REWRITED_FILE_NAME);
 function createStore({ name }, defaultStore = {}) {
   fs.ensureDirSync(path.resolve(INITX_DIR, name));
   const storePath = resolveStore(name);
   const generateResult = (resultData) => {
     writeJson(storePath, resultData);
-    return useProxy(name, resultData);
+    return useProxy(resultData);
   };
   if (!fs.existsSync(storePath)) {
     return generateResult(defaultStore);
@@ -29,20 +28,17 @@ function createStore({ name }, defaultStore = {}) {
   return generateResult(json);
 }
 function writeStore({ name }) {
-  const rewritedPath = resolveRewrited(name);
-  if (!fs.existsSync(rewritedPath)) {
+  if (!rewritedCache) {
     return;
   }
-  const rewrited = fs.readJsonSync(rewritedPath);
-  writeJson(resolveStore(name), rewrited);
-  fs.removeSync(rewritedPath);
+  writeJson(resolveStore(name), rewritedCache);
 }
 function writeJson(path2, data) {
   fs.writeJsonSync(path2, data, {
     spaces: 2
   });
 }
-function useProxy(name, obj = {}) {
+function useProxy(obj = {}) {
   const isPlainObject = (value) => {
     return Object.prototype.toString.call(value) === "[object Object]";
   };
@@ -57,7 +53,7 @@ function useProxy(name, obj = {}) {
       },
       set(target2, key, value) {
         const success = Reflect.set(target2, key, value);
-        fs.writeJsonSync(resolveRewrited(name), target2);
+        rewritedCache = target2;
         return success;
       }
     });
@@ -154,7 +150,7 @@ class InitxPlugin {
   }
 }
 
-async function loadPlugins() {
+async function fetchPlugins() {
   const { content: npmPath } = await c("npm", ["config", "get", "prefix"]);
   const nodeModules = path.join(npmPath, "node_modules");
   const communityPlugins = fs.readdirSync(nodeModules);
@@ -164,19 +160,24 @@ async function loadPlugins() {
     plugin: /^(?:@initx-plugin\/|initx-plugin-)/,
     exclude: /@initx-plugin\/(?:core|utils)$/
   };
-  const pluginsName = [
+  return [
     ...officialPlugins,
     ...communityPlugins
   ].filter(
     (name) => regexps.plugin.test(name) && !regexps.exclude.test(name)
-  );
+  ).map((name) => ({
+    name,
+    root: path.join(nodeModules, name)
+  }));
+}
+async function loadPlugins() {
+  const pluginsInfo = await fetchPlugins();
   const x = await import('importx');
-  return Promise.all(pluginsName.map(async (dirname) => {
-    const pluginRoot = path.join(nodeModules, dirname);
-    const InitxPluginClass = await x.import(pluginRoot, import.meta.url).then((x2) => x2.default);
-    const packageAll = JSON.parse(fs.readFileSync(path.join(nodeModules, dirname, "package.json"), "utf-8"));
+  return Promise.all(pluginsInfo.map(async ({ root }) => {
+    const InitxPluginClass = await x.import(root, import.meta.url).then((x2) => x2.default);
+    const packageAll = fs.readJsonSync(path.join(root, "package.json"));
     const packageInfo = {
-      root: pluginRoot,
+      root,
       name: packageAll.name,
       version: packageAll.version,
       description: packageAll.description,
@@ -208,4 +209,4 @@ function matchPlugins(plugins, { key, cliOptions }, ...others) {
   return matchedHandlers;
 }
 
-export { InitxPlugin, createStore, loadPlugins, matchPlugins, writeStore };
+export { InitxPlugin, createStore, fetchPlugins, loadPlugins, matchPlugins, writeStore };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@initx-plugin/core",
   "type": "module",
-  "version": "0.0.22",
+  "version": "0.0.23",
   "description": "core module for initx plugins",
   "license": "MIT",
   "homepage": "https://github.com/initx-collective/initx#readme",
@@ -25,7 +25,7 @@
     "defu": "^6.1.4",
     "fs-extra": "^11.2.0",
     "importx": "^0.5.0",
-    "@initx-plugin/utils": "0.0.22"
+    "@initx-plugin/utils": "0.0.23"
   },
   "devDependencies": {
     "@types/fs-extra": "^11.0.4"