Skip to content

Commit 7390d1b

Browse files
danpoletaevdanpoletaev
committed
Merge branch 'master' into feat/calculate-default-memory-from-expression
2 parents 640167e + 91eb401 commit 7390d1b

File tree

16 files changed

+1482
-1897
lines changed

16 files changed

+1482
-1897
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,12 @@ package | version | changelog
1313
`@apify/dummy-package-for-testing` | 2.2.0 | [CHANGELOG](./packages/dummy/CHANGELOG.md)
1414
`@apify/git` | 2.1.4 | [CHANGELOG](./packages/git/CHANGELOG.md)
1515
`@apify/image_proxy_client` | 2.0.3 | [CHANGELOG](./packages/image_proxy_client/CHANGELOG.md)
16-
`@apify/input_schema` | 3.23.9 | [CHANGELOG](./packages/input_schema/CHANGELOG.md)
17-
`@apify/input_secrets` | 1.2.15 | [CHANGELOG](./packages/input_secrets/CHANGELOG.md)
18-
`@apify/json_schemas` | 0.7.0 | [CHANGELOG](./packages/json_schemas/CHANGELOG.md)
16+
`@apify/input_schema` | 3.24.0 | [CHANGELOG](./packages/input_schema/CHANGELOG.md)
17+
`@apify/input_secrets` | 1.2.16 | [CHANGELOG](./packages/input_secrets/CHANGELOG.md)
18+
`@apify/json_schemas` | 0.8.0 | [CHANGELOG](./packages/json_schemas/CHANGELOG.md)
1919
`@apify/log` | 2.5.26 | [CHANGELOG](./packages/log/CHANGELOG.md)
20-
`@apify/markdown` | 3.0.39 | [CHANGELOG](./packages/markdown/CHANGELOG.md)
20+
`@apify/markdown` | 3.0.40 | [CHANGELOG](./packages/markdown/CHANGELOG.md)
2121
`@apify/payment_qr_codes` | 0.2.1 | [CHANGELOG](./packages/payment_qr_codes/CHANGELOG.md)
2222
`@apify/pseudo_url` | 2.0.67 | [CHANGELOG](./packages/pseudo_url/CHANGELOG.md)
2323
`@apify/timeout` | 0.3.2 | [CHANGELOG](./packages/timeout/CHANGELOG.md)
24-
`@apify/utilities` | 2.23.1 | [CHANGELOG](./packages/utilities/CHANGELOG.md)
24+
`@apify/utilities` | 2.23.2 | [CHANGELOG](./packages/utilities/CHANGELOG.md)

‎package-lock.json‎

