tmui-cli 1.0.0 → 1.0.1

package/bin/tmui.js

@@ -8,6 +8,7 @@ const create = require("../src/create")
 const createHbx = require("../src/createHbx")
 const rhbx = require("../src/rhbx")
 const rcli = require("../src/rcli")
+const viewTmuiVer = require("../src/viewTmuiVer")
 
 chalk.then(v=>{
 	const ck = new v.Chalk();
@@ -16,14 +17,15 @@ chalk.then(v=>{
 	console.log(ck.green(`tmui3.0`))
 	console.log(ck.green(`欢迎使用tmui3.0 cli 命令行工具`))
 	console.log(ck.green(`将引导你创建一个tmui3.0组件框架的UNIAPP项目`))
+	console.log(ck.bgBlue(`文档地址：https://tmui.design.com`))
 	console.log(ck.green(`---------------------------------------------------`))
 	console.log(ck.green(`---------------------------------------------------`))
 	program
-		.option('-c cli','创建新的cli tmui3.0 项目[推荐]')
-		.option('-c hbx','创建新的hbx tmui3.0 项目[不推荐]')
-		.option('-c rcli','已有cli项目下载/更新tmui3.0')
-		.option('-c rhbx','已有hbx项目下载/更新tmui3.0')
-		
+		.version(require('../package').version)
+		.option('-c cli','[可选指定版本号] 创建新的cli tmui3.0 项目[推荐]')
+		.option('-c hbx','[可选指定版本号] 创建新的hbx tmui3.0 项目[不推荐]')
+		.option('-c rcli','[可选指定版本号] 已有cli项目下载/更新tmui3.0')
+		.option('-c rhbx','[可选指定版本号] 已有hbx项目下载/更新tmui3.0')
 		program.command('cli')
 		.description('创建cli uniapp tmui3.0 项目[推荐]')
 		.action(function(type, name){
@@ -44,6 +46,11 @@ chalk.then(v=>{
 		.action(function(type, name){
 		    rhbx.run(type,name)
 		})
+		program.command('ver')
+		.description('查看tmui可用版本号')
+		.action(function(type, name){
+		    viewTmuiVer.run(type,name)
+		})
 	
 	program.parse();
 	

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tmui-cli",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "description": "tmui3.0",
   "main": "./bin/tmui.js",
   "scripts": {},

package/src/create.js

@@ -9,6 +9,22 @@ exports.run = function(type, name) {
 		const ck = new v.Chalk();
 		const nowPath = path.resolve('./');
 		console.log(ck.bgBlue('不 要 关闭窗体，正在创建中....'))
+		let userInputVer = "";
+		let args = name.parent.rawArgs.filter(el=>{
+			return el
+		})
+		
+		if(args.includes('-c')){
+			if(args.length==5){
+				userInputVer = args.pop()||""
+				userInputVer = typeof userInputVer=='undefined'?"":userInputVer
+			}
+		}else if(args.length==4){
+			userInputVer = args.pop()||""
+			userInputVer = typeof userInputVer=='undefined'?"":userInputVer
+		}
+		
+		
 		// 检查是否有router目录？
 		// fs.existsSync(path.join(nowPath,'router','index.ts'))
 		ft.then((fah)=>{
@@ -17,6 +33,15 @@ exports.run = function(type, name) {
 			fetch('https://cdn.tmui.design/tmuiVer.txt').then(async (res)=>{
 				let verText = await res.text();
 				let ver = verText.split('\n')[0]
+				if(userInputVer){
+					ver = userInputVer;
+				}
+				let isVer = verText.includes(ver)
+				if(!isVer){
+					console.log(ck.red('不存在版本号：'+ver))
+					return;
+				}
+				
 				const fileName = `cli${ver}.zip`
 				console.log(ck.green('查询到版本号如下：'))
 				console.log(verText)

package/src/createHbx.js

@@ -9,15 +9,35 @@ exports.run = function(type, name) {
 		const ck = new v.Chalk();
 		const nowPath = path.resolve('./');
 		console.log(ck.bgBlue('不 要 关闭窗体，正在创建中....'))
-		// 检查是否有router目录？
-		// fs.existsSync(path.join(nowPath,'router','index.ts'))
+		let userInputVer = "";
+		let args = name.parent.rawArgs.filter(el=>{
+			return el
+		})
+		
+		if(args.includes('-c')){
+			if(args.length==5){
+				userInputVer = args.pop()||""
+				userInputVer = typeof userInputVer=='undefined'?"":userInputVer
+			}
+		}else if(args.length==4){
+			userInputVer = args.pop()||""
+			userInputVer = typeof userInputVer=='undefined'?"":userInputVer
+		}
+		
 		ft.then((fah)=>{
 			const fetch = fah.default
 			
 			fetch('https://cdn.tmui.design/tmuiVer.txt').then(async (res)=>{
 				let verText = await res.text();
 				let ver = verText.split('\n')[0]
-		
+				if(userInputVer){
+					ver = userInputVer;
+				}
+				let isVer = verText.includes(ver)
+				if(!isVer){
+					console.log(ck.red('不存在版本号：'+ver))
+					return;
+				}
 				console.log(ck.green('查询到版本号如下：'))
 				console.log(verText)
 				console.log(ck.green('正在使用最新的版本号：'+ver+'进行创建项目'))

package/src/rcli.js

@@ -9,14 +9,34 @@ exports.run = function(type, name) {
 		const ck = new v.Chalk();
 		const nowPath = path.resolve('./');
 		console.log(ck.bgBlue('不 要 关闭窗体，正在创建中....'))
-		// 检查是否有router目录？
-		// fs.existsSync(path.join(nowPath,'router','index.ts'))
+		let userInputVer = "";
+		let args = name.parent.rawArgs.filter(el=>{
+			return el
+		})
+		
+		if(args.includes('-c')){
+			if(args.length==5){
+				userInputVer = args.pop()||""
+				userInputVer = typeof userInputVer=='undefined'?"":userInputVer
+			}
+		}else if(args.length==4){
+			userInputVer = args.pop()||""
+			userInputVer = typeof userInputVer=='undefined'?"":userInputVer
+		}
 		ft.then((fah)=>{
 			const fetch = fah.default
 			
 			fetch('https://cdn.tmui.design/tmuiVer.txt').then(async (res)=>{
 				let verText = await res.text();
 				let ver = verText.split('\n')[0]
+				if(userInputVer){
+					ver = userInputVer;
+				}
+				let isVer = verText.includes(ver)
+				if(!isVer){
+					console.log(ck.red('不存在版本号：'+ver))
+					return;
+				}
 				const fileName = `cli${ver}.zip`
 				console.log(ck.green('查询到版本号如下：'))
 				console.log(verText)

package/src/rhbx.js

@@ -9,6 +9,20 @@ exports.run = function(type, name) {
 		const ck = new v.Chalk();
 		const nowPath = path.resolve('./');
 		console.log(ck.bgBlue('不 要 关闭窗体，正在创建中....'))
+		let userInputVer = "";
+		let args = name.parent.rawArgs.filter(el=>{
+			return el
+		})
+		
+		if(args.includes('-c')){
+			if(args.length==5){
+				userInputVer = args.pop()||""
+				userInputVer = typeof userInputVer=='undefined'?"":userInputVer
+			}
+		}else if(args.length==4){
+			userInputVer = args.pop()||""
+			userInputVer = typeof userInputVer=='undefined'?"":userInputVer
+		}
 		
 		if(fs.existsSync(path.join(nowPath,'router','index.ts'))){
 			if(!fs.existsSync(path.join(nowPath,'router'))){
@@ -39,7 +53,14 @@ exports.run = function(type, name) {
 			fetch('https://cdn.tmui.design/tmuiVer.txt').then(async (res)=>{
 				let verText = await res.text();
 				let ver = verText.split('\n')[0]
-					
+				if(userInputVer){
+					ver = userInputVer;
+				}
+				let isVer = verText.includes(ver)
+				if(!isVer){
+					console.log(ck.red('不存在版本号：'+ver))
+					return;
+				}
 				console.log(ck.green('查询到版本号如下：'))
 				console.log(verText)
 				console.log(ck.green('正在使用最新的版本号：'+ver+'进行创建项目'))

package/src/viewTmuiVer.js

@@ -0,0 +1,24 @@
+const chalk = import("chalk")
+const path = require("path")
+const fs = require("fs")
+const ft =  import("node-fetch")
+const compressing = require("compressing")
+const chilPro = require("child_process")
+exports.run = function(type, name) {
+	chalk.then(v=>{
+		const ck = new v.Chalk();
+		const nowPath = path.resolve('./');
+		
+		ft.then((fah)=>{
+			const fetch = fah.default
+			
+			fetch('https://cdn.tmui.design/tmuiVer.txt').then(async (res)=>{
+				let verText = await res.text();
+				let ver = verText.split('\n')[0]
+				console.log(ck.green('查询到版本号如下：'))
+				console.log(verText)
+			})
+		})
+		// fetch()tmuiVer.txt
+	})
+}