From 04189feb2faf19a4b68b1408f308b8e08d7381cb Mon Sep 17 00:00:00 2001 From: qlin Date: Tue, 27 Sep 2022 09:56:12 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20js=20=E8=AF=AD=E6=B3=95=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E5=AF=BC=E8=87=B4=20dev=20=E9=80=80=E5=87=BA=20(#149)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/fes-plugin-model/src/utils/index.js | 82 ++++++++++--------- packages/fes-plugin-vuex/src/helper.js | 13 +-- .../src/plugins/misc/route/index.js | 22 +++-- 3 files changed, 65 insertions(+), 52 deletions(-) diff --git a/packages/fes-plugin-model/src/utils/index.js b/packages/fes-plugin-model/src/utils/index.js index c12a0506..36c53d05 100644 --- a/packages/fes-plugin-model/src/utils/index.js +++ b/packages/fes-plugin-model/src/utils/index.js @@ -112,10 +112,15 @@ export const genModels = (imports, absSrcPath) => { const checkDuplicates = list => new Set(list).size !== list.length; const raw = contents.map((ele, index) => { - const ast = parser.parse(ele.content, { - sourceType: 'module', - plugins: ['jsx', 'typescript'] - }); + let ast; + try { + ast = parser.parse(ele.content, { + sourceType: 'module', + plugins: ['jsx', 'typescript'] + }); + } catch (err) { + return null; + } const use = []; @@ -136,7 +141,7 @@ export const genModels = (imports, absSrcPath) => { }); return { namespace: ele.namespace, use, importName: `model${index}` }; - }); + }).filter(Boolean); const models = sort(raw); @@ -149,45 +154,46 @@ export const genModels = (imports, absSrcPath) => { }; export const isValidHook = (filePath) => { - const content = readFileSync(filePath, { encoding: 'utf-8' }).toString(); - - const ast = parser.parse(content, { - sourceType: 'module', - plugins: [ - 'classProperties', - 'dynamicImport', - 'exportDefaultFrom', - 'exportNamespaceFrom', - 'functionBind', - 'nullishCoalescingOperator', - 'objectRestSpread', - 'optionalChaining', - 'decorators-legacy' - ].filter(Boolean) - }); let valid = false; - let identifierName = ''; - traverse(ast, { - enter(p) { - if (p.isExportDefaultDeclaration()) { - const { type } = p.node.declaration; - try { - if ( - type === 'ArrowFunctionExpression' + try { + const content = readFileSync(filePath, { encoding: 'utf-8' }).toString(); + + const ast = parser.parse(content, { + sourceType: 'module', + plugins: [ + 'classProperties', + 'dynamicImport', + 'exportDefaultFrom', + 'exportNamespaceFrom', + 'functionBind', + 'nullishCoalescingOperator', + 'objectRestSpread', + 'optionalChaining', + 'decorators-legacy' + ].filter(Boolean) + }); + + let identifierName = ''; + traverse(ast, { + enter(p) { + if (p.isExportDefaultDeclaration()) { + const { type } = p.node.declaration; + try { + if ( + type === 'ArrowFunctionExpression' || type === 'FunctionDeclaration' - ) { - valid = true; - } else if (type === 'Identifier') { - identifierName = p.node.declaration.name; + ) { + valid = true; + } else if (type === 'Identifier') { + identifierName = p.node.declaration.name; + } + } catch (e) { + console.error(e); } - } catch (e) { - console.error(e); } } - } - }); + }); - try { if (identifierName) { ast.program.body.forEach((ele) => { if (ele.type === 'FunctionDeclaration') { diff --git a/packages/fes-plugin-vuex/src/helper.js b/packages/fes-plugin-vuex/src/helper.js index 85ada0ea..508ef1bb 100644 --- a/packages/fes-plugin-vuex/src/helper.js +++ b/packages/fes-plugin-vuex/src/helper.js @@ -105,11 +105,14 @@ function parseModel(paths = [], root) { importModules.push(`import ${moduleName} from '${path}'`); modules.push(moduleName); const content = readFileSync(path).toString('utf-8'); - let ast = parser.parse(content, { - sourceType: 'module', - plugins: ['jsx', 'typescript'] - }); - ast = ast.program.body.filter(body => body.type === 'ExportDefaultDeclaration')[0]; + let ast; + try { + ast = parser.parse(content, { + sourceType: 'module', + plugins: ['jsx', 'typescript'] + }); + ast = ast.program.body.filter(body => body.type === 'ExportDefaultDeclaration')[0]; + } catch (err) {} if (ast) { const { mutations, actions, getters } = getModelTypes(ast.declaration, moduleName); MUTATION_TYPES = { diff --git a/packages/fes-preset-built-in/src/plugins/misc/route/index.js b/packages/fes-preset-built-in/src/plugins/misc/route/index.js index 4d564c30..a5533bda 100644 --- a/packages/fes-preset-built-in/src/plugins/misc/route/index.js +++ b/packages/fes-preset-built-in/src/plugins/misc/route/index.js @@ -69,16 +69,20 @@ const getRoutePath = function (parentRoutePath, fileName, isFile = true) { }; function getRouteMeta(content) { - const ast = parser.parse(content, { - sourceType: 'module', - plugins: ['jsx', 'typescript'] - }); - const defineRouteExpression = ast.program.body.filter(expression => expression.type === 'ExpressionStatement' && expression.expression.type === 'CallExpression' && expression.expression.callee.name === 'defineRouteMeta')[0]; - if (defineRouteExpression) { - const argument = generator(defineRouteExpression.expression.arguments[0]); - return JSON.parse(argument.code.replace(/'/g, '"').replace(/(\S+):/g, (global, m1) => `"${m1}":`)); + try { + const ast = parser.parse(content, { + sourceType: 'module', + plugins: ['jsx', 'typescript'] + }); + const defineRouteExpression = ast.program.body.filter(expression => expression.type === 'ExpressionStatement' && expression.expression.type === 'CallExpression' && expression.expression.callee.name === 'defineRouteMeta')[0]; + if (defineRouteExpression) { + const argument = generator(defineRouteExpression.expression.arguments[0]); + return JSON.parse(argument.code.replace(/'/g, '"').replace(/(\S+):/g, (global, m1) => `"${m1}":`)); + } + return null; + } catch (error) { + return null; } - return null; } let cacheGenRoutes = {};