feat(model)

- State expand
- рефакторинг

package.json

@@ -1,6 +1,6 @@
 {
   "name": "moysklad-api-model",
-  "version": "0.1.3",
+  "version": "0.1.4",
   "description": "Объектная модель API МойСклад для TypeScript проектов",
   "main": "build/src/index.js",
   "types": "build/src/index.d.ts",

src/model/MetaType.ts

@@ -1,12 +1,17 @@
-import type { Account } from './Account'
-import type { AgentNote } from './AgentNote'
-import type { ContactPerson } from './ContactPerson'
-import type { Counterparty } from './Counterparty'
-import type { CustomerOrder } from './CustomerOrder'
-import type { Employee } from './Employee'
-import type { Entity } from './Entity'
-import type { Group } from './Group'
-import type { Organization } from './Organization'
+import type {
+  Account,
+  AgentNote,
+  ContactPerson,
+  Counterparty,
+  CustomerOrder,
+  Demand,
+  Employee,
+  Entity,
+  Group,
+  Organization,
+  RetailDemand,
+  State
+} from '.'
 
 export enum MetaType {
   Account = 'account',
@@ -126,7 +131,7 @@ export type EntityByMetaType = {
   [MetaType.CustomerOrder]: CustomerOrder
   [MetaType.CustomerOrderPosition]: Entity<MetaType.CustomerOrderPosition>
   [MetaType.CustomTemplate]: Entity<MetaType.CustomTemplate>
-  [MetaType.Demand]: Entity<MetaType.Demand>
+  [MetaType.Demand]: Demand
   [MetaType.DemandPosition]: Entity<MetaType.DemandPosition>
   [MetaType.Discount]: Entity<MetaType.Discount>
   [MetaType.EmbeddedTemplate]: Entity<MetaType.EmbeddedTemplate>
@@ -173,7 +178,7 @@ export type EntityByMetaType = {
   [MetaType.PurchaseReturn]: Entity<MetaType.PurchaseReturn>
   [MetaType.PurchaseReturnPosition]: Entity<MetaType.PurchaseReturnPosition>
   [MetaType.Region]: Entity<MetaType.Region>
-  [MetaType.RetailDemand]: Entity<MetaType.RetailDemand>
+  [MetaType.RetailDemand]: RetailDemand
   [MetaType.RetailDrawerCashIn]: Entity<MetaType.RetailDrawerCashIn>
   [MetaType.RetailDrawerCashOut]: Entity<MetaType.RetailDrawerCashOut>
   [MetaType.RetailSalesReturn]: Entity<MetaType.RetailSalesReturn>
@@ -183,7 +188,7 @@ export type EntityByMetaType = {
   [MetaType.SalesReturnPosition]: Entity<MetaType.SalesReturnPosition>
   [MetaType.Service]: Entity<MetaType.Service>
   [MetaType.SpecialPriceDiscount]: Entity<MetaType.SpecialPriceDiscount>
-  [MetaType.State]: Entity<MetaType.State>
+  [MetaType.State]: State
   [MetaType.Store]: Entity<MetaType.Store>
   [MetaType.Supply]: Entity<MetaType.Supply>
   [MetaType.SupplyPosition]: Entity<MetaType.SupplyPosition>

src/model/index.ts

@@ -1,3 +1,5 @@
+// Добавить новые сущности аналогично в MetaType.ts
+
 export * from './Account'
 export * from './Address'
 export * from './Agent'

test/model/CustomerOrder.test.ts

@@ -1,5 +1,5 @@
-import type { CustomerOrder, CustomerOrderExpand } from '../..'
-import { AttributeType, MediaType, MetaType, TaxSystem } from '../..'
+import type { CustomerOrder, CustomerOrderExpand } from '../../src'
+import { AttributeType, MediaType, MetaType, TaxSystem } from '../../src'
 
 const customerOrderFull1: CustomerOrder = {
   meta: {

test/model/Expand.test.ts

@@ -1,7 +1,7 @@
-import type { CustomerOrder, Expand } from '../..'
+import type { CustomerOrder, Expand } from '../../src'
 
 // Expand EntityRef
-const test1 = {} as Expand<CustomerOrder, 'agent'>
+const test1 = {} as Expand<Expand<CustomerOrder, 'agent'>, 'state'>
 
 test1.owner.meta
 test1.agent.name // expand
@@ -10,6 +10,8 @@ test1.agent.group.name // ERROR: no 2-nd level expanded
 // @ts-expect-error
 test1.project?.id
 
+test1.state?.name
+
 const test2 = {} as Expand<CustomerOrder, 'agent.group'>
 
 test2.agent.group.name // OK: 2-nd level expanded

test/model/isType.test.ts

@@ -1,4 +1,4 @@
-import { CustomerOrder, Demand, MetaType, RetailDemand } from '../../build/src'
+import { CustomerOrder, Demand, MetaType, RetailDemand } from '../../src'
 import { isType } from '../../src/tools'
 import { getTypedVar } from '../tools'