typescript-class-helpers 21.0.26 → 21.0.27

package/browser/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typescript-class-helpers/browser",
-  "version": "21.0.26",
+  "version": "21.0.27",
   "peerDependencies": {
     "@angular/common": "^21.0.0",
     "@angular/core": "^21.0.0"

package/browser-prod/package.json

@@ -1,6 +1,6 @@
 {
   "name": "typescript-class-helpers/browser-prod",
-  "version": "21.0.26",
+  "version": "21.0.27",
   "peerDependencies": {
     "@angular/common": "^21.0.0",
     "@angular/core": "^21.0.0"

package/lib/build-info._auto-generated_.d.ts

@@ -21,4 +21,4 @@ export declare const CURRENT_PACKAGE_TAON_VERSION = "v21";
 /**
  *  Autogenerated by current cli tool. Use *tnp release* to bump version.
  */
-export declare const CURRENT_PACKAGE_VERSION = "21.0.26";
+export declare const CURRENT_PACKAGE_VERSION = "21.0.27";

package/lib/build-info._auto-generated_.js

@@ -25,6 +25,6 @@ exports.CURRENT_PACKAGE_TAON_VERSION = 'v21';
 /**
  *  Autogenerated by current cli tool. Use *tnp release* to bump version.
  */
-exports.CURRENT_PACKAGE_VERSION = '21.0.26';
+exports.CURRENT_PACKAGE_VERSION = '21.0.27';
 // THIS FILE IS GENERATED - DO NOT MODIFY
 //# sourceMappingURL=build-info._auto-generated_.js.map

package/lib/package.json

@@ -1,4 +1,4 @@
 {
   "name": "typescript-class-helpers/lib",
-  "version": "21.0.26"
+  "version": "21.0.27"
 }

package/lib-prod/build-info._auto-generated_.js

@@ -1,14 +1,26 @@
-const BUILD_FRAMEWORK_CLI_NAME = "tnp";
-const APP_ID = "com.domain.example.typescript-class-helpers";
-const BUILD_BASE_HREF = "";
-const PROJECT_NPM_NAME = "typescript-class-helpers";
-const CURRENT_PACKAGE_TAON_VERSION = "v21";
-const CURRENT_PACKAGE_VERSION = "21.0.26";
-export {
-  APP_ID,
-  BUILD_BASE_HREF,
-  BUILD_FRAMEWORK_CLI_NAME,
-  CURRENT_PACKAGE_TAON_VERSION,
-  CURRENT_PACKAGE_VERSION,
-  PROJECT_NPM_NAME
-};
+// THIS FILE IS GENERATED - DO NOT MODIFY
+/**
+ *  Autogenerated by current cli tool
+ */
+export const BUILD_FRAMEWORK_CLI_NAME = 'tnp';
+/**
+ *  This value can be change in taon.jsonc (appId)
+ */
+export const APP_ID = 'com.domain.example.typescript-class-helpers';
+/**
+ *  Autogenerated by current cli tool
+ */
+export const BUILD_BASE_HREF = '';
+/**
+ *  This value can be change in taon.jsonc (overrideNpmName)
+ */
+export const PROJECT_NPM_NAME = 'typescript-class-helpers';
+/**
+ * Taon version from you project taon.json
+ */
+export const CURRENT_PACKAGE_TAON_VERSION = 'v21';
+/**
+ *  Autogenerated by current cli tool. Use *tnp release* to bump version.
+ */
+export const CURRENT_PACKAGE_VERSION = '21.0.27';
+// THIS FILE IS GENERATED - DO NOT MODIFY

package/lib-prod/classname.js

@@ -1,155 +1,185 @@
-import { ___NS__first, ___NS__isFunction, ___NS__isNil, ___NS__isString, UtilsOs__NS__isBrowser } from "tnp-core/lib-prod";
-import { Models__NS__ClassConfig } from "./models";
-import { SYMBOL } from "./symbols";
-import { TchHelpers } from "./index";
-import { Helpers__NS__log } from "tnp-core/lib-prod";
-import { getStorage } from "./storage";
-import { setClassName } from "./set-class-name";
-import { registerd } from "./registerd-db";
-import { ERROR_MSG_CLASS_WITHOUT_DECORATOR } from "./errors-messages";
-import * as FormData from "form-data";
+import { ___NS__first, ___NS__isFunction, ___NS__isNil, ___NS__isString, UtilsOs__NS__isBrowser } from 'tnp-core/lib-prod';
+import { Models } from './models';
+import { SYMBOL } from './symbols';
+import { TchHelpers } from './index';
+import { Helpers__NS__log } from 'tnp-core/lib-prod';
+import { getStorage } from './storage';
+import { setClassName } from './set-class-name';
+import { registerd } from './registerd-db';
+import { ERROR_MSG_CLASS_WITHOUT_DECORATOR } from './errors-messages';
+//#region @backend
+import * as FormData from 'form-data';
+//#endregion
 function getClasses() {
-  const s = getStorage();
-  return s[SYMBOL.CLASSES];
+    const s = getStorage();
+    return s[SYMBOL.CLASSES];
 }
-function CLASSNAME__NS__getClassConfig(target, configs = [], callerTarget) {
-  if (!___NS__isFunction(target)) {
-    throw `[typescript-class-helper][getClassConfig] Cannot get class config from: ${target}`;
-  }
-  let config;
-  const parentClass = Object.getPrototypeOf(target);
-  const isValidParent = ___NS__isFunction(parentClass) && parentClass.name !== "";
-  if (registerd.classes.includes(target)) {
-    config = registerd.configs[registerd.classes.findIndex((c) => c === target)];
-  } else {
-    config = new Models__NS__ClassConfig();
-    config.classReference = target;
-    registerd.classes.push(target);
-  }
-  registerd.configs[registerd.classes.findIndex((c) => c === target)] = config;
-  if (callerTarget) {
-    const callerTargetConfig = registerd.configs[registerd.classes.findIndex((c) => c === callerTarget)];
-    if (!config.vChildren.includes(callerTargetConfig)) {
-      config.vChildren.push(callerTargetConfig);
+//namespace CLASSNAME
+export function CLASSNAME__NS__getClassConfig(target, configs = [], callerTarget) {
+    if (!___NS__isFunction(target)) {
+        throw `[typescript-class-helper][getClassConfig] Cannot get class config from: ${target}`;
     }
-    callerTargetConfig.vParent = config;
-  }
-  configs.push(config);
-  return isValidParent ? CLASSNAME__NS__getClassConfig(parentClass, configs, target) : configs;
+    let config;
+    const parentClass = Object.getPrototypeOf(target);
+    const isValidParent = ___NS__isFunction(parentClass) && parentClass.name !== '';
+    if (registerd.classes.includes(target)) {
+        config =
+            registerd.configs[registerd.classes.findIndex(c => c === target)];
+    }
+    else {
+        config = new Models.ClassConfig();
+        config.classReference = target;
+        registerd.classes.push(target);
+    }
+    registerd.configs[registerd.classes.findIndex(c => c === target)] = config;
+    if (callerTarget) {
+        const callerTargetConfig = registerd.configs[registerd.classes.findIndex(c => c === callerTarget)];
+        if (!config.vChildren.includes(callerTargetConfig)) {
+            config.vChildren.push(callerTargetConfig);
+        }
+        callerTargetConfig.vParent = config;
+    }
+    configs.push(config);
+    return isValidParent
+        ? CLASSNAME__NS__getClassConfig(parentClass, configs, target)
+        : configs;
 }
-function CLASSNAME__NS__CLASSNAME(className, options) {
-  return function(target) {
-    return setClassName(target, className, options);
-  };
+/**
+ * PLEASE PROVIDE NAME AS TYPED STRING, NOT VARIABLE
+ * Decorator requred for production mode
+ * @param name Name of class
+ */
+export function CLASSNAME__NS__CLASSNAME(className, options) {
+    return function (target) {
+        // console.log(`CLASSNAME Inited ${className}`)
+        return setClassName(target, className, options);
+    };
 }
-function CLASSNAME__NS__getClassName(target, production = false) {
-  if (___NS__isNil(target)) {
-    return void 0;
-  }
-  if (___NS__isString(target)) {
-    Helpers__NS__log(
-      `[typescript-class-helpers][getClassName] target is string: '${target}', produciton: ${production}`
-    );
-    return target;
-  }
-  if (target === Date) {
-    return "Date";
-  }
-  if (target === FormData) {
-    return "FormData";
-  }
-  if (!___NS__isFunction(target)) {
-    Helpers__NS__log(
-      `[typescript-class-helpers][getClassName] target is not a class`
-    );
-    return void 0;
-  }
-  if (target[SYMBOL.ClassNameStaticProperty]) {
-    return target[SYMBOL.ClassNameStaticProperty];
-  }
-  const configs = CLASSNAME__NS__getClassConfig(target);
-  const config = ___NS__first(configs);
-  const classNameInBrowser = config?.classNameInBrowser;
-  if (UtilsOs__NS__isBrowser && ___NS__isString(classNameInBrowser)) {
-    return classNameInBrowser;
-  }
-  const className = config?.className;
-  if (typeof className === "string") {
-    return className;
-  }
-  if (production) {
-    console.log("class without @CLASS.NAME deocrator", target);
-    throw new Error(ERROR_MSG_CLASS_WITHOUT_DECORATOR);
-  } else {
-  }
-  if (target.name?.startsWith("class_")) {
-    return "";
-  }
-  return target.name;
+export function CLASSNAME__NS__getClassName(target, production = false) {
+    if (___NS__isNil(target)) {
+        // console.log(target);
+        // Helpers__NS__warn(`[typescript-class-helpers][getClassName] target is nil`)
+        return void 0;
+    }
+    if (___NS__isString(target)) {
+        // console.log(target);
+        Helpers__NS__log(`[typescript-class-helpers][getClassName] target is string: '${target}', produciton: ${production}`);
+        return target;
+    }
+    if (target === Date) {
+        return 'Date';
+    }
+    if (target === FormData) {
+        return 'FormData';
+    }
+    if (!___NS__isFunction(target)) {
+        // console.log(target);
+        Helpers__NS__log(`[typescript-class-helpers][getClassName] target is not a class`);
+        return void 0;
+    }
+    if (target[SYMBOL.ClassNameStaticProperty]) {
+        return target[SYMBOL.ClassNameStaticProperty];
+    }
+    const configs = CLASSNAME__NS__getClassConfig(target);
+    const config = ___NS__first(configs);
+    const classNameInBrowser = config?.classNameInBrowser;
+    if (UtilsOs__NS__isBrowser && ___NS__isString(classNameInBrowser)) {
+        return classNameInBrowser;
+    }
+    const className = config?.className;
+    if (typeof className === 'string') {
+        return className;
+    }
+    if (production) {
+        console.log('class without @CLASS.NAME deocrator', target);
+        throw new Error(ERROR_MSG_CLASS_WITHOUT_DECORATOR);
+    }
+    else {
+        // Helpers__NS__log('check for ' + target.name)
+        // setTimeout(() => {
+        //   // Helpers__NS__log('check for ' + target.name + ' === ' + config.className)/
+        //   // TODO this may work, but not yet in singleton/morphi
+        //   if (!config.className) {
+        //     if (target?.name && target.name !== 'Object') {
+        //       ConfigHelpers.log(`[typescript-class-helpers] Please use @CLASS.NAME`
+        //         + `('${(target?.name && !!target.name) ? target.name : '...'}') decorator for class ${target?.name}`)
+        //     }
+        //   }
+        // })
+    }
+    // special thing when cloning classes
+    if (target.name?.startsWith('class_')) {
+        return '';
+    }
+    return target.name;
 }
-function CLASSNAME__NS__getObjectIndexPropertyValue(obj) {
-  const className = TchHelpers.getNameFromObject(obj);
-  let c = getClasses().find((c2) => c2.className === className);
-  if (c) {
-    return c.uniqueKey;
-  }
+// @ts-ignore
+export function CLASSNAME__NS__getObjectIndexPropertyValue(obj) {
+    const className = TchHelpers.getNameFromObject(obj);
+    // console.log('className',className)
+    let c = getClasses().find(c => c.className === className);
+    // console.log('c',c)
+    if (c) {
+        return c.uniqueKey;
+    }
 }
-function CLASSNAME__NS__getClassFamilyByClassName(className) {
-  let c = getClasses().find((c2) => c2.className === className);
-  if (c) {
-    return c.classFamily;
-  }
+// @ts-ignore
+export function CLASSNAME__NS__getClassFamilyByClassName(className) {
+    let c = getClasses().find(c => c.className === className);
+    // console.log('getClasses()', getClasses())
+    if (c) {
+        return c.classFamily;
+    }
 }
-function CLASSNAME__NS__getObjectClassFamily(obj) {
-  const className = TchHelpers.getNameFromObject(obj);
-  let c = getClasses().find((c2) => c2.className === className);
-  if (c) {
-    return c.classFamily;
-  }
+// @ts-ignore
+export function CLASSNAME__NS__getObjectClassFamily(obj) {
+    const className = TchHelpers.getNameFromObject(obj);
+    // console.log('className',className)
+    let c = getClasses().find(c => c.className === className);
+    // console.log('c',c)
+    if (c) {
+        return c.classFamily;
+    }
 }
-function CLASSNAME__NS__getObjectIndexValue(obj) {
-  const className = TchHelpers.getNameFromObject(obj);
-  let c = getClasses().find((c2) => c2.className === className);
-  if (c && ___NS__isString(c.uniqueKey)) {
-    return obj[c.uniqueKey];
-  }
+export function CLASSNAME__NS__getObjectIndexValue(obj) {
+    const className = TchHelpers.getNameFromObject(obj);
+    // console.log('className',className)
+    let c = getClasses().find(c => c.className === className);
+    // console.log('c',c)
+    if (c && ___NS__isString(c.uniqueKey)) {
+        return obj[c.uniqueKey];
+    }
 }
-function CLASSNAME__NS__getClassBy(className) {
-  let res;
-  if (Array.isArray(className)) {
-    if (className.length !== 1) {
-      throw `Mapping error... please use proper class names:
+export function CLASSNAME__NS__getClassBy(className) {
+    let res;
+    if (Array.isArray(className)) {
+        if (className.length !== 1) {
+            throw `Mapping error... please use proper class names:
   {
     propertyObject: 'MyClassName',
     propertyWithArray: ['MyClassName']
   }
 
         `;
+        }
+        className = className[0];
     }
-    className = className[0];
-  }
-  if (typeof className === "function") {
-    res = className;
-  }
-  if (className === "Date") {
-    res = Date;
-  }
-  if (className === "FormData") {
-    res = FormData;
-  }
-  let c = getClasses().find((c2) => c2.className === className);
-  if (c) {
-    res = c.target;
-  }
-  return res;
+    if (typeof className === 'function') {
+        // TODO QUICK_FIX
+        res = className;
+    }
+    if (className === 'Date') {
+        res = Date;
+    }
+    if (className === 'FormData') {
+        res = FormData;
+    }
+    let c = getClasses().find(c => c.className === className);
+    if (c) {
+        res = c.target;
+    }
+    // console.log(`getClassBy "${className} return \n\n ${res} \n\n`)
+    // @ts-ignore
+    return res;
 }
-export {
-  CLASSNAME__NS__CLASSNAME,
-  CLASSNAME__NS__getClassBy,
-  CLASSNAME__NS__getClassConfig,
-  CLASSNAME__NS__getClassFamilyByClassName,
-  CLASSNAME__NS__getClassName,
-  CLASSNAME__NS__getObjectClassFamily,
-  CLASSNAME__NS__getObjectIndexPropertyValue,
-  CLASSNAME__NS__getObjectIndexValue
-};
+//end of namespace CLASSNAME

package/lib-prod/describe-class.js

@@ -1,49 +1,72 @@
-import { ___NS__isArray, ___NS__isFunction } from "tnp-core/lib-prod";
-import { SYMBOL } from "./symbols";
+import { ___NS__isArray, ___NS__isFunction } from 'tnp-core/lib-prod';
+import { SYMBOL } from './symbols';
+/**
+  * @DEPRECATED
+  * Describe fields assigned in class
+  */
 const FRegEx = new RegExp(/(?:this\.)(.+?(?= ))/g);
-function describeFromClassStringify(target, parent = false) {
-  var result = [];
-  if (parent) {
-    var proto = Object.getPrototypeOf(target.prototype);
-    if (proto) {
-      result = result.concat(describeFromClassStringify(proto.constructor, parent));
+export function describeFromClassStringify(target, parent = false) {
+    // @ts-ignore
+    var result = [];
+    if (parent) {
+        var proto = Object.getPrototypeOf(target.prototype);
+        if (proto) {
+            // @ts-ignore
+            result = result.concat(describeFromClassStringify(proto.constructor, parent));
+        }
     }
-  }
-  const classString = target.toString();
-  const matches = classString.match(FRegEx) || [];
-  result = result.concat(matches);
-  return result.map(
-    (prop) => prop.replace("this.", "").replace(".", "").replace(")", "").replace("(", "")
-  );
+    const classString = target.toString();
+    const matches = classString.match(FRegEx) || [];
+    // console.log({
+    //   classString,
+    // });
+    result = result.concat(matches);
+    return result.map(prop => prop
+        .replace('this.', '')
+        .replace('.', '')
+        .replace(')', '')
+        .replace('(', ''));
 }
-function describeByDefaultModelsAndMapping(target) {
-  let res = {};
-  if (target) {
-    if (target[SYMBOL.DEFAULT_MODEL]) {
-      Object.keys(target[SYMBOL.DEFAULT_MODEL]).filter((key) => {
-        return !___NS__isFunction(target[SYMBOL.DEFAULT_MODEL][key]);
-      }).forEach((key) => {
-        return res[key] = null;
-      });
+/**
+   * Describe fields assigne through @DefaultModelWithMapping decorator
+   * without functions
+   */
+export function describeByDefaultModelsAndMapping(target) {
+    let res = {};
+    if (target) {
+        // @ts-ignore
+        if (target[SYMBOL.DEFAULT_MODEL]) {
+            // @ts-ignore
+            Object.keys(target[SYMBOL.DEFAULT_MODEL])
+                .filter(key => {
+                // @ts-ignore
+                return !___NS__isFunction(target[SYMBOL.DEFAULT_MODEL][key]);
+            })
+                .forEach(key => {
+                // @ts-ignore
+                return res[key] = null;
+            });
+        }
+        // @ts-ignore
+        let mapping = target[SYMBOL.MODELS_MAPPING];
+        if (___NS__isArray(mapping)) {
+            mapping.forEach(m => {
+                Object.keys(m)
+                    .forEach(key => {
+                    // @ts-ignore
+                    res[key] = null;
+                });
+            });
+        }
+        else if (mapping) {
+            Object.keys(mapping)
+                .forEach(key => {
+                // @ts-ignore
+                res[key] = null;
+            });
+        }
     }
-    let mapping = target[SYMBOL.MODELS_MAPPING];
-    if (___NS__isArray(mapping)) {
-      mapping.forEach((m) => {
-        Object.keys(m).forEach((key) => {
-          res[key] = null;
-        });
-      });
-    } else if (mapping) {
-      Object.keys(mapping).forEach((key) => {
-        res[key] = null;
-      });
-    }
-  }
-  let propNames = Object.keys(res).filter((f) => !!f);
-  propNames = (!propNames.includes("id") ? ["id"] : []).concat(propNames);
-  return propNames;
+    let propNames = Object.keys(res).filter(f => !!f);
+    propNames = (!propNames.includes('id') ? ['id'] : []).concat(propNames);
+    return propNames;
 }
-export {
-  describeByDefaultModelsAndMapping,
-  describeFromClassStringify
-};