依赖列表抽离到dep.json中

bin/cli-wrapper.js

@@ -15,11 +15,19 @@ exports.execute = async function (program) {
 
 	const componentsPath = program.projectPath || path.join(os.homedir(), '.scilla', 'components');
 	const componentsSrcPath = path.join(componentsPath, 'src');
+
 	const tsconfig = fs.readJsonSync(path.join(componentsPath, 'tsconfig.json'));
 
 	const inputFile = program.input;
 	const inputFileFolder = path.dirname(inputFile);
-	const outputFile = path.join(inputFileFolder, 'declare.json');
+	const outputFile = path.join(inputFileFolder, 'dec.json');
+
+	let dependencies;
+	try {
+		dependencies = fs.readJsonSync(path.join(inputFileFolder, 'dep.json'));
+	}catch (e) {
+
+	}
 
 	const projectPath = process.cwd();
 
@@ -27,8 +35,9 @@ exports.execute = async function (program) {
 		return source.fileName.indexOf(inputFileFolder) >= 0;
 	}
 
-	const {declareMap, dependencies, missingDependencies} = generateDeclareMap(
+	const {declareMap, missingDependencies} = generateDeclareMap(
 		tsconfig,
+		dependencies,
 		inputFile,
 		componentsSrcPath,
 		projectPath,
@@ -40,8 +49,6 @@ exports.execute = async function (program) {
 		console.log(result);
 	}
 
-	declareMap.dependencies = dependencies;
-
 	if (Object.keys(missingDependencies).length > 0) {
 		console.warn(JSON.stringify(missingDependencies, null, '\t'));
 		return 2;

package.json

@@ -7,6 +7,7 @@
   "dependencies": {
     "commander": "^2.20.0",
     "fs-extra": "^7.0.1",
+    "semver": "^6.0.0",
     "typescript": "^3.2.2"
   }
 }

src/index.js

@@ -3,6 +3,8 @@
  */
 
 const ts = require('typescript');
+const fs = require('fs-extra');
+const semver = require('semver');
 
 let declareMap;
 let _componentsPath;
@@ -16,7 +18,7 @@ const componentBaseClassName = '"scilla/core/Component".Component';
 const showLog = false;
 const showVerboseLog = false;
 
-exports.generateDeclareMap = function(tsconfig, file, componentsPath, projectPath, assetsPath, filter) {
+exports.generateDeclareMap = function(tsconfig, dependencies, file, componentsPath, projectPath, assetsPath, filter) {
 	_componentsPath = componentsPath;
 	_projectPath = projectPath;
 	_assetsPath = assetsPath;
@@ -24,6 +26,26 @@ exports.generateDeclareMap = function(tsconfig, file, componentsPath, projectPat
 
 	const config = ts.parseJsonConfigFileContent(tsconfig, ts.sys, projectPath);
 
+	const missingDependencies = [];
+
+	for(let key in dependencies){
+		let componentSrcPath = key.replace('components', 'src');
+		let versions = fs.readdirSync(componentSrcPath);
+		versions = versions.filter(item=>item.match(/^\d+\.\d+\.\d+$/));
+		let maxVersion = semver.maxSatisfying(versions, dependencies[key]);
+		if(maxVersion){
+			config.options.paths[key] = [componentSrcPath + '/' + maxVersion + '/index'];
+		}else{
+			missingDependencies.push(key);
+		}
+	}
+
+	if(missingDependencies.length > 0){
+		return {
+			missingDependencies
+		};
+	}
+
 	const files = file ? [file] : config.fileNames;
 	const program = ts.createProgram(files, config.options);
 	const sourceFiles = program.getSourceFiles();
@@ -35,29 +57,20 @@ exports.generateDeclareMap = function(tsconfig, file, componentsPath, projectPat
 	if(showLog) console.timeEnd('getTypeChecker');
 
 	if(showLog) console.time('delint');
-	const dependencies = [];
-	const missingDependencies = {};
 	for(let sourceFile of sourceFiles){
 		if (sourceFile.fileName.indexOf('.d.ts') < 0) {
 			if(!_filter || _filter(sourceFile)){
 				const fileName = sourceFile.fileName;
 				if(sourceFile.resolvedModules){
 					sourceFile.resolvedModules.forEach((item, key)=>{
-						if(!dependencies.includes(key)){
-							dependencies.push(key);
-						}
 						if(!item){
-							let t = missingDependencies[fileName];
-							if(!t){
-								t = missingDependencies[fileName] = [];
-							}
-							t.push(key);
+							missingDependencies.push(key);
 						}
 					});
 				}
-				if(showLog && showVerboseLog) console.time(sourceFile.fileName);
+				if(showLog && showVerboseLog) console.time(fileName);
 				delint(checker, sourceFile);
-				if(showLog && showVerboseLog) console.timeEnd(sourceFile.fileName);
+				if(showLog && showVerboseLog) console.timeEnd(fileName);
 			}
 		}
 	}
@@ -65,7 +78,6 @@ exports.generateDeclareMap = function(tsconfig, file, componentsPath, projectPat
 
 	return {
 		declareMap,
-		dependencies,
 		missingDependencies,
 	};
 };
@@ -226,6 +238,7 @@ function getFullyQualifiedNameOfType(type, checker) {
 				path = path.replace('src', 'components')
 			}else{
 				path = path.replace(_componentsPath, 'components')
+					.replace(/\/\d+\.\d+\.\d+\/index/, '')
 			}
 			fullClassName = `"${path}".${className}`;
 		}

test.js

-/**
- * Created by rockyl on 2018-12-19.
- */
-
-const {generateDeclareMap, } = require('./src/index');
-
-async function exec(){
-	let classDeclareMap = await generateDeclareMap(
-		'/Users/rockyl/.scilla/components',
-		'/Users/rockyl/WorkSpaces/scilla/jigsaw-puzzle',
-		'/Users/rockyl/WorkSpaces/scilla/jigsaw-puzzle/assets',
-		'/Users/rockyl/WorkSpaces/scilla/jigsaw-puzzle/assets/scripts/game/Puzzle.ts'
-	);
-
-	console.log(JSON.stringify(classDeclareMap, null, '\t'));
-	//const keys = Object.keys(classDeclareMap);
-	//console.log(keys);
-	//console.log(JSON.stringify(classDeclareMap[keys[keys.length - 1]], null, '\t'));
-}
-
-exec();

yarn.lock

@@ -28,6 +28,11 @@ jsonfile@^4.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
+semver@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.npm.taobao.org/semver/download/semver-6.0.0.tgz?cache=0&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fsemver%2Fdownload%2Fsemver-6.0.0.tgz#05e359ee571e5ad7ed641a6eec1e547ba52dea65"
+  integrity sha1-BeNZ7lceWtftZBpu7B5Ue6Ut6mU=
+
 typescript@^3.2.2:
   version "3.2.2"
   resolved "https://registry.npmjs.org/typescript/-/typescript-3.2.2.tgz#fe8101c46aa123f8353523ebdcf5730c2ae493e5"