@nocobase/data-source-manager 0.21.0-alpha.15 → 0.21.0-alpha.16

package/lib/collection-field.d.ts

@@ -1,6 +1,6 @@
 import { FieldOptions, IField } from './types';
 export declare class CollectionField implements IField {
-    options: any;
+    options: FieldOptions;
     constructor(options: FieldOptions);
     updateOptions(options: any): void;
 }

package/lib/collection-manager.js

@@ -28,10 +28,13 @@ const _CollectionManager = class _CollectionManager {
   models = /* @__PURE__ */ new Map();
   constructor(options = {}) {
   }
+  /* istanbul ignore next -- @preserve */
   getRegisteredFieldType(type) {
   }
+  /* istanbul ignore next -- @preserve */
   getRegisteredFieldInterface(key) {
   }
+  /* istanbul ignore next -- @preserve */
   getRegisteredModel(key) {
     return this.models.get(key);
   }
@@ -41,10 +44,13 @@ const _CollectionManager = class _CollectionManager {
     }
     return this.repositories.get(key);
   }
+  /* istanbul ignore next -- @preserve */
   registerFieldTypes() {
   }
+  /* istanbul ignore next -- @preserve */
   registerFieldInterfaces() {
   }
+  /* istanbul ignore next -- @preserve */
   registerCollectionTemplates() {
   }
   registerModels(models) {
@@ -64,6 +70,7 @@ const _CollectionManager = class _CollectionManager {
   }
   extendCollection(collectionOptions, mergeOptions) {
     const collection = this.getCollection(collectionOptions.name);
+    collection.updateOptions(collectionOptions, mergeOptions);
     return collection;
   }
   hasCollection(name) {

package/lib/collection.d.ts

@@ -7,6 +7,7 @@ export declare class Collection implements ICollection {
     fields: Map<string, IField>;
     constructor(options: CollectionOptions, collectionManager: ICollectionManager);
     updateOptions(options: CollectionOptions, mergeOptions?: any): this;
+    setFields(fields: any[]): void;
     setField(name: string, options: any): CollectionField;
     removeField(name: string): void;
     getField(name: string): IField;

package/lib/collection.js

@@ -40,9 +40,7 @@ const _Collection = class _Collection {
     this.collectionManager = collectionManager;
     this.setRepository(options.repository);
     if (options.fields) {
-      for (const field of options.fields) {
-        this.setField(field.name, field);
-      }
+      this.setFields(options.fields);
     }
   }
   repository;
@@ -51,11 +49,17 @@ const _Collection = class _Collection {
     let newOptions = import_lodash.default.cloneDeep(options);
     newOptions = (0, import_deepmerge.default)(this.options, newOptions, mergeOptions);
     this.options = newOptions;
+    this.setFields(newOptions.fields || []);
     if (options.repository) {
       this.setRepository(options.repository);
     }
     return this;
   }
+  setFields(fields) {
+    for (const field of fields) {
+      this.setField(field.name, field);
+    }
+  }
   setField(name, options) {
     const field = new import_collection_field.CollectionField(options);
     this.fields.set(name, field);

package/lib/data-source.d.ts

@@ -13,10 +13,10 @@ export declare abstract class DataSource extends EventEmitter {
     get name(): any;
     static testConnection(options?: any): Promise<boolean>;
     init(options?: DataSourceOptions): void;
-    collectionToResourceMiddleware(): (ctx: any, next: any) => Promise<any>;
     middleware(middlewares?: any): (ctx: any, next: any) => Promise<any>;
     createACL(): ACL;
     createResourceManager(options: any): ResourceManager;
     load(options?: any): Promise<void>;
     abstract createCollectionManager(options?: any): ICollectionManager;
+    protected collectionToResourceMiddleware(): (ctx: any, next: any) => Promise<any>;
 }

package/lib/data-source.js

@@ -58,11 +58,36 @@ const _DataSource = class _DataSource extends import_events.default {
       ...options.resourceManager
     });
     this.collectionManager = this.createCollectionManager(options);
-    this.resourceManager.registerActionHandlers((0, import_load_default_actions.loadDefaultActions)(this));
+    this.resourceManager.registerActionHandlers((0, import_load_default_actions.loadDefaultActions)());
     if (options.acl !== false) {
       this.resourceManager.use(this.acl.middleware(), { tag: "acl", after: ["auth"] });
     }
   }
+  middleware(middlewares = []) {
+    const dataSource = this;
+    if (!this["_used"]) {
+      for (const [fn, options] of middlewares) {
+        this.resourceManager.use(fn, options);
+      }
+      this["_used"] = true;
+    }
+    return async (ctx, next) => {
+      ctx.dataSource = dataSource;
+      ctx.getCurrentRepository = () => {
+        const { resourceName, resourceOf } = ctx.action;
+        return this.collectionManager.getRepository(resourceName, resourceOf);
+      };
+      return (0, import_koa_compose.default)([this.collectionToResourceMiddleware(), this.resourceManager.middleware()])(ctx, next);
+    };
+  }
+  createACL() {
+    return new import_acl.ACL();
+  }
+  createResourceManager(options) {
+    return new import_resourcer.ResourceManager(options);
+  }
+  async load(options = {}) {
+  }
   collectionToResourceMiddleware() {
     return async (ctx, next) => {
       const params = (0, import_resourcer.parseRequest)(
@@ -93,31 +118,6 @@ const _DataSource = class _DataSource extends import_events.default {
       return next();
     };
   }
-  middleware(middlewares = []) {
-    const dataSource = this;
-    if (!this["_used"]) {
-      for (const [fn, options] of middlewares) {
-        this.resourceManager.use(fn, options);
-      }
-      this["_used"] = true;
-    }
-    return async (ctx, next) => {
-      ctx.getCurrentRepository = () => {
-        const { resourceName, resourceOf } = ctx.action;
-        return this.collectionManager.getRepository(resourceName, resourceOf);
-      };
-      ctx.dataSource = dataSource;
-      return (0, import_koa_compose.default)([this.collectionToResourceMiddleware(), this.resourceManager.middleware()])(ctx, next);
-    };
-  }
-  createACL() {
-    return new import_acl.ACL();
-  }
-  createResourceManager(options) {
-    return new import_resourcer.ResourceManager(options);
-  }
-  async load(options = {}) {
-  }
 };
 __name(_DataSource, "DataSource");
 let DataSource = _DataSource;

package/lib/default-actions/list.js

@@ -45,7 +45,7 @@ function findArgs(ctx) {
 __name(findArgs, "findArgs");
 async function listWithPagination(ctx) {
   const { page = 1, pageSize = 50 } = ctx.action.params;
-  const repository = (0, import_utils2.getRepositoryFromParams)(ctx);
+  const repository = ctx.getCurrentRepository();
   const options = {
     context: ctx,
     ...findArgs(ctx),
@@ -67,7 +67,7 @@ async function listWithPagination(ctx) {
 }
 __name(listWithPagination, "listWithPagination");
 async function listWithNonPaged(ctx) {
-  const repository = (0, import_utils2.getRepositoryFromParams)(ctx);
+  const repository = ctx.getCurrentRepository();
   const rows = await repository.find({ context: ctx, ...findArgs(ctx) });
   ctx.body = rows;
 }

package/lib/default-actions/move.d.ts

@@ -1,2 +1,2 @@
 import { Context } from '@nocobase/actions';
-export declare function move(ctx: Context, next: any): Promise<void>;
+export declare function createMoveAction(databaseMoveAction: any): (ctx: Context, next: any) => Promise<any>;

package/lib/default-actions/move.js

@@ -1,8 +1,6 @@
-var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -17,38 +15,29 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
-var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
-  // If the importer is in node compatibility mode or this is not an ESM
-  // file that has been converted to a CommonJS file using a Babel-
-  // compatible transform (i.e. "__esModule" has not been set), then set
-  // "default" to the CommonJS "module.exports" for node compatibility.
-  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
-  mod
-));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var move_exports = {};
 __export(move_exports, {
-  move: () => move
+  createMoveAction: () => createMoveAction
 });
 module.exports = __toCommonJS(move_exports);
-var import_actions = __toESM(require("@nocobase/actions"));
-var import_utils = require("./utils");
-const databaseMoveAction = import_actions.default.move;
-async function move(ctx, next) {
-  const repository = (0, import_utils.getRepositoryFromParams)(ctx);
-  if (repository.move) {
-    ctx.body = await repository.move(ctx.action.params);
-    await next();
-    return;
-  }
-  if (repository.database) {
-    ctx.databaseRepository = repository;
-    return databaseMoveAction(ctx, next);
-  }
-  throw new Error(`Repository can not handle action move for ${ctx.action.resourceName}`);
+function createMoveAction(databaseMoveAction) {
+  return /* @__PURE__ */ __name(async function move(ctx, next) {
+    const repository = ctx.getCurrentRepository();
+    if (repository.move) {
+      ctx.body = await repository.move(ctx.action.params);
+      await next();
+      return;
+    }
+    if (repository.database) {
+      ctx.databaseRepository = repository;
+      return databaseMoveAction(ctx, next);
+    }
+    throw new Error(`Repository can not handle action move for ${ctx.action.resourceName}`);
+  }, "move");
 }
-__name(move, "move");
+__name(createMoveAction, "createMoveAction");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  move
+  createMoveAction
 });

package/lib/default-actions/proxy-to-repository.d.ts

@@ -1 +1,2 @@
-export declare function proxyToRepository(paramKeys: string[] | ((ctx: any) => object), repositoryMethod: string): (ctx: any, next: any) => Promise<void>;
+import { Context } from '@nocobase/actions';
+export declare function proxyToRepository(paramKeys: string[] | ((ctx: any) => object), repositoryMethod: string): (ctx: Context, next: () => Promise<void>) => Promise<void>;

package/lib/default-actions/proxy-to-repository.js

@@ -32,10 +32,9 @@ __export(proxy_to_repository_exports, {
 });
 module.exports = __toCommonJS(proxy_to_repository_exports);
 var import_lodash = __toESM(require("lodash"));
-var import_utils = require("./utils");
 function proxyToRepository(paramKeys, repositoryMethod) {
   return async function(ctx, next) {
-    const repository = (0, import_utils.getRepositoryFromParams)(ctx);
+    const repository = ctx.getCurrentRepository();
     const callObj = typeof paramKeys === "function" ? paramKeys(ctx) : { ...import_lodash.default.pick(ctx.action.params, paramKeys), context: ctx };
     const dataSource = ctx.dataSource;
     if (!repository[repositoryMethod]) {

package/lib/default-actions/utils.d.ts

@@ -1,7 +1,4 @@
-import { Context } from '@nocobase/actions';
-import { IRepository } from '../';
 export declare function pageArgsToLimitArgs(page: number, pageSize: number): {
     offset: number;
     limit: number;
 };
-export declare function getRepositoryFromParams(ctx: Context): IRepository;

package/lib/default-actions/utils.js

@@ -18,7 +18,6 @@ var __copyProps = (to, from, except, desc) => {
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var utils_exports = {};
 __export(utils_exports, {
-  getRepositoryFromParams: () => getRepositoryFromParams,
   pageArgsToLimitArgs: () => pageArgsToLimitArgs
 });
 module.exports = __toCommonJS(utils_exports);
@@ -29,21 +28,7 @@ function pageArgsToLimitArgs(page, pageSize) {
   };
 }
 __name(pageArgsToLimitArgs, "pageArgsToLimitArgs");
-function getRepositoryFromParams(ctx) {
-  const { resourceName, sourceId, actionName } = ctx.action;
-  const dataSource = ctx.dataSource;
-  if (sourceId === "_" && ["get", "list"].includes(actionName)) {
-    const collection = dataSource.collectionManager.getCollection(resourceName);
-    return dataSource.collectionManager.getRepository(collection.name);
-  }
-  if (sourceId) {
-    return dataSource.collectionManager.getRepository(resourceName, sourceId);
-  }
-  return dataSource.collectionManager.getRepository(resourceName);
-}
-__name(getRepositoryFromParams, "getRepositoryFromParams");
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  getRepositoryFromParams,
   pageArgsToLimitArgs
 });

package/lib/index.d.ts

@@ -5,5 +5,4 @@ export * from './sequelize-collection-manager';
 export * from './sequelize-data-source';
 export * from './load-default-actions';
 export * from './types';
-export * from './data-source-with-database';
 export * from './utils';

package/lib/index.js

@@ -21,7 +21,6 @@ __reExport(src_exports, require("./sequelize-collection-manager"), module.export
 __reExport(src_exports, require("./sequelize-data-source"), module.exports);
 __reExport(src_exports, require("./load-default-actions"), module.exports);
 __reExport(src_exports, require("./types"), module.exports);
-__reExport(src_exports, require("./data-source-with-database"), module.exports);
 __reExport(src_exports, require("./utils"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
@@ -32,6 +31,5 @@ __reExport(src_exports, require("./utils"), module.exports);
   ...require("./sequelize-data-source"),
   ...require("./load-default-actions"),
   ...require("./types"),
-  ...require("./data-source-with-database"),
   ...require("./utils")
 });

package/lib/load-default-actions.d.ts

@@ -1,7 +1,5 @@
 import { list } from './default-actions/list';
-import { move } from './default-actions/move';
-import { DataSource } from './data-source';
-export declare function loadDefaultActions(dataSource: DataSource): {
+export declare function loadDefaultActions(): {
     list: typeof list;
-    move: typeof move;
+    move: (ctx: import("@nocobase/actions").Context, next: any) => Promise<any>;
 };

package/lib/load-default-actions.js

@@ -1,6 +1,8 @@
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __name = (target, value) => __defProp(target, "name", { value, configurable: true });
 var __export = (target, all) => {
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var load_default_actions_exports = {};
 __export(load_default_actions_exports, {
@@ -24,6 +34,7 @@ module.exports = __toCommonJS(load_default_actions_exports);
 var import_list = require("./default-actions/list");
 var import_move = require("./default-actions/move");
 var import_proxy_to_repository = require("./default-actions/proxy-to-repository");
+var import_actions = __toESM(require("@nocobase/actions"));
 const actions = {
   add: {
     params(ctx) {
@@ -83,14 +94,14 @@ const actions = {
     method: "toggle"
   }
 };
-function loadDefaultActions(dataSource) {
+function loadDefaultActions() {
   return {
     ...Object.keys(actions).reduce((carry, key) => {
       carry[key] = (0, import_proxy_to_repository.proxyToRepository)(actions[key].params, actions[key].method);
       return carry;
     }, {}),
     list: import_list.list,
-    move: import_move.move
+    move: (0, import_move.createMoveAction)(import_actions.default.move)
   };
 }
 __name(loadDefaultActions, "loadDefaultActions");

package/lib/repository.js

@@ -32,6 +32,7 @@ __export(repository_exports, {
 });
 module.exports = __toCommonJS(repository_exports);
 var console = __toESM(require("console"));
+/* istanbul ignore file -- @preserve */
 const _Repository = class _Repository {
   async create(options) {
     console.log("Repository.create....");
@@ -42,7 +43,11 @@ const _Repository = class _Repository {
     return [];
   }
   async findOne(options) {
-    return {};
+    return {
+      toJSON() {
+        return {};
+      }
+    };
   }
   async destroy(options) {
   }

package/lib/sequelize-collection-manager.js

@@ -32,6 +32,7 @@ __export(sequelize_collection_manager_exports, {
 });
 module.exports = __toCommonJS(sequelize_collection_manager_exports);
 var import_database = __toESM(require("@nocobase/database"));
+/* istanbul ignore file -- @preserve */
 const _SequelizeCollectionManager = class _SequelizeCollectionManager {
   db;
   options;

package/lib/sequelize-data-source.d.ts

@@ -1,6 +1,5 @@
 import { DataSource } from './data-source';
 import { SequelizeCollectionManager } from './sequelize-collection-manager';
 export declare class SequelizeDataSource extends DataSource {
-    load(): Promise<void>;
     createCollectionManager(options?: any): SequelizeCollectionManager;
 }

package/lib/sequelize-data-source.js

@@ -24,8 +24,6 @@ module.exports = __toCommonJS(sequelize_data_source_exports);
 var import_data_source = require("./data-source");
 var import_sequelize_collection_manager = require("./sequelize-collection-manager");
 const _SequelizeDataSource = class _SequelizeDataSource extends import_data_source.DataSource {
-  async load() {
-  }
   createCollectionManager(options) {
     return new import_sequelize_collection_manager.SequelizeCollectionManager(options.collectionManager);
   }

package/lib/types.d.ts

@@ -24,8 +24,8 @@ export interface IField {
     options: FieldOptions;
 }
 export interface ICollection {
-    repository: any;
-    updateOptions(options: any): void;
+    repository: IRepository;
+    updateOptions(options: CollectionOptions, mergeOptions?: MergeOptions): void;
     setField(name: string, options: any): IField;
     removeField(name: string): void;
     getFields(): Array<IField>;
@@ -33,6 +33,7 @@ export interface ICollection {
     [key: string]: any;
 }
 export interface IModel {
+    toJSON: () => any;
     [key: string]: any;
 }
 export interface IRepository {
@@ -40,9 +41,9 @@ export interface IRepository {
     findOne(options?: any): Promise<IModel>;
     count(options?: any): Promise<Number>;
     findAndCount(options?: any): Promise<[IModel[], Number]>;
-    create(options: any): void;
-    update(options: any): void;
-    destroy(options: any): void;
+    create(options: any): any;
+    update(options: any): any;
+    destroy(options: any): any;
     [key: string]: any;
 }
 export type MergeOptions = {

package/package.json

@@ -1,16 +1,16 @@
 {
   "name": "@nocobase/data-source-manager",
-  "version": "0.21.0-alpha.15",
+  "version": "0.21.0-alpha.16",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "dependencies": {
-    "@nocobase/actions": "0.21.0-alpha.15",
-    "@nocobase/cache": "0.21.0-alpha.15",
-    "@nocobase/database": "0.21.0-alpha.15",
-    "@nocobase/resourcer": "0.21.0-alpha.15",
-    "@nocobase/utils": "0.21.0-alpha.15",
+    "@nocobase/actions": "0.21.0-alpha.16",
+    "@nocobase/cache": "0.21.0-alpha.16",
+    "@nocobase/database": "0.21.0-alpha.16",
+    "@nocobase/resourcer": "0.21.0-alpha.16",
+    "@nocobase/utils": "0.21.0-alpha.16",
     "@types/jsonwebtoken": "^8.5.8",
     "jsonwebtoken": "^8.5.1"
   },
@@ -19,5 +19,5 @@
     "url": "git+https://github.com/nocobase/nocobase.git",
     "directory": "packages/auth"
   },
-  "gitHead": "155a252452eba37d8047d7f4a1c3fb518679abf0"
+  "gitHead": "2914500f14e4454cc5702a49371230865660ca33"
 }

package/lib/data-source-with-database.d.ts

@@ -1,4 +0,0 @@
-import Database from '@nocobase/database';
-export interface DataSourceWithDatabase {
-    db: Database;
-}

package/lib/data-source-with-database.js

@@ -1,15 +0,0 @@
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  return to;
-};
-var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var data_source_with_database_exports = {};
-module.exports = __toCommonJS(data_source_with_database_exports);