rigjs 1.0.34 → 2.0.0-alpha.1

package/lib/init/index.js

@@ -4,24 +4,22 @@
  * @author Wang Bo (ralwayne@163.com)
  * @date 2020/10/9 6:14 PM
  */
-const shell = require('shelljs');
 const fs = require('fs');
-const path = require('path');
 const json5 = require('json5');
-const inquirer = require('inquirer');
 const chalk = require('chalk');
 let log = console.log;
 let green = chalk.green;
-let red = chalk.red;
 let redBright = chalk.redBright;
 
-let yellow = chalk.yellow;
-
 //加载命令控制器
 
-const load = async (cmd) => {
+const load = async () => {
   try {
     console.log(chalk.blue('exec init'));
+    const pkg = JSON.parse(fs.readFileSync(`${process.cwd()}/package.json`));
+
+
+
     //检查当前目录是否存在package.json
     if (!(fs.existsSync('package.json') && fs.lstatSync('package.json').isFile())) {
       console.log(chalk.red('Please run this in the root directory of project!Must have a validate package.json'));
@@ -32,7 +30,7 @@ const load = async (cmd) => {
       console.log(chalk.green('package.rig.json5 already exists~'));
     } else {
       //创建package.rig.json5.json5
-      let template =`[
+      let template = `[
 //  {
 //    name: "your project name",
 //    source: "git ssh url",
@@ -43,26 +41,43 @@ const load = async (cmd) => {
       console.log(chalk.green('create package.rig.json5'));
       fs.writeFileSync('./package.rig.json5', template);
     }
-    if (fs.existsSync('rig_helper.js')){
+    if (fs.existsSync(`${process.cwd()}/rig_helper.js`)) {
       console.log(chalk.green('rig_helper.js already exists~'));
-    }else{
-      let rigHelper = `const json5 = require('json5');
+    } else {
+      console.log(chalk.green('create rig_helper.js'));
+      let template = `const json5 = require('json5');
 const fs = require('fs');
 const getPkgs = () => {
-  let pkgArr = json5.parse(fs.readFileSync('./package.rig.json5'));
-  let flatPkgArr = pkgArr.map((item, index) => {
-    return item.name;
-  });
-  console.log(flatPkgArr);
-  return flatPkgArr;
+\tlet pkgArr = json5.parse(fs.readFileSync('./package.rig.json5'));
+\tlet flatPkgArr = pkgArr.map((item, index) => {
+\t\treturn item.name;
+\t});
+\tconsole.log(flatPkgArr);
+\treturn flatPkgArr;
 }
 
 module.exports = {
-  getPkgs
+\tgetPkgs
 }
 `
-      console.log(chalk.green('create rig_helper.js'));
-      fs.writeFileSync('./rig_helper.js', rigHelper);
+      fs.writeFileSync(`${process.cwd()}/rig_helper.js`, template);
+    }
+    if (fs.existsSync(`${process.cwd()}/cicd.rig.json5`)) {
+      console.log(chalk.green('cicd.rig.json5 already exists~'));
+    } else {
+      console.log(chalk.green('create cicd.rig.json5'));
+      let template = `{
+  tree_schema: '{app}/{env}/{oem}',
+  source: {
+    root_path: 'dist',
+  },
+  target: {},
+  endpoints: {},
+  groups: [],
+}
+`;
+      fs.writeFileSync(`${process.cwd()}/cicd.rig.json5`, template);
+
     }
     //检查rigs是否存在
     if (fs.existsSync('./rigs') && fs.lstatSync('./rigs').isDirectory()) {
@@ -111,21 +126,21 @@ module.exports = {
         "rigs/*",
         "rigs_dev/*"
       ],
-      scripts:{
-        preinstall:"rig preinstall",
-        postinstall:"rig postinstall",
+      scripts: {
+        preinstall: "rig preinstall",
+        postinstall: "rig postinstall",
       },
-      devDependencies:{
-        json5:'2.1.3'
+      devDependencies: {
+        json5: '2.1.3'
       }
     }
     pkgJSON.private = inserted.private;
     //初始化workspaces
     if (pkgJSON.workspaces && pkgJSON.workspaces instanceof Array) {
-      if (pkgJSON.workspaces.indexOf('rigs/*')===-1) {
+      if (pkgJSON.workspaces.indexOf('rigs/*') === -1) {
         pkgJSON.workspaces.push('rigs/*')
       }
-      if (pkgJSON.workspaces.indexOf('rigs_dev/*')===-1) {
+      if (pkgJSON.workspaces.indexOf('rigs_dev/*') === -1) {
         pkgJSON.workspaces.push('rigs_dev/*')
       }
 
@@ -134,26 +149,26 @@ module.exports = {
     }
     //初始化pre/post-install
     if (pkgJSON.scripts && pkgJSON.scripts instanceof Object) {
-      if (pkgJSON.scripts.preinstall && pkgJSON.scripts.preinstall.indexOf(inserted.scripts.preinstall)<0) {
+      if (pkgJSON.scripts.preinstall && pkgJSON.scripts.preinstall.indexOf(inserted.scripts.preinstall) < 0) {
         pkgJSON.scripts.preinstall = `${pkgJSON.scripts.preinstall} && ${inserted.scripts.preinstall}`
-      }else{
+      } else {
         pkgJSON.scripts.preinstall = inserted.scripts.preinstall;
       }
-      if (pkgJSON.scripts.postinstall && pkgJSON.scripts.postinstall.indexOf(inserted.scripts.postinstall)<0) {
+      if (pkgJSON.scripts.postinstall && pkgJSON.scripts.postinstall.indexOf(inserted.scripts.postinstall) < 0) {
         pkgJSON.scripts.postinstall = `${pkgJSON.scripts.postinstall} && ${inserted.scripts.postinstall}`
-      }else{
+      } else {
         pkgJSON.scripts.postinstall = inserted.scripts.postinstall;
       }
     } else {
       pkgJSON.scripts = inserted.scripts
     }
-    if (pkgJSON.devDependencies){
+    if (pkgJSON.devDependencies) {
       //TODO:可优化
       pkgJSON.devDependencies.json5 = inserted.devDependencies.json5;
-    }else{
+    } else {
       pkgJSON.devDependencies = inserted.devDependencies;
     }
-    fs.writeFileSync('package.json', JSON.stringify(pkgJSON,null,2));
+    fs.writeFileSync('package.json', JSON.stringify(pkgJSON, null, 2));
     log(green('package.json updated'))
   } catch (e) {
     log(redBright(e.message));

package/lib/init/rig_helper.js

@@ -0,0 +1,14 @@
+const json5 = require('json5');
+const fs = require('fs');
+const getPkgs = () => {
+	let pkgArr = json5.parse(fs.readFileSync('./package.rig.json5'));
+	let flatPkgArr = pkgArr.map((item, index) => {
+		return item.name;
+	});
+	console.log(flatPkgArr);
+	return flatPkgArr;
+}
+
+module.exports = {
+	getPkgs
+}

package/lib/install/index.d.ts

@@ -0,0 +1,5 @@
+declare namespace install {
+	function load(): void;
+
+}
+export default install;

package/lib/install/index.js

@@ -7,7 +7,7 @@
 const shell = require('shelljs');
 const print = require('../print')
 //加载命令控制器
-const load = async (cmd) => {
+const load = async () => {
   print.info('start installing\n');
   try {
     let yarnProcess = shell.exec('yarn install',{silent:true});
@@ -24,6 +24,5 @@ const load = async (cmd) => {
   }
 }
 module.exports = {
-  name: 'install',
   load
 }

package/lib/postinstall/index.d.ts

@@ -0,0 +1,6 @@
+declare namespace postinstall {
+	function load(): void;
+	const name: string;
+
+}
+export default postinstall;

package/lib/preinstall/index.d.ts

@@ -0,0 +1,6 @@
+declare namespace preinstall {
+	function load(): void;
+	const name: string;
+
+}
+export default preinstall;

package/lib/rig/index.ts

@@ -0,0 +1,49 @@
+import {Command} from 'commander';
+
+const program = new Command();
+console.log('Hello');
+
+import check from '../check';
+
+program.command('check').action(check.load);
+import init from '../init';
+
+program.command('init').action(init.load);
+import install from '../install';
+
+program.command('install').action(install.load);
+program.command('i').action(install.load);
+import preinstall from '../preinstall';
+import postinstall from '../postinstall';
+
+program.command('preinstall').action(preinstall.load);
+program.command('postinstall').action(postinstall.load);
+import tag from '../tag';
+
+program.command('tag').action(tag.load);
+import info from '../info';
+
+program.command('info').action(info.load);
+import build from '../build';
+
+program.command('build')
+	.option('-s, --schema <schema>', 'specify params in tree_schema')
+	.option('-p , --params <params>', 'replace words in cicd.rig.json5, only words in ${} are replacable')
+	.action(build);
+// import define from '../define';
+//
+// program.command('define')
+// 	.option('-s, --schema <schema>', 'specify params in tree_schema')
+// 	.option('-p , --params <params>', 'replace words in cicd.rig.json5, only words in ${} are replacable')
+// 	.action(define);
+import deploy from '../deploy';
+
+program.command('deploy')
+	.option('-s, --schema <schema>', 'specify params in tree_schema')
+	.option('-p , --params <params>', 'replace words in cicd.rig.json5, only words in ${} are replacable')
+	.action(deploy);
+import env from '../env';
+
+program.option('-e, --env <env>', 'specify env').action(env.load);
+program.version(require('../../package.json').version, '-v,--version');
+program.parse(process.argv);

package/lib/tag/index.d.ts

@@ -0,0 +1,6 @@
+declare namespace tag {
+	function load(): void;
+	const name: string;
+
+}
+export default tag;

package/lib/tag/index.js

@@ -5,13 +5,10 @@
  * @date 2020/10/15 3:28 PM
  */
 const fs = require('fs');
-const JSON5 = require('json5');
 const shell = require('shelljs');
 const chalk = require('chalk');
 const print = require('../print');
 let red = chalk.red;
-let greenBright = chalk.greenBright;
-let redBright = chalk.redBright;
 
 
 const load = async ()=>{

package/lib/utils/fsHelper.ts

@@ -0,0 +1,10 @@
+import fs from 'fs';
+
+const JSON5 = require('json5');
+const readCICDConfig = () => {
+	const cicdStr = fs.readFileSync(`${process.cwd()}/cicd.rig.json5`);
+	return JSON5.parse(cicdStr);
+}
+export default {
+	readCICDConfig
+}

package/lib/utils/index.js

@@ -5,6 +5,9 @@
  * @date 2020/10/10 3:58 PM
  */
 const regex = require('./regex');
+const fsHelper = require('./fsHelper');
+
 module.exports ={
-  regex
+  regex,
+  fsHelper
 }

package/lib/utils/{regex.js → regex.ts}

@@ -6,7 +6,13 @@
  */
 const gitURL = /(?:git|ssh|https?|git@[-\w.]+):(\/\/)?(.*?)(\.git)(\/?|\#[-\d\w._]+?)$/;
 const path = /^(\/\w+){0,2}\/?$/;
-module.exports = {
-  gitURL,
-  path
+/**
+ * 文字下划线中划线
+ * @type {RegExp}
+ */
+const dynamicDir = /(^\[[\w\-]+\]$)|(^\{[\w\-]+\}$)/
+export default {
+	gitURL,
+	path,
+	dynamicDir
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "rigjs",
-  "version": "1.0.34",
+  "version": "2.0.0-alpha.1",
   "description": "A multi-repos dev tool based on yarn and git.Rig is inspired by cocoapods. Not like those monorepo solutions,rig is a tool for organizing multi-repos.",
   "keywords": [
     "modular",
@@ -28,14 +28,27 @@
     "c": "d demo && node ../lib/rig/index.js check",
     "envmake": "cd demo && node ../lib/rig/index.js --env prod_view_zhs",
     "t": "node lib/rig/index.js tag",
-    "deliver": "npm publish --registry=https://registry.npmjs.org"
+    "deliver": "npm publish --registry=https://registry.npmjs.org",
+    "build": "esbuild lib/rig/index.ts --platform=node --bundle --minify --outfile=built/index.js --external:shelljs"
   },
   "dependencies": {
+    "@types/ali-oss": "^6.16.3",
+    "@types/json5": "^2.2.0",
+    "@types/qs": "^6.9.7",
+    "@types/shelljs": "^0.8.11",
+    "@types/uuid": "^8.3.4",
+    "ali-oss": "^6.17.1",
+    "axios": "^0.26.1",
     "chalk": "^4.1.0",
     "commander": "6.1.0",
+    "dayjs": "^1.11.0",
     "inquirer": "7.3.3",
     "json5": "2.1.3",
     "ora": "^5.1.0",
-    "shelljs": "^0.8.4"
+    "shelljs": "^0.8.4",
+    "uuid": "^8.3.2"
+  },
+  "devDependencies": {
+    "@types/node": "^17.0.21"
   }
 }

package/tsconfig.json

@@ -0,0 +1,50 @@
+{
+	"compilerOptions": {
+		"target": "es2015",
+		"module": "CommonJS",
+		"strict": true,
+		"importHelpers": true,
+		"moduleResolution": "node",
+		"esModuleInterop": true,
+		"experimentalDecorators": true,
+		"allowSyntheticDefaultImports": true,
+		"sourceMap": true,
+		"baseUrl": ".",
+		"resolveJsonModule": true,
+		"outDir": "./built",
+		"allowJs": true,
+		"types": [
+			"node"
+		],
+		"paths": {
+			"@/*": [
+				"./lib/*"
+			],
+			"@root/*": [
+				"./*"
+			],
+			"@static/*": [
+				"static/*"
+			],
+			"tslib": [
+				"node_modules/tslib/tslib.d.ts"
+			]
+		},
+		"lib": [
+			"es2015"
+		]
+	},
+	"include": [
+		"index.ts",
+		"rigs/**/*.ts",
+		"src/**/*.ts",
+		"lib/**/*.ts",
+		"lib/**/*.d.ts",
+		"lib/**/*.js",
+		"test/**/*.ts",
+		"typings/**/*.ts",
+	],
+	"exclude": [
+		"node_modules"
+	]
+}

package/.github/workflows/npm-publish.yml

@@ -1,44 +0,0 @@
-# This workflow will run tests using node and then publish a package to GitHub Packages when a release is created
-# For more information see: https://help.github.com/actions/language-and-framework-guides/publishing-nodejs-packages
-
-name: Node.js Package
-
-on:
-  push:
-    branches:
-    - main
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 12
-
-  publish-npm:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 12
-          registry-url: https://registry.npmjs.org/
-      - run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.npm_token}}
-
-  publish-gpr:
-    needs: build
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v1
-        with:
-          node-version: 12
-          registry-url: https://npm.pkg.github.com/
-      - run: npm publish
-        env:
-          NODE_AUTH_TOKEN: ${{secrets.GITHUB_TOKEN}}

package/demo/package.rig2.json5

@@ -1,8 +0,0 @@
-[
-  {
-    name: "r-foundation",
-    source: "git@git.rys.cn:f2e-common/r-foundation.git",
-    version: "1.0.1",
-    dev: true
-  }
-]

package/demo/test.js

@@ -1,18 +0,0 @@
-// const fs = require('fs');
-// let pkgStr = fs.readFileSync('package.json').toString();
-// let pkg = JSON.parse(pkgStr);
-// console.log(pkg);
-// pkg.info = 'test';
-// // fs.('package.json');
-// fs.writeFileSync('package.json', JSON.stringify(pkg,null,2));
-//  pkgStr = fs.readFileSync('package.json').toString();
-//  pkg = JSON.parse(pkgStr);
-// console.log(pkg);
-//
-console.log(/^([a-z]+-){1,3}([0-9]+)(\.([0-9]+)){3}$/.test('a-a-1.2.1.1'));
-//cmd
-// console.log(/^(\.([0-9]+)){3}$/.test('a-a-1.2.1.1'));
-console.log('a-a-1.2.1.1'.split(/(?<=[a-z])-(?=[0-9])/));
-
-//抓取版本
-

package/lib/rig/index.js

@@ -1,17 +0,0 @@
-const { Command } = require('commander');
-const program = new Command();
-const fs = require('fs');
-program.command('check').action(require('../check').load);
-program.command('init').action(require('../init').load);
-program.command('install').action(require('../install').load);
-program.command('i').action(require('../install').load);
-program.command('publish').action(require('../publish').load);
-program.command('p').action(require('../publish').load);
-program.command('preinstall').action(require('../preinstall').load);
-program.command('postinstall').action(require('../postinstall').load);
-program.command('tag').action(require('../tag').load);
-program.command('info').action(require('../info').load);
-program.option('-e, --env <env>', 'specify env').action(require('../env').load);
-
-program.version(require('../../package.json').version,'-v,--version');
-program.parse(process.argv);