Skip to content

Commit 5ec9e20

Browse files
mforimfori
committed
Merge branch 'master' into feat/custom-error-message
# Conflicts: # packages/json_schemas/schemas/input.schema.json
2 parents 631fce4 + dc40a32 commit 5ec9e20

File tree

14 files changed

+749
-310
lines changed

14 files changed

+749
-310
lines changed

‎CHANGELOG.md‎

Lines changed: 4 additions & 4 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.8 | [CHANGELOG](./packages/input_schema/CHANGELOG.md)
17-
`@apify/input_secrets` | 1.2.14 | [CHANGELOG](./packages/input_secrets/CHANGELOG.md)
16+
`@apify/input_schema` | 3.23.10 | [CHANGELOG](./packages/input_schema/CHANGELOG.md)
17+
`@apify/input_secrets` | 1.2.16 | [CHANGELOG](./packages/input_secrets/CHANGELOG.md)
1818
`@apify/json_schemas` | 0.7.0 | [CHANGELOG](./packages/json_schemas/CHANGELOG.md)
1919
`@apify/log` | 2.5.26 | [CHANGELOG](./packages/log/CHANGELOG.md)
20-
`@apify/markdown` | 3.0.38 | [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.0 | [CHANGELOG](./packages/utilities/CHANGELOG.md)
24+
`@apify/utilities` | 2.23.2 | [CHANGELOG](./packages/utilities/CHANGELOG.md)

‎package-lock.json‎

Lines changed: 307 additions & 280 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: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
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.23.10](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_schema
9+
10+
11+
12+
13+
14+
## [3.23.9](https://github.com/apify/apify-shared-js/compare/@apify/[email protected]...@apify/[email protected]) (2025-11-18)
15+
16+
**Note:** Version bump only for package @apify/input_schema
17+
18+
19+
20+
21+
622
## [3.23.8](https://github.com/apify/apify-shared-js/compare/@apify/[email protected]...@apify/[email protected]) (2025-11-11)
723

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

‎packages/input_schema/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_schema",
3-
"version": "3.23.8",
3+
"version": "3.23.10",
44
"description": "Tools and constants shared across Apify projects.",
55
"main": "./dist/cjs/index.cjs",
66
"module": "./dist/esm/index.mjs",
@@ -49,7 +49,7 @@
4949
},
5050
"dependencies": {
5151
"@apify/consts": "^2.47.0",
52-
"@apify/input_secrets": "^1.2.14",
52+
"@apify/input_secrets": "^1.2.16",
5353
"@apify/json_schemas": "^0.7.0",
5454
"acorn-loose": "^8.4.0",
5555
"countries-list": "^3.0.0"

‎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: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
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+
14+
## [1.2.15](https://github.com/apify/apify-shared-js/compare/@apify/[email protected]...@apify/[email protected]) (2025-11-18)
15+
16+
**Note:** Version bump only for package @apify/input_secrets
17+
18+
19+
20+
21+
622
## [1.2.14](https://github.com/apify/apify-shared-js/compare/@apify/[email protected]...@apify/[email protected]) (2025-11-11)
723

824
**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.14",
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.0",
48+
"@apify/utilities": "^2.23.2",
4949
"ow": "^0.28.2"
5050
}
5151
}

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

