chore(): Move dependencies around (#9278)

RESOLVES FRMW-2716 [1]

**What**
First stab at re organising dependencies in the modules and their usage.
This commit is contained in:
Adrien de Peretti
2024-09-24 16:58:04 +02:00
committed by GitHub
parent bb342d46f6
commit 6937d74252
40 changed files with 96 additions and 86 deletions

View File

@@ -18,7 +18,12 @@
"./subscribers": "./dist/subscribers/index.js",
"./workflows": "./dist/workflows/index.js",
"./links": "./dist/links/index.js",
"./jobs": "./dist/jobs/index.js"
"./jobs": "./dist/jobs/index.js",
"./utils": "./dist/utils/index.js",
"./types": "./dist/types/index.js",
"./orchestration": "./dist/orchestration/index.js",
"./workflows-sdk": "./dist/workflows-sdk/index.js",
"./workflows-sdk/composer": "./dist/workflows-sdk/composer.js"
},
"engines": {
"node": ">=20"
@@ -40,7 +45,6 @@
"test": "jest --runInBand --bail --passWithNoTests --forceExit"
},
"devDependencies": {
"@medusajs/orchestration": "^0.5.7",
"@medusajs/types": "^1.11.16",
"@types/express": "^4.17.17",
"@types/jsonwebtoken": "^8.5.9",
@@ -55,6 +59,7 @@
"dependencies": {
"@medusajs/medusa-cli": "^1.3.22",
"@medusajs/modules-sdk": "^1.12.11",
"@medusajs/orchestration": "^0.5.7",
"@medusajs/utils": "^1.11.9",
"@medusajs/workflows-sdk": "^0.1.6",
"@opentelemetry/api": "^1.9.0",

View File

@@ -0,0 +1 @@
export * from "@medusajs/orchestration"

View File

@@ -0,0 +1 @@
export * from "@medusajs/types"

View File

@@ -0,0 +1 @@
export * from "@medusajs/utils"

View File

@@ -0,0 +1 @@
export * from "@medusajs/workflows-sdk/composer"

View File

@@ -0,0 +1 @@
export * from "@medusajs/workflows-sdk"

View File

@@ -2,7 +2,7 @@ import {
createStep,
createWorkflow,
StepResponse,
} from "@medusajs/workflows-sdk"
} from "@medusajs/framework/workflows-sdk"
const step_1 = createStep(
"step_1",

View File

@@ -2,7 +2,7 @@ import {
createStep,
createWorkflow,
StepResponse,
} from "@medusajs/workflows-sdk"
} from "@medusajs/framework/workflows-sdk"
const step_1 = createStep(
"step_1",

View File

@@ -4,7 +4,7 @@ import {
createStep,
createWorkflow,
parallelize,
} from "@medusajs/workflows-sdk"
} from "@medusajs/framework/workflows-sdk"
import { setTimeout } from "timers/promises"
const step_1_background = createStep(

View File

@@ -2,8 +2,8 @@ import {
createStep,
createWorkflow,
StepResponse,
} from "@medusajs/workflows-sdk"
import { when } from "@medusajs/workflows-sdk/composer"
} from "@medusajs/framework/workflows-sdk"
import { when } from "@medusajs/framework/workflows-sdk/composer"
const step_1 = createStep(
"step_1",

View File

@@ -1,4 +1,4 @@
import { createStep, createWorkflow } from "@medusajs/workflows-sdk"
import { createStep, createWorkflow } from "@medusajs/framework/workflows-sdk"
import { setTimeout } from "timers/promises"
export const workflowEventGroupIdStep1Mock = jest.fn(async (input) => {

View File

@@ -1,8 +1,8 @@
import {
StepResponse,
createStep,
createWorkflow,
} from "@medusajs/workflows-sdk"
StepResponse,
} from "@medusajs/framework/workflows-sdk"
const step_1 = createStep(
"step_1",

View File

@@ -1,9 +1,9 @@
import { SchedulerOptions } from "@medusajs/orchestration"
import { SchedulerOptions } from "@medusajs/framework/orchestration"
import {
createStep,
createWorkflow,
StepResponse,
} from "@medusajs/workflows-sdk"
} from "@medusajs/framework/workflows-sdk"
export const createScheduled = (name: string, schedule?: SchedulerOptions) => {
const workflowScheduledStepInvoke = jest.fn((input, { container }) => {

View File

@@ -1,8 +1,8 @@
import {
StepResponse,
createStep,
createWorkflow,
} from "@medusajs/workflows-sdk"
StepResponse,
} from "@medusajs/framework/workflows-sdk"
import { setTimeout } from "timers/promises"
const step_1 = createStep(

View File

@@ -1,8 +1,8 @@
import {
StepResponse,
createStep,
createWorkflow,
} from "@medusajs/workflows-sdk"
StepResponse,
} from "@medusajs/framework/workflows-sdk"
const step_1 = createStep(
"step_1",

View File

@@ -1,10 +1,14 @@
import { WorkflowManager } from "@medusajs/orchestration"
import { WorkflowManager } from "@medusajs/framework/orchestration"
import {
Context,
IWorkflowEngineService,
RemoteQueryFunction,
} from "@medusajs/types"
import { Module, Modules, TransactionHandlerType } from "@medusajs/utils"
} from "@medusajs/framework/types"
import {
Module,
Modules,
TransactionHandlerType,
} from "@medusajs/framework/utils"
import { WorkflowsModuleService } from "@services"
import { asFunction } from "awilix"
import { moduleIntegrationTestRunner } from "medusa-test-utils"

View File

@@ -1,4 +1,4 @@
import { defineMikroOrmCliConfig, Modules } from "@medusajs/utils"
import { defineMikroOrmCliConfig, Modules } from "@medusajs/framework/utils"
import * as entities from "./src/models"
export default defineMikroOrmCliConfig(Modules.WORKFLOW_ENGINE, {

View File

@@ -48,9 +48,7 @@
"typescript": "^5.6.2"
},
"dependencies": {
"@medusajs/orchestration": "^0.5.7",
"@medusajs/utils": "^1.11.9",
"@medusajs/workflows-sdk": "^0.1.6",
"@medusajs/framework": "^0.0.1",
"cron-parser": "^4.9.0"
},
"peerDependencies": {

View File

@@ -1,4 +1,4 @@
import { Module, Modules } from "@medusajs/utils"
import { Module, Modules } from "@medusajs/framework/utils"
import { WorkflowsModuleService } from "@services"
import { loadUtils } from "./loaders"

View File

@@ -1,5 +1,5 @@
import { TransactionState } from "@medusajs/orchestration"
import { DALUtils, generateEntityId } from "@medusajs/utils"
import { TransactionState } from "@medusajs/framework/orchestration"
import { DALUtils, generateEntityId } from "@medusajs/framework/utils"
import {
BeforeCreate,
Entity,

View File

@@ -5,21 +5,25 @@ import {
TransactionHandlerType,
TransactionStep,
WorkflowScheduler,
} from "@medusajs/orchestration"
import { ContainerLike, Context, MedusaContainer } from "@medusajs/types"
} from "@medusajs/framework/orchestration"
import {
ContainerLike,
Context,
MedusaContainer,
} from "@medusajs/framework/types"
import {
InjectSharedContext,
isString,
MedusaContext,
MedusaError,
TransactionState,
isString,
} from "@medusajs/utils"
} from "@medusajs/framework/utils"
import {
MedusaWorkflow,
ReturnWorkflow,
resolveValue,
type FlowRunOptions,
} from "@medusajs/workflows-sdk"
MedusaWorkflow,
resolveValue,
ReturnWorkflow,
} from "@medusajs/framework/workflows-sdk"
import { ulid } from "ulid"
import { InMemoryDistributedTransactionStorage } from "../utils"

View File

@@ -5,16 +5,16 @@ import {
MedusaContainer,
ModulesSdkTypes,
WorkflowsSdkTypes,
} from "@medusajs/types"
} from "@medusajs/framework/types"
import {
InjectSharedContext,
MedusaContext,
ModulesSdkUtils,
} from "@medusajs/utils"
} from "@medusajs/framework/utils"
import type {
ReturnWorkflow,
UnwrapWorkflowInputDataType,
} from "@medusajs/workflows-sdk"
} from "@medusajs/framework/workflows-sdk"
import { WorkflowExecution } from "@models"
import { WorkflowOrchestratorService } from "@services"

View File

@@ -1,4 +1,4 @@
import { Logger } from "@medusajs/types"
import { Logger } from "@medusajs/framework/types"
export type InitializeModuleInjectableDependencies = {
logger?: Logger

View File

@@ -6,9 +6,9 @@ import {
TransactionCheckpoint,
TransactionOptions,
TransactionStep,
} from "@medusajs/orchestration"
import { Logger, ModulesSdkTypes } from "@medusajs/types"
import { MedusaError, TransactionState } from "@medusajs/utils"
} from "@medusajs/framework/orchestration"
import { Logger, ModulesSdkTypes } from "@medusajs/framework/types"
import { MedusaError, TransactionState } from "@medusajs/framework/utils"
import { WorkflowOrchestratorService } from "@services"
import { CronExpression, parseExpression } from "cron-parser"

View File

@@ -1,8 +1,8 @@
import {
StepResponse,
createStep,
createWorkflow,
} from "@medusajs/workflows-sdk"
StepResponse,
} from "@medusajs/framework/workflows-sdk"
const step_1 = createStep(
"step_1",

View File

@@ -1,8 +1,8 @@
import {
StepResponse,
createStep,
createWorkflow,
} from "@medusajs/workflows-sdk"
StepResponse,
} from "@medusajs/framework/workflows-sdk"
const step_1 = createStep(
"step_1",

View File

@@ -1,10 +1,10 @@
import {
StepResponse,
WorkflowResponse,
createStep,
createWorkflow,
parallelize,
} from "@medusajs/workflows-sdk"
StepResponse,
WorkflowResponse,
} from "@medusajs/framework/workflows-sdk"
import { setTimeout } from "timers/promises"
const step_1_background = createStep(

View File

@@ -1,9 +1,9 @@
import { SchedulerOptions } from "@medusajs/orchestration"
import { SchedulerOptions } from "@medusajs/framework/orchestration"
import {
createStep,
createWorkflow,
StepResponse,
} from "@medusajs/workflows-sdk"
} from "@medusajs/framework/workflows-sdk"
export const createScheduled = (
name: string,

View File

@@ -1,8 +1,8 @@
import {
StepResponse,
createStep,
createWorkflow,
} from "@medusajs/workflows-sdk"
StepResponse,
} from "@medusajs/framework/workflows-sdk"
import { setTimeout } from "timers/promises"
const step_1 = createStep(

View File

@@ -1,8 +1,8 @@
import {
StepResponse,
createStep,
createWorkflow,
} from "@medusajs/workflows-sdk"
StepResponse,
} from "@medusajs/framework/workflows-sdk"
import { setTimeout } from "timers/promises"
const step_1 = createStep(

View File

@@ -2,26 +2,26 @@ import {
TransactionStepTimeoutError,
TransactionTimeoutError,
WorkflowManager,
} from "@medusajs/orchestration"
} from "@medusajs/framework/orchestration"
import {
IWorkflowEngineService,
MedusaContainer,
RemoteQueryFunction,
} from "@medusajs/types"
} from "@medusajs/framework/types"
import {
ContainerRegistrationKeys,
Module,
Modules,
TransactionHandlerType,
TransactionStepState,
} from "@medusajs/utils"
import { WorkflowsModuleService } from "@medusajs/workflow-engine-inmemory/dist/services"
} from "@medusajs/framework/utils"
import { asValue } from "awilix"
import { moduleIntegrationTestRunner } from "medusa-test-utils"
import { setTimeout } from "timers/promises"
import "../__fixtures__"
import { createScheduled } from "../__fixtures__/workflow_scheduled"
import { TestDatabase } from "../utils"
import { WorkflowsModuleService } from "../../src/services"
jest.setTimeout(999900000)

