@asapjs/error 1.0.0-alpha.0 → 1.0.0-alpha.1

package/dist/factory.js

@@ -6,7 +6,8 @@ exports.markSwaggerAsReady = markSwaggerAsReady;
 // addScheme will be injected at runtime
 let addSchemeFunc = () => { };
 const types_1 = require("./types");
-const schema_1 = require("./schema");
+const schema_1 = require("@asapjs/schema");
+const schema_2 = require("./schema");
 // 지연 등록을 위한 큐
 const pendingSchemas = [];
 let isSwaggerReady = false;
@@ -23,11 +24,11 @@ function error(status, code, message, schema) {
     const creator = ((data) => {
         // 스키마 등록 확인 (첫 사용 시)
         ensureSchemaRegistered(code, status, message, schema);
-        // 데이터 유효성 검사
-        (0, schema_1.validateDataWithSchema)(data, schema);
+        // 스키마로 데이터만 매핑 (유효성 검사 없음, 예: "1" → 1)
+        const mappedData = (0, schema_1.mapDataWithSchema)(data && typeof data === 'object' ? data : {}, schema);
         // 메시지 템플릿 처리 (예: "사용자 {userId}를 찾을 수 없습니다")
-        const finalMessage = interpolateMessage(message, data);
-        return new types_1.HttpError(status, code, finalMessage, data);
+        const finalMessage = interpolateMessage(message, mappedData);
+        return new types_1.HttpError(status, code, finalMessage, mappedData);
     });
     // 메타데이터 저장 (Swagger 문서화용)
     creator._status = status;
@@ -69,7 +70,7 @@ function registerErrorSwaggerSchema(code, status, message, schema) {
             data: {
                 type: 'object',
                 properties: Object.entries(schema).reduce((acc, [key, typeIs]) => {
-                    acc[key] = (0, schema_1.typeIsToSwaggerSchema)(typeIs);
+                    acc[key] = (0, schema_2.typeIsToSwaggerSchema)(typeIs);
                     return acc;
                 }, {}),
             },

package/dist/middleware.js

@@ -56,18 +56,40 @@ const effectErrorHandler = (error, req, res, next) => {
 exports.effectErrorHandler = effectErrorHandler;
 function wrapWithEffect(handler) {
     return async (...args) => {
-        const [req, res, next] = args;
+        var _a, _b, _c, _d;
+        // asapjs/router Wrapper는 cb(args)로 호출 → 인자 1개가 ExecuteArgs
+        const isExecuteArgs = args.length === 1 &&
+            args[0] != null &&
+            typeof args[0] === 'object' &&
+            'req' in args[0] &&
+            'res' in args[0];
+        const req = isExecuteArgs
+            ? args[0].req
+            : args[0];
+        const next = isExecuteArgs
+            ? undefined
+            : args[2];
         try {
             const effect = effect_1.Effect.promise(() => handler(...args));
-            const traced = effect_1.Effect.withSpan(effect, `${req.method} ${req.path}`, {
+            const traced = effect_1.Effect.withSpan(effect, `${(_a = req === null || req === void 0 ? void 0 : req.method) !== null && _a !== void 0 ? _a : 'unknown'} ${(_b = req === null || req === void 0 ? void 0 : req.path) !== null && _b !== void 0 ? _b : ''}`, {
                 attributes: {
-                    'http.method': req.method,
-                    'http.path': req.path,
-                    'http.request_id': req.id || 'unknown',
+                    'http.method': (_c = req === null || req === void 0 ? void 0 : req.method) !== null && _c !== void 0 ? _c : 'unknown',
+                    'http.path': (_d = req === null || req === void 0 ? void 0 : req.path) !== null && _d !== void 0 ? _d : '',
+                    'http.request_id': (req === null || req === void 0 ? void 0 : req.id) || 'unknown',
                 },
             });
-            const result = await effect_1.Effect.runPromise(traced);
-            return result;
+            const exit = await effect_1.Effect.runPromiseExit(traced);
+            if (effect_1.Exit.isFailure(exit)) {
+                const originalError = (0, helpers_1.causeToError)(exit.cause);
+                if (next) {
+                    next(originalError);
+                }
+                else {
+                    throw originalError;
+                }
+                return;
+            }
+            return exit.value;
         }
         catch (error) {
             if (next) {

package/dist/schema.d.ts

@@ -1,3 +1,5 @@
-import { SchemaType } from '@asapjs/schema';
-export declare function typeIsToSwaggerSchema(typeIs: SchemaType): any;
-export declare function validateDataWithSchema(data: any, schema: Record<string, any>): void;
+import type { SchemaType } from '@asapjs/schema';
+/**
+ * Swagger 스키마 생성용. error 패키지 내부에서만 사용.
+ */
+export declare function typeIsToSwaggerSchema(typeIs: SchemaType | (() => SchemaType)): any;

package/dist/schema.js

@@ -1,38 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.typeIsToSwaggerSchema = typeIsToSwaggerSchema;
-exports.validateDataWithSchema = validateDataWithSchema;
+/**
+ * Swagger 스키마 생성용. error 패키지 내부에서만 사용.
+ */
 function typeIsToSwaggerSchema(typeIs) {
-    // @asapjs/schema의 toSwagger 메서드 사용
-    if (typeIs.toSwagger) {
-        return typeIs.toSwagger();
+    const schemaType = typeof typeIs === 'function' ? typeIs() : typeIs;
+    if (schemaType.toSwagger) {
+        return schemaType.toSwagger();
     }
-    // fallback
     return { type: 'string' };
 }
-function validateDataWithSchema(data, schema) {
-    if (!data || typeof data !== 'object') {
-        throw new Error('Invalid data: must be an object');
-    }
-    for (const [key, typeIs] of Object.entries(schema)) {
-        const value = data[key];
-        // TypeIs가 함수로 전달된 경우 실행
-        const schemaType = typeof typeIs === 'function' ? typeIs() : typeIs;
-        // optional 여부 확인
-        const isOptional = schemaType.__options.optional || false;
-        // 필수 필드 체크
-        if (value === undefined && !isOptional) {
-            throw new Error(`Missing required field: ${key}`);
-        }
-        // 값이 있을 때만 타입 체크
-        if (value !== undefined) {
-            validateFieldType(key, value, schemaType);
-        }
-    }
-}
-function validateFieldType(fieldName, value, schemaType) {
-    // @asapjs/schema의 validate 메서드 사용
-    if (!schemaType.validate(value)) {
-        throw new Error(`Field '${fieldName}' has invalid type for ${schemaType.__name}`);
-    }
-}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@asapjs/error",
-  "version": "1.0.0-alpha.0",
+  "version": "1.0.0-alpha.1",
   "description": "Error handling utilities for ASAP.js with Effect integration",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,7 +13,7 @@
   },
   "dependencies": {
     "@asapjs/common": "1.0.0-alpha.0",
-    "@asapjs/schema": "1.0.0-alpha.0",
+    "@asapjs/schema": "1.0.0-alpha.1",
     "@asapjs/types": "1.0.0-alpha.0",
     "effect": "^3.11.11",
     "express": "^4.17.3"
@@ -28,5 +28,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "79561e3604dc505813035558d1bfcc6cda0b088a"
+  "gitHead": "84779254dfe56c6e01cfa219b6234058cae9aca8"
 }