From 5f0b7989dfceefdf061fca2bf1a4a8d89b614ba5 Mon Sep 17 00:00:00 2001 From: yylgit <394720943@qq.com> Date: Wed, 17 Apr 2019 15:51:14 +0800 Subject: [PATCH] template-parser --- .../chameleon-loader/src/interface-check/mvvm.js | 3 --- packages/chameleon-tool/configs/utils.js | 1 - packages/mvvm-babel-generator/lib/buffer.js | 2 +- .../mvvm-babel-generator/lib/generators/classes.js | 2 +- .../lib/generators/expressions.js | 2 +- packages/mvvm-babel-generator/lib/generators/flow.js | 2 +- .../mvvm-babel-generator/lib/generators/methods.js | 2 +- .../mvvm-babel-generator/lib/generators/modules.js | 2 +- .../lib/generators/statements.js | 2 +- .../mvvm-babel-generator/lib/generators/types.js | 4 ++-- packages/mvvm-babel-generator/lib/node/index.js | 2 +- .../mvvm-babel-generator/lib/node/parentheses.js | 2 +- packages/mvvm-babel-generator/lib/node/whitespace.js | 2 +- packages/mvvm-babel-generator/lib/printer.js | 6 +++--- packages/mvvm-babel-generator/lib/source-map.js | 2 +- packages/mvvm-interface-parser/README.md | 3 ++- packages/mvvm-pack/compiler.js | 2 +- packages/mvvm-template-parser/common/index.js | 2 +- .../mvvm-template-parser/common/process-template.js | 2 +- packages/mvvm-template-parser/index.js | 11 ++++++++--- packages/mvvm-template-parser/lib/standardParser.js | 12 ------------ 21 files changed, 29 insertions(+), 39 deletions(-) delete mode 100644 packages/chameleon-loader/src/interface-check/mvvm.js delete mode 100644 packages/mvvm-template-parser/lib/standardParser.js diff --git a/packages/chameleon-loader/src/interface-check/mvvm.js b/packages/chameleon-loader/src/interface-check/mvvm.js deleted file mode 100644 index 130ad142..00000000 --- a/packages/chameleon-loader/src/interface-check/mvvm.js +++ /dev/null @@ -1,3 +0,0 @@ -const getInterfaceCode = require('mvvm-interface-parser/lib/getInterfaceCode.js'); - -console.log(typeof getInterfaceCode) \ No newline at end of file diff --git a/packages/chameleon-tool/configs/utils.js b/packages/chameleon-tool/configs/utils.js index 4cd6ae7c..d58ad4e5 100644 --- a/packages/chameleon-tool/configs/utils.js +++ b/packages/chameleon-tool/configs/utils.js @@ -211,7 +211,6 @@ exports.updateEntry = function (updateEntryConfig) { source = parts.template[0].content; options = analyzeTemplate(source, options) } - } }); let usedBuildInTagMap = options.usedBuildInTagMap; diff --git a/packages/mvvm-babel-generator/lib/buffer.js b/packages/mvvm-babel-generator/lib/buffer.js index 8a800148..3e90905e 100644 --- a/packages/mvvm-babel-generator/lib/buffer.js +++ b/packages/mvvm-babel-generator/lib/buffer.js @@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { exports.default = void 0; function _trimRight() { - const data = _interopRequireDefault(require("trim-right")); + const data = _interopRequireDefault(require("../node_modules/trim-right")); _trimRight = function () { return data; diff --git a/packages/mvvm-babel-generator/lib/generators/classes.js b/packages/mvvm-babel-generator/lib/generators/classes.js index 7f54632a..281e30b7 100644 --- a/packages/mvvm-babel-generator/lib/generators/classes.js +++ b/packages/mvvm-babel-generator/lib/generators/classes.js @@ -12,7 +12,7 @@ exports.ClassPrivateMethod = ClassPrivateMethod; exports._classMethodHead = _classMethodHead; function t() { - const data = _interopRequireWildcard(require("@babel/types")); + const data = _interopRequireWildcard(require("../../node_modules/@babel/types/lib")); t = function () { return data; diff --git a/packages/mvvm-babel-generator/lib/generators/expressions.js b/packages/mvvm-babel-generator/lib/generators/expressions.js index 45efa98e..3f81bdb7 100644 --- a/packages/mvvm-babel-generator/lib/generators/expressions.js +++ b/packages/mvvm-babel-generator/lib/generators/expressions.js @@ -28,7 +28,7 @@ exports.PrivateName = PrivateName; exports.AwaitExpression = exports.YieldExpression = void 0; function t() { - const data = _interopRequireWildcard(require("@babel/types")); + const data = _interopRequireWildcard(require("../../node_modules/@babel/types/lib")); t = function () { return data; diff --git a/packages/mvvm-babel-generator/lib/generators/flow.js b/packages/mvvm-babel-generator/lib/generators/flow.js index 0b24d2cc..aca68e66 100644 --- a/packages/mvvm-babel-generator/lib/generators/flow.js +++ b/packages/mvvm-babel-generator/lib/generators/flow.js @@ -67,7 +67,7 @@ Object.defineProperty(exports, "StringLiteralTypeAnnotation", { }); function t() { - const data = _interopRequireWildcard(require("@babel/types")); + const data = _interopRequireWildcard(require("../../node_modules/@babel/types/lib")); t = function () { return data; diff --git a/packages/mvvm-babel-generator/lib/generators/methods.js b/packages/mvvm-babel-generator/lib/generators/methods.js index 39965bac..b70d07a6 100644 --- a/packages/mvvm-babel-generator/lib/generators/methods.js +++ b/packages/mvvm-babel-generator/lib/generators/methods.js @@ -13,7 +13,7 @@ exports.FunctionDeclaration = exports.FunctionExpression = FunctionExpression; exports.ArrowFunctionExpression = ArrowFunctionExpression; function t() { - const data = _interopRequireWildcard(require("@babel/types")); + const data = _interopRequireWildcard(require("../../node_modules/@babel/types/lib")); t = function () { return data; diff --git a/packages/mvvm-babel-generator/lib/generators/modules.js b/packages/mvvm-babel-generator/lib/generators/modules.js index af87bd58..68a56d97 100644 --- a/packages/mvvm-babel-generator/lib/generators/modules.js +++ b/packages/mvvm-babel-generator/lib/generators/modules.js @@ -15,7 +15,7 @@ exports.ImportDeclaration = ImportDeclaration; exports.ImportNamespaceSpecifier = ImportNamespaceSpecifier; function t() { - const data = _interopRequireWildcard(require("@babel/types")); + const data = _interopRequireWildcard(require("../../node_modules/@babel/types/lib")); t = function () { return data; diff --git a/packages/mvvm-babel-generator/lib/generators/statements.js b/packages/mvvm-babel-generator/lib/generators/statements.js index c74363de..b14900c5 100644 --- a/packages/mvvm-babel-generator/lib/generators/statements.js +++ b/packages/mvvm-babel-generator/lib/generators/statements.js @@ -19,7 +19,7 @@ exports.VariableDeclarator = VariableDeclarator; exports.ThrowStatement = exports.BreakStatement = exports.ReturnStatement = exports.ContinueStatement = exports.ForOfStatement = exports.ForInStatement = void 0; function t() { - const data = _interopRequireWildcard(require("@babel/types")); + const data = _interopRequireWildcard(require("../../node_modules/@babel/types/lib")); t = function () { return data; diff --git a/packages/mvvm-babel-generator/lib/generators/types.js b/packages/mvvm-babel-generator/lib/generators/types.js index 04a8a2fe..5bce8a8b 100644 --- a/packages/mvvm-babel-generator/lib/generators/types.js +++ b/packages/mvvm-babel-generator/lib/generators/types.js @@ -20,7 +20,7 @@ exports.PipelineBareFunction = PipelineBareFunction; exports.PipelinePrimaryTopicReference = PipelinePrimaryTopicReference; function t() { - const data = _interopRequireWildcard(require("@babel/types")); + const data = _interopRequireWildcard(require("../../node_modules/@babel/types/lib")); t = function () { return data; @@ -30,7 +30,7 @@ function t() { } function _jsesc() { - const data = _interopRequireDefault(require("jsesc")); + const data = _interopRequireDefault(require("../../node_modules/jsesc/jsesc")); _jsesc = function () { return data; diff --git a/packages/mvvm-babel-generator/lib/node/index.js b/packages/mvvm-babel-generator/lib/node/index.js index bef46f0e..a99f090c 100644 --- a/packages/mvvm-babel-generator/lib/node/index.js +++ b/packages/mvvm-babel-generator/lib/node/index.js @@ -13,7 +13,7 @@ var whitespace = _interopRequireWildcard(require("./whitespace")); var parens = _interopRequireWildcard(require("./parentheses")); function t() { - const data = _interopRequireWildcard(require("@babel/types")); + const data = _interopRequireWildcard(require("../../node_modules/@babel/types/lib")); t = function () { return data; diff --git a/packages/mvvm-babel-generator/lib/node/parentheses.js b/packages/mvvm-babel-generator/lib/node/parentheses.js index 3f98dc18..06ad5807 100644 --- a/packages/mvvm-babel-generator/lib/node/parentheses.js +++ b/packages/mvvm-babel-generator/lib/node/parentheses.js @@ -26,7 +26,7 @@ exports.AssignmentExpression = AssignmentExpression; exports.NewExpression = NewExpression; function t() { - const data = _interopRequireWildcard(require("@babel/types")); + const data = _interopRequireWildcard(require("../../node_modules/@babel/types/lib")); t = function () { return data; diff --git a/packages/mvvm-babel-generator/lib/node/whitespace.js b/packages/mvvm-babel-generator/lib/node/whitespace.js index 06121860..23efa9cd 100644 --- a/packages/mvvm-babel-generator/lib/node/whitespace.js +++ b/packages/mvvm-babel-generator/lib/node/whitespace.js @@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { exports.list = exports.nodes = void 0; function t() { - const data = _interopRequireWildcard(require("@babel/types")); + const data = _interopRequireWildcard(require("../../node_modules/@babel/types/lib")); t = function () { return data; diff --git a/packages/mvvm-babel-generator/lib/printer.js b/packages/mvvm-babel-generator/lib/printer.js index f32a4a99..78ef3cd6 100644 --- a/packages/mvvm-babel-generator/lib/printer.js +++ b/packages/mvvm-babel-generator/lib/printer.js @@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { exports.default = void 0; function _isInteger() { - const data = _interopRequireDefault(require("lodash/isInteger")); + const data = _interopRequireDefault(require("../node_modules/lodash/isInteger")); _isInteger = function () { return data; @@ -16,7 +16,7 @@ function _isInteger() { } function _repeat() { - const data = _interopRequireDefault(require("lodash/repeat")); + const data = _interopRequireDefault(require("../node_modules/lodash/repeat")); _repeat = function () { return data; @@ -30,7 +30,7 @@ var _buffer = _interopRequireDefault(require("./buffer")); var n = _interopRequireWildcard(require("./node")); function t() { - const data = _interopRequireWildcard(require("@babel/types")); + const data = _interopRequireWildcard(require("../node_modules/@babel/types/lib")); t = function () { return data; diff --git a/packages/mvvm-babel-generator/lib/source-map.js b/packages/mvvm-babel-generator/lib/source-map.js index 12b70308..5fc10e0b 100644 --- a/packages/mvvm-babel-generator/lib/source-map.js +++ b/packages/mvvm-babel-generator/lib/source-map.js @@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", { exports.default = void 0; function _sourceMap() { - const data = _interopRequireDefault(require("source-map")); + const data = _interopRequireDefault(require("../node_modules/source-map/source-map")); _sourceMap = function () { return data; diff --git a/packages/mvvm-interface-parser/README.md b/packages/mvvm-interface-parser/README.md index 6148d84d..5d731596 100644 --- a/packages/mvvm-interface-parser/README.md +++ b/packages/mvvm-interface-parser/README.md @@ -1 +1,2 @@ -#### mvvm协议标准中处理interface文件 \ No newline at end of file +#### 使用 +chameleon-loader和interface-loader中获取interface文件内容时使用 diff --git a/packages/mvvm-pack/compiler.js b/packages/mvvm-pack/compiler.js index 14aaad1d..e9244741 100644 --- a/packages/mvvm-pack/compiler.js +++ b/packages/mvvm-pack/compiler.js @@ -3,7 +3,7 @@ const path = require('path'); const Log = require('./log.js'); const EventEmitter = require('events'); const cmlUtils = require('chameleon-tool-utils'); -const parser = require('mvvm-babel-parser'); +const parser = require('../mvvm-babel-parser/lib'); class Compiler { constructor(webpackCompiler) { this.moduleRule = [ // 文件后缀对应module信息 diff --git a/packages/mvvm-template-parser/common/index.js b/packages/mvvm-template-parser/common/index.js index f4eb6d3a..93109a86 100644 --- a/packages/mvvm-template-parser/common/index.js +++ b/packages/mvvm-template-parser/common/index.js @@ -23,7 +23,7 @@ let source = `` let options = {lang: 'cml', diff --git a/packages/mvvm-template-parser/common/process-template.js b/packages/mvvm-template-parser/common/process-template.js index 89f4b28e..8978ece5 100644 --- a/packages/mvvm-template-parser/common/process-template.js +++ b/packages/mvvm-template-parser/common/process-template.js @@ -1,7 +1,7 @@ const parser = require('mvvm-babel-parser'); const t = require('@babel/types'); const traverse = require('@babel/traverse')["default"]; -const generate = require('mvvm-babel-generator')["default"]; +const generate = require('mvvm-babel-generator/lib')["default"]; const _ = module.exports = {}; /* 将vue语法的模板转化为cml语法 diff --git a/packages/mvvm-template-parser/index.js b/packages/mvvm-template-parser/index.js index 2ffccea7..aaa8c65e 100644 --- a/packages/mvvm-template-parser/index.js +++ b/packages/mvvm-template-parser/index.js @@ -1,8 +1,13 @@ -const standardParser = require('./lib/standardParser'); -const generator = require('@babel/generator'); +const {vueToCml} = require('./common/process-template.js'); +const parser = require('mvvm-babel-parser'); +const generator = require('mvvm-babel-generator/lib') + const types = require('@babel/types'); const traverse = require('@babel/traverse'); -exports.standardParser = standardParser; + + +exports.vueToCml = vueToCml; +exports.parser = parser; exports.generator = generator["default"]; exports.types = types; exports.traverse = traverse["default"]; diff --git a/packages/mvvm-template-parser/lib/standardParser.js b/packages/mvvm-template-parser/lib/standardParser.js deleted file mode 100644 index b4b5710f..00000000 --- a/packages/mvvm-template-parser/lib/standardParser.js +++ /dev/null @@ -1,12 +0,0 @@ -const parser = require('mvvm-babel-parser'); - -module.exports = function({source, lang = "cml"}) { - const ast = parser.parse(source, { - sourceType: 'module', - plugins: ['jsx'] - }); - return { - convert: ast, - output: source - } -} -- GitLab