apify-schema-tools 2.0.5 → 2.1.1

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # Changelog
 
+## 2.1.1
+
+### Fixed
+
+- Fixed conversion when an object has only `additionalProperties` and no `properties`.
+
+### Documentation
+
+- Fixed commands in README file.
+
+## 2.1.0
+
+### Added
+
+- Support for JSON schema's `additionalProperties` field.
+- `additionalProperties` is set to true by default.
+
+### Changed
+
+- The `init` command will not override existing source schemas anymore.
+
+### Documentation
+
+- The new features of v2 are now documented in the README file.
+
 ## 2.0.5
 
 ### Fixed

package/README.md

@@ -50,8 +50,75 @@ Let's assume you are starting from a new project created from an
 npm i -D apify-schema-tools
 ```
 
-Now the command `apify-schema-tools` is installed for the current project.
-You can check which options are available:
+2. Initialize your project with default settings:
+
+```sh
+npx apify-schema-tools init
+```
+
+This command will:
+- Create a `src-schemas` folder with `input.json` and `dataset-item.json` files.
+- Create the necessary `.actor` files if they don't exist.
+- Add configuration to your `package.json`.
+- Add a `generate` script to your `package.json`.
+
+3. Generate JSON schemas and TypeScript types from the source schemas:
+
+```sh
+npx apify-schema-tools sync
+```
+
+4. Now, you will be able to use TypeScript types and utilities in your project:
+
+```ts
+import { Actor } from 'apify';
+
+import type { DatasetItem } from './generated/dataset.ts';
+import type { Input } from './generated/input.ts';
+import { getInputWithDefaultValues, type InputWithDefaults } from './generated/input-utils.ts';
+
+await Actor.init();
+
+const input: InputWithDefaults = getInputWithDefaultValues(await Actor.getInput<Input>());
+
+'...'
+
+await Actor.pushData<DatasetItem>({
+    tile: '...',
+    url: '...',
+    text: '...',
+    timestamp: '...',
+});
+
+await Actor.exit();
+```
+
+## Configuration
+
+You can configure `apify-schema-tools` in two ways:
+
+### Using package.json configuration
+
+The `init` command automatically adds configuration to your `package.json`. You can also manually add an `apify-schema-tools` section to customize the behavior:
+
+```json
+{
+  "name": "my-actor",
+  "version": "1.0.0",
+  "apify-schema-tools": {
+    "input": ["input", "dataset"],
+    "output": ["json-schemas", "ts-types"],
+    "srcInput": "src-schemas/input.json",
+    "srcDataset": "src-schemas/dataset-item.json",
+    "outputTSDir": "src/generated",
+    "includeInputUtils": true
+  }
+}
+```
+
+### Using command-line arguments
+
+You can also pass options directly to the `sync` command. You can check which options are available:
 
 ```console
 $ npx apify-schema-tools --help
@@ -69,8 +136,6 @@ optional arguments:
   -h, --help         show this help message and exit
 ```
 
-You can also check the options available for a specific command:
-
 ```console
 $ npx apify-schema-tools sync --help
 usage: apify-schema-tools sync [-h] [-i [{input,dataset} ...]] [-o [{json-schemas,ts-types} ...]] [--src-input SRC_INPUT] [--src-dataset SRC_DATASET] [--add-input ADD_INPUT] [--add-dataset ADD_DATASET] [--input-schema INPUT_SCHEMA] [--dataset-schema DATASET_SCHEMA] [--output-ts-dir OUTPUT_TS_DIR]
@@ -101,16 +166,17 @@ optional arguments:
                         include input utilities in the generated TypeScript files: 'input' input and 'ts-types' output are required (default: true)
 ```
 
-You can customize the path of all the files involved in the generation.
-In this case, we will use the default locations, so the commands will be simpler.
+## Setting up your project manually
 
-2. Create a `src-schemas` folder:
+If you prefer to set up your project manually instead of using the `init` command, you can follow these steps:
+
+1. Create a `src-schemas` folder:
 
 ```sh
 mkdir src-schemas
 ```
 
-3. Create the files `input.json` and `dataset-item.json` inside the `src-schemas`. Here is some example content:
+2. Create the files `input.json` and `dataset-item.json` inside the `src-schemas`. Here is some example content:
 
 ```json
 {
@@ -132,7 +198,8 @@ mkdir src-schemas
       }
     }
   },
-  "required": ["startUrls"]
+  "required": ["startUrls"],
+  "additionalProperties": false
 }
 ```
 
@@ -167,7 +234,7 @@ mkdir src-schemas
 }
 ```
 
