Skip to content

Commit

Permalink
refactor(types): Align configuration and fixes (#9240)
Browse files Browse the repository at this point in the history
RESOLVES FRMW-2712

**What**
Refactor types packages to use the latest configuration of typescript and fixes issues
  • Loading branch information
adrien2p authored Sep 23, 2024
1 parent 94e07c8 commit 8ec323b
Show file tree
Hide file tree
Showing 12 changed files with 42 additions and 198 deletions.
15 changes: 11 additions & 4 deletions packages/core/types/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
module.exports = {
moduleNameMapper: {},
transform: {
"^.+\\.[jt]s$": [
"@swc/jest",
{
jsc: {
parser: { syntax: "typescript", decorators: true },
transform: { decoratorMetadata: true },
parser: {
syntax: "typescript",
decorators: true,
},
transform: {
useDefineForClassFields: false,
legacyDecorator: true,
decoratorMetadata: true,
},
target: "ES2021",
},
},
],
},
testPathIgnorePatterns: [`dist/`, `node_modules/`],
testEnvironment: `node`,
moduleFileExtensions: [`js`, `ts`],
modulePathIgnorePatterns: ["dist/"],
}
22 changes: 14 additions & 8 deletions packages/core/types/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,36 +4,42 @@
"description": "Medusa Types definition",
"main": "dist/index.js",
"types": "dist/index.d.ts",
"export": {
".": "./dist/index.js"
},
"repository": {
"type": "git",
"url": "https://github.com/medusajs/medusa",
"directory": "packages/types"
},
"engines": {
"node": ">=16"
"node": ">=20"
},
"publishConfig": {
"access": "public"
},
"files": [
"dist"
"dist",
"!dist/**/__tests__",
"!dist/**/__fixtures__",
"!dist/**/__mocks__"
],
"author": "Medusa",
"license": "MIT",
"scripts": {
"build": "rimraf dist && tsc --build",
"watch": "tsc --build --watch",
"test": "exit 0"
},
"devDependencies": {
"awilix": "^8.0.1",
"bignumber.js": "^9.1.2",
"cross-env": "^5.2.1",
"expect-type": "^0.20.0",
"ioredis": "^5.4.1",
"rimraf": "^5.0.1",
"typescript": "^5.1.6",
"typescript": "^5.6.2",
"vite": "^5.2.11",
"winston": "^3.8.2"
},
"scripts": {
"build": "rimraf dist && tsc -p tsconfig.spec.json --noEmit && tsc -p tsconfig.build.json",
"watch": "tsc --build --watch",
"test": "exit 0"
}
}
144 changes: 0 additions & 144 deletions packages/core/types/src/common/nested-pick.ts

This file was deleted.

8 changes: 6 additions & 2 deletions packages/core/types/src/http/claim/common.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,12 @@
import { OperatorMap } from "../../dal"
import { ClaimReason, OrderClaimType, ReturnDTO } from "../../order"
import { ClaimReason, OrderClaimType } from "../../order"
import { BigNumberRawValue } from "../../totals"
import { FindParams } from "../common"
import { BaseOrder, BaseOrderShippingMethod, BaseOrderTransaction } from "../order/common"
import {
BaseOrder,
BaseOrderShippingMethod,
BaseOrderTransaction,
} from "../order/common"
import { BaseReturn } from "../return/common"

export interface BaseClaimItem {
Expand Down
2 changes: 1 addition & 1 deletion packages/core/types/src/http/collection/store/entities.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
import { BaseCollection, BaseCollectionListParams } from "../common"
import { BaseCollection } from "../common"

export interface StoreCollection extends BaseCollection {}
1 change: 0 additions & 1 deletion packages/core/types/src/http/payment/store/queries.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import {
BasePaymentCollectionFilters,
BasePaymentProviderFilters,
BasePaymentSessionFilters,
} from "../common"

Expand Down
15 changes: 7 additions & 8 deletions packages/core/types/src/http/region/admin/queries.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import { BaseFilterable, OperatorMap } from "../../../dal";
import { FindParams } from "../../common";
import {
BaseRegionCountryFilters,
BaseRegionFilters,
} from "../common"
import { BaseFilterable, OperatorMap } from "../../../dal"
import { FindParams } from "../../common"
import { BaseRegionCountryFilters } from "../common"

export interface AdminRegionFilters extends FindParams, BaseFilterable<AdminRegionFilters> {
export interface AdminRegionFilters
extends FindParams,
BaseFilterable<AdminRegionFilters> {
q?: string
id?: string | string[]
currency_code?: string | string[]
Expand All @@ -14,4 +13,4 @@ export interface AdminRegionFilters extends FindParams, BaseFilterable<AdminRegi
updated_at?: OperatorMap<string>
deleted_at?: OperatorMap<string>
}
export interface AdminRegionCountryFilters extends BaseRegionCountryFilters {}
export interface AdminRegionCountryFilters extends BaseRegionCountryFilters {}
10 changes: 0 additions & 10 deletions packages/core/types/src/workflow/order/create-shipment.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,3 @@ export interface CreateOrderShipmentWorkflowInput {
no_notification?: boolean
metadata?: MetadataType
}

interface CreateOrderDeliveryItem {
id: string
quantity: BigNumberInput
}

export interface CreateOrderDeliveryWorkflowInput {
order_id: string
fulfillment_id: string
}
11 changes: 0 additions & 11 deletions packages/core/types/tsconfig.build.json

This file was deleted.

2 changes: 2 additions & 0 deletions packages/core/types/tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@
"moduleResolution": "node",
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"noUnusedLocals": true,
"forceConsistentCasingInFileNames": true,
"sourceMap": true,
"noImplicitReturns": true,
"strictNullChecks": true,
Expand Down
8 changes: 0 additions & 8 deletions packages/core/types/tsconfig.spec.json

This file was deleted.

2 changes: 1 addition & 1 deletion yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -6618,7 +6618,7 @@ __metadata:
expect-type: ^0.20.0
ioredis: ^5.4.1
rimraf: ^5.0.1
typescript: ^5.1.6
typescript: ^5.6.2
vite: ^5.2.11
winston: ^3.8.2
languageName: unknown
Expand Down

0 comments on commit 8ec323b

Please sign in to comment.