fix the model keyword

Author: peze

lib/generator.js

@@ -8,7 +8,7 @@ const fs = require('fs');
 const DSL = require('@darabonba/parser');
 const {
   _name, _string, _type, _subModelName, _vid,
-  _isBinaryOp, _escape, _snakeCase, _camelCase,
+  _isBinaryOp, _escape, _snakeCase, _camelCase, _avoidModel,
   REQUEST, RESPONSE, CORE, _upperFirst, _removeFilesInDirectory
 } = require('./helper');
 const getBuiltin = require('./builtin');
@@ -203,7 +203,7 @@ class Visitor {
     // this.emit(`\n`);
 
     [...new Set(this.subModelUsed)].map(modelName => {
-      this.header += `import { ${modelName} } from "./${_camelCase(_snakeCase(modelName))}";\n`;
+      this.header += `import { ${modelName} } from "./${_avoidModel(_camelCase(_snakeCase(modelName)))}";\n`;
     });
 
     [...new Set(this.exceptionUsed)].map(ExceptionName => {
@@ -1240,7 +1240,7 @@ Client.main(process.argv.slice(2));`);
     for (let i = 0; i < models.length; i++) {
       const ast = models[i];
       const modelName = _subModelName(_name(ast.modelName));
-      this.emit(`export { ${modelName} } from './${_camelCase(_snakeCase(modelName))}';\n`);
+      this.emit(`export { ${modelName} } from './${_avoidModel(_camelCase(_snakeCase(modelName)))}';\n`);
     }
     this.save(path.join(this.modelPath, 'model.ts'), true);
   }
@@ -1259,7 +1259,7 @@ Client.main(process.argv.slice(2));`);
     this.subModelUsed = this.subModelUsed.filter(name => {
       return name !== modelName;
     });
-    this.saveBuffer(path.join(this.modelPath, `${_camelCase(_snakeCase(modelName))}.ts`));
+    this.saveBuffer(path.join(this.modelPath, `${_avoidModel(_camelCase(_snakeCase(modelName)))}.ts`));
     this.usedTypes = [];
     this.modelUsed = [];
     this.moudleUsed = [];

lib/helper.js

@@ -22,6 +22,13 @@ function _name(str) {
   return str.lexeme || str.name;
 }
 
+function _avoidModel(name) {
+  if(name.toLowerCase() === 'model') {
+    return `${name}_`;
+  }
+  return name;
+}
+
 function _snakeCase(str) {
   if (!str) {
     return '';
@@ -223,5 +230,5 @@ function _removeFilesInDirectory(directoryPath) {
 module.exports = {
   _name, _string, _type, _subModelName, _vid, _upperFirst,
   _isBinaryOp, _escape, _isDefault, _snakeCase, _camelCase,
-  REQUEST, RESPONSE, CORE, _removeFilesInDirectory
+  REQUEST, RESPONSE, CORE, _removeFilesInDirectory, _avoidModel
 };

test/fixtures/model/main.dara

@@ -5,6 +5,10 @@ model M {
   self: M,
 }
 
+model Model {
+  stringfield: string,
+}
+
 model MyModel {
   stringfield: string,
   bytesfield: bytes,

test/fixtures/model/models/Model_.ts

@@ -0,0 +1,28 @@
+// This file is auto-generated, don't edit it
+import * as $dara from '@darabonba/typescript';
+
+
+export class Model extends $dara.Model {
+  stringfield: string;
+  static names(): { [key: string]: string } {
+    return {
+      stringfield: 'stringfield',
+    };
+  }
+
+  static types(): { [key: string]: any } {
+    return {
+      stringfield: 'string',
+    };
+  }
+
+  validate() {
+    $dara.Model.validateRequired("stringfield", this.stringfield);
+    super.validate();
+  }
+
+  constructor(map?: { [key: string]: any }) {
+    super(map);
+  }
+}
+

test/fixtures/model/models/model.ts

@@ -2,5 +2,6 @@ export { MSubM } from './MsubM';
 export { MyModelSubmodel } from './MyModelSubmodel';
 export { MyModelSubarraymodel } from './MyModelSubarraymodel';
 export { M } from './M';
+export { Model } from './Model_';
 export { MyModel } from './MyModel';
 export { INT } from './Int';