@common-stack/generate-plugin 8.0.2-alpha.0 → 8.2.1-alpha.0

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

@@ -3,7 +3,7 @@
     "version": "0.0.1",
     "private": true,
     "description": "",
-    "license": "ISC",
+    "license": "UNLICENSED",
     "author": "CDMBase LLC",
     "main": "index.js",
     "scripts": {
@@ -29,11 +29,11 @@
         "common": "link:./common"
     },
     "dependencies": {
-        "@common-stack/client-core": "8.0.1-alpha.0",
-        "@common-stack/core": "8.0.1-alpha.0",
-        "@common-stack/server-core": "8.0.1-alpha.0",
-        "@common-stack/server-stack": "8.0.1-alpha.2",
-        "@common-stack/store-mongo": "8.0.1-alpha.2",
+        "@common-stack/client-core": "8.0.2-alpha.0",
+        "@common-stack/core": "8.0.2-alpha.0",
+        "@common-stack/server-core": "8.0.2-alpha.0",
+        "@common-stack/server-stack": "8.0.2-alpha.0",
+        "@common-stack/store-mongo": "8.0.2-alpha.0",
         "@container-stack/mailing-api": "5.2.1-alpha.1",
         "helmet": "^3.21.2",
         "react": "18.2.0",

package/lib/generators/add-package/files/browser/package.json

@@ -2,7 +2,7 @@
     "name": "browser-package",
     "version": "3.1.1-alpha.6",
     "description": "Sample core for higher packages to depend on",
-    "license": "ISC",
+    "license": "UNLICENSED",
     "author": "CDMBase LLC",
     "type": "module",
     "main": "lib/index.js",
@@ -29,7 +29,7 @@
     },
     "peerDependencies": {
         "@cdm-logger/client": "*",
-        "@common-stack/client-react": "8.0.1-alpha.2",
+        "@common-stack/client-react": "8.0.2-alpha.1",
         "@remix-run/react": "*",
         "antd": ">=5.1.6",
         "lodash": "*",

package/lib/generators/add-package/files/client/package.json

@@ -2,7 +2,7 @@
     "name": "client-package",
     "version": "3.1.1-alpha.4",
     "description": "Sample core for higher packages to depend on",
-    "license": "ISC",
+    "license": "UNLICENSED",
     "author": "CDMBase LLC",
     "type": "module",
     "main": "lib/index.js",

package/lib/generators/add-package/files/core/package.json

@@ -2,7 +2,7 @@
     "name": "core-package",
     "version": "3.1.1-alpha.4",
     "description": "Workbench core for higher packages to depend on",
-    "license": "ISC",
+    "license": "UNLICENSED",
     "author": "CDMBase LLC",
     "type": "module",
     "main": "lib/index.js",

package/lib/generators/add-package/files/server/package.json

@@ -2,7 +2,7 @@
     "name": "server-package",
     "version": "3.1.1-alpha.5",
     "description": "Sample core for higher packages to depend on",
-    "license": "ISC",
+    "license": "UNLICENSED",
     "author": "CDMBase LLC",
     "type": "module",
     "main": "lib/index.js",
@@ -62,9 +62,9 @@
     "peerDependencies": {
         "@apollo/client": ">=3.0.0",
         "@cdm-logger/server": ">=9.0.3",
-        "@common-stack/core": "8.0.1-alpha.0",
-        "@common-stack/server-core": "8.0.1-alpha.0",
-        "@common-stack/store-mongo": "8.0.1-alpha.2",
+        "@common-stack/core": "8.0.2-alpha.0",
+        "@common-stack/server-core": "8.0.2-alpha.0",
+        "@common-stack/store-mongo": "8.0.2-alpha.0",
         "@container-stack/mailing-api": ">=0.0.35-alpha.1",
         "@vscode-alt/monaco-editor": "^0.21.4",
         "inversify": "^5.0.1",

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/generate-plugin",
-    "version": "8.0.2-alpha.0",
+    "version": "8.2.1-alpha.0",
     "type": "module",
     "main": "./lib/index.mjs",
     "typings": "./lib/index.d.ts",
@@ -18,7 +18,7 @@
         "watch": "yarn build:lib:watch"
     },
     "dependencies": {
-        "@common-stack/rollup-vite-utils": "8.0.2-alpha.0",
+        "@common-stack/rollup-vite-utils": "8.2.1-alpha.0",
         "tslib": "^2.3.0"
     },
     "publishConfig": {
@@ -26,5 +26,5 @@
     },
     "executors": "./executors.json",
     "generators": "./generators.json",
-    "gitHead": "d45864ba7429065d7b67e573e909ecf762ffc150"
+    "gitHead": "b46db06f987271c3a2e050f081e266d3a01b285b"
 }

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

