feat: adjust field name for object

package.json

@@ -30,7 +30,7 @@
   "author": "Alibaba Cloud OpenAPI Team",
   "license": "Apache-2.0",
   "dependencies": {
-    "@darabonba/parser": "^1.2.10",
+    "@darabonba/parser": "^1.4.7",
     "enum": "^3.0.4"
   }
 }

src/lib/helper.js

@@ -41,7 +41,12 @@ function _subModelName(name) {
 }
 
 function _string(str) {
-  return str.string;
+  if (str.string === '""') {
+    return '\\"\\"';
+  }
+  return str.string.replace(/([^\\])"+|^"/g, function (str) {
+    return str.replace(/"/g, '\\"');
+  });
 }
 
 function _isBasicType(type) {
@@ -172,9 +177,14 @@ function _toSnakeCase(str) {
   return res;
 }
 
+function _escape(str) {
+  return str.includes('-') ? `${str}` : str;
+}
+
 
 module.exports = {
   _config,
+  _escape,
   _upperFirst,
   _camelCase,
   _string,

src/resolver/base.js

@@ -3,6 +3,8 @@
 const debug = require('../lib/debug');
 
 const {
+  _string,
+  _escape,
   _isBasicType
 } = require('../lib/helper');
 
@@ -176,7 +178,7 @@ class BaseResolver {
       } else if (typeNode.type === 'modelBody') {
         // is sub model
         typeInfo['objectType'] = 'model';
-        typeInfo['lexeme'] = this.combinator.addModelInclude([this.object.name, sourceNode.fieldName.lexeme].join('.'));
+        typeInfo['lexeme'] = this.combinator.addModelInclude([this.object.name, _escape(sourceNode.fieldName.lexeme) || _string(sourceNode.fieldName)].join('.'));
         return typeInfo;
       } else if (_isBasicType(typeNode.type)) {
         return this.resolveType(typeNode.type, typeNode);

src/resolver/client.js

@@ -43,7 +43,10 @@ const {
 } = require('../langs/common/enum');
 
 const {
-  _isBasicType
+  _isBasicType,
+  _string,
+  _escape
+
 } = require('../lib/helper');
 
 const systemPackage = ['Util'];
@@ -158,7 +161,7 @@ class ClientResolver extends BaseResolver {
     ast.params.params.forEach(p => {
       var param = new GrammerValue();
       param.type = this.resolveType(p.paramType, p);
-      param.key = p.paramName.lexeme;
+      param.key = _escape(p.paramName.lexeme || _string(p.paramName));
       if (p.needValidate) {
         func.addBodyNode(new GrammerCall('method', [
           { type: 'object', name: param.key },
@@ -450,8 +453,8 @@ class ClientResolver extends BaseResolver {
           valGrammer.needCast = true;
           exprChild.isExpand = true;
         }
-        if (field.fieldName && field.fieldName.lexeme) {
-          exprChild.key = field.fieldName.lexeme;
+        if (field.fieldName && (field.fieldName.lexeme || field.fieldName.string)) {
+          exprChild.key = (field.fieldName.lexeme) || _string(field.fieldName);
         }
         this.renderGrammerValue(exprChild, field.expr, expectedType);
         this.findComments(valGrammer, field);

src/resolver/model.js

@@ -6,7 +6,9 @@ const assert = require('assert');
 const BaseResolver = require('./base');
 
 const {
-  _isBasicType
+  _string,
+  _escape,
+  _isBasicType,  
 } = require('../lib/helper');
 
 const {
@@ -95,7 +97,7 @@ class ModelResolver extends BaseResolver {
 
       const prop = new PropItem();
       prop.belong = object.index;
-      prop.name = node.fieldName.lexeme;
+      prop.name = _escape(node.fieldName.lexeme) || _string(node.fieldName);
       prop.type = this.resolveType(node.fieldValue, node);
 
       prop.modify.push(Modify.public());
@@ -141,7 +143,7 @@ class ModelResolver extends BaseResolver {
   }
 
   findSubModelsUsed(node, subModelUsed = [], pre = '') {
-    let name = node.fieldName.lexeme;
+    let name = _escape(node.fieldName.lexeme) || _string(node.fieldName);
     if (pre !== '') {
       name = pre + '.' + name;
     }

tests/expected/python2/function/tea_python_tests/client.py

@@ -18,7 +18,9 @@ def hello_map():
         m = {}
         return TeaCore.merge({
             'key': 'value',
-            'key-1': 'value-1'
+            'key-1': 'value-1',
+            'key-2': 'value-2',
+            '\"\"': 'value-3'
         }, m)
 
     @staticmethod

tests/expected/python3/function/tea_python_tests/client.py

@@ -17,7 +17,9 @@ def hello_map() -> Dict[str, str]:
         m = {}
         return TeaCore.merge({
             'key': 'value',
-            'key-1': 'value-1'
+            'key-1': 'value-1',
+            'key-2': 'value-2',
+            '\"\"': 'value-3'
         }, m)
 
     @staticmethod

tests/fixtures/function/main.dara

@@ -10,6 +10,8 @@ static function helloMap(): map[string]string {
   return {
     key = 'value',
     key-1 = 'value-1',
+    'key-2' = 'value-2',
+    '""' = 'value-3',
     ...m,
   };
 }