@typespec/compiler 0.65.0-dev.2 → 0.65.0-dev.22
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/manifest.js +2 -2
- package/dist/src/core/binder.d.ts +1 -1
- package/dist/src/core/binder.d.ts.map +1 -1
- package/dist/src/core/binder.js +1 -0
- package/dist/src/core/binder.js.map +1 -1
- package/dist/src/core/checker.d.ts.map +1 -1
- package/dist/src/core/checker.js +7 -4
- package/dist/src/core/checker.js.map +1 -1
- package/dist/src/core/compiler-code-fixes/convert-to-value.codefix.d.ts +10 -0
- package/dist/src/core/compiler-code-fixes/convert-to-value.codefix.d.ts.map +1 -0
- package/dist/src/core/compiler-code-fixes/convert-to-value.codefix.js +68 -0
- package/dist/src/core/compiler-code-fixes/convert-to-value.codefix.js.map +1 -0
- package/dist/src/core/decorator-utils.d.ts.map +1 -1
- package/dist/src/core/decorator-utils.js +3 -1
- package/dist/src/core/decorator-utils.js.map +1 -1
- package/dist/src/core/deprecation.d.ts.map +1 -1
- package/dist/src/core/deprecation.js +1 -3
- package/dist/src/core/deprecation.js.map +1 -1
- package/dist/src/core/helpers/projected-names-utils.d.ts.map +1 -1
- package/dist/src/core/helpers/projected-names-utils.js.map +1 -1
- package/dist/src/core/intrinsic-type-state.d.ts.map +1 -1
- package/dist/src/core/intrinsic-type-state.js +1 -3
- package/dist/src/core/intrinsic-type-state.js.map +1 -1
- package/dist/src/core/messages.d.ts +2 -20
- package/dist/src/core/messages.d.ts.map +1 -1
- package/dist/src/core/messages.js +0 -6
- package/dist/src/core/messages.js.map +1 -1
- package/dist/src/core/name-resolver.d.ts.map +1 -1
- package/dist/src/core/name-resolver.js +1 -0
- package/dist/src/core/name-resolver.js.map +1 -1
- package/dist/src/core/parser.d.ts.map +1 -1
- package/dist/src/core/parser.js +1 -0
- package/dist/src/core/parser.js.map +1 -1
- package/dist/src/core/program.d.ts +2 -0
- package/dist/src/core/program.d.ts.map +1 -1
- package/dist/src/core/program.js +2 -0
- package/dist/src/core/program.js.map +1 -1
- package/dist/src/core/projected-program.d.ts.map +1 -1
- package/dist/src/core/projected-program.js.map +1 -1
- package/dist/src/core/projection-members.d.ts.map +1 -1
- package/dist/src/core/projection-members.js +1 -0
- package/dist/src/core/projection-members.js.map +1 -1
- package/dist/src/core/projector.d.ts.map +1 -1
- package/dist/src/core/projector.js +1 -5
- package/dist/src/core/projector.js.map +1 -1
- package/dist/src/core/semantic-walker.d.ts +4 -0
- package/dist/src/core/semantic-walker.d.ts.map +1 -1
- package/dist/src/core/semantic-walker.js +5 -0
- package/dist/src/core/semantic-walker.js.map +1 -1
- package/dist/src/core/state-accessors.d.ts.map +1 -1
- package/dist/src/core/state-accessors.js.map +1 -1
- package/dist/src/core/type-relation-checker.d.ts.map +1 -1
- package/dist/src/core/type-relation-checker.js +1 -0
- package/dist/src/core/type-relation-checker.js.map +1 -1
- package/dist/src/core/types.d.ts +7 -0
- package/dist/src/core/types.d.ts.map +1 -1
- package/dist/src/core/types.js.map +1 -1
- package/dist/src/core/visibility/core.d.ts.map +1 -1
- package/dist/src/core/visibility/core.js +7 -6
- package/dist/src/core/visibility/core.js.map +1 -1
- package/dist/src/emitter-framework/types.d.ts.map +1 -1
- package/dist/src/experimental/freeze-graph.d.ts +3 -0
- package/dist/src/experimental/freeze-graph.d.ts.map +1 -0
- package/dist/src/experimental/freeze-graph.js +28 -0
- package/dist/src/experimental/freeze-graph.js.map +1 -0
- package/dist/src/experimental/index.d.ts +6 -2
- package/dist/src/experimental/index.d.ts.map +1 -1
- package/dist/src/experimental/index.js +6 -2
- package/dist/src/experimental/index.js.map +1 -1
- package/dist/src/experimental/mutators.d.ts +5 -3
- package/dist/src/experimental/mutators.d.ts.map +1 -1
- package/dist/src/experimental/mutators.js +283 -52
- package/dist/src/experimental/mutators.js.map +1 -1
- package/dist/src/experimental/realm.d.ts.map +1 -1
- package/dist/src/experimental/realm.js +5 -0
- package/dist/src/experimental/realm.js.map +1 -1
- package/dist/src/experimental/typekit/kits/literal.d.ts +61 -52
- package/dist/src/experimental/typekit/kits/literal.d.ts.map +1 -1
- package/dist/src/experimental/typekit/kits/literal.js.map +1 -1
- package/dist/src/experimental/typekit/kits/model-property.d.ts +11 -3
- package/dist/src/experimental/typekit/kits/model-property.d.ts.map +1 -1
- package/dist/src/experimental/typekit/kits/model-property.js.map +1 -1
- package/dist/src/experimental/typekit/kits/model.d.ts +41 -15
- package/dist/src/experimental/typekit/kits/model.d.ts.map +1 -1
- package/dist/src/experimental/typekit/kits/model.js +4 -0
- package/dist/src/experimental/typekit/kits/model.js.map +1 -1
- package/dist/src/experimental/typekit/kits/scalar.d.ts +349 -344
- package/dist/src/experimental/typekit/kits/scalar.d.ts.map +1 -1
- package/dist/src/experimental/typekit/kits/scalar.js.map +1 -1
- package/dist/src/experimental/typekit/kits/type.d.ts +5 -4
- package/dist/src/experimental/typekit/kits/type.d.ts.map +1 -1
- package/dist/src/experimental/typekit/kits/type.js +19 -38
- package/dist/src/experimental/typekit/kits/type.js.map +1 -1
- package/dist/src/experimental/typekit/kits/union-variant.d.ts +28 -15
- package/dist/src/experimental/typekit/kits/union-variant.d.ts.map +1 -1
- package/dist/src/experimental/typekit/kits/union-variant.js.map +1 -1
- package/dist/src/experimental/typekit/kits/union.d.ts +39 -30
- package/dist/src/experimental/typekit/kits/union.d.ts.map +1 -1
- package/dist/src/experimental/typekit/kits/union.js.map +1 -1
- package/dist/src/formatter/print/printer.d.ts.map +1 -1
- package/dist/src/formatter/print/printer.js.map +1 -1
- package/dist/src/init/init.d.ts +3 -2
- package/dist/src/init/init.d.ts.map +1 -1
- package/dist/src/init/init.js +8 -3
- package/dist/src/init/init.js.map +1 -1
- package/dist/src/init/scaffold.d.ts +2 -1
- package/dist/src/init/scaffold.d.ts.map +1 -1
- package/dist/src/init/scaffold.js +1 -1
- package/dist/src/init/scaffold.js.map +1 -1
- package/dist/src/lib/decorators.d.ts +0 -2
- package/dist/src/lib/decorators.d.ts.map +1 -1
- package/dist/src/lib/decorators.js +15 -26
- package/dist/src/lib/decorators.js.map +1 -1
- package/dist/src/lib/encoded-names.js +3 -3
- package/dist/src/lib/encoded-names.js.map +1 -1
- package/dist/src/lib/examples.js +5 -1
- package/dist/src/lib/examples.js.map +1 -1
- package/dist/src/lib/key.d.ts.map +1 -1
- package/dist/src/lib/key.js +3 -2
- package/dist/src/lib/key.js.map +1 -1
- package/dist/src/lib/paging.js +3 -3
- package/dist/src/lib/paging.js.map +1 -1
- package/dist/src/lib/service.d.ts.map +1 -1
- package/dist/src/lib/service.js +3 -2
- package/dist/src/lib/service.js.map +1 -1
- package/dist/src/lib/utils.d.ts +6 -3
- package/dist/src/lib/utils.d.ts.map +1 -1
- package/dist/src/lib/utils.js +7 -10
- package/dist/src/lib/utils.js.map +1 -1
- package/dist/src/lib/visibility.d.ts.map +1 -1
- package/dist/src/lib/visibility.js +3 -2
- package/dist/src/lib/visibility.js.map +1 -1
- package/dist/src/module-resolver/esm/resolve-package-exports.js +2 -2
- package/dist/src/module-resolver/esm/resolve-package-exports.js.map +1 -1
- package/dist/src/module-resolver/esm/resolve-package-imports.d.ts +5 -0
- package/dist/src/module-resolver/esm/resolve-package-imports.d.ts.map +1 -0
- package/dist/src/module-resolver/esm/resolve-package-imports.js +26 -0
- package/dist/src/module-resolver/esm/resolve-package-imports.js.map +1 -0
- package/dist/src/module-resolver/esm/utils.d.ts +4 -1
- package/dist/src/module-resolver/esm/utils.d.ts.map +1 -1
- package/dist/src/module-resolver/esm/utils.js +5 -0
- package/dist/src/module-resolver/esm/utils.js.map +1 -1
- package/dist/src/module-resolver/module-resolver.d.ts +2 -0
- package/dist/src/module-resolver/module-resolver.d.ts.map +1 -1
- package/dist/src/module-resolver/module-resolver.js +55 -3
- package/dist/src/module-resolver/module-resolver.js.map +1 -1
- package/dist/src/server/lib-provider.d.ts +23 -0
- package/dist/src/server/lib-provider.d.ts.map +1 -0
- package/dist/src/server/{emitter-provider.js → lib-provider.js} +25 -23
- package/dist/src/server/lib-provider.js.map +1 -0
- package/dist/src/server/serverlib.d.ts.map +1 -1
- package/dist/src/server/serverlib.js +5 -2
- package/dist/src/server/serverlib.js.map +1 -1
- package/dist/src/server/tspconfig/completion.d.ts +5 -3
- package/dist/src/server/tspconfig/completion.d.ts.map +1 -1
- package/dist/src/server/tspconfig/completion.js +234 -16
- package/dist/src/server/tspconfig/completion.js.map +1 -1
- package/dist/src/server/yaml-resolver.d.ts +20 -2
- package/dist/src/server/yaml-resolver.d.ts.map +1 -1
- package/dist/src/server/yaml-resolver.js +39 -6
- package/dist/src/server/yaml-resolver.js.map +1 -1
- package/dist/src/types/package-json.d.ts +19 -2
- package/dist/src/types/package-json.d.ts.map +1 -1
- package/dist/src/utils/index.d.ts +1 -0
- package/dist/src/utils/index.d.ts.map +1 -1
- package/dist/src/utils/index.js +1 -0
- package/dist/src/utils/index.js.map +1 -1
- package/dist/src/{experimental → utils}/state-accessor.d.ts +2 -4
- package/dist/src/utils/state-accessor.d.ts.map +1 -0
- package/dist/src/{experimental → utils}/state-accessor.js +2 -4
- package/dist/src/utils/state-accessor.js.map +1 -0
- package/lib/std/projected-names.tsp +5 -5
- package/package.json +15 -11
- package/templates/__snapshots__/rest/.gitignore +9 -0
- package/templates/__snapshots__/rest/main.tsp +46 -0
- package/templates/__snapshots__/rest/package.json +20 -0
- package/templates/__snapshots__/rest/tspconfig.yaml +16 -0
- package/templates/rest/main.tsp +46 -0
- package/templates/scaffolding.json +51 -5
- package/dist/src/core/compiler-code-fixes/model-to-object-literal.codefix.d.ts +0 -6
- package/dist/src/core/compiler-code-fixes/model-to-object-literal.codefix.d.ts.map +0 -1
- package/dist/src/core/compiler-code-fixes/model-to-object-literal.codefix.js +0 -15
- package/dist/src/core/compiler-code-fixes/model-to-object-literal.codefix.js.map +0 -1
- package/dist/src/core/compiler-code-fixes/tuple-to-array-value.codefix.d.ts +0 -6
- package/dist/src/core/compiler-code-fixes/tuple-to-array-value.codefix.d.ts.map +0 -1
- package/dist/src/core/compiler-code-fixes/tuple-to-array-value.codefix.js +0 -15
- package/dist/src/core/compiler-code-fixes/tuple-to-array-value.codefix.js.map +0 -1
- package/dist/src/experimental/state-accessor.d.ts.map +0 -1
- package/dist/src/experimental/state-accessor.js.map +0 -1
- package/dist/src/server/emitter-provider.d.ts +0 -22
- package/dist/src/server/emitter-provider.d.ts.map +0 -1
- package/dist/src/server/emitter-provider.js.map +0 -1
|
@@ -3,11 +3,9 @@ import type { Type } from "../core/types.js";
|
|
|
3
3
|
type StateMapGetter<K extends Type, V> = (program: Program, type: K) => V | undefined;
|
|
4
4
|
type StateMapSetter<K extends Type, V> = (program: Program, type: K, value: V) => void;
|
|
5
5
|
type StateMapMapGetter<K extends Type, V> = (program: Program) => Map<K, V>;
|
|
6
|
-
|
|
7
|
-
export declare function unsafe_useStateMap<K extends Type, V>(key: symbol): [StateMapGetter<K, V>, StateMapSetter<K, V>, StateMapMapGetter<K, V>];
|
|
6
|
+
export declare function useStateMap<K extends Type, V>(key: symbol): [StateMapGetter<K, V>, StateMapSetter<K, V>, StateMapMapGetter<K, V>];
|
|
8
7
|
type StateSetGetter<K extends Type> = (program: Program, type: K) => boolean;
|
|
9
8
|
type StateSetSetter<K extends Type> = (program: Program, type: K) => void;
|
|
10
|
-
|
|
11
|
-
export declare function unsafe_useStateSet<K extends Type>(key: symbol): [StateSetGetter<K>, StateSetSetter<K>];
|
|
9
|
+
export declare function useStateSet<K extends Type>(key: symbol): [StateSetGetter<K>, StateSetSetter<K>];
|
|
12
10
|
export {};
|
|
13
11
|
//# sourceMappingURL=state-accessor.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"state-accessor.d.ts","sourceRoot":"","sources":["../../../src/utils/state-accessor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE7C,KAAK,cAAc,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;AACtF,KAAK,cAAc,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;AACvF,KAAK,iBAAiB,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE5E,wBAAgB,WAAW,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,EAC3C,GAAG,EAAE,MAAM,GACV,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAMvE;AAED,KAAK,cAAc,CAAC,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC;AAC7E,KAAK,cAAc,CAAC,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC;AAE1E,wBAAgB,WAAW,CAAC,CAAC,SAAS,IAAI,EAAE,GAAG,EAAE,MAAM,GAAG,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAK/F"}
|
|
@@ -1,12 +1,10 @@
|
|
|
1
|
-
|
|
2
|
-
export function unsafe_useStateMap(key) {
|
|
1
|
+
export function useStateMap(key) {
|
|
3
2
|
const getter = (program, target) => program.stateMap(key).get(target);
|
|
4
3
|
const setter = (program, target, value) => program.stateMap(key).set(target, value);
|
|
5
4
|
const mapGetter = (program) => program.stateMap(key);
|
|
6
5
|
return [getter, setter, mapGetter];
|
|
7
6
|
}
|
|
8
|
-
|
|
9
|
-
export function unsafe_useStateSet(key) {
|
|
7
|
+
export function useStateSet(key) {
|
|
10
8
|
const getter = (program, target) => program.stateSet(key).has(target);
|
|
11
9
|
const setter = (program, target) => program.stateSet(key).add(target);
|
|
12
10
|
return [getter, setter];
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"state-accessor.js","sourceRoot":"","sources":["../../../src/utils/state-accessor.ts"],"names":[],"mappings":"AAOA,MAAM,UAAU,WAAW,CACzB,GAAW;IAEX,MAAM,MAAM,GAAG,CAAC,OAAgB,EAAE,MAAS,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAClF,MAAM,MAAM,GAAG,CAAC,OAAgB,EAAE,MAAS,EAAE,KAAQ,EAAE,EAAE,CACvD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC9D,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,SAAgB,CAAC,CAAC;AAC5C,CAAC;AAKD,MAAM,UAAU,WAAW,CAAiB,GAAW;IACrD,MAAM,MAAM,GAAG,CAAC,OAAgB,EAAE,MAAS,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAClF,MAAM,MAAM,GAAG,CAAC,OAAgB,EAAE,MAAS,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAElF,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC1B,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
// Set of projections consuming the @projectedName decorator
|
|
2
|
-
#suppress "
|
|
2
|
+
#suppress "deprecated"
|
|
3
3
|
projection op#target {
|
|
4
4
|
to(targetName) {
|
|
5
5
|
if hasProjectedName(self, targetName) {
|
|
@@ -13,7 +13,7 @@ projection op#target {
|
|
|
13
13
|
}
|
|
14
14
|
}
|
|
15
15
|
|
|
16
|
-
#suppress "
|
|
16
|
+
#suppress "deprecated"
|
|
17
17
|
projection interface#target {
|
|
18
18
|
to(targetName) {
|
|
19
19
|
if hasProjectedName(self, targetName) {
|
|
@@ -27,7 +27,7 @@ projection interface#target {
|
|
|
27
27
|
}
|
|
28
28
|
}
|
|
29
29
|
|
|
30
|
-
#suppress "
|
|
30
|
+
#suppress "deprecated"
|
|
31
31
|
projection model#target {
|
|
32
32
|
to(targetName) {
|
|
33
33
|
if hasProjectedName(self, targetName) {
|
|
@@ -53,7 +53,7 @@ projection model#target {
|
|
|
53
53
|
}
|
|
54
54
|
}
|
|
55
55
|
|
|
56
|
-
#suppress "
|
|
56
|
+
#suppress "deprecated"
|
|
57
57
|
projection enum#target {
|
|
58
58
|
to(targetName) {
|
|
59
59
|
if hasProjectedName(self, targetName) {
|
|
@@ -79,7 +79,7 @@ projection enum#target {
|
|
|
79
79
|
}
|
|
80
80
|
}
|
|
81
81
|
|
|
82
|
-
#suppress "
|
|
82
|
+
#suppress "deprecated"
|
|
83
83
|
projection union#target {
|
|
84
84
|
to(targetName) {
|
|
85
85
|
if hasProjectedName(self, targetName) {
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typespec/compiler",
|
|
3
|
-
"version": "0.65.0-dev.
|
|
3
|
+
"version": "0.65.0-dev.22",
|
|
4
4
|
"description": "TypeSpec Compiler Preview",
|
|
5
5
|
"author": "Microsoft Corporation",
|
|
6
6
|
"license": "MIT",
|
|
@@ -45,6 +45,10 @@
|
|
|
45
45
|
"./experimental": {
|
|
46
46
|
"types": "./dist/src/experimental/index.d.ts",
|
|
47
47
|
"default": "./dist/src/experimental/index.js"
|
|
48
|
+
},
|
|
49
|
+
"./experimental/typekit": {
|
|
50
|
+
"types": "./dist/src/experimental/typekit/index.d.ts",
|
|
51
|
+
"default": "./dist/src/experimental/typekit/index.js"
|
|
48
52
|
}
|
|
49
53
|
},
|
|
50
54
|
"browser": {
|
|
@@ -66,40 +70,40 @@
|
|
|
66
70
|
"!dist/test/**"
|
|
67
71
|
],
|
|
68
72
|
"dependencies": {
|
|
69
|
-
"@babel/code-frame": "~7.
|
|
73
|
+
"@babel/code-frame": "~7.26.2",
|
|
70
74
|
"ajv": "~8.17.1",
|
|
71
75
|
"change-case": "~5.4.4",
|
|
72
76
|
"globby": "~14.0.2",
|
|
73
77
|
"mustache": "~4.2.0",
|
|
74
78
|
"picocolors": "~1.1.1",
|
|
75
|
-
"prettier": "~3.
|
|
79
|
+
"prettier": "~3.4.2",
|
|
76
80
|
"prompts": "~2.4.2",
|
|
77
81
|
"semver": "^7.6.3",
|
|
78
82
|
"temporal-polyfill": "^0.2.5",
|
|
79
83
|
"vscode-languageserver": "~9.0.1",
|
|
80
84
|
"vscode-languageserver-textdocument": "~1.0.12",
|
|
81
|
-
"yaml": "~2.
|
|
85
|
+
"yaml": "~2.7.0",
|
|
82
86
|
"yargs": "~17.7.2"
|
|
83
87
|
},
|
|
84
88
|
"devDependencies": {
|
|
85
89
|
"@types/babel__code-frame": "~7.0.6",
|
|
86
90
|
"@types/mustache": "~4.2.5",
|
|
87
|
-
"@types/node": "~22.
|
|
91
|
+
"@types/node": "~22.10.10",
|
|
88
92
|
"@types/prompts": "~2.4.9",
|
|
89
93
|
"@types/semver": "^7.5.8",
|
|
90
94
|
"@types/yargs": "~17.0.33",
|
|
91
95
|
"@typespec/internal-build-utils": "~0.64.0 || >=0.65.0-dev <0.65.0",
|
|
92
|
-
"@vitest/coverage-v8": "^
|
|
93
|
-
"@vitest/ui": "^
|
|
94
|
-
"c8": "^10.1.
|
|
96
|
+
"@vitest/coverage-v8": "^3.0.4",
|
|
97
|
+
"@vitest/ui": "^3.0.3",
|
|
98
|
+
"c8": "^10.1.3",
|
|
95
99
|
"grammarkdown": "~3.3.2",
|
|
96
100
|
"rimraf": "~6.0.1",
|
|
97
101
|
"source-map-support": "~0.5.21",
|
|
98
102
|
"tmlanguage-generator": "~0.5.10 || >=0.6.0-dev <0.6.0",
|
|
99
|
-
"typescript": "~5.
|
|
100
|
-
"vitest": "^
|
|
103
|
+
"typescript": "~5.7.3",
|
|
104
|
+
"vitest": "^3.0.4",
|
|
101
105
|
"vscode-oniguruma": "~2.0.1",
|
|
102
|
-
"vscode-textmate": "~9.
|
|
106
|
+
"vscode-textmate": "~9.2.0"
|
|
103
107
|
},
|
|
104
108
|
"peerDependencies": {},
|
|
105
109
|
"scripts": {
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import "@typespec/http";
|
|
2
|
+
|
|
3
|
+
using TypeSpec.Http;
|
|
4
|
+
@service({
|
|
5
|
+
title: "Widget Service",
|
|
6
|
+
})
|
|
7
|
+
namespace DemoService;
|
|
8
|
+
|
|
9
|
+
model Widget {
|
|
10
|
+
id: string;
|
|
11
|
+
weight: int32;
|
|
12
|
+
color: "red" | "blue";
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
model WidgetList {
|
|
16
|
+
items: Widget[];
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
@error
|
|
20
|
+
model Error {
|
|
21
|
+
code: int32;
|
|
22
|
+
message: string;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
model AnalyzeResult {
|
|
26
|
+
id: string;
|
|
27
|
+
analysis: string;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
@route("/widgets")
|
|
31
|
+
@tag("Widgets")
|
|
32
|
+
interface Widgets {
|
|
33
|
+
/** List widgets */
|
|
34
|
+
@get list(): WidgetList | Error;
|
|
35
|
+
/** Read widgets */
|
|
36
|
+
@get read(@path id: string): Widget | Error;
|
|
37
|
+
/** Create a widget */
|
|
38
|
+
@post create(@body body: Widget): Widget | Error;
|
|
39
|
+
/** Update a widget */
|
|
40
|
+
@patch update(@path id: string, @body body: Widget): Widget | Error;
|
|
41
|
+
/** Delete a widget */
|
|
42
|
+
@delete delete(@path id: string): void | Error;
|
|
43
|
+
|
|
44
|
+
/** Analyze a widget */
|
|
45
|
+
@route("{id}/analyze") @post analyze(@path id: string): AnalyzeResult | Error;
|
|
46
|
+
}
|
|
@@ -0,0 +1,20 @@
|
|
|
1
|
+
{
|
|
2
|
+
"name": "rest",
|
|
3
|
+
"version": "0.1.0",
|
|
4
|
+
"type": "module",
|
|
5
|
+
"peerDependencies": {
|
|
6
|
+
"@typespec/compiler": "latest",
|
|
7
|
+
"@typespec/http": "latest",
|
|
8
|
+
"@typespec/rest": "latest",
|
|
9
|
+
"@typespec/openapi": "latest",
|
|
10
|
+
"@typespec/openapi3": "latest"
|
|
11
|
+
},
|
|
12
|
+
"devDependencies": {
|
|
13
|
+
"@typespec/compiler": "latest",
|
|
14
|
+
"@typespec/http": "latest",
|
|
15
|
+
"@typespec/rest": "latest",
|
|
16
|
+
"@typespec/openapi": "latest",
|
|
17
|
+
"@typespec/openapi3": "latest"
|
|
18
|
+
},
|
|
19
|
+
"private": true
|
|
20
|
+
}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
# extends: ../tspconfig.yaml # Extend another config file
|
|
2
|
+
# emit: # Emitter name
|
|
3
|
+
# - "<emitter-name"
|
|
4
|
+
# options: # Emitter options
|
|
5
|
+
# <emitter-name>:
|
|
6
|
+
# "<option-name>": "<option-value>"
|
|
7
|
+
# environment-variables: # Environment variables which can be used to interpolate emitter options
|
|
8
|
+
# <variable-name>:
|
|
9
|
+
# default: "<variable-default>"
|
|
10
|
+
# parameters: # Parameters which can be used to interpolate emitter options
|
|
11
|
+
# <param-name>:
|
|
12
|
+
# default: "<param-default>"
|
|
13
|
+
# trace: # Trace areas to enable tracing
|
|
14
|
+
# - "<trace-name>"
|
|
15
|
+
# warn-as-error: true # Treat warnings as errors
|
|
16
|
+
# output-dir: "{project-root}/_generated" # Configure the base output directory for all emitters
|
|
@@ -0,0 +1,46 @@
|
|
|
1
|
+
import "@typespec/http";
|
|
2
|
+
|
|
3
|
+
using TypeSpec.Http;
|
|
4
|
+
@service({
|
|
5
|
+
title: "Widget Service",
|
|
6
|
+
})
|
|
7
|
+
namespace DemoService;
|
|
8
|
+
|
|
9
|
+
model Widget {
|
|
10
|
+
id: string;
|
|
11
|
+
weight: int32;
|
|
12
|
+
color: "red" | "blue";
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
model WidgetList {
|
|
16
|
+
items: Widget[];
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
@error
|
|
20
|
+
model Error {
|
|
21
|
+
code: int32;
|
|
22
|
+
message: string;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
model AnalyzeResult {
|
|
26
|
+
id: string;
|
|
27
|
+
analysis: string;
|
|
28
|
+
}
|
|
29
|
+
|
|
30
|
+
@route("/widgets")
|
|
31
|
+
@tag("Widgets")
|
|
32
|
+
interface Widgets {
|
|
33
|
+
/** List widgets */
|
|
34
|
+
@get list(): WidgetList | Error;
|
|
35
|
+
/** Read widgets */
|
|
36
|
+
@get read(@path id: string): Widget | Error;
|
|
37
|
+
/** Create a widget */
|
|
38
|
+
@post create(@body body: Widget): Widget | Error;
|
|
39
|
+
/** Update a widget */
|
|
40
|
+
@patch update(@path id: string, @body body: Widget): Widget | Error;
|
|
41
|
+
/** Delete a widget */
|
|
42
|
+
@delete delete(@path id: string): void | Error;
|
|
43
|
+
|
|
44
|
+
/** Analyze a widget */
|
|
45
|
+
@route("{id}/analyze") @post analyze(@path id: string): AnalyzeResult | Error;
|
|
46
|
+
}
|
|
@@ -12,13 +12,59 @@
|
|
|
12
12
|
"libraries": [
|
|
13
13
|
"@typespec/http",
|
|
14
14
|
"@typespec/rest",
|
|
15
|
+
"@typespec/openapi",
|
|
15
16
|
"@typespec/openapi3"
|
|
16
17
|
],
|
|
17
|
-
"
|
|
18
|
-
"
|
|
19
|
-
"
|
|
20
|
-
|
|
21
|
-
|
|
18
|
+
"emitters": {
|
|
19
|
+
"@typespec/openapi3": {
|
|
20
|
+
"selected": true,
|
|
21
|
+
"options": {
|
|
22
|
+
"emitter-output-dir": "{output-dir}/schema"
|
|
23
|
+
}
|
|
24
|
+
},
|
|
25
|
+
"@typespec/http-client-csharp": {
|
|
26
|
+
"description": "CSharp Client emitter",
|
|
27
|
+
"options": {
|
|
28
|
+
"emitter-output-dir": "{output-dir}/clients/csharp"
|
|
29
|
+
}
|
|
30
|
+
},
|
|
31
|
+
"@typespec/http-client-java": {
|
|
32
|
+
"description": "Java Client emitter",
|
|
33
|
+
"options": {
|
|
34
|
+
"emitter-output-dir": "{output-dir}/clients/java"
|
|
35
|
+
}
|
|
36
|
+
},
|
|
37
|
+
"@azure-tools/typespec-ts": {
|
|
38
|
+
"description": "JavaScript Client emitter",
|
|
39
|
+
"options": {
|
|
40
|
+
"emitter-output-dir": "{output-dir}/clients/js"
|
|
41
|
+
}
|
|
42
|
+
},
|
|
43
|
+
"@typespec/http-client-python": {
|
|
44
|
+
"description": "Python Client emitter",
|
|
45
|
+
"options": {
|
|
46
|
+
"emitter-output-dir": "{output-dir}/clients/python"
|
|
47
|
+
}
|
|
48
|
+
},
|
|
49
|
+
"@typespec/http-server-csharp": {
|
|
50
|
+
"description": "CSharp server stubs",
|
|
51
|
+
"options": {
|
|
52
|
+
"emitter-output-dir": "{output-dir}/server/generated"
|
|
53
|
+
}
|
|
54
|
+
},
|
|
55
|
+
"@typespec/http-server-javascript": {
|
|
56
|
+
"description": "Javascript server stubs",
|
|
57
|
+
"options": {
|
|
58
|
+
"emitter-output-dir": "{output-dir}/server"
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
},
|
|
62
|
+
"files": [
|
|
63
|
+
{
|
|
64
|
+
"path": "rest/main.tsp",
|
|
65
|
+
"destination": "main.tsp"
|
|
66
|
+
}
|
|
67
|
+
]
|
|
22
68
|
},
|
|
23
69
|
"library-ts": {
|
|
24
70
|
"title": "TypeSpec Library (With TypeScript)",
|
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
import type { ModelExpressionNode } from "../types.js";
|
|
2
|
-
/**
|
|
3
|
-
* Quick fix that convert a model expression to an object value.
|
|
4
|
-
*/
|
|
5
|
-
export declare function createModelToObjectValueCodeFix(node: ModelExpressionNode): import("../types.js").CodeFix;
|
|
6
|
-
//# sourceMappingURL=model-to-object-literal.codefix.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"model-to-object-literal.codefix.d.ts","sourceRoot":"","sources":["../../../../src/core/compiler-code-fixes/model-to-object-literal.codefix.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAEvD;;GAEG;AACH,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,mBAAmB,iCASxE"}
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
import { defineCodeFix, getSourceLocation } from "../diagnostics.js";
|
|
2
|
-
/**
|
|
3
|
-
* Quick fix that convert a model expression to an object value.
|
|
4
|
-
*/
|
|
5
|
-
export function createModelToObjectValueCodeFix(node) {
|
|
6
|
-
return defineCodeFix({
|
|
7
|
-
id: "model-to-object-value",
|
|
8
|
-
label: `Convert to an object value \`#{}\``,
|
|
9
|
-
fix: (context) => {
|
|
10
|
-
const location = getSourceLocation(node);
|
|
11
|
-
return context.prependText(location, "#");
|
|
12
|
-
},
|
|
13
|
-
});
|
|
14
|
-
}
|
|
15
|
-
//# sourceMappingURL=model-to-object-literal.codefix.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"model-to-object-literal.codefix.js","sourceRoot":"","sources":["../../../../src/core/compiler-code-fixes/model-to-object-literal.codefix.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAGrE;;GAEG;AACH,MAAM,UAAU,+BAA+B,CAAC,IAAyB;IACvE,OAAO,aAAa,CAAC;QACnB,EAAE,EAAE,uBAAuB;QAC3B,KAAK,EAAE,oCAAoC;QAC3C,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE;YACf,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACzC,OAAO,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC5C,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1,6 +0,0 @@
|
|
|
1
|
-
import type { TupleExpressionNode } from "../types.js";
|
|
2
|
-
/**
|
|
3
|
-
* Quick fix that convert a tuple to an array value.
|
|
4
|
-
*/
|
|
5
|
-
export declare function createTupleToArrayValueCodeFix(node: TupleExpressionNode): import("../types.js").CodeFix;
|
|
6
|
-
//# sourceMappingURL=tuple-to-array-value.codefix.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"tuple-to-array-value.codefix.d.ts","sourceRoot":"","sources":["../../../../src/core/compiler-code-fixes/tuple-to-array-value.codefix.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,aAAa,CAAC;AAEvD;;GAEG;AACH,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,mBAAmB,iCASvE"}
|
|
@@ -1,15 +0,0 @@
|
|
|
1
|
-
import { defineCodeFix, getSourceLocation } from "../diagnostics.js";
|
|
2
|
-
/**
|
|
3
|
-
* Quick fix that convert a tuple to an array value.
|
|
4
|
-
*/
|
|
5
|
-
export function createTupleToArrayValueCodeFix(node) {
|
|
6
|
-
return defineCodeFix({
|
|
7
|
-
id: "tuple-to-array-value",
|
|
8
|
-
label: `Convert to an array value \`#[]\``,
|
|
9
|
-
fix: (context) => {
|
|
10
|
-
const location = getSourceLocation(node);
|
|
11
|
-
return context.prependText(location, "#");
|
|
12
|
-
},
|
|
13
|
-
});
|
|
14
|
-
}
|
|
15
|
-
//# sourceMappingURL=tuple-to-array-value.codefix.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"tuple-to-array-value.codefix.js","sourceRoot":"","sources":["../../../../src/core/compiler-code-fixes/tuple-to-array-value.codefix.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAGrE;;GAEG;AACH,MAAM,UAAU,8BAA8B,CAAC,IAAyB;IACtE,OAAO,aAAa,CAAC;QACnB,EAAE,EAAE,sBAAsB;QAC1B,KAAK,EAAE,mCAAmC;QAC1C,GAAG,EAAE,CAAC,OAAO,EAAE,EAAE;YACf,MAAM,QAAQ,GAAG,iBAAiB,CAAC,IAAI,CAAC,CAAC;YACzC,OAAO,OAAO,CAAC,WAAW,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC5C,CAAC;KACF,CAAC,CAAC;AACL,CAAC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"state-accessor.d.ts","sourceRoot":"","sources":["../../../src/experimental/state-accessor.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,kBAAkB,CAAC;AAE7C,KAAK,cAAc,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;AACtF,KAAK,cAAc,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,KAAK,IAAI,CAAC;AACvF,KAAK,iBAAiB,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,KAAK,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;AAE5E,oBAAoB;AACpB,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,IAAI,EAAE,CAAC,EAClD,GAAG,EAAE,MAAM,GACV,CAAC,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,iBAAiB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAMvE;AAED,KAAK,cAAc,CAAC,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,KAAK,OAAO,CAAC;AAC7E,KAAK,cAAc,CAAC,CAAC,SAAS,IAAI,IAAI,CAAC,OAAO,EAAE,OAAO,EAAE,IAAI,EAAE,CAAC,KAAK,IAAI,CAAC;AAE1E,oBAAoB;AACpB,wBAAgB,kBAAkB,CAAC,CAAC,SAAS,IAAI,EAC/C,GAAG,EAAE,MAAM,GACV,CAAC,cAAc,CAAC,CAAC,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,CAAC,CAKxC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"state-accessor.js","sourceRoot":"","sources":["../../../src/experimental/state-accessor.ts"],"names":[],"mappings":"AAOA,oBAAoB;AACpB,MAAM,UAAU,kBAAkB,CAChC,GAAW;IAEX,MAAM,MAAM,GAAG,CAAC,OAAgB,EAAE,MAAS,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAClF,MAAM,MAAM,GAAG,CAAC,OAAgB,EAAE,MAAS,EAAE,KAAQ,EAAE,EAAE,CACvD,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC;IAC3C,MAAM,SAAS,GAAG,CAAC,OAAgB,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IAC9D,OAAO,CAAC,MAAM,EAAE,MAAM,EAAE,SAAgB,CAAC,CAAC;AAC5C,CAAC;AAKD,oBAAoB;AACpB,MAAM,UAAU,kBAAkB,CAChC,GAAW;IAEX,MAAM,MAAM,GAAG,CAAC,OAAgB,EAAE,MAAS,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAClF,MAAM,MAAM,GAAG,CAAC,OAAgB,EAAE,MAAS,EAAE,EAAE,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAElF,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAC1B,CAAC"}
|
|
@@ -1,22 +0,0 @@
|
|
|
1
|
-
import { NpmPackage, NpmPackageProvider } from "./npm-package-provider.js";
|
|
2
|
-
export declare class EmitterProvider {
|
|
3
|
-
private npmPackageProvider;
|
|
4
|
-
private isEmitterPackageCache;
|
|
5
|
-
constructor(npmPackageProvider: NpmPackageProvider);
|
|
6
|
-
/**
|
|
7
|
-
*
|
|
8
|
-
* @param startFolder folder starts to search for package.json with emitters defined as dependencies
|
|
9
|
-
* @returns
|
|
10
|
-
*/
|
|
11
|
-
listEmitters(startFolder: string): Promise<Record<string, NpmPackage>>;
|
|
12
|
-
/**
|
|
13
|
-
*
|
|
14
|
-
* @param startFolder folder starts to search for package.json with emitters defined as dependencies
|
|
15
|
-
* @param emitterName
|
|
16
|
-
* @returns
|
|
17
|
-
*/
|
|
18
|
-
getEmitter(startFolder: string, emitterName: string): Promise<NpmPackage | undefined>;
|
|
19
|
-
private isEmitter;
|
|
20
|
-
private getEmitterFromDep;
|
|
21
|
-
}
|
|
22
|
-
//# sourceMappingURL=emitter-provider.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"emitter-provider.d.ts","sourceRoot":"","sources":["../../../src/server/emitter-provider.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAE3E,qBAAa,eAAe;IAEd,OAAO,CAAC,kBAAkB;IADtC,OAAO,CAAC,qBAAqB,CAA8B;gBACvC,kBAAkB,EAAE,kBAAkB;IAE1D;;;;OAIG;IACG,YAAY,CAAC,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,UAAU,CAAC,CAAC;IAsB5E;;;;;OAKG;IACG,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,GAAG,SAAS,CAAC;YAQ7E,SAAS;YAwBT,iBAAiB;CAQhC"}
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"emitter-provider.js","sourceRoot":"","sources":["../../../src/server/emitter-provider.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAC;AAGlD,MAAM,OAAO,eAAe;IAEN;IADZ,qBAAqB,GAAG,IAAI,GAAG,EAAmB,CAAC;IAC3D,YAAoB,kBAAsC;QAAtC,uBAAkB,GAAlB,kBAAkB,CAAoB;IAAG,CAAC;IAE9D;;;;OAIG;IACH,KAAK,CAAC,YAAY,CAAC,WAAmB;QACpC,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;QAC1F,IAAI,CAAC,iBAAiB;YAAE,OAAO,EAAE,CAAC;QAElC,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAC;QACjE,MAAM,IAAI,GAAG,MAAM,GAAG,EAAE,kBAAkB,EAAE,CAAC;QAC7C,IAAI,CAAC,IAAI;YAAE,OAAO,EAAE,CAAC;QAErB,MAAM,QAAQ,GAA+B,EAAE,CAAC;QAChD,MAAM,MAAM,GAAG;YACb,GAAG,CAAC,IAAI,CAAC,YAAY,IAAI,EAAE,CAAC;YAC5B,GAAG,CAAC,IAAI,CAAC,eAAe,IAAI,EAAE,CAAC;SAChC,CAAC;QACF,KAAK,MAAM,GAAG,IAAI,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;YACtC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,GAAG,CAAC,CAAC;YACpE,IAAI,MAAM,EAAE,CAAC;gBACX,QAAQ,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC;YACzB,CAAC;QACH,CAAC;QACD,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,UAAU,CAAC,WAAmB,EAAE,WAAmB;QACvD,MAAM,iBAAiB,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAC;QAC1F,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACvB,OAAO,SAAS,CAAC;QACnB,CAAC;QACD,OAAO,IAAI,CAAC,iBAAiB,CAAC,iBAAiB,EAAE,WAAW,CAAC,CAAC;IAChE,CAAC;IAEO,KAAK,CAAC,SAAS,CAAC,OAAe,EAAE,GAAe;QACtD,IAAI,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5C,OAAO,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACjD,CAAC;QAED,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,kBAAkB,EAAE,CAAC;QAC5C,2EAA2E;QAC3E,IAAI,CAAC,IAAI;YAAE,OAAO,KAAK,CAAC;QACxB,IACE,CAAC,IAAI,CAAC,eAAe,IAAI,IAAI,CAAC,eAAe,CAAC,oBAAoB,CAAC,CAAC;YACpE,CAAC,IAAI,CAAC,YAAY,IAAI,IAAI,CAAC,YAAY,CAAC,oBAAoB,CAAC,CAAC,EAC9D,CAAC;YACD,MAAM,OAAO,GAAG,MAAM,GAAG,CAAC,gBAAgB,EAAE,CAAC;YAC7C,sEAAsE;YACtE,IAAI,CAAC,OAAO;gBAAE,OAAO,KAAK,CAAC;YAC3B,MAAM,SAAS,GAAG,OAAO,CAAC,OAAO,KAAK,SAAS,CAAC;YAChD,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;YACnD,OAAO,SAAS,CAAC;QACnB,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,qBAAqB,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;YAC/C,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,iBAAiB,CAAC,iBAAyB,EAAE,OAAe;QACxE,MAAM,SAAS,GAAG,SAAS,CAAC,iBAAiB,EAAE,cAAc,EAAE,OAAO,CAAC,CAAC;QACxE,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAC5D,IAAI,MAAM,IAAI,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,EAAE,CAAC;YACtD,OAAO,MAAM,CAAC;QAChB,CAAC;QACD,OAAO,SAAS,CAAC;IACnB,CAAC;CACF"}
|