@pikku/cli 0.11.2 → 0.12.0

package/src/utils/file-import-path.test.ts

@@ -1,175 +0,0 @@
-import { strict as assert } from 'assert'
-import { describe, test } from 'node:test'
-import { getFileImportRelativePath } from './file-import-path.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'))
-  })
-
-  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/file-import-path.ts

@@ -1,53 +0,0 @@
-import { relative, dirname, resolve } from 'path'
-
-export const getFileImportRelativePath = (
-  from: string,
-  to: string,
-  packageMappings: Record<string, string>
-): string => {
-  let filePath = relative(dirname(from), to)
-  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
-  // 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
-        // Use string slicing instead of regex to avoid ReDoS and ensure correct behavior
-        const pathIndex = absolutePath.indexOf(path)
-        filePath = packageName + absolutePath.slice(pathIndex + path.length)
-        break
-      }
-    }
-  }
-
-  // if (usesPackageName) {
-  //   return filePath.replace('.ts', '')
-  // }
-  return filePath.replace('.ts', '.js')
-}

package/src/utils/file-imports-serializer.ts

@@ -1,25 +0,0 @@
-import { getFileImportRelativePath } from './file-import-path.js'
-
-export const serializeFileImports = (
-  importType: string,
-  outputPath: string,
-  files: Set<string>,
-  packageMappings: Record<string, string> = {}
-) => {
-  const serializedOutput: string[] = [
-    `/* The files with an ${importType} function call */`,
-  ]
-
-  Array.from(files)
-    .sort()
-    .forEach((path) => {
-      const filePath = getFileImportRelativePath(
-        outputPath,
-        path,
-        packageMappings
-      )
-      serializedOutput.push(`import '${filePath}'`)
-    })
-
-  return serializedOutput.join('\n')
-}

package/src/utils/file-writer.ts

@@ -1,72 +0,0 @@
-import { dirname } from 'path'
-import { mkdir, readFile, writeFile, rm } from 'fs/promises'
-import { existsSync } from 'fs'
-import { CLILogger } from '../services/cli-logger.service.js'
-import { getCLIVersion } from './get-cli-version.js'
-
-export const DO_NOT_MODIFY_COMMENT = `/**
- * This file was generated by @pikku/cli@${getCLIVersion()}
- */
-`
-
-export const writeFileInDir = async (
-  logger: CLILogger,
-  path: string,
-  content: string,
-  {
-    ignoreModifyComment = false,
-    logWrite = true,
-  }: { ignoreModifyComment?: boolean; logWrite?: boolean } = {}
-) => {
-  if (path.includes('.json')) {
-    ignoreModifyComment = true
-  }
-
-  if (content.includes('server-only')) {
-    content = content.replace(
-      "'server-only'",
-      `'server-only'\n\n${ignoreModifyComment ? '' : DO_NOT_MODIFY_COMMENT}`
-    )
-  } else {
-    content = `${ignoreModifyComment ? '' : DO_NOT_MODIFY_COMMENT}${content}`
-  }
-
-  // Try to read existing file content
-  let existingContent: string | undefined
-  try {
-    existingContent = await readFile(path, 'utf-8')
-  } catch (error) {
-    // Only suppress ENOENT (file not found) errors
-    // Rethrow permission, I/O, encoding, or other errors
-    const nodeError = error as NodeJS.ErrnoException
-    if (nodeError.code !== 'ENOENT') {
-      throw error
-    }
-    // File doesn't exist, so we need to write it
-  }
-
-  // Only write if content has changed or file doesn't exist
-  if (existingContent !== content) {
-    await mkdir(dirname(path), { recursive: true })
-    await writeFile(path, content, 'utf-8')
-
-    if (logWrite) {
-      logger.debug({ message: `✓ File written to ${path}`, type: 'success' })
-    }
-  }
-}
-
-export const removeFileInDir = async (
-  logger: CLILogger,
-  path: string,
-  { logRemove = true }: { logRemove?: boolean } = {}
-) => {
-  // Check if file exists before attempting removal
-  if (existsSync(path)) {
-    await rm(path, { force: true })
-
-    if (logRemove) {
-      logger.debug({ message: `✓ File removed at ${path}`, type: 'success' })
-    }
-  }
-}

package/src/utils/generate-bootstrap-file.ts

@@ -1,43 +0,0 @@
-import { Config } from '../../types/application-types.js'
-import { CLILogger } from '../services/cli-logger.service.js'
-import { getFileImportRelativePath } from './file-import-path.js'
-import { writeFileInDir } from './file-writer.js'
-
-export const generateBootstrapFile = async (
-  logger: CLILogger,
-  config: Config,
-  bootstrapFile: string,
-  specificImports: string[],
-  schemas?: boolean,
-  hasMiddleware?: boolean
-) => {
-  // Common imports that every bootstrap file needs
-  const commonImports: string[] = []
-
-  // Add middleware first (must be registered before functions meta)
-  if (hasMiddleware) {
-    commonImports.push(config.middlewareFile)
-  }
-
-  commonImports.push(config.functionsMetaMinFile, config.functionsFile)
-
-  // Add schema if it exists
-  if (schemas) {
-    commonImports.push(`${config.schemaDirectory}/register.gen.ts`)
-  }
-
-  // Combine common imports with specific imports
-  const allImports = [...commonImports, ...specificImports]
-
-  await writeFileInDir(
-    logger,
-    bootstrapFile,
-    allImports
-      .map(
-        (to) =>
-          `import '${getFileImportRelativePath(bootstrapFile, to, config.packageMappings)}'`
-      )
-      .sort((to) => (to.includes('meta') ? -1 : 1)) // Ensure meta files are at the top
-      .join('\n')
-  )
-}

package/src/utils/get-cli-version.ts

@@ -1,28 +0,0 @@
-import { dirname, join } from 'path'
-import { readFile } from 'fs/promises'
-import { fileURLToPath } from 'url'
-
-// Get package version for generated file comments
-const __dirname = dirname(fileURLToPath(import.meta.url))
-let version = 'unknown'
-
-try {
-  // Try from src/ first (development), then from dist/src/ (built)
-  const pkgPath = join(__dirname, '..', '..', 'package.json')
-  const pkgJson = JSON.parse(await readFile(pkgPath, 'utf-8'))
-  version = pkgJson.version
-} catch {
-  try {
-    const pkgPath = join(__dirname, '..', '..', '..', 'package.json')
-    const pkgJson = JSON.parse(await readFile(pkgPath, 'utf-8'))
-    version = pkgJson.version
-  } catch {
-    // Fallback to unknown if package.json can't be found
-  }
-}
-
-/**
- * Returns the CLI version string
- * Works from both src/ and dist/src/ locations
- */
-export const getCLIVersion = () => version