@nocobase/resourcer 0.17.0-alpha.7 → 0.18.0-alpha.3

package/lib/resourcer.d.ts

@@ -123,6 +123,7 @@ export interface ImportOptions {
     extensions?: string[];
 }
 export declare class Resourcer {
+    readonly options: ResourcerOptions;
     protected resources: Map<string, Resource>;
     /**
      * 全局定义的 action handlers
@@ -131,7 +132,6 @@ export declare class Resourcer {
     protected actionHandlers: Map<ActionName, any>;
     protected middlewareHandlers: Map<string, any>;
     protected middlewares: Toposort<any>;
-    readonly options: ResourcerOptions;
     constructor(options?: ResourcerOptions);
     /**
      * 载入指定目录下的 resource 配置（配置的文件驱动）
@@ -142,7 +142,7 @@ export declare class Resourcer {
      * @param {string}   [options.directory] 指定配置所在路径
      * @param {array}    [options.extensions = ['js', 'ts', 'json']] 文件后缀
      */
-    import(options: ImportOptions): Map<string, Resource>;
+    import(options: ImportOptions): Promise<Map<string, Resource>>;
     /**
      * resource 配置
      *

package/lib/resourcer.js

@@ -40,6 +40,7 @@ var import_path_to_regexp = require("path-to-regexp");
 var import_resource = __toESM(require("./resource"));
 var import_utils2 = require("./utils");
 const _Resourcer = class _Resourcer {
+  options;
   resources = /* @__PURE__ */ new Map();
   /**
    * 全局定义的 action handlers
@@ -48,7 +49,6 @@ const _Resourcer = class _Resourcer {
   actionHandlers = /* @__PURE__ */ new Map();
   middlewareHandlers = /* @__PURE__ */ new Map();
   middlewares;
-  options;
   constructor(options = {}) {
     this.options = options;
     this.middlewares = new import_utils.Toposort();
@@ -62,18 +62,18 @@ const _Resourcer = class _Resourcer {
    * @param {string}   [options.directory] 指定配置所在路径
    * @param {array}    [options.extensions = ['js', 'ts', 'json']] 文件后缀
    */
-  import(options) {
+  async import(options) {
     const { extensions = ["js", "ts", "json"], directory } = options;
     const patten = `${directory}/*.{${extensions.join(",")}}`;
     const files = import_glob.default.sync(patten, {
       ignore: ["**/*.d.ts"]
     });
     const resources = /* @__PURE__ */ new Map();
-    files.forEach((file) => {
-      const options2 = (0, import_utils.requireModule)(file);
+    for (const file of files) {
+      const options2 = await (0, import_utils.importModule)(file);
       const table = this.define(typeof options2 === "function" ? options2(this) : options2);
       resources.set(table.getName(), table);
-    });
+    }
     return resources;
   }
   /**

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@nocobase/resourcer",
-  "version": "0.17.0-alpha.7",
+  "version": "0.18.0-alpha.3",
   "description": "",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "license": "Apache-2.0",
   "dependencies": {
-    "@nocobase/utils": "0.17.0-alpha.7",
+    "@nocobase/utils": "0.18.0-alpha.3",
     "deepmerge": "^4.2.2",
     "koa-compose": "^4.1.0",
     "lodash": "^4.17.21",
@@ -18,5 +18,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/resourcer"
   },
-  "gitHead": "91377a3abd1124f79fb3819f2d0e80905e091a32"
+  "gitHead": "3d34bcd0e3aca0f485e4a2425b87bc971526634d"
 }