@servora/proto-utils 0.1.3 → 0.1.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.
@@ -65,10 +65,10 @@ export function createRequestHandler(options = {}) {
65
65
  }
66
66
  async function doRequest(request, meta, isRetry = false) {
67
67
  const headers = {
68
- Accept: "application/protojson",
68
+ Accept: "application/json",
69
69
  };
70
70
  if (request.body) {
71
- headers["Content-Type"] = "application/protojson";
71
+ headers["Content-Type"] = "application/json";
72
72
  }
73
73
  if (tokenStore) {
74
74
  const token = tokenStore.getAccessToken();
@@ -1 +1 @@
1
- {"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/client/request.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"request.js","sourceRoot":"","sources":["../../src/client/request.ts"],"names":[],"mappings":"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"}
@@ -19,7 +19,20 @@ export type RawFilterValue = Readonly<{
19
19
  }>;
20
20
  /** Use for validated enum symbols or AIP functions such as duration("5s"). */
21
21
  export declare function rawFilterValue(text: string): RawFilterValue;
22
- export type FilterValue = string | number | bigint | boolean | Date | null | RawFilterValue;
22
+ declare const stringMatchValueSymbol: unique symbol;
23
+ export type StringMatchValueKind = "prefix" | "suffix" | "contains";
24
+ export type StringMatchValue = Readonly<{
25
+ [stringMatchValueSymbol]: true;
26
+ kind: StringMatchValueKind;
27
+ value: string;
28
+ }>;
29
+ /** Builds a typed string prefix filter value. */
30
+ export declare function filterPrefix(value: string): StringMatchValue;
31
+ /** Builds a typed string suffix filter value. */
32
+ export declare function filterSuffix(value: string): StringMatchValue;
33
+ /** Builds a typed string contains filter value. */
34
+ export declare function filterContains(value: string): StringMatchValue;
35
+ export type FilterValue = string | number | bigint | boolean | Date | null | RawFilterValue | StringMatchValue;
23
36
  export type FilterExpression<Field extends string> = Readonly<{
24
37
  field: Field;
25
38
  operator: FilterOperator;
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/crud/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/crud/index.ts"],"names":[],"mappings":"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"}
@@ -33,6 +33,15 @@ export function makeUpdateMask(fields, values) {
33
33
  .map(([, path]) => path)
34
34
  .join(",");
35
35
  }
36
+ const filterOperators = {
37
+ "=": true,
38
+ "!=": true,
39
+ "<": true,
40
+ "<=": true,
41
+ ">": true,
42
+ ">=": true,
43
+ ":": true,
44
+ };
36
45
  const rawFilterValueSymbol = Symbol("RawFilterValue");
37
46
  /** Use for validated enum symbols or AIP functions such as duration("5s"). */
38
47
  export function rawFilterValue(text) {
@@ -41,6 +50,26 @@ export function rawFilterValue(text) {
41
50
  }
42
51
  return Object.freeze({ [rawFilterValueSymbol]: true, text });
43
52
  }
53
+ const stringMatchValueSymbol = Symbol("StringMatchValue");
54
+ function stringMatchValue(kind, value) {
55
+ return Object.freeze({
56
+ [stringMatchValueSymbol]: true,
57
+ kind,
58
+ value,
59
+ });
60
+ }
61
+ /** Builds a typed string prefix filter value. */
62
+ export function filterPrefix(value) {
63
+ return stringMatchValue("prefix", value);
64
+ }
65
+ /** Builds a typed string suffix filter value. */
66
+ export function filterSuffix(value) {
67
+ return stringMatchValue("suffix", value);
68
+ }
69
+ /** Builds a typed string contains filter value. */
70
+ export function filterContains(value) {
71
+ return stringMatchValue("contains", value);
72
+ }
44
73
  /** Serializes a typed expression into the AIP-160 filter text accepted by CRUD. */
45
74
  export function buildFilter(fields, expression) {
46
75
  if (expression == null)
@@ -52,9 +81,18 @@ function renderFilter(expression, fields) {
52
81
  if (!fields.has(expression.field)) {
53
82
  throw new RangeError(`unknown filter field: ${expression.field}`);
54
83
  }
55
- if (expression.value === null && !["=", "!="].includes(expression.operator)) {
84
+ if (!Object.prototype.hasOwnProperty.call(filterOperators, expression.operator)) {
85
+ throw new RangeError(`unsupported filter operator: ${String(expression.operator)}`);
86
+ }
87
+ if (expression.value === null &&
88
+ !["=", "!="].includes(expression.operator)) {
56
89
  throw new RangeError("null filter values only support = and !=");
57
90
  }
91
+ if (isStringMatchValue(expression.value) &&
92
+ expression.operator !== "=" &&
93
+ expression.operator !== "!=") {
94
+ throw new RangeError("typed wildcard filter values only support = and !=");
95
+ }
58
96
  return `${expression.field} ${expression.operator} ${renderFilterValue(expression.value)}`;
59
97
  }
60
98
  const [operator, children] = "and" in expression
@@ -68,8 +106,9 @@ function renderFilter(expression, fields) {
68
106
  function renderFilterValue(value) {
69
107
  if (value === null)
70
108
  return "null";
71
- if (typeof value === "string")
72
- return JSON.stringify(value);
109
+ if (typeof value === "string") {
110
+ return JSON.stringify(escapeWildcardLiteral(value));
111
+ }
73
112
  if (typeof value === "boolean" || typeof value === "bigint") {
74
113
  return value.toString();
75
114
  }
@@ -85,8 +124,32 @@ function renderFilterValue(value) {
85
124
  }
86
125
  return `timestamp(${JSON.stringify(value.toISOString())})`;
87
126
  }
127
+ if (isStringMatchValue(value)) {
128
+ return renderStringMatchValue(value);
129
+ }
88
130
  return value.text;
89
131
  }
132
+ function isStringMatchValue(value) {
133
+ return (typeof value === "object" &&
134
+ value !== null &&
135
+ stringMatchValueSymbol in value);
136
+ }
137
+ function escapeWildcardLiteral(value) {
138
+ return value.replaceAll("\\", "\\\\").replaceAll("*", "\\*");
139
+ }
140
+ function renderStringMatchValue(value) {
141
+ if (value.value.length === 0)
142
+ return JSON.stringify("*");
143
+ const literal = escapeWildcardLiteral(value.value);
144
+ switch (value.kind) {
145
+ case "prefix":
146
+ return JSON.stringify(`${literal}*`);
147
+ case "suffix":
148
+ return JSON.stringify(`*${literal}`);
149
+ case "contains":
150
+ return JSON.stringify(`*${literal}*`);
151
+ }
152
+ }
90
153
  /** Serializes typed terms into canonical AIP-132 order_by text. */
91
154
  export function buildOrderBy(fields, terms) {
92
155
  if (terms == null || terms.length === 0)
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/crud/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/crud/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@servora/proto-utils",
3
- "version": "0.1.3",
3
+ "version": "0.1.4",
4
4
  "description": "Servora Proto 工具:CRUD 查询、FieldMask、HTTP client、Kratos 错误解析",
5
5
  "type": "module",
6
6
  "exports": {
@@ -131,11 +131,11 @@ export function createRequestHandler(
131
131
  isRetry = false,
132
132
  ): Promise<T> {
133
133
  const headers: Record<string, string> = {
134
- Accept: "application/protojson",
134
+ Accept: "application/json",
135
135
  };
136
136
 
137
137
  if (request.body) {
138
- headers["Content-Type"] = "application/protojson";
138
+ headers["Content-Type"] = "application/json";
139
139
  }
140
140
 
141
141
  if (tokenStore) {
@@ -19,6 +19,6 @@
19
19
  在 `servora/` 执行:
20
20
 
21
21
  ```bash
22
- make web.typecheck
23
- make web.build
22
+ just web-typecheck
23
+ just web-build
24
24
  ```
package/src/crud/index.ts CHANGED
@@ -10,13 +10,12 @@ export type FieldCollection =
10
10
  | readonly string[]
11
11
  | Readonly<Record<string, string>>;
12
12
 
13
- export type FieldOf<Fields extends FieldCollection> = Fields extends readonly (
14
- infer Field extends string
15
- )[]
16
- ? Field
17
- : Fields extends Readonly<Record<string, infer Field extends string>>
13
+ export type FieldOf<Fields extends FieldCollection> =
14
+ Fields extends readonly (infer Field extends string)[]
18
15
  ? Field
19
- : never;
16
+ : Fields extends Readonly<Record<string, infer Field extends string>>
17
+ ? Field
18
+ : never;
20
19
 
21
20
  export type FieldKeyOf<Fields extends FieldCollection> =
22
21
  Fields extends readonly (infer Field extends string)[]
@@ -25,7 +24,9 @@ export type FieldKeyOf<Fields extends FieldCollection> =
25
24
  ? Key
26
25
  : never;
27
26
 
28
- function fieldEntries(fields: FieldCollection): ReadonlyArray<readonly [string, string]> {
27
+ function fieldEntries(
28
+ fields: FieldCollection,
29
+ ): ReadonlyArray<readonly [string, string]> {
29
30
  return Array.isArray(fields)
30
31
  ? fields.map((field) => [field, field] as const)
31
32
  : Object.entries(fields as Readonly<Record<string, string>>);
@@ -63,6 +64,16 @@ export function makeUpdateMask<
63
64
 
64
65
  export type FilterOperator = "=" | "!=" | "<" | "<=" | ">" | ">=" | ":";
65
66
 
67
+ const filterOperators: Record<FilterOperator, true> = {
68
+ "=": true,
69
+ "!=": true,
70
+ "<": true,
71
+ "<=": true,
72
+ ">": true,
73
+ ">=": true,
74
+ ":": true,
75
+ };
76
+
66
77
  const rawFilterValueSymbol: unique symbol = Symbol("RawFilterValue");
67
78
 
68
79
  export type RawFilterValue = Readonly<{
@@ -78,6 +89,42 @@ export function rawFilterValue(text: string): RawFilterValue {
78
89
  return Object.freeze({ [rawFilterValueSymbol]: true as const, text });
79
90
  }
80
91
 
92
+ const stringMatchValueSymbol: unique symbol = Symbol("StringMatchValue");
93
+
94
+ export type StringMatchValueKind = "prefix" | "suffix" | "contains";
95
+
96
+ export type StringMatchValue = Readonly<{
97
+ [stringMatchValueSymbol]: true;
98
+ kind: StringMatchValueKind;
99
+ value: string;
100
+ }>;
101
+
102
+ function stringMatchValue(
103
+ kind: StringMatchValueKind,
104
+ value: string,
105
+ ): StringMatchValue {
106
+ return Object.freeze({
107
+ [stringMatchValueSymbol]: true as const,
108
+ kind,
109
+ value,
110
+ });
111
+ }
112
+
113
+ /** Builds a typed string prefix filter value. */
114
+ export function filterPrefix(value: string): StringMatchValue {
115
+ return stringMatchValue("prefix", value);
116
+ }
117
+
118
+ /** Builds a typed string suffix filter value. */
119
+ export function filterSuffix(value: string): StringMatchValue {
120
+ return stringMatchValue("suffix", value);
121
+ }
122
+
123
+ /** Builds a typed string contains filter value. */
124
+ export function filterContains(value: string): StringMatchValue {
125
+ return stringMatchValue("contains", value);
126
+ }
127
+
81
128
  export type FilterValue =
82
129
  | string
83
130
  | number
@@ -85,7 +132,8 @@ export type FilterValue =
85
132
  | boolean
86
133
  | Date
87
134
  | null
88
- | RawFilterValue;
135
+ | RawFilterValue
136
+ | StringMatchValue;
89
137
 
90
138
  export type FilterExpression<Field extends string> =
91
139
  | Readonly<{
@@ -113,14 +161,37 @@ function renderFilter(
113
161
  if (!fields.has(expression.field)) {
114
162
  throw new RangeError(`unknown filter field: ${expression.field}`);
115
163
  }
116
- if (expression.value === null && !["=", "!="].includes(expression.operator)) {
164
+ if (
165
+ !Object.prototype.hasOwnProperty.call(
166
+ filterOperators,
167
+ expression.operator,
168
+ )
169
+ ) {
170
+ throw new RangeError(
171
+ `unsupported filter operator: ${String(expression.operator)}`,
172
+ );
173
+ }
174
+ if (
175
+ expression.value === null &&
176
+ !["=", "!="].includes(expression.operator)
177
+ ) {
117
178
  throw new RangeError("null filter values only support = and !=");
118
179
  }
180
+ if (
181
+ isStringMatchValue(expression.value) &&
182
+ expression.operator !== "=" &&
183
+ expression.operator !== "!="
184
+ ) {
185
+ throw new RangeError(
186
+ "typed wildcard filter values only support = and !=",
187
+ );
188
+ }
119
189
  return `${expression.field} ${expression.operator} ${renderFilterValue(expression.value)}`;
120
190
  }
121
- const [operator, children] = "and" in expression
122
- ? (["AND", expression.and] as const)
123
- : (["OR", expression.or] as const);
191
+ const [operator, children] =
192
+ "and" in expression
193
+ ? (["AND", expression.and] as const)
194
+ : (["OR", expression.or] as const);
124
195
  if (children.length === 0) {
125
196
  throw new RangeError(`${operator} filter group must not be empty`);
126
197
  }
@@ -129,7 +200,9 @@ function renderFilter(
129
200
 
130
201
  function renderFilterValue(value: FilterValue): string {
131
202
  if (value === null) return "null";
132
- if (typeof value === "string") return JSON.stringify(value);
203
+ if (typeof value === "string") {
204
+ return JSON.stringify(escapeWildcardLiteral(value));
205
+ }
133
206
  if (typeof value === "boolean" || typeof value === "bigint") {
134
207
  return value.toString();
135
208
  }
@@ -145,9 +218,37 @@ function renderFilterValue(value: FilterValue): string {
145
218
  }
146
219
  return `timestamp(${JSON.stringify(value.toISOString())})`;
147
220
  }
221
+ if (isStringMatchValue(value)) {
222
+ return renderStringMatchValue(value);
223
+ }
148
224
  return value.text;
149
225
  }
150
226
 
227
+ function isStringMatchValue(value: FilterValue): value is StringMatchValue {
228
+ return (
229
+ typeof value === "object" &&
230
+ value !== null &&
231
+ stringMatchValueSymbol in value
232
+ );
233
+ }
234
+
235
+ function escapeWildcardLiteral(value: string): string {
236
+ return value.replaceAll("\\", "\\\\").replaceAll("*", "\\*");
237
+ }
238
+
239
+ function renderStringMatchValue(value: StringMatchValue): string {
240
+ if (value.value.length === 0) return JSON.stringify("*");
241
+ const literal = escapeWildcardLiteral(value.value);
242
+ switch (value.kind) {
243
+ case "prefix":
244
+ return JSON.stringify(`${literal}*`);
245
+ case "suffix":
246
+ return JSON.stringify(`*${literal}`);
247
+ case "contains":
248
+ return JSON.stringify(`*${literal}*`);
249
+ }
250
+ }
251
+
151
252
  export type OrderDirection = "asc" | "desc";
152
253
 
153
254
  export type OrderTerm<Field extends string> = Readonly<{
@@ -23,8 +23,8 @@ export const UserName = {
23
23
  parse(value: string): UserNameParts {
24
24
  const segments = value.split("/");
25
25
  if (segments.length === 4 && segments[0] === "tenants" && segments[2] === "users") {
26
- assertResourceSegment("User", "tenant", segments[1]!);
27
- assertResourceSegment("User", "user", segments[3]!);
26
+ assertResourceSegment("User", "tenant", segments[1]!);
27
+ assertResourceSegment("User", "user", segments[3]!);
28
28
  return {
29
29
  tenant: segments[1]!,
30
30
  user: segments[3]!,
@@ -61,4 +61,3 @@ export const UserUpdateFields = {
61
61
  nickname: "nickname",
62
62
  temporaryPassword: "temporary_password",
63
63
  } as const;
64
-