egg-ts-helper
Advanced tools
egg-ts-helper - npm Package Compare versions
Comparing version 1.3.2 to 1.4.0
@@ -45,3 +45,3 @@ #! /usr/bin/env node | ||
| }); | ||
| process.exit(1); | ||
| process.exit(0); | ||
| } | ||
@@ -62,2 +62,2 @@ const watchFiles = program.watch; | ||
| .build(); | ||
| //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmluLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2Jpbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFFQSx5Q0FBb0M7QUFDcEMsK0JBQStCO0FBQy9CLDZCQUE2QjtBQUM3Qiw0Q0FBNEM7QUFDNUMseUJBQTJEO0FBQzNELG1DQUEyQztBQUUzQyxNQUFNLE1BQU0sR0FBRyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQztBQUM3QyxNQUFNLFlBQVksR0FBRyxtQkFBTyxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUM7QUFDakQsbUJBQU8sQ0FBQyxTQUFTLENBQUMsU0FBUyxHQUFHLFVBQVMsSUFBYyxFQUFFLE9BQU87SUFDNUQsTUFBTSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxZQUFZLENBQUMsSUFBSSxDQUFDLElBQUksRUFBRSxJQUFJLEVBQUUsT0FBTyxDQUFDLENBQUM7QUFDaEUsQ0FBQyxDQUFDO0FBRUYsTUFBTSxPQUFPLEdBQUcsSUFBSSxtQkFBTyxFQUFFLENBQUM7QUFFOUIsT0FBTztLQUNKLE9BQU8sQ0FBQyxRQUFRLENBQUMsT0FBTyxFQUFFLGVBQWUsQ0FBQztLQUMxQyxLQUFLLENBQUMsc0JBQXNCLENBQUM7S0FDN0IsTUFBTSxDQUFDLGFBQWEsRUFBRSx5REFBeUQsQ0FBQztLQUNoRixNQUFNLENBQUMsa0JBQWtCLEVBQUUsaURBQWlELENBQUM7S0FDN0UsTUFBTSxDQUFDLHFCQUFxQixFQUFFLHVIQUF1SCxDQUFDO0tBQ3RKLE1BQU0sQ0FBQyx3QkFBd0IsRUFBRSw2QkFBNkIsQ0FBQztLQUMvRCxNQUFNLENBQUMsY0FBYyxFQUFFLHdCQUF3QixDQUFDO0tBQ2hELE1BQU0sQ0FBQyxxQkFBcUIsRUFBRSx3RkFBd0YsQ0FBQztLQUN2SCxNQUFNLENBQUMsc0JBQXNCLEVBQUUsaUZBQWlGLENBQUM7S0FDakgs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 | ||
| //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiYmluLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL2Jpbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFFQSx5Q0FBb0M7QUFDcEMsK0JBQStCO0FBQy9CLDZCQUE2QjtBQUM3Qiw0Q0FBNEM7QUFDNUMseUJBQTJEO0FBQzNELG1DQUEyQztBQUUzQyxNQUFNLE1BQU0sR0FBRyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQztBQUM3QyxNQUFNLFlBQVksR0FBRyxtQkFBTyxDQUFDLFNBQVMsQ0FBQyxTQUFTLENBQUM7QUFDakQsbUJBQU8sQ0FBQyxTQUFTLENBQUMsU0FBUyxHQUFHLFVBQVMsSUFBYyxFQUFFLE9BQU87SUFDNUQsT0FBTyxNQUFNLENBQUMsQ0FBQyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsWUFBWSxDQUFDLElBQUksQ0FBQyxJQUFJLEVBQUUsSUFBSSxFQUFFLE9BQU8sQ0FBQyxDQUFDO0FBQ2hFLENBQUMsQ0FBQztBQUVGLE1BQU0sT0FBTyxHQUFHLElBQUksbUJBQU8sRUFBRSxDQUFDO0FBRTlCLE9BQU87S0FDSixPQUFPLENBQUMsUUFBUSxDQUFDLE9BQU8sRUFBRSxlQUFlLENBQUM7S0FDMUMsS0FBSyxDQUFDLHNCQUFzQixDQUFDO0tBQzdCLE1BQU0sQ0FBQyxhQUFhLEVBQUUseURBQXlELENBQUM7S0FDaEYsTUFBTSxDQUFDLGtCQUFrQixFQUFFLGlEQUFpRCxDQUFDO0tBQzdFLE1BQU0sQ0FBQyxxQkFBcUIsRUFBRSx1SEFBdUgsQ0FBQztLQUN0SixNQUFNLENBQUMsd0JBQXdCLEVBQUUsNkJBQTZCLENBQUM7S0FDL0QsTUFBTSxDQUFDLGNBQWMsRUFBRSx3QkFBd0IsQ0FBQztLQUNoRCxNQUFNLENBQUMscUJBQXFCLEVBQUUsd0ZBQXdGLENBQUM7S0FDdkgsTUFBTSxDQUFDLHNCQUFzQixFQUFFLGlGQUFpRixDQUFDO0tBQ2pILE1BQU0s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 |
@@ -9,5 +9,4 @@ "use strict"; | ||
| tsHelper.register('class', (config, baseConfig) => { | ||
| const dtsDir = path.resolve(baseConfig.typings, path.relative(baseConfig.cwd, config.dir)); | ||
| const fileList = utils.loadFiles(config.dir); | ||
| const dist = path.resolve(dtsDir, 'index.d.ts'); | ||
| const fileList = utils.loadFiles(config.dir, config.pattern); | ||
| const dist = path.resolve(config.dtsDir, 'index.d.ts'); | ||
| debug('file list : %o', fileList); | ||
@@ -23,20 +22,14 @@ if (!fileList.length) { | ||
| f = f.substring(0, f.lastIndexOf('.')); | ||
| const props = f.split('/').map(prop => | ||
| // transfer _ to uppercase | ||
| prop.replace(/[_-][a-z]/gi, s => s.substring(1).toUpperCase())); | ||
| // composing moduleName | ||
| const moduleName = props | ||
| .map(prop => prop[0].toUpperCase() + prop.substring(1)) | ||
| .join(''); | ||
| const obj = utils.getModuleObjByPath(f); | ||
| const tsPath = path | ||
| .relative(dtsDir, path.join(config.dir, f)) | ||
| .relative(config.dtsDir, path.join(config.dir, f)) | ||
| .replace(/\/|\\/g, '/'); | ||
| debug('import %s from %s', moduleName, tsPath); | ||
| importStr += `import ${moduleName} from '${tsPath}';\n`; | ||
| debug('import %s from %s', obj.moduleName, tsPath); | ||
| importStr += `import ${obj.moduleName} from '${tsPath}';\n`; | ||
| // create mapping | ||
| let collector = interfaceMap; | ||
| while (props.length) { | ||
| const name = camelProp(props.shift(), baseConfig.caseStyle); | ||
| if (!props.length) { | ||
| collector[name] = moduleName; | ||
| while (obj.props.length) { | ||
| const name = camelProp(obj.props.shift(), baseConfig.caseStyle); | ||
| if (!obj.props.length) { | ||
| collector[name] = obj.moduleName; | ||
| } | ||
@@ -92,2 +85,2 @@ else { | ||
| } | ||
| //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZ2VuZXJhdG9ycy9jbGFzcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDJCQUEyQjtBQUMzQiw2QkFBNkI7QUFFN0Isa0NBQWtDO0FBQ2xDLE1BQU0sS0FBSyxHQUFHLENBQUMsQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDO0FBRWxELG1CQUF3QixRQUFrQjtJQUN4QyxRQUFRLENBQUMsUUFBUSxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRSxVQUFVLEVBQUUsRUFBRTtRQUNoRCxNQUFNLE1BQU0sR0FBRyxJQUFJLENBQUMsT0FBTyxDQUN6QixVQUFVLENBQUMsT0FBTyxFQUNsQixJQUFJLENBQUMsUUFBUSxDQUFDLFVBQVUsQ0FBQyxHQUFHLEVBQUUsTUFBTSxDQUFDLEdBQUcsQ0FBQyxDQUMxQyxDQUFDO1FBRUYsTUFBTSxRQUFRLEdBQUcsS0FBSyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLENBQUM7UUFDN0MsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxNQUFNLEVBQUUsWUFBWSxDQUFDLENBQUM7UUFFaEQsS0FBSyxDQUFDLGdCQUFnQixFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBQ2xDLEVBQUUsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDckIsTUFBTSxDQUFDLEVBQUUsSUFBSSxFQUFFLENBQUM7UUFDbEIsQ0FBQztRQUVELCtCQUErQjtRQUMvQixJQUFJLFNBQVMsR0FBRyxFQUFFLENBQUM7UUFDbkIsb0NBQW9DO1FBQ3BDLE1BQU0sWUFBWSxHQUFnQixFQUFFLENBQUM7UUFFckMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRTtZQUNuQixDQUFDLEdBQUcsQ0FBQyxDQUFDLFNBQVMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxHQUFHLENB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 | ||
| //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY2xhc3MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvZ2VuZXJhdG9ycy9jbGFzcy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDJCQUEyQjtBQUMzQiw2QkFBNkI7QUFFN0Isa0NBQWtDO0FBQ2xDLE1BQU0sS0FBSyxHQUFHLENBQUMsQ0FBQyxnQ0FBZ0MsQ0FBQyxDQUFDO0FBRWxELG1CQUF3QixRQUFrQjtJQUN4QyxRQUFRLENBQUMsUUFBUSxDQUFDLE9BQU8sRUFBRSxDQUFDLE1BQU0sRUFBRSxVQUFVLEVBQUUsRUFBRTtRQUNoRCxNQUFNLFFBQVEsR0FBRyxLQUFLLENBQUMsU0FBUyxDQUFDLE1BQU0sQ0FBQyxHQUFHLEVBQUUsTUFBTSxDQUFDLE9BQU8sQ0FBQyxDQUFDO1FBQzdELE1BQU0sSUFBSSxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsTUFBTSxDQUFDLE1BQU0sRUFBRSxZQUFZLENBQUMsQ0FBQztRQUV2RCxLQUFLLENBQUMsZ0JBQWdCLEVBQUUsUUFBUSxDQUFDLENBQUM7UUFDbEMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUU7WUFDcEIsT0FBTyxFQUFFLElBQUksRUFBRSxDQUFDO1NBQ2pCO1FBRUQsK0JBQStCO1FBQy9CLElBQUksU0FBUyxHQUFHLEVBQUUsQ0FBQztRQUNuQixvQ0FBb0M7UUFDcEMsTUFBTSxZQUFZLEdBQWdCLEVBQUUsQ0FBQztRQUVyQyxRQUFRLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxFQUFFO1lBQ25CLENBQUMsR0FBRyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7WUFDdkMsTUFBTSxHQUFHLEdBQUcsS0FBSyxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQyxDQUFDO1lBQ3hDLE1BQU0sTUFBTSxHQUFHLElBQUk7aUJBQ2hCLFFBQVEsQ0FBQyxNQUFNLENBQUMsTUFBTSxFQUFF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 |
@@ -11,8 +11,13 @@ "use strict"; | ||
| tsHelper.register('extend', (config, baseConfig) => { | ||
| const dtsDir = path.resolve(baseConfig.typings, path.relative(baseConfig.cwd, config.dir)); | ||
| const fileList = !config.file | ||
| ? utils.loadFiles(config.dir) | ||
| ? utils.loadFiles(config.dir, config.pattern) | ||
| : config.file.endsWith('.ts') ? [config.file] : []; | ||
| debug('file list : %o', fileList); | ||
| if (!fileList.length) { | ||
| if (!config.file) { | ||
| // clean files | ||
| return Object.keys(config.interface).map(key => ({ | ||
| dist: path.resolve(config.dtsDir, `${key}.d.ts`), | ||
| })); | ||
| } | ||
| return; | ||
@@ -27,3 +32,3 @@ } | ||
| } | ||
| const dist = path.resolve(dtsDir, `${basename}.d.ts`); | ||
| const dist = path.resolve(config.dtsDir, `${basename}.d.ts`); | ||
| f = path.resolve(config.dir, f); | ||
@@ -38,3 +43,3 @@ if (!fs.existsSync(f)) { | ||
| } | ||
| let tsPath = path.relative(dtsDir, f).replace(/\/|\\/g, '/'); | ||
| let tsPath = path.relative(config.dtsDir, f).replace(/\/|\\/g, '/'); | ||
| tsPath = tsPath.substring(0, tsPath.lastIndexOf('.')); | ||
@@ -59,11 +64,4 @@ debug('import extendObject from %s', tsPath); | ||
| function findReturnPropertiesByTs(f) { | ||
| const code = fs.readFileSync(f, { | ||
| encoding: 'utf-8', | ||
| }); | ||
| let sourceFile; | ||
| try { | ||
| sourceFile = ts.createSourceFile(f, code, ts.ScriptTarget.ES2017, true); | ||
| } | ||
| catch (e) { | ||
| console.error(e); | ||
| const sourceFile = utils.getSourceFile(f); | ||
| if (!sourceFile) { | ||
| return; | ||
@@ -73,32 +71,36 @@ } | ||
| let exp; | ||
| handleNode(sourceFile); | ||
| function handleNode(node) { | ||
| if (node.parent === sourceFile) { | ||
| // find node in root scope | ||
| if (ts.isVariableStatement(node)) { | ||
| // const exportData = {}; | ||
| // export exportData | ||
| const declarations = node.declarationList.declarations; | ||
| declarations.forEach(declaration => { | ||
| if (ts.isIdentifier(declaration.name)) { | ||
| cache.set(declaration.name.escapedText, declaration.initializer); | ||
| } | ||
| }); | ||
| } | ||
| else if (ts.isExportAssignment(node)) { | ||
| // export default {} | ||
| exp = node.expression; | ||
| } | ||
| else if (ts.isExpressionStatement(node) && | ||
| ts.isBinaryExpression(node.expression)) { | ||
| // let exportData; | ||
| // exportData = {}; | ||
| // export exportData | ||
| if (ts.isIdentifier(node.expression.left)) { | ||
| cache.set(node.expression.left.escapedText, node.expression.right); | ||
| utils.eachSourceFile(sourceFile, node => { | ||
| if (node.parent !== sourceFile) { | ||
| return; | ||
| } | ||
| // find node in root scope | ||
| if (ts.isVariableStatement(node)) { | ||
| // const exportData = {}; | ||
| // export exportData | ||
| const declarations = node.declarationList.declarations; | ||
| declarations.forEach(declaration => { | ||
| if (ts.isIdentifier(declaration.name)) { | ||
| cache.set(declaration.name.escapedText, declaration.initializer); | ||
| } | ||
| }); | ||
| } | ||
| else if (ts.isExportAssignment(node)) { | ||
| // export default {} | ||
| exp = node.expression; | ||
| } | ||
| else if (utils.modifierHas(node, ts.SyntaxKind.ExportKeyword) && | ||
| utils.modifierHas(node, ts.SyntaxKind.DefaultKeyword)) { | ||
| // export default | ||
| exp = node; | ||
| } | ||
| else if (ts.isExpressionStatement(node) && | ||
| ts.isBinaryExpression(node.expression)) { | ||
| // let exportData; | ||
| // exportData = {}; | ||
| // export exportData | ||
| if (ts.isIdentifier(node.expression.left)) { | ||
| cache.set(node.expression.left.escapedText, node.expression.right); | ||
| } | ||
| } | ||
| ts.forEachChild(node, handleNode); | ||
| } | ||
| }); | ||
| if (!exp) { | ||
@@ -137,2 +139,2 @@ return; | ||
| exports.findReturnPropertiesByTs = findReturnPropertiesByTs; | ||
| //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXh0ZW5kLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2dlbmVyYXRvcnMvZXh0ZW5kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsMkJBQTJCO0FBQzNCLHlCQUF5QjtBQUN6Qiw2QkFBNkI7QUFDN0IsaUNBQWlDO0FBRWpDLGtDQUFrQztBQUNsQyxNQUFNLEtBQUssR0FBRyxDQUFDLENBQUMsaUNBQWlDLENBQUMsQ0FBQztBQUVuRCxtQkFBd0IsUUFBa0I7SUFDeEMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLEVBQUU7UUFDakQsTUFBTSxNQUFNLEdBQUcsSUFBSSxDQUFDLE9BQU8sQ0FDekIsVUFBVSxDQUFDLE9BQU8sRUFDbEIsSUFBSSxDQUFDLFFBQVEsQ0FBQyxVQUFVLENBQUMsR0FBRyxFQUFFLE1BQU0sQ0FBQyxHQUFHLENBQUMsQ0FDMUMsQ0FBQztRQUVGLE1BQU0sUUFBUSxHQUFHLENBQUMsTUFBTSxDQUFDLElBQUk7WUFDM0IsQ0FBQyxDQUFDLEtBQUssQ0FBQyxTQUFTLENBQUMsTUFBTSxDQUFDLEdBQUcsQ0FBQztZQUM3QixDQUFDLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFLENBQUM7UUFFckQsS0FBSyxDQUFDLGdCQUFnQixFQUFFLFFBQVEsQ0FBQyxDQUFDO1FBQ2xDLEVBQUUsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDckIsTUFBTSxDQUFDO1FBQ1QsQ0FBQztRQUVELE1BQU0sTUFBTSxHQUFzQixFQUFFLENBQUM7UUFDckMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsRUFBRTtZQUNuQixNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsUUFBUSxD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 | ||
| //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZXh0ZW5kLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2dlbmVyYXRvcnMvZXh0ZW5kLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsMkJBQTJCO0FBQzNCLHlCQUF5QjtBQUN6Qiw2QkFBNkI7QUFDN0IsaUNBQWlDO0FBRWpDLGtDQUFrQztBQUNsQyxNQUFNLEtBQUssR0FBRyxDQUFDLENBQUMsaUNBQWlDLENBQUMsQ0FBQztBQUVuRCxtQkFBd0IsUUFBa0I7SUFDeEMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxNQUFNLEVBQUUsVUFBVSxFQUFFLEVBQUU7UUFDakQsTUFBTSxRQUFRLEdBQUcsQ0FBQyxNQUFNLENBQUMsSUFBSTtZQUMzQixDQUFDLENBQUMsS0FBSyxDQUFDLFNBQVMsQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFLE1BQU0sQ0FBQyxPQUFPLENBQUM7WUFDN0MsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO1FBRXJELEtBQUssQ0FBQyxnQkFBZ0IsRUFBRSxRQUFRLENBQUMsQ0FBQztRQUNsQyxJQUFJLENBQUMsUUFBUSxDQUFDLE1BQU0sRUFBRTtZQUNwQixJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRTtnQkFDaEIsY0FBYztnQkFDZCxPQUFPLE1BQU0sQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLFNBQVMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUM7b0JBQy9DLElBQUksRUFBRSxJQUFJLENBQUMsT0FBTyxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUUsR0FBRyxHQUFHLE9BQU8sQ0FBQztpQkFDakQsQ0FBQyxDQUFDLENBQUM7YUFDTDtZQUVELE9BQU87U0FDUjtRQUVELE1BQU0s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 |
@@ -11,4 +11,5 @@ /// <reference types="node" /> | ||
| generator: string; | ||
| trigger: string[]; | ||
| enabled: boolean; | ||
| trigger?: string[]; | ||
| pattern?: string; | ||
| } | ||
@@ -20,3 +21,3 @@ export interface TsHelperOption { | ||
| watchDirs?: { | ||
| [key: string]: WatchItem; | ||
| [key: string]: WatchItem | boolean; | ||
| }; | ||
@@ -33,2 +34,3 @@ caseStyle?: string; | ||
| dir: string; | ||
| dtsDir: string; | ||
| file?: string; | ||
@@ -82,2 +84,14 @@ } & WatchItem; | ||
| }; | ||
| config: { | ||
| path: string; | ||
| pattern: string; | ||
| interface: { | ||
| inserts: string[]; | ||
| property: string; | ||
| base: string; | ||
| }; | ||
| generator: string; | ||
| trigger: string[]; | ||
| enabled: boolean; | ||
| }; | ||
| service: { | ||
@@ -110,2 +124,2 @@ path: string; | ||
| } | ||
| export declare function createTsHelperInstance(options?: TsHelperOption): default; | ||
| export declare function createTsHelperInstance(options?: TsHelperOption): TsHelper; |
@@ -54,2 +54,14 @@ "use strict"; | ||
| }, | ||
| config: { | ||
| path: 'config', | ||
| pattern: 'config*', | ||
| interface: { | ||
| inserts: ['Application', 'Context', 'Controller', 'Service'], | ||
| property: 'config', | ||
| base: 'EggAppConfig', | ||
| }, | ||
| generator: 'config', | ||
| trigger: ['add', 'unlink', 'change'], | ||
| enabled: true, | ||
| }, | ||
| service: { | ||
@@ -182,3 +194,4 @@ path: 'app/service', | ||
| } | ||
| const result = generator(Object.assign({}, generatorConfig, { dir, file }), config); | ||
| const dtsDir = path.resolve(config.typings, path.relative(config.cwd, dir)); | ||
| const result = generator(Object.assign({}, generatorConfig, { dir, file, dtsDir }), config); | ||
| debug('generate ts file result : %o', result); | ||
@@ -269,2 +282,2 @@ if (result) { | ||
| } | ||
| //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":";;AAAA,qCAAqC;AACrC,2BAA2B;AAC3B,mCAAsC;AACtC,yBAAyB;AACzB,iCAAiC;AACjC,6BAA6B;AAC7B,iCAAiC;AACjC,MAAM,KAAK,GAAG,CAAC,CAAC,qBAAqB,CAAC,CAAC;AA0C1B,QAAA,aAAa,GAAG;IAC3B,GAAG,EAAE,OAAO,CAAC,GAAG,EAAE;IAClB,SAAS,EAAE,KAAK;IAChB,OAAO,EAAE,WAAW;IACpB,SAAS,EAAE,OAAO;IAClB,YAAY,EAAE,IAAI;IAClB,QAAQ,EAAE,GAAG;IACb,KAAK,EAAE,KAAK;IACZ,UAAU,EAAE,KAAK;IACjB,SAAS,EAAE,EAAE;IACb,UAAU,EAAE,eAAe;CAC5B,CAAC;AAEF,oBAAoB;AACpB;IACE,MAAM,CAAC;QACL,MAAM,EAAE;YACN,IAAI,EAAE,YAAY;YAClB,SAAS,EAAE;gBACT,OAAO,EAAE,SAAS;gBAClB,WAAW,EAAE,aAAa;gBAC1B,KAAK,EAAE,aAAa;gBACpB,OAAO,EAAE,SAAS;gBAClB,QAAQ,EAAE,UAAU;gBACpB,MAAM,EAAE,SAAS;aAClB;YACD,SAAS,EAAE,QAAQ;YACnB,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,EAAE,QAAQ,CAAC;YACpC,OAAO,EAAE,IAAI;SACd;QAED,UAAU,EAAE;YACV,IAAI,EAAE,gBAAgB;YACtB,SAAS,EAAE,aAAa;YACxB,SAAS,EAAE,OAAO;YAClB,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC;YAC1B,OAAO,EAAE,IAAI;SACd;QAED,KAAK,EAAE;YACL,IAAI,EAAE,WAAW;YACjB,SAAS,EAAE,QAAQ;YACnB,SAAS,EAAE,OAAO;YAClB,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC;YAC1B,OAAO,EAAE,KAAK;SACf;QAED,OAAO,EAAE;YACP,IAAI,EAAE,aAAa;YACnB,SAAS,EAAE,UAAU;YACrB,SAAS,EAAE,OAAO;YAClB,OAAO,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC;YAC1B,OAAO,EAAE,IAAI;SACd;KACF,CAAC;AACJ,CAAC;AAzCD,kDAyCC;AAED,qBAAqB;AACrB,MAAM,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,cAAc,CAAC,CAAC;AACnD,MAAM,UAAU,GAAG,EAAE;KAClB,WAAW,CAAC,EAAE,CAAC;KACf,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;KACjC,GAAG,CACF,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAC3E,CAAC;AAEJ,cAA8B,SAAQ,qBAAY;IAShD,YAAY,UAA0B,EAAE;QACtC,KAAK,EAAE,CAAC;QAND,eAAU,GAAwC,EAAE,CAAC;QAEtD,cAAS,GAAgB,EAAE,CAAC;QAC5B,YAAO,GAAY,KAAK,CAAC;QAK/B,MAAM,MAAM,GAAG,CAAC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;QAEvD,KAAK,CAAC,iBAAiB,EAAE,MAAM,CAAC,SAAS,CAAC,CAAC;QAE3C,0BAA0B;QAC1B,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC;QAErC,oBAAoB;QACpB,IAAI,CAAC,aAAa,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE;YAC9D,MAAM,GAAG,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YAClC,MAAM,CAAC,MAAM,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC;gBACzD,CAAC,CAAC,GAAG,CAAC,OAAO;gBACb,CAAC,CAAC,IAAI,CAAC;QACX,CAAC,CAAC,CAAC;QAEH,oBAAoB;QACpB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAC5C,MAAM,IAAI,GAAG,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;YACnC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC;YAC/C,MAAM,CAAC,mBAAmB,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,CAAC,CAAC;QAC5C,CAAC,CAAC,CAAC;QAEH,wBAAwB;QACxB,EAAE,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;YACtB,KAAK,CAAC,cAAc,CAAC,CAAC;YACtB,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,CAAC;QAED,sBAAsB;QACtB,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC;YACjB,IAAI,CAAC,KAAK,EAAE,CAAC;QACf,CAAC;IACH,CAAC;IAED,0BAA0B;IAC1B,QAAQ,CACN,IAAY,EACZ,KAAqB;QAErB,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;IAChC,CAAC;IAED,iBAAiB;IACjB,KAAK;QACH,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;IACvD,CAAC;IAED,eAAe;IACf,KAAK;QACH,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;YACjB,MAAM,CAAC;QACT,CAAC;QAED,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,mBAAmB;QACnB,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE;YAC1C,oCAAoC;YACpC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,gBAAgB,CAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAClE,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,CAAC,IAAI,CAAC,OAAO,GAAG,QAAQ,CAAC,KAAK,CAAC,SAAS,EAAE;YACxD,aAAa,EAAE,IAAI;SACpB,CAAC,CAAC,CAAC;QAEJ,uBAAuB;QACvB,OAAO,CAAC,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC;QAEzD,sCAAsC;QACtC,EAAE,CAAC,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,CAAC;YACxB,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,KAAK,CAAC,gBAAgB,CAAC,CAAC;QAC/C,CAAC;QAED,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC;IACtB,CAAC;IAED,YAAY;IACZ,sCAAsC;IAC9B,SAAS,CAAC,OAAuB;QACvC,cAAc;QACd,MAAM,MAAM,qBAAQ,qBAAa,IAAE,SAAS,EAAE,mBAAmB,EAAE,GAAE,CAAC;QACtE,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,IAAI,MAAM,CAAC,GAAG,CAAC;QACtC,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,MAAM,CAAC,UAAU,CAAC;QAC3D,MAAM,OAAO,GACX,KAAK,CAAC,WAAW,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,gBAAgB,CAAC,CAAC,IAAI,EAAE,CAAC;QAE/D,yBAAyB;QACzB,EAAE,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC;YAChB,MAAM,CAAC,SAAS,GAAG,OAAO,CAAC,GAAG,CAAC,SAAS,IAAI,qBAAa,CAAC,SAAS,CAAC;YACpE,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC5C,CAAC;QAED,uBAAuB;QACvB,WAAW,CACT,MAAM,EACN,KAAK,CAAC,WAAW,CAAC,mBAAmB,CAAC,UAAU,EAAE,GAAG,CAAC,CAAC,CACxD,CAAC;QACF,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAEpB,2CAA2C;QAC3C,WAAW,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QAC7B,KAAK,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAErB,yCAAyC;QACzC,MAAM,CAAC,OAAO,GAAG,mBAAmB,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAE1D,MAAM,CAAC,MAAwB,CAAC;IAClC,CAAC;IAED,8BAA8B;IACtB,eAAe,CAAC,CAAS;QAC/B,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YAC/C,EAAE,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;gBACrC,QAAQ,CAAC;YACX,CAAC;YAED,MAAM,CAAC,CAAC,CAAC;QACX,CAAC;QAED,MAAM,CAAC,CAAC,CAAC,CAAC;IACZ,CAAC;IAEO,UAAU,CAAC,KAAa,EAAE,KAAc,EAAE,IAAa;QAC7D,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC3B,MAAM,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QAClC,MAAM,eAAe,GAAG,MAAM,CAAC,SAAS,CACtC,IAAI,CAAC,aAAa,CAAC,KAAK,CAAC,CACb,CAAC;QAEf,EAAE,CAAC,CACD,CAAC,eAAe,CAAC,OAAO;YACxB,CAAC,KAAK,IAAI,CAAC,eAAe,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CACpD,CAAC,CAAC,CAAC;YACD,sCAAsC;YACtC,MAAM,CAAC;QACT,CAAC;QAED,MAAM,SAAS,GACb,OAAO,eAAe,CAAC,SAAS,KAAK,QAAQ;YAC3C,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,SAAS,CAAC;YAC5C,CAAC,CAAC,eAAe,CAAC,SAAS,CAAC;QAEhC,EAAE,CAAC,CAAC,OAAO,SAAS,KAAK,UAAU,CAAC,CAAC,CAAC;YACpC,MAAM,IAAI,KAAK,CAAC,iBAAiB,eAAe,CAAC,SAAS,cAAc,CAAC,CAAC;QAC5E,CAAC;QAED,MAAM,MAAM,GAAG,SAAS,mBAAM,eAAe,IAAE,GAAG,EAAE,IAAI,KAAI,MAAM,CAAC,CAAC;QACpE,KAAK,CAAC,8BAA8B,EAAE,MAAM,CAAC,CAAC;QAC9C,EAAE,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;YACX,MAAM,UAAU,GAAG,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;YAC7D,UAAU,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACxB,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC;oBACjB,KAAK,CAAC,mBAAmB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;oBACtC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC;oBACrC,EAAE,CAAC,aAAa,CACd,IAAI,CAAC,IAAI,EACT,kDAAkD;wBAChD,yCAAyC;wBACzC,IAAI,CAAC,OAAO,CACf,CAAC;oBACF,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBACjC,CAAC;gBAAC,IAAI,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBACpC,KAAK,CAAC,kBAAkB,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;oBACrC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACzB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,IAAI,CAAC,CAAC;gBACjC,CAAC;YACH,CAAC,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,6BAA6B;IACrB,QAAQ,CAAC,CAAS,EAAE,KAAa;QACvC,KAAK,CAAC,mBAAmB,EAAE,CAAC,CAAC,CAAC;QAE9B,uBAAuB;QACvB,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;YACvB,MAAM,CAAC;QACT,CAAC;QAED,MAAM,CAAC,GAAG,CAAC,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC;QAC7C,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;YACtB,MAAM,CAAC;QACT,CAAC;QAED,iBAAiB;QACjB,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,GAAG,EAAE;YAClC,MAAM,KAAK,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YACtC,uBAAuB;YACvB,EAAE,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,CAAC;gBACd,MAAM,CAAC;YACT,CAAC;YAED,KAAK,CAAC,4BAA4B,EAAE,KAAK,CAAC,CAAC;YAC3C,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC;YACvB,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YACjC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;QAC3B,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IAC3B,CAAC;CACF;AAjND,2BAiNC;AAED,gCAAuC,OAAwB;IAC7D,MAAM,CAAC,IAAI,QAAQ,CAAC,OAAO,CAAC,CAAC;AAC/B,CAAC;AAFD,wDAEC;AAED,6BAA6B,CAAS,EAAE,GAAW;IACjD,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;AACvD,CAAC;AAED,0BAA0B;AAC1B,qBAAqB,IAAoB,EAAE,GAAG,IAAsB;IAClE,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;QACjB,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACT,MAAM,CAAC;QACT,CAAC;QAED,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;YAC7B,EAAE,CAAC,CAAC,GAAG,KAAK,WAAW,CAAC,CAAC,CAAC;gBACxB,MAAM,SAAS,GAAG,GAAG,CAAC,SAAS,IAAI,EAAE,CAAC;gBAEtC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;oBACjC,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;oBAC1B,EAAE,CAAC,CAAC,OAAO,IAAI,KAAK,SAAS,CAAC,CAAC,CAAC;wBAC9B,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;4BACtB,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,OAAO,GAAG,IAAI,CAAC;wBACnC,CAAC;oBACH,CAAC;oBAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;wBAChB,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;4BACtB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC;wBACzC,CAAC;wBAAC,IAAI,CAAC,CAAC;4BACN,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;wBAC3B,CAAC;oBACH,CAAC;gBACH,CAAC,CAAC,CAAC;YACL,CAAC;YAAC,IAAI,CAAC,CAAC;gBACN,IAAI,CAAC,GAAG,CAAC,GAAG,GAAG,CAAC,GAAG,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC5D,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC"} | ||
| //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} |
@@ -26,2 +26,2 @@ "use strict"; | ||
| } | ||
| //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVnaXN0ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcmVnaXN0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxpREFBcUM7QUFDckMsbUNBQW1DO0FBQ25DLDZCQUE2QjtBQUM3Qix5QkFBNEM7QUFFNUMsdUJBQXVCO0FBQ3ZCLEVBQUUsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDO0lBQ3JCLHVDQUF1QztJQUN2QyxNQUFNLEVBQUUsR0FBRyxvQkFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsU0FBUyxFQUFFLE9BQU8sQ0FBQyxFQUFFLENBQUMsSUFBSSxDQUFDLEVBQUU7UUFDeEQsUUFBUSxFQUFFLEVBQUU7S0FDYixDQUFDLENBQUM7SUFFSCx3Q0FBd0M7SUFDeEM7UUFDRSxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDO1lBQ2YsRUFBRSxDQUFDLElBQUksQ0FBQyxRQUFRLENBQUMsQ0FBQztRQUNwQixDQUFDO0lBQ0gsQ0FBQztJQUVELE9BQU8sQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLEtBQUssQ0FBQyxDQUFDO0lBQzFCLE9BQU8sQ0FBQyxFQUFFLENBQUMsUUFBUSxFQUFFLEtBQUssQ0FBQyxDQUFDO0lBQzVCLE9BQU8sQ0FBQyxFQUFFLENBQUMsU0FBUyxFQUFFLEtBQUssQ0FBQyxDQUFDO0lBQzdCLE9BQU8sQ0FBQyxFQUFFLENBQUMsUUFBUSxFQUFFLEtBQUssQ0FBQyxDQUFDO0lBRTVCLHlCQUF5QjtJQUN6Qix5QkFBc0IsRUFBRSxDQUFDLEtBQUssRUFBRSxDQUFDO0FBQ25DLENBQUMifQ== | ||
| //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVnaXN0ZXIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvcmVnaXN0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxpREFBcUM7QUFDckMsbUNBQW1DO0FBQ25DLDZCQUE2QjtBQUM3Qix5QkFBNEM7QUFFNUMsdUJBQXVCO0FBQ3ZCLElBQUksT0FBTyxDQUFDLFFBQVEsRUFBRTtJQUNwQix1Q0FBdUM7SUFDdkMsTUFBTSxFQUFFLEdBQUcsb0JBQUksQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFNBQVMsRUFBRSxPQUFPLENBQUMsRUFBRSxDQUFDLElBQUksQ0FBQyxFQUFFO1FBQ3hELFFBQVEsRUFBRSxFQUFFO0tBQ2IsQ0FBQyxDQUFDO0lBRUgsd0NBQXdDO0lBQ3hDO1FBQ0UsSUFBSSxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUU7WUFDZCxFQUFFLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1NBQ25CO0lBQ0gsQ0FBQztJQUVELE9BQU8sQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLEtBQUssQ0FBQyxDQUFDO0lBQzFCLE9BQU8sQ0FBQyxFQUFFLENBQUMsUUFBUSxFQUFFLEtBQUssQ0FBQyxDQUFDO0lBQzVCLE9BQU8sQ0FBQyxFQUFFLENBQUMsU0FBUyxFQUFFLEtBQUssQ0FBQyxDQUFDO0lBQzdCLE9BQU8sQ0FBQyxFQUFFLENBQUMsUUFBUSxFQUFFLEtBQUssQ0FBQyxDQUFDO0lBRTVCLHlCQUF5QjtJQUN6Qix5QkFBc0IsRUFBRSxDQUFDLEtBQUssRUFBRSxDQUFDO0NBQ2xDIn0= |
@@ -0,3 +1,11 @@ | ||
| import * as ts from 'typescript'; | ||
| export declare function loadFiles(cwd: string, pattern?: string): string[]; | ||
| export declare function getModuleObjByPath(f: string): { | ||
| props: string[]; | ||
| moduleName: string; | ||
| }; | ||
| export declare function removeSameNameJs(f: string): string | undefined; | ||
| export declare function getSourceFile(f: string): ts.SourceFile | undefined; | ||
| export declare function modifierHas(node: ts.Node, kind: any): ts.Token<ts.SyntaxKind.AbstractKeyword> | ts.Token<ts.SyntaxKind.AsyncKeyword> | ts.Token<ts.SyntaxKind.ConstKeyword> | ts.Token<ts.SyntaxKind.DeclareKeyword> | ts.Token<ts.SyntaxKind.DefaultKeyword> | ts.Token<ts.SyntaxKind.ExportKeyword> | ts.Token<ts.SyntaxKind.PublicKeyword> | ts.Token<ts.SyntaxKind.PrivateKeyword> | ts.Token<ts.SyntaxKind.ProtectedKeyword> | ts.Token<ts.SyntaxKind.ReadonlyKeyword> | ts.Token<ts.SyntaxKind.StaticKeyword> | undefined; | ||
| export declare function eachSourceFile(node: ts.Node, cb: (n: ts.Node) => any): void; | ||
| export declare function requireFile(url: any): any; |
@@ -5,5 +5,6 @@ "use strict"; | ||
| const glob = require("globby"); | ||
| const ts = require("typescript"); | ||
| // load ts/js files | ||
| function loadFiles(cwd, pattern = '**/*.(js|ts)') { | ||
| const fileList = glob.sync([pattern, '!**/*.d.ts'], { | ||
| function loadFiles(cwd, pattern) { | ||
| const fileList = glob.sync([pattern || '**/*.(js|ts)', '!**/*.d.ts'], { | ||
| cwd, | ||
@@ -18,2 +19,17 @@ }); | ||
| exports.loadFiles = loadFiles; | ||
| // get moduleName by file path | ||
| function getModuleObjByPath(f) { | ||
| const props = f.split('/').map(prop => | ||
| // transfer _ to uppercase | ||
| prop.replace(/[._-][a-z]/gi, s => s.substring(1).toUpperCase())); | ||
| // composing moduleName | ||
| const moduleName = props | ||
| .map(prop => prop[0].toUpperCase() + prop.substring(1)) | ||
| .join(''); | ||
| return { | ||
| props, | ||
| moduleName, | ||
| }; | ||
| } | ||
| exports.getModuleObjByPath = getModuleObjByPath; | ||
| // remove same name js | ||
@@ -31,2 +47,32 @@ function removeSameNameJs(f) { | ||
| exports.removeSameNameJs = removeSameNameJs; | ||
| // parse ts file to ast | ||
| function getSourceFile(f) { | ||
| const code = fs.readFileSync(f, { | ||
| encoding: 'utf-8', | ||
| }); | ||
| try { | ||
| return ts.createSourceFile(f, code, ts.ScriptTarget.ES2017, true); | ||
| } | ||
| catch (e) { | ||
| console.error(e); | ||
| return; | ||
| } | ||
| } | ||
| exports.getSourceFile = getSourceFile; | ||
| // check kind in node.modifiers. | ||
| function modifierHas(node, kind) { | ||
| return node.modifiers && node.modifiers.find(mod => kind === mod.kind); | ||
| } | ||
| exports.modifierHas = modifierHas; | ||
| // each ast node | ||
| function eachSourceFile(node, cb) { | ||
| const result = cb(node); | ||
| if (result === false) { | ||
| return; | ||
| } | ||
| node.forEachChild((sub) => { | ||
| eachSourceFile(sub, cb); | ||
| }); | ||
| } | ||
| exports.eachSourceFile = eachSourceFile; | ||
| // require modules | ||
@@ -47,2 +93,2 @@ function requireFile(url) { | ||
| exports.requireFile = requireFile; | ||
| //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx5QkFBeUI7QUFDekIsK0JBQStCO0FBRS9CLG1CQUFtQjtBQUNuQixtQkFBMEIsR0FBVyxFQUFFLFVBQWtCLGNBQWM7SUFDckUsTUFBTSxRQUFRLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLE9BQU8sRUFBRSxZQUFZLENBQUMsRUFBRTtRQUNsRCxHQUFHO0tBQ0osQ0FBQyxDQUFDO0lBRUgsTUFBTSxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsQ0FBQyxDQUFDLEVBQUU7UUFDekIseUJBQXlCO1FBQ3pCLE1BQU0sQ0FBQyxDQUFDLENBQ04sQ0FBQyxDQUFDLFFBQVEsQ0FBQyxLQUFLLENBQUM7WUFDakIsUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQyxDQUN2RCxDQUFDO0lBQ0osQ0FBQyxDQUFDLENBQUM7QUFDTCxDQUFDO0FBWkQsOEJBWUM7QUFFRCxzQkFBc0I7QUFDdEIsMEJBQWlDLENBQVM7SUFDeEMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQyxRQUFRLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzlDLE1BQU0sQ0FBQztJQUNULENBQUM7SUFFRCxNQUFNLEVBQUUsR0FBRyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsTUFBTSxHQUFHLENBQUMsQ0FBQyxHQUFHLElBQUksQ0FBQztJQUMvQyxFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN0QixFQUFFLENBQUMsVUFBVSxDQUFDLEVBQUUsQ0FBQyxDQUFDO1FBQ2xCLE1BQU0sQ0FBQyxFQUFFLENBQUM7SUFDWixDQUFDO0FBQ0gsQ0FBQztBQVZELDRDQVVDO0FBRUQsa0JBQWtCO0FBQ2xCLHFCQUE0QixHQUFHO0lBQzdCLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLFVBQVUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDeEIsTUFBTSxDQUFDLFNBQVMsQ0FBQztJQUNuQixDQUFDO0lBRUQsSUFBSSxHQUFHLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQyxDQUFDO0lBQ3ZCLEVBQUUsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxVQUFVLElBQUksU0FBUyxJQUFJLEdBQUcsQ0FBQyxDQUFDLENBQUM7UUFDdkMsR0FBRyxHQUFHLEdBQUcsQ0FBQyxPQUFPLENBQUM7SUFDcEIsQ0FBQztJQUVELEVBQUUsQ0FBQyxDQUFDLE9BQU8sR0FBRyxLQUFLLFVBQVUsQ0FBQyxDQUFDLENBQUM7UUFDOUIsR0FBRyxHQUFHLEdBQUcsRUFBRSxDQUFDO0lBQ2QsQ0FBQztJQUVELE1BQU0sQ0FBQyxHQUFHLENBQUM7QUFDYixDQUFDO0FBZkQsa0NBZUMifQ== | ||
| //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSx5QkFBeUI7QUFDekIsK0JBQStCO0FBQy9CLGlDQUFpQztBQUVqQyxtQkFBbUI7QUFDbkIsbUJBQTBCLEdBQVcsRUFBRSxPQUFnQjtJQUNyRCxNQUFNLFFBQVEsR0FBRyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsT0FBTyxJQUFJLGNBQWMsRUFBRSxZQUFZLENBQUMsRUFBRTtRQUNwRSxHQUFHO0tBQ0osQ0FBQyxDQUFDO0lBRUgsT0FBTyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBQyxFQUFFO1FBQ3pCLHlCQUF5QjtRQUN6QixPQUFPLENBQUMsQ0FDTixDQUFDLENBQUMsUUFBUSxDQUFDLEtBQUssQ0FBQztZQUNqQixRQUFRLENBQUMsUUFBUSxDQUFDLENBQUMsQ0FBQyxTQUFTLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLEdBQUcsSUFBSSxDQUFDLENBQ3ZELENBQUM7SUFDSixDQUFDLENBQUMsQ0FBQztBQUNMLENBQUM7QUFaRCw4QkFZQztBQUVELDhCQUE4QjtBQUM5Qiw0QkFBbUMsQ0FBUztJQUMxQyxNQUFNLEtBQUssR0FBRyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRTtJQUNwQywwQkFBMEI7SUFDMUIsSUFBSSxDQUFDLE9BQU8sQ0FBQyxjQUFjLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQyxDQUFDLFdBQVcsRUFBRSxDQUFDLENBQ2hFLENBQUM7SUFFRix1QkFBdUI7SUFDdkIsTUFBTSxVQUFVLEdBQUcsS0FBSztTQUNyQixHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsV0FBVyxFQUFF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 |
| { | ||
| "name": "egg-ts-helper", | ||
| "version": "1.3.2", | ||
| "version": "1.4.0", | ||
| "description": "egg typescript helper", | ||
@@ -40,3 +40,3 @@ "bin": { | ||
| "mkdirp": "^0.5.1", | ||
| "typescript": "^2.7.1" | ||
| "typescript": "^2.8.0" | ||
| }, | ||
@@ -56,2 +56,3 @@ "publishConfig": { | ||
| "@types/mkdirp": "^0.5.2", | ||
| "@types/mocha": "^5.0.0", | ||
| "@types/node": "^9.4.5", | ||
@@ -58,0 +59,0 @@ "@types/power-assert": "^1.4.29", |
@@ -51,14 +51,20 @@ # egg-ts-helper | ||
| Usage: ets [options] | ||
| Options: | ||
| -h, --help usage | ||
| -v, --version show version | ||
| -w, --watch watch file change | ||
| -c, --cwd [path] egg application base dir (default: process.cwd) | ||
| -C, --config [path] configuration file, The argument can be a file path to a valid JSON/JS configuration file.（default: {cwd}/tshelper.js） | ||
| -f, --framework [name] egg framework(default: egg) | ||
| -s, --silent disabled log | ||
| -i, --ignore [dir] ignore watchDirs, your can ignore multiple dirs with comma like: -i controller,service | ||
| -e, --enabled [dir] enabled watchDirs, your can use multiple dirs with comma like: -e proxy,other | ||
| -E, --extra [json] extra config, value type was a json string | ||
| Usage: ets [commands] [options] | ||
| Options: | ||
| -v, --version output the version number | ||
| -w, --watch Watching files, d.ts would recreated while file changed | ||
| -c, --cwd [path] Egg application base dir (default: process.cwd) | ||
| -C, --config [path] Configuration file, The argument can be a file path to a valid JSON/JS configuration file.（default: {cwd}/tshelper.js | ||
| -f, --framework [name] Egg framework(default: egg) | ||
| -s, --silent Running without output | ||
| -i, --ignore [dirs] Ignore watchDirs, your can ignore multiple dirs with comma like: -i controller,service | ||
| -e, --enabled [dirs] Enable watchDirs, your can enable multiple dirs with comma like: -e proxy,other | ||
| -E, --extra [json] Extra config, the value should be json string | ||
| -h, --help output usage information | ||
| Commands: | ||
| clean Clean js file while it has the same name ts file | ||
| ``` | ||
@@ -79,3 +85,3 @@ | ||
| egg-ts-helper would watching `app/extend`,`app/controller`,`app/service` by default. The dts would recreated when the files under these folders was changed. | ||
| egg-ts-helper would watching `app/extend`,`app/controller`,`app/service`, `app/config` by default. The dts would recreated when the files under these folders was changed. | ||
@@ -130,3 +136,3 @@ you can disabled some folders by `-i` flag. | ||
| It works in these directories : `app/controller`, `app/service`, `app/proxy`, `app/extend`. | ||
| It works in these directories : `app/controller`, `app/service`, `app/proxy`, `app/extend`, `app/config`. | ||
@@ -189,2 +195,40 @@ #### Controller | ||
| #### Config | ||
| ts | ||
| ```js | ||
| // config/config.default.ts | ||
| export default function() { | ||
| return { | ||
| keys: '123456' | ||
| } | ||
| } | ||
| ``` | ||
| typings | ||
| ```js | ||
| import { EggAppConfig } from 'egg'; | ||
| import ExportConfigDefault from '../../config/config.default'; | ||
| type ConfigDefault = ReturnType<typeof ExportConfigDefault>; | ||
| type NewEggAppConfig = EggAppConfig & ConfigDefault; | ||
| declare module 'egg' { | ||
| interface Application { | ||
| config: NewEggAppConfig; | ||
| } | ||
| interface Context { | ||
| config: NewEggAppConfig; | ||
| } | ||
| interface Controller { | ||
| config: NewEggAppConfig; | ||
| } | ||
| interface Service { | ||
| config: NewEggAppConfig; | ||
| } | ||
| } | ||
| ``` |
New alerts
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Fixed alerts
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
Improved metrics
- Total package byte prevSize
- increased by20.77%
73795
- Number of package files
- increased by12.5%
18
- Lines of code
- increased by28.08%
935
- Number of lines in readme file
- increased by23.53%
231
Worsened metrics
- Dev dependency count
- increased by5.88%
18
Dependency changes
Updatedtypescript@^2.8.0