@common-stack/rollup-vite-utils 4.0.1-alpha.49 → 4.0.1-alpha.51

package/lib/rollup/rollupPluginAddJsExtension.d.ts

@@ -1,7 +1,9 @@
-export default function addJsExtensionToImportsPlugin(packages: any): {
+import * as t from '@babel/types';
+import { NodePath } from '@babel/traverse';
+declare const addJsExtensionToImportsPlugin: (packages: string[] | '*', needToAddIndexJs?: string[]) => {
     name: string;
-    transform(code: any, id: any): {
-        code: any;
-        map: any;
+    visitor: {
+        ImportDeclaration(path: NodePath<t.ImportDeclaration>): void;
     };
 };
+export default addJsExtensionToImportsPlugin;

package/lib/rollup/rollupPluginAddJsExtension.js

@@ -1,39 +1,45 @@
-import {parse}from'@babel/parser';import generateSource from'@babel/generator';import traverseSource from'@babel/traverse';// to support esm default
-// https://github.com/babel/babel/issues/15269#issuecomment-1505804243
-const traverse = traverseSource.default ?? traverseSource;
-const generate = generateSource.default ?? generateSource;
-function addJsExtensionToImportsPlugin(packages) {
+const addJsExtensionToImportsPlugin = (packages, needToAddIndexJs = []) => {
+    // Add known packages that need `/index.js` if they are not already included
+    const knownNeedToAddIndexJs = ['@apollo/client'];
+    needToAddIndexJs = Array.from(new Set([...needToAddIndexJs, ...knownNeedToAddIndexJs]));
     return {
         name: 'add-js-extension-to-imports',
-        transform(code, id) {
-            // Only apply the transformation to TypeScript and JavaScript files
-            if (!/\.tsx?$/.test(id))
-                return null;
-            const ast = parse(code, {
-                sourceType: 'module',
-                plugins: ['typescript', 'jsx'], // Adjusted to 'typescript' for .tsx files
-            });
-            traverse(ast, {
-                ImportDeclaration(path) {
-                    const source = path.node.source.value;
-                    packages.forEach(pkg => {
-                        // Append ".js" to imports from specified packages if not already present
-                        if (source.startsWith(pkg) && !source.endsWith('.js')) {
-                            if (pkg === '@apollo/client' && (source === pkg || source === `${pkg}/`)) {
-                                path.node.source.value = source.endsWith('/') ? `${source}index.js` : `${source}/index.js`;
-                            }
-                            else {
-                                path.node.source.value = `${source}.js`;
-                            }
-                        }
-                    });
-                },
-            });
-            const output = generate(ast, {}, code);
-            return {
-                code: output.code,
-                map: output.map,
-            };
+        visitor: {
+            ImportDeclaration(path) {
+                const source = path.node.source.value;
+                // Function to extract package name from the import source
+                const getPackageName = (importPath) => {
+                    if (importPath.startsWith('@')) {
+                        // Scoped package
+                        const match = importPath.match(/^(@[^/]+\/[^/]+)/);
+                        return match ? match[1] : null;
+                    }
+                    else {
+                        // Normal package
+                        const match = importPath.match(/^([^/]+)/);
+                        return match ? match[1] : null;
+                    }
+                };
+                const packageName = getPackageName(source);
+                // Determine if we should transform the import based on the package patterns
+                !source.startsWith('@');
+                const isInExceptionList = packageName && needToAddIndexJs.includes(packageName);
+                const isModularPackage = source.startsWith('@');
+                const hasAdditionalSlashes = isModularPackage && source.split('/').length > 2;
+                const shouldTransform = (packages === '*' && source.includes('/') && !isModularPackage) ||
+                    (packages === '*' && isModularPackage && hasAdditionalSlashes) ||
+                    (isModularPackage && isInExceptionList) ||
+                    (packageName && packages.includes(packageName));
+                // Append ".js" or "/index.js" to imports if they match the criteria and don't already end with ".js"
+                if (shouldTransform && !source.endsWith('.js')) {
+                    if (isInExceptionList) {
+                        path.node.source.value = `${source}/index.js`;
+                    }
+                    else {
+                        path.node.source.value = `${source}.js`;
+                    }
+                }
+            },
         },
     };
-}export{addJsExtensionToImportsPlugin as default};//# sourceMappingURL=rollupPluginAddJsExtension.js.map
+};export{addJsExtensionToImportsPlugin as default};//# sourceMappingURL=rollupPluginAddJsExtension.js.map

package/lib/rollup/rollupPluginAddJsExtension.js.map

@@ -1 +1 @@
-{"version":3,"file":"rollupPluginAddJsExtension.js","sources":["../../src/rollup/rollupPluginAddJsExtension.ts"],"sourcesContent":[null],"names":[],"mappings":"2HAIA;AACA;AACA,MAAM,QAAQ,GAAI,cAAsB,CAAC,OAAO,IAAI,cAAc,CAAC;AACnE,MAAM,QAAQ,GAAI,cAAsB,CAAC,OAAO,IAAI,cAAc,CAAC;AAE3C,SAAA,6BAA6B,CAAC,QAAQ,EAAA;IAC1D,OAAO;AACH,QAAA,IAAI,EAAE,6BAA6B;QACnC,SAAS,CAAC,IAAI,EAAE,EAAE,EAAA;;AAEd,YAAA,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,EAAE,CAAC;AAAE,gBAAA,OAAO,IAAI,CAAC;AAErC,YAAA,MAAM,GAAG,GAAG,KAAK,CAAC,IAAI,EAAE;AACpB,gBAAA,UAAU,EAAE,QAAQ;AACpB,gBAAA,OAAO,EAAE,CAAC,YAAY,EAAE,KAAK,CAAC;AACjC,aAAA,CAAC,CAAC;YAEH,QAAQ,CAAC,GAAG,EAAE;AACV,gBAAA,iBAAiB,CAAC,IAAI,EAAA;oBAClB,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;AAEtC,oBAAA,QAAQ,CAAC,OAAO,CAAC,GAAG,IAAG;;AAEnB,wBAAA,IAAI,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;AACnD,4BAAA,IAAI,GAAG,KAAK,gBAAgB,KAAK,MAAM,KAAK,GAAG,IAAI,MAAM,KAAK,CAAG,EAAA,GAAG,CAAG,CAAA,CAAA,CAAC,EAAE;gCACtE,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAA,EAAG,MAAM,CAAA,QAAA,CAAU,GAAG,CAAA,EAAG,MAAM,CAAA,SAAA,CAAW,CAAC;6BAC9F;iCAAM;gCACH,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,CAAA,EAAG,MAAM,CAAA,GAAA,CAAK,CAAC;6BAC3C;yBACJ;AACL,qBAAC,CAAC,CAAC;iBACN;AACJ,aAAA,CAAC,CAAC;YAEH,MAAM,MAAM,GAAG,QAAQ,CAAC,GAAG,EAAE,EAAE,EAAE,IAAI,CAAC,CAAC;YACvC,OAAO;gBACH,IAAI,EAAE,MAAM,CAAC,IAAI;gBACjB,GAAG,EAAE,MAAM,CAAC,GAAG;aAClB,CAAC;SACL;KACJ,CAAC;AACN"}
+{"version":3,"file":"rollupPluginAddJsExtension.js","sources":["../../src/rollup/rollupPluginAddJsExtension.ts"],"sourcesContent":[null],"names":[],"mappings":"AAGM,MAAA,6BAA6B,GAAG,CAAC,QAAwB,EAAE,gBAA6B,GAAA,EAAE,KAAI;;AAEhG,IAAA,MAAM,qBAAqB,GAAG,CAAC,gBAAgB,CAAC,CAAC;AACjD,IAAA,gBAAgB,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,GAAG,CAAC,CAAC,GAAG,gBAAgB,EAAE,GAAG,qBAAqB,CAAC,CAAC,CAAC,CAAC;IAExF,OAAO;AACH,QAAA,IAAI,EAAE,6BAA6B;AACnC,QAAA,OAAO,EAAE;AACL,YAAA,iBAAiB,CAAC,IAAmC,EAAA;gBACjD,MAAM,MAAM,GAAG,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC;;AAGtC,gBAAA,MAAM,cAAc,GAAG,CAAC,UAAkB,KAAI;AAC1C,oBAAA,IAAI,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;;wBAE5B,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,kBAAkB,CAAC,CAAC;AACnD,wBAAA,OAAO,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;qBAClC;yBAAM;;wBAEH,MAAM,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;AAC3C,wBAAA,OAAO,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC;qBAClC;AACL,iBAAC,CAAC;AAEF,gBAAA,MAAM,WAAW,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC;;gBAGnB,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE;gBAChD,MAAM,iBAAiB,GAAG,WAAW,IAAI,gBAAgB,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;gBAChF,MAAM,gBAAgB,GAAG,MAAM,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;AAChD,gBAAA,MAAM,oBAAoB,GAAG,gBAAgB,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC;AAE9E,gBAAA,MAAM,eAAe,GACjB,CAAC,QAAQ,KAAK,GAAG,IAAI,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,IAAI,CAAC,gBAAgB;AAC9D,qBAAC,QAAQ,KAAK,GAAG,IAAI,gBAAgB,IAAI,oBAAoB,CAAC;qBAC7D,gBAAgB,IAAI,iBAAiB,CAAC;qBACtC,WAAW,IAAI,QAAQ,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC,CAAC;;gBAGpD,IAAI,eAAe,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;oBAC5C,IAAI,iBAAiB,EAAE;wBACnB,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,CAAA,EAAG,MAAM,CAAA,SAAA,CAAW,CAAC;qBACjD;yBAAM;wBACH,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,GAAG,CAAA,EAAG,MAAM,CAAA,GAAA,CAAK,CAAC;qBAC3C;iBACJ;aACJ;AACJ,SAAA;KACJ,CAAC;AACN"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@common-stack/rollup-vite-utils",
-    "version": "4.0.1-alpha.49",
+    "version": "4.0.1-alpha.51",
     "description": "Client Module for react app",
     "homepage": "https://github.com/cdmbase/fullstack-pro#readme",
     "bugs": {
@@ -54,5 +54,5 @@
     "typescript": {
         "definition": "lib/index.d.ts"
     },
-    "gitHead": "ef0042cfecdbb351d2c044370135f5fbb746c543"
+    "gitHead": "e03f5976e7390fb98a898aedf97ad692ef54f78b"
 }