generator-jhipster 8.7.3 → 8.8.0

package/dist/generators/bootstrap-application-server/generator.js

@@ -19,7 +19,7 @@
 import BaseApplicationGenerator from '../base-application/index.js';
 import { JAVA_VERSION, MAIN_DIR, SERVER_MAIN_RES_DIR, SERVER_MAIN_SRC_DIR, SERVER_TEST_RES_DIR, SERVER_TEST_SRC_DIR, TEST_DIR, dockerContainers, } from '../generator-constants.js';
 import { loadRequiredConfigIntoEntity, prepareEntityPrimaryKeyForTemplates } from '../base-application/support/index.js';
-import { addEntitiesOtherRelationships, hibernateSnakeCase, loadDerivedServerConfig, loadRequiredConfigDerivedProperties, loadServerConfig, prepareEntity as prepareEntityServerForTemplates, prepareRelationship, } from '../server/support/index.js';
+import { addEntitiesOtherRelationships, getPrimaryKeyValue, hibernateSnakeCase, loadDerivedServerConfig, loadRequiredConfigDerivedProperties, loadServerConfig, prepareEntity as prepareEntityServerForTemplates, prepareRelationship, } from '../server/support/index.js';
 import { getGradleLibsVersionsProperties } from '../gradle/support/index.js';
 import { getPomVersionProperties } from '../maven/support/index.js';
 import { prepareField as prepareFieldForLiquibaseTemplates } from '../liquibase/support/index.js';