@@ -21,7 +21,7 @@
         "type": "git",
         "url": "git+https://github.com/cdmbase/fullstack-pro.git"
     },
-    "license": "MIT",
+    "license": "UNLICENSED",
     "author": "CDMBase LLC",
     "main": "dist/index.js",
     "typings": "dist/main.d.ts",
@@ -64,7 +64,7 @@
     "dependencies": {
         "@apollo/client": "^3.9.0",
         "@babel/runtime": "^7.20.1",
-        "@common-stack/server-stack": "8.0.1-alpha.2",
+        "@common-stack/server-stack": "8.0.2-alpha.0",
         "@remix-run/node": "~2.15.3",
         "lodash": "^4.17.15",
         "react": "18.2.0"

package/src/generators/add-backend/files/src/modules/index.ts.template

@@ -3,6 +3,8 @@ import modules, { settings } from './module';
 export default modules;
 export { settings };
 
+export const serverConfigurations = {};
+
 // export const updateContainers = (options) => {
 //     if (process.env.NODE_ENV !== 'development') {
 //         options.forEach(el => {

package/src/generators/add-backend/files/src/service.ts.template

@@ -1,6 +1,6 @@
 import { logger } from '@cdm-logger/server';
 import * as url from 'url';
-import modules, { settings } from './modules';
+import modules, { settings, serverConfigurations } from './modules';
 import { MainStackServer } from '@common-stack/server-stack';
 import { config } from './config';
 
@@ -10,7 +10,7 @@ export class Service {
     private app: MainStackServer;
 
     public async initialize() {
-        this.app = new MainStackServer(modules, settings);
+        this.app = new MainStackServer(modules, settings, serverConfigurations);
         await this.app.initialize();
     }
 

package/src/generators/add-frontend/frameworks/antui/src/root.tsx.template

@@ -1,6 +1,7 @@
 import 'reflect-metadata';
 import * as React from 'react';
 import { Links, Meta, Outlet, Scripts, ScrollRestoration, useRouteLoaderData, useRouteError } from '@remix-run/react';
+import { json } from '@remix-run/node';
 import { PluginArea } from '@common-stack/client-react';
 import { subscribeReduxRouter } from '@common-stack/remix-router-redux';
 import { ApplicationErrorHandler } from '@admin-layout/ant-ui';
@@ -10,10 +11,40 @@ import clientModules, { plugins } from '@app/frontend-stack-react/modules.js';
 // @ts-ignore
 import { useChangeLanguage } from 'remix-i18next/react';
 import { useTranslation } from 'react-i18next';
+import { LayoutCookieProvider } from '@admin-layout/client';
+import { settingsLoaderUtil } from '@admin-layout/client/lib/components/UpdateSettings/UpdateSettings.server';
+import { IAppLoadContext, IResourceParams } from '@common-stack/client-core';
+import { FillRenderProvider, PluginsLoader } from '@common-stack/components-pro';
 // @ts-ignore
 import { ErrorBoundary } from '@app/frontend-stack-react/entries/antui/components/ErrorBoundary';
 import { LocaleContext } from './context';
 
+export const loader = async ({
+    request,
+    context,
+    params,
+}: {
+    request: Request;
+    context: IAppLoadContext;
+    params: IResourceParams;
+}) => {
+    const settingsResponse = await settingsLoaderUtil({ request });
+    const loadedPlugins = await PluginsLoader(plugins, { request, context, params });
+
+    return json(
+        {
+            settings: settingsResponse?.settings,
+            loadedPlugins,
+        },
+        {
+            headers: [
+                ['Cache-Control', 'max-age=300, s-maxage=600'],
+                ['Set-Cookie', settingsResponse?.setCookie],
+            ],
+        },
+    );
+};
+
 export const handle = {
     i18n: 'common',
 };
@@ -77,7 +108,9 @@ export function Layout({ children }: { children: React.ReactNode }) {
             </head>
             <body>
                 <PluginArea />
-                {clientModules.getWrappedRoot(children)}
+                <FillRenderProvider>
+                    {clientModules.getWrappedRoot(children)}
+                </FillRenderProvider>
                 <ScrollRestoration />
                 <Scripts />
                 {getConstants()}
@@ -90,7 +123,9 @@ export default function App() {
     return (
         <ApplicationErrorHandler plugins={plugins}>
             <ConfigProvider>
-                <Outlet />
+                <LayoutCookieProvider>
+                    <Outlet />
+                </LayoutCookieProvider>
             </ConfigProvider>
         </ApplicationErrorHandler>
     );

package/src/generators/add-frontend/frameworks/chakraui/src/root.tsx.template

@@ -14,9 +14,41 @@ import { useContext } from 'react';
 import { ServerStyleContext, ClientStyleContext, LocaleContext } from './context';
 import { withEmotionCache } from '@emotion/react';
 import { useChangeLanguage } from 'remix-i18next/react';
+import { LayoutCookieProvider } from '@admin-layout/client';
+import { settingsLoaderUtil } from '@admin-layout/client/lib/components/UpdateSettings/UpdateSettings.server';
+import { IAppLoadContext, IResourceParams } from '@common-stack/client-core';
+import { FillRenderProvider, PluginsLoader } from '@common-stack/components-pro';
+// @ts-ignore
 import { i18nextInstance as i18next } from '@app/frontend-stack-react/i18n-localization/i18next.server.js';
+// @ts-ignore
 import { ErrorBoundary } from '@app/frontend-stack-react/entries/chakraui/components/ErrorBoundary.js';
 
+export const loader = async ({
+    request,
+    context,
+    params,
+}: {
+    request: Request;
+    context: IAppLoadContext;
+    params: IResourceParams;
+}) => {
+    const settingsResponse = await settingsLoaderUtil({ request });
+    const loadedPlugins = await PluginsLoader(plugins, { request, context, params });
+
+    return json(
+        {
+            settings: settingsResponse?.settings,
+            loadedPlugins,
+        },
+        {
+            headers: [
+                ['Cache-Control', 'max-age=300, s-maxage=600'],
+                ['Set-Cookie', settingsResponse?.setCookie],
+            ],
+        },
+    );
+};
+
 interface DocumentProps {
     children: React.ReactNode;
 }
@@ -67,12 +99,7 @@ export const Document = withEmotionCache(({ children }: DocumentProps, emotionCa
         </>
     );
 });
-/*
-export let loader = async ({ request }) => {
-    let locale = await i18next.getLocale(request);
-    return json({ locale });
-};
-*/
+
 export let handle = {
     i18n: 'common',
 };
@@ -94,7 +121,11 @@ export default function App() {
 
     return (
         <ApplicationErrorHandler plugins={plugins}>
-            <Document>{clientModules.getWrappedRoot(<Outlet />)}</Document>
+            <Document>
+                <FillRenderProvider>
+                    {clientModules.getWrappedRoot(<LayoutCookieProvider><Outlet /></LayoutCookieProvider>)}
+                </FillRenderProvider>
+            </Document>
         </ApplicationErrorHandler>
     );
 }

package/src/generators/add-frontend/frameworks/tailwindui/src/root.tsx.template

@@ -11,6 +11,10 @@ import clientModules, { plugins } from '@app/frontend-stack-react/modules.js';
 // @ts-ignore
 import { useChangeLanguage } from 'remix-i18next/react';
 import { useTranslation } from 'react-i18next';
+import { LayoutCookieProvider } from '@admin-layout/client';
+import { settingsLoaderUtil } from '@admin-layout/client/lib/components/UpdateSettings/UpdateSettings.server';
+import { IAppLoadContext, IResourceParams } from '@common-stack/client-core';
+import { FillRenderProvider, PluginsLoader } from '@common-stack/components-pro';
 // @ts-ignore
 import { i18nextInstance as i18next } from '@app/frontend-stack-react/i18n-localization/i18next.server.js';
 import stylesheet from "./tailwind.css?url";
@@ -19,12 +23,33 @@ export const links: LinksFunction = () => [
     { rel: "stylesheet", href: stylesheet },
 ];
 
-export const loader = async ({ request }) => {
+export const loader = async ({
+    request,
+    context,
+    params,
+}: {
+    request: Request;
+    context: IAppLoadContext;
+    params: IResourceParams;
+}) => {
     const locale = await i18next.getLocale(request);
-    return json({
-        __ENV__: publicEnv,
-        locale,
-    });
+    const settingsResponse = await settingsLoaderUtil({ request });
+    const loadedPlugins = await PluginsLoader(plugins, { request, context, params });
+
+    return json(
+        {
+            __ENV__: publicEnv,
+            locale,
+            settings: settingsResponse?.settings,
+            loadedPlugins,
+        },
+        {
+            headers: [
+                ['Cache-Control', 'max-age=300, s-maxage=600'],
+                ['Set-Cookie', settingsResponse?.setCookie],
+            ],
+        },
+    );
 };
 
 export const handle = {
@@ -87,7 +112,9 @@ export function Layout({ children }: { children: React.ReactNode }) {
             </head>
             <body>
                 <PluginArea />
-                {clientModules.getWrappedRoot(children)}
+                <FillRenderProvider>
+                    {clientModules.getWrappedRoot(children)}
+                </FillRenderProvider>
                 <ScrollRestoration />
                 <Scripts />
                 {getConstants()}
@@ -109,8 +136,10 @@ const TestComponent = () => {
 
 export default function App() {
     return (
-        // <Outlet />
-        <TestComponent />
+        <LayoutCookieProvider>
+            {/* <Outlet /> */}
+            <TestComponent />
+        </LayoutCookieProvider>
     );
 }
 

package/src/generators/add-frontend/templates/package.json

@@ -11,7 +11,7 @@
         "type": "git",
         "url": "git+https://github.com/cdmbase/fullstack-pro.git"
     },
-    "license": "MIT",
+    "license": "UNLICENSED",
     "author": "CDMBase LLC",
     "type": "module",
     "main": "index.js",
@@ -56,7 +56,7 @@
         "common": "link:./common"
     },
     "dependencies": {
-        "@common-stack/frontend-stack-react": "8.0.1-alpha.3",
+        "@common-stack/frontend-stack-react": "8.0.2-alpha.1",
         "@react-icons/all-files": "^4.1.0",
         "classnames": "^2.2.6",
         "compression": "^1.7.4",
@@ -81,7 +81,7 @@
     },
     "devDependencies": {
         "@cdmbase/vite-plugin-i18next-loader": "^2.0.12",
-        "@common-stack/rollup-vite-utils": "8.0.1-alpha.4",
+        "@common-stack/rollup-vite-utils": "8.0.2-alpha.1",
         "@remix-run/dev": "~2.15.3",
         "@remix-run/serve": "~2.15.3",
         "cross-env": "^7.0.3",

package/src/generators/add-fullstack/files/Jenkinsfile

@@ -4,7 +4,7 @@ def GIT_BRANCH_NAME=getGitBranchName()
 pipeline {
   agent {
     kubernetes{
-      label 'new-slave-2cpu-8gb'
+      label 'slave-2cpu-8gb'
     }
   }
   parameters {

package/src/generators/add-fullstack/files/_prettierignore

@@ -0,0 +1,7 @@
+node_modules
+dist
+lib
+
+# Generated files
+**/generated/**
+packages/common/src/generated/**

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

@@ -2,10 +2,13 @@
     "servers": ["servers/frontend-server/config.json", "servers/backend-server/config.json"],
     "codegen": {
         "outputFile": "codegen.ts",
-        "rootSchema": "servers/backend-server/src/api/root-schema.graphqls",
+        "rootSchema": "node_modules/@common-stack/graphql-api/root-schema.graphqls",
         "fullConfig": {
             "overwrite": true,
             "schema": ["$PRIMARY_SCHEMA_PLACEHOLDER$"],
+            "hooks": {
+                "afterAllFileWrite": ["node scripts/fix-enum-references.js"]
+            },
             "generates": {
                 "packages/common/src/generated/generated-models.ts": {
                     "schema": "%discoveredSchemas%",
@@ -37,7 +40,8 @@
                         },
                         "typescript",
                         "typescript-operations",
-                        "typescript-resolvers"
+                        "typescript-resolvers",
+                        "typescript-mongodb"
                     ]
                 },
                 "packages/common/src/generated/generated.tsx": {

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

@@ -10,7 +10,7 @@
         "type": "git",
         "url": "git+https://github.com/cdmbase/fullstack-pro.git"
     },
-    "license": "MIT",
+    "license": "UNLICENSED",
     "author": {
         "name": "CDMBase LLC",
         "email": "none@cdmbase.com"
@@ -96,16 +96,12 @@
     },
     "resolutions": {
         "@apollo/client": "^3.9.0",
-        "@nx/workspace": "20.4.3",
         "@types/react": "^18.2.25",
         "@types/react-dom": "^18.2.7",
         "common": "link:packages/common",
         "html-to-text": "^8.0.0",
-        "nx": "20.4.3",
-        "react": "18.3.0-canary-c3048aab4-20240326",
-        "react-dom": "18.3.0-canary-c3048aab4-20240326",
-        "react-native": "0.72.10",
-        "react-native-gesture-handler": "~2.12.0"
+        "react-native": "~0.76.3",
+        "react-native-safe-area-context": "4.12.0"
     },
     "dependencies": {
         "graphql": "^16.0.0",
@@ -141,8 +137,8 @@
         "@babel/register": "^7.18.9",
         "@babel/runtime": "^7.20.1",
         "@common-stack/env-list-loader": "8.0.1-alpha.0",
-        "@common-stack/generate-plugin": "8.0.1-alpha.5",
-        "@common-stack/rollup-vite-utils": "8.0.1-alpha.4",
+        "@common-stack/generate-plugin": "8.0.2-alpha.1",
+        "@common-stack/rollup-vite-utils": "8.0.2-alpha.1",
         "@emotion/babel-plugin": "^11.11.0",
         "@graphql-codegen/add": "^5.0.3",
         "@graphql-codegen/cli": "^5.0.4",
@@ -151,13 +147,13 @@
         "@graphql-codegen/near-operation-file-preset": "^3.0.0",
         "@graphql-codegen/typescript": "^4.1.3",
         "@graphql-codegen/typescript-graphql-files-modules": "^3.0.0",
+        "@graphql-codegen/typescript-mongodb": "^3.0.0",
         "@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",
-        "@nx/workspace": "20.4.3",
         "@redux-devtools/core": "^3.13.1",
         "@redux-devtools/dock-monitor": "^3.0.1",
         "@redux-devtools/log-monitor": "^4.0.1",
@@ -167,7 +163,7 @@
         "@rollup/plugin-image": "^3.0.1",
         "@rollup/plugin-json": "^6.1.0",
         "@rollup/plugin-node-resolve": "^15.2.3",
-        "@rollup/plugin-typescript": "^11.1.5",
+        "@rollup/plugin-typescript": "^12.1.4",
         "@shelf/jest-mongodb": "^4.1.3",
         "@svgr/webpack": "^6.5.1",
         "@testing-library/dom": "^10.4.0",
@@ -287,7 +283,7 @@
         "nock": "^13.2.9",
         "node-dev": "^7.4.3",
         "node-hmr-plugin": "^1.0.1",
-        "nodemon": "^2.0.20",
+        "nodemon": "^3.1.10",
         "nodemon-webpack-plugin": "^4.8.1",
         "openurl": "^1.1.1",
         "pm2": "^5.2.2",

package/src/generators/add-fullstack/files/scripts/fix-enum-references.js

@@ -0,0 +1,58 @@
+#!/usr/bin/env node
+
+const fs = require('fs');
+const path = require('path');
+
+// File paths to fix
+const filesToFix = [
+    path.join(__dirname, '../packages/common/src/generated/generated-models.ts'),
+    path.join(__dirname, '../packages/common/src/generated/generated.tsx'),
+];
+
+// Enum mappings - add more mappings here if needed
+const enumMappings = {
+    ICacheControlScope: 'CacheControlScope',
+    // Add more enum mappings here as needed
+    // 'ISomeOtherEnum': 'SomeOtherEnum'
+};
+
+function fixEnumReferences(filePath) {
+    if (!fs.existsSync(filePath)) {
+        console.log(`File not found: ${filePath}`);
+        return;
+    }
+
+    let content = fs.readFileSync(filePath, 'utf8');
+    let hasChanges = false;
+
+    // Apply enum reference fixes
+    Object.entries(enumMappings).forEach(([incorrectRef, correctRef]) => {
+        const regex = new RegExp(`\\b${incorrectRef}\\b`, 'g');
+        if (content.includes(incorrectRef)) {
+            content = content.replace(regex, correctRef);
+            hasChanges = true;
+            console.log(`Fixed: ${incorrectRef} -> ${correctRef} in ${path.basename(filePath)}`);
+        }
+    });
+
+    if (hasChanges) {
+        fs.writeFileSync(filePath, content, 'utf8');
+        console.log(`Updated: ${filePath}`);
+    } else {
+        console.log(`No changes needed in: ${path.basename(filePath)}`);
+    }
+}
+
+function main() {
+    console.log('🔧 Fixing enum references in generated files...');
+
+    filesToFix.forEach(fixEnumReferences);
+
+    console.log('✅ Enum reference fix completed!');
+}
+
+if (require.main === module) {
+    main();
+}
+
+module.exports = { fixEnumReferences, enumMappings };

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

@@ -1,26 +1,22 @@
 {
-  "compilerOptions": {
-    "target": "ES2022",
-    "module": "ES2022",
-    "moduleResolution": "node",
-    "esModuleInterop": true,
-    "jsx": "react",
-    "skipLibCheck": true,
-    "declaration": true,
-    "experimentalDecorators": true,
-    "emitDecoratorMetadata": true,
-    "preserveConstEnums": true,
-    "sourceMap": true,
-    "noImplicitAny": false,
-    "allowSyntheticDefaultImports": true,
-    "pretty": true,
-    "removeComments": false,
-    "lib": [
-      "ES2022",
-      "dom",
-      "esnext.asynciterable"
-    ]
-  },
-  "include": ["src", "typings/*.d.ts"],
-  "exclude": ["node_modules"]
+    "compilerOptions": {
+        "target": "ES2022",
+        "module": "ES2022",
+        "moduleResolution": "bundler",
+        "esModuleInterop": true,
+        "jsx": "react",
+        "skipLibCheck": true,
+        "declaration": true,
+        "experimentalDecorators": true,
+        "emitDecoratorMetadata": true,
+        "preserveConstEnums": true,
+        "sourceMap": true,
+        "noImplicitAny": false,
+        "allowSyntheticDefaultImports": true,
+        "pretty": true,
+        "removeComments": false,
+        "lib": ["ES2022", "dom", "esnext.asynciterable"]
+    },
+    "include": ["src", "typings/*.d.ts"],
+    "exclude": ["node_modules"]
 }

package/src/generators/add-fullstack/updates/htmlPluginUpdate.ts

@@ -18,6 +18,7 @@ export function renameDotFiles(tree: Tree, projectRoot: string) {
         { src: '_browserslistrc', dest: '.browserslistrc' },
         { src: '_eslintignore', dest: '.eslintignore' },
         { src: '_eslintrc.js', dest: '.eslintrc.js' },
+        { src: '_prettierignore', dest: '.prettierignore' },
         { src: '_nxignore', dest: '.nxignore' },
         { src: '_markdownlint.json', dest: '.markdownlint.json' },
         { src: '_markdownlintignore', dest: '.markdownlintignore' },
@@ -28,7 +29,7 @@ export function renameDotFiles(tree: Tree, projectRoot: string) {
     dotFiles.forEach(({ src, dest }) => {
         const srcPath = path.join(projectRoot, src);
         const destPath = path.join(projectRoot, dest);
-        
+
         // Check if the source file exists
         if (tree.exists(srcPath)) {
             // Read content and write to destination