apify-schema-tools 2.0.4 → 2.0.5
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/.husky/pre-commit +0 -8
- package/CHANGELOG.md +6 -0
- package/biome.json +121 -9
- package/dist/apify-schema-tools.d.ts +1 -0
- package/dist/apify-schema-tools.d.ts.map +1 -1
- package/dist/apify-schema-tools.js +125 -106
- package/dist/apify-schema-tools.js.map +1 -1
- package/dist/apify.d.ts +1 -1
- package/dist/apify.d.ts.map +1 -1
- package/dist/apify.js +4 -2
- package/dist/apify.js.map +1 -1
- package/dist/configuration.d.ts +17 -16
- package/dist/configuration.d.ts.map +1 -1
- package/dist/configuration.js +8 -1
- package/dist/configuration.js.map +1 -1
- package/dist/json-schemas.d.ts.map +1 -1
- package/dist/json-schemas.js +31 -21
- package/dist/json-schemas.js.map +1 -1
- package/dist/typescript.d.ts.map +1 -1
- package/dist/typescript.js +242 -189
- package/dist/typescript.js.map +1 -1
- package/package.json +16 -5
- package/samples/all-defaults/src/generated/input-utils.ts +3 -1
- package/samples/deep-merged-schemas/src/generated/input-utils.ts +3 -1
- package/samples/merged-schemas/src/generated/input-utils.ts +3 -1
- package/samples/package-json-config/package.json +8 -2
- package/samples/package-json-config/src/custom-generated/input-utils.ts +3 -1
- package/src/apify-schema-tools.ts +171 -150
- package/src/apify.ts +6 -4
- package/src/configuration.ts +14 -5
- package/src/json-schemas.ts +44 -22
- package/src/typescript.ts +299 -199
- package/test/apify-schema-tools.test.ts +47 -123
- package/test/apify.test.ts +8 -6
- package/test/common.ts +2 -2
- package/test/configuration.test.ts +1 -1
- package/test/json-schemas.test.ts +1 -2
- package/test/typescript.test.ts +3 -5
- package/tsconfig.json +1 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.d.ts","sourceRoot":"","sources":["../src/configuration.ts"],"names":[],"mappings":"
|
|
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,EAAwC,KAAK,KAAK,IAAI,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAUtF,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,YAAY,EAAE,MAAM,CAAC;IACrB,cAAc,EAAE,MAAM,CAAC;IACvB,aAAa,EAAE,MAAM,CAAC;CACtB;AAED,eAAO,MAAM,aAAa;;;;;;;;;;;;;;;;gCAUxB,CAAC;AAEH,wBAAgB,mCAAmC,IAAI,QAAQ,CAAC,OAAO,aAAa,CAAC,CAIpF;AAED,wBAAgB,+BAA+B,CAAC,IAAI,EAAE,aAAa,GAAG,IAAI,CAkBzE;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAAC,MAAM,EAAE,cAAc,EAAE,aAAa,EAAE,QAAQ,CAAC,OAAO,aAAa,CAAC,GAAG,IAAI,CA4C5G"}
|
package/dist/configuration.js
CHANGED
|
@@ -1,6 +1,13 @@
|
|
|
1
|
+
/** biome-ignore-all lint/style/useNamingConvention: parsed CLI arguments are in snake_case */
|
|
1
2
|
import { existsSync } from "node:fs";
|
|
2
|
-
import
|
|
3
|
+
import { array, enum as enum_, object, string } from "zod/v4";
|
|
3
4
|
import { readFile, writeFile } from "./filesystem.js";
|
|
5
|
+
const zod = {
|
|
6
|
+
object,
|
|
7
|
+
array,
|
|
8
|
+
enum: enum_,
|
|
9
|
+
string,
|
|
10
|
+
};
|
|
4
11
|
const INPUTS = ["input", "dataset"];
|
|
5
12
|
const OUTPUTS = ["json-schemas", "ts-types"];
|
|
6
13
|
export const Configuration = zod.object({
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../src/configuration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAErC,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"configuration.js","sourceRoot":"","sources":["../src/configuration.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,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,UAAO,GACT,YAAY,CAmDd;AAwBD,wBAAgB,cAAc,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,YAAY,EAAE,kBAAkB,CAAC,EAAE,OAAO,GAAG,OAAO,CAKtG;
|
|
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,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,UAAO,GACT,YAAY,CAmDd;AAwBD,wBAAgB,cAAc,CAAC,CAAC,EAAE,YAAY,EAAE,CAAC,EAAE,YAAY,EAAE,kBAAkB,CAAC,EAAE,OAAO,GAAG,OAAO,CAKtG;AA4BD;;;GAGG;AACH,wBAAgB,mBAAmB,CAAC,YAAY,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,GAAG,OAAO,CAoBjG"}
|
package/dist/json-schemas.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import
|
|
1
|
+
import { equals, omit, pick } from "ramda";
|
|
2
2
|
import { readFile, writeFile } from "./filesystem.js";
|
|
3
3
|
function isOrderedSchemaProperty(property) {
|
|
4
4
|
return typeof property.position === "number";
|
|
@@ -38,7 +38,7 @@ export function writeSchemaToField(filePath, schema, fieldName) {
|
|
|
38
38
|
}
|
|
39
39
|
// Filtering properties
|
|
40
40
|
export function filterValidSchemaProperties(schema, validRootKeys, validPropertyKeys, validPropertyTypes, validPropertyKeysByType) {
|
|
41
|
-
const result =
|
|
41
|
+
const result = pick(validRootKeys, schema);
|
|
42
42
|
if (result.properties) {
|
|
43
43
|
result.properties = Object.fromEntries(Object.entries(result.properties).map(([key, value]) => {
|
|
44
44
|
if (!value.type) {
|
|
@@ -51,7 +51,7 @@ export function filterValidSchemaProperties(schema, validRootKeys, validProperty
|
|
|
51
51
|
throw new Error(`Invalid property type "${value.type}" for property "${key}" in the input schema`);
|
|
52
52
|
}
|
|
53
53
|
const validKeys = [...validPropertyKeys, ...(validPropertyKeysByType[value.type] ?? [])];
|
|
54
|
-
return [key,
|
|
54
|
+
return [key, pick(validKeys, value)];
|
|
55
55
|
}));
|
|
56
56
|
}
|
|
57
57
|
if (!isObjectSchema(result)) {
|
|
@@ -140,7 +140,7 @@ export function mergeObjectSchemas(baseSchema, additionalSchema, deep = true) {
|
|
|
140
140
|
*/
|
|
141
141
|
const OMISSIBLE_FIELDS = ["title", "description"];
|
|
142
142
|
function omitFieldsFromSchema(schema, omitFields) {
|
|
143
|
-
const filteredSchema =
|
|
143
|
+
const filteredSchema = omit(omitFields, schema);
|
|
144
144
|
if (isObjectSchema(filteredSchema) && filteredSchema.properties) {
|
|
145
145
|
filteredSchema.properties = Object.fromEntries(Object.entries(filteredSchema.properties).map(([key, value]) => {
|
|
146
146
|
return [key, omitFieldsFromSchema(value, omitFields)];
|
|
@@ -150,7 +150,25 @@ function omitFieldsFromSchema(schema, omitFields) {
|
|
|
150
150
|
}
|
|
151
151
|
const DESCRIPTION_FIELDS = ["title", "description"];
|
|
152
152
|
export function compareSchemas(a, b, ignoreDescriptions) {
|
|
153
|
-
return
|
|
153
|
+
return equals(ignoreDescriptions ? omitFieldsFromSchema(a, DESCRIPTION_FIELDS) : a, ignoreDescriptions ? omitFieldsFromSchema(b, DESCRIPTION_FIELDS) : b);
|
|
154
|
+
}
|
|
155
|
+
function compareDescriptionsObjectProps(sourceProps, outputProps) {
|
|
156
|
+
for (const [key, value] of Object.entries(sourceProps)) {
|
|
157
|
+
if (!(key in outputProps)) {
|
|
158
|
+
continue; // property is not present in the output schema
|
|
159
|
+
}
|
|
160
|
+
const otherValue = outputProps[key];
|
|
161
|
+
if (!compareDescriptions(value, otherValue)) {
|
|
162
|
+
return false; // property descriptions do not match
|
|
163
|
+
}
|
|
164
|
+
}
|
|
165
|
+
return true;
|
|
166
|
+
}
|
|
167
|
+
function compareDescriptionsArrayItems(sourceItems, outputItems) {
|
|
168
|
+
if (sourceItems && outputItems) {
|
|
169
|
+
return compareDescriptions(sourceItems, outputItems);
|
|
170
|
+
}
|
|
171
|
+
return true;
|
|
154
172
|
}
|
|
155
173
|
/**
|
|
156
174
|
* Compare descriptions of source and output schemas.
|
|
@@ -161,24 +179,16 @@ export function compareDescriptions(sourceSchema, outputSchema) {
|
|
|
161
179
|
return false;
|
|
162
180
|
}
|
|
163
181
|
if (isObjectSchema(sourceSchema) && isObjectSchema(outputSchema)) {
|
|
164
|
-
if (sourceSchema.properties &&
|
|
165
|
-
|
|
166
|
-
|
|
167
|
-
|
|
168
|
-
}
|
|
169
|
-
const otherValue = outputSchema.properties[key];
|
|
170
|
-
if (!compareDescriptions(value, otherValue)) {
|
|
171
|
-
return false; // property descriptions do not match
|
|
172
|
-
}
|
|
173
|
-
}
|
|
182
|
+
if (sourceSchema.properties &&
|
|
183
|
+
outputSchema.properties &&
|
|
184
|
+
!compareDescriptionsObjectProps(sourceSchema.properties, outputSchema.properties)) {
|
|
185
|
+
return false;
|
|
174
186
|
}
|
|
175
187
|
}
|
|
176
|
-
else if (isArraySchema(sourceSchema) &&
|
|
177
|
-
|
|
178
|
-
|
|
179
|
-
|
|
180
|
-
}
|
|
181
|
-
}
|
|
188
|
+
else if (isArraySchema(sourceSchema) &&
|
|
189
|
+
isArraySchema(outputSchema) &&
|
|
190
|
+
!compareDescriptionsArrayItems(sourceSchema.items, outputSchema.items)) {
|
|
191
|
+
return false;
|
|
182
192
|
}
|
|
183
193
|
return true;
|
|
184
194
|
}
|
package/dist/json-schemas.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"json-schemas.js","sourceRoot":"","sources":["../src/json-schemas.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"json-schemas.js","sourceRoot":"","sources":["../src/json-schemas.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAQtD,SAAS,uBAAuB,CAAC,QAAwB;IACxD,OAAO,OAAO,QAAQ,CAAC,QAAQ,KAAK,QAAQ,CAAC;AAC9C,CAAC;AAMD,MAAM,UAAU,aAAa,CAAC,MAAmB;IAChD,OAAO,MAAM,CAAC,IAAI,KAAK,OAAO,CAAC;AAChC,CAAC;AAQD,MAAM,UAAU,cAAc,CAAC,MAAmB;IACjD,OAAO,MAAM,CAAC,IAAI,KAAK,QAAQ,CAAC;AACjC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,cAAc,CAAC,QAAgB;IAC9C,OAAO,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC;AACvC,CAAC;AAED;;GAEG;AACH,MAAM,UAAU,eAAe,CAAC,QAAgB,EAAE,MAAoB;IACrE,SAAS,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;AACtD,CAAC;AAED,MAAM,UAAU,mBAAmB,CAAC,QAAgB,EAAE,SAAiB;IACtE,MAAM,cAAc,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;IAChD,IAAI,CAAC,CAAC,SAAS,IAAI,cAAc,CAAC,EAAE,CAAC;QACpC,MAAM,IAAI,KAAK,CAAC,UAAU,SAAS,0BAA0B,QAAQ,GAAG,CAAC,CAAC;IAC3E,CAAC;IACD,IAAI,CAAC,cAAc,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,EAAE,CAAC;QAChD,MAAM,IAAI,KAAK,CAAC,WAAW,QAAQ,MAAM,SAAS,2BAA2B,CAAC,CAAC;IAChF,CAAC;IACD,OAAO,cAAc,CAAC,SAAS,CAAC,CAAC;AAClC,CAAC;AAED,MAAM,UAAU,kBAAkB,CAAC,QAAgB,EAAE,MAAoB,EAAE,SAAiB;IAC3F,MAAM,cAAc,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;IAChD,cAAc,CAAC,SAAS,CAAC,GAAG,MAAM,CAAC;IACnC,eAAe,CAAC,QAAQ,EAAE,cAAc,CAAC,CAAC;AAC3C,CAAC;AAED,uBAAuB;AAEvB,MAAM,UAAU,2BAA2B,CAC1C,MAAoB,EACpB,aAAuB,EACvB,iBAA2B,EAC3B,kBAA4B,EAC5B,uBAAiD;IAEjD,MAAM,MAAM,GAAgB,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC;IACxD,IAAI,MAAM,CAAC,UAAU,EAAE,CAAC;QACvB,MAAM,CAAC,UAAU,GAAG,MAAM,CAAC,WAAW,CACrC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YACtD,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBACjB,MAAM,IAAI,KAAK,CAAC,aAAa,GAAG,yCAAyC,CAAC,CAAC;YAC5E,CAAC;YACD,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;gBACpC,MAAM,IAAI,KAAK,CACd,aAAa,GAAG,0BAA0B,KAAK,CAAC,IAAI,2DAA2D,CAC/G,CAAC;YACH,CAAC;YACD,IAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC9C,MAAM,IAAI,KAAK,CAAC,0BAA0B,KAAK,CAAC,IAAI,mBAAmB,GAAG,uBAAuB,CAAC,CAAC;YACpG,CAAC;YACD,MAAM,SAAS,GAAG,CAAC,GAAG,iBAAiB,EAAE,GAAG,CAAC,uBAAuB,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YACzF,OAAO,CAAC,GAAG,EAAE,IAAI,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC;QACtC,CAAC,CAAC,CACF,CAAC;IACH,CAAC;IACD,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,sFAAsF,CAAC,CAAC;IACzG,CAAC;IACD,OAAO,MAAM,CAAC;AACf,CAAC;AAED,kBAAkB;AAElB,SAAS,eAAe,CACvB,YAA4B,EAC5B,kBAAkC,EAClC,IAAa;IAEb,IAAI,CAAC,IAAI,EAAE,CAAC;QACX,4DAA4D;QAC5D,OAAO,kBAAkB,CAAC;IAC3B,CAAC;IACD,IAAI,cAAc,CAAC,YAAY,CAAC,IAAI,cAAc,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACxE,OAAO,kBAAkB,CAAC,YAAY,EAAE,kBAAkB,EAAE,IAAI,CAAC,CAAC;IACnE,CAAC;IACD,IAAI,aAAa,CAAC,YAAY,CAAC,IAAI,aAAa,CAAC,kBAAkB,CAAC,EAAE,CAAC;QACtE,OAAO,iBAAiB,CAAC,YAAY,EAAE,kBAAkB,EAAE,IAAI,CAAC,CAAC;IAClE,CAAC;IACD,kFAAkF;IAClF,OAAO,kBAAkB,CAAC;AAC3B,CAAC;AAED,SAAS,iBAAiB,CAAC,UAAuB,EAAE,gBAA6B,EAAE,IAAa;IAC/F,MAAM,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC;IACnC,MAAM,eAAe,GAAG,gBAAgB,CAAC,KAAK,CAAC;IAE/C,IAAI,SAAS,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,eAAe,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;QAClG,OAAO;YACN,GAAG,UAAU;YACb,GAAG,gBAAgB;YACnB,KAAK,EAAE,eAAe,CAAC,SAAS,EAAE,eAAe,EAAE,IAAI,CAAC;SACxD,CAAC;IACH,CAAC;IAED,OAAO;QACN,GAAG,UAAU;QACb,GAAG,gBAAgB;KACnB,CAAC;AACH,CAAC;AAED,MAAM,UAAU,kBAAkB,CACjC,UAAwB,EACxB,gBAA8B,EAC9B,IAAI,GAAG,IAAI;IAEX,MAAM,cAAc,GAAG,UAAU,CAAC,UAAU,IAAI,EAAE,CAAC;IACnD,MAAM,oBAAoB,GAAG,gBAAgB,CAAC,UAAU,IAAI,EAAE,CAAC;IAE/D,MAAM,sBAAsB,GAAsC,EAAE,CAAC;IACrE,MAAM,yBAAyB,GAA+B,EAAE,CAAC;IAEjE,SAAS,WAAW,CAAC,GAAW,EAAE,QAAwB;QACzD,IAAI,uBAAuB,CAAC,QAAQ,CAAC,EAAE,CAAC;YACvC,sBAAsB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;QAC9C,CAAC;aAAM,CAAC;YACP,yBAAyB,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,QAAQ,CAAC,CAAC,CAAC;QACjD,CAAC;IACF,CAAC;IAED,KAAK,MAAM,CAAC,GAAG,EAAE,YAAY,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,CAAC;QAClE,IAAI,GAAG,IAAI,oBAAoB,EAAE,CAAC;YACjC,MAAM,kBAAkB,GAAG,oBAAoB,CAAC,GAAG,CAAC,CAAC;YACrD,WAAW,CAAC,GAAG,EAAE,eAAe,CAAC,YAAY,EAAE,kBAAkB,EAAE,IAAI,CAAC,CAAC,CAAC;QAC3E,CAAC;aAAM,CAAC;YACP,WAAW,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC;QAChC,CAAC;IACF,CAAC;IAED,sDAAsD;IACtD,KAAK,MAAM,CAAC,GAAG,EAAE,kBAAkB,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,oBAAoB,CAAC,EAAE,CAAC;QAC9E,IAAI,CAAC,CAAC,GAAG,IAAI,cAAc,CAAC,EAAE,CAAC;YAC9B,WAAW,CAAC,GAAG,EAAE,kBAAkB,CAAC,CAAC;QACtC,CAAC;IACF,CAAC;IAED,sBAAsB,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;QACpC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;IACtC,CAAC,CAAC,CAAC;IAEH,MAAM,UAAU,GAAG;QAClB,GAAG,MAAM,CAAC,WAAW,CAAC,sBAAsB,CAAC;QAC7C,GAAG,MAAM,CAAC,WAAW,CAAC,yBAAyB,CAAC;KAChD,CAAC;IAEF,MAAM,QAAQ,GACb,UAAU,CAAC,QAAQ,IAAI,gBAAgB,CAAC,QAAQ;QAC/C,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,QAAQ,IAAI,EAAE,CAAC,EAAE,GAAG,CAAC,gBAAgB,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;QAC7F,CAAC,CAAC,SAAS,CAAC;IAEd,OAAO;QACN,GAAG,UAAU;QACb,GAAG,gBAAgB;QACnB,UAAU;QACV,QAAQ;KACR,CAAC;AACH,CAAC;AAED,kBAAkB;AAElB;;GAEG;AACH,MAAM,gBAAgB,GAAG,CAAC,OAAO,EAAE,aAAa,CAAU,CAAC;AAG3D,SAAS,oBAAoB,CAAC,MAAmB,EAAE,UAA4B;IAC9E,MAAM,cAAc,GAAG,IAAI,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;IAChD,IAAI,cAAc,CAAC,cAAc,CAAC,IAAI,cAAc,CAAC,UAAU,EAAE,CAAC;QACjE,cAAc,CAAC,UAAU,GAAG,MAAM,CAAC,WAAW,CAC7C,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;YAC9D,OAAO,CAAC,GAAG,EAAE,oBAAoB,CAAC,KAAK,EAAE,UAAU,CAAC,CAAC,CAAC;QACvD,CAAC,CAAC,CACF,CAAC;IACH,CAAC;IACD,OAAO,cAAc,CAAC;AACvB,CAAC;AAED,MAAM,kBAAkB,GAAqB,CAAC,OAAO,EAAE,aAAa,CAAC,CAAC;AAEtE,MAAM,UAAU,cAAc,CAAC,CAAe,EAAE,CAAe,EAAE,kBAA4B;IAC5F,OAAO,MAAM,CACZ,kBAAkB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,EACpE,kBAAkB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,EAAE,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CACpE,CAAC;AACH,CAAC;AAED,SAAS,8BAA8B,CACtC,WAAwC,EACxC,WAAwC;IAExC,KAAK,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,EAAE,CAAC;QACxD,IAAI,CAAC,CAAC,GAAG,IAAI,WAAW,CAAC,EAAE,CAAC;YAC3B,SAAS,CAAC,+CAA+C;QAC1D,CAAC;QACD,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;QACpC,IAAI,CAAC,mBAAmB,CAAC,KAAK,EAAE,UAAU,CAAC,EAAE,CAAC;YAC7C,OAAO,KAAK,CAAC,CAAC,qCAAqC;QACpD,CAAC;IACF,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC;AAED,SAAS,6BAA6B,CACrC,WAAoD,EACpD,WAAoD;IAEpD,IAAI,WAAW,IAAI,WAAW,EAAE,CAAC;QAChC,OAAO,mBAAmB,CAAC,WAA0B,EAAE,WAA0B,CAAC,CAAC;IACpF,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC;AAED;;;GAGG;AACH,MAAM,UAAU,mBAAmB,CAAC,YAAyB,EAAE,YAAyB;IACvF,IAAI,YAAY,CAAC,KAAK,KAAK,YAAY,CAAC,KAAK,IAAI,YAAY,CAAC,WAAW,KAAK,YAAY,CAAC,WAAW,EAAE,CAAC;QACxG,OAAO,KAAK,CAAC;IACd,CAAC;IACD,IAAI,cAAc,CAAC,YAAY,CAAC,IAAI,cAAc,CAAC,YAAY,CAAC,EAAE,CAAC;QAClE,IACC,YAAY,CAAC,UAAU;YACvB,YAAY,CAAC,UAAU;YACvB,CAAC,8BAA8B,CAAC,YAAY,CAAC,UAAU,EAAE,YAAY,CAAC,UAAU,CAAC,EAChF,CAAC;YACF,OAAO,KAAK,CAAC;QACd,CAAC;IACF,CAAC;SAAM,IACN,aAAa,CAAC,YAAY,CAAC;QAC3B,aAAa,CAAC,YAAY,CAAC;QAC3B,CAAC,6BAA6B,CAAC,YAAY,CAAC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,EACrE,CAAC;QACF,OAAO,KAAK,CAAC;IACd,CAAC;IACD,OAAO,IAAI,CAAC;AACb,CAAC"}
|
package/dist/typescript.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"typescript.d.ts","sourceRoot":"","sources":["../src/typescript.ts"],"names":[],"mappings":"AAGA,OAAO,
|
|
1
|
+
{"version":3,"file":"typescript.d.ts","sourceRoot":"","sources":["../src/typescript.ts"],"names":[],"mappings":"AAGA,OAAO,EAAiC,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAuBrF,wBAAgB,mBAAmB,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAE3E;AAED,wBAAgB,2BAA2B,CAAC,QAAQ,EAAE,MAAM,GAAG,MAAM,CAGpE;AAED,UAAU,mBAAmB;IAC5B,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,OAAO,CAAC;IACpB,OAAO,EAAE,OAAO,CAAC;CACjB;AAED,UAAU,mBAAoB,SAAQ,mBAAmB;IACxD,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACxB;AAMD,UAAU,cAAe,SAAQ,mBAAmB;IACnD,IAAI,EAAE,OAAO,EAAE,CAAC;CAChB;AAMD,MAAM,WAAW,mBAAoB,SAAQ,mBAAmB;IAC/D,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC;CAC7C;AAMD,MAAM,MAAM,gBAAgB,GAAG,mBAAmB,GAAG,cAAc,GAAG,mBAAmB,CAAC;AA+E1F,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,YAAY,GAAG,mBAAmB,CAEzF;AAiCD,wBAAgB,yBAAyB,CAAC,MAAM,EAAE,gBAAgB,EAAE,WAAW,SAAI,GAAG,MAAM,CAa3F;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,mBAAmB,GAAG,MAAM,CAI9F;AAID,wBAAgB,sBAAsB,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,CAQlE;AA+JD,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,mBAAmB,CAe1E;AAwED,wBAAgB,2BAA2B,CAC1C,CAAC,EAAE,mBAAmB,EACtB,CAAC,EAAE,mBAAmB,EACtB,UAAU,CAAC,EAAE,OAAO,GAClB,OAAO,CAoBT"}
|