Lines changed: 1065 additions & 1868 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎packages/input_schema/CHANGELOG.md‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,25 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [3.24.0](https://github.com/apify/apify-shared-js/compare/@apify/[email protected]...@apify/[email protected]) (2025-11-18)
7+
8+
9+
### Features
10+
11+
* **input_schema:** Add enumSuggestedValues property to input schema ([#569](https://github.com/apify/apify-shared-js/issues/569)) ([dc40a32](https://github.com/apify/apify-shared-js/commit/dc40a328763f7825a3e58464b7bf30ca174a42a4))
12+
13+
14+
15+
16+
17+
## [3.23.10](https://github.com/apify/apify-shared-js/compare/@apify/[email protected]...@apify/[email protected]) (2025-11-18)
18+
19+
**Note:** Version bump only for package @apify/input_schema
20+
21+
22+
23+
24+
625
## [3.23.9](https://github.com/apify/apify-shared-js/compare/@apify/[email protected]...@apify/[email protected]) (2025-11-18)
726

827
**Note:** Version bump only for package @apify/input_schema

‎packages/input_schema/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@apify/input_schema",
3-
"version": "3.23.9",
3+
"version": "3.24.0",
44
"description": "Tools and constants shared across Apify projects.",
55
"main": "./dist/cjs/index.cjs",
66
"module": "./dist/esm/index.mjs",
@@ -49,8 +49,8 @@
4949
},
5050
"dependencies": {
5151
"@apify/consts": "^2.47.0",
52-
"@apify/input_secrets": "^1.2.15",
53-
"@apify/json_schemas": "^0.7.0",
52+
"@apify/input_secrets": "^1.2.16",
53+
"@apify/json_schemas": "^0.8.0",
5454
"acorn-loose": "^8.4.0",
5555
"countries-list": "^3.0.0"
5656
},

‎packages/input_schema/src/types.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@ export type StringFieldDefinition = CommonFieldDefinition<string> & {
1616
minLength?: number;
1717
maxLength?: number;
1818
enum?: readonly string[]; // required if editor is 'select'
19-
enumTitles?: readonly string[]
19+
enumTitles?: readonly string[];
20+
enumSuggestedValues?: readonly string[];
2021
isSecret?: boolean;
2122
// Used for 'datepicker' editor, absolute is considered as default value
2223
dateType?: 'absolute' | 'relative' | 'absoluteOrRelative';

‎packages/input_secrets/CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
## [1.2.16](https://github.com/apify/apify-shared-js/compare/@apify/[email protected]...@apify/[email protected]) (2025-11-18)
7+
8+
**Note:** Version bump only for package @apify/input_secrets
9+
10+
11+
12+
13+
614
## [1.2.15](https://github.com/apify/apify-shared-js/compare/@apify/[email protected]...@apify/[email protected]) (2025-11-18)
715

816
**Note:** Version bump only for package @apify/input_secrets

‎packages/input_secrets/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@apify/input_secrets",
3-
"version": "1.2.15",
3+
"version": "1.2.16",
44
"description": "Package to encrypt and decrypt apify actor input secrets.",
55
"main": "./dist/cjs/index.cjs",
66
"module": "./dist/esm/index.mjs",
@@ -45,7 +45,7 @@
4545
},
4646
"dependencies": {
4747
"@apify/log": "^2.5.26",
48-
"@apify/utilities": "^2.23.1",
48+
"@apify/utilities": "^2.23.2",
4949
"ow": "^0.28.2"
5050
}
5151
}

‎packages/json_schemas/CHANGELOG.md‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
All notable changes to this project will be documented in this file.
44
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
55

6+
# [0.8.0](https://github.com/apify/apify-shared-js/compare/@apify/[email protected]...@apify/[email protected]) (2025-11-18)
7+
8+
9+
### Features
10+
11+
* **input_schema:** Add enumSuggestedValues property to input schema ([#569](https://github.com/apify/apify-shared-js/issues/569)) ([dc40a32](https://github.com/apify/apify-shared-js/commit/dc40a328763f7825a3e58464b7bf30ca174a42a4))
12+
13+
14+
15+
16+
617
# [0.7.0](https://github.com/apify/apify-shared-js/compare/@apify/[email protected]...@apify/[email protected]) (2025-10-23)
718

819

‎packages/json_schemas/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@apify/json_schemas",
3-
"version": "0.7.0",
3+
"version": "0.8.0",
44
"description": "Publicly available JSON schemas for Apify platform",
55
"main": "./dist/cjs/index.cjs",
66
"module": "./dist/esm/index.mjs",

‎packages/json_schemas/schemas/input.schema.json‎

Lines changed: 63 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -98,17 +98,13 @@
9898
"title": { "type": "string" },
9999
"description": { "type": "string" },
100100
"nullable": { "type": "boolean" },
101-
"editor": { "enum": ["javascript", "python", "textfield", "textarea", "datepicker", "hidden", "fileupload"] },
101+
"editor": { "enum": ["javascript", "python", "textfield", "textarea", "datepicker", "select", "fileupload", "hidden"] },
102102
"isSecret": { "type": "boolean" }
103103
},
104104
"required": ["type", "title", "description", "editor"],
105105
"if": {
106106
"properties": {
107-
"isSecret": {
108-
"not": {
109-
"const": true
110-
}
111-
}
107+
"isSecret": { "not": { "const": true } }
112108
}
113109
},
114110
"then": {
@@ -142,7 +138,7 @@
142138
},
143139
"else": {
144140
"properties": {
145-
"editor": { "enum": ["javascript", "python", "textfield", "textarea", "hidden", "fileupload"] }
141+
"editor": { "enum": ["javascript", "python", "textfield", "textarea", "select", "fileupload", "hidden"] }
146142
}
147143
}
148144
},
@@ -156,6 +152,30 @@
156152
"else": {
157153
"properties": { "default": { "type": ["string", "null"] } }
158154
}
155+
},
156+
{
157+
"if": {
158+
"required": ["editor"],
159+
"properties": {
160+
"editor": { "const": "select" }
161+
}
162+
},
163+
"then": {
164+
"properties": {
165+
"enumSuggestedValues": {
166+
"type": "array",
167+
"items": { "type": "string" },
168+
"minItems": 1,
169+
"uniqueItems": true
170+
},
171+
"enumTitles": {
172+
"type": "array",
173+
"items": { "type": "string" },
174+
"minItems": 1
175+
}
176+
},
177+
"required": ["enumSuggestedValues"]
178+
}
159179
}
160180
]
161181
},
@@ -694,7 +714,7 @@
694714
"nullable": { "type": "boolean" },
695715
"minLength": { "type": "integer" },
696716
"maxLength": { "type": "integer" },
697-
"editor": { "enum": ["javascript", "python", "textfield", "textarea", "datepicker", "hidden", "fileupload"] }
717+
"editor": { "enum": ["javascript", "python", "textfield", "textarea", "datepicker", "select", "fileupload", "hidden"] }
698718
},
699719
"required": ["type", "title", "description"],
700720
"allOf": [
@@ -712,7 +732,7 @@
712732
},
713733
"else": {
714734
"properties": {
715-
"editor": { "enum": ["javascript", "python", "textfield", "textarea", "hidden", "fileupload"] }
735+
"editor": { "enum": ["javascript", "python", "textfield", "textarea", "select", "fileupload", "hidden"] }
716736
}
717737
}
718738
},
@@ -726,6 +746,30 @@
726746
"else": {
727747
"properties": { "default": { "type": ["string", "null"] } }
728748
}
749+
},
750+
{
751+
"if": {
752+
"required": ["editor"],
753+
"properties": {
754+
"editor": { "const": "select" }
755+
}
756+
},
757+
"then": {
758+
"properties": {
759+
"enumSuggestedValues": {
760+
"type": "array",
761+
"items": { "type": "string" },
762+
"minItems": 1,
763+
"uniqueItems": true
764+
},
765+
"enumTitles": {
766+
"type": "array",
767+
"items": { "type": "string" },
768+
"minItems": 1
769+
}
770+
},
771+
"required": ["enumSuggestedValues"]
772+
}
729773
}
730774
]
731775
},
@@ -1137,9 +1181,18 @@
11371181
"enumTitles": {
11381182
"type": "array",
11391183
"items": { "type": "string" }
1184+
},
1185+
"enumSuggestedValues": {
1186+
"type": "array",
1187+
"items": { "type": "string" },
1188+
"minItems": 1,
1189+
"uniqueItems": true
11401190
}
11411191
},
1142-
"required": ["type", "enum"]
1192+
"oneOf": [
1193+
{ "required": ["type", "enum"] },
1194+
{ "required": ["type", "enumSuggestedValues"] }
1195+
]
11431196
},
11441197
"arrayItemsKeyValue": {
11451198
"title": "Utils: Array items keyValue definition",

0 commit comments

Comments
 (0)