tmui-cli 1.0.3 → 1.0.4

package/bin/tmui.js

@@ -1,76 +1,133 @@
-#!/usr/bin/env node
-
-process.title = 'tmui3.0-cli';
+#!/usr/bin/env node
+
+process.title = 'tmui3.0-cli';
 const chalk = import("chalk")
-const { Command } = require('commander');
+const { Command } = require('commander');
 const program = new Command();
 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")
-
+const tm2 = require("../src/tmui2")
+const inquirer = import('inquirer');
+const ft =  import("node-fetch")
 chalk.then(v=>{
 	const ck = new v.Chalk();
-	console.log(ck.green(`---------------------------------------------------`))
-	console.log(ck.green(`---------------------------------------------------`))
-	console.log(ck.green(`tmui3.0`))
-	console.log(ck.green(`欢迎使用tmui3.0 cli 命令行工具`))
-	console.log(ck.green(`将引导你创建一个tmui3.0组件框架的UNIAPP项目`))
-	console.log(ck.green(`文档地址：https://tmui.design.com`))
-	console.log(ck.green(`---------------------------------------------------`))
-	console.log(ck.green(`---------------------------------------------------`))
-	program
-		.version(require('../package').version)
-		program.command('cli')
-		.description('[可选指定版本号] 创建cli uniapp tmui3.0 项目[推荐]')
-		.action(function(type, name){
-		    create.run(type,name)
-		})
-		program.command('hbx')
-		.description('[可选指定版本号] 创建hbx uniapp tmui3.0 项目[不推荐]')
-		.action(function(type, name){
-		    createHbx.run(type,name)
-		})
-		program.command('rcli')
-		.description('[可选指定版本号] 已有cli项目下载/更新tmui3.0')
-		.action(function(type, name){
-		    rcli.run(type,name)
-		})
-		program.command('rhbx')
-		.description('[可选指定版本号] 已有hbx项目下载/更新tmui3.0')
-		.action(function(type, name){
-		    rhbx.run(type,name)
-		})
-		program.command('ver')
-		.description('查看tmui可用版本号')
-		.action(function(type, name){
-		    viewTmuiVer.run(type,name)
-		})
-		program.command('use')
-		.description('如何使用本命令行？')
-		.action(function(type, name){
-		   console.log(ck.green(`全局安装本命令 npm -g install tmui-cli`))
-		   console.log(ck.green(`在你已有/空目录下创建/更新组件。`))
-		   console.log(ck.green(`比如在空目录下创建新的cli项目可以使用如下命令：`))
-		   console.log(ck.bgGreen(`tmui cli`))
-		   console.log(ck.green(`创建指定cli项目的tmui 版本号`))
-		   console.log(ck.bgGreen(`tmui cli 3.0.78`))
-		})
-	
-	program.parse();
-	
+	console.log(ck.white(`---------------------------------------------------`))
+	console.log(ck.white(`---------------------------------------------------`))
+	console.log(ck.white(`tmui3.0`))
+	console.log(ck.white(`欢迎使用tmui3.0 cli 命令行工具`))
+	console.log(ck.white(`将引导你创建一个tmui3.0组件框架的UNIAPP项目`))
+	console.log(ck.green(`文档地址：https://tmui.design`))
+	console.log(ck.white(`---------------------------------------------------`))
+	console.log(ck.white(`---------------------------------------------------`))
+	inquirer.then(ivk=>{
+		program
+			.version(require('../package').version)
+			program.command('cli')
+			.description('[可选指定版本号] 创建cli uniapp tmui3.0 项目[推荐]')
+			.action(function(type, name){
+				create.run(type,name)
+			})
+			program.command('hbx')
+			.description('[可选指定版本号] 创建hbx uniapp tmui3.0 项目[不推荐]')
+			.action(function(type, name){
+				createHbx.run(type,name)
+			})
+			program.command('rcli')
+			.description('[可选指定版本号] 已有cli项目下载/更新tmui3.0')
+			.action(function(type, name){
+				rcli.run(type,name)
+			})
+			program.command('rhbx')
+			.description('[可选指定版本号] 已有hbx项目下载/更新tmui3.0')
+			.action(function(type, name){
+				rhbx.run(type,name)
+			})
+			program.command('ver')
+			.description('查看tmui可用版本号')
+			.action(function(type, name){
+				viewTmuiVer.run(type,name)
+			})
+			program.command('use')
+			.description('引导式安装tmui组件!!!')
+			.action(function(type, name){
+				const { prompt,Separator} = ivk.default;
+					prompt([
+						{
+						type: 'list',
+						name: 'tmuiVerName',
+						message: '请选择你的uniApp项目的vue版本',
+						choices: [
+							'vue2',
+							'vue3'
+						],
+						}
+					])
+					.then((answers) => {
+						if(answers.tmuiVerName=="vue2"){
+							console.log("tmui2.0版本只支持uniApp HBX项目，请务必当前目录在你的项目文件夹下/或者一个空文件都可以。")
+							console.log("正在为你的项目下载/更新tmui2.0的最新版本。")
+							tm2.run()
+						}else if(answers.tmuiVerName=='vue3'){
 
-	
-	
-	
-	// cm
-	// .Option()
-	// .version(require('../package').version)
-	// .usage('<命令> [参数]')
-	// .command('create', '创建一个UNIAPP cli项目')
-	// .parse(process.argv)
+							ft.then((fah)=>{
+								const fetch = fah.default
+								fetch('https://cdn.tmui.design/tmuiVer.txt').then(async (res)=>{
+									let verText = await res.text();
+									let lastVer = verText.split('\n').slice(0,10)
+									prompt([
+										{
+											type: 'list',
+											name: 'moshi',
+											message: '选择安装方式：',
+											choices: [
+												'cli',
+												'rcli',
+												'hbx',
+												'rhbx',
+											],
+										},
+										{
+											type: 'list',
+											name: 'ver',
+											message: '选择最近的版本号',
+											choices: lastVer,
+										},
+										
+									])
+									.then((answers) => {
+										let ms = answers.moshi;
+										let ver = answers.ver.trim()
+										if(!ver||typeof ver=="undefined"){
+											console.log(ck.red("请正确输入版本号"))
+											return;
+										}
+										if(ms=="cli"){
+											create.run(null,null,ver)
+										}else if(ms=="rcli"){
+											rcli.run(null,null,ver)
+										}else if(ms=="hbx"){
+											createHbx.run(null,null,ver)
+										}else if(ms=="rhbx"){
+											rhbx.run(null,null,ver)
+										}
+									})	
+								})
+								
+							})	
+							
+						}
+					});
+
+					
+			})
+			program.parse();
+			
+	})
+		
 	
 })
 
