@pikku/cli 0.8.1 → 0.8.2

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @pikku/cli
 
+## 0.8.2
+
+### Patch Changes
+
+- a02347b: fix: only insert package mapping if it's not the same package
+- Updated dependencies [0fb4b3d]
+  - @pikku/core@0.8.2
+
 ## 0.8.1
 
 ### Patch Changes

package/cli.schema.json

@@ -5,11 +5,23 @@
     "InspectorFilters": {
       "additionalProperties": false,
       "properties": {
+        "directories": {
+          "items": {
+            "type": "string"
+          },
+          "type": "array"
+        },
         "tags": {
           "items": {
             "type": "string"
           },
           "type": "array"
+        },
+        "types": {
+          "items": {
+            "type": "string"
+          },
+          "type": "array"
         }
       },
       "type": "object"
@@ -153,11 +165,11 @@
             "rpc": {
               "type": "string"
             },
-            "scheduled": {
+            "scheduler": {
               "type": "string"
             }
           },
-          "required": ["http", "scheduled", "channel", "rpc", "queue", "mcp"],
+          "required": ["http", "scheduler", "channel", "rpc", "queue", "mcp"],
           "type": "object"
         },
         "channelsFile": {
@@ -205,6 +217,12 @@
         "mcpJsonFile": {
           "type": "string"
         },
+        "middlewareServices": {
+          "items": {
+            "type": "string"
+          },
+          "type": "array"
+        },
         "nextBackendFile": {
           "type": "string"
         },

package/dist/src/utils.js

@@ -50,14 +50,27 @@ export const getFileImportRelativePath = (from, to, packageMappings) => {
         filePath = `./${filePath}`;
     }
     const absolutePath = resolve(dirname(from), to);
-    // let usesPackageName = false
-    for (const [path, packageName] of Object.entries(packageMappings)) {
-        if (absolutePath.includes(path)) {
-            // usesPackageName = true
-            filePath = absolutePath.replace(new RegExp(`.*${path}`), packageName);
+    const fromAbsolutePath = resolve(dirname(from));
+    // Check if both files are in the same package directory
+    // If so, skip packageMappings to use relative paths
+    let inSamePackage = false;
+    for (const [path] of Object.entries(packageMappings)) {
+        if (absolutePath.includes(path) && fromAbsolutePath.includes(path)) {
+            inSamePackage = true;
             break;
         }
     }
+    // Only apply packageMappings if files are not in the same package
+    if (!inSamePackage) {
+        // let usesPackageName = false
+        for (const [path, packageName] of Object.entries(packageMappings)) {
+            if (absolutePath.includes(path)) {
+                // usesPackageName = true
+                filePath = absolutePath.replace(new RegExp(`.*${path}`), packageName);
+                break;
+            }
+        }
+    }
     // if (usesPackageName) {
     //   return filePath.replace('.ts', '')
     // }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikku/cli",
-  "version": "0.8.1",
+  "version": "0.8.2",
   "author": "yasser.fadl@gmail.com",
   "license": "MIT",
   "bin": {
@@ -22,7 +22,7 @@
   },
   "dependencies": {
     "@openapi-contrib/json-schema-to-openapi-schema": "^3.0.2",
-    "@pikku/core": "^0.8.1",
+    "@pikku/core": "^0.8.2",
     "@pikku/inspector": "^0.8.1",
     "@types/cookie": "^0.6.0",
     "@types/uuid": "^10.0.0",

package/src/utils.test.ts

@@ -0,0 +1,137 @@
+import { strict as assert } from 'assert'
+import { describe, test } from 'node:test'
+import { getFileImportRelativePath } from './utils.js'
+
+describe('getFileImportRelativePath', () => {
+  test('should return relative path for files in same directory', () => {
+    const from = '/project/src/file1.ts'
+    const to = '/project/src/file2.ts'
+    const packageMappings = {}
+
+    const result = getFileImportRelativePath(from, to, packageMappings)
+
+    assert.strictEqual(result, './file2.js')
+  })
+
+  test('should return relative path for files in different directories', () => {
+    const from = '/project/src/file1.ts'
+    const to = '/project/lib/file2.ts'
+    const packageMappings = {}
+
+    const result = getFileImportRelativePath(from, to, packageMappings)
+
+    assert.strictEqual(result, '../lib/file2.js')
+  })
+
+  test('should use package mapping when files are in different packages', () => {
+    const from = '/project/packages/app/src/file1.ts'
+    const to = '/project/packages/sdk/src/file2.ts'
+    const packageMappings = {
+      'packages/sdk': '@myorg/sdk',
+    }
+
+    const result = getFileImportRelativePath(from, to, packageMappings)
+
+    assert.strictEqual(result, '@myorg/sdk/src/file2.js')
+  })
+
+  test('should NOT use package mapping when files are in same package', () => {
+    const from = '/project/packages/sdk/src/file1.ts'
+    const to = '/project/packages/sdk/lib/file2.ts'
+    const packageMappings = {
+      'packages/sdk': '@myorg/sdk',
+    }
+
+    const result = getFileImportRelativePath(from, to, packageMappings)
+
+    assert.strictEqual(result, '../lib/file2.js')
+  })
+
+  test('should use package mapping when only target file is in mapped package', () => {
+    const from = '/project/apps/web/src/file1.ts'
+    const to = '/project/packages/sdk/src/file2.ts'
+    const packageMappings = {
+      'packages/sdk': '@myorg/sdk',
+    }
+
+    const result = getFileImportRelativePath(from, to, packageMappings)
+
+    assert.strictEqual(result, '@myorg/sdk/src/file2.js')
+  })
+
+  test('should handle multiple package mappings correctly', () => {
+    const from = '/project/packages/app/src/file1.ts'
+    const to = '/project/packages/utils/src/file2.ts'
+    const packageMappings = {
+      'packages/app': '@myorg/app',
+      'packages/utils': '@myorg/utils',
+    }
+
+    const result = getFileImportRelativePath(from, to, packageMappings)
+
+    assert.strictEqual(result, '@myorg/utils/src/file2.js')
+  })
+
+  test('should preserve relative path when both files are in same package directory', () => {
+    const from = '/project/packages/sdk/src/components/file1.ts'
+    const to = '/project/packages/sdk/src/utils/file2.ts'
+    const packageMappings = {
+      'packages/sdk': '@myorg/sdk',
+    }
+
+    const result = getFileImportRelativePath(from, to, packageMappings)
+
+    assert.strictEqual(result, '../utils/file2.js')
+  })
+
+  test('should work with nested package structures', () => {
+    const from = '/project/packages/app/src/file1.ts'
+    const to = '/project/packages/app/lib/nested/file2.ts'
+    const packageMappings = {
+      'packages/app': '@myorg/app',
+      'packages/sdk': '@myorg/sdk',
+    }
+
+    const result = getFileImportRelativePath(from, to, packageMappings)
+
+    assert.strictEqual(result, '../lib/nested/file2.js')
+  })
+
+  test('should handle complex path structures', () => {
+    const from =
+      '/Users/user/project/workspace-starter/packages/sdk/.pikku/pikku-fetch.gen.ts'
+    const to =
+      '/Users/user/project/workspace-starter/packages/functions/.pikku/http/pikku-http-routes-map.gen.d.ts'
+    const packageMappings = {
+      'packages/sdk': '@workspace/sdk',
+      'packages/functions': '@workspace/functions',
+    }
+
+    const result = getFileImportRelativePath(from, to, packageMappings)
+
+    assert.strictEqual(
+      result,
+      '@workspace/functions/.pikku/http/pikku-http-routes-map.gen.d.js'
+    )
+  })
+
+  test('should handle empty package mappings', () => {
+    const from = '/project/src/file1.ts'
+    const to = '/project/lib/file2.ts'
+    const packageMappings = {}
+
+    const result = getFileImportRelativePath(from, to, packageMappings)
+
+    assert.strictEqual(result, '../lib/file2.js')
+  })
+
+  test('should replace .ts extension with .js', () => {
+    const from = '/project/src/file1.ts'
+    const to = '/project/src/file2.tsx'
+    const packageMappings = {}
+
+    const result = getFileImportRelativePath(from, to, packageMappings)
+
+    assert.strictEqual(result, './file2.tsx'.replace('.ts', '.js'))
+  })
+})

package/src/utils.ts

@@ -64,15 +64,30 @@ export const getFileImportRelativePath = (
   }
 
   const absolutePath = resolve(dirname(from), to)
-  // let usesPackageName = false
-  for (const [path, packageName] of Object.entries(packageMappings)) {
-    if (absolutePath.includes(path)) {
-      // usesPackageName = true
-      filePath = absolutePath.replace(new RegExp(`.*${path}`), packageName)
+  const fromAbsolutePath = resolve(dirname(from))
+
+  // Check if both files are in the same package directory
+  // If so, skip packageMappings to use relative paths
+  let inSamePackage = false
+  for (const [path] of Object.entries(packageMappings)) {
+    if (absolutePath.includes(path) && fromAbsolutePath.includes(path)) {
+      inSamePackage = true
       break
     }
   }
 
+  // Only apply packageMappings if files are not in the same package
+  if (!inSamePackage) {
+    // let usesPackageName = false
+    for (const [path, packageName] of Object.entries(packageMappings)) {
+      if (absolutePath.includes(path)) {
+        // usesPackageName = true
+        filePath = absolutePath.replace(new RegExp(`.*${path}`), packageName)
+        break
+      }
+    }
+  }
+
   // if (usesPackageName) {
   //   return filePath.replace('.ts', '')
   // }