@common-stack/rollup-vite-utils 6.0.8-alpha.52 → 6.0.8-alpha.54

package/lib/tools/codegen/performCopyOperations.cjs

@@ -1,65 +1,177 @@
-'use strict';var child_process=require('child_process'),fs=require('fs'),path=require('path'),commonPaths=require('./commonPaths.cjs');/**
- * For each discovered module, if "cdecode.common" is found in
- * the package.json, copy the specified files into the common package.
+'use strict';var child_process=require('child_process'),fs=require('fs'),path=require('path'),commonPaths=require('./commonPaths.cjs');/* eslint-disable no-continue */
+/* eslint-disable default-param-last */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable guard-for-in */
+/**
+ * For each discovered module (package), if its package.json defines cdecode.common then this
+ * function copies resource files (for keys such as "modules", "services", "repository", and "enums")
+ * from the package's template directory into the common package.
  *
- * Provide optional cdecodePaths = { repoRoot, commonPackagePath } to override
- * the defaults in commonPaths.mjs.
+ * The new behavior is as follows:
+ *
+ * 1. The module path provided (for example "packages-modules/user-auth0/core/src")
+ *    is trimmed (removing any trailing "/src" or "/lib") so that package.json is read from the package root.
+ *
+ * 2. For keys other than "enums", each resource file (after flattening its full path to just its basename)
+ *    is copied into the common folder for that key (for example, "common/src/services") and then modified so that
+ *    a comment is prepended indicating the originating package.
+ *
+ * 3. For "enums", files with the same flattened name are aggregated across packages.
+ *    A single merged file is created in "common/src/enums" by wrapping all enum member definitions within
+ *    an enum declaration, and each contribution is preceded by a comment (e.g. "// from package: user-auth0-core").
+ *
+ * 4. Finally, the global top-level index (common/src/index.ts) is appended with export statements for each folder type.
+ *
+ * Note: We no longer create an additional module (package) directory in the destination.
  */
