diff --git a/package.json b/package.json index a6d4cde..dd60e20 100644 --- a/package.json +++ b/package.json @@ -46,6 +46,7 @@ "@push.rocks/smartenv": "^5.0.12", "@push.rocks/smartfeed": "^1.0.11", "@push.rocks/smartfile": "^11.0.4", + "@push.rocks/smartjson": "^5.0.10", "@push.rocks/smartlog": "^3.0.3", "@push.rocks/smartlog-destination-devtools": "^1.0.10", "@push.rocks/smartmanifest": "^2.0.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 794a87c..4290544 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -32,6 +32,9 @@ dependencies: '@push.rocks/smartfile': specifier: ^11.0.4 version: 11.0.4 + '@push.rocks/smartjson': + specifier: ^5.0.10 + version: 5.0.10 '@push.rocks/smartlog': specifier: ^3.0.3 version: 3.0.3 diff --git a/ts/00_commitinfo_data.ts b/ts/00_commitinfo_data.ts index 3193e03..0796aa1 100644 --- a/ts/00_commitinfo_data.ts +++ b/ts/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@api.global/typedserver', - version: '3.0.20', + version: '3.0.21', description: 'easy serving of static files' } diff --git a/ts/index.ts b/ts/index.ts index df23f8d..ab2ff7e 100644 --- a/ts/index.ts +++ b/ts/index.ts @@ -1,4 +1,4 @@ -import * as plugins from './typedserver.plugins.js'; +import * as plugins from './plugins.js'; import * as servertools from './servertools/index.js'; diff --git a/ts/typedserver.plugins.ts b/ts/plugins.ts similarity index 96% rename from ts/typedserver.plugins.ts rename to ts/plugins.ts index 8bf35ea..d11de50 100644 --- a/ts/typedserver.plugins.ts +++ b/ts/plugins.ts @@ -26,6 +26,7 @@ import * as smartchok from '@push.rocks/smartchok'; import * as smartdelay from '@push.rocks/smartdelay'; import * as smartfeed from '@push.rocks/smartfeed'; import * as smartfile from '@push.rocks/smartfile'; +import * as smartjson from '@push.rocks/smartjson'; import * as smartmanifest from '@push.rocks/smartmanifest'; import * as smartmime from '@push.rocks/smartmime'; import * as smartopen from '@push.rocks/smartopen'; @@ -43,6 +44,7 @@ export { smartdelay, smartfeed, smartfile, + smartjson, smartmanifest, smartmime, smartopen, diff --git a/ts/servertools/classes.compressor.ts b/ts/servertools/classes.compressor.ts index 1490929..003246c 100644 --- a/ts/servertools/classes.compressor.ts +++ b/ts/servertools/classes.compressor.ts @@ -1,4 +1,4 @@ -import * as plugins from '../typedserver.plugins.js'; +import * as plugins from '../plugins.js'; export type TCompressionMethod = 'gzip' | 'deflate' | 'br' | 'none'; export interface ICompressionResult { diff --git a/ts/servertools/classes.feed.ts b/ts/servertools/classes.feed.ts index 95177ce..a871a41 100644 --- a/ts/servertools/classes.feed.ts +++ b/ts/servertools/classes.feed.ts @@ -1,6 +1,6 @@ import { Handler } from './classes.handler.js'; import { Server } from './classes.server.js'; -import * as plugins from '../typedserver.plugins.js'; +import * as plugins from '../plugins.js'; export class Feed { public smartexpressRef: Server; diff --git a/ts/servertools/classes.handler.ts b/ts/servertools/classes.handler.ts index 7b014fe..37f7f78 100644 --- a/ts/servertools/classes.handler.ts +++ b/ts/servertools/classes.handler.ts @@ -1,4 +1,4 @@ -import * as plugins from '../typedserver.plugins.js'; +import * as plugins from '../plugins.js'; import { type Request, type Response } from 'express'; export interface IHandlerFunction { diff --git a/ts/servertools/classes.handlerproxy.ts b/ts/servertools/classes.handlerproxy.ts index f169b5e..b053061 100644 --- a/ts/servertools/classes.handlerproxy.ts +++ b/ts/servertools/classes.handlerproxy.ts @@ -1,4 +1,4 @@ -import * as plugins from '../typedserver.plugins.js'; +import * as plugins from '../plugins.js'; import { Handler } from './classes.handler.js'; import * as interfaces from '../interfaces/index.js'; diff --git a/ts/servertools/classes.handlerstatic.ts b/ts/servertools/classes.handlerstatic.ts index 0d2c6f8..8017165 100644 --- a/ts/servertools/classes.handlerstatic.ts +++ b/ts/servertools/classes.handlerstatic.ts @@ -1,4 +1,4 @@ -import * as plugins from '../typedserver.plugins.js'; +import * as plugins from '../plugins.js'; import * as interfaces from '../interfaces/index.js'; import { Handler } from './classes.handler.js'; diff --git a/ts/servertools/classes.handlertypedrouter.ts b/ts/servertools/classes.handlertypedrouter.ts index bef25d4..482123a 100644 --- a/ts/servertools/classes.handlertypedrouter.ts +++ b/ts/servertools/classes.handlertypedrouter.ts @@ -1,4 +1,4 @@ -import * as plugins from '../typedserver.plugins.js'; +import * as plugins from '../plugins.js'; import { Handler } from './classes.handler.js'; import * as interfaces from '../interfaces/index.js'; @@ -11,7 +11,7 @@ export class HandlerTypedRouter extends Handler { constructor(typedrouter: plugins.typedrequest.TypedRouter) { super('POST', async (req, res) => { const response = await typedrouter.routeAndAddResponse(req.body); - res.json(response); + res.json(plugins.smartjson.stringify(response)); }); } } diff --git a/ts/servertools/classes.route.ts b/ts/servertools/classes.route.ts index ab9efe9..7bab520 100644 --- a/ts/servertools/classes.route.ts +++ b/ts/servertools/classes.route.ts @@ -1,4 +1,4 @@ -import * as plugins from '../typedserver.plugins.js'; +import * as plugins from '../plugins.js'; import { Handler } from './classes.handler.js'; import { Server } from './classes.server.js'; diff --git a/ts/servertools/classes.server.ts b/ts/servertools/classes.server.ts index 89a5cc1..156969b 100644 --- a/ts/servertools/classes.server.ts +++ b/ts/servertools/classes.server.ts @@ -1,4 +1,4 @@ -import * as plugins from '../typedserver.plugins.js'; +import * as plugins from '../plugins.js'; import { Route } from './classes.route.js'; import { Handler } from './classes.handler.js'; diff --git a/ts/servertools/classes.sitemap.ts b/ts/servertools/classes.sitemap.ts index f59d46d..78744ff 100644 --- a/ts/servertools/classes.sitemap.ts +++ b/ts/servertools/classes.sitemap.ts @@ -1,6 +1,6 @@ import { Server } from './classes.server.js'; import { Handler } from './classes.handler.js'; -import * as plugins from '../typedserver.plugins.js'; +import * as plugins from '../plugins.js'; import { type IUrlInfo } from '@push.rocks/smartsitemap'; export class Sitemap { diff --git a/ts/servertools/tools.manifest.ts b/ts/servertools/tools.manifest.ts index c1179c3..0306f5b 100644 --- a/ts/servertools/tools.manifest.ts +++ b/ts/servertools/tools.manifest.ts @@ -1,4 +1,4 @@ -import * as plugins from '../typedserver.plugins.js'; +import * as plugins from '../plugins.js'; export const setupManifest = async ( expressInstanceArg: plugins.express.Application, diff --git a/ts/servertools/tools.robots.ts b/ts/servertools/tools.robots.ts index 892591d..4695fec 100644 --- a/ts/servertools/tools.robots.ts +++ b/ts/servertools/tools.robots.ts @@ -1,4 +1,4 @@ -import * as plugins from '../typedserver.plugins.js'; +import * as plugins from '../plugins.js'; import { Server } from './classes.server.js'; import { Handler } from './classes.handler.js'; diff --git a/ts/servertools/tools.sslredirect.ts b/ts/servertools/tools.sslredirect.ts index bfcf1e0..afd0fed 100644 --- a/ts/servertools/tools.sslredirect.ts +++ b/ts/servertools/tools.sslredirect.ts @@ -1,4 +1,4 @@ -import * as plugins from '../typedserver.plugins.js'; +import * as plugins from '../plugins.js'; import { Server } from './classes.server.js'; import { Handler } from './classes.handler.js'; diff --git a/ts/typedserver.classes.typedserver.ts b/ts/typedserver.classes.typedserver.ts index 93a7606..e82760c 100644 --- a/ts/typedserver.classes.typedserver.ts +++ b/ts/typedserver.classes.typedserver.ts @@ -1,4 +1,4 @@ -import * as plugins from './typedserver.plugins.js'; +import * as plugins from './plugins.js'; import * as paths from './typedserver.paths.js'; import * as interfaces from './interfaces/index.js'; import * as servertools from './servertools/index.js'; diff --git a/ts/typedserver.paths.ts b/ts/typedserver.paths.ts index b7d6096..ca61462 100644 --- a/ts/typedserver.paths.ts +++ b/ts/typedserver.paths.ts @@ -1,4 +1,4 @@ -import * as plugins from './typedserver.plugins.js'; +import * as plugins from './plugins.js'; export const packageDir = plugins.path.join( plugins.smartpath.get.dirnameFromImportMetaUrl(import.meta.url), diff --git a/ts_web/00_commitinfo_data.ts b/ts_web/00_commitinfo_data.ts index 3193e03..0796aa1 100644 --- a/ts_web/00_commitinfo_data.ts +++ b/ts_web/00_commitinfo_data.ts @@ -3,6 +3,6 @@ */ export const commitinfo = { name: '@api.global/typedserver', - version: '3.0.20', + version: '3.0.21', description: 'easy serving of static files' }