@darabonba/python-generator 1.2.18 → 2.0.0

package/lib/helper.js

@@ -0,0 +1,422 @@
+'use strict';
+const DSL = require('@darabonba/parser');
+
+const keywords = [
+  'False', 'None', 'True', '__peg_parser__', 'and',
+  'as', 'assert', 'async', 'await', 'break',
+  'class', 'continue', 'def', 'del', 'elif',
+  'else', 'except', 'finally', 'for', 'from',
+  'global', 'if', 'import', 'in', 'is',
+  'lambda', 'nonlocal', 'not', 'or', 'pass',
+  'raise', 'return', 'try', 'while', 'with', 'yield'
+];
+
+const builtinModels = [
+  '$Request', '$Response', '$Error', '$SSEEvent', '$Model',
+  '$RuntimeOptions', '$ExtendsParameters', '$RetryOptions',
+  '$ResponseError', '$FileField'
+];
+
+const CORE = 'Dara';
+const REQUEST = '_request';
+const RESPONSE = '_response';
+const EXCEPTION = 'darabonba.exceptions.DaraException';
+const RESP_EXCEPTION = 'darabonba.exceptions.ResponseException';
+const MODEL = 'darabonba.model';
+
+const builtinImports = {
+  DaraStream: {
+    packageName: 'darabonba.utils.stream',
+    className: 'Stream',
+    aliasName: 'DaraStream'
+  },
+  DaraConsole: {
+    packageName: 'darabonba.utils.console',
+    className: 'Logger',
+    aliasName: 'DaraConsole'
+  },
+  DaraXML: {
+    packageName: 'darabonba.utils.xml',
+    className: 'XML',
+    aliasName: 'DaraXML'
+  },
+  DaraURL: {
+    packageName: 'darabonba.url',
+    className: 'Url',
+    aliasName: 'DaraURL'
+  },
+  DaraForm: {
+    packageName: 'darabonba.utils.form',
+    className: 'Form',
+    aliasName: 'DaraForm'
+  },
+  DaraFile: {
+    packageName: 'darabonba.file',
+    className: 'File',
+    aliasName: 'DaraFile'
+  },
+  DaraBytes: {
+    packageName: 'darabonba.utils.bytes',
+    className: 'Bytes',
+    aliasName: 'DaraBytes'
+  },
+  DaraDate: {
+    packageName: 'darabonba.date',
+    className: 'Date',
+    aliasName: 'DaraDate'
+  },
+  DaraCore: {
+    packageName: 'darabonba.core',
+    className: 'DaraCore',
+  },
+  DaraRequest: {
+    packageName: 'darabonba.request',
+    className: 'DaraRequest',
+  },
+  DaraResponse: {
+    packageName: 'darabonba.response',
+    className: 'DaraResponse',
+  },
+  DaraModel: {
+    packageName: 'darabonba.model',
+    className: 'DaraModel',
+  },
+  RuntimeOptions: {
+    packageName: 'darabonba.runtime',
+    className: 'RuntimeOptions',
+  },
+  DaraException: {
+    packageName: 'darabonba.exceptions',
+    className: 'DaraException',
+  },
+  UnretryableException: {
+    packageName: 'darabonba.exceptions',
+    className: 'UnretryableException',
+  },
+  ResponseException: {
+    packageName: 'darabonba.exceptions',
+    className: 'ResponseException',
+  },
+  RetryPolicyContext: {
+    packageName: 'darabonba.policy.retry',
+    className: 'RetryPolicyContext',
+  },
+  RetryOptions: {
+    packageName: 'darabonba.policy.retry',
+    className: 'RetryOptions',
+  },
+  SSEEvent: {
+    packageName: 'darabonba.event',
+    className: 'Event',
+    aliasName: 'SSEEvent'
+  },
+  FileField: {
+    packageName: 'darabonba.form',
+    className: 'FileField',
+  },
+  ExtendsParameters: {
+    packageName: 'darabonba.runtime',
+    className: 'ExtendsParameters',
+  },
+  DaraEnv: {
+    className: 'os',
+  },
+  DaraLogger: {
+    className: 'logging',
+  }
+};
+
+function _name(str) {
+  if (str.lexeme === '__request') {
+    return REQUEST;
+  }
+
+  if (str.lexeme === '__response') {
+    return RESPONSE;
+  }
+
+  if (str.lexeme === 'from') {
+    return 'from_';
+  }
+
+  if (str.lexeme === 'self') {
+    return 'self_';
+  }
+
+  return str.lexeme || str.name;
+}
+
+function _vid(vid) {
+  return `_${_name(vid).substr(1)}`;
+}
+
+function _string(str) {
+  if (str.string === '\'\'') {
+    return '\\\'\\\'';
+  }
+  return str.string.replace(/([^\\])'+|^'/g, function (str) {
+    return str.replace(/'/g, '\\\'');
+  });
+}
+
+function _upperFirst(str) {
+  return str.charAt(0).toUpperCase() + str.slice(1);
+}
+function _lowerFirst(str) {
+  return str[0].toLowerCase() + str.substring(1);
+}
+
+function _subModelName(name) {
+  return name.split('.').map((name) => _upperFirst(name)).join('');
+}
+
+function _avoidKeywords(str) {
+  // 区分大小写
+  if (keywords.indexOf(str) > -1) {
+    return str + '_';
+  }
+  return str;
+}
+
+function _camelCase(str, split = '_') {
+  // 先将字符串中的下划线拆分
+  if (str.indexOf(split) > -1) {
+    let tmp = str.split(split);
+    tmp = tmp.map((s, i) => {
+      // 如果是第一个单词则不处理，其他单词首字母大写
+      return _upperFirst(s);
+    });
+    str = tmp.join('');
+  } else {
+    // 如果没有下划线，对整个字符串首字母大写
+    str = _upperFirst(str);
+  }
+  
+  return str;
+}
+
+function _snakeCase(str) {
+  if (!str) {
+    return '';
+  }
+  let res = '';
+  let tmp = '';
+  for (const c of str) {
+    if (/[A-Z|0-9]/.test(c)) {
+      tmp += c;
+    } else {
+      if (tmp.length > 0) {
+        res += res === '' ? tmp.toLowerCase() : '_' + tmp.toLowerCase();
+        tmp = '';
+      }
+      res += c;
+    }
+  }
+  if (tmp.length > 0) {
+    res += '_' + tmp.toLowerCase();
+  }
+  res = res.replace(/-/g, '_');
+  if (res[0] === '_' && str[0] !== '_') {
+    res = res.substring(1);
+  }
+  return res;
+}
+
+function _deepClone(obj) {
+  return JSON.parse(JSON.stringify(obj));
+}
+
+function _isSnakeCase(str) {
+  if (/[^\da-z_]/.test(str)) {
+    return false;
+  }
+
+  if (/\d/.test(str[0])) {
+    return false;
+  }
+
+  return true;
+}
+
+function _isBasicType(type) {
+  return DSL.util.isBasicType(type);
+}
+
+function _isBinaryOp(type) {
+  const op = [
+    'or', 'eq', 'neq',
+    'gt', 'gte', 'lt',
+    'lte', 'add', 'subtract',
+    'div', 'multi', 'and'
+  ];
+  return op.includes(type);
+}
+
+function _isBuiltinModel(name) {
+  return builtinModels.includes(name);
+}
+
+function _isDefault(expr) {
+  if(expr.type !== 'call' || expr.left.type !== 'method_call') {
+    return false;
+  }
+  const name = _name(expr.left.id);
+
+  if(name !== '$default') {
+    return false;
+  }
+
+  return true;
+}
+
+function _type(name) {
+  if (name === 'string') {
+    return 'str';
+  }
+
+  if (name === 'boolean') {
+    return 'bool';
+  }
+
+  if (name === 'any') {
+    return 'Any';
+  }
+
+  if (name === 'void') {
+    return 'None';
+  }
+
+  if (name === 'integer' || name === 'number' ||
+    name === 'int8' || name === 'uint8' ||
+    name === 'int16' || name === 'uint16' ||
+    name === 'int32' || name === 'uint32' ||
+    name === 'int64' || name === 'uint64' ||
+    name === 'long' || name === 'ulong') {
+    return 'int';
+  }
+
+  if(name === 'float'  || name === 'double') {
+    return 'float';
+  }
+
+  if (name === 'readable') {
+    return 'BinaryIO';
+  }
+
+  if (name === 'writable') {
+    return 'BinaryIO';
+  }
+
+  if (name === '$Request') {
+    return `${CORE}Request`;
+  }
+
+  if (name === '$Response') {
+    return `${CORE}Response`;
+  }
+
+  if (name === '$Model') {
+    return `${CORE}Model`;
+  }
+
+  if (name === '$Error') {
+    return `${CORE}Exception`;
+  }
+
+  if (name === '$SSEEvent') {
+    return 'SSEEvent';
+  }
+
+  if (name === '$RetryOptions') {
+    return 'RetryOptions';
+  }
+
+  if (name === '$RuntimeOptions') {
+    return 'RuntimeOptions';
+  }
+
+  if (name === '$ResponseError') {
+    return 'ResponseError';
+  }
+
+  if (name === '$FileField') {
+    return 'FileField';
+  }
+
+  if (name === '$ExtendsParameters') {
+    return 'ExtendsParameters';
+  }
+
+  if (name === '$Date') {
+    return `${CORE}Date`;
+  }
+
+  if (name === '$File') {
+    return `${CORE}File`;
+  }
+
+  if (name === '$URL') {
+    return `${CORE}URL`;
+  }
+
+  if (name === '$Stream') {
+    return `${CORE}Stream`;
+  }
+
+  if (name === 'object') {
+    return 'dict';
+  }
+
+  if (name === 'bytes') {
+    return 'bytes';
+  }
+
+  return name;
+}
+
+function _adaptedQuotes(str) {
+  const line = str.split('\n');
+  let quote = '\'';
+  if (str.indexOf('\'') !== -1 && str.indexOf('"') !== -1 || line.length > 1) {
+    quote = '\'\'\'';
+  } else if (str.indexOf('\'') !== -1) {
+    quote = '"';
+  }
+  return quote;
+}
+
+function _getImport(type) {
+  return builtinImports[type];
+}
+
+function _escape(str) {
+  return str.includes('-') ? `'${str}'` : str;
+}
+
+module.exports = {
+  _name,
+  _escape,
+  _vid,
+  _string,
+  _upperFirst,
+  _lowerFirst,
+  _subModelName,
+  _avoidKeywords,
+  _camelCase,
+  _snakeCase,
+  _deepClone,
+  _isSnakeCase,
+  _isBasicType,
+  _isBinaryOp,
+  _isBuiltinModel,
+  _isDefault,
+  _type,
+  _getImport,
+  _adaptedQuotes,
+  CORE,
+  REQUEST,
+  RESPONSE,
+  EXCEPTION,
+  RESP_EXCEPTION,
+  MODEL,
+};

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@darabonba/python-generator",
-  "version": "1.2.18",
+  "version": "2.0.0",
   "description": "The darabonba generator for Python",
