@common-stack/rollup-vite-utils 8.0.2-alpha.0 → 8.1.1-alpha.0

package/lib/tools/codegen/readModules.js

@@ -1,4 +1,6 @@
-import fs__default from'fs';import path__default from'path';import {createRequire}from'module';import {pathsConfig}from'./commonPaths.js';// ESM-compatible require
+import fs__default from'fs';import path__default from'path';import {createRequire}from'module';import {resolvePackageJson}from'../../utils/packageUtils.js';import {pathsConfig}from'./commonPaths.js';/* eslint-disable no-lonely-if */
+/* eslint-disable no-use-before-define */
+// ESM-compatible require
 const esmRequire = createRequire(import.meta.url);
 /**
  * For local modules, if the relative path ends with "lib",
@@ -88,24 +90,6 @@ function transformModules(modules) {
     });
     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.
@@ -125,53 +109,54 @@ function readModules(configPaths = []) {
         try {
             // Determine if the raw config string suggests a variant module.
             const isVariant = rawStr.includes('-browser') || rawStr.endsWith('-server');
-            let resolvedFile;
-            try {
-                // Primary resolution: try to resolve directly to package.json.
-                resolvedFile = esmRequire.resolve(path__default.join(rawStr, 'package.json'));
-            }
-            catch (err) {
-                // 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;
-                        }
-                    }
+            // For internal/local packages, construct path directly
+            let resolvedFile = null;
+            if (rawStr.startsWith('packages-modules/')) {
+                const localPath = path__default.join(process.cwd(), rawStr, 'package.json');
+                if (fs__default.existsSync(localPath)) {
+                    resolvedFile = localPath;
                 }
                 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'));
+                    // If not found at cwd, try from repo root
+                    const repoRootPath = path__default.join(pathsConfig.repoRoot, rawStr, 'package.json');
+                    if (fs__default.existsSync(repoRootPath)) {
+                        resolvedFile = repoRootPath;
                     }
-                    catch (err2) {
-                        console.warn(`Could not resolve module ${rawStr} even with fallback ${fallbackModule}. Skipping.`);
-                        return;
+                }
+            }
+            else {
+                resolvedFile = resolvePackageJson(rawStr, esmRequire, {
+                    repoRoot: pathsConfig.repoRoot,
+                });
+                if (!resolvedFile) {
+                    // For subpaths like '@pkg/name/subpath', try resolving the base package
+                    const basePackageName = rawStr
+                        .split('/')
+                        .slice(0, rawStr.startsWith('@') ? 2 : 1)
+                        .join('/');
+                    if (basePackageName !== rawStr) {
+                        resolvedFile = resolvePackageJson(basePackageName, esmRequire, {
+                            repoRoot: pathsConfig.repoRoot,
+                        });
                     }
                 }
             }
+            if (!resolvedFile) {
+                console.warn(`Could not resolve module ${rawStr}. Skipping.`);
+                return;
+            }
             const dirName = path__default.dirname(resolvedFile);
+            // Follow symlinks to get the real path for linked packages
+            let realDirPath;
+            try {
+                realDirPath = fs__default.realpathSync(dirName);
+            }
+            catch (err) {
+                // If realpath fails, fall back to the original path
+                realDirPath = dirName;
+            }
             // Compute the folder path relative to the repository root.
-            const modulePathRaw = path__default.relative(pathsConfig.repoRoot, dirName);
+            const modulePathRaw = path__default.relative(pathsConfig.repoRoot, realDirPath);
             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.
@@ -245,5 +230,41 @@ function readModules(configPaths = []) {
     });
     // Transform the intermediate definitions into the final output format.
     const finalOutput = transformModules(collectedModules);
-    return finalOutput;
+    // Before returning the final output, deduplicate the modules
+    const uniqueModules = deduplicateModules(finalOutput);
+    return uniqueModules;
+}
+/**
+ * Deduplicates modules to prevent processing the same package multiple times.
+ * Checks all paths (server, client, browser, core, independent) for duplicates.
+ */
+function deduplicateModules(modules) {
+    // Track all paths we've seen
+    const seenPaths = new Set();
+    const result = [];
+    for (const mod of modules) {
+        let newPaths = false;
+        // Create a copy of the module to potentially modify
+        const newMod = { ...mod };
+        // Check each path type
+        for (const pathType of ['server', 'client', 'browser', 'core', 'independent']) {
+            if (mod[pathType]) {
+                if (seenPaths.has(mod[pathType])) {
+                    // This path is a duplicate, remove it from our new module
+                    delete newMod[pathType];
+                }
+                else {
+                    // New path, add to seen set
+                    seenPaths.add(mod[pathType]);
+                    newPaths = true;
+                }
+            }
+        }
+        // Only add the module if it has at least one new path
+        // and we've removed any duplicate paths
+        if (newPaths) {
+            result.push(newMod);
+        }
+    }
+    return result;
 }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":["path","fs"],"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/setupCommonPackage.cjs