-4. Create the file `.actor/dataset_schema.json` and enter some empty content:
+3. Create the file `.actor/dataset_schema.json` and enter some empty content:
 
 ```json
 {
@@ -177,7 +244,7 @@ mkdir src-schemas
 }
 ```
 
-5. Link the dataset schema in `.actor/actor.json`:
+4. Link the dataset schema in `.actor/actor.json`:
 
 ```json
 {
@@ -191,49 +258,40 @@ mkdir src-schemas
 }
 ```
 
-6. Add the script to `package.json`:
-
-```json
-{
-    "...": "...",
-    "scripts": {
-        "...": "...",
-        "generate": "apify-schema-tools sync"
-    }
-}
-```
 
-7. Generate JSON schemas and TypeScript types from the source schemas:
+5. Generate JSON schemas and TypeScript types from the source schemas:
 
 ```sh
-npm run generate
+npx apify-schema-tools sync
 ```
 
-8. Now, you will be able to use TypeScript types and utilities in your project:
-
-```ts
-import { Actor } from 'apify';
+## Checking if the schemas are in sync with the source schemas
 
-import type { DatasetItem } from './generated/dataset.ts';
-import type { Input } from './generated/input.ts';
-import { getInputWithDefaultValues, type InputWithDefaults } from './generated/input-utils.ts';
+The `check` command allows you to verify that your generated schemas and TypeScript files are up-to-date with your source schemas. This is particularly useful in CI/CD pipelines to ensure that developers haven't forgotten to run the generation after making changes to the source schemas.
 
-await Actor.init();
+```sh
+npx apify-schema-tools check
+```
 
-const input: InputWithDefaults = getInputWithDefaultValues(await Actor.getInput<Input>());
+The `check` command will:
+- Compare the current generated files with what would be generated from the source schemas
+- Exit with code 0 if everything is in sync
+- Exit with code 1 if there are differences, showing you which files are out of sync
 
-'...'
+You can add this to your CI pipeline to automatically detect when schemas need to be regenerated:
 
-await Actor.pushData<DatasetItem>({
-    tile: '...',
-    url: '...',
-    text: '...',
-    timestamp: '...',
-});
-
-await Actor.exit();
+```json
+{
+  "scripts": {
+    "generate": "apify-schema-tools sync",
+    "check-schemas": "apify-schema-tools check",
+    "test": "npm run check-schemas && npm run test:unit"
+  }
+}
 ```
 
+The `check` command accepts the same configuration options as the `sync` command, either through `package.json` configuration or command-line arguments, ensuring it checks the same files that would be generated.
+
 ## Extra features
 
 ### Keep only allowed properties in Input schema
@@ -273,12 +331,14 @@ An example:
 {
   "title": "My input schema",
   "description": "My input properties",
+  "type": "object",
   "properties": {
     "a": { "type": "string", "position": 3 },
     "b": { "type": "string" }, // will be last, because it has no position
     "c": { "type": "string", "position": 1 }
   },
-  "required": ["a"]
+  "required": ["a"],
+  "additionalProperties": false
 }
 ```
 
@@ -286,11 +346,13 @@ An example:
 # Additional input schema
 {
   "description": "My input properties, a bit changed", // will override the description
+  "type": "object",
   "properties": {
     "c": { "type": "boolean", "position": 5 }, // will override also the position
     "d": { "type": "string", "position": 1 } // will be first
   },
-  "required": ["c", "d"] // will be merged to the source required parameters
+  "required": ["c", "d"], // will be merged to the source required parameters
+  "additionalProperties": false
 }
 ```
 
@@ -299,13 +361,15 @@ An example:
 {
   "title": "My input schema",
   "description": "My input properties, a bit changed",
+  "type": "object",
   "properties": {
     "d": { "type": "string" },
     "a": { "type": "string" },
     "c": { "type": "boolean" },
     "b": { "type": "string" }
   },
-  "required": ["a", "c", "d"]
+  "required": ["a", "c", "d"],
+  "additionalProperties": false
 }
 ```
 

package/dist/apify-schema-tools.js

@@ -37,6 +37,10 @@ initParser.add_argument("--only-config-file", {
     default: false,
 });
 function initializeInputSchema(args) {
+    if (existsSync(args.src_input)) {
+        console.log(`Input schema already exists at ${args.src_input}, skipping initialization.`);
+        return;
+    }
     if (!existsSync(args.input_schema)) {
         throw new Error("The current Actor does not have an input schema.");
     }
@@ -71,6 +75,10 @@ function initializeDatasetSchema(args) {
         }, null, 4));
         console.log(`Dataset schema initialized at ${args.dataset_schema}`);
     }
