apify-schema-tools 3.0.0 → 3.1.0
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/.cspell/custom-dictionary.txt +1 -0
- package/CHANGELOG.md +6 -0
- package/biome.json +18 -18
- package/check-samples.sh +4 -0
- package/dist/apify-schema-tools.js +4 -12
- package/dist/apify-schema-tools.js.map +1 -1
- package/dist/apify.js +3 -3
- package/dist/configuration.d.ts +3 -1
- package/dist/configuration.d.ts.map +1 -1
- package/dist/configuration.js +10 -2
- package/dist/configuration.js.map +1 -1
- package/dist/json-schema-conflicts.js +3 -3
- package/dist/json-schema-conflicts.js.map +1 -1
- package/dist/json-schemas.d.ts +1 -1
- package/dist/json-schemas.d.ts.map +1 -1
- package/dist/json-schemas.js +1 -1
- package/dist/json-schemas.js.map +1 -1
- package/package.json +8 -8
- package/samples/package-json-config-merged/.actor/actor.json +15 -0
- package/samples/package-json-config-merged/.actor/dataset_schema.json +32 -0
- package/samples/package-json-config-merged/.actor/input_schema.json +58 -0
- package/samples/package-json-config-merged/custom-add-schemas/add-input.json +21 -0
- package/samples/package-json-config-merged/custom-src-schemas/dataset-item.json +28 -0
- package/samples/package-json-config-merged/custom-src-schemas/input.json +89 -0
- package/samples/package-json-config-merged/package.json +19 -0
- package/samples/package-json-config-merged/src/custom-generated/dataset.ts +25 -0
- package/samples/package-json-config-merged/src/custom-generated/input-utils.ts +73 -0
- package/samples/package-json-config-merged/src/custom-generated/input.ts +49 -0
- package/src/apify-schema-tools.ts +5 -16
- package/src/apify.ts +3 -3
- package/src/configuration.ts +11 -2
- package/src/json-schema-conflicts.ts +3 -3
- package/src/json-schemas.ts +1 -1
- package/test/apify.test.ts +3 -3
- package/test/configuration.test.ts +51 -18
- package/test/json-schema-conflicts.test.ts +1 -1
- package/test/json-schemas.test.ts +1 -1
- package/update-samples.sh +4 -0
package/CHANGELOG.md
CHANGED
package/biome.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
{
|
|
2
|
-
"$schema": "https://biomejs.dev/schemas/2.
|
|
2
|
+
"$schema": "https://biomejs.dev/schemas/2.2.2/schema.json",
|
|
3
3
|
"vcs": {
|
|
4
4
|
"enabled": true,
|
|
5
5
|
"clientKind": "git",
|
|
@@ -30,6 +30,7 @@
|
|
|
30
30
|
"recommended": true,
|
|
31
31
|
"complexity": {
|
|
32
32
|
"noExcessiveCognitiveComplexity": "on",
|
|
33
|
+
"noExcessiveLinesPerFunction": "on",
|
|
33
34
|
"noExcessiveNestedTestSuites": "on",
|
|
34
35
|
"noForEach": "on",
|
|
35
36
|
"noUselessStringConcat": "on",
|
|
@@ -40,25 +41,15 @@
|
|
|
40
41
|
"correctness": {
|
|
41
42
|
"noPrivateImports": "on",
|
|
42
43
|
"noUndeclaredDependencies": "on",
|
|
43
|
-
"noUndeclaredVariables": "on"
|
|
44
|
+
"noUndeclaredVariables": "on",
|
|
45
|
+
"useJsonImportAttributes": "on"
|
|
44
46
|
},
|
|
45
47
|
"nursery": {
|
|
46
|
-
"noAwaitInLoop": "on",
|
|
47
|
-
"noBitwiseOperators": "on",
|
|
48
|
-
"noConstantBinaryExpression": "on",
|
|
49
|
-
"noExcessiveLinesPerFunction": "on",
|
|
50
48
|
"noImportCycles": "on",
|
|
51
|
-
"
|
|
52
|
-
"noShadow": "on",
|
|
53
|
-
"noUnassignedVariables": "on",
|
|
54
|
-
"noUselessBackrefInRegex": "on",
|
|
55
|
-
"useAdjacentGetterSetter": "on",
|
|
56
|
-
"useIterableCallbackReturn": "on",
|
|
57
|
-
"useJsonImportAttribute": "on",
|
|
58
|
-
"useNumericSeparators": "on",
|
|
59
|
-
"useObjectSpread": "on"
|
|
49
|
+
"noShadow": "on"
|
|
60
50
|
},
|
|
61
51
|
"performance": {
|
|
52
|
+
"noAwaitInLoops": "on",
|
|
62
53
|
"noBarrelFile": "on",
|
|
63
54
|
"noDelete": "on",
|
|
64
55
|
"noNamespaceImport": "on",
|
|
@@ -72,6 +63,7 @@
|
|
|
72
63
|
"noEnum": "on",
|
|
73
64
|
"noExportedImports": "on",
|
|
74
65
|
"noInferrableTypes": "on",
|
|
66
|
+
"noMagicNumbers": "on",
|
|
75
67
|
"noNamespace": "on",
|
|
76
68
|
"noNegationElse": "on",
|
|
77
69
|
"noNestedTernary": "on",
|
|
@@ -94,9 +86,12 @@
|
|
|
94
86
|
"useExplicitLengthCheck": "on",
|
|
95
87
|
"useFilenamingConvention": "on",
|
|
96
88
|
"useForOf": "on",
|
|
89
|
+
"useGroupedAccessorPairs": "on",
|
|
97
90
|
"useNamingConvention": "on",
|
|
98
91
|
"useNodeAssertStrict": "on",
|
|
99
92
|
"useNumberNamespace": "on",
|
|
93
|
+
"useNumericSeparators": "on",
|
|
94
|
+
"useObjectSpread": "on",
|
|
100
95
|
"useShorthandAssign": "on",
|
|
101
96
|
"useSingleVarDeclarator": "on",
|
|
102
97
|
"useThrowNewError": "on",
|
|
@@ -104,12 +99,17 @@
|
|
|
104
99
|
"useTrimStartEnd": "on"
|
|
105
100
|
},
|
|
106
101
|
"suspicious": {
|
|
102
|
+
"noBitwiseOperators": "on",
|
|
103
|
+
"noConstantBinaryExpressions": "on",
|
|
107
104
|
"noDuplicateTestHooks": "on",
|
|
108
105
|
"noEmptyBlockStatements": "on",
|
|
109
106
|
"noEvolvingTypes": "on",
|
|
110
107
|
"noExportsInTest": "on",
|
|
111
108
|
"noFocusedTests": "on",
|
|
112
109
|
"noMisplacedAssertion": "on",
|
|
110
|
+
"noUnassignedVariables": "on",
|
|
111
|
+
"noUselessRegexBackrefs": "on",
|
|
112
|
+
"useIterableCallbackReturn": "on",
|
|
113
113
|
"useNumberToFixedDigitsArgument": "on"
|
|
114
114
|
}
|
|
115
115
|
}
|
|
@@ -119,11 +119,11 @@
|
|
|
119
119
|
"includes": ["test/**"],
|
|
120
120
|
"linter": {
|
|
121
121
|
"rules": {
|
|
122
|
-
"
|
|
123
|
-
"noExcessiveLinesPerFunction": "off"
|
|
124
|
-
"noMagicNumbers": "off"
|
|
122
|
+
"complexity": {
|
|
123
|
+
"noExcessiveLinesPerFunction": "off"
|
|
125
124
|
},
|
|
126
125
|
"style": {
|
|
126
|
+
"noMagicNumbers": "off",
|
|
127
127
|
"useNamingConvention": "off"
|
|
128
128
|
}
|
|
129
129
|
}
|
package/check-samples.sh
CHANGED
|
@@ -4,7 +4,7 @@ import { existsSync } from "node:fs";
|
|
|
4
4
|
import { join } from "node:path";
|
|
5
5
|
import { ArgumentDefaultsHelpFormatter, ArgumentParser } from "argparse";
|
|
6
6
|
import { ACTOR_CONFIG_PATH, DATASET_SCHEMA_FIELD, DESCRIPTION_FIELDS, filterValidInputSchemaProperties, generateInputDefaultsTsFileContent, getPathRelativeToActorConfig, } from "./apify.js";
|
|
7
|
-
import {
|
|
7
|
+
import { addCommonCliArgs, parseConfigurationFromFileOrDefault, writeConfigurationToPackageJson, } from "./configuration.js";
|
|
8
8
|
import { readFile, writeFile } from "./filesystem.js";
|
|
9
9
|
import { checkConflicts } from "./json-schema-conflicts.js";
|
|
10
10
|
import { compareSchemas, mergeObjectSchemas, readJsonSchema, readJsonSchemaField, writeJsonSchema, writeSchemaToField, } from "./json-schemas.js";
|
|
@@ -16,17 +16,11 @@ const rootParser = new ArgumentParser({
|
|
|
16
16
|
});
|
|
17
17
|
// Create subparsers for commands, and define arguments shared by multiple commands
|
|
18
18
|
const subparsers = rootParser.add_subparsers();
|
|
19
|
-
const DEEP_MERGE_PARAM = "--deep-merge";
|
|
20
|
-
const DEEP_MERGE_OPTIONS = {
|
|
21
|
-
help: "whether to deep merge additional schemas into the main schema",
|
|
22
|
-
action: "store_true",
|
|
23
|
-
default: false,
|
|
24
|
-
};
|
|
25
19
|
const initParser = subparsers.add_parser("init", {
|
|
26
20
|
help: "Initialize the Apify Schema Tools project with default settings.",
|
|
27
21
|
formatter_class: ArgumentDefaultsHelpFormatter,
|
|
28
22
|
});
|
|
29
|
-
|
|
23
|
+
addCommonCliArgs(initParser, configuration);
|
|
30
24
|
initParser.add_argument("--no-config-file", {
|
|
31
25
|
help: "do not create a configuration file in package.json",
|
|
32
26
|
action: "store_true",
|
|
@@ -109,8 +103,7 @@ const syncParser = subparsers.add_parser("sync", {
|
|
|
109
103
|
By default, if conflicts are detected, the user will be prompted to resolve them.`,
|
|
110
104
|
formatter_class: ArgumentDefaultsHelpFormatter,
|
|
111
105
|
});
|
|
112
|
-
|
|
113
|
-
syncParser.add_argument(DEEP_MERGE_PARAM, DEEP_MERGE_OPTIONS);
|
|
106
|
+
addCommonCliArgs(syncParser, configuration);
|
|
114
107
|
syncParser.add_argument("--include-input-utils", {
|
|
115
108
|
help: "include input utilities in the generated TypeScript files: 'input' input and 'ts-types' output are required",
|
|
116
109
|
choices: ["true", "false"],
|
|
@@ -213,8 +206,7 @@ const checkParser = subparsers.add_parser("check", {
|
|
|
213
206
|
help: "Check the schemas for consistency and correctness. (WARNING: input utils will not be checked!)",
|
|
214
207
|
formatter_class: ArgumentDefaultsHelpFormatter,
|
|
215
208
|
});
|
|
216
|
-
|
|
217
|
-
checkParser.add_argument(DEEP_MERGE_PARAM, DEEP_MERGE_OPTIONS);
|
|
209
|
+
addCommonCliArgs(checkParser, configuration);
|
|
218
210
|
checkParser.add_argument("--ignore-descriptions", {
|
|
219
211
|
help: "ignore the 'title' and 'description' fields during the comparison",
|
|
220
212
|
action: "store_true",
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"apify-schema-tools.js","sourceRoot":"","sources":["../src/apify-schema-tools.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"apify-schema-tools.js","sourceRoot":"","sources":["../src/apify-schema-tools.ts"],"names":[],"mappings":";AAEA,oGAAoG;AAEpG,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACrC,OAAO,EAAE,IAAI,EAAE,MAAM,WAAW,CAAC;AACjC,OAAO,EAAE,6BAA6B,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AACzE,OAAO,EACN,iBAAiB,EACjB,oBAAoB,EACpB,kBAAkB,EAClB,gCAAgC,EAChC,kCAAkC,EAClC,4BAA4B,GAC5B,MAAM,YAAY,CAAC;AACpB,OAAO,EACN,gBAAgB,EAEhB,mCAAmC,EACnC,+BAA+B,GAC/B,MAAM,oBAAoB,CAAC;AAC5B,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AACtD,OAAO,EAAmC,cAAc,EAAE,MAAM,4BAA4B,CAAC;AAC7F,OAAO,EACN,cAAc,EACd,kBAAkB,EAElB,cAAc,EACd,mBAAmB,EACnB,eAAe,EACf,kBAAkB,GAClB,MAAM,mBAAmB,CAAC;AAC3B,OAAO,EACN,2BAA2B,EAC3B,+BAA+B,EAC/B,wBAAwB,EACxB,sBAAsB,EACtB,4BAA4B,EAC5B,mBAAmB,GACnB,MAAM,iBAAiB,CAAC;AAEzB,MAAM,aAAa,GAAG,mCAAmC,EAAE,CAAC;AAE5D,MAAM,UAAU,GAAG,IAAI,cAAc,CAAC;IACrC,WAAW,EAAE,qGAAqG;IAClH,eAAe,EAAE,6BAA6B;CAC9C,CAAC,CAAC;AAEH,mFAAmF;AAEnF,MAAM,UAAU,GAAG,UAAU,CAAC,cAAc,EAAE,CAAC;AAS/C,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,EAAE;IAChD,IAAI,EAAE,kEAAkE;IACxE,eAAe,EAAE,6BAA6B;CAC9C,CAAC,CAAC;AACH,gBAAgB,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;AAC5C,UAAU,CAAC,YAAY,CAAC,kBAAkB,EAAE;IAC3C,IAAI,EAAE,oDAAoD;IAC1D,MAAM,EAAE,YAAY;IACpB,OAAO,EAAE,KAAK;CACd,CAAC,CAAC;AACH,UAAU,CAAC,YAAY,CAAC,oBAAoB,EAAE;IAC7C,IAAI,EAAE,kFAAkF;IACxF,MAAM,EAAE,YAAY;IACpB,OAAO,EAAE,KAAK;CACd,CAAC,CAAC;AAEH,SAAS,qBAAqB,CAAC,IAAc;IAC5C,IAAI,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,CAAC;QAChC,OAAO,CAAC,GAAG,CAAC,kCAAkC,IAAI,CAAC,SAAS,4BAA4B,CAAC,CAAC;QAC1F,OAAO;IACR,CAAC;IACD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,YAAY,CAAC,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,kDAAkD,CAAC,CAAC;IACrE,CAAC;IACD,MAAM,WAAW,GAAG,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;IACtD,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAC7C,OAAO,CAAC,GAAG,CAAC,+BAA+B,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;IAC7D,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QACpB,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC;QACpE,OAAO,CAAC,GAAG,CAAC,0CAA0C,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;IACzE,CAAC;AACF,CAAC;AAED,SAAS,uBAAuB,CAAC,IAAc;IAC9C,IAAI,CAAC,UAAU,CAAC,iBAAiB,CAAC,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,sCAAsC,iBAAiB,sBAAsB,CAAC,CAAC;IAChG,CAAC;IACD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,iBAAiB,CAAC,CAAC,CAAC;IAC5D,MAAM,mBAAmB,GAAG,4BAA4B,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;IAC9E,IAAI,WAAW,CAAC,QAAQ,EAAE,OAAO,KAAK,mBAAmB,EAAE,CAAC;QAC3D,SAAS,CACR,iBAAiB,EACjB,IAAI,CAAC,SAAS,CACb;YACC,GAAG,WAAW;YACd,QAAQ,EAAE;gBACT,GAAG,WAAW,CAAC,QAAQ;gBACvB,OAAO,EAAE,mBAAmB;aAC5B;SACD,EACD,IAAI,EACJ,CAAC,CACD,CACD,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,WAAW,iBAAiB,iCAAiC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;IACjG,CAAC;IACD,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,cAAc,CAAC,EAAE,CAAC;QACtC,SAAS,CACR,IAAI,CAAC,cAAc,EACnB,IAAI,CAAC,SAAS,CACb;YACC,kBAAkB,EAAE,CAAC;YACrB,CAAC,oBAAoB,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,UAAU,EAAE,EAAE,EAAE;SAC1D,EACD,IAAI,EACJ,CAAC,CACD,CACD,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,iCAAiC,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC;IACrE,CAAC;IACD,IAAI,UAAU,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;QAClC,OAAO,CAAC,GAAG,CAAC,oCAAoC,IAAI,CAAC,WAAW,4BAA4B,CAAC,CAAC;QAC9F,OAAO;IACR,CAAC;IACD,MAAM,iBAAiB,GAAG,mBAAmB,CAAC,IAAI,CAAC,cAAc,EAAE,oBAAoB,CAAC,CAAC;IACzF,eAAe,CAAC,IAAI,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;AACtD,CAAC;AAED,SAAS,IAAI,CAAC,IAAc;IAC3B,IAAI,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC;QAClD,MAAM,IAAI,KAAK,CAAC,2FAA2F,CAAC,CAAC;IAC9G,CAAC;IAED,OAAO,CAAC,GAAG,CAAC,2DAA2D,CAAC,CAAC;IAEzE,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,CAAC;QAC1B,+BAA+B,CAAC,IAAI,CAAC,CAAC;QACtC,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAC;IACtD,CAAC;IAED,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC3B,OAAO,CAAC,GAAG,CAAC,kEAAkE,CAAC,CAAC;QAChF,OAAO;IACR,CAAC;IAED,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,qBAAqB,CAAC,IAAI,CAAC,CAAC;IAC7B,CAAC;IAED,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QACpC,uBAAuB,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;AACF,CAAC;AAED,UAAU,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;AAUxC,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,CAAC,MAAM,EAAE;IAChD,IAAI,EAAE;kFAC2E;IACjF,eAAe,EAAE,6BAA6B;CAC9C,CAAC,CAAC;AACH,gBAAgB,CAAC,UAAU,EAAE,aAAa,CAAC,CAAC;AAC5C,UAAU,CAAC,YAAY,CAAC,uBAAuB,EAAE;IAChD,IAAI,EAAE,6GAA6G;IACnH,OAAO,EAAE,CAAC,MAAM,EAAE,OAAO,CAAC;IAC1B,OAAO,EAAE,MAAM;CACf,CAAC,CAAC;AACH,UAAU,CAAC,YAAY,CAAC,SAAS,EAAE;IAClC,IAAI,EAAE,0DAA0D;IAChE,MAAM,EAAE,YAAY;IACpB,OAAO,EAAE,KAAK;CACd,CAAC,CAAC;AACH,UAAU,CAAC,YAAY,CAAC,oBAAoB,EAAE;IAC7C,IAAI,EAAE,mDAAmD;IACzD,MAAM,EAAE,YAAY;IACpB,OAAO,EAAE,KAAK;CACd,CAAC,CAAC;AAEH,SAAS,6BAA6B,CAAC,IAAc;IACpD,IAAI,IAAI,CAAC,gBAAgB,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QACzC,MAAM,IAAI,KAAK,CAAC,wEAAwE,CAAC,CAAC;IAC3F,CAAC;IACD,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QAChB,OAAO,KAAK,CAAC;IACd,CAAC;IACD,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC;QAC3B,OAAO,OAAO,CAAC;IAChB,CAAC;IACD,OAAO,aAAa,CAAC;AACtB,CAAC;AAED,KAAK,UAAU,eAAe,CAAC,IAAc;IAC5C,IAAI,YAAY,GAAG;QAClB,YAAY,EAAE,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC;QAC5C,gBAAgB,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS;KAC7E,CAAC;IACF,IAAI,oBAA8C,CAAC;IACnD,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QAC1C,MAAM,0BAA0B,GAAG,6BAA6B,CAAC,IAAI,CAAC,CAAC;QACvE,MAAM,mBAAmB,GAAG,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC9D,YAAY,GAAG,MAAM,cAAc,CAClC,YAAY,CAAC,YAAY,EACzB,IAAI,CAAC,SAAS,EACd,YAAY,CAAC,gBAAgB,EAC7B,IAAI,CAAC,SAAS,EACd,mBAAmB,EACnB,IAAI,CAAC,UAAU,EACf,kBAAkB,EAClB,0BAA0B,CAC1B,CAAC;QACF,oBAAoB,GAAG,YAAY,CAAC,gBAAgB;YACnD,CAAC,CAAC,kBAAkB,CAAC,YAAY,CAAC,YAAY,EAAE,YAAY,CAAC,gBAAgB,EAAE,IAAI,CAAC,UAAU,CAAC;YAC/F,CAAC,CAAC,YAAY,CAAC,YAAY,CAAC;QAC7B,eAAe,CAAC,IAAI,CAAC,YAAY,EAAE,gCAAgC,CAAC,oBAAoB,CAAC,CAAC,CAAC;IAC5F,CAAC;IACD,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACtC,IAAI,CAAC,oBAAoB,EAAE,CAAC;YAC3B,oBAAoB,GAAG,YAAY,CAAC,gBAAgB;gBACnD,CAAC,CAAC,kBAAkB,CAAC,YAAY,CAAC,YAAY,EAAE,YAAY,CAAC,gBAAgB,EAAE,IAAI,CAAC,UAAU,CAAC;gBAC/F,CAAC,CAAC,YAAY,CAAC,YAAY,CAAC;QAC9B,CAAC;QACD,mBAAmB,CAClB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,EACpC,4BAA4B,CAAC,OAAO,EAAE,+BAA+B,CAAC,oBAAoB,CAAC,CAAC,CAC5F,CAAC;QACF,IAAI,IAAI,CAAC,mBAAmB,KAAK,MAAM,EAAE,CAAC;YACzC,mBAAmB,CAClB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,gBAAgB,CAAC,EAC1C,kCAAkC,CAAC,oBAAoB,CAAC,CACxD,CAAC;QACH,CAAC;IACF,CAAC;IACD,qFAAqF;IACrF,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,YAAY,CAAC,CAAC;IAC3D,IAAI,IAAI,CAAC,SAAS,IAAI,YAAY,CAAC,gBAAgB,EAAE,CAAC;QACrD,eAAe,CAAC,IAAI,CAAC,SAAS,EAAE,YAAY,CAAC,gBAAgB,CAAC,CAAC;IAChE,CAAC;AACF,CAAC;AAED,KAAK,UAAU,iBAAiB,CAAC,IAAc;IAC9C,IAAI,cAAc,GAAG;QACpB,YAAY,EAAE,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC;QAC9C,gBAAgB,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC,CAAC,CAAC,SAAS;KACjF,CAAC;IACF,IAAI,sBAAgD,CAAC;IACrD,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QAC1C,MAAM,0BAA0B,GAAG,6BAA6B,CAAC,IAAI,CAAC,CAAC;QACvE,MAAM,qBAAqB,GAAG,mBAAmB,CAAC,IAAI,CAAC,cAAc,EAAE,oBAAoB,CAAC,CAAC;QAC7F,cAAc,GAAG,MAAM,cAAc,CACpC,cAAc,CAAC,YAAY,EAC3B,IAAI,CAAC,WAAW,EAChB,cAAc,CAAC,gBAAgB,EAC/B,IAAI,CAAC,WAAW,EAChB,qBAAqB,EACrB,IAAI,CAAC,UAAU,EACf,kBAAkB,EAClB,0BAA0B,CAC1B,CAAC;QACF,sBAAsB,GAAG,cAAc,CAAC,gBAAgB;YACvD,CAAC,CAAC,kBAAkB,CAAC,cAAc,CAAC,YAAY,EAAE,cAAc,CAAC,gBAAgB,EAAE,IAAI,CAAC,UAAU,CAAC;YACnG,CAAC,CAAC,cAAc,CAAC,YAAY,CAAC;QAC/B,kBAAkB,CAAC,IAAI,CAAC,cAAc,EAAE,sBAAsB,EAAE,oBAAoB,CAAC,CAAC;IACvF,CAAC;IACD,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACtC,IAAI,CAAC,sBAAsB,EAAE,CAAC;YAC7B,sBAAsB,GAAG,cAAc,CAAC,gBAAgB;gBACvD,CAAC,CAAC,kBAAkB,CAAC,cAAc,CAAC,YAAY,EAAE,cAAc,CAAC,gBAAgB,EAAE,IAAI,CAAC,UAAU,CAAC;gBACnG,CAAC,CAAC,cAAc,CAAC,YAAY,CAAC;QAChC,CAAC;QACD,mBAAmB,CAClB,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,EACtC,4BAA4B,CAAC,aAAa,EAAE,+BAA+B,CAAC,sBAAsB,CAAC,CAAC,CACpG,CAAC;IACH,CAAC;IACD,qFAAqF;IACrF,eAAe,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,YAAY,CAAC,CAAC;IAC/D,IAAI,IAAI,CAAC,WAAW,IAAI,cAAc,CAAC,gBAAgB,EAAE,CAAC;QACzD,eAAe,CAAC,IAAI,CAAC,WAAW,EAAE,cAAc,CAAC,gBAAgB,CAAC,CAAC;IACpE,CAAC;AACF,CAAC;AAED,SAAS,IAAI,CAAC,IAAc;IAC3B,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAC,CAAC;IAElC,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,eAAe,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;IAED,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QACpC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;AACF,CAAC;AAED,UAAU,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAC;AAQxC,MAAM,WAAW,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,EAAE;IAClD,IAAI,EAAE,gGAAgG;IACtG,eAAe,EAAE,6BAA6B;CAC9C,CAAC,CAAC;AACH,gBAAgB,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;AAC7C,WAAW,CAAC,YAAY,CAAC,uBAAuB,EAAE;IACjD,IAAI,EAAE,mEAAmE;IACzE,MAAM,EAAE,YAAY;IACpB,OAAO,EAAE,KAAK;CACd,CAAC,CAAC;AAEH,SAAS,iBAAiB,CAAC,IAAe;IACzC,IAAI,iBAAiB,GAAG,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IACvD,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;QACpB,iBAAiB,GAAG,kBAAkB,CAAC,iBAAiB,EAAE,cAAc,CAAC,IAAI,CAAC,SAAS,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAC5G,CAAC;IACD,MAAM,oBAAoB,GAAG,gCAAgC,CAAC,iBAAiB,CAAC,CAAC;IACjF,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QAC1C,MAAM,iBAAiB,GAAG,cAAc,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;QAC5D,MAAM,qBAAqB,GAAG,cAAc,CAC3C,oBAAoB,EACpB,iBAAiB,EACjB,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,SAAS,CACzD,CAAC;QACF,IAAI,CAAC,qBAAqB,EAAE,CAAC;YAC5B,OAAO,CAAC,KAAK,CAAC,oFAAoF,CAAC,CAAC;YACpG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC;IACF,CAAC;IACD,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACtC,MAAM,cAAc,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC;QACtE,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAAC,CAAC;QAC1F,MAAM,sBAAsB,GAAG,+BAA+B,CAAC,iBAAiB,CAAC,CAAC;QAClF,MAAM,iBAAiB,GAAG,2BAA2B,CACpD,sBAAsB,EACtB,gBAAgB,EAChB,IAAI,CAAC,mBAAmB,CACxB,CAAC;QACF,IAAI,CAAC,iBAAiB,EAAE,CAAC;YACxB,OAAO,CAAC,KAAK,CACZ,0GAA0G,CAC1G,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC;IACF,CAAC;AACF,CAAC;AAED,SAAS,mBAAmB,CAAC,IAAe;IAC3C,IAAI,mBAAmB,GAAG,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;IAC3D,IAAI,IAAI,CAAC,WAAW,EAAE,CAAC;QACtB,mBAAmB,GAAG,kBAAkB,CAAC,mBAAmB,EAAE,cAAc,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAClH,CAAC;IACD,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC;QAC1C,MAAM,mBAAmB,GAAG,mBAAmB,CAAC,IAAI,CAAC,cAAc,EAAE,oBAAoB,CAAC,CAAC;QAC3F,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC1B,OAAO,CAAC,KAAK,CAAC,yBAAyB,oBAAoB,kBAAkB,IAAI,CAAC,cAAc,GAAG,CAAC,CAAC;YACrG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC;QACD,MAAM,uBAAuB,GAAG,cAAc,CAC7C,mBAAmB,EACnB,mBAAmB,EACnB,IAAI,CAAC,mBAAmB,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,SAAS,CACzD,CAAC;QACF,IAAI,CAAC,uBAAuB,EAAE,CAAC;YAC9B,OAAO,CAAC,KAAK,CAAC,wFAAwF,CAAC,CAAC;YACxG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC;IACF,CAAC;IACD,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;QACtC,MAAM,gBAAgB,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,CAAC,CAAC;QAC1E,MAAM,kBAAkB,GAAG,wBAAwB,CAAC,sBAAsB,CAAC,gBAAgB,CAAC,CAAC,CAAC;QAC9F,MAAM,wBAAwB,GAAG,+BAA+B,CAAC,mBAAmB,CAAC,CAAC;QACtF,MAAM,mBAAmB,GAAG,2BAA2B,CACtD,wBAAwB,EACxB,kBAAkB,EAClB,IAAI,CAAC,mBAAmB,CACxB,CAAC;QACF,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC1B,OAAO,CAAC,KAAK,CACZ,4GAA4G,CAC5G,CAAC;YACF,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACjB,CAAC;IACF,CAAC;AACF,CAAC;AAED,SAAS,KAAK,CAAC,IAAe;IAC7B,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,OAAO,CAAC,EAAE,CAAC;QAClC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IACD,IAAI,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;QACpC,mBAAmB,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IACD,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC;AAC9B,CAAC;AAED,WAAW,CAAC,YAAY,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,CAAC;AAE1C,oBAAoB;AAEpB,MAAM,UAAU,GAAG,UAAU,CAAC,UAAU,EAAE,CAAC;AAC3C,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC"}
|
package/dist/apify.js
CHANGED
|
@@ -105,9 +105,9 @@ export function getInputWithDefaultValues(input?: Input | null): InputWithDefaul
|
|
|
105
105
|
}${requiredParamsWithoutDefaults.length > 0
|
|
106
106
|
? `
|
|
107
107
|
if (!input) {
|
|
108
|
-
throw new Error(\`Input is required, because the following fields are required:
|
|
109
|
-
|
|
110
|
-
|
|
108
|
+
throw new Error(\`Input is required, because the following fields are required: \${REQUIRED_INPUT_FIELDS_WITHOUT_DEFAULT.join(
|
|
109
|
+
", ",
|
|
110
|
+
)}\`);
|
|
111
111
|
}`
|
|
112
112
|
: ""}
|
|
113
113
|
${areThereDefaults
|
package/dist/configuration.d.ts
CHANGED
|
@@ -12,6 +12,7 @@ export interface CommonCliArgs {
|
|
|
12
12
|
src_dataset: string;
|
|
13
13
|
add_input?: string;
|
|
14
14
|
add_dataset?: string;
|
|
15
|
+
deep_merge: boolean;
|
|
15
16
|
input_schema: string;
|
|
16
17
|
dataset_schema: string;
|
|
17
18
|
output_ts_dir: string;
|
|
@@ -29,6 +30,7 @@ export declare const Configuration: import("zod/v4").ZodObject<{
|
|
|
29
30
|
srcDataset: import("zod/v4").ZodDefault<import("zod/v4").ZodString>;
|
|
30
31
|
addInput: import("zod/v4").ZodOptional<import("zod/v4").ZodString>;
|
|
31
32
|
addDataset: import("zod/v4").ZodOptional<import("zod/v4").ZodString>;
|
|
33
|
+
deepMerge: import("zod/v4").ZodDefault<import("zod/v4").ZodBoolean>;
|
|
32
34
|
inputSchema: import("zod/v4").ZodDefault<import("zod/v4").ZodString>;
|
|
33
35
|
datasetSchema: import("zod/v4").ZodDefault<import("zod/v4").ZodString>;
|
|
34
36
|
outputTSDir: import("zod/v4").ZodDefault<import("zod/v4").ZodString>;
|
|
@@ -39,6 +41,6 @@ export declare function writeConfigurationToPackageJson(args: CommonCliArgs): vo
|
|
|
39
41
|
* This function will set as default values the configuration from package.json, or the default one.
|
|
40
42
|
* In this way, the CLI arguments can override the configuration.
|
|
41
43
|
*/
|
|
42
|
-
export declare function
|
|
44
|
+
export declare function addCommonCliArgs(parser: ArgumentParser, configuration: zodInfer<typeof Configuration>): void;
|
|
43
45
|
export {};
|
|
44
46
|
//# sourceMappingURL=configuration.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../src/configuration.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAG9F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,
|
|
1
|
+
{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../src/configuration.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAG9F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,UAAU,CAAC;AAC/C,OAAO,EAAiD,KAAK,KAAK,IAAI,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAW/F,QAAA,MAAM,MAAM,+BAAgC,CAAC;AAC7C,QAAA,MAAM,OAAO,uCAAwC,CAAC;AAEtD,KAAK,KAAK,GAAG,CAAC,OAAO,MAAM,CAAC,CAAC,MAAM,CAAC,CAAC;AACrC,KAAK,MAAM,GAAG,CAAC,OAAO,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC;AAEvC,MAAM,WAAW,aAAa;IAC7B,KAAK,EAAE,KAAK,EAAE,CAAC;IACf,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;;gCAWxB,CAAC;AAEH,wBAAgB,mCAAmC,IAAI,QAAQ,CAAC,OAAO,aAAa,CAAC,CAIpF;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,aAAa,GAAG,IAAI,CAmBzE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,cAAc,EAAE,aAAa,EAAE,QAAQ,CAAC,OAAO,aAAa,CAAC,GAAG,IAAI,CAiD5G"}
|
package/dist/configuration.js
CHANGED
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
/** biome-ignore-all lint/style/useNamingConvention: parsed CLI arguments are in snake_case */
|
|
2
2
|
import { existsSync } from "node:fs";
|
|
3
|
-
import { array, enum as enum_, object, string } from "zod/v4";
|
|
3
|
+
import { array, boolean, enum as enum_, object, string } from "zod/v4";
|
|
4
4
|
import { readFile, writeFile } from "./filesystem.js";
|
|
5
5
|
const zod = {
|
|
6
6
|
object,
|
|
7
7
|
array,
|
|
8
|
+
boolean,
|
|
8
9
|
enum: enum_,
|
|
9
10
|
string,
|
|
10
11
|
};
|
|
@@ -17,6 +18,7 @@ export const Configuration = zod.object({
|
|
|
17
18
|
srcDataset: zod.string().default("src-schemas/dataset-item.json"),
|
|
18
19
|
addInput: zod.string().optional(),
|
|
19
20
|
addDataset: zod.string().optional(),
|
|
21
|
+
deepMerge: zod.boolean().default(false),
|
|
20
22
|
inputSchema: zod.string().default(".actor/input_schema.json"),
|
|
21
23
|
datasetSchema: zod.string().default(".actor/dataset_schema.json"),
|
|
22
24
|
outputTSDir: zod.string().default("src/generated"),
|
|
@@ -39,6 +41,7 @@ export function writeConfigurationToPackageJson(args) {
|
|
|
39
41
|
srcDataset: args.src_dataset,
|
|
40
42
|
addInput: args.add_input,
|
|
41
43
|
addDataset: args.add_dataset,
|
|
44
|
+
deepMerge: args.deep_merge,
|
|
42
45
|
inputSchema: args.input_schema,
|
|
43
46
|
datasetSchema: args.dataset_schema,
|
|
44
47
|
outputTSDir: args.output_ts_dir,
|
|
@@ -49,7 +52,7 @@ export function writeConfigurationToPackageJson(args) {
|
|
|
49
52
|
* This function will set as default values the configuration from package.json, or the default one.
|
|
50
53
|
* In this way, the CLI arguments can override the configuration.
|
|
51
54
|
*/
|
|
52
|
-
export function
|
|
55
|
+
export function addCommonCliArgs(parser, configuration) {
|
|
53
56
|
parser.add_argument("-i", "--input", {
|
|
54
57
|
help: "specify which sources to use for generation",
|
|
55
58
|
choices: [...INPUTS],
|
|
@@ -78,6 +81,11 @@ export function addCommonCLIArgs(parser, configuration) {
|
|
|
78
81
|
help: "path to an additional schema to merge into the dataset schema",
|
|
79
82
|
default: configuration.addDataset,
|
|
80
83
|
});
|
|
84
|
+
parser.add_argument("--deep-merge", {
|
|
85
|
+
help: "whether to deep merge additional schemas into the main schema",
|
|
86
|
+
action: "store_true",
|
|
87
|
+
default: configuration.deepMerge,
|
|
88
|
+
});
|
|
81
89
|
parser.add_argument("--input-schema", {
|
|
82
90
|
help: "the path of the destination input schema file",
|
|
83
91
|
default: configuration.inputSchema,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../src/configuration.ts"],"names":[],"mappings":"AAAA,8FAA8F;AAE9F,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,OAAO,EAAE,KAAK,EAAE,IAAI,IAAI,KAAK,EAAE,MAAM,EAAE,MAAM,EAA0B,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../src/configuration.ts"],"names":[],"mappings":"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"}
|
|
@@ -52,7 +52,7 @@ async function checkRootFieldsConflicts(sourceSchema, additionalSchema, targetSc
|
|
|
52
52
|
let alteredAdditionalSchema = clone(additionalSchema);
|
|
53
53
|
for (const field of fieldsToCheck) {
|
|
54
54
|
if (alteredAdditionalSchema && field in alteredAdditionalSchema) {
|
|
55
|
-
// biome-ignore lint/
|
|
55
|
+
// biome-ignore lint/performance/noAwaitInLoops: user interaction for each field
|
|
56
56
|
alteredAdditionalSchema = await manageFieldConflict([], field, alteredAdditionalSchema, "additional schema", targetSchema, strategy);
|
|
57
57
|
}
|
|
58
58
|
else {
|
|
@@ -84,7 +84,7 @@ async function checkPropertyFieldsConflicts(sourceSchema, additionalSchema, targ
|
|
|
84
84
|
const targetProp = targetSchema.properties[key];
|
|
85
85
|
for (const field of fieldsToCheck) {
|
|
86
86
|
if (alteredAdditionalSchema && additionalProp && (!deepMerge || field in additionalProp)) {
|
|
87
|
-
// biome-ignore lint/
|
|
87
|
+
// biome-ignore lint/performance/noAwaitInLoops: user interaction for each field
|
|
88
88
|
const resultProp = await manageFieldConflict(["properties", key], field, additionalProp, "additional schema", targetProp, strategy);
|
|
89
89
|
alteredAdditionalSchema.properties = {
|
|
90
90
|
...alteredAdditionalSchema?.properties,
|
|
@@ -112,7 +112,7 @@ async function checkRemovedPropertyConflicts(sourceSchema, sourceSchemaPath, add
|
|
|
112
112
|
for (const [key, targetValue] of Object.entries(targetSchema.properties ?? {})) {
|
|
113
113
|
if (!(key in (alteredSourceSchema.properties ?? {}) || key in (alteredAdditionalSchema?.properties ?? {}))) {
|
|
114
114
|
const errorMessage = `Property "${key}" was removed from the source schema.`;
|
|
115
|
-
// biome-ignore lint/
|
|
115
|
+
// biome-ignore lint/performance/noAwaitInLoops: user interaction for each field
|
|
116
116
|
await manageConflict(errorMessage, async () => {
|
|
117
117
|
const deleteField = await select({
|
|
118
118
|
message: `${errorMessage} What do you want to do?`,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-schema-conflicts.js","sourceRoot":"","sources":["../src/json-schema-conflicts.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,OAAO,EAAE,KAAK,EAAE,MAAM,OAAO,CAAC;AAK9B,MAAM,qBAAqB,GAAG,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,CAAC;AAEtE;;GAEG;AACH,MAAM,CAAC,KAAK,UAAU,gBAAgB,CACrC,OAAe,EACf,WAAoB,EACpB,WAAoB;IAEpB,OAAO,MAAM,MAAM,CAAC;QACnB,OAAO;QACP,OAAO,EAAE;YACR,EAAE,IAAI,EAAE,YAAY,WAAW,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE;YACvD,EAAE,IAAI,EAAE,YAAY,WAAW,EAAE,EAAE,KAAK,EAAE,WAAW,EAAE;SACvD;QACD,KAAK,EAAE,qBAAqB;KAC5B,CAAC,CAAC;AACJ,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,cAAc,CAC5B,YAAoB,EACpB,iBAAsC,EACtC,QAAoC;IAEpC,QAAQ,QAAQ,EAAE,CAAC;QAClB,KAAK,aAAa;YACjB,MAAM,iBAAiB,EAAE,CAAC;YAC1B,MAAM;QACP,KAAK,OAAO;YACX,MAAM,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC;QAC/B,KAAK,KAAK;YACT,OAAO,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;YAC3B,MAAM;QACP;YACC,MAAM,IAAI,KAAK,CAAC,yCAAyC,QAAQ,EAAE,CAAC,CAAC;IACvE,CAAC;AACF,CAAC;AAED;;GAEG;AACH,KAAK,UAAU,mBAAmB,CACjC,IAAc,EACd,KAAqB,EACrB,YAAe,EACf,gBAAwB,EACxB,YAAe,EACf,QAAoC;IAEpC,IAAI,YAAY,CAAC,KAAK,CAAC,KAAK,YAAY,CAAC,KAAK,CAAC,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,CAAC;QACzE,OAAO,YAAY,CAAC;IACrB,CAAC;IACD,MAAM,aAAa,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC;IAC1C,MAAM,UAAU,GAAG,IAAI,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;IACvD,MAAM,YAAY,GAAG,SAAS,UAAU,WAAW,gBAAgB,kCAAkC,CAAC;IACtG,MAAM,cAAc,CACnB,YAAY,EACZ,KAAK,IAAI,EAAE;QACV,MAAM,UAAU,GAAG,MAAM,gBAAgB,CACxC,GAAG,YAAY,wBAAwB,EACvC,YAAY,CAAC,KAAK,CAAC,EACnB,YAAY,CAAC,KAAK,CAAC,CACnB,CAAC;QACF,aAAa,CAAC,KAAK,CAAC,GAAG,UAAU,CAAC;IACnC,CAAC,EACD,QAAQ,CACR,CAAC;IACF,OAAO,aAAa,CAAC;AACtB,CAAC;AAED,KAAK,UAAU,wBAAwB,CACtC,YAA0B,EAC1B,gBAA0C,EAC1C,YAA0B,EAC1B,aAA+B,EAC/B,QAAoC;IAEpC,IAAI,mBAAmB,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC;IAC9C,IAAI,uBAAuB,GAAG,KAAK,CAAC,gBAAgB,CAAC,CAAC;IAEtD,KAAK,MAAM,KAAK,IAAI,aAAa,EAAE,CAAC;QACnC,IAAI,uBAAuB,IAAI,KAAK,IAAI,uBAAuB,EAAE,CAAC;YACjE,
|
|
1
|
+
{"version":3,"file":"json-schema-conflicts.js","sourceRoot":"","sources":["../src/json-schema-conflicts.ts"],"names":[],"mappings":"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"}
|
package/dist/json-schemas.d.ts
CHANGED
|
@@ -27,7 +27,7 @@ export declare function writeJsonSchema(filePath: string, schema: ObjectSchema):
|
|
|
27
27
|
export declare function readJsonSchemaField(filePath: string, fieldName: string): ObjectSchema;
|
|
28
28
|
export declare function writeSchemaToField(filePath: string, schema: ObjectSchema, fieldName: string): void;
|
|
29
29
|
export declare function filterValidSchemaProperties(schema: ObjectSchema, validRootKeys: string[], validPropertyKeys: string[], validPropertyTypes: string[], validPropertyKeysByType: Record<string, string[]>): ObjectSchema;
|
|
30
|
-
export declare function mergeObjectSchemas(baseSchema: ObjectSchema, additionalSchema: ObjectSchema, deep
|
|
30
|
+
export declare function mergeObjectSchemas(baseSchema: ObjectSchema, additionalSchema: ObjectSchema, deep: boolean): ObjectSchema;
|
|
31
31
|
/**
|
|
32
32
|
* Fields which is safe to omit without breaking the JSON schema.
|
|
33
33
|
*/
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-schemas.d.ts","sourceRoot":"","sources":["../src/json-schemas.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI/C,KAAK,cAAc,GAAG,WAAW,GAAG;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAQF,MAAM,WAAW,WAAY,SAAQ,WAAW;IAC/C,IAAI,EAAE,OAAO,CAAC;CACd;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,IAAI,WAAW,CAExE;AAED,MAAM,WAAW,YAAa,SAAQ,WAAW;IAChD,IAAI,EAAE,QAAQ,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAC5C,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,IAAI,YAAY,CAE1E;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,YAAY,CAE7D;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,IAAI,CAE5E;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,YAAY,CASrF;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAIlG;AAID,wBAAgB,2BAA2B,CAC1C,MAAM,EAAE,YAAY,EACpB,aAAa,EAAE,MAAM,EAAE,EACvB,iBAAiB,EAAE,MAAM,EAAE,EAC3B,kBAAkB,EAAE,MAAM,EAAE,EAC5B,uBAAuB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAC/C,YAAY,CAyBd;AAyCD,wBAAgB,kBAAkB,CACjC,UAAU,EAAE,YAAY,EACxB,gBAAgB,EAAE,YAAY,EAC9B,IAAI,
|
|
1
|
+
{"version":3,"file":"json-schemas.d.ts","sourceRoot":"","sources":["../src/json-schemas.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAI/C,KAAK,cAAc,GAAG,WAAW,GAAG;IACnC,QAAQ,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAQF,MAAM,WAAW,WAAY,SAAQ,WAAW;IAC/C,IAAI,EAAE,OAAO,CAAC;CACd;AAED,wBAAgB,aAAa,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,IAAI,WAAW,CAExE;AAED,MAAM,WAAW,YAAa,SAAQ,WAAW;IAChD,IAAI,EAAE,QAAQ,CAAC;IACf,UAAU,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC;IAC5C,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,IAAI,YAAY,CAE1E;AAED;;GAEG;AACH,wBAAgB,cAAc,CAAC,QAAQ,EAAE,MAAM,GAAG,YAAY,CAE7D;AAED;;GAEG;AACH,wBAAgB,eAAe,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,GAAG,IAAI,CAE5E;AAED;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,GAAG,YAAY,CASrF;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAIlG;AAID,wBAAgB,2BAA2B,CAC1C,MAAM,EAAE,YAAY,EACpB,aAAa,EAAE,MAAM,EAAE,EACvB,iBAAiB,EAAE,MAAM,EAAE,EAC3B,kBAAkB,EAAE,MAAM,EAAE,EAC5B,uBAAuB,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,GAC/C,YAAY,CAyBd;AAyCD,wBAAgB,kBAAkB,CACjC,UAAU,EAAE,YAAY,EACxB,gBAAgB,EAAE,YAAY,EAC9B,IAAI,EAAE,OAAO,GACX,YAAY,CAmDd;AAID;;GAEG;AACH,QAAA,MAAM,gBAAgB,mCAAoC,CAAC;AAC3D,MAAM,MAAM,cAAc,GAAG,CAAC,OAAO,gBAAgB,CAAC,CAAC,MAAM,CAAC,CAAC;AAc/D;;;GAGG;AACH,wBAAgB,cAAc,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,YAAY,EAAE,uBAAuB,CAAC,EAAE,cAAc,EAAE,GAAG,OAAO,CAKpH"}
|
package/dist/json-schemas.js
CHANGED
|
@@ -93,7 +93,7 @@ function mergeArraySchemas(baseSchema, additionalSchema, deep) {
|
|
|
93
93
|
...additionalSchema,
|
|
94
94
|
};
|
|
95
95
|
}
|
|
96
|
-
export function mergeObjectSchemas(baseSchema, additionalSchema, deep
|
|
96
|
+
export function mergeObjectSchemas(baseSchema, additionalSchema, deep) {
|
|
97
97
|
const baseProperties = baseSchema.properties || {};
|
|
98
98
|
const additionalProperties = additionalSchema.properties || {};
|
|
99
99
|
const propertiesWithPosition = [];
|
package/dist/json-schemas.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-schemas.js","sourceRoot":"","sources":["../src/json-schemas.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"json-schemas.js","sourceRoot":"","sources":["../src/json-schemas.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "apify-schema-tools",
|
|
3
|
-
"version": "3.
|
|
3
|
+
"version": "3.1.0",
|
|
4
4
|
"description": "Apify schema managing tools.",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"types": "dist/index.d.ts",
|
|
@@ -34,23 +34,23 @@
|
|
|
34
34
|
"type": "module",
|
|
35
35
|
"devDependencies": {
|
|
36
36
|
"@apify/tsconfig": "^0.1.1",
|
|
37
|
-
"@biomejs/biome": "^2.
|
|
37
|
+
"@biomejs/biome": "^2.2.2",
|
|
38
38
|
"@types/argparse": "^2.0.17",
|
|
39
39
|
"@types/json-schema": "^7.0.15",
|
|
40
40
|
"@types/minimist": "^1.2.5",
|
|
41
|
-
"@types/node": "^24.1
|
|
42
|
-
"@types/ramda": "^0.
|
|
41
|
+
"@types/node": "^24.3.1",
|
|
42
|
+
"@types/ramda": "^0.31.0",
|
|
43
43
|
"apify": "^3.4.4",
|
|
44
|
-
"cspell": "^9.2.
|
|
44
|
+
"cspell": "^9.2.1",
|
|
45
45
|
"husky": "^9.1.7",
|
|
46
|
-
"typescript": "^5.
|
|
46
|
+
"typescript": "^5.9.2",
|
|
47
47
|
"vitest": "^3.2.4"
|
|
48
48
|
},
|
|
49
49
|
"dependencies": {
|
|
50
|
-
"@inquirer/prompts": "^7.
|
|
50
|
+
"@inquirer/prompts": "^7.8.4",
|
|
51
51
|
"argparse": "^2.0.1",
|
|
52
52
|
"ramda": "^0.31.3",
|
|
53
|
-
"zod": "^4.
|
|
53
|
+
"zod": "^4.1.5"
|
|
54
54
|
},
|
|
55
55
|
"cspell": {
|
|
56
56
|
"version": "0.2",
|
|
@@ -0,0 +1,15 @@
|
|
|
1
|
+
{
|
|
2
|
+
"actorSpecification": 1,
|
|
3
|
+
"name": "web-scraper",
|
|
4
|
+
"title": "Web Scraper",
|
|
5
|
+
"description": "A web scraper.",
|
|
6
|
+
"version": "0.0",
|
|
7
|
+
"meta": {
|
|
8
|
+
"templateId": "ts-crawlee-playwright-chrome"
|
|
9
|
+
},
|
|
10
|
+
"input": "./input_schema.json",
|
|
11
|
+
"storages": {
|
|
12
|
+
"dataset": "./dataset_schema.json"
|
|
13
|
+
},
|
|
14
|
+
"dockerfile": "./Dockerfile"
|
|
15
|
+
}
|
|
@@ -0,0 +1,32 @@
|
|
|
1
|
+
{
|
|
2
|
+
"actorSpecification": 1,
|
|
3
|
+
"fields": {
|
|
4
|
+
"$schema": "http://json-schema.org/draft-07/schema#",
|
|
5
|
+
"title": "Dataset schema for Web Scraper",
|
|
6
|
+
"type": "object",
|
|
7
|
+
"properties": {
|
|
8
|
+
"title": {
|
|
9
|
+
"type": "string",
|
|
10
|
+
"title": "Title",
|
|
11
|
+
"description": "Page title"
|
|
12
|
+
},
|
|
13
|
+
"url": {
|
|
14
|
+
"type": "string",
|
|
15
|
+
"title": "URL",
|
|
16
|
+
"description": "Page URL"
|
|
17
|
+
},
|
|
18
|
+
"text": {
|
|
19
|
+
"type": "string",
|
|
20
|
+
"title": "Text content",
|
|
21
|
+
"description": "Extracted text"
|
|
22
|
+
},
|
|
23
|
+
"timestamp": {
|
|
24
|
+
"type": "string",
|
|
25
|
+
"title": "Timestamp",
|
|
26
|
+
"description": "When the data was scraped"
|
|
27
|
+
}
|
|
28
|
+
},
|
|
29
|
+
"required": ["title", "url"]
|
|
30
|
+
},
|
|
31
|
+
"views": {}
|
|
32
|
+
}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
{
|
|
2
|
+
"title": "Input schema for Web Scraper",
|
|
3
|
+
"description": "startUrls and searchTerm are required.",
|
|
4
|
+
"type": "object",
|
|
5
|
+
"schemaVersion": 1,
|
|
6
|
+
"properties": {
|
|
7
|
+
"startUrls": {
|
|
8
|
+
"type": "array",
|
|
9
|
+
"title": "Start URLs",
|
|
10
|
+
"description": "List of URLs to scrape",
|
|
11
|
+
"default": [],
|
|
12
|
+
"editor": "requestListSources"
|
|
13
|
+
},
|
|
14
|
+
"searchTerm": {
|
|
15
|
+
"type": "string",
|
|
16
|
+
"title": "Search term",
|
|
17
|
+
"description": "Term to search for",
|
|
18
|
+
"minLength": 1,
|
|
19
|
+
"maxLength": 100
|
|
20
|
+
},
|
|
21
|
+
"categories": {
|
|
22
|
+
"type": "array",
|
|
23
|
+
"title": "Categories",
|
|
24
|
+
"description": "List of categories to filter results",
|
|
25
|
+
"default": []
|
|
26
|
+
},
|
|
27
|
+
"maxPages": {
|
|
28
|
+
"type": "integer",
|
|
29
|
+
"title": "Maximum pages",
|
|
30
|
+
"description": "Maximum number of pages to scrape",
|
|
31
|
+
"default": 10,
|
|
32
|
+
"sectionCaption": "Scraping options",
|
|
33
|
+
"sectionDescription": "Configure how many pages to scrape and other options.",
|
|
34
|
+
"maximum": 1000,
|
|
35
|
+
"minimum": 1
|
|
36
|
+
},
|
|
37
|
+
"proxy": {
|
|
38
|
+
"type": "object",
|
|
39
|
+
"title": "Proxy configuration",
|
|
40
|
+
"description": "Proxy settings",
|
|
41
|
+
"default": {
|
|
42
|
+
"useApifyProxy": true
|
|
43
|
+
}
|
|
44
|
+
},
|
|
45
|
+
"debugMode": {
|
|
46
|
+
"type": "boolean",
|
|
47
|
+
"title": "Debug mode",
|
|
48
|
+
"description": "Enable debug logging",
|
|
49
|
+
"default": false
|
|
50
|
+
},
|
|
51
|
+
"extraField": {
|
|
52
|
+
"type": "string",
|
|
53
|
+
"title": "An extra field from add-input.json",
|
|
54
|
+
"description": "This field was added from the additional schema and merged into the main schema."
|
|
55
|
+
}
|
|
56
|
+
},
|
|
57
|
+
"required": ["startUrls", "searchTerm"]
|
|
58
|
+
}
|