lemon-core 4.3.0 → 5.0.1

package/dist/extended/cores/types.d.ts

@@ -4,233 +4,11 @@
  *
  * @author      Steve <steve@lemoncloud.io>
  * @date        2022-06-21 optimized w/ `abstract-services`
- * @date        2022-06-28 added `Codable` interface for general types.
- * @date        2023-01-18 optimized with `lemon-core@3.2.4`
- * @date        2023-02-15 optimized with `lemon-core@3.2.5`
  * @date        2024-11-14 optimized `IdentityToken`.
+ * @date        2026-10-28 v5 B3: re-export only — the single definition lives in `helpers/types.ts`.
  *
  * @copyright   (C) 2022 LemonCloud Co Ltd. - All Rights Reserved.
  * @origin      `@lemoncloud/lemon-templates-api/cores`
  */
-import { NextIdentity, CoreModel, View, Body } from 'lemon-model';
-export type { CoreModel, View, Body };
-/** type: `IdentityTokenSite` */
-export interface IdentityTokenSite {
-    /** site-code (ex: kwonsun) */
-    code?: string;
-    /** name of site (ex: 권선) */
-    name?: string;
-}
-/** type: `IdentityTokenUser` */
-export interface IdentityTokenUser {
-    /** name of user (ex: 홍길동) */
-    name?: string;
-    /** nick of user (ex: 홍사마) */
-    nick?: string;
-    /** (optional) login-id of user */
-    login?: string;
-    /** (optional) email of user */
-    email?: string;
-}
-/** type: `IdentityTokenGroup` */
-export interface IdentityTokenGroup {
-    /** site-code (ex: kwonsun) */
-    code?: string;
-    /** name of site (ex: 권선) */
-    name?: string;
-}
-/**
- * type: `IdentityToken` (named as `session`)
- * - 계정토큰(= JWT(IdentityToken))으로, `/refresh`시 AWS Key와 함께 발급됨 (기본, 1일동안 유효함)
- * - `backend-api`에서 조직/그룹/사용자에 맞게 재설정됨!
- * - 세션토큰 검사는 `proxy.getCurrentSession()` 이용하기
- */
-export interface IdentityToken<T = any, U extends IdentityTokenUser = IdentityTokenUser, S extends IdentityTokenSite = IdentityTokenSite, G extends IdentityTokenGroup = IdentityTokenGroup> extends NextIdentity<T> {
-    /**
-     * cloud-id (= id in `AWS ACCOUNT_NO`)
-     * - `#` 일경우, 무시됨.
-     * - aws 계정 수준의 cloud-id
-     */
-    cid: string;
-    /**
-     * site-id (= id in `SiteModel(사이트)`)
-     * - `#` 일경우, 특정 site에 엮이지 않음 (무시됨)
-     * - `0000` 일경우, 기본 site 정보로 환경설정에 따름
-     * - 메인 `backend-api` (see `.iss`)에서 관리되는 `site-model`의 id
-     *
-     * @see SiteModel
-     */
-    sid: string;
-    /**
-     * group-id (= id in `GroupModel(그룹)`)
-     * - `group`은 `user`를 물리적 구분으로 나눠서 생각해볼때 이용가능함.
-     *
-     * @see GroupModel
-     */
-    gid: string;
-    /**
-     * user-id (= id in `UserModel(유저)`)
-     * - 메인 `backend-api` (see `.iss`)에서 관리되는 `user-model`의 id.
-     *
-     * @see UserModel
-     */
-    uid: string;
-    /**
-     * auth-id (= id in `AuthModel(인정정보)`)
-     * - 메인 `backend-api` (see `.iss`)에서 관리되는 `auth-model`의 id.
-     * - 인증 정보를 통해서, 로그인의 추가 상세 정보를 알 수 있음.
-     *
-     * @see AuthModel
-     */
-    aid: string;
-    /**
-     * (optional) delegator-id (= 위임된 게스트 User ID)
-     * - **중계서버(`backend-api`)에서만 유효한 필드.** 다른 시스템(socials 등)은 이 필드를 신뢰하지 말 것.
-     * - 소셜 로그인 세션에서 원본 디바이스 게스트 User ID를 가리킴 (= `AuthModel.linkUserId`).
-     * - 채팅(개인 채팅방) 도메인은 본 신원이 아닌 `did`를 채택하여 게스트의 데이터를 그대로 이용함.
-     * - 게스트 세션이거나 위임이 없을 때는 `undefined`.
-     */
-    did?: string;
-    /**
-     * list of roles  (like `user`, `admin`, `super`)
-     */
-    roles: string[];
-    /**
-     * (optional) internal `identity-id` (= delegated identity)
-     * - `.identityId` 는 aws cognito 인증을 통해서, 현재 인증된 `identity-id`를 알 수 있음
-     * - 다만, `delegated`된 경우에는 위임된 id 가 들어감.
-     *
-     * @deprecated 삭제될 예정! @241114
-     */
-    iid?: string;
-    /**
-     * service-name of issuer
-     * ex) `lemon-backend-api`
-     */
-    iss?: string;
-    /** Site Info */
-    Site: S;
-    /** User Info */
-    User: U;
-    /** (optional) Group Info */
-    Group?: G;
-}
-/**
- * type `ListResult`
- */
-export interface ListResult<T, R = any> {
-    /**
-     * total searched count
-     */
-    total?: number;
-    /**
-     * max items count in the page
-     */
-    limit?: number;
-    /**
-     * current page number.
-     */
-    page?: number;
-    /**
-     * (optional) time took in sec
-     */
-    took?: number;
-    /**
-     * items searched
-     */
-    list: T[];
-    /**
-     * (optional) aggr list
-     */
-    aggr?: R | R[];
-}
-export interface AggrResult {
-    [key: string]: {
-        [key: string]: number;
-    };
-}
-export interface AggrKeyCount {
-    /** name of key(or bucket name) */
-    key: string;
-    /** number of count */
-    val: number;
-}
-/**
- * type `PaginatedListResult`
- */
-export interface PaginatedListResult<T, R = string> extends ListResult<T, R> {
-    /**
-     * current page
-     */
-    page: number;
-}
-/**
- * type `ListParam`
- */
-export interface ListParam {
-    /**
-     * max items count to be fetched
-     */
-    limit?: number;
-    /**
-     * (optional) sorting order
-     *  - 'asc': older first
-     *  - 'desc': newer first
-     *  - string: extended sorting features
-     */
-    sort?: 'asc' | 'desc' | string;
-}
-/**
- * type `PaginateParam`
- */
-export interface PaginateParam extends ListParam {
-    /**
-     * page # to fetch (0-indexed)
-     */
-    page?: number;
-    /**
-     * (optional) offset # from start.
-     */
-    offset?: number;
-    /**
-     * (optional) flag to filter by uid
-     */
-    uid?: string;
-    /**
-     * (optional) flag to filter by sid (only for admin role)
-     */
-    sid?: string;
-}
-/**
- * type `BulkUpdateBody`
- */
-export interface BulkUpdateBody<T> extends BulkBody<T> {
-    /**
-     * list bulk update model with id
-     */
-    list: T[];
-}
-/**
- * body data for bulk
- */
-export interface BulkBody<T> {
-    list: T[];
-}
-/**
- * list of the selected model-id
- */
-export interface BodyList<T extends {
-    id: string;
-} = {
-    id: string;
-}> {
-    list: T[];
-}
-/**
- * type `BulkItemsResult`
- */
-export interface BulkItemsResult {
-    success: number;
-    failed: number;
-    failedItems: any[];
-}
+export * from '../../helpers/types';
+export type { CoreModel, View, Body } from 'lemon-model';

