@common-stack/rollup-vite-utils 8.0.1-alpha.0 → 8.0.1-alpha.2

package/lib/tools/codegen/readModules.js

@@ -1,140 +1,249 @@
-import fs__default from'fs';import path__default from'path';import {createRequire}from'module';import {pathsConfig}from'./commonPaths.js';// If you also need checkFileExists, import it from the same file:
-// import { pathsConfig, checkFileExists } from './commonPaths.mjs';
-// ESM-compatible require
+import fs__default from'fs';import path__default from'path';import {createRequire}from'module';import {pathsConfig}from'./commonPaths.js';// ESM-compatible require
 const esmRequire = createRequire(import.meta.url);
 /**
- * Reads modules from JSON config files and returns an array of module objects.
+ * For local modules, if the relative path ends with "lib",
+ * remove that segment so that the package root is used.
+ */
+function normalizeLocalBase(modulePath) {
+    const parts = modulePath.split(path__default.sep);
+    if (parts[parts.length - 1] === 'lib') {
+        parts.pop();
+    }
+    return parts.join(path__default.sep);
+}
+/**
+ * For variant local modules, strip off a trailing role folder (if present)
+ * so that the group name equals the package base.
+ * E.g. "packages-modules/mail-campaign/browser" becomes "packages-modules/mail-campaign".
+ */
+function getInternalGroupName(modName) {
+    const segments = modName.split(path__default.sep);
+    const variants = ['server', 'client', 'browser', 'core'];
+    if (segments.length && variants.includes(segments[segments.length - 1])) {
+        segments.pop();
+    }
+    return segments.join(path__default.sep);
+}
+/**
+ * Determines if a module is external by checking if its computed name starts with "node_modules".
+ * (This approach does not rely on any hard-coded vendor-specific package name prefixes.)
+ */
+function isExternalModule(mod) {
+    return mod.name.split(path__default.sep)[0] === 'node_modules';
+}
+/**
+ * Transforms the collected module definitions into the desired final output format.
  *
- * The function separates modules into client and server arrays based on the suffix (“-server”),
- * then it attempts to resolve each module’s location. If the resolution fails—often due to a missing
- * "lib" folder on external packages—it falls back by removing any `/lib` reference from the module name.
+ * - External modules:
+ *     • If the module name contains "-browser", output an object with keys "browser", "client" and "core".
+ *       The client and core are computed by replacing the "-browser" suffix with "-client" and "-core" respectively.
+ *     • Else if the name ends with "-server", output an object with key "server".
+ *     • Otherwise, output an object with key "independent".
  *
- * For local modules it always returns an object with { client, core, browser, server } keys.
- * For modules from node_modules, it generates paths based on naming conventions.
+ * - Internal (local) modules:
+ *     • If the module is flagged as independent (flat, no variant indicated), output an object with key "independent"
+ *       that points to `<baseModule>/src`.
+ *     • Otherwise (when flagged as variant) group them by their normalized base and output a single object containing
+ *       four keys: client, core, browser, and server (e.g. `<groupName>/client/src`, etc.).
  */
