Skip to content

Adapt new cli command npx typia patch. #696

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
samchon merged 1 commit into from
Nov 26, 2023
Merged

Adapt new cli command npx typia patch. #696

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions benchmark/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"build": "rimraf bin && tsc",
"generate": "ts-node src/generate",
"start": "npm run build && node bin",
"prepare": "ts-patch install"
"prepare": "ts-patch install && typia patch"
},
"repository": {
"type": "git",
Expand All @@ -24,8 +24,8 @@
},
"homepage": "https://nestia.io",
"dependencies": {
"@nestia/core": "^2.2.1-dev.20231012",
"typia": "^5.2.6"
"@nestia/core": "^2.4.0",
"typia": "^5.3.0"
},
"devDependencies": {
"@trivago/prettier-plugin-sort-imports": "^4.1.1",
Expand All @@ -47,6 +47,6 @@
"ts-node": "^10.9.1",
"ts-patch": "^3.0.2",
"tstl": "^2.5.13",
"typescript": "^5.2.2"
"typescript": "^5.3.2"
}
}
8 changes: 4 additions & 4 deletions packages/cli/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "nestia",
"version": "5.0.3",
"version": "5.1.0",
"description": "Nestia CLI tool",
"main": "bin/index.js",
"bin": {
Expand Down Expand Up @@ -37,14 +37,14 @@
"inquirer": "^8.2.5"
},
"devDependencies": {
"@nestia/core": "^2.3.4",
"@nestia/sdk": "^2.3.4",
"@nestia/core": "^2.4.0",
"@nestia/sdk": "^2.4.0",
"@trivago/prettier-plugin-sort-imports": "^4.1.1",
"@types/inquirer": "^9.0.3",
"@types/node": "^18.11.16",
"prettier": "^2.8.7",
"rimraf": "^3.0.2",
"typescript": "^5.2.2"
"typescript": "^5.3.2"
},
"files": [
"bin",
Expand Down
24 changes: 20 additions & 4 deletions packages/cli/src/NestiaSetupWizard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ export namespace NestiaSetupWizard {
// INSTALL TYPESCRIPT COMPILERS
pack.install({ dev: true, modulo: "ts-patch", version: "latest" });
pack.install({ dev: true, modulo: "ts-node", version: "latest" });
pack.install({ dev: true, modulo: "typescript", version: "5.2.2" });
pack.install({ dev: true, modulo: "typescript", version: "5.3.2" });
args.project ??= (() => {
const runner: string =
pack.manager === "npm" ? "npx" : pack.manager;
Expand All @@ -34,10 +34,24 @@ export namespace NestiaSetupWizard {
typeof data.scripts.prepare === "string" &&
data.scripts.prepare.trim().length
) {
if (data.scripts.prepare.indexOf("ts-patch install") === -1)
if (
data.scripts.prepare.indexOf("ts-patch install") === -1 &&
data.scripts.prepare.indexOf("typia patch") === -1
)
data.scripts.prepare =
"ts-patch install && typia patch && " +
data.scripts.prepare;
else if (
data.scripts.prepare.indexOf("ts-patch install") === -1
)
data.scripts.prepare =
"ts-patch install && " + data.scripts.prepare;
} else data.scripts.prepare = "ts-patch install";
else if (data.scripts.prepare.indexOf("typia patch") === -1)
data.scripts.prepare = data.scripts.prepare.replace(
"ts-patch install",
"ts-patch install && typia patch",
);
} else data.scripts.prepare = "ts-patch install && typia patch";

// FOR OLDER VERSIONS
if (typeof data.scripts.postinstall === "string") {
Expand All @@ -50,13 +64,15 @@ export namespace NestiaSetupWizard {
delete data.scripts.postinstall;
}
});
CommandExecutor.run(`${pack.manager} run prepare`);

// INSTALL AND CONFIGURE NESTIA
pack.install({ dev: false, modulo: "@nestia/core", version: "latest" });
pack.install({ dev: true, modulo: "@nestia/e2e", version: "latest" });
pack.install({ dev: true, modulo: "@nestia/sdk", version: "latest" });
pack.install({ dev: true, modulo: "nestia", version: "latest" });
pack.install({ dev: false, modulo: "typia" });

await PluginConfigurator.configure(args);
CommandExecutor.run(`${pack.manager} run prepare`);
}
}
2 changes: 1 addition & 1 deletion packages/cli/src/internal/PackageManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export class PackageManager {
public install(props: {
dev: boolean;
modulo: string;
version: `latest` | `${number}.${number}.${number}`;
version?: `latest` | `next` | `${number}.${number}.${number}`;
}): boolean {
const middle: string =
this.manager === "yarn"
Expand Down
16 changes: 8 additions & 8 deletions packages/core/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nestia/core",
"version": "2.3.12",
"version": "2.4.0",
"description": "Super-fast validation decorators of NestJS",
"main": "lib/index.js",
"typings": "lib/index.d.ts",
Expand All @@ -12,7 +12,7 @@
"package:latest": "npm run build && npm publish --access public",
"package:next": "npm run package:latest -- --tag next",
"prettier": "prettier ./**/*.ts --write",
"prepare": "ts-patch install"
"prepare": "ts-patch install && typia patch"
},
"repository": {
"type": "git",
Expand All @@ -34,7 +34,7 @@
},
"homepage": "https://nestia.io",
"dependencies": {
"@nestia/fetcher": "^2.3.12",
"@nestia/fetcher": "^2.4.0",
"@nestjs/common": ">=7.0.1",
"@nestjs/core": ">=7.0.1",
"@nestjs/platform-express": ">=7.0.1",
Expand All @@ -44,19 +44,19 @@
"raw-body": ">=2.0.0",
"reflect-metadata": ">=0.1.12",
"rxjs": ">=6.0.0",
"typia": "^5.2.6"
"typia": "^5.3.0"
},
"peerDependencies": {
"@nestia/fetcher": ">=2.3.12",
"@nestia/fetcher": ">=2.4.0",
"@nestjs/common": ">=7.0.1",
"@nestjs/core": ">=7.0.1",
"@nestjs/platform-express": ">=7.0.1",
"@nestjs/platform-fastify": ">=7.0.1",
"raw-body": ">=2.0.0",
"reflect-metadata": ">=0.1.12",
"rxjs": ">=6.0.0",
"typescript": ">=4.8.0 <5.3.0",
"typia": ">=5.2.6 <6.0.0"
"typescript": ">=4.8.0 <5.4.0",
"typia": ">=5.3.0 <6.0.0"
},
"devDependencies": {
"@trivago/prettier-plugin-sort-imports": "^4.0.0",
Expand All @@ -76,7 +76,7 @@
"ts-node": "^10.9.1",
"ts-patch": "^3.0.2",
"tstl": "^2.5.13",
"typescript": "^5.2.2",
"typescript": "^5.3.2",
"typescript-transform-paths": "^3.4.6"
},
"files": [
Expand Down
6 changes: 3 additions & 3 deletions packages/e2e/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"dev": "npm run build -- --watch",
"eslint": "eslint src",
"prettier": "prettier --write ./src/**/*.ts",
"prepare": "ts-patch install",
"prepare": "ts-patch install && typia patch",
"test": "node lib/test"
},
"repository": {
Expand Down Expand Up @@ -39,8 +39,8 @@
"rimraf": "^4.1.2",
"ts-node": "^10.9.1",
"ts-patch": "^3.0.2",
"typescript": "^5.2.2",
"typia": "^5.2.6"
"typescript": "^5.3.2",
"typia": "^5.3.0"
},
"dependencies": {
"chalk": "^4.1.2",
Expand Down
4 changes: 2 additions & 2 deletions packages/fetcher/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nestia/fetcher",
"version": "2.3.12",
"version": "2.4.0",
"description": "Fetcher library of Nestia SDK",
"main": "lib/index.js",
"typings": "lib/index.d.ts",
Expand Down Expand Up @@ -32,7 +32,7 @@
"@typescript-eslint/parser": "^5.46.1",
"prettier": "^2.8.1",
"rimraf": "^3.0.2",
"typescript": "^5.2.2"
"typescript": "^5.3.2"
},
"peerDependencies": {
"typescript": ">= 4.8.0"
Expand Down
4 changes: 2 additions & 2 deletions packages/migrate/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@
"ts-node": "^10.9.1",
"ts-patch": "^3.0.2",
"tstl": "^2.5.13",
"typescript": "^5.2.2",
"typescript": "^5.3.2",
"typescript-transform-paths": "^3.4.6"
},
"dependencies": {
"typia": "^5.2.6"
"typia": "^5.3.0"
},
"files": [
"lib",
Expand Down
14 changes: 7 additions & 7 deletions packages/sdk/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@nestia/sdk",
"version": "2.3.12",
"version": "2.4.0",
"description": "Nestia SDK and Swagger generator",
"main": "lib/index.js",
"typings": "lib/index.d.ts",
Expand All @@ -13,7 +13,7 @@
"eslint": "eslint ./**/*.ts",
"package:latest": "npm run build && npm publish --access public",
"package:next": "npm run package:latest -- --tag next",
"prepare": "ts-patch install",
"prepare": "ts-patch install && typia patch",
"prettier": "prettier --write ./**/*.ts"
},
"repository": {
Expand All @@ -35,7 +35,7 @@
},
"homepage": "https://nestia.io",
"dependencies": {
"@nestia/fetcher": "^2.3.12",
"@nestia/fetcher": "^2.4.0",
"cli": "^1.0.1",
"get-function-location": "^2.0.0",
"glob": "^7.2.0",
Expand All @@ -44,16 +44,16 @@
"tsconfck": "^2.0.1",
"tsconfig-paths": "^4.1.1",
"tstl": "^2.5.13",
"typia": "^5.2.6"
"typia": "^5.3.0"
},
"peerDependencies": {
"@nestia/fetcher": ">=2.3.12",
"@nestia/fetcher": ">=2.4.0",
"@nestjs/common": ">=7.0.1",
"@nestjs/core": ">=7.0.1",
"reflect-metadata": ">=0.1.12",
"ts-node": ">=10.6.0",
"typescript": ">=4.8.0 <5.3.0",
"typia": ">=5.2.6 <6.0.0"
"typescript": ">=4.8.0 <5.4.0",
"typia": ">=5.3.0 <6.0.0"
},
"devDependencies": {
"@nestia/e2e": "^0.3.7",
Expand Down
6 changes: 3 additions & 3 deletions test/features/distribute-assert/packages/api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build:sdk": "rimraf ../../src/api/functional && cd ../.. && npx nestia sdk && cd packages/api",
"compile": "rimraf lib && tsc",
"deploy": "npm run build && npm publish",
"prepare": "ts-patch install"
"prepare": "ts-patch install && typia patch"
},
"repository": {
"type": "git",
Expand All @@ -30,10 +30,10 @@
"rimraf": "^5.0.5",
"ts-node": "^10.9.1",
"ts-patch": "^3.0.2",
"typescript": "^5.2.2"
"typescript": "^5.3.2"
},
"dependencies": {
"@nestia/fetcher": "file:../../../../../packages/fetcher/nestia-fetcher-0.0.0-dev.20991231.tgz",
"typia": "^5.2.6"
"typia": "^5.3.0"
}
}
6 changes: 3 additions & 3 deletions test/features/distribute-json/packages/api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build:sdk": "rimraf ../../src/api/functional && cd ../.. && npx nestia sdk && cd packages/api",
"compile": "rimraf lib && tsc",
"deploy": "npm run build && npm publish",
"prepare": "ts-patch install"
"prepare": "ts-patch install && typia patch"
},
"repository": {
"type": "git",
Expand All @@ -30,10 +30,10 @@
"rimraf": "^5.0.5",
"ts-node": "^10.9.1",
"ts-patch": "^3.0.2",
"typescript": "^5.2.2"
"typescript": "^5.3.2"
},
"dependencies": {
"@nestia/fetcher": "file:../../../../../packages/fetcher/nestia-fetcher-0.0.0-dev.20991231.tgz",
"typia": "^5.2.6"
"typia": "^5.3.0"
}
}
6 changes: 3 additions & 3 deletions test/features/distribute/packages/api/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"build:sdk": "rimraf ../../src/api/functional && cd ../.. && npx nestia sdk && cd packages/api",
"compile": "rimraf lib && tsc",
"deploy": "npm run build && npm publish",
"prepare": "ts-patch install"
"prepare": "ts-patch install && typia patch"
},
"repository": {
"type": "git",
Expand All @@ -30,10 +30,10 @@
"rimraf": "^5.0.5",
"ts-node": "^10.9.1",
"ts-patch": "^3.0.2",
"typescript": "^5.2.2"
"typescript": "^5.3.2"
},
"dependencies": {
"@nestia/fetcher": "file:../../../../../packages/fetcher/nestia-fetcher-0.0.0-dev.20991231.tgz",
"typia": "^5.2.6"
"typia": "^5.3.0"
}
}
12 changes: 6 additions & 6 deletions test/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
{
"private": true,
"name": "@nestia/test",
"version": "2.3.12",
"version": "2.4.0",
"description": "Test program of Nestia",
"main": "index.js",
"scripts": {
"clean": "npm uninstall @nestia/core @nestia/e2e @nestia/fetcher @nestia/sdk nestia",
"errors": "node executable/errors",
"generate": "node executable/generate",
"start": "node executable/start",
"prepare": "ts-patch install"
"prepare": "ts-patch install && typia patch"
},
"repository": {
"type": "git",
Expand All @@ -34,12 +34,12 @@
"ts-patch": "v3.0.2",
"typescript": "^5.3.0-beta",
"typescript-transform-paths": "^3.4.4",
"typia": "^5.2.6",
"typia": "^5.3.0",
"uuid": "^9.0.0",
"nestia": "^4.5.0",
"@nestia/core": "^2.3.12",
"@nestia/core": "^2.4.0",
"@nestia/e2e": "^0.3.6",
"@nestia/fetcher": "^2.3.12",
"@nestia/sdk": "^2.3.12"
"@nestia/fetcher": "^2.4.0",
"@nestia/sdk": "^2.4.0"
}
}
2 changes: 1 addition & 1 deletion website/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@
"gh-pages": "^5.0.0",
"next-sitemap": "^4.0.7",
"rimraf": "^5.0.0",
"typescript": "^4.9.3"
"typescript": "^5.3.2"
}
}
Loading