@axinom/mosaic-cli 0.43.0-rc.8 → 0.43.0-rc.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -12,6 +12,16 @@ const git_1 = require("./helpers/git");
|
|
|
12
12
|
const logger = require("./helpers/logger");
|
|
13
13
|
// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
|
|
14
14
|
const getOra = () => tslib_1.__awaiter(void 0, void 0, void 0, function* () { return (yield import('ora')).default; });
|
|
15
|
+
// Add helper function for sanitizing the package name
|
|
16
|
+
const sanitizePackageName = (name) => {
|
|
17
|
+
// Lowercase and replace invalid characters with a hyphen.
|
|
18
|
+
return name
|
|
19
|
+
.trim()
|
|
20
|
+
.toLowerCase()
|
|
21
|
+
.replace(/[^a-z0-9-_]/g, '-')
|
|
22
|
+
.replace(/-+/g, '-')
|
|
23
|
+
.replace(/^-|-$/g, '');
|
|
24
|
+
};
|
|
15
25
|
const createSolution = (options) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
16
26
|
logger.debug('CreateSolution options', JSON.stringify(options));
|
|
17
27
|
yield downloadAndUnzipTemplate(options);
|
|
@@ -70,7 +80,8 @@ const adjustSolution = (options) => tslib_1.__awaiter(void 0, void 0, void 0, fu
|
|
|
70
80
|
try {
|
|
71
81
|
const packageJsonPath = path.join(process.cwd(), 'package.json');
|
|
72
82
|
const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
|
|
73
|
-
|
|
83
|
+
// Use sanitized package name
|
|
84
|
+
packageJson.name = sanitizePackageName(options.projectName);
|
|
74
85
|
packageJson.mosaic = {
|
|
75
86
|
baseVersion: `${yield (0, git_1.getCommitId)(options)} (${options.gitReference})`,
|
|
76
87
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"createSolution.js","sourceRoot":"","sources":["../../../src/commands/create/createSolution.ts"],"names":[],"mappings":";;;;AAAA,iDAAqC;AACrC,yBAAyB;AACzB,yCAAyC;AACzC,6BAA6B;AAC7B,2CAAuC;AACvC,2BAA2B;AAC3B,uCAA4C;AAC5C,2CAA2C;AAG3C,4EAA4E;AAC5E,MAAM,MAAM,GAAG,GAAS,EAAE,0DAAC,OAAA,CAAC,MAAM,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,CAAA,GAAA,CAAC;
|
|
1
|
+
{"version":3,"file":"createSolution.js","sourceRoot":"","sources":["../../../src/commands/create/createSolution.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axinom/mosaic-cli",
|
|
3
|
-
"version": "0.43.0-rc.
|
|
3
|
+
"version": "0.43.0-rc.9",
|
|
4
4
|
"description": "The Axinom Mosaic CLI",
|
|
5
5
|
"author": "Axinom",
|
|
6
6
|
"license": "PROPRIETARY",
|
|
@@ -34,8 +34,8 @@
|
|
|
34
34
|
"@asyncapi/diff": "^0.4.1",
|
|
35
35
|
"@asyncapi/modelina": "^1.8.4",
|
|
36
36
|
"@asyncapi/parser": "^2.0.2",
|
|
37
|
-
"@axinom/mosaic-id-link-be": "^0.31.0-rc.
|
|
38
|
-
"@axinom/mosaic-service-common": "^0.59.0-rc.
|
|
37
|
+
"@axinom/mosaic-id-link-be": "^0.31.0-rc.9",
|
|
38
|
+
"@axinom/mosaic-service-common": "^0.59.0-rc.9",
|
|
39
39
|
"@graphql-inspector/core": "^3.1.2",
|
|
40
40
|
"@inquirer/prompts": "^4.3.0",
|
|
41
41
|
"@stoplight/spectral-core": "^1.18.3",
|
|
@@ -77,5 +77,5 @@
|
|
|
77
77
|
"publishConfig": {
|
|
78
78
|
"access": "public"
|
|
79
79
|
},
|
|
80
|
-
"gitHead": "
|
|
80
|
+
"gitHead": "2ebedd14546ecd630b7a05b043968f556bac14e1"
|
|
81
81
|
}
|
|
@@ -11,6 +11,17 @@ import { CreateSolutionInput } from './helpers/types';
|
|
|
11
11
|
// eslint-disable-next-line @typescript-eslint/explicit-function-return-type
|
|
12
12
|
const getOra = async () => (await import('ora')).default;
|
|
13
13
|
|
|
14
|
+
// Add helper function for sanitizing the package name
|
|
15
|
+
const sanitizePackageName = (name: string): string => {
|
|
16
|
+
// Lowercase and replace invalid characters with a hyphen.
|
|
17
|
+
return name
|
|
18
|
+
.trim()
|
|
19
|
+
.toLowerCase()
|
|
20
|
+
.replace(/[^a-z0-9-_]/g, '-')
|
|
21
|
+
.replace(/-+/g, '-')
|
|
22
|
+
.replace(/^-|-$/g, '');
|
|
23
|
+
};
|
|
24
|
+
|
|
14
25
|
export const createSolution = async (
|
|
15
26
|
options: CreateSolutionInput,
|
|
16
27
|
): Promise<void> => {
|
|
@@ -94,7 +105,8 @@ const adjustSolution = async (options: CreateSolutionInput): Promise<void> => {
|
|
|
94
105
|
try {
|
|
95
106
|
const packageJsonPath = path.join(process.cwd(), 'package.json');
|
|
96
107
|
const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
|
|
97
|
-
|
|
108
|
+
// Use sanitized package name
|
|
109
|
+
packageJson.name = sanitizePackageName(options.projectName);
|
|
98
110
|
|
|
99
111
|
packageJson.mosaic = {
|
|
100
112
|
baseVersion: `${await getCommitId(options)} (${options.gitReference})`,
|