-function readModules(serverConfigPaths = []) {
-    // Separate client and server modules while loading the JSON config files.
-    const [clientModules, serverModules] = serverConfigPaths.reduce((acc, configFile) => {
-        if (!fs__default.existsSync(configFile)) {
-            console.error(`Config file not found: ${configFile}`);
-            process.exit(1);
-        }
-        const configData = JSON.parse(fs__default.readFileSync(configFile, 'utf-8'));
-        // Process regular modules.
-        configData.modules?.forEach((mod) => {
-            if (mod.endsWith('-server')) {
-                acc[1].push(mod);
-            }
-            else {
-                acc[0].push(mod);
+function transformModules(modules) {
+    const finalOutput = [];
+    const variantGroups = new Map();
+    modules.forEach((mod) => {
+        if (isExternalModule(mod)) {
+            // External modules: check if the computed name indicates a browser variant.
+            if (mod.name.includes('-browser')) {
+                // Remove only the trailing "-browser" occurrence to compute client/core names.
+                const base = mod.name.replace(/-browser$/, '');
+                finalOutput.push({
+                    client: `${base}-client/lib`,
+                    core: `${base}-core/lib`,
+                    browser: `${base}-browser/lib`,
+                });
             }
-        });
-        // Process external modules.
-        configData.externalModules?.forEach((mod) => {
-            if (mod.endsWith('-server')) {
-                acc[1].push(mod);
+            else if (mod.name.endsWith('-server')) {
+                finalOutput.push({ server: `${mod.name}/lib` });
             }
             else {
-                acc[0].push(mod);
+                finalOutput.push({ independent: `${mod.name}/lib` });
             }
-        });
-        // Process devModules.
-        configData.devModules?.forEach((mod) => {
-            if (mod.endsWith('-server')) {
-                acc[1].push(mod);
+        }
+        else {
+            // Internal (local) modules.
+            if (mod.isIndependentLocal) {
+                finalOutput.push({ independent: `${mod.name}/src` });
             }
             else {
-                acc[0].push(mod);
+                const groupName = getInternalGroupName(mod.name);
+                if (!variantGroups.has(groupName)) {
+                    variantGroups.set(groupName, {
+                        client: `${groupName}/client/src`,
+                        core: `${groupName}/core/src`,
+                        browser: `${groupName}/browser/src`,
+                        server: `${groupName}/server/src`,
+                    });
+                }
             }
-        });
-        return acc;
-    }, [[], []]);
-    // Combine modules uniquely
-    const allModules = [...new Set([...clientModules, ...serverModules])];
-    const processedModules = new Set();
-    return allModules.reduce((acc, moduleName) => {
+        }
+    });
+    return [...finalOutput, ...Array.from(variantGroups.values())];
+}
+/**
+ * Reads modules from one or more JSON config files (e.g., cdecode-config.json) and returns an array,
+ * transformed into the final desired output format of module objects.
+ *
+ * The processing steps are:
+ *  1. Load module names (from keys such as modules, externalModules, devModules) from each config.
+ *  2. Deduplicate the raw module names.
+ *  3. For each raw module string, attempt to resolve it using esmRequire.resolve (with fallback).
+ *  4. Compute the module's base folder relative to the repository root.
+ *  5. Determine if the module is local (i.e. does not live in node_modules).
+ *  6. For local modules, decide whether it is "variant" (if the raw config string indicates "-browser" or "-server")
+ *     or independent (if not).
+ *  7. Optionally, if a package.json exists, adjust the server path using its "main" field.
+ *  8. Finally, transform the processed definitions into the desired output format.
+ *
+ * @param {string[]} configPaths - Array of configuration file paths.
+ * @returns {any[]} Final processed module objects.
+ */
+function readModules(configPaths = []) {
+    const rawModuleSet = new Set();
+    // Collect raw module names from all config files.
+    configPaths.forEach((configFile) => {
+        if (!fs__default.existsSync(configFile)) {
+            console.error(`Config file not found: ${configFile}`);
+            process.exit(1);
+        }
+        const configData = JSON.parse(fs__default.readFileSync(configFile, 'utf-8'));
+        (configData.modules || []).forEach((mod) => rawModuleSet.add(mod));
+        (configData.externalModules || []).forEach((mod) => rawModuleSet.add(mod));
+        (configData.devModules || []).forEach((mod) => rawModuleSet.add(mod));
+    });
+    const collectedModules = [];
+    // Process each unique raw module.
+    rawModuleSet.forEach((rawStr) => {
         try {
+            // Determine if the raw config string suggests a variant module.
+            const isVariant = rawStr.includes('-browser') || rawStr.endsWith('-server');
             let resolvedFile;
             try {
-                // Attempt normal resolution.
-                resolvedFile = esmRequire.resolve(moduleName);
+                // Primary resolution: try to resolve directly to package.json.
+                resolvedFile = esmRequire.resolve(path__default.join(rawStr, 'package.json'));
             }
             catch (err) {
-                // Fallback resolution: if the module name includes "/lib", remove it and try again.
-                const fallbackModule = moduleName.includes('/lib') ? moduleName.replace(/\/lib.*$/, '') : moduleName;
-                try {
-                    resolvedFile = esmRequire.resolve(fallbackModule);
+                // If resolution fails, try to use error file details.
+                if (err && typeof err === 'object' && 'path' in err && typeof err.path === 'string') {
+                    let filePath = err.path;
+                    // Check if the file path includes a "/lib/" segment.
+                    const libSegment = `${path__default.sep}lib${path__default.sep}`;
+                    const libIndex = filePath.indexOf(libSegment);
+                    if (libIndex !== -1) {
+                        // Remove the lib folder and what follows, then append package.json.
+                        filePath = filePath.slice(0, libIndex);
+                        filePath = path__default.join(filePath, 'package.json');
+                    }
+                    if (fs__default.existsSync(filePath)) {
+                        resolvedFile = filePath;
+                    }
+                    else {
+                        // Fallback: if the error-derived path fails, remove "/lib" from the raw string.
+                        const fallbackModule = rawStr.includes('/lib') ? rawStr.replace(/\/lib.*$/, '') : rawStr;
+                        try {
+                            resolvedFile = esmRequire.resolve(path__default.join(fallbackModule, 'package.json'));
+                        }
+                        catch (err2) {
+                            console.warn(`Could not resolve module ${rawStr} even with fallback ${fallbackModule}. Skipping.`);
+                            return;
+                        }
+                    }
                 }
-                catch (err2) {
-                    console.warn(`Could not resolve module ${moduleName} even with fallback ${fallbackModule}. Skipping.`);
-                    return acc;
+                else {
+                    // Fallback resolution if error object doesn't contain a path.
+                    const fallbackModule = rawStr.includes('/lib') ? rawStr.replace(/\/lib.*$/, '') : rawStr;
+                    try {
+                        resolvedFile = esmRequire.resolve(path__default.join(fallbackModule, 'package.json'));
+                    }
+                    catch (err2) {
+                        console.warn(`Could not resolve module ${rawStr} even with fallback ${fallbackModule}. Skipping.`);
+                        return;
+                    }
                 }
             }
             const dirName = path__default.dirname(resolvedFile);
-            const modulePath = path__default.relative(pathsConfig.repoRoot, dirName);
-            // Reverse the split parts to check if "node_modules" exists.
-            const [dir, pkg, ...rest] = modulePath.split('/').reverse();
-            const isLocal = !rest.includes('node_modules');
-            const baseModule = isLocal ? [...rest].reverse().join('/') : modulePath.replace('/lib', '');
-            if (processedModules.has(baseModule)) {
-                return acc;
-            }
-            processedModules.add(baseModule);
-            // For local modules, use "src" directory; for node_modules, use "lib"
+            // Compute the folder path relative to the repository root.
+            const modulePathRaw = path__default.relative(pathsConfig.repoRoot, dirName);
+            const isLocal = !modulePathRaw.split(path__default.sep).includes('node_modules');
+            const baseModule = isLocal ? normalizeLocalBase(modulePathRaw) : modulePathRaw.replace(/\/lib.*/, '');
+            // Avoid duplicates based on the computed base.
+            if (collectedModules.find((m) => m.name === baseModule))
+                return;
             const srcOrLib = isLocal ? 'src' : 'lib';
-            const generatePath = (type) => `${baseModule}${isLocal ? `/${type}` : ''}/${srcOrLib}`;
-            // For local modules, always return all module keys.
-            if (isLocal) {
-                return [
-                    ...acc,
-                    {
-                        client: generatePath('client'),
-                        core: generatePath('core'),
-                        browser: generatePath('browser'),
-                        server: generatePath('server'),
-                    },
-                ];
+            // Start a module definition.
+            const moduleDef = { raw: rawStr, name: baseModule };
+            if (!isLocal) {
+                // External modules.
+                if (rawStr.includes('-browser')) {
+                    // For external variants, look for client and core as well.
+                    moduleDef.browser = `${baseModule}/${srcOrLib}`;
+                    // Replace only the trailing "-browser" for client/core.
+                    moduleDef.client = `${baseModule.replace(/-browser$/, '-client')}/${srcOrLib}`;
+                    moduleDef.core = `${baseModule.replace(/-browser$/, '-core')}/${srcOrLib}`;
+                }
+                else if (rawStr.endsWith('-server')) {
+                    moduleDef.server = `${baseModule}/${srcOrLib}`;
+                }
+                else {
+                    moduleDef.server = `${baseModule}/${srcOrLib}`;
+                }
+            }
+            else {
+                // Local (internal) modules.
+                if (isVariant) {
+                    if (rawStr.includes('-browser')) {
+                        // For variant local modules with -browser, expect subfolders for browser, client, core and server.
+                        moduleDef.browser = `${baseModule}/browser/${srcOrLib}`;
+                        moduleDef.client = `${baseModule}/client/${srcOrLib}`;
+                        moduleDef.core = `${baseModule}/core/${srcOrLib}`;
+                        moduleDef.server = `${baseModule}/server/${srcOrLib}`;
+                    }
+                    else if (rawStr.endsWith('-server')) {
+                        moduleDef.server = `${baseModule}/server/${srcOrLib}`;
+                    }
+                    moduleDef.isVariant = true;
+                }
+                else {
+                    // Independent local package with a flat structure.
+                    moduleDef.server = `${baseModule}/src`;
+                    moduleDef.isIndependentLocal = true;
+                }
             }
-            // Otherwise, handle node_module naming conventions.
-            // If the baseModule ends with "-browser".
-            if (baseModule.endsWith('-browser')) {
-                return [
-                    ...acc,
-                    {
-                        browser: `${baseModule}/${srcOrLib}`,
-                        client: `${baseModule.replace(/-browser$/, '-client')}/${srcOrLib}`,
-                        core: `${baseModule.replace(/-browser$/, '-core')}/${srcOrLib}`,
-                    },
-                ];
+            // Optionally, if package.json exists, adjust the server path using its "main" field.
+            let packageJsonPath;
+            if (isLocal) {
+                packageJsonPath = path__default.join(pathsConfig.repoRoot, baseModule, 'package.json');
             }
-            if (baseModule.endsWith('-server')) {
-                return [
-                    ...acc,
-                    {
-                        server: `${baseModule}/${srcOrLib}`,
-                    },
-                ];
+            else {
+                packageJsonPath = path__default.join('node_modules', baseModule, 'package.json');
             }
-            if (baseModule.includes('-browser')) {
-                return [
-                    ...acc,
-                    {
-                        browser: `${baseModule}/${srcOrLib}`,
-                    },
-                ];
+            if (fs__default.existsSync(packageJsonPath)) {
+                try {
+                    const pkgContent = fs__default.readFileSync(packageJsonPath, 'utf-8');
+                    const pkg = JSON.parse(pkgContent);
+                    if (pkg.main) {
+                        moduleDef.server = pkg.main.replace(/\.js$/, `/${srcOrLib}`);
+                    }
+                }
+                catch (error) {
+                    console.error(`Error reading package.json for ${baseModule}:`, error);
+                }
             }
-            // Default fallback.
-            return [
-                ...acc,
-                {
-                    independent: `${baseModule}/${srcOrLib}`,
-                },
-            ];
+            collectedModules.push(moduleDef);
         }
         catch (e) {
-            console.error(e);
-            console.log('Error while processing module:', moduleName);
-            return acc;
+            console.error('Error while processing module:', rawStr, e);
         }
-    }, []);
+    });
+    // Transform the intermediate definitions into the final output format.
+    const finalOutput = transformModules(collectedModules);
+    return finalOutput;
 }export{readModules};//# sourceMappingURL=readModules.js.map

package/lib/tools/codegen/readModules.js.map

@@ -1 +1 @@
-{"version":3,"file":"readModules.js","sources":["../../../src/tools/codegen/readModules.ts"],"sourcesContent":[null],"names":["fs","path"],"mappings":"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"}
+{"version":3,"file":"readModules.js","sources":["../../../src/tools/codegen/readModules.ts"],"sourcesContent":[null],"names":["path","fs"],"mappings":"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"}

package/lib/tools/codegen/readModules.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/tools/codegen/templates/common/rollup.config.mjs.template

@@ -1,14 +1,13 @@
 import { createRollupConfig } from '../../rollup.config.base.mjs';
-import multiInput from 'rollup-plugin-multi-input';
 
-const additionalPlugins = [multiInput()];
+const additionalPlugins = [];
 // Use the createRollupConfig function to merge the base and specific configurations
 export default (commandLineArgs) => {
     const isWatchMode = commandLineArgs.watch;
     return [
         createRollupConfig(
             {
-                input: ['src/**/*.{ts,tsx}'],
+                input: ['src/index.ts', 'src/generated/generated.tsx', 'src/generated/introspection-result.ts'],
                 plugins: [
                     // Spread in additional plugins specific to this config
                     ...additionalPlugins,
@@ -26,7 +25,10 @@ export default (commandLineArgs) => {
                     },
                 ],
             },
-            isWatchMode,
+            {
+                isWatchMode,
+                generateRoutesJSON: false,
+            },
         ),
     ];
 };

package/lib/tools/codegen/templates/common/src/apollo-context.ts.template

@@ -4,7 +4,7 @@ import { ApolloClient } from '@apollo/client/index.js';
 import { CdmLogger } from '@cdm-logger/core';
 import express from 'express';
 import { IPreferncesTransformed } from '@common-stack/server-core';
-import { IUserContext, IUserProfile, IIAuth0Token, IAuthStrategyEnum } from './generated/generated-models';
+import { IUserContext, IUserProfile, IIAuth0Token, AuthStrategy } from './generated/generated-models';
 /**
  *
  * Context
@@ -32,7 +32,7 @@ export interface IDataSources {}
 
 export interface IHttpMiddlewareContext {
     req?: express.Request & {
-        authStrategy: IAuthStrategyEnum | string;
+        authStrategy: AuthStrategy;
         permissions?: any;
         cdecodeuri?: any;
         logger?: CdmLogger.ILogger;
@@ -42,7 +42,14 @@ export interface IHttpMiddlewareContext {
     };
     res: express.Response;
 }
-export interface ServerContext extends IHttpMiddlewareContext {
+
+export type IGraphQLContext = {
+    /**
+     * current ip of the user fetched from the request
+     */
+    userIp: string;
+};
+export interface ServerContext extends IHttpMiddlewareContext, IGraphQLContext {
     accessRoleService: any;
     user?: IIAuth0Token;
     userContext?: IUserContext;
@@ -53,6 +60,5 @@ export interface ServerContext extends IHttpMiddlewareContext {
     orgRole?: string;
     teamName?: string;
     preferences: IPreferncesTransformed[];
-    accountService?: any;
 }
 export interface MyContext extends ClientContext, ServerContext {}

package/lib/tools/codegen/templates/common/src/index.ts.template

@@ -2,4 +2,4 @@ export * from './generated/generated-models';
 export * from './configuration';
 export * from './permissions';
 export * from './apollo-context';
-export * from './types';
+export * from './types';

package/lib/tools/codegen/templates/common/tsconfig.json.template

@@ -1,8 +1,6 @@
 {
     "extends": "../../tsconfig.json",
     "compilerOptions": {
-        "target": "es2017",
-        "lib": ["es2017"],
         "resolveJsonModule": true,
         "allowSyntheticDefaultImports": true,
         "experimentalDecorators": true,
@@ -14,5 +12,5 @@
         "skipLibCheck": true
     },
     "include": ["src"],
-    "exclude": ["../../../node_modules", "node_modules", "lib", "lib", "webpack.config.js", "rollup.config.mjs"]
+    "exclude": ["../../../node_modules", "node_modules", "lib", "rollup.config.mjs"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/rollup-vite-utils",
-    "version": "8.0.1-alpha.0",
+    "version": "8.0.1-alpha.2",
     "description": "Client Module for react app",
     "homepage": "https://github.com/cdmbase/fullstack-pro#readme",
     "bugs": {
@@ -22,15 +22,16 @@
         "build:clean": "rimraf lib",
         "build:lib": "rollup -c rollup.config.mjs",
         "build:lib:watch": "npm run build:lib -- --watch",
-        "jest": "./node_modules/.bin/jest",
+        "jest": "node --experimental-vm-modules ./node_modules/.bin/jest",
         "prepublish": "npm run build",
         "test": "jest",
         "test:debug": "npm test -- --runInBand",
         "test:watch": "npm test -- --watch",
+        "vitest": "cross-env ENV_FILE=../../config/test/test.env vitest",
         "watch": "npm run build:lib:watch"
     },
     "dependencies": {
-        "@common-stack/client-react": "8.0.1-alpha.0",
+        "@common-stack/client-react": "8.0.1-alpha.2",
         "@common-stack/core": "8.0.1-alpha.0",
         "ajv": "^8.17.1",
         "dot-prop": "^9.0.0",
@@ -38,6 +39,7 @@
         "glob-all": "^3.3.1",
         "js-sha256": "^0.11.0",
         "minimatch": "^10.0.1",
+        "replace-in-file": "^8.3.0",
         "ts-deepmerge": "^7.0.0"
     },
     "devDependencies": {
@@ -47,7 +49,7 @@
     },
     "peerDependencies": {
         "@apollo/client": ">=3.0.0",
-        "@remix-run/react": "^2.9.2",
+        "@remix-run/react": "~2.15.3",
         "react": ">=16.8.6",
         "react-dom": ">=16.8.6",
         "react-router": ">=6.0.0",
@@ -59,5 +61,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "73d9088ae254fbc43425eed5c9f5cd95bd66e921"
+    "gitHead": "740324071e77326fc0d9dd3ce4a1bc4a64a472f8"
 }