npm - @farris/jit-engine - Versions diffs - 1.3.302 → 1.3.303 - Mend

@farris/jit-engine 1.3.302 → 1.3.303

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (5) hide show

package/README.md CHANGED Viewed

@@ -1,3 +1,7 @@
+1.3.303
+    支持版本校验功能
 1.3.302
     移动页面标题、tab过滤条件修复

package/bin/index.js CHANGED Viewed

@@ -1,19 +1,22 @@
 #!/usr/bin/env node
 "use strict";
 const yargs = require("yargs");
 const path = require("path");
 const jitEngine = require('../lib/index');
+const versionCheck = require("../lib/command/check")
 const FILE_PATH = 'file path';
 const METADATA_CONFIG = 'metadata config';
+const jsonPath = "allowempty";
+const projectName = "bo-featurenoah-front";
 yargs.options({
     'metaDataPath': {
         alias: 'mp',
         demand: true,
-        default: path.resolve(__dirname, '../lib/config/sagi_object'),
+        default: path.resolve(__dirname, '../lib/config/' + jsonPath),
         describe: '元数据存放路径',
         type: 'string',
         group: FILE_PATH
@@ -21,28 +24,28 @@ yargs.options({
     'publishPath': {
         alias: 'pp',
         demand: true,
-        default: path.resolve(__dirname, '../lib/publish/sagi_object'),
+        default: path.resolve(__dirname, '../lib/publish/' + jsonPath),
         describe: '代码生成目录',
         type: 'string',
         group: FILE_PATH
     },
-    'formFileName':{
+    'formFileName': {
         alias: 'fn',
-        default: 'Form_SagiObject.frm',
+        default: 't.frm',
         describe: '表单名称',
         type: 'string',
         group: METADATA_CONFIG
     },
     'cmd': {
         alias: 'cmd',
-        default: 'Form_SagiObject.frm.command.json',
+        default: 't.frm.command',
         describe: 'Command 配置文件名',
         type: 'string',
         group: METADATA_CONFIG
     },
     'sm': {
         alias: 'sm',
-        default: 'Form_SagiObject.frm.sm.json',
+        default: 't.frm.sm',
         describe: 'StateMachine 配置文件名',
         type: 'string',
         group: METADATA_CONFIG
@@ -67,8 +70,69 @@ yargs.options({
         describe: '端口号',
         type: 'string',
         group: METADATA_CONFIG
+    },
+    "ngVersion": {
+        alias: 'nv',
+        default: 'ng7',
+        describe: '编译的ng版本',
+        type: 'string',
+        group: METADATA_CONFIG
+    },
+    "projectName": {
+        alias: 'pn',
+        default: projectName,
+        describe: '工程名称',
+        type: 'string',
+        group: METADATA_CONFIG
+    },
+    "entryProject": {
+        alias: 'ep',
+        default: projectName,
+        describe: '默认的工程',
+        type: 'string',
+        group: METADATA_CONFIG
+    },
+    "projectRoute": {
+        alias: 'pr',
+        default: projectName + '.route.json',
+        describe: '默认的工程',
+        type: 'string',
+        group: METADATA_CONFIG
+    },
+    "linkedNodeModules": {
+        alias: 'lnm',
+        default: 'c:/projects/node_modules',
+        describe: '引用的node_modules路径',
+        type: 'string',
+        group: METADATA_CONFIG
+    },
+    "formatCode": {
+        alias: 'FYBXD',
+        default: 'true',
+        type: 'string',
+        group: METADATA_CONFIG
+    },
+    "eapiPath": {
+        alias: 'eapip',
+        default: 'D:/工作目录/ng7-jit-engine/farris-jit-engine/lib/config/eapifilename/',
+        type: 'string',
+        group: METADATA_CONFIG
+    },
+    "serviceUnitPath": {
+        default: 'TM/CM',
+        type: 'string',
+        group: METADATA_CONFIG
+    },
+    "isMobileApprove":{
+        default: false,
+        type: 'string',
+        group: METADATA_CONFIG
+    },
+    "mobileApproveFormCode":{
+        default: 'idpform',
+        type: 'string',
+        group: METADATA_CONFIG
     }
 });
 yargs.parse(process.argv.slice(2), (err, argv, output) => {
@@ -82,13 +146,28 @@ yargs.parse(process.argv.slice(2), (err, argv, output) => {
         return;
     }
-    try {
-            jitEngine.jit(argv);
+    const command = process.argv.slice(2)[0];
+    if (command === 'check') {
+        if (argv.path) {
+            let result;
+            return versionCheck.checkVersion(argv.path, (result) => {
+                if (result.needUpdate) {
+                    process.exit(1);
+                } else {
+                    process.exit(0);
+                }
+            })
+        } else {
+            console.log('node_modules目录为空。');
+            process.exit(-1);
+        }
+    }
+    try {
+        jitEngine.jit(argv);
     } catch (e) {
         console.log(e);
         throw e;
     }
-});
+})

package/lib/command/check.js ADDED Viewed

@@ -0,0 +1,102 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.checkVersion = void 0;
+function checkVersion(dir, callback) {
+    let output = {
+        needUpdate: false,
+        updateList: []
+    };
+    const readPackageTree = require('read-package-tree');
+    readPackageTree(dir, (_err, physicalTree) => {
+        try {
+            const nodes = physicalTree.children;
+            let map = new Map();
+            for (const key in nodes) {
+                if (nodes.hasOwnProperty(key)) {
+                    const element = nodes[key];
+                    const packageData = element.package || {};
+                    const id = packageData['_id'];
+                    if (id) {
+                        const atIndex = id.lastIndexOf('@');
+                        const prefix = id.slice(0, atIndex);
+                        const suffix = id.slice(atIndex + 1);
+                        map.set(prefix, suffix);
+                    }
+                }
+            }
+            const packageJson = physicalTree.package;
+            if (packageJson) {
+                const dependencies = packageJson.dependencies;
+                Object.keys(dependencies).forEach((key) => {
+                    if (key.startsWith('@farris') || key.startsWith('@gsp')) {
+                        if (dependencies.hasOwnProperty(key)) {
+                            const packageJsonVersion = dependencies[key];
+                            const nodeModulesVersion = map.get(key);
+                            if (nodeModulesVersion) {
+                                if (packageJsonVersion !== nodeModulesVersion && !isValidVersion(nodeModulesVersion, packageJsonVersion)) {
+                                    const info = {
+                                        name: key,
+                                        nodeModulesVersion: nodeModulesVersion,
+                                        packageJsonVersion: packageJsonVersion
+                                    };
+                                    output.needUpdate = true;
+                                    output.updateList.push(info);
+                                }
+                            }
+                            else {
+                                const info = {
+                                    name: key,
+                                    nodeModulesVersion: "",
+                                    packageJsonVersion: packageJsonVersion
+                                };
+                                output.needUpdate = true;
+                                output.updateList.push(info);
+                            }
+                        }
+                    }
+                });
+                if (output && output.needUpdate) {
+                    console.log('The node_modules need to be updated, with the following update list:');
+                    const updateList = output.updateList;
+                    updateList.forEach((item) => {
+                        console.log(item.name + '@' + item.packageJsonVersion);
+                    });
+                }
+                callback(output);
+            }
+        }
+        catch (error) {
+            output.needUpdate = false;
+        }
+    });
+}
+exports.checkVersion = checkVersion;
+function isValidVersion(versionToCheck, rangeSpecifier) {
+    let minVersion, maxMajor;
+    if (rangeSpecifier.startsWith('^')) {
+        const [major, minor, patch] = rangeSpecifier.slice(1).split('.').map(Number);
+        minVersion = `${major}.${minor}.${patch}`;
+        maxMajor = major + 1;
+    }
+    else {
+        return false;
+    }
+    function parseVersion(v) {
+        return v.split('.').map(Number);
+    }
+    const parsedVersionToCheck = parseVersion(versionToCheck);
+    const parsedMinVersion = parseVersion(minVersion);
+    for (let i = 0; i < parsedMinVersion.length; i++) {
+        if (parsedVersionToCheck[i] < parsedMinVersion[i])
+            return false;
+        if (parsedVersionToCheck[i] > parsedMinVersion[i])
+            break;
+    }
+    if (parsedVersionToCheck[0] === parsedMinVersion[0]) {
+    }
+    else if (parsedVersionToCheck[0] >= maxMajor) {
+        return false;
+    }
+    return true;
+}
+//# sourceMappingURL=check.js.map

package/lib/command/check.js.map ADDED Viewed

@@ -0,0 +1 @@

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

package/package.json CHANGED Viewed

@@ -1,56 +1,57 @@
-{
-  "name": "@farris/jit-engine",
-  "version": "1.3.302",
-  "description": "",
-  "main": "./lib/index.js",
-  "bin": {
-    "jit": "./bin/index.js"
-  },
-  "engines": {
-    "node": ">= 6.9.0",
-    "npm": ">= 3.0.0"
-  },
-  "files": [
-    "lib/",
-    "bin/",
-    "ioc.config"
-  ],
-  "scripts": {
-    "build": "npm run build-ts && npm run copy-static-assets",
-    "build-q": "npm run build-ts",
-    "test": "jest  --coverage ",
-    "watch-test": "npm run test --watchAll",
-    "build-ts": "tsc",
-    "tslint": "tslint -c tslint.json -p tsconfig.json",
-    "copy-static-assets": "ts-node copyStaticAssets.ts"
-  },
-  "keywords": [
-    "jit",
-    "engine",
-    "jit-engine"
-  ],
-  "author": "Noah",
-  "license": "ISC",
-  "dependencies": {
-    "fs-extra": "^8.1.0",
-    "lodash": "^4.17.10",
-    "prettier": "^1.18.2",
-    "pug": "^2.0.0-rc.4",
-    "typescript-ioc": "^1.2.4",
-    "yargs": "^12.0.1"
-  },
-  "devDependencies": {
-    "@types/fs-extra": "^8.1.1",
-    "@types/jest": "24.0.15",
-    "@types/lodash": "^4.14.91",
-    "@types/node": "^12.6.1",
-    "@types/prettier": "^1.18.0",
-    "@types/pug": "^2.0.4",
-    "@types/yargs": "^11.1.1",
-    "jest": "^24.8.0",
-    "ts-jest": "^24.0.2",
-    "ts-node": "^8.3.0",
-    "tslint": "^5.18.0",
-    "typescript": "^4.3.5"
-  }
-}
+{
+  "name": "@farris/jit-engine",
+  "version": "1.3.303",
+  "description": "",
+  "main": "./lib/index.js",
+  "bin": {
+    "jit": "./bin/index.js"
+  },
+  "engines": {
+    "node": ">= 6.9.0",
+    "npm": ">= 3.0.0"
+  },
+  "files": [
+    "lib/",
+    "bin/",
+    "ioc.config"
+  ],
+  "scripts": {
+    "build": "npm run build-ts && npm run copy-static-assets",
+    "build-q": "npm run build-ts",
+    "test": "jest  --coverage ",
+    "watch-test": "npm run test --watchAll",
+    "build-ts": "tsc",
+    "tslint": "tslint -c tslint.json -p tsconfig.json",
+    "copy-static-assets": "ts-node copyStaticAssets.ts"
+  },
+  "keywords": [
+    "jit",
+    "engine",
+    "jit-engine"
+  ],
+  "author": "Noah",
+  "license": "ISC",
+  "dependencies": {
+    "fs-extra": "^8.1.0",
+    "lodash": "^4.17.10",
+    "prettier": "^1.18.2",
+    "pug": "^2.0.0-rc.4",
+    "read-package-tree": "^5.3.1",
+    "typescript-ioc": "^1.2.4",
+    "yargs": "^12.0.1"
+  },
+  "devDependencies": {
+    "@types/fs-extra": "^8.1.1",
+    "@types/jest": "24.0.15",
+    "@types/lodash": "^4.14.91",
+    "@types/node": "^12.6.1",
+    "@types/prettier": "^1.18.0",
+    "@types/pug": "^2.0.4",
+    "@types/yargs": "^11.1.1",
+    "jest": "^24.8.0",
+    "ts-jest": "^24.0.2",
+    "ts-node": "^8.3.0",
+    "tslint": "^5.18.0",
+    "typescript": "^3.5.3"
+  }
+}