@darabonba/python-generator 2.0.0 → 2.0.1

package/lib/generator.js

@@ -59,7 +59,6 @@ class Visitor {
     // 新增：用于存储已使用的类型
     this.isAsyncFunction = false; // 新增：用于标记是否为异步函数
     this.isStaticFunction = true; // 新增：用于标记是否为非静态函数
-    this.clientName = new Map(); // 新增：用于存储importName
     // this.moduleDir = this.config.modelDirName || 'Models'; // 新增，用于存储models文件
 
     this.output = '';
@@ -274,6 +273,8 @@ setup(
     this.notes = ast.notes;
     this.builtin = getBuiltin(this);
     ast.innerModule = new Map();
+
+    this.clientName = new Map();
     this.packageInfo = {};
     this.usedTypes = [];
     this.imports = [];
@@ -566,7 +567,9 @@ setup(
       this.emit('def __init__(self):\n', level + 2);
     }
     if (ast.initBody && ast.initBody.stmts.length !==0 ) {
+      this.isStaticFunction = false;
       this.visitStmts(ast.initBody, level + 4);
+      this.isStaticFunction = true;
     } else {
       this.emit('pass\n', level + 4);
     }
@@ -628,14 +631,15 @@ setup(
           throw new Error(`The '${aliasId}' has no Python supported.`);
         }
         let className = _camelCase(pyPkg.clientName || 'client');
+        let filename = _snakeCase(className);
         let classNamespace = pyPkg.package;
         let models = 'models';
         let exceptions = 'exceptions';
         if(inner && pkg.exports[inner]) {
           let pyPath = pkg.exports[inner];
-          const [ filename ] = pyPath.split(path.sep).slice(-1);
-          models = filename.replace(/(\.tea)$|(\.spec)$|(\.dara)$/gi, '') + '_models';
-          exceptions = filename.replace(/(\.tea)$|(\.spec)$|(\.dara)$/gi, '') + '_exceptions';
+          filename = pyPath.split(path.sep).slice(-1)[0].replace(/(\.tea)$|(\.spec)$|(\.dara)$/gi, '');
+          models = filename + '_models';
+          exceptions = filename + '_exceptions';
           const arr = pyPath.split(path.sep).slice(1, -1);
           arr.map(key => {
             classNamespace += '.' + _snakeCase(key);
@@ -646,7 +650,7 @@ setup(
         const aliasName = this.getAliasName(className, aliasId);
         this.packageInfo[aliasId] = {
           aliasName: aliasName || className,
-          fileName: _snakeCase(className),
+          fileName: filename,
           clientName: className,
           namemespace: classNamespace,
           models: models,
@@ -1954,7 +1958,7 @@ setup(
         current = ast.propertyPathTypes[i];
       }
     }
-    this.emit(`${expr}[`, level);
+    this.emit(`${expr}[`);
     this.visitExpr(ast.accessKey, level);
     this.emit(']');
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@darabonba/python-generator",
-  "version": "2.0.0",
+  "version": "2.0.1",
   "description": "The darabonba generator for Python",
   "main": "lib/generator.js",
   "directories": {

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

@@ -29,8 +29,9 @@ class Client(SourceClient):
         source_config: source_models.Config,
     ):
         super().__init__(source_config)
-                self._configs[0] = source_config
+        self._configs[0] = source_config
         test = SourceClient(source_config)
+        self.print_data(DaraCore.to_map(source_config), 'test')
 
     def complex_1(
         self,
@@ -978,7 +979,7 @@ class Client(SourceClient):
             'b',
             'c'
         ]
-                configs[3] = config
+        configs[3] = config
         return configs
 
     @staticmethod
@@ -992,7 +993,7 @@ class Client(SourceClient):
                 'c'
             ]
         }
-                data["configs"][3] = config
+        data["configs"][3] = config
         return data.get("configs")
 
     @staticmethod
@@ -1000,7 +1001,7 @@ class Client(SourceClient):
         request: main_models.ComplexRequest,
         config: str,
     ) -> None:
-                request.configs.value[0] = config
+        request.configs.value[0] = config
 
     @staticmethod
     def map_access(

package/tests/expected/multi/tea_python_tests/model/user.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # This file is auto-generated, don't edit it. Thanks.
 from __future__ import annotations
+from alibabacloud_tea_util.util import Utils 
 from tea_python_tests.lib.util import Util 
 from typing import Generator, AsyncGenerator
 
@@ -12,12 +13,14 @@ class Client:
 
     @staticmethod
     def test() -> Generator[str, None, None]:
+        Utils.test()
         it = Util.test_1()
         for test in it:
             yield  test
 
     @staticmethod
     async def test_async() -> AsyncGenerator[str, None, None]:
+        Utils.test()
         it = Util.test_1()
         for test in it:
             yield  test

package/tests/fixtures/complex/main.dara

@@ -13,6 +13,7 @@ init(sourceConfig: Source.Config){
   super(sourceConfig);
   @configs[0] = sourceConfig;
   var test : Source = new Source(sourceConfig);
+  printData(sourceConfig, 'test');
 }
 
 exception Err1 = {

package/tests/fixtures/multi/libraries/darabonba_Util_0.2.11/Teafile

@@ -3,6 +3,9 @@
 	"name": "Util",
 	"version": "0.2.11",
 	"main": "./main.tea",
+	"exports": {
+		"Util": "./util.tea"
+	},
 	"releases": {
 		"go": "github.com/alibabacloud-go/tea-utils/v2/service:v2.0.4",
 		"ts": "@alicloud/tea-util:^1.4.7",
@@ -29,7 +32,10 @@
 	},
 	"python": {
 		"package": "alibabacloud_tea_util",
-		"clientName": "client"
+		"clientName": "client",
+		"exports": {
+		  "Util": "Utils"
+		}
 	},
 	"python2": {
 		"package": "alibabacloud_tea_util",

package/tests/fixtures/multi/libraries/darabonba_Util_0.2.11/util.tea

@@ -0,0 +1,2 @@
+@clientName("Utils")
+static function test(): void;

package/tests/fixtures/multi/model/user.dara

@@ -1,4 +1,5 @@
 import DARAUtil;
+import DARAUtil.Util as Utils;
 import "../lib/util" Util;
 
 
@@ -13,6 +14,7 @@ model Info extends BaseInfo {
 
 
 static async function test(): asyncIterator[string]{
+ Utils.test();
  var it:iterator[string] = Util.test1();
  for(var test : it) {
     yield test;

package/tests/output/complex/tea_python_tests/client.py

@@ -29,8 +29,9 @@ class Client(SourceClient):
         source_config: source_models.Config,
     ):
         super().__init__(source_config)
-                self._configs[0] = source_config
+        self._configs[0] = source_config
         test = SourceClient(source_config)
+        self.print_data(DaraCore.to_map(source_config), 'test')
 
     def complex_1(
         self,
@@ -978,7 +979,7 @@ class Client(SourceClient):
             'b',
             'c'
         ]
-                configs[3] = config
+        configs[3] = config
         return configs
 
     @staticmethod
@@ -992,7 +993,7 @@ class Client(SourceClient):
                 'c'
             ]
         }
-                data["configs"][3] = config
+        data["configs"][3] = config
         return data.get("configs")
 
     @staticmethod
@@ -1000,7 +1001,7 @@ class Client(SourceClient):
         request: main_models.ComplexRequest,
         config: str,
     ) -> None:
-                request.configs.value[0] = config
+        request.configs.value[0] = config
 
     @staticmethod
     def map_access(

package/tests/output/multi/tea_python_tests/model/user.py

@@ -1,6 +1,7 @@
 # -*- coding: utf-8 -*-
 # This file is auto-generated, don't edit it. Thanks.
 from __future__ import annotations
+from alibabacloud_tea_util.util import Utils 
 from tea_python_tests.lib.util import Util 
 from typing import Generator, AsyncGenerator
 
@@ -12,12 +13,14 @@ class Client:
 
     @staticmethod
     def test() -> Generator[str, None, None]:
+        Utils.test()
         it = Util.test_1()
         for test in it:
             yield  test
 
     @staticmethod
     async def test_async() -> AsyncGenerator[str, None, None]:
+        Utils.test()
         it = Util.test_1()
         for test in it:
             yield  test

package/src/generator.js

@@ -1,231 +0,0 @@
-'use strict';
-
-const path = require('path');
-const fs = require('fs');
-const debug = require('./lib/debug');
-
-const { _deepClone } = require('./lib/helper');
-const ClientResolver = require('./resolver/client');
-const ModelResolver = require('./resolver/model');
-
-class Generator {
-  constructor(meta = {}, lang = 'python') {
-    if (!meta.outputDir) {
-      throw new Error('`option.outputDir` should not empty');
-    }
-    this.lang = lang;
-    this.typedef = meta[lang] && meta[lang].typedef ? meta[lang].typedef : {};
-    this.additionalPackage = meta[lang] && meta[lang].additionalPackage ? meta[lang].additionalPackage : [];
-    this.initConfig(meta);
-  }
-
-  visit(ast) {
-    this.imports = this.resolveImports(ast);
-    this.imports.typedef = this.typedef;
-    this.imports.additionalPackage = this.additionalPackage;
-    Object.keys(this.typedef).forEach((def) => {
-      if (this.typedef[def].package && !this.imports.requirePackage.includes(this.typedef[def].package)) {
-        this.imports.requirePackage.push(this.typedef[def].package);
-      }
-    });
-    const objects = [];
-
-    // combine client code
-    const clientObjectItem = this.resolve('client', ast, ast);
-    objects.push(clientObjectItem);
-
-    // combine model code
-    ast.moduleBody.nodes.filter((item) => {
-      return item.type === 'model';
-    }).forEach((model) => {
-      const modelName = model.modelName.lexeme;
-      const modelObjectItem = this.resolve('model', model, ast);
-      if (ast.models) {
-        Object.keys(ast.models).filter((key) => {
-          return key.startsWith(modelName + '.');
-        }).forEach((key) => {
-          const subModel = ast.models[key];
-          const subModelObjectItem = this.resolve('model', subModel, ast);
-          modelObjectItem.subObject.push(subModelObjectItem);
-        });
-      }
-      objects.push(modelObjectItem);
-    });
-
-    const combinator = this.getCombinator(this.config);
-    combinator.combine(objects);
-  }
-
-  resolve(type, ast, globalAST) {
-    const combinator = this.getCombinator(this.config);
-    let resolver;
-    switch (type) {
-    case 'client':
-      resolver = new ClientResolver(ast, combinator, ast);
-      break;
-    case 'model':
-      resolver = new ModelResolver(ast, combinator, globalAST);
-      break;
-    }
-    const objectItem = resolver.resolve();
-    objectItem.includeList = combinator.includeList;
-    objectItem.includeModelList = combinator.includeModelList;
-    return objectItem;
-  }
-
-  getCombinator(configOriginal) {
-    const config = _deepClone(configOriginal);
-
-    // init combinator
-    const Combinator = require(`./langs/${this.lang}/combinator`);
-    return new Combinator(config, this.imports);
-  }
-
-  initConfig(meta) {
-    const langDir = path.join(__dirname, `./langs/${this.lang}/`);
-    if (!fs.existsSync(langDir)) {
-      throw new Error(`Not supported language : ${this.lang}`);
-    }
-    const langConfig = require(`./langs/${this.lang}/config`);
-
-    const config = {
-      package: 'darabonba_sdk',
-      clientName: langConfig.client.defaultName,
-      include: [],
-      parent: [],
-      pkgDir: '',
-      output: true,
-      dir: meta.outputDir,
-      layer: '',
-    };
-    Object.assign(config,
-      langConfig,
-      meta,
-    );
-    if (meta[this.lang]) {
-      if (!meta[this.lang].package) {
-        debug.warning('Not found package in Darafile, default package name is "darabonba_sdk".');
-      }
-
-      if (!meta[this.lang].clientName) {
-        debug.warning('Not found clientName in Darafile, default clientName is "client".');
-      }
-
-      Object.assign(config,
-        meta[this.lang],
-      );
-    } else {
-      debug.warning('Not found python config in Darafile, default config will be used.');
-    }
-
-    this.config = config;
-  }
-
-  resolveImports(ast) {
-    const imports = ast.imports;
-
-    let requirePackage = [];
-    let thirdPackageNamespace = {};
-    let thirdPackageModel = {};
-    let thirdPackageClient = {};
-    let thirdPackageClientAlias = {};
-    let importsTypedef = {};
-
-    if (imports.length > 0) {
-      const lockPath = path.join(this.config.pkgDir, '.libraries.json');
-      const lock = JSON.parse(fs.readFileSync(lockPath, 'utf8'));
-      let packageNameSet = [];
-      let clientNameSet = [];
-      ast.imports.forEach((item) => {
-        const aliasId = item.lexeme;
-        const moduleDir = this.config.libraries[aliasId];
-        let targetPath;
-        if (moduleDir.startsWith('/')) {
-          targetPath = moduleDir;
-        } else if (moduleDir.startsWith('./') || moduleDir.startsWith('../')) {
-          targetPath = path.join(this.config.pkgDir, moduleDir);
-        } else {
-          targetPath = path.join(this.config.pkgDir, lock[moduleDir]);
-        }
-        // get dara meta
-        const daraFilePath = fs.existsSync(path.join(targetPath, 'Teafile'))
-          ? path.join(targetPath, 'Teafile')
-          : path.join(targetPath, 'Darafile');
-        const daraMeta = JSON.parse(fs.readFileSync(daraFilePath));
-
-        // init package name,client name,modelDir name
-        let packageName, clientName, modelDir;
-        if (daraMeta[this.lang]) {
-          if (daraMeta[this.lang].package) {
-            packageName = daraMeta[this.lang].package;
-          } else {
-            debug.warning(`Not found package in ${daraMeta.name} Darafile, default package name is "${daraMeta.name}".`);
-            packageName = daraMeta.name;
-          }
-
-          clientName = daraMeta[this.lang].clientName
-            ? daraMeta[this.lang].clientName
-            : this.config.clientName;
-
-          modelDir = daraMeta[this.lang].modelDirName
-            ? daraMeta[this.lang].modelDirName
-            : this.config.model.dir;
-          if (daraMeta[this.lang].typedef) {
-            importsTypedef[aliasId] = {};
-            const moduleTypedef = daraMeta[this.lang].typedef;
-            Object.keys(moduleTypedef || {}).forEach((types) => {
-              if (!importsTypedef[aliasId][types]) {
-                importsTypedef[aliasId][types] = {};
-              }
-              importsTypedef[aliasId][types].import = moduleTypedef[types].import;
-              importsTypedef[aliasId][types].type = moduleTypedef[types].type;
-              if (moduleTypedef[types].package && !requirePackage.includes(moduleTypedef[types].package)) {
-                requirePackage.push(moduleTypedef[types].package);
-              }
-            });
-          }
-        } else {
-          packageName = daraMeta.name;
-          clientName = this.config.clientName;
-          modelDir = this.config.model.dir;
-        }
-
-        // resolve third package namespace
-        if (packageNameSet.indexOf(packageName.toLowerCase()) < 0) {
-          thirdPackageNamespace[aliasId] = packageName;
-          packageNameSet.push(packageName.toLowerCase());
-        } else {
-          debug.stack('Duplication namespace');
-        }
-
-        // resolve third package model client name
-        if (
-          clientNameSet.indexOf(clientName.toLowerCase()) > -1 ||
-          clientName.toLowerCase() === this.config.clientName.toLowerCase()
-        ) {
-          const alias = packageName.split('.').join('') + '->' + clientName.split('.').join('');
-          thirdPackageClientAlias[aliasId] = alias;
-          thirdPackageClient[aliasId] = clientName;
-        } else {
-          thirdPackageClient[aliasId] = clientName;
-          clientNameSet.push(clientName.toLowerCase());
-        }
-        if (daraMeta.releases && daraMeta.releases[this.lang]) {
-          requirePackage.push(daraMeta.releases[this.lang]);
-        }
-        // third package model dir name
-        thirdPackageModel[aliasId] = modelDir;
-      });
-    }
-    return {
-      requirePackage,
-      thirdPackageNamespace,
-      thirdPackageClient,
-      thirdPackageClientAlias,
-      thirdPackageModel,
-      importsTypedef,
-    };
-  }
-}
-
-module.exports = Generator;

package/src/langs/common/combinator.js

@@ -1,193 +0,0 @@
-'use strict';
-
-const debug = require('../../lib/debug');
-const Emitter = require('../../lib/emitter');
-
-const {
-  Grammer,
-  GrammerThrows,
-
-  Behavior,
-  PropItem,
-  AnnotationItem,
-  ObjectItem,
-} = require('./items');
-
-const {
-  _config,
-  _upperFirst,
-  _lowerFirst,
-} = require('../../lib/helper.js');
-
-class BaseCombinator {
-  constructor(config = {}, imports = {}) {
-    this.level = 0;
-    this.eol = '';
-
-    this.includeList = [];
-    this.includeModelList = [];
-    this.includeSet = [];
-
-    this.config = config;
-    this.imports = imports;
-
-    this.requirePackage = imports.requirePackage;
-    this.thirdPackageNamespace = imports.thirdPackageNamespace;
-    this.thirdPackageClient = imports.thirdPackageClient;
-    this.thirdPackageClientAlias = imports.thirdPackageClientAlias;
-    this.thirdPackageModel = imports.thirdPackageModel;
-    this.typedef = imports.typedef;
-    this.importsTypedef = imports.importsTypedef;
-    this.additionalPackage = imports.additionalPackage;
-
-    _config(this.config);
-  }
-
-  combine(objects = []) {
-    if (objects.some(Object => !(Object instanceof ObjectItem))) {
-      throw new Error('Only supported ObjectItem.');
-    }
-  }
-
-  combineOutputParts(config, outputParts) {
-    const globalEmitter = new Emitter(config);
-    globalEmitter.emit(outputParts.head);
-    globalEmitter.emit(outputParts.body);
-    globalEmitter.emit(outputParts.foot);
-    globalEmitter.save();
-  }
-
-  coreClass(objName) {
-    const key = _lowerFirst(objName.split('$').join(''));
-    if (this.config.tea[key]) {
-      return this.config.tea[key].name;
-    }
-    debug.stack('Unsupported core class name : ' + objName);
-  }
-
-  resolveNotes(nodes) {
-    let notes = {};
-    nodes.filter(node => node instanceof PropItem).map(prop => {
-      if (prop.notes.length > 0) {
-        prop.notes.forEach(note => {
-          note.belong = prop.index;
-          note.prop = prop.name;
-          if (typeof notes[note.key] === 'undefined') {
-            notes[note.key] = [];
-          }
-          notes[note.key].push(note);
-        });
-      }
-    });
-    return notes;
-  }
-
-  emitAnnotations(emitter, annotations) {
-    annotations.forEach(annotation => {
-      this.emitAnnotation(emitter, annotation);
-    });
-  }
-
-  findThrows(grammer, set = []) {
-    if (grammer.body) {
-      grammer.body.filter(node => {
-        if (node instanceof GrammerThrows) {
-          set.push(node);
-        } else if (node.body) {
-          this.findThrows(node, set);
-        }
-      });
-    }
-    return set;
-  }
-
-  init(ast) {
-    throw new Error('unimpelemented');
-  }
-
-  levelUp() {
-    this.level++;
-    return this.level;
-  }
-
-  levelDown() {
-    this.level--;
-    return this.level;
-  }
-
-  addModelInclude(modelName) {
-    throw new Error('unimpelemented');
-  }
-
-  addInclude(include) {
-    throw new Error('unimpelemented');
-  }
-
-  systemfunc(emitter, gram) {
-    let tmp = [];
-    gram.path.forEach(path => {
-      tmp.push(_upperFirst(path.name));
-    });
-    if (tmp.length === 0) {
-      debug.stack('Invalid path. path list cannot be empty.');
-    }
-    let systemFunc = 'sys' + tmp.join('');
-    if (this[systemFunc]) {
-      this[systemFunc].apply(this, [emitter, gram]);
-    } else {
-      debug.stack(`unimpelemented ${systemFunc}(emitter, gram){} method\n`, gram);
-    }
-  }
-
-  grammer(emit, gram, eol = true, newLine = true) {
-    if (gram instanceof AnnotationItem) {
-      this.emitAnnotation(emit, gram);
-      return;
-    }
-
-    let emitter = new Emitter();
-    let method = null;
-    if (gram instanceof Behavior) {
-      method = gram.name;
-    } else if (gram instanceof Grammer) {
-      method = _lowerFirst(gram.constructor.name);
-    } else {
-      debug.stack('Unsupported', gram);
-    }
-    if (typeof this[method] !== 'undefined') {
-      this[method].call(this, emitter, gram);
-    } else {
-      debug.stack('Unimpelemented : ' + method);
-    }
-    if (gram.eol !== null) {
-      eol = gram.eol;
-    }
-    if (gram.newLine !== null) {
-      newLine = gram.newLine;
-    }
-    if (newLine) {
-      emit.emit('', this.level);
-    }
-    emit.emit(emitter.output);
-    if (eol) {
-      emit.emitln(this.eol);
-    }
-    emitter = null;
-  }
-
-  grammerNewLine(emitter, gram) {
-    let number = gram.number;
-    while (number > 0) {
-      emitter.emitln();
-      number--;
-    }
-  }
-
-  emitGrammerValue(gram) {
-    let emitter = new Emitter();
-    this.grammerValue(emitter, gram);
-    return emitter.output;
-  }
-}
-
-module.exports = BaseCombinator;