@fibery/schema 8.1.14 → 8.3.0

package/lib/index.js

@@ -306,7 +306,8 @@ class FieldObject {
       rawFieldObject,
       holderType,
       resolveTypeObject,
-      version
+      version,
+      resolveMultiRelatedFieldObjects
     } = _ref;
     if (!external_lodash_default().isPlainObject(rawFieldObject)) {
       throw new Error("rawFieldObject arg must be plain object");
@@ -317,6 +318,9 @@ class FieldObject {
     if (!external_lodash_default().isFunction(resolveTypeObject)) {
       throw new Error("resolveTypeObject arg must be function");
     }
+    if (!external_lodash_default().isFunction(resolveMultiRelatedFieldObjects)) {
+      throw new Error("resolveMultiRelationFieldObjects arg must be function");
+    }
     this.name = rawFieldObject["fibery/name"];
     this.description = rawFieldObject["fibery/description"] || null;
     this.id = rawFieldObject["fibery/id"];
@@ -346,6 +350,7 @@ class FieldObject {
     this.isDeleted = rawFieldObject["fibery/deleted?"] || false;
     this.disableLinkExistingItems = rawMeta["ui/disable-link-existing-items"] || false;
     this.version = version;
+    this.multiRelation = rawMeta["fibery/multi-relation"] || null;
     Object.defineProperties(this, {
       typeObject: {
         configurable: false,
@@ -375,21 +380,49 @@ class FieldObject {
         configurable: false,
         enumerable: true,
         get: external_lodash_default().once(() => toNonEnumTitle(rawFieldObject["fibery/name"]))
+      },
+      multiRelatedFieldObjects: {
+        configurable: false,
+        enumerable: true,
+        get: external_lodash_default().once(() => {
+          const {
+            multiRelation,
+            typeObject
+          } = this;
+          if (!multiRelation || !typeObject.isEntityRef) {
+            return [];
+          }
+          return resolveMultiRelatedFieldObjects(multiRelation);
+        })
       }
     });
   }
   get relatedFieldObject() {
     const {
       name,
-      relation
+      relation,
+      multiRelation,
+      typeObject
     } = this;
-    if (!relation) {
+    if (!relation && !multiRelation) {
       return null;
     }
-    const selector = this.type !== this.holderType ? fieldObject => fieldObject.relation === relation : fieldObject => fieldObject.relation === relation && fieldObject.name !== name;
+    if (!relation && multiRelation && typeObject.isEntityRef) {
+      return null;
+    }
+    let relationKey;
+    let relationId;
+    if (relation) {
+      relationKey = "relation";
+      relationId = relation;
+    } else {
+      relationId = multiRelation;
+      relationKey = "multiRelation";
+    }
+    const selector = this.type !== this.holderType ? fieldObject => fieldObject[relationKey] === relationId : fieldObject => fieldObject[relationKey] === relationId && fieldObject.name !== name;
     const fieldObject = this.typeObject.fieldObjects.find(selector);
     if (!fieldObject) {
-      throw new Error(`there no other end for relation ${relation}`);
+      throw new Error(`there no other end for ${relationKey} ${relationId}`);
     }
     return fieldObject;
   }
@@ -476,10 +509,29 @@ class Schema {
       });
       return typeComponentTypeToFieldObject;
     });
+    let multiRelatedFieldsObjectsMap = null;
+    const initMultiRelatedFieldsObjectsMap = () => {
+      multiRelatedFieldsObjectsMap = new Map();
+      this.typeObjects.forEach(typeObject => {
+        typeObject.fieldObjects.forEach(fieldObject => {
+          if (fieldObject.multiRelation && !fieldObject.typeObject.isEntityRef) {
+            const store = multiRelatedFieldsObjectsMap.get(fieldObject.multiRelation) || [];
+            store.push(fieldObject);
+            multiRelatedFieldsObjectsMap.set(fieldObject.multiRelation, store);
+          }
+        });
+      });
+    };
     this.typeObjects = rawTypeObjects.map(rawTypeObject => factory.makeTypeObject({
       rawTypeObject,
       resolveTypeObject: type => this.typeObjectsByName[type] || null,
       getTypeComponentTypeToFieldObject: type => getTypeComponentTypeToFieldObject().get(type),
+      resolveMultiRelatedFieldObjects: multiRelation => {
+        if (!multiRelatedFieldsObjectsMap) {
+          initMultiRelatedFieldsObjectsMap();
+        }
+        return multiRelatedFieldsObjectsMap.get(multiRelation) || [];
+      },
       version
     }));
     this.typeObjectsById = factory.makeTypeObjectsById(this.typeObjects);
@@ -505,7 +557,8 @@ class TypeObject {
       resolveTypeObject,
       getTypeComponentTypeToFieldObject,
       version,
-      factory
+      factory,
+      resolveMultiRelatedFieldObjects
     } = _ref;
     _defineProperty(this, "_getFieldObjectShortcuts", external_lodash_default().once(() => {
       const hasRank = this.installedMixins.has("fibery/rank-mixin");
@@ -547,6 +600,7 @@ class TypeObject {
     const rawMeta = rawTypeObject["fibery/meta"] || {};
     this.rawMeta = rawMeta;
     this.isDomain = rawMeta["fibery/domain?"] || false;
+    this.isHighlight = rawMeta["fibery/highlight?"] || false;
     this.isMixin = rawMeta["app/mixin?"] || false;
     this.mixinIcon = rawMeta["ui/mixin-icon"] || null;
     this.isEnum = rawMeta["fibery/enum?"] || false;
@@ -559,6 +613,7 @@ class TypeObject {
     this.installedMixins = new Set(Object.keys(rawMeta["app/mixins"] || {}));
     this.syncSource = rawMeta["sync/source"] || null;
     this.version = version;
+    this.isEntityRef = rawTypeObject["fibery/name"] === "fibery/entity-ref";
     const fieldObjectsByNameOnceGetter = external_lodash_default().once(() => {
       return factory.makeFieldObjectsByName({
         type: this.name,
@@ -570,7 +625,8 @@ class TypeObject {
         rawFieldObject,
         holderType: this.name,
         resolveTypeObject,
-        version
+        version,
+        resolveMultiRelatedFieldObjects
       });
     }));
     Object.defineProperties(this, {

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@fibery/schema",
-  "version": "8.1.14",
+  "version": "8.3.0",
   "description": "utils for working with fibery schema",
   "main": "./lib/index.js",
   "browser": "./index.js",
   "types": "./types.d.ts",
   "files": [
-    "/lib",
+    "./lib",
     "types.d.ts"
   ],
   "private": false,
@@ -14,7 +14,7 @@
     "lodash": "^4.17.21",
     "memoize-one": "^6.0.0",
     "pluralize": "^8.0.0",
-    "@fibery/helpers": "1.1.0"
+    "@fibery/helpers": "1.2.0"
   },
   "devDependencies": {
     "@babel/core": "7.20.5",
@@ -25,8 +25,8 @@
     "jest-junit": "13.0.0",
     "webpack": "5.87.0",
     "webpack-cli": "4.10.0",
-    "@fibery/babel-preset": "7.2.0",
-    "@fibery/eslint-config": "8.3.0"
+    "@fibery/babel-preset": "7.3.0",
+    "@fibery/eslint-config": "8.5.0"
   },
   "jest": {
     "testEnvironment": "node",
@@ -52,8 +52,8 @@
   "scripts": {
     "build": "BABEL_ENV=production webpack",
     "test": "node scripts/test.js",
-    "test:ci": "yarn test --reporters=default --reporters=jest-junit",
-    "test:coverage": "yarn test --coverage --coverageDirectory=${JEST_COVERAGE_RESULT_DIR:-$(pwd)}/coverage/schema --reporters=default --reporters=jest-junit",
+    "test:ci": "pnpm run test --reporters=default --reporters=jest-junit",
+    "test:coverage": "pnpm run test --coverage --coverageDirectory=${JEST_COVERAGE_RESULT_DIR:-$(pwd)}/coverage/schema --reporters=default --reporters=jest-junit",
     "lint": "eslint ."
   }
 }

package/types.d.ts

@@ -21,6 +21,7 @@ export type FieldObject = {
   hasLinkRule: boolean;
   linkRule: unknown | null;
   relation: string | null;
+  multiRelation: string | null;
   defaultValue: unknown | null;
   objectEditorOrder: number;
   isRequired: boolean;
@@ -40,6 +41,7 @@ export type FieldObject = {
   relatedFieldObject: FieldObject | null;
   cardinality: Cardinality;
   kind: ":field/reference" | ":field/reference-collection" | ":field/basic";
+  multiRelatedFieldObjects: Array<FieldObject>;
 };
 
 export type TypeObject = {
@@ -55,6 +57,7 @@ export type TypeObject = {
   rankField: string | null;
   rawMeta: Record<string, unknown>;
   isDomain: boolean;
+  isHighlight: boolean;
   isMixin: boolean;
   mixinIcon: string | null;
   isEnum: boolean;
@@ -78,6 +81,7 @@ export type TypeObject = {
   fieldObjectsByName: Record<string, FieldObject>;
   typeComponentFieldObject: FieldObject | undefined;
   isDeleted: boolean;
+  isEntityRef: boolean;
 };
 
 export type Schema = {