@common-stack/generate-plugin 7.2.1-alpha.7 → 7.2.1-alpha.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.
- package/CHANGELOG.md +8 -0
- package/lib/generators/add-backend/files/package.json +1 -1
- package/lib/generators/add-fullstack/files/_prettierignore +7 -0
- package/lib/generators/add-fullstack/files/cdecode-config.json +4 -1
- package/lib/generators/add-fullstack/files/package.json +1 -1
- package/lib/generators/add-fullstack/files/scripts/fix-enum-references.js +58 -0
- package/lib/generators/add-fullstack/updates/htmlPluginUpdate.cjs +1 -0
- package/lib/generators/add-fullstack/updates/htmlPluginUpdate.cjs.map +1 -1
- package/lib/generators/add-fullstack/updates/htmlPluginUpdate.mjs +1 -0
- package/lib/generators/add-fullstack/updates/htmlPluginUpdate.mjs.map +1 -1
- package/lib/generators/add-moleculer/files/package.json +1 -1
- package/package.json +3 -3
- package/src/generators/add-backend/files/package.json +1 -1
- package/src/generators/add-fullstack/files/_prettierignore +7 -0
- package/src/generators/add-fullstack/files/cdecode-config.json +4 -1
- package/src/generators/add-fullstack/files/package.json +1 -1
- package/src/generators/add-fullstack/files/scripts/fix-enum-references.js +58 -0
- package/src/generators/add-fullstack/updates/htmlPluginUpdate.ts +1 -0
- package/src/generators/add-moleculer/files/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -3,6 +3,14 @@
|
|
|
3
3
|
All notable changes to this project will be documented in this file.
|
|
4
4
|
See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
|
|
5
5
|
|
|
6
|
+
## [7.2.1-alpha.9](https://github.com/cdmbase/common-stack/compare/v7.2.1-alpha.8...v7.2.1-alpha.9) (2025-10-07)
|
|
7
|
+
|
|
8
|
+
**Note:** Version bump only for package @common-stack/generate-plugin
|
|
9
|
+
|
|
10
|
+
## [7.2.1-alpha.8](https://github.com/cdmbase/common-stack/compare/v7.2.1-alpha.7...v7.2.1-alpha.8) (2025-09-25)
|
|
11
|
+
|
|
12
|
+
**Note:** Version bump only for package @common-stack/generate-plugin
|
|
13
|
+
|
|
6
14
|
## [7.2.1-alpha.7](https://github.com/cdmbase/common-stack/compare/v7.2.1-alpha.6...v7.2.1-alpha.7) (2025-09-22)
|
|
7
15
|
|
|
8
16
|
**Note:** Version bump only for package @common-stack/generate-plugin
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
"dependencies": {
|
|
65
65
|
"@apollo/client": "^3.9.0",
|
|
66
66
|
"@babel/runtime": "^7.20.1",
|
|
67
|
-
"@common-stack/server-stack": "7.2.1-alpha.
|
|
67
|
+
"@common-stack/server-stack": "7.2.1-alpha.8",
|
|
68
68
|
"@remix-run/node": "~2.10.1",
|
|
69
69
|
"lodash": "^4.17.15",
|
|
70
70
|
"react": "18.2.0"
|
|
@@ -2,10 +2,13 @@
|
|
|
2
2
|
"servers": ["servers/frontend-server/config.json", "servers/backend-server/config.json"],
|
|
3
3
|
"codegen": {
|
|
4
4
|
"outputFile": "codegen.ts",
|
|
5
|
-
"rootSchema": "
|
|
5
|
+
"rootSchema": "node_modules/@common-stack/graphql-api/root-schema.graphqls",
|
|
6
6
|
"fullConfig": {
|
|
7
7
|
"overwrite": true,
|
|
8
8
|
"schema": ["$PRIMARY_SCHEMA_PLACEHOLDER$"],
|
|
9
|
+
"hooks": {
|
|
10
|
+
"afterAllFileWrite": ["node scripts/fix-enum-references.js"]
|
|
11
|
+
},
|
|
9
12
|
"generates": {
|
|
10
13
|
"packages/common/src/generated/generated-models.ts": {
|
|
11
14
|
"schema": "%discoveredSchemas%",
|
|
@@ -137,7 +137,7 @@
|
|
|
137
137
|
"@babel/register": "^7.18.9",
|
|
138
138
|
"@babel/runtime": "^7.20.1",
|
|
139
139
|
"@common-stack/env-list-loader": "7.2.1-alpha.5",
|
|
140
|
-
"@common-stack/generate-plugin": "7.2.1-alpha.
|
|
140
|
+
"@common-stack/generate-plugin": "7.2.1-alpha.8",
|
|
141
141
|
"@common-stack/rollup-vite-utils": "7.2.1-alpha.5",
|
|
142
142
|
"@emotion/babel-plugin": "^11.11.0",
|
|
143
143
|
"@graphql-codegen/add": "^5.0.3",
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
|
|
3
|
+
const fs = require('fs');
|
|
4
|
+
const path = require('path');
|
|
5
|
+
|
|
6
|
+
// File paths to fix
|
|
7
|
+
const filesToFix = [
|
|
8
|
+
path.join(__dirname, '../packages/common/src/generated/generated-models.ts'),
|
|
9
|
+
path.join(__dirname, '../packages/common/src/generated/generated.tsx'),
|
|
10
|
+
];
|
|
11
|
+
|
|
12
|
+
// Enum mappings - add more mappings here if needed
|
|
13
|
+
const enumMappings = {
|
|
14
|
+
ICacheControlScope: 'CacheControlScope',
|
|
15
|
+
// Add more enum mappings here as needed
|
|
16
|
+
// 'ISomeOtherEnum': 'SomeOtherEnum'
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
function fixEnumReferences(filePath) {
|
|
20
|
+
if (!fs.existsSync(filePath)) {
|
|
21
|
+
console.log(`File not found: ${filePath}`);
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
let content = fs.readFileSync(filePath, 'utf8');
|
|
26
|
+
let hasChanges = false;
|
|
27
|
+
|
|
28
|
+
// Apply enum reference fixes
|
|
29
|
+
Object.entries(enumMappings).forEach(([incorrectRef, correctRef]) => {
|
|
30
|
+
const regex = new RegExp(`\\b${incorrectRef}\\b`, 'g');
|
|
31
|
+
if (content.includes(incorrectRef)) {
|
|
32
|
+
content = content.replace(regex, correctRef);
|
|
33
|
+
hasChanges = true;
|
|
34
|
+
console.log(`Fixed: ${incorrectRef} -> ${correctRef} in ${path.basename(filePath)}`);
|
|
35
|
+
}
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
if (hasChanges) {
|
|
39
|
+
fs.writeFileSync(filePath, content, 'utf8');
|
|
40
|
+
console.log(`Updated: ${filePath}`);
|
|
41
|
+
} else {
|
|
42
|
+
console.log(`No changes needed in: ${path.basename(filePath)}`);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
function main() {
|
|
47
|
+
console.log('🔧 Fixing enum references in generated files...');
|
|
48
|
+
|
|
49
|
+
filesToFix.forEach(fixEnumReferences);
|
|
50
|
+
|
|
51
|
+
console.log('✅ Enum reference fix completed!');
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
if (require.main === module) {
|
|
55
|
+
main();
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
module.exports = { fixEnumReferences, enumMappings };
|
|
@@ -13,6 +13,7 @@ function renameDotFiles(tree, projectRoot) {
|
|
|
13
13
|
{ src: '_browserslistrc', dest: '.browserslistrc' },
|
|
14
14
|
{ src: '_eslintignore', dest: '.eslintignore' },
|
|
15
15
|
{ src: '_eslintrc.js', dest: '.eslintrc.js' },
|
|
16
|
+
{ src: '_prettierignore', dest: '.prettierignore' },
|
|
16
17
|
{ src: '_nxignore', dest: '.nxignore' },
|
|
17
18
|
{ src: '_markdownlint.json', dest: '.markdownlint.json' },
|
|
18
19
|
{ src: '_markdownlintignore', dest: '.markdownlintignore' },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"htmlPluginUpdate.cjs","sources":["../../../../src/generators/add-fullstack/updates/htmlPluginUpdate.ts"],"sourcesContent":[null],"names":["path"],"mappings":"oYAIgB,SAAA,gBAAgB,CAAC,IAAU,EAAE,WAAmB,EAAA;AAC5D,IAAA,MAAM,QAAQ,GAAGA,eAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,0BAA0B,CAAC,CAAC;AAC7E,IAAA,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;QACvB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;AAChD,QAAA,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACrE,QAAA,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;KACrC;AACL,CAAC;AAEe,SAAA,cAAc,CAAC,IAAU,EAAE,WAAmB,EAAA;;AAE1D,IAAA,MAAM,QAAQ,GAAG;AACb,QAAA,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE;AACzC,QAAA,EAAE,GAAG,EAAE,iBAAiB,EAAE,IAAI,EAAE,iBAAiB,EAAE;AACnD,QAAA,EAAE,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,eAAe,EAAE;AAC/C,QAAA,EAAE,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE;AAC7C,QAAA,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE;AACvC,QAAA,EAAE,GAAG,EAAE,oBAAoB,EAAE,IAAI,EAAE,oBAAoB,EAAE;AACzD,QAAA,EAAE,GAAG,EAAE,qBAAqB,EAAE,IAAI,EAAE,qBAAqB,EAAE;AAC3D,QAAA,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE;KACpC,CAAC;;IAGF,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,KAAI;QAC/B,MAAM,OAAO,GAAGA,eAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAGA,eAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;;AAG9C,QAAA,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;;YAEtB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;AAC9C,YAAA,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;;AAE9B,YAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACrB,OAAO,CAAC,GAAG,CAAC,CAAA,QAAA,EAAW,OAAO,CAAO,IAAA,EAAA,QAAQ,CAAE,CAAA,CAAC,CAAC;SACpD;AACL,KAAC,CAAC,CAAC;AACP"}
|
|
1
|
+
{"version":3,"file":"htmlPluginUpdate.cjs","sources":["../../../../src/generators/add-fullstack/updates/htmlPluginUpdate.ts"],"sourcesContent":[null],"names":["path"],"mappings":"oYAIgB,SAAA,gBAAgB,CAAC,IAAU,EAAE,WAAmB,EAAA;AAC5D,IAAA,MAAM,QAAQ,GAAGA,eAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,0BAA0B,CAAC,CAAC;AAC7E,IAAA,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;QACvB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;AAChD,QAAA,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACrE,QAAA,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;KACrC;AACL,CAAC;AAEe,SAAA,cAAc,CAAC,IAAU,EAAE,WAAmB,EAAA;;AAE1D,IAAA,MAAM,QAAQ,GAAG;AACb,QAAA,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE;AACzC,QAAA,EAAE,GAAG,EAAE,iBAAiB,EAAE,IAAI,EAAE,iBAAiB,EAAE;AACnD,QAAA,EAAE,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,eAAe,EAAE;AAC/C,QAAA,EAAE,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE;AAC7C,QAAA,EAAE,GAAG,EAAE,iBAAiB,EAAE,IAAI,EAAE,iBAAiB,EAAC;AAClD,QAAA,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE;AACvC,QAAA,EAAE,GAAG,EAAE,oBAAoB,EAAE,IAAI,EAAE,oBAAoB,EAAE;AACzD,QAAA,EAAE,GAAG,EAAE,qBAAqB,EAAE,IAAI,EAAE,qBAAqB,EAAE;AAC3D,QAAA,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE;KACpC,CAAC;;IAGF,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,KAAI;QAC/B,MAAM,OAAO,GAAGA,eAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAGA,eAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;;AAG9C,QAAA,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;;YAEtB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;AAC9C,YAAA,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;;AAE9B,YAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACrB,OAAO,CAAC,GAAG,CAAC,CAAA,QAAA,EAAW,OAAO,CAAO,IAAA,EAAA,QAAQ,CAAE,CAAA,CAAC,CAAC;SACpD;AACL,KAAC,CAAC,CAAC;AACP"}
|
|
@@ -13,6 +13,7 @@ function renameDotFiles(tree, projectRoot) {
|
|
|
13
13
|
{ src: '_browserslistrc', dest: '.browserslistrc' },
|
|
14
14
|
{ src: '_eslintignore', dest: '.eslintignore' },
|
|
15
15
|
{ src: '_eslintrc.js', dest: '.eslintrc.js' },
|
|
16
|
+
{ src: '_prettierignore', dest: '.prettierignore' },
|
|
16
17
|
{ src: '_nxignore', dest: '.nxignore' },
|
|
17
18
|
{ src: '_markdownlint.json', dest: '.markdownlint.json' },
|
|
18
19
|
{ src: '_markdownlintignore', dest: '.markdownlintignore' },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"htmlPluginUpdate.mjs","sources":["../../../../src/generators/add-fullstack/updates/htmlPluginUpdate.ts"],"sourcesContent":[null],"names":[],"mappings":"0BAIgB,SAAA,gBAAgB,CAAC,IAAU,EAAE,WAAmB,EAAA;AAC5D,IAAA,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,0BAA0B,CAAC,CAAC;AAC7E,IAAA,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;QACvB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;AAChD,QAAA,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACrE,QAAA,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;KACrC;AACL,CAAC;AAEe,SAAA,cAAc,CAAC,IAAU,EAAE,WAAmB,EAAA;;AAE1D,IAAA,MAAM,QAAQ,GAAG;AACb,QAAA,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE;AACzC,QAAA,EAAE,GAAG,EAAE,iBAAiB,EAAE,IAAI,EAAE,iBAAiB,EAAE;AACnD,QAAA,EAAE,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,eAAe,EAAE;AAC/C,QAAA,EAAE,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE;AAC7C,QAAA,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE;AACvC,QAAA,EAAE,GAAG,EAAE,oBAAoB,EAAE,IAAI,EAAE,oBAAoB,EAAE;AACzD,QAAA,EAAE,GAAG,EAAE,qBAAqB,EAAE,IAAI,EAAE,qBAAqB,EAAE;AAC3D,QAAA,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE;KACpC,CAAC;;IAGF,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,KAAI;QAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;;AAG9C,QAAA,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;;YAEtB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;AAC9C,YAAA,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;;AAE9B,YAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACrB,OAAO,CAAC,GAAG,CAAC,CAAA,QAAA,EAAW,OAAO,CAAO,IAAA,EAAA,QAAQ,CAAE,CAAA,CAAC,CAAC;SACpD;AACL,KAAC,CAAC,CAAC;AACP"}
|
|
1
|
+
{"version":3,"file":"htmlPluginUpdate.mjs","sources":["../../../../src/generators/add-fullstack/updates/htmlPluginUpdate.ts"],"sourcesContent":[null],"names":[],"mappings":"0BAIgB,SAAA,gBAAgB,CAAC,IAAU,EAAE,WAAmB,EAAA;AAC5D,IAAA,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,OAAO,EAAE,0BAA0B,CAAC,CAAC;AAC7E,IAAA,IAAI,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE;QACvB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC;AAChD,QAAA,MAAM,WAAW,GAAG,QAAQ,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;AACrE,QAAA,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;KACrC;AACL,CAAC;AAEe,SAAA,cAAc,CAAC,IAAU,EAAE,WAAmB,EAAA;;AAE1D,IAAA,MAAM,QAAQ,GAAG;AACb,QAAA,EAAE,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,YAAY,EAAE;AACzC,QAAA,EAAE,GAAG,EAAE,iBAAiB,EAAE,IAAI,EAAE,iBAAiB,EAAE;AACnD,QAAA,EAAE,GAAG,EAAE,eAAe,EAAE,IAAI,EAAE,eAAe,EAAE;AAC/C,QAAA,EAAE,GAAG,EAAE,cAAc,EAAE,IAAI,EAAE,cAAc,EAAE;AAC7C,QAAA,EAAE,GAAG,EAAE,iBAAiB,EAAE,IAAI,EAAE,iBAAiB,EAAC;AAClD,QAAA,EAAE,GAAG,EAAE,WAAW,EAAE,IAAI,EAAE,WAAW,EAAE;AACvC,QAAA,EAAE,GAAG,EAAE,oBAAoB,EAAE,IAAI,EAAE,oBAAoB,EAAE;AACzD,QAAA,EAAE,GAAG,EAAE,qBAAqB,EAAE,IAAI,EAAE,qBAAqB,EAAE;AAC3D,QAAA,EAAE,GAAG,EAAE,QAAQ,EAAE,IAAI,EAAE,QAAQ,EAAE;KACpC,CAAC;;IAGF,QAAQ,CAAC,OAAO,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,EAAE,KAAI;QAC/B,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QAC5C,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;;AAG9C,QAAA,IAAI,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;;YAEtB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC;AAC9C,YAAA,IAAI,CAAC,KAAK,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;;AAE9B,YAAA,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;YACrB,OAAO,CAAC,GAAG,CAAC,CAAA,QAAA,EAAW,OAAO,CAAO,IAAA,EAAA,QAAQ,CAAE,CAAA,CAAC,CAAC;SACpD;AACL,KAAC,CAAC,CAAC;AACP"}
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"@common-stack/client-core": "7.2.1-alpha.5",
|
|
33
33
|
"@common-stack/core": "7.2.1-alpha.5",
|
|
34
34
|
"@common-stack/server-core": "7.2.1-alpha.5",
|
|
35
|
-
"@common-stack/server-stack": "7.2.1-alpha.
|
|
35
|
+
"@common-stack/server-stack": "7.2.1-alpha.8",
|
|
36
36
|
"@common-stack/store-mongo": "7.2.1-alpha.5",
|
|
37
37
|
"@container-stack/mailing-api": "5.2.1-alpha.1",
|
|
38
38
|
"helmet": "^3.21.2",
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@common-stack/generate-plugin",
|
|
3
|
-
"version": "7.2.1-alpha.
|
|
3
|
+
"version": "7.2.1-alpha.9",
|
|
4
4
|
"type": "module",
|
|
5
5
|
"main": "./lib/index.mjs",
|
|
6
6
|
"typings": "./lib/index.d.ts",
|
|
@@ -18,7 +18,7 @@
|
|
|
18
18
|
"watch": "yarn build:lib:watch"
|
|
19
19
|
},
|
|
20
20
|
"dependencies": {
|
|
21
|
-
"@common-stack/rollup-vite-utils": "7.2.1-alpha.
|
|
21
|
+
"@common-stack/rollup-vite-utils": "7.2.1-alpha.9",
|
|
22
22
|
"tslib": "^2.3.0"
|
|
23
23
|
},
|
|
24
24
|
"publishConfig": {
|
|
@@ -26,5 +26,5 @@
|
|
|
26
26
|
},
|
|
27
27
|
"executors": "./executors.json",
|
|
28
28
|
"generators": "./generators.json",
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "15130c2d19bb06da3e6675bec49fcdc17b160723"
|
|
30
30
|
}
|
|
@@ -64,7 +64,7 @@
|
|
|
64
64
|
"dependencies": {
|
|
65
65
|
"@apollo/client": "^3.9.0",
|
|
66
66
|
"@babel/runtime": "^7.20.1",
|
|
67
|
-
"@common-stack/server-stack": "7.2.1-alpha.
|
|
67
|
+
"@common-stack/server-stack": "7.2.1-alpha.8",
|
|
68
68
|
"@remix-run/node": "~2.10.1",
|
|
69
69
|
"lodash": "^4.17.15",
|
|
70
70
|
"react": "18.2.0"
|
|
@@ -2,10 +2,13 @@
|
|
|
2
2
|
"servers": ["servers/frontend-server/config.json", "servers/backend-server/config.json"],
|
|
3
3
|
"codegen": {
|
|
4
4
|
"outputFile": "codegen.ts",
|
|
5
|
-
"rootSchema": "
|
|
5
|
+
"rootSchema": "node_modules/@common-stack/graphql-api/root-schema.graphqls",
|
|
6
6
|
"fullConfig": {
|
|
7
7
|
"overwrite": true,
|
|
8
8
|
"schema": ["$PRIMARY_SCHEMA_PLACEHOLDER$"],
|
|
9
|
+
"hooks": {
|
|
10
|
+
"afterAllFileWrite": ["node scripts/fix-enum-references.js"]
|
|
11
|
+
},
|
|
9
12
|
"generates": {
|
|
10
13
|
"packages/common/src/generated/generated-models.ts": {
|
|
11
14
|
"schema": "%discoveredSchemas%",
|
|
@@ -137,7 +137,7 @@
|
|
|
137
137
|
"@babel/register": "^7.18.9",
|
|
138
138
|
"@babel/runtime": "^7.20.1",
|
|
139
139
|
"@common-stack/env-list-loader": "7.2.1-alpha.5",
|
|
140
|
-
"@common-stack/generate-plugin": "7.2.1-alpha.
|
|
140
|
+
"@common-stack/generate-plugin": "7.2.1-alpha.8",
|
|
141
141
|
"@common-stack/rollup-vite-utils": "7.2.1-alpha.5",
|
|
142
142
|
"@emotion/babel-plugin": "^11.11.0",
|
|
143
143
|
"@graphql-codegen/add": "^5.0.3",
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
#!/usr/bin/env node
|
|
2
|
+
|
|
3
|
+
const fs = require('fs');
|
|
4
|
+
const path = require('path');
|
|
5
|
+
|
|
6
|
+
// File paths to fix
|
|
7
|
+
const filesToFix = [
|
|
8
|
+
path.join(__dirname, '../packages/common/src/generated/generated-models.ts'),
|
|
9
|
+
path.join(__dirname, '../packages/common/src/generated/generated.tsx'),
|
|
10
|
+
];
|
|
11
|
+
|
|
12
|
+
// Enum mappings - add more mappings here if needed
|
|
13
|
+
const enumMappings = {
|
|
14
|
+
ICacheControlScope: 'CacheControlScope',
|
|
15
|
+
// Add more enum mappings here as needed
|
|
16
|
+
// 'ISomeOtherEnum': 'SomeOtherEnum'
|
|
17
|
+
};
|
|
18
|
+
|
|
19
|
+
function fixEnumReferences(filePath) {
|
|
20
|
+
if (!fs.existsSync(filePath)) {
|
|
21
|
+
console.log(`File not found: ${filePath}`);
|
|
22
|
+
return;
|
|
23
|
+
}
|
|
24
|
+
|
|
25
|
+
let content = fs.readFileSync(filePath, 'utf8');
|
|
26
|
+
let hasChanges = false;
|
|
27
|
+
|
|
28
|
+
// Apply enum reference fixes
|
|
29
|
+
Object.entries(enumMappings).forEach(([incorrectRef, correctRef]) => {
|
|
30
|
+
const regex = new RegExp(`\\b${incorrectRef}\\b`, 'g');
|
|
31
|
+
if (content.includes(incorrectRef)) {
|
|
32
|
+
content = content.replace(regex, correctRef);
|
|
33
|
+
hasChanges = true;
|
|
34
|
+
console.log(`Fixed: ${incorrectRef} -> ${correctRef} in ${path.basename(filePath)}`);
|
|
35
|
+
}
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
if (hasChanges) {
|
|
39
|
+
fs.writeFileSync(filePath, content, 'utf8');
|
|
40
|
+
console.log(`Updated: ${filePath}`);
|
|
41
|
+
} else {
|
|
42
|
+
console.log(`No changes needed in: ${path.basename(filePath)}`);
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
function main() {
|
|
47
|
+
console.log('🔧 Fixing enum references in generated files...');
|
|
48
|
+
|
|
49
|
+
filesToFix.forEach(fixEnumReferences);
|
|
50
|
+
|
|
51
|
+
console.log('✅ Enum reference fix completed!');
|
|
52
|
+
}
|
|
53
|
+
|
|
54
|
+
if (require.main === module) {
|
|
55
|
+
main();
|
|
56
|
+
}
|
|
57
|
+
|
|
58
|
+
module.exports = { fixEnumReferences, enumMappings };
|
|
@@ -18,6 +18,7 @@ export function renameDotFiles(tree: Tree, projectRoot: string) {
|
|
|
18
18
|
{ src: '_browserslistrc', dest: '.browserslistrc' },
|
|
19
19
|
{ src: '_eslintignore', dest: '.eslintignore' },
|
|
20
20
|
{ src: '_eslintrc.js', dest: '.eslintrc.js' },
|
|
21
|
+
{ src: '_prettierignore', dest: '.prettierignore'},
|
|
21
22
|
{ src: '_nxignore', dest: '.nxignore' },
|
|
22
23
|
{ src: '_markdownlint.json', dest: '.markdownlint.json' },
|
|
23
24
|
{ src: '_markdownlintignore', dest: '.markdownlintignore' },
|
|
@@ -32,7 +32,7 @@
|
|
|
32
32
|
"@common-stack/client-core": "7.2.1-alpha.5",
|
|
33
33
|
"@common-stack/core": "7.2.1-alpha.5",
|
|
34
34
|
"@common-stack/server-core": "7.2.1-alpha.5",
|
|
35
|
-
"@common-stack/server-stack": "7.2.1-alpha.
|
|
35
|
+
"@common-stack/server-stack": "7.2.1-alpha.8",
|
|
36
36
|
"@common-stack/store-mongo": "7.2.1-alpha.5",
|
|
37
37
|
"@container-stack/mailing-api": "5.2.1-alpha.1",
|
|
38
38
|
"helmet": "^3.21.2",
|