@pikku/cli 0.6.9 → 0.6.11

package/CHANGELOG.md

@@ -1,5 +1,20 @@
 # @pikku/cli
 
+## 0.6.11
+
+### Patch Changes
+
+- 3062086: fix: renaming AbstractFetch/Websocket to core
+- eb8a8b4: fix: updating schema and cli build issue due to tsconfig settings
+- Updated dependencies [eb8a8b4]
+  - @pikku/core@0.6.13
+
+## 0.6.10
+
+### Patch Changes
+
+- 06e71be: fix: use readFile instead of import for json file
+
 ## 0.6.9
 
 ### Patch Changes

package/cli.schema.json

@@ -184,11 +184,17 @@
         "schemaDirectory": {
           "type": "string"
         },
+        "supportsImportAttributes": {
+          "type": "boolean"
+        },
         "tsconfig": {
           "type": "string"
         },
         "typesDeclarationFile": {
           "type": "string"
+        },
+        "websocketFile": {
+          "type": "string"
         }
       },
       "required": [
@@ -203,6 +209,7 @@
         "routesMapDeclarationFile",
         "schedulersFile",
         "schemaDirectory",
+        "supportsImportAttributes",
         "tsconfig",
         "typesDeclarationFile"
       ],

package/dist/src/channels/serialize-websocket-wrapper.js