Lines changed: 63 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -99,17 +99,13 @@
9999
"title": { "type": "string" },
100100
"description": { "type": "string" },
101101
"nullable": { "type": "boolean" },
102-
"editor": { "enum": ["javascript", "python", "textfield", "textarea", "datepicker", "hidden", "fileupload"] },
102+
"editor": { "enum": ["javascript", "python", "textfield", "textarea", "datepicker", "select", "fileupload", "hidden"] },
103103
"isSecret": { "type": "boolean" }
104104
},
105105
"required": ["type", "title", "description", "editor"],
106106
"if": {
107107
"properties": {
108-
"isSecret": {
109-
"not": {
110-
"const": true
111-
}
112-
}
108+
"isSecret": { "not": { "const": true } }
113109
}
114110
},
115111
"then": {
@@ -144,7 +140,7 @@
144140
},
145141
"else": {
146142
"properties": {
147-
"editor": { "enum": ["javascript", "python", "textfield", "textarea", "hidden", "fileupload"] }
143+
"editor": { "enum": ["javascript", "python", "textfield", "textarea", "select", "fileupload", "hidden"] }
148144
}
149145
}
150146
},
@@ -158,6 +154,30 @@
158154
"else": {
159155
"properties": { "default": { "type": ["string", "null"] } }
160156
}
157+
},
158+
{
159+
"if": {
160+
"required": ["editor"],
161+
"properties": {
162+
"editor": { "const": "select" }
163+
}
164+
},
165+
"then": {
166+
"properties": {
167+
"enumSuggestedValues": {
168+
"type": "array",
169+
"items": { "type": "string" },
170+
"minItems": 1,
171+
"uniqueItems": true
172+
},
173+
"enumTitles": {
174+
"type": "array",
175+
"items": { "type": "string" },
176+
"minItems": 1
177+
}
178+
},
179+
"required": ["enumSuggestedValues"]
180+
}
161181
}
162182
]
163183
},
@@ -708,7 +728,7 @@
708728
"nullable": { "type": "boolean" },
709729
"minLength": { "type": "integer" },
710730
"maxLength": { "type": "integer" },
711-
"editor": { "enum": ["javascript", "python", "textfield", "textarea", "datepicker", "hidden", "fileupload"] },
731+
"editor": { "enum": ["javascript", "python", "textfield", "textarea", "datepicker", "select", "fileupload", "hidden"] },
712732
"errorMessage": { "$ref": "#/definitions/errorMessage" }
713733
},
714734
"required": ["type", "title", "description"],
@@ -727,7 +747,7 @@
727747
},
728748
"else": {
729749
"properties": {
730-
"editor": { "enum": ["javascript", "python", "textfield", "textarea", "hidden", "fileupload"] }
750+
"editor": { "enum": ["javascript", "python", "textfield", "textarea", "select", "fileupload", "hidden"] }
731751
}
732752
}
733753
},
@@ -741,6 +761,30 @@
741761
"else": {
742762
"properties": { "default": { "type": ["string", "null"] } }
743763
}
764+
},
765+
{
766+
"if": {
767+
"required": ["editor"],
768+
"properties": {
769+
"editor": { "const": "select" }
770+
}
771+
},
772+
"then": {
773+
"properties": {
774+
"enumSuggestedValues": {
775+
"type": "array",
776+
"items": { "type": "string" },
777+
"minItems": 1,
778+
"uniqueItems": true
779+
},
780+
"enumTitles": {
781+
"type": "array",
782+
"items": { "type": "string" },
783+
"minItems": 1
784+
}
785+
},
786+
"required": ["enumSuggestedValues"]
787+
}
744788
}
745789
]
746790
},
@@ -1159,9 +1203,18 @@
11591203
"enumTitles": {
11601204
"type": "array",
11611205
"items": { "type": "string" }
1206+
},
1207+
"enumSuggestedValues": {
1208+
"type": "array",
1209+
"items": { "type": "string" },
1210+
"minItems": 1,
1211+
"uniqueItems": true
11621212
}
11631213
},
1164-
"required": ["type", "enum"]
1214+
"oneOf": [
1215+
{ "required": ["type", "enum"] },
1216+
{ "required": ["type", "enumSuggestedValues"] }
1217+
]
11651218
},
11661219
"arrayItemsKeyValue": {
11671220
"title": "Utils: Array items keyValue definition",

‎packages/markdown/CHANGELOG.md‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,22 @@
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.0.40](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/markdown
9+
10+
11+
12+
13+
14+
## [3.0.39](https://github.com/apify/apify-shared-js/compare/@apify/[email protected]...@apify/[email protected]) (2025-11-18)
15+
16+
**Note:** Version bump only for package @apify/markdown
17+
18+
19+
20+
21+
622
## [3.0.38](https://github.com/apify/apify-shared-js/compare/@apify/[email protected]...@apify/[email protected]) (2025-11-11)
723

824
**Note:** Version bump only for package @apify/markdown

‎packages/markdown/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@apify/markdown",
3-
"version": "3.0.38",
3+
"version": "3.0.40",
44
"description": "Tools and constants shared across Apify projects.",
55
"main": "./dist/cjs/index.cjs",
66
"module": "./dist/esm/index.mjs",
@@ -49,7 +49,7 @@
4949
},
5050
"dependencies": {
5151
"@apify/consts": "^2.47.0",
52-
"@apify/utilities": "^2.23.0",
52+
"@apify/utilities": "^2.23.2",
5353
"marked": "^15.0.0",
5454
"match-all": "^1.2.6"
5555
},

0 commit comments

Comments
 (0)