taon 21.0.53 → 21.0.55

package/lib-prod/helpers/class-helpers.js

@@ -1,195 +1,228 @@
-import * as FormData from "form-data";
-import { ___NS__isArray, ___NS__isArrayBuffer, ___NS__isBuffer, ___NS__isDate, ___NS__isFunction, ___NS__isNull, ___NS__isObject, ___NS__isRegExp, ___NS__isString, ___NS__isUndefined, ___NS__uniq, Utils__NS__uniqArray } from "tnp-core/lib-prod";
-import { CLASS } from "typescript-class-helpers/lib-prod";
-import {
-  controllerConfigFrom
-} from "../config/controller-config";
-import { Symbols__NS__classNameStaticProperty, Symbols__NS__fullClassNameStaticProperty, Symbols__NS__metadata, Symbols__NS__orignalClass } from "../symbols";
-import { Validators__NS__classNameVlidation } from "../validators";
-const ClassHelpers__NS__getClassFnFromObject = (json) => {
-  if (___NS__isUndefined(json) || ___NS__isNull(json)) {
-    return;
-  }
-  if (json.constructor) {
-    return json.constructor;
-  }
-  const p = Object.getPrototypeOf(json);
-  return p && p.constructor && p.constructor.name !== "Object" ? p.constructor : void 0;
+//#region imports
+import * as FormData from 'form-data'; // @backend
+import { ___NS__isArray, ___NS__isArrayBuffer, ___NS__isBuffer, ___NS__isDate, ___NS__isFunction, ___NS__isNull, ___NS__isObject, ___NS__isRegExp, ___NS__isString, ___NS__isUndefined, ___NS__uniq, Utils__NS__uniqArray } from 'tnp-core/lib-prod';
+import { CLASS } from 'typescript-class-helpers/lib-prod';
+import { controllerConfigFrom, } from '../config/controller-config';
+import { Symbols__NS__classNameStaticProperty, Symbols__NS__fullClassNameStaticProperty, Symbols__NS__metadata, Symbols__NS__orignalClass } from '../symbols';
+import { Validators__NS__classNameVlidation } from '../validators';
+//#endregion
+//namespace ClassHelpers
+//#region get class from name
+/**
+ * TODO - repalce in every place when getting class fn from object
+ */
+export const ClassHelpers__NS__getClassFnFromObject = (json) => {
+    if (___NS__isUndefined(json) || ___NS__isNull(json)) {
+        return;
+    }
+    if (json.constructor) {
+        return json.constructor;
+    }
+    const p = Object.getPrototypeOf(json);
+    return p && p.constructor && p.constructor.name !== 'Object'
+        ? p.constructor
+        : void 0;
 };
-const ClassHelpers__NS__getName = (classFnOrObject) => {
-  if (classFnOrObject instanceof FormData) {
-    return "FormData";
-  }
-  if (!classFnOrObject) {
-    console.error("OBJECT OR CLASS", classFnOrObject);
-    throw new Error(`Cannot get name from this object or class.`);
-  }
-  return (classFnOrObject[Symbols__NS__classNameStaticProperty] ? classFnOrObject[Symbols__NS__classNameStaticProperty] : classFnOrObject?.constructor[Symbols__NS__classNameStaticProperty]) || (___NS__isFunction(classFnOrObject) ? CLASS.getName(classFnOrObject) : void 0);
+//#endregion
+//#region get name
+export const ClassHelpers__NS__getName = (classFnOrObject) => {
+    // exception for FormData
+    if (classFnOrObject instanceof FormData) {
+        return 'FormData';
+    }
+    if (!classFnOrObject) {
+        console.error('OBJECT OR CLASS', classFnOrObject);
+        throw new Error(`Cannot get name from this object or class.`);
+    }
+    return ((classFnOrObject[Symbols__NS__classNameStaticProperty]
+        ? classFnOrObject[Symbols__NS__classNameStaticProperty]
+        : classFnOrObject?.constructor[Symbols__NS__classNameStaticProperty]) ||
+        (___NS__isFunction(classFnOrObject) ? CLASS.getName(classFnOrObject) : void 0));
 };
-const ClassHelpers__NS__getOrginalClass = (classFnOrObject) => {
-  const org = classFnOrObject[Symbols__NS__orignalClass];
-  if (!org) {
-    return classFnOrObject;
-  }
-  return ClassHelpers__NS__getOrginalClass(org);
+//#endregion
+export const ClassHelpers__NS__getOrginalClass = (classFnOrObject) => {
+    const org = classFnOrObject[Symbols__NS__orignalClass];
+    if (!org) {
+        return classFnOrObject;
+    }
+    return ClassHelpers__NS__getOrginalClass(org);
 };
-const ClassHelpers__NS__getFullInternalName = (classFnOrObject) => {
-  if (!classFnOrObject) {
-    throw new Error(`Cannot get name from: ${classFnOrObject}`);
-  }
-  return (classFnOrObject[Symbols__NS__fullClassNameStaticProperty] ? classFnOrObject[Symbols__NS__fullClassNameStaticProperty] : classFnOrObject?.constructor[Symbols__NS__fullClassNameStaticProperty]) || void 0;
+//#region get full internal name
+export const ClassHelpers__NS__getFullInternalName = (classFnOrObject) => {
+    // exception for FormData
+    if (!classFnOrObject) {
+        throw new Error(`Cannot get name from: ${classFnOrObject}`);
+    }
+    return ((classFnOrObject[Symbols__NS__fullClassNameStaticProperty]
+        ? classFnOrObject[Symbols__NS__fullClassNameStaticProperty]
+        : classFnOrObject?.constructor[Symbols__NS__fullClassNameStaticProperty]) ||
+        void 0);
 };
-const ClassHelpers__NS__getUniqueKey = (classFnOrObject) => {
-  const classFn = ___NS__isFunction(classFnOrObject) ? classFnOrObject : classFnOrObject.constructor;
-  const config = Reflect.getMetadata(
-    Symbols__NS__metadata.options.entity,
-    classFn
-  );
-  return config.uniqueKeyProp;
+//#endregion
+//#region get unique key
+export const ClassHelpers__NS__getUniqueKey = (classFnOrObject) => {
+    const classFn = ___NS__isFunction(classFnOrObject)
+        ? classFnOrObject
+        : classFnOrObject.constructor;
+    const config = Reflect.getMetadata(Symbols__NS__metadata.options.entity, classFn);
+    return config.uniqueKeyProp;
 };
-const ClassHelpers__NS__isContextClassObject = (obj) => {
-  if (!___NS__isObject(obj) || ___NS__isArray(obj) || ___NS__isRegExp(obj) || ___NS__isBuffer(obj) || ___NS__isArrayBuffer(obj)) {
-    return false;
-  }
-  if (___NS__isDate(obj)) {
-    return true;
-  }
-  const className = ClassHelpers__NS__getName(obj);
-  return ___NS__isString(className) && className !== "Object";
+//#endregion
+//#region is class object
+export const ClassHelpers__NS__isContextClassObject = (obj) => {
+    if (!___NS__isObject(obj) ||
+        ___NS__isArray(obj) ||
+        ___NS__isRegExp(obj) ||
+        ___NS__isBuffer(obj) ||
+        ___NS__isArrayBuffer(obj)) {
+        return false;
+    }
+    if (___NS__isDate(obj)) {
+        return true;
+    }
+    const className = ClassHelpers__NS__getName(obj);
+    return ___NS__isString(className) && className !== 'Object';
 };
-const ClassHelpers__NS__setName = (target, className) => {
-  Validators__NS__classNameVlidation(className, target);
-  target[Symbols__NS__classNameStaticProperty] = className;
+//#endregion
+//#region get name
+export const ClassHelpers__NS__setName = (target, className) => {
+    // console.log('setName', className, target.name)
+    Validators__NS__classNameVlidation(className, target);
+    target[Symbols__NS__classNameStaticProperty] = className;
 };
-const ClassHelpers__NS__hasParentClassWithName = (target, className, targets = []) => {
-  if (!target) {
-    return false;
-  }
-  targets.push(target);
-  let targetProto = Object.getPrototypeOf(target);
-  if (___NS__isFunction(targetProto) && ClassHelpers__NS__getName(targetProto) === className) {
-    return true;
-  }
-  return ClassHelpers__NS__hasParentClassWithName(targetProto, className, targets);
+//#endregion
+//#region has parent with class name
+export const ClassHelpers__NS__hasParentClassWithName = (target, className, targets = []) => {
+    if (!target) {
+        return false;
+    }
+    targets.push(target);
+    let targetProto = Object.getPrototypeOf(target);
+    if (___NS__isFunction(targetProto) &&
+        ClassHelpers__NS__getName(targetProto) === className) {
+        // console.log(`true  "${___NS__first(targets).name}" for ${targets.map(d => d.name).join(',')}`)
+        return true;
+    }
+    return ClassHelpers__NS__hasParentClassWithName(targetProto, className, targets);
 };
+//#endregion
+//#region get methods name
+//#region not allowed as method name
 const notAllowedAsMethodName = [
-  "length",
-  "name",
-  "arguments",
-  "caller",
-  "constructor",
-  "apply",
-  "bind",
-  "call",
-  "toString",
-  "__defineGetter__",
-  "__defineSetter__",
-  "hasOwnProperty",
-  "__lookupGetter__",
-  "__lookupSetter__",
-  "isPrototypeOf",
-  "propertyIsEnumerable",
-  "valueOf",
-  "__proto__",
-  "toLocaleString"
+    'length',
+    'name',
+    'arguments',
+    'caller',
+    'constructor',
+    'apply',
+    'bind',
+    'call',
+    'toString',
+    '__defineGetter__',
+    '__defineSetter__',
+    'hasOwnProperty',
+    '__lookupGetter__',
+    '__lookupSetter__',
+    'isPrototypeOf',
+    'propertyIsEnumerable',
+    'valueOf',
+    '__proto__',
+    'toLocaleString',
 ];
-const ClassHelpers__NS__asyncHandler = (fn) => (req, res, next) => {
-  Promise.resolve(fn(req, res, next)).catch(next);
+//#endregion
+/**
+ * Express async handler for middleware functions.
+ */
+export const ClassHelpers__NS__asyncHandler = fn => (req, res, next) => {
+    Promise.resolve(fn(req, res, next)).catch(next);
 };
-const ClassHelpers__NS__getMethodsNames = (classOrClassInstance, allMethodsNames = []) => {
-  if (!classOrClassInstance) {
-    return Utils__NS__uniqArray(allMethodsNames);
-  }
-  const isClassFunction = ___NS__isFunction(classOrClassInstance);
-  const classFun = isClassFunction ? classOrClassInstance : Object.getPrototypeOf(classOrClassInstance);
-  const objectToCheck = isClassFunction ? classOrClassInstance?.prototype : classOrClassInstance;
-  const prototypeObj = Object.getPrototypeOf(objectToCheck || {});
-  const properties = ___NS__uniq([
-    ...Object.getOwnPropertyNames(objectToCheck || {}),
-    ...Object.getOwnPropertyNames(prototypeObj || {}),
-    ...Object.keys(objectToCheck || {}),
-    ...Object.keys(prototypeObj || {})
-  ]).filter((f) => !!f && !notAllowedAsMethodName.includes(f));
-  properties.filter((methodName) => typeof objectToCheck[methodName] === "function").forEach((p) => allMethodsNames.push(p));
-  if (!classFun || !classFun.constructor || classFun?.constructor?.name === "Object") {
-    return Utils__NS__uniqArray(allMethodsNames);
-  }
-  return ClassHelpers__NS__getMethodsNames(Object.getPrototypeOf(classFun), allMethodsNames);
+export const ClassHelpers__NS__getMethodsNames = (classOrClassInstance, allMethodsNames = []) => {
+    if (!classOrClassInstance) {
+        return Utils__NS__uniqArray(allMethodsNames);
+    }
+    const isClassFunction = ___NS__isFunction(classOrClassInstance);
+    const classFun = isClassFunction
+        ? classOrClassInstance
+        : Object.getPrototypeOf(classOrClassInstance);
+    const objectToCheck = isClassFunction
+        ? classOrClassInstance?.prototype
+        : classOrClassInstance;
+    const prototypeObj = Object.getPrototypeOf(objectToCheck || {});
+    const properties = ___NS__uniq([
+        ...Object.getOwnPropertyNames(objectToCheck || {}),
+        ...Object.getOwnPropertyNames(prototypeObj || {}),
+        ...Object.keys(objectToCheck || {}),
+        ...Object.keys(prototypeObj || {}),
+    ]).filter(f => !!f && !notAllowedAsMethodName.includes(f));
+    properties
+        .filter(methodName => typeof objectToCheck[methodName] === 'function')
+        .forEach(p => allMethodsNames.push(p));
+    if (!classFun ||
+        !classFun.constructor ||
+        classFun?.constructor?.name === 'Object') {
+        return Utils__NS__uniqArray(allMethodsNames);
+    }
+    return ClassHelpers__NS__getMethodsNames(Object.getPrototypeOf(classFun), allMethodsNames);
 };
-const ClassHelpers__NS__getControllerConfigs = (target, configs = [], callerTarget) => {
-  if (!___NS__isFunction(target)) {
-    throw `[typescript-class-helper][getControllerConfigs] Cannot get class config from: ${target}`;
-  }
-  let config;
-  const parentClass = Object.getPrototypeOf(target);
-  const parentName = parentClass ? ClassHelpers__NS__getName(parentClass) : void 0;
-  const isValidParent = ___NS__isFunction(parentClass) && parentName !== "";
-  config = controllerConfigFrom(ClassHelpers__NS__getClassConfig(target));
-  configs.push(config);
-  return isValidParent ? ClassHelpers__NS__getControllerConfigs(parentClass, configs, target) : configs;
+//#endregion
+//#region get controller configs
+export const ClassHelpers__NS__getControllerConfigs = (target, configs = [], callerTarget) => {
+    if (!___NS__isFunction(target)) {
+        throw `[typescript-class-helper][getControllerConfigs] Cannot get class config from: ${target}`;
+    }
+    let config;
+    const parentClass = Object.getPrototypeOf(target);
+    const parentName = parentClass ? ClassHelpers__NS__getName(parentClass) : void 0;
+    const isValidParent = ___NS__isFunction(parentClass) && parentName !== '';
+    config = controllerConfigFrom(ClassHelpers__NS__getClassConfig(target));
+    configs.push(config);
+    return isValidParent
+        ? ClassHelpers__NS__getControllerConfigs(parentClass, configs, target)
+        : configs;
 };
-const ClassHelpers__NS__ensureClassConfig = (target) => {
-  let cfg = Reflect.getOwnMetadata(
-    Symbols__NS__metadata.options.controller,
-    // META_KEYS.class,
-    target
-  );
-  if (!cfg) {
-    cfg = { methods: {} };
-    const parent = Object.getPrototypeOf(target);
-    if (parent && parent !== Function.prototype) {
-      const parentCfg = Reflect.getMetadata(
-        Symbols__NS__metadata.options.controller,
-        // META_KEYS.class,
-        parent
-      );
-      if (parentCfg) {
-        const clonedMethods = {};
-        for (const [k, v] of Object.entries(parentCfg.methods)) {
-          clonedMethods[k] = {
-            ...v,
-            parameters: { ...v.parameters }
-            // shallow clone parameters too
-          };
+//#endregion
+//#region ensure configs
+// Ensure ClassConfig on constructor, clone parent if needed
+export const ClassHelpers__NS__ensureClassConfig = (target) => {
+    let cfg = Reflect.getOwnMetadata(Symbols__NS__metadata.options.controller, // META_KEYS.class,
+    target);
+    if (!cfg) {
+        cfg = { methods: {} };
+        const parent = Object.getPrototypeOf(target);
+        if (parent && parent !== Function.prototype) {
+            const parentCfg = Reflect.getMetadata(Symbols__NS__metadata.options.controller, // META_KEYS.class,
+            parent);
+            if (parentCfg) {
+                // Deep copy each method config so child gets its own objects
+                const clonedMethods = {};
+                for (const [k, v] of Object.entries(parentCfg.methods)) {
+                    clonedMethods[k] = {
+                        ...v,
+                        parameters: { ...v.parameters }, // shallow clone parameters too
+                    };
+                }
+                cfg = {
+                    ...parentCfg,
+                    methods: clonedMethods,
+                };
+            }
         }
-        cfg = {
-          ...parentCfg,
-          methods: clonedMethods
-        };
-      }
+        Reflect.defineMetadata(Symbols__NS__metadata.options.controller, cfg, target);
     }
-    Reflect.defineMetadata(Symbols__NS__metadata.options.controller, cfg, target);
-  }
-  return cfg;
-};
-const ClassHelpers__NS__ensureMethodConfig = (target, propertyKey) => {
-  const classCfg = ClassHelpers__NS__ensureClassConfig(target.constructor);
-  let methodCfg = classCfg.methods[propertyKey?.toString()];
-  if (!methodCfg) {
-    methodCfg = { methodName: propertyKey?.toString(), parameters: {} };
-    classCfg.methods[propertyKey?.toString()] = methodCfg;
-  }
-  return methodCfg;
+    return cfg;
 };
-const ClassHelpers__NS__getClassConfig = (constructor) => {
-  return Reflect.getMetadata(
-    Symbols__NS__metadata.options.controller,
-    constructor
-  );
+// Ensure MethodConfig inside ClassConfig
+export const ClassHelpers__NS__ensureMethodConfig = (target, propertyKey) => {
+    const classCfg = ClassHelpers__NS__ensureClassConfig(target.constructor);
+    let methodCfg = classCfg.methods[propertyKey?.toString()];
+    if (!methodCfg) {
+        methodCfg = { methodName: propertyKey?.toString(), parameters: {} };
+        classCfg.methods[propertyKey?.toString()] = methodCfg;
+    }
+    return methodCfg;
 };
-export {
-  ClassHelpers__NS__asyncHandler,
-  ClassHelpers__NS__ensureClassConfig,
-  ClassHelpers__NS__ensureMethodConfig,
-  ClassHelpers__NS__getClassConfig,
-  ClassHelpers__NS__getClassFnFromObject,
-  ClassHelpers__NS__getControllerConfigs,
-  ClassHelpers__NS__getFullInternalName,
-  ClassHelpers__NS__getMethodsNames,
-  ClassHelpers__NS__getName,
-  ClassHelpers__NS__getOrginalClass,
-  ClassHelpers__NS__getUniqueKey,
-  ClassHelpers__NS__hasParentClassWithName,
-  ClassHelpers__NS__isContextClassObject,
-  ClassHelpers__NS__setName
+export const ClassHelpers__NS__getClassConfig = (constructor) => {
+    return Reflect.getMetadata(Symbols__NS__metadata.options.controller, constructor);
 };
+//#endregion
+//end of namespace ClassHelpers

package/lib-prod/helpers/clone-obj.js

@@ -1,21 +1,17 @@
-import { walk } from "lodash-walk-object/lib-prod";
-import { ___NS__cloneDeep, ___NS__isFunction, ___NS__isNil, ___NS__isObject, ___NS__merge, ___NS__set } from "tnp-core/lib-prod";
-const cloneObj = (override, classFn) => {
-  const result = ___NS__merge(new classFn(), ___NS__cloneDeep(void 0));
-  walk.Object(
-    override || {},
-    (value, lodashPath) => {
-      if (___NS__isNil(value) || ___NS__isFunction(value) || ___NS__isObject(value)) {
-      } else {
-        ___NS__set(result, lodashPath, value);
-      }
-    },
-    {
-      walkGetters: false
-    }
-  );
-  return result;
-};
-export {
-  cloneObj
+import { walk } from 'lodash-walk-object/lib-prod';
+import { ___NS__cloneDeep, ___NS__isFunction, ___NS__isNil, ___NS__isObject, ___NS__merge, ___NS__set } from 'tnp-core/lib-prod';
+export const cloneObj = (override, classFn) => {
+    const result = ___NS__merge(new classFn(), ___NS__cloneDeep(this));
+    walk.Object(override || {}, (value, lodashPath) => {
+        if (___NS__isNil(value) || ___NS__isFunction(value) || ___NS__isObject(value)) {
+            // skipping
+        }
+        else {
+            ___NS__set(result, lodashPath, value);
+        }
+    }, {
+        walkGetters: false,
+    });
+    // console.log({result})
+    return result;
 };