@pikku/cli 0.8.2 → 0.8.3

package/CHANGELOG.md

@@ -1,5 +1,16 @@
 # @pikku/cli
 
+## 0.8.3
+
+### Patch Changes
+
+- 9156577: Fix import path generation to handle same-package files and node_modules paths
+
+  - When files are in the same package directory, skip packageMappings and use relative paths
+  - When import paths include node_modules, strip everything before and including node_modules/ for cleaner imports
+  - This prevents issues where files within the same package would incorrectly reference themselves via package names
+  - Transforms ugly paths like `../../../../node_modules/@pikku/core/dist/types/core.types.d.js` into clean paths like `@pikku/core/dist/types/core.types.d.js`
+
 ## 0.8.2
 
 ### Patch Changes

package/dist/src/utils.js

@@ -49,6 +49,14 @@ export const getFileImportRelativePath = (from, to, packageMappings) => {
     if (!/^\.+\//.test(filePath)) {
         filePath = `./${filePath}`;
     }
+    // If the path includes node_modules, strip everything before and including node_modules/
+    if (filePath.includes('node_modules')) {
+        const nodeModulesIndex = filePath.indexOf('node_modules/');
+        if (nodeModulesIndex !== -1) {
+            filePath = filePath.substring(nodeModulesIndex + 'node_modules/'.length);
+        }
+        return filePath.replace('.ts', '.js');
+    }
     const absolutePath = resolve(dirname(from), to);
     const fromAbsolutePath = resolve(dirname(from));
     // Check if both files are in the same package directory

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikku/cli",
-  "version": "0.8.2",
+  "version": "0.8.3",
   "author": "yasser.fadl@gmail.com",
   "license": "MIT",
   "bin": {

package/src/utils.test.ts

@@ -134,4 +134,42 @@ describe('getFileImportRelativePath', () => {
 
     assert.strictEqual(result, './file2.tsx'.replace('.ts', '.js'))
   })
+
+  test('should strip everything before and including node_modules/', () => {
+    const from =
+      '/project/packages/functions/.pikku/http/pikku-http-routes-map.gen.d.ts'
+    const to =
+      '/project/packages/functions/../../../../node_modules/@pikku/core/dist/types/core.types.d.ts'
+    const packageMappings = {}
+
+    const result = getFileImportRelativePath(from, to, packageMappings)
+
+    assert.strictEqual(result, '@pikku/core/dist/types/core.types.d.js')
+  })
+
+  test('should handle node_modules path with package mappings', () => {
+    const from = '/project/packages/app/src/file1.ts'
+    const to = '/project/packages/app/node_modules/@myorg/utils/dist/utils.d.ts'
+    const packageMappings = {
+      'packages/app': '@myorg/app',
+    }
+
+    const result = getFileImportRelativePath(from, to, packageMappings)
+
+    assert.strictEqual(result, '@myorg/utils/dist/utils.d.js')
+  })
+
+  test('should handle deeply nested node_modules paths', () => {
+    const from =
+      '/Users/user/project/workspace-starter/packages/functions/.pikku/http/pikku-http-routes-map.gen.d.ts'
+    const to =
+      '/Users/user/project/workspace-starter/packages/functions/../../../../node_modules/@pikku/core/dist/types/core.types.d.ts'
+    const packageMappings = {
+      'packages/functions': '@workspace/functions',
+    }
+
+    const result = getFileImportRelativePath(from, to, packageMappings)
+
+    assert.strictEqual(result, '@pikku/core/dist/types/core.types.d.js')
+  })
 })

package/src/utils.ts

@@ -63,6 +63,15 @@ export const getFileImportRelativePath = (
     filePath = `./${filePath}`
   }
 
+  // If the path includes node_modules, strip everything before and including node_modules/
+  if (filePath.includes('node_modules')) {
+    const nodeModulesIndex = filePath.indexOf('node_modules/')
+    if (nodeModulesIndex !== -1) {
+      filePath = filePath.substring(nodeModulesIndex + 'node_modules/'.length)
+    }
+    return filePath.replace('.ts', '.js')
+  }
+
   const absolutePath = resolve(dirname(from), to)
   const fromAbsolutePath = resolve(dirname(from))