@shijiu/jsview 1.9.888 → 1.9.912

package/tools/jsview-batch-upgrade.mjs

@@ -0,0 +1,335 @@
+#!/usr/bin/env node
+'use strict';
+
+import fs from 'fs';
+import path from 'path';
+import url from 'url';
+import {
+  askAndAnswer,
+  checkNodeVersion,
+  execCommand,
+  parseArguments
+} from './jsview-common.mjs';
+
+function getOptions(argv)
+{
+  const options = {
+    stagePixels: '1',
+    stageAnimation: '2',
+    stageAudiotrack: '3',
+    stageImportPostfix: '4',
+    stageAppConfig: '5',
+    stageMainEntry: '6',
+  };
+
+  const scriptPath = path.resolve(process.cwd(), process.argv[1]);
+  options.rootDir = scriptPath.replaceAll(/node_modules\/@shijiu\/jsview.*/g, '');
+
+  options.stages = argv.stages?.split(',') ?? [];
+
+  const defaultUpgradeDir = path.resolve(options.rootDir, 'src');
+  options.upgradeDir = path.resolve(process.cwd(), argv.dir ?? defaultUpgradeDir);
+  if (fs.existsSync(options.upgradeDir) == false) {
+    console.error('JsView Error: Upgrade dir [' + options.upgradeDir + '] is not exists.');
+    process.exit(1);
+  }
+
+  console.info();
+  console.info('Upgrade JsView source: ');
+  console.info('  Project folder: ' + options.rootDir);
+  console.info('=====================================');
+  console.info('  Upgrade folder: ' + path.relative(options.rootDir, options.upgradeDir));
+  console.info('  Stages:         [ ' + options.stages.join(', ') + ' ]');
+  console.info('=====================================');
+
+  console.info();
+  console.info('Are you sure to upgrade it?');
+  const answer = askAndAnswer('(y/N) ');
+  if (answer.substring(0, 1) != 'y' && answer.substring(0, 3) != 'yes') {
+    console.error('JsView Info: User cancelled.')
+    process.exit(1);
+  }
+
+  options.sourcePathList = getFilesRecursive(options.upgradeDir);
+
+  return options;
+}
+
+function getFilesRecursive(dirPath) {
+  const ignoreFileList = [
+    '.git',
+    '.gitignore',
+    'node_modules',
+    'package.json',
+    'package-lock.json'
+  ];
+  const fileExtList = [
+    '!.d.ts',
+    '!.min.js',
+    '.css',
+    '.js',
+    '.json',
+    '.mjs',
+    '.ts',
+    '.tsx',
+    '.vue',
+  ];
+
+  let filePathList = [];
+
+  const fileNameList = fs.readdirSync(dirPath);
+  for (const fileName of fileNameList) {
+    if (ignoreFileList.includes(fileName)) {
+      continue;
+    }
+
+    const filePath = path.join(dirPath, fileName);
+    if (fs.statSync(filePath).isDirectory()) {
+      const subFilePathList = getFilesRecursive(filePath);
+      filePathList = [...filePathList, ...subFilePathList];
+    } else {
+      let needUpgrade = false;
+      for (let fileExtName of fileExtList) {
+        if (fileExtName.startsWith('!')) { // 强制忽略该文件
+          fileExtName = fileExtName.substring(1);
+          if (filePath.endsWith(fileExtName)) {
+            break;
+          }
+        } else {
+          if (filePath.endsWith(fileExtName)) {
+            needUpgrade = true;
+            break;
+          }
+        }
+      }
+      if (needUpgrade == false) {
+        continue;
+      }
+
+      const fileExtName = path.extname(filePath);
+      if (fileExtList.includes(fileExtName) == false) {
+        continue;
+      } else if (fileExtList.includes('!' + fileExtName)) {
+        continue;
+      }
+      filePathList.push(filePath);
+    }
+  }
+
+  return filePathList;
+}
+
+function replaceStageContent(options, sourcePathList, msgPrefix,
+                             repleceRegExp, replaceto) {
+  for (const filePath of sourcePathList) {
+    const content = fs.readFileSync(filePath, 'utf8');
+
+    const fixedContent = content.replaceAll(repleceRegExp, replaceto);
+    if (fixedContent === content) {
+      continue;
+    }
+
+    fs.writeFileSync(filePath, fixedContent, 'utf8');
+    console.info(msgPrefix + ': Upgraded ' + path.relative(options.rootDir, filePath) + '.');
+  }
+
+  return 0;
+}
+
+function removeStageFile(options, sourcePathList, msgPrefix,
+                         fromExtName, toExtName)
+{
+  for (const filePath of sourcePathList) {
+    if (filePath.endsWith(fromExtName) == false) {
+      continue;
+    }
+
+    const toFilePath = filePath.replace(new RegExp(fromExtName + '$'), toExtName);
+    fs.renameSync(filePath, toFilePath)
+    console.info(msgPrefix + ': Upgraded ' + path.relative(options.rootDir, filePath) + '.');
+  }
+
+  return 0;
+}
+
+function upgradeStagePixel(options) {
+  const msgPrefix = 'Stage ' + options.stagePixels;
+  console.info(msgPrefix + ': Upgrading pixels...');
+
+  const ret = replaceStageContent(options, options.sourcePathList, msgPrefix,
+                                  /([0-9])px/g, '$1');
+  return ret;
+}
+
+function upgradeStageAnimation(options)
+{
+  const msgPrefix = 'Stage ' + options.stageAnimation;
+  console.info(msgPrefix + ': Upgrading animation...');
+
+  const ret = replaceStageContent(options, options.sourcePathList, msgPrefix,
+                                  ':onAnimationEnd', '@animationend');
+
+  return ret;
+}
+
+function upgradeStageAudiotrack(options)
+{
+  const msgPrefix = 'Stage ' + options.stageAudiotrack;
+  console.info(msgPrefix + ': Upgrading audiotrack...');
+
+  const ret = replaceStageContent(options, options.sourcePathList, msgPrefix,
+                                  '<audiotrack', '<jsv-audiotrack');
+
+  return ret;
+}
+
+function upgradeStageImportPostfix(options)
+{
+  const msgPrefix = 'Stage ' + options.stageImportPostfix;
+  console.info(msgPrefix + ': upgrading import postfix...');
+
+  const amendImportPostfix = function(currentDir, content) {
+    if (content.trim().startsWith('import') == false) {
+      return content;
+    }
+
+    let importFromFile = content.replaceAll(/.*'(.*)'.*/g, '$1');
+    if (importFromFile === content) {
+      importFromFile = content.replaceAll(/.*"\(\)".*/g, "$1");
+    }
+    if (importFromFile === content) {
+      return content;
+    }
+    let importFilePath = path.resolve(currentDir, importFromFile);
+    importFilePath += '.vue';
+    if (fs.existsSync(importFilePath) == false) {
+      return content;
+    }
+
+    // 执行到此处，则需要给给import的文件加上vue尾缀。
+    const fixedContent = content.replace(importFromFile, importFromFile + '.vue');
+
+    return fixedContent;
+  }
+
+  for (const filePath of options.sourcePathList) {
+    const currentDir = path.dirname(filePath);
+    const content = fs.readFileSync(filePath, 'utf8');
+
+    const lineContentList = content.split('\n');
+    for (let idx = 0; idx < lineContentList.length; idx++) {
+      let lineContent = lineContentList[idx];
+      lineContent = amendImportPostfix(currentDir, lineContent);
+      lineContentList[idx] = lineContent;
+    }
+
+    const fixedContent = lineContentList.join('\n');
+    if (fixedContent == content) {
+      continue;
+    }
+
+    fs.writeFileSync(filePath, fixedContent, 'utf8');
+    console.info(msgPrefix + ': Upgraded ' + path.relative(options.rootDir, filePath) + '.');
+  }
+
+  return 0;
+}
+
+function upgradeStageAppConfig(options)
+{
+  const msgPrefix = 'Stage ' + options.stageAppConfig;
+  console.info(msgPrefix + ': Upgrading appConfig...');
+
+
+  const appConfigDir = path.resolve(options.upgradeDir, 'appConfig');
+  if (fs.existsSync(appConfigDir) == false) {
+    console.error(msgPrefix + ': Failed to upgrading appConfig, appConfig folder is not found.');
+    process.exit(1);
+  }
+
+  const sourcePathList = getFilesRecursive(appConfigDir);
+
+  const ret = removeStageFile(options, sourcePathList, msgPrefix,
+                              '.js', '.mjs');
+
+  return ret;
+}
+
+function upgradeStageMainEntry(options)
+{
+  const msgPrefix = 'Stage ' + options.stageMainEntry;
+  console.info(msgPrefix + ': Upgrading main entry...');
+
+  const mainEntryFilePath = path.resolve(options.upgradeDir, 'main.ts');
+  const fixedMainEntryFilePath = path.resolve(options.upgradeDir, 'main.tsx');
+  if (fs.existsSync(mainEntryFilePath) == false
+  && fs.existsSync(fixedMainEntryFilePath) == false) {
+    console.error(msgPrefix + ': Failed to upgrading main entry, main.ts is not found.');
+    process.exit(1);
+  }
+
+  const ret = removeStageFile(options, [ mainEntryFilePath ], msgPrefix,
+                              'main.ts', 'main.tsx');
+
+  return ret;
+}
+
+function main(argv)
+{
+  checkNodeVersion();
+
+  try {
+    const options = getOptions(argv);
+
+    // Stage 1
+    if (options.stages.includes(options.stagePixels)) {
+      upgradeStagePixel(options);
+    }
+
+    // Stage 2
+    if (options.stages.includes(options.stageAnimation)) {
+      upgradeStageAnimation(options);
+    }
+
+    // Stage 3
+    if (options.stages.includes(options.stageAudiotrack)) {
+      upgradeStageAudiotrack(options);
+    }
+
+    // Stage 4
+    if (options.stages.includes(options.stageImportPostfix)) {
+      upgradeStageImportPostfix(options);
+    }
+
+    // Stage 5
+    if (options.stages.includes(options.stageAppConfig)) {
+      upgradeStageAppConfig(options);
+    }
+
+    // Stage 6
+    if (options.stages.includes(options.stageMainEntry)) {
+      upgradeStageMainEntry(options);
+    }
+  } catch (ex) {
+    console.error('JsView Error: Failed to update jsview source!');
+    console.error(ex);
+    process.exit(1);
+  }
+
+  console.error('JsView Info: Done!');
+}
+
+const requiredUsages = {
+  '--stages': `Upgrade stages, separate by comma(,). The value means the following:
+                            1. Fix pixels.
+                            2. Fix animation.
+                            3. Fix audiotrack.
+                            4. Fix import postfix.
+                            5. Fix appConfig.
+                            6. Rename main.ts to main.tsx.`,
+};
+const optionalUsages = {
+  '--dir': 'Upgrade directory, default is [src].',
+};
+const argv = parseArguments(requiredUsages, optionalUsages, false);
+main(argv)