View File

@@ -1,4 +1,4 @@
import { defineMikroOrmCliConfig, Modules } from "@medusajs/utils"
import { defineMikroOrmCliConfig, Modules } from "@medusajs/framework/utils"
import * as entities from "./src/models"
export default defineMikroOrmCliConfig(Modules.WORKFLOW_ENGINE, {

View File

@@ -37,7 +37,6 @@
"orm:cache:clear": " MIKRO_ORM_CLI=./mikro-orm.config.dev.ts mikro-orm cache:clear"
},
"devDependencies": {
"@medusajs/types": "^1.11.16",
"@mikro-orm/cli": "5.9.7",
"cross-env": "^5.2.1",
"jest": "^29.7.0",
@@ -48,9 +47,7 @@
"typescript": "^5.6.2"
},
"dependencies": {
"@medusajs/orchestration": "^0.5.7",
"@medusajs/utils": "^1.11.9",
"@medusajs/workflows-sdk": "^0.1.6",
"@medusajs/framework": "^0.0.1",
"bullmq": "5.13.0",
"ioredis": "^5.4.1"
},

View File

@@ -1,4 +1,4 @@
import { LoaderOptions } from "@medusajs/types"
import { LoaderOptions } from "@medusajs/framework/types"
import { asValue } from "awilix"
import Redis from "ioredis"
import { RedisWorkflowsOptions } from "../types"

View File

@@ -1,4 +1,4 @@
import { TransactionState } from "@medusajs/orchestration"
import { TransactionState } from "@medusajs/framework/orchestration"
import { DALUtils, generateEntityId } from "@medusajs/utils"
import {
BeforeCreate,

View File

@@ -5,25 +5,24 @@ import {
TransactionHandlerType,
TransactionStep,
WorkflowScheduler,
} from "@medusajs/orchestration"
} from "@medusajs/framework/orchestration"
import {
ContainerLike,
Context,
Logger,
MedusaContainer,
} from "@medusajs/types"
} from "@medusajs/framework/types"
import {
InjectSharedContext,
isString,
MedusaContext,
TransactionState,
isString,
} from "@medusajs/utils"
} from "@medusajs/framework/utils"
import {
FlowRunOptions,
MedusaWorkflow,
ReturnWorkflow,
resolveValue,
} from "@medusajs/workflows-sdk"
ReturnWorkflow,
} from "@medusajs/framework/workflows-sdk"
import Redis from "ioredis"
import { ulid } from "ulid"
import type { RedisDistributedTransactionStorage } from "../utils"
@@ -107,7 +106,6 @@ export class WorkflowOrchestratorService {
workflowOrchestratorService: WorkflowOrchestratorService
redisPublisher: Redis
redisSubscriber: Redis
logger: Logger
sharedContainer: MedusaContainer
}) {
this.container_ = sharedContainer

View File

@@ -4,7 +4,7 @@ import {
InternalModuleDeclaration,
ModulesSdkTypes,
WorkflowsSdkTypes,
} from "@medusajs/types"
} from "@medusajs/framework/types"
import {
InjectSharedContext,
MedusaContext,
@@ -13,7 +13,7 @@ import {
import type {
ReturnWorkflow,
UnwrapWorkflowInputDataType,
} from "@medusajs/workflows-sdk"
} from "@medusajs/framework/workflows-sdk"
import { WorkflowExecution } from "@models"
import { WorkflowOrchestratorService } from "@services"

View File

@@ -1,4 +1,4 @@
import { Logger } from "@medusajs/types"
import { Logger } from "@medusajs/framework/types"
import { RedisOptions } from "ioredis"
export type InitializeModuleInjectableDependencies = {

View File

@@ -7,9 +7,13 @@ import {
TransactionCheckpoint,
TransactionOptions,
TransactionStep,
} from "@medusajs/orchestration"
import { Logger, ModulesSdkTypes } from "@medusajs/types"
import { MedusaError, TransactionState, promiseAll } from "@medusajs/utils"
} from "@medusajs/framework/orchestration"
import { Logger, ModulesSdkTypes } from "@medusajs/framework/types"
import {
MedusaError,
promiseAll,
TransactionState,
} from "@medusajs/framework/utils"
import { WorkflowOrchestratorService } from "@services"
import { Queue, Worker } from "bullmq"
import Redis from "ioredis"

View File

@@ -6769,10 +6769,8 @@ __metadata:
version: 0.0.0-use.local
resolution: "@medusajs/workflow-engine-inmemory@workspace:packages/modules/workflow-engine-inmemory"
dependencies:
"@medusajs/orchestration": ^0.5.7
"@medusajs/framework": ^0.0.1
"@medusajs/types": ^1.11.16
"@medusajs/utils": ^1.11.9
"@medusajs/workflows-sdk": ^0.1.6
"@mikro-orm/cli": 5.9.7
cron-parser: ^4.9.0
cross-env: ^5.2.1
@@ -6794,10 +6792,7 @@ __metadata:
version: 0.0.0-use.local
resolution: "@medusajs/workflow-engine-redis@workspace:packages/modules/workflow-engine-redis"
dependencies:
"@medusajs/orchestration": ^0.5.7
"@medusajs/types": ^1.11.16
"@medusajs/utils": ^1.11.9
"@medusajs/workflows-sdk": ^0.1.6
"@medusajs/framework": ^0.0.1
"@mikro-orm/cli": 5.9.7
bullmq: 5.13.0
cross-env: ^5.2.1