fix(cli): 修复cli工具提取问题

wood3n · wood3n · commit 29e1ffac4795 · 2022-02-26T22:31:44.000+08:00
diff --git a/.github/workflows/deploy.yaml b/.github/workflows/deploy.yaml
@@ -17,6 +17,7 @@ jobs:
         uses: actions/setup-node@v2
         with:
           node-version: ${{ matrix.node-version }}
+          registry-url: "https://registry.npmmirror.com"
           cache: "pnpm"
       - name: Install dependencies
         run: pnpm install
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,7 @@
 # compiled output
 dist
 build
+lib
 node_modules
 
 # Logs
@@ -36,3 +37,5 @@ lerna-debug.log*
 !.vscode/launch.json
 !.vscode/extensions.json
 
+# example directory
+examples
diff --git a/.npmrc b/.npmrc
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
   <img src="./public/logo.png" height="150">
 </p>
 <p align="center">
-  <a href="https://badge.fury.io/js/tvt"><img src="https://badge.fury.io/js/tvt.svg" alt="npm version" height="18"></a>
+  <a href="https://badge.fury.io/js/sugar18"><img src="https://badge.fury.io/js/sugar18.svg" alt="npm version" height="18"></a>
   <a href="https://github.com/wood3n/tvt/actions"><img src="https://github.com/wood3n/tvt/actions/workflows/ci.yml/badge.svg" alt="ci Status"></a>
 </p>
 
diff --git a/package.json b/package.json
@@ -24,7 +24,8 @@
     "doc:build": "cd packages/docs && yarn build",
     "doc:serve": "cd packages/docs && yarn serve",
     "serve": "cd packages/coop-backend && pnpm run start",