package/tools/{jsview-common.js → jsview-common.mjs}

@@ -1,9 +1,9 @@
 #!/usr/bin/env node
 'use strict';
 
-const childProcess = require('child_process');
-const fs = require('fs');
-const path = require('path');
+import childProcess from 'child_process';
+import fs from 'fs';
+import path from 'path';
 
 function printArgumentsUsages(requiredUsages, optionalUsages, helpUsages)
 {
@@ -41,6 +41,7 @@ function parseArguments(requiredUsages = {},
                         optionalUsages = {},
                         withoutUnparsed = true)
 {
+  const keySeparator = '|';
   const formatKey = (key) => {
     let formattedKey = key.trim().replace(/^-*/, '');
     formattedKey = formattedKey.replace(/-(.)/g, (x) => x[1].toUpperCase())
@@ -57,9 +58,25 @@ function parseArguments(requiredUsages = {},
     }
     return formattedValue;
   }
-  const checkAliases = (aliases, options) => {
+  const hasKey = (usages, key) => {
+    const fmtKey = formatKey(key);
+    for (const checker in usages) {
+      const checkerList = checker.split(keySeparator);
+      for (const alias of checkerList) {
+        const fmtAlias = formatKey(alias);
+        if (fmtAlias === fmtKey) {
+          return true;
+        }
+      }
+    }
+
+    return false;
+  }
+  const checkAliases = (checker, options) => {
+    const checkerList = checker.split(keySeparator);
+
     const formattedAliases = [];
-    for (const alias of aliases) {
+    for (const alias of checkerList) {
       const fmtAlias = formatKey(alias);
       formattedAliases.push(fmtAlias);
     }
@@ -112,31 +129,35 @@ function parseArguments(requiredUsages = {},
       }
     }
 
+    if (hasKey(helpUsages, key) == false
+    && hasKey(requiredUsages, key) == false
+    && hasKey(optionalUsages, key) == false) {
+        console.error('JsView Error: Failed to parse usage: ' + argu);
+        process.exit(1);
+    }
+
     let formattedKey = formatKey(key);
     let formattedValue = formatValue(value);
     options[formattedKey] = formattedValue;
   }
 
   for (const checker in helpUsages) {
-    const checkerList = checker.split('|');
-    const aliasedOptions = checkAliases(checkerList, options);
+    const aliasedOptions = checkAliases(checker, options);
     if (aliasedOptions) {
       printArgumentsUsages(requiredUsages, optionalUsages, helpUsages);
       process.exit(0);
     }
   }
   for (const checker in requiredUsages) {
-    const checkerList = checker.split('|');
-    const aliasedOptions = checkAliases(checkerList, options);
+    const aliasedOptions = checkAliases(checker, options);
     if (!aliasedOptions) {
-      console.log('JsView Error: Failed to find required option: ' + checkerList);
+      console.log('JsView Error: Failed to find required option: ' + checker);
       process.exit(-1);
     }
     options = { ...options, ...aliasedOptions };
   }
   for (const checker in optionalUsages) {
-    const checkerList = checker.split('|');
-    const aliasedOptions = checkAliases(checkerList, options);
+    const aliasedOptions = checkAliases(checker, options);
     options = { ...options, ...aliasedOptions };
   }
 
@@ -208,7 +229,8 @@ function getPackageObject(modulePath)
     console.error('JsView Error: Failed to get ' + modulePath + ', file is not exists.');
     process.exit(1);
   }
-  const pkgObj = require(pkgFullFile);
+  let pkgContent = fs.readFileSync(pkgFullFile, 'utf8');
+  const pkgObj = JSON.parse(pkgContent);
 
   return pkgObj;
 }
@@ -298,7 +320,18 @@ function checkNodeVersion(minMajorVersion = 16)
   }
 }
 
