@nocobase/plugin-ui-schema-storage 2.0.0-alpha.5 → 2.0.0-alpha.50

package/dist/externalVersion.js

@@ -8,14 +8,14 @@
  */
 
 module.exports = {
-  "@nocobase/client": "2.0.0-alpha.5",
-  "@nocobase/database": "2.0.0-alpha.5",
-  "@nocobase/cache": "2.0.0-alpha.5",
-  "@nocobase/utils": "2.0.0-alpha.5",
+  "@nocobase/client": "2.0.0-alpha.50",
+  "@nocobase/database": "2.0.0-alpha.50",
+  "@nocobase/cache": "2.0.0-alpha.50",
+  "@nocobase/utils": "2.0.0-alpha.50",
   "lodash": "4.17.21",
-  "@nocobase/plugin-localization": "2.0.0-alpha.5",
-  "@nocobase/server": "2.0.0-alpha.5",
-  "@nocobase/actions": "2.0.0-alpha.5",
-  "@nocobase/resourcer": "2.0.0-alpha.5",
+  "@nocobase/plugin-localization": "2.0.0-alpha.50",
+  "@nocobase/server": "2.0.0-alpha.50",
+  "@nocobase/actions": "2.0.0-alpha.50",
+  "@nocobase/resourcer": "2.0.0-alpha.50",
   "@formily/json-schema": "2.3.7"
 };

package/dist/locale/hu-HU.json

@@ -0,0 +1 @@
+{}

package/dist/server/repository.d.ts

