@common-stack/generate-plugin 6.0.8-alpha.5 → 6.0.8-alpha.50

package/src/generators/add-fullstack/files/cdecode-config.json

@@ -0,0 +1,126 @@
+{
+    "servers": ["servers/frontend-server/config.json", "servers/backend-server/config.json"],
+    "codegen": {
+        "outputFile": "codegen.ts",
+        "rootSchema": "servers/backend-server/src/api/root-schema.graphqls",
+        "fullConfig": {
+            "overwrite": true,
+            "schema": ["$PRIMARY_SCHEMA_PLACEHOLDER$"],
+            "generates": {
+                "packages/common/src/generated/generated-models.ts": {
+                    "schema": "%discoveredSchemas%",
+                    "documents": "%discoveredDocuments%",
+                    "config": {
+                        "scalars": {
+                            "URI": "URI",
+                            "URIInput": "URI | UriComponents"
+                        },
+                        "enumPrefix": false,
+                        "enumValues": {
+                            "ConfigurationScope": "@workbench-stack/core/lib/interfaces/configuration/configuration.js#ConfigurationScope",
+                            "ConfigurationTarget": "../configuration#ConfigurationTarget"
+                        },
+                        "constEnums": false,
+                        "contextType": "../apollo-context#MyContext",
+                        "withHooks": true,
+                        "typesPrefix": "I",
+                        "noNamespaces": true,
+                        "noGraphQLTag": true
+                    },
+                    "plugins": [
+                        {
+                            "add": {
+                                "content": [
+                                    "import { URI,  UriComponents } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';"
+                                ]
+                            }
+                        },
+                        "typescript",
+                        "typescript-operations",
+                        "typescript-resolvers"
+                    ]
+                },
+                "packages/common/src/generated/generated.tsx": {
+                    "schema": "%discoveredSchemas%",
+                    "documents": "%discoveredDocuments%",
+                    "config": {
+                        "scalars": {
+                            "URI": "URI",
+                            "URIInput": "URI | UriComponents"
+                        },
+                        "enumPrefix": false,
+                        "withHooks": true,
+                        "typesPrefix": "I",
+                        "noNamespaces": true,
+                        "noGraphQLTag": true
+                    },
+                    "preset": "import-types-preset",
+                    "presetConfig": {
+                        "typesPath": "./generated-models",
+                        "importTypesNamespace": "SchemaTypes"
+                    },
+                    "plugins": [
+                        {
+                            "add": {
+                                "content": [
+                                    "import { URI,  UriComponents } from '@vscode-alt/monaco-editor/esm/vs/base/common/uri.js';"
+                                ]
+                            }
+                        },
+                        "typescript-react-apollo"
+                    ]
+                },
+                "packages/common/src/generated/introspection-result.ts": {
+                    "schema": "%discoveredSchemas%",
+                    "documents": "%discoveredDocuments%",
+                    "config": {
+                        "typesPrefix": "I"
+                    },
+                    "plugins": [
+                        {
+                            "add": {
+                                "content": ["/* tslint:disable */"]
+                            }
+                        },
+                        "fragment-matcher"
+                    ]
+                }
+            }
+        }
+    },
+    "updateDependencies": {
+        "packagesToCheck": [
+            "@common-stack/server-stack",
+            "@common-stack/frontend-stack-react",
+            "@common-stack/mobile-stack-react"
+        ],
+        "packagePaths": {
+            "backend": ["servers/backend-server/package.json"],
+            "frontend": ["servers/frontend-server/package.json"],
+            "mobile": ["portable-devices/mobile/package.json"]
+        }
+    },
+    "updateDependencyVersion": {
+        "roots": ["servers", "portable-devices", "packages", "packages-modules"],
+        "ignorePattern": "**/node_modules/**",
+        "jsonSpacing": 4,
+        "addEndNewLine": true,
+        "commitMessage": "Updated packages to use correct versions"
+    },
+    "sortPackageJson": {
+        "directories": [".", "packages", "packages-modules", "servers", "portable-devices"],
+        "skipNodeModules": true
+    },
+    "deployVersionUpdate": {
+        "lernaJsonPath": "lerna.json",
+        "jenkinsfilePath": "Jenkinsfile",
+        "valuesDevYamlPath": "values-dev.yaml",
+        "valuesProdYamlPath": "values-prod.yaml"
+    },
+    "projectPaths": {
+        "packages": "packages",
+        "packagesModules": "packages-modules",
+        "servers": "servers",
+        "portableDevices": "portable-devices"
+    }
+}

