@common-stack/rollup-vite-utils 6.0.8-alpha.53 → 6.0.8-alpha.55

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

@@ -0,0 +1,56 @@
+/**
+ * Module Path Parser and Stringifier
+ *
+ * Universal Module Path Format:
+ * For modules with a particular variant:
+ *   <moduleBase>/<variant>/${libDir}
+ * For independent modules:
+ *   <moduleBase>/${libDir}
+ *
+ * This module provides two functions:
+ * - parseModulePath: parses a module path string into its components.
+ * - stringifyModulePath: converts the components back into a module path string.
+ */
+export interface ModulePathParts {
+    /**
+     * The base part of the module path, for example:
+     * "packages-modules/account-api" or "node_modules/@container-stack/file-info-server"
+     */
+    moduleBase: string;
+    /**
+     * The resource variant, for example: "client", "core", "browser", "server".
+     * This is optional, as independent modules do not include a variant.
+     */
+    variant?: string;
+    /**
+     * This is the library directory token or its resolved value.
+     * In our configuration it is typically the placeholder "${libDir}".
+     */
+    libDir: string;
+}
+/**
+ * Parses a module path string into its constituent parts.
+ *
+ * The function will try to match one of two patterns:
+ *
+ * 1. <moduleBase>/<variant>/<libDir>
+ * 2. <moduleBase>/<libDir>
+ *
+ * If neither pattern matches, the function returns null.
+ *
+ * @param modulePath - The module path string to parse.
+ * @returns An object containing the parsed parts, or null if parsing fails.
+ */
+export declare function parseModulePath(modulePath: string): ModulePathParts | null;
+/**
+ * Converts the provided ModulePathParts object back to a module path string.
+ *
+ * If the variant is provided, the format will be:
+ *   <moduleBase>/<variant>/<libDir>
+ * Otherwise, it is considered an independent module and formatted as:
+ *   <moduleBase>/<libDir>
+ *
+ * @param parts - The ModulePathParts object.
+ * @returns The combined module path string.
+ */
+export declare function stringifyModulePath(parts: ModulePathParts): string;

package/lib/tools/codegen/performCopyOperations.cjs

