@common-stack/generate-plugin 6.0.8-alpha.4 → 6.0.8-alpha.40

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

@@ -52,7 +52,9 @@
         "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)",
@@ -105,9 +107,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,9 +150,9 @@
         "@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.3",
-        "@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.39",
+        "@common-stack/rollup-vite-utils": "6.0.8-alpha.38",
         "@emotion/babel-plugin": "^11.11.0",
         "@graphql-codegen/add": "^5.0.2",
         "@graphql-codegen/cli": "^5.0.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",
@@ -311,7 +315,9 @@
         "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",
         "sass-loader": "^13.1.0",
         "shelljs": "^0.8.5",
         "simple-git": "^3.14.1",
@@ -332,6 +338,10 @@
         "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",
         "wait-on": "^6.0.1",
         "webpack": "^5.74.0",
         "webpack-bundle-analyzer": "^4.7.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-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

@@ -24,12 +24,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.3",
-        "@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/lib/generators/add-moleculer/files/src/modules/module.ts.template

@@ -1,31 +0,0 @@
-import { ContainerModule, interfaces } from 'inversify';
-import { Feature } from '@common-stack/server-core';
-import { TaggedType } from '@common-stack/core';
-import { config } from '../config';
-
-const subTopic = config.CONNECTION_ID;
-export const settings: any = {
-    connectionId: config.CONNECTION_ID,
-    namespace: config.NAMESPACE,
-    subTopic,
-    logger: config.LOG_LEVEL,
-    workspaceId: config.CONNECTION_ID || 'DEFAULT',
-    configPath: process.env.CONFIG_PATH,
-    adminApiNamespace: 'api-admin',
-    apiNamespace: 'api-admin',
-};
-
-const defaultModule = () =>
-    new ContainerModule((bind: interfaces.Bind) => {
-        bind('Settings').toConstantValue(settings).whenTargetTagged('default', true);
-        bind('Settings').toConstantValue(settings).whenTargetTagged('microservice', true);
-        bind('Settings').toConstantValue(settings).whenTargetTagged(TaggedType.MICROSERVICE, true);
-        bind('MongoOptions').toConstantValue({});
-    });
-
-const DefaultFeature = new Feature({
-    createContainerFunc: [defaultModule],
-    createHemeraContainerFunc: [defaultModule],
-});
-
-export default new Feature<any>(DefaultFeature);

package/src/generators/add-moleculer/files/src/modules/module.ts.template

@@ -1,31 +0,0 @@
-import { ContainerModule, interfaces } from 'inversify';
-import { Feature } from '@common-stack/server-core';
-import { TaggedType } from '@common-stack/core';
-import { config } from '../config';
-
-const subTopic = config.CONNECTION_ID;
-export const settings: any = {
-    connectionId: config.CONNECTION_ID,
-    namespace: config.NAMESPACE,
-    subTopic,
-    logger: config.LOG_LEVEL,
-    workspaceId: config.CONNECTION_ID || 'DEFAULT',
-    configPath: process.env.CONFIG_PATH,
-    adminApiNamespace: 'api-admin',
-    apiNamespace: 'api-admin',
-};
-
-const defaultModule = () =>
-    new ContainerModule((bind: interfaces.Bind) => {
-        bind('Settings').toConstantValue(settings).whenTargetTagged('default', true);
-        bind('Settings').toConstantValue(settings).whenTargetTagged('microservice', true);
-        bind('Settings').toConstantValue(settings).whenTargetTagged(TaggedType.MICROSERVICE, true);
-        bind('MongoOptions').toConstantValue({});
-    });
-
-const DefaultFeature = new Feature({
-    createContainerFunc: [defaultModule],
-    createHemeraContainerFunc: [defaultModule],
-});
-
-export default new Feature<any>(DefaultFeature);