@typespec/emitter-framework 0.17.0-dev.2 → 0.17.0-dev.4
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/src/csharp/components/extensible-enum/extensible-enum.d.ts +2 -2
- package/dist/src/csharp/components/extensible-enum/extensible-enum.d.ts.map +1 -1
- package/dist/src/csharp/components/extensible-enum/extensible-enum.js.map +1 -1
- package/dist/src/csharp/components/index.d.ts +1 -0
- package/dist/src/csharp/components/index.d.ts.map +1 -1
- package/dist/src/csharp/components/index.js +1 -0
- package/dist/src/csharp/components/index.js.map +1 -1
- package/dist/src/python/components/type-expression/type-expression.js +14 -13
- package/dist/src/python/components/type-expression/type-expression.js.map +1 -1
- package/dist/src/typescript/components/type-expression.js +1 -1
- package/dist/src/typescript/components/type-expression.js.map +1 -1
- package/package.json +3 -3
- package/package.json.bak +3 -3
- package/src/csharp/components/extensible-enum/extensible-enum.tsx +2 -2
- package/src/csharp/components/index.ts +1 -0
- package/src/python/components/type-expression/type-expression.tsx +14 -13
- package/src/typescript/components/type-expression.tsx +1 -1
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { type Children } from "@alloy-js/core";
|
|
2
2
|
import { type StructDeclarationProps } from "@alloy-js/csharp";
|
|
3
3
|
import type { Union } from "@typespec/compiler";
|
|
4
|
-
export interface
|
|
4
|
+
export interface ExtensibleEnumDeclarationProps extends Omit<StructDeclarationProps, "name"> {
|
|
5
5
|
/** Union that should be rendered as an extensible enum struct */
|
|
6
6
|
type: Union;
|
|
7
7
|
/** Name override */
|
|
@@ -10,5 +10,5 @@ export interface EnumDeclarationProps extends Omit<StructDeclarationProps, "name
|
|
|
10
10
|
/**
|
|
11
11
|
* Render a struct designed to represent an extensible enum based on a TypeSpec union.
|
|
12
12
|
*/
|
|
13
|
-
export declare function ExtensibleEnumDeclaration(props:
|
|
13
|
+
export declare function ExtensibleEnumDeclaration(props: ExtensibleEnumDeclarationProps): Children;
|
|
14
14
|
//# sourceMappingURL=extensible-enum.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"extensible-enum.d.ts","sourceRoot":"","sources":["../../../../../src/csharp/components/extensible-enum/extensible-enum.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAoC,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACjF,OAAO,EAOL,KAAK,sBAAsB,EAC5B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAGhD,MAAM,WAAW,
|
|
1
|
+
{"version":3,"file":"extensible-enum.d.ts","sourceRoot":"","sources":["../../../../../src/csharp/components/extensible-enum/extensible-enum.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAoC,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACjF,OAAO,EAOL,KAAK,sBAAsB,EAC5B,MAAM,kBAAkB,CAAC;AAC1B,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAGhD,MAAM,WAAW,8BAA+B,SAAQ,IAAI,CAAC,sBAAsB,EAAE,MAAM,CAAC;IAC1F,iEAAiE;IACjE,IAAI,EAAE,KAAK,CAAC;IACZ,oBAAoB;IACpB,IAAI,CAAC,EAAE,MAAM,CAAC;CACf;AAED;;GAEG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,8BAA8B,GAAG,QAAQ,CAYzF"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["code","For","List","namekey","refkey","Constructor","Field","Method","Property","StructDeclaration","useCSharpNamePolicy","declarationRefkeys","ExtensibleEnumDeclaration","props","variants","kind","getExtensibleEnumVariantsFromUnion","type","refkeys","_$createComponent","ExtensibleEnumFromVariants","_$mergeProps","name","union","kinds","Set","member","values","value","push","add","numName","toString","size","Error","valueRk","constructorRk","namepolicy","getName","readonly","interfaceTypes","children","doubleHardline","parameters","each","x","get","initializer","ignoreNameConflict","returns","expression","override","ignoreNamePolicy"],"sources":["../../../../../src/csharp/components/extensible-enum/extensible-enum.tsx"],"sourcesContent":[null],"mappings":";AAAA,SAASA,IAAI,EAAEC,GAAG,EAAEC,IAAI,EAAEC,OAAO,EAAEC,MAAM,QAAuB,gBAAgB;AAChF,SACEC,WAAW,EACXC,KAAK,EACLC,MAAM,EACNC,QAAQ,EACRC,iBAAiB,EACjBC,mBAAmB,QAEd,kBAAkB;AAEzB,SAASC,kBAAkB,QAAQ,oBAAoB;AASvD;AACA;AACA;AACA,OAAO,SAASC,yBAAyBA,CAACC,
|
|
1
|
+
{"version":3,"names":["code","For","List","namekey","refkey","Constructor","Field","Method","Property","StructDeclaration","useCSharpNamePolicy","declarationRefkeys","ExtensibleEnumDeclaration","props","variants","kind","getExtensibleEnumVariantsFromUnion","type","refkeys","_$createComponent","ExtensibleEnumFromVariants","_$mergeProps","name","union","kinds","Set","member","values","value","push","add","numName","toString","size","Error","valueRk","constructorRk","namepolicy","getName","readonly","interfaceTypes","children","doubleHardline","parameters","each","x","get","initializer","ignoreNameConflict","returns","expression","override","ignoreNamePolicy"],"sources":["../../../../../src/csharp/components/extensible-enum/extensible-enum.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export * from "./class/declaration.js";
|
|
2
2
|
export * from "./enum/declaration.jsx";
|
|
3
|
+
export * from "./extensible-enum/extensible-enum.jsx";
|
|
3
4
|
export * from "./json-converter/json-converter-resolver.jsx";
|
|
4
5
|
export * from "./json-converter/json-converter.jsx";
|
|
5
6
|
export * from "./property/property.jsx";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/csharp/components/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,8CAA8C,CAAC;AAC7D,cAAc,qCAAqC,CAAC;AACpD,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/csharp/components/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uCAAuC,CAAC;AACtD,cAAc,8CAA8C,CAAC;AAC7D,cAAc,qCAAqC,CAAC;AACpD,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export * from "./class/declaration.js";
|
|
2
2
|
export * from "./enum/declaration.js";
|
|
3
|
+
export * from "./extensible-enum/extensible-enum.js";
|
|
3
4
|
export * from "./json-converter/json-converter-resolver.js";
|
|
4
5
|
export * from "./json-converter/json-converter.js";
|
|
5
6
|
export * from "./property/property.js";
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":[],"sources":["../../../../src/csharp/components/index.ts"],"sourcesContent":[null],"mappings":"AAAA,cAAc,wBAAwB;AACtC;AACA;AACA;AACA;AACA","ignoreList":[]}
|
|
1
|
+
{"version":3,"names":[],"sources":["../../../../src/csharp/components/index.ts"],"sourcesContent":[null],"mappings":"AAAA,cAAc,wBAAwB;AACtC;AACA;AACA;AACA;AACA;AACA","ignoreList":[]}
|
|
@@ -161,7 +161,7 @@ export function TypeExpression(props) {
|
|
|
161
161
|
{
|
|
162
162
|
// Render function types as typing.Callable[[ArgTypes...], ReturnType]
|
|
163
163
|
// If parameters cannot be enumerated, fall back to Callable[..., ReturnType]
|
|
164
|
-
let paramTypes
|
|
164
|
+
let paramTypes;
|
|
165
165
|
const op = type;
|
|
166
166
|
if (op.parameters) {
|
|
167
167
|
try {
|
|
@@ -292,18 +292,19 @@ const pythonTypeToImport = new Map([["Any", typingModule["."]["Any"]], ["Never",
|
|
|
292
292
|
function getScalarIntrinsicExpression($, type) {
|
|
293
293
|
let intrinsicName;
|
|
294
294
|
if ($.scalar.is(type)) {
|
|
295
|
-
|
|
296
|
-
|
|
297
|
-
|
|
298
|
-
|
|
299
|
-
|
|
300
|
-
|
|
301
|
-
|
|
302
|
-
|
|
303
|
-
|
|
304
|
-
|
|
305
|
-
|
|
306
|
-
}
|
|
295
|
+
// This was always is overridden below?
|
|
296
|
+
// if ($.scalar.isUtcDateTime(type) || $.scalar.extendsUtcDateTime(type)) {
|
|
297
|
+
// const encoding = $.scalar.getEncoding(type);
|
|
298
|
+
// intrinsicName = "utcDateTime";
|
|
299
|
+
// switch (encoding?.encoding) {
|
|
300
|
+
// case "unixTimestamp":
|
|
301
|
+
// case "rfc7231":
|
|
302
|
+
// case "rfc3339":
|
|
303
|
+
// default:
|
|
304
|
+
// intrinsicName = `utcDateTime`;
|
|
305
|
+
// break;
|
|
306
|
+
// }
|
|
307
|
+
// }
|
|
307
308
|
intrinsicName = $.scalar.getStdBase(type)?.name ?? "";
|
|
308
309
|
} else {
|
|
309
310
|
intrinsicName = type.name;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["Experimental_OverridableComponent","useTsp","reportPythonDiagnostic","code","For","List","mapJoin","py","isNeverType","datetimeModule","decimalModule","typingModule","efRefkey","ArrayExpression","RecordExpression","TypeExpression","props","$","type","noReference","isDeclaration","_$createComponent","reference","children","Reference","refkey","kind","_$memo","getScalarIntrinsicExpression","formatLiteralValue","each","values","comma","space","element","variants","Array","from","isLiteralOrVariantRef","t","isLiteral","union","name","innerTypes","map","v","every","literalValues","innerType","variantName","String","toUpperCase","undefined","filter","Boolean","joiner","array","is","elementType","indexer","value","record","program","target","node","id","sv","paramTypes","op","parameters","modelProps","model","getProperties","p","length","returnType","literal","isString","isNumeric","isBoolean","JSON","stringify","intrinsicNameToPythonType","Map","pythonTypeToImport","intrinsicName","scalar","
|
|
1
|
+
{"version":3,"names":["Experimental_OverridableComponent","useTsp","reportPythonDiagnostic","code","For","List","mapJoin","py","isNeverType","datetimeModule","decimalModule","typingModule","efRefkey","ArrayExpression","RecordExpression","TypeExpression","props","$","type","noReference","isDeclaration","_$createComponent","reference","children","Reference","refkey","kind","_$memo","getScalarIntrinsicExpression","formatLiteralValue","each","values","comma","space","element","variants","Array","from","isLiteralOrVariantRef","t","isLiteral","union","name","innerTypes","map","v","every","literalValues","innerType","variantName","String","toUpperCase","undefined","filter","Boolean","joiner","array","is","elementType","indexer","value","record","program","target","node","id","sv","paramTypes","op","parameters","modelProps","model","getProperties","p","length","returnType","literal","isString","isNumeric","isBoolean","JSON","stringify","intrinsicNameToPythonType","Map","pythonTypeToImport","intrinsicName","scalar","getStdBase","pythonType","get","importModule"],"sources":["../../../../../src/python/components/type-expression/type-expression.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -171,7 +171,7 @@ function getScalarIntrinsicExpression($, type) {
|
|
|
171
171
|
if ($.scalar.is(type)) {
|
|
172
172
|
if ($.scalar.isUtcDateTime(type) || $.scalar.extendsUtcDateTime(type)) {
|
|
173
173
|
const encoding = $.scalar.getEncoding(type);
|
|
174
|
-
let emittedType
|
|
174
|
+
let emittedType;
|
|
175
175
|
switch (encoding?.encoding) {
|
|
176
176
|
case "unixTimestamp":
|
|
177
177
|
case "rfc7231":
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"names":["For","Reference","ValueExpression","Experimental_OverridableComponent","useTsp","reportTypescriptDiagnostic","efRefkey","ArrayExpression","FunctionType","InterfaceExpression","RecordExpression","UnionExpression","TypeExpression","props","type","$","_$createComponent","reference","children","noReference","isDeclaration","refkey","kind","_$memo","getScalarIntrinsicExpression","jsValue","value","each","values","comma","line","element","array","is","elementType","indexer","record","program","code","target","intrinsicNameToTSType","Map","intrinsicName","scalar","isUtcDateTime","extendsUtcDateTime","encoding","getEncoding","emittedType","getStdBase","name","tsType","get","Boolean"],"sources":["../../../../src/typescript/components/type-expression.tsx"],"sourcesContent":[null],"mappings":"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
|
|
1
|
+
{"version":3,"names":["For","Reference","ValueExpression","Experimental_OverridableComponent","useTsp","reportTypescriptDiagnostic","efRefkey","ArrayExpression","FunctionType","InterfaceExpression","RecordExpression","UnionExpression","TypeExpression","props","type","$","_$createComponent","reference","children","noReference","isDeclaration","refkey","kind","_$memo","getScalarIntrinsicExpression","jsValue","value","each","values","comma","line","element","array","is","elementType","indexer","record","program","code","target","intrinsicNameToTSType","Map","intrinsicName","scalar","isUtcDateTime","extendsUtcDateTime","encoding","getEncoding","emittedType","getStdBase","name","tsType","get","Boolean"],"sources":["../../../../src/typescript/components/type-expression.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typespec/emitter-framework",
|
|
3
|
-
"version": "0.17.0-dev.
|
|
3
|
+
"version": "0.17.0-dev.4",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"repository": {
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"@alloy-js/csharp": "^0.22.0",
|
|
49
49
|
"@alloy-js/python": "^0.3.0",
|
|
50
50
|
"@alloy-js/typescript": "^0.22.0",
|
|
51
|
-
"@typespec/compiler": "^1.9.0 || >= 1.10.0-dev.
|
|
51
|
+
"@typespec/compiler": "^1.9.0 || >= 1.10.0-dev.10"
|
|
52
52
|
},
|
|
53
53
|
"devDependencies": {
|
|
54
54
|
"@alloy-js/cli": "^0.22.0",
|
|
@@ -56,7 +56,7 @@
|
|
|
56
56
|
"@alloy-js/python": "^0.3.0",
|
|
57
57
|
"@alloy-js/rollup-plugin": "^0.1.0",
|
|
58
58
|
"@alloy-js/typescript": "^0.22.0",
|
|
59
|
-
"@typespec/compiler": "^1.9.0 || >= 1.10.0-dev.
|
|
59
|
+
"@typespec/compiler": "^1.9.0 || >= 1.10.0-dev.10",
|
|
60
60
|
"concurrently": "^9.1.2",
|
|
61
61
|
"pathe": "^2.0.3",
|
|
62
62
|
"prettier": "~3.8.0",
|
package/package.json.bak
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typespec/emitter-framework",
|
|
3
|
-
"version": "0.17.0-dev.
|
|
3
|
+
"version": "0.17.0-dev.4",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"repository": {
|
|
@@ -66,7 +66,7 @@
|
|
|
66
66
|
"@alloy-js/csharp": "^0.22.0",
|
|
67
67
|
"@alloy-js/python": "^0.3.0",
|
|
68
68
|
"@alloy-js/typescript": "^0.22.0",
|
|
69
|
-
"@typespec/compiler": "^1.9.0 || >= 1.10.0-dev.
|
|
69
|
+
"@typespec/compiler": "^1.9.0 || >= 1.10.0-dev.10"
|
|
70
70
|
},
|
|
71
71
|
"devDependencies": {
|
|
72
72
|
"@alloy-js/cli": "^0.22.0",
|
|
@@ -74,7 +74,7 @@
|
|
|
74
74
|
"@alloy-js/python": "^0.3.0",
|
|
75
75
|
"@alloy-js/rollup-plugin": "^0.1.0",
|
|
76
76
|
"@alloy-js/typescript": "^0.22.0",
|
|
77
|
-
"@typespec/compiler": "^1.9.0 || >= 1.10.0-dev.
|
|
77
|
+
"@typespec/compiler": "^1.9.0 || >= 1.10.0-dev.10",
|
|
78
78
|
"concurrently": "^9.1.2",
|
|
79
79
|
"pathe": "^2.0.3",
|
|
80
80
|
"prettier": "~3.8.0",
|
|
@@ -11,7 +11,7 @@ import {
|
|
|
11
11
|
import type { Union } from "@typespec/compiler";
|
|
12
12
|
import { declarationRefkeys } from "../utils/refkey.js";
|
|
13
13
|
|
|
14
|
-
export interface
|
|
14
|
+
export interface ExtensibleEnumDeclarationProps extends Omit<StructDeclarationProps, "name"> {
|
|
15
15
|
/** Union that should be rendered as an extensible enum struct */
|
|
16
16
|
type: Union;
|
|
17
17
|
/** Name override */
|
|
@@ -21,7 +21,7 @@ export interface EnumDeclarationProps extends Omit<StructDeclarationProps, "name
|
|
|
21
21
|
/**
|
|
22
22
|
* Render a struct designed to represent an extensible enum based on a TypeSpec union.
|
|
23
23
|
*/
|
|
24
|
-
export function ExtensibleEnumDeclaration(props:
|
|
24
|
+
export function ExtensibleEnumDeclaration(props: ExtensibleEnumDeclarationProps): Children {
|
|
25
25
|
const { variants, kind } = getExtensibleEnumVariantsFromUnion(props.type);
|
|
26
26
|
const refkeys = declarationRefkeys(props.refkey, props.type)[0];
|
|
27
27
|
return (
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
export * from "./class/declaration.js";
|
|
2
2
|
export * from "./enum/declaration.jsx";
|
|
3
|
+
export * from "./extensible-enum/extensible-enum.jsx";
|
|
3
4
|
export * from "./json-converter/json-converter-resolver.jsx";
|
|
4
5
|
export * from "./json-converter/json-converter.jsx";
|
|
5
6
|
export * from "./property/property.jsx";
|
|
@@ -161,7 +161,7 @@ export function TypeExpression(props: TypeExpressionProps) {
|
|
|
161
161
|
case "Operation": {
|
|
162
162
|
// Render function types as typing.Callable[[ArgTypes...], ReturnType]
|
|
163
163
|
// If parameters cannot be enumerated, fall back to Callable[..., ReturnType]
|
|
164
|
-
let paramTypes: Type[] | null
|
|
164
|
+
let paramTypes: Type[] | null;
|
|
165
165
|
const op: any = type as any;
|
|
166
166
|
if (op.parameters) {
|
|
167
167
|
try {
|
|
@@ -276,18 +276,19 @@ const pythonTypeToImport = new Map<string, any>([
|
|
|
276
276
|
function getScalarIntrinsicExpression($: Typekit, type: Scalar | IntrinsicType): string | null {
|
|
277
277
|
let intrinsicName: string;
|
|
278
278
|
if ($.scalar.is(type)) {
|
|
279
|
-
|
|
280
|
-
|
|
281
|
-
|
|
282
|
-
|
|
283
|
-
|
|
284
|
-
|
|
285
|
-
|
|
286
|
-
|
|
287
|
-
|
|
288
|
-
|
|
289
|
-
|
|
290
|
-
}
|
|
279
|
+
// This was always is overridden below?
|
|
280
|
+
// if ($.scalar.isUtcDateTime(type) || $.scalar.extendsUtcDateTime(type)) {
|
|
281
|
+
// const encoding = $.scalar.getEncoding(type);
|
|
282
|
+
// intrinsicName = "utcDateTime";
|
|
283
|
+
// switch (encoding?.encoding) {
|
|
284
|
+
// case "unixTimestamp":
|
|
285
|
+
// case "rfc7231":
|
|
286
|
+
// case "rfc3339":
|
|
287
|
+
// default:
|
|
288
|
+
// intrinsicName = `utcDateTime`;
|
|
289
|
+
// break;
|
|
290
|
+
// }
|
|
291
|
+
// }
|
|
291
292
|
intrinsicName = $.scalar.getStdBase(type)?.name ?? "";
|
|
292
293
|
} else {
|
|
293
294
|
intrinsicName = type.name;
|
|
@@ -132,7 +132,7 @@ function getScalarIntrinsicExpression($: Typekit, type: Scalar | IntrinsicType):
|
|
|
132
132
|
if ($.scalar.is(type)) {
|
|
133
133
|
if ($.scalar.isUtcDateTime(type) || $.scalar.extendsUtcDateTime(type)) {
|
|
134
134
|
const encoding = $.scalar.getEncoding(type);
|
|
135
|
-
let emittedType
|
|
135
|
+
let emittedType;
|
|
136
136
|
switch (encoding?.encoding) {
|
|
137
137
|
case "unixTimestamp":
|
|
138
138
|
case "rfc7231":
|