@jayfong/x-server 2.2.0 → 2.2.2

package/lib/_cjs/cli/templates/crons.ts

@@ -1,2 +1,2 @@
-// @index(['../../src/crons/**/*.ts', '!**/_*'], (f, _) => `import '${f.path}'`)
+// @index(['../../src/crons/**/*.ts', '!**/_*', '!**/_*/**'], (f, _) => `import '${f.path}'`)
 // @endindex

package/lib/_cjs/cli/templates/handlers.ts

@@ -1,3 +1,3 @@
-// @index(['../../src/handlers/**/*.ts', '!**/_*'], (f, _) => `export * as __${_.pascal(f.path.replace('/src/handlers/', ''))}__ from '${f.path}'`)
+// @index(['../../src/handlers/**/*.ts', '!**/_*', '!**/_*/**'], (f, _) => `export * as __${_.pascal(f.path.replace('/src/handlers/', ''))}__ from '${f.path}'`)
 
 // @endindex

package/lib/_cjs/cli/templates/hooks.ts

@@ -1,2 +1,2 @@
-// @index(['../../src/hooks/**/*.ts', '!**/_*'], (f, _) => `import '${f.path}'`)
+// @index(['../../src/hooks/**/*.ts', '!**/_*', '!**/_*/**'], (f, _) => `import '${f.path}'`)
 // @endindex

package/lib/_cjs/cli/templates/routes.ts

@@ -2,7 +2,7 @@ import * as handlers from './handlers'
 import { Handler, XServer } from '@jayfong/x-server'
 
 const basePathWithHandlers: Array<[string, Record<string, Handler>]> = [
-  // @index(['../../src/handlers/**/*.ts', '!**/_*'], (f, _) => `['${(f.path+'/').replace('../../src/handlers/', '/').replace(/\/index\/$/, '/').split('/').map(v => _.snake(v)).join('/')}', handlers.__${_.pascal(f.path.replace('/src/handlers/', ''))}__ as any],`)
+  // @index(['../../src/handlers/**/*.ts', '!**/_*', '!**/_*/**'], (f, _) => `['${(f.path+'/').replace('../../src/handlers/', '/').replace(/\/index\/$/, '/').split('/').map(v => _.snake(v)).join('/')}', handlers.__${_.pascal(f.path.replace('/src/handlers/', ''))}__ as any],`)
   // @endindex
 ]
 
@@ -13,7 +13,7 @@ type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
   ? I
   : never
 type RouteMap = {
-  // @index(['../../src/handlers/**/*.ts', '!**/_*'], (f, _) => `'${(f.path+'/').replace('../../src/handlers/', '/').replace(/\/index\/$/, '/').split('/').map(v => _.snake(v)).join('/')}': typeof handlers.__${_.pascal(f.path.replace('/src/handlers/', ''))}__,`)
+  // @index(['../../src/handlers/**/*.ts', '!**/_*', '!**/_*/**'], (f, _) => `'${(f.path+'/').replace('../../src/handlers/', '/').replace(/\/index\/$/, '/').split('/').map(v => _.snake(v)).join('/')}': typeof handlers.__${_.pascal(f.path.replace('/src/handlers/', ''))}__,`)
   // @endindex
 }
 export type HandlerMap = UnionToIntersection<

package/lib/_cjs/services/log.js

@@ -0,0 +1,27 @@
+"use strict";
+
+exports.__esModule = true;
+exports.LogService = void 0;
+
+var _date = require("vtils/date");
+
+class LogService {
+  constructor() {
+    this.serviceName = 'log';
+  }
+
+  log(level, message) {
+    console[level === 'error' ? 'error' : 'log'](`[${(0, _date.formatDate)(new Date(), 'yyyy-mm-dd hh:ii:ss')}] ${level.toUpperCase()} - ${message}`);
+  }
+
+  error(message) {
+    this.log('error', message);
+  }
+
+  info(message) {
+    this.log('info', message);
+  }
+
+}
+
+exports.LogService = LogService;

package/lib/_cjs/x.js

@@ -5,6 +5,8 @@ exports.x = void 0;
 
 var _dispose = require("./services/dispose");
 
+var _log = require("./services/log");
+
 const env = JSON.parse(process.env.X_SERVER_ENVS || '{}');
 const x = {
   appId: env.APP_ID,
@@ -19,4 +21,4 @@ const x = {
 exports.x = x;
 x.register(new _dispose.DisposeService({
   disposeOnExit: true
-}));
+}), new _log.LogService());

package/lib/cli/templates/crons.ts

@@ -1,2 +1,2 @@
-// @index(['../../src/crons/**/*.ts', '!**/_*'], (f, _) => `import '${f.path}'`)
+// @index(['../../src/crons/**/*.ts', '!**/_*', '!**/_*/**'], (f, _) => `import '${f.path}'`)
 // @endindex

