@typespec/http-client-python 0.8.1 → 0.9.0-dev.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/emitter/code-model.d.ts.map +1 -1
- package/dist/emitter/code-model.js +2 -2
- package/dist/emitter/code-model.js.map +1 -1
- package/dist/emitter/emitter.d.ts.map +1 -1
- package/dist/emitter/emitter.js +9 -5
- package/dist/emitter/emitter.js.map +1 -1
- package/dist/emitter/lib.d.ts +11 -2
- package/dist/emitter/lib.d.ts.map +1 -1
- package/dist/emitter/lib.js +7 -1
- package/dist/emitter/lib.js.map +1 -1
- package/dist/emitter/utils.d.ts +1 -0
- package/dist/emitter/utils.d.ts.map +1 -1
- package/dist/emitter/utils.js +31 -16
- package/dist/emitter/utils.js.map +1 -1
- package/emitter/src/code-model.ts +3 -13
- package/emitter/src/emitter.ts +9 -7
- package/emitter/src/lib.ts +8 -4
- package/emitter/src/utils.ts +32 -18
- package/emitter/temp/tsconfig.tsbuildinfo +1 -1
- package/eng/scripts/ci/regenerate.ts +96 -41
- package/eng/scripts/setup/__pycache__/venvtools.cpython-38.pyc +0 -0
- package/generator/build/lib/pygen/codegen/__init__.py +0 -2
- package/generator/build/lib/pygen/codegen/models/code_model.py +5 -5
- package/generator/build/lib/pygen/codegen/serializers/__init__.py +18 -14
- package/generator/build/lib/pygen/codegen/serializers/general_serializer.py +5 -2
- package/generator/build/lib/pygen/codegen/serializers/test_serializer.py +1 -1
- package/generator/build/lib/pygen/codegen/templates/packaging_templates/MANIFEST.in.jinja2 +6 -2
- package/generator/build/lib/pygen/codegen/templates/packaging_templates/README.md.jinja2 +5 -5
- package/generator/build/lib/pygen/codegen/templates/packaging_templates/dev_requirements.txt.jinja2 +3 -3
- package/generator/build/lib/pygen/codegen/templates/packaging_templates/setup.py.jinja2 +14 -5
- package/generator/dist/pygen-0.1.0-py3-none-any.whl +0 -0
- package/generator/pygen/codegen/__init__.py +0 -2
- package/generator/pygen/codegen/models/code_model.py +5 -5
- package/generator/pygen/codegen/serializers/__init__.py +18 -14
- package/generator/pygen/codegen/serializers/general_serializer.py +5 -2
- package/generator/pygen/codegen/serializers/test_serializer.py +1 -1
- package/generator/pygen/codegen/templates/packaging_templates/MANIFEST.in.jinja2 +6 -2
- package/generator/pygen/codegen/templates/packaging_templates/README.md.jinja2 +5 -5
- package/generator/pygen/codegen/templates/packaging_templates/dev_requirements.txt.jinja2 +3 -3
- package/generator/pygen/codegen/templates/packaging_templates/setup.py.jinja2 +14 -5
- package/generator/pygen.egg-info/PKG-INFO +2 -2
- package/generator/pygen.egg-info/requires.txt +2 -2
- package/generator/setup.py +2 -2
- package/package.json +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code-model.d.ts","sourceRoot":"","sources":["../../emitter/src/code-model.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"code-model.d.ts","sourceRoot":"","sources":["../../emitter/src/code-model.ts"],"names":[],"mappings":"AAAA,OAAO,EAYL,mBAAmB,EAKpB,MAAM,6CAA6C,CAAC;AAQrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAuP5C,wBAAgB,aAAa,CAAC,iBAAiB,SAAS,mBAAmB,EACzE,UAAU,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,uBAyDhD"}
|
|
@@ -2,7 +2,7 @@ import { UsageFlags, getCrossLanguagePackageId, isAzureCoreModel, } from "@azure
|
|
|
2
2
|
import { ignoreDiagnostics } from "@typespec/compiler";
|
|
3
3
|
import { emitBasicHttpMethod, emitLroHttpMethod, emitLroPagingHttpMethod, emitPagingHttpMethod, } from "./http.js";
|
|
4
4
|
import { KnownTypes, disableGenerationMap, emitEndpointType, getType, simpleTypesMap, typesMap, } from "./types.js";
|
|
5
|
-
import { emitParamBase, getClientNamespace, getImplementation,
|
|
5
|
+
import { emitParamBase, getClientNamespace, getImplementation, getRootNamespace } from "./utils.js";
|
|
6
6
|
function emitBasicMethod(context, rootClient, method, operationGroupName) {
|
|
7
7
|
if (method.operation.kind !== "http")
|
|
8
8
|
throw new Error("We only support HTTP operations right now");
|
|
@@ -191,7 +191,7 @@ export function emitCodeModel(sdkContext) {
|
|
|
191
191
|
// Get types
|
|
192
192
|
const sdkPackage = sdkContext.sdkPackage;
|
|
193
193
|
const codeModel = {
|
|
194
|
-
namespace:
|
|
194
|
+
namespace: getRootNamespace(sdkContext),
|
|
195
195
|
clients: [],
|
|
196
196
|
};
|
|
197
197
|
for (const client of sdkPackage.clients) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"code-model.js","sourceRoot":"","sources":["../../emitter/src/code-model.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"code-model.js","sourceRoot":"","sources":["../../emitter/src/code-model.ts"],"names":[],"mappings":"AAAA,OAAO,EAcL,UAAU,EACV,yBAAyB,EACzB,gBAAgB,GACjB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AACvD,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,uBAAuB,EACvB,oBAAoB,GACrB,MAAM,WAAW,CAAC;AAEnB,OAAO,EACL,UAAU,EACV,oBAAoB,EACpB,gBAAgB,EAChB,OAAO,EACP,cAAc,EACd,QAAQ,GACT,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,aAAa,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,YAAY,CAAC;AAEpG,SAAS,eAAe,CACtB,OAA4C,EAC5C,UAA4C,EAC5C,MAAgD,EAChD,kBAA0B;IAE1B,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,KAAK,MAAM;QAClC,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC/D,QAAQ,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAC9B,KAAK,MAAM;YACT,OAAO,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;QAC9E;YACE,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IACjE,CAAC;AACH,CAAC;AAED,SAAS,aAAa,CACpB,OAA4C,EAC5C,UAA4C,EAC5C,MAA8C,EAC9C,kBAA0B;IAE1B,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,KAAK,MAAM;QAClC,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC/D,QAAQ,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAC9B,KAAK,MAAM;YACT,OAAO,iBAAiB,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;QAC5E;YACE,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IACjE,CAAC;AACH,CAAC;AAED,SAAS,gBAAgB,CACvB,OAA4C,EAC5C,UAA4C,EAC5C,MAAiD,EACjD,kBAA0B;IAE1B,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,KAAK,MAAM;QAClC,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC/D,QAAQ,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAC9B,KAAK,MAAM;YACT,OAAO,oBAAoB,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;QAC/E;YACE,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IACjE,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAC1B,OAA4C,EAC5C,UAA4C,EAC5C,MAAoD,EACpD,kBAA0B;IAE1B,IAAI,MAAM,CAAC,SAAS,CAAC,IAAI,KAAK,MAAM;QAClC,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IAC/D,QAAQ,MAAM,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC;QAC9B,KAAK,MAAM;YACT,OAAO,uBAAuB,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;QAClF;YACE,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;IACjE,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAC1B,OAA4C,EAC5C,SAA6E;IAE7E,IAAI,SAAS,CAAC,IAAI,KAAK,UAAU,EAAE,CAAC;QAClC,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;YACpC,KAAK,MAAM,WAAW,IAAI,SAAS,CAAC,IAAI,CAAC,YAAY,EAAE,CAAC;gBACtD,OAAO,gBAAgB,CAAC,OAAO,EAAE,WAA8B,CAAC,CAAC;YACnE,CAAC;QACH,CAAC;aAAM,CAAC;YACN,OAAO,gBAAgB,CAAC,OAAO,EAAE,SAAS,CAAC,IAAI,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;IACD,6DAA6D;IAC7D,IAAI,SAAS,CAAC,IAAI,KAAK,YAAY,EAAE,CAAC;QACpC,MAAM,sBAAsB,GAAG,EAAE,CAAC;QAClC,MAAM,sBAAsB,GAC1B,SAAS,CAAC,IAAI,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACnF,KAAK,MAAM,cAAc,IAAI,sBAAsB,EAAE,CAAC;YACpD,IACE,cAAc,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ;gBACvC,cAAc,CAAC,MAAM,CAAC,IAAI,KAAK,MAAM;gBACrC,CAAC,cAAc,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,IAAI,cAAc,CAAC,MAAM,CAAC,EAAE,KAAK,QAAQ,CAAC,EAClF,CAAC;gBACD,sBAAsB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAC9C,CAAC;QACH,CAAC;QACD,IAAI,sBAAsB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YACxC,OAAO,EAAE,CAAC;QACZ,CAAC;aAAM,IAAI,sBAAsB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC/C,SAAS,CAAC,IAAI,GAAG,sBAAsB,CAAC,CAAC,CAAC,CAAC;QAC7C,CAAC;aAAM,CAAC;YACL,SAAS,CAAC,IAAwC,CAAC,YAAY,GAAG,sBAAsB,CAAC;QAC5F,CAAC;IACH,CAAC;IACD,MAAM,IAAI,GAAG;QACX,GAAG,aAAa,CAAC,OAAO,EAAE,SAAS,CAAC;QACpC,cAAc,EAAE,iBAAiB,CAAC,OAAO,EAAE,SAAS,CAAC;QACrD,kBAAkB,EAAE,SAAS,CAAC,kBAAkB;QAChD,QAAQ,EAAE,SAAS,CAAC,IAAI;KACzB,CAAC;IACF,IAAI,SAAS,CAAC,iBAAiB,EAAE,CAAC;QAChC,OAAO;YACL;gBACE,GAAG,IAAI;gBACP,QAAQ,EAAE,OAAO;gBACjB,QAAQ,EAAE,aAAa;gBACvB,YAAY,EAAE,KAAK;aACpB;SACF,CAAC;IACJ,CAAC;IACD,OAAO,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAED,SAAS,UAAU,CACjB,OAA4C,EAC5C,UAA4C,EAC5C,MAA2C,EAC3C,kBAA0B;IAE1B,QAAQ,MAAM,CAAC,IAAI,EAAE,CAAC;QACpB,KAAK,OAAO;YACV,OAAO,eAAe,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;QAC1E,KAAK,KAAK;YACR,OAAO,aAAa,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;QACxE,KAAK,QAAQ;YACX,OAAO,gBAAgB,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;QAC3E;YACE,OAAO,mBAAmB,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,kBAAkB,CAAC,CAAC;IAChF,CAAC;AACH,CAAC;AAED,SAAS,mBAAmB,CAC1B,OAA4C,EAC5C,MAAwC,EACxC,UAA4C,EAC5C,MAAc;IAEd,MAAM,eAAe,GAA0B,EAAE,CAAC;IAElD,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;QACpC,IAAI,MAAM,CAAC,IAAI,KAAK,gBAAgB,EAAE,CAAC;YACrC,MAAM,cAAc,GAAG,MAAM,CAAC,QAAQ,CAAC;YACvC,MAAM,IAAI,GAAG,GAAG,MAAM,GAAG,cAAc,CAAC,IAAI,EAAE,CAAC;YAC/C,IAAI,UAAU,GAA0B,EAAE,CAAC;YAC3C,KAAK,MAAM,MAAM,IAAI,cAAc,CAAC,OAAO,EAAE,CAAC;gBAC5C,IAAI,MAAM,CAAC,IAAI,KAAK,gBAAgB;oBAAE,SAAS;gBAC/C,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC,CAAC;YAChF,CAAC;YACD,eAAe,CAAC,IAAI,CAAC;gBACnB,IAAI,EAAE,IAAI;gBACV,SAAS,EAAE,IAAI;gBACf,YAAY,EAAE,cAAc,CAAC,IAAI;gBACjC,UAAU,EAAE,UAAU;gBACtB,eAAe,EAAE,mBAAmB,CAAC,OAAO,EAAE,cAAc,EAAE,UAAU,EAAE,IAAI,CAAC;gBAC/E,eAAe,EAAE,kBAAkB,CAAC,OAAO,EAAE,cAAc,CAAC,SAAS,CAAC;aACvE,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,qDAAqD;IACrD,IAAI,MAAM,KAAK,EAAE,EAAE,CAAC;QAClB,IAAI,UAAU,GAA0B,EAAE,CAAC;QAC3C,KAAK,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAE,CAAC;YACpC,IAAI,MAAM,CAAC,IAAI,KAAK,gBAAgB;gBAAE,SAAS;YAC/C,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,OAAO,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC,CAAC;QAC9E,CAAC;QACD,IAAI,UAAU,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC1B,eAAe,CAAC,IAAI,CAAC;gBACnB,IAAI,EAAE,EAAE;gBACR,SAAS,EAAE,EAAE;gBACb,YAAY,EAAE,EAAE;gBAChB,UAAU,EAAE,UAAU;gBACtB,eAAe,EAAE,kBAAkB,CAAC,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC;aAC/D,CAAC,CAAC;QACL,CAAC;IACH,CAAC;IAED,4DAA4D;IAC5D,KAAK,MAAM,EAAE,IAAI,eAAe,EAAE,CAAC;QACjC,KAAK,MAAM,EAAE,IAAI,EAAE,CAAC,UAAU,EAAE,CAAC;YAC/B,EAAE,CAAC,eAAe,GAAG,kBAAkB,CAAC,OAAO,EAAE,EAAE,CAAC,eAAe,CAAC,CAAC;QACvE,CAAC;IACH,CAAC;IAED,OAAO,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,SAAS,CAAC;AAClE,CAAC;AAED,SAAS,UAAU,CACjB,OAA4C,EAC5C,MAAwC;IAExC,IAAI,MAAM,CAAC,oBAAoB,EAAE,CAAC;QAChC,OAAO,CAAC,wBAAwB,GAAG,EAAE,CAAC;IACxC,CAAC;IACD,MAAM,UAAU,GACd,MAAM,CAAC,oBAAoB,EAAE,UAAU;SACpC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,mBAAmB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC;SAC3C,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,GAAG,CAAC,EAAE,GAAG,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;IAE1C,MAAM,iBAAiB,GAAG,MAAM,CAAC,oBAAoB,EAAE,UAAU,CAAC,IAAI,CACpE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,KAAK,UAAU,CACO,CAAC;IACtC,MAAM,eAAe,GAAG,mBAAmB,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,CAAC,CAAC;IACzE,IAAI,GAAuB,CAAC;IAC5B,IAAI,iBAAiB,EAAE,IAAI,CAAC,IAAI,KAAK,OAAO,EAAE,CAAC;QAC7C,GAAG,GAAI,iBAAiB,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAqB,CAAC,SAAS,CAAC;IAC9E,CAAC;SAAM,CAAC;QACN,GAAG,GAAG,iBAAiB,EAAE,IAAI,CAAC,SAAS,CAAC;IAC1C,CAAC;IACD,OAAO;QACL,IAAI,EAAE,MAAM,CAAC,IAAI;QACjB,WAAW,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,EAAE;QACjE,UAAU;QACV,eAAe;QACf,GAAG;QACH,WAAW,EAAE,MAAM,CAAC,WAAW;QAC/B,GAAG,EAAE,OAAO,CAAC,GAAG;QAChB,eAAe,EAAE,kBAAkB,CAAC,OAAO,EAAE,MAAM,CAAC,SAAS,CAAC;KAC/D,CAAC;AACJ,CAAC;AAED,SAAS,iBAAiB,CAAC,KAAiB;IAC1C,OAAO,CACL,CAAC,CAAC,KAAK,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC;QAClC,CAAC,KAAK,GAAG,UAAU,CAAC,gBAAgB,CAAC,GAAG,CAAC;QACzC,CAAC,KAAK,GAAG,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QACtC,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC;QAChC,CAAC,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAClC,CAAC;AACJ,CAAC;AAED,MAAM,UAAU,aAAa,CAC3B,UAA+C;IAE/C,YAAY;IACZ,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC;IACzC,MAAM,SAAS,GAAwB;QACrC,SAAS,EAAE,gBAAgB,CAAC,UAAU,CAAC;QACvC,OAAO,EAAE,EAAE;KACZ,CAAC;IACF,KAAK,MAAM,MAAM,IAAI,UAAU,CAAC,OAAO,EAAE,CAAC;QACxC,SAAS,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC;IAC5D,CAAC;IACD,8FAA8F;IAC9F,KAAK,MAAM,KAAK,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;QACtC,2BAA2B;QAC3B,IACE,KAAK,CAAC,IAAI,KAAK,EAAE;YACjB,CAAC,CAAC,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC;gBACpC,CAAC,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,CAAC;gBACtC,CAAC,KAAK,CAAC,KAAK,GAAG,UAAU,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAC1C,CAAC;YACD,SAAS;QACX,CAAC;QACD,iEAAiE;QACjE,IAAI,iBAAiB,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE,CAAC;YACnC,SAAS;QACX,CAAC;QACD,uEAAuE;QACvE,IAAI,oBAAoB,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC;YACpC,SAAS;QACX,CAAC;QACD,yBAAyB;QACzB,IAAI,gBAAgB,CAAC,KAAK,CAAC,EAAE,CAAC;YAC5B,SAAS;QACX,CAAC;QACD,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC;IAC7B,CAAC;IACD,KAAK,MAAM,OAAO,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;QACvC,8DAA8D;QAC9D,IAAI,OAAO,CAAC,KAAK,KAAK,UAAU,CAAC,cAAc,EAAE,CAAC;YAChD,SAAS;QACX,CAAC;QACD,IAAI,iBAAiB,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC;YACrC,SAAS;QACX,CAAC;QACD,wBAAwB;QACxB,IAAI,gBAAgB,CAAC,OAAO,CAAC,EAAE,CAAC;YAC9B,SAAS;QACX,CAAC;QACD,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC;IAC/B,CAAC;IACD,SAAS,CAAC,OAAO,CAAC,GAAG;QACnB,GAAG,QAAQ,CAAC,MAAM,EAAE;QACpB,GAAG,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC;QAC5B,GAAG,cAAc,CAAC,MAAM,EAAE;KAC3B,CAAC;IACF,SAAS,CAAC,wBAAwB,CAAC,GAAG,iBAAiB,CAAC,yBAAyB,CAAC,UAAU,CAAC,CAAC,CAAC;IAC/F,OAAO,SAAS,CAAC;AACnB,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emitter.d.ts","sourceRoot":"","sources":["../../emitter/src/emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EAGX,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,WAAW,EAAY,MAAM,oBAAoB,CAAC;AAS3D,OAAO,EAAE,oBAAoB,EAAsC,MAAM,UAAU,CAAC;AAKpF,wBAAgB,aAAa,CAAC,OAAO,EAAE,UAAU,GAAG,KAAK,GAAG,MAAM,CAcjE;
|
|
1
|
+
{"version":3,"file":"emitter.d.ts","sourceRoot":"","sources":["../../emitter/src/emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,UAAU,EAGX,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAE,WAAW,EAAY,MAAM,oBAAoB,CAAC;AAS3D,OAAO,EAAE,oBAAoB,EAAsC,MAAM,UAAU,CAAC;AAKpF,wBAAgB,aAAa,CAAC,OAAO,EAAE,UAAU,GAAG,KAAK,GAAG,MAAM,CAcjE;AA8FD,wBAAsB,OAAO,CAAC,OAAO,EAAE,WAAW,CAAC,oBAAoB,CAAC,iBAevE"}
|
package/dist/emitter/emitter.js
CHANGED
|
@@ -11,7 +11,7 @@ import { saveCodeModelAsYaml } from "./external-process.js";
|
|
|
11
11
|
import { reportDiagnostic } from "./lib.js";
|
|
12
12
|
import { runPython3 } from "./run-python3.js";
|
|
13
13
|
import { disableGenerationMap, simpleTypesMap, typesMap } from "./types.js";
|
|
14
|
-
import {
|
|
14
|
+
import { getRootNamespace, md2Rst } from "./utils.js";
|
|
15
15
|
export function getModelsMode(context) {
|
|
16
16
|
const specifiedModelsMode = context.emitContext.options["models-mode"];
|
|
17
17
|
if (specifiedModelsMode) {
|
|
@@ -43,7 +43,14 @@ function addDefaultOptions(sdkContext) {
|
|
|
43
43
|
options["package-mode"] = sdkContext.arm ? "azure-mgmt" : "azure-dataplane";
|
|
44
44
|
}
|
|
45
45
|
if (!options["package-name"]) {
|
|
46
|
-
|
|
46
|
+
const namespace = getRootNamespace(sdkContext);
|
|
47
|
+
const packageName = namespace.replace(/\./g, "-");
|
|
48
|
+
reportDiagnostic(sdkContext.program, {
|
|
49
|
+
code: "no-package-name",
|
|
50
|
+
target: NoTarget,
|
|
51
|
+
format: { namespace, packageName },
|
|
52
|
+
});
|
|
53
|
+
options["package-name"] = packageName;
|
|
47
54
|
}
|
|
48
55
|
if (options.flavor !== "azure") {
|
|
49
56
|
// if they pass in a flavor other than azure, we want to ignore the value
|
|
@@ -52,9 +59,6 @@ function addDefaultOptions(sdkContext) {
|
|
|
52
59
|
if (!options.flavor && sdkContext.emitContext.emitterOutputDir.includes("azure")) {
|
|
53
60
|
options.flavor = "azure";
|
|
54
61
|
}
|
|
55
|
-
if (options["enable-typespec-namespace"] === undefined) {
|
|
56
|
-
options["enable-typespec-namespace"] = options.flavor !== "azure";
|
|
57
|
-
}
|
|
58
62
|
}
|
|
59
63
|
async function createPythonSdkContext(context) {
|
|
60
64
|
const sdkContext = await createSdkContext(context, "@azure-tools/typespec-python");
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../emitter/src/emitter.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,gBAAgB,GAIjB,MAAM,6CAA6C,CAAC;AACrD,OAAO,EAAe,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC3D,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AACzC,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,IAAI,EAAE,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACrC,OAAO,OAAO,MAAM,SAAS,CAAC;AAC9B,OAAO,EAAE,WAAW,EAAE,MAAM,SAAS,CAAC;AACtC,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AACpC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAC5D,OAAO,EAA0C,gBAAgB,EAAE,MAAM,UAAU,CAAC;AACpF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,oBAAoB,EAAE,cAAc,EAAE,QAAQ,EAAE,MAAM,YAAY,CAAC;AAC5E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"emitter.js","sourceRoot":"","sources":["../../emitter/src/emitter.ts"],"names":[],"mappings":"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"}
|
package/dist/emitter/lib.d.ts
CHANGED
|
@@ -15,7 +15,7 @@ export interface PythonEmitterOptions {
|
|
|
15
15
|
debug?: boolean;
|
|
16
16
|
flavor?: "azure";
|
|
17
17
|
"examples-dir"?: string;
|
|
18
|
-
|
|
18
|
+
namespace?: string;
|
|
19
19
|
"use-pyodide"?: boolean;
|
|
20
20
|
}
|
|
21
21
|
export interface PythonSdkContext<TServiceOperation extends SdkServiceOperation> extends SdkContext<PythonEmitterOptions, TServiceOperation> {
|
|
@@ -31,6 +31,9 @@ export declare const $lib: import("@typespec/compiler").TypeSpecLibrary<{
|
|
|
31
31
|
"pyodide-flag-conflict": {
|
|
32
32
|
readonly default: "Python is not installed. Please follow https://www.python.org/ to install Python or set 'use-pyodide' to true.";
|
|
33
33
|
};
|
|
34
|
+
"no-package-name": {
|
|
35
|
+
readonly default: import("@typespec/compiler").CallableMessage<["packageName", "namespace"]>;
|
|
36
|
+
};
|
|
34
37
|
"no-valid-client": {
|
|
35
38
|
readonly default: "Can't generate Python SDK since no client defined in typespec file.";
|
|
36
39
|
};
|
|
@@ -47,7 +50,7 @@ export declare const $lib: import("@typespec/compiler").TypeSpecLibrary<{
|
|
|
47
50
|
readonly default: import("@typespec/compiler").CallableMessage<["direction", "operationId"]>;
|
|
48
51
|
};
|
|
49
52
|
}, PythonEmitterOptions, never>;
|
|
50
|
-
export declare const reportDiagnostic: <C extends "unknown-error" | "invalid-models-mode" | "pyodide-flag-conflict" | "no-valid-client" | "invalid-paging-items" | "invalid-next-link" | "invalid-lro-result" | "invalid-continuation-token", M extends keyof {
|
|
53
|
+
export declare const reportDiagnostic: <C extends "unknown-error" | "invalid-models-mode" | "pyodide-flag-conflict" | "no-package-name" | "no-valid-client" | "invalid-paging-items" | "invalid-next-link" | "invalid-lro-result" | "invalid-continuation-token", M extends keyof {
|
|
51
54
|
"unknown-error": {
|
|
52
55
|
readonly default: import("@typespec/compiler").CallableMessage<["stack"]>;
|
|
53
56
|
};
|
|
@@ -57,6 +60,9 @@ export declare const reportDiagnostic: <C extends "unknown-error" | "invalid-mod
|
|
|
57
60
|
"pyodide-flag-conflict": {
|
|
58
61
|
readonly default: "Python is not installed. Please follow https://www.python.org/ to install Python or set 'use-pyodide' to true.";
|
|
59
62
|
};
|
|
63
|
+
"no-package-name": {
|
|
64
|
+
readonly default: import("@typespec/compiler").CallableMessage<["packageName", "namespace"]>;
|
|
65
|
+
};
|
|
60
66
|
"no-valid-client": {
|
|
61
67
|
readonly default: "Can't generate Python SDK since no client defined in typespec file.";
|
|
62
68
|
};
|
|
@@ -82,6 +88,9 @@ export declare const reportDiagnostic: <C extends "unknown-error" | "invalid-mod
|
|
|
82
88
|
"pyodide-flag-conflict": {
|
|
83
89
|
readonly default: "Python is not installed. Please follow https://www.python.org/ to install Python or set 'use-pyodide' to true.";
|
|
84
90
|
};
|
|
91
|
+
"no-package-name": {
|
|
92
|
+
readonly default: import("@typespec/compiler").CallableMessage<["packageName", "namespace"]>;
|
|
93
|
+
};
|
|
85
94
|
"no-valid-client": {
|
|
86
95
|
readonly default: "Can't generate Python SDK since no client defined in typespec file.";
|
|
87
96
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../emitter/src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAG9F,MAAM,WAAW,oBAAoB;IACnC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../emitter/src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,mBAAmB,EAAE,MAAM,6CAA6C,CAAC;AAG9F,MAAM,WAAW,oBAAoB;IACnC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,0BAA0B,CAAC,EAAE,OAAO,CAAC;IACrC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,wBAAwB,CAAC,EAAE,MAAM,CAAC;IAClC,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,gBAAgB,CAAC,iBAAiB,SAAS,mBAAmB,CAC7E,SAAQ,UAAU,CAAC,oBAAoB,EAAE,iBAAiB,CAAC;IAC3D,wBAAwB,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAAE,CAAC;CACjD;AA6FD,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;;;;+BAAgC,CAAC;AAClD,eAAO,MAAQ,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAAE,iBAAiB,4BAAE,SAAS,wFAAS,CAAC"}
|
package/dist/emitter/lib.js
CHANGED
|
@@ -18,7 +18,7 @@ const EmitterOptionsSchema = {
|
|
|
18
18
|
debug: { type: "boolean", nullable: true },
|
|
19
19
|
flavor: { type: "string", nullable: true },
|
|
20
20
|
"examples-dir": { type: "string", nullable: true, format: "absolute-path" },
|
|
21
|
-
|
|
21
|
+
namespace: { type: "string", nullable: true },
|
|
22
22
|
"use-pyodide": { type: "boolean", nullable: true },
|
|
23
23
|
},
|
|
24
24
|
required: [],
|
|
@@ -46,6 +46,12 @@ const libDef = {
|
|
|
46
46
|
},
|
|
47
47
|
},
|
|
48
48
|
// warning
|
|
49
|
+
"no-package-name": {
|
|
50
|
+
severity: "warning",
|
|
51
|
+
messages: {
|
|
52
|
+
default: paramMessage `No package-name configured in tspconfig.yaml and will infer package-name '${"packageName"}' from namespace '${"namespace"}'.`,
|
|
53
|
+
},
|
|
54
|
+
},
|
|
49
55
|
"no-valid-client": {
|
|
50
56
|
severity: "warning",
|
|
51
57
|
messages: {
|
package/dist/emitter/lib.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../emitter/src/lib.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,qBAAqB,EAAkB,YAAY,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../emitter/src/lib.ts"],"names":[],"mappings":"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"}
|
package/dist/emitter/utils.d.ts
CHANGED
|
@@ -20,6 +20,7 @@ export declare function isContinuationToken<TServiceOperation extends SdkService
|
|
|
20
20
|
export declare function emitParamBase<TServiceOperation extends SdkServiceOperation>(context: PythonSdkContext<TServiceOperation>, parameter: SdkParameter | SdkHttpParameter, method?: SdkServiceMethod<TServiceOperation>): ParamBase;
|
|
21
21
|
export declare function isAzureCoreErrorResponse(t: SdkType | undefined): boolean;
|
|
22
22
|
export declare function capitalize(name: string): string;
|
|
23
|
+
export declare function getRootNamespace(context: PythonSdkContext<SdkServiceOperation>): string;
|
|
23
24
|
export declare function getClientNamespace<TServiceOperation extends SdkServiceOperation>(context: PythonSdkContext<TServiceOperation>, clientNamespace: string): string;
|
|
24
25
|
export declare function md2Rst(text?: string): string | undefined;
|
|
25
26
|
export {};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../emitter/src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAClB,gBAAgB,EAChB,SAAS,EACT,oBAAoB,EACpB,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,mBAAmB,EACnB,wBAAwB,EACxB,OAAO,EACR,MAAM,6CAA6C,CAAC;AAGrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAoF5C,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAMrD;AAED,wBAAgB,8BAA8B,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAGpE;AAED,wBAAgB,iBAAiB,CAAC,iBAAiB,SAAS,mBAAmB,EAC7E,OAAO,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,EAC5C,SAAS,EAAE,YAAY,GAAG,gBAAgB,GACzC,QAAQ,GAAG,QAAQ,CAGrB;AAED,wBAAgB,UAAU,CAAC,iBAAiB,SAAS,mBAAmB,EACtE,MAAM,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,GAC1C,OAAO,CAET;AAED,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,iBAAiB,GAAG,kBAAkB,GAChD,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAgB/B;AAED,KAAK,SAAS,GAAG;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF,wBAAgB,UAAU,CAAC,iBAAiB,SAAS,mBAAmB,EACtE,OAAO,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,EAC5C,IAAI,EAAE,oBAAoB,GAAG,SAAS,CAAC,iBAAiB,CAAC,GACxD,MAAM,GAAG,SAAS,CAWpB;AAED,wBAAgB,mBAAmB,CAAC,iBAAiB,SAAS,mBAAmB,EAC/E,SAAS,EAAE,YAAY,GAAG,gBAAgB,GAAG,wBAAwB,EACrE,MAAM,CAAC,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,EAC5C,KAAK,GAAE,OAAc,GACpB,OAAO,CAsBT;AAED,wBAAgB,aAAa,CAAC,iBAAiB,SAAS,mBAAmB,EACzE,OAAO,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,EAC5C,SAAS,EAAE,YAAY,GAAG,gBAAgB,EAC1C,MAAM,CAAC,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,GAC3C,SAAS,CAqBX;AAED,wBAAgB,wBAAwB,CAAC,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,OAAO,CAUxE;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE/C;AAED,wBAAgB,kBAAkB,CAAC,iBAAiB,SAAS,mBAAmB,EAC9E,OAAO,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,EAC5C,eAAe,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../emitter/src/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAClB,gBAAgB,EAChB,SAAS,EACT,oBAAoB,EACpB,YAAY,EACZ,iBAAiB,EACjB,gBAAgB,EAChB,mBAAmB,EACnB,wBAAwB,EACxB,OAAO,EACR,MAAM,6CAA6C,CAAC;AAGrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAoF5C,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAMrD;AAED,wBAAgB,8BAA8B,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,CAGpE;AAED,wBAAgB,iBAAiB,CAAC,iBAAiB,SAAS,mBAAmB,EAC7E,OAAO,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,EAC5C,SAAS,EAAE,YAAY,GAAG,gBAAgB,GACzC,QAAQ,GAAG,QAAQ,CAGrB;AAED,wBAAgB,UAAU,CAAC,iBAAiB,SAAS,mBAAmB,EACtE,MAAM,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,GAC1C,OAAO,CAET;AAED,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,iBAAiB,GAAG,kBAAkB,GAChD,CAAC,MAAM,GAAG,SAAS,EAAE,OAAO,CAAC,CAgB/B;AAED,KAAK,SAAS,GAAG;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,GAAG,SAAS,CAAC;IAC5B,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,OAAO,CAAC;IACtB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC1B,mBAAmB,EAAE,OAAO,CAAC;CAC9B,CAAC;AAEF,wBAAgB,UAAU,CAAC,iBAAiB,SAAS,mBAAmB,EACtE,OAAO,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,EAC5C,IAAI,EAAE,oBAAoB,GAAG,SAAS,CAAC,iBAAiB,CAAC,GACxD,MAAM,GAAG,SAAS,CAWpB;AAED,wBAAgB,mBAAmB,CAAC,iBAAiB,SAAS,mBAAmB,EAC/E,SAAS,EAAE,YAAY,GAAG,gBAAgB,GAAG,wBAAwB,EACrE,MAAM,CAAC,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,EAC5C,KAAK,GAAE,OAAc,GACpB,OAAO,CAsBT;AAED,wBAAgB,aAAa,CAAC,iBAAiB,SAAS,mBAAmB,EACzE,OAAO,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,EAC5C,SAAS,EAAE,YAAY,GAAG,gBAAgB,EAC1C,MAAM,CAAC,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,GAC3C,SAAS,CAqBX;AAED,wBAAgB,wBAAwB,CAAC,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,OAAO,CAUxE;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAE/C;AAWD,wBAAgB,gBAAgB,CAAC,OAAO,EAAE,gBAAgB,CAAC,mBAAmB,CAAC,GAAG,MAAM,CAiBvF;AAED,wBAAgB,kBAAkB,CAAC,iBAAiB,SAAS,mBAAmB,EAC9E,OAAO,EAAE,gBAAgB,CAAC,iBAAiB,CAAC,EAC5C,eAAe,EAAE,MAAM,UASxB;AAiDD,wBAAgB,MAAM,CAAC,IAAI,CAAC,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAgCxD"}
|
package/dist/emitter/utils.js
CHANGED
|
@@ -166,24 +166,39 @@ export function isAzureCoreErrorResponse(t) {
|
|
|
166
166
|
export function capitalize(name) {
|
|
167
167
|
return name[0].toUpperCase() + name.slice(1);
|
|
168
168
|
}
|
|
169
|
-
|
|
170
|
-
|
|
171
|
-
|
|
172
|
-
|
|
169
|
+
const LIB_NAMESPACE = [
|
|
170
|
+
"azure.core",
|
|
171
|
+
"azure.resourcemanager",
|
|
172
|
+
"azure.clientgenerator.core",
|
|
173
|
+
"typespec.rest",
|
|
174
|
+
"typespec.http",
|
|
175
|
+
"typespec.versioning",
|
|
176
|
+
];
|
|
177
|
+
export function getRootNamespace(context) {
|
|
178
|
+
let rootNamespace = "";
|
|
179
|
+
if (context.sdkPackage.clients.length > 0) {
|
|
180
|
+
rootNamespace = context.sdkPackage.clients[0].namespace;
|
|
181
|
+
}
|
|
182
|
+
else if (context.sdkPackage.models.length > 0) {
|
|
183
|
+
const result = context.sdkPackage.models
|
|
184
|
+
.map((model) => model.namespace)
|
|
185
|
+
.filter((namespace) => !LIB_NAMESPACE.includes(namespace));
|
|
186
|
+
if (result.length > 0) {
|
|
187
|
+
result.sort();
|
|
188
|
+
rootNamespace = result[0];
|
|
189
|
+
}
|
|
173
190
|
}
|
|
174
|
-
if (
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
return
|
|
191
|
+
else if (context.sdkPackage.namespaces.length > 0) {
|
|
192
|
+
rootNamespace = context.sdkPackage.namespaces[0].fullName;
|
|
193
|
+
}
|
|
194
|
+
return removeUnderscoresFromNamespace(rootNamespace).toLowerCase();
|
|
195
|
+
}
|
|
196
|
+
export function getClientNamespace(context, clientNamespace) {
|
|
197
|
+
if (clientNamespace === "" ||
|
|
198
|
+
LIB_NAMESPACE.some((item) => clientNamespace.toLowerCase().startsWith(item))) {
|
|
199
|
+
return getRootNamespace(context);
|
|
183
200
|
}
|
|
184
|
-
return clientNamespace
|
|
185
|
-
? rootNamespace
|
|
186
|
-
: removeUnderscoresFromNamespace(clientNamespace).toLowerCase();
|
|
201
|
+
return removeUnderscoresFromNamespace(clientNamespace).toLowerCase();
|
|
187
202
|
}
|
|
188
203
|
function parseToken(token) {
|
|
189
204
|
let parsed = "";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../emitter/src/utils.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../emitter/src/utils.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
1
|
import {
|
|
2
|
-
SdkApiVersionParameter,
|
|
3
2
|
SdkBasicServiceMethod,
|
|
4
3
|
SdkClientType,
|
|
5
4
|
SdkCredentialParameter,
|
|
@@ -33,12 +32,7 @@ import {
|
|
|
33
32
|
simpleTypesMap,
|
|
34
33
|
typesMap,
|
|
35
34
|
} from "./types.js";
|
|
36
|
-
import {
|
|
37
|
-
emitParamBase,
|
|
38
|
-
getClientNamespace,
|
|
39
|
-
getImplementation,
|
|
40
|
-
removeUnderscoresFromNamespace,
|
|
41
|
-
} from "./utils.js";
|
|
35
|
+
import { emitParamBase, getClientNamespace, getImplementation, getRootNamespace } from "./utils.js";
|
|
42
36
|
|
|
43
37
|
function emitBasicMethod<TServiceOperation extends SdkServiceOperation>(
|
|
44
38
|
context: PythonSdkContext<TServiceOperation>,
|
|
@@ -106,11 +100,7 @@ function emitLroPagingMethod<TServiceOperation extends SdkServiceOperation>(
|
|
|
106
100
|
|
|
107
101
|
function emitMethodParameter<TServiceOperation extends SdkServiceOperation>(
|
|
108
102
|
context: PythonSdkContext<TServiceOperation>,
|
|
109
|
-
parameter:
|
|
110
|
-
| SdkEndpointParameter
|
|
111
|
-
| SdkCredentialParameter
|
|
112
|
-
| SdkMethodParameter
|
|
113
|
-
| SdkApiVersionParameter,
|
|
103
|
+
parameter: SdkEndpointParameter | SdkCredentialParameter | SdkMethodParameter,
|
|
114
104
|
): Record<string, any>[] {
|
|
115
105
|
if (parameter.kind === "endpoint") {
|
|
116
106
|
if (parameter.type.kind === "union") {
|
|
@@ -286,7 +276,7 @@ export function emitCodeModel<TServiceOperation extends SdkServiceOperation>(
|
|
|
286
276
|
// Get types
|
|
287
277
|
const sdkPackage = sdkContext.sdkPackage;
|
|
288
278
|
const codeModel: Record<string, any> = {
|
|
289
|
-
namespace:
|
|
279
|
+
namespace: getRootNamespace(sdkContext),
|
|
290
280
|
clients: [],
|
|
291
281
|
};
|
|
292
282
|
for (const client of sdkPackage.clients) {
|
package/emitter/src/emitter.ts
CHANGED
|
@@ -16,7 +16,7 @@ import { saveCodeModelAsYaml } from "./external-process.js";
|
|
|
16
16
|
import { PythonEmitterOptions, PythonSdkContext, reportDiagnostic } from "./lib.js";
|
|
17
17
|
import { runPython3 } from "./run-python3.js";
|
|
18
18
|
import { disableGenerationMap, simpleTypesMap, typesMap } from "./types.js";
|
|
19
|
-
import {
|
|
19
|
+
import { getRootNamespace, md2Rst } from "./utils.js";
|
|
20
20
|
|
|
21
21
|
export function getModelsMode(context: SdkContext): "dpg" | "none" {
|
|
22
22
|
const specifiedModelsMode = context.emitContext.options["models-mode"];
|
|
@@ -50,9 +50,14 @@ function addDefaultOptions(sdkContext: SdkContext) {
|
|
|
50
50
|
options["package-mode"] = sdkContext.arm ? "azure-mgmt" : "azure-dataplane";
|
|
51
51
|
}
|
|
52
52
|
if (!options["package-name"]) {
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
53
|
+
const namespace = getRootNamespace(sdkContext as PythonSdkContext<SdkServiceOperation>);
|
|
54
|
+
const packageName = namespace.replace(/\./g, "-");
|
|
55
|
+
reportDiagnostic(sdkContext.program, {
|
|
56
|
+
code: "no-package-name",
|
|
57
|
+
target: NoTarget,
|
|
58
|
+
format: { namespace, packageName },
|
|
59
|
+
});
|
|
60
|
+
options["package-name"] = packageName;
|
|
56
61
|
}
|
|
57
62
|
if (options.flavor !== "azure") {
|
|
58
63
|
// if they pass in a flavor other than azure, we want to ignore the value
|
|
@@ -61,9 +66,6 @@ function addDefaultOptions(sdkContext: SdkContext) {
|
|
|
61
66
|
if (!options.flavor && sdkContext.emitContext.emitterOutputDir.includes("azure")) {
|
|
62
67
|
options.flavor = "azure";
|
|
63
68
|
}
|
|
64
|
-
if (options["enable-typespec-namespace"] === undefined) {
|
|
65
|
-
options["enable-typespec-namespace"] = options.flavor !== "azure";
|
|
66
|
-
}
|
|
67
69
|
}
|
|
68
70
|
|
|
69
71
|
async function createPythonSdkContext<TServiceOperation extends SdkServiceOperation>(
|
package/emitter/src/lib.ts
CHANGED
|
@@ -17,9 +17,7 @@ export interface PythonEmitterOptions {
|
|
|
17
17
|
debug?: boolean;
|
|
18
18
|
flavor?: "azure";
|
|
19
19
|
"examples-dir"?: string;
|
|
20
|
-
|
|
21
|
-
// package namespace is always aligned with package name.
|
|
22
|
-
"enable-typespec-namespace"?: boolean;
|
|
20
|
+
namespace?: string;
|
|
23
21
|
"use-pyodide"?: boolean;
|
|
24
22
|
}
|
|
25
23
|
|
|
@@ -47,7 +45,7 @@ const EmitterOptionsSchema: JSONSchemaType<PythonEmitterOptions> = {
|
|
|
47
45
|
debug: { type: "boolean", nullable: true },
|
|
48
46
|
flavor: { type: "string", nullable: true },
|
|
49
47
|
"examples-dir": { type: "string", nullable: true, format: "absolute-path" },
|
|
50
|
-
|
|
48
|
+
namespace: { type: "string", nullable: true },
|
|
51
49
|
"use-pyodide": { type: "boolean", nullable: true },
|
|
52
50
|
},
|
|
53
51
|
required: [],
|
|
@@ -77,6 +75,12 @@ const libDef = {
|
|
|
77
75
|
},
|
|
78
76
|
},
|
|
79
77
|
// warning
|
|
78
|
+
"no-package-name": {
|
|
79
|
+
severity: "warning",
|
|
80
|
+
messages: {
|
|
81
|
+
default: paramMessage`No package-name configured in tspconfig.yaml and will infer package-name '${"packageName"}' from namespace '${"namespace"}'.`,
|
|
82
|
+
},
|
|
83
|
+
},
|
|
80
84
|
"no-valid-client": {
|
|
81
85
|
severity: "warning",
|
|
82
86
|
messages: {
|
package/emitter/src/utils.ts
CHANGED
|
@@ -242,31 +242,45 @@ export function capitalize(name: string): string {
|
|
|
242
242
|
return name[0].toUpperCase() + name.slice(1);
|
|
243
243
|
}
|
|
244
244
|
|
|
245
|
+
const LIB_NAMESPACE = [
|
|
246
|
+
"azure.core",
|
|
247
|
+
"azure.resourcemanager",
|
|
248
|
+
"azure.clientgenerator.core",
|
|
249
|
+
"typespec.rest",
|
|
250
|
+
"typespec.http",
|
|
251
|
+
"typespec.versioning",
|
|
252
|
+
];
|
|
253
|
+
|
|
254
|
+
export function getRootNamespace(context: PythonSdkContext<SdkServiceOperation>): string {
|
|
255
|
+
let rootNamespace = "";
|
|
256
|
+
if (context.sdkPackage.clients.length > 0) {
|
|
257
|
+
rootNamespace = context.sdkPackage.clients[0].namespace;
|
|
258
|
+
} else if (context.sdkPackage.models.length > 0) {
|
|
259
|
+
const result = context.sdkPackage.models
|
|
260
|
+
.map((model) => model.namespace)
|
|
261
|
+
.filter((namespace) => !LIB_NAMESPACE.includes(namespace));
|
|
262
|
+
if (result.length > 0) {
|
|
263
|
+
result.sort();
|
|
264
|
+
rootNamespace = result[0];
|
|
265
|
+
}
|
|
266
|
+
} else if (context.sdkPackage.namespaces.length > 0) {
|
|
267
|
+
rootNamespace = context.sdkPackage.namespaces[0].fullName;
|
|
268
|
+
}
|
|
269
|
+
|
|
270
|
+
return removeUnderscoresFromNamespace(rootNamespace).toLowerCase();
|
|
271
|
+
}
|
|
272
|
+
|
|
245
273
|
export function getClientNamespace<TServiceOperation extends SdkServiceOperation>(
|
|
246
274
|
context: PythonSdkContext<TServiceOperation>,
|
|
247
275
|
clientNamespace: string,
|
|
248
276
|
) {
|
|
249
|
-
const rootNamespace = removeUnderscoresFromNamespace(
|
|
250
|
-
context.sdkPackage.rootNamespace,
|
|
251
|
-
).toLowerCase();
|
|
252
|
-
if (!context.emitContext.options["enable-typespec-namespace"]) {
|
|
253
|
-
return rootNamespace;
|
|
254
|
-
}
|
|
255
277
|
if (
|
|
256
|
-
|
|
257
|
-
|
|
258
|
-
"azure.resourcemanager",
|
|
259
|
-
"azure.clientgenerator.core",
|
|
260
|
-
"typespec.rest",
|
|
261
|
-
"typespec.http",
|
|
262
|
-
"typespec.versioning",
|
|
263
|
-
].some((item) => clientNamespace.toLowerCase().startsWith(item))
|
|
278
|
+
clientNamespace === "" ||
|
|
279
|
+
LIB_NAMESPACE.some((item) => clientNamespace.toLowerCase().startsWith(item))
|
|
264
280
|
) {
|
|
265
|
-
return
|
|
281
|
+
return getRootNamespace(context);
|
|
266
282
|
}
|
|
267
|
-
return clientNamespace
|
|
268
|
-
? rootNamespace
|
|
269
|
-
: removeUnderscoresFromNamespace(clientNamespace).toLowerCase();
|
|
283
|
+
return removeUnderscoresFromNamespace(clientNamespace).toLowerCase();
|
|
270
284
|
}
|
|
271
285
|
|
|
272
286
|
function parseToken(token: Token): string {
|