-function performCopyOperations(modules, cdecodePaths = {}) {
+function performCopyOperations(modules, cdecodePaths = {}, options) {
     let { repoRoot, commonPackagePath } = cdecodePaths;
-    // Fallback to internal pathsConfig if not provided by user
     if (!repoRoot) {
         repoRoot = commonPaths.pathsConfig.repoRoot;
     }
     if (!commonPackagePath) {
-        // e.g. "packages/common"
+        // For example, "packages/common"
         commonPackagePath = path.join(commonPaths.pathsConfig.repoRoot, 'packages/common');
     }
-    let shouldAddExport = false;
-    for (const modulesObj of modules) {
-        // modulesObj = { client, core, browser, server, independent }
-        for (const moduleName of Object.values(modulesObj)) {
+    // Use the provided commandRunner or default to execSync.
+    const commandRunner = options?.commandRunner || ((cmd) => child_process.execSync(cmd));
+    // Track which resource folders are processed.
+    const processedFolders = {};
+    // Object to collect enum contributions.
+    // Key is the flattened destination file name (e.g. "auth-error.ts"),
+    // value is an array with the source file and package name.
+    const aggregatedEnums = {};
+    // Process each module (package) definition.
+    for (const moduleObj of modules) {
+        // moduleObj is expected to be an object like { server: 'packages-modules/user-auth0/core/src' }
+        for (const modulePathVal of Object.values(moduleObj)) {
             try {
-                const modulePath = path.join(repoRoot, moduleName, '../');
-                const pkgJsonFilePath = path.join(modulePath, 'package.json');
-                if (!fs.existsSync(pkgJsonFilePath)) {
-                    continue;
+                // Trim a trailing "/src" or "/lib" from the provided module path.
+                let trimmedModulePath = modulePathVal;
+                if (trimmedModulePath.endsWith(`${path.sep}src`) || trimmedModulePath.endsWith(`${path.sep}lib`)) {
+                    trimmedModulePath = path.dirname(trimmedModulePath);
                 }
-                const pkgJsonBuffer = fs.readFileSync(pkgJsonFilePath, 'utf-8');
-                const pkgJson = JSON.parse(pkgJsonBuffer);
-                // If cdecode.common is present, copy the specified modules
-                if (pkgJson.cdecode?.common) {
-                    const pkgName = (pkgJson.name || '').split('/')[1] || pkgJson.name;
-                    const { modules: resourceList } = pkgJson.cdecode.common;
-                    const directoryPath = path.join(commonPackagePath, `src/modules/${pkgName}`);
-                    child_process.execSync(`mkdir -p ${directoryPath}`);
-                    // Copy each file or folder
-                    resourceList.forEach((moduleFile) => {
-                        child_process.execSync(`cp -r ${path.join(modulePath, moduleFile)} ${directoryPath}`);
+                // Read package.json from the package root.
+                const pkgJsonFilePath = path.join(repoRoot, trimmedModulePath, 'package.json');
+                if (!fs.existsSync(pkgJsonFilePath))
+                    continue;
+                const pkgJson = JSON.parse(fs.readFileSync(pkgJsonFilePath, 'utf-8'));
+                if (!pkgJson.cdecode?.common)
+                    continue;
+                // For a scoped package like "@org/user-auth0-core", use the part after the slash.
+                const pkgNameFull = pkgJson.name || '';
+                const pkgName = pkgNameFull.split('/')[1] || pkgNameFull;
+                // Source base: package root (for resolving declared resource paths).
+                const sourceBase = path.join(repoRoot, trimmedModulePath);
+                for (const folderType of ['modules', 'services', 'repository', 'enums']) {
+                    const resourceList = pkgJson.cdecode.common[folderType] || [];
+                    if (resourceList.length === 0)
+                        continue;
+                    // Mark folder as processed.
+                    processedFolders[folderType] = true;
+                    // Determine destination folder.
+                    // For non-enums, files are copied into common/src/<folderType>
+                    // For enums, files are aggregated into common/src/enums.
+                    let destFolder;
+                    if (folderType === 'enums') {
+                        destFolder = path.join(commonPackagePath, 'src', 'enums');
+                    }
+                    else {
+                        destFolder = path.join(commonPackagePath, 'src', folderType);
+                    }
+                    commandRunner(`mkdir -p ${destFolder}`);
+                    resourceList.forEach((file) => {
+                        // Flatten the resource file name (ignore any intermediate directories)
+                        // and remove the ".ts.template" suffix.
+                        const destFileName = path.basename(file).replace(/\.ts\.template$/, '.ts');
+                        // Resolve the source file relative to the package root.
+                        const sourceFile = path.join(sourceBase, file);
+                        if (folderType === 'enums') {
+                            // For enums, collect each file (with package name) for later aggregation.
+                            if (!aggregatedEnums[destFileName]) {
+                                aggregatedEnums[destFileName] = { contributions: [] };
+                            }
+                            aggregatedEnums[destFileName].contributions.push({ pkgName, sourceFile });
+                        }
+                        else {
+                            // For non-enums, copy the file and then prepend a comment indicating its origin.
+                            const destFile = path.join(destFolder, destFileName);
+                            commandRunner(`cp -r ${sourceFile} ${destFile}`);
+                            // Prepend a comment to indicate the package origin.
+                            commandRunner(`(echo "// from package: ${pkgName}" && cat ${destFile}) > ${destFile}.tmp && mv ${destFile}.tmp ${destFile}`);
+                            // Append an export statement to the folder's index.
+                            commandRunner(`echo "export * from './${destFileName.replace('.ts', '')}';" >> ${path.join(destFolder, 'index.ts')}`);
+                            // Replace any import from "common" with the relative path to generated models.
+                            commandRunner(`sed -i '' "s/from ['\\"]common['\\"]/from '..\\/generated\\/generated-models'/g" ${destFile}`);
+                            // If this is a service file, append the augmentation code directly to the service file.
+                            if (folderType === 'services') {
+                                const serviceBaseName = destFileName.replace('.ts', '');
+                                const propertyName = serviceBaseName.charAt(0).toLowerCase() + serviceBaseName.slice(1);
+                                const augmentationContent = `
+
+/**
+ * This augments the ServerContext interface from the central apollo-context.
+ * Through declaration merging, the ${propertyName} service will be added to the ServerContext.
+ */
+declare module '../apollo-context' {
+  export interface ServerContext {
+    ${propertyName}: I${serviceBaseName};
+  }
+}
+`;
+                                // Read the current content of the service file.
+                                const currentServiceContent = fs.readFileSync(destFile, 'utf8');
+                                // Append the augmentation content to the service file.
+                                fs.writeFileSync(destFile, currentServiceContent + augmentationContent, 'utf8');
+                            }
+                        }
                     });
-                    // Create an index.ts that re-exports each file
-                    const getFileNameWithoutExt = (filePath) => {
-                        const justFile = path.basename(filePath);
-                        return path.basename(justFile, path.extname(justFile));
-                    };
-                    const exports = resourceList
-                        .map((file) => `export * from './${getFileNameWithoutExt(file)}';`)
-                        .join('\n');
-                    // Write index.ts
-                    child_process.execSync(`echo "${exports.replace(/"/g, '\\"')}" > ${path.join(directoryPath, 'index.ts')}`);
-                    // Write an index.ts in the parent folder, referencing the new module folder
-                    child_process.execSync(`echo "export * from './${pkgName}';" > ${path.join(directoryPath, '../', 'index.ts')}`);
-                    shouldAddExport = true;
                 }
             }
-            catch (e) {
-                console.error(`Error copying modules for: ${moduleName}`, e);
-                // you can decide to continue or break
+            catch (err) {
+                console.error(`Error processing module: ${modulePathVal}`, err);
             }
         }
     }
-    // If we've added at least one module export, update the top-level index
-    if (shouldAddExport) {
-        child_process.execSync(`echo "export * from './modules';" >> ${path.join(commonPackagePath, 'src', 'index.ts')}`);
+    // ----- Enum Aggregation Step -----
+    // Ensure the enums destination folder is created if it was processed.
+    const enumDestFolder = path.join(commonPackagePath, 'src', 'enums');
+    if (processedFolders['enums']) {
+        commandRunner(`mkdir -p ${enumDestFolder}`);
+        if (Object.keys(aggregatedEnums).length > 0) {
+            for (const destFileName in aggregatedEnums) {
+                const aggregatedFile = path.join(enumDestFolder, destFileName);
+                const contributions = aggregatedEnums[destFileName].contributions;
+                // Read the first contribution's file content to extract the proper enum name.
+                const firstContribution = contributions[0];
+                const fileContent = fs.readFileSync(firstContribution.sourceFile, 'utf8');
+                const match = fileContent.match(/export\s+enum\s+(\w+)/);
+                const enumName = match ? match[1] : destFileName.replace('.ts', '');
+                // Start the aggregated file with the correct enum declaration.
+                commandRunner(`echo "export enum ${enumName} {" > ${aggregatedFile}`);
+                for (const contribution of contributions) {
+                    commandRunner(`echo "  // from package: ${contribution.pkgName}" >> ${aggregatedFile}`);
+                    // Extract only the enum inner content (between "{" and "}") using two sed commands.
+                    commandRunner(`sed -n '/{/,/}/p' ${contribution.sourceFile} | sed '1d;$d' >> ${aggregatedFile}`);
+                }
+                // Close the enum declaration.
+                commandRunner(`echo "}" >> ${aggregatedFile}`);
+                // Append an export statement to the enums index.
+                commandRunner(`echo "export * from './${enumName}';" >> ${path.join(enumDestFolder, 'index.ts')}`);
+            }
+        }
+        else {
+            // No enums were aggregated, but still create an empty index file.
+            fs.writeFileSync(path.join(enumDestFolder, 'index.ts'), '', 'utf8');
+        }
+    }
+    // ----- Global Index Update -----
+    // Append export statements for each folder type that was processed.
+    const globalIndexFile = path.join(commonPackagePath, 'src', 'index.ts');
+    const folderTypes = ['modules', 'services', 'repository', 'enums'];
+    for (const folderKey of folderTypes) {
+        if (processedFolders[folderKey]) {
+            commandRunner(`echo "export * from './${folderKey}';" >> ${globalIndexFile}`);
+        }
     }
 }exports.performCopyOperations=performCopyOperations;//# sourceMappingURL=performCopyOperations.cjs.map

package/lib/tools/codegen/performCopyOperations.cjs.map

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

package/lib/tools/codegen/performCopyOperations.d.ts

@@ -1,8 +1,27 @@
+export interface CopyOptions {
+    /** Overrides the default execSync command runner */
+    commandRunner?: (command: string) => void;
+}
 /**
- * For each discovered module, if "cdecode.common" is found in
- * the package.json, copy the specified files into the common package.
+ * For each discovered module (package), if its package.json defines cdecode.common then this
+ * function copies resource files (for keys such as "modules", "services", "repository", and "enums")
+ * from the package's template directory into the common package.
  *
- * Provide optional cdecodePaths = { repoRoot, commonPackagePath } to override
- * the defaults in commonPaths.mjs.
+ * The new behavior is as follows:
+ *
+ * 1. The module path provided (for example "packages-modules/user-auth0/core/src")
+ *    is trimmed (removing any trailing "/src" or "/lib") so that package.json is read from the package root.
+ *
+ * 2. For keys other than "enums", each resource file (after flattening its full path to just its basename)
+ *    is copied into the common folder for that key (for example, "common/src/services") and then modified so that
+ *    a comment is prepended indicating the originating package.
+ *
+ * 3. For "enums", files with the same flattened name are aggregated across packages.
+ *    A single merged file is created in "common/src/enums" by wrapping all enum member definitions within
+ *    an enum declaration, and each contribution is preceded by a comment (e.g. "// from package: user-auth0-core").
+ *
+ * 4. Finally, the global top-level index (common/src/index.ts) is appended with export statements for each folder type.
+ *
+ * Note: We no longer create an additional module (package) directory in the destination.
  */
-export declare function performCopyOperations(modules: any, cdecodePaths?: any): void;
+export declare function performCopyOperations(modules: any, cdecodePaths?: any, options?: CopyOptions): void;

package/lib/tools/codegen/performCopyOperations.js

@@ -1,65 +1,177 @@
-import {execSync}from'child_process';import fs__default from'fs';import path__default from'path';import {pathsConfig}from'./commonPaths.js';/**
- * For each discovered module, if "cdecode.common" is found in
- * the package.json, copy the specified files into the common package.
+import {execSync}from'child_process';import fs__default from'fs';import path__default from'path';import {pathsConfig}from'./commonPaths.js';/* eslint-disable no-continue */
+/* eslint-disable default-param-last */
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable guard-for-in */
+/**
+ * For each discovered module (package), if its package.json defines cdecode.common then this
+ * function copies resource files (for keys such as "modules", "services", "repository", and "enums")
+ * from the package's template directory into the common package.
  *
- * Provide optional cdecodePaths = { repoRoot, commonPackagePath } to override
- * the defaults in commonPaths.mjs.
+ * The new behavior is as follows:
+ *
+ * 1. The module path provided (for example "packages-modules/user-auth0/core/src")
+ *    is trimmed (removing any trailing "/src" or "/lib") so that package.json is read from the package root.
+ *
+ * 2. For keys other than "enums", each resource file (after flattening its full path to just its basename)
+ *    is copied into the common folder for that key (for example, "common/src/services") and then modified so that
+ *    a comment is prepended indicating the originating package.
+ *
+ * 3. For "enums", files with the same flattened name are aggregated across packages.
+ *    A single merged file is created in "common/src/enums" by wrapping all enum member definitions within
+ *    an enum declaration, and each contribution is preceded by a comment (e.g. "// from package: user-auth0-core").
+ *
+ * 4. Finally, the global top-level index (common/src/index.ts) is appended with export statements for each folder type.
+ *
+ * Note: We no longer create an additional module (package) directory in the destination.
  */
-function performCopyOperations(modules, cdecodePaths = {}) {
+function performCopyOperations(modules, cdecodePaths = {}, options) {
     let { repoRoot, commonPackagePath } = cdecodePaths;
-    // Fallback to internal pathsConfig if not provided by user
     if (!repoRoot) {
         repoRoot = pathsConfig.repoRoot;
     }
     if (!commonPackagePath) {
-        // e.g. "packages/common"
+        // For example, "packages/common"
         commonPackagePath = path__default.join(pathsConfig.repoRoot, 'packages/common');
     }
-    let shouldAddExport = false;
-    for (const modulesObj of modules) {
-        // modulesObj = { client, core, browser, server, independent }
-        for (const moduleName of Object.values(modulesObj)) {
+    // Use the provided commandRunner or default to execSync.
+    const commandRunner = options?.commandRunner || ((cmd) => execSync(cmd));
+    // Track which resource folders are processed.
+    const processedFolders = {};
+    // Object to collect enum contributions.
+    // Key is the flattened destination file name (e.g. "auth-error.ts"),
+    // value is an array with the source file and package name.
+    const aggregatedEnums = {};
+    // Process each module (package) definition.
+    for (const moduleObj of modules) {
+        // moduleObj is expected to be an object like { server: 'packages-modules/user-auth0/core/src' }
+        for (const modulePathVal of Object.values(moduleObj)) {
             try {
-                const modulePath = path__default.join(repoRoot, moduleName, '../');
-                const pkgJsonFilePath = path__default.join(modulePath, 'package.json');
-                if (!fs__default.existsSync(pkgJsonFilePath)) {
-                    continue;
+                // Trim a trailing "/src" or "/lib" from the provided module path.
+                let trimmedModulePath = modulePathVal;
+                if (trimmedModulePath.endsWith(`${path__default.sep}src`) || trimmedModulePath.endsWith(`${path__default.sep}lib`)) {
+                    trimmedModulePath = path__default.dirname(trimmedModulePath);
                 }
-                const pkgJsonBuffer = fs__default.readFileSync(pkgJsonFilePath, 'utf-8');
-                const pkgJson = JSON.parse(pkgJsonBuffer);
-                // If cdecode.common is present, copy the specified modules
-                if (pkgJson.cdecode?.common) {
-                    const pkgName = (pkgJson.name || '').split('/')[1] || pkgJson.name;
-                    const { modules: resourceList } = pkgJson.cdecode.common;
-                    const directoryPath = path__default.join(commonPackagePath, `src/modules/${pkgName}`);
-                    execSync(`mkdir -p ${directoryPath}`);
-                    // Copy each file or folder
-                    resourceList.forEach((moduleFile) => {
-                        execSync(`cp -r ${path__default.join(modulePath, moduleFile)} ${directoryPath}`);
+                // Read package.json from the package root.
+                const pkgJsonFilePath = path__default.join(repoRoot, trimmedModulePath, 'package.json');
+                if (!fs__default.existsSync(pkgJsonFilePath))
+                    continue;
+                const pkgJson = JSON.parse(fs__default.readFileSync(pkgJsonFilePath, 'utf-8'));
+                if (!pkgJson.cdecode?.common)
+                    continue;
+                // For a scoped package like "@org/user-auth0-core", use the part after the slash.
+                const pkgNameFull = pkgJson.name || '';
+                const pkgName = pkgNameFull.split('/')[1] || pkgNameFull;
+                // Source base: package root (for resolving declared resource paths).
+                const sourceBase = path__default.join(repoRoot, trimmedModulePath);
+                for (const folderType of ['modules', 'services', 'repository', 'enums']) {
+                    const resourceList = pkgJson.cdecode.common[folderType] || [];
+                    if (resourceList.length === 0)
+                        continue;
+                    // Mark folder as processed.
+                    processedFolders[folderType] = true;
+                    // Determine destination folder.
+                    // For non-enums, files are copied into common/src/<folderType>
+                    // For enums, files are aggregated into common/src/enums.
+                    let destFolder;
+                    if (folderType === 'enums') {
+                        destFolder = path__default.join(commonPackagePath, 'src', 'enums');
+                    }
+                    else {
+                        destFolder = path__default.join(commonPackagePath, 'src', folderType);
+                    }
+                    commandRunner(`mkdir -p ${destFolder}`);
+                    resourceList.forEach((file) => {
+                        // Flatten the resource file name (ignore any intermediate directories)
+                        // and remove the ".ts.template" suffix.
+                        const destFileName = path__default.basename(file).replace(/\.ts\.template$/, '.ts');
+                        // Resolve the source file relative to the package root.
+                        const sourceFile = path__default.join(sourceBase, file);
+                        if (folderType === 'enums') {
+                            // For enums, collect each file (with package name) for later aggregation.
+                            if (!aggregatedEnums[destFileName]) {
+                                aggregatedEnums[destFileName] = { contributions: [] };
+                            }
+                            aggregatedEnums[destFileName].contributions.push({ pkgName, sourceFile });
+                        }
+                        else {
+                            // For non-enums, copy the file and then prepend a comment indicating its origin.
+                            const destFile = path__default.join(destFolder, destFileName);
+                            commandRunner(`cp -r ${sourceFile} ${destFile}`);
+                            // Prepend a comment to indicate the package origin.
+                            commandRunner(`(echo "// from package: ${pkgName}" && cat ${destFile}) > ${destFile}.tmp && mv ${destFile}.tmp ${destFile}`);
+                            // Append an export statement to the folder's index.
+                            commandRunner(`echo "export * from './${destFileName.replace('.ts', '')}';" >> ${path__default.join(destFolder, 'index.ts')}`);
+                            // Replace any import from "common" with the relative path to generated models.
+                            commandRunner(`sed -i '' "s/from ['\\"]common['\\"]/from '..\\/generated\\/generated-models'/g" ${destFile}`);
+                            // If this is a service file, append the augmentation code directly to the service file.
+                            if (folderType === 'services') {
+                                const serviceBaseName = destFileName.replace('.ts', '');
+                                const propertyName = serviceBaseName.charAt(0).toLowerCase() + serviceBaseName.slice(1);
+                                const augmentationContent = `
+
+/**
+ * This augments the ServerContext interface from the central apollo-context.
+ * Through declaration merging, the ${propertyName} service will be added to the ServerContext.
+ */
+declare module '../apollo-context' {
+  export interface ServerContext {
+    ${propertyName}: I${serviceBaseName};
+  }
+}
+`;
+                                // Read the current content of the service file.
+                                const currentServiceContent = fs__default.readFileSync(destFile, 'utf8');
+                                // Append the augmentation content to the service file.
+                                fs__default.writeFileSync(destFile, currentServiceContent + augmentationContent, 'utf8');
+                            }
+                        }
                     });
-                    // Create an index.ts that re-exports each file
-                    const getFileNameWithoutExt = (filePath) => {
-                        const justFile = path__default.basename(filePath);
-                        return path__default.basename(justFile, path__default.extname(justFile));
-                    };
-                    const exports = resourceList
-                        .map((file) => `export * from './${getFileNameWithoutExt(file)}';`)
-                        .join('\n');
-                    // Write index.ts
-                    execSync(`echo "${exports.replace(/"/g, '\\"')}" > ${path__default.join(directoryPath, 'index.ts')}`);
-                    // Write an index.ts in the parent folder, referencing the new module folder
-                    execSync(`echo "export * from './${pkgName}';" > ${path__default.join(directoryPath, '../', 'index.ts')}`);
-                    shouldAddExport = true;
                 }
             }
-            catch (e) {
-                console.error(`Error copying modules for: ${moduleName}`, e);
-                // you can decide to continue or break
+            catch (err) {
+                console.error(`Error processing module: ${modulePathVal}`, err);
             }
         }
     }
-    // If we've added at least one module export, update the top-level index
-    if (shouldAddExport) {
-        execSync(`echo "export * from './modules';" >> ${path__default.join(commonPackagePath, 'src', 'index.ts')}`);
+    // ----- Enum Aggregation Step -----
+    // Ensure the enums destination folder is created if it was processed.
+    const enumDestFolder = path__default.join(commonPackagePath, 'src', 'enums');
+    if (processedFolders['enums']) {
+        commandRunner(`mkdir -p ${enumDestFolder}`);
+        if (Object.keys(aggregatedEnums).length > 0) {
+            for (const destFileName in aggregatedEnums) {
+                const aggregatedFile = path__default.join(enumDestFolder, destFileName);
+                const contributions = aggregatedEnums[destFileName].contributions;
+                // Read the first contribution's file content to extract the proper enum name.
+                const firstContribution = contributions[0];
+                const fileContent = fs__default.readFileSync(firstContribution.sourceFile, 'utf8');
+                const match = fileContent.match(/export\s+enum\s+(\w+)/);
+                const enumName = match ? match[1] : destFileName.replace('.ts', '');
+                // Start the aggregated file with the correct enum declaration.
+                commandRunner(`echo "export enum ${enumName} {" > ${aggregatedFile}`);
+                for (const contribution of contributions) {
+                    commandRunner(`echo "  // from package: ${contribution.pkgName}" >> ${aggregatedFile}`);
+                    // Extract only the enum inner content (between "{" and "}") using two sed commands.
+                    commandRunner(`sed -n '/{/,/}/p' ${contribution.sourceFile} | sed '1d;$d' >> ${aggregatedFile}`);
+                }
+                // Close the enum declaration.
+                commandRunner(`echo "}" >> ${aggregatedFile}`);
+                // Append an export statement to the enums index.
+                commandRunner(`echo "export * from './${enumName}';" >> ${path__default.join(enumDestFolder, 'index.ts')}`);
+            }
+        }
+        else {
+            // No enums were aggregated, but still create an empty index file.
+            fs__default.writeFileSync(path__default.join(enumDestFolder, 'index.ts'), '', 'utf8');
+        }
+    }
+    // ----- Global Index Update -----
+    // Append export statements for each folder type that was processed.
+    const globalIndexFile = path__default.join(commonPackagePath, 'src', 'index.ts');
+    const folderTypes = ['modules', 'services', 'repository', 'enums'];
+    for (const folderKey of folderTypes) {
+        if (processedFolders[folderKey]) {
+            commandRunner(`echo "export * from './${folderKey}';" >> ${globalIndexFile}`);
+        }
     }
 }export{performCopyOperations};//# sourceMappingURL=performCopyOperations.js.map

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

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

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

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

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

@@ -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;

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": "6.0.8-alpha.52",
+    "version": "6.0.8-alpha.54",
     "description": "Client Module for react app",
     "homepage": "https://github.com/cdmbase/fullstack-pro#readme",
     "bugs": {
@@ -57,7 +57,7 @@
     "publishConfig": {
         "access": "public"
     },
-    "gitHead": "1f3b93d9bf04f183291f48d19065be04f7bd7b6e",
+    "gitHead": "51ae82926e64ca89370dc7c447853befea00c3fa",
     "typescript": {
         "definition": "lib/index.d.ts"
     }