@@ -28,7 +28,6 @@ export interface removeParentOptions extends Transactionable {
 interface InsertAdjacentOptions extends removeParentOptions {
     wrap?: any;
 }
-export declare function transaction(transactionAbleArgPosition?: number): (target: any, propertyKey: string, descriptor: PropertyDescriptor) => PropertyDescriptor;
 export declare class UiSchemaRepository extends Repository {
     cache: Cache;
     get uiSchemasTableName(): any;
@@ -93,7 +92,6 @@ export declare class UiSchemaRepository extends Repository {
     protected insertAfterEnd(targetUid: string, schema: any, options?: InsertAdjacentOptions): Promise<any>;
     protected insertNodes(nodes: SchemaNode[], options?: Transactionable): Promise<any[]>;
     private doGetProperties;
-    findNodesById(uid: string, options?: GetJsonSchemaOptions): Promise<unknown[]>;
     private doGetJsonSchema;
     private ignoreSchemaProperties;
     private breakOnMatched;
@@ -101,16 +99,5 @@ export declare class UiSchemaRepository extends Repository {
     private regenerateUid;
     private insertSchemaRecord;
     private prepareSingleNodeForInsert;
-    static modelToSingleNodes(model: any, parentChildOptions?: any): SchemaNode[];
-    static nodeToModel(node: any): any;
-    static nodesToModel(nodes: any[], rootUid: string): any;
-    insertModel(model: any, options?: Transactionable): Promise<any>;
-    updateSingleNode(node: SchemaNode, options?: Transactionable): Promise<boolean>;
-    upsertModel(model: any, options?: Transactionable): Promise<string>;
-    findModelById(uid: string, options?: GetJsonSchemaOptions): Promise<any>;
-    findModelByParentId(parentUid: string, options?: GetJsonSchemaOptions & {
-        subKey?: string;
-    }): Promise<any>;
-    move(options: any): Promise<any>;
 }
 export default UiSchemaRepository;

package/dist/server/repository.js

@@ -45,8 +45,7 @@ var __decorateClass = (decorators, target, key, kind) => {
 var repository_exports = {};
 __export(repository_exports, {
   UiSchemaRepository: () => UiSchemaRepository,
-  default: () => repository_default,
-  transaction: () => transaction
+  default: () => repository_default
 });
 module.exports = __toCommonJS(repository_exports);
 var import_database = require("@nocobase/database");
@@ -218,9 +217,6 @@ const _UiSchemaRepository = class _UiSchemaRepository extends import_database.Re
       return schema;
     };
     const buildTree = (rootNode) => {
-      if (!rootNode) {
-        return null;
-      }
       const children = nodes.filter((node) => node.parent == rootNode["x-uid"]);
       if (children.length > 0) {
         const childrenGroupByType = import_lodash.default.groupBy(children, "type");
@@ -883,7 +879,7 @@ WHERE TreeTable.depth = 1 AND  TreeTable.ancestor = :ancestor and TreeTable.sort
     const schema = this.nodesToSchema(nodes[0], uid2);
     return import_lodash.default.pick(schema, ["type", "properties"]);
   }
-  async findNodesById(uid2, options) {
+  async doGetJsonSchema(uid2, options) {
     const db = this.database;
     const treeTable = this.uiSchemaTreePathTableName;
     const rawSql = `
@@ -903,13 +899,9 @@ WHERE TreeTable.depth = 1 AND  TreeTable.ancestor = :ancestor and TreeTable.sort
       transaction: options == null ? void 0 : options.transaction
     });
     if (nodes[0].length == 0) {
-      return [];
+      return {};
     }
-    return nodes[0];
-  }
-  async doGetJsonSchema(uid2, options) {
-    const nodes = await this.findNodesById(uid2, options);
-    return this.nodesToSchema(nodes, uid2);
+    return this.nodesToSchema(nodes[0], uid2);
   }
   ignoreSchemaProperties(schemaProperties) {
     return import_lodash.default.omit(schemaProperties, nodeKeys);
@@ -977,175 +969,6 @@ WHERE TreeTable.depth = 1 AND  TreeTable.ancestor = :ancestor and TreeTable.sort
     delete schema["childOptions"];
     return { uid: uid2, name, async, childOptions };
   }
-  static modelToSingleNodes(model, parentChildOptions = null) {
-    const { uid: oldUid, async, subModels, ...rest } = import_lodash.default.cloneDeep(model);
-    const currentUid = oldUid || (0, import_utils.uid)();
-    const node = {
-      "x-uid": currentUid,
-      "x-async": async || false,
-      name: currentUid,
-      ...rest
-    };
-    if (parentChildOptions) {
-      node.childOptions = parentChildOptions;
-    }
-    const nodes = [node];
-    if (Object.keys(subModels || {}).length > 0) {
-      for (const [subKey, subItems] of Object.entries(subModels)) {
-        const items = import_lodash.default.castArray(subItems);
-        let sort = 0;
-        for (const item of items) {
-          item.subKey = subKey;
-          item.subType = Array.isArray(subItems) ? "array" : "object";
-          const childOptions = {
-            parentUid: currentUid,
-            parentPath: [currentUid, ...(parentChildOptions == null ? void 0 : parentChildOptions.parentPath) || []].filter(Boolean),
-            type: subKey,
-            // type: 'properties',
-            sort: ++sort
-          };
-          const children = this.modelToSingleNodes(item, childOptions);
-          nodes.push(...children);
-        }
-      }
-    }
-    return nodes;
-  }
-  static nodeToModel(node) {
-    const { "x-uid": uid2, name, schema } = node;
-    const model = {
-      uid: uid2,
-      ...schema
-    };
-    return model;
-  }
-  static nodesToModel(nodes, rootUid) {
-    const nodeMap = /* @__PURE__ */ new Map();
-    for (const node of nodes) {
-      nodeMap.set(node["x-uid"], node);
-    }
-    const rootNode = nodeMap.get(rootUid);
-    if (!rootNode) return null;
-    const children = nodes.filter((n) => n.parent === rootUid);
-    const subModels = {};
-    for (const child of children) {
-      const { subKey, subType } = child.schema;
-      if (!subKey) continue;
-      const model = _UiSchemaRepository.nodesToModel(nodes, child["x-uid"]) || {
-        uid: child["x-uid"],
-        ...child.schema,
-        sortIndex: child.sort
-      };
-      model.sortIndex = child.sort;
-      if (subType === "array") {
-        if (!subModels[subKey]) subModels[subKey] = [];
-        subModels[subKey].push(model);
-      } else {
-        subModels[subKey] = model;
-      }
-    }
-    for (const key in subModels) {
-      if (Array.isArray(subModels[key])) {
-        subModels[key].sort((a, b) => (a.sortIndex ?? 0) - (b.sortIndex ?? 0));
-      }
-    }
-    const filteredSubModels = {};
-    for (const key in subModels) {
-      const value = subModels[key];
-      if (Array.isArray(value) && value.length === 0) continue;
-      if (!Array.isArray(value) && typeof value === "object" && value !== null && Object.keys(value).length === 0)
-        continue;
-      filteredSubModels[key] = value;
-    }
-    return {
-      uid: rootNode["x-uid"],
-      ...rootNode.schema,
-      ...Object.keys(filteredSubModels).length > 0 ? { subModels: filteredSubModels } : {}
-    };
-  }
-  async insertModel(model, options) {
-    const nodes = _UiSchemaRepository.modelToSingleNodes(model);
-    const rootUid = nodes[0]["x-uid"];
-    await this.insertNodes(nodes, options);
-    return await this.findModelById(rootUid, options);
-  }
-  async updateSingleNode(node, options) {
-    const instance = await this.model.findByPk(node["x-uid"], {
-      transaction: options == null ? void 0 : options.transaction
-    });
-    if (instance) {
-      await instance.update(
-        {
-          schema: {
-            ...instance.get("schema"),
-            ...import_lodash.default.omit(node, ["x-async", "name", "x-uid", "childOptions"])
-          }
-        },
-        {
-          hooks: false,
-          transaction: options == null ? void 0 : options.transaction
-        }
-      );
-      return true;
-    }
-    return false;
-  }
-  async upsertModel(model, options) {
-    let childOptions = null;
-    if (model.parentId) {
-      childOptions = {
-        parentUid: model.parentId,
-        type: model.subKey,
-        // type: 'properties',
-        position: "last"
-      };
-    }
-    const nodes = _UiSchemaRepository.modelToSingleNodes(model, childOptions);
-    const rootUid = nodes[0]["x-uid"];
-    for (const node of nodes) {
-      const exists = await this.updateSingleNode(node, options);
-      if (!exists) {
-        await this.insertSingleNode(node, options);
-      }
-    }
-    return rootUid;
-  }
-  async findModelById(uid2, options) {
-    const nodes = await this.findNodesById(uid2, options);
-    return _UiSchemaRepository.nodesToModel(nodes, uid2);
-  }
-  async findModelByParentId(parentUid, options) {
-    const r = this.database.getRepository("uiSchemaTreePath");
-    const treePaths = await r.model.findAll({
-      where: {
-        ancestor: parentUid,
-        depth: 1
-      },
-      transaction: options == null ? void 0 : options.transaction
-    });
-    const ancestors = treePaths.map((treePath2) => treePath2["descendant"]);
-    const where = {
-      ancestor: ancestors,
-      depth: 0
-    };
-    if (options == null ? void 0 : options.subKey) {
-      where["type"] = options.subKey;
-    }
-    const treePath = await r.model.findOne({
-      where,
-      transaction: options == null ? void 0 : options.transaction
-    });
-    if (treePath == null ? void 0 : treePath["descendant"]) {
-      return this.findModelById(treePath["descendant"], options);
-    }
-    return null;
-  }
-  async move(options) {
-    const { sourceId, targetId, position } = options;
-    return await this.insertAdjacent(position === "after" ? "afterEnd" : "beforeBegin", targetId, {
-      ["x-uid"]: sourceId
-    });
-  }
 };
 __decorateClass([
   transaction()
@@ -1195,19 +1018,9 @@ __decorateClass([
 __decorateClass([
   transaction()
 ], _UiSchemaRepository.prototype, "insertNodes", 1);
-__decorateClass([
-  transaction()
-], _UiSchemaRepository.prototype, "insertModel", 1);
-__decorateClass([
-  transaction()
-], _UiSchemaRepository.prototype, "updateSingleNode", 1);
-__decorateClass([
-  transaction()
-], _UiSchemaRepository.prototype, "upsertModel", 1);
 let UiSchemaRepository = _UiSchemaRepository;
 var repository_default = UiSchemaRepository;
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  UiSchemaRepository,
-  transaction
+  UiSchemaRepository
 });

package/dist/server/server.js

@@ -130,7 +130,7 @@ class PluginUISchemaStorageServer extends import_server.Plugin {
         transaction
       });
     });
-    this.app.resourceManager.define({
+    this.app.resourcer.define({
       name: "uiSchemas",
       actions: import_ui_schema_action.uiSchemaActions
     });

package/package.json

@@ -2,12 +2,15 @@
   "name": "@nocobase/plugin-ui-schema-storage",
   "displayName": "UI schema storage",
   "displayName.zh-CN": "UI schema 存储服务",
+  "displayName.ru-RU": "Хранилище UI схем",
   "description": "Provides centralized UI schema storage service.",
   "description.zh-CN": "提供中心化的 UI schema 存储服务。",
-  "version": "2.0.0-alpha.5",
+  "description.ru-RU": "Предоставляет централизованный сервис хранения UI схем.",
+  "version": "2.0.0-alpha.50",
   "license": "AGPL-3.0",
   "main": "./dist/server/index.js",
   "homepage": "https://docs.nocobase.com/handbook/ui-schema-storage",
+  "homepage.ru-RU": "https://docs-ru.nocobase.com/handbook/ui-schema-storage",
   "homepage.zh-CN": "https://docs-cn.nocobase.com/handbook/ui-schema-storage",
   "devDependencies": {
     "@formily/json-schema": "2.x"
@@ -23,7 +26,7 @@
     "@nocobase/test": "2.x",
     "@nocobase/utils": "2.x"
   },
-  "gitHead": "943e035bbec27f9ecfe8ce8857955945f20976f3",
+  "gitHead": "a6eb64abf3632e116ad0b295a7f410270a1059d1",
   "keywords": [
     "System & security"
   ]