Skip to content

Typescript blueprint #33096

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
mshima wants to merge 9 commits into
base: main
Choose a base branch
from
Draft

Typescript blueprint #33096

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
75bfd82
generate-blueprint: add typescript blueprint support
mshima Apr 15, 2026
cee26ac
adjusts
mshima Apr 17, 2026
1ae9e0f
generate-blueprint
mshima Apr 17, 2026
5677af9
adjusts
mshima Apr 17, 2026
64cae84
adjusts
mshima Apr 17, 2026
a459d4e
adjusts
mshima Apr 17, 2026
d6dea14
adjusts
mshima Apr 18, 2026
1524183
adjusts
mshima Apr 18, 2026
d38069a
adjusts
mshima Apr 18, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
215 changes: 215 additions & 0 deletions ...erate-sample/templates/test-integration/generate-blueprint-samples/javascript/.yo-rc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,215 @@
{
"generator-jhipster": {
"additionalSubGenerators": "",
"baseName": "foo",
"cli": true,
"javascriptBlueprint": true,
"localBlueprint": false,
"generators": {
"client": {
"command": false,
"priorities": [
"initializing",
"prompting",
"configuring",
"composing",
"loading",
"preparing",
"preparingEachEntity",
"preparingEachEntityField",
"preparingEachEntityRelationship",
"postPreparingEachEntity",
"default",
"writing",
"writingEntities",
"postWriting",
"postWritingEntities",
"install",
"end"
],
"sbs": false
},
"common": {
"command": false,
"priorities": [
"initializing",
"prompting",
"configuring",
"composing",
"loading",
"preparing",
"preparingEachEntity",
"preparingEachEntityField",
"preparingEachEntityRelationship",
"postPreparingEachEntity",
"default",
"writing",
"writingEntities",
"postWriting",
"postWritingEntities",
"install",
"end"
],
"sbs": false
},
"cypress": {
"command": false,
"priorities": [
"initializing",
"prompting",
"configuring",
"composing",
"loading",
"preparing",
"preparingEachEntity",
"preparingEachEntityField",
"preparingEachEntityRelationship",
"postPreparingEachEntity",
"default",
"writing",
"writingEntities",
"postWriting",
"postWritingEntities",
"install",
"end"
],
"sbs": false
},
"server": {
"command": false,
"priorities": [
"initializing",
"prompting",
"configuring",
"composing",
"loading",
"preparing",
"preparingEachEntity",
"preparingEachEntityField",
"preparingEachEntityRelationship",
"postPreparingEachEntity",
"default",
"writing",
"writingEntities",
"postWriting",
"postWritingEntities",
"install",
"end"
],
"sbs": false
},
"jdl": {
"command": true,
"priorities": [
"initializing",
"prompting",
"configuring",
"composing",
"loading",
"preparing",
"configuringEachEntity",
"loadingEntities",
"preparingEachEntity",
"preparingEachEntityField",
"preparingEachEntityRelationship",
"postPreparingEachEntity",
"default",
"writing",
"writingEntities",
"postWriting",
"postWritingEntities",
"loadingTranslations",
"install",
"postInstall",
"end"
],
"sbs": false
},
"spring-data-relational": {
"command": true,
"priorities": [
"initializing",
"prompting",
"configuring",
"composing",
"loading",
"preparing",
"configuringEachEntity",
"loadingEntities",
"preparingEachEntity",
"preparingEachEntityField",
"preparingEachEntityRelationship",
"postPreparingEachEntity",
"default",
"writing",
"writingEntities",
"postWriting",
"postWritingEntities",
"loadingTranslations",
"install",
"postInstall",
"end"
],
"sbs": false
},
"languages": {
"command": true,
"priorities": [
"initializing",
"prompting",
"configuring",
"composing",
"loading",
"preparing",
"configuringEachEntity",
"loadingEntities",
"preparingEachEntity",
"preparingEachEntityField",
"preparingEachEntityRelationship",
"postPreparingEachEntity",
"default",
"writing",
"writingEntities",
"postWriting",
"postWritingEntities",
"loadingTranslations",
"install",
"postInstall",
"end"
],
"sbs": false
},
"angular": {
"command": true,
"priorities": [
"initializing",
"prompting",
"configuring",
"composing",
"loading",
"preparing",
"configuringEachEntity",
"loadingEntities",
"preparingEachEntity",
"preparingEachEntityField",
"preparingEachEntityRelationship",
"postPreparingEachEntity",
"default",
"writing",
"writingEntities",
"postWriting",
"postWritingEntities",
"loadingTranslations",
"install",
"postInstall",
"end"
],
"sbs": false
}
},
"mainGenerator": "generate-blueprint",
"prettierDefaultIndent": 2,
"projectName": "CiTest",
"subGenerators": ["client", "common", "cypress", "server", "jdl", "spring-data-relational", "languages", "angular"]
}
}
1 change: 1 addition & 0 deletions ...ate-blueprint-samples/default/.yo-rc.json → ...-blueprint-samples/typescript/.yo-rc.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@
"sbs": false
}
},
"jhipsterVersion": "9.0.1",
"mainGenerator": "generate-blueprint",
"prettierDefaultIndent": 2,
"projectName": "CiTest",
Expand Down
6 changes: 5 additions & 1 deletion .github/workflows/generator-generate-blueprint.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,9 @@ env:
jobs:
check-generator-generate-blueprint:
runs-on: ubuntu-latest
strategy:
matrix:
sample: ['javascript', 'typescript']
defaults:
run:
working-directory: ${{ github.workspace }}/app
Expand Down Expand Up @@ -66,10 +69,11 @@ jobs:
cd ..
mkdir generator-jhipster-foo
cd generator-jhipster-foo
cp ${{ github.workspace }}/generator-jhipster/.blueprint/generate-sample/templates/test-integration/generate-blueprint-samples/default/.yo-rc.json .
cp ${{ github.workspace }}/generator-jhipster/.blueprint/generate-sample/templates/test-integration/generate-blueprint-samples/${{ matrix.sample }}/.yo-rc.json .
jhipster.cjs generate-blueprint --force --link-jhipster-dependency --generate-snapshots
npm link
cat package.json
jhipster.cjs info
- name: 'GENERATION: project'
run: jhipster-foo --defaults --client-test-frameworks cypress --skip-jhipster-dependencies
env:
Expand Down
1 change: 1 addition & 0 deletions generators/angular/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@
*/
export { default } from './generator.ts';
export { default as command } from './command.ts';
export type { Application, Config, Entity, Field, Options, Relationship, Source } from './types.ts';
2 changes: 1 addition & 1 deletion generators/angular/templates/package.json.ejs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@
"default_environment": "prod"
},
"scripts": {
"lint": "eslint .",
"lint": "eslint",
"lint:fix": "<%- nodePackageManager %> run lint -- --fix",
"cleanup": "rimraf <%- this.relativeDir(clientRootDir, temporaryDir) %>",
"clean-www": "rimraf <%- this.relativeDir(clientRootDir, clientDistDir) %>",
Expand Down
1 change: 1 addition & 0 deletions generators/app/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@
*/
export { default } from './generator.ts';
export { default as command } from './command.ts';
export type { Application, Config, Entity, Field, Options, Relationship, Source } from './types.ts';
33 changes: 30 additions & 3 deletions generators/app/types.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,39 @@
* limitations under the License.
*/
import type { CommandTypeMap } from '../../lib/command/types.ts';
import type { Config as BaseApplicationConfig, Options as BaseApplicationOptions } from '../base-application/types.ts';
import type {
Application as ClientApplication,
Config as ClientConfig,
Entity as ClientEntity,
Field as ClientField,
Options as ClientOptions,
Relationship as ClientRelationship,
Source as ClientSource,
} from '../client/types.d.ts';
import type {
Application as ServerApplication,
Config as ServerConfig,
Entity as ServerEntity,
Field as ServerField,
Options as ServerOptions,
Relationship as ServerRelationship,
Source as ServerSource,
} from '../server/types.d.ts';

import type command from './command.ts';

type Command = CommandTypeMap<typeof command>;

export type Config = Command['Config'] & BaseApplicationConfig;
export type Config = Command['Config'] & ClientConfig & ServerConfig;

export type Options = Command['Options'] & BaseApplicationOptions;
export type Options = Command['Options'] & ClientOptions & ServerOptions;

export type Source = ClientSource & ServerSource;

export type Field = ClientField & ServerField;

export interface Relationship extends ClientRelationship, ServerRelationship {}

export type Entity<F extends Field = Field, R extends Relationship = Relationship> = ClientEntity<F, R> & ServerEntity<F, R>;

export type Application = Command['Application'] & ClientApplication<Entity> & ServerApplication<Entity>;
1 change: 1 addition & 0 deletions generators/cypress/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@
export { default } from './generator.ts';
export { default as command } from './command.ts';
export { cypressEntityFiles, cypressFiles } from './files.ts';
export type { Application, Config, Entity, Field, Options, Relationship, Source } from './types.ts';
2 changes: 1 addition & 1 deletion generators/cypress/types.d.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import type {
Options as JavascriptOptions,
} from '../client/types.ts';

export type { Features, Field, Relationship } from '../client/types.ts';
export type { Features, Field, Relationship, Source } from '../client/types.ts';
import type command from './command.ts';

type Command = CommandTypeMap<typeof command>;
Expand Down
Loading
Loading