-module.exports = {
+function askAndAnswer(question)
+{
+  process.stdout.write(question)
+  let buffer = Buffer.alloc(100)
+  fs.readSync(0, buffer, 0, 100)
+  let answer = buffer.toString().toLowerCase().replace('\n', '');
+  answer = answer.substring(0, answer.indexOf('\0'));
+  return answer;
+}
+
+export {
+  askAndAnswer,
   checkNodeVersion,
   cpSync,
   execCommand,

package/tools/{jsview-post-build.js → jsview-post-build.mjs}

@@ -1,15 +1,15 @@
 #!/usr/bin/env node
 'use strict';
 
-const crypto = require('crypto');
-const fs = require('fs');
-const path = require('path');
-const url = require('url')
-const {
+import crypto from 'crypto';
+import fs from 'fs';
+import path from 'path';
+import url from 'url'
+import {
   checkNodeVersion,
   getOptions,
   parseArguments,
-} = require('./jsview-common');
+} from './jsview-common.mjs';
 
 // npm run build 时检查jsview-dom是否处于Debug模式。
 async function checkDomDebugDisabled(options) {
@@ -227,7 +227,8 @@ async function main(argv)
 
   const vueConfigFile = path.resolve(options.projectDir, 'vue.config.js');
   if (fs.existsSync(vueConfigFile)) {
-    vueCfgObj = require(vueConfigFile);
+    let vueCfgContent = fs.readFileSync(vueConfigFile, 'utf8');
+    const vueCfgObj = JSON.parse(vueCfgContent);
     if(vueCfgObj.outputDir) {
         options.distDir = path.resolve(options.projectDir, vueCfgObj.outputDir);
     }

package/tools/{jsview-post-install.js → jsview-post-install.mjs}

@@ -1,10 +1,10 @@
 #!/usr/bin/env node
 'use strict';
 
-const fs = require('fs');
-const path = require('path');
-const url = require('url');
-const {
+import fs from 'fs';
+import path from 'path';
+import url from 'url';
+import {
   checkNodeVersion,
   cpSync,
   execCommand,
@@ -14,7 +14,7 @@ const {
   parseArguments,
   symlinkSync,
   rmSync
-} = require('./jsview-common');
+} from './jsview-common.mjs';
 
 function checkNpmCommand()
 {

package/tools/{jsview-run-android.js → jsview-run-android.mjs}

@@ -1,14 +1,13 @@
 #!/usr/bin/env node
 'use strict';
 
-const childProcess = require('child_process');
-const path = require('path');
-const url = require('url');
-const {
+import childProcess from 'child_process';
+import url from 'url';
+import {
     checkNodeVersion,
     getOptions,
     parseArguments
-} = require('./jsview-common');
+} from './jsview-common.mjs';
 
 async function getExtraOptions(argv)
 {