@jimengio/router-code-generator - npm Package Compare versions

Comparing version 0.2.5 to 0.2.6-a1

.github/workflows/npm-publish.yaml

+name: npm publish
+
+on:
+  release:
+    types: [created]
+
+jobs:
+  publish-npm:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v1
+        with:
+          node-version: 12
+          registry-url: https://registry.npmjs.org/
+
+      - name: Get yarn cache
+        id: yarn-cache
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/cache@v1
+        with:
+          path: ${{ steps.yarn-cache.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - run: yarn && yarn compile && npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{secrets.npm_token}}

.github/workflows/test.yaml

+name: Run tests
+
+on:
+  pull_request: {}
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Use Node.js
+        uses: actions/setup-node@v1
+
+      - name: Get yarn cache
+        id: yarn-cache
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/cache@v1
+        with:
+          path: ${{ steps.yarn-cache.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - run: yarn && yarn test && yarn compile

.github/workflows/upload.yaml

+name: Upload Assets
+
+on:
+  push: {}
+
+jobs:
+  upload-assets:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+
+      - name: Use Node.js
+        uses: actions/setup-node@v1
+
+      - name: Get yarn cache
+        id: yarn-cache
+        run: echo "::set-output name=dir::$(yarn cache dir)"
+
+      - uses: actions/cache@v1
+        with:
+          path: ${{ steps.yarn-cache.outputs.dir }}
+          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.os }}-yarn-
+
+      - run: yarn && yarn release
+        name: Build web assets
+
+      - name: Deploy to server
+        id: deploy
+        uses: Pendect/action-rsyncer@v1.1.0
+        env:
+          DEPLOY_KEY: ${{secrets.rsync_private_key}}
+        with:
+          flags: "-avzr --progress"
+          options: ""
+          ssh_options: ""
+          src: "dist/*"
+          dest: "[e-mail]:/web-assets/repo/${{ github.repository }}"
+
+      - name: Display status from deploy
+        run: echo "${{ steps.deploy.outputs.status }}"

lib/generator.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const lodash_1 = require("lodash");
 let pkg = require("../package.json");
@@ -58,3 +59,3 @@ let genTypeName = "GenRouterTypeTree";
 }
-function generateField(rule, basePath, trackQueryTypes) {
+function generateField(rule, basePath, trackQueryTypes, parentQueries) {
     let nameString = JSON.stringify(rule.name || rule.path || "");
@@ -64,7 +65,8 @@ let currentPath = `${basePath}/${rule.path}`;
     let propName = convertPathToMethodName(rule.path);
-    let fieldsInString = (rule.next || []).map((childRule) => generateField(childRule, currentPath, trackQueryTypes)).join("\n");
+    let queries = lodash_1.union(rule.queries, parentQueries);
+    let fieldsInString = (rule.next || []).map((childRule) => generateField(childRule, currentPath, trackQueryTypes, queries)).join("\n");
     let paramsList = convertPathToParams(currentPath);
     let pathInString;
     // for queries=[], allow generating queries:{} for use cases such as `queries as any`
-    if (rule.queries == null) {
+    if (rule.queries == null && lodash_1.isEmpty(parentQueries)) {
         pathInString = "`" + convertVariables(currentPath) + "`";
@@ -81,6 +83,6 @@ let resultObj = ` {
     }
-    pathInString = "`" + convertVariables(currentPath) + getQueryPath(rule.queries) + "`";
+    pathInString = "`" + convertVariables(currentPath) + getQueryPath(queries) + "`";
     let queryName = path2QueryName(currentPath);
-    if (rule.queries.length > 0) {
-        trackQueryTypes(queryName, rule.queries);
+    if (queries.length > 0) {
+        trackQueryTypes(queryName, queries);
     }
@@ -108,3 +110,3 @@ else {
     };
-    let fieldsInString = rules.map((y) => generateField(y, "", trackQueryTypes)).join("\n");
+    let fieldsInString = rules.map((y) => generateField(y, "", trackQueryTypes, [])).join("\n");
     let queryTypesInString = queryTypes
@@ -111,0 +113,0 @@ .map(([name, queries]) => {

lib/generator.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"generator.js","sourceRoot":"","sources":["../src/generator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generator.js","sourceRoot":"","sources":["../src/generator.ts"],"names":[],"mappings":"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"}

package.json

 {
   "name": "@jimengio/router-code-generator",
-  "version": "0.2.5",
+  "version": "0.2.6-a1",
   "description": "",
@@ -15,4 +15,3 @@ "main": "./lib/generator.js",
     "upload": "rsync -avr --progress dist/ fe.jimu.io:~/repo/jimengio/router-code-generator",
-    "test": "jest",
-    "prepare": "yarn test && yarn compile"
+    "test": "jest"
   },
@@ -22,37 +21,37 @@ "keywords": [],
   "devDependencies": {
-    "@jimengio/flex-styles": "^0.1.5",
-    "@jimengio/ruled-router": "^0.2.15",
+    "@jimengio/flex-styles": "^0.1.6",
+    "@jimengio/ruled-router": "^0.2.19",
     "@types/history": "^4.7.3",
-    "@types/jest": "^24.0.18",
-    "@types/lodash": "^4.14.144",
-    "@types/node": "^12.11.1",
+    "@types/jest": "^24.0.22",
+    "@types/lodash": "^4.14.145",
+    "@types/node": "^12.12.6",
     "@types/query-string": "^6.3.0",
-    "@types/react": "^16.9.5",
-    "@types/react-dom": "^16.9.1",
+    "@types/react": "^16.9.11",
+    "@types/react-dom": "^16.9.4",
     "cache-loader": "^4.1.0",
     "copy-to-clipboard": "^3.2.0",
     "css-loader": "^3.2.0",
-    "emotion": "^10.0.17",
+    "emotion": "^10.0.23",
     "file-loader": "^4.2.0",
-    "fork-ts-checker-webpack-plugin": "^1.5.0",
+    "fork-ts-checker-webpack-plugin": "^3.0.1",
     "history": "^4.10.1",
     "html-webpack-plugin": "^3.2.0",
     "http-server": "^0.11.0",
-    "immer": "^4.0.1",
+    "immer": "^5.0.0",
     "jest": "^24.9.0",
     "lodash": "^4.17.15",
     "prettier": "^1.18.2",
-    "react": "^16.10.2",
-    "react-dom": "^16.10.2",
+    "react": "^16.11.0",
+    "react-dom": "^16.11.0",
     "style-loader": "^1.0.0",
-    "terser-webpack-plugin": "^2.1.3",
+    "terser-webpack-plugin": "^2.2.1",
     "thread-loader": "^2.1.3",
     "ts-jest": "^24.1.0",
-    "ts-loader": "^6.2.0",
-    "typescript": "^3.6.4",
-    "typescript-styled-plugin": "^0.14.0",
+    "ts-loader": "^6.2.1",
+    "typescript": "^3.7.2",
+    "typescript-styled-plugin": "^0.15.0",
     "url-loader": "^2.2.0",
-    "webpack": "^4.41.1",
-    "webpack-cli": "^3.3.9",
-    "webpack-dev-server": "^3.8.2",
+    "webpack": "^4.41.2",
+    "webpack-cli": "^3.3.10",
+    "webpack-dev-server": "^3.9.0",
     "webpack-hud": "^0.1.2"
@@ -59,0 +58,0 @@ },

No alert changes

Improved metrics

Total package byte prevSize

21611

13.87%

Number of package files

13

30%

Lines of code

210

0.96%

No dependency changes