package/src/generators/add-fullstack/files/package.json

@@ -25,7 +25,7 @@
     },
     "scripts": {
         "prebootstrap": "lerna run prepare",
-        "bootstrap": "yarn && yarn lerna",
+        "bootstrap": "yarn",
         "postbootstrap": "yarn build",
         "build": "yarn build:packages",
         "build:clean": "lerna exec yarn build:clean",
@@ -52,14 +52,15 @@
         "devpublish:push": "yarn predevpublish && git push origin $PUBLISH_BRANCH && yarn postdevpublish",
         "format": "yarn lint --fix",
         "format:md": "yarn lint:md --fix",
-        "generateGraphql": "graphql-codegen",
+        "pregenerateGraphql": " node --experimental-modules tools/codegenGenerator.mjs",
+        "generateGraphql": "graphql-codegen-esm",
+        "postgenerateGraphql": "lerna run watch --scope=common",
         "generateGraphql:watch": "yarn generateGraphql -- --watch",
         "git:pull": "git pull origin $(git rev-parse --abbrev-ref HEAD)",
         "git:push": "git push origin $(git rev-parse --abbrev-ref HEAD)",
         "gitcommit": "git add -A && git diff --staged --quiet || git commit -am 'auto publish [skip ci] \r\n'",
         "husky-skip": "cross-env HUSKY_SKIP_HOOKS=1",
         "jest": "./node_modules/.bin/jest",
-        "lerna": "lerna bootstrap",
         "prelernapublish": "git checkout $PUBLISH_BRANCH && git pull origin $PUBLISH_BRANCH  && git merge -s recursive -X theirs $MASTER_BRANCH  -m 'merge from master' && yarn gitcommit && node tools/update-dependency-version.mjs && yarn gitcommit",
         "lernapublish": "lerna publish patch --ignore-scripts",
         "postlernapublish": "yarn update-lerna-on-develop && git checkout $MASTER_BRANCH",
@@ -105,9 +106,11 @@
     },
     "resolutions": {
         "@apollo/client": "^3.9.0",
-        "@types/react": "^18.0.25",
-        "@types/react-dom": "^18.0.8",
+        "@types/react": "^18.2.25",
+        "@types/react-dom": "^18.2.7",
+        "common": "link:packages/common",
         "html-to-text": "^8.0.0",
+        "lerna": "8.1.8",
         "react": "18.3.0-canary-c3048aab4-20240326",
         "react-dom": "18.3.0-canary-c3048aab4-20240326",
         "react-native": "0.72.10",
@@ -146,20 +149,20 @@
         "@babel/preset-typescript": "^7.18.6",
         "@babel/register": "^7.18.9",
         "@babel/runtime": "^7.20.1",
-        "@common-stack/env-list-loader": "6.0.8-alpha.1",
-        "@common-stack/generate-plugin": "6.0.8-alpha.4",
-        "@common-stack/rollup-vite-utils": "6.0.8-alpha.1",
+        "@common-stack/env-list-loader": "6.0.8-alpha.31",
+        "@common-stack/generate-plugin": "6.0.8-alpha.49",
+        "@common-stack/rollup-vite-utils": "6.0.8-alpha.48",
         "@emotion/babel-plugin": "^11.11.0",
-        "@graphql-codegen/add": "^5.0.2",
-        "@graphql-codegen/cli": "^5.0.2",
-        "@graphql-codegen/fragment-matcher": "^5.0.2",
+        "@graphql-codegen/add": "^5.0.3",
+        "@graphql-codegen/cli": "^5.0.4",
+        "@graphql-codegen/fragment-matcher": "^5.1.0",
         "@graphql-codegen/import-types-preset": "^3.0.0",
         "@graphql-codegen/near-operation-file-preset": "^3.0.0",
-        "@graphql-codegen/typescript": "^4.0.6",
+        "@graphql-codegen/typescript": "^4.1.3",
         "@graphql-codegen/typescript-graphql-files-modules": "^3.0.0",
-        "@graphql-codegen/typescript-operations": "^4.2.0",
-        "@graphql-codegen/typescript-react-apollo": "^4.3.0",
-        "@graphql-codegen/typescript-resolvers": "^4.0.6",
+        "@graphql-codegen/typescript-operations": "^4.4.1",
+        "@graphql-codegen/typescript-react-apollo": "^4.3.2",
+        "@graphql-codegen/typescript-resolvers": "^4.4.2",
         "@loadable/babel-plugin": "^5.13.2",
         "@loadable/webpack-plugin": "^5.15.2",
         "@nx-aws-plugin/nx-aws-cache": "^3.2.2",
@@ -176,7 +179,8 @@
         "@rollup/plugin-typescript": "^11.1.5",
         "@shelf/jest-mongodb": "^4.1.3",
         "@svgr/webpack": "^6.5.1",
-        "@testing-library/react": "^16.0.1",
+        "@testing-library/dom": "^10.4.0",
+        "@testing-library/react": "^16.1.0",
         "@testing-library/react-hooks": "^8.0.1",
         "@types/async": "^3.2.15",
         "@types/body-parser": "1.19.2",
@@ -272,7 +276,7 @@
         "jest-raw-loader": "^1.0.1",
         "jest-transform-graphql": "^2.1.0",
         "jsdom": "^20.0.2",
-        "lerna": "8",
+        "lerna": "8.1.8",
         "less": "^4.1.3",
         "less-loader": "^11.0.0",
         "lint-staged": "^15.2.7",
@@ -307,11 +311,15 @@
         "redux-devtools-extension": "^2.13.9",
         "redux-mock-store": "^1.5.4",
         "remap-istanbul": "^0.13.0",
+        "remix-development-tools": "^4.4.1",
         "resolve-url-loader": "^5.0.0",
         "rimraf": "^3.0.2",
         "rollup": "^4.13.0",
         "rollup-plugin-esbuild": "^6.1.1",
+        "rollup-plugin-multi-input": "^1.5.0",
         "rollup-plugin-string": "^3.0.0",
+        "rollup-plugin-svg": "^2.0.0",
+        "rollup-plugin-visualizer": "^5.14.0",
         "sass-loader": "^13.1.0",
         "shelljs": "^0.8.5",
         "simple-git": "^3.14.1",
@@ -332,10 +340,15 @@
         "typedoc": "^0.23.20",
         "typescript": "^5.5.4",
         "url-loader": "^4.1.1",
+        "vite": "^5.1.1",
+        "vite-plugin-babel-macros": "^1.0.6",
+        "vite-plugin-cjs-interop": "^2.0.6",
+        "vite-plugin-compression": "^0.5.1",
+        "vitest": "^3.0.4",
         "wait-on": "^6.0.1",
         "webpack": "^5.74.0",
         "webpack-bundle-analyzer": "^4.7.0",
-        "webpack-cli": "^4.10.0",
+        "webpack-cli": "^5.1.4",
         "webpack-dev-server": "^4.11.1",
         "webpack-manifest-plugin": "^5.0.0",
         "webpack-merge": "^5.8.0",

package/src/generators/add-fullstack/files/rollup.config.base.mjs

@@ -3,15 +3,15 @@ import graphql from '@rollup/plugin-graphql';
 import image from '@rollup/plugin-image';
 import typescript from '@rollup/plugin-typescript';
 import { string } from 'rollup-plugin-string';
+import svg from 'rollup-plugin-svg';
 import { copy } from '@web/rollup-plugin-copy';
 import modifyLibFilesPlugin from '@common-stack/rollup-vite-utils/lib/rollup/rollupPluginModifyLibFiles.js';
 import generateJsonFromObject from '@common-stack/rollup-vite-utils/lib/rollup/rollupPluginGenerateJson.js';
 import addJsExtensionToImportsPlugin from '@common-stack/rollup-vite-utils/lib/rollup/rollupPluginAddJsExtension.js';
 import { ignoreCssUrlPlugin } from '@common-stack/rollup-vite-utils/lib/rollup/pluginIgnore.js';
-
-// Define any additional plugins specific to this bundle 
+// Define any additional plugins specific to this bundle
 const additionalPlugins = [
-    copy({ patterns: ['**/cdm-locales/**/*', '**/styles/**/*'], rootDir: './src' }),
+    copy({ patterns: ['**/cdm-locales/**/*', '**/*.gql', '**/**/*.graphql', '**/styles/**/*', '**/css/**/*'], rootDir: './src' }),
 ];
 
 function deepMergeConfigs(baseConfig, specificConfig) {
@@ -28,7 +28,8 @@ function deepMergeConfigs(baseConfig, specificConfig) {
 // Base configuration
 const baseConfig = {
     plugins: [
-        image(),
+        image({ exclude: '**/*.svg' }),
+        svg({ include: '**/*.svg' }),
         graphql({ include: '**/*.gql' }),
         string({
             include: ['**/*.ejs', '**/*.graphql'],
@@ -45,6 +46,7 @@ const baseConfig = {
             outputDir: 'lib', // Ensure this matches your actual output directory
         }),
         generateJsonFromObject({}),
+
         ...additionalPlugins,
     ],
     external: (id) => !/^[./]/.test(id),
@@ -52,101 +54,21 @@ const baseConfig = {
 };
 
 // Function to create a configuration by extending the base
-function createRollupConfig(overrides) {
-    return deepMergeConfigs(baseConfig, overrides);
-}
-function watch(watchOptions, buildMode = '') {
-    const filename = path.basename(watchOptions.input);
-    message(
-        'note',
-        `${dt()} Rollup: Watcher Starting - watching for changes starting with: "${filename}" buildMode="${buildMode}"...`,
-        'WATCH  ',
-        true,
-    );
-    const watcher = rollup.watch(watchOptions);
-
-    watcher.on('event', (event) => {
-        // event.code can be one of:
-        //   START        — the watcher is (re)starting
-        //   BUNDLE_START — building an individual bundle
-        //                  * event.input will be the input options object if present
-        //                  * event.output contains an array of the "file" or
-        //                    "dir" option values of the generated outputs
-        //   BUNDLE_END   — finished building a bundle
-        //                  * event.input will be the input options object if present
-        //                  * event.output contains an array of the "file" or
-        //                    "dir" option values of the generated outputs
-        //                  * event.duration is the build duration in milliseconds
-        //                  * event.result contains the bundle object that can be
-        //                    used to generate additional outputs by calling
-        //                    bundle.generate or bundle.write. This is especially
-        //                    important when the watch.skipWrite option is used.
-        //                  You should call "event.result.close()" once you are done
-        //                  generating outputs, or if you do not generate outputs.
-        //                  This will allow plugins to clean up resources via the
-        //                  "closeBundle" hook.
-        //   END          — finished building all bundles
-        //   ERROR        — encountered an error while bundling
-        //                  * event.error contains the error that was thrown
-        //                  * event.result is null for build errors and contains the
-        //                    bundle object for output generation errors. As with
-        //                    "BUNDLE_END", you should call "event.result.close()" if
-        //                    present once you are done.
-        // If you return a Promise from your event handler, Rollup will wait until the
-        // Promise is resolved before continuing.
-        // console.log(`rollup: ${event.code}`)
-        if (event.code === 'BUNDLE_END') {
-            const outputFiles = event.output.map((o) => path.basename(o)).join(', .../');
-            const msg = `${dt()} Rollup: wrote bundle${event.output.length > 1 ? 's' : ''}: ".../${outputFiles}"`;
-            if (NOTIFY) {
-                notifier.notify({
-                    title: 'React Component Build',
-                    message: msg,
-                });
-            }
-            // messenger: success, warn, critical, note, log
-            message('success', msg, 'SUCCESS', true);
-        } else if (event.code === 'ERROR') {
-            message('critical', `!!!!!!!!!!!!!!!\nRollup ${event.error}\n!!!!!!!!!!!!!!!\n`, 'ERROR', true);
-            if (NOTIFY) {
-                notifier.notify({
-                    title: 'NotePlan Plugins Build',
-                    message: `An error occurred during build process.\nSee console for more information`,
-                });
-            }
-        }
-    });
+function createRollupConfig(overrides, isWatchMode = false) {
+    const config = deepMergeConfigs(baseConfig, overrides);
 
-    // This will make sure that bundles are properly closed after each run
-    watcher.on('event', ({ result }) => {
-        if (result) {
-            result.close();
+    // Adjust TypeScript plugin based on watch mode
+    config.plugins = config.plugins.map((plugin) => {
+        if (plugin.name === 'typescript') {
+            return typescript({
+                ...plugin.options,
+                noEmitOnError: !isWatchMode, // Set to false only in watch mode
+            });
         }
+        return plugin;
     });
 
-    // Additionally, you can hook into the following. Again, return a Promise to
-    // make Rollup wait at that stage:
-    watcher.on('change', (id /* , { event } */) => {
-        const filename = path.basename(id);
-        message('info', `${dt()} Rollup: file: "${filename}" changed`, 'CHANGE', true);
-        /* a file was modified */
-    });
-    watcher.on('restart', () => {
-        // console.log(`rollup: restarting`)
-        /* a new run was triggered (usually a watched file change) */
-    });
-    watcher.on('close', () => {
-        console.log(`rollup: closing`);
-        /* the watcher was closed, see below */
-    });
-    process.on('SIGINT', async function () {
-        console.log('\n\n');
-        console.log(colors.yellow('Quitting...\n'));
-        if (watcher) {
-            await watcher.close();
-        }
-        process.exit();
-    });
+    return config;
 }
 
 export { createRollupConfig, baseConfig };

package/src/generators/add-fullstack/files/tools/codegenGenerator.mjs

@@ -0,0 +1,36 @@
+import fs from 'fs';
+import path from 'path';
+import { fileURLToPath } from 'url';
+
+import { runCodegenTasks } from '@common-stack/rollup-vite-utils/lib/tools/codegen/index.js';
+
+/**
+ * This main script orchestrates your codegen steps, using cdecode-config.json.
+ * Usage:
+ *   node tools/mainScript.mjs
+ */
+
+// ESM housekeeping
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+(async function main() {
+  try {
+    // 1) Locate and parse cdecode-config.json
+    const configPath = path.join(__dirname, '../cdecode-config.json');
+    if (!fs.existsSync(configPath)) {
+      console.error(`cdecode-config.json not found at: ${configPath}`);
+      process.exit(1);
+    }
+    const rawConfig = fs.readFileSync(configPath, 'utf-8');
+    const cdecodeConfig = JSON.parse(rawConfig);
+
+    // 2) Run the orchestrated tasks
+    await runCodegenTasks(cdecodeConfig);
+
+    console.log('mainScript completed successfully!');
+  } catch (err) {
+    console.error('Error running mainScript:', err);
+    process.exit(1);
+  }
+})(); 

package/src/generators/add-fullstack/generator.ts

@@ -24,11 +24,15 @@ import {
 } from '../../index';
 
 export async function addFullstackGenerator(tree: Tree, options: AddFullstackGeneratorSchema) {
-    const basePath = options.path || '';
+    let projectPath = options.path || '';
+    if (projectPath !== '') {
+        const basePath = process.cwd();
+        projectPath = path.relative(basePath, projectPath);
+    }
     const projectName = getValid(options.name) ?? 'fullstack-pro';
-    const projectRoot = path.join(basePath, projectName);
+    const projectRoot = path.join(projectPath, projectName);
 
-    console.log(`basePath: ${basePath}`);
+    // console.log(`Project Path: ${projectPath}`);
 
     // backup existing lerna values
     const lernaBackup = backupLernaJson(tree, projectRoot);
@@ -59,7 +63,7 @@ export async function addFullstackGenerator(tree: Tree, options: AddFullstackGen
     await formatFiles(tree);
 
     if (isValid(options.config)) {
-        const configPath = path.resolve(basePath, getValid(options.config));
+        const configPath = path.resolve(projectPath, getValid(options.config));
         if (fs.existsSync(configPath)) {
             try {
                 const configs = JSON.parse(fs.readFileSync(configPath).toString());

package/src/generators/add-fullstack/schema.json

@@ -16,7 +16,7 @@
         "path": {
             "type": "string",
             "description": "The base path where the project will be created or updated",
-            "x-prompt": "Where do you want to create or update the project? (Leave empty for the current directory)"
+            "x-prompt": "Where do you want to create or update the project? (Please provide in absolute path, or leave empty for the current directory)"
         }
     },
     "required": ["name"]

package/src/generators/add-moleculer/files/.dockerignore

@@ -2,4 +2,5 @@
 !dist/
 !*.js
 !*.json
-!.npmrc
+!.npmrc
+!common/

package/src/generators/add-moleculer/files/Dockerfile

@@ -1,6 +1,7 @@
 FROM node:20.16-alpine
 
 COPY .npmrc package.json /tmp/
+COPY common /tmp/common
 
 RUN set -ex \
   && apk add --no-cache \
@@ -13,6 +14,7 @@ RUN set -ex \
 	&& rm -f /tmp/.npmrc \
 	&& mkdir -p /home/app \
 	&& cp -a /tmp/node_modules /home/app/ \
+	&& cp -a /tmp/common /home/app/common \
 	&& rm -Rf /tmp/*
 
 WORKDIR /home/app

package/src/generators/add-moleculer/files/config.json

@@ -0,0 +1,5 @@
+{
+    "modules": [],
+    "devModules": ["@container-stack/mailing-api-server"],
+    "externalModules": ["@container-stack/territory"]
+}

package/src/generators/add-moleculer/files/package.json

@@ -12,7 +12,8 @@
         "build:clean": "rimraf dist",
         "build:dist": "rollup -c rollup.config.mjs",
         "build:watch": "npm run build:dist -- --watch",
-        "docker:build": "npm run build && docker build . -t $npm_package_name:$npm_package_version",
+        "copycommon": "cp -r ../../packages/common .",
+        "docker:build": "yarn copycommon && npm run build && docker build . -t $npm_package_name:$npm_package_version",
         "docker:run": "docker run -it --env-file ../../config/staging/docker-staging.env  $npm_package_name:$npm_package_version",
         "jest": "./node_modules/.bin/jest",
         "start": "cross-env NODE_ENV=production tsx  dist/index.js",
@@ -24,12 +25,15 @@
         "test:watch": "npm test -- --watch",
         "watch": "npm run start:dev"
     },
+    "resolutions": {
+        "common": "link:./common"
+    },
     "dependencies": {
-        "@common-stack/client-core": "6.0.8-alpha.1",
-        "@common-stack/core": "6.0.8-alpha.1",
-        "@common-stack/server-core": "6.0.8-alpha.1",
-        "@common-stack/server-stack": "6.0.8-alpha.4",
-        "@common-stack/store-mongo": "6.0.8-alpha.1",
+        "@common-stack/client-core": "6.0.8-alpha.31",
+        "@common-stack/core": "6.0.8-alpha.31",
+        "@common-stack/server-core": "6.0.8-alpha.31",
+        "@common-stack/server-stack": "6.0.8-alpha.32",
+        "@common-stack/store-mongo": "6.0.8-alpha.31",
         "@container-stack/mailing-api": "5.2.1-alpha.1",
         "helmet": "^3.21.2",
         "react": "18.2.0",

package/src/generators/add-moleculer/files/rollup.config.mjs

@@ -1,11 +1,24 @@
 import graphql from '@rollup/plugin-graphql';
 import typescript from '@rollup/plugin-typescript';
 import { string } from 'rollup-plugin-string';
+import path from 'path';
+import { fileURLToPath } from 'url';
+import { writeBackendModuleFile } from '@common-stack/rollup-vite-utils';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+// Write backend module file before bundling
+try {
+    const packageConfig = await import('./config.json', { assert: { type: 'json' } });
+    await writeBackendModuleFile(path.join(__dirname, 'src/modules'), packageConfig.default);
+} catch (e) {
+    console.error('Error writing backend module file:', e);
+}
 
 const bundle = (config) => ({
     ...config,
     input: 'src/index.ts',
-    // marking all node modules as external
     external: (id) => !/^[./]/.test(id),
 });
 

package/tsconfig.spec.json

@@ -0,0 +1,9 @@
+{
+    "extends": "./tsconfig.json",
+    "compilerOptions": {
+        "module": "commonjs",
+        "target": "es6",
+        "types": ["jest", "node"]
+    },
+    "include": ["**/*.spec.ts", "**/*.test.ts"]
+}