@@ -1,36 +1,29 @@
-'use strict';var child_process=require('child_process'),fs=require('fs'),path=require('path'),commonPaths=require('./commonPaths.cjs');/* eslint-disable no-continue */
+'use strict';var child_process=require('child_process'),fs=require('fs'),path=require('path'),commonPaths=require('./commonPaths.cjs');/* eslint-disable no-template-curly-in-string */
+/* 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, if "cdecode.common" is defined in its package.json,
- * copy the files specified under the keys "modules", "services", "repository", and "enums"
- * from the package's template folder 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.
  *
- * For files with the .ts.template extension, the ".template" suffix is removed
- * upon copy so that the destination file is a plain .ts file.
+ * The new behavior is as follows:
  *
- * Each of these keys is processed into its own destination folder:
- *   • common/src/modules/<pkgName>
- *   • common/src/services/<pkgName>
- *   • common/src/repository/<pkgName>
- *   • common/src/enums/<pkgName>
+ * 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.
  *
- * An index.ts file is created in each subfolder to re-export the files,
- * and a top-level index file is updated so that the common code (for example,
- * the ApolloContext file) can import the services, repository types, or enums.
+ * 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.
  *
- * For folder type "enums", after copying the files per package, an aggregation step
- * groups files by their base file name (e.g. ErrorMessage.ts) and then generates a merged file.
- * The merged file will be created in common/src/enums/ and wrap all enum members in a single
- * export—for example:
+ * 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").
  *
- *   export enum ErrorMessage {
- *     // contents from package1
- *     // contents from package2
- *   }
+ * 4. Finally, the global top-level index (common/src/index.ts) is appended with export statements for each folder type.
  *
- * The `options.commandRunner` allows injecting a custom command runner for testability.
+ * Note: We no longer create an additional module (package) directory in the destination.
  */
 function performCopyOperations(modules, cdecodePaths = {}, options) {
     let { repoRoot, commonPackagePath } = cdecodePaths;
@@ -43,112 +36,146 @@ function performCopyOperations(modules, cdecodePaths = {}, options) {
     }
     // Use the provided commandRunner or default to execSync.
     const commandRunner = options?.commandRunner || ((cmd) => child_process.execSync(cmd));
-    // Define the folder types we want to process.
-    const folderTypes = ['modules', 'services', 'repository', 'enums'];
-    // Track whether we have added any export for each folder type.
-    const shouldAddExportFlag = {
-        modules: false,
-        services: false,
-        repository: false,
-        enums: false,
-    };
-    // For enums we want to merge files across packages.
-    // We'll accumulate a list of destination file paths (already renamed to .ts)
-    // keyed by their base file name (e.g. "ErrorMessage.ts").
-    const enumAggregation = {};
-    // Helper: compute final destination file name.
-    const getDestinationFileName = (file) => {
-        if (file.endsWith('.ts.template')) {
-            return file.replace(/\.ts\.template$/, '.ts');
-        }
-        return file;
-    };
-    // Helper: compute export name for index generation.
-    const getExportName = (file) => {
-        const destFileName = getDestinationFileName(file);
-        // Remove the .ts extension from the file name.
-        return path.basename(destFileName, '.ts');
-    };
-    for (const modulesObj of modules) {
-        // modulesObj is expected to be an object like { server, client, etc. }
-        for (const moduleName of Object.values(modulesObj)) {
+    // 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)) {
+            let trimmedModulePath = modulePathVal;
+            let inferredLibDir = 'src'; // default
+            if (modulePathVal.endsWith(`${path.sep}src`)) {
+                inferredLibDir = 'src';
+                trimmedModulePath = path.dirname(modulePathVal);
+            }
+            else if (modulePathVal.endsWith(`${path.sep}lib`)) {
+                inferredLibDir = 'lib';
+                trimmedModulePath = path.dirname(modulePathVal);
+            }
             try {
-                // Read package.json from the package directory.
-                const pkgJsonFilePath = path.join(repoRoot, moduleName, 'package.json');
-                if (!fs.existsSync(pkgJsonFilePath)) {
+                // Read package.json from the package root.
+                const pkgJsonFilePath = path.join(repoRoot, trimmedModulePath, 'package.json');
+                if (!fs.existsSync(pkgJsonFilePath))
                     continue;
-                }
-                const pkgJsonBuffer = fs.readFileSync(pkgJsonFilePath, 'utf-8');
-                const pkgJson = JSON.parse(pkgJsonBuffer);
-                // If the package uses cdecode.common then process for each folder type.
-                if (pkgJson.cdecode?.common) {
-                    // Use the package name (falling back to the whole name if expected format is not met)
-                    const pkgName = (pkgJson.name || '').split('/')[1] || pkgJson.name;
-                    // Compute the source base for template files.
-                    // (Assumes that the template files live one directory above the package folder.)
-                    const sourceBase = path.join(repoRoot, moduleName, '../');
-                    for (const folderType of folderTypes) {
-                        const resourceList = pkgJson.cdecode.common[folderType];
-                        if (!resourceList)
-                            continue;
-                        // Destination folder (for example, common/src/modules/dummy-package)
-                        const directoryPath = path.join(commonPackagePath, 'src', folderType, pkgName);
-                        commandRunner(`mkdir -p ${directoryPath}`);
-                        // Copy and rename (if needed) each file.
-                        resourceList.forEach((file) => {
-                            const sourceFile = path.join(sourceBase, file);
-                            const destFileName = getDestinationFileName(file);
-                            const destination = path.join(directoryPath, destFileName);
-                            commandRunner(`cp -r ${sourceFile} ${destination}`);
-                            // For enums, accumulate the destination file for aggregation.
-                            if (folderType === 'enums') {
-                                if (!enumAggregation[destFileName]) {
-                                    enumAggregation[destFileName] = [];
-                                }
-                                enumAggregation[destFileName].push(destination);
-                            }
-                        });
-                        // Generate index.ts in the destination folder that re-exports each file.
-                        const exportsContent = resourceList
-                            .map((file) => `export * from './${getExportName(file)}';`)
-                            .join('\n');
-                        commandRunner(`echo "${exportsContent.replace(/"/g, '\\"')}" > ${path.join(directoryPath, 'index.ts')}`);
-                        // Create (or overwrite) an index.ts in the parent folder of the destination;
-                        // this index re-exports the package folder so that later an aggregator can import all packages.
-                        commandRunner(`echo "export * from './${pkgName}';" > ${path.join(directoryPath, '../', 'index.ts')}`);
-                        shouldAddExportFlag[folderType] = true;
+                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');
+                        // When processing each resource (using the value from package.json, e.g. "./${libDir}/templates/...")
+                        const resolvedTemplatePath = file.replace('${libDir}', inferredLibDir);
+                        const sourceFile = path.join(sourceBase, resolvedTemplatePath);
+                        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.
+                            // Use BSD‑compatible sed syntax.
+                            commandRunner(`sed -i '' "s/from ['\\"]common['\\"]/from '..\\/generated\\/generated-models'/g" ${destFile}`);
+                            // If this is a service file, auto generate the augmentation boilerplate.
+                            if (folderType === 'services') {
+                                const serviceBaseName = destFileName.replace('.ts', '');
+                                const propertyName = serviceBaseName.charAt(0).toLowerCase() + serviceBaseName.slice(1);
+                                const augmentationContent = `/**
+ * This file augments the ServerContext interface from the central apollo-context.
+ * Through declaration merging, the ${propertyName} will be added to the ServerContext.
+ */
+declare module '../apollo-context' {
+  export interface ServerContext {
+    ${propertyName}: I${serviceBaseName};
+  }
+}
+`;
+                                const augmentationFilePath = path.join(destFolder, `${serviceBaseName}.augment.d.ts`);
+                                fs.writeFileSync(augmentationFilePath, augmentationContent, 'utf8');
+                            }
+                        }
+                    });
                 }
             }
-            catch (e) {
-                console.error(`Error processing module: ${moduleName}`, e);
+            catch (err) {
+                console.error(`Error processing module: ${modulePathVal}`, err);
             }
         }
     }