-  "main": "src/generator.js",
+  "main": "lib/generator.js",
   "directories": {
-    "src": "src"
+    "lib": "lib"
   },
   "scripts": {
-    "lint": "eslint --fix src/",
+    "lint": "eslint --fix lib/ tests/",
     "test": "mocha -R spec -t 3000 tests/*.tests.js",
     "test-cov": "nyc -r=lcov -r=html -r=text -r=json npm run test",
     "ci": "npm run lint && npm run test-cov"
@@ -30,7 +30,8 @@
   "author": "Alibaba Cloud OpenAPI Team",
   "license": "Apache-2.0",
   "dependencies": {
-    "@darabonba/parser": "^1.2.10",
+    "@darabonba/annotation-parser": "^1.0.1",
+    "@darabonba/parser": "^2.1.4",
     "enum": "^3.0.4"
   }
 }

package/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,

package/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);

package/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);

package/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;
     }

package/tests/expected/alias/setup.py

@@ -0,0 +1,79 @@
+# -*- coding: utf-8 -*-
+"""
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied.  See the License for the
+ specific language governing permissions and limitations
+ under the License.
+"""
+
+import os
+from setuptools import setup, find_packages
+
+"""
+setup module for tea_python_tests.
+
+Created on *
+
+@author: Alibaba
+"""
+
+PACKAGE = "tea_python_tests"
+NAME = "tea_python_tests"
+DESCRIPTION = ""
+AUTHOR = "Alibaba"
+AUTHOR_EMAIL = "sdk-team@alibabacloud.com"
+URL = "https://github.com/"
+VERSION = __import__(PACKAGE).__version__
+REQUIRES = [
+     "alibabacloud-tea>=1.0.0",
+    "source==0.0.1",
+    "import==1.1.2",
+    "alibabacloud_tea_util==0.3.11"
+]
+
+LONG_DESCRIPTION = ''
+if os.path.exists('./README.md'):
+    with open("README.md", encoding='utf-8') as fp:
+        LONG_DESCRIPTION = fp.read()
+
+setup(
+    name=NAME,
+    version=VERSION,
+    description=DESCRIPTION,
+    long_description=LONG_DESCRIPTION,
+    long_description_content_type='text/markdown',
+    author=AUTHOR,
+    author_email=AUTHOR_EMAIL,
+    license="Apache License 2.0",
+    url=URL,
+    keywords=["tea","python","tests"],
+    packages=find_packages(exclude=["tests*"]),
+    include_package_data=True,
+    platforms="any",
+    install_requires=REQUIRES,
+    python_requires=">=3.6",
+    classifiers=(
+        "Development Status :: 4 - Beta",
+        "Intended Audience :: Developers",
+        "License :: OSI Approved :: Apache Software License",
+        "Programming Language :: Python",
+        "Programming Language :: Python :: 3",
+        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
+        "Topic :: Software Development"
+    )
+)