package/lib/cli/templates/handlers.ts

@@ -1,3 +1,3 @@
-// @index(['../../src/handlers/**/*.ts', '!**/_*'], (f, _) => `export * as __${_.pascal(f.path.replace('/src/handlers/', ''))}__ from '${f.path}'`)
+// @index(['../../src/handlers/**/*.ts', '!**/_*', '!**/_*/**'], (f, _) => `export * as __${_.pascal(f.path.replace('/src/handlers/', ''))}__ from '${f.path}'`)
 
 // @endindex

package/lib/cli/templates/hooks.ts

@@ -1,2 +1,2 @@
-// @index(['../../src/hooks/**/*.ts', '!**/_*'], (f, _) => `import '${f.path}'`)
+// @index(['../../src/hooks/**/*.ts', '!**/_*', '!**/_*/**'], (f, _) => `import '${f.path}'`)
 // @endindex

package/lib/cli/templates/routes.ts

@@ -2,7 +2,7 @@ import * as handlers from './handlers'
 import { Handler, XServer } from '@jayfong/x-server'
 
 const basePathWithHandlers: Array<[string, Record<string, Handler>]> = [
-  // @index(['../../src/handlers/**/*.ts', '!**/_*'], (f, _) => `['${(f.path+'/').replace('../../src/handlers/', '/').replace(/\/index\/$/, '/').split('/').map(v => _.snake(v)).join('/')}', handlers.__${_.pascal(f.path.replace('/src/handlers/', ''))}__ as any],`)
+  // @index(['../../src/handlers/**/*.ts', '!**/_*', '!**/_*/**'], (f, _) => `['${(f.path+'/').replace('../../src/handlers/', '/').replace(/\/index\/$/, '/').split('/').map(v => _.snake(v)).join('/')}', handlers.__${_.pascal(f.path.replace('/src/handlers/', ''))}__ as any],`)
   // @endindex
 ]
 
@@ -13,7 +13,7 @@ type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (
   ? I
   : never
 type RouteMap = {
-  // @index(['../../src/handlers/**/*.ts', '!**/_*'], (f, _) => `'${(f.path+'/').replace('../../src/handlers/', '/').replace(/\/index\/$/, '/').split('/').map(v => _.snake(v)).join('/')}': typeof handlers.__${_.pascal(f.path.replace('/src/handlers/', ''))}__,`)
+  // @index(['../../src/handlers/**/*.ts', '!**/_*', '!**/_*/**'], (f, _) => `'${(f.path+'/').replace('../../src/handlers/', '/').replace(/\/index\/$/, '/').split('/').map(v => _.snake(v)).join('/')}': typeof handlers.__${_.pascal(f.path.replace('/src/handlers/', ''))}__,`)
   // @endindex
 }
 export type HandlerMap = UnionToIntersection<

package/lib/services/log.d.ts

@@ -0,0 +1,13 @@
+import { BaseService } from './base';
+export declare type LogServiceLevel = 'error' | 'info';
+export declare class LogService implements BaseService {
+    serviceName: string;
+    log(level: LogServiceLevel, message: any): void;
+    error(message: any): void;
+    info(message: any): void;
+}
+declare module '../x' {
+    interface X {
+        log: LogService;
+    }
+}

package/lib/services/log.js

@@ -0,0 +1,19 @@
+import { formatDate } from 'vtils/date';
+export class LogService {
+  constructor() {
+    this.serviceName = 'log';
+  }
+
+  log(level, message) {
+    console[level === 'error' ? 'error' : 'log'](`[${formatDate(new Date(), 'yyyy-mm-dd hh:ii:ss')}] ${level.toUpperCase()} - ${message}`);
+  }
+
+  error(message) {
+    this.log('error', message);
+  }
+
+  info(message) {
+    this.log('info', message);
+  }
+
+}

package/lib/x.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="node" />
 import { BaseService } from './services/base';
 import './services/dispose';
+import './services/log';
 export interface X {
     readonly appId: string;
     readonly env: NodeJS.ProcessEnv;

package/lib/x.js

@@ -1,4 +1,5 @@
 import { DisposeService } from "./services/dispose";
+import { LogService } from "./services/log";
 const env = JSON.parse(process.env.X_SERVER_ENVS || '{}');
 export const x = {
   appId: env.APP_ID,
@@ -12,4 +13,4 @@ export const x = {
 };
 x.register(new DisposeService({
   disposeOnExit: true
-}));
+}), new LogService());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jayfong/x-server",
-  "version": "2.2.0",
+  "version": "2.2.2",
   "license": "ISC",
   "sideEffects": false,
   "main": "lib/_cjs/index.js",