@@ -61,6 +61,7 @@ export default class BoostrapApplicationServer extends BaseApplicationGenerator
                 applicationDefaults({
                     javaVersion: this.useVersionPlaceholders ? 'JAVA_VERSION' : JAVA_VERSION,
                     packageInfoJavadocs: [],
+                    javaNodeBuildPaths: [],
                     javaProperties: {},
                     javaManagedProperties: {},
                     javaDependencies: ({ javaDependencies }) => ({
@@ -107,10 +108,10 @@ export default class BoostrapApplicationServer extends BaseApplicationGenerator
     }
     get loadingEntities() {
         return this.asLoadingEntitiesTaskGroup({
-            loadingEntities({ application, entitiesToLoad }) {
+            loadingEntities({ entitiesToLoad }) {
                 for (const { entityName } of entitiesToLoad) {
                     const entity = this.sharedData.getEntity(entityName);
-                    loadRequiredConfigIntoEntity.call(this, entity, application);
+                    loadRequiredConfigIntoEntity.call(this, entity, this.jhipsterConfigWithDefaults);
                 }
             },
             requiredOtherSideRelationships() {
@@ -123,8 +124,8 @@ export default class BoostrapApplicationServer extends BaseApplicationGenerator
     }
     get preparingEachEntity() {
         return this.asPreparingEachEntityTaskGroup({
-            prepareEntity({ entity }) {
-                prepareEntityServerForTemplates(entity);
+            prepareEntity({ entity, application }) {
+                prepareEntityServerForTemplates(entity, application);
                 loadRequiredConfigDerivedProperties(entity);
             },
             preparePrimaryKey({ entity, application }) {
@@ -174,4 +175,25 @@ export default class BoostrapApplicationServer extends BaseApplicationGenerator
     get [BaseApplicationGenerator.POST_PREPARING_EACH_ENTITY]() {
         return this.postPreparingEachEntity;
     }
+    get default() {
+        return this.asDefaultTaskGroup({
+            async postPreparingEntity({ application, entities }) {
+                if (!application.backendTypeJavaAny)
+                    return;
+                for (const entity of entities) {
+                    if (entity.primaryKey) {
+                        entity.resetFakerSeed(`${application.baseName}post-prepare-server`);
+                        entity.primaryKey.javaSampleValues ??= [
+                            getPrimaryKeyValue(entity.primaryKey, application.databaseType, 1),
+                            getPrimaryKeyValue(entity.primaryKey, application.databaseType, 2),
+                            getPrimaryKeyValue(entity.primaryKey, application.databaseType, entity.faker.number.int({ min: 10, max: 100 })),
+                        ];
+                    }
+                }
+            },
+        });
+    }
+    get [BaseApplicationGenerator.DEFAULT]() {
+        return this.default;
+    }
 }

package/dist/generators/bootstrap-workspaces/generator.d.ts

@@ -18,6 +18,7 @@
  */
 import BaseWorkspacesGenerator from '../base-workspaces/index.js';
 export default class DockerComposeGenerator extends BaseWorkspacesGenerator {
+    [x: string]: any;
     sharedWorkspaces: any;
     customWorkspacesConfig?: boolean;
     beforeQueue(): Promise<void>;

package/dist/generators/ci-cd/generator.d.ts

@@ -18,6 +18,7 @@
  */
 import BaseApplicationGenerator from '../base-application/index.js';
 export default class CiCdGenerator extends BaseApplicationGenerator {
+    [x: string]: any;
     insideDocker: any;
     context: {};
     beforeQueue(): Promise<void>;

package/dist/generators/ci-cd/templates/.gitlab-ci.yml.ejs

@@ -155,16 +155,15 @@ gradle-package:
             - build/classes
         expire_in: 1 day
 
-# Uncomment the following line to use gitlabs container registry. You need to adapt the REGISTRY_URL in case you are not using gitlab.com
+# Uncomment the following section to enable pushing the Docker image to the GitLab Container Registry
 #docker-push:
 #    stage: release
 #    variables:
-#        REGISTRY_URL: registry.gitlab.com
 #        IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHA
 #    dependencies:
 #        - gradle-package
 #    script:
-#        - ./gradlew jib -Pprod -PnodeInstall -Djib.to.image=$IMAGE_TAG -Djib.to.auth.username="gitlab-ci-token"  -Djib.to.auth.password=$CI_BUILD_TOKEN
+#        - ./gradlew jib -Pprod -PnodeInstall -Djib.to.image=$IMAGE_TAG -Djib.to.auth.username=$CI_REGISTRY_USER -Djib.to.auth.password=$CI_REGISTRY_PASSWORD
 
     <%_ if (ciCdIntegrationsHeroku) { _%>
 deploy-to-production:
@@ -284,16 +283,15 @@ maven-package:
             - target/classes
         expire_in: 1 day
 
-# Uncomment the following line to use gitlabs container registry. You need to adapt the REGISTRY_URL in case you are not using gitlab.com
+# Uncomment the following section to enable pushing the Docker image to the GitLab Container Registry
 #docker-push:
 #    stage: release
 #    variables:
-#        REGISTRY_URL: registry.gitlab.com
 #        IMAGE_TAG: $CI_REGISTRY_IMAGE:$CI_COMMIT_REF_SLUG-$CI_COMMIT_SHA
 #    dependencies:
 #        - maven-package
 #    script:
-#        - ./mvnw -ntp jib:build -Pprod -Djib.to.image=$IMAGE_TAG -Djib.to.auth.username=gitlab-ci-token  -Djib.to.auth.password=$CI_BUILD_TOKEN -Dmaven.repo.local=$MAVEN_USER_HOME
+#        - ./mvnw -ntp jib:build -Pprod -Djib.to.image=$IMAGE_TAG -Djib.to.auth.username=$CI_REGISTRY_USER -Djib.to.auth.password=$CI_REGISTRY_PASSWORD -Dmaven.repo.local=$MAVEN_USER_HOME
 
     <%_ if (ciCdIntegrationsHeroku) { _%>
 deploy-to-production:

package/dist/generators/client/command.d.ts

@@ -44,7 +44,21 @@ declare const command: {
                 readonly type: StringConstructor;
                 readonly hide: true;
             };
-            readonly choices: readonly ["webpack", "vite"];
+            readonly choices: readonly ["webpack", "vite", "experimentalEsbuild"];
+            readonly scope: "storage";
+        };
+        readonly devServerPort: {
+            readonly cli: {
+                readonly type: NumberConstructor;
+                readonly hide: true;
+            };
+            readonly scope: "storage";
+        };
+        readonly devServerPortProxy: {
+            readonly cli: {
+                readonly type: NumberConstructor;
+                readonly hide: true;
+            };
             readonly scope: "storage";
         };
         readonly microfrontend: {

package/dist/generators/client/command.js

@@ -71,7 +71,21 @@ const command = {
                 type: String,
                 hide: true,
             },
-            choices: ['webpack', 'vite'],
+            choices: ['webpack', 'vite', 'experimentalEsbuild'],
+            scope: 'storage',
+        },
+        devServerPort: {
+            cli: {
+                type: Number,
+                hide: true,
+            },
+            scope: 'storage',
+        },
+        devServerPortProxy: {
+            cli: {
+                type: Number,
+                hide: true,
+            },
             scope: 'storage',
         },
         microfrontend: {

package/dist/generators/client/files-common.js

@@ -69,7 +69,7 @@ export const files = {
     swagger: [
         {
             ...clientSrcTemplatesBlock(),
-            templates: ['swagger-ui/index.html', 'swagger-ui/dist/images/throbber.gif'],
+            templates: ['swagger-ui/index.html'],
         },
     ],
 };

package/dist/generators/client/generator.d.ts

@@ -18,6 +18,7 @@
  */
 import BaseApplicationGenerator from '../base-application/index.js';
 export default class JHipsterClientGenerator extends BaseApplicationGenerator {
+    [x: string]: any;
     beforeQueue(): Promise<void>;
     get prompting(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "askForClientTheme" | "askForClientThemeVariant">;
     get configuring(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/base/tasks.js").TaskParamWithControl, "applyNoFramework" | "mergeTestConfig" | "upgradeAngular" | "configureDevServerPort">;
@@ -29,7 +30,7 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
             entity: any;
         }): void;
     };
-    get writing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").WritingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "writeCommonFiles" | "webappFakeDataSeed">;
+    get writing(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").WritingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "cleanup" | "writeCommonFiles" | "webappFakeDataSeed">;
     get writingEntities(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").TaskParamWithEntities<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "writeEnumerationFiles">;
     get postWriting(): import("../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../lib/types/application/tasks.js").PostWritingTaskParam<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>, "microfrontend" | "packageJsonScripts">;
 }

package/dist/generators/client/generator.js

@@ -72,18 +72,10 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
                 }
             },
             configureDevServerPort() {
-                if (this.jhipsterConfig.devServerPort !== undefined)
+                if (this.jhipsterConfig.devServerPort !== undefined || this.jhipsterConfig.applicationIndex === undefined)
                     return;
-                const { clientFramework, applicationIndex } = this.jhipsterConfigWithDefaults;
-                const devServerBasePort = clientFramework === ANGULAR ? 4200 : 9060;
-                let devServerPort;
-                if (applicationIndex !== undefined) {
-                    devServerPort = devServerBasePort + applicationIndex;
-                }
-                else if (!devServerPort) {
-                    devServerPort = devServerBasePort;
-                }
-                this.jhipsterConfig.devServerPort = devServerPort;
+                const { applicationIndex, devServerPort } = this.jhipsterConfigWithDefaults;
+                this.jhipsterConfig.devServerPort = devServerPort + applicationIndex;
             },
         });
     }
@@ -161,6 +153,11 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
     // Public API method used by the getter and also by Blueprints
     get writing() {
         return this.asWritingTaskGroup({
+            async cleanup({ application, control }) {
+                await control.cleanupFiles({
+                    '8.7.4': [`${application.clientSrcDir}swagger-ui/dist/images/throbber.gif`],
+                });
+            },
             webappFakeDataSeed({ application: { clientFramework } }) {
                 this.resetEntitiesFakeData(clientFramework);
             },
@@ -203,6 +200,22 @@ export default class JHipsterClientGenerator extends BaseApplicationGenerator {
                     scriptsStorage.set('ci:frontend:build', 'npm run webapp:build:$npm_package_config_default_environment');
                     scriptsStorage.set('ci:frontend:test', 'npm run ci:frontend:build && npm test');
                 }
+                if (application.clientRootDir) {
+                    // Add scripts to map to client package.json
+                    this.packageJson.merge({
+                        scripts: {
+                            'webapp:build': `npm run -w ${application.clientRootDir} webapp:build`,
+                            'ci:frontend:test': `npm run -w ${application.clientRootDir} ci:frontend:test`,
+                            'e2e:headless': `npm run -w ${application.clientRootDir} e2e:headless`,
+                        },
+                    });
+                    const clientWorkspace = application.clientRootDir.slice(0, -1);
+                    const packageJson = this.packageJson.createProxy();
+                    const workspaces = packageJson.workspaces;
+                    if (!workspaces?.includes(clientWorkspace)) {
+                        packageJson.workspaces = [...(workspaces ?? []), clientWorkspace];
+                    }
+                }
             },
             microfrontend({ application, source }) {
                 if (!application.microfrontend || !application.clientFrameworkBuiltIn || !application.clientBundlerWebpack) {

package/dist/generators/client/generators/common/generator.d.ts

@@ -18,6 +18,7 @@
  */
 import BaseApplicationGenerator from '../../../base-application/index.js';
 export default class CommonGenerator extends BaseApplicationGenerator {
+    [x: string]: any;
     beforeQueue(): Promise<void>;
     get writing(): import("../../../../lib/types/base/tasks.js").GenericTaskGroup<any, import("../../../../lib/types/application/tasks.js").WritingTaskParam<import("../../../base-application/index.js").Entity<import("../../../base-application/index.js").Field, never>, import("../../../../lib/types/application/application.js").ApplicationType<import("../../../base-application/index.js").Entity<import("../../../base-application/index.js").Field, never>>>, "writing">;
 }

package/dist/generators/client/prompts.d.ts

@@ -1,2 +1,2 @@
-export declare const askForClientTheme: (this: import("../index.js").GeneratorBaseCore, params: import("../../lib/types/application/tasks.js").TaskTypes<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>["PromptingTaskParam"]) => void;
-export declare const askForClientThemeVariant: (this: import("../index.js").GeneratorBaseCore, params: import("../../lib/types/application/tasks.js").TaskTypes<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>, import("../../lib/types/application/application.js").ApplicationType<import("../base-application/index.js").Entity<import("../base-application/index.js").Field, never>>>["PromptingTaskParam"]) => void;
+export declare const askForClientTheme: (this: import("../index.js").GeneratorBaseCore, params: import("../../lib/types/base/tasks.js").TaskParamWithControl) => void;
+export declare const askForClientThemeVariant: (this: import("../index.js").GeneratorBaseCore, params: import("../../lib/types/base/tasks.js").TaskParamWithControl) => void;

package/dist/generators/client/resources/package.json

@@ -3,14 +3,14 @@
     "dayjs": "1.11.13"
   },
   "devDependencies": {
-    "@cypress/code-coverage": "3.13.5",
+    "@cypress/code-coverage": "3.13.9",
     "babel-loader": "9.2.1",
     "babel-plugin-istanbul": "7.0.0",
-    "cypress": "13.15.1",
+    "cypress": "13.17.0",
     "cypress-audit": "1.1.0",
-    "eslint-plugin-cypress": "4.0.0",
-    "lighthouse": "12.2.1",
+    "eslint-plugin-cypress": "4.1.0",
+    "lighthouse": "12.3.0",
     "nyc": "17.1.0",
-    "swagger-ui-dist": "5.17.14"
+    "swagger-ui-dist": "5.18.2"
   }
 }

package/dist/generators/client/support/config.js

@@ -10,8 +10,10 @@ export const loadClientConfig = ({ config, application }) => {
     application.clientThemeVariant = config.clientThemeVariant;
     application.devServerPort = config.devServerPort;
     application.clientRootDir = config.clientRootDir ?? '';
-    application.clientSrcDir = config.clientSrcDir ?? `${application.clientRootDir}${CLIENT_MAIN_SRC_DIR}`;
-    application.clientTestDir = config.clientTestDir ?? `${application.clientRootDir}${CLIENT_TEST_SRC_DIR}`;
+    application.clientSrcDir =
+        config.clientSrcDir ?? `${application.clientRootDir}${application.clientRootDir ? 'src/' : CLIENT_MAIN_SRC_DIR}`;
+    application.clientTestDir =
+        config.clientTestDir ?? `${application.clientRootDir}${application.clientRootDir ? 'test/' : CLIENT_TEST_SRC_DIR}`;
 };
 /**
  * Load client derived properties.

package/dist/generators/client/support/entity-definition.d.ts

@@ -29,15 +29,12 @@
  * @param { string} clientFramework
  * @returns variablesWithTypes: Array
  */
-declare const generateEntityClientFields: (primaryKey: any, fields: any, relationships: any, dto: any, customDateType?: string, embedded?: boolean, clientFramework?: string) => never[];
+declare const generateEntityClientFields: (primaryKey: any, fields: any, relationships: any, dto: any, customDateType?: string, embedded?: boolean, clientFramework?: string) => string[];
 /**
  * @private
  * Generate a test entity, according to the type
- *
- * @param references
- * @param {number} [index] - index of the primary key sample, pass undefined for a random key.
  */
-export declare const generateTestEntity: (references: any, index?: string) => {
+export declare const generateTestEntity: (references: any, index?: 0 | 1 | "random") => {
     [k: string]: any;
 };
 export default generateEntityClientFields;

package/dist/generators/client/support/entity-definition.js

@@ -1,4 +1,3 @@
-// @ts-nocheck
 /**
  * Copyright 2013-2024 the original author or authors from the JHipster project.
  *
@@ -19,7 +18,7 @@
  */
 import { clientFrameworkTypes, fieldTypes, validations } from '../../../lib/jhipster/index.js';
 import getTypescriptKeyType from './types-utils.js';
-import { filterRelevantRelationships } from './template-utils.js';
+import { filterRelevantRelationships, generateTestEntityId } from './template-utils.js';
 const dbTypes = fieldTypes;
 const { Validations: { REQUIRED }, } = validations;
 const { STRING: TYPE_STRING, INTEGER: TYPE_INTEGER, LONG: TYPE_LONG, BIG_DECIMAL: TYPE_BIG_DECIMAL, FLOAT: TYPE_FLOAT, DOUBLE: TYPE_DOUBLE, UUID: TYPE_UUID, BOOLEAN: TYPE_BOOLEAN, LOCAL_DATE: TYPE_LOCAL_DATE, ZONED_DATE_TIME: TYPE_ZONED_DATE_TIME, INSTANT: TYPE_INSTANT, DURATION: TYPE_DURATION, } = dbTypes.CommonDBTypes;
@@ -99,15 +98,11 @@ const generateEntityClientFields = (primaryKey, fields, relationships, dto, cust
 /**
  * @private
  * Generate a test entity, according to the type
- *
- * @param references
- * @param {number} [index] - index of the primary key sample, pass undefined for a random key.
  */
 export const generateTestEntity = (references, index = 'random') => {
-    const random = index === 'random';
     const entries = references
         .map(reference => {
-        if (random && reference.field) {
+        if (index === 'random') {
             const field = reference.field;
             const fakeData = field.generateFakeData('json-serializable');
             if (reference.field.fieldWithContentType) {
@@ -118,7 +113,7 @@ export const generateTestEntity = (references, index = 'random') => {
             }
             return [[reference.name, fakeData]];
         }
-        return [[reference.name, this.generateTestEntityId(reference.type, index, false)]];
+        return [[reference.name, generateTestEntityId(reference.type, index, false)]];
     })
         .flat();
     return Object.fromEntries(entries);

package/dist/generators/client/support/filter-entities.d.ts

@@ -16,7 +16,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import { type Entity } from '../../base-application/index.js';
+import type { Field } from '../../../lib/types/application/field.js';
+import type { Relationship } from '../../../lib/types/application/relationship.js';
+import type { Entity } from '../../base-application/index.js';
+export declare const isClientField: (field: Field) => boolean;
+export declare const isClientRelationship: (rel: Relationship) => boolean;
 /**
  * Clone entity properties for frontend templates.
  * To be used in writing operations.

package/dist/generators/client/support/filter-entities.js

@@ -1,11 +1,13 @@
+export const isClientField = (field) => !field.skipClient;
+export const isClientRelationship = (rel) => !!(rel.skipClient ?? !(rel.persistableRelationship || rel.relationshipEagerLoad || rel.otherEntity?.jpaMetamodelFiltering));
 /**
  * Clone entity properties for frontend templates.
  * To be used in writing operations.
  */
 export const filterEntityPropertiesForClient = (entity) => ({
     ...entity,
-    fields: entity.fields.filter(field => !field.skipClient),
-    relationships: entity.relationships.filter(rel => !(rel.skipClient ?? !(rel.persistableRelationship || rel.relationshipEagerLoad || rel.otherEntity?.jpaMetamodelFiltering))),
+    fields: entity.fields.filter(field => isClientField(field)),
+    relationships: entity.relationships.filter(rel => isClientRelationship(rel)),
 });
 /**
  * Filter entities for frontend templates.

package/dist/generators/client/support/prepare-entity.d.ts

@@ -1,2 +1,21 @@
+/**
+ * Copyright 2013-2024 the original author or authors from the JHipster project.
+ *
+ * This file is part of the JHipster project, see https://www.jhipster.tech/
+ * for more information.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+import type { Entity } from '../../../lib/types/application/entity.js';
 export default function prepareEntity(): void;
-export declare function preparePostEntityClientDerivedProperties(entity: any): void;
+export declare function preparePostEntityClientDerivedProperties(entity: Entity): Promise<void>;

package/dist/generators/client/support/prepare-entity.js

@@ -1,25 +1,36 @@
-/**
- * Copyright 2013-2024 the original author or authors from the JHipster project.
- *
- * This file is part of the JHipster project, see https://www.jhipster.tech/
- * for more information.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      https://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
+import { isClientField } from './filter-entities.js';
+import { generateTestEntityId, generateTsTestEntityForFields, stringifyTsEntity } from './template-utils.js';
 import getTypescriptKeyType from './types-utils.js';
 export default function prepareEntity() { }
-export function preparePostEntityClientDerivedProperties(entity) {
+const SEED = 'post-prepare-client';
+export async function preparePostEntityClientDerivedProperties(entity) {
+    let clientFields = entity.fields.filter(field => isClientField(field));
+    if (entity.builtInUser) {
+        clientFields = clientFields.filter(field => ['id', 'login'].includes(field.fieldName));
+    }
+    await entity.resetFakerSeed(`${SEED}-1`);
+    const options = { sep: `\n  ` };
+    const fieldsWithPartialData = clientFields.filter(field => field.id || field.fieldValidationRequired || (!field.transient && entity.faker.datatype.boolean()));
+    entity.tsSampleWithPartialData = stringifyTsEntity(generateTsTestEntityForFields(fieldsWithPartialData), options);
+    await entity.resetFakerSeed(`${SEED}-2`);
+    const fieldsWithRequiredData = clientFields.filter(field => field.id || field.fieldValidationRequired);
+    entity.tsSampleWithRequiredData = stringifyTsEntity(generateTsTestEntityForFields(fieldsWithRequiredData), options);
+    await entity.resetFakerSeed(`${SEED}-3`);
+    const fieldsWithFullData = clientFields.filter(field => !field.transient);
+    entity.tsSampleWithFullData = stringifyTsEntity(generateTsTestEntityForFields(fieldsWithFullData), options);
     if (entity.primaryKey) {
+        await entity.resetFakerSeed(`${SEED}-4`);
+        const fieldsWithNewData = clientFields.filter(field => !field.id && field.fieldValidationRequired);
+        entity.tsSampleWithNewData = stringifyTsEntity({
+            ...generateTsTestEntityForFields(fieldsWithNewData),
+            [entity.primaryKey.name]: null,
+        }, options);
+        await entity.resetFakerSeed(`${SEED}-5`);
         entity.tsKeyType = getTypescriptKeyType(entity.primaryKey.type);
+        entity.primaryKey.tsSampleValues = [generateTestEntityId(entity.primaryKey, 0), generateTestEntityId(entity.primaryKey, 1)];
+        entity.tsPrimaryKeySamples = [
+            stringifyTsEntity(generateTsTestEntityForFields(entity.primaryKey.fields)),
+            stringifyTsEntity(generateTsTestEntityForFields(entity.primaryKey.fields)),
+        ];
     }
 }

package/dist/generators/client/support/template-utils.d.ts

@@ -1,5 +1,6 @@
 import type { PrimaryKey } from '../../../lib/types/application/entity.js';
 import type { FieldType } from '../../../lib/application/field-types.js';
+import type { Field } from '../../../lib/types/application/field.js';
 /**
  * @private
  * Filter the relevant relationships fields on the model
@@ -25,27 +26,32 @@ export declare const generateEntityClientImports: (relationships: any, dto?: any
  * @param {string} clientFramework the client framework, 'angular' or 'react'.
  * @returns typeImports: Map
  */
-export declare const generateEntityClientEnumImports: (fields: any, clientFramework: any) => Map<any, any>;
+export declare const generateEntityClientEnumImports: (fields: Field[], clientFramework: string) => Map<any, any>;
 /**
  * @private
  * Generate a primary key, according to the type
- *
- * @param {any} primaryKey - primary key definition
- * @param {number} index - the index of the primary key, currently it's possible to generate 2 values, index = 0 - first key (default), otherwise second key
- * @param {boolean} [wrapped=true] - wrapped values for required types.
  */
-export declare const generateTestEntityId: (primaryKey: FieldType | PrimaryKey, index?: string | number, wrapped?: boolean) => any;
+export declare const generateTestEntityId: (primaryKey: FieldType | PrimaryKey, index?: 0 | 1 | "random", wrapped?: boolean) => string | number;
+/**
+ * Generate a test entity, according to the type
+ */
+export declare const generateTsTestEntityForFields: (fields: Field[]) => Record<string, string | number | boolean>;
+export declare const stringifyTsEntity: (data: Record<string, any>, options?: {
+    sep?: string;
+}) => string;
 /**
  * @private
+ * @deprecated
  * Generate a test entity, according to the type
  *
  * @param references
  * @param {number} [index] - index of the primary key sample, pass undefined for a random key.
  */
-export declare const generateTestEntity: (references: any, index?: string) => {
+export declare const generateTestEntity: (references: any, index?: 0 | 1 | "random") => {
     [k: string]: any;
 };
 /**
+ * @deprecated
  * Generate a test entity, according to the references
  *
  * @param references
@@ -54,15 +60,13 @@ export declare const generateTestEntity: (references: any, index?: string) => {
  */
 export declare const generateTypescriptTestEntity: (references: any, additionalFields?: {}) => string;
 /**
+ * @deprecated
  * Generate a test entity for the PK references (when the PK is a composite key)
- *
- * @param {any} primaryKey - primary key definition.
- * @param {number} [index] - index of the primary key sample, pass undefined for a random key.
  */
-export declare const generateTestEntityPrimaryKey: (primaryKey: any, index: any) => string;
+export declare const generateTestEntityPrimaryKey: (primaryKey: any, index: 0 | 1 | "random") => string;
 /**
  * @private
  * Get a parent folder path addition for entity
  * @param {string} clientRootFolder
  */
-export declare const getEntityParentPathAddition: (clientRootFolder: any) => string;
+export declare const getEntityParentPathAddition: (clientRootFolder: string) => string;