Merge pull request #747 from samchon/features/yarn

Fix #744 - change setup wizard to deprecate `yarn berry`.
samchon · Aug 7, 2023 · a296a8e · a296a8e
2 parents cea1b45 + f5a475d
commit a296a8e
Show file tree

Hide file tree

Showing 8 changed files with 211 additions and 43 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "typia",
-  "version": "4.1.16",
+  "version": "4.2.0",
   "description": "Superfast runtime validators with only one line",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -128,7 +128,7 @@
     "zod": "^3.19.1"
   },
   "stackblitzs": {
-    "startCommand": "npm run prepare && npm run build && npm run build:test && npm run test"
+    "startCommand": "npm run postinstall && npm run build && npm run build:test && npm run test"
   },
   "files": [
     "LICENSE",

diff --git a/packages/typescript-json/package.json b/packages/typescript-json/package.json
@@ -1,6 +1,6 @@
 {
   "name": "typescript-json",
-  "version": "4.1.16",
+  "version": "4.2.0",
   "description": "Superfast runtime validators with only one line",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
@@ -68,13 +68,13 @@
   },
   "homepage": "https://typia.io",
   "dependencies": {
-    "typia": "4.1.16"
+    "typia": "4.2.0"
   },
   "peerDependencies": {
     "typescript": ">= 4.7.4"
   },
   "stackblitzs": {
-    "startCommand": "npm run prepare && npm run build && npm run build:test && npm run test"
+    "startCommand": "npm run postinstall && npm run build && npm run build:test && npm run test"
   },
   "files": [
     "LICENSE",

diff --git a/src/executable/TypiaSetupWizard.ts b/src/executable/TypiaSetupWizard.ts
@@ -40,23 +40,37 @@ export namespace TypiaSetupWizard {
             })(),
         });
         args.project ??= (() => {
-            CommandExecutor.run("npx tsc --init");
+            const runner: string =
+                pack.manager === "npm" ? "npx" : pack.manager;
+            CommandExecutor.run(`${runner} tsc --init`);
             return (args.project = "tsconfig.json");
         })();
 
         // SETUP TRANSFORMER
         await pack.save((data) => {
+            // COMPOSE POSTINSTALL COMMAND
             data.scripts ??= {};
             if (
-                typeof data.scripts.prepare === "string" &&
-                data.scripts.prepare.length
+                typeof data.scripts.postinstall === "string" &&
+                data.scripts.postinstall.trim().length
             ) {
-                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";
+                if (data.scripts.postinstall.indexOf("ts-patch install") === -1)
+                    data.scripts.postinstall =
+                        "ts-patch install && " + data.scripts.postinstall;
+            } else data.scripts.postinstall = "ts-patch install";
+
+            // FOR OLDER VERSIONS
+            if (typeof data.scripts.prepare === "string") {
+                data.scripts.prepare = data.scripts.prepare
+                    .split("&&")
+                    .map((str) => str.trim())
+                    .filter((str) => str.indexOf("ts-patch install") === -1)
+                    .join(" && ");
+                if (data.scripts.prepare.length === 0)
+                    delete data.scripts.prepare;
+            }
         });
-        CommandExecutor.run("npm run prepare");
+        CommandExecutor.run(`${pack.manager} run postinstall`);
 
         // CONFIGURE TYPIA
         await PluginConfigurator.configure(args);
@@ -87,6 +101,7 @@ export namespace TypiaSetupWizard {
                         name: name,
                         message: message,
                         choices: choices,
+                        filter: (value) => value.split(" ")[0],
                     })
                 )[name];
             };
@@ -118,12 +133,13 @@ export namespace TypiaSetupWizard {
 
         // DO CONSTRUCT
         return action(async (options) => {
-            options.manager ??= await select("manager")("Package Manager")([
+            pack.manager = options.manager ??= await select("manager")(
+                "Package Manager",
+            )([
                 "npm" as const,
                 "pnpm" as const,
-                "yarn" as const,
+                "yarn (berry is not supported)" as "yarn",
             ]);
-            pack.manager = options.manager;
             options.project ??= await configure();
 
             if (questioned.value) console.log("");

diff --git a/src/executable/setup/CommandExecutor.ts b/src/executable/setup/CommandExecutor.ts
@@ -3,6 +3,7 @@ import cp from "child_process";
 export namespace CommandExecutor {
     export const run = (str: string): void => {
         console.log(str);
-        cp.execSync(str, { stdio: "ignore" });
+        cp.execSync(str, { stdio: "inherit" });
+        // @todo - rollback to ignore
     };
 }
diff --git a/website/package-lock.json b/website/package-lock.json
diff --git a/website/package.json b/website/package.json
@@ -31,7 +31,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "typescript": "5.1.6",
-    "typia": "^4.1.14"
+    "typia": "^4.2.0"
   },
   "devDependencies": {
     "@trivago/prettier-plugin-sort-imports": "^4.1.1",