@typespec/rest 0.75.0-dev.0 → 0.75.0
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/lib.d.ts +17 -2
- package/dist/src/lib.d.ts.map +1 -1
- package/dist/src/lib.js +6 -0
- package/dist/src/lib.js.map +1 -1
- package/dist/src/resource.d.ts +26 -1
- package/dist/src/resource.d.ts.map +1 -1
- package/dist/src/resource.js +54 -6
- package/dist/src/resource.js.map +1 -1
- package/dist/src/utils/cycle-tracker/cycle-tracker.d.ts +5 -0
- package/dist/src/utils/cycle-tracker/cycle-tracker.d.ts.map +1 -0
- package/dist/src/utils/cycle-tracker/cycle-tracker.js +12 -0
- package/dist/src/utils/cycle-tracker/cycle-tracker.js.map +1 -0
- package/dist/src/utils/cycle-tracker/cycle-tracker.test.d.ts +2 -0
- package/dist/src/utils/cycle-tracker/cycle-tracker.test.d.ts.map +1 -0
- package/dist/src/utils/cycle-tracker/cycle-tracker.test.js +19 -0
- package/dist/src/utils/cycle-tracker/cycle-tracker.test.js.map +1 -0
- package/dist/src/validate.d.ts.map +1 -1
- package/dist/src/validate.js +7 -0
- package/dist/src/validate.js.map +1 -1
- package/package.json +8 -9
package/dist/src/lib.d.ts
CHANGED
|
@@ -20,8 +20,11 @@ export declare const $lib: import("@typespec/compiler").TypeSpecLibrary<{
|
|
|
20
20
|
"shared-route-unspecified-action-name": {
|
|
21
21
|
readonly default: import("@typespec/compiler").CallableMessage<["decoratorName"]>;
|
|
22
22
|
};
|
|
23
|
+
"circular-parent-resource": {
|
|
24
|
+
readonly default: import("@typespec/compiler").CallableMessage<["cycle"]>;
|
|
25
|
+
};
|
|
23
26
|
}, Record<string, any>, never>;
|
|
24
|
-
export declare const reportDiagnostic: <C extends "not-key-type" | "resource-missing-key" | "resource-missing-error" | "duplicate-key" | "duplicate-parent-key" | "invalid-action-name" | "shared-route-unspecified-action-name", M extends keyof {
|
|
27
|
+
export declare const reportDiagnostic: <C extends "not-key-type" | "resource-missing-key" | "resource-missing-error" | "duplicate-key" | "duplicate-parent-key" | "invalid-action-name" | "shared-route-unspecified-action-name" | "circular-parent-resource", M extends keyof {
|
|
25
28
|
"not-key-type": {
|
|
26
29
|
readonly default: "Cannot copy keys from a non-key type (KeysOf<T> or ParentKeysOf<T>)";
|
|
27
30
|
};
|
|
@@ -43,6 +46,9 @@ export declare const reportDiagnostic: <C extends "not-key-type" | "resource-mis
|
|
|
43
46
|
"shared-route-unspecified-action-name": {
|
|
44
47
|
readonly default: import("@typespec/compiler").CallableMessage<["decoratorName"]>;
|
|
45
48
|
};
|
|
49
|
+
"circular-parent-resource": {
|
|
50
|
+
readonly default: import("@typespec/compiler").CallableMessage<["cycle"]>;
|
|
51
|
+
};
|
|
46
52
|
}[C]>(program: import("@typespec/compiler").Program, diag: import("@typespec/compiler").DiagnosticReport<{
|
|
47
53
|
"not-key-type": {
|
|
48
54
|
readonly default: "Cannot copy keys from a non-key type (KeysOf<T> or ParentKeysOf<T>)";
|
|
@@ -65,7 +71,10 @@ export declare const reportDiagnostic: <C extends "not-key-type" | "resource-mis
|
|
|
65
71
|
"shared-route-unspecified-action-name": {
|
|
66
72
|
readonly default: import("@typespec/compiler").CallableMessage<["decoratorName"]>;
|
|
67
73
|
};
|
|
68
|
-
|
|
74
|
+
"circular-parent-resource": {
|
|
75
|
+
readonly default: import("@typespec/compiler").CallableMessage<["cycle"]>;
|
|
76
|
+
};
|
|
77
|
+
}, C, M>) => void, createDiagnostic: <C extends "not-key-type" | "resource-missing-key" | "resource-missing-error" | "duplicate-key" | "duplicate-parent-key" | "invalid-action-name" | "shared-route-unspecified-action-name" | "circular-parent-resource", M extends keyof {
|
|
69
78
|
"not-key-type": {
|
|
70
79
|
readonly default: "Cannot copy keys from a non-key type (KeysOf<T> or ParentKeysOf<T>)";
|
|
71
80
|
};
|
|
@@ -87,6 +96,9 @@ export declare const reportDiagnostic: <C extends "not-key-type" | "resource-mis
|
|
|
87
96
|
"shared-route-unspecified-action-name": {
|
|
88
97
|
readonly default: import("@typespec/compiler").CallableMessage<["decoratorName"]>;
|
|
89
98
|
};
|
|
99
|
+
"circular-parent-resource": {
|
|
100
|
+
readonly default: import("@typespec/compiler").CallableMessage<["cycle"]>;
|
|
101
|
+
};
|
|
90
102
|
}[C]>(diag: import("@typespec/compiler").DiagnosticReport<{
|
|
91
103
|
"not-key-type": {
|
|
92
104
|
readonly default: "Cannot copy keys from a non-key type (KeysOf<T> or ParentKeysOf<T>)";
|
|
@@ -109,5 +121,8 @@ export declare const reportDiagnostic: <C extends "not-key-type" | "resource-mis
|
|
|
109
121
|
"shared-route-unspecified-action-name": {
|
|
110
122
|
readonly default: import("@typespec/compiler").CallableMessage<["decoratorName"]>;
|
|
111
123
|
};
|
|
124
|
+
"circular-parent-resource": {
|
|
125
|
+
readonly default: import("@typespec/compiler").CallableMessage<["cycle"]>;
|
|
126
|
+
};
|
|
112
127
|
}, C, M>) => import("@typespec/compiler").Diagnostic, createStateSymbol: (name: string) => symbol;
|
|
113
128
|
//# sourceMappingURL=lib.d.ts.map
|
package/dist/src/lib.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,IAAI
|
|
1
|
+
{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,IAAI;;;;;;;;;;;;;;;;;;;;;;;;;8BAoDf,CAAC;AAEH,eAAO,MAAQ,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAAE,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sDAAE,iBAAiB,0BAAS,CAAC"}
|
package/dist/src/lib.js
CHANGED
|
@@ -44,6 +44,12 @@ export const $lib = createTypeSpecLibrary({
|
|
|
44
44
|
default: paramMessage `An operation marked as '@sharedRoute' must have an explicit collection action name passed to '${"decoratorName"}'.`,
|
|
45
45
|
},
|
|
46
46
|
},
|
|
47
|
+
"circular-parent-resource": {
|
|
48
|
+
severity: "error",
|
|
49
|
+
messages: {
|
|
50
|
+
default: paramMessage `Resource has a parent cycle (${"cycle"})`,
|
|
51
|
+
},
|
|
52
|
+
},
|
|
47
53
|
},
|
|
48
54
|
});
|
|
49
55
|
export const { reportDiagnostic, createDiagnostic, createStateSymbol } = $lib;
|
package/dist/src/lib.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEzE,MAAM,CAAC,MAAM,IAAI,GAAG,qBAAqB,CAAC;IACxC,IAAI,EAAE,gBAAgB;IACtB,WAAW,EAAE;QACX,cAAc,EAAE;YACd,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE;gBACR,OAAO,EAAE,qEAAqE;aAC/E;SACF;QACD,sBAAsB,EAAE;YACtB,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE;gBACR,OAAO,EAAE,YAAY,CAAA,SAAS,WAAW,qGAAqG;aAC/I;SACF;QACD,wBAAwB,EAAE;YACxB,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE;gBACR,OAAO,EAAE,YAAY,CAAA,SAAS,WAAW,6EAA6E;aACvH;SACF;QACD,eAAe,EAAE;YACf,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE;gBACR,OAAO,EAAE,YAAY,CAAA,yCAAyC,cAAc,EAAE;aAC/E;SACF;QACD,sBAAsB,EAAE;YACtB,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE;gBACR,OAAO,EAAE,YAAY,CAAA,kBAAkB,cAAc,+BAA+B,SAAS,oEAAoE;aAClK;SACF;QACD,qBAAqB,EAAE;YACrB,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE;gBACR,OAAO,EAAE,qCAAqC;aAC/C;SACF;QACD,sCAAsC,EAAE;YACtC,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE;gBACR,OAAO,EAAE,YAAY,CAAA,iGAAiG,eAAe,IAAI;aAC1I;SACF;KACF;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC"}
|
|
1
|
+
{"version":3,"file":"lib.js","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEzE,MAAM,CAAC,MAAM,IAAI,GAAG,qBAAqB,CAAC;IACxC,IAAI,EAAE,gBAAgB;IACtB,WAAW,EAAE;QACX,cAAc,EAAE;YACd,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE;gBACR,OAAO,EAAE,qEAAqE;aAC/E;SACF;QACD,sBAAsB,EAAE;YACtB,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE;gBACR,OAAO,EAAE,YAAY,CAAA,SAAS,WAAW,qGAAqG;aAC/I;SACF;QACD,wBAAwB,EAAE;YACxB,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE;gBACR,OAAO,EAAE,YAAY,CAAA,SAAS,WAAW,6EAA6E;aACvH;SACF;QACD,eAAe,EAAE;YACf,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE;gBACR,OAAO,EAAE,YAAY,CAAA,yCAAyC,cAAc,EAAE;aAC/E;SACF;QACD,sBAAsB,EAAE;YACtB,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE;gBACR,OAAO,EAAE,YAAY,CAAA,kBAAkB,cAAc,+BAA+B,SAAS,oEAAoE;aAClK;SACF;QACD,qBAAqB,EAAE;YACrB,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE;gBACR,OAAO,EAAE,qCAAqC;aAC/C;SACF;QACD,sCAAsC,EAAE;YACtC,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE;gBACR,OAAO,EAAE,YAAY,CAAA,iGAAiG,eAAe,IAAI;aAC1I;SACF;QACD,0BAA0B,EAAE;YAC1B,QAAQ,EAAE,OAAO;YACjB,QAAQ,EAAE;gBACR,OAAO,EAAE,YAAY,CAAA,gCAAgC,OAAO,GAAG;aAChE;SACF;KACF;CACF,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,EAAE,gBAAgB,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,GAAG,IAAI,CAAC"}
|
package/dist/src/resource.d.ts
CHANGED
|
@@ -9,7 +9,32 @@ export declare function getResourceTypeKey(program: Program, resourceType: Model
|
|
|
9
9
|
export declare function $resourceTypeForKeyParam(context: DecoratorContext, entity: Type, resourceType: Type): void;
|
|
10
10
|
export declare function getResourceTypeForKeyParam(program: Program, param: ModelProperty): Model | undefined;
|
|
11
11
|
export declare function $copyResourceKeyParameters(context: DecoratorContext, entity: Model, filter?: string): void;
|
|
12
|
-
export declare
|
|
12
|
+
export declare const
|
|
13
|
+
/**
|
|
14
|
+
* Get the parent resource type for a given resource model.
|
|
15
|
+
*
|
|
16
|
+
* @param program The TypeSpec program instance
|
|
17
|
+
* @param type The resource model to get the parent for
|
|
18
|
+
* @returns The parent resource model if one exists, otherwise `undefined`
|
|
19
|
+
*
|
|
20
|
+
* @example
|
|
21
|
+
*
|
|
22
|
+
* ```tsp
|
|
23
|
+
* @parentResource(Organization)
|
|
24
|
+
* model User {}
|
|
25
|
+
* ```
|
|
26
|
+
*
|
|
27
|
+
* ```typescript
|
|
28
|
+
* const parentType = getParentResource(program, userModel);
|
|
29
|
+
* // parentType would be the Organization model
|
|
30
|
+
* ```
|
|
31
|
+
*/
|
|
32
|
+
getParentResource: (program: Program, type: Model) => Model | undefined,
|
|
33
|
+
/**
|
|
34
|
+
* Set parent resource for a resource.
|
|
35
|
+
* Same as applying `@parentResource` decorator.
|
|
36
|
+
*/
|
|
37
|
+
setParentResource: (program: Program, type: Model, value: Model) => void;
|
|
13
38
|
/**
|
|
14
39
|
* `@parentResource` marks a model with a reference to its parent resource type
|
|
15
40
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../../src/resource.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,gBAAgB,
|
|
1
|
+
{"version":3,"file":"resource.d.ts","sourceRoot":"","sources":["../../src/resource.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,gBAAgB,EAKhB,KAAK,EACL,aAAa,EACb,OAAO,EAEP,IAAI,EACL,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,uBAAuB,EAAE,MAAM,oCAAoC,CAAC;AAI7E,MAAM,WAAW,WAAW;IAC1B,YAAY,EAAE,KAAK,CAAC;IACpB,WAAW,EAAE,aAAa,CAAC;CAC5B;AAKD,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,OAAO,EAChB,YAAY,EAAE,KAAK,EACnB,WAAW,EAAE,aAAa,GACzB,IAAI,CAKN;AAED,wBAAgB,kBAAkB,CAAC,OAAO,EAAE,OAAO,EAAE,YAAY,EAAE,KAAK,GAAG,WAAW,GAAG,SAAS,CAyCjG;AAED,wBAAgB,wBAAwB,CACtC,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,IAAI,EACZ,YAAY,EAAE,IAAI,QAGnB;AAID,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,OAAO,EAChB,KAAK,EAAE,aAAa,GACnB,KAAK,GAAG,SAAS,CAEnB;AAoDD,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,gBAAgB,EACzB,MAAM,EAAE,KAAK,EACb,MAAM,CAAC,EAAE,MAAM,QA+BhB;AAED,eAAO;AACL;;;;;;;;;;;;;;;;;;GAkBG;AACH,iBAAiB;AAEjB;;;GAGG;AACH,iBAAiB,uDACoD,CAAC;AAExE;;;;;;;;GAQG;AACH,eAAO,MAAM,eAAe,EAAE,uBAU7B,CAAC"}
|
package/dist/src/resource.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
|
-
import { $invisible, $removeVisibility, $visibility, getKeyName, isErrorType, isKey, setTypeSpecNamespace, } from "@typespec/compiler";
|
|
1
|
+
import { $invisible, $removeVisibility, $visibility, getKeyName, getTypeName, isErrorType, isKey, setTypeSpecNamespace, } from "@typespec/compiler";
|
|
2
|
+
import { useStateMap } from "@typespec/compiler/utils";
|
|
2
3
|
import { $path } from "@typespec/http";
|
|
3
4
|
import { createStateSymbol, reportDiagnostic } from "./lib.js";
|
|
5
|
+
import { CycleTracker } from "./utils/cycle-tracker/cycle-tracker.js";
|
|
4
6
|
const resourceKeysKey = createStateSymbol("resourceKeys");
|
|
5
7
|
const resourceTypeForKeyParamKey = createStateSymbol("resourceTypeForKeyParam");
|
|
6
8
|
export function setResourceTypeKey(program, resourceType, keyProperty) {
|
|
@@ -123,10 +125,32 @@ export function $copyResourceKeyParameters(context, entity, filter) {
|
|
|
123
125
|
cloneKeyProperties(context, entity, resourceType);
|
|
124
126
|
}
|
|
125
127
|
}
|
|
126
|
-
const
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
128
|
+
export const [
|
|
129
|
+
/**
|
|
130
|
+
* Get the parent resource type for a given resource model.
|
|
131
|
+
*
|
|
132
|
+
* @param program The TypeSpec program instance
|
|
133
|
+
* @param type The resource model to get the parent for
|
|
134
|
+
* @returns The parent resource model if one exists, otherwise `undefined`
|
|
135
|
+
*
|
|
136
|
+
* @example
|
|
137
|
+
*
|
|
138
|
+
* ```tsp
|
|
139
|
+
* @parentResource(Organization)
|
|
140
|
+
* model User {}
|
|
141
|
+
* ```
|
|
142
|
+
*
|
|
143
|
+
* ```typescript
|
|
144
|
+
* const parentType = getParentResource(program, userModel);
|
|
145
|
+
* // parentType would be the Organization model
|
|
146
|
+
* ```
|
|
147
|
+
*/
|
|
148
|
+
getParentResource,
|
|
149
|
+
/**
|
|
150
|
+
* Set parent resource for a resource.
|
|
151
|
+
* Same as applying `@parentResource` decorator.
|
|
152
|
+
*/
|
|
153
|
+
setParentResource,] = useStateMap(createStateSymbol("parentResourceTypes"));
|
|
130
154
|
/**
|
|
131
155
|
* `@parentResource` marks a model with a reference to its parent resource type
|
|
132
156
|
*
|
|
@@ -138,6 +162,30 @@ export function getParentResource(program, resourceType) {
|
|
|
138
162
|
*/
|
|
139
163
|
export const $parentResource = (context, entity, parentType) => {
|
|
140
164
|
const { program } = context;
|
|
141
|
-
|
|
165
|
+
if (!checkCircularParentResource(program, entity, parentType)) {
|
|
166
|
+
return;
|
|
167
|
+
}
|
|
168
|
+
setParentResource(program, entity, parentType);
|
|
142
169
|
};
|
|
170
|
+
function checkCircularParentResource(program, entity, parentType) {
|
|
171
|
+
const cycleTracker = new CycleTracker();
|
|
172
|
+
cycleTracker.add(entity);
|
|
173
|
+
let currentType = parentType;
|
|
174
|
+
while (currentType) {
|
|
175
|
+
const cycle = cycleTracker.add(currentType);
|
|
176
|
+
if (cycle) {
|
|
177
|
+
for (const type of cycle) {
|
|
178
|
+
cycleTracker.add(type);
|
|
179
|
+
reportDiagnostic(program, {
|
|
180
|
+
code: "circular-parent-resource",
|
|
181
|
+
format: { cycle: [...cycle, cycle[0]].map((x) => getTypeName(x)).join(" -> ") },
|
|
182
|
+
target: type,
|
|
183
|
+
});
|
|
184
|
+
}
|
|
185
|
+
return false;
|
|
186
|
+
}
|
|
187
|
+
currentType = getParentResource(program, currentType);
|
|
188
|
+
}
|
|
189
|
+
return true;
|
|
190
|
+
}
|
|
143
191
|
//# sourceMappingURL=resource.js.map
|
package/dist/src/resource.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resource.js","sourceRoot":"","sources":["../../src/resource.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,iBAAiB,EACjB,WAAW,EAEX,UAAU,EACV,WAAW,EACX,KAAK,EAIL,oBAAoB,GAErB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,KAAK,EAAE,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"resource.js","sourceRoot":"","sources":["../../src/resource.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cycle-tracker.d.ts","sourceRoot":"","sources":["../../../../src/utils/cycle-tracker/cycle-tracker.ts"],"names":[],"mappings":"AAAA,qBAAa,YAAY,CAAC,CAAC;;IAGzB,GAAG,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,EAAE,GAAG,SAAS;CAQ9B"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
export class CycleTracker {
|
|
2
|
+
#items = [];
|
|
3
|
+
add(type) {
|
|
4
|
+
const existingIndex = this.#items.indexOf(type);
|
|
5
|
+
if (existingIndex !== -1) {
|
|
6
|
+
return this.#items.slice(existingIndex);
|
|
7
|
+
}
|
|
8
|
+
this.#items.push(type);
|
|
9
|
+
return undefined;
|
|
10
|
+
}
|
|
11
|
+
}
|
|
12
|
+
//# sourceMappingURL=cycle-tracker.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cycle-tracker.js","sourceRoot":"","sources":["../../../../src/utils/cycle-tracker/cycle-tracker.ts"],"names":[],"mappings":"AAAA,MAAM,OAAO,YAAY;IACvB,MAAM,GAAQ,EAAE,CAAC;IAEjB,GAAG,CAAC,IAAO;QACT,MAAM,aAAa,GAAG,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,aAAa,KAAK,CAAC,CAAC,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,CAAC;QAC1C,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACvB,OAAO,SAAS,CAAC;IACnB,CAAC;CACF"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cycle-tracker.test.d.ts","sourceRoot":"","sources":["../../../../src/utils/cycle-tracker/cycle-tracker.test.ts"],"names":[],"mappings":""}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { expect, it } from "vitest";
|
|
2
|
+
import { CycleTracker } from "./cycle-tracker.js";
|
|
3
|
+
it("find cycle at start", () => {
|
|
4
|
+
const tracker = new CycleTracker();
|
|
5
|
+
expect(tracker.add("a")).toEqual(undefined);
|
|
6
|
+
expect(tracker.add("b")).toEqual(undefined);
|
|
7
|
+
expect(tracker.add("c")).toEqual(undefined);
|
|
8
|
+
const cycle = tracker.add("a");
|
|
9
|
+
expect(cycle).toEqual(["a", "b", "c"]);
|
|
10
|
+
});
|
|
11
|
+
it("find cycle in middle", () => {
|
|
12
|
+
const tracker = new CycleTracker();
|
|
13
|
+
expect(tracker.add("a")).toEqual(undefined);
|
|
14
|
+
expect(tracker.add("b")).toEqual(undefined);
|
|
15
|
+
expect(tracker.add("c")).toEqual(undefined);
|
|
16
|
+
const cycle = tracker.add("b");
|
|
17
|
+
expect(cycle).toEqual(["b", "c"]);
|
|
18
|
+
});
|
|
19
|
+
//# sourceMappingURL=cycle-tracker.test.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"cycle-tracker.test.js","sourceRoot":"","sources":["../../../../src/utils/cycle-tracker/cycle-tracker.test.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,QAAQ,CAAC;AACpC,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAElD,EAAE,CAAC,qBAAqB,EAAE,GAAG,EAAE;IAC7B,MAAM,OAAO,GAAG,IAAI,YAAY,EAAU,CAAC;IAC3C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC/B,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;AACzC,CAAC,CAAC,CAAC;AAEH,EAAE,CAAC,sBAAsB,EAAE,GAAG,EAAE;IAC9B,MAAM,OAAO,GAAG,IAAI,YAAY,EAAU,CAAC;IAC3C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5C,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;IAC5C,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC/B,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC;AACpC,CAAC,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,OAAO,EACR,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"validate.d.ts","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,OAAO,EACR,MAAM,oBAAoB,CAAC;AAwF5B,wBAAgB,WAAW,CAAC,OAAO,EAAE,OAAO,QAQ3C"}
|
package/dist/src/validate.js
CHANGED
|
@@ -10,9 +10,16 @@ function checkForDuplicateResourceKeyNames(program) {
|
|
|
10
10
|
if (model.name === "") {
|
|
11
11
|
return;
|
|
12
12
|
}
|
|
13
|
+
const visited = new Set();
|
|
13
14
|
let currentType = model;
|
|
14
15
|
const keyProperties = new DuplicateTracker();
|
|
15
16
|
while (currentType) {
|
|
17
|
+
if (visited.has(currentType)) {
|
|
18
|
+
break;
|
|
19
|
+
}
|
|
20
|
+
else {
|
|
21
|
+
visited.add(currentType);
|
|
22
|
+
}
|
|
16
23
|
const resourceKey = getResourceTypeKey(program, currentType);
|
|
17
24
|
if (resourceKey) {
|
|
18
25
|
const keyName = getKeyName(program, resourceKey.keyProperty);
|
package/dist/src/validate.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,UAAU,EACV,WAAW,EACX,YAAY,EAEZ,wBAAwB,GAEzB,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,gBAAgB,EAAE,MAAM,0BAA0B,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,gBAAgB,EAAE,MAAM,UAAU,CAAC;AAC5C,OAAO,EAAE,iBAAiB,EAAE,kBAAkB,EAAe,MAAM,eAAe,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,0BAA0B,EAAE,MAAM,WAAW,CAAC;AAEzE,SAAS,iCAAiC,CAAC,OAAgB;IACzD,MAAM,SAAS,GAAG,IAAI,GAAG,EAAU,CAAC;IAEpC,SAAS,sBAAsB,CAAC,KAAY;QAC1C,IAAI,KAAK,CAAC,IAAI,KAAK,EAAE,EAAE,CAAC;YACtB,OAAO;QACT,CAAC;QACD,IAAI,WAAW,GAAsB,KAAK,CAAC;QAC3C,MAAM,aAAa,GAAG,IAAI,gBAAgB,EAAuB,CAAC;QAClE,OAAO,WAAW,EAAE,CAAC;YACnB,MAAM,WAAW,GAAG,kBAAkB,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;YAC7D,IAAI,WAAW,EAAE,CAAC;gBAChB,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,EAAE,WAAW,CAAC,WAAW,CAAE,CAAC;gBAC9D,aAAa,CAAC,KAAK,CAAC,OAAO,EAAE,WAAW,CAAC,CAAC;YAC5C,CAAC;
|
|
1
|
+
{"version":3,"file":"validate.js","sourceRoot":"","sources":["../../src/validate.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@typespec/rest",
|
|
3
|
-
"version": "0.75.0
|
|
3
|
+
"version": "0.75.0",
|
|
4
4
|
"author": "Microsoft Corporation",
|
|
5
5
|
"description": "TypeSpec REST protocol binding",
|
|
6
6
|
"homepage": "https://typespec.io",
|
|
@@ -39,23 +39,22 @@
|
|
|
39
39
|
"!dist/test/**"
|
|
40
40
|
],
|
|
41
41
|
"peerDependencies": {
|
|
42
|
-
"@typespec/compiler": "^1.
|
|
43
|
-
"@typespec/http": "^1.
|
|
42
|
+
"@typespec/compiler": "^1.5.0",
|
|
43
|
+
"@typespec/http": "^1.5.0"
|
|
44
44
|
},
|
|
45
45
|
"devDependencies": {
|
|
46
46
|
"@types/node": "~24.3.0",
|
|
47
|
-
"@typespec/compiler": "^1.4.0",
|
|
48
|
-
"@typespec/http": "^1.4.0",
|
|
49
|
-
"@typespec/library-linter": "^0.74.0 || >=0.75.0-dev <0.75.0",
|
|
50
|
-
"@typespec/tspd": "^0.73.0 || >=0.74.0-dev <0.74.0",
|
|
51
47
|
"@vitest/coverage-v8": "^3.1.2",
|
|
52
48
|
"@vitest/ui": "^3.1.2",
|
|
53
49
|
"c8": "^10.1.3",
|
|
54
50
|
"rimraf": "~6.0.1",
|
|
55
51
|
"typescript": "~5.9.2",
|
|
56
|
-
"vitest": "^3.1.2"
|
|
52
|
+
"vitest": "^3.1.2",
|
|
53
|
+
"@typespec/compiler": "^1.5.0",
|
|
54
|
+
"@typespec/http": "^1.5.0",
|
|
55
|
+
"@typespec/library-linter": "^0.75.0",
|
|
56
|
+
"@typespec/tspd": "^0.73.0"
|
|
57
57
|
},
|
|
58
|
-
"dependencies": {},
|
|
59
58
|
"scripts": {
|
|
60
59
|
"clean": "rimraf ./dist ./temp",
|
|
61
60
|
"build": "pnpm gen-extern-signature && tsc -p . && pnpm lint-typespec-library",
|