-    "postgres": "cd packages/coop-backend && pnpm postgres"
+    "postgres": "cd packages/coop-backend && pnpm postgres",
+    "publish": "zx scripts/publish.js"
   },
   "dependencies": {
     "@algolia/client-search": "^4.12.0",
diff --git a/packages/sugar18/lib/index.js b/packages/sugar18/lib/index.js
diff --git a/packages/sugar18/lib/index.js.map b/packages/sugar18/lib/index.js.map
diff --git a/packages/sugar18/package.json b/packages/sugar18/package.json
@@ -1,6 +1,8 @@
 {
   "name": "sugar18",
-  "version": "1.0.0",
+  "version": "1.0.5",
+  "homepage": "https://github.com/wood3n/sweet-i18n",
+  "description": "a nodejs cli tool that transforms chinese characters automaticly",
   "scripts": {
     "build": "node esbuild.js"
   },
diff --git a/packages/sugar18/src/index.ts b/packages/sugar18/src/index.ts
@@ -24,11 +24,11 @@ import packageJson from "../package.json";
       path.resolve(process.cwd(), "package.json"),
       "utf8"
     );
-    const config: { tvt: ConfigOptions } = JSON.parse(localPackageJson);
-    if (config.tvt) {
+    const config: { sugar18: ConfigOptions } = JSON.parse(localPackageJson);
+    if (config.sugar18) {
       options = {
         ...options,
-        ...config.tvt,
+        ...config.sugar18,
       };
     }
   } catch (err) {
@@ -38,17 +38,18 @@ import packageJson from "../package.json";
 
   const program = new Command();
   program
+    .name("sugar18")
     .version(packageJson.version)
-    .name("🤖tvt🤖")
+    .command("trust")
     .option("-i --import", "importExpression's filepath")
     .option("-p --output", "json output filepath")
-    .action((cli) => {
-      if (cli.output) {
-        options.output = cli.output;
+    .action((_, options) => {
+      if (options.output) {
+        options.output = options.output;
       }
 
-      if (cli.import) {
-        options.importPath = cli.import;
+      if (options.import) {
+        options.importPath = options.import;
       }
     })
     .parse(process.argv);
@@ -61,16 +62,13 @@ import packageJson from "../package.json";
 
   let locales = {};
   const outputJSONPath = path.resolve(process.cwd(), options.output!);
-  try {
+  if (fs.existsSync(outputJSONPath)) {
     const content = fs.readFileSync(outputJSONPath, "utf8");
     if (content) {
       locales = JSON.parse(content);
     }
-  } catch (err) {
-    console.log(err);
   }
 
-  const files = glob.sync(options.pattern!, { ignore: options.ignore });
   glob
     .sync(options.pattern!, { ignore: options.ignore })
     .forEach((filename) => {
diff --git a/packages/sugar18/src/transform.ts b/packages/sugar18/src/transform.ts
@@ -1,11 +1,7 @@
 import babelTraverse, { Visitor } from "@babel/traverse";
 import * as t from "@babel/types";
 import path from "path";
-import {
-  ElementNode,
-  SimpleExpressionNode,
-  NodeTypes,
-} from "@vue/compiler-core";
+import { ElementNode, SimpleExpressionNode } from "@vue/compiler-core";
 import { parseVue, parseJS } from "./parse";
 import {
   generateTemplate,
@@ -15,7 +11,7 @@ import {
 } from "./generator";
 import { hasChineseCharacter, logError } from "./utils";
 import { generateHash } from "./hash";
-import { ConfigOptions, FileType } from "./typings";
+import { ConfigOptions, FileType, NodeTypes } from "./typings";
 
 function createDirectiveAttr(type: string, name: string, value: string) {
   // 处理特殊的事件属性
@@ -95,7 +91,7 @@ class Transformer {
           hasChineseCharacter(descriptor?.template?.content)
         ) {
           descriptor.template.content = generateTemplate({
-            ...this.transformTemplate(descriptor?.template.ast),
+            ...this.transformTemplate(descriptor?.template?.ast),
             tag: "",
           });
         }
@@ -165,14 +161,14 @@ class Transformer {
      * https://github.com/vuejs/vue-next/issues/4975
      */
     if (
-      ast.type === NodeTypes.ELEMENT &&
+      ast.type === 1 &&
       /^<+?[^>]+\s+(v-pre)[^>]*>+?[\s\S]*<+?\/[\s\S]*>+?$/gm.test(
         ast.loc.source
       )
     ) {
       ast.props = [
         {
-          type: NodeTypes.DIRECTIVE,
+          type: 7,
           name: "pre",
           // @ts-expect-error 类型“{ source: string; }”缺少类型“SourceLocation”中的以下属性: start, endts(2739)
           loc: {
@@ -188,7 +184,7 @@ class Transformer {
       ast.props = ast.props.map((prop) => {
         // vue指令
         if (
-          prop.type === NodeTypes.DIRECTIVE &&
+          prop.type === 7 &&
           hasChineseCharacter((prop.exp as SimpleExpressionNode)?.content)
         ) {
           const jsCode = generateInterpolation(
@@ -201,10 +197,7 @@ class Transformer {
           );
         }
         // 普通属性
-        if (
-          prop.type === NodeTypes.ATTRIBUTE &&
-          hasChineseCharacter(prop.value?.content)
-        ) {
+        if (prop.type === 6 && hasChineseCharacter(prop.value?.content)) {
           const localeKey = this.extractChar(prop.value!.content);
           return createDirectiveAttr("bind", prop.name, `$t('${localeKey}')`);
         }
@@ -216,17 +209,14 @@ class Transformer {
     if (ast.children.length) {
       // @ts-expect-error 类型“{ type: number; loc: { source: string; }; }”缺少类型“TextCallNode”中的以下属性: content, codegenNodets(2322)
       ast.children = ast.children.map((child) => {
-        if (
-          child.type === NodeTypes.TEXT &&
-          hasChineseCharacter(child.content)
-        ) {
+        if (child.type === 2 && hasChineseCharacter(child.content)) {
           const localeKey = this.extractChar(child.content);
           return createInterpolationNode(`$t('${localeKey}')`);
         }
 
         // 插值语法，插值语法的内容包含在child.content内部，如果匹配到中文字符，则进行JS表达式解析并替换
         if (
-          child.type === NodeTypes.INTERPOLATION &&
+          child.type === 5 &&
           hasChineseCharacter((child.content as SimpleExpressionNode)?.content)
         ) {
           const jsCode = generateInterpolation(
@@ -239,7 +229,7 @@ class Transformer {
         }
 
         // 元素
-        if (child.type === NodeTypes.ELEMENT) {
+        if (child.type === 1) {
           return this.transformTemplate(child);
         }
 
diff --git a/packages/sugar18/src/typings.ts b/packages/sugar18/src/typings.ts
@@ -43,7 +43,7 @@ export interface CommanderOptions {
 /**
  * vue ast节点类型
  */
-export enum NodeTypes {
+export const enum NodeTypes {
   ROOT = 0,
   ELEMENT = 1,
   TEXT = 2,
diff --git a/packages/sugar18/tsconfig.json b/packages/sugar18/tsconfig.json
@@ -83,7 +83,7 @@
     // "preserveValueImports": true,                     /* Preserve unused imported values in the JavaScript output that would otherwise be removed. */
 
     /* Interop Constraints */
-    "isolatedModules": false /* Ensure that each file can be safely transpiled without relying on other imports. */,
+    "isolatedModules": true /* Ensure that each file can be safely transpiled without relying on other imports. */,
     // "allowSyntheticDefaultImports": true /* Allow 'import x from y' when a module doesn't have a default export. */,
     "esModuleInterop": true /* Emit additional JavaScript to ease support for importing CommonJS modules. This enables `allowSyntheticDefaultImports` for type compatibility. */,
     // "preserveSymlinks": true,                         /* Disable resolving symlinks to their realpath. This correlates to the same flag in node. */
diff --git a/scripts/publish.js b/scripts/publish.js
@@ -0,0 +1,10 @@
+void (async function () {
+  try {
+    await $`npm config set registry=https://registry.npmjs.org`;
+    await $`pnpm build`;
+    await $`pnpm publish --access public --filter sugar18 --no-git-checks`;
+  } catch (p) {
+    console.log(`Exit code: ${p.exitCode}`);
+    console.log(`Error: ${p.stderr}`);
+  }
+})();
