@skmtc/core 0.0.242 → 0.0.244
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/dsl/withConfig.d.ts +3 -1
- package/esm/dsl/withConfig.d.ts.map +1 -1
- package/esm/dsl/withConfig.js +7 -0
- package/esm/oas/object/Object.d.ts.map +1 -1
- package/esm/oas/object/Object.js +8 -8
- package/package.json +1 -1
- package/script/dsl/withConfig.d.ts +3 -1
- package/script/dsl/withConfig.d.ts.map +1 -1
- package/script/dsl/withConfig.js +7 -0
- package/script/oas/object/Object.d.ts.map +1 -1
- package/script/oas/object/Object.js +8 -8
package/esm/dsl/withConfig.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import type { CoreContext } from '../context/CoreContext.js';
|
|
|
2
2
|
import type { OasOperation } from '../oas/operation/Operation.js';
|
|
3
3
|
import type { ContentSettings } from './ContentSettings.js';
|
|
4
4
|
import type { RefName } from '../types/RefName.js';
|
|
5
|
-
import
|
|
5
|
+
import { EntityType } from '../typescript/EntityType.js';
|
|
6
6
|
import type { IsModelSelectedArgs, ToModelExportPathArgs, ToModelNameArgs } from './ModelCreator.js';
|
|
7
7
|
import type { IsOperationSelectedArgs, ToOperationExportPathArgs, ToOperationNameArgs } from './OperationCreator.js';
|
|
8
8
|
export type GeneratorConfigConstructor = {
|
|
@@ -13,6 +13,7 @@ export type ModelGeneratorConfig = GeneratorConfig & ModelConfig;
|
|
|
13
13
|
export type OperationConfig = {
|
|
14
14
|
id: string;
|
|
15
15
|
type: 'operation';
|
|
16
|
+
entityType?: EntityType;
|
|
16
17
|
toName({ operation, baseSettings }: ToOperationNameArgs): string;
|
|
17
18
|
toExportPath({ operation, baseSettings }: ToOperationExportPathArgs): string;
|
|
18
19
|
isSelected({ operation, baseSettings }: IsOperationSelectedArgs): boolean;
|
|
@@ -42,6 +43,7 @@ export declare const toOperationCreatorBase: (config: OperationConfig) => {
|
|
|
42
43
|
generatorKey: import("../types/GeneratorKeys.js").GeneratorKey;
|
|
43
44
|
};
|
|
44
45
|
id: string;
|
|
46
|
+
entityType: EntityType;
|
|
45
47
|
toName: ({ operation, baseSettings }: ToOperationNameArgs) => string;
|
|
46
48
|
toExportPath: ({ operation, baseSettings }: ToOperationExportPathArgs) => string;
|
|
47
49
|
isSelected: ({ operation, baseSettings }: IsOperationSelectedArgs) => boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withConfig.d.ts","sourceRoot":"","sources":["../../src/dsl/withConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAK3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,
|
|
1
|
+
{"version":3,"file":"withConfig.d.ts","sourceRoot":"","sources":["../../src/dsl/withConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAK3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AACxD,OAAO,KAAK,EACV,mBAAmB,EACnB,qBAAqB,EACrB,eAAe,EAChB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,KAAK,EACV,uBAAuB,EACvB,yBAAyB,EACzB,mBAAmB,EACpB,MAAM,uBAAuB,CAAA;AAG9B,MAAM,MAAM,0BAA0B,GAAG;IAAE,OAAO,EAAE,WAAW,CAAA;CAAE,CAAA;AACjE,MAAM,MAAM,wBAAwB,GAAG,eAAe,GAAG,eAAe,CAAA;AACxE,MAAM,MAAM,oBAAoB,GAAG,eAAe,GAAG,WAAW,CAAA;AAEhE,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,WAAW,CAAA;IACjB,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,MAAM,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,mBAAmB,GAAG,MAAM,CAAA;IAChE,YAAY,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,yBAAyB,GAAG,MAAM,CAAA;IAC5E,UAAU,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,uBAAuB,GAAG,OAAO,CAAA;CAC1E,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,WAAW,CAAA;IACpB,QAAQ,EAAE,eAAe,CAAA;IACzB,SAAS,EAAE,YAAY,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,sBAAsB,WAAY,eAAe;eAQxC,oBAAoB;;;;;;;;;;;;;;;;;;;;0CAnBJ,mBAAmB,KAAG,MAAM;gDACtB,yBAAyB,KAAG,MAAM;8CACpC,uBAAuB,KAAG,OAAO;CA2B1E,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,OAAO,CAAA;IACb,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,eAAe,GAAG,MAAM,CAAA;IAC1D,YAAY,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,qBAAqB,GAAG,MAAM,CAAA;IACtE,UAAU,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,mBAAmB,GAAG,OAAO,CAAA;CACpE,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,EAAE,WAAW,CAAA;IACpB,QAAQ,EAAE,eAAe,CAAA;IACzB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,kBAAkB,WAAY,WAAW;eAUhC,gBAAgB;;;;;;;;;;;;;;;;;;wCArBF,eAAe,KAAG,MAAM;8CAClB,qBAAqB,KAAG,MAAM;4CAChC,mBAAmB,KAAG,OAAO;CA6BpE,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,YAAY,KAAK,OAAO,CAAA;CACnD,CAAA;AAED,eAAO,MAAM,eAAe,WAClB,eAAe,GAAG;IAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAA;CAAE;sBAO9B,0BAA0B;iBAD1C,WAAW;;;;8BAVI,YAAY,KAAK,OAAO;CAenD,CAAA"}
|
package/esm/dsl/withConfig.js
CHANGED
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { toOperationGeneratorKey, toModelGeneratorKey } from '../types/GeneratorKeys.js';
|
|
2
|
+
import { EntityType } from '../typescript/EntityType.js';
|
|
2
3
|
import { OperationBase, ModelBase } from './base.js';
|
|
3
4
|
export const toOperationCreatorBase = (config) => {
|
|
4
5
|
var _a;
|
|
@@ -19,6 +20,12 @@ export const toOperationCreatorBase = (config) => {
|
|
|
19
20
|
writable: true,
|
|
20
21
|
value: config.id
|
|
21
22
|
}),
|
|
23
|
+
Object.defineProperty(_a, "entityType", {
|
|
24
|
+
enumerable: true,
|
|
25
|
+
configurable: true,
|
|
26
|
+
writable: true,
|
|
27
|
+
value: config.entityType ?? new EntityType('value')
|
|
28
|
+
}),
|
|
22
29
|
Object.defineProperty(_a, "toName", {
|
|
23
30
|
enumerable: true,
|
|
24
31
|
configurable: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Object.d.ts","sourceRoot":"","sources":["../../../src/oas/object/Object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAA;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAC/D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAE7D,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,WAAW,CAAC,CAAA;IACtE,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,oBAAoB,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAA;IAC7D,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,eAAe,CAAA;IACvB,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,WAAW,GAAG,SAAS,CAAA;IAC9D,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,eAAe,CAAA;IACvB,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAChC,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,qBAAa,SAAU,SAAQ,OAAO;;IACpC,OAAO,EAAE,QAAQ,CAAW;IAC5B,IAAI,EAAE,QAAQ,CAAW;gBAGb,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,cAAc;IAM/D,MAAM,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,cAAc,GAAG,SAAS;IASjE,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAED,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED,IAAI,UAAU,IACV,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,WAAW,CAAC,GAC1D,SAAS,CAEZ;IAED,IAAI,QAAQ,IAAI,MAAM,EAAE,GAAG,SAAS,CAEnC;IAED,IAAI,oBAAoB,IACpB,OAAO,GACP,SAAS,GACT,MAAM,CAAC,QAAQ,CAAC,GAChB,SAAS,CAEZ;IAED,IAAI,QAAQ,IAAI,OAAO,GAAG,SAAS,CAElC;IAED,WAAW,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,eAAe,GAAG,SAAS;IAsBnE,cAAc,CAAC,EAAE,IAAI,EAAE,EAAE,kBAAkB,GAAG,SAAS;
|
|
1
|
+
{"version":3,"file":"Object.d.ts","sourceRoot":"","sources":["../../../src/oas/object/Object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAA;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAC/D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAE7D,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,WAAW,CAAC,CAAA;IACtE,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,oBAAoB,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAA;IAC7D,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,eAAe,CAAA;IACvB,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,WAAW,GAAG,SAAS,CAAA;IAC9D,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,eAAe,CAAA;IACvB,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAChC,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,qBAAa,SAAU,SAAQ,OAAO;;IACpC,OAAO,EAAE,QAAQ,CAAW;IAC5B,IAAI,EAAE,QAAQ,CAAW;gBAGb,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,cAAc;IAM/D,MAAM,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,cAAc,GAAG,SAAS;IASjE,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAED,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED,IAAI,UAAU,IACV,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,WAAW,CAAC,GAC1D,SAAS,CAEZ;IAED,IAAI,QAAQ,IAAI,MAAM,EAAE,GAAG,SAAS,CAEnC;IAED,IAAI,oBAAoB,IACpB,OAAO,GACP,SAAS,GACT,MAAM,CAAC,QAAQ,CAAC,GAChB,SAAS,CAEZ;IAED,IAAI,QAAQ,IAAI,OAAO,GAAG,SAAS,CAElC;IAED,WAAW,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,eAAe,GAAG,SAAS;IAsBnE,cAAc,CAAC,EAAE,IAAI,EAAE,EAAE,kBAAkB,GAAG,SAAS;IAmBvD,KAAK,IAAI,IAAI,IAAI,MAAM,CAAC,QAAQ,CAAC;IAIjC,OAAO,IAAI,SAAS;IAIpB,WAAW,IAAI,SAAS;CAGzB"}
|
package/esm/oas/object/Object.js
CHANGED
|
@@ -60,15 +60,16 @@ export class OasObject extends OasBase {
|
|
|
60
60
|
if (!schema) {
|
|
61
61
|
return this;
|
|
62
62
|
}
|
|
63
|
-
const fields = structuredClone(__classPrivateFieldGet(this, _OasObject_fields, "f"));
|
|
64
63
|
return new OasObject({
|
|
65
64
|
fields: {
|
|
66
|
-
...
|
|
65
|
+
...__classPrivateFieldGet(this, _OasObject_fields, "f"),
|
|
67
66
|
properties: {
|
|
68
|
-
...
|
|
67
|
+
...__classPrivateFieldGet(this, _OasObject_fields, "f").properties,
|
|
69
68
|
[name]: schema
|
|
70
69
|
},
|
|
71
|
-
required: required
|
|
70
|
+
required: required
|
|
71
|
+
? [...__classPrivateFieldGet(this, _OasObject_fields, "f").required, name]
|
|
72
|
+
: __classPrivateFieldGet(this, _OasObject_fields, "f").required
|
|
72
73
|
},
|
|
73
74
|
trail: this.trail.clone(),
|
|
74
75
|
context: this.context,
|
|
@@ -79,13 +80,12 @@ export class OasObject extends OasBase {
|
|
|
79
80
|
if (!__classPrivateFieldGet(this, _OasObject_fields, "f").properties[name]) {
|
|
80
81
|
return this;
|
|
81
82
|
}
|
|
82
|
-
const
|
|
83
|
-
const { [name]: _removed, ...properties } = fields.properties;
|
|
83
|
+
const { [name]: _removed, ...properties } = __classPrivateFieldGet(this, _OasObject_fields, "f").properties;
|
|
84
84
|
return new OasObject({
|
|
85
85
|
fields: {
|
|
86
|
-
...
|
|
86
|
+
...__classPrivateFieldGet(this, _OasObject_fields, "f"),
|
|
87
87
|
properties,
|
|
88
|
-
required:
|
|
88
|
+
required: __classPrivateFieldGet(this, _OasObject_fields, "f").required.filter(n => n !== name)
|
|
89
89
|
},
|
|
90
90
|
trail: this.trail.clone(),
|
|
91
91
|
context: this.context,
|
package/package.json
CHANGED
|
@@ -2,7 +2,7 @@ import type { CoreContext } from '../context/CoreContext.js';
|
|
|
2
2
|
import type { OasOperation } from '../oas/operation/Operation.js';
|
|
3
3
|
import type { ContentSettings } from './ContentSettings.js';
|
|
4
4
|
import type { RefName } from '../types/RefName.js';
|
|
5
|
-
import
|
|
5
|
+
import { EntityType } from '../typescript/EntityType.js';
|
|
6
6
|
import type { IsModelSelectedArgs, ToModelExportPathArgs, ToModelNameArgs } from './ModelCreator.js';
|
|
7
7
|
import type { IsOperationSelectedArgs, ToOperationExportPathArgs, ToOperationNameArgs } from './OperationCreator.js';
|
|
8
8
|
export type GeneratorConfigConstructor = {
|
|
@@ -13,6 +13,7 @@ export type ModelGeneratorConfig = GeneratorConfig & ModelConfig;
|
|
|
13
13
|
export type OperationConfig = {
|
|
14
14
|
id: string;
|
|
15
15
|
type: 'operation';
|
|
16
|
+
entityType?: EntityType;
|
|
16
17
|
toName({ operation, baseSettings }: ToOperationNameArgs): string;
|
|
17
18
|
toExportPath({ operation, baseSettings }: ToOperationExportPathArgs): string;
|
|
18
19
|
isSelected({ operation, baseSettings }: IsOperationSelectedArgs): boolean;
|
|
@@ -42,6 +43,7 @@ export declare const toOperationCreatorBase: (config: OperationConfig) => {
|
|
|
42
43
|
generatorKey: import("../types/GeneratorKeys.js").GeneratorKey;
|
|
43
44
|
};
|
|
44
45
|
id: string;
|
|
46
|
+
entityType: EntityType;
|
|
45
47
|
toName: ({ operation, baseSettings }: ToOperationNameArgs) => string;
|
|
46
48
|
toExportPath: ({ operation, baseSettings }: ToOperationExportPathArgs) => string;
|
|
47
49
|
isSelected: ({ operation, baseSettings }: IsOperationSelectedArgs) => boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"withConfig.d.ts","sourceRoot":"","sources":["../../src/dsl/withConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAK3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,
|
|
1
|
+
{"version":3,"file":"withConfig.d.ts","sourceRoot":"","sources":["../../src/dsl/withConfig.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAA;AAC5D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAA;AAK3D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAClD,OAAO,EAAE,UAAU,EAAE,MAAM,6BAA6B,CAAA;AACxD,OAAO,KAAK,EACV,mBAAmB,EACnB,qBAAqB,EACrB,eAAe,EAChB,MAAM,mBAAmB,CAAA;AAC1B,OAAO,KAAK,EACV,uBAAuB,EACvB,yBAAyB,EACzB,mBAAmB,EACpB,MAAM,uBAAuB,CAAA;AAG9B,MAAM,MAAM,0BAA0B,GAAG;IAAE,OAAO,EAAE,WAAW,CAAA;CAAE,CAAA;AACjE,MAAM,MAAM,wBAAwB,GAAG,eAAe,GAAG,eAAe,CAAA;AACxE,MAAM,MAAM,oBAAoB,GAAG,eAAe,GAAG,WAAW,CAAA;AAEhE,MAAM,MAAM,eAAe,GAAG;IAC5B,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,WAAW,CAAA;IACjB,UAAU,CAAC,EAAE,UAAU,CAAA;IACvB,MAAM,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,mBAAmB,GAAG,MAAM,CAAA;IAChE,YAAY,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,yBAAyB,GAAG,MAAM,CAAA;IAC5E,UAAU,CAAC,EAAE,SAAS,EAAE,YAAY,EAAE,EAAE,uBAAuB,GAAG,OAAO,CAAA;CAC1E,CAAA;AAED,MAAM,MAAM,oBAAoB,GAAG;IACjC,OAAO,EAAE,WAAW,CAAA;IACpB,QAAQ,EAAE,eAAe,CAAA;IACzB,SAAS,EAAE,YAAY,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,sBAAsB,WAAY,eAAe;eAQxC,oBAAoB;;;;;;;;;;;;;;;;;;;;0CAnBJ,mBAAmB,KAAG,MAAM;gDACtB,yBAAyB,KAAG,MAAM;8CACpC,uBAAuB,KAAG,OAAO;CA2B1E,CAAA;AAED,KAAK,WAAW,GAAG;IACjB,EAAE,EAAE,MAAM,CAAA;IACV,IAAI,EAAE,OAAO,CAAA;IACb,UAAU,EAAE,UAAU,CAAA;IACtB,MAAM,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,eAAe,GAAG,MAAM,CAAA;IAC1D,YAAY,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,qBAAqB,GAAG,MAAM,CAAA;IACtE,UAAU,CAAC,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,mBAAmB,GAAG,OAAO,CAAA;CACpE,CAAA;AAED,MAAM,MAAM,gBAAgB,GAAG;IAC7B,OAAO,EAAE,WAAW,CAAA;IACpB,QAAQ,EAAE,eAAe,CAAA;IACzB,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA;AAED,eAAO,MAAM,kBAAkB,WAAY,WAAW;eAUhC,gBAAgB;;;;;;;;;;;;;;;;;;wCArBF,eAAe,KAAG,MAAM;8CAClB,qBAAqB,KAAG,MAAM;4CAChC,mBAAmB,KAAG,OAAO;CA6BpE,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,EAAE,EAAE,MAAM,CAAA;IACV,QAAQ,CAAC,EAAE,OAAO,CAAA;IAClB,WAAW,CAAC,EAAE,CAAC,SAAS,EAAE,YAAY,KAAK,OAAO,CAAA;CACnD,CAAA;AAED,eAAO,MAAM,eAAe,WAClB,eAAe,GAAG;IAAE,IAAI,EAAE,WAAW,GAAG,OAAO,CAAA;CAAE;sBAO9B,0BAA0B;iBAD1C,WAAW;;;;8BAVI,YAAY,KAAK,OAAO;CAenD,CAAA"}
|
package/script/dsl/withConfig.js
CHANGED
|
@@ -2,6 +2,7 @@
|
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.toGeneratorBase = exports.toModelCreatorBase = exports.toOperationCreatorBase = void 0;
|
|
4
4
|
const GeneratorKeys_js_1 = require("../types/GeneratorKeys.js");
|
|
5
|
+
const EntityType_js_1 = require("../typescript/EntityType.js");
|
|
5
6
|
const base_js_1 = require("./base.js");
|
|
6
7
|
const toOperationCreatorBase = (config) => {
|
|
7
8
|
var _a;
|
|
@@ -22,6 +23,12 @@ const toOperationCreatorBase = (config) => {
|
|
|
22
23
|
writable: true,
|
|
23
24
|
value: config.id
|
|
24
25
|
}),
|
|
26
|
+
Object.defineProperty(_a, "entityType", {
|
|
27
|
+
enumerable: true,
|
|
28
|
+
configurable: true,
|
|
29
|
+
writable: true,
|
|
30
|
+
value: config.entityType ?? new EntityType_js_1.EntityType('value')
|
|
31
|
+
}),
|
|
25
32
|
Object.defineProperty(_a, "toName", {
|
|
26
33
|
enumerable: true,
|
|
27
34
|
configurable: true,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Object.d.ts","sourceRoot":"","sources":["../../../src/oas/object/Object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAA;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAC/D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAE7D,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,WAAW,CAAC,CAAA;IACtE,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,oBAAoB,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAA;IAC7D,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,eAAe,CAAA;IACvB,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,WAAW,GAAG,SAAS,CAAA;IAC9D,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,eAAe,CAAA;IACvB,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAChC,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,qBAAa,SAAU,SAAQ,OAAO;;IACpC,OAAO,EAAE,QAAQ,CAAW;IAC5B,IAAI,EAAE,QAAQ,CAAW;gBAGb,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,cAAc;IAM/D,MAAM,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,cAAc,GAAG,SAAS;IASjE,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAED,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED,IAAI,UAAU,IACV,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,WAAW,CAAC,GAC1D,SAAS,CAEZ;IAED,IAAI,QAAQ,IAAI,MAAM,EAAE,GAAG,SAAS,CAEnC;IAED,IAAI,oBAAoB,IACpB,OAAO,GACP,SAAS,GACT,MAAM,CAAC,QAAQ,CAAC,GAChB,SAAS,CAEZ;IAED,IAAI,QAAQ,IAAI,OAAO,GAAG,SAAS,CAElC;IAED,WAAW,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,eAAe,GAAG,SAAS;IAsBnE,cAAc,CAAC,EAAE,IAAI,EAAE,EAAE,kBAAkB,GAAG,SAAS;
|
|
1
|
+
{"version":3,"file":"Object.d.ts","sourceRoot":"","sources":["../../../src/oas/object/Object.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAA;AACvD,OAAO,EAAE,KAAK,EAAE,MAAM,wBAAwB,CAAA;AAC9C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAA;AAC/D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAC3C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,4BAA4B,CAAA;AAE7D,MAAM,MAAM,eAAe,GAAG;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,WAAW,CAAC,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,WAAW,CAAC,CAAA;IACtE,QAAQ,EAAE,MAAM,EAAE,CAAA;IAClB,oBAAoB,CAAC,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAA;IAC7D,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,eAAe,CAAA;IACvB,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAA;CACb,CAAA;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,WAAW,GAAG,SAAS,CAAA;IAC9D,QAAQ,CAAC,EAAE,OAAO,CAAA;CACnB,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,eAAe,CAAA;IACvB,KAAK,EAAE,KAAK,CAAA;IACZ,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;IAChC,OAAO,EAAE,WAAW,CAAA;CACrB,CAAA;AAED,qBAAa,SAAU,SAAQ,OAAO;;IACpC,OAAO,EAAE,QAAQ,CAAW;IAC5B,IAAI,EAAE,QAAQ,CAAW;gBAGb,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,OAAO,EAAE,EAAE,cAAc;IAM/D,MAAM,CAAC,UAAU,CAAC,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE,cAAc,GAAG,SAAS;IASjE,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAED,IAAI,WAAW,IAAI,MAAM,GAAG,SAAS,CAEpC;IAED,IAAI,UAAU,IACV,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,WAAW,CAAC,GAC1D,SAAS,CAEZ;IAED,IAAI,QAAQ,IAAI,MAAM,EAAE,GAAG,SAAS,CAEnC;IAED,IAAI,oBAAoB,IACpB,OAAO,GACP,SAAS,GACT,MAAM,CAAC,QAAQ,CAAC,GAChB,SAAS,CAEZ;IAED,IAAI,QAAQ,IAAI,OAAO,GAAG,SAAS,CAElC;IAED,WAAW,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,QAAQ,EAAE,EAAE,eAAe,GAAG,SAAS;IAsBnE,cAAc,CAAC,EAAE,IAAI,EAAE,EAAE,kBAAkB,GAAG,SAAS;IAmBvD,KAAK,IAAI,IAAI,IAAI,MAAM,CAAC,QAAQ,CAAC;IAIjC,OAAO,IAAI,SAAS;IAIpB,WAAW,IAAI,SAAS;CAGzB"}
|
|
@@ -63,15 +63,16 @@ class OasObject extends OasBase_js_1.OasBase {
|
|
|
63
63
|
if (!schema) {
|
|
64
64
|
return this;
|
|
65
65
|
}
|
|
66
|
-
const fields = structuredClone(__classPrivateFieldGet(this, _OasObject_fields, "f"));
|
|
67
66
|
return new OasObject({
|
|
68
67
|
fields: {
|
|
69
|
-
...
|
|
68
|
+
...__classPrivateFieldGet(this, _OasObject_fields, "f"),
|
|
70
69
|
properties: {
|
|
71
|
-
...
|
|
70
|
+
...__classPrivateFieldGet(this, _OasObject_fields, "f").properties,
|
|
72
71
|
[name]: schema
|
|
73
72
|
},
|
|
74
|
-
required: required
|
|
73
|
+
required: required
|
|
74
|
+
? [...__classPrivateFieldGet(this, _OasObject_fields, "f").required, name]
|
|
75
|
+
: __classPrivateFieldGet(this, _OasObject_fields, "f").required
|
|
75
76
|
},
|
|
76
77
|
trail: this.trail.clone(),
|
|
77
78
|
context: this.context,
|
|
@@ -82,13 +83,12 @@ class OasObject extends OasBase_js_1.OasBase {
|
|
|
82
83
|
if (!__classPrivateFieldGet(this, _OasObject_fields, "f").properties[name]) {
|
|
83
84
|
return this;
|
|
84
85
|
}
|
|
85
|
-
const
|
|
86
|
-
const { [name]: _removed, ...properties } = fields.properties;
|
|
86
|
+
const { [name]: _removed, ...properties } = __classPrivateFieldGet(this, _OasObject_fields, "f").properties;
|
|
87
87
|
return new OasObject({
|
|
88
88
|
fields: {
|
|
89
|
-
...
|
|
89
|
+
...__classPrivateFieldGet(this, _OasObject_fields, "f"),
|
|
90
90
|
properties,
|
|
91
|
-
required:
|
|
91
|
+
required: __classPrivateFieldGet(this, _OasObject_fields, "f").required.filter(n => n !== name)
|
|
92
92
|
},
|
|
93
93
|
trail: this.trail.clone(),
|
|
94
94
|
context: this.context,
|