@pikku/cli 0.8.0 → 0.8.2

package/src/utils.ts

@@ -1,4 +1,4 @@
-import { relative, dirname } from 'path'
+import { relative, dirname, resolve } from 'path'
 import { PathToNameAndType, InspectorState, TypesMap } from '@pikku/inspector'
 import { mkdir, writeFile } from 'fs/promises'
 import chalk from 'chalk'
@@ -38,6 +38,11 @@ export class CLILogger {
   warn(message: string) {
     console.error(chalk.yellow(message))
   }
+  debug(message: string) {
+    if (process.env.DEBUG) {
+      console.log(chalk.gray(message))
+    }
+  }
 
   private logPikkuLogo() {
     this.primary(logo)
@@ -57,14 +62,32 @@ export const getFileImportRelativePath = (
   if (!/^\.+\//.test(filePath)) {
     filePath = `./${filePath}`
   }
-  // let usesPackageName = false
-  for (const [path, packageName] of Object.entries(packageMappings)) {
-    if (filePath.includes(path)) {
-      // usesPackageName = true
-      filePath = filePath.replace(new RegExp(`.*${path}`), packageName)
+
+  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
+        filePath = absolutePath.replace(new RegExp(`.*${path}`), packageName)
+        break
+      }
+    }
+  }
+
   // if (usesPackageName) {
   //   return filePath.replace('.ts', '')
   // }
@@ -95,6 +118,8 @@ export interface PikkuCLIOptions {
   singletonServicesFactoryType?: string
   sessionServicesFactoryType?: string
   tags?: string[]
+  types?: string[]
+  directories?: string[]
 }
 
 const getMetaTypes = (

package/dist/src/events/http/pikku-command-nextjs.d.ts

@@ -1,2 +0,0 @@
-import { PikkuCommand } from '../../types.js';
-export declare const pikkuNext: PikkuCommand;

package/dist/src/events/http/pikku-command-nextjs.js

@@ -1,36 +0,0 @@
-import { serializeNextJsBackendWrapper as serializeNextBackendWrapper } from '../../runtimes/nextjs/serialize-nextjs-backend-wrapper.js';
-import { serializeNextJsHTTPWrapper as serializeNextHTTPWrapper } from '../../runtimes/nextjs/serialize-nextjs-http-wrapper.js';
-import { getFileImportRelativePath, getPikkuFilesAndMethods, logCommandInfoAndTime, writeFileInDir, } from '../../utils.js';
-export const pikkuNext = async (logger, { nextBackendFile, nextHTTPFile, httpRoutesMapDeclarationFile, packageMappings, fetchFile, bootstrapFiles, }, visitState, options = {}) => {
-    return await logCommandInfoAndTime(logger, 'Generating nextjs wrapper', 'Generated nextjs wrapper', [
-        nextBackendFile === undefined && nextHTTPFile === undefined,
-        'nextjs outfile is not defined',
-    ], async () => {
-        if (!nextBackendFile && !nextHTTPFile) {
-            throw new Error('nextBackendFile or nextHTTPFile is required in pikku config for nextJS');
-        }
-        if (nextHTTPFile && !fetchFile) {
-            throw new Error('fetchFile is required in pikku config in order for nextJS http wrapper to work');
-        }
-        if (nextBackendFile) {
-            const { pikkuConfigFactory, singletonServicesFactory, sessionServicesFactory, } = await getPikkuFilesAndMethods(logger, visitState, packageMappings, nextBackendFile, options, {
-                config: true,
-                singletonServicesFactory: true,
-                sessionServicesFactory: true,
-            });
-            const pikkuConfigImport = `import { ${pikkuConfigFactory.variable} as createConfig } from '${getFileImportRelativePath(nextBackendFile, pikkuConfigFactory.file, packageMappings)}'`;
-            const singletonServicesImport = `import { ${singletonServicesFactory.variable} as createSingletonServices } from '${getFileImportRelativePath(nextBackendFile, singletonServicesFactory.file, packageMappings)}'`;
-            const sessionServicesImport = `import { ${sessionServicesFactory.variable} as createSessionServices } from '${getFileImportRelativePath(nextBackendFile, sessionServicesFactory.file, packageMappings)}'`;
-            const httpBootstrapPath = getFileImportRelativePath(nextBackendFile, bootstrapFiles.http, packageMappings);
-            const routesMapDeclarationPath = getFileImportRelativePath(nextBackendFile, httpRoutesMapDeclarationFile, packageMappings);
-            const content = serializeNextBackendWrapper(httpBootstrapPath, routesMapDeclarationPath, pikkuConfigImport, singletonServicesImport, sessionServicesImport);
-            await writeFileInDir(logger, nextBackendFile, content);
-        }
-        if (nextHTTPFile && fetchFile) {
-            const routesMapDeclarationPath = getFileImportRelativePath(nextHTTPFile, httpRoutesMapDeclarationFile, packageMappings);
-            const fetchPath = getFileImportRelativePath(nextHTTPFile, fetchFile, packageMappings);
-            const content = serializeNextHTTPWrapper(routesMapDeclarationPath, fetchPath);
-            await writeFileInDir(logger, nextHTTPFile, content);
-        }
-    });
-};

package/src/events/http/pikku-command-nextjs.ts

@@ -1,111 +0,0 @@
-import { PikkuCLIConfig } from '../../pikku-cli-config.js'
-import { serializeNextJsBackendWrapper as serializeNextBackendWrapper } from '../../runtimes/nextjs/serialize-nextjs-backend-wrapper.js'
-import { serializeNextJsHTTPWrapper as serializeNextHTTPWrapper } from '../../runtimes/nextjs/serialize-nextjs-http-wrapper.js'
-import {
-  getFileImportRelativePath,
-  getPikkuFilesAndMethods,
-  logCommandInfoAndTime,
-  writeFileInDir,
-} from '../../utils.js'
-import { PikkuCommand } from '../../types.js'
-
-export const pikkuNext: PikkuCommand = async (
-  logger,
-  {
-    nextBackendFile,
-    nextHTTPFile,
-    httpRoutesMapDeclarationFile,
-    packageMappings,
-    fetchFile,
-    bootstrapFiles,
-  }: PikkuCLIConfig,
-  visitState,
-  options = {}
-) => {
-  return await logCommandInfoAndTime(
-    logger,
-    'Generating nextjs wrapper',
-    'Generated nextjs wrapper',
-    [
-      nextBackendFile === undefined && nextHTTPFile === undefined,
-      'nextjs outfile is not defined',
-    ],
-    async () => {
-      if (!nextBackendFile && !nextHTTPFile) {
-        throw new Error(
-          'nextBackendFile or nextHTTPFile is required in pikku config for nextJS'
-        )
-      }
-
-      if (nextHTTPFile && !fetchFile) {
-        throw new Error(
-          'fetchFile is required in pikku config in order for nextJS http wrapper to work'
-        )
-      }
-
-      if (nextBackendFile) {
-        const {
-          pikkuConfigFactory,
-          singletonServicesFactory,
-          sessionServicesFactory,
-        } = await getPikkuFilesAndMethods(
-          logger,
-          visitState,
-          packageMappings,
-          nextBackendFile,
-          options,
-          {
-            config: true,
-            singletonServicesFactory: true,
-            sessionServicesFactory: true,
-          }
-        )
-
-        const pikkuConfigImport = `import { ${pikkuConfigFactory.variable} as createConfig } from '${getFileImportRelativePath(nextBackendFile, pikkuConfigFactory.file, packageMappings)}'`
-        const singletonServicesImport = `import { ${singletonServicesFactory.variable} as createSingletonServices } from '${getFileImportRelativePath(nextBackendFile, singletonServicesFactory.file, packageMappings)}'`
-        const sessionServicesImport = `import { ${sessionServicesFactory.variable} as createSessionServices } from '${getFileImportRelativePath(nextBackendFile, sessionServicesFactory.file, packageMappings)}'`
-
-        const httpBootstrapPath = getFileImportRelativePath(
-          nextBackendFile,
-          bootstrapFiles.http,
-          packageMappings
-        )
-
-        const routesMapDeclarationPath = getFileImportRelativePath(
-          nextBackendFile,
-          httpRoutesMapDeclarationFile,
-          packageMappings
-        )
-
-        const content = serializeNextBackendWrapper(
-          httpBootstrapPath,
-          routesMapDeclarationPath,
-          pikkuConfigImport,
-          singletonServicesImport,
-          sessionServicesImport
-        )
-        await writeFileInDir(logger, nextBackendFile, content)
-      }
-
-      if (nextHTTPFile && fetchFile) {
-        const routesMapDeclarationPath = getFileImportRelativePath(
-          nextHTTPFile,
-          httpRoutesMapDeclarationFile,
-          packageMappings
-        )
-
-        const fetchPath = getFileImportRelativePath(
-          nextHTTPFile,
-          fetchFile,
-          packageMappings
-        )
-
-        const content = serializeNextHTTPWrapper(
-          routesMapDeclarationPath,
-          fetchPath
-        )
-        await writeFileInDir(logger, nextHTTPFile, content)
-      }
-    }
-  )
-}