Merge pull request #48 from Ubugeeei/39-tweak-cli-options

tweak: #39 🔧 if cjs option is true, ts option is ignored
ublib · Oct 17, 2023 · 7846360 · 7846360
2 parents 1307b5c + a16a603
commit 7846360
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/examples/cli/package.json b/examples/cli/package.json
@@ -6,7 +6,7 @@
     "datagen": "node ../../packages/cli/bin/bin.js datagen",
     "datagen:ts": "pnpm run datagen -d=dataset -o=out/data.ts",
     "datagen:js": "pnpm run datagen -d=dataset -o=out/data.js --ts=false",
-    "datagen:cjs": "pnpm run datagen -d=dataset -o=out/data.cjs --ts=false --cjs",
+    "datagen:cjs": "pnpm run datagen -d=dataset -o=out/data.cjs --cjs",
     "datagen:named": "pnpm run datagen -d=dataset -o=out/named.ts --n=MY_TEGAKI_DATA"
   },
   "author": "Ubugeeei <ubuge1122@gmail.com>",

diff --git a/packages/cli/src/cmd/datagen/index.ts b/packages/cli/src/cmd/datagen/index.ts
@@ -31,12 +31,12 @@ export const datagen = defineCommand({
       default: "TEGAKI_DATA_SET",
     },
     ts: {
-      description: "use typescript",
+      description: "use typescript. if cjs option is true, this option is ignored",
       type: "boolean",
       default: true,
     },
     cjs: {
-      description: "use commonjs. if ts option is true, this option is ignored",
+      description: "use commonjs.",
       type: "boolean",
       default: false,
     },
@@ -59,10 +59,11 @@ export const datagen = defineCommand({
 
 type CodegenOptions = { ts: boolean; cjs: boolean; exportName: string };
 const codegen = (parsed: TegakiStroke[], { ts, cjs, exportName }: CodegenOptions): string => {
+  const asTs = ts && !cjs;
   const code = `/// This file is generated by tegaki-cli. Do not edit this file directly
-${ts ? 'import type { TegakiStroke } from "@tegaki/shared";' : ""}
+${asTs ? 'import type { TegakiStroke } from "@tegaki/shared";' : ""}
 ${cjs ? `module.exports.${exportName}` : `export const ${exportName}`}${
-    ts ? ": Array<TegakiStroke>" : ""
+    asTs ? ": Array<TegakiStroke>" : ""
   } = ${JSON.stringify(parsed)};
 `;
   return code;