-    // For each folder type where any export was added, update the top-level index.
-    // For example, append "export * from './modules';" to common/src/index.ts.
-    for (const folderType of folderTypes) {
-        if (shouldAddExportFlag[folderType]) {
-            commandRunner(`echo "export * from './${folderType}';" >> ${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');
         }
     }
-    // ----- Enum Aggregation Step -----
-    // For enums, we want to merge definitions from all packages into a single file per enum type.
-    // The aggregated file will be placed in common/src/enums/<EnumFileName>.
-    if (Object.keys(enumAggregation).length > 0) {
-        const enumsTargetDir = path.join(commonPackagePath, 'src', 'enums');
-        commandRunner(`mkdir -p ${enumsTargetDir}`);
-        for (const destFileName in enumAggregation) {
-            const baseName = path.basename(destFileName, '.ts'); // e.g., "ErrorMessage"
-            const aggregatedFile = path.join(enumsTargetDir, destFileName);
-            // Begin the aggregated file with the enum header.
-            commandRunner(`echo "export enum ${baseName} {" > ${aggregatedFile}`);
-            // Append the contents (enum members) from each package's file.
-            enumAggregation[destFileName].forEach((filePath) => {
-                commandRunner(`cat ${filePath} >> ${aggregatedFile}`);
-            });
-            // Close the enum definition.
-            commandRunner(`echo "}" >> ${aggregatedFile}`);
+    // ----- 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

@@ -3,33 +3,25 @@ export interface CopyOptions {
     commandRunner?: (command: string) => void;
 }
 /**
- * For each discovered module, if "cdecode.common" is defined in its package.json,
- * copy the files specified under the keys "modules", "services", "repository", and "enums"
- * from the package's template folder 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.
  *
- * For files with the .ts.template extension, the ".template" suffix is removed
- * upon copy so that the destination file is a plain .ts file.
+ * The new behavior is as follows:
  *
- * Each of these keys is processed into its own destination folder:
- *   • common/src/modules/<pkgName>
- *   • common/src/services/<pkgName>
- *   • common/src/repository/<pkgName>
- *   • common/src/enums/<pkgName>
+ * 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.
  *
- * An index.ts file is created in each subfolder to re-export the files,
- * and a top-level index file is updated so that the common code (for example,
- * the ApolloContext file) can import the services, repository types, or enums.
+ * 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.
  *
- * For folder type "enums", after copying the files per package, an aggregation step
- * groups files by their base file name (e.g. ErrorMessage.ts) and then generates a merged file.
- * The merged file will be created in common/src/enums/ and wrap all enum members in a single
- * export—for example:
+ * 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").
  *
- *   export enum ErrorMessage {
- *     // contents from package1
- *     // contents from package2
- *   }
+ * 4. Finally, the global top-level index (common/src/index.ts) is appended with export statements for each folder type.
  *
- * The `options.commandRunner` allows injecting a custom command runner for testability.
+ * Note: We no longer create an additional module (package) directory in the destination.
  */
 export declare function performCopyOperations(modules: any, cdecodePaths?: any, options?: CopyOptions): void;

package/lib/tools/codegen/performCopyOperations.js

@@ -1,36 +1,29 @@
-import {execSync}from'child_process';import fs__default from'fs';import path__default from'path';import {pathsConfig}from'./commonPaths.js';/* eslint-disable no-continue */
+import {execSync}from'child_process';import fs__default from'fs';import path__default from'path';import {pathsConfig}from'./commonPaths.js';/* eslint-disable no-template-curly-in-string */
+/* 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, if "cdecode.common" is defined in its package.json,
- * copy the files specified under the keys "modules", "services", "repository", and "enums"
- * from the package's template folder 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.
  *
- * For files with the .ts.template extension, the ".template" suffix is removed
- * upon copy so that the destination file is a plain .ts file.
+ * The new behavior is as follows:
  *
- * Each of these keys is processed into its own destination folder:
- *   • common/src/modules/<pkgName>
- *   • common/src/services/<pkgName>
- *   • common/src/repository/<pkgName>
- *   • common/src/enums/<pkgName>
+ * 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.
  *
- * An index.ts file is created in each subfolder to re-export the files,
- * and a top-level index file is updated so that the common code (for example,
- * the ApolloContext file) can import the services, repository types, or enums.
+ * 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.
  *
- * For folder type "enums", after copying the files per package, an aggregation step
- * groups files by their base file name (e.g. ErrorMessage.ts) and then generates a merged file.
- * The merged file will be created in common/src/enums/ and wrap all enum members in a single
- * export—for example:
+ * 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").
  *
- *   export enum ErrorMessage {
- *     // contents from package1
- *     // contents from package2
- *   }
+ * 4. Finally, the global top-level index (common/src/index.ts) is appended with export statements for each folder type.
  *
- * The `options.commandRunner` allows injecting a custom command runner for testability.
+ * Note: We no longer create an additional module (package) directory in the destination.
  */
 function performCopyOperations(modules, cdecodePaths = {}, options) {
     let { repoRoot, commonPackagePath } = cdecodePaths;
@@ -43,112 +36,146 @@ function performCopyOperations(modules, cdecodePaths = {}, options) {
     }
     // Use the provided commandRunner or default to execSync.
     const commandRunner = options?.commandRunner || ((cmd) => execSync(cmd));
-    // Define the folder types we want to process.
-    const folderTypes = ['modules', 'services', 'repository', 'enums'];
-    // Track whether we have added any export for each folder type.
-    const shouldAddExportFlag = {
-        modules: false,
-        services: false,
-        repository: false,
-        enums: false,
-    };
-    // For enums we want to merge files across packages.
-    // We'll accumulate a list of destination file paths (already renamed to .ts)
-    // keyed by their base file name (e.g. "ErrorMessage.ts").
-    const enumAggregation = {};
-    // Helper: compute final destination file name.
-    const getDestinationFileName = (file) => {
-        if (file.endsWith('.ts.template')) {
-            return file.replace(/\.ts\.template$/, '.ts');
-        }
-        return file;
-    };
-    // Helper: compute export name for index generation.
-    const getExportName = (file) => {
-        const destFileName = getDestinationFileName(file);
-        // Remove the .ts extension from the file name.
-        return path__default.basename(destFileName, '.ts');
-    };
-    for (const modulesObj of modules) {
-        // modulesObj is expected to be an object like { server, client, etc. }
-        for (const moduleName of Object.values(modulesObj)) {
+    // 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)) {
+            let trimmedModulePath = modulePathVal;
+            let inferredLibDir = 'src'; // default
+            if (modulePathVal.endsWith(`${path__default.sep}src`)) {
+                inferredLibDir = 'src';
+                trimmedModulePath = path__default.dirname(modulePathVal);
+            }
+            else if (modulePathVal.endsWith(`${path__default.sep}lib`)) {
+                inferredLibDir = 'lib';
+                trimmedModulePath = path__default.dirname(modulePathVal);
+            }
             try {
-                // Read package.json from the package directory.
-                const pkgJsonFilePath = path__default.join(repoRoot, moduleName, 'package.json');
-                if (!fs__default.existsSync(pkgJsonFilePath)) {
+                // Read package.json from the package root.
+                const pkgJsonFilePath = path__default.join(repoRoot, trimmedModulePath, 'package.json');
+                if (!fs__default.existsSync(pkgJsonFilePath))
                     continue;
-                }
-                const pkgJsonBuffer = fs__default.readFileSync(pkgJsonFilePath, 'utf-8');
-                const pkgJson = JSON.parse(pkgJsonBuffer);
-                // If the package uses cdecode.common then process for each folder type.
-                if (pkgJson.cdecode?.common) {
-                    // Use the package name (falling back to the whole name if expected format is not met)
-                    const pkgName = (pkgJson.name || '').split('/')[1] || pkgJson.name;
-                    // Compute the source base for template files.
-                    // (Assumes that the template files live one directory above the package folder.)
-                    const sourceBase = path__default.join(repoRoot, moduleName, '../');
-                    for (const folderType of folderTypes) {
-                        const resourceList = pkgJson.cdecode.common[folderType];
-                        if (!resourceList)
-                            continue;
-                        // Destination folder (for example, common/src/modules/dummy-package)
-                        const directoryPath = path__default.join(commonPackagePath, 'src', folderType, pkgName);
-                        commandRunner(`mkdir -p ${directoryPath}`);
-                        // Copy and rename (if needed) each file.
-                        resourceList.forEach((file) => {
-                            const sourceFile = path__default.join(sourceBase, file);
-                            const destFileName = getDestinationFileName(file);
-                            const destination = path__default.join(directoryPath, destFileName);
-                            commandRunner(`cp -r ${sourceFile} ${destination}`);
-                            // For enums, accumulate the destination file for aggregation.
-                            if (folderType === 'enums') {
-                                if (!enumAggregation[destFileName]) {
-                                    enumAggregation[destFileName] = [];
-                                }
-                                enumAggregation[destFileName].push(destination);
-                            }
-                        });
-                        // Generate index.ts in the destination folder that re-exports each file.
-                        const exportsContent = resourceList
-                            .map((file) => `export * from './${getExportName(file)}';`)
-                            .join('\n');
-                        commandRunner(`echo "${exportsContent.replace(/"/g, '\\"')}" > ${path__default.join(directoryPath, 'index.ts')}`);
-                        // Create (or overwrite) an index.ts in the parent folder of the destination;
-                        // this index re-exports the package folder so that later an aggregator can import all packages.
-                        commandRunner(`echo "export * from './${pkgName}';" > ${path__default.join(directoryPath, '../', 'index.ts')}`);
-                        shouldAddExportFlag[folderType] = true;
+                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');
+                        // When processing each resource (using the value from package.json, e.g. "./${libDir}/templates/...")
+                        const resolvedTemplatePath = file.replace('${libDir}', inferredLibDir);
+                        const sourceFile = path__default.join(sourceBase, resolvedTemplatePath);
+                        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.
+                            // Use BSD‑compatible sed syntax.
+                            commandRunner(`sed -i '' "s/from ['\\"]common['\\"]/from '..\\/generated\\/generated-models'/g" ${destFile}`);
+                            // If this is a service file, auto generate the augmentation boilerplate.
+                            if (folderType === 'services') {
+                                const serviceBaseName = destFileName.replace('.ts', '');
+                                const propertyName = serviceBaseName.charAt(0).toLowerCase() + serviceBaseName.slice(1);
+                                const augmentationContent = `/**
+ * This file augments the ServerContext interface from the central apollo-context.
+ * Through declaration merging, the ${propertyName} will be added to the ServerContext.
+ */
+declare module '../apollo-context' {
+  export interface ServerContext {
+    ${propertyName}: I${serviceBaseName};
+  }
+}
+`;
+                                const augmentationFilePath = path__default.join(destFolder, `${serviceBaseName}.augment.d.ts`);
+                                fs__default.writeFileSync(augmentationFilePath, augmentationContent, 'utf8');
+                            }
+                        }
+                    });
                 }
             }