package/dist/extended/cores/types.js

@@ -1,3 +1,31 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * `types.ts`
+ * - common types used in `/cores`
+ *
+ * @author      Steve <steve@lemoncloud.io>
+ * @date        2022-06-21 optimized w/ `abstract-services`
+ * @date        2024-11-14 optimized `IdentityToken`.
+ * @date        2026-10-28 v5 B3: re-export only — the single definition lives in `helpers/types.ts`.
+ *
+ * @copyright   (C) 2022 LemonCloud Co Ltd. - All Rights Reserved.
+ * @origin      `@lemoncloud/lemon-templates-api/cores`
+ */
+//* v5 B3: keeps the deep path `dist/extended/cores/types` and the L2 barrel names; one definition (`helpers/types.ts`).
+__exportStar(require("../../helpers/types"), exports);
 //# sourceMappingURL=types.js.map

package/dist/extended/cores/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/extended/cores/types.ts"],"names":[],"mappings":""}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../src/extended/cores/types.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;AAAA;;;;;;;;;;;GAWG;AACH,wHAAwH;AACxH,sDAAoC"}

package/dist/helpers/helpers.d.ts

@@ -8,6 +8,7 @@
  * @date        2021-12-21 protocol support `//self` url.
  * @date        2021-12-23 optimize types of $protocol.
  * @date        2022-03-17 addition text processing. (S2, P)
