@cocojs/compiler 0.1.0-beta.202601082202 → 0.1.0-beta.202601082203

package/README.md

@@ -1,10 +1,3 @@
-# @cocojs/compiler
-
-基于 typescript api 的转译程序。
-
-✨ **功能**
-- 组件添加`static $$id`属性
-- `@constructorParams()`装饰器添加入参
-- `@autowired()`装饰器添加入参
-- `@component()`装饰器添加入参
+# coconut-framework [![GitHub license](https://img.shields.io/badge/license-MIT-blue.svg)](https://github.com/cocojs-org/coconut-framework/blob/main/LICENSE)
 
+`@cocojs/bundle-webpack`属于[coconut-framework](https://github.com/cocojs-org/coconut-framework)代码仓，更多内容见[cocojs.dev](https://cocojs.dev)。

package/dist/index.cjs.js

@@ -186,6 +186,7 @@ function createImport(className, importPath) {
 }
 function updateTypeImports(sourceFile) {
   var identifyList = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var importConstructorInjectDecorator = arguments.length > 2 ? arguments[2] : undefined;
   if (!identifyList.length) {
     return sourceFile;
   }
@@ -239,11 +240,14 @@ function updateTypeImports(sourceFile) {
   } finally {
     _iterator.f();
   }
+  if (importConstructorInjectDecorator) {
+    newStatements.push(ts__namespace.factory.createImportDeclaration(undefined, ts__namespace.factory.createImportClause(undefined, undefined, ts__namespace.factory.createNamedImports([ts__namespace.factory.createImportSpecifier(false, undefined, ts__namespace.factory.createIdentifier('constructorInject'))])), ts__namespace.factory.createStringLiteral(importConstructorInjectDecorator.module), undefined));
+  }
   return ts__namespace.factory.updateSourceFile(sourceFile, [].concat(newStatements, _toConsumableArray(sourceFile.statements)));
 }
 
 function isConstructParamsDecorator(decorator) {
-  return isDecoratorExp(decorator, 'constructorParam');
+  return isDecoratorExp(decorator, 'constructorInject');
 }
 function extractIdentifiersFromConstructor(ctor) {
   var identifiers = [];
@@ -268,7 +272,7 @@ function extractIdentifiersFromConstructor(ctor) {
   }
   return identifiers;
 }
-function updateConstructorParamDecorator(classDeclaration) {
+function updateConstructorInjectDecorator(classDeclaration) {
   var modifiers = classDeclaration.modifiers;
   if (!modifiers) {
     return {
@@ -284,15 +288,8 @@ function updateConstructorParamDecorator(classDeclaration) {
     };
   }
   var constructParams = decorators.find(isConstructParamsDecorator);
-  if (!constructParams) {
-    return {
-      updated: false,
-      modifiers: classDeclaration.modifiers
-    };
-  }
-  var call = constructParams.expression;
-  // 已有参数，不处理
-  if (call.arguments.length > 0) {
+  if (constructParams) {
+    // 用户自定义，不处理
     return {
       updated: false,
       modifiers: classDeclaration.modifiers
@@ -315,15 +312,12 @@ function updateConstructorParamDecorator(classDeclaration) {
       modifiers: classDeclaration.modifiers
     };
   }
-  // 构造数组：[Api, User]
-  var arrayLiteral = ts__namespace.factory.createArrayLiteralExpression(identifiers, false);
-  var newModifiers = modifiers.map(function (m) {
-    return ts__namespace.isDecorator(m) && m === constructParams ? ts__namespace.factory.createDecorator(ts__namespace.factory.updateCallExpression(call, call.expression, call.typeArguments, [arrayLiteral])) : m;
-  });
+  var constructorInjectDecorator = ts__namespace.factory.createDecorator(ts__namespace.factory.createCallExpression(ts__namespace.factory.createIdentifier('constructorInject'), undefined, [ts__namespace.factory.createArrayLiteralExpression(identifiers, false)]));
+  var newModifiers = [].concat(_toConsumableArray(modifiers), [constructorInjectDecorator]);
   return {
     updated: true,
     modifiers: newModifiers,
-    constructorParamTypeList: identifiers
+    constructorInjectTypeList: identifiers
   };
 }
 
@@ -459,26 +453,32 @@ function updateMembers(classDeclaration) {
     componentList: componentList
   };
 }
+/**
+ * 转换工具工厂函数
+ * @param idPrefix id前缀
+ * @param addConstructorInjectImportStmt 遇到构造函数有参数时，是否添加import { constructorInject } from 'xxx'语句
+ */
 function transformerFactory() {
-  var prefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  var idPrefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  var addConstructorInjectImportStmt = arguments.length > 1 ? arguments[1] : undefined;
   return function (context) {
-    var constructorParamList = [];
+    var constructorInjectList = [];
     var autowiredList = [];
     var componentList = [];
     var _visit = function visit(node) {
       if (ts__namespace.isClassDeclaration(node)) {
         if (hasClassKindDecorator(node)) {
-          var $$idProperty = ifNeedAdd$$idProperty(node, prefix);
+          var $$idProperty = ifNeedAdd$$idProperty(node, idPrefix);
           var _updateMembers = updateMembers(node),
             members = _updateMembers.members,
             membersUpdated = _updateMembers.updated,
             _autowiredList = _updateMembers.autowiredList,
             _componentList = _updateMembers.componentList;
-          var _updateConstructorPar = updateConstructorParamDecorator(node),
-            modifiers = _updateConstructorPar.modifiers,
-            constructorParamsUpdated = _updateConstructorPar.updated,
-            _constructorParamTypeList = _updateConstructorPar.constructorParamTypeList;
-          if (!membersUpdated && !constructorParamsUpdated && !$$idProperty) {
+          var _updateConstructorInj = updateConstructorInjectDecorator(node),
+            modifiers = _updateConstructorInj.modifiers,
+            constructorInjectUpdated = _updateConstructorInj.updated,
+            _constructorInjectTypeList = _updateConstructorInj.constructorInjectTypeList;
+          if (!membersUpdated && !constructorInjectUpdated && !$$idProperty) {
             return node;
           } else {
             if (_autowiredList) {
@@ -487,8 +487,8 @@ function transformerFactory() {
             if (_componentList) {
               componentList = _componentList;
             }
-            if (constructorParamsUpdated) {
-              constructorParamList = _constructorParamTypeList;
+            if (constructorInjectUpdated) {
+              constructorInjectList = _constructorInjectTypeList;
             }
             return ts__namespace.factory.updateClassDeclaration(node, modifiers, node.name, node.typeParameters, node.heritageClauses, $$idProperty ? [$$idProperty].concat(_toConsumableArray(members)) : members);
           }
@@ -501,10 +501,20 @@ function transformerFactory() {
     // @ts-ignore
     return function (sourceFile) {
       var updatedSourceFile = ts__namespace.visitNode(sourceFile, _visit);
-      if (!constructorParamList.length && !autowiredList.length && !componentList.length) {
+      if (!constructorInjectList.length && !autowiredList.length && !componentList.length) {
         return updatedSourceFile;
       }
-      return updateTypeImports(updatedSourceFile, [].concat(_toConsumableArray(constructorParamList), _toConsumableArray(autowiredList), _toConsumableArray(componentList)));
+      var importConstructorInjectDecorator;
+      if (!!constructorInjectList.length && addConstructorInjectImportStmt) {
+        if (addConstructorInjectImportStmt === 'coco-ioc-container' || addConstructorInjectImportStmt === '@cocojs/mvc') {
+          importConstructorInjectDecorator = {
+            module: addConstructorInjectImportStmt
+          };
+        } else {
+          console.error('未知的addConstructorInjectImportStmt', addConstructorInjectImportStmt);
+        }
+      }
+      return updateTypeImports(updatedSourceFile, [].concat(_toConsumableArray(constructorInjectList), _toConsumableArray(autowiredList), _toConsumableArray(componentList)), importConstructorInjectDecorator);
     };
   };
 }
@@ -516,13 +526,14 @@ var commonCompilerOptions = {
 };
 function compileOneFile(code, fileName) {
   var prefix = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
+  var addConstructorInjectImportStmt = arguments.length > 3 ? arguments[3] : undefined;
   var result = ts__namespace.transpileModule(code, {
     fileName: fileName,
     compilerOptions: _objectSpread2(_objectSpread2({}, commonCompilerOptions), {}, {
       sourceMap: true
     }),
     transformers: {
-      before: [transformerFactory(prefix)]
+      before: [transformerFactory(prefix, addConstructorInjectImportStmt)]
     }
   });
   return {

package/dist/index.d.ts

@@ -2,11 +2,16 @@ import * as ts from 'typescript';
 
 export declare const commonCompilerOptions: ts.CompilerOptions;
 
-export declare function compileOneFile(code: string, fileName: string, prefix?: string): {
+export declare function compileOneFile(code: string, fileName: string, prefix?: string, addConstructorInjectImportStmt?: 'coco-ioc-container' | '@cocojs/mvc'): {
     code: string;
     map?: string;
 };
 
-export declare function transformerFactory(prefix?: string): ts.TransformerFactory<ts.SourceFile>;
+/**
+ * 转换工具工厂函数
+ * @param idPrefix id前缀
+ * @param addConstructorInjectImportStmt 遇到构造函数有参数时，是否添加import { constructorInject } from 'xxx'语句
+ */
+export declare function transformerFactory(idPrefix?: string, addConstructorInjectImportStmt?: 'coco-ioc-container' | '@cocojs/mvc'): ts.TransformerFactory<ts.SourceFile>;
 
 export { }

package/dist/index.esm.js

@@ -165,6 +165,7 @@ function createImport(className, importPath) {
 }
 function updateTypeImports(sourceFile) {
   var identifyList = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
+  var importConstructorInjectDecorator = arguments.length > 2 ? arguments[2] : undefined;
   if (!identifyList.length) {
     return sourceFile;
   }
@@ -218,11 +219,14 @@ function updateTypeImports(sourceFile) {
   } finally {
     _iterator.f();
   }
+  if (importConstructorInjectDecorator) {
+    newStatements.push(ts.factory.createImportDeclaration(undefined, ts.factory.createImportClause(undefined, undefined, ts.factory.createNamedImports([ts.factory.createImportSpecifier(false, undefined, ts.factory.createIdentifier('constructorInject'))])), ts.factory.createStringLiteral(importConstructorInjectDecorator.module), undefined));
+  }
   return ts.factory.updateSourceFile(sourceFile, [].concat(newStatements, _toConsumableArray(sourceFile.statements)));
 }
 
 function isConstructParamsDecorator(decorator) {
-  return isDecoratorExp(decorator, 'constructorParam');
+  return isDecoratorExp(decorator, 'constructorInject');
 }
 function extractIdentifiersFromConstructor(ctor) {
   var identifiers = [];
@@ -247,7 +251,7 @@ function extractIdentifiersFromConstructor(ctor) {
   }
   return identifiers;
 }
-function updateConstructorParamDecorator(classDeclaration) {
+function updateConstructorInjectDecorator(classDeclaration) {
   var modifiers = classDeclaration.modifiers;
   if (!modifiers) {
     return {
@@ -263,15 +267,8 @@ function updateConstructorParamDecorator(classDeclaration) {
     };
   }
   var constructParams = decorators.find(isConstructParamsDecorator);
-  if (!constructParams) {
-    return {
-      updated: false,
-      modifiers: classDeclaration.modifiers
-    };
-  }
-  var call = constructParams.expression;
-  // 已有参数，不处理
-  if (call.arguments.length > 0) {
+  if (constructParams) {
+    // 用户自定义，不处理
     return {
       updated: false,
       modifiers: classDeclaration.modifiers
@@ -294,15 +291,12 @@ function updateConstructorParamDecorator(classDeclaration) {
       modifiers: classDeclaration.modifiers
     };
   }
-  // 构造数组：[Api, User]
-  var arrayLiteral = ts.factory.createArrayLiteralExpression(identifiers, false);
-  var newModifiers = modifiers.map(function (m) {
-    return ts.isDecorator(m) && m === constructParams ? ts.factory.createDecorator(ts.factory.updateCallExpression(call, call.expression, call.typeArguments, [arrayLiteral])) : m;
-  });
+  var constructorInjectDecorator = ts.factory.createDecorator(ts.factory.createCallExpression(ts.factory.createIdentifier('constructorInject'), undefined, [ts.factory.createArrayLiteralExpression(identifiers, false)]));
+  var newModifiers = [].concat(_toConsumableArray(modifiers), [constructorInjectDecorator]);
   return {
     updated: true,
     modifiers: newModifiers,
-    constructorParamTypeList: identifiers
+    constructorInjectTypeList: identifiers
   };
 }
 
@@ -438,26 +432,32 @@ function updateMembers(classDeclaration) {
     componentList: componentList
   };
 }
+/**
+ * 转换工具工厂函数
+ * @param idPrefix id前缀
+ * @param addConstructorInjectImportStmt 遇到构造函数有参数时，是否添加import { constructorInject } from 'xxx'语句
+ */
 function transformerFactory() {
-  var prefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  var idPrefix = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : '';
+  var addConstructorInjectImportStmt = arguments.length > 1 ? arguments[1] : undefined;
   return function (context) {
-    var constructorParamList = [];
+    var constructorInjectList = [];
     var autowiredList = [];
     var componentList = [];
     var _visit = function visit(node) {
       if (ts.isClassDeclaration(node)) {
         if (hasClassKindDecorator(node)) {
-          var $$idProperty = ifNeedAdd$$idProperty(node, prefix);
+          var $$idProperty = ifNeedAdd$$idProperty(node, idPrefix);
           var _updateMembers = updateMembers(node),
             members = _updateMembers.members,
             membersUpdated = _updateMembers.updated,
             _autowiredList = _updateMembers.autowiredList,
             _componentList = _updateMembers.componentList;
-          var _updateConstructorPar = updateConstructorParamDecorator(node),
-            modifiers = _updateConstructorPar.modifiers,
-            constructorParamsUpdated = _updateConstructorPar.updated,
-            _constructorParamTypeList = _updateConstructorPar.constructorParamTypeList;
-          if (!membersUpdated && !constructorParamsUpdated && !$$idProperty) {
+          var _updateConstructorInj = updateConstructorInjectDecorator(node),
+            modifiers = _updateConstructorInj.modifiers,
+            constructorInjectUpdated = _updateConstructorInj.updated,
+            _constructorInjectTypeList = _updateConstructorInj.constructorInjectTypeList;
+          if (!membersUpdated && !constructorInjectUpdated && !$$idProperty) {
             return node;
           } else {
             if (_autowiredList) {
@@ -466,8 +466,8 @@ function transformerFactory() {
             if (_componentList) {
               componentList = _componentList;
             }
-            if (constructorParamsUpdated) {
-              constructorParamList = _constructorParamTypeList;
+            if (constructorInjectUpdated) {
+              constructorInjectList = _constructorInjectTypeList;
             }
             return ts.factory.updateClassDeclaration(node, modifiers, node.name, node.typeParameters, node.heritageClauses, $$idProperty ? [$$idProperty].concat(_toConsumableArray(members)) : members);
           }
@@ -480,10 +480,20 @@ function transformerFactory() {
     // @ts-ignore
     return function (sourceFile) {
       var updatedSourceFile = ts.visitNode(sourceFile, _visit);
-      if (!constructorParamList.length && !autowiredList.length && !componentList.length) {
+      if (!constructorInjectList.length && !autowiredList.length && !componentList.length) {
         return updatedSourceFile;
       }
-      return updateTypeImports(updatedSourceFile, [].concat(_toConsumableArray(constructorParamList), _toConsumableArray(autowiredList), _toConsumableArray(componentList)));
+      var importConstructorInjectDecorator;
+      if (!!constructorInjectList.length && addConstructorInjectImportStmt) {
+        if (addConstructorInjectImportStmt === 'coco-ioc-container' || addConstructorInjectImportStmt === '@cocojs/mvc') {
+          importConstructorInjectDecorator = {
+            module: addConstructorInjectImportStmt
+          };
+        } else {
+          console.error('未知的addConstructorInjectImportStmt', addConstructorInjectImportStmt);
+        }
+      }
+      return updateTypeImports(updatedSourceFile, [].concat(_toConsumableArray(constructorInjectList), _toConsumableArray(autowiredList), _toConsumableArray(componentList)), importConstructorInjectDecorator);
     };
   };
 }
@@ -495,13 +505,14 @@ var commonCompilerOptions = {
 };
 function compileOneFile(code, fileName) {
   var prefix = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : '';
+  var addConstructorInjectImportStmt = arguments.length > 3 ? arguments[3] : undefined;
   var result = ts.transpileModule(code, {
     fileName: fileName,
     compilerOptions: _objectSpread2(_objectSpread2({}, commonCompilerOptions), {}, {
       sourceMap: true
     }),
     transformers: {
-      before: [transformerFactory(prefix)]
+      before: [transformerFactory(prefix, addConstructorInjectImportStmt)]
     }
   });
   return {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cocojs/compiler",
-  "version": "0.1.0-beta.202601082202",
+  "version": "0.1.0-beta.202601082203",
   "description": "A Coco component transpiler built on the TypeScript compiler API.",
   "main": "dist/index.cjs.js",
   "module": "dist/index.esm.js",