-            catch (e) {
-                console.error(`Error processing module: ${moduleName}`, e);
+            catch (err) {
+                console.error(`Error processing module: ${modulePathVal}`, err);
             }
         }
     }
-    // For each folder type where any export was added, update the top-level index.
-    // For example, append "export * from './modules';" to common/src/index.ts.
-    for (const folderType of folderTypes) {
-        if (shouldAddExportFlag[folderType]) {
-            commandRunner(`echo "export * from './${folderType}';" >> ${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');
         }
     }
-    // ----- Enum Aggregation Step -----
-    // For enums, we want to merge definitions from all packages into a single file per enum type.
-    // The aggregated file will be placed in common/src/enums/<EnumFileName>.
-    if (Object.keys(enumAggregation).length > 0) {
-        const enumsTargetDir = path__default.join(commonPackagePath, 'src', 'enums');
-        commandRunner(`mkdir -p ${enumsTargetDir}`);
-        for (const destFileName in enumAggregation) {
-            const baseName = path__default.basename(destFileName, '.ts'); // e.g., "ErrorMessage"
-            const aggregatedFile = path__default.join(enumsTargetDir, destFileName);
-            // Begin the aggregated file with the enum header.
-            commandRunner(`echo "export enum ${baseName} {" > ${aggregatedFile}`);
-            // Append the contents (enum members) from each package's file.
-            enumAggregation[destFileName].forEach((filePath) => {
-                commandRunner(`cat ${filePath} >> ${aggregatedFile}`);
-            });
-            // Close the enum definition.
-            commandRunner(`echo "}" >> ${aggregatedFile}`);
+    // ----- 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":"4IAAA;AACA;AACA;AACA;AACA;AAWA;;;;;;;;;;;;;;;;;;;;;AAqBG;AACG,SAAU,qBAAqB,CAAC,OAAY,EAAE,YAAe,GAAA,EAAS,EAAE,OAAqB,EAAA;AAC/F,IAAA,IAAI,EAAE,QAAQ,EAAE,iBAAiB,EAAE,GAAG,YAAY,CAAC;IAEnD,IAAI,CAAC,QAAQ,EAAE;AACX,QAAA,QAAQ,GAAG,WAAW,CAAC,QAAQ,CAAC;KACnC;IACD,IAAI,CAAC,iBAAiB,EAAE;;QAEpB,iBAAiB,GAAGA,aAAI,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;KAC1E;;AAGD,IAAA,MAAM,aAAa,GAAG,OAAO,EAAE,aAAa,KAAK,CAAC,GAAW,KAAK,QAAQ,CAAC,GAAG,CAAC,CAAC,CAAC;;IAGjF,MAAM,gBAAgB,GAA+B,EAAE,CAAC;;;;IAKxD,MAAM,eAAe,GAEjB,EAAE,CAAC;;AAGP,IAAA,KAAK,MAAM,SAAS,IAAI,OAAO,EAAE;;QAE7B,KAAK,MAAM,aAAa,IAAI,MAAM,CAAC,MAAM,CAAC,SAAS,CAAa,EAAE;YAC9D,IAAI,iBAAiB,GAAG,aAAa,CAAC;AACtC,YAAA,IAAI,cAAc,GAAG,KAAK,CAAC;YAC3B,IAAI,aAAa,CAAC,QAAQ,CAAC,CAAA,EAAGA,aAAI,CAAC,GAAG,CAAA,GAAA,CAAK,CAAC,EAAE;gBAC1C,cAAc,GAAG,KAAK,CAAC;AACvB,gBAAA,iBAAiB,GAAGA,aAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;aACnD;iBAAM,IAAI,aAAa,CAAC,QAAQ,CAAC,CAAA,EAAGA,aAAI,CAAC,GAAG,CAAA,GAAA,CAAK,CAAC,EAAE;gBACjD,cAAc,GAAG,KAAK,CAAC;AACvB,gBAAA,iBAAiB,GAAGA,aAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;aACnD;AACD,YAAA,IAAI;;AAEA,gBAAA,MAAM,eAAe,GAAGA,aAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,iBAAiB,EAAE,cAAc,CAAC,CAAC;AAC/E,gBAAA,IAAI,CAACC,WAAE,CAAC,UAAU,CAAC,eAAe,CAAC;oBAAE,SAAS;AAC9C,gBAAA,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAACA,WAAE,CAAC,YAAY,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC,CAAC;AACtE,gBAAA,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,MAAM;oBAAE,SAAS;;AAEvC,gBAAA,MAAM,WAAW,GAAG,OAAO,CAAC,IAAI,IAAI,EAAE,CAAC;AACvC,gBAAA,MAAM,OAAO,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,WAAW,CAAC;;gBAEzD,MAAM,UAAU,GAAGD,aAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,iBAAiB,CAAC,CAAC;AAE1D,gBAAA,KAAK,MAAM,UAAU,IAAI,CAAC,SAAS,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,CAAC,EAAE;AACrE,oBAAA,MAAM,YAAY,GAAa,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;AACxE,oBAAA,IAAI,YAAY,CAAC,MAAM,KAAK,CAAC;wBAAE,SAAS;;AAExC,oBAAA,gBAAgB,CAAC,UAAU,CAAC,GAAG,IAAI,CAAC;;;;AAIpC,oBAAA,IAAI,UAAkB,CAAC;AACvB,oBAAA,IAAI,UAAU,KAAK,OAAO,EAAE;wBACxB,UAAU,GAAGA,aAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;qBAC7D;yBAAM;wBACH,UAAU,GAAGA,aAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;qBAChE;AACD,oBAAA,aAAa,CAAC,CAAA,SAAA,EAAY,UAAU,CAAA,CAAE,CAAC,CAAC;AAExC,oBAAA,YAAY,CAAC,OAAO,CAAC,CAAC,IAAY,KAAI;;;AAGlC,wBAAA,MAAM,YAAY,GAAGA,aAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;;wBAE3E,MAAM,oBAAoB,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;wBACvE,MAAM,UAAU,GAAGA,aAAI,CAAC,IAAI,CAAC,UAAU,EAAE,oBAAoB,CAAC,CAAC;AAE/D,wBAAA,IAAI,UAAU,KAAK,OAAO,EAAE;;AAExB,4BAAA,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,EAAE;gCAChC,eAAe,CAAC,YAAY,CAAC,GAAG,EAAE,aAAa,EAAE,EAAE,EAAE,CAAC;6BACzD;AACD,4BAAA,eAAe,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,CAAC,CAAC;yBAC7E;6BAAM;;4BAEH,MAAM,QAAQ,GAAGA,aAAI,CAAC,IAAI,CAAC,UAAU,EAAE,YAAY,CAAC,CAAC;AACrD,4BAAA,aAAa,CAAC,CAAS,MAAA,EAAA,UAAU,IAAI,QAAQ,CAAA,CAAE,CAAC,CAAC;;AAEjD,4BAAA,aAAa,CACT,CAAA,wBAAA,EAA2B,OAAO,CAAA,SAAA,EAAY,QAAQ,CAAA,IAAA,EAAO,QAAQ,CAAA,WAAA,EAAc,QAAQ,CAAA,KAAA,EAAQ,QAAQ,CAAA,CAAE,CAChH,CAAC;;4BAEF,aAAa,CACT,0BAA0B,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,UAAUA,aAAI,CAAC,IAAI,CAAC,UAAU,EAAE,UAAU,CAAC,CAAE,CAAA,CACzG,CAAC;;;AAGF,4BAAA,aAAa,CACT,CAAA,iFAAA,EAAoF,QAAQ,CAAA,CAAE,CACjG,CAAC;;AAEF,4BAAA,IAAI,UAAU,KAAK,UAAU,EAAE;gCAC3B,MAAM,eAAe,GAAG,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;AACxD,gCAAA,MAAM,YAAY,GAAG,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AACxF,gCAAA,MAAM,mBAAmB,GAAG,CAAA;;sCAEtB,YAAY,CAAA;;;;AAI5C,IAAA,EAAA,YAAY,MAAM,eAAe,CAAA;;;CAGtC,CAAC;AAC8B,gCAAA,MAAM,oBAAoB,GAAGA,aAAI,CAAC,IAAI,CAAC,UAAU,EAAE,CAAG,EAAA,eAAe,CAAe,aAAA,CAAA,CAAC,CAAC;gCACtFC,WAAE,CAAC,aAAa,CAAC,oBAAoB,EAAE,mBAAmB,EAAE,MAAM,CAAC,CAAC;6BACvE;yBACJ;AACL,qBAAC,CAAC,CAAC;iBACN;aACJ;YAAC,OAAO,GAAG,EAAE;gBACV,OAAO,CAAC,KAAK,CAAC,CAAA,yBAAA,EAA4B,aAAa,CAAE,CAAA,EAAE,GAAG,CAAC,CAAC;aACnE;SACJ;KACJ;;;AAID,IAAA,MAAM,cAAc,GAAGD,aAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC;AACpE,IAAA,IAAI,gBAAgB,CAAC,OAAO,CAAC,EAAE;AAC3B,QAAA,aAAa,CAAC,CAAA,SAAA,EAAY,cAAc,CAAA,CAAE,CAAC,CAAC;QAC5C,IAAI,MAAM,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;AACzC,YAAA,KAAK,MAAM,YAAY,IAAI,eAAe,EAAE;gBACxC,MAAM,cAAc,GAAGA,aAAI,CAAC,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;gBAC/D,MAAM,aAAa,GAAG,eAAe,CAAC,YAAY,CAAC,CAAC,aAAa,CAAC;;AAElE,gBAAA,MAAM,iBAAiB,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;AAC3C,gBAAA,MAAM,WAAW,GAAGC,WAAE,CAAC,YAAY,CAAC,iBAAiB,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;gBAC1E,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;gBACzD,MAAM,QAAQ,GAAG,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC,OAAO,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;;AAEpE,gBAAA,aAAa,CAAC,CAAqB,kBAAA,EAAA,QAAQ,SAAS,cAAc,CAAA,CAAE,CAAC,CAAC;AACtE,gBAAA,KAAK,MAAM,YAAY,IAAI,aAAa,EAAE;oBACtC,aAAa,CAAC,4BAA4B,YAAY,CAAC,OAAO,CAAQ,KAAA,EAAA,cAAc,CAAE,CAAA,CAAC,CAAC;;oBAExF,aAAa,CAAC,qBAAqB,YAAY,CAAC,UAAU,CAAqB,kBAAA,EAAA,cAAc,CAAE,CAAA,CAAC,CAAC;iBACpG;;AAED,gBAAA,aAAa,CAAC,CAAA,YAAA,EAAe,cAAc,CAAA,CAAE,CAAC,CAAC;;AAE/C,gBAAA,aAAa,CAAC,CAAA,uBAAA,EAA0B,QAAQ,CAAA,OAAA,EAAUD,aAAI,CAAC,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,CAAA,CAAE,CAAC,CAAC;aACtG;SACJ;aAAM;;AAEH,YAAAC,WAAE,CAAC,aAAa,CAACD,aAAI,CAAC,IAAI,CAAC,cAAc,EAAE,UAAU,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC;SACvE;KACJ;;;AAID,IAAA,MAAM,eAAe,GAAGA,aAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,EAAE,UAAU,CAAC,CAAC;IACxE,MAAM,WAAW,GAAG,CAAC,SAAS,EAAE,UAAU,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC;AACnE,IAAA,KAAK,MAAM,SAAS,IAAI,WAAW,EAAE;AACjC,QAAA,IAAI,gBAAgB,CAAC,SAAS,CAAC,EAAE;AAC7B,YAAA,aAAa,CAAC,CAA0B,uBAAA,EAAA,SAAS,UAAU,eAAe,CAAA,CAAE,CAAC,CAAC;SACjF;KACJ;AACL"}

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