@pikku/cli 0.6.17 → 0.6.19

package/CHANGELOG.md

@@ -1,5 +1,22 @@
 # @pikku/cli
 
+## 0.6.19
+
+### Patch Changes
+
+- 1c8c470: removing a console
+- Updated dependencies [1c8c470]
+  - @pikku/core@0.6.23
+
+## 0.6.18
+
+### Patch Changes
+
+- 60b2265: refactor: supporting request and response objects
+- Updated dependencies [60b2265]
+  - @pikku/inspector@0.6.4
+  - @pikku/core@0.6.22
+
 ## 0.6.17
 
 ### Patch Changes

package/bin/pikku-all.ts

@@ -76,7 +76,9 @@ const runAll = async (cliConfig: PikkuCLIConfig, options: PikkuCLIOptions) => {
     addImport(`${cliConfig.schemaDirectory}/register.gen.ts`)
   }
 
-  await pikkuNext(cliConfig, visitState, options)
+  if (cliConfig.nextBackendFile || cliConfig.nextHTTPFile) {
+    await pikkuNext(cliConfig, visitState, options)
+  }
 
   if (cliConfig.openAPI) {
     logInfo(`• OpenAPI requires a reinspection to pickup new generated types..`)
@@ -153,6 +155,8 @@ export const action = async (options: PikkuCLIOptions): Promise<void> => {
 
   if (options.watch) {
     watch(cliConfig, options)
+  } else {
+    await runAll(cliConfig, options)
   }
 }
 

package/bin/pikku-nextjs.ts

@@ -29,11 +29,14 @@ export const pikkuNext = async (
   return await logCommandInfoAndTime(
     'Generating nextjs wrapper',
     'Generated nextjs wrapper',
-    [nextBackendFile === undefined, 'nextjs outfile is not defined'],
+    [
+      nextBackendFile === undefined && nextHTTPFile === undefined,
+      'nextjs outfile is not defined',
+    ],
     async () => {
-      if (!nextBackendFile || !nextHTTPFile) {
+      if (!nextBackendFile && !nextHTTPFile) {
         throw new Error(
-          'nextBackendFile or nextHTTPFile is required in pikku config'
+          'nextBackendFile or nextHTTPFile is required in pikku config for nextJS'
         )
       }
 
@@ -43,43 +46,44 @@ export const pikkuNext = async (
         )
       }
 
-      const {
-        pikkuConfigFactory,
-        singletonServicesFactory,
-        sessionServicesFactory,
-      } = await getPikkuFilesAndMethods(
-        visitState,
-        packageMappings,
-        nextBackendFile,
-        options,
-        {
-          config: true,
-          singletonServicesFactory: true,
-          sessionServicesFactory: true,
-        }
-      )
+      if (nextBackendFile) {
+        const {
+          pikkuConfigFactory,
+          singletonServicesFactory,
+          sessionServicesFactory,
+        } = await getPikkuFilesAndMethods(
+          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 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 routesPath = getFileImportRelativePath(
-        nextBackendFile,
-        routesFile,
-        packageMappings
-      )
-      const routesMapDeclarationPath = getFileImportRelativePath(
-        nextBackendFile,
-        routesMapDeclarationFile,
-        packageMappings
-      )
-      const schemasPath = getFileImportRelativePath(
-        nextBackendFile,
-        `${schemaDirectory}/register.gen.ts`,
-        packageMappings
-      )
+        const routesPath = getFileImportRelativePath(
+          nextBackendFile,
+          routesFile,
+          packageMappings
+        )
+
+        const routesMapDeclarationPath = getFileImportRelativePath(
+          nextBackendFile,
+          routesMapDeclarationFile,
+          packageMappings
+        )
+        const schemasPath = getFileImportRelativePath(
+          nextBackendFile,
+          `${schemaDirectory}/register.gen.ts`,
+          packageMappings
+        )
 
-      if (nextBackendFile) {
         const content = serializeNextBackendWrapper(
           routesPath,
           routesMapDeclarationPath,
@@ -92,10 +96,21 @@ export const pikkuNext = async (
       }
 
       if (nextHTTPFile) {
-        const pikkuFetchImport = `import { PikkuFetch } from '${getFileImportRelativePath(nextBackendFile, fetchFile!, packageMappings)}'`
+        const routesPath = getFileImportRelativePath(
+          nextHTTPFile,
+          routesFile,
+          packageMappings
+        )
+
+        const routesMapDeclarationPath = getFileImportRelativePath(
+          nextHTTPFile,
+          routesMapDeclarationFile,
+          packageMappings
+        )
+
         const content = serializeNextHTTPWrapper(
-          routesMapDeclarationPath,
-          pikkuFetchImport
+          routesPath,
+          routesMapDeclarationPath
         )
         await writeFileInDir(nextHTTPFile, content)
       }
@@ -107,7 +122,7 @@ export const action = async (options: PikkuCLIOptions): Promise<void> => {
   logPikkuLogo()
   const cliConfig = await getPikkuCLIConfig(
     options.config,
-    ['rootDir', 'schemaDirectory', 'configDir', 'nextBackendFile'],
+    ['rootDir', 'schemaDirectory', 'configDir'],
     options.tags,
     true
   )

package/bin/pikku-schemas.ts

@@ -10,6 +10,7 @@ export const pikkuSchemas = async (
   { tsconfig, schemaDirectory, supportsImportAttributes }: PikkuCLIConfig,
   { http }: InspectorState
 ) => {
+  console.log('Generating schemas...')
   return await logCommandInfoAndTime(
     'Creating schemas',
     'Created schemas',

package/dist/bin/pikku-all.js

@@ -50,7 +50,9 @@ const runAll = async (cliConfig, options) => {
     if (schemas) {
         addImport(`${cliConfig.schemaDirectory}/register.gen.ts`);
     }
-    await pikkuNext(cliConfig, visitState, options);
+    if (cliConfig.nextBackendFile || cliConfig.nextHTTPFile) {
+        await pikkuNext(cliConfig, visitState, options);
+    }
     if (cliConfig.openAPI) {
         logInfo(`• OpenAPI requires a reinspection to pickup new generated types..`);
         visitState = await inspectorGlob(cliConfig.rootDir, cliConfig.routeDirectories, cliConfig.filters);
@@ -103,6 +105,9 @@ export const action = async (options) => {
     if (options.watch) {
         watch(cliConfig, options);
     }
+    else {
+        await runAll(cliConfig, options);
+    }
 };
 export const all = (program) => {
     program

package/dist/bin/pikku-nextjs.js

@@ -4,38 +4,42 @@ import { getFileImportRelativePath, getPikkuFilesAndMethods, logCommandInfoAndTi
 import { getPikkuCLIConfig } from '../src/pikku-cli-config.js';
 import { inspectorGlob } from '../src/inspector-glob.js';
 export const pikkuNext = async ({ nextBackendFile, nextHTTPFile, routesFile, routesMapDeclarationFile, schemaDirectory, packageMappings, fetchFile, }, visitState, options) => {
-    return await logCommandInfoAndTime('Generating nextjs wrapper', 'Generated nextjs wrapper', [nextBackendFile === undefined, 'nextjs outfile is not defined'], async () => {
-        if (!nextBackendFile || !nextHTTPFile) {
-            throw new Error('nextBackendFile or nextHTTPFile is required in pikku config');
+    return await logCommandInfoAndTime('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');
         }
-        const { pikkuConfigFactory, singletonServicesFactory, sessionServicesFactory, } = await getPikkuFilesAndMethods(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 routesPath = getFileImportRelativePath(nextBackendFile, routesFile, packageMappings);
-        const routesMapDeclarationPath = getFileImportRelativePath(nextBackendFile, routesMapDeclarationFile, packageMappings);
-        const schemasPath = getFileImportRelativePath(nextBackendFile, `${schemaDirectory}/register.gen.ts`, packageMappings);
         if (nextBackendFile) {
+            const { pikkuConfigFactory, singletonServicesFactory, sessionServicesFactory, } = await getPikkuFilesAndMethods(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 routesPath = getFileImportRelativePath(nextBackendFile, routesFile, packageMappings);
+            const routesMapDeclarationPath = getFileImportRelativePath(nextBackendFile, routesMapDeclarationFile, packageMappings);
+            const schemasPath = getFileImportRelativePath(nextBackendFile, `${schemaDirectory}/register.gen.ts`, packageMappings);
             const content = serializeNextBackendWrapper(routesPath, routesMapDeclarationPath, schemasPath, pikkuConfigImport, singletonServicesImport, sessionServicesImport);
             await writeFileInDir(nextBackendFile, content);
         }
         if (nextHTTPFile) {
-            const pikkuFetchImport = `import { PikkuFetch } from '${getFileImportRelativePath(nextBackendFile, fetchFile, packageMappings)}'`;
-            const content = serializeNextHTTPWrapper(routesMapDeclarationPath, pikkuFetchImport);
+            const routesPath = getFileImportRelativePath(nextHTTPFile, routesFile, packageMappings);
+            const routesMapDeclarationPath = getFileImportRelativePath(nextHTTPFile, routesMapDeclarationFile, packageMappings);
+            const content = serializeNextHTTPWrapper(routesPath, routesMapDeclarationPath);
             await writeFileInDir(nextHTTPFile, content);
         }
     });
 };
 export const action = async (options) => {
     logPikkuLogo();
-    const cliConfig = await getPikkuCLIConfig(options.config, ['rootDir', 'schemaDirectory', 'configDir', 'nextBackendFile'], options.tags, true);
+    const cliConfig = await getPikkuCLIConfig(options.config, ['rootDir', 'schemaDirectory', 'configDir'], options.tags, true);
     const visitState = await inspectorGlob(cliConfig.rootDir, cliConfig.routeDirectories, cliConfig.filters);
     await pikkuNext(cliConfig, visitState, options);
 };

package/dist/bin/pikku-schemas.js

@@ -3,6 +3,7 @@ import { getPikkuCLIConfig } from '../src/pikku-cli-config.js';
 import { logCommandInfoAndTime, logPikkuLogo } from '../src/utils.js';
 import { inspectorGlob } from '../src/inspector-glob.js';
 export const pikkuSchemas = async ({ tsconfig, schemaDirectory, supportsImportAttributes }, { http }) => {
+    console.log('Generating schemas...');
     return await logCommandInfoAndTime('Creating schemas', 'Created schemas', [false], async () => {
         const schemas = await generateSchemas(tsconfig, http.typesMap, http.meta);
         await saveSchemas(schemaDirectory, schemas, http.typesMap, http.meta, supportsImportAttributes);

package/dist/src/nextjs/serialize-nextjs-http-wrapper.js

@@ -30,7 +30,7 @@ export const pikku = (options?: CorePikkuFetchOptions) => {
     method: Method,
     data: RouteHandlerOf<Route, Method>['input'] = null
   ): Promise<RouteHandlerOf<Route, Method>['output']> => {
-    return (_pikku! as any)[method](route, data as any)
+    return (_pikku! as any)[(method as string).toLowerCase()](route, data as any)
   }
 
   /**
@@ -52,7 +52,7 @@ export const pikku = (options?: CorePikkuFetchOptions) => {
     method: Method,
     data: RouteHandlerOf<Route, Method>['input'] = null
   ): Promise<RouteHandlerOf<Route, Method>['output']> => {
-    return (_pikku! as any)[method](route, data as any)
+    return (_pikku! as any)[(method as string).toLowerCase()](route, data as any)
   }
 
   /**

package/dist/src/schema/schema-generator.js

@@ -69,11 +69,8 @@ export async function saveSchemas(schemaParentDir, schemas, typesMap, routesMeta
         .map((schema) => `
 import * as ${schema} from './schemas/${schema}.schema.json' ${supportsImportAttributes ? `with { type: 'json' }` : ''}
 addSchema('${schema}', ${schema})
-// addSchema('${schema}', require('./schemas/${schema}.schema.json'))
 `)
         .join('\n');
     await writeFileInDir(`${schemaParentDir}/register.gen.ts`, `import { addSchema } from '@pikku/core/schema'
-// import { createRequire } from "module"
-// const require = createRequire(import.meta.url)
 ${schemaImports}`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikku/cli",
-  "version": "0.6.17",
+  "version": "0.6.19",
   "author": "yasser.fadl@gmail.com",
   "license": "MIT",
   "bin": {
@@ -22,11 +22,12 @@
   },
   "dependencies": {
     "@openapi-contrib/json-schema-to-openapi-schema": "^3.0.2",
-    "@pikku/core": "^0.6.19",
-    "@pikku/inspector": "^0.6.3",
+    "@pikku/core": "^0.6.23",
+    "@pikku/inspector": "^0.6.4",
     "@types/cookie": "^0.6.0",
     "@types/uuid": "^10.0.0",
     "chalk": "^5.4.1",
+    "chokidar": "^4.0.3",
     "commander": "^12",
     "path-to-regexp": "^8.2.0",
     "tinyglobby": "^0.2.12",

package/src/nextjs/serialize-nextjs-http-wrapper.ts

@@ -33,7 +33,7 @@ export const pikku = (options?: CorePikkuFetchOptions) => {
     method: Method,
     data: RouteHandlerOf<Route, Method>['input'] = null
   ): Promise<RouteHandlerOf<Route, Method>['output']> => {
-    return (_pikku! as any)[method](route, data as any)
+    return (_pikku! as any)[(method as string).toLowerCase()](route, data as any)
   }
 
   /**
@@ -55,7 +55,7 @@ export const pikku = (options?: CorePikkuFetchOptions) => {
     method: Method,
     data: RouteHandlerOf<Route, Method>['input'] = null
   ): Promise<RouteHandlerOf<Route, Method>['output']> => {
-    return (_pikku! as any)[method](route, data as any)
+    return (_pikku! as any)[(method as string).toLowerCase()](route, data as any)
   }
 
   /**

package/src/schema/schema-generator.ts

@@ -102,7 +102,6 @@ export async function saveSchemas(
       (schema) => `
 import * as ${schema} from './schemas/${schema}.schema.json' ${supportsImportAttributes ? `with { type: 'json' }` : ''}
 addSchema('${schema}', ${schema})
-// addSchema('${schema}', require('./schemas/${schema}.schema.json'))
 `
     )
     .join('\n')
@@ -110,8 +109,6 @@ addSchema('${schema}', ${schema})
   await writeFileInDir(
     `${schemaParentDir}/register.gen.ts`,
     `import { addSchema } from '@pikku/core/schema'
-// import { createRequire } from "module"
-// const require = createRequire(import.meta.url)
 ${schemaImports}`
   )
 }