@@ -1,8 +1,8 @@
 export const serializeWebsocketWrapper = (channelsMapPath) => {
-    return `import { AbstractPikkuWebsocket, AbstractPikkuRouteHandler } from '@pikku/websocket'
+    return `import { CorePikkuWebsocket, CorePikkuRouteHandler } from '@pikku/websocket'
 import { ChannelDefaultHandlerOf, ChannelRouteHandlerOf, ChannelsMap } from '${channelsMapPath}';
 
-class PikkuWebSocketRoute<Channel extends keyof ChannelsMap, Route extends keyof ChannelsMap[Channel]['routes']> extends AbstractPikkuRouteHandler {
+class PikkuWebSocketRoute<Channel extends keyof ChannelsMap, Route extends keyof ChannelsMap[Channel]['routes']> extends CorePikkuRouteHandler {
     public subscribe<
         Method extends keyof ChannelsMap[Channel]['routes'][Route],
         Data extends ChannelRouteHandlerOf<Channel, Route, Method>['output']
@@ -26,7 +26,7 @@ class PikkuWebSocketRoute<Channel extends keyof ChannelsMap, Route extends keyof
     }
 }
 
-export class PikkuWebSocket<Channel extends keyof ChannelsMap> extends AbstractPikkuWebsocket {
+export class PikkuWebSocket<Channel extends keyof ChannelsMap> extends CorePikkuWebsocket {
     /**
      * Send a message to a specific route and method.
      * Validates the input data type.

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

@@ -3,7 +3,7 @@ export const serializeFetchWrapper = (routesMapPath) => {
 import { CorePikkuFetch, HTTPMethod } from '@pikku/fetch'
 import type { RoutesMap, RouteHandlerOf, RoutesWithMethod } from '${routesMapPath}'
 
-export class PikkuFetch extends AbstractPikkuFetch {
+export class PikkuFetch extends CorePikkuFetch {
     public async post<Route extends RoutesWithMethod<'POST'>>(
         route: Route,
         data: RouteHandlerOf<Route, 'POST'>['input'] = null,

package/dist/src/openapi/openapi-spec-generator.d.ts

@@ -1,4 +1,4 @@
-import { HTTPRoutesMeta } from '@pikku/core/http';
+import { HTTPRoutesMeta } from '@pikku/core';
 interface OpenAPISpec {
     openapi: string;
     info: {

package/dist/src/openapi/openapi-spec-generator.js

@@ -1,4 +1,4 @@
-import { getErrors } from '@pikku/core/errors';
+import { getErrors } from '@pikku/core';
 import _convertSchema from '@openapi-contrib/json-schema-to-openapi-schema';
 const convertSchema = 'default' in _convertSchema ? _convertSchema.default : _convertSchema;
 const getErrorResponseForConstructorName = (constructorName) => {

package/dist/src/utils.js

@@ -1,8 +1,9 @@
-// import packageInfo from '../package.json'
 import { relative, dirname } from 'path';
 import { mkdir, writeFile } from 'fs/promises';
 import chalk from 'chalk';
-import packageJson from '../package.json';
+import { fileURLToPath } from 'url';
+import { readFileSync } from 'fs';
+const __filename = fileURLToPath(import.meta.url);
 export const logPrimary = (message) => {
     console.log(chalk.green(message));
 };
@@ -120,7 +121,8 @@ const logo = `
 `;
 export const logPikkuLogo = () => {
     logPrimary(logo);
-    logPrimary(`⚙️ Welcome to the Pikku CLI (v${packageJson})\n`);
+    const packageJson = JSON.parse(readFileSync(`${dirname(__filename)}/../../package.json`, 'utf-8'));
+    logPrimary(`⚙️ Welcome to the Pikku CLI (v${packageJson.version})\n`);
 };
 // TODO: add version back in once the ESM dust settles
 export const DO_NOT_MODIFY_COMMENT = `/**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pikku/cli",
-  "version": "0.6.9",
+  "version": "0.6.11",
   "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.6.11",
+    "@pikku/core": "^0.6.13",
     "@pikku/inspector": "^0.6.2",
     "@types/cookie": "^0.6.0",
     "@types/uuid": "^10.0.0",

package/src/channels/serialize-websocket-wrapper.ts

@@ -1,8 +1,8 @@
 export const serializeWebsocketWrapper = (channelsMapPath: string) => {
-  return `import { AbstractPikkuWebsocket, AbstractPikkuRouteHandler } from '@pikku/websocket'
+  return `import { CorePikkuWebsocket, CorePikkuRouteHandler } from '@pikku/websocket'
 import { ChannelDefaultHandlerOf, ChannelRouteHandlerOf, ChannelsMap } from '${channelsMapPath}';
 
-class PikkuWebSocketRoute<Channel extends keyof ChannelsMap, Route extends keyof ChannelsMap[Channel]['routes']> extends AbstractPikkuRouteHandler {
+class PikkuWebSocketRoute<Channel extends keyof ChannelsMap, Route extends keyof ChannelsMap[Channel]['routes']> extends CorePikkuRouteHandler {
     public subscribe<
         Method extends keyof ChannelsMap[Channel]['routes'][Route],
         Data extends ChannelRouteHandlerOf<Channel, Route, Method>['output']
@@ -26,7 +26,7 @@ class PikkuWebSocketRoute<Channel extends keyof ChannelsMap, Route extends keyof
     }
 }
 
-export class PikkuWebSocket<Channel extends keyof ChannelsMap> extends AbstractPikkuWebsocket {
+export class PikkuWebSocket<Channel extends keyof ChannelsMap> extends CorePikkuWebsocket {
     /**
      * Send a message to a specific route and method.
      * Validates the input data type.

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

@@ -3,7 +3,7 @@ export const serializeFetchWrapper = (routesMapPath: string) => {
 import { CorePikkuFetch, HTTPMethod } from '@pikku/fetch'
 import type { RoutesMap, RouteHandlerOf, RoutesWithMethod } from '${routesMapPath}'
 
-export class PikkuFetch extends AbstractPikkuFetch {
+export class PikkuFetch extends CorePikkuFetch {
     public async post<Route extends RoutesWithMethod<'POST'>>(
         route: Route,
         data: RouteHandlerOf<Route, 'POST'>['input'] = null,

package/src/openapi/openapi-spec-generator.ts

@@ -1,5 +1,4 @@
-import { getErrors } from '@pikku/core/errors'
-import { HTTPRoutesMeta } from '@pikku/core/http'
+import { getErrors, HTTPRoutesMeta } from '@pikku/core'
 import _convertSchema from '@openapi-contrib/json-schema-to-openapi-schema'
 const convertSchema =
   'default' in _convertSchema ? (_convertSchema.default as any) : _convertSchema

package/src/utils.ts

@@ -1,9 +1,11 @@
-// import packageInfo from '../package.json'
 import { relative, dirname } from 'path'
 import { PathToNameAndType, InspectorState } from '@pikku/inspector'
 import { mkdir, writeFile } from 'fs/promises'
 import chalk from 'chalk'
-import packageJson from '../package.json'
+import { fileURLToPath } from 'url'
+import { readFileSync } from 'fs'
+
+const __filename = fileURLToPath(import.meta.url)
 
 export const logPrimary = (message: string) => {
   console.log(chalk.green(message))
@@ -231,7 +233,11 @@ const logo = `
 
 export const logPikkuLogo = () => {
   logPrimary(logo)
-  logPrimary(`⚙️ Welcome to the Pikku CLI (v${packageJson})\n`)
+
+  const packageJson = JSON.parse(
+    readFileSync(`${dirname(__filename)}/../../package.json`, 'utf-8')
+  )
+  logPrimary(`⚙️ Welcome to the Pikku CLI (v${packageJson.version})\n`)
 }
 
 // TODO: add version back in once the ESM dust settles

package/dist/package.json

@@ -1,43 +0,0 @@
-{
-    "name": "@pikku/cli",
-    "version": "0.6.9",
-    "author": "yasser.fadl@gmail.com",
-    "license": "MIT",
-    "bin": {
-        "pikku": "dist/bin/pikku.js"
-    },
-    "type": "module",
-    "main": "dist/bin/pikku.js",
-    "module": "dist/bin/pikku.js",
-    "scripts": {
-        "tsc": "tsc",
-        "build:esm": "tsc -b",
-        "schema": "ts-json-schema-generator -o cli.schema.json --path 'src/pikku-cli-config.ts' --type 'PikkuCLIConfig'",
-        "build": "yarn build:esm && yarn schema",
-        "ncu": "npx npm-check-updates -x '/.*glob.*/'",
-        "release": "yarn build && npm test",
-        "test": "bash run-tests.sh",
-        "test:watch": "bash run-tests.sh --watch",
-        "test:coverage": "bash run-tests.sh --coverage"
-    },
-    "dependencies": {
-        "@openapi-contrib/json-schema-to-openapi-schema": "^3.0.2",
-        "@pikku/core": "^0.6.11",
-        "@pikku/inspector": "^0.6.2",
-        "@types/cookie": "^0.6.0",
-        "@types/uuid": "^10.0.0",
-        "chalk": "^5.4.1",
-        "commander": "^12",
-        "glob": "^10",
-        "path-to-regexp": "^8.2.0",
-        "ts-json-schema-generator": "^2.3.0",
-        "typescript": "^5.6",
-        "yaml": "^2.6.0"
-    },
-    "devDependencies": {
-        "@types/node": "^22.7.8"
-    },
-    "engines": {
-        "node": ">=18"
-    }
-}