+ * @date        2026-10-28 v5 B3: single `$T` (L1/L2 merged), single `parseListParam`/`parsePaginateParam`.
  *
  * @copyright (C) 2021 LemonCloud Co Ltd. - All Rights Reserved.
  */
@@ -45,13 +46,17 @@ export declare const $T: {
      */
     S: <T extends string = string>(val: any, def?: string) => T;
     /**
-     * as string w/o white-space.
+     * clear white-spaces and trim.
      */
-    S2: <T extends string = string>(val: any, def?: string, delim?: string) => T;
+    S2: <T extends string = string>(v?: any, def?: string) => T;
     /**
-     * transform to string[]
+     * array string with clear white-spaces and trim
      */
-    SS: <T extends string = string>(val: any, def?: T[]) => T[];
+    SS: <T extends string = string>(v?: any) => T[];
+    /**
+     * remove duplicates from string array using reduce
+     */
+    US: <T extends string = string>(arr: T[]) => T[];
     /**
      * text to Plain text (remove html tag)
      */
@@ -59,7 +64,7 @@ export declare const $T: {
     /**
      * transform to number(integer).
      */
-    N: (v?: boolean | number | string, def?: number) => number;
+    N: (v: boolean | number | string | unknown, def?: number) => number;
     /**
      * number array
      */

package/dist/helpers/helpers.js

@@ -52,6 +52,7 @@ exports.parseRange = parseRange;
  * @date        2021-12-21 protocol support `//self` url.
  * @date        2021-12-23 optimize types of $protocol.
  * @date        2022-03-17 addition text processing. (S2, P)
+ * @date        2026-10-28 v5 B3: single `$T` (L1/L2 merged), single `parseListParam`/`parsePaginateParam`.
  *
  * @copyright (C) 2021 LemonCloud Co Ltd. - All Rights Reserved.
  */
@@ -60,7 +61,7 @@ const engine_1 = __importStar(require("../engine/"));
 const test_helper_1 = require("../common/test-helper");
 const sig_v4_1 = require("../extended/libs/sig-v4");
 const perf_hooks_1 = require("perf_hooks");
-const request_1 = __importDefault(require("request"));
+const http_fetch_1 = require("../lib/http-fetch");
 const query_string_1 = __importDefault(require("query-string"));
 const _B = (val, def = 0) => {
     if (val === null || val === undefined)
@@ -75,6 +76,18 @@ const _N = (val, def = 0) => {
     const n = engine_1.$U.N(val, def);
     return Number.isNaN(n) ? def : n;
 };
+//* the former L1 `$T.S2` body (with `delim`) — kept local as the base of the L2 `S2`/`SS`.
+const _S2 = (val, def = '', delim = ' ') => `${val ?? def}`.replace(/\s+/g, delim).trim();
+//* the former L1 `$T.SS` body — kept local: the L2 `SS` splits a non-array value with it.
+const _SS = (val, def = []) => {
+    if (val === null || val === undefined)
+        return def;
+    if (typeof val === 'string')
+        return val ? val.split(',').map(_ => _S2(_)) : def;
+    if (Array.isArray(val))
+        return val.length > 0 ? val.map(_ => exports.$T.S(_, '')) : def;
+    return [exports.$T.S(val)];
+};
 /**
  * list param parser
  * @param param
@@ -119,27 +132,31 @@ options) {
 /**
  * Helpers to transform data-types.
  */
+//* v5 B3: the single `$T` (32 members; L1 + the L2 `S2`/`SS`/`N`/`US`). `extended/cores/commons.ts` re-exports it.
 exports.$T = {
     /**
      * transform to string w/ trim()
      */
     S: (val, def = '') => `${val ?? def}`.trim(),
     /**
-     * as string w/o white-space.
+     * clear white-spaces and trim.
      */
-    S2: (val, def = '', delim = ' ') => `${val ?? def}`.replace(/\s+/g, delim).trim(),
+    //* v5 B3: L2 body (the root `$T` already had it) — a 3rd `delim` argument is no longer honoured.
+    S2: (v, def = '') => _S2(v, def).trim(),
     /**
-     * transform to string[]
+     * array string with clear white-spaces and trim
      */
-    SS: (val, def = []) => {
-        if (val === null || val === undefined)
-            return def;
-        if (typeof val === 'string')
-            return val ? val.split(',').map(_ => exports.$T.S2(_)) : def;
-        if (Array.isArray(val))
-            return val.length > 0 ? val.map(_ => exports.$T.S(_, '')) : def;
-        return [exports.$T.S(val)];
-    },
+    //* v5 B3: L2 body — `def` is not taken; array items get their inner white-spaces collapsed too.
+    SS: (v) => (v && Array.isArray(v) ? v : _SS(v)).map(v => _S2(v, '').trim()),
+    /**
+     * remove duplicates from string array using reduce
+     */
+    //* v5 B3: moved from the L2 `$T` (`extended/cores/commons.ts`) so one object has all 32 members.
+    US: (arr) => arr?.reduce((acc, v) => {
+        if (!acc.includes(v))
+            acc.push(v);
+        return acc;
+    }, []) ?? [],
     /**
      * text to Plain text (remove html tag)
      */
@@ -154,6 +171,7 @@ exports.$T = {
     /**
      * transform to number(integer).
      */
+    //* v5 B3: L2 signature (`unknown` accepted); same result as before.
     N: (v, def = 0) => typeof v === 'boolean' ? (v ? 1 : 0) : typeof v === 'number' || typeof v === 'string' ? _N(v, def) : def,
     /**
      * number array
@@ -715,7 +733,8 @@ exports.$event = $event;
  */
 function getIdentityId(context) {
     const identityId = context?.identity?.identityId;
-    if (!identityId && context?.domain === 'localhost') {
+    //* v5: `env[LOCAL_ACCOUNT]` only in local mode, never from `context.domain` (B5 § 6.3).
+    if (!identityId && engine_1.$U.isLocalMode()) {
         //* use `env[LOCAL_ACCOUNT]` only if runs in local server.
         return engine_1.$U.env('LOCAL_ACCOUNT', '');
     }
@@ -731,8 +750,8 @@ function getIdentityId(context) {
  */
 function isUserAuthorized(context, params) {
     const identityId = getIdentityId(context);
-    //WARN - in local server, override the identity w/ param
-    if (context?.domain === 'localhost') {
+    //WARN - in local server, override the identity w/ param (v5: local mode only — B5 § 6.3)
+    if (engine_1.$U.isLocalMode()) {
         //!* override with optional parameter.
         if (context) {
             context.identity = {
@@ -911,14 +930,17 @@ options) => {
                 (_isNa(path1) ? '' : `/${encoder('host', path1)}`) +
                 (_isNa(path1) && _isNa(path2) ? '' : `/${encoder('path', path2)}`) +
                 (!query_string ? '' : '?' + query_string);
-            const request = request_1.default;
+            //* serialize the body once: the same string is signed and sent.
+            const json = (0, http_fetch_1.isJsonBody)($body);
+            const payload = (0, http_fetch_1.toPayload)($body, json);
             const options = {
                 method,
                 uri: url,
                 headers: { ...this.headers },
-                body: $body === null ? undefined : $body,
-                json: typeof $body === 'string' ? false : true,
+                body: payload,
+                json,
             };
+            //* sign with SigV4 (the signed body is the exact `payload` string)
             if (sigClient) {
                 const signedRequest = sigClient.signRequest({
                     method,
@@ -926,7 +948,7 @@ options) => {
                         (_isNa(path1) && _isNa(path2) ? '' : `/${encoder('path', path2)}`),
                     queryParams: $param,
                     headers: options.headers,
-                    body: $body,
+                    body: payload,
                 });
                 options.headers = { ...options.headers, ...signedRequest.headers };
                 options.uri = signedRequest.url;
@@ -945,44 +967,10 @@ options) => {
             _log(NS, ' url :=', options.method, url);
             _log(NS, '*', options.method, url, options.json ? 'json' : 'plain');
             _log(NS, '> options =', engine_1.$U.json(options));
-            //* returns promise
-            return new Promise((resolve, reject) => {
-                //* start request..
-                request(options, function (error, response, body) {
-                    error && _err(NS, '>>>>> requested! err=', error);
-                    if (error)
-                        return reject(error instanceof Error ? error : new Error((0, test_helper_1.GETERR)(error)));
-                    //* detect trouble.
-                    const statusCode = response.statusCode;
-                    const statusMessage = response.statusMessage;
-                    //* if not in success
-                    if (statusCode !== 200 && statusCode !== 201) {
-                        const msg = body ? (0, test_helper_1.GETERR)(body) : `${statusMessage || ''}`;
-                        if (statusCode === 400 || statusCode === 404) {
-                            const title = `${(statusCode == 404 ? '' : statusMessage) || 'NOT FOUND'}`.toUpperCase();
-                            const message = msg.startsWith('404 NOT FOUND') ? msg : `${statusCode} ${title} - ${msg}`;
-                            return reject(new Error(message));
-                        }
-                        statusMessage && _log(NS, `> statusMessage[${statusCode}] =`, statusMessage);
-                        body && _log(NS, `> body[${statusCode}] =`, engine_1.$U.json(body));
-                        return reject(new Error(`${statusCode} ${statusMessage || 'FAILURE'} - ${msg}`));
-                    }
-                    //* try to parse body.
-                    try {
-                        if (body && typeof body == 'string' && body.startsWith('{') && body.endsWith('}')) {
-                            body = JSON.parse(body);
-                        }
-                        else if (body && typeof body == 'string' && body.startsWith('[') && body.endsWith(']')) {
-                            body = JSON.parse(body);
-                        }
-                    }
-                    catch (e) {
-                        _err(NS, '!WARN! parse(body) =', e instanceof Error ? e : engine_1.$U.json(e));
-                    }
-                    //* ok! succeeded.
-                    resolve(body);
-                });
-            }).then((res) => {
+            //* send via `fetch` (status check, error format and body parse in `http-fetch`)
+            const logger = { log: (...a) => _log(NS, ...a), err: (...a) => _err(NS, ...a) };
+            const req = { method, url: options.uri, headers: options.headers, payload, json };
+            return (0, http_fetch_1.fetchProxyBody)(req, logger).then((res) => {
                 if (resultKey && res && res[resultKey] !== undefined)
                     return res[resultKey];
                 return res;