package/tests/expected/alias/tea_python_tests/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.0.0"

package/tests/expected/alias/tea_python_tests/client.py

@@ -0,0 +1,35 @@
+# -*- coding: utf-8 -*-
+# This file is auto-generated, don't edit it. Thanks.
+from __future__ import annotations
+from Import.client import Client as ImportClient 
+from Source.client import Client as SourceClient 
+from Alias.alias_client import AliasClient 
+from alias_source.source_client import SourceClient as AliasSourceSourceClient 
+from alias_symbol.client import Client as AliasSymbolClient 
+from alias_symbol import models as alias_symbol_models 
+
+
+
+
+class Client:
+
+    def __init__(self):
+        pass
+
+    @staticmethod
+    def empty_model() -> None:
+        ImportClient.test()
+        SourceClient.test()
+        AliasClient.test()
+        AliasSourceSourceClient.test()
+        AliasSymbolClient.test()
+        model = alias_symbol_models.TestModel()
+
+    @staticmethod
+    async def empty_model_async() -> None:
+        ImportClient.test()
+        await SourceClient.test_async()
+        AliasClient.test()
+        AliasSourceSourceClient.test()
+        AliasSymbolClient.test()
+        model = alias_symbol_models.TestModel()

package/tests/expected/annotation/tea_python_tests/__init__.py

@@ -0,0 +1 @@
+__version__ = "1.0.0"