fix(Attribute): AttributePatch

wmakeev · Aug 2, 2021 · 43578a2 · 43578a2
1 parent 9c6f419
commit 43578a2
Show file tree

Hide file tree

Showing 3 changed files with 52 additions and 9 deletions.
diff --git a/src/model/Attribute.ts b/src/model/Attribute.ts
@@ -84,11 +84,22 @@ export type Attribute<T extends AttributeType = AttributeType> =
       }
     : AttributeBase<T>
 
+// TODO Попробовать оптимизировать см. #dhg06qfl
+
+// prettier-ignore
+
 export type AttributePatch<T extends AttributeType = AttributeType> =
-  | (EntityPatchRef<'attributemetadata'> & {
-      file: {
+  T extends AttributeType.File
+    ? EntityPatchRef<'attributemetadata'> & {
+      file?: {
         filename: string
         content: string
       }
-    })
-  | (EntityPatchRef<'attributemetadata'> & Partial<Pick<Attribute<T>, 'value'>>)
+    }
+
+  : T extends AttributeType.CustomEntity
+    ? EntityPatchRef<'attributemetadata'> & {
+      value: EntityRef<'customentity'>
+    }
+
+  : EntityPatchRef<'attributemetadata'> & Partial<Pick<Attribute<T>, 'value'>>
diff --git a/test/model/common.test.ts b/test/model/common.test.ts
@@ -1,4 +1,4 @@
-import type { Patch, PrefilledDocument } from '../../src'
+import type { EntityRef, Patch, PrefilledDocument } from '../../src'
 import { testTypeEqual } from '../tools'
 
 const customerorder: Patch<'customerorder'> = {}
@@ -11,3 +11,23 @@ invoiceOut.positions?.[0].price
 invoiceOut.customerOrder
 invoiceOut.store
 invoiceOut.paymentPlannedMoment
+
+//#region
+const t10_1 = {} as EntityRef<'attributemetadata'> & {
+  value: EntityRef<'customentity'>
+}
+
+const t10_2: Patch<'customerorder'> = {
+  attributes: [
+    t10_1,
+    {
+      meta: {
+        type: 'attributemetadata',
+        href: ''
+      },
+      value: 123
+    }
+  ]
+}
+t10_2
+//#endregion
diff --git a/test/model/utils/Patch.test.ts b/test/model/utils/Patch.test.ts
@@ -65,7 +65,6 @@ t1.attributes = [
       type: 'attributemetadata',
       href: ''
     },
-    value: '',
     file: { filename: '', content: '' }
   },
   {
@@ -77,8 +76,8 @@ t1.attributes = [
 ]
 
 t1.attributes = [
-  // @ts-expect-error
   {
+    // @ts-expect-error
     value: ''
   }
 ]
@@ -90,17 +89,30 @@ t1.attributes = [
   }
 ]
 
+// TODO Нужно оптимизировать проверку типа в attributes #dhg06qfl ..
+// .. не понятная ошибка, когда указано лишнее поле
+
 t1.attributes = [
   {
     meta: {
       type: 'attributemetadata',
       href: ''
     },
-    // @ts-expect-error
-    name: '',
+    // foo: '', // #dhg06qfl
     value: ''
   }
 ]
+
+t1.attributes = [
+  {
+    meta: {
+      type: 'attributemetadata',
+      href: ''
+    },
+    // foo: '', // #dhg06qfl
+    value: { meta: { type: 'customentity', href: '' } }
+  }
+]
 //#endregion
 
 //#region Патч коллекции