Add explicit CRDT edit contracts and structured query values
This commit is contained in:
Timothy J. Aveni
@@ -28,6 +28,8 @@ export const generateClientContracts = (
|
||||
return qualified
|
||||
? `CapabilityReference<${JSON.stringify(value.expectation.kind === "atom" ? `atom:${value.expectation.atomId}` : `interface:${value.expectation.interfaceRevisionId}`)}>`
|
||||
: `{readonly $quixosRef: string}`;
|
||||
case "change":
|
||||
throw new Error("CRDT change values require the prepared-change codec and runtime (LF-19)");
|
||||
case "optional":
|
||||
return `(${type(value.value)} | null)`;
|
||||
case "list":
|
||||
|
||||
@@ -60,6 +60,8 @@ export const genericImplementationType = (
|
||||
return `QxObjectRef<${target(type.expectation, scope)}>`;
|
||||
case "record":
|
||||
return object(Object.entries(type.fields).map(([name, field]) => [name, value(field, scope, depth + 1)]));
|
||||
case "change":
|
||||
throw new Error("CRDT change values require the prepared-change codec and runtime (LF-19)");
|
||||
case "optional":
|
||||
return `(${value(type.value, scope, depth + 1)} | null)`;
|
||||
case "list":
|
||||
|
||||
@@ -122,6 +122,8 @@ export const generateTypeScriptBindings = (
|
||||
}[value.name];
|
||||
case "object-ref":
|
||||
return `QxObjectRef<${q(value.expectation.kind === "atom" ? `atom:${value.expectation.atomId}` : `interface:${value.expectation.interfaceRevisionId}`)}>`;
|
||||
case "change":
|
||||
throw new Error("CRDT change values require the prepared-change codec and runtime (LF-19)");
|
||||
case "optional":
|
||||
return `(${type(value.value)} | null)`;
|
||||
case "list":
|
||||
|
||||
@@ -30,6 +30,8 @@ export function generateReactBindings(
|
||||
uint32: "number",
|
||||
double: "number",
|
||||
}[value.name];
|
||||
case "change":
|
||||
throw new Error("CRDT change values require the prepared-change codec and runtime (LF-19)");
|
||||
case "optional":
|
||||
return `(${type(value.value)} | null)`;
|
||||
case "list":
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1,283 +1,285 @@
|
||||
CREATION=1
|
||||
INITIALIZE=2
|
||||
WORKSPACE=3
|
||||
EXECUTION=4
|
||||
SNAPSHOT=5
|
||||
TRANSACTION=6
|
||||
REMOTE=7
|
||||
TARGETS=8
|
||||
PORTABLE=9
|
||||
REPLICA=10
|
||||
LOCAL=11
|
||||
FROM=12
|
||||
RESULT_BYTES=13
|
||||
RPC_CALLS=14
|
||||
DEADLINE_MS=15
|
||||
QUERY=16
|
||||
REFLECTION=17
|
||||
SPECIALIZE=18
|
||||
ROOT=19
|
||||
DOCUMENT=20
|
||||
FRAGMENTS=21
|
||||
VIEW=22
|
||||
MAX=23
|
||||
ALLOW=24
|
||||
POLL=25
|
||||
QUERYABLE=26
|
||||
RPC=27
|
||||
QUERY_REASON=28
|
||||
TYPE=29
|
||||
OBJECT=30
|
||||
STORABLE=31
|
||||
IMPLEMENTS=32
|
||||
REF=33
|
||||
FRAGMENT=34
|
||||
IMPORT=35
|
||||
EXTERNAL=36
|
||||
ATOM=37
|
||||
INTERFACE=38
|
||||
INTERFACES=39
|
||||
PACKAGE=40
|
||||
VALUE=41
|
||||
RELATION=42
|
||||
OPERATION=43
|
||||
FUNCTION=44
|
||||
CONSTRUCTOR=45
|
||||
CONSTRUCTS=46
|
||||
INPUT=47
|
||||
CONFORM=48
|
||||
AS=49
|
||||
BIND=50
|
||||
STATIC=51
|
||||
TO=52
|
||||
PRIVATE=53
|
||||
SHARED=54
|
||||
STATE=55
|
||||
EDGE=56
|
||||
PROJECTION=57
|
||||
WITH=58
|
||||
USING=59
|
||||
VIA=60
|
||||
MATERIALIZE=61
|
||||
IF=62
|
||||
ABSENT=63
|
||||
ON=64
|
||||
POLICY=65
|
||||
DEFAULT=66
|
||||
SOURCE=67
|
||||
REPOSITORY=68
|
||||
COMMIT=69
|
||||
REVISION=70
|
||||
SEMANTIC_MAJOR=71
|
||||
ON_DELETE=72
|
||||
RETAIN_OTHER=73
|
||||
KEYED=74
|
||||
PUBLIC_TRAVERSAL=75
|
||||
ID=76
|
||||
DOC=77
|
||||
MODE=78
|
||||
EMITS=79
|
||||
RECEIVER=80
|
||||
REQUIRES=81
|
||||
ANY=82
|
||||
GET=83
|
||||
SET=84
|
||||
WATCH=85
|
||||
START=86
|
||||
STOP=87
|
||||
READ=88
|
||||
WRITE=89
|
||||
RESOLVE=90
|
||||
CONNECT=91
|
||||
DISCONNECT=92
|
||||
CALL=93
|
||||
WATCH_START=94
|
||||
WATCH_STOP=95
|
||||
SUBSCRIBE=96
|
||||
UNSUBSCRIBE=97
|
||||
REGISTER=98
|
||||
CRDT=99
|
||||
OPTIONAL_ONE=100
|
||||
EXACTLY_ONE=101
|
||||
MANY_UNIQUE=102
|
||||
MANY=103
|
||||
ORDERED=104
|
||||
UNIT=105
|
||||
WATCH_HANDLE=106
|
||||
MESSAGE=107
|
||||
ATOM_REF=108
|
||||
INTERFACE_REF=109
|
||||
OPTIONAL=110
|
||||
LIST=111
|
||||
RECORD=112
|
||||
BOOL=113
|
||||
BYTES=114
|
||||
DOUBLE=115
|
||||
INT32=116
|
||||
INT64=117
|
||||
STRING=118
|
||||
UINT32=119
|
||||
UINT64=120
|
||||
TRUE=121
|
||||
FALSE=122
|
||||
NULL=123
|
||||
ARROW=124
|
||||
COLON=125
|
||||
SEMI=126
|
||||
COMMA=127
|
||||
DOT=128
|
||||
LBRACE=129
|
||||
RBRACE=130
|
||||
LBRACK=131
|
||||
RBRACK=132
|
||||
LPAREN=133
|
||||
RPAREN=134
|
||||
LT=135
|
||||
GT=136
|
||||
AMP=137
|
||||
EQUAL=138
|
||||
INTEGER=139
|
||||
JSON_NUMBER=140
|
||||
IDENTIFIER=141
|
||||
STRING_LITERAL=142
|
||||
LINE_COMMENT=143
|
||||
BLOCK_COMMENT=144
|
||||
WS=145
|
||||
'creation'=1
|
||||
'initialize'=2
|
||||
'workspace'=3
|
||||
'execution'=4
|
||||
'snapshot'=5
|
||||
'transaction'=6
|
||||
'remote'=7
|
||||
'targets'=8
|
||||
'portable'=9
|
||||
'replica'=10
|
||||
'local'=11
|
||||
'from'=12
|
||||
'result-bytes'=13
|
||||
'rpc-calls'=14
|
||||
'deadline-ms'=15
|
||||
'query'=16
|
||||
'reflection'=17
|
||||
'specialize'=18
|
||||
'root'=19
|
||||
'document'=20
|
||||
'fragments'=21
|
||||
'view'=22
|
||||
'max'=23
|
||||
'allow'=24
|
||||
'poll'=25
|
||||
'queryable'=26
|
||||
'rpc'=27
|
||||
'query-reason'=28
|
||||
'type'=29
|
||||
'object'=30
|
||||
'storable'=31
|
||||
'implements'=32
|
||||
'ref'=33
|
||||
'fragment'=34
|
||||
'import'=35
|
||||
'external'=36
|
||||
'atom'=37
|
||||
'interface'=38
|
||||
'interfaces'=39
|
||||
'package'=40
|
||||
'value'=41
|
||||
'relation'=42
|
||||
'operation'=43
|
||||
'function'=44
|
||||
'constructor'=45
|
||||
'constructs'=46
|
||||
'input'=47
|
||||
'conform'=48
|
||||
'as'=49
|
||||
'bind'=50
|
||||
'static'=51
|
||||
'to'=52
|
||||
'private'=53
|
||||
'shared'=54
|
||||
'state'=55
|
||||
'edge'=56
|
||||
'projection'=57
|
||||
'with'=58
|
||||
'using'=59
|
||||
'via'=60
|
||||
'materialize'=61
|
||||
'if'=62
|
||||
'absent'=63
|
||||
'on'=64
|
||||
'policy'=65
|
||||
'default'=66
|
||||
'source'=67
|
||||
'repository'=68
|
||||
'commit'=69
|
||||
'revision'=70
|
||||
'semantic-major'=71
|
||||
'on-delete'=72
|
||||
'retain-other'=73
|
||||
'keyed'=74
|
||||
'public-traversal'=75
|
||||
'id'=76
|
||||
'doc'=77
|
||||
'mode'=78
|
||||
'emits'=79
|
||||
'receiver'=80
|
||||
'requires'=81
|
||||
'any'=82
|
||||
'get'=83
|
||||
'set'=84
|
||||
'watch'=85
|
||||
'start'=86
|
||||
'stop'=87
|
||||
'read'=88
|
||||
'write'=89
|
||||
'resolve'=90
|
||||
'connect'=91
|
||||
'disconnect'=92
|
||||
'call'=93
|
||||
'watch-start'=94
|
||||
'watch-stop'=95
|
||||
'subscribe'=96
|
||||
'unsubscribe'=97
|
||||
'register'=98
|
||||
'crdt'=99
|
||||
'optional-one'=100
|
||||
'exactly-one'=101
|
||||
'many-unique'=102
|
||||
'many'=103
|
||||
'ordered'=104
|
||||
'unit'=105
|
||||
'watch-handle'=106
|
||||
'message'=107
|
||||
'atom-ref'=108
|
||||
'interface-ref'=109
|
||||
'optional'=110
|
||||
'list'=111
|
||||
'record'=112
|
||||
'bool'=113
|
||||
'bytes'=114
|
||||
'double'=115
|
||||
'int32'=116
|
||||
'int64'=117
|
||||
'string'=118
|
||||
'uint32'=119
|
||||
'uint64'=120
|
||||
'true'=121
|
||||
'false'=122
|
||||
'null'=123
|
||||
'->'=124
|
||||
':'=125
|
||||
';'=126
|
||||
','=127
|
||||
'.'=128
|
||||
'{'=129
|
||||
'}'=130
|
||||
'['=131
|
||||
']'=132
|
||||
'('=133
|
||||
')'=134
|
||||
'<'=135
|
||||
'>'=136
|
||||
'&'=137
|
||||
'='=138
|
||||
EDIT=1
|
||||
CREATION=2
|
||||
INITIALIZE=3
|
||||
WORKSPACE=4
|
||||
EXECUTION=5
|
||||
SNAPSHOT=6
|
||||
TRANSACTION=7
|
||||
REMOTE=8
|
||||
TARGETS=9
|
||||
PORTABLE=10
|
||||
REPLICA=11
|
||||
LOCAL=12
|
||||
FROM=13
|
||||
RESULT_BYTES=14
|
||||
RPC_CALLS=15
|
||||
DEADLINE_MS=16
|
||||
QUERY=17
|
||||
REFLECTION=18
|
||||
SPECIALIZE=19
|
||||
ROOT=20
|
||||
DOCUMENT=21
|
||||
FRAGMENTS=22
|
||||
VIEW=23
|
||||
MAX=24
|
||||
ALLOW=25
|
||||
POLL=26
|
||||
QUERYABLE=27
|
||||
RPC=28
|
||||
QUERY_REASON=29
|
||||
TYPE=30
|
||||
OBJECT=31
|
||||
STORABLE=32
|
||||
IMPLEMENTS=33
|
||||
REF=34
|
||||
FRAGMENT=35
|
||||
IMPORT=36
|
||||
EXTERNAL=37
|
||||
ATOM=38
|
||||
INTERFACE=39
|
||||
INTERFACES=40
|
||||
PACKAGE=41
|
||||
VALUE=42
|
||||
RELATION=43
|
||||
OPERATION=44
|
||||
FUNCTION=45
|
||||
CONSTRUCTOR=46
|
||||
CONSTRUCTS=47
|
||||
INPUT=48
|
||||
CONFORM=49
|
||||
AS=50
|
||||
BIND=51
|
||||
STATIC=52
|
||||
TO=53
|
||||
PRIVATE=54
|
||||
SHARED=55
|
||||
STATE=56
|
||||
EDGE=57
|
||||
PROJECTION=58
|
||||
WITH=59
|
||||
USING=60
|
||||
VIA=61
|
||||
MATERIALIZE=62
|
||||
IF=63
|
||||
ABSENT=64
|
||||
ON=65
|
||||
POLICY=66
|
||||
DEFAULT=67
|
||||
SOURCE=68
|
||||
REPOSITORY=69
|
||||
COMMIT=70
|
||||
REVISION=71
|
||||
SEMANTIC_MAJOR=72
|
||||
ON_DELETE=73
|
||||
RETAIN_OTHER=74
|
||||
KEYED=75
|
||||
PUBLIC_TRAVERSAL=76
|
||||
ID=77
|
||||
DOC=78
|
||||
MODE=79
|
||||
EMITS=80
|
||||
RECEIVER=81
|
||||
REQUIRES=82
|
||||
ANY=83
|
||||
GET=84
|
||||
SET=85
|
||||
WATCH=86
|
||||
START=87
|
||||
STOP=88
|
||||
READ=89
|
||||
WRITE=90
|
||||
RESOLVE=91
|
||||
CONNECT=92
|
||||
DISCONNECT=93
|
||||
CALL=94
|
||||
WATCH_START=95
|
||||
WATCH_STOP=96
|
||||
SUBSCRIBE=97
|
||||
UNSUBSCRIBE=98
|
||||
REGISTER=99
|
||||
CRDT=100
|
||||
OPTIONAL_ONE=101
|
||||
EXACTLY_ONE=102
|
||||
MANY_UNIQUE=103
|
||||
MANY=104
|
||||
ORDERED=105
|
||||
UNIT=106
|
||||
WATCH_HANDLE=107
|
||||
MESSAGE=108
|
||||
ATOM_REF=109
|
||||
INTERFACE_REF=110
|
||||
OPTIONAL=111
|
||||
LIST=112
|
||||
RECORD=113
|
||||
BOOL=114
|
||||
BYTES=115
|
||||
DOUBLE=116
|
||||
INT32=117
|
||||
INT64=118
|
||||
STRING=119
|
||||
UINT32=120
|
||||
UINT64=121
|
||||
TRUE=122
|
||||
FALSE=123
|
||||
NULL=124
|
||||
ARROW=125
|
||||
COLON=126
|
||||
SEMI=127
|
||||
COMMA=128
|
||||
DOT=129
|
||||
LBRACE=130
|
||||
RBRACE=131
|
||||
LBRACK=132
|
||||
RBRACK=133
|
||||
LPAREN=134
|
||||
RPAREN=135
|
||||
LT=136
|
||||
GT=137
|
||||
AMP=138
|
||||
EQUAL=139
|
||||
INTEGER=140
|
||||
JSON_NUMBER=141
|
||||
IDENTIFIER=142
|
||||
STRING_LITERAL=143
|
||||
LINE_COMMENT=144
|
||||
BLOCK_COMMENT=145
|
||||
WS=146
|
||||
'edit'=1
|
||||
'creation'=2
|
||||
'initialize'=3
|
||||
'workspace'=4
|
||||
'execution'=5
|
||||
'snapshot'=6
|
||||
'transaction'=7
|
||||
'remote'=8
|
||||
'targets'=9
|
||||
'portable'=10
|
||||
'replica'=11
|
||||
'local'=12
|
||||
'from'=13
|
||||
'result-bytes'=14
|
||||
'rpc-calls'=15
|
||||
'deadline-ms'=16
|
||||
'query'=17
|
||||
'reflection'=18
|
||||
'specialize'=19
|
||||
'root'=20
|
||||
'document'=21
|
||||
'fragments'=22
|
||||
'view'=23
|
||||
'max'=24
|
||||
'allow'=25
|
||||
'poll'=26
|
||||
'queryable'=27
|
||||
'rpc'=28
|
||||
'query-reason'=29
|
||||
'type'=30
|
||||
'object'=31
|
||||
'storable'=32
|
||||
'implements'=33
|
||||
'ref'=34
|
||||
'fragment'=35
|
||||
'import'=36
|
||||
'external'=37
|
||||
'atom'=38
|
||||
'interface'=39
|
||||
'interfaces'=40
|
||||
'package'=41
|
||||
'value'=42
|
||||
'relation'=43
|
||||
'operation'=44
|
||||
'function'=45
|
||||
'constructor'=46
|
||||
'constructs'=47
|
||||
'input'=48
|
||||
'conform'=49
|
||||
'as'=50
|
||||
'bind'=51
|
||||
'static'=52
|
||||
'to'=53
|
||||
'private'=54
|
||||
'shared'=55
|
||||
'state'=56
|
||||
'edge'=57
|
||||
'projection'=58
|
||||
'with'=59
|
||||
'using'=60
|
||||
'via'=61
|
||||
'materialize'=62
|
||||
'if'=63
|
||||
'absent'=64
|
||||
'on'=65
|
||||
'policy'=66
|
||||
'default'=67
|
||||
'source'=68
|
||||
'repository'=69
|
||||
'commit'=70
|
||||
'revision'=71
|
||||
'semantic-major'=72
|
||||
'on-delete'=73
|
||||
'retain-other'=74
|
||||
'keyed'=75
|
||||
'public-traversal'=76
|
||||
'id'=77
|
||||
'doc'=78
|
||||
'mode'=79
|
||||
'emits'=80
|
||||
'receiver'=81
|
||||
'requires'=82
|
||||
'any'=83
|
||||
'get'=84
|
||||
'set'=85
|
||||
'watch'=86
|
||||
'start'=87
|
||||
'stop'=88
|
||||
'read'=89
|
||||
'write'=90
|
||||
'resolve'=91
|
||||
'connect'=92
|
||||
'disconnect'=93
|
||||
'call'=94
|
||||
'watch-start'=95
|
||||
'watch-stop'=96
|
||||
'subscribe'=97
|
||||
'unsubscribe'=98
|
||||
'register'=99
|
||||
'crdt'=100
|
||||
'optional-one'=101
|
||||
'exactly-one'=102
|
||||
'many-unique'=103
|
||||
'many'=104
|
||||
'ordered'=105
|
||||
'unit'=106
|
||||
'watch-handle'=107
|
||||
'message'=108
|
||||
'atom-ref'=109
|
||||
'interface-ref'=110
|
||||
'optional'=111
|
||||
'list'=112
|
||||
'record'=113
|
||||
'bool'=114
|
||||
'bytes'=115
|
||||
'double'=116
|
||||
'int32'=117
|
||||
'int64'=118
|
||||
'string'=119
|
||||
'uint32'=120
|
||||
'uint64'=121
|
||||
'true'=122
|
||||
'false'=123
|
||||
'null'=124
|
||||
'->'=125
|
||||
':'=126
|
||||
';'=127
|
||||
','=128
|
||||
'.'=129
|
||||
'{'=130
|
||||
'}'=131
|
||||
'['=132
|
||||
']'=133
|
||||
'('=134
|
||||
')'=135
|
||||
'<'=136
|
||||
'>'=137
|
||||
'&'=138
|
||||
'='=139
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -1,283 +1,285 @@
|
||||
CREATION=1
|
||||
INITIALIZE=2
|
||||
WORKSPACE=3
|
||||
EXECUTION=4
|
||||
SNAPSHOT=5
|
||||
TRANSACTION=6
|
||||
REMOTE=7
|
||||
TARGETS=8
|
||||
PORTABLE=9
|
||||
REPLICA=10
|
||||
LOCAL=11
|
||||
FROM=12
|
||||
RESULT_BYTES=13
|
||||
RPC_CALLS=14
|
||||
DEADLINE_MS=15
|
||||
QUERY=16
|
||||
REFLECTION=17
|
||||
SPECIALIZE=18
|
||||
ROOT=19
|
||||
DOCUMENT=20
|
||||
FRAGMENTS=21
|
||||
VIEW=22
|
||||
MAX=23
|
||||
ALLOW=24
|
||||
POLL=25
|
||||
QUERYABLE=26
|
||||
RPC=27
|
||||
QUERY_REASON=28
|
||||
TYPE=29
|
||||
OBJECT=30
|
||||
STORABLE=31
|
||||
IMPLEMENTS=32
|
||||
REF=33
|
||||
FRAGMENT=34
|
||||
IMPORT=35
|
||||
EXTERNAL=36
|
||||
ATOM=37
|
||||
INTERFACE=38
|
||||
INTERFACES=39
|
||||
PACKAGE=40
|
||||
VALUE=41
|
||||
RELATION=42
|
||||
OPERATION=43
|
||||
FUNCTION=44
|
||||
CONSTRUCTOR=45
|
||||
CONSTRUCTS=46
|
||||
INPUT=47
|
||||
CONFORM=48
|
||||
AS=49
|
||||
BIND=50
|
||||
STATIC=51
|
||||
TO=52
|
||||
PRIVATE=53
|
||||
SHARED=54
|
||||
STATE=55
|
||||
EDGE=56
|
||||
PROJECTION=57
|
||||
WITH=58
|
||||
USING=59
|
||||
VIA=60
|
||||
MATERIALIZE=61
|
||||
IF=62
|
||||
ABSENT=63
|
||||
ON=64
|
||||
POLICY=65
|
||||
DEFAULT=66
|
||||
SOURCE=67
|
||||
REPOSITORY=68
|
||||
COMMIT=69
|
||||
REVISION=70
|
||||
SEMANTIC_MAJOR=71
|
||||
ON_DELETE=72
|
||||
RETAIN_OTHER=73
|
||||
KEYED=74
|
||||
PUBLIC_TRAVERSAL=75
|
||||
ID=76
|
||||
DOC=77
|
||||
MODE=78
|
||||
EMITS=79
|
||||
RECEIVER=80
|
||||
REQUIRES=81
|
||||
ANY=82
|
||||
GET=83
|
||||
SET=84
|
||||
WATCH=85
|
||||
START=86
|
||||
STOP=87
|
||||
READ=88
|
||||
WRITE=89
|
||||
RESOLVE=90
|
||||
CONNECT=91
|
||||
DISCONNECT=92
|
||||
CALL=93
|
||||
WATCH_START=94
|
||||
WATCH_STOP=95
|
||||
SUBSCRIBE=96
|
||||
UNSUBSCRIBE=97
|
||||
REGISTER=98
|
||||
CRDT=99
|
||||
OPTIONAL_ONE=100
|
||||
EXACTLY_ONE=101
|
||||
MANY_UNIQUE=102
|
||||
MANY=103
|
||||
ORDERED=104
|
||||
UNIT=105
|
||||
WATCH_HANDLE=106
|
||||
MESSAGE=107
|
||||
ATOM_REF=108
|
||||
INTERFACE_REF=109
|
||||
OPTIONAL=110
|
||||
LIST=111
|
||||
RECORD=112
|
||||
BOOL=113
|
||||
BYTES=114
|
||||
DOUBLE=115
|
||||
INT32=116
|
||||
INT64=117
|
||||
STRING=118
|
||||
UINT32=119
|
||||
UINT64=120
|
||||
TRUE=121
|
||||
FALSE=122
|
||||
NULL=123
|
||||
ARROW=124
|
||||
COLON=125
|
||||
SEMI=126
|
||||
COMMA=127
|
||||
DOT=128
|
||||
LBRACE=129
|
||||
RBRACE=130
|
||||
LBRACK=131
|
||||
RBRACK=132
|
||||
LPAREN=133
|
||||
RPAREN=134
|
||||
LT=135
|
||||
GT=136
|
||||
AMP=137
|
||||
EQUAL=138
|
||||
INTEGER=139
|
||||
JSON_NUMBER=140
|
||||
IDENTIFIER=141
|
||||
STRING_LITERAL=142
|
||||
LINE_COMMENT=143
|
||||
BLOCK_COMMENT=144
|
||||
WS=145
|
||||
'creation'=1
|
||||
'initialize'=2
|
||||
'workspace'=3
|
||||
'execution'=4
|
||||
'snapshot'=5
|
||||
'transaction'=6
|
||||
'remote'=7
|
||||
'targets'=8
|
||||
'portable'=9
|
||||
'replica'=10
|
||||
'local'=11
|
||||
'from'=12
|
||||
'result-bytes'=13
|
||||
'rpc-calls'=14
|
||||
'deadline-ms'=15
|
||||
'query'=16
|
||||
'reflection'=17
|
||||
'specialize'=18
|
||||
'root'=19
|
||||
'document'=20
|
||||
'fragments'=21
|
||||
'view'=22
|
||||
'max'=23
|
||||
'allow'=24
|
||||
'poll'=25
|
||||
'queryable'=26
|
||||
'rpc'=27
|
||||
'query-reason'=28
|
||||
'type'=29
|
||||
'object'=30
|
||||
'storable'=31
|
||||
'implements'=32
|
||||
'ref'=33
|
||||
'fragment'=34
|
||||
'import'=35
|
||||
'external'=36
|
||||
'atom'=37
|
||||
'interface'=38
|
||||
'interfaces'=39
|
||||
'package'=40
|
||||
'value'=41
|
||||
'relation'=42
|
||||
'operation'=43
|
||||
'function'=44
|
||||
'constructor'=45
|
||||
'constructs'=46
|
||||
'input'=47
|
||||
'conform'=48
|
||||
'as'=49
|
||||
'bind'=50
|
||||
'static'=51
|
||||
'to'=52
|
||||
'private'=53
|
||||
'shared'=54
|
||||
'state'=55
|
||||
'edge'=56
|
||||
'projection'=57
|
||||
'with'=58
|
||||
'using'=59
|
||||
'via'=60
|
||||
'materialize'=61
|
||||
'if'=62
|
||||
'absent'=63
|
||||
'on'=64
|
||||
'policy'=65
|
||||
'default'=66
|
||||
'source'=67
|
||||
'repository'=68
|
||||
'commit'=69
|
||||
'revision'=70
|
||||
'semantic-major'=71
|
||||
'on-delete'=72
|
||||
'retain-other'=73
|
||||
'keyed'=74
|
||||
'public-traversal'=75
|
||||
'id'=76
|
||||
'doc'=77
|
||||
'mode'=78
|
||||
'emits'=79
|
||||
'receiver'=80
|
||||
'requires'=81
|
||||
'any'=82
|
||||
'get'=83
|
||||
'set'=84
|
||||
'watch'=85
|
||||
'start'=86
|
||||
'stop'=87
|
||||
'read'=88
|
||||
'write'=89
|
||||
'resolve'=90
|
||||
'connect'=91
|
||||
'disconnect'=92
|
||||
'call'=93
|
||||
'watch-start'=94
|
||||
'watch-stop'=95
|
||||
'subscribe'=96
|
||||
'unsubscribe'=97
|
||||
'register'=98
|
||||
'crdt'=99
|
||||
'optional-one'=100
|
||||
'exactly-one'=101
|
||||
'many-unique'=102
|
||||
'many'=103
|
||||
'ordered'=104
|
||||
'unit'=105
|
||||
'watch-handle'=106
|
||||
'message'=107
|
||||
'atom-ref'=108
|
||||
'interface-ref'=109
|
||||
'optional'=110
|
||||
'list'=111
|
||||
'record'=112
|
||||
'bool'=113
|
||||
'bytes'=114
|
||||
'double'=115
|
||||
'int32'=116
|
||||
'int64'=117
|
||||
'string'=118
|
||||
'uint32'=119
|
||||
'uint64'=120
|
||||
'true'=121
|
||||
'false'=122
|
||||
'null'=123
|
||||
'->'=124
|
||||
':'=125
|
||||
';'=126
|
||||
','=127
|
||||
'.'=128
|
||||
'{'=129
|
||||
'}'=130
|
||||
'['=131
|
||||
']'=132
|
||||
'('=133
|
||||
')'=134
|
||||
'<'=135
|
||||
'>'=136
|
||||
'&'=137
|
||||
'='=138
|
||||
EDIT=1
|
||||
CREATION=2
|
||||
INITIALIZE=3
|
||||
WORKSPACE=4
|
||||
EXECUTION=5
|
||||
SNAPSHOT=6
|
||||
TRANSACTION=7
|
||||
REMOTE=8
|
||||
TARGETS=9
|
||||
PORTABLE=10
|
||||
REPLICA=11
|
||||
LOCAL=12
|
||||
FROM=13
|
||||
RESULT_BYTES=14
|
||||
RPC_CALLS=15
|
||||
DEADLINE_MS=16
|
||||
QUERY=17
|
||||
REFLECTION=18
|
||||
SPECIALIZE=19
|
||||
ROOT=20
|
||||
DOCUMENT=21
|
||||
FRAGMENTS=22
|
||||
VIEW=23
|
||||
MAX=24
|
||||
ALLOW=25
|
||||
POLL=26
|
||||
QUERYABLE=27
|
||||
RPC=28
|
||||
QUERY_REASON=29
|
||||
TYPE=30
|
||||
OBJECT=31
|
||||
STORABLE=32
|
||||
IMPLEMENTS=33
|
||||
REF=34
|
||||
FRAGMENT=35
|
||||
IMPORT=36
|
||||
EXTERNAL=37
|
||||
ATOM=38
|
||||
INTERFACE=39
|
||||
INTERFACES=40
|
||||
PACKAGE=41
|
||||
VALUE=42
|
||||
RELATION=43
|
||||
OPERATION=44
|
||||
FUNCTION=45
|
||||
CONSTRUCTOR=46
|
||||
CONSTRUCTS=47
|
||||
INPUT=48
|
||||
CONFORM=49
|
||||
AS=50
|
||||
BIND=51
|
||||
STATIC=52
|
||||
TO=53
|
||||
PRIVATE=54
|
||||
SHARED=55
|
||||
STATE=56
|
||||
EDGE=57
|
||||
PROJECTION=58
|
||||
WITH=59
|
||||
USING=60
|
||||
VIA=61
|
||||
MATERIALIZE=62
|
||||
IF=63
|
||||
ABSENT=64
|
||||
ON=65
|
||||
POLICY=66
|
||||
DEFAULT=67
|
||||
SOURCE=68
|
||||
REPOSITORY=69
|
||||
COMMIT=70
|
||||
REVISION=71
|
||||
SEMANTIC_MAJOR=72
|
||||
ON_DELETE=73
|
||||
RETAIN_OTHER=74
|
||||
KEYED=75
|
||||
PUBLIC_TRAVERSAL=76
|
||||
ID=77
|
||||
DOC=78
|
||||
MODE=79
|
||||
EMITS=80
|
||||
RECEIVER=81
|
||||
REQUIRES=82
|
||||
ANY=83
|
||||
GET=84
|
||||
SET=85
|
||||
WATCH=86
|
||||
START=87
|
||||
STOP=88
|
||||
READ=89
|
||||
WRITE=90
|
||||
RESOLVE=91
|
||||
CONNECT=92
|
||||
DISCONNECT=93
|
||||
CALL=94
|
||||
WATCH_START=95
|
||||
WATCH_STOP=96
|
||||
SUBSCRIBE=97
|
||||
UNSUBSCRIBE=98
|
||||
REGISTER=99
|
||||
CRDT=100
|
||||
OPTIONAL_ONE=101
|
||||
EXACTLY_ONE=102
|
||||
MANY_UNIQUE=103
|
||||
MANY=104
|
||||
ORDERED=105
|
||||
UNIT=106
|
||||
WATCH_HANDLE=107
|
||||
MESSAGE=108
|
||||
ATOM_REF=109
|
||||
INTERFACE_REF=110
|
||||
OPTIONAL=111
|
||||
LIST=112
|
||||
RECORD=113
|
||||
BOOL=114
|
||||
BYTES=115
|
||||
DOUBLE=116
|
||||
INT32=117
|
||||
INT64=118
|
||||
STRING=119
|
||||
UINT32=120
|
||||
UINT64=121
|
||||
TRUE=122
|
||||
FALSE=123
|
||||
NULL=124
|
||||
ARROW=125
|
||||
COLON=126
|
||||
SEMI=127
|
||||
COMMA=128
|
||||
DOT=129
|
||||
LBRACE=130
|
||||
RBRACE=131
|
||||
LBRACK=132
|
||||
RBRACK=133
|
||||
LPAREN=134
|
||||
RPAREN=135
|
||||
LT=136
|
||||
GT=137
|
||||
AMP=138
|
||||
EQUAL=139
|
||||
INTEGER=140
|
||||
JSON_NUMBER=141
|
||||
IDENTIFIER=142
|
||||
STRING_LITERAL=143
|
||||
LINE_COMMENT=144
|
||||
BLOCK_COMMENT=145
|
||||
WS=146
|
||||
'edit'=1
|
||||
'creation'=2
|
||||
'initialize'=3
|
||||
'workspace'=4
|
||||
'execution'=5
|
||||
'snapshot'=6
|
||||
'transaction'=7
|
||||
'remote'=8
|
||||
'targets'=9
|
||||
'portable'=10
|
||||
'replica'=11
|
||||
'local'=12
|
||||
'from'=13
|
||||
'result-bytes'=14
|
||||
'rpc-calls'=15
|
||||
'deadline-ms'=16
|
||||
'query'=17
|
||||
'reflection'=18
|
||||
'specialize'=19
|
||||
'root'=20
|
||||
'document'=21
|
||||
'fragments'=22
|
||||
'view'=23
|
||||
'max'=24
|
||||
'allow'=25
|
||||
'poll'=26
|
||||
'queryable'=27
|
||||
'rpc'=28
|
||||
'query-reason'=29
|
||||
'type'=30
|
||||
'object'=31
|
||||
'storable'=32
|
||||
'implements'=33
|
||||
'ref'=34
|
||||
'fragment'=35
|
||||
'import'=36
|
||||
'external'=37
|
||||
'atom'=38
|
||||
'interface'=39
|
||||
'interfaces'=40
|
||||
'package'=41
|
||||
'value'=42
|
||||
'relation'=43
|
||||
'operation'=44
|
||||
'function'=45
|
||||
'constructor'=46
|
||||
'constructs'=47
|
||||
'input'=48
|
||||
'conform'=49
|
||||
'as'=50
|
||||
'bind'=51
|
||||
'static'=52
|
||||
'to'=53
|
||||
'private'=54
|
||||
'shared'=55
|
||||
'state'=56
|
||||
'edge'=57
|
||||
'projection'=58
|
||||
'with'=59
|
||||
'using'=60
|
||||
'via'=61
|
||||
'materialize'=62
|
||||
'if'=63
|
||||
'absent'=64
|
||||
'on'=65
|
||||
'policy'=66
|
||||
'default'=67
|
||||
'source'=68
|
||||
'repository'=69
|
||||
'commit'=70
|
||||
'revision'=71
|
||||
'semantic-major'=72
|
||||
'on-delete'=73
|
||||
'retain-other'=74
|
||||
'keyed'=75
|
||||
'public-traversal'=76
|
||||
'id'=77
|
||||
'doc'=78
|
||||
'mode'=79
|
||||
'emits'=80
|
||||
'receiver'=81
|
||||
'requires'=82
|
||||
'any'=83
|
||||
'get'=84
|
||||
'set'=85
|
||||
'watch'=86
|
||||
'start'=87
|
||||
'stop'=88
|
||||
'read'=89
|
||||
'write'=90
|
||||
'resolve'=91
|
||||
'connect'=92
|
||||
'disconnect'=93
|
||||
'call'=94
|
||||
'watch-start'=95
|
||||
'watch-stop'=96
|
||||
'subscribe'=97
|
||||
'unsubscribe'=98
|
||||
'register'=99
|
||||
'crdt'=100
|
||||
'optional-one'=101
|
||||
'exactly-one'=102
|
||||
'many-unique'=103
|
||||
'many'=104
|
||||
'ordered'=105
|
||||
'unit'=106
|
||||
'watch-handle'=107
|
||||
'message'=108
|
||||
'atom-ref'=109
|
||||
'interface-ref'=110
|
||||
'optional'=111
|
||||
'list'=112
|
||||
'record'=113
|
||||
'bool'=114
|
||||
'bytes'=115
|
||||
'double'=116
|
||||
'int32'=117
|
||||
'int64'=118
|
||||
'string'=119
|
||||
'uint32'=120
|
||||
'uint64'=121
|
||||
'true'=122
|
||||
'false'=123
|
||||
'null'=124
|
||||
'->'=125
|
||||
':'=126
|
||||
';'=127
|
||||
','=128
|
||||
'.'=129
|
||||
'{'=130
|
||||
'}'=131
|
||||
'['=132
|
||||
']'=133
|
||||
'('=134
|
||||
')'=135
|
||||
'<'=136
|
||||
'>'=137
|
||||
'&'=138
|
||||
'='=139
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
@@ -108,6 +108,7 @@ export class GenericSourceTypes {
|
||||
return parameter?.kind === "value" && Boolean(parameter.storable);
|
||||
}
|
||||
if (type.kind === "list" || type.kind === "optional") return storable(type.value, depth + 1);
|
||||
if (type.kind === "record") return Object.values(type.fields).every((field) => storable(field, depth + 1));
|
||||
if (type.kind === "alias") {
|
||||
const alias = aliases.get(type.definitionId);
|
||||
if (!alias || alias.parameters.length !== type.arguments.length) return false;
|
||||
@@ -318,6 +319,12 @@ export class GenericSourceTypes {
|
||||
return { kind: "record", fields: Object.fromEntries(fields) };
|
||||
}
|
||||
const name = context.identifier()!.getText();
|
||||
if (name === "change" && context.typeArguments())
|
||||
throw new GenericTypeError(
|
||||
"unsupported-prepared-change",
|
||||
name,
|
||||
"Authored change<T> transport values require LF-19; native edit contracts are available separately",
|
||||
);
|
||||
if (context.ATOM_REF()) return { kind: "object-ref", expectation: this.atom(name) };
|
||||
if (context.INTERFACE_REF())
|
||||
return {
|
||||
|
||||
@@ -405,6 +405,8 @@ const valueOperation = (displayName: string, id: InterfaceOperation["id"], value
|
||||
outputType: value,
|
||||
mode: "call",
|
||||
};
|
||||
case "edit":
|
||||
return { id, displayName, inputType: { kind: "change", value }, outputType: valueType.unit, mode: "call" };
|
||||
case "set":
|
||||
return {
|
||||
id,
|
||||
@@ -494,6 +496,11 @@ const lowerValueMember = (state: LoweringState, context: ValueMemberContext): In
|
||||
...valueOperation("get", capabilityId.operation(stringValue(operation.stringLiteral(0))), memberValueType),
|
||||
...lowerExecution(operation.executionClause()),
|
||||
});
|
||||
} else if (operation.EDIT()) {
|
||||
operations.push({
|
||||
...valueOperation("edit", capabilityId.operation(stringValue(operation.stringLiteral(0))), memberValueType),
|
||||
...lowerExecution(operation.executionClause()),
|
||||
});
|
||||
} else if (operation.SET()) {
|
||||
operations.push({
|
||||
...valueOperation("set", capabilityId.operation(stringValue(operation.stringLiteral(0))), memberValueType),
|
||||
@@ -763,6 +770,13 @@ const lowerInterfaceTemplate = (
|
||||
return [
|
||||
{ ...signature("get", id, valueType.unit, type), ...lowerExecution(operation.executionClause()) },
|
||||
];
|
||||
if (operation.EDIT())
|
||||
return [
|
||||
{
|
||||
...signature("edit", id, { kind: "change", value: type }, valueType.unit),
|
||||
...lowerExecution(operation.executionClause()),
|
||||
},
|
||||
];
|
||||
if (operation.SET())
|
||||
return [
|
||||
{ ...signature("set", id, type, valueType.unit), ...lowerExecution(operation.executionClause()) },
|
||||
@@ -939,7 +953,9 @@ const lowerDependencyPort = (state: LoweringState, context: DependencyPortContex
|
||||
.primitiveList()!
|
||||
.primitive()
|
||||
.map((entry) => text(entry));
|
||||
const invalid = primitives.filter((entry) => !["read", "write", "watch-start", "watch-stop"].includes(entry));
|
||||
const invalid = primitives.filter(
|
||||
(entry) => !["read", "write", "edit", "watch-start", "watch-stop"].includes(entry),
|
||||
);
|
||||
if (invalid.length > 0) {
|
||||
loweringIssue(state, context, "invalid-port-primitive", `State port cannot request ${invalid.join(", ")}`);
|
||||
}
|
||||
@@ -1405,12 +1421,12 @@ const lowerPackage = (
|
||||
const name = identifier(clause.identifier(0));
|
||||
const key = budgetNames[name],
|
||||
n = Number(clause.INTEGER()!.getText());
|
||||
if (!key || assigned.has(name) || !Number.isSafeInteger(n) || n < 1 || n > defaultQueryBudgets[key])
|
||||
if (!key || assigned.has(name) || !Number.isSafeInteger(n) || n < 1 || n > 0xffffffff)
|
||||
loweringIssue(
|
||||
state,
|
||||
clause,
|
||||
"invalid-query-budget",
|
||||
`Invalid, duplicate, or excessive query budget ${name}`,
|
||||
`Invalid, duplicate, or out-of-range query budget ${name}`,
|
||||
);
|
||||
else {
|
||||
declaration.budgets[key] = n;
|
||||
@@ -1898,6 +1914,7 @@ const lowerConformance = (
|
||||
const primitives = {
|
||||
get: "read",
|
||||
set: "write",
|
||||
edit: "edit",
|
||||
"watch-start": "watch-start",
|
||||
"watch-stop": "watch-stop",
|
||||
} as const;
|
||||
@@ -2622,7 +2639,7 @@ const compileCapabilityResourceSourceInternal = (
|
||||
portNames.add(port.displayName);
|
||||
const requirement = port.requirement;
|
||||
if (requirement.kind === "state") {
|
||||
if (requirement.primitives.some((p) => !["read", "write", "watch-start", "watch-stop"].includes(p)))
|
||||
if (requirement.primitives.some((p) => !["read", "write", "edit", "watch-start", "watch-stop"].includes(p)))
|
||||
throw new GenericTypeError("invalid-port-primitive", port.displayName, "Invalid state primitive");
|
||||
types.push(requirement.valueType);
|
||||
}
|
||||
|
||||
@@ -16,7 +16,7 @@ export type ValueTypeExpression =
|
||||
| Extract<ValueType, { kind: "builtin" | "scalar" | "message" }>
|
||||
| { kind: "parameter"; parameterId: string }
|
||||
| { kind: "record"; fields: Record<string, ValueTypeExpression> }
|
||||
| { kind: "list" | "optional"; value: ValueTypeExpression }
|
||||
| { kind: "list" | "optional" | "change"; value: ValueTypeExpression }
|
||||
| { kind: "object-ref"; expectation: ObjectTypeExpression }
|
||||
| { kind: "alias"; definitionId: string; arguments: TypeArgumentExpression[] };
|
||||
|
||||
@@ -184,10 +184,10 @@ export const isStorableType = (
|
||||
case "list":
|
||||
case "optional":
|
||||
return visit(value.value, depth + 1);
|
||||
// Records currently have RPC codecs, not ordinary-state persistence codecs.
|
||||
// A generic bound must not promise storage that the installed model rejects.
|
||||
case "record":
|
||||
case "change":
|
||||
return false;
|
||||
case "record":
|
||||
return Object.values(value.fields).every((field) => visit(field, depth + 1));
|
||||
}
|
||||
};
|
||||
return visit(type, 0);
|
||||
@@ -216,6 +216,7 @@ export const canonicalTypeArgument = (argument: ClosedTypeArgument): string => {
|
||||
return ["message", value.descriptorId];
|
||||
case "object-ref":
|
||||
return ["object-ref", target(value.expectation)];
|
||||
case "change":
|
||||
case "list":
|
||||
case "optional":
|
||||
return [value.kind, type(value.value, depth + 1)];
|
||||
@@ -323,6 +324,7 @@ export class TypeSubstitution {
|
||||
return { kind: "scalar", name: expression.name };
|
||||
case "message":
|
||||
return { kind: "message", descriptorId: expression.descriptorId };
|
||||
case "change":
|
||||
case "list":
|
||||
case "optional":
|
||||
return { kind: expression.kind, value: this.value(expression.value, `${path}.${expression.kind}`, depth + 1) };
|
||||
|
||||
@@ -67,7 +67,8 @@ export type ValueType =
|
||||
| { kind: "record"; fields: Record<string, ValueType> }
|
||||
| { kind: "object-ref"; expectation: ObjectExpectation }
|
||||
| { kind: "optional"; value: ValueType }
|
||||
| { kind: "list"; value: ValueType };
|
||||
| { kind: "list"; value: ValueType }
|
||||
| { kind: "change"; value: ValueType };
|
||||
|
||||
export const valueType = {
|
||||
unit: { kind: "builtin", name: "unit" } as const,
|
||||
@@ -214,7 +215,7 @@ export interface EdgeDefinition {
|
||||
|
||||
export type PersistentAttachment = StateSlotDefinition | EdgeDefinition;
|
||||
|
||||
export type StatePrimitive = "read" | "write" | "watch-start" | "watch-stop";
|
||||
export type StatePrimitive = "read" | "write" | "edit" | "watch-start" | "watch-stop";
|
||||
|
||||
export type EdgePrimitive = "resolve" | "connect" | "disconnect" | "watch-start" | "watch-stop";
|
||||
|
||||
|
||||
@@ -154,6 +154,8 @@ const typeLabel = (type: ValueType): string => {
|
||||
return type.expectation.kind === "atom"
|
||||
? `object:atom:${type.expectation.atomId}`
|
||||
: `object:interface:${type.expectation.interfaceRevisionId}`;
|
||||
case "change":
|
||||
return `change<${typeLabel(type.value)}>`;
|
||||
case "optional":
|
||||
return `optional<${typeLabel(type.value)}>`;
|
||||
case "list":
|
||||
@@ -189,6 +191,7 @@ export const valueTypesEqual = (left: ValueType, right: ValueType): boolean => {
|
||||
? left.expectation.atomId === (other as typeof left.expectation).atomId
|
||||
: left.expectation.interfaceRevisionId === (other as typeof left.expectation).interfaceRevisionId;
|
||||
}
|
||||
case "change":
|
||||
case "optional":
|
||||
case "list":
|
||||
return valueTypesEqual(left.value, (right as typeof left).value);
|
||||
@@ -239,6 +242,7 @@ const validateValueType = (
|
||||
case "message":
|
||||
requireText(issues, type.descriptorId, `${path}.descriptorId`, "Message descriptor identity");
|
||||
return;
|
||||
case "change":
|
||||
case "optional":
|
||||
case "list":
|
||||
validateValueType(issues, type.value, `${path}.value`, indexes);
|
||||
@@ -341,6 +345,8 @@ export const statePrimitiveSignature = (slot: StateSlotDefinition, primitive: St
|
||||
inputType: valueType.unit,
|
||||
outputType: slot.valueType,
|
||||
};
|
||||
case "edit":
|
||||
return { mode: "call", inputType: { kind: "change", value: slot.valueType }, outputType: valueType.unit };
|
||||
case "write":
|
||||
return {
|
||||
mode: "call",
|
||||
@@ -532,9 +538,19 @@ const collectIdentityIndexes = (
|
||||
if (member.kind === "relationship" && contract === "rpc-permitted")
|
||||
issue(issues, "invalid-query-contract", memberPath, "RPC query relationships are not supported");
|
||||
if (member.kind === "value") {
|
||||
const type = member.valueType.kind === "optional" ? member.valueType.value : member.valueType;
|
||||
if (type.kind !== "scalar")
|
||||
issue(issues, "invalid-query-contract", memberPath, "Queryable values must be scalar or optional scalar");
|
||||
const queryValue = (type: ValueType): boolean =>
|
||||
type.kind === "scalar" ||
|
||||
((type.kind === "optional" || type.kind === "list") && queryValue(type.value)) ||
|
||||
(type.kind === "record" &&
|
||||
Object.keys(type.fields).length > 0 &&
|
||||
Object.values(type.fields).every(queryValue));
|
||||
if (!queryValue(member.valueType))
|
||||
issue(
|
||||
issues,
|
||||
"invalid-query-contract",
|
||||
memberPath,
|
||||
"Queryable values require scalar leaves in optional, list, or nonempty record shapes",
|
||||
);
|
||||
}
|
||||
}
|
||||
requireText(issues, member.id, `${memberPath}.id`, "Member ID");
|
||||
@@ -837,7 +853,8 @@ const validateAttachments = (issues: CapabilityValidationIssue[], indexes: Valid
|
||||
validateValueType(issues, attachment.valueType, `${path}.valueType`, indexes);
|
||||
const containsRpcType = (type: ValueType): boolean =>
|
||||
type.kind === "object-ref" ||
|
||||
type.kind === "record" ||
|
||||
type.kind === "change" ||
|
||||
(type.kind === "record" && Object.values(type.fields).some(containsRpcType)) ||
|
||||
((type.kind === "optional" || type.kind === "list") && containsRpcType(type.value));
|
||||
if (
|
||||
containsRpcType(attachment.valueType) ||
|
||||
@@ -847,7 +864,7 @@ const validateAttachments = (issues: CapabilityValidationIssue[], indexes: Valid
|
||||
issues,
|
||||
"invalid-attachment",
|
||||
`${path}.valueType`,
|
||||
"Managed object references belong in graph relationships, not ordinary state; record types are RPC-only",
|
||||
"Managed object references belong in graph relationships; captured changes are transport-only",
|
||||
);
|
||||
}
|
||||
if (attachment.storagePolicy.kind === "crdt-document") {
|
||||
@@ -1287,6 +1304,12 @@ const validateBoundDependencies = (
|
||||
: `State ${stateBinding.slotId} is not attached to receiver atom ${params.atomId}`,
|
||||
);
|
||||
}
|
||||
if (
|
||||
requirement.primitives.includes("edit") &&
|
||||
(attachment.attachment.storagePolicy.kind !== "crdt-document" ||
|
||||
!valueTypesEqual(attachment.attachment.valueType, attachment.attachment.storagePolicy.updateType))
|
||||
)
|
||||
issue(issues, "invalid-dependency-binding", path, "Edit ports require a matching CRDT slot");
|
||||
if (!valueTypesEqual(requirement.valueType, attachment.attachment.valueType)) {
|
||||
issue(
|
||||
issues,
|
||||
@@ -1579,6 +1602,17 @@ const validateConformances = (
|
||||
}
|
||||
} else binding = entry.binding;
|
||||
const member = operationEntry.member;
|
||||
if (
|
||||
member.kind === "value" &&
|
||||
operation.displayName === "edit" &&
|
||||
(binding.kind !== "state" || binding.primitive !== "edit")
|
||||
)
|
||||
issue(
|
||||
issues,
|
||||
"invalid-state-binding",
|
||||
bindingPath,
|
||||
"CRDT edit operations must resolve to a native state edit capability",
|
||||
);
|
||||
if (
|
||||
member.kind !== "operation" &&
|
||||
member.queryRead &&
|
||||
@@ -1652,6 +1686,17 @@ const validateConformances = (
|
||||
"State primitives may only implement value members",
|
||||
);
|
||||
}
|
||||
if (
|
||||
binding.primitive === "edit" &&
|
||||
(attachment.attachment.storagePolicy.kind !== "crdt-document" ||
|
||||
!valueTypesEqual(attachment.attachment.valueType, attachment.attachment.storagePolicy.updateType))
|
||||
)
|
||||
issue(
|
||||
issues,
|
||||
"invalid-state-binding",
|
||||
bindingPath,
|
||||
"Edit requires a CRDT slot with a matching materialized profile type",
|
||||
);
|
||||
const expected = statePrimitiveSignature(attachment.attachment, binding.primitive);
|
||||
if (!signaturesMatch(operation, expected)) {
|
||||
issue(
|
||||
|
||||
File diff suppressed because one or more lines are too long
@@ -154,8 +154,19 @@ export function relationalCompiler(
|
||||
): QueryExpression => {
|
||||
requireAvailable(names, available, node);
|
||||
const meta = names.at(-2) === "_qx";
|
||||
const { row, path, nullable } = walk(root, names.slice(0, meta ? -2 : -1), uses, node);
|
||||
const name = names.at(-1)!;
|
||||
let fieldIndex = names.length - 1;
|
||||
if (!meta) {
|
||||
let cursor = root;
|
||||
for (let index = 0; index < names.length; index++) {
|
||||
if (cursor.kind === "object" && rowFields(cursor).get(names[index]!)?.kind === "leaf") {
|
||||
fieldIndex = index;
|
||||
break;
|
||||
}
|
||||
if (index < names.length - 1) cursor = walk(root, names.slice(0, index + 1), uses, node).row;
|
||||
}
|
||||
}
|
||||
const { row, path, nullable } = walk(root, names.slice(0, meta ? -2 : fieldIndex), uses, node);
|
||||
const name = names[meta ? names.length - 1 : fieldIndex]!;
|
||||
let type: ValueType, leaf: QueryExpression["leaf"];
|
||||
if (meta) {
|
||||
if (name === "ref" && row.kind === "object") {
|
||||
@@ -185,7 +196,24 @@ export function relationalCompiler(
|
||||
for (const use of uses) mark(row.interfaceRevisionId, name, use, node);
|
||||
const member = env.contracts.get(row.interfaceRevisionId)!.members.find((m) => m.displayName === name)!;
|
||||
type = field.type;
|
||||
leaf = { kind: "field", interfaceRevisionId: row.interfaceRevisionId, memberId: member.id };
|
||||
const valuePath = names.slice(fieldIndex + 1);
|
||||
let valueNullable = false;
|
||||
for (const component of valuePath) {
|
||||
if (type.kind === "optional") {
|
||||
valueNullable = true;
|
||||
type = type.value;
|
||||
}
|
||||
if (type.kind !== "record" || !Object.hasOwn(type.fields, component))
|
||||
return fail("QUERY_FIELD_NOT_QUERYABLE", `Unknown scalar value path ${names.join(".")}`, node);
|
||||
type = type.fields[component]!;
|
||||
}
|
||||
if (valueNullable && type.kind !== "optional") type = valueType.optional(type);
|
||||
leaf = {
|
||||
kind: "field",
|
||||
interfaceRevisionId: row.interfaceRevisionId,
|
||||
memberId: member.id,
|
||||
...(valuePath.length ? { valuePath } : {}),
|
||||
};
|
||||
}
|
||||
return { path, leaf, type: nullable && type.kind !== "optional" ? valueType.optional(type) : type };
|
||||
};
|
||||
@@ -356,15 +384,22 @@ export function relationalCompiler(
|
||||
}
|
||||
}
|
||||
} else {
|
||||
const expr = expression(row, [...base, name], ["predicate"], field, available);
|
||||
children.push(
|
||||
...(comparisons(field.value, (operator, value) => ({
|
||||
kind: "compare",
|
||||
expression: expr,
|
||||
operator,
|
||||
value,
|
||||
})) as QueryPredicate[]),
|
||||
);
|
||||
const valuePredicate = (names: string[], value: ValueNode) => {
|
||||
const expr = expression(row, names, ["predicate"], field, available);
|
||||
const type = expr.type.kind === "optional" ? expr.type.value : expr.type;
|
||||
if (type.kind === "record") {
|
||||
for (const child of pairs(value)) valuePredicate([...names, child.name.value], child.value);
|
||||
} else
|
||||
children.push(
|
||||
...(comparisons(value, (operator, value) => ({
|
||||
kind: "compare",
|
||||
expression: expr,
|
||||
operator,
|
||||
value,
|
||||
})) as QueryPredicate[]),
|
||||
);
|
||||
};
|
||||
valuePredicate([...base, name], field.value);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import { comparableValue } from "./structured.js";
|
||||
import {
|
||||
GraphQLBoolean,
|
||||
GraphQLString,
|
||||
@@ -45,6 +46,7 @@ export interface RelationalSchemaEnvironment {
|
||||
name(id: InterfaceRevisionId): string;
|
||||
scalar(type: ValueType): GraphQLInputType & GraphQLOutputType;
|
||||
comparison(type: ValueType): GraphQLInputObjectType;
|
||||
valueOrder(type: ValueType): GraphQLInputType;
|
||||
scalarTypes: Map<string, ValueType>;
|
||||
direction: GraphQLEnumType;
|
||||
cursor: GraphQLScalarType;
|
||||
@@ -255,7 +257,8 @@ export function relationalSchema(env: RelationalSchemaEnvironment, document?: Do
|
||||
continue;
|
||||
}
|
||||
}
|
||||
result[name] = { type: ordering ? env.direction : compare(type) };
|
||||
if (!comparableValue(type, ordering)) continue;
|
||||
result[name] = { type: ordering ? env.valueOrder(type) : compare(type) };
|
||||
}
|
||||
}
|
||||
const meta: GraphQLInputFieldConfigMap = {};
|
||||
@@ -300,6 +303,7 @@ export function relationalSchema(env: RelationalSchemaEnvironment, document?: Do
|
||||
for (const [name, field] of fields(row)) {
|
||||
if (row.kind === "object" && field.kind === "row") continue;
|
||||
if (name in result) throw new QueryCompileError("QUERY_SCHEMA_NAME", `Reserved predicate name ${name}`);
|
||||
if (field.kind === "leaf" && !comparableValue(field.type)) continue;
|
||||
result[name] = { type: field.kind === "row" ? where(field.row) : compare(field.type) };
|
||||
}
|
||||
result._qx = {
|
||||
|
||||
@@ -49,7 +49,7 @@ export type QueryPathStep =
|
||||
export interface QueryExpression {
|
||||
path: QueryPathStep[];
|
||||
leaf:
|
||||
| { kind: "field"; interfaceRevisionId: InterfaceRevisionId; memberId: MemberId }
|
||||
| { kind: "field"; interfaceRevisionId: InterfaceRevisionId; memberId: MemberId; valuePath?: string[] }
|
||||
| { kind: "ref"; interfaceRevisionId: InterfaceRevisionId }
|
||||
| { kind: "entry" | "mapKey" };
|
||||
type: ValueType;
|
||||
|
||||
+18
-7
@@ -1,3 +1,4 @@
|
||||
import { structuredQueryTypes, comparableValue } from "./structured.js";
|
||||
import {
|
||||
GraphQLBoolean,
|
||||
GraphQLString,
|
||||
@@ -132,7 +133,7 @@ export function querySchema(
|
||||
throw new QueryCompileError("QUERY_TYPE", "Only scalar/optional scalar query fields are supported");
|
||||
return queryScalars[type.name];
|
||||
};
|
||||
const comparison = (type: ValueType) => {
|
||||
const scalarComparison = (type: ValueType) => {
|
||||
const base = type.kind === "optional" ? type.value : type;
|
||||
const value = scalar(base);
|
||||
const key = String(value);
|
||||
@@ -149,8 +150,21 @@ export function querySchema(
|
||||
}
|
||||
return result;
|
||||
};
|
||||
const structured = structuredQueryTypes(scalar, scalarComparison, direction);
|
||||
const comparison = (type: ValueType) => structured.input(type) as GraphQLInputObjectType;
|
||||
const relational = relationalSchema(
|
||||
{ contracts, target, name, scalar, comparison, scalarTypes, direction, cursor: cursorScalar, pageInfo },
|
||||
{
|
||||
contracts,
|
||||
target,
|
||||
name,
|
||||
scalar,
|
||||
comparison,
|
||||
valueOrder: (type) => structured.input(type, true),
|
||||
scalarTypes,
|
||||
direction,
|
||||
cursor: cursorScalar,
|
||||
pageInfo,
|
||||
},
|
||||
document,
|
||||
);
|
||||
relational.discover(root.interface);
|
||||
@@ -162,7 +176,7 @@ export function querySchema(
|
||||
for (const member of contract(id).members) {
|
||||
if (member.kind !== "value" || !member.queryRead) continue;
|
||||
const t = member.valueType.kind === "optional" ? member.valueType.value : member.valueType;
|
||||
if (t.kind === "scalar" && t.name !== "bytes") fields[member.displayName] = { type: direction };
|
||||
if (comparableValue(t, true)) fields[member.displayName] = { type: structured.input(t, true) };
|
||||
}
|
||||
if (Object.keys(fields).length === 0) return undefined;
|
||||
result = new GraphQLInputObjectType({ name: `${name(id)}Order`, fields });
|
||||
@@ -190,10 +204,7 @@ export function querySchema(
|
||||
if (!/^[_A-Za-z][_0-9A-Za-z]*$/.test(member.displayName) || member.displayName.startsWith("_"))
|
||||
throw new QueryCompileError("QUERY_SCHEMA_NAME", `Unsupported query field name ${member.displayName}`);
|
||||
if (member.kind === "value") {
|
||||
const type = scalar(member.valueType);
|
||||
fields[member.displayName] = {
|
||||
type: member.valueType.kind === "optional" ? type : new GraphQLNonNull(type),
|
||||
};
|
||||
fields[member.displayName] = { type: structured.output(member.valueType) };
|
||||
} else {
|
||||
const targetId = target(member),
|
||||
node = object(targetId);
|
||||
|
||||
@@ -0,0 +1,76 @@
|
||||
import { createHash } from "node:crypto";
|
||||
import {
|
||||
GraphQLObjectType,
|
||||
GraphQLInputObjectType,
|
||||
GraphQLList,
|
||||
GraphQLNonNull,
|
||||
type GraphQLNullableType,
|
||||
type GraphQLOutputType,
|
||||
type GraphQLInputType,
|
||||
type GraphQLEnumType,
|
||||
} from "graphql";
|
||||
import type { ValueType } from "../capability-model/types.js";
|
||||
import { QueryCompileError } from "./types.js";
|
||||
|
||||
export function comparableValue(type: ValueType, ordering = false): boolean {
|
||||
if (type.kind === "optional") return comparableValue(type.value, ordering);
|
||||
if (type.kind === "record") return Object.values(type.fields).some((t) => comparableValue(t, ordering));
|
||||
return type.kind === "scalar" && (!ordering || type.name !== "bytes");
|
||||
}
|
||||
|
||||
/** Structured values retain one field identity; their children are value projections. */
|
||||
export function structuredQueryTypes(
|
||||
scalar: (type: ValueType) => GraphQLInputType & GraphQLOutputType,
|
||||
scalarComparison: (type: ValueType) => GraphQLInputObjectType,
|
||||
direction: GraphQLEnumType,
|
||||
) {
|
||||
const objects = new Map<string, GraphQLObjectType>();
|
||||
const inputs = new Map<string, GraphQLInputObjectType>();
|
||||
const name = (role: string, type: ValueType) =>
|
||||
`QxValue${role}_${createHash("sha256").update(JSON.stringify(type)).digest("hex").slice(0, 16)}`;
|
||||
const output = (type: ValueType, depth = 0): GraphQLOutputType => {
|
||||
if (depth > 128) throw new QueryCompileError("QUERY_TYPE", "Structured value exceeds type depth limit");
|
||||
if (type.kind === "optional") return required(type.value, depth + 1);
|
||||
return new GraphQLNonNull(required(type, depth));
|
||||
};
|
||||
const required = (type: ValueType, depth: number): GraphQLNullableType & GraphQLOutputType => {
|
||||
if (type.kind === "optional") return required(type.value, depth + 1);
|
||||
if (type.kind === "list") return new GraphQLList(output(type.value, depth + 1));
|
||||
if (type.kind !== "record") return scalar(type) as GraphQLNullableType & GraphQLOutputType;
|
||||
const key = name("Record", type);
|
||||
let result = objects.get(key);
|
||||
if (!result) {
|
||||
if (!Object.keys(type.fields).length)
|
||||
throw new QueryCompileError("QUERY_TYPE", "Queryable records must have at least one field");
|
||||
result = new GraphQLObjectType({
|
||||
name: key,
|
||||
fields: () =>
|
||||
Object.fromEntries(
|
||||
Object.entries(type.fields).map(([key, value]) => [key, { type: output(value, depth + 1) }]),
|
||||
),
|
||||
});
|
||||
objects.set(key, result);
|
||||
}
|
||||
return result;
|
||||
};
|
||||
const input = (type: ValueType, ordering = false): GraphQLInputType => {
|
||||
if (type.kind === "optional") return input(type.value, ordering);
|
||||
if (type.kind !== "record") return ordering ? direction : scalarComparison(type);
|
||||
const key = name(ordering ? "Order" : "Compare", type);
|
||||
let result = inputs.get(key);
|
||||
if (!result) {
|
||||
result = new GraphQLInputObjectType({
|
||||
name: key,
|
||||
fields: () =>
|
||||
Object.fromEntries(
|
||||
Object.entries(type.fields)
|
||||
.filter(([, value]) => comparableValue(value, ordering))
|
||||
.map(([key, value]) => [key, { type: input(value, ordering) }]),
|
||||
),
|
||||
});
|
||||
inputs.set(key, result);
|
||||
}
|
||||
return result;
|
||||
};
|
||||
return { output, input };
|
||||
}
|
||||
Reference in New Issue
Block a user