+    if (existsSync(args.src_dataset)) {
+        console.log(`Dataset schema already exists at ${args.src_dataset}, skipping initialization.`);
+        return;
+    }
     const datasetItemSchema = readJsonSchemaField(args.dataset_schema, DATASET_SCHEMA_FIELD);
     writeJsonSchema(args.src_dataset, datasetItemSchema);
 }

package/dist/apify-schema-tools.js.map

@@ -1 +1 @@
-{"version":3,"file":"apify-schema-tools.js","sourceRoot":"","sources":["../src/apify-schema-tools.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"apify-schema-tools.js","sourceRoot":"","sources":["../src/apify-schema-tools.ts"],"names":[],"mappings":"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"}

package/dist/typescript.d.ts

@@ -14,6 +14,7 @@ interface TypeScriptEnum extends TypeScriptBasicData {
 }
 export interface TypeScriptInterface extends TypeScriptBasicData {
     properties: Record<string, TypeScriptSchema>;
+    additionalProperties?: TypeScriptSchema;
 }
 export type TypeScriptSchema = TypeScriptBasicType | TypeScriptEnum | TypeScriptInterface;
 export declare function jsonSchemaToTypeScriptInterface(schema: ObjectSchema): TypeScriptInterface;

package/dist/typescript.d.ts.map

@@ -1 +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"}
+{"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;IAC7C,oBAAoB,CAAC,EAAE,gBAAgB,CAAC;CACxC;AAMD,MAAM,MAAM,gBAAgB,GAAG,mBAAmB,GAAG,cAAc,GAAG,mBAAmB,CAAC;AAyF1F,wBAAgB,+BAA+B,CAAC,MAAM,EAAE,YAAY,GAAG,mBAAmB,CAEzF;AAoCD,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;AAgMD,wBAAgB,wBAAwB,CAAC,IAAI,EAAE,MAAM,GAAG,mBAAmB,CAe1E;AAoFD,wBAAgB,2BAA2B,CAC1C,CAAC,EAAE,mBAAmB,EACtB,CAAC,EAAE,mBAAmB,EACtB,UAAU,CAAC,EAAE,OAAO,GAClB,OAAO,CAwBT"}

package/dist/typescript.js

@@ -37,7 +37,15 @@ function createTypeScriptInterface(schema, doc, isArray, isRequired) {
     const properties = Object.fromEntries(Object.entries(schema.properties ?? {}).map(([key, value]) => {
         return [key, jsonSchemaToTypeScriptSchema(value, false, requiredProperties.includes(key))];
     }));
-    return { doc, isArray, isRequired, properties };
+    let additionalProperties;
+    if (schema.additionalProperties === true || schema.additionalProperties === undefined) {
+        // If additionalProperties is true or undefined, we parse it as an "empty" schema
+        additionalProperties = { doc: undefined, isArray: false, isRequired: true, type: "unknown" };
+    }
+    else if (schema.additionalProperties !== false) {
+        additionalProperties = jsonSchemaToTypeScriptSchema(schema.additionalProperties, false, true);
+    }
+    return { doc, isArray, isRequired, properties, additionalProperties };
 }
 function createTypeScriptArraySchema(schema, doc, isRequired) {
     if (Array.isArray(schema.items)) {
@@ -86,7 +94,7 @@ export function jsonSchemaToTypeScriptInterface(schema) {
 function serializeInterfaceSchema(schema, indentLevel) {
     const indent = "\t".repeat(indentLevel);
     const properties = Object.entries(schema.properties);
-    if (properties.length === 0) {
+    if (properties.length === 0 && !schema.additionalProperties) {
         return "{}";
     }
     const innerIndentLevel = indentLevel + 1;
@@ -98,6 +106,9 @@ function serializeInterfaceSchema(schema, indentLevel) {
         }
         result += `\n${innerIndent}${key}${value.isRequired ? "" : "?"}: ${serializeTypeScriptSchema(value, innerIndentLevel)};`;
     }
+    if (schema.additionalProperties) {
+        result += `\n${innerIndent}[key: string]: ${serializeTypeScriptSchema(schema.additionalProperties, innerIndentLevel)};`;
+    }
     result += `\n${indent}}`;
     return result;
 }
@@ -142,29 +153,6 @@ export function removeTypeScriptHeader(fileContent) {
     const headerEndIndex = headerMatch.index + headerMatch[0].length;
     return fileContent.slice(headerEndIndex).trim();
 }
-function parseInterfaceProperties(body) {
-    const properties = {};
-    let i = 0;
-    let currentDoc;
-    while (i < body.length) {
-        i = skipWhitespace(body, i);
-        const docResult = tryParseJsDoc(body, i);
-        if (docResult) {
-            currentDoc = docResult.doc;
-            i = docResult.nextIndex;
-            continue;
-        }
-        const propResult = tryParseProperty(body, i, currentDoc);
-        if (propResult) {
-            properties[propResult.propName] = propResult.schema;
-            currentDoc = undefined;
-            i = propResult.nextIndex;
-            continue;
-        }
-        i++;
-    }
-    return properties;
-}
 const WHITESPACE_REGEX = /\s/;
 function skipWhitespace(body, i) {
     let cursor = i;
@@ -190,30 +178,47 @@ function tryParseJsDoc(body, i) {
     }
     return null;
 }
-const TYPESCRIPT_PROPERTY_REGEX = /^(\w+)(\?)?:\s*/;
-function tryParseProperty(body, i, currentDoc) {
-    let cursor = i;
-    const propMatch = body.slice(cursor).match(TYPESCRIPT_PROPERTY_REGEX);
-    if (!propMatch) {
-        return null;
+function extractTypeString(body, i) {
+    let braceDepth = 0;
+    let typeEnd = i;
+    while (typeEnd < body.length) {
+        const char = body[typeEnd];
+        if (char === "{") {
+            braceDepth++;
+        }
+        else if (char === "}") {
+            braceDepth--;
+            if (braceDepth < 0) {
+                break;
+            }
+        }
+        else if (char === ";" && braceDepth === 0) {
+            break;
+        }
+        typeEnd++;
     }
-    const propName = propMatch[1];
-    const isRequired = !propMatch[2];
-    cursor += propMatch[0].length;
-    const { typeStr, isArray, typeEnd } = extractTypeString(body, cursor);
+    let typeStr = body.slice(i, typeEnd).trim();
+    const isArray = typeStr.endsWith("[]");
+    if (isArray) {
+        typeStr = typeStr.slice(0, -2).trim();
+    }
+    return { typeStr, isArray, typeEnd };
+}
+function extractSchemaFromText(text, currentDoc, isRequired, isArray) {
     let schema;
-    if (typeStr.startsWith("{") && typeStr.endsWith("}")) {
-        const objectBody = typeStr.slice(1, -1);
-        const nestedProperties = parseInterfaceProperties(objectBody);
+    if (text.startsWith("{") && text.endsWith("}")) {
+        const objectBody = text.slice(1, -1);
+        const { properties: nestedProperties, additionalProperties: additionalNestedProperties } = parseInterfaceProperties(objectBody);
         schema = {
             doc: currentDoc,
             isArray,
             isRequired,
             properties: nestedProperties,
+            additionalProperties: additionalNestedProperties,
         };
     }
-    else if (typeStr.includes("|")) {
-        const unionBody = isArray ? typeStr.slice(1, -1) : typeStr;
+    else if (text.includes("|")) {
+        const unionBody = isArray ? text.slice(1, -1) : text;
         const unionParts = unionBody.split("|").map((part) => part.trim());
         if (unionParts.every((part) => isAllowedType(part))) {
             schema = {
@@ -234,7 +239,7 @@ function tryParseProperty(body, i, currentDoc) {
                 };
             }
             catch {
-                throw new Error(`Invalid enum format for property "${propName}": ${typeStr}`);
+                throw new Error(`Invalid enum format for TypeScript text: ${text}`);
             }
         }
     }
@@ -243,40 +248,68 @@ function tryParseProperty(body, i, currentDoc) {
             doc: currentDoc,
             isArray,
             isRequired,
-            type: typeStr,
+            type: text,
         };
     }
+    return schema;
+}
+const TYPESCRIPT_ADDITIONAL_PROPERTIES_REGEX = /^\s*\[\s*key\s*:\s*string\s*\]\s*:\s*/;
+const TYPESCRIPT_PROPERTY_REGEX = /^(\w+)(\?)?:\s*/;
+function tryParseProperty(body, i, currentDoc) {
+    let cursor = i;
+    let propName;
+    let isRequired;
+    const bodySlice = body.slice(cursor);
+    const additionalPropertiesMatch = bodySlice.match(TYPESCRIPT_ADDITIONAL_PROPERTIES_REGEX);
+    if (additionalPropertiesMatch) {
+        cursor += additionalPropertiesMatch[0].length;
+        isRequired = true;
+    }
+    else {
+        const propMatch = bodySlice.match(TYPESCRIPT_PROPERTY_REGEX);
+        if (!propMatch) {
+            return null;
+        }
+        propName = propMatch[1];
+        isRequired = !propMatch[2];
+        cursor += propMatch[0].length;
+    }
+    const { typeStr, isArray, typeEnd } = extractTypeString(body, cursor);
+    const schema = extractSchemaFromText(typeStr, currentDoc, isRequired, isArray);
     let nextIndex = typeEnd;
     if (body[nextIndex] === ";") {
         nextIndex++;
     }
     return { propName, schema, nextIndex };
 }
-function extractTypeString(body, i) {
-    let braceDepth = 0;
-    let typeEnd = i;
-    while (typeEnd < body.length) {
-        const char = body[typeEnd];
-        if (char === "{") {
-            braceDepth++;
+function parseInterfaceProperties(body) {
+    const properties = {};
+    let additionalProperties;
+    let i = 0;
+    let currentDoc;
+    while (i < body.length) {
+        i = skipWhitespace(body, i);
+        const docResult = tryParseJsDoc(body, i);
+        if (docResult) {
+            currentDoc = docResult.doc;
+            i = docResult.nextIndex;
+            continue;
         }
-        else if (char === "}") {
-            braceDepth--;
-            if (braceDepth < 0) {
-                break;
+        const propResult = tryParseProperty(body, i, currentDoc);
+        if (propResult) {
+            if (propResult.propName) {
+                properties[propResult.propName] = propResult.schema;
             }
+            else {
+                additionalProperties = propResult.schema;
+            }
+            currentDoc = undefined;
+            i = propResult.nextIndex;
+            continue;
         }
-        else if (char === ";" && braceDepth === 0) {
-            break;
-        }
-        typeEnd++;
-    }
-    let typeStr = body.slice(i, typeEnd).trim();
-    const isArray = typeStr.endsWith("[]");
-    if (isArray) {
-        typeStr = typeStr.slice(0, -2).trim();
+        i++;
     }
-    return { typeStr, isArray, typeEnd };
+    return { properties, additionalProperties };
 }
 const TYPESCRIPT_JSDOC_REGEX = /\/\*\*\s*\n\s*\*\s*(.*?)\s*\n\s*\*\//;
 const TYPESCRIPT_INTERFACE_REGEX = /export interface (\w+) \{([\s\S]*)\}$/;
@@ -290,8 +323,8 @@ export function parseTypeScriptInterface(text) {
         throw new Error("Invalid TypeScript interface format");
     }
     const body = interfaceMatch[2];
-    const properties = parseInterfaceProperties(body);
-    return { doc, isArray: false, isRequired: true, properties };
+    const { properties, additionalProperties } = parseInterfaceProperties(body);
+    return { doc, isArray: false, isRequired: true, properties, additionalProperties };
 }
 function compareInterfaceProperty(key, propA, propB, ignoreDocs) {
     if (!isTypeScriptInterface(propB)) {
@@ -347,6 +380,17 @@ function compareProperty(key, propA, propB, ignoreDocs) {
     }
     return compareBasicTypeProperty(key, propA, propB);
 }
+function compareAdditionalProperties(a, b, ignoreDocs) {
+    if (!(a.additionalProperties || b.additionalProperties)) {
+        return true; // Both have no additional properties
+    }
+    if (!(a.additionalProperties && b.additionalProperties)) {
+        console.error(`One interface has additionalProperties defined, but the other does not.
+If you generated an interface from a JSON schema, pay attention that "additionalProperties" is set to an empty schema by default.`);
+        return false;
+    }
+    return compareProperty("[key: string]", a.additionalProperties, b.additionalProperties, ignoreDocs);
+}
 export function compareTypescriptInterfaces(a, b, ignoreDocs) {
     if (Object.keys(a.properties).length !== Object.keys(b.properties).length) {
         console.error("Interfaces have different number of properties.");
@@ -364,6 +408,9 @@ export function compareTypescriptInterfaces(a, b, ignoreDocs) {
             }
         }
     }
+    if (!compareAdditionalProperties(a, b, ignoreDocs)) {
+        return false;
+    }
     return true;
 }
 //# sourceMappingURL=typescript.js.map