@itrocks/core-transformers 0.1.4 → 0.2.0

package/cjs/collection-type.d.ts

@@ -1,11 +1,11 @@
-import { AnyObject } from '@itrocks/class-type';
-import { KeyOf, Type } from '@itrocks/class-type';
+import { ObjectOrType } from '@itrocks/class-type';
+import { Type } from '@itrocks/class-type';
 export type Dependencies = {
-    displayOf: (object: AnyObject, property: string) => string;
-    fieldNameOf: (property: string) => string;
-    fieldIdOf: (property: string) => string;
+    displayOf: <T extends object>(object: ObjectOrType<T>, property: keyof T) => string;
+    fieldNameOf: (property: keyof any) => string;
+    fieldIdOf: (property: keyof any) => string;
     ignoreTransformedValue: any;
-    propertyOutput: <T extends object>(object: T, property: KeyOf<T>) => Promise<string>;
+    propertyOutput: <T extends object>(object: T, property: keyof T) => Promise<string>;
     representativeValueOf: (object: object) => Promise<string>;
     routeOf: (type: Type) => string;
     tr: (text: string) => string;

package/cjs/collection-type.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.initCollectionHtmlTransformers = initCollectionHtmlTransformers;
 exports.initCollectionTransformers = initCollectionTransformers;
 const composition_1 = require("@itrocks/composition");
+const composition_2 = require("@itrocks/composition");
 const storage_1 = require("@itrocks/storage");
 const class_type_1 = require("@itrocks/class-type");
 const class_type_2 = require("@itrocks/class-type");
@@ -12,11 +13,10 @@ const reflect_1 = require("@itrocks/reflect");
 const reflect_2 = require("@itrocks/reflect");
 const transformer_1 = require("@itrocks/transformer");
 const transformer_2 = require("@itrocks/transformer");
-const transformer_3 = require("@itrocks/transformer");
 const depends = {
-    displayOf: (_object, property) => property,
-    fieldNameOf: property => property,
-    fieldIdOf: property => property,
+    displayOf: (_object, property) => property.toString(),
+    fieldNameOf: property => property.toString(),
+    fieldIdOf: property => property.toString(),
     ignoreTransformedValue: Symbol('ignoreTransformedValue'),
     propertyOutput: async (object, property) => '' + await object[property],
     representativeValueOf: async (object) => (0, class_type_1.baseType)((0, class_type_2.typeOf)(object)).name,
@@ -55,7 +55,7 @@ function collectionInput(values, object, property, data) {
     delete object[property];
     const data_property_id = data[(0, rename_1.toField)(property) + '_id'];
     Object.assign(object, {
-        [property + 'Ids']: Object.keys(values).map(key => +data_property_id[key]).filter(value => value)
+        [property.toString() + 'Ids']: Object.keys(values).map(key => +data_property_id[key]).filter(value => value)
     });
     return depends.ignoreTransformedValue;
 }
@@ -67,7 +67,7 @@ async function collectionOutput(values, object, property, askFor) {
         const propertyType = new reflect_2.ReflectProperty(object, property).collectionType;
         const type = propertyType.elementType.type;
         const propertyClass = new reflect_1.ReflectClass(type);
-        const properties = propertyClass.propertyNames.filter(property => !(0, composition_1.compositeOf)(type, property));
+        const properties = propertyClass.propertyNames.filter(property => !(0, composition_2.compositeOf)(type, property));
         const html = [];
         html.push('<table>');
         html.push('<tr>'
@@ -95,9 +95,9 @@ async function collectionOutput(values, object, property, askFor) {
 }
 function initCollectionHtmlTransformers(dependencies = {}) {
     Object.assign(depends, dependencies);
-    (0, transformer_3.setPropertyTypeTransformer)(property_type_1.CollectionType, transformer_1.HTML, transformer_1.EDIT, collectionEdit);
-    (0, transformer_3.setPropertyTypeTransformer)(property_type_1.CollectionType, transformer_1.HTML, transformer_2.INPUT, collectionInput);
-    (0, transformer_3.setPropertyTypeTransformer)(property_type_1.CollectionType, transformer_1.HTML, transformer_2.OUTPUT, collectionOutput);
+    (0, transformer_2.setPropertyTypeTransformer)(property_type_1.CollectionType, transformer_1.HTML, transformer_1.EDIT, collectionEdit);
+    (0, transformer_2.setPropertyTypeTransformer)(property_type_1.CollectionType, transformer_1.HTML, transformer_1.INPUT, collectionInput);
+    (0, transformer_2.setPropertyTypeTransformer)(property_type_1.CollectionType, transformer_1.HTML, transformer_1.OUTPUT, collectionOutput);
 }
 function initCollectionTransformers(dependencies = {}) {
     initCollectionHtmlTransformers(dependencies);

package/cjs/primitive.d.ts

@@ -1,8 +1,8 @@
-import { AnyObject } from '@itrocks/class-type';
+import { ObjectOrType } from '@itrocks/class-type';
 export type CoreDependencies = {
-    displayOf: (object: AnyObject, property: string) => string;
-    fieldIdOf: (property: string) => string;
-    fieldNameOf: (property: string) => string;
+    displayOf: <T extends object>(object: ObjectOrType<T>, property: keyof T) => string;
+    fieldIdOf: (property: keyof any) => string;
+    fieldNameOf: (property: keyof any) => string;
     tr: (text: string) => string;
 };
 export type Dependencies = CoreDependencies & {

package/cjs/primitive.js

@@ -15,10 +15,10 @@ const transformer_2 = require("@itrocks/transformer");
 const transformer_3 = require("@itrocks/transformer");
 const lfTab = '\n\t\t\t\t';
 const depends = {
-    displayOf: (_object, property) => property,
+    displayOf: (_object, property) => property.toString(),
     formatDate: date => date.toString(),
-    fieldIdOf: property => property,
-    fieldNameOf: property => property,
+    fieldIdOf: property => property.toString(),
+    fieldNameOf: property => property.toString(),
     parseDate: date => new Date(date),
     tr: text => text
 };

package/cjs/store.d.ts

@@ -1,12 +1,12 @@
-import { AnyObject } from '@itrocks/class-type';
+import { ObjectOrType } from '@itrocks/class-type';
 import { Type } from '@itrocks/class-type';
 export type SqlDependencies = {
     ignoreTransformedValue: any;
 };
 export type Dependencies = SqlDependencies & {
-    displayOf: (object: AnyObject, property: string) => string;
-    fieldIdOf: (property: string) => string;
-    fieldNameOf: (property: string) => string;
+    displayOf: <T extends object>(object: ObjectOrType<T>, property: keyof T) => string;
+    fieldIdOf: (property: keyof any) => string;
+    fieldNameOf: (property: keyof any) => string;
     representativeValueOf: (object: object) => Promise<string>;
     routeOf: (type: Type) => string;
     tr: (text: string) => string;

package/cjs/store.js

@@ -6,6 +6,7 @@ exports.initStoreSqlTransformers = initStoreSqlTransformers;
 exports.initStoreTransformers = initStoreTransformers;
 exports.setStoreDependencies = setStoreDependencies;
 const class_type_1 = require("@itrocks/class-type");
+const class_type_2 = require("@itrocks/class-type");
 const reflect_1 = require("@itrocks/reflect");
 const storage_1 = require("@itrocks/storage");
 const transformer_1 = require("@itrocks/transformer");
@@ -13,11 +14,11 @@ const transformer_2 = require("@itrocks/transformer");
 const transformer_3 = require("@itrocks/transformer");
 const lfTab = '\n\t\t\t\t';
 const depends = {
-    displayOf: (_object, property) => property,
-    fieldIdOf: property => property,
-    fieldNameOf: property => property,
+    displayOf: (_object, property) => property.toString(),
+    fieldIdOf: property => property.toString(),
+    fieldNameOf: property => property.toString(),
     ignoreTransformedValue: Symbol('ignoreTransformedValue'),
-    representativeValueOf: async (object) => (0, class_type_1.baseType)((0, class_type_1.typeOf)(object)).name,
+    representativeValueOf: async (object) => (0, class_type_1.baseType)((0, class_type_2.typeOf)(object)).name,
     routeOf: type => '/' + (0, class_type_1.baseType)(type).name,
     tr: text => text
 };
@@ -52,7 +53,7 @@ async function storeEdit(value, object, property) {
     return label + lfTab + inputId + input;
 }
 function storeInput(value, object, property, data) {
-    const propertyId = property + 'Id';
+    const propertyId = (property.toString() + 'Id');
     const fieldId = depends.fieldNameOf(propertyId);
     const id = +data[fieldId];
     if (id === ((propertyId in object) ? object[propertyId] : value?.id)) {
@@ -79,7 +80,7 @@ async function storeSave(value, _object, property, record) {
     if (value && !dao.isObjectConnected(value)) {
         await dao.save(value);
     }
-    const columnId = property + '_id';
+    const columnId = property.toString() + '_id';
     const id = (value && dao.isObjectConnected(value)) ? value.id : record[columnId];
     record[columnId] = id ?? null;
     return depends.ignoreTransformedValue;

package/esm/collection-type.d.ts

@@ -1,11 +1,11 @@
-import { AnyObject } from '@itrocks/class-type';
-import { KeyOf, Type } from '@itrocks/class-type';
+import { ObjectOrType } from '@itrocks/class-type';
+import { Type } from '@itrocks/class-type';
 export type Dependencies = {
-    displayOf: (object: AnyObject, property: string) => string;
-    fieldNameOf: (property: string) => string;
-    fieldIdOf: (property: string) => string;
+    displayOf: <T extends object>(object: ObjectOrType<T>, property: keyof T) => string;
+    fieldNameOf: (property: keyof any) => string;
+    fieldIdOf: (property: keyof any) => string;
     ignoreTransformedValue: any;
-    propertyOutput: <T extends object>(object: T, property: KeyOf<T>) => Promise<string>;
+    propertyOutput: <T extends object>(object: T, property: keyof T) => Promise<string>;
     representativeValueOf: (object: object) => Promise<string>;
     routeOf: (type: Type) => string;
     tr: (text: string) => string;

package/esm/collection-type.js

@@ -1,4 +1,5 @@
-import { componentOf, compositeOf } from '@itrocks/composition';
+import { componentOf } from '@itrocks/composition';
+import { compositeOf } from '@itrocks/composition';
 import { dataSource } from '@itrocks/storage';
 import { baseType } from '@itrocks/class-type';
 import { typeOf } from '@itrocks/class-type';
@@ -6,13 +7,12 @@ import { CollectionType } from '@itrocks/property-type';
 import { toField } from '@itrocks/rename';
 import { ReflectClass } from '@itrocks/reflect';
 import { ReflectProperty } from '@itrocks/reflect';
-import { EDIT, HTML } from '@itrocks/transformer';
-import { INPUT, OUTPUT } from '@itrocks/transformer';
+import { EDIT, HTML, INPUT, OUTPUT } from '@itrocks/transformer';
 import { setPropertyTypeTransformer } from '@itrocks/transformer';
 const depends = {
-    displayOf: (_object, property) => property,
-    fieldNameOf: property => property,
-    fieldIdOf: property => property,
+    displayOf: (_object, property) => property.toString(),
+    fieldNameOf: property => property.toString(),
+    fieldIdOf: property => property.toString(),
     ignoreTransformedValue: Symbol('ignoreTransformedValue'),
     propertyOutput: async (object, property) => '' + await object[property],
     representativeValueOf: async (object) => baseType(typeOf(object)).name,
@@ -51,7 +51,7 @@ function collectionInput(values, object, property, data) {
     delete object[property];
     const data_property_id = data[toField(property) + '_id'];
     Object.assign(object, {
-        [property + 'Ids']: Object.keys(values).map(key => +data_property_id[key]).filter(value => value)
+        [property.toString() + 'Ids']: Object.keys(values).map(key => +data_property_id[key]).filter(value => value)
     });
     return depends.ignoreTransformedValue;
 }

package/esm/primitive.d.ts

@@ -1,8 +1,8 @@
-import { AnyObject } from '@itrocks/class-type';
+import { ObjectOrType } from '@itrocks/class-type';
 export type CoreDependencies = {
-    displayOf: (object: AnyObject, property: string) => string;
-    fieldIdOf: (property: string) => string;
-    fieldNameOf: (property: string) => string;
+    displayOf: <T extends object>(object: ObjectOrType<T>, property: keyof T) => string;
+    fieldIdOf: (property: keyof any) => string;
+    fieldNameOf: (property: keyof any) => string;
     tr: (text: string) => string;
 };
 export type Dependencies = CoreDependencies & {

package/esm/primitive.js

@@ -4,10 +4,10 @@ import { EDIT, HTML, INPUT, OUTPUT } from '@itrocks/transformer';
 import { READ, SAVE, SQL } from '@itrocks/transformer';
 const lfTab = '\n\t\t\t\t';
 const depends = {
-    displayOf: (_object, property) => property,
+    displayOf: (_object, property) => property.toString(),
     formatDate: date => date.toString(),
-    fieldIdOf: property => property,
-    fieldNameOf: property => property,
+    fieldIdOf: property => property.toString(),
+    fieldNameOf: property => property.toString(),
     parseDate: date => new Date(date),
     tr: text => text
 };

package/esm/store.d.ts

@@ -1,12 +1,12 @@
-import { AnyObject } from '@itrocks/class-type';
+import { ObjectOrType } from '@itrocks/class-type';
 import { Type } from '@itrocks/class-type';
 export type SqlDependencies = {
     ignoreTransformedValue: any;
 };
 export type Dependencies = SqlDependencies & {
-    displayOf: (object: AnyObject, property: string) => string;
-    fieldIdOf: (property: string) => string;
-    fieldNameOf: (property: string) => string;
+    displayOf: <T extends object>(object: ObjectOrType<T>, property: keyof T) => string;
+    fieldIdOf: (property: keyof any) => string;
+    fieldNameOf: (property: keyof any) => string;
     representativeValueOf: (object: object) => Promise<string>;
     routeOf: (type: Type) => string;
     tr: (text: string) => string;

package/esm/store.js

@@ -1,4 +1,5 @@
-import { baseType, typeOf } from '@itrocks/class-type';
+import { baseType } from '@itrocks/class-type';
+import { typeOf } from '@itrocks/class-type';
 import { ReflectProperty } from '@itrocks/reflect';
 import { dataSource } from '@itrocks/storage';
 import { setPropertyTypeTransformer } from '@itrocks/transformer';
@@ -6,9 +7,9 @@ import { EDIT, HTML } from '@itrocks/transformer';
 import { INPUT, OUTPUT, SAVE, SQL } from '@itrocks/transformer';
 const lfTab = '\n\t\t\t\t';
 const depends = {
-    displayOf: (_object, property) => property,
-    fieldIdOf: property => property,
-    fieldNameOf: property => property,
+    displayOf: (_object, property) => property.toString(),
+    fieldIdOf: property => property.toString(),
+    fieldNameOf: property => property.toString(),
     ignoreTransformedValue: Symbol('ignoreTransformedValue'),
     representativeValueOf: async (object) => baseType(typeOf(object)).name,
     routeOf: type => '/' + baseType(type).name,
@@ -45,7 +46,7 @@ async function storeEdit(value, object, property) {
     return label + lfTab + inputId + input;
 }
 function storeInput(value, object, property, data) {
-    const propertyId = property + 'Id';
+    const propertyId = (property.toString() + 'Id');
     const fieldId = depends.fieldNameOf(propertyId);
     const id = +data[fieldId];
     if (id === ((propertyId in object) ? object[propertyId] : value?.id)) {
@@ -72,7 +73,7 @@ async function storeSave(value, _object, property, record) {
     if (value && !dao.isObjectConnected(value)) {
         await dao.save(value);
     }
-    const columnId = property + '_id';
+    const columnId = property.toString() + '_id';
     const id = (value && dao.isObjectConnected(value)) ? value.id : record[columnId];
     record[columnId] = id ?? null;
     return depends.ignoreTransformedValue;

package/package.json

@@ -58,5 +58,5 @@
 		"build:esm": "tsc -p tsconfig.esm.json && node esm/esm"
 	},
 	"types": "./esm/core-transformers.d.ts",
-	"version": "0.1.4"
+	"version": "0.2.0"
 }