@dxos/effect 0.7.1 → 0.7.2-main.f1adc9f
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/lib/browser/index.mjs +36 -14
- package/dist/lib/browser/index.mjs.map +3 -3
- package/dist/lib/browser/meta.json +1 -1
- package/dist/lib/node/index.cjs +37 -14
- package/dist/lib/node/index.cjs.map +3 -3
- package/dist/lib/node/meta.json +1 -1
- package/dist/lib/node-esm/index.mjs +36 -14
- package/dist/lib/node-esm/index.mjs.map +3 -3
- package/dist/lib/node-esm/meta.json +1 -1
- package/dist/types/src/ast.d.ts +17 -11
- package/dist/types/src/ast.d.ts.map +1 -1
- package/dist/types/src/sanity.test.d.ts +2 -0
- package/dist/types/src/sanity.test.d.ts.map +1 -0
- package/package.json +6 -5
- package/src/ast.test.ts +2 -3
- package/src/ast.ts +75 -28
- package/src/sanity.test.ts +69 -0
|
@@ -34,14 +34,13 @@ var PATH_REGEX = /[a-zA-Z_$][\w$]*(?:\.[a-zA-Z_$][\w$]*)*/;
|
|
|
34
34
|
var PROP_REGEX = /\w+/;
|
|
35
35
|
var JsonPath = S.NonEmptyString.pipe(S.pattern(PATH_REGEX));
|
|
36
36
|
var JsonProp = S.NonEmptyString.pipe(S.pattern(PROP_REGEX));
|
|
37
|
-
var getAnnotation = (annotationId) => (node) => pipe(AST.getAnnotation(annotationId)(node), Option.getOrUndefined);
|
|
38
37
|
var VisitResult;
|
|
39
38
|
(function(VisitResult2) {
|
|
40
39
|
VisitResult2[VisitResult2["CONTINUE"] = 0] = "CONTINUE";
|
|
41
40
|
VisitResult2[VisitResult2["SKIP"] = 1] = "SKIP";
|
|
42
41
|
VisitResult2[VisitResult2["EXIT"] = 2] = "EXIT";
|
|
43
42
|
})(VisitResult || (VisitResult = {}));
|
|
44
|
-
var defaultTest =
|
|
43
|
+
var defaultTest = isSimpleType;
|
|
45
44
|
var visit = (node, testOrVisitor, visitor) => {
|
|
46
45
|
if (!visitor) {
|
|
47
46
|
visitNode(node, defaultTest, testOrVisitor);
|
|
@@ -50,7 +49,8 @@ var visit = (node, testOrVisitor, visitor) => {
|
|
|
50
49
|
}
|
|
51
50
|
};
|
|
52
51
|
var visitNode = (node, test, visitor, path = [], depth = 0) => {
|
|
53
|
-
const
|
|
52
|
+
const _result = test?.(node, path, depth);
|
|
53
|
+
const result = _result === void 0 ? 0 : typeof _result === "boolean" ? _result ? 0 : 1 : _result;
|
|
54
54
|
if (result === 2) {
|
|
55
55
|
return result;
|
|
56
56
|
}
|
|
@@ -129,7 +129,7 @@ var findProperty = (schema, path) => {
|
|
|
129
129
|
const typeNode = findNode(node, AST.isTypeLiteral);
|
|
130
130
|
invariant(typeNode, void 0, {
|
|
131
131
|
F: __dxlog_file,
|
|
132
|
-
L:
|
|
132
|
+
L: 223,
|
|
133
133
|
S: void 0,
|
|
134
134
|
A: [
|
|
135
135
|
"typeNode",
|
|
@@ -154,14 +154,19 @@ var defaultAnnotations = {
|
|
|
154
154
|
["NumberKeyword"]: AST.numberKeyword,
|
|
155
155
|
["BooleanKeyword"]: AST.booleanKeyword
|
|
156
156
|
};
|
|
157
|
-
var
|
|
158
|
-
const
|
|
157
|
+
var getAnnotation = (annotationId, noDefault = true) => (node) => {
|
|
158
|
+
const id = pipe(AST.getIdentifierAnnotation(node), Option.getOrUndefined);
|
|
159
|
+
const value = pipe(AST.getAnnotation(annotationId)(node), Option.getOrUndefined);
|
|
160
|
+
if (noDefault && (value === defaultAnnotations[node._tag]?.annotations[annotationId] || value === id)) {
|
|
161
|
+
return void 0;
|
|
162
|
+
}
|
|
163
|
+
return value;
|
|
164
|
+
};
|
|
165
|
+
var findAnnotation = (node, annotationId, noDefault = true) => {
|
|
166
|
+
const getAnnotationById = getAnnotation(annotationId, noDefault);
|
|
159
167
|
const getBaseAnnotation = (node2) => {
|
|
160
168
|
const value = getAnnotationById(node2);
|
|
161
169
|
if (value !== void 0) {
|
|
162
|
-
if (options?.noDefault && value === defaultAnnotations[node2._tag]?.annotations[annotationId]) {
|
|
163
|
-
return void 0;
|
|
164
|
-
}
|
|
165
170
|
return value;
|
|
166
171
|
}
|
|
167
172
|
if (AST.isUnion(node2)) {
|
|
@@ -184,7 +189,7 @@ var isDiscriminatedUnion = (node) => {
|
|
|
184
189
|
var getDiscriminatingProps = (node) => {
|
|
185
190
|
invariant(AST.isUnion(node), void 0, {
|
|
186
191
|
F: __dxlog_file,
|
|
187
|
-
L:
|
|
192
|
+
L: 320,
|
|
188
193
|
S: void 0,
|
|
189
194
|
A: [
|
|
190
195
|
"AST.isUnion(node)",
|
|
@@ -202,7 +207,7 @@ var getDiscriminatingProps = (node) => {
|
|
|
202
207
|
var getDiscriminatedType = (node, value = {}) => {
|
|
203
208
|
invariant(AST.isUnion(node), void 0, {
|
|
204
209
|
F: __dxlog_file,
|
|
205
|
-
L:
|
|
210
|
+
L: 341,
|
|
206
211
|
S: void 0,
|
|
207
212
|
A: [
|
|
208
213
|
"AST.isUnion(node)",
|
|
@@ -211,7 +216,7 @@ var getDiscriminatedType = (node, value = {}) => {
|
|
|
211
216
|
});
|
|
212
217
|
invariant(value, void 0, {
|
|
213
218
|
F: __dxlog_file,
|
|
214
|
-
L:
|
|
219
|
+
L: 342,
|
|
215
220
|
S: void 0,
|
|
216
221
|
A: [
|
|
217
222
|
"value",
|
|
@@ -226,7 +231,7 @@ var getDiscriminatedType = (node, value = {}) => {
|
|
|
226
231
|
const match = AST.getPropertySignatures(type).filter((prop) => props?.includes(prop.name.toString())).every((prop) => {
|
|
227
232
|
invariant(AST.isLiteral(prop.type), void 0, {
|
|
228
233
|
F: __dxlog_file,
|
|
229
|
-
L:
|
|
234
|
+
L: 353,
|
|
230
235
|
S: void 0,
|
|
231
236
|
A: [
|
|
232
237
|
"AST.isLiteral(prop.type)",
|
|
@@ -244,7 +249,7 @@ var getDiscriminatedType = (node, value = {}) => {
|
|
|
244
249
|
const literal = AST.getPropertySignatures(type).find((p) => p.name.toString() === prop);
|
|
245
250
|
invariant(AST.isLiteral(literal.type), void 0, {
|
|
246
251
|
F: __dxlog_file,
|
|
247
|
-
L:
|
|
252
|
+
L: 371,
|
|
248
253
|
S: void 0,
|
|
249
254
|
A: [
|
|
250
255
|
"AST.isLiteral(literal.type)",
|
|
@@ -261,6 +266,22 @@ var getDiscriminatedType = (node, value = {}) => {
|
|
|
261
266
|
const schema = S.Struct(fields);
|
|
262
267
|
return schema.ast;
|
|
263
268
|
};
|
|
269
|
+
var mapAst = (ast, f) => {
|
|
270
|
+
switch (ast._tag) {
|
|
271
|
+
case "TypeLiteral":
|
|
272
|
+
return new AST.TypeLiteral(ast.propertySignatures.map((prop) => new AST.PropertySignature(prop.name, f(prop.type), prop.isOptional, prop.isReadonly, prop.annotations)), ast.indexSignatures);
|
|
273
|
+
case "Union":
|
|
274
|
+
return AST.Union.make(ast.types.map(f), ast.annotations);
|
|
275
|
+
case "TupleType":
|
|
276
|
+
return new AST.TupleType(ast.elements.map((t) => new AST.OptionalType(f(t.type), t.isOptional, t.annotations)), ast.rest.map((t) => new AST.Type(f(t.type), t.annotations)), ast.isReadonly, ast.annotations);
|
|
277
|
+
case "Suspend": {
|
|
278
|
+
const newAst = f(ast.f());
|
|
279
|
+
return new AST.Suspend(() => newAst, ast.annotations);
|
|
280
|
+
}
|
|
281
|
+
default:
|
|
282
|
+
return ast;
|
|
283
|
+
}
|
|
284
|
+
};
|
|
264
285
|
|
|
265
286
|
// packages/common/effect/src/url.ts
|
|
266
287
|
import { AST as AST2 } from "@effect/schema";
|
|
@@ -337,6 +358,7 @@ export {
|
|
|
337
358
|
isLiteralUnion,
|
|
338
359
|
isOption,
|
|
339
360
|
isSimpleType,
|
|
361
|
+
mapAst,
|
|
340
362
|
visit
|
|
341
363
|
};
|
|
342
364
|
//# sourceMappingURL=index.mjs.map
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"version": 3,
|
|
3
3
|
"sources": ["../../../src/index.ts", "../../../src/ast.ts", "../../../src/url.ts"],
|
|
4
|
-
"sourcesContent": ["//\n// Copyright 2020 DXOS.org\n//\n\nimport { AST, JSONSchema, Schema as S } from '@effect/schema';\nimport type * as Types from 'effect/Types';\n\n// TODO(dmaretskyi): Remove re-exports.\nexport { AST, JSONSchema, S, Types };\n\nexport * from './ast';\nexport * from './url';\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { AST, Schema as S } from '@effect/schema';\nimport { Option, pipe } from 'effect';\n\nimport { invariant } from '@dxos/invariant';\nimport { nonNullable } from '@dxos/util';\n\n//\n// Refs\n// https://effect.website/docs/schema/introduction\n// https://www.npmjs.com/package/@effect/schema\n// https://effect-ts.github.io/effect/schema/AST.ts.html\n//\n\nexport type SimpleType = 'object' | 'string' | 'number' | 'boolean' | 'enum' | 'literal';\n\n/**\n * Get the base type; e.g., traverse through refinements.\n */\nexport const getSimpleType = (node: AST.AST): SimpleType | undefined => {\n if (AST.isObjectKeyword(node) || AST.isTypeLiteral(node) || isDiscriminatedUnion(node)) {\n return 'object';\n }\n\n if (AST.isStringKeyword(node)) {\n return 'string';\n }\n if (AST.isNumberKeyword(node)) {\n return 'number';\n }\n if (AST.isBooleanKeyword(node)) {\n return 'boolean';\n }\n\n if (AST.isEnums(node)) {\n return 'enum';\n }\n\n if (AST.isLiteral(node)) {\n return 'literal';\n }\n};\n\nexport const isSimpleType = (node: AST.AST): boolean => !!getSimpleType(node);\n\n//\n// Branded types\n//\n\nexport type JsonProp = string & { __JsonPath: true; __JsonProp: true };\nexport type JsonPath = string & { __JsonPath: true };\n\nconst PATH_REGEX = /[a-zA-Z_$][\\w$]*(?:\\.[a-zA-Z_$][\\w$]*)*/;\nconst PROP_REGEX = /\\w+/;\n\n/**\n * https://www.ietf.org/archive/id/draft-goessner-dispatch-jsonpath-00.html\n */\nexport const JsonPath = S.NonEmptyString.pipe(S.pattern(PATH_REGEX)) as any as S.Schema<JsonPath>;\nexport const JsonProp = S.NonEmptyString.pipe(S.pattern(PROP_REGEX)) as any as S.Schema<JsonProp>;\n\n/**\n * Get annotation or return undefined.\n */\nexport const getAnnotation =\n <T>(annotationId: symbol) =>\n (node: AST.Annotated): T | undefined =>\n pipe(AST.getAnnotation<T>(annotationId)(node), Option.getOrUndefined);\n\nexport enum VisitResult {\n CONTINUE = 0,\n /**\n * Skip visiting children.\n */\n SKIP = 1,\n /**\n * Stop traversing immediately.\n */\n EXIT = 2,\n}\n\nexport type Path = (string | number)[];\n\nexport type Tester = (node: AST.AST, path: Path, depth: number) => VisitResult | undefined;\nexport type Visitor = (node: AST.AST, path: Path, depth: number) => void;\n\nconst defaultTest: Tester = (node) => (isSimpleType(node) ? VisitResult.CONTINUE : VisitResult.SKIP);\n\n/**\n * Visit leaf nodes.\n * Refs:\n * - https://github.com/syntax-tree/unist-util-visit?tab=readme-ov-file#visitor\n * - https://github.com/syntax-tree/unist-util-is?tab=readme-ov-file#test\n */\nexport const visit: {\n (node: AST.AST, visitor: Visitor): void;\n (node: AST.AST, test: Tester, visitor: Visitor): void;\n} = (node: AST.AST, testOrVisitor: Tester | Visitor, visitor?: Visitor): void => {\n if (!visitor) {\n visitNode(node, defaultTest, testOrVisitor);\n } else {\n visitNode(node, testOrVisitor as Tester, visitor);\n }\n};\n\nconst visitNode = (\n node: AST.AST,\n test: Tester | undefined,\n visitor: Visitor,\n path: Path = [],\n depth = 0,\n): VisitResult | undefined => {\n const result = test?.(node, path, depth) ?? VisitResult.CONTINUE;\n if (result === VisitResult.EXIT) {\n return result;\n }\n if (result !== VisitResult.SKIP) {\n visitor(node, path, depth);\n }\n\n // Object.\n if (AST.isTypeLiteral(node)) {\n for (const prop of AST.getPropertySignatures(node)) {\n const currentPath = [...path, prop.name.toString()];\n const result = visitNode(prop.type, test, visitor, currentPath, depth + 1);\n if (result === VisitResult.EXIT) {\n return result;\n }\n }\n }\n\n // Array.\n else if (AST.isTupleType(node)) {\n for (const [i, element] of node.elements.entries()) {\n const currentPath = [...path, i];\n const result = visitNode(element.type, test, visitor, currentPath, depth);\n if (result === VisitResult.EXIT) {\n return result;\n }\n }\n }\n\n // Branching union (e.g., optional, discriminated unions).\n else if (AST.isUnion(node)) {\n for (const type of node.types) {\n const result = visitNode(type, test, visitor, path, depth);\n if (result === VisitResult.EXIT) {\n return result;\n }\n }\n }\n\n // Refinement.\n else if (AST.isRefinement(node)) {\n const result = visitNode(node.from, test, visitor, path, depth);\n if (result === VisitResult.EXIT) {\n return result;\n }\n }\n\n // TODO(burdon): Transforms?\n};\n\n/**\n * Recursively descend into AST to find first node that passes the test.\n */\n// TODO(burdon): Rewrite using visitNode?\nexport const findNode = (node: AST.AST, test: (node: AST.AST) => boolean): AST.AST | undefined => {\n if (test(node)) {\n return node;\n }\n\n // Object.\n else if (AST.isTypeLiteral(node)) {\n for (const prop of AST.getPropertySignatures(node)) {\n const child = findNode(prop.type, test);\n if (child) {\n return child;\n }\n }\n }\n\n // Tuple.\n else if (AST.isTupleType(node)) {\n for (const [_, element] of node.elements.entries()) {\n const child = findNode(element.type, test);\n if (child) {\n return child;\n }\n }\n }\n\n // Branching union (e.g., optional, discriminated unions).\n else if (AST.isUnion(node)) {\n if (isOption(node)) {\n for (const type of node.types) {\n const child = findNode(type, test);\n if (child) {\n return child;\n }\n }\n }\n }\n\n // Refinement.\n else if (AST.isRefinement(node)) {\n return findNode(node.from, test);\n }\n};\n\n/**\n * Get the AST node for the given property (dot-path).\n */\nexport const findProperty = (schema: S.Schema<any>, path: JsonPath | JsonProp): AST.AST | undefined => {\n const getProp = (node: AST.AST, path: JsonProp[]): AST.AST | undefined => {\n const [name, ...rest] = path;\n const typeNode = findNode(node, AST.isTypeLiteral);\n invariant(typeNode);\n for (const prop of AST.getPropertySignatures(typeNode)) {\n if (prop.name === name) {\n if (rest.length) {\n return getProp(prop.type, rest);\n } else {\n return prop.type;\n }\n }\n }\n };\n\n return getProp(schema.ast, path.split('.') as JsonProp[]);\n};\n\n//\n// Annotations\n//\n\nconst defaultAnnotations: Record<string, AST.Annotated> = {\n ['ObjectKeyword' as const]: AST.objectKeyword,\n ['StringKeyword' as const]: AST.stringKeyword,\n ['NumberKeyword' as const]: AST.numberKeyword,\n ['BooleanKeyword' as const]: AST.booleanKeyword,\n};\n\n/**\n * Recursively descend into AST to find first matching annotations.\n * Optionally skips default annotations for basic types (e.g., 'a string').\n */\nexport const findAnnotation = <T>(\n node: AST.AST,\n annotationId: symbol,\n options?: { noDefault: boolean },\n): T | undefined => {\n const getAnnotationById = getAnnotation(annotationId);\n\n const getBaseAnnotation = (node: AST.AST): T | undefined => {\n const value = getAnnotationById(node);\n if (value !== undefined) {\n if (options?.noDefault && value === defaultAnnotations[node._tag]?.annotations[annotationId]) {\n return undefined;\n }\n\n return value as T;\n }\n\n if (AST.isUnion(node)) {\n if (isOption(node)) {\n return getAnnotationById(node.types[0]) as T;\n }\n }\n };\n\n return getBaseAnnotation(node);\n};\n\n//\n// Unions\n//\n\n/**\n * Effect S.optional creates a union type with undefined as the second type.\n */\nexport const isOption = (node: AST.AST): boolean => {\n return AST.isUnion(node) && node.types.length === 2 && AST.isUndefinedKeyword(node.types[1]);\n};\n\n/**\n * Determines if the node is a union of literal types.\n */\nexport const isLiteralUnion = (node: AST.AST): boolean => {\n return AST.isUnion(node) && node.types.every(AST.isLiteral);\n};\n\n/**\n * Determines if the node is a discriminated union.\n */\nexport const isDiscriminatedUnion = (node: AST.AST): boolean => {\n return AST.isUnion(node) && !!getDiscriminatingProps(node)?.length;\n};\n\n/**\n * Get the discriminating properties for the given union type.\n */\nexport const getDiscriminatingProps = (node: AST.AST): string[] | undefined => {\n invariant(AST.isUnion(node));\n if (isOption(node)) {\n return;\n }\n\n // Get common literals across all types.\n return node.types.reduce<string[]>((shared, type) => {\n const props = AST.getPropertySignatures(type)\n // TODO(burdon): Should check each literal is unique.\n .filter((p) => AST.isLiteral(p.type))\n .map((p) => p.name.toString());\n\n // Return common literals.\n return shared.length === 0 ? props : shared.filter((prop) => props.includes(prop));\n }, []);\n};\n\n/**\n * Get the discriminated type for the given value.\n */\nexport const getDiscriminatedType = (node: AST.AST, value: Record<string, any> = {}): AST.AST | undefined => {\n invariant(AST.isUnion(node));\n invariant(value);\n const props = getDiscriminatingProps(node);\n if (!props?.length) {\n return;\n }\n\n // Match provided values.\n for (const type of node.types) {\n const match = AST.getPropertySignatures(type)\n .filter((prop) => props?.includes(prop.name.toString()))\n .every((prop) => {\n invariant(AST.isLiteral(prop.type));\n return prop.type.literal === value[prop.name.toString()];\n });\n\n if (match) {\n return type;\n }\n }\n\n // Create union of discriminating properties.\n // NOTE: This may not work with non-overlapping variants.\n // TODO(burdon): Iterate through props and knock-out variants that don't match.\n const fields = Object.fromEntries(\n props\n .map((prop) => {\n const literals = node.types\n .map((type) => {\n const literal = AST.getPropertySignatures(type).find((p) => p.name.toString() === prop)!;\n invariant(AST.isLiteral(literal.type));\n return literal.type.literal;\n })\n .filter(nonNullable);\n\n return literals.length ? [prop, S.Literal(...literals)] : undefined;\n })\n .filter(nonNullable),\n );\n\n const schema = S.Struct(fields);\n return schema.ast;\n};\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { AST, type Schema as S } from '@effect/schema';\nimport { Option, pipe } from 'effect';\n\nimport { decamelize } from '@dxos/util';\n\nconst ParamKeyAnnotationId = Symbol.for('@dxos/schema/annotation/ParamKey');\n\ntype ParamKeyAnnotationValue = { key: string };\n\nexport const getParamKeyAnnotation: (annotated: AST.Annotated) => Option.Option<ParamKeyAnnotationValue> =\n AST.getAnnotation<ParamKeyAnnotationValue>(ParamKeyAnnotationId);\n\nexport const ParamKeyAnnotation =\n (value: ParamKeyAnnotationValue) =>\n <S extends S.Annotable.All>(self: S): S.Annotable.Self<S> =>\n self.annotations({ [ParamKeyAnnotationId]: value });\n\n/**\n * HTTP params parser.\n * Supports custom key serialization.\n */\nexport class UrlParser<T extends Record<string, any>> {\n constructor(private readonly _schema: S.Struct<T>) {}\n\n /**\n * Parse URL params.\n */\n parse(_url: string): T {\n const url = new URL(_url);\n return Object.entries(this._schema.fields).reduce<Record<string, any>>((params, [key, type]) => {\n let value = url.searchParams.get(decamelize(key));\n if (value == null) {\n value = url.searchParams.get(key);\n }\n\n if (value != null) {\n if (AST.isNumberKeyword(type.ast)) {\n params[key] = parseInt(value);\n } else if (AST.isBooleanKeyword(type.ast)) {\n params[key] = value === 'true' || value === '1';\n } else {\n params[key] = value;\n }\n }\n\n return params;\n }, {}) as T;\n }\n\n /**\n * Return URL with encoded params.\n */\n create(_url: string, params: T): URL {\n const url = new URL(_url);\n Object.entries(params).forEach(([key, value]) => {\n if (value !== undefined) {\n const field = this._schema.fields[key];\n if (field) {\n const { key: serializedKey } = pipe(\n getParamKeyAnnotation(field.ast),\n Option.getOrElse(() => ({\n key: decamelize(key),\n })),\n );\n\n url.searchParams.set(serializedKey, String(value));\n }\n }\n });\n\n return url;\n }\n}\n"],
|
|
5
|
-
"mappings": ";;;AAIA,SAASA,OAAAA,MAAKC,YAAYC,UAAUC,UAAS;;;ACA7C,SAASC,KAAKC,UAAUC,SAAS;AACjC,SAASC,QAAQC,YAAY;AAE7B,SAASC,iBAAiB;AAC1B,SAASC,mBAAmB;;AAcrB,IAAMC,gBAAgB,CAACC,SAAAA;AAC5B,MAAIR,IAAIS,gBAAgBD,IAAAA,KAASR,IAAIU,cAAcF,IAAAA,KAASG,qBAAqBH,IAAAA,GAAO;AACtF,WAAO;EACT;AAEA,MAAIR,IAAIY,gBAAgBJ,IAAAA,GAAO;AAC7B,WAAO;EACT;AACA,MAAIR,IAAIa,gBAAgBL,IAAAA,GAAO;AAC7B,WAAO;EACT;AACA,MAAIR,IAAIc,iBAAiBN,IAAAA,GAAO;AAC9B,WAAO;EACT;AAEA,MAAIR,IAAIe,QAAQP,IAAAA,GAAO;AACrB,WAAO;EACT;AAEA,MAAIR,IAAIgB,UAAUR,IAAAA,GAAO;AACvB,WAAO;EACT;AACF;AAEO,IAAMS,eAAe,CAACT,SAA2B,CAAC,CAACD,cAAcC,IAAAA;AASxE,IAAMU,aAAa;AACnB,IAAMC,aAAa;AAKZ,IAAMC,WAAWlB,EAAEmB,eAAejB,KAAKF,EAAEoB,QAAQJ,UAAAA,CAAAA;AACjD,IAAMK,WAAWrB,EAAEmB,eAAejB,KAAKF,EAAEoB,QAAQH,UAAAA,CAAAA
|
|
6
|
-
"names": ["AST", "JSONSchema", "Schema", "S", "AST", "Schema", "S", "Option", "pipe", "invariant", "nonNullable", "getSimpleType", "node", "isObjectKeyword", "isTypeLiteral", "isDiscriminatedUnion", "isStringKeyword", "isNumberKeyword", "isBooleanKeyword", "isEnums", "isLiteral", "isSimpleType", "PATH_REGEX", "PROP_REGEX", "JsonPath", "NonEmptyString", "pattern", "JsonProp", "
|
|
4
|
+
"sourcesContent": ["//\n// Copyright 2020 DXOS.org\n//\n\nimport { AST, JSONSchema, Schema as S } from '@effect/schema';\nimport type * as Types from 'effect/Types';\n\n// TODO(dmaretskyi): Remove re-exports.\nexport { AST, JSONSchema, S, Types };\n\nexport * from './ast';\nexport * from './url';\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { AST, Schema as S } from '@effect/schema';\nimport { Option, pipe } from 'effect';\n\nimport { invariant } from '@dxos/invariant';\nimport { nonNullable } from '@dxos/util';\n\n//\n// Refs\n// https://effect.website/docs/schema/introduction\n// https://www.npmjs.com/package/@effect/schema\n// https://effect-ts.github.io/effect/schema/AST.ts.html\n//\n\nexport type SimpleType = 'object' | 'string' | 'number' | 'boolean' | 'enum' | 'literal';\n\n/**\n * Get the base type; e.g., traverse through refinements.\n */\nexport const getSimpleType = (node: AST.AST): SimpleType | undefined => {\n if (AST.isObjectKeyword(node) || AST.isTypeLiteral(node) || isDiscriminatedUnion(node)) {\n return 'object';\n }\n\n if (AST.isStringKeyword(node)) {\n return 'string';\n }\n if (AST.isNumberKeyword(node)) {\n return 'number';\n }\n if (AST.isBooleanKeyword(node)) {\n return 'boolean';\n }\n\n if (AST.isEnums(node)) {\n return 'enum';\n }\n\n if (AST.isLiteral(node)) {\n return 'literal';\n }\n};\n\nexport const isSimpleType = (node: AST.AST): boolean => !!getSimpleType(node);\n\n//\n// Branded types\n//\n\nexport type JsonProp = string & { __JsonPath: true; __JsonProp: true };\nexport type JsonPath = string & { __JsonPath: true };\n\nconst PATH_REGEX = /[a-zA-Z_$][\\w$]*(?:\\.[a-zA-Z_$][\\w$]*)*/;\nconst PROP_REGEX = /\\w+/;\n\n/**\n * https://www.ietf.org/archive/id/draft-goessner-dispatch-jsonpath-00.html\n */\nexport const JsonPath = S.NonEmptyString.pipe(S.pattern(PATH_REGEX)) as any as S.Schema<JsonPath>;\nexport const JsonProp = S.NonEmptyString.pipe(S.pattern(PROP_REGEX)) as any as S.Schema<JsonProp>;\n\nexport enum VisitResult {\n CONTINUE = 0,\n /**\n * Skip visiting children.\n */\n SKIP = 1,\n /**\n * Stop traversing immediately.\n */\n EXIT = 2,\n}\n\nexport type Path = (string | number)[];\n\nexport type TestFn = (node: AST.AST, path: Path, depth: number) => VisitResult | boolean | undefined;\n\nexport type VisitorFn = (node: AST.AST, path: Path, depth: number) => void;\n\nconst defaultTest: TestFn = isSimpleType;\n\n/**\n * Visit leaf nodes.\n * Refs:\n * - https://github.com/syntax-tree/unist-util-visit?tab=readme-ov-file#visitor\n * - https://github.com/syntax-tree/unist-util-is?tab=readme-ov-file#test\n */\nexport const visit: {\n (node: AST.AST, visitor: VisitorFn): void;\n (node: AST.AST, test: TestFn, visitor: VisitorFn): void;\n} = (node: AST.AST, testOrVisitor: TestFn | VisitorFn, visitor?: VisitorFn): void => {\n if (!visitor) {\n visitNode(node, defaultTest, testOrVisitor);\n } else {\n visitNode(node, testOrVisitor as TestFn, visitor);\n }\n};\n\nconst visitNode = (\n node: AST.AST,\n test: TestFn | undefined,\n visitor: VisitorFn,\n path: Path = [],\n depth = 0,\n): VisitResult | undefined => {\n const _result = test?.(node, path, depth);\n const result: VisitResult =\n _result === undefined\n ? VisitResult.CONTINUE\n : typeof _result === 'boolean'\n ? _result\n ? VisitResult.CONTINUE\n : VisitResult.SKIP\n : _result;\n\n if (result === VisitResult.EXIT) {\n return result;\n }\n if (result !== VisitResult.SKIP) {\n visitor(node, path, depth);\n }\n\n // Object.\n if (AST.isTypeLiteral(node)) {\n for (const prop of AST.getPropertySignatures(node)) {\n const currentPath = [...path, prop.name.toString()];\n const result = visitNode(prop.type, test, visitor, currentPath, depth + 1);\n if (result === VisitResult.EXIT) {\n return result;\n }\n }\n }\n\n // Array.\n else if (AST.isTupleType(node)) {\n for (const [i, element] of node.elements.entries()) {\n const currentPath = [...path, i];\n const result = visitNode(element.type, test, visitor, currentPath, depth);\n if (result === VisitResult.EXIT) {\n return result;\n }\n }\n }\n\n // Branching union (e.g., optional, discriminated unions).\n else if (AST.isUnion(node)) {\n for (const type of node.types) {\n const result = visitNode(type, test, visitor, path, depth);\n if (result === VisitResult.EXIT) {\n return result;\n }\n }\n }\n\n // Refinement.\n else if (AST.isRefinement(node)) {\n const result = visitNode(node.from, test, visitor, path, depth);\n if (result === VisitResult.EXIT) {\n return result;\n }\n }\n\n // TODO(burdon): Transforms?\n};\n\n/**\n * Recursively descend into AST to find first node that passes the test.\n */\n// TODO(burdon): Rewrite using visitNode?\nexport const findNode = (node: AST.AST, test: (node: AST.AST) => boolean): AST.AST | undefined => {\n if (test(node)) {\n return node;\n }\n\n // Object.\n else if (AST.isTypeLiteral(node)) {\n for (const prop of AST.getPropertySignatures(node)) {\n const child = findNode(prop.type, test);\n if (child) {\n return child;\n }\n }\n }\n\n // Tuple.\n else if (AST.isTupleType(node)) {\n for (const [_, element] of node.elements.entries()) {\n const child = findNode(element.type, test);\n if (child) {\n return child;\n }\n }\n }\n\n // Branching union (e.g., optional, discriminated unions).\n else if (AST.isUnion(node)) {\n if (isOption(node)) {\n for (const type of node.types) {\n const child = findNode(type, test);\n if (child) {\n return child;\n }\n }\n }\n }\n\n // Refinement.\n else if (AST.isRefinement(node)) {\n return findNode(node.from, test);\n }\n};\n\n/**\n * Get the AST node for the given property (dot-path).\n */\nexport const findProperty = (schema: S.Schema<any>, path: JsonPath | JsonProp): AST.AST | undefined => {\n const getProp = (node: AST.AST, path: JsonProp[]): AST.AST | undefined => {\n const [name, ...rest] = path;\n const typeNode = findNode(node, AST.isTypeLiteral);\n invariant(typeNode);\n for (const prop of AST.getPropertySignatures(typeNode)) {\n if (prop.name === name) {\n if (rest.length) {\n return getProp(prop.type, rest);\n } else {\n return prop.type;\n }\n }\n }\n };\n\n return getProp(schema.ast, path.split('.') as JsonProp[]);\n};\n\n//\n// Annotations\n//\n\nconst defaultAnnotations: Record<string, AST.Annotated> = {\n ['ObjectKeyword' as const]: AST.objectKeyword,\n ['StringKeyword' as const]: AST.stringKeyword,\n ['NumberKeyword' as const]: AST.numberKeyword,\n ['BooleanKeyword' as const]: AST.booleanKeyword,\n};\n\n/**\n * Get annotation or return undefined.\n * @param annotationId\n * @param noDefault If true, then return undefined for effect library defined values.\n */\nexport const getAnnotation =\n <T>(annotationId: symbol, noDefault = true) =>\n (node: AST.AST): T | undefined => {\n // Title fallback seems to be the identifier.\n const id = pipe(AST.getIdentifierAnnotation(node), Option.getOrUndefined);\n const value = pipe(AST.getAnnotation<T>(annotationId)(node), Option.getOrUndefined);\n if (noDefault && (value === defaultAnnotations[node._tag]?.annotations[annotationId] || value === id)) {\n return undefined;\n }\n\n return value;\n };\n\n/**\n * Recursively descend into AST to find first matching annotations.\n * Optionally skips default annotations for basic types (e.g., 'a string').\n */\n// TODO(burdon): Convert to effect pattern (i.e., return operator like getAnnotation).\nexport const findAnnotation = <T>(node: AST.AST, annotationId: symbol, noDefault = true): T | undefined => {\n const getAnnotationById = getAnnotation(annotationId, noDefault);\n\n const getBaseAnnotation = (node: AST.AST): T | undefined => {\n const value = getAnnotationById(node);\n if (value !== undefined) {\n return value as T;\n }\n\n if (AST.isUnion(node)) {\n if (isOption(node)) {\n return getAnnotationById(node.types[0]) as T;\n }\n }\n };\n\n return getBaseAnnotation(node);\n};\n\n//\n// Unions\n//\n\n/**\n * Effect S.optional creates a union type with undefined as the second type.\n */\nexport const isOption = (node: AST.AST): boolean => {\n return AST.isUnion(node) && node.types.length === 2 && AST.isUndefinedKeyword(node.types[1]);\n};\n\n/**\n * Determines if the node is a union of literal types.\n */\nexport const isLiteralUnion = (node: AST.AST): boolean => {\n return AST.isUnion(node) && node.types.every(AST.isLiteral);\n};\n\n/**\n * Determines if the node is a discriminated union.\n */\nexport const isDiscriminatedUnion = (node: AST.AST): boolean => {\n return AST.isUnion(node) && !!getDiscriminatingProps(node)?.length;\n};\n\n/**\n * Get the discriminating properties for the given union type.\n */\nexport const getDiscriminatingProps = (node: AST.AST): string[] | undefined => {\n invariant(AST.isUnion(node));\n if (isOption(node)) {\n return;\n }\n\n // Get common literals across all types.\n return node.types.reduce<string[]>((shared, type) => {\n const props = AST.getPropertySignatures(type)\n // TODO(burdon): Should check each literal is unique.\n .filter((p) => AST.isLiteral(p.type))\n .map((p) => p.name.toString());\n\n // Return common literals.\n return shared.length === 0 ? props : shared.filter((prop) => props.includes(prop));\n }, []);\n};\n\n/**\n * Get the discriminated type for the given value.\n */\nexport const getDiscriminatedType = (node: AST.AST, value: Record<string, any> = {}): AST.AST | undefined => {\n invariant(AST.isUnion(node));\n invariant(value);\n const props = getDiscriminatingProps(node);\n if (!props?.length) {\n return;\n }\n\n // Match provided values.\n for (const type of node.types) {\n const match = AST.getPropertySignatures(type)\n .filter((prop) => props?.includes(prop.name.toString()))\n .every((prop) => {\n invariant(AST.isLiteral(prop.type));\n return prop.type.literal === value[prop.name.toString()];\n });\n\n if (match) {\n return type;\n }\n }\n\n // Create union of discriminating properties.\n // NOTE: This may not work with non-overlapping variants.\n // TODO(burdon): Iterate through props and knock-out variants that don't match.\n const fields = Object.fromEntries(\n props\n .map((prop) => {\n const literals = node.types\n .map((type) => {\n const literal = AST.getPropertySignatures(type).find((p) => p.name.toString() === prop)!;\n invariant(AST.isLiteral(literal.type));\n return literal.type.literal;\n })\n .filter(nonNullable);\n\n return literals.length ? [prop, S.Literal(...literals)] : undefined;\n })\n .filter(nonNullable),\n );\n\n const schema = S.Struct(fields);\n return schema.ast;\n};\n\n/**\n * Maps AST nodes.\n * The user is responsible for recursively calling {@link mapAst} on the AST.\n * NOTE: Will evaluate suspended ASTs.\n */\nexport const mapAst = (ast: AST.AST, f: (ast: AST.AST) => AST.AST): AST.AST => {\n switch (ast._tag) {\n case 'TypeLiteral':\n return new AST.TypeLiteral(\n ast.propertySignatures.map(\n (prop) =>\n new AST.PropertySignature(prop.name, f(prop.type), prop.isOptional, prop.isReadonly, prop.annotations),\n ),\n ast.indexSignatures,\n );\n case 'Union':\n return AST.Union.make(ast.types.map(f), ast.annotations);\n case 'TupleType':\n return new AST.TupleType(\n ast.elements.map((t) => new AST.OptionalType(f(t.type), t.isOptional, t.annotations)),\n ast.rest.map((t) => new AST.Type(f(t.type), t.annotations)),\n ast.isReadonly,\n ast.annotations,\n );\n case 'Suspend': {\n const newAst = f(ast.f());\n return new AST.Suspend(() => newAst, ast.annotations);\n }\n default:\n // TODO(dmaretskyi): Support more nodes.\n return ast;\n }\n};\n", "//\n// Copyright 2024 DXOS.org\n//\n\nimport { AST, type Schema as S } from '@effect/schema';\nimport { Option, pipe } from 'effect';\n\nimport { decamelize } from '@dxos/util';\n\nconst ParamKeyAnnotationId = Symbol.for('@dxos/schema/annotation/ParamKey');\n\ntype ParamKeyAnnotationValue = { key: string };\n\nexport const getParamKeyAnnotation: (annotated: AST.Annotated) => Option.Option<ParamKeyAnnotationValue> =\n AST.getAnnotation<ParamKeyAnnotationValue>(ParamKeyAnnotationId);\n\nexport const ParamKeyAnnotation =\n (value: ParamKeyAnnotationValue) =>\n <S extends S.Annotable.All>(self: S): S.Annotable.Self<S> =>\n self.annotations({ [ParamKeyAnnotationId]: value });\n\n/**\n * HTTP params parser.\n * Supports custom key serialization.\n */\nexport class UrlParser<T extends Record<string, any>> {\n constructor(private readonly _schema: S.Struct<T>) {}\n\n /**\n * Parse URL params.\n */\n parse(_url: string): T {\n const url = new URL(_url);\n return Object.entries(this._schema.fields).reduce<Record<string, any>>((params, [key, type]) => {\n let value = url.searchParams.get(decamelize(key));\n if (value == null) {\n value = url.searchParams.get(key);\n }\n\n if (value != null) {\n if (AST.isNumberKeyword(type.ast)) {\n params[key] = parseInt(value);\n } else if (AST.isBooleanKeyword(type.ast)) {\n params[key] = value === 'true' || value === '1';\n } else {\n params[key] = value;\n }\n }\n\n return params;\n }, {}) as T;\n }\n\n /**\n * Return URL with encoded params.\n */\n create(_url: string, params: T): URL {\n const url = new URL(_url);\n Object.entries(params).forEach(([key, value]) => {\n if (value !== undefined) {\n const field = this._schema.fields[key];\n if (field) {\n const { key: serializedKey } = pipe(\n getParamKeyAnnotation(field.ast),\n Option.getOrElse(() => ({\n key: decamelize(key),\n })),\n );\n\n url.searchParams.set(serializedKey, String(value));\n }\n }\n });\n\n return url;\n }\n}\n"],
|
|
5
|
+
"mappings": "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",
|
|
6
|
+
"names": ["AST", "JSONSchema", "Schema", "S", "AST", "Schema", "S", "Option", "pipe", "invariant", "nonNullable", "getSimpleType", "node", "isObjectKeyword", "isTypeLiteral", "isDiscriminatedUnion", "isStringKeyword", "isNumberKeyword", "isBooleanKeyword", "isEnums", "isLiteral", "isSimpleType", "PATH_REGEX", "PROP_REGEX", "JsonPath", "NonEmptyString", "pattern", "JsonProp", "VisitResult", "defaultTest", "visit", "testOrVisitor", "visitor", "visitNode", "test", "path", "depth", "_result", "result", "undefined", "prop", "getPropertySignatures", "currentPath", "name", "toString", "type", "isTupleType", "i", "element", "elements", "entries", "isUnion", "types", "isRefinement", "from", "findNode", "child", "_", "isOption", "findProperty", "schema", "getProp", "rest", "typeNode", "length", "ast", "split", "defaultAnnotations", "objectKeyword", "stringKeyword", "numberKeyword", "booleanKeyword", "getAnnotation", "annotationId", "noDefault", "id", "getIdentifierAnnotation", "getOrUndefined", "value", "_tag", "annotations", "findAnnotation", "getAnnotationById", "getBaseAnnotation", "isUndefinedKeyword", "isLiteralUnion", "every", "getDiscriminatingProps", "reduce", "shared", "props", "filter", "p", "map", "includes", "getDiscriminatedType", "match", "literal", "fields", "Object", "fromEntries", "literals", "find", "Literal", "Struct", "mapAst", "f", "TypeLiteral", "propertySignatures", "PropertySignature", "isOptional", "isReadonly", "indexSignatures", "Union", "make", "TupleType", "t", "OptionalType", "Type", "newAst", "Suspend", "AST", "Option", "pipe", "decamelize", "ParamKeyAnnotationId", "Symbol", "for", "getParamKeyAnnotation", "AST", "getAnnotation", "ParamKeyAnnotation", "value", "self", "annotations", "UrlParser", "constructor", "_schema", "parse", "_url", "url", "URL", "Object", "entries", "fields", "reduce", "params", "key", "type", "searchParams", "get", "decamelize", "isNumberKeyword", "ast", "parseInt", "isBooleanKeyword", "create", "forEach", "undefined", "field", "serializedKey", "pipe", "Option", "getOrElse", "set", "String"]
|
|
7
7
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"inputs":{"packages/common/effect/src/ast.ts":{"bytes":
|
|
1
|
+
{"inputs":{"packages/common/effect/src/ast.ts":{"bytes":39386,"imports":[{"path":"@effect/schema","kind":"import-statement","external":true},{"path":"effect","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"format":"esm"},"packages/common/effect/src/url.ts":{"bytes":7711,"imports":[{"path":"@effect/schema","kind":"import-statement","external":true},{"path":"effect","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"format":"esm"},"packages/common/effect/src/index.ts":{"bytes":1150,"imports":[{"path":"@effect/schema","kind":"import-statement","external":true},{"path":"packages/common/effect/src/ast.ts","kind":"import-statement","original":"./ast"},{"path":"packages/common/effect/src/url.ts","kind":"import-statement","original":"./url"}],"format":"esm"}},"outputs":{"packages/common/effect/dist/lib/node-esm/index.mjs.map":{"imports":[],"exports":[],"inputs":{},"bytes":24570},"packages/common/effect/dist/lib/node-esm/index.mjs":{"imports":[{"path":"@effect/schema","kind":"import-statement","external":true},{"path":"@effect/schema","kind":"import-statement","external":true},{"path":"effect","kind":"import-statement","external":true},{"path":"@dxos/invariant","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true},{"path":"@effect/schema","kind":"import-statement","external":true},{"path":"effect","kind":"import-statement","external":true},{"path":"@dxos/util","kind":"import-statement","external":true}],"exports":["AST","JSONSchema","JsonPath","JsonProp","ParamKeyAnnotation","S","UrlParser","VisitResult","findAnnotation","findNode","findProperty","getAnnotation","getDiscriminatedType","getDiscriminatingProps","getParamKeyAnnotation","getSimpleType","isDiscriminatedUnion","isLiteralUnion","isOption","isSimpleType","mapAst","visit"],"entryPoint":"packages/common/effect/src/index.ts","inputs":{"packages/common/effect/src/index.ts":{"bytesInOutput":72},"packages/common/effect/src/ast.ts":{"bytesInOutput":8194},"packages/common/effect/src/url.ts":{"bytesInOutput":1624}},"bytes":10502}}}
|
package/dist/types/src/ast.d.ts
CHANGED
|
@@ -17,10 +17,6 @@ export type JsonPath = string & {
|
|
|
17
17
|
*/
|
|
18
18
|
export declare const JsonPath: S.Schema<JsonPath>;
|
|
19
19
|
export declare const JsonProp: S.Schema<JsonProp>;
|
|
20
|
-
/**
|
|
21
|
-
* Get annotation or return undefined.
|
|
22
|
-
*/
|
|
23
|
-
export declare const getAnnotation: <T>(annotationId: symbol) => (node: AST.Annotated) => T | undefined;
|
|
24
20
|
export declare enum VisitResult {
|
|
25
21
|
CONTINUE = 0,
|
|
26
22
|
/**
|
|
@@ -33,8 +29,8 @@ export declare enum VisitResult {
|
|
|
33
29
|
EXIT = 2
|
|
34
30
|
}
|
|
35
31
|
export type Path = (string | number)[];
|
|
36
|
-
export type
|
|
37
|
-
export type
|
|
32
|
+
export type TestFn = (node: AST.AST, path: Path, depth: number) => VisitResult | boolean | undefined;
|
|
33
|
+
export type VisitorFn = (node: AST.AST, path: Path, depth: number) => void;
|
|
38
34
|
/**
|
|
39
35
|
* Visit leaf nodes.
|
|
40
36
|
* Refs:
|
|
@@ -42,8 +38,8 @@ export type Visitor = (node: AST.AST, path: Path, depth: number) => void;
|
|
|
42
38
|
* - https://github.com/syntax-tree/unist-util-is?tab=readme-ov-file#test
|
|
43
39
|
*/
|
|
44
40
|
export declare const visit: {
|
|
45
|
-
(node: AST.AST, visitor:
|
|
46
|
-
(node: AST.AST, test:
|
|
41
|
+
(node: AST.AST, visitor: VisitorFn): void;
|
|
42
|
+
(node: AST.AST, test: TestFn, visitor: VisitorFn): void;
|
|
47
43
|
};
|
|
48
44
|
/**
|
|
49
45
|
* Recursively descend into AST to find first node that passes the test.
|
|
@@ -53,13 +49,17 @@ export declare const findNode: (node: AST.AST, test: (node: AST.AST) => boolean)
|
|
|
53
49
|
* Get the AST node for the given property (dot-path).
|
|
54
50
|
*/
|
|
55
51
|
export declare const findProperty: (schema: S.Schema<any>, path: JsonPath | JsonProp) => AST.AST | undefined;
|
|
52
|
+
/**
|
|
53
|
+
* Get annotation or return undefined.
|
|
54
|
+
* @param annotationId
|
|
55
|
+
* @param noDefault If true, then return undefined for effect library defined values.
|
|
56
|
+
*/
|
|
57
|
+
export declare const getAnnotation: <T>(annotationId: symbol, noDefault?: boolean) => (node: AST.AST) => T | undefined;
|
|
56
58
|
/**
|
|
57
59
|
* Recursively descend into AST to find first matching annotations.
|
|
58
60
|
* Optionally skips default annotations for basic types (e.g., 'a string').
|
|
59
61
|
*/
|
|
60
|
-
export declare const findAnnotation: <T>(node: AST.AST, annotationId: symbol,
|
|
61
|
-
noDefault: boolean;
|
|
62
|
-
}) => T | undefined;
|
|
62
|
+
export declare const findAnnotation: <T>(node: AST.AST, annotationId: symbol, noDefault?: boolean) => T | undefined;
|
|
63
63
|
/**
|
|
64
64
|
* Effect S.optional creates a union type with undefined as the second type.
|
|
65
65
|
*/
|
|
@@ -80,4 +80,10 @@ export declare const getDiscriminatingProps: (node: AST.AST) => string[] | undef
|
|
|
80
80
|
* Get the discriminated type for the given value.
|
|
81
81
|
*/
|
|
82
82
|
export declare const getDiscriminatedType: (node: AST.AST, value?: Record<string, any>) => AST.AST | undefined;
|
|
83
|
+
/**
|
|
84
|
+
* Maps AST nodes.
|
|
85
|
+
* The user is responsible for recursively calling {@link mapAst} on the AST.
|
|
86
|
+
* NOTE: Will evaluate suspended ASTs.
|
|
87
|
+
*/
|
|
88
|
+
export declare const mapAst: (ast: AST.AST, f: (ast: AST.AST) => AST.AST) => AST.AST;
|
|
83
89
|
//# sourceMappingURL=ast.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../../src/ast.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,GAAG,EAAE,MAAM,IAAI,CAAC,EAAE,MAAM,gBAAgB,CAAC;AAalD,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,QAAQ,GAAG,QAAQ,GAAG,SAAS,GAAG,MAAM,GAAG,SAAS,CAAC;AAEzF;;GAEG;AACH,eAAO,MAAM,aAAa,SAAU,GAAG,CAAC,GAAG,KAAG,UAAU,GAAG,SAsB1D,CAAC;AAEF,eAAO,MAAM,YAAY,SAAU,GAAG,CAAC,GAAG,KAAG,OAAgC,CAAC;AAM9E,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG;IAAE,UAAU,EAAE,IAAI,CAAC;IAAC,UAAU,EAAE,IAAI,CAAA;CAAE,CAAC;AACvE,MAAM,MAAM,QAAQ,GAAG,MAAM,GAAG;IAAE,UAAU,EAAE,IAAI,CAAA;CAAE,CAAC;AAKrD;;GAEG;AACH,eAAO,MAAM,QAAQ,EAA0D,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AAClG,eAAO,MAAM,QAAQ,EAA0D,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;AAElG
|
|
1
|
+
{"version":3,"file":"ast.d.ts","sourceRoot":"","sources":["../../../src/ast.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"sanity.test.d.ts","sourceRoot":"","sources":["../../../src/sanity.test.ts"],"names":[],"mappings":""}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@dxos/effect",
|
|
3
|
-
"version": "0.7.
|
|
3
|
+
"version": "0.7.2-main.f1adc9f",
|
|
4
4
|
"description": "Effect utils.",
|
|
5
5
|
"homepage": "https://dxos.org",
|
|
6
6
|
"bugs": "https://github.com/dxos/dxos/issues",
|
|
@@ -22,13 +22,14 @@
|
|
|
22
22
|
"src"
|
|
23
23
|
],
|
|
24
24
|
"dependencies": {
|
|
25
|
-
"@dxos/
|
|
26
|
-
"@dxos/
|
|
27
|
-
"@dxos/node-std": "0.7.
|
|
25
|
+
"@dxos/invariant": "0.7.2-main.f1adc9f",
|
|
26
|
+
"@dxos/util": "0.7.2-main.f1adc9f",
|
|
27
|
+
"@dxos/node-std": "0.7.2-main.f1adc9f"
|
|
28
28
|
},
|
|
29
29
|
"devDependencies": {
|
|
30
30
|
"@effect/schema": "^0.75.5",
|
|
31
|
-
"effect": "^3.9.2"
|
|
31
|
+
"effect": "^3.9.2",
|
|
32
|
+
"@dxos/log": "0.7.2-main.f1adc9f"
|
|
32
33
|
},
|
|
33
34
|
"peerDependencies": {
|
|
34
35
|
"@effect/schema": "^0.75.5",
|
package/src/ast.test.ts
CHANGED
|
@@ -114,7 +114,6 @@ describe('AST', () => {
|
|
|
114
114
|
const annotation = findAnnotation(
|
|
115
115
|
S.String.annotations({ [AST.TitleAnnotationId]: 'test' }).ast,
|
|
116
116
|
AST.TitleAnnotationId,
|
|
117
|
-
{ noDefault: true },
|
|
118
117
|
);
|
|
119
118
|
expect(annotation).to.eq('test');
|
|
120
119
|
|
|
@@ -122,8 +121,8 @@ describe('AST', () => {
|
|
|
122
121
|
const schemas = [S.Object, S.String, S.Number, S.Boolean];
|
|
123
122
|
for (const schema of schemas) {
|
|
124
123
|
for (const annotationId of annotationIds) {
|
|
125
|
-
const annotation = findAnnotation(schema.ast, annotationId
|
|
126
|
-
expect(annotation, schema
|
|
124
|
+
const annotation = findAnnotation(schema.ast, annotationId);
|
|
125
|
+
expect(annotation, String(annotationId) + ':' + schema).to.eq(undefined);
|
|
127
126
|
}
|
|
128
127
|
}
|
|
129
128
|
});
|
package/src/ast.ts
CHANGED
|
@@ -62,14 +62,6 @@ const PROP_REGEX = /\w+/;
|
|
|
62
62
|
export const JsonPath = S.NonEmptyString.pipe(S.pattern(PATH_REGEX)) as any as S.Schema<JsonPath>;
|
|
63
63
|
export const JsonProp = S.NonEmptyString.pipe(S.pattern(PROP_REGEX)) as any as S.Schema<JsonProp>;
|
|
64
64
|
|
|
65
|
-
/**
|
|
66
|
-
* Get annotation or return undefined.
|
|
67
|
-
*/
|
|
68
|
-
export const getAnnotation =
|
|
69
|
-
<T>(annotationId: symbol) =>
|
|
70
|
-
(node: AST.Annotated): T | undefined =>
|
|
71
|
-
pipe(AST.getAnnotation<T>(annotationId)(node), Option.getOrUndefined);
|
|
72
|
-
|
|
73
65
|
export enum VisitResult {
|
|
74
66
|
CONTINUE = 0,
|
|
75
67
|
/**
|
|
@@ -84,10 +76,11 @@ export enum VisitResult {
|
|
|
84
76
|
|
|
85
77
|
export type Path = (string | number)[];
|
|
86
78
|
|
|
87
|
-
export type
|
|
88
|
-
|
|
79
|
+
export type TestFn = (node: AST.AST, path: Path, depth: number) => VisitResult | boolean | undefined;
|
|
80
|
+
|
|
81
|
+
export type VisitorFn = (node: AST.AST, path: Path, depth: number) => void;
|
|
89
82
|
|
|
90
|
-
const defaultTest:
|
|
83
|
+
const defaultTest: TestFn = isSimpleType;
|
|
91
84
|
|
|
92
85
|
/**
|
|
93
86
|
* Visit leaf nodes.
|
|
@@ -96,24 +89,33 @@ const defaultTest: Tester = (node) => (isSimpleType(node) ? VisitResult.CONTINUE
|
|
|
96
89
|
* - https://github.com/syntax-tree/unist-util-is?tab=readme-ov-file#test
|
|
97
90
|
*/
|
|
98
91
|
export const visit: {
|
|
99
|
-
(node: AST.AST, visitor:
|
|
100
|
-
(node: AST.AST, test:
|
|
101
|
-
} = (node: AST.AST, testOrVisitor:
|
|
92
|
+
(node: AST.AST, visitor: VisitorFn): void;
|
|
93
|
+
(node: AST.AST, test: TestFn, visitor: VisitorFn): void;
|
|
94
|
+
} = (node: AST.AST, testOrVisitor: TestFn | VisitorFn, visitor?: VisitorFn): void => {
|
|
102
95
|
if (!visitor) {
|
|
103
96
|
visitNode(node, defaultTest, testOrVisitor);
|
|
104
97
|
} else {
|
|
105
|
-
visitNode(node, testOrVisitor as
|
|
98
|
+
visitNode(node, testOrVisitor as TestFn, visitor);
|
|
106
99
|
}
|
|
107
100
|
};
|
|
108
101
|
|
|
109
102
|
const visitNode = (
|
|
110
103
|
node: AST.AST,
|
|
111
|
-
test:
|
|
112
|
-
visitor:
|
|
104
|
+
test: TestFn | undefined,
|
|
105
|
+
visitor: VisitorFn,
|
|
113
106
|
path: Path = [],
|
|
114
107
|
depth = 0,
|
|
115
108
|
): VisitResult | undefined => {
|
|
116
|
-
const
|
|
109
|
+
const _result = test?.(node, path, depth);
|
|
110
|
+
const result: VisitResult =
|
|
111
|
+
_result === undefined
|
|
112
|
+
? VisitResult.CONTINUE
|
|
113
|
+
: typeof _result === 'boolean'
|
|
114
|
+
? _result
|
|
115
|
+
? VisitResult.CONTINUE
|
|
116
|
+
: VisitResult.SKIP
|
|
117
|
+
: _result;
|
|
118
|
+
|
|
117
119
|
if (result === VisitResult.EXIT) {
|
|
118
120
|
return result;
|
|
119
121
|
}
|
|
@@ -244,24 +246,35 @@ const defaultAnnotations: Record<string, AST.Annotated> = {
|
|
|
244
246
|
['BooleanKeyword' as const]: AST.booleanKeyword,
|
|
245
247
|
};
|
|
246
248
|
|
|
249
|
+
/**
|
|
250
|
+
* Get annotation or return undefined.
|
|
251
|
+
* @param annotationId
|
|
252
|
+
* @param noDefault If true, then return undefined for effect library defined values.
|
|
253
|
+
*/
|
|
254
|
+
export const getAnnotation =
|
|
255
|
+
<T>(annotationId: symbol, noDefault = true) =>
|
|
256
|
+
(node: AST.AST): T | undefined => {
|
|
257
|
+
// Title fallback seems to be the identifier.
|
|
258
|
+
const id = pipe(AST.getIdentifierAnnotation(node), Option.getOrUndefined);
|
|
259
|
+
const value = pipe(AST.getAnnotation<T>(annotationId)(node), Option.getOrUndefined);
|
|
260
|
+
if (noDefault && (value === defaultAnnotations[node._tag]?.annotations[annotationId] || value === id)) {
|
|
261
|
+
return undefined;
|
|
262
|
+
}
|
|
263
|
+
|
|
264
|
+
return value;
|
|
265
|
+
};
|
|
266
|
+
|
|
247
267
|
/**
|
|
248
268
|
* Recursively descend into AST to find first matching annotations.
|
|
249
269
|
* Optionally skips default annotations for basic types (e.g., 'a string').
|
|
250
270
|
*/
|
|
251
|
-
|
|
252
|
-
|
|
253
|
-
annotationId
|
|
254
|
-
options?: { noDefault: boolean },
|
|
255
|
-
): T | undefined => {
|
|
256
|
-
const getAnnotationById = getAnnotation(annotationId);
|
|
271
|
+
// TODO(burdon): Convert to effect pattern (i.e., return operator like getAnnotation).
|
|
272
|
+
export const findAnnotation = <T>(node: AST.AST, annotationId: symbol, noDefault = true): T | undefined => {
|
|
273
|
+
const getAnnotationById = getAnnotation(annotationId, noDefault);
|
|
257
274
|
|
|
258
275
|
const getBaseAnnotation = (node: AST.AST): T | undefined => {
|
|
259
276
|
const value = getAnnotationById(node);
|
|
260
277
|
if (value !== undefined) {
|
|
261
|
-
if (options?.noDefault && value === defaultAnnotations[node._tag]?.annotations[annotationId]) {
|
|
262
|
-
return undefined;
|
|
263
|
-
}
|
|
264
|
-
|
|
265
278
|
return value as T;
|
|
266
279
|
}
|
|
267
280
|
|
|
@@ -368,3 +381,37 @@ export const getDiscriminatedType = (node: AST.AST, value: Record<string, any> =
|
|
|
368
381
|
const schema = S.Struct(fields);
|
|
369
382
|
return schema.ast;
|
|
370
383
|
};
|
|
384
|
+
|
|
385
|
+
/**
|
|
386
|
+
* Maps AST nodes.
|
|
387
|
+
* The user is responsible for recursively calling {@link mapAst} on the AST.
|
|
388
|
+
* NOTE: Will evaluate suspended ASTs.
|
|
389
|
+
*/
|
|
390
|
+
export const mapAst = (ast: AST.AST, f: (ast: AST.AST) => AST.AST): AST.AST => {
|
|
391
|
+
switch (ast._tag) {
|
|
392
|
+
case 'TypeLiteral':
|
|
393
|
+
return new AST.TypeLiteral(
|
|
394
|
+
ast.propertySignatures.map(
|
|
395
|
+
(prop) =>
|
|
396
|
+
new AST.PropertySignature(prop.name, f(prop.type), prop.isOptional, prop.isReadonly, prop.annotations),
|
|
397
|
+
),
|
|
398
|
+
ast.indexSignatures,
|
|
399
|
+
);
|
|
400
|
+
case 'Union':
|
|
401
|
+
return AST.Union.make(ast.types.map(f), ast.annotations);
|
|
402
|
+
case 'TupleType':
|
|
403
|
+
return new AST.TupleType(
|
|
404
|
+
ast.elements.map((t) => new AST.OptionalType(f(t.type), t.isOptional, t.annotations)),
|
|
405
|
+
ast.rest.map((t) => new AST.Type(f(t.type), t.annotations)),
|
|
406
|
+
ast.isReadonly,
|
|
407
|
+
ast.annotations,
|
|
408
|
+
);
|
|
409
|
+
case 'Suspend': {
|
|
410
|
+
const newAst = f(ast.f());
|
|
411
|
+
return new AST.Suspend(() => newAst, ast.annotations);
|
|
412
|
+
}
|
|
413
|
+
default:
|
|
414
|
+
// TODO(dmaretskyi): Support more nodes.
|
|
415
|
+
return ast;
|
|
416
|
+
}
|
|
417
|
+
};
|