inanis 0.0.7-beta.13 → 0.0.7-beta.15

package/dist/api/method.js

@@ -144,6 +144,7 @@ export class Method {
                         if (event.headers['x-warm-up'] === '1') {
                             console.log('warm-up:', (new Date()).toISOString());
                             return resolve({
+                                headers,
                                 statusCode: 200,
                                 body: JSON.stringify({
                                     message: 'warm-up'
@@ -307,7 +308,8 @@ export class Method {
                     for (let key in attrs) {
                         const doc = docs.query?.[key] || {};
                         const schema = attrs[key];
-                        const isOptional = schema.isOptional();
+                        const isNumber = schema.safeParse(0).success || schema.type === 'number';
+                        const isOptional = schema.safeParse(null).success || schema.safeParse(undefined).success;
                         output.parameters.push({
                             in: 'query',
                             name: key,
@@ -315,7 +317,7 @@ export class Method {
                             example: doc.example,
                             required: !isOptional,
                             schema: {
-                                type: 'string'
+                                type: isNumber ? 'number' : 'string'
                             }
                         });
                     }

package/dist/build-tools/swagger-to-types.js

@@ -30,6 +30,9 @@ class OpenApiReader {
             if (data.enum) {
                 output.enum = data.enum;
             }
+            if (data.nullable) {
+                output.type = [data.type, 'null'];
+            }
             if (data.description) {
                 output.description = descBeautify(`
                     ${data.description}
@@ -47,6 +50,9 @@ class OpenApiReader {
         };
         for (let key in data.properties) {
             let property = data.properties[key];
+            if (property.nullable && Array.isArray(output.required)) {
+                output.required = output.required.filter(e => e !== key);
+            }
             if (output.properties) {
                 output.properties[key] = this.schemaToJsonSchema(property);
             }

package/dist/document-db/index.js

@@ -141,7 +141,7 @@ export class DocumentDbManager extends Hook {
                             AttributeName: 'expiredAt'
                         };
                     }
-                    for (let [key, value] of Object.entries(table.params.indexs)) {
+                    for (let [key, value] of Object.entries(table.params.indexes)) {
                         const attr = value;
                         keys.push(attr.primaryKey);
                         const KeySchema = [

package/dist/document-db/table-dynamo.js

@@ -69,7 +69,7 @@ export class DynamoDbTable {
         };
     }
     async getByIndexId(indexName, primary, secondary) {
-        let { primaryKey, secondaryKey } = this.params.indexs[indexName];
+        let { primaryKey, secondaryKey } = this.params.indexes[indexName];
         let KeyConditionExpression = '#P = :P';
         let ExpressionAttributeNames = {
             '#P': primaryKey
@@ -95,7 +95,7 @@ export class DynamoDbTable {
         return Items[0];
     }
     async listByIndexId(indexName, primary, secondary, options) {
-        let { primaryKey, secondaryKey } = this.params.indexs[indexName];
+        let { primaryKey, secondaryKey } = this.params.indexes[indexName];
         let params = {
             Limit: options.limit,
             TableName: this.tableName,
@@ -152,7 +152,7 @@ export class DynamoDbTable {
         return result;
     }
     async listByIndexIdWithTime(indexName, primary, secondary, before, options) {
-        let { primaryKey, secondaryKey } = this.params.indexs[indexName];
+        let { primaryKey, secondaryKey } = this.params.indexes[indexName];
         let params = {
             Limit: options.limit,
             TableName: this.tableName,
@@ -193,7 +193,7 @@ export class DynamoDbTable {
         return result;
     }
     async betweenByIndexId(indexName, primary, secondary, options) {
-        let { primaryKey, secondaryKey } = this.params.indexs[indexName];
+        let { primaryKey, secondaryKey } = this.params.indexes[indexName];
         let params = {
             Limit: options.limit,
             TableName: this.tableName,
@@ -230,7 +230,7 @@ export class DynamoDbTable {
         return Count;
     }
     async countByIndexId(indexName, primary) {
-        let { primaryKey } = this.params.indexs[indexName];
+        let { primaryKey } = this.params.indexes[indexName];
         let params = {
             Select: 'COUNT',
             TableName: this.tableName,

package/dist/document-db/table-mongo.js

@@ -72,7 +72,7 @@ export class MongoCollection {
         };
     }
     async getByIndexId(indexName, primary, secondary) {
-        let { primaryKey, secondaryKey } = this.params.indexs[indexName];
+        let { primaryKey, secondaryKey } = this.params.indexes[indexName];
         let { items } = await this.find({
             [primaryKey]: primary,
             [secondaryKey]: secondary
@@ -82,7 +82,7 @@ export class MongoCollection {
         return items[0];
     }
     async listByIndexId(indexName, primary, secondary, options) {
-        let { primaryKey, secondaryKey } = this.params.indexs[indexName];
+        let { primaryKey, secondaryKey } = this.params.indexes[indexName];
         let { nextKey, items } = await this.find({
             [primaryKey]: primary,
             [secondaryKey]: secondary
@@ -116,7 +116,7 @@ export class MongoCollection {
         };
     }
     async betweenByIndexId(indexName, primary, secondary, options) {
-        let { primaryKey, secondaryKey } = this.params.indexs[indexName];
+        let { primaryKey, secondaryKey } = this.params.indexes[indexName];
         let { items, nextKey } = await this.find({
             [primaryKey]: primary,
             [secondaryKey]: {
@@ -141,7 +141,7 @@ export class MongoCollection {
         };
     }
     async listByIndexIdWithTime(indexName, primary, secondary, before, options) {
-        let { primaryKey, secondaryKey } = this.params.indexs[indexName];
+        let { primaryKey, secondaryKey } = this.params.indexes[indexName];
         let { items, nextKey } = await this.find({
             [primaryKey]: primary,
             [secondaryKey]: before ? { $lt: secondary } : { $gt: secondary }
@@ -158,7 +158,7 @@ export class MongoCollection {
         return count;
     }
     async countByIndexId(indexName, primary) {
-        let { primaryKey } = this.params.indexs[indexName];
+        let { primaryKey } = this.params.indexes[indexName];
         let count = await this.collection.countDocuments({
             [primaryKey]: primary
         });

package/dist/document-db/table.d.ts

@@ -18,7 +18,7 @@ export type AttrToCalculate<T> = {
 };
 export type TableParams<T = any, ID = any, PK = any, SK = any> = {
     ttl?: number;
-    indexs: ID;
+    indexes: ID;
     tableName: string;
     primaryKey: PK;
     secondaryKey: SK;

package/dist/modules/data-model.d.ts

@@ -58,6 +58,8 @@ export declare class DataModel<T extends DataModelConfig<any, any, any>, D exten
     data: D;
     constructor(config: T, data: T['_initData']);
     getPublic(): Pick<D, PublicKey>;
+    copy(): this;
+    from(source: Partial<D> | DataModel<T, D, PublicKey>): void;
     save(reader?: (_data: D) => Partial<D>): Promise<void>;
     remove(): Promise<void>;
 }

package/dist/modules/data-model.js

@@ -96,6 +96,15 @@ export class DataModel {
         }
         return output;
     }
+    copy() {
+        const newData = structuredClone(this.data);
+        const model = new DataModel(this._config, newData);
+        return model;
+    }
+    from(source) {
+        const data = source instanceof DataModel ? source.data : source;
+        Object.assign(this.data, data);
+    }
     async save(reader = data => data) {
         const table = this._config.table;
         const params = table.params;

package/dist/stream/context.d.ts

@@ -15,6 +15,10 @@ type Events = {
     after: any;
 };
 export declare class StreamRouterContext<Path extends string = any, Body extends Record<string, any> = any, Query extends Record<string, any> = any, Chunk extends Record<string, any> = any, Messages extends FailData = any> {
+    _isEnd: boolean;
+    _emitter: Event<{
+        close: Record<string, unknown>;
+    }>;
     ip: string;
     meta: Record<any, any>;
     mode: RunningMode;
@@ -31,13 +35,9 @@ export declare class StreamRouterContext<Path extends string = any, Body extends
     interaction: Interaction;
     interactionStepMessage: string;
     methodStream: ResponseStream;
-    _isEnd: boolean;
-    _emitter: Event<{
-        lostConnection: Record<string, unknown>;
-    }>;
     constructor(method: Method);
+    get on(): typeof this._emitter.on;
     static fromAwsLambda(method: Method, event: APIGatewayEvent, responseStream: ResponseStream): Promise<StreamRouterContext<any, any, any, any, any>>;
-    get on(): any;
     _validate(): void;
     isEnded(): boolean;
     step(name: string): void;

package/dist/stream/context.js

@@ -5,6 +5,8 @@ import { rootException } from '../exception.js';
 import { ValidationError } from '../utils/errors.js';
 const exception = rootException.checkout('Api/Context');
 export class StreamRouterContext {
+    _isEnd = false;
+    _emitter = new Event();
     ip = '';
     meta = {};
     mode = 'lambda';
@@ -21,8 +23,6 @@ export class StreamRouterContext {
     interaction;
     interactionStepMessage = '';
     methodStream;
-    _isEnd = false;
-    _emitter = new Event();
     constructor(method) {
         this.method = method;
         this.interaction = new Interaction({
@@ -35,11 +35,14 @@ export class StreamRouterContext {
         // 綁定協助解構
         const methods = Object.getOwnPropertyNames(StreamRouterContext.prototype);
         for (let key of methods) {
-            if (key !== 'constructor' && typeof this[key] === 'function') {
+            if (key !== 'on' && key !== 'constructor' && typeof this[key] === 'function') {
                 this[key] = this[key].bind(this);
             }
         }
     }
+    get on() {
+        return this._emitter.on.bind(this._emitter);
+    }
     static async fromAwsLambda(method, event, responseStream) {
         const context = new StreamRouterContext(method);
         const xForwardedFor = event.headers['X-Forwarded-For']; // cloudfront
@@ -54,11 +57,11 @@ export class StreamRouterContext {
         context.language = event.headers?.['Accept-Language'] || '';
         context.methodStream = responseStream;
         context.body = json.nonStrictJSONParse(event.body || '{}');
+        responseStream.on('close', () => {
+            context._emitter.emit('close', {});
+        });
         return context;
     }
-    get on() {
-        return this._emitter.on.bind(this._emitter);
-    }
     _validate() {
         try {
             if (this.method.verify.body) {

package/dist/stream/index.d.ts

@@ -4,9 +4,8 @@ import { exportOpenApi } from './export-open-api.js';
 import { Router, RouterParams, Methods } from './router.js';
 import { AnyError } from '../utils/errors.js';
 import { Handler } from 'aws-lambda';
-export interface ResponseStream {
-    write(data: string | boolean): void;
-    end(): void;
+import { Writable } from 'stream';
+export interface ResponseStream extends Writable {
     setContentType(type: string): void;
 }
 export type FailData = Record<string, {
@@ -35,9 +34,9 @@ export declare class StreamAPIManager extends Event<Channels> {
     routers: Router[];
     constructor(params: Params);
     _injectInanis(inanis: Inanis): void;
-    createRoute<Path extends string, Fails extends FailData, Headers extends string>(params: RouterParams<Path, Fails, Headers>): Router<Path, Fails, Headers>;
+    createRoute<Path extends string, Headers extends string>(params: RouterParams<Path, Headers>): Router<Path, Headers>;
     eachMethods(cb: (_route: Router, _method: keyof Methods) => void): void;
-    getRouter(path: string): Router<any, any, string>;
+    getRouter(path: string): Router<any, string>;
     getMethod(path: string, method: keyof Methods): import("./method.js").Method<any, any, any, any, any>;
     get outputs(): {
         toTypes: () => Promise<string>;

package/dist/stream/index.js

@@ -5,6 +5,15 @@ import { rootException } from '../exception.js';
 import { exportOpenApi } from './export-open-api.js';
 import { Router } from './router.js';
 import { toRouterName } from '../utils/string.js';
+import { streamifyResponse, isInAWS } from 'lambda-stream';
+if (isInAWS() === false) {
+    global['awslambda'] = {
+        streamifyResponse,
+        HttpResponseStream: {
+            from: () => null
+        }
+    };
+}
 const exception = rootException.checkout('APIManager');
 const getLambdaGroup = (manager, method, path) => {
     let sourcePath = `${method}@${path}`;
@@ -123,6 +132,15 @@ export class StreamAPIManager extends Event {
                     const handlerName = group.handlerName + appendHandleName;
                     if (outputs[handlerName] == null) {
                         outputs[handlerName] = awslambda.streamifyResponse(async (event, responseStream) => {
+                            const httpResponseMetadata = {
+                                statusCode: 200,
+                                headers: {
+                                    'Content-Type': 'text/event-stream',
+                                    'Access-Control-Allow-Origin': '*',
+                                    'Access-Control-Allow-Credentials': 'true'
+                                }
+                            };
+                            responseStream = awslambda.HttpResponseStream.from(responseStream, httpResponseMetadata);
                             let callPath = event.requestContext.resourcePath;
                             let isOffline = !!this.params.serverless?.isOffline;
                             if (isOffline) {

package/dist/stream/method.d.ts

@@ -47,7 +47,7 @@ export declare class Method<Path extends string = any, Fails extends FailData =
     private handler;
     constructor(router: Router, action: string, params: MethodParams<Path, Body, Query, Chunk, Fails>);
     private get inanis();
-    get fullRouters(): Router<any, any, string>[];
+    get fullRouters(): Router<any, string>[];
     get allowHeaders(): string[];
     run(context: StreamRouterContext): Promise<void>;
     get outputs(): {

package/dist/stream/method.js

@@ -158,7 +158,8 @@ export class Method {
                     for (let key in attrs) {
                         const doc = docs.query?.[key] || {};
                         const schema = attrs[key];
-                        const isOptional = schema.isOptional();
+                        const isNumber = schema.safeParse(0).success || schema.type === 'number';
+                        const isOptional = schema.safeParse(null).success || schema.safeParse(undefined).success;
                         output.parameters.push({
                             in: 'query',
                             name: key,
@@ -166,7 +167,7 @@ export class Method {
                             example: doc.example,
                             required: !isOptional,
                             schema: {
-                                type: 'string'
+                                type: isNumber ? 'number' : 'string'
                             }
                         });
                     }

package/dist/stream/router.d.ts

@@ -11,27 +11,25 @@ export type Methods = {
     get?: Method;
     post?: Method;
 };
-export type RouterParams<Path extends string, Fails extends FailData, Headers extends string> = {
+export type RouterParams<Path extends string, Headers extends string> = {
     path: Path;
     tags?: string[];
-    failMessages: Fails;
     allowHeaders?: Headers[];
     authorizerExpression?: AuthorizerExpression;
 };
-export declare class Router<Path extends string = any, Fails extends FailData = any, Headers extends string = string> {
+export declare class Router<Path extends string = any, Headers extends string = string> {
     tags: string[];
     path: Path;
     manager: StreamAPIManager;
-    failMessages: Fails | null;
     methods: Methods;
     allowHeaders: string[];
     authorizerExpression?: AuthorizerExpression;
-    constructor(manager: StreamAPIManager, params: RouterParams<Path, Fails, Headers>);
+    constructor(manager: StreamAPIManager, params: RouterParams<Path, Headers>);
     get name(): string;
     get fullTags(): string[];
     get schema(): typeof definedValidateSchema;
     get nowAuthorizerExpression(): AuthorizerExpression | null;
-    export(): Record<string, Router<any, any, string>>;
+    export(): Record<string, Router<any, string>>;
     method<Fails extends FailData, Body extends ValidateCallback<any>, Query extends ValidateCallback<any>, Chunk extends ValidateCallback<any>>(key: keyof Router['methods'], params: MethodParams<Path, Body, Query, Chunk, Fails>): Method;
 }
 export {};

package/dist/stream/router.js

@@ -6,14 +6,12 @@ export class Router {
     tags;
     path;
     manager;
-    failMessages = null;
     methods = {};
     allowHeaders;
     authorizerExpression;
     constructor(manager, params) {
         this.path = params.path;
         this.tags = params.tags || [];
-        this.failMessages = params.failMessages;
         this.manager = manager;
         this.allowHeaders = params.allowHeaders || [];
         this.authorizerExpression = params.authorizerExpression;

package/dist/utils/json-schema.d.ts

@@ -1,4 +1,6 @@
 import { z } from 'zod';
 import { ValidateCallback } from './validate.js';
-export declare const zodToJsonSchema: (cb: ValidateCallback<any>) => z.core.JSONSchema.JSONSchema;
+export declare const zodToJsonSchema: (cb: ValidateCallback<any>) => z.core.ZodStandardJSONSchemaPayload<z.ZodObject<{
+    [x: string]: any;
+}, z.core.$strip>>;
 export type JsonSchema = ReturnType<typeof zodToJsonSchema>;

package/dist/utils/json-schema.js

@@ -1,4 +1,6 @@
 import { z, toJSONSchema } from 'zod';
 export const zodToJsonSchema = (cb) => {
-    return toJSONSchema(z.object(cb(z)));
+    return toJSONSchema(z.object(cb(z)), {
+        target: 'openapi-3.0'
+    });
 };

package/dist/utils/validate.js

@@ -3,5 +3,5 @@ export function definedValidateSchema(cb) {
     return cb;
 }
 export function validate(target, schemaCallback) {
-    return z.object(schemaCallback(z)).required().parse(target || {});
+    return z.object(schemaCallback(z)).parse(target || {});
 }

package/package.json

@@ -1,7 +1,7 @@
 {
     "name": "inanis",
     "type": "module",
-    "version": "0.0.7-beta.13",
+    "version": "0.0.7-beta.15",
     "description": "Micro Service Best Tools.",
     "main": "./dist/index.js",
     "scripts": {
@@ -65,6 +65,7 @@
         "json-schema-to-typescript": "^15.0.4",
         "json-to-pretty-yaml": "^1.2.2",
         "jsonwebtoken": "^9.0.2",
+        "lambda-stream": "^0.6.0",
         "mime": "^4.1.0",
         "mongodb": "^7.0.0",
         "node-rsa": "^1.1.1",
@@ -74,7 +75,7 @@
         "redis": "^5.10.0",
         "websocket": "^1.0.35",
         "yaml": "^2.8.2",
-        "zod": "^4.1.13"
+        "zod": "^4.2.1"
     },
     "packageManager": "yarn@4.1.1"
 }