feat: ref #102071 Implementation of a general scheme for a card in the orders section and in chats

Author: Arianr0d

meta/index.ts

@@ -447,16 +447,16 @@ export const targetListDocumentation: {
       'ru-RU': 'Начало секции, над списком товарных позиций',
     },
     contexts: [
-      'order/mg',
-      'order/mg:settings',
+      'order/card',
+      'order/card:settings',
       'user/current',
       'settings',
     ],
     customContexts: [
       'order',
     ],
     actions: [
-      'order/mg',
+      'order/card',
     ],
   },
   'order/mg:list.after': {
@@ -471,16 +471,16 @@ export const targetListDocumentation: {
       'ru-RU': 'Конец секции, сразу после списка товарных позиций и до полей ввода скидки, выбора привилегии и т.п.',
     },
     contexts: [
-      'order/mg',
-      'order/mg:settings',
+      'order/card',
+      'order/card:settings',
       'user/current',
       'settings',
     ],
     customContexts: [
       'order',
     ],
     actions: [
-      'order/mg',
+      'order/card',
     ],
   },
   'order/mg:delivery.before': {
@@ -495,16 +495,16 @@ export const targetListDocumentation: {
       'ru-RU': 'Начало секции, над полем ввода',
     },
     contexts: [
-      'order/mg',
-      'order/mg:settings',
+      'order/card',
+      'order/card:settings',
       'user/current',
       'settings',
     ],
     customContexts: [
       'order',
     ],
     actions: [
-      'order/mg',
+      'order/card',
     ],
   },
   'order/mg:delivery.after': {
@@ -519,16 +519,16 @@ export const targetListDocumentation: {
       'ru-RU': 'Конец секции, под полями ввода',
     },
     contexts: [
-      'order/mg',
-      'order/mg:settings',
+      'order/card',
+      'order/card:settings',
       'user/current',
       'settings',
     ],
     customContexts: [
       'order',
     ],
     actions: [
-      'order/mg',
+      'order/card',
     ],
   },
   'order/mg:payment.before': {
@@ -543,16 +543,16 @@ export const targetListDocumentation: {
       'ru-RU': 'Начало секции, над полем ввода',
     },
     contexts: [
-      'order/mg',
-      'order/mg:settings',
+      'order/card',
+      'order/card:settings',
       'user/current',
       'settings',
     ],
     customContexts: [
       'order',
     ],
     actions: [
-      'order/mg',
+      'order/card',
     ],
   },
   'order/mg:payment.after': {
@@ -567,16 +567,16 @@ export const targetListDocumentation: {
       'ru-RU': 'Конец секции, после списка оплат, контролов и пользовательских полей',
     },
     contexts: [
-      'order/mg',
-      'order/mg:settings',
+      'order/card',
+      'order/card:settings',
       'user/current',
       'settings',
     ],
     customContexts: [
       'order',
     ],
     actions: [
-      'order/mg',
+      'order/card',
     ],
   },
 }

packages/v1-contexts/package.json

@@ -72,12 +72,6 @@
       "remote/order/card-settings": [
         "./dist/remote/order/card-settings.d.ts"
       ],
-      "remote/order/mg": [
-        "./dist/remote/order/mg.d.ts"
-      ],
-      "remote/order/mg-settings": [
-        "./dist/remote/order/mg-settings.d.ts"
-      ],
       "remote/user/current": [
         "./dist/remote/user/current.d.ts"
       ],

packages/v1-contexts/scripts/build.meta.ts

@@ -20,20 +20,16 @@ import { keysOf } from '@/utilities'
 
 import * as customer from '@/common/customer/card'
 import * as customerPhone from '@/common/customer/card-phone'
-import * as orderCard from '@/common/order/card'
-import * as orderCardSettings from '@/common/order/card-settings'
-import * as orderMg from '@/common/order/mg'
-import * as orderMgSettings from '@/common/order/mg-settings'
+import * as order from '@/common/order/card'
+import * as orderSettings from '@/common/order/card-settings'
 import * as user from '@/common/user/current'
 import * as settings from '@/common/settings'
 
 const schema: SchemaList = {
   [customer.id]: customer.schema,
   [customerPhone.id]: customerPhone.schema,
-  [orderCard.id]: orderCard.schema,
-  [orderCardSettings.id]: orderCardSettings.schema,
-  [orderMg.id]: orderMg.schema,
-  [orderMgSettings.id]: orderMgSettings.schema,
+  [order.id]: order.schema,
+  [orderSettings.id]: orderSettings.schema,
   [user.id]: user.schema,
   [settings.id]: settings.schema,
 }