-
+

package/package.json

@@ -1,22 +1,50 @@
 {
-  "name": "tmui-cli",
-  "version": "1.0.3",
-  "description": "tmui3.0",
-  "main": "./bin/tmui.js",
-  "scripts": {},
-  "bin": {
-    "tmui": "./bin/tmui.js"
+  "_from": "tmui-cli",
+  "_id": "tmui-cli@1.0.3",
+  "_inBundle": false,
+  "_integrity": "sha512-mnddgPs3eUjTuxQGv6hxlc0b98d53YXtjd0tvrlzWvrAnf0IS0qQMo4bZHi+ImwOEYqbNLX9jhd9pq1cVb9tjw==",
+  "_location": "/tmui-cli",
+  "_phantomChildren": {},
+  "_requested": {
+    "type": "tag",
+    "registry": true,
+    "raw": "tmui-cli",
+    "name": "tmui-cli",
+    "escapedName": "tmui-cli",
+    "rawSpec": "",
+    "saveSpec": null,
+    "fetchSpec": "latest"
   },
-  "keywords": [
-    "tmui",
-    "tm-vuetify"
+  "_requiredBy": [
+    "#USER"
   ],
-  "author": "tmzdy tmui",
-  "license": "ISC",
+  "_resolved": "https://registry.npmjs.org/tmui-cli/-/tmui-cli-1.0.3.tgz",
+  "_shasum": "162803da7d6cc696e3f4a908b223a15f0b33d245",
+  "_spec": "tmui-cli",
+  "_where": "C:\\Users\\zsylp",
+  "author": {
+    "name": "tmzdy tmui"
+  },
+  "bin": {
+    "tmui": "bin/tmui.js"
+  },
+  "bundleDependencies": false,
   "dependencies": {
     "chalk": "^5.0.1",
     "commander": "^9.4.0",
     "compressing": "^1.6.2",
+    "inquirer": "^9.1.0",
     "node-fetch": "^3.2.10"
-  }
+  },
+  "deprecated": false,
+  "description": "tmui3.0",
+  "keywords": [
+    "tmui",
+    "tm-vuetify"
+  ],
+  "license": "ISC",
+  "main": "./bin/tmui.js",
+  "name": "tmui-cli",
+  "scripts": {},
+  "version": "1.0.4"
 }

package/src/create.js

@@ -4,32 +4,34 @@ const fs = require("fs")
 const ft =  import("node-fetch")
 const compressing = require("compressing")
 const chilPro = require("child_process")
-exports.run = function(type, name) {
+
+exports.run = function(type, name,vr) {
 	chalk.then(v=>{
 		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){
+		if(vr!=null){
+			userInputVer = vr;
+		}else{
+			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
 			}
-		}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)=>{
 			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]
@@ -76,7 +78,9 @@ exports.run = function(type, name) {
 										fs.unlinkSync(path.join(nowPath,'cli.zip'))
 									}
 									console.log(ck.bgGreen('清理成功，正在安装依赖时间稍长~'))
-									chilPro.exec('npm install',error=>{
+								
+									const installNpm = chilPro.exec('npm install',(error, stdout, stderr)=>{
+										
 										if(error){
 											console.log('安装失败，请在当前目录手动安装依赖文件执行：',ck.bgRed(error))
 											console.log(ck.green('npm install'))
@@ -89,6 +93,11 @@ exports.run = function(type, name) {
 										console.log(ck.green('npm run dev:h5'))
 										console.log(ck.green('在本窗口输入上述命令，按回车键编译。'))
 									})
+								
+									installNpm.stdout?.on("data",(msg)=>{
+										console.log(msg.toString('utf8'))
+									})
+									
 								}).catch(err=>{
 									console.log(ck.bgRed(err))
 								})

package/src/createHbx.js

@@ -4,24 +4,27 @@ const fs = require("fs")
 const ft =  import("node-fetch")
 const compressing = require("compressing")
 const chilPro = require("child_process")
-exports.run = function(type, name) {
+exports.run = function(type, name,vr) {
 	chalk.then(v=>{
 		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){
+		if(vr!=null){
+			userInputVer = vr;
+		}else{
+			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
 			}
-		}else if(args.length==4){
-			userInputVer = args.pop()||""
-			userInputVer = typeof userInputVer=='undefined'?"":userInputVer
 		}
 		
 		ft.then((fah)=>{

package/src/rcli.js

@@ -4,24 +4,27 @@ const fs = require("fs")
 const ft =  import("node-fetch")
 const compressing = require("compressing")
 const chilPro = require("child_process")
-exports.run = function(type, name) {
+exports.run = function(type, name,vr) {
 	chalk.then(v=>{
 		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){
+		if(vr!=null){
+			userInputVer = vr;
+		}else{
+			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
 			}
-		}else if(args.length==4){
-			userInputVer = args.pop()||""
-			userInputVer = typeof userInputVer=='undefined'?"":userInputVer
 		}
 		ft.then((fah)=>{
 			const fetch = fah.default

package/src/rhbx.js

@@ -4,24 +4,27 @@ const fs = require("fs")
 const ft =  import("node-fetch")
 const compressing = require("compressing")
 const chilPro = require("child_process")
-exports.run = function(type, name) {
+exports.run = function(type, name,vr) {
 	chalk.then(v=>{
 		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){
+		if(vr!=null){
+			userInputVer = vr;
+		}else{
+			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
 			}
-		}else if(args.length==4){
-			userInputVer = args.pop()||""
-			userInputVer = typeof userInputVer=='undefined'?"":userInputVer
 		}
 		
 		if(fs.existsSync(path.join(nowPath,'router','index.ts'))){

package/src/tmui2.js

@@ -0,0 +1,60 @@
+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() {
+	chalk.then(v=>{
+		const ck = new v.Chalk();
+		const nowPath = path.resolve('./');
+		console.log(ck.bgBlue('不 要 关闭窗体，正在创建中....'))
+
+		ft.then((fah)=>{
+			const fetch = fah.default
+			//创建tmui目录
+			let tmuipath = path.join(nowPath,'tm-vuetify');
+			if(!fs.existsSync(tmuipath)){
+				fs.mkdirSync(tmuipath);
+			}
+			
+			fetch('https://cdn.tmui.design/tmui2.0Ver.txt').then(async (res)=>{
+				let verText = await res.text();
+				let ver = verText.split('\n')[0]
+				
+				let isVer = verText.includes(ver)
+				if(!isVer){
+					console.log(ck.red('不存在版本号：'+ver))
+					return;
+				}
+				console.log(ck.green(`---------------------------------------------------`))
+				console.log(ck.green('正在使用版本号：'+ver))
+				console.log(ck.green(`---------------------------------------------------`))
+				console.log(ck.bgBlue('不 要 关闭窗体，正在创建中....'))
+				//下载tmui
+				let donloadTmui = `https://cdn.tmui.design/public/static/tmui${ver}.zip`
+				fetch(donloadTmui).then(async (tmuires)=>{
+					fs.writeFileSync(path.join(nowPath,'tmui.zip'),await tmuires.buffer())
+					compressing.zip.uncompress(path.join(nowPath,'tmui.zip'),tmuipath)
+					.then(comtmui=>{
+						
+						if(fs.existsSync(path.join(nowPath,'tmui.zip'))){
+							fs.unlinkSync(path.join(nowPath,'tmui.zip'))
+						}
+						console.log(ck.bgGreen('已成功将tmui2.0下载至你的项目根目录下！'))
+						console.log(ck.bgGreen('具体安装配置流程见文档:https://jx2d.cn'))
+
+					}).catch(err=>{
+						console.log(ck.bgRed(err))
+					})
+				})
+				.catch(e=>{
+					console.log(ck.bgRed(e))
+				})
+			})
+			
+			
+		})
+		// fetch()tmuiVer.txt
+	})
+}