@darabonba/python-generator 2.0.2 → 2.0.3

package/lib/generator.js

@@ -9,24 +9,13 @@ const DSL = require('@darabonba/parser');
 const {
   _name, _vid, _string, _upperFirst, _type, _escape,
   _subModelName, _camelCase, _snakeCase, _getImport,
-  _isBinaryOp, _adaptedQuotes, CORE, REQUEST, RESPONSE
+  _isBinaryOp, _adaptedQuotes, CORE, REQUEST, RESPONSE,
+  _avoidKeywords, _removeFilesInDirectory
 } = require('./helper');
 const getBuiltin = require('./builtin');
 const { Tag } = require('@darabonba/parser/lib/tag');
 const Annotation = require('@darabonba/annotation-parser');
 
-function avoidReserveName(name) {
-  const reserves = [
-    'function'
-  ];
-
-  if (reserves.indexOf(name) !== -1) {
-    return `_${name}`;
-  }
-
-  return name;
-}
-
 class Visitor {
 
   static get supportGenerateTest() {
@@ -52,8 +41,10 @@ class Visitor {
     this.imports = [];
     this.outputDir = this.config.outputDir;
     this.setupPath = path.join(this.outputDir, 'setup.py');
-    this.modelPath = path.join(this.outputDir, this.config.package, 'models.py');
-    this.exceptionPath = path.join(this.outputDir, this.config.package, 'exceptions.py');
+    this.modelPath = path.join(this.outputDir, this.config.package, 'models');
+    this.modelPackage = 'models';
+    this.exceptionPath = path.join(this.outputDir, this.config.package, 'exceptions');
+    this.exceptionPackage = 'exceptions';
     this.config.clientPath = path.join(this.outputDir, this.config.package, `${_snakeCase(this.config.clientName)}.py`);
     this.classNamespace = new Map();
     // 新增：用于存储已使用的类型
@@ -211,8 +202,10 @@ setup(
       // this.exceptionPath = path.join(this.outputDir, this.config.package, 'exceptions.py');
       const filepath = ast.innerModule.get(aliasId);
       this.className = this.getInnerClient(aliasId);
-      this.modelPath = filepath.replace('.py', '_models.py');
-      this.exceptionPath = filepath.replace('.py', '_exceptions.py');
+      this.modelPath = filepath.replace('.py', '_models');
+      this.modelPackage = path.basename(this.modelPath);
+      this.exceptionPath = filepath.replace('.py', '_exceptions');
+      this.exceptionPackage = path.basename(this.exceptionPath);
       this.visitModule(moduleAst, filepath, false, 0);
       data = keys.next();
     }
@@ -262,6 +255,27 @@ setup(
     return true;
   }
 
+  modelBefore() {
+    // clear model.py
+    if(fs.existsSync(this.modelPath + '.py')) {
+      fs.unlinkSync(this.modelPath + '.py');
+    }
+    _removeFilesInDirectory(this.modelPath);
+    _removeFilesInDirectory(this.exceptionPath);
+  }
+
+  visitModuleInit() {
+    const initFile = path.join(this.outputDir, this.config.package, '__init__.py');
+    if(!fs.existsSync(initFile)) {
+      if(!fs.existsSync(path.dirname(initFile))) {
+        fs.mkdirSync(path.dirname(initFile), {
+          recursive: true
+        });
+      }
+      fs.writeFileSync(initFile, '__version__ = "1.0.0"\n');
+    }
+  }
+
   visitModule(ast, filepath, level) {
     assert.equal(ast.type, 'module');
     this.ast = ast;
@@ -276,6 +290,7 @@ setup(
 
     this.clientName = new Map();
     this.packageInfo = {};
+    this.fileBuffer = {};
     this.usedTypes = [];
     this.imports = [];
     if(this.overwrite(ast, filepath) === false) {
@@ -310,12 +325,10 @@ setup(
     for (let i = 0; i < models.length; i++) {
       this.eachModel(models[i], level);
     }
-    if (models.length > 0) {
+    if (models.length > 0 || subModels.length > 0) {
       // 存一笔 models
-
-      this.save(this.modelPath);
-      this.usedTypes = [];
-      this.imports = [];
+      this.modelInitBefore(ast, level);
+      this.visitModelInit(subModels.concat(models));
     }
 
     const exceptions = ast.moduleBody.nodes.filter((item) => {
@@ -324,17 +337,15 @@ setup(
 
     
     if (exceptions.length > 0) {
-      this.exceptionsBody = true;
       for (let i = 0; i < exceptions.length; i++) {
         this.eachException(exceptions[i], level);
       }
-      this.exceptionsBody = false;
-      this.save(this.exceptionPath);
-      this.usedTypes = [];
-      this.imports = [];
+      this.visitExceptionInit(exceptions);
     }
+    this.flushBuffer();
 
 
+    this.visitModuleInit();
     this.moduleBefore(ast, level);
 
     this.visitAnnotation(ast.annotation, level);
@@ -554,8 +565,8 @@ setup(
       for (var i = 0; i < ast.params.params.length; i++) {
         const node = ast.params.params[i];
         assert.equal(node.type, 'param');
-        const name = _snakeCase(_name(node.paramName));
-        this.emit(`${avoidReserveName(name)}: `, level + 4);
+        const name = _avoidKeywords(_snakeCase(_name(node.paramName)));
+        this.emit(`${name}: `, level + 4);
         this.visitType(node.paramType, level);
         this.emit(',');
         if (i !== ast.params.length - 1) {
@@ -741,8 +752,8 @@ setup(
     for (var i = 0; i < ast.params.length; i++) {
       const node = ast.params[i];
       assert.equal(node.type, 'param');
-      const name = _snakeCase(_name(node.paramName));
-      this.emit(`${avoidReserveName(name)}: `, level);
+      const name = _avoidKeywords(_snakeCase(_name(node.paramName)));
+      this.emit(`${name}: `, level);
       this.visitType(node.paramType, level);
       this.emit(',');
       if (i !== ast.params.length - 1) {
@@ -762,13 +773,18 @@ setup(
     } else if (ast.type === 'moduleModel') {
       const [moduleId, ...rest] = ast.path;
       const modelName = _subModelName(rest.map((item) => item.lexeme).join('.'));
-      this.emit(this.getModelName(modelName, _name(moduleId)));
+      let type = 'model';
+      const externEx = this.usedExternException.get(_name(moduleId));
+      if (externEx && externEx.has(modelName)) {
+        type = 'exception';
+      }
+      this.emit(this.getModelName(modelName, _name(moduleId), type));
     } else if (ast.type === 'subModel') {
       const [moduleId, ...rest] = ast.path;
-      this.emit('main_models.');
-      this.emit(_subModelName([moduleId.lexeme, ...rest.map((item) => {
+      const modelName = _subModelName([moduleId.lexeme, ...rest.map((item) => {
         return item.lexeme;
-      })].join('.')));
+      })].join('.'));
+      this.emit(this.getModelName(modelName));
     } else if (ast.type === 'moduleTypedef') {
       const [moduleId, ...rest] = ast.path;
       const type = rest.map((item) => { return item.lexeme; }).join('.');
@@ -784,9 +800,19 @@ setup(
       this.visitType(ast.valueType, level);
       this.emit(']');
     } else if (ast.type === 'model') {
-      this.emit(this.getModelName(_upperFirst(_name(ast)), ast.moduleName));
+      const predefined = ast.moduleName ? this.usedExternException.get(ast.moduleName) : this.predefined;
+      let type = 'model';
+      if (predefined[_name(ast)] && predefined[_name(ast)].isException) {
+        type = 'exception';
+      }
+      this.emit(this.getModelName(_upperFirst(_name(ast)), ast.moduleName, type));
     } else if (ast.idType === 'model') {
-      this.emit(this.getModelName(_upperFirst(_name(ast)), ast.moduleName));
+      const predefined = ast.moduleName ? this.usedExternException.get(ast.moduleName) : this.predefined;
+      let type = 'model';
+      if (predefined[_name(ast)] && predefined[_name(ast)].isException) {
+        type = 'exception';
+      }
+      this.emit(this.getModelName(_upperFirst(_name(ast)), ast.moduleName, type));
     } else if (ast.type === 'module') {
       this.emit(this.getModelName('', _name(ast), 'module'));
     } else if (ast.idType === 'module') {
@@ -895,10 +921,8 @@ setup(
 
   visitFieldType(value, level, modelName, fieldName) {
     if (value.type === 'modelBody') {
-      if(this.exceptionsBody) {
-        this.emit('main_models.');
-      }
-      this.emit(`${_subModelName([modelName, fieldName].join('.'))}`);
+      const subModelName = _subModelName([modelName, fieldName].join('.'))
+      this.emit(this.getModelName(subModelName));
     } else if (value.type === 'array') {
       this.visitType(value);
     } else if (value.fieldType === 'array') {
@@ -972,8 +996,9 @@ setup(
       this.pushImports(type);
       this.emit(`${type}`);
     } else if (value.fieldType.idType === 'model') {
+      const predefined = value.fieldType.moduleName ? this.usedExternException.get(value.fieldType.moduleName) : this.predefined;
       let type = 'model';
-      if (this.predefined[_name(type)] && this.predefined[_name(type)].isException) {
+      if (predefined[_name(value.fieldType)] && predefined[_name(value.fieldType)].isException) {
         type = 'exception';
       }
       this.emit(this.getModelName(_name(value.fieldType), value.fieldType.moduleName, type));
@@ -995,7 +1020,7 @@ setup(
       node = ast.nodes[i];
       let comments = DSL.comment.getFrontComments(this.comments, node.tokenRange[0]);
       this.visitComments(comments, level);
-      let param = _snakeCase(_escape(_name(node.fieldName)));
+      let param = _avoidKeywords(_snakeCase(_escape(_name(node.fieldName))));
       const description = this.getAttributes(node, 'description');
       if (description) {
         const descriptions = description.trimEnd().split('\n');
@@ -1048,7 +1073,7 @@ setup(
       const minimum = this.getAttributes(node, 'minimum') || 0;
       let comments = DSL.comment.getFrontComments(this.comments, node.tokenRange[0]);
       this.visitComments(comments, level);
-      let param = _snakeCase(_escape(_name(node.fieldName)));
+      let param = _avoidKeywords(_snakeCase(_escape(_name(node.fieldName))));
       // 这里判断类中属性是否是必填
       if (node.required) {
         notPass = true;
@@ -1165,7 +1190,7 @@ setup(
       let realName = this.getRealName(node);
       let comments = DSL.comment.getFrontComments(this.comments, node.tokenRange[0]);
       this.visitComments(comments, level);
-      let param = _snakeCase(_escape(_name(node.fieldName)));
+      let param = _avoidKeywords(_snakeCase(_escape(_name(node.fieldName))));
       this.emit(`if self.${param} is not None:\n`, level + 2);
       if(!this.checkFieldHasModel(node.fieldValue)) {
         this.emit(`result['${realName}'] = self.${param}`, level + 4);
@@ -1190,7 +1215,7 @@ setup(
     const deep = Math.floor(level / 4);
     if (fieldValue.type === 'modelBody') {
       const subModelName = _subModelName(_camelCase(fieldName));
-      this.emit(`temp_model = ${subModelName}()\n`, level);
+      this.emit(`temp_model = ${this.getModelName(subModelName)}()\n`, level);
       this.emitFieldConvert(key, `temp_model.from_map(${value})`, level, arr);
     } else if (fieldValue.type === 'array' || fieldValue.fieldType === 'array') {
       this.emit(`l${deep} = 0\n`, level);
@@ -1207,22 +1232,22 @@ setup(
       const modelName = _subModelName(rest.map((item) => {
         return item.lexeme;
       }).join('.'));
-      this.emit(`temp_model = ${this.getModelName(modelName, _name(moduleId), 'module')}()\n`, level);
+      this.emit(`temp_model = ${this.getModelName(modelName, _name(moduleId))}()\n`, level);
       this.emitFieldConvert(key, `temp_model.from_map(${value})`, level, arr);
     } else if (fieldValue.type === 'subModel') {
       const [moduleId, ...rest] = fieldValue.path;
       const subModelName = _subModelName([moduleId.lexeme, ...rest.map((item) => {
         return item.lexeme;
       })].join('.'));
-      this.emit(`temp_model = ${subModelName}()\n`, level);
+      this.emit(`temp_model = ${this.getModelName(subModelName)}()\n`, level);
       this.emitFieldConvert(key, `temp_model.from_map(${value})`, level, arr);
     } else if (fieldValue.idType === 'model') {
       const modelName = _type(_name(fieldValue));
-      this.emit(`temp_model = ${modelName}()\n`, level);
+      this.emit(`temp_model = ${this.getModelName(modelName)}()\n`, level);
       this.emitFieldConvert(key, `temp_model.from_map(${value})`, level, arr);
     } else if (fieldValue.fieldType && fieldValue.fieldType.idType === 'model') {
       const modelName = _type(_name(fieldValue.fieldType));
-      this.emit(`temp_model = ${modelName}()\n`, level);
+      this.emit(`temp_model = ${this.getModelName(modelName)}()\n`, level);
       this.emitFieldConvert(key, `temp_model.from_map(${value})`, level, arr);
     } else if (fieldValue.fieldType && fieldValue.fieldType.idType === 'builtin_model') {
       const typeName = _type(_name(fieldValue.fieldType));
@@ -1243,7 +1268,7 @@ setup(
       let realName = this.getRealName(node);
       let comments = DSL.comment.getFrontComments(this.comments, node.tokenRange[0]);
       this.visitComments(comments, level);
-      let param = _snakeCase(_escape(_name(node.fieldName)));
+      let param = _avoidKeywords(_snakeCase(_escape(_name(node.fieldName))));
       this.emit(`if m.get('${realName}') is not None:\n`, level + 2);
       if(!this.checkFieldHasModel(node.fieldValue)) {
         this.emit(`self.${param} = m.get('${realName}')`, level + 4);
@@ -1333,40 +1358,13 @@ setup(
       this.emit(`(${this.getModelName(modelName, moduleName, type)}`);
     } else if (extendOn.type === 'subModel') {
       const [moduleId, ...rest] = extendOn.path;
-      if (type === 'exception') {
-        needBaseException = true;
-        const modelPkgName = path.basename(this.modelPath, '.py');
-        this.imports.push({
-          className: modelPkgName,
-        });
-        this.emit(`${modelPkgName}.`);
-      }
-      this.emit(`(${_subModelName([moduleId.lexeme, ...rest.map((item) => {
+      const subModelName = _subModelName([moduleId.lexeme, ...rest.map((item) => {
         return item.lexeme;
-      })].join('.'))}`);
+      })].join('.'));
+      this.emit(`(${this.emit(this.getModelName(subModelName, '', type))}`);
     } else {
-      let modelName = _upperFirst(_name(extendOn));
       this.emit('(');
-      if(extendOn.moduleName){
-        this.getModelName(_upperFirst(_name(extendOn)), extendOn.moduleName, type);
-      } else if (this.predefined[modelName] && this.predefined[modelName].isException && type === 'model') {
-        const exPkgName = path.basename(this.exceptionPath, '.py');
-        this.imports.push({
-          className: exPkgName,
-        });
-        this.emit(`${exPkgName}.`);
-      } else if (this.predefined[modelName] && !this.predefined[modelName].isException && type === 'exception') {
-        needBaseException = true;
-        const modelPkgName = path.basename(this.modelPath, '.py');
-        this.imports.push({
-          className: modelPkgName,
-        });
-        this.emit(`${modelPkgName}.`);
-      }
-      this.emit(`${modelName}`);
-      if(type === 'exception' && !needBaseException) {
-        this.emit('Exception');
-      }
+      this.emit(this.getModelName(_upperFirst(_name(extendOn)), extendOn.moduleName, type));
     }
     if(needBaseException) {
       this.emit(`, ${CORE}Exception`);
@@ -1401,6 +1399,37 @@ setup(
     this.visitExtendOn(extendOn);
     this.emit(':\n');
     this.visitModelBody(modelBody, level + 2, modelName);
+    this.saveBuffer(path.join(this.modelPath, `_${_snakeCase(modelName)}.py`));
+    this.usedTypes = [];
+    this.imports = [];
+    this.output = '';
+  }
+
+  saveBuffer(filepath) {
+    if(this.fileBuffer[filepath]) {
+      this.fileBuffer[filepath].imports = this.imports.concat(this.fileBuffer[filepath].imports);
+      this.fileBuffer[filepath].usedTypes = this.usedTypes.concat(this.fileBuffer[filepath].usedTypes);
+      this.fileBuffer[filepath].output = this.output + this.fileBuffer[filepath].output;
+      return;
+    }
+
+    this.fileBuffer[filepath] = {
+      imports: this.imports,
+      usedTypes: this.usedTypes,
+      output: this.output,
+    };
+  }
+
+  flushBuffer() {
+    Object.keys(this.fileBuffer).map(filepath => {
+      this.output = this.fileBuffer[filepath].output;
+      this.imports = this.fileBuffer[filepath].imports;
+      this.usedTypes = this.fileBuffer[filepath].usedTypes;
+      this.save(filepath);
+      this.output = '';
+      this.imports = [];
+      this.usedTypes = [];
+    });
   }
 
   eachModel(ast, level) {
@@ -1412,6 +1441,29 @@ setup(
     this.visitModel(ast.modelBody, modelName, ast.extendOn, level);
   }
 
+  visitModelInit(models) {
+    const modelNames = [];
+    const moreExports = this.moreExports || [];
+    for (let i = 0; i < models.length; i++) {
+      const ast = models[i];
+      const modelName = _subModelName(_name(ast.modelName));
+      modelNames.push(modelName);
+      this.emit(`from ._${_snakeCase(modelName)} import ${modelName}\n`);
+    }
+    
+    this.emit('\n__all__ = [\n');
+    this.emit(modelNames.join(',\n    '), 2);
+    if(moreExports && moreExports.length > 0) {
+      this.emit((',\n'));
+      this.emit(moreExports.join(',\n    '), 2);
+    }
+    
+    this.emit('\n]\n');
+
+    this.save(path.join(this.modelPath, '__init__.py'));
+    this.moreExports = [];
+  }
+
   visitFieldsInit(ast, level, modelName, type = 'model', baseErr = false){ 
     let node;
     this.emit('    def __init__(');
@@ -1422,14 +1474,14 @@ setup(
       return;
     }
     this.emit('\n');
-    this.emit('self, \n', level + 2);
+    this.emit('self, *,\n', level + 2);
     for (let i = 0; i < paramNodes.length; i++) {
       node = paramNodes[i];
       if(!node.extend) {
         let comments = DSL.comment.getFrontComments(this.comments, node.tokenRange[0]);
         this.visitComments(comments, level);
       }
-      let param = _snakeCase(_escape(_name(node.fieldName)));
+      let param = _avoidKeywords(_snakeCase(_escape(_name(node.fieldName))));
       if(param === 'name' && type === 'exception') {
         continue;
       }
@@ -1446,7 +1498,7 @@ setup(
         for (let i = 0; i < ast.extendFileds.length; i++) {
           node = ast.extendFileds[i];
           let value = _snakeCase(_escape(_name(node.fieldName)));
-          let key = _escape(_name(node.fieldName));
+          let key = _avoidKeywords(_escape(_name(node.fieldName)));
           if(key === 'name' && type === 'exception') {
             continue;
           }
@@ -1457,7 +1509,7 @@ setup(
         this.emit('\n');
         for (let i = 0; i < ast.extendFileds.length; i++) {
           node = ast.extendFileds[i];
-          let param = _snakeCase(_escape(_name(node.fieldName)));
+          let param = _avoidKeywords(_snakeCase(_escape(_name(node.fieldName))));
           if(param === 'name' && type === 'exception') {
             continue;
           }
@@ -1478,7 +1530,7 @@ setup(
       node = ast.nodes[i];
       let comments = DSL.comment.getFrontComments(this.comments, node.tokenRange[0]);
       this.visitComments(comments, level);
-      let param = _snakeCase(_escape(_name(node.fieldName)));
+      let param = _avoidKeywords(_snakeCase(_escape(_name(node.fieldName))));
       if(param === 'name') {
         continue;
       }
@@ -1503,6 +1555,10 @@ setup(
     this.visitExtendOn(extendOn, 'exception');
     this.emit(':\n');
     this.visitEcxceptionBody(exceptionBody, extendOn, exceptionName, level + 2);
+    this.saveBuffer(path.join(this.exceptionPath, `_${_snakeCase(exceptionName)}.py`));
+    this.usedTypes = [];
+    this.imports = [];
+    this.output = '';
   }
 
   eachException(ast, level) {
@@ -1514,6 +1570,22 @@ setup(
     this.visitException(ast.exceptionBody, exceptionName, ast.extendOn, level);
   }
 
+  visitExceptionInit(excpetions) {
+    const exceptionNames = [];
+    for (let i = 0; i < excpetions.length; i++) {
+      const ast = excpetions[i];
+      const exceptionName = _subModelName(_name(ast.exceptionName));
+      exceptionNames.push(exceptionName);
+      this.emit(`from ._${_snakeCase(exceptionName)} import ${exceptionName}Exception\n`);
+    }
+    
+    this.emit('\n__all__ = [\n');
+    this.emit(exceptionNames.join('Exception,\n    '), 2);
+    this.emit('Exception\n]\n');
+
+    this.save(path.join(this.exceptionPath, '__init__.py'));
+  }
+
   eachSubModel(ast, level) {
     assert.equal(ast.type, 'model');
     const modelName = _subModelName(_name(ast.modelName));
@@ -1548,7 +1620,7 @@ setup(
     if (ast.type === 'objectField') {
       // TODO 这里粗暴处理的双引号，可以考虑优化
       var key = _escape(_name(ast.fieldName) || _string(ast.fieldName)).replace(/['"]/g, '');
-      this.emit(`${_snakeCase(key)} = `, level + 2);
+      this.emit(`${_avoidKeywords(_snakeCase(key))} = `, level + 2);
       this.visitObjectFieldValue(ast.expr, level + 2);
       if (!end) {
         this.emit(',\n');
@@ -1615,7 +1687,7 @@ setup(
   visitMethodCall(ast, level) {
     assert.equal(ast.left.type, 'method_call');
     const name = _name(ast.left.id);
-    const functionName = _snakeCase(name);
+    const functionName = _avoidKeywords(_snakeCase(name));
     if (name.startsWith('$') && this.builtin[name]) {
       const method = name.replace('$', '');
       this.builtin[name][method](ast, level, ast.isAsync && this.isAsyncFunction);
@@ -1650,7 +1722,7 @@ setup(
         const aliasId = _snakeCase(_name(ast.left.id));
         this.emit(aliasId);
       }
-      this.emit(`.${(_snakeCase(method))}`);
+      this.emit(`.${(_avoidKeywords(_snakeCase(method)))}`);
       if(async) {
         this.emit('_async');
       }
@@ -1669,7 +1741,7 @@ setup(
     const aliasId = _name(ast.left.id);
     let clientName = this.getModelName('', aliasId, 'module');
 
-    const functionName = _snakeCase(_name(ast.left.propertyPath[0]));
+    const functionName = _avoidKeywords(_snakeCase(_name(ast.left.propertyPath[0])));
 
     if (ast.isAsync && this.isAsyncFunction) {
       this.emit(`await ${clientName}.${functionName}_async`);
@@ -1750,7 +1822,7 @@ setup(
     if (ast.id.tag === Tag.VID) {
       id = `self.${_snakeCase(_vid(ast.id))}`;
     }
-    var expr = avoidReserveName(id);
+    var expr = _avoidKeywords(id);
     const prefix = env.left ? '[' : '.get(';
     const suffix = env.left ? ']' : ')';
     var current = ast.id.inferred;
@@ -1758,7 +1830,7 @@ setup(
     for (var i = 0; i < ast.propertyPath.length; i++) {
       var name = _name(ast.propertyPath[i]);
       if (current.type === 'model') {
-        expr += `.${_snakeCase(name)}`;
+        expr += `.${_avoidKeywords(_snakeCase(name))}`;
       } else {
         expr += `${prefix}"${name}"${suffix}`;
       }
@@ -1784,7 +1856,7 @@ setup(
       if(ast.inferred &&  ast.inferred.type === 'basic' && ast.inferred.name === 'class') {
         this.emit(this.getModelName('', _name(ast.id), 'module'));
       } else {
-        this.emit(avoidReserveName(_snakeCase(_name(ast.id))));
+        this.emit(_avoidKeywords(_snakeCase(_name(ast.id))));
       }
     } else if (ast.type === 'virtualVariable') {
       this.emit(`self.${_snakeCase(_vid(ast.vid))}`);
@@ -1926,7 +1998,7 @@ setup(
     if (ast.id.tag === DSL.Tag.Tag.VID) {
       expr = `self.${_snakeCase(_vid(ast.id))}`;
     } else {
-      expr = `${_snakeCase(_name(ast.id))}`;
+      expr = `${_avoidKeywords(_snakeCase(_name(ast.id)))}`;
     }
     const prefix = env.left ? '[' : '.get(';
     const suffix = env.left ? ']' : ')';
@@ -1935,7 +2007,7 @@ setup(
       for (var i = 0; i < ast.propertyPath.length; i++) {
         var name = _name(ast.propertyPath[i]);
         if (current.type === 'model') {
-          expr += `.${_snakeCase(name)}`;
+          expr += `.${_avoidKeywords(_snakeCase(name))}`;
         } else {
           expr += `${prefix}"${name}"${suffix}`;
         }
@@ -1954,14 +2026,14 @@ setup(
       // 这个判断很奇怪诶
       expr = `self.${_snakeCase(_vid(ast.id))}`;
     } else {
-      expr = `${_snakeCase(_name(ast.id))}`;
+      expr = `${_avoidKeywords(_snakeCase(_name(ast.id)))}`;
     }
     if (ast.propertyPath && ast.propertyPath.length) {
       var current = ast.id.inferred;
       for (var i = 0; i < ast.propertyPath.length; i++) {
         var name = _name(ast.propertyPath[i]);
         if (current.type === 'model') {
-          expr += `.${_snakeCase(name)}`;
+          expr += `.${_avoidKeywords(_snakeCase(name))}`;
         } else {
           expr += `["${name}"]`;
         }
@@ -2078,16 +2150,16 @@ setup(
           return;
         }
         if (!catchBlock.id.type) {
-          this.emit(`except Exception as ${_name(ast.catchId)} :\n`, level);
+          this.emit(`except Exception as ${_avoidKeywords(_name(ast.catchId))} :\n`, level);
         } else {
           this.emit('except ', level);
           this.visitType(catchBlock.id.type);
-          this.emit(` as ${_name(ast.catchId)} :\n`);
+          this.emit(` as ${_avoidKeywords(_name(ast.catchId))} :\n`);
         }
         this.visitStmts(catchBlock.catchStmts, level + 2);
       });
     } else if (ast.catchBlock && ast.catchBlock.stmts.length > 0) {
-      this.emit(`except Exception as ${_name(ast.catchId)} :\n`, level);
+      this.emit(`except Exception as ${_avoidKeywords(_name(ast.catchId))} :\n`, level);
       this.visitStmts(ast.catchBlock, level + 2);
     }
     if (ast.finallyBlock && ast.finallyBlock.stmts.length > 0) {
@@ -2119,7 +2191,7 @@ setup(
       this.emit('k, v in ');
       this.visitExpr(ast.list, level);
     } else {
-      this.emit(`${_snakeCase(_name(ast.id))} in `);
+      this.emit(`${_avoidKeywords(_snakeCase(_name(ast.id)))} in `);
       this.visitExpr(ast.list, level);
     }
     this.emit(':\n');
@@ -2177,7 +2249,7 @@ setup(
     } else if (ast.left.type === 'virtualVariable') { // vid
       this.emit(`self.${_snakeCase(_vid((ast.left.vid)))}`, level);
     } else if (ast.left.type === 'variable') {
-      this.emit(`${_snakeCase(_name(ast.left.id))}`, level);
+      this.emit(`${_avoidKeywords(_snakeCase(_name(ast.left.id)))}`, level);
     } else if (ast.left.type === 'map_access') {
       // 声明时不能用get去赋值
       this.emit('', level);
@@ -2202,7 +2274,7 @@ setup(
 
   // 实例初始化 new的地方
   visitDeclare(ast, level) {
-    var id = _snakeCase(_name(ast.id));
+    var id = _avoidKeywords(_snakeCase(_name(ast.id)));
     this.emit(`${id}`, level);
     if(id === 'new_full_str'){
       this.emit('');
@@ -2268,7 +2340,7 @@ setup(
     // this.visitAnnotation(ast.annotation, level);
     // let comments = DSL.comment.getFrontComments(this.comments, ast.tokenRange[0]);
     // this.visitComments(comments, level);
-    const functionName = _snakeCase(_name(ast.functionName));
+    const functionName = _avoidKeywords(_snakeCase(_name(ast.functionName)));
 
     if (ast.isStatic) {
       this.emit('@staticmethod\n', level);
@@ -2345,7 +2417,7 @@ setup(
     let comments = DSL.comment.getFrontComments(this.comments, ast.tokenRange[0]);
     this.visitComments(comments, level);
     // set api name to _snakeCase
-    const apiName = _snakeCase(_name(ast.apiName));
+    const apiName = _avoidKeywords(_snakeCase(_name(ast.apiName)));
     this.isStaticFunction = false;
     this.emit(`def ${apiName}`, level);
     this.visitParams(ast.params, level, true);
@@ -2470,7 +2542,7 @@ setup(
     this.output = tempOutput + '\n\n' + this.output;
   }
 
-  modelBefore(ast, level) {
+  modelInitBefore(ast, level) {
     let beginToken = 0;
     if(ast.imports.length > 0) {
       const lastIndex = ast.imports.length - 1;
@@ -2485,6 +2557,20 @@ setup(
     if(part && part.arg.value) {
       this.emit(_string(part.arg.value));
     }
+
+    if(part && part.arg.type === 'object') {
+      part.arg.fields.map(field => {
+        if(_name(field.fieldName) === 'header') {
+          this.emit(_string(field.expr.value));
+        }
+
+        if(_name(field.fieldName) === 'exports') {
+          this.moreExports = field.expr.items.map(item => {
+            return _string(item.value);
+          });
+        }
+      });
+    }
   }
 
   moduleBefore(ast, level) {
@@ -2614,7 +2700,7 @@ setup(
       this.imports.push({
         aliasName,
         packageName: this.config.package,
-        className: 'models',
+        className: this.modelPackage,
       });
       return `${aliasName}.${name}`;
     }
@@ -2635,7 +2721,7 @@ setup(
       this.imports.push({
         aliasName,
         packageName: this.config.package,
-        className: 'exceptions',
+        className: this.exceptionPackage,
       });
       return `${aliasName}.${name}Exception`;
     }