@@ -30,7 +30,7 @@ function renameTemplateFilesSync(dirPath) {
  *
  * Provide optional projectPaths to override defaults.
  */
-function setupCommonPackage(projectPaths = {}) {
+function setupCommonPackage(projectPaths = {}, forceClean = false) {
     // Default template path, if none provided in projectPaths
     const templatePath = projectPaths.templateCommonDir
         ? path.resolve(projectPaths.templateCommonDir)
@@ -42,10 +42,19 @@ function setupCommonPackage(projectPaths = {}) {
     console.log('--- Debug Info (setupCommonPackage) ---');
     console.log('templatePath:', templatePath);
     console.log('commonPackagePath:', commonPackagePath);
-    // 1) Remove existing directory
-    fs.removeSync(commonPackagePath);
-    // 2) Recreate it
-    fs.ensureDirSync(commonPackagePath);
+    if (forceClean) {
+        // Only remove everything if force clean is requested
+        fs.removeSync(commonPackagePath);
+        fs.ensureDirSync(commonPackagePath);
+    }
+    else {
+        // Otherwise just ensure the directory exists and clean src
+        fs.ensureDirSync(commonPackagePath);
+        const srcPath = path.join(commonPackagePath, 'src');
+        if (fs.existsSync(srcPath)) {
+            fs.removeSync(srcPath);
+        }
+    }
     // 3) Copy template into it
     if (!fs.existsSync(templatePath)) {
         console.error(`Template path not found: ${templatePath}`);

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

@@ -1 +1 @@
-{"version":3,"file":"setupCommonPackage.cjs","sources":["../../../src/tools/codegen/setupCommonPackage.ts"],"sourcesContent":[null],"names":["fileURLToPath"],"mappings":"mKAUA,MAAM,eAAe,GAAGA,iBAAa,CAAC,sRAAe,CAAC,CAAC;AACvD,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;AAErD;;;;AAIG;AACH,SAAS,sBAAsB,CAAC,QAAgB,EAAA;IAC5C,OAAO,QAAQ,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;AACrD,CAAC;AAED;;AAEG;AACH,SAAS,uBAAuB,CAAC,OAAe,EAAA;AAC5C,IAAA,MAAM,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;AACjE,IAAA,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;AACzB,QAAA,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;AACjD,QAAA,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE;YACrB,uBAAuB,CAAC,SAAS,CAAC,CAAC;SACtC;AAAM,aAAA,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;AACxE,YAAA,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,sBAAsB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;AACvE,YAAA,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;SACxD;KACJ;AACL,CAAC;AAED;;;;;AAKG;AACa,SAAA,kBAAkB,CAAC,YAAA,GAA6B,EAAE,EAAA;;AAE9D,IAAA,MAAM,YAAY,GAAG,YAAY,CAAC,iBAAiB;UAC7C,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,iBAAiB,CAAC;UAC5C,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;;AAGpD,IAAA,MAAM,iBAAiB,GAAG,YAAY,CAAC,gBAAgB;UACjD,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,gBAAgB,CAAC;AAC7C,UAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,iBAAiB,CAAC,CAAC;AAElD,IAAA,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;AACvD,IAAA,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;AAC3C,IAAA,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;;AAGrD,IAAA,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;;AAGjC,IAAA,EAAE,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;;IAGpC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;AAC9B,QAAA,OAAO,CAAC,KAAK,CAAC,4BAA4B,YAAY,CAAA,CAAE,CAAC,CAAC;AAC1D,QAAA,OAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;AACxD,QAAA,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACnB;AAED,IAAA,EAAE,CAAC,QAAQ,CAAC,YAAY,EAAE,iBAAiB,EAAE;AACzC,QAAA,SAAS,EAAE,IAAI;AAClB,KAAA,CAAC,CAAC;;IAGH,uBAAuB,CAAC,iBAAiB,CAAC,CAAC;AAE3C,IAAA,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;AACnD"}
+{"version":3,"file":"setupCommonPackage.cjs","sources":["../../../src/tools/codegen/setupCommonPackage.ts"],"sourcesContent":[null],"names":["fileURLToPath"],"mappings":"mKAUA,MAAM,eAAe,GAAGA,iBAAa,CAAC,sRAAe,CAAC,CAAC;AACvD,MAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;AAErD;;;;AAIG;AACH,SAAS,sBAAsB,CAAC,QAAgB,EAAA;IAC5C,OAAO,QAAQ,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;AACrD,CAAC;AAED;;AAEG;AACH,SAAS,uBAAuB,CAAC,OAAe,EAAA;AAC5C,IAAA,MAAM,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;AACjE,IAAA,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;AACzB,QAAA,MAAM,SAAS,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;AACjD,QAAA,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE;YACrB,uBAAuB,CAAC,SAAS,CAAC,CAAC;SACtC;AAAM,aAAA,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;AACxE,YAAA,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE,sBAAsB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;AACvE,YAAA,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;SACxD;KACJ;AACL,CAAC;AAED;;;;;AAKG;AACG,SAAU,kBAAkB,CAAC,YAAA,GAA6B,EAAE,EAAE,UAAU,GAAG,KAAK,EAAA;;AAElF,IAAA,MAAM,YAAY,GAAG,YAAY,CAAC,iBAAiB;UAC7C,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,iBAAiB,CAAC;UAC5C,IAAI,CAAC,IAAI,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;;AAGpD,IAAA,MAAM,iBAAiB,GAAG,YAAY,CAAC,gBAAgB;UACjD,IAAI,CAAC,OAAO,CAAC,YAAY,CAAC,gBAAgB,CAAC;AAC7C,UAAE,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,iBAAiB,CAAC,CAAC;AAElD,IAAA,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;AACvD,IAAA,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;AAC3C,IAAA,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;IAErD,IAAI,UAAU,EAAE;;AAEZ,QAAA,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;AACjC,QAAA,EAAE,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;KACvC;SAAM;;AAEH,QAAA,EAAE,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;QACpC,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,iBAAiB,EAAE,KAAK,CAAC,CAAC;AACpD,QAAA,IAAI,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;AACxB,YAAA,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;SAC1B;KACJ;;IAGD,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;AAC9B,QAAA,OAAO,CAAC,KAAK,CAAC,4BAA4B,YAAY,CAAA,CAAE,CAAC,CAAC;AAC1D,QAAA,OAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;AACxD,QAAA,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACnB;AAED,IAAA,EAAE,CAAC,QAAQ,CAAC,YAAY,EAAE,iBAAiB,EAAE;AACzC,QAAA,SAAS,EAAE,IAAI;AAClB,KAAA,CAAC,CAAC;;IAGH,uBAAuB,CAAC,iBAAiB,CAAC,CAAC;AAE3C,IAAA,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;AACnD"}

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

@@ -8,5 +8,5 @@ interface ProjectPaths {
  *
  * Provide optional projectPaths to override defaults.
  */
-export declare function setupCommonPackage(projectPaths?: ProjectPaths): void;
+export declare function setupCommonPackage(projectPaths?: ProjectPaths, forceClean?: boolean): void;
 export {};

package/lib/tools/codegen/setupCommonPackage.js

@@ -30,7 +30,7 @@ function renameTemplateFilesSync(dirPath) {
  *
  * Provide optional projectPaths to override defaults.
  */
-function setupCommonPackage(projectPaths = {}) {
+function setupCommonPackage(projectPaths = {}, forceClean = false) {
     // Default template path, if none provided in projectPaths
     const templatePath = projectPaths.templateCommonDir
         ? path__default.resolve(projectPaths.templateCommonDir)
@@ -42,10 +42,19 @@ function setupCommonPackage(projectPaths = {}) {
     console.log('--- Debug Info (setupCommonPackage) ---');
     console.log('templatePath:', templatePath);
     console.log('commonPackagePath:', commonPackagePath);
-    // 1) Remove existing directory
-    fs.removeSync(commonPackagePath);
-    // 2) Recreate it
-    fs.ensureDirSync(commonPackagePath);
+    if (forceClean) {
+        // Only remove everything if force clean is requested
+        fs.removeSync(commonPackagePath);
+        fs.ensureDirSync(commonPackagePath);
+    }
+    else {
+        // Otherwise just ensure the directory exists and clean src
+        fs.ensureDirSync(commonPackagePath);
+        const srcPath = path__default.join(commonPackagePath, 'src');
+        if (fs.existsSync(srcPath)) {
+            fs.removeSync(srcPath);
+        }
+    }
     // 3) Copy template into it
     if (!fs.existsSync(templatePath)) {
         console.error(`Template path not found: ${templatePath}`);

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

@@ -1 +1 @@
-{"version":3,"file":"setupCommonPackage.js","sources":["../../../src/tools/codegen/setupCommonPackage.ts"],"sourcesContent":[null],"names":["path"],"mappings":"yFAUA,MAAM,eAAe,GAAG,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AACvD,MAAM,cAAc,GAAGA,aAAI,CAAC,OAAO,CAAC,eAAe,CAAC,CAAC;AAErD;;;;AAIG;AACH,SAAS,sBAAsB,CAAC,QAAgB,EAAA;IAC5C,OAAO,QAAQ,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;AACrD,CAAC;AAED;;AAEG;AACH,SAAS,uBAAuB,CAAC,OAAe,EAAA;AAC5C,IAAA,MAAM,OAAO,GAAG,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,EAAE,aAAa,EAAE,IAAI,EAAE,CAAC,CAAC;AACjE,IAAA,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;AACzB,QAAA,MAAM,SAAS,GAAGA,aAAI,CAAC,IAAI,CAAC,OAAO,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;AACjD,QAAA,IAAI,KAAK,CAAC,WAAW,EAAE,EAAE;YACrB,uBAAuB,CAAC,SAAS,CAAC,CAAC;SACtC;AAAM,aAAA,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;AACxE,YAAA,MAAM,OAAO,GAAGA,aAAI,CAAC,IAAI,CAAC,OAAO,EAAE,sBAAsB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;AACvE,YAAA,EAAE,CAAC,QAAQ,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;SACxD;KACJ;AACL,CAAC;AAED;;;;;AAKG;AACa,SAAA,kBAAkB,CAAC,YAAA,GAA6B,EAAE,EAAA;;AAE9D,IAAA,MAAM,YAAY,GAAG,YAAY,CAAC,iBAAiB;UAC7CA,aAAI,CAAC,OAAO,CAAC,YAAY,CAAC,iBAAiB,CAAC;UAC5CA,aAAI,CAAC,IAAI,CAAC,cAAc,EAAE,kBAAkB,CAAC,CAAC;;AAGpD,IAAA,MAAM,iBAAiB,GAAG,YAAY,CAAC,gBAAgB;UACjDA,aAAI,CAAC,OAAO,CAAC,YAAY,CAAC,gBAAgB,CAAC;AAC7C,UAAEA,aAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,iBAAiB,CAAC,CAAC;AAElD,IAAA,OAAO,CAAC,GAAG,CAAC,yCAAyC,CAAC,CAAC;AACvD,IAAA,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,YAAY,CAAC,CAAC;AAC3C,IAAA,OAAO,CAAC,GAAG,CAAC,oBAAoB,EAAE,iBAAiB,CAAC,CAAC;;AAGrD,IAAA,EAAE,CAAC,UAAU,CAAC,iBAAiB,CAAC,CAAC;;AAGjC,IAAA,EAAE,CAAC,aAAa,CAAC,iBAAiB,CAAC,CAAC;;IAGpC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;AAC9B,QAAA,OAAO,CAAC,KAAK,CAAC,4BAA4B,YAAY,CAAA,CAAE,CAAC,CAAC;AAC1D,QAAA,OAAO,CAAC,KAAK,CAAC,wCAAwC,CAAC,CAAC;AACxD,QAAA,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;KACnB;AAED,IAAA,EAAE,CAAC,QAAQ,CAAC,YAAY,EAAE,iBAAiB,EAAE;AACzC,QAAA,SAAS,EAAE,IAAI;AAClB,KAAA,CAAC,CAAC;;IAGH,uBAAuB,CAAC,iBAAiB,CAAC,CAAC;AAE3C,IAAA,OAAO,CAAC,GAAG,CAAC,iCAAiC,CAAC,CAAC;AACnD"}
+{"version":3,"file":"setupCommonPackage.js","sources":["../../../src/tools/codegen/setupCommonPackage.ts"],"sourcesContent":[null],"names":["path"],"mappings":"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"}

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

@@ -9,10 +9,21 @@
     "main": "lib/index.js",
     "module": "lib/index.js",
     "typings": "lib/index.d.ts",
+    "exports": {
+        ".": "./lib/index.js",
+        "./server": "./lib/index.server.js",
+        "./graphql": "./lib/generated/generated.js",
+        "./lib/generated/generated-models.js": "./lib/generated/generated-models.js",
+        "./lib/generated/introspection-result.js": "./lib/generated/introspection-result.js",
+        "./lib/generated/generated.js": "./lib/generated/generated.js",
+        "./lib/generated/service-schemas.js": "./lib/generated/service-schemas.js",
+        "./lib/index.js": "./lib/index.js"
+    },
     "scripts": {
         "build": "npm run build:clean && npm run build:lib",
         "build:clean": "rimraf lib",
         "build:lib": "rollup -c rollup.config.mjs",
+        "build:fix": "node ./scripts/fix-generated-types.js",
         "build:lib:watch": "npm run build:lib -- -w",
         "watch": "npm run build:lib:watch"
     },

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

@@ -7,7 +7,12 @@ export default (commandLineArgs) => {
     return [
         createRollupConfig(
             {
-                input: ['src/index.ts', 'src/generated/generated.tsx', 'src/generated/introspection-result.ts'],
+                input: [
+                    'src/index.ts',
+                    'src/index.server.ts',
+                    'src/generated/generated.tsx',
+                    'src/generated/introspection-result.ts'
+                ],
                 plugins: [
                     // Spread in additional plugins specific to this config
                     ...additionalPlugins,

package/lib/tools/codegen/templates/common/scripts/fix-generated-types.js.template

@@ -0,0 +1,58 @@
+#!/usr/bin/env node
+
+/**
+ * Post-build script to fix malformed generated TypeScript definitions
+ * Fixes issues where JSDoc comments are incorrectly inserted into type definitions
+ */
+
+import { readFileSync, writeFileSync } from 'fs';
+import { fileURLToPath } from 'url';
+import { dirname, join } from 'path';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+
+const generatedFilePath = join(__dirname, '../lib/generated/generated.d.ts');
+
+try {
+    console.log('Fixing generated type definitions...');
+
+    let content = readFileSync(generatedFilePath, 'utf8');
+
+    // Fix issue where JSDoc comments are inserted in the middle of type definitions
+    // Pattern 1: SchemaTypes.Scalars["URI"] /**...*/ ["input"]
+    // Should be: SchemaTypes.Scalars["URI"]["input"]
+    const jsdocInTypeRegex = /SchemaTypes\.Scalars\["URI"\]\s*\/\*\*[\s\S]*?\*\/\s*\["input"\]/g;
+    content = content.replace(jsdocInTypeRegex, 'SchemaTypes.Scalars["URI"]["input"]');
+
+    // Pattern 2: SchemaTypes.Scalars["Int"] /**...*/ ["input"]
+    // Remove JSDoc comments that appear between type accessors
+    const jsdocBetweenAccessorsRegex = /(SchemaTypes\.Scalars\["[^"]+"\])\s*\/\*\*[\s\S]*?\*\/\s*(\["input"\])/g;
+    content = content.replace(jsdocBetweenAccessorsRegex, '$1$2');
+
+    // Pattern 3: Fix closing JSDoc that appears as a standalone line followed by ["input"]
+    // Pattern: */ ["input"]>
+    // Should be removed - the JSDoc block shouldn't be there at all
+    const standaloneJsdocCloseRegex = /\s*\*\/\["input"\]>/g;
+    content = content.replace(standaloneJsdocCloseRegex, '>');
+
+    // Pattern 4: Fix multi-line JSDoc comments that break type definitions
+    // This happens when a JSDoc comment from another function is incorrectly placed
+    // between type accessor parts, e.g., ["String"] /**...*/ ["input"]
+    // Match any Scalar type followed by JSDoc followed by ["input"] or ["output"]
+    const multilineJsdocInTypeRegex = /(SchemaTypes\.Scalars\[[^\]]+\])\s*\/\*\*[\s\S]*?\*\/\s*(\["(?:input|output)"\])/g;
+    content = content.replace(multilineJsdocInTypeRegex, '$1$2');
+
+    // Pattern 5: Fix cases where JSDoc appears between other type accessors
+    // e.g., key: SchemaTypes.Scalars["String"] /**...*/ ["input"];
+    const typeAccessorJsdocRegex = /(\w+:\s*SchemaTypes\.\w+\[[^\]]+\])\s*\/\*\*[\s\S]*?\*\/\s*(\[[^\]]+\])/g;
+    content = content.replace(typeAccessorJsdocRegex, '$1$2');
+
+    // Write the fixed content back
+    writeFileSync(generatedFilePath, content, 'utf8');
+
+    console.log('✓ Successfully fixed generated type definitions');
+} catch (error) {
+    console.error('Error fixing generated types:', error.message);
+    process.exit(1);
+}

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

@@ -0,0 +1,34 @@
+//@ts-nocheck
+import { DataProxy } from '@apollo/client/cache';
+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 { ClientContext } from './client-context';
+import { IHttpReq, IIGraphQlContext } from './generated/generated-models';
+
+/**
+ *
+ * Context
+ * @export
+ * @interface MyContext
+ */
+
+export interface IDataSources {}
+
+export interface IHttpMiddlewareContext {
+    req?: express.Request &
+        IHttpReq & {
+            logger?: CdmLogger.ILogger;
+            errors?: any;
+        };
+    res: express.Response;
+}
+
+export interface IGraphQLContext extends IIGraphQlContext {}
+export interface ServerContext extends IHttpMiddlewareContext, IGraphQLContext {
+    /** Backend Datasource */
+    dataSources: IDataSources;
+    preferences: IPreferncesTransformed[];
+}
+export interface MyContext extends ClientContext, ServerContext {}

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

@@ -4,7 +4,16 @@ 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, AuthStrategy } from './generated/generated-models';
+import { ClientContext } from './client-context';
+import {
+    IUserContext,
+    IUserProfile,
+    IIAuth0Token,
+    AuthStrategy,
+    ICdecodeParsedUri,
+    IHttpReq,
+    IIGraphQlContext,
+} from './generated/generated-models';
 /**
  *
  * Context
@@ -12,22 +21,6 @@ import { IUserContext, IUserProfile, IIAuth0Token, AuthStrategy } from './genera
  * @interface MyContext
  */
 
-export interface ClientContext {
-    /**
-     * Only application on the client side
-     */
-    cache: DataProxy;
-    /**
-     * Only application on the client side
-     */
-    getCacheKey: (options: { __typename: string; id?: string }) => string;
-    /**
-     * Only applicable on the client side
-     */
-    apolloClient: ApolloClient<any>; // deprecated use `client` instead
-    client: ApolloClient<any>;
-}
-
 export interface IDataSources {}
 
 export interface IHttpMiddlewareContext {
@@ -36,21 +29,21 @@ export interface IHttpMiddlewareContext {
         permissions?: any;
         cdecodeuri?: any;
         logger?: CdmLogger.ILogger;
+        currentPageUriSegments?: ICdecodeParsedUri;
         user?: IIAuth0Token;
         errors?: any;
         profile?: IUserProfile;
-    };
+    } & IHttpReq;
     res: express.Response;
 }
 
-export type IGraphQLContext = {
+export interface IGraphQLContext extends IIGraphQlContext {
     /**
      * current ip of the user fetched from the request
      */
     userIp: string;
 };
 export interface ServerContext extends IHttpMiddlewareContext, IGraphQLContext {
-    accessRoleService: any;
     user?: IIAuth0Token;
     userContext?: IUserContext;
     orgname?: string;

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

@@ -0,0 +1,19 @@
+
+import { DataProxy } from '@apollo/client/cache';
+import { ApolloClient } from '@apollo/client/index.js';
+
+export interface ClientContext {
+    /**
+     * Only application on the client side
+     */
+    cache: DataProxy;
+    /**
+     * Only application on the client side
+     */
+    getCacheKey: (options: { __typename: string; id?: string }) => string;
+    /**
+     * Only applicable on the client side
+     */
+    apolloClient: ApolloClient<any>; // deprecated use `client` instead
+    client: ApolloClient<any>;
+}

package/lib/tools/codegen/templates/common/src/core/disposable.ts.template

@@ -0,0 +1,93 @@
+/* tslint:disable */
+import { Event, Emitter } from './event';
+
+export interface Disposable {
+    /**
+     * Dispose this object.
+     */
+    dispose(): void;
+}
+
+export namespace Disposable {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    export function is(arg: any): arg is Disposable {
+        return !!arg && typeof arg === 'object' && 'dispose' in arg && typeof arg['dispose'] === 'function';
+    }
+    export function create(func: () => void): Disposable {
+        return {
+            dispose: func
+        };
+    }
+    export const NULL = create(() => { });
+}
+
+export class DisposableCollection implements Disposable {
+
+    protected readonly disposables: Disposable[] = [];
+    protected readonly onDisposeEmitter = new Emitter<void>();
+
+    constructor(...toDispose: Disposable[]) {
+        toDispose.forEach(d => this.push(d));
+    }
+
+    /**
+     * This event is fired only once
+     * on first dispose of not empty collection.
+     */
+    get onDispose(): Event<void> {
+        return this.onDisposeEmitter.event;
+    }
+
+    protected checkDisposed(): void {
+        if (this.disposed && !this.disposingElements) {
+            this.onDisposeEmitter.fire(undefined);
+            this.onDisposeEmitter.dispose();
+        }
+    }
+
+    get disposed(): boolean {
+        return this.disposables.length === 0;
+    }
+
+    private disposingElements = false;
+    dispose(): void {
+        if (this.disposed || this.disposingElements) {
+            return;
+        }
+        this.disposingElements = true;
+        while (!this.disposed) {
+            try {
+                this.disposables.pop()!.dispose();
+            } catch (e) {
+                console.error(e);
+            }
+        }
+        this.disposingElements = false;
+        this.checkDisposed();
+    }
+
+    push(disposable: Disposable): Disposable {
+        const disposables = this.disposables;
+        disposables.push(disposable);
+        const originalDispose = disposable.dispose.bind(disposable);
+        const toRemove = Disposable.create(() => {
+            const index = disposables.indexOf(disposable);
+            if (index !== -1) {
+                disposables.splice(index, 1);
+            }
+            this.checkDisposed();
+        });
+        disposable.dispose = () => {
+            toRemove.dispose();
+            originalDispose();
+        };
+        return toRemove;
+    }
+
+    pushAll(disposables: Disposable[]): Disposable[] {
+        return disposables.map(disposable =>
+            this.push(disposable)
+        );
+    }
+
+}

package/lib/tools/codegen/templates/common/src/core/event.test.ts

@@ -0,0 +1,16 @@
+// import { expect } from 'vitest';
+// import { Emitter } from './event';
+
+// describe('Event Objects', () => {
+
+//     it('Emitter firing should be synchronous', () => {
+//         const emitter = new Emitter<undefined>();
+//         let counter = 0;
+
+//         emitter.event(() => counter++);
+//         expect(counter).eq(0);
+//         emitter.fire(undefined);
+//         expect(counter).eq(1);
+//     });
+
+// });