feat: merge cli and core

Author: brandonxiang

.eslintrc.js

@@ -0,0 +1,17 @@
+{
+  "parserOptions": {
+    "ecmaVersion": 6,
+    "sourceType": "module"
+  },
+  "parser": "@typescript-eslint/parser",
+  "extends": [
+    // add more generic rule sets here, such as:
+    // 'eslint:recommended',
+    "plugin:prettier/recommended",
+    "plugin:svelte/recommended"
+  ],
+  "rules": {
+    // override/add rules settings here, such as:
+    // 'svelte/rule-name': 'error'
+  }
+}

.eslintrc.json

@@ -11,7 +11,7 @@
       "skipFiles": [
         "<node_internals>/**"
       ],
-      "program": "${workspaceFolder}/packages/cli/tests/multiproto/multiproto.spec.js"
+      "program": "${workspaceFolder}/packages/core/tests/print/enum.spec.js"
     }
   ]
 }

.vscode/launch.json

@@ -11,7 +11,6 @@ A converter to transform from Protobuf to Typescript definition files, which is
 Protobuf is currently used in micro-service for back end. As a front end web developer, you can generate Typescript defination files based on Protobuf in case to develop your web page easily.
 
 - [pbts](./packages/core)
-- [pbts-cli](./packages/cli)
 - [pbts-web](./packages/web)
 - [pbts-vscode](./packages/vscode)
 

README.md

@@ -14,11 +14,11 @@
   ],
   "devDependencies": {
     "@changesets/cli": "^2.14.1",
-    "@typescript-eslint/eslint-plugin": "^5.59.0",
-    "@typescript-eslint/parser": "^5.59.0",
+    "@typescript-eslint/eslint-plugin": "5.59.2",
+    "@typescript-eslint/parser": "5.59.2",
     "svelte": "^3.58.0",
     "eslint": "^8.39.0",
-    "eslint-plugin-svelte3": "^4.0.0",
+    "eslint-plugin-svelte": "2.27.3",
     "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-prettier": "^4.2.1",
     "prettier": "^2.8.7",

package.json

@@ -1,4 +1,10 @@
-# @pbts/core
+# pbts
+
+## 4.0.0
+
+### Major Changes
+
+- merge cli and core repo
 
 ## 3.0.1
 

packages/cli/CHANGELOG.md

@@ -3,18 +3,43 @@
 [![NPM version][npm-image]][npm-url]
 [![npm download][download-image]][download-url]
 
-[npm-image]: https://img.shields.io/npm/v/@pbts/core.svg?style=flat-square
-[npm-url]: https://www.npmjs.com/package/@pbts/core
-[download-image]: https://img.shields.io/npm/dm/@pbts/core.svg?style=flat-square
-[download-url]: https://www.npmjs.com/package/@pbts/core
+[npm-image]: https://img.shields.io/npm/v/pbts.svg?style=flat-square
+[npm-url]: https://www.npmjs.com/package/pbts
+[download-image]: https://img.shields.io/npm/dm/pbts.svg?style=flat-square
+[download-url]: https://www.npmjs.com/package/pbts
 
+It is the cli for pbts. You can convert pb to ts file by command line
 
-The core repo to convert protobuffer to typescript definition file.
+## CLI Usage
 
-## Usage
+### Global Installation
+
+step 1 Install pbts
+
+```shell
+npm i pbts -g
+```
+
+step 2 Convert your protobuffer to Typescript Definition File
+
+```shell
+pbts -i input/app/order.proto -o output/order.ts
+```
+
+### No Installation
+
+Please use npx for short.
+
+```shell
+npx pbts -i packages/cli/__tests__/__fixtures__/input/app/single.proto -o packages/cli/__tests__/__fixtures__/output/single.ts
+```
+
+## Javascript API Usage
+
+## Browser Library Usage
 
 ```javascript
-import { parseProto } from '@pbts/core';
+import { parseProto } from 'pbts/core';
 
 const source = `
 syntax = "proto3";
@@ -34,20 +59,17 @@ interface MyRequest {
 }
 ```
 
-## Parameter
-
-### Case 1 Typescript Definition File (.d.ts)
-
-Default is false.
+## Node Library Usage
 
 ```javascript
-const ts = parseProto(source, {isDefinition: true});
-```
+import { parseProto } from 'pbts';
 
-### Case 2 Request and Response Parameter (Optional)
-
-Default is false.
+const source = `
+syntax = "proto3";
+message MyRequest {
+  string path = 1;
+}
+`;
 
-```javascript
-const ts = parseProto(source, {isParamOptional: true});
+const ts = parseProto(source);
 ```

packages/cli/README.md

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
 import sade from 'sade';
-import convert from './src/index.js';
+import { convertCommand } from './src/index.js';
 //@ts-ignore
 import updater from 'pkg-updater';
 import { readFile } from 'fs/promises';
@@ -21,7 +21,7 @@ updater({
     .example('-i test.proto -o test.ts')
     .option('-i, --input <env>', 'input file path')
     .option('-o, --output <env>', 'output file path')
-    .action(convert);
+    .action(convertCommand);
 
   prog.parse(process.argv);
 });

packages/cli/package.json

@@ -1,6 +1,6 @@
 
-import { ProductInfo } from './order';
-import { ErrorCode } from './order';
+import { ProductInfo } from 'order';
+import { ErrorCode } from 'order';
 
 //Service: AppService
 export type GetProduct = (params: GetProductReq) => Promise<GetProductResp>;