Skip to content

Commit e3a1be2

Browse files
authored
Merge pull request #75 from contentstack/fix/DX-2775
[DX-2775], fix duplicate modular block Type Definitions
2 parents 4c6b3bf + ac6eef1 commit e3a1be2

File tree

4 files changed

+116
-104
lines changed

4 files changed

+116
-104
lines changed

package-lock.json

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

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "@contentstack/types-generator",
3-
"version": "2.3.1",
3+
"version": "2.3.2",
44
"description": "Contentstack type definition generation library",
55
"private": false,
66
"author": "Contentstack",
@@ -38,7 +38,7 @@
3838
"dotenv": "^16.4.7",
3939
"jest": "^29.7.0",
4040
"nock": "^13.5.6",
41-
"rollup": "^4.38.0",
41+
"rollup": "^4.40.0",
4242
"ts-jest": "^29.3.1",
4343
"tsup": "^8.4.0",
4444
"typescript": "^5.7.3"

src/generateTS/factory.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ export default function (userOptions: TSGenOptions) {
286286
let blockInterfaceName = name_type(field.uid);
287287

288288
const blockInterfaces = field.blocks.map((block) => {
289-
const fieldType = block.reference_to
289+
const fieldType = block.reference_to && cachedGlobalFields[name_type(block.reference_to)]
290290
? name_type(block.reference_to)
291291
: visit_fields(block.schema || []);
292292

@@ -314,7 +314,7 @@ export default function (userOptions: TSGenOptions) {
314314

315315
// Store or track the generated block interface for later use
316316
modularBlockInterfaces.add(modularInterface);
317-
317+
cachedModularBlocks[blockInterfaceName] = blockInterfaceName;
318318
return field.multiple ? `${blockInterfaceName}[]` : blockInterfaceName;
319319
}
320320

0 commit comments

Comments
 (0)