@@ -43,10 +39,8 @@ const description: {
 } = {
   [customer.id]: customer.description,
   [customerPhone.id]: customerPhone.description,
-  [orderCard.id]: orderCard.description,
-  [orderCardSettings.id]: orderCardSettings.description,
-  [orderMg.id]: orderMg.description,
-  [orderMgSettings.id]: orderMgSettings.description,
+  [order.id]: order.description,
+  [orderSettings.id]: orderSettings.description,
   [user.id]: user.description,
   [settings.id]: settings.description,
 }
@@ -56,24 +50,20 @@ const usage: {
 } = {
   [customer.id]: customer.usage,
   [customerPhone.id]: customerPhone.usage,
-  [orderCard.id]: orderCard.usage,
-  [orderCardSettings.id]: orderCardSettings.usage,
-  [orderMg.id]: orderMg.usage,
-  [orderMgSettings.id]: orderMgSettings.usage,
+  [order.id]: order.usage,
+  [orderSettings.id]: orderSettings.usage,
   [user.id]: user.usage,
   [settings.id]: settings.usage,
 }
 
 const actions: ActionSchemaList = {
-  [orderCard.id]: orderCard.actions,
-  [orderMg.id]: orderMg.actions,
+  [order.id]: order.actions,
 }
 
 const actionsDescription: {
   [K in keyof ActionSchemaList]: ObjectDescription<ActionSchemaList[K]>;
 } = {
-  [orderCard.id]: orderCard.actionsDescription,
-  [orderMg.id]: orderMg.actionsDescription,
+  [order.id]: order.actionsDescription,
 }
 
 const __dirname = dirname(fileURLToPath(import.meta.url))
@@ -164,18 +154,12 @@ const types: ObjectMeta[] = [{
 
 fs.writeFileSync(join(dist, 'meta.json'), JSON.stringify({
   types: [
-    ...keysOf({
-      ...orderCard.typesDescription,
-      ...orderMg.typesDescription,
-    }).reduce((meta, name) => {
-      const types = { ...orderCard.types, ...orderMg.types }[name] as Record<string, string>
-      const descriptions = {
-        ...orderCard.typesDescription,
-        ...orderMg.typesDescription,
-      }[name]
+    ...keysOf(order.typesDescription).reduce((meta, name) => {
+      const types = order.types[name] as Record<string, string>
+      const descriptions = order.typesDescription[name]
 
       meta.push({
-        name: name,
+        name,
         fields: keysOf(descriptions).map(field => ({
           name: field as string,
           type: types[field as string],

packages/v1-contexts/scripts/generate.known-types.ts

@@ -22,14 +22,7 @@ type Path = string
 type SchemaName = string
 
 const schemas: Record<SchemaName, Path[]> = {
-  'order/card': [
-    path.resolve(__root, 'types/order/card.d.ts'),
-    path.resolve(__root, 'types/order/common.d.ts'),
-  ],
-  'order/mg': [
-    path.resolve(__root, 'types/order/mg.d.ts'),
-    path.resolve(__root, 'types/order/common.d.ts'),
-  ],
+  'order/card': [ path.resolve(__root, 'types/order/card.d.ts') ],
 }
 
 const code = {} as Record<SchemaName, string>

packages/v1-contexts/src/common/order/card.ts

@@ -23,18 +23,15 @@ import {
 } from '@/predicates'
 
 import {
+  isCreateOrderItemInput,
+  isDiscount,
+  isItem,
   isOffer,
   isPriceType,
   isProduct,
   isProductGroup,
   isProperty,
   isStatus,
-} from '@/predicates/order/common'
-
-import {
-  isCreateOrderItemInput,
-  isDiscount,
-  isItem,
 } from '@/predicates/order/card'
 
 export const id = 'order/card'