chore: remove lerna, add pnpm

qballer · qballer · commit 369236ab97b2 · 2025-01-20T18:03:16.000+02:00
diff --git a/.yarn/releases/yarn-1.22.1.cjs b/.yarn/releases/yarn-1.22.1.cjs
diff --git a/demo/package.json b/demo/package.json
@@ -8,9 +8,9 @@
     "test": "playwright test --config=playwright.config.ts"
   },
   "dependencies": {
-    "@contractual/client": "^0.0.0",
-    "@contractual/fixtures": "^0.0.0",
-    "@contractual/test": "^0.0.0",
+    "@contractual/client": "workspace:*",
+    "@contractual/fixtures": "workspace:*",
+    "@contractual/test": "workspace:*",
     "@playwright/test": "^1.49.1"
   },
   "engines": {
diff --git a/lerna.json b/lerna.json
diff --git a/package.json b/package.json
@@ -22,9 +22,9 @@
     }
   ],
   "scripts": {
-    "build": "yarn lerna run build",
-    "tester": "yarn lerna exec yarn test",
-    "lint": "yarn lerna run lint --parallel",
+    "build": "pnpm -r run build",
+    "tester": "pnpm -r run test",
+    "lint": "pnpm -r run lint",
     "prepare": "husky"
   },
   "dependencies": {
@@ -76,5 +76,5 @@
     "classNameTemplate": "{classname}",
     "titleTemplate": "{title}"
   },
-  "packageManager": "yarn@1.22.1"
+  "packageManager": "pnpm@9.15.4"
 }
diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -36,24 +36,24 @@
     "node": ">=18.12.0"
   },
   "scripts": {
-    "prebuild": "yarn rimraf dist",
-    "build": "yarn tsc -p tsconfig.build.json",
-    "build:watch": "yarn tsc -p tsconfig.build.json --watch",
+    "prebuild": "pnpm rimraf dist",
+    "build": "pnpm tsc -p tsconfig.build.json",
+    "build:watch": "pnpm tsc -p tsconfig.build.json --watch",
     "tester": "jest --coverage --verbose",
-    "lint": "yarn eslint '{src,test}/**/*.ts'"
+    "lint": "pnpm eslint '{src,test}/**/*.ts'"
   },
   "files": [
     "bin",
     "dist",
     "README.md"
   ],
   "dependencies": {
-    "@contractual/generators.client": "^0.0.0",
-    "@contractual/generators.fixtures": "^0.0.0",
+    "@contractual/generators.client": "workspace:*",
+    "@contractual/generators.fixtures": "workspace:*",
     "commander": "^12.1.0"
   },
   "devDependencies": {
-    "@contractual/fixtures": "^0.0.0"
+    "@contractual/fixtures": "workspace:*"
   },
   "publishConfig": {
     "access": "public",
diff --git a/packages/client/package.json b/packages/client/package.json
@@ -44,10 +44,10 @@
     "node": ">=18.12.0"
   },
   "scripts": {
-    "prebuild": "yarn rimraf dist",
-    "build": "yarn tsc -p tsconfig.build.json",
+    "prebuild": "pnpm rimraf dist",
+    "build": "pnpm tsc -p tsconfig.build.json",
     "tester": "jest --coverage --verbose",
-    "lint": "yarn eslint '{src,test}/**/*.ts'"
+    "lint": "pnpm eslint '{src,test}/**/*.ts'"
   },
   "files": [
     "client",
diff --git a/packages/fixtures/package.json b/packages/fixtures/package.json
@@ -39,10 +39,10 @@
     "node": ">=18.12.0"
   },
   "scripts": {
-    "prebuild": "yarn rimraf dist",
-    "build": "yarn tsc -p tsconfig.build.json",
+    "prebuild": "pnpm rimraf dist",
+    "build": "pnpm tsc -p tsconfig.build.json",
     "tester": "jest --coverage --verbose",
-    "lint": "yarn eslint '{src,test}/**/*.ts'"
+    "lint": "pnpm eslint '{src,test}/**/*.ts'"
   },
   "files": [
     "generator",
@@ -51,8 +51,8 @@
     "README.md"
   ],
   "dependencies": {
-    "@contractual/client": "^0.0.0",
-    "@contractual/types.fixtures": "^0.0.0"
+    "@contractual/client": "workspace:*",
+    "@contractual/types.fixtures": "workspace:*"
   },
   "devDependencies": {
     "typescript": "~5.7.2"
diff --git a/packages/generators/client/package.json b/packages/generators/client/package.json
@@ -41,10 +41,10 @@
     "node": ">=18.12.0"
   },
   "scripts": {
-    "prebuild": "yarn rimraf dist",
-    "build": "yarn tsc -p tsconfig.build.json",
+    "prebuild": "pnpm rimraf dist",
+    "build": "pnpm tsc -p tsconfig.build.json",
     "tester": "jest --coverage --verbose",
-    "lint": "yarn eslint '{src,test}/**/*.ts'"
+    "lint": "pnpm eslint '{src,test}/**/*.ts'"
   },
   "files": [
     "client.template.hbs",
@@ -56,7 +56,7 @@
     "@babel/core": "^7.26.0",
     "@babel/generator": "^7.26.3",
     "@babel/preset-typescript": "^7.26.0",
-    "@contractual/client": "^0.0.0",
+    "@contractual/client": "workspace:*",
     "handlebars": "^4.7.8",
     "openapi-types": "^12.1.3",
     "openapi-zod-client": "^1.18.2",
diff --git a/packages/generators/fixtures/package.json b/packages/generators/fixtures/package.json
@@ -41,11 +41,11 @@
     "node": ">=18.12.0"
   },
   "scripts": {
-    "prebuild": "yarn rimraf dist",
-    "build": "yarn tsc -p tsconfig.build.json",
-    "build:watch": "yarn tsc -p tsconfig.build.json --watch",
+    "prebuild": "pnpm rimraf dist",
+    "build": "pnpm tsc -p tsconfig.build.json",
+    "build:watch": "pnpm tsc -p tsconfig.build.json --watch",
     "tester": "jest --coverage --verbose",
-    "lint": "yarn eslint '{src,test}/**/*.ts'"
+    "lint": "pnpm eslint '{src,test}/**/*.ts'"
   },
   "files": [
     "dist",
@@ -55,10 +55,10 @@
     "@babel/core": "^7.26.0",
     "@babel/generator": "^7.26.3",
     "@babel/preset-typescript": "^7.26.0",
-    "@contractual/fixtures": "^0.0.0"
+    "@contractual/fixtures": "workspace:*",
+    "typescript": ">=5.x"
   },
   "peerDependencies": {
-    "typescript": ">=5.x"
   },
   "publishConfig": {
     "access": "public",
diff --git a/packages/generators/openapi/package.json b/packages/generators/openapi/package.json
@@ -41,11 +41,11 @@
     "node": ">=18.12.0"
   },
   "scripts": {
-    "prebuild": "yarn rimraf dist",
-    "build": "yarn tsc -p tsconfig.build.json",
-    "build:watch": "yarn tsc -p tsconfig.build.json --watch",
+    "prebuild": "pnpm rimraf dist",
+    "build": "pnpm tsc -p tsconfig.build.json",
+    "build:watch": "pnpm tsc -p tsconfig.build.json --watch",
     "tester": "jest --coverage --verbose",
-    "lint": "yarn eslint '{src,test}/**/*.ts'"
+    "lint": "pnpm eslint '{src,test}/**/*.ts'"
   },
   "files": [
     "dist",
diff --git a/packages/generators/openapi/src/generator.ts b/packages/generators/openapi/src/generator.ts
@@ -32,7 +32,7 @@ export async function generateSpecification() {
       ignoreDeprecated: true,
     }
   )
-    .then((program) => {
+    .then(() => {
       // console.log(program.diagnostics);
       console.log('Specifi/**/cation generated');
     })
diff --git a/packages/test/package.json b/packages/test/package.json
@@ -34,19 +34,19 @@
     "node": ">=18.12.0"
   },
   "scripts": {
-    "prebuild": "yarn rimraf dist",
-    "build": "yarn tsc -p tsconfig.build.json",
+    "prebuild": "pnpm rimraf dist",
+    "build": "pnpm tsc -p tsconfig.build.json",
     "tester": "jest --coverage --verbose",
-    "lint": "yarn eslint '{src,test}/**/*.ts'"
+    "lint": "pnpm eslint '{src,test}/**/*.ts'"
   },
   "files": [
     "dist",
     "README.md"
   ],
   "dependencies": {
-    "@contractual/client": "^0.0.0",
-    "@contractual/fixtures": "^0.0.0",
-    "@contractual/types.test": "^0.0.0",
+    "@contractual/client": "workspace:*",
+    "@contractual/fixtures": "workspace:*",
+    "@contractual/types.test": "workspace:*",
     "@playwright/test": "^1.49.1"
   },
   "publishConfig": {
diff --git a/packages/test/tsconfig.json b/packages/test/tsconfig.json
@@ -1,3 +1,4 @@
 {
-  "extends": "../../tsconfig.json"
+  "extends": "../../tsconfig.json",
+  "include": ["src/**/*.ts", "test/**/*.ts"]  
 }
diff --git a/packages/types/fixtures/index.d.ts b/packages/types/fixtures/index.d.ts
@@ -0,0 +1,8 @@
+import type { ApiClientInput, ApiOperationToClientMethod } from '@contractual/client';
+import type { ApiOperations } from '@contractual/client/client';
+export type FixturesBuilder<TOperation extends keyof typeof ApiOperations> = Record<string, FixtureCallback<TOperation>>;
+export type FixtureCallback<TOperation extends keyof typeof ApiOperations> = (params: {
+    extend: ExtendFunction<TOperation>;
+}) => ApiClientInput<ApiOperationToClientMethod<TOperation>>;
+export type ExtendFunction<TOperation extends keyof typeof ApiOperations> = (fixtures: FixturesBuilder<TOperation>) => ApiClientInput<ApiOperationToClientMethod<TOperation>>;
+export type GeneratedFixtures<TOperation extends keyof typeof ApiOperations> = Record<string, ApiClientInput<ApiOperationToClientMethod<TOperation>>>;
diff --git a/packages/types/fixtures/package.json b/packages/types/fixtures/package.json
@@ -21,13 +21,13 @@
     }
   ],
   "scripts": {
-    "prebuild": "yarn rimraf dist",
-    "build": "yarn tsc -p tsconfig.build.json",
+    "prebuild": "pnpm rimraf dist",
+    "build": "pnpm tsc -p tsconfig.build.json",
     "tester": "jest --passWithNoTests",
-    "lint": "yarn eslint 'index.ts'"
+    "lint": "pnpm eslint 'index.ts'"
   },
   "dependencies": {
-    "@contractual/client": "^0.0.0"
+    "@contractual/client": "workspace:*"
   },
   "files": [
     "index.d.ts"
diff --git a/packages/types/test/package.json b/packages/types/test/package.json
@@ -21,17 +21,17 @@
     }
   ],
   "dependencies": {
-    "@contractual/client": "^0.0.0",
-    "@contractual/types.fixtures": "^0.0.0"
+    "@contractual/client": "workspace:*",
+    "@contractual/types.fixtures": "workspace:*"
   },
   "engines": {
     "node": ">=18.12.0"
   },
   "scripts": {
-    "prebuild": "yarn rimraf dist",
-    "build": "yarn tsc -p tsconfig.build.json",
+    "prebuild": "pnpm rimraf dist",
+    "build": "pnpm tsc -p tsconfig.build.json",
     "tester": "jest --passWithNoTests",
-    "lint": "yarn eslint '{src,test}/**/*.ts'"
+    "lint": "pnpm eslint '{src,test}/**/*.ts'"
   },
   "files": [
     "dist",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
