@shijiu/jsview 1.9.778 → 1.9.780

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shijiu/jsview",
-  "version": "1.9.778",
+  "version": "1.9.780",
   "bin": {
     "jsview-post-build": "./tools/jsview-post-build.js",
     "jsview-post-install": "./tools/jsview-post-install.js"

package/tools/jsview-common.js

@@ -1,9 +1,11 @@
 #!/usr/bin/env node
+'use strict';
 
 const fs = require('fs');
 const path = require('path');
 
-function parseArguments(beginWithHyphen = true) {
+function parseArguments(beginWithHyphen = true)
+{
   let options = {
     unparsed: []
   };
@@ -11,8 +13,7 @@ function parseArguments(beginWithHyphen = true) {
   // arg0: node
   // arg1: script.js
   const arguList = process.argv.slice(2);
-  const unparsed = [];
-  for (argu of arguList) {
+  for (const argu of arguList) {
     let [key, value] = argu.split('=');
     if (argu.includes('=') == false) {
       value = true;
@@ -69,7 +70,8 @@ function parseArguments(beginWithHyphen = true) {
  * └── src
  *     └── appConfig
 **************************************************/
-function getOptions(framework) {
+function getOptions(framework)
+{
   const options = {};
 
   options.projectDir = process.cwd();
@@ -101,7 +103,20 @@ function getOptions(framework) {
   return options;
 }
 
-function cpSync(workDir, src, dest, ignore=[]) {
+function getPackageObject(modulePath)
+{
+  const pkgFullFile = path.resolve(modulePath, 'package.json');
+  if (!fs.existsSync(pkgFullFile)) {
+    console.error('Error: Failed to get ' + modulePath + ', file is not exists.');
+    process.exit(1);
+  }
+  const pkgObj = require(pkgFullFile);
+
+  return pkgObj;
+}
+
+function cpSync(workDir, src, dest, ignore=[])
+{
   const exists = fs.existsSync(src);
   const stats = exists && fs.statSync(src);
   const isDirectory = exists && stats.isDirectory();
@@ -109,14 +124,15 @@ function cpSync(workDir, src, dest, ignore=[]) {
     if (fs.existsSync(dest) == false) {
       fs.mkdirSync(dest);
     }
-    fs.readdirSync(src).forEach(function(childItemName) {
+    const childFileNames = fs.readdirSync(src);
+    for (const childName of childFileNames) {
       cpSync(
         workDir,
-        path.join(src, childItemName),
-        path.join(dest, childItemName),
+        path.join(src, childName),
+        path.join(dest, childName),
         ignore
       );
-    });
+    };
   } else {
     const filename = path.basename(src);
     if (ignore && ignore.includes(filename)) {
@@ -129,11 +145,13 @@ function cpSync(workDir, src, dest, ignore=[]) {
   }
 }
 
-function rmSync(path) {
+function rmSync(path)
+{
   fs.rmSync(path, { recursive: true, force: true });
 }
 
-function symlinkSync(target, to) {
+function symlinkSync(target, to)
+{
   rmSync(to);
 
   const targetPath = path.relative(path.dirname(to), target);
@@ -144,6 +162,7 @@ function symlinkSync(target, to) {
 module.exports = {
   cpSync,
   getOptions,
+  getPackageObject,
   parseArguments,
   rmSync,
   symlinkSync,

package/tools/jsview-jsmap-serve.mjs

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+'use strict';
 
 import fs from 'fs';
 import http from 'http';
@@ -12,7 +13,8 @@ const context = {
   needRedirect: false,
 }
 
-function requestListener(req, res) {
+function requestListener(req, res)
+{
   console.log('[request] ' + req.url);
 
   if (req.url.endsWith('.map') == false) { // 只处理 .map 文件
@@ -46,7 +48,8 @@ function requestListener(req, res) {
   return;
 }
 
-function convertMapBaseUrl(originUrl) {
+function convertMapBaseUrl(originUrl)
+{
   if (originUrl.startsWith('/map/')) {
     /* 去掉子目录/map/ */
     return originUrl.substr(5); 
@@ -58,7 +61,8 @@ function convertMapBaseUrl(originUrl) {
   }
 }
 
-function getIPAddress() {
+function getIPAddress()
+{
   let ret = [];
 
   var interfaces = os.networkInterfaces();
@@ -74,7 +78,8 @@ function getIPAddress() {
   return ret;
 }
 
-function parseBaseUrl(context, argv) {
+function parseBaseUrl(context, argv)
+{
   context.baseUrl = context.scriptDir;
   if (argv.length < 3) {
     return;
@@ -97,21 +102,24 @@ function parseBaseUrl(context, argv) {
   return;
 }
 
-function main(argv) {
+function main(argv)
+{
   parseBaseUrl(context, argv);
 
   const server = http.createServer(requestListener);
   const port = 57245;
   server.listen(port, '0.0.0.0', () => {
+    const ipAddrs = getIPAddress();
+
     console.log('');
     console.log('SourceMap base url: ' + context.baseUrl)
     console.log('');
     console.log('JsView server running at:');
     console.log('');
     console.log(' - Local:   http://localhost:' + port + '/');
-    getIPAddress().forEach(ip => {
+    for(const ip of ipAddrs) {
       console.log(' - Network: http://' + ip + ':' + port + '/');
-    });
+    }
     console.log('');
   });
 }

package/tools/jsview-post-build.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+'use strict';
 
 const crypto = require('crypto');
 const fs = require('fs');
@@ -70,7 +71,7 @@ async function prepareMainAppData(options, fileMd5)
   }
   // const appConfigText = fs.readFileSync(appConfigFile);
   // const appDataOriginJson = JSON.parse(appConfigText);
-  appDataOriginJson = await import(appConfigFile);
+  const appDataOriginJson = await import(appConfigFile);
 
   // 组装AppData
   let targetAppData = {};
@@ -157,15 +158,16 @@ function makeDebugMap(options)
     process.exit(1);
   }
 
-  const to = path.resolve(options.debugDir, jsmapServeName);
+  const to = path.resolve(options.distDebugDir, jsmapServeName);
   console.log(' -> ' + path.relative(options.projectDir, to));
   fs.copyFileSync(jsmapServePath, to);
 }
 
-async function main() {
+async function main()
+{
   const options = getOptions();
 
-  vueConfigFile = path.resolve(options.projectDir, 'vue.config.js');
+  const vueConfigFile = path.resolve(options.projectDir, 'vue.config.js');
   if (fs.existsSync(vueConfigFile)) {
     vueCfgObj = require(vueConfigFile);
     if(vueCfgObj.outputDir) {

package/tools/jsview-post-install.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+'use strict';
 
 const fs = require('fs');
 const path = require('path');
@@ -6,12 +7,14 @@ const url = require('url');
 const {
   cpSync,
   getOptions,
+  getPackageObject,
   parseArguments,
   symlinkSync,
   rmSync
 } = require('./jsview-common');
 
-function checkNpmCommand() {
+function checkNpmCommand()
+{
   let command = process.env.npm_command;
   if(!command) {
     command = process.env.npm_config_refer; // for linux
@@ -26,10 +29,11 @@ function checkNpmCommand() {
   console.warn();
 }
 
-function checkNpmLinkForDebug(options, linkablePkgNames) {
-  const pkgObj = getPackageObject(options, options.projectDir, '.');
+function checkNpmLinkForDebug(options, linkablePkgNames)
+{
+  const pkgObj = getPackageObject(options.projectDir);
 
-  for (linkableName of linkablePkgNames) {
+  for (const linkableName of linkablePkgNames) {
     let linkableTarget = pkgObj.dependencies?.[linkableName];
     if (!linkableTarget || !linkableTarget.startsWith('file:')) {
       continue;
@@ -42,26 +46,17 @@ function checkNpmLinkForDebug(options, linkablePkgNames) {
   }
 }
 
-function getPackageObject(options, dir, name)
+function checkPatches(options, pkgNeedPatch, skipCheckVersion)
 {
-  const pkgFullFile = path.resolve(dir, name, 'package.json');
-  if (!fs.existsSync(pkgFullFile)) {
-    console.error('Error: Failed to get "' + path.relative(options.projectDir, pkgFullFile) + '" is not exists.');
-    process.exit(1);
-  }
-  const pkgObj = require(pkgFullFile);
-
-  return pkgObj;
-}
-
-function checkPatches(options, pkgNeedPatch, skipCheckVersion) {
   console.info('Checking package:');
-  for (pkgName of pkgNeedPatch) {
+  for (const pkgName of pkgNeedPatch) {
     if (skipCheckVersion !== true) {
-      const patchPkgObj = getPackageObject(options, options.jsviewPatchModulesDir, pkgName);
+      const patchPkgDir = path.resolve(options.jsviewPatchModulesDir, pkgName);
+      const patchPkgObj = getPackageObject(patchPkgDir);
       console.info('  ' + pkgName + ': ' + patchPkgObj.version);
 
-      const modulePkgObj = getPackageObject(options, options.modulesDir, pkgName);
+      const modulePkgDir = path.resolve(options.modulesDir, pkgName);
+      const modulePkgObj = getPackageObject(modulePkgDir);
       if (modulePkgObj.version != patchPkgObj.version) {
         console.error('Error: ' + pkgName + '@' + modulePkgObj.version + ' is not supported, required version is ' + patchPkgObj.version);
         process.exit(1);
@@ -72,9 +67,10 @@ function checkPatches(options, pkgNeedPatch, skipCheckVersion) {
   }
 }
 
-function installPatches(options, pkgNeedPatch) {
+function installPatches(options, pkgNeedPatch)
+{
   console.info('\nPatching JsView:');
-  for (pkgName of pkgNeedPatch) {
+  for (const pkgName of pkgNeedPatch) {
     const patchSrc = path.resolve(options.jsviewPatchModulesDir, pkgName);
     const patchDest = path.resolve(options.modulesDir, pkgName);
 
@@ -85,7 +81,8 @@ function installPatches(options, pkgNeedPatch) {
   rmSync(options.cacheDir);
 }
 
-async function printRevision(options) {
+async function printRevision(options)
+{
   const jsviewVersionURL = url.pathToFileURL(options.jsviewRevisionFile);
   const { default: jsviewTargetVersion } = await import(jsviewVersionURL);
 
@@ -100,8 +97,9 @@ async function printRevision(options) {
   {
     let pluginDirPath = path.resolve(options.jsviewFrameworkDir, 'utils', 'JsViewPlugin');
     if(fs.existsSync(pluginDirPath)) {
-      fs.readdirSync(pluginDirPath).forEach((file) => {
-        var pathname = path.resolve(pluginDirPath, file);
+      const pluginFileNames = fs.readdirSync(pluginDirPath);
+      for(const fileName of pluginFileNames) {
+        var pathname = path.resolve(pluginDirPath, fileName);
         if (fs.statSync(pathname).isDirectory()) {
           let versionFilePath = path.resolve(pathname, 'version.js'); 
           if (fs.existsSync(versionFilePath)) {
@@ -112,7 +110,7 @@ async function printRevision(options) {
             pluginCount++;
           }
         }
-      })
+      }
     }
   }
   console.log(`*    total:${pluginCount}`);
@@ -120,7 +118,8 @@ async function printRevision(options) {
   console.log('**************************************************');
 }
 
-function doPostInstall(framework, pkgNeedPatch, skipCheckVersion) {
+function doPostInstall(framework, pkgNeedPatch, skipCheckVersion)
+{
   const options = getOptions(framework);
   options.projectDir = process.cwd();
 
@@ -143,7 +142,8 @@ function doPostInstall(framework, pkgNeedPatch, skipCheckVersion) {
   printRevision(options);
 }
 
-function main(argv) {
+function main(argv)
+{
   let pkgNeedPatch;
 
   switch (argv.framework) {

package/tools/jsview-run-android.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+'use strict';
 
 const childProcess = require('child_process');
 const path = require('path');
@@ -8,7 +9,8 @@ const {
     parseArguments
 } = require('./jsview-common');
 
-async function getExtraOptions(argv) {
+async function getExtraOptions(argv)
+{
     const options = getOptions(argv.framework);
     options.androidPackage = 'com.tvcode.sjcenter/com.tvcode.chmarket.MainActivity';
     options.jsviewCoreRevision = null;
@@ -36,7 +38,8 @@ async function getExtraOptions(argv) {
     return options;
 }
 
-function printRevision(options) {
+function printRevision(options)
+{
     console.log('**************************************************');
     console.log('* Android Package: ' + options.androidPackage);
     console.log('* Core:            ' + options.jsviewCoreRevision);
@@ -45,7 +48,8 @@ function printRevision(options) {
     console.log('**************************************************');
 }
 
-function androidStartActivity(options) {
+function androidStartActivity(options)
+{
     let cmdline = 'adb shell am start';
     cmdline += ` -n ${options.androidPackage}`;
     cmdline += ` --es COREVERSIONRANGE "${options.jsviewCoreRevision}"`;
@@ -59,9 +63,9 @@ function androidStartActivity(options) {
     }
 }
 
-
 const argv = parseArguments(false);
-async function main(argv) {
+async function main(argv)
+{
     const options = await getExtraOptions(argv);
 
     printRevision(options);