@skmtc/core 0.0.228 → 0.0.231
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/esm/types/TypeSystem.d.ts +0 -1
- package/esm/types/TypeSystem.d.ts.map +1 -1
- package/esm/typescript/FunctionParameter.d.ts +5 -9
- package/esm/typescript/FunctionParameter.d.ts.map +1 -1
- package/esm/typescript/FunctionParameter.js +22 -21
- package/package.json +1 -1
- package/script/types/TypeSystem.d.ts +0 -1
- package/script/types/TypeSystem.d.ts.map +1 -1
- package/script/typescript/FunctionParameter.d.ts +5 -9
- package/script/typescript/FunctionParameter.d.ts.map +1 -1
- package/script/typescript/FunctionParameter.js +22 -21
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TypeSystem.d.ts","sourceRoot":"","sources":["../../src/types/TypeSystem.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"TypeSystem.d.ts","sourceRoot":"","sources":["../../src/types/TypeSystem.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,27 +1,23 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import type {
|
|
1
|
+
import type { TypeSystemObject, TypeSystemValue } from '../types/TypeSystem.js';
|
|
2
|
+
import type { Definition } from '../dsl/Definition.js';
|
|
3
3
|
type CreateArgs = {
|
|
4
4
|
name?: string;
|
|
5
|
-
|
|
6
|
-
value: TypeSystemValue;
|
|
5
|
+
typeDefiniton: Definition<TypeSystemValue>;
|
|
7
6
|
destructure: boolean;
|
|
8
7
|
required?: boolean;
|
|
9
8
|
};
|
|
10
9
|
type ParameterProperties = VoidParameter | DestructuredParameter | RegularParameter;
|
|
11
10
|
type VoidParameter = {
|
|
12
11
|
type: 'void';
|
|
13
|
-
value: TypeSystemVoid;
|
|
14
12
|
};
|
|
15
13
|
type DestructuredParameter = {
|
|
16
14
|
type: 'destructured';
|
|
17
|
-
|
|
18
|
-
value: TypeSystemObject;
|
|
15
|
+
typeDefiniton: Definition<TypeSystemObject>;
|
|
19
16
|
};
|
|
20
17
|
type RegularParameter = {
|
|
21
18
|
type: 'regular';
|
|
22
19
|
name: string;
|
|
23
|
-
|
|
24
|
-
value: TypeSystemValue;
|
|
20
|
+
typeDefiniton: Definition<TypeSystemValue>;
|
|
25
21
|
required: boolean;
|
|
26
22
|
};
|
|
27
23
|
export declare class FunctionParameter {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FunctionParameter.d.ts","sourceRoot":"","sources":["../../src/typescript/FunctionParameter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"FunctionParameter.d.ts","sourceRoot":"","sources":["../../src/typescript/FunctionParameter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAE/E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEtD,KAAK,UAAU,GAAG;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,UAAU,CAAC,eAAe,CAAC,CAAA;IAC1C,WAAW,EAAE,OAAO,CAAA;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,KAAK,mBAAmB,GACpB,aAAa,GACb,qBAAqB,GACrB,gBAAgB,CAAA;AAEpB,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,KAAK,qBAAqB,GAAG;IAC3B,IAAI,EAAE,cAAc,CAAA;IACpB,aAAa,EAAE,UAAU,CAAC,gBAAgB,CAAC,CAAA;CAC5C,CAAA;AACD,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,aAAa,EAAE,UAAU,CAAC,eAAe,CAAC,CAAA;IAC1C,QAAQ,EAAE,OAAO,CAAA;CAClB,CAAA;AAED,qBAAa,iBAAiB;IAC5B,UAAU,EAAE,mBAAmB,CAAA;gBAEnB,IAAI,EAAE,UAAU;IA6B5B,cAAc,IAAI,iBAAiB;IAgBnC,cAAc,IAAI,MAAM,EAAE;IAc1B,SAAS,IAAI,MAAM;IAkBnB,QAAQ,IAAI,MAAM;CAiBnB"}
|
|
@@ -8,21 +8,23 @@ export class FunctionParameter {
|
|
|
8
8
|
writable: true,
|
|
9
9
|
value: void 0
|
|
10
10
|
});
|
|
11
|
+
// @TODO It might be possible to simplify this by adding entityType
|
|
12
|
+
// to Definition as one its generic parameter types
|
|
13
|
+
if (args.typeDefiniton.identifier.entityType.type === 'value') {
|
|
14
|
+
throw new Error('Value identifiers cannot be used in type definitions');
|
|
15
|
+
}
|
|
11
16
|
this.properties = match(args)
|
|
12
|
-
.with({ value: { type: 'void' } }, (
|
|
13
|
-
type: 'void'
|
|
14
|
-
value
|
|
17
|
+
.with({ typeDefiniton: { value: { type: 'void' } } }, () => ({
|
|
18
|
+
type: 'void'
|
|
15
19
|
}))
|
|
16
|
-
.with({ value: { type: 'object' }, destructure: true }, ({
|
|
20
|
+
.with({ typeDefiniton: { value: { type: 'object' }, destructure: true } }, ({ typeDefiniton }) => ({
|
|
17
21
|
type: 'destructured',
|
|
18
|
-
|
|
19
|
-
value
|
|
22
|
+
typeDefiniton
|
|
20
23
|
}))
|
|
21
|
-
.with({ name: P.string }, ({
|
|
24
|
+
.with({ name: P.string }, ({ typeDefiniton, name, required }) => ({
|
|
22
25
|
type: 'regular',
|
|
23
|
-
identifier,
|
|
24
26
|
name,
|
|
25
|
-
|
|
27
|
+
typeDefiniton,
|
|
26
28
|
required: required ?? false
|
|
27
29
|
}))
|
|
28
30
|
.otherwise(() => {
|
|
@@ -33,10 +35,9 @@ export class FunctionParameter {
|
|
|
33
35
|
if (this.properties.type === 'void') {
|
|
34
36
|
return this;
|
|
35
37
|
}
|
|
36
|
-
invariant(this.properties.value.type === 'object', 'Only object types can be destructured');
|
|
38
|
+
invariant(this.properties.typeDefiniton.value.type === 'object', 'Only object types can be destructured');
|
|
37
39
|
return new FunctionParameter({
|
|
38
|
-
|
|
39
|
-
value: this.properties.value,
|
|
40
|
+
typeDefiniton: this.properties.typeDefiniton,
|
|
40
41
|
destructure: true
|
|
41
42
|
});
|
|
42
43
|
}
|
|
@@ -44,8 +45,8 @@ export class FunctionParameter {
|
|
|
44
45
|
return match(this.properties)
|
|
45
46
|
.with({ type: 'void' }, () => [])
|
|
46
47
|
.with({ type: 'regular' }, ({ name }) => [`${name}`])
|
|
47
|
-
.with({ type: 'destructured' }, ({
|
|
48
|
-
return toPropertyNames(value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
|
|
48
|
+
.with({ type: 'destructured' }, ({ typeDefiniton }) => {
|
|
49
|
+
return toPropertyNames(typeDefiniton.value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
|
|
49
50
|
})
|
|
50
51
|
.otherwise(() => {
|
|
51
52
|
throw new Error('Invalid parameter');
|
|
@@ -57,8 +58,8 @@ export class FunctionParameter {
|
|
|
57
58
|
.with({ type: 'regular' }, ({ name }) => {
|
|
58
59
|
return `${name}`;
|
|
59
60
|
})
|
|
60
|
-
.with({ type: 'destructured' }, ({
|
|
61
|
-
const propertyNames = toPropertyNames(value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
|
|
61
|
+
.with({ type: 'destructured' }, ({ typeDefiniton }) => {
|
|
62
|
+
const propertyNames = toPropertyNames(typeDefiniton.value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
|
|
62
63
|
return `{${propertyNames.join(', ')}}`;
|
|
63
64
|
})
|
|
64
65
|
.otherwise(() => {
|
|
@@ -68,12 +69,12 @@ export class FunctionParameter {
|
|
|
68
69
|
toString() {
|
|
69
70
|
return match(this.properties)
|
|
70
71
|
.with({ type: 'void' }, () => '')
|
|
71
|
-
.with({ type: 'regular' }, ({ name,
|
|
72
|
-
return `${name}${required ? '' : '?'}: ${identifier}`;
|
|
72
|
+
.with({ type: 'regular' }, ({ name, typeDefiniton, required }) => {
|
|
73
|
+
return `${name}${required ? '' : '?'}: ${typeDefiniton.identifier}`;
|
|
73
74
|
})
|
|
74
|
-
.with({ type: 'destructured' }, ({
|
|
75
|
-
const propertyNames = toPropertyNames(value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
|
|
76
|
-
return `{${propertyNames.join(', ')}}: ${identifier}`;
|
|
75
|
+
.with({ type: 'destructured' }, ({ typeDefiniton }) => {
|
|
76
|
+
const propertyNames = toPropertyNames(typeDefiniton.value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
|
|
77
|
+
return `{${propertyNames.join(', ')}}: ${typeDefiniton.identifier}`;
|
|
77
78
|
})
|
|
78
79
|
.otherwise(() => {
|
|
79
80
|
throw new Error('Invalid parameter');
|
package/package.json
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TypeSystem.d.ts","sourceRoot":"","sources":["../../src/types/TypeSystem.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"TypeSystem.d.ts","sourceRoot":"","sources":["../../src/types/TypeSystem.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,27 +1,23 @@
|
|
|
1
|
-
import type {
|
|
2
|
-
import type {
|
|
1
|
+
import type { TypeSystemObject, TypeSystemValue } from '../types/TypeSystem.js';
|
|
2
|
+
import type { Definition } from '../dsl/Definition.js';
|
|
3
3
|
type CreateArgs = {
|
|
4
4
|
name?: string;
|
|
5
|
-
|
|
6
|
-
value: TypeSystemValue;
|
|
5
|
+
typeDefiniton: Definition<TypeSystemValue>;
|
|
7
6
|
destructure: boolean;
|
|
8
7
|
required?: boolean;
|
|
9
8
|
};
|
|
10
9
|
type ParameterProperties = VoidParameter | DestructuredParameter | RegularParameter;
|
|
11
10
|
type VoidParameter = {
|
|
12
11
|
type: 'void';
|
|
13
|
-
value: TypeSystemVoid;
|
|
14
12
|
};
|
|
15
13
|
type DestructuredParameter = {
|
|
16
14
|
type: 'destructured';
|
|
17
|
-
|
|
18
|
-
value: TypeSystemObject;
|
|
15
|
+
typeDefiniton: Definition<TypeSystemObject>;
|
|
19
16
|
};
|
|
20
17
|
type RegularParameter = {
|
|
21
18
|
type: 'regular';
|
|
22
19
|
name: string;
|
|
23
|
-
|
|
24
|
-
value: TypeSystemValue;
|
|
20
|
+
typeDefiniton: Definition<TypeSystemValue>;
|
|
25
21
|
required: boolean;
|
|
26
22
|
};
|
|
27
23
|
export declare class FunctionParameter {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FunctionParameter.d.ts","sourceRoot":"","sources":["../../src/typescript/FunctionParameter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"FunctionParameter.d.ts","sourceRoot":"","sources":["../../src/typescript/FunctionParameter.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAA;AAE/E,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAA;AAEtD,KAAK,UAAU,GAAG;IAChB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,aAAa,EAAE,UAAU,CAAC,eAAe,CAAC,CAAA;IAC1C,WAAW,EAAE,OAAO,CAAA;IACpB,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,KAAK,mBAAmB,GACpB,aAAa,GACb,qBAAqB,GACrB,gBAAgB,CAAA;AAEpB,KAAK,aAAa,GAAG;IACnB,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,KAAK,qBAAqB,GAAG;IAC3B,IAAI,EAAE,cAAc,CAAA;IACpB,aAAa,EAAE,UAAU,CAAC,gBAAgB,CAAC,CAAA;CAC5C,CAAA;AACD,KAAK,gBAAgB,GAAG;IACtB,IAAI,EAAE,SAAS,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,aAAa,EAAE,UAAU,CAAC,eAAe,CAAC,CAAA;IAC1C,QAAQ,EAAE,OAAO,CAAA;CAClB,CAAA;AAED,qBAAa,iBAAiB;IAC5B,UAAU,EAAE,mBAAmB,CAAA;gBAEnB,IAAI,EAAE,UAAU;IA6B5B,cAAc,IAAI,iBAAiB;IAgBnC,cAAc,IAAI,MAAM,EAAE;IAc1B,SAAS,IAAI,MAAM;IAkBnB,QAAQ,IAAI,MAAM;CAiBnB"}
|
|
@@ -14,21 +14,23 @@ class FunctionParameter {
|
|
|
14
14
|
writable: true,
|
|
15
15
|
value: void 0
|
|
16
16
|
});
|
|
17
|
+
// @TODO It might be possible to simplify this by adding entityType
|
|
18
|
+
// to Definition as one its generic parameter types
|
|
19
|
+
if (args.typeDefiniton.identifier.entityType.type === 'value') {
|
|
20
|
+
throw new Error('Value identifiers cannot be used in type definitions');
|
|
21
|
+
}
|
|
17
22
|
this.properties = (0, ts_pattern_1.match)(args)
|
|
18
|
-
.with({ value: { type: 'void' } }, (
|
|
19
|
-
type: 'void'
|
|
20
|
-
value
|
|
23
|
+
.with({ typeDefiniton: { value: { type: 'void' } } }, () => ({
|
|
24
|
+
type: 'void'
|
|
21
25
|
}))
|
|
22
|
-
.with({ value: { type: 'object' }, destructure: true }, ({
|
|
26
|
+
.with({ typeDefiniton: { value: { type: 'object' }, destructure: true } }, ({ typeDefiniton }) => ({
|
|
23
27
|
type: 'destructured',
|
|
24
|
-
|
|
25
|
-
value
|
|
28
|
+
typeDefiniton
|
|
26
29
|
}))
|
|
27
|
-
.with({ name: ts_pattern_1.P.string }, ({
|
|
30
|
+
.with({ name: ts_pattern_1.P.string }, ({ typeDefiniton, name, required }) => ({
|
|
28
31
|
type: 'regular',
|
|
29
|
-
identifier,
|
|
30
32
|
name,
|
|
31
|
-
|
|
33
|
+
typeDefiniton,
|
|
32
34
|
required: required ?? false
|
|
33
35
|
}))
|
|
34
36
|
.otherwise(() => {
|
|
@@ -39,10 +41,9 @@ class FunctionParameter {
|
|
|
39
41
|
if (this.properties.type === 'void') {
|
|
40
42
|
return this;
|
|
41
43
|
}
|
|
42
|
-
(0, tiny_invariant_1.default)(this.properties.value.type === 'object', 'Only object types can be destructured');
|
|
44
|
+
(0, tiny_invariant_1.default)(this.properties.typeDefiniton.value.type === 'object', 'Only object types can be destructured');
|
|
43
45
|
return new FunctionParameter({
|
|
44
|
-
|
|
45
|
-
value: this.properties.value,
|
|
46
|
+
typeDefiniton: this.properties.typeDefiniton,
|
|
46
47
|
destructure: true
|
|
47
48
|
});
|
|
48
49
|
}
|
|
@@ -50,8 +51,8 @@ class FunctionParameter {
|
|
|
50
51
|
return (0, ts_pattern_1.match)(this.properties)
|
|
51
52
|
.with({ type: 'void' }, () => [])
|
|
52
53
|
.with({ type: 'regular' }, ({ name }) => [`${name}`])
|
|
53
|
-
.with({ type: 'destructured' }, ({
|
|
54
|
-
return toPropertyNames(value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
|
|
54
|
+
.with({ type: 'destructured' }, ({ typeDefiniton }) => {
|
|
55
|
+
return toPropertyNames(typeDefiniton.value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
|
|
55
56
|
})
|
|
56
57
|
.otherwise(() => {
|
|
57
58
|
throw new Error('Invalid parameter');
|
|
@@ -63,8 +64,8 @@ class FunctionParameter {
|
|
|
63
64
|
.with({ type: 'regular' }, ({ name }) => {
|
|
64
65
|
return `${name}`;
|
|
65
66
|
})
|
|
66
|
-
.with({ type: 'destructured' }, ({
|
|
67
|
-
const propertyNames = toPropertyNames(value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
|
|
67
|
+
.with({ type: 'destructured' }, ({ typeDefiniton }) => {
|
|
68
|
+
const propertyNames = toPropertyNames(typeDefiniton.value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
|
|
68
69
|
return `{${propertyNames.join(', ')}}`;
|
|
69
70
|
})
|
|
70
71
|
.otherwise(() => {
|
|
@@ -74,12 +75,12 @@ class FunctionParameter {
|
|
|
74
75
|
toString() {
|
|
75
76
|
return (0, ts_pattern_1.match)(this.properties)
|
|
76
77
|
.with({ type: 'void' }, () => '')
|
|
77
|
-
.with({ type: 'regular' }, ({ name,
|
|
78
|
-
return `${name}${required ? '' : '?'}: ${identifier}`;
|
|
78
|
+
.with({ type: 'regular' }, ({ name, typeDefiniton, required }) => {
|
|
79
|
+
return `${name}${required ? '' : '?'}: ${typeDefiniton.identifier}`;
|
|
79
80
|
})
|
|
80
|
-
.with({ type: 'destructured' }, ({
|
|
81
|
-
const propertyNames = toPropertyNames(value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
|
|
82
|
-
return `{${propertyNames.join(', ')}}: ${identifier}`;
|
|
81
|
+
.with({ type: 'destructured' }, ({ typeDefiniton }) => {
|
|
82
|
+
const propertyNames = toPropertyNames(typeDefiniton.value).map(name => name === `'If-Match'` ? `'If-Match': IfMatch` : name);
|
|
83
|
+
return `{${propertyNames.join(', ')}}: ${typeDefiniton.identifier}`;
|
|
83
84
|
})
|
|
84
85
|
.otherwise(() => {
|
|
85
86
|
throw new Error('Invalid parameter');
|