Merge branch 'master' into language-typeguards

Author: Enngage

CHANGELOG.md

@@ -1,26 +1,33 @@
 # Changelog
 
-All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+All notable changes to this project will be documented in this file. See
+[standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
 ## [9.0.0-0](https://github.com/kontent-ai/model-generator-js/compare/v8.1.0...v9.0.0-0) (2025-04-15)
 
-
 ### Features
 
-* Extends support for types / type guards for Delivery for more entity types (i.e. collections. languages, workflows...) ([613648e](https://github.com/kontent-ai/model-generator-js/commit/613648ed4cdbcf2cd5462282275ad51007386622))
-* updates deps ([6d87a64](https://github.com/kontent-ai/model-generator-js/commit/6d87a64aeba93f59627e11f54e1956e3b6208eb9))
+- Extends support for types / type guards for Delivery for more entity types (i.e. collections. languages, workflows...)
+  ([613648e](https://github.com/kontent-ai/model-generator-js/commit/613648ed4cdbcf2cd5462282275ad51007386622))
+- updates deps ([6d87a64](https://github.com/kontent-ai/model-generator-js/commit/6d87a64aeba93f59627e11f54e1956e3b6208eb9))
 
-## [8.1.0](https://github.com/kontent-ai/model-generator-js/compare/v8.0.0...v8.1.0) (2025-04-08)
+### [8.1.1](https://github.com/kontent-ai/model-generator-js/compare/v8.1.0...v8.1.1) (2025-04-22)
 
+### Bug Fixes
 
-### Features
+- Correctly imports CoreContentType in snippet when all types are allowed in RTE, linkes items or subpages element
+  ([96f33c7](https://github.com/kontent-ai/model-generator-js/commit/96f33c7ac84c09edd7ff2983aa35b9227f881c2e))
 
-* updates deps ([1fef000](https://github.com/kontent-ai/model-generator-js/commit/1fef0002792c59be1e9163bf0fd1aaf4e6b13d53))
+## [8.1.0](https://github.com/kontent-ai/model-generator-js/compare/v8.0.0...v8.1.0) (2025-04-08)
+
+### Features
 
+- updates deps ([1fef000](https://github.com/kontent-ai/model-generator-js/commit/1fef0002792c59be1e9163bf0fd1aaf4e6b13d53))
 
 ### Bug Fixes
 
-* Skips invalid reference to taxonomies. Usually caused by deleting a taxonomy and not updating it's references in content types / snippets ([598bad3](https://github.com/kontent-ai/model-generator-js/commit/598bad338139f3d87750ab7bcb903e5d00cb15da))
+- Skips invalid reference to taxonomies. Usually caused by deleting a taxonomy and not updating it's references in content types / snippets
+  ([598bad3](https://github.com/kontent-ai/model-generator-js/commit/598bad338139f3d87750ab7bcb903e5d00cb15da))
 
 ## [8.0.0-0](https://github.com/kontent-ai/model-generator-js/compare/v7.4.0...v8.0.0-0) (2024-09-16)
 

lib/generators/delivery/delivery-type.generator.ts

@@ -150,7 +150,7 @@ export function deliveryTypeGenerator(config: DeliveryTypeGeneratorConfig) {
         })
     };
 
-    const getContentTypeSystemImports = (): readonly string[] => {
+    const getCoreTypeImports = (): readonly string[] => {
         return [
             importer.importType({
                 filePathOrPackage: `../${deliveryConfig.systemTypesFolderName}/${coreConfig.barrelExportFilename}`,
@@ -159,6 +159,21 @@ export function deliveryTypeGenerator(config: DeliveryTypeGeneratorConfig) {
         ];
     };
 
+    const shouldImportCoreTypeInSnippet = (snippet: Readonly<ContentTypeSnippetModels.ContentTypeSnippet>): boolean => {
+        return snippet.elements
+            .map<boolean>((m) =>
+                match(m)
+                    .returnType<boolean>()
+                    .with(
+                        P.union({ type: 'modular_content' }, { type: 'subpages' }, { type: 'rich_text' }),
+                        (elementWithAllowedContentTypes) =>
+                            (elementWithAllowedContentTypes.allowed_content_types?.length ?? 0) > 0 ? false : true
+                    )
+                    .otherwise(() => false)
+            )
+            .some((m) => m === true);
+    };
+
     const getSnippetImports = (snippets: readonly Readonly<ContentTypeSnippetModels.ContentTypeSnippet>[]): readonly string[] => {
         if (snippets.length === 0) {
             return [];
@@ -169,7 +184,6 @@ export function deliveryTypeGenerator(config: DeliveryTypeGeneratorConfig) {
                 filePathOrPackage: `../${deliveryConfig.itemSnippetsFolderName}/${coreConfig.barrelExportFilename}`,
                 importValue: snippets
                     .map((snippet) => nameResolvers.snippet(snippet))
-                    .map((m) => m)
                     .filter(uniqueFilter)
                     .join(', ')
             })
@@ -272,7 +286,7 @@ export function deliveryTypeGenerator(config: DeliveryTypeGeneratorConfig) {
         return {
             imports: sortAlphabetically(
                 [
-                    ...getContentTypeSystemImports(),
+                    ...getCoreTypeImports(),
                     ...getReferencedTypeImports(data.contentType, data.flattenedElements),
                     ...getReferencedTaxonomyImports(data.contentType, data.flattenedElements),
                     ...getSnippetImports(snippets)
@@ -300,6 +314,7 @@ export function deliveryTypeGenerator(config: DeliveryTypeGeneratorConfig) {
         return {
             imports: sortAlphabetically(
                 [
+                    ...(shouldImportCoreTypeInSnippet(data.snippet) ? getCoreTypeImports() : []),
                     ...getReferencedTypeImports(data.snippet, data.flattenedElements),
                     ...getReferencedTaxonomyImports(data.snippet, data.flattenedElements),
                     ...getSnippetImports(snippets)

lib/meta/metadata.ts

@@ -1,7 +1,6 @@
-
 export const libMetadata = {
     host: 'npmjs.com',
-	name: '@kontent-ai/model-generator',
+    name: '@kontent-ai/model-generator',
     timestamp: 'Tue, 15 Apr 2025 15:25:59 GMT',
     version: '9.0.0-0'
 };

tests/integration/snapshots/delivery-sdk/basic-js/itemTypes/contentTypeWithAllElements.ts

@@ -120,6 +120,7 @@ export type ContentTypeWithAllElementsElementCodenames =
     | 'asset_element'
     | 'multiple_choice_element'
     | 'number_element'
+    | 'snippet_a__rich_text_with_all_allowed_item_types'
     | 'snippet_a__linked_items_with_specific_types'
     | 'snippet_a__text'
     | 'taxonomy_element';

tests/integration/snapshots/delivery-sdk/basic-js/itemTypes/contentTypeWithSnippetOnly.ts

@@ -16,7 +16,10 @@ export type ContentTypeWithSnippetOnly = CoreItem<
 /**
  * Type representing all available element codenames for Content type with snippet only
  */
-export type ContentTypeWithSnippetOnlyElementCodenames = 'snippet_a__linked_items_with_specific_types' | 'snippet_a__text';
+export type ContentTypeWithSnippetOnlyElementCodenames =
+    | 'snippet_a__rich_text_with_all_allowed_item_types'
+    | 'snippet_a__linked_items_with_specific_types'
+    | 'snippet_a__text';
 
 /**
  * Type guard for Content type with snippet only

tests/integration/snapshots/delivery-sdk/basic-ts/itemTypes/contentTypeWithAllElements.ts

@@ -120,6 +120,7 @@ export type ContentTypeWithAllElementsElementCodenames =
     | 'asset_element'
     | 'multiple_choice_element'
     | 'number_element'
+    | 'snippet_a__rich_text_with_all_allowed_item_types'
     | 'snippet_a__linked_items_with_specific_types'
     | 'snippet_a__text'
     | 'taxonomy_element';

tests/integration/snapshots/delivery-sdk/basic-ts/itemTypes/contentTypeWithSnippetOnly.ts

@@ -16,7 +16,10 @@ export type ContentTypeWithSnippetOnly = CoreItem<
 /**
  * Type representing all available element codenames for Content type with snippet only
  */
-export type ContentTypeWithSnippetOnlyElementCodenames = 'snippet_a__linked_items_with_specific_types' | 'snippet_a__text';
+export type ContentTypeWithSnippetOnlyElementCodenames =
+    | 'snippet_a__rich_text_with_all_allowed_item_types'
+    | 'snippet_a__linked_items_with_specific_types'
+    | 'snippet_a__text';
 
 /**
  * Type guard for Content type with snippet only

tests/integration/snapshots/delivery-sdk/custom-format-options/itemTypes/contentTypeWithAllElements.ts

@@ -109,7 +109,7 @@ ContentTypeWithAllElementsElementCodenames,
 /**
 * Type representing all available element codenames for Content type with all elements
 */
-export type ContentTypeWithAllElementsElementCodenames = 'text_element' | 'url_slug_element' | 'rich_text_element' | 'date___time_element' | 'custom_element' | 'linked_items_element' | 'asset_element' | 'multiple_choice_element' | 'number_element' | 'snippet_a__linked_items_with_specific_types' | 'snippet_a__text' | 'taxonomy_element';;
+export type ContentTypeWithAllElementsElementCodenames = 'text_element' | 'url_slug_element' | 'rich_text_element' | 'date___time_element' | 'custom_element' | 'linked_items_element' | 'asset_element' | 'multiple_choice_element' | 'number_element' | 'snippet_a__rich_text_with_all_allowed_item_types' | 'snippet_a__linked_items_with_specific_types' | 'snippet_a__text' | 'taxonomy_element';;
 
 /**
 * Type guard for Content type with all elements

tests/integration/snapshots/delivery-sdk/custom-format-options/itemTypes/contentTypeWithSnippetOnly.ts

@@ -17,7 +17,7 @@ Record<string, never> & SnippetA,
 /**
 * Type representing all available element codenames for Content type with snippet only
 */
-export type ContentTypeWithSnippetOnlyElementCodenames = 'snippet_a__linked_items_with_specific_types' | 'snippet_a__text';;
+export type ContentTypeWithSnippetOnlyElementCodenames = 'snippet_a__rich_text_with_all_allowed_item_types' | 'snippet_a__linked_items_with_specific_types' | 'snippet_a__text';;
 
 /**
 * Type guard for Content type with snippet only

tests/integration/snapshots/delivery-sdk/name-and-file-resolvers/itemTypes/content_type_content_type_with_all_elements.ts

@@ -120,6 +120,7 @@ export type ContentType_content_type_with_all_elementsElementCodenames =
     | 'asset_element'
     | 'multiple_choice_element'
     | 'number_element'
+    | 'snippet_a__rich_text_with_all_allowed_item_types'
     | 'snippet_a__linked_items_with_specific_types'
     | 'snippet_a__text'
     | 'taxonomy_element';