@itrocks/core-transformers 0.0.10 → 0.0.11

package/cjs/collection-type.d.ts

@@ -10,5 +10,4 @@ export type Dependencies = {
     tr: (text: string) => string;
 };
 export declare function initCollectionHtmlTransformers(dependencies?: Partial<Dependencies>): void;
-export declare function initCollectionSqlTransformers(): void;
 export declare function initCollectionTransformers(dependencies?: Partial<Dependencies>): void;

package/cjs/collection-type.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initCollectionHtmlTransformers = initCollectionHtmlTransformers;
-exports.initCollectionSqlTransformers = initCollectionSqlTransformers;
 exports.initCollectionTransformers = initCollectionTransformers;
 const composition_1 = require("@itrocks/composition");
 const storage_1 = require("@itrocks/storage");
@@ -23,7 +22,7 @@ const depends = {
     routeOf: type => '/' + (0, class_type_1.baseType)(type).name,
     tr: text => text
 };
-const areMayEntityEntries = (entries) => (typeof entries[0]?.[1])[0] === 'o';
+const areMayEntity = (entries) => (typeof entries[0])[0] === 'o';
 function collectionEdit(values, object, property) {
     const fieldId = depends.fieldIdOf(property);
     const fieldName = depends.fieldNameOf(property);
@@ -48,17 +47,15 @@ function collectionEdit(values, object, property) {
         + '</ul>';
 }
 function collectionInput(values, object, property, data) {
-    const entries = Object.entries(values);
-    if (areMayEntityEntries(entries)) {
-        Object.assign(object, { [property]: entries.map(([id, value]) => (0, storage_1.dataSource)().connectObject(value, +id)) });
-    }
-    else {
-        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)
-        });
+    const entries = Object.values(values);
+    if (areMayEntity(entries)) {
+        return Object.values(values);
     }
+    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)
+    });
     return depends.ignoreTransformedValue;
 }
 function collectionOutput(values, object, property, askFor) {
@@ -83,40 +80,13 @@ function collectionOutput(values, object, property, askFor) {
     }
     return values.map(object => depends.representativeValueOf(object)).join(', ');
 }
-async function collectionSave(values, object, property) {
-    const dao = (0, storage_1.dataSource)();
-    const newIdsPromise = object[property + 'Ids']
-        ?? values?.map(async (value) => (dao.isObjectConnected(value) ? value : await dao.save(value)).id).sort()
-        ?? [];
-    const previousIdsPromise = dao.isObjectConnected(object)
-        ? await dao.readCollectionIds(object, property)
-        : [];
-    return async (object) => {
-        const previousIds = await Promise.all(previousIdsPromise);
-        const newIds = await Promise.all(newIdsPromise);
-        for (const id of previousIds) {
-            if (newIds.includes(id))
-                continue;
-            dao.deleteRelatedId(object, property, id);
-        }
-        for (const id of newIds) {
-            if (previousIds.includes(id))
-                continue;
-            dao.insertRelatedId(object, property, id);
-        }
-    };
-}
 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);
 }
-function initCollectionSqlTransformers() {
-    (0, transformer_3.setPropertyTypeTransformer)(property_type_1.CollectionType, transformer_2.SQL, transformer_2.SAVE, collectionSave);
-}
 function initCollectionTransformers(dependencies = {}) {
     initCollectionHtmlTransformers(dependencies);
-    initCollectionSqlTransformers();
 }
 //# sourceMappingURL=collection-type.js.map

package/cjs/core-transformers.d.ts

@@ -2,7 +2,7 @@ import { Dependencies as CollectionTypeDependencies } from './collection-type';
 import { Dependencies as PrimitiveDependencies } from './primitive';
 import { Dependencies as StoreDependencies } from './store';
 type Dependencies = CollectionTypeDependencies & PrimitiveDependencies & StoreDependencies;
-export { initCollectionHtmlTransformers, initCollectionSqlTransformers, initCollectionTransformers } from './collection-type';
+export { initCollectionHtmlTransformers, initCollectionTransformers } from './collection-type';
 export { HtmlContainer, initContainerTransformers } from './container';
 export { initBigintHtmlTransformers, initBooleanHtmlTransformers, initBooleanSqlTransformers, initDateHtmlTransformers, initDefaultHtmlEditTransformers, initNumberHtmlTransformers, initPrimitiveTransformers, setCorePrimitiveDependencies, setPrimitiveDependencies } from './primitive';
 export { initStoreHtmlTransformers, initStoreSqlTransformers, initStoreTransformers, setStoreDependencies, setStoreSqlDependencies, setStoreHtmlDependencies } from './store';

package/cjs/core-transformers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.setStoreHtmlDependencies = exports.setStoreSqlDependencies = exports.setStoreDependencies = exports.initStoreTransformers = exports.initStoreSqlTransformers = exports.initStoreHtmlTransformers = exports.setPrimitiveDependencies = exports.setCorePrimitiveDependencies = exports.initPrimitiveTransformers = exports.initNumberHtmlTransformers = exports.initDefaultHtmlEditTransformers = exports.initDateHtmlTransformers = exports.initBooleanSqlTransformers = exports.initBooleanHtmlTransformers = exports.initBigintHtmlTransformers = exports.initContainerTransformers = exports.HtmlContainer = exports.initCollectionTransformers = exports.initCollectionSqlTransformers = exports.initCollectionHtmlTransformers = void 0;
+exports.setStoreHtmlDependencies = exports.setStoreSqlDependencies = exports.setStoreDependencies = exports.initStoreTransformers = exports.initStoreSqlTransformers = exports.initStoreHtmlTransformers = exports.setPrimitiveDependencies = exports.setCorePrimitiveDependencies = exports.initPrimitiveTransformers = exports.initNumberHtmlTransformers = exports.initDefaultHtmlEditTransformers = exports.initDateHtmlTransformers = exports.initBooleanSqlTransformers = exports.initBooleanHtmlTransformers = exports.initBigintHtmlTransformers = exports.initContainerTransformers = exports.HtmlContainer = exports.initCollectionTransformers = exports.initCollectionHtmlTransformers = void 0;
 exports.initCoreTransformers = initCoreTransformers;
 const collection_type_1 = require("./collection-type");
 const container_1 = require("./container");
@@ -8,7 +8,6 @@ const primitive_1 = require("./primitive");
 const store_1 = require("./store");
 var collection_type_2 = require("./collection-type");
 Object.defineProperty(exports, "initCollectionHtmlTransformers", { enumerable: true, get: function () { return collection_type_2.initCollectionHtmlTransformers; } });
-Object.defineProperty(exports, "initCollectionSqlTransformers", { enumerable: true, get: function () { return collection_type_2.initCollectionSqlTransformers; } });
 Object.defineProperty(exports, "initCollectionTransformers", { enumerable: true, get: function () { return collection_type_2.initCollectionTransformers; } });
 var container_2 = require("./container");
 Object.defineProperty(exports, "HtmlContainer", { enumerable: true, get: function () { return container_2.HtmlContainer; } });

package/cjs/primitive.js

@@ -9,6 +9,7 @@ exports.initDefaultHtmlEditTransformers = initDefaultHtmlEditTransformers;
 exports.initPrimitiveTransformers = initPrimitiveTransformers;
 exports.setCorePrimitiveDependencies = setCorePrimitiveDependencies;
 exports.setPrimitiveDependencies = setPrimitiveDependencies;
+const precision_1 = require("@itrocks/precision");
 const transformer_1 = require("@itrocks/transformer");
 const transformer_2 = require("@itrocks/transformer");
 const transformer_3 = require("@itrocks/transformer");
@@ -73,20 +74,52 @@ function initDateHtmlTransformers() {
 }
 // Number
 function numberEdit(value, type, property) {
+    const output = numberOutput(value, type, property);
     const fieldId = depends.fieldIdOf(property);
     const fieldName = depends.fieldNameOf(property);
     const label = `<label for="${fieldId}">${depends.tr(depends.displayOf(type, property))}</label>`;
     const name = `id="${fieldId}" name="${fieldName}"`;
-    const inputValue = (value !== undefined) ? ` value="${value}"` : '';
+    const inputValue = (output !== undefined) ? ` value="${output}"` : '';
     const input = `<input data-type="number" ${name}${inputValue}>`;
     return label + lfTab + input;
 }
+function numberInput(value) {
+    const number = (value === '') ? undefined : +(value.replace(/\s/g, '').replace(',', '.'));
+    if (!Number.isNaN(number))
+        return number;
+    const endChar = value[value.length - 1].toUpperCase();
+    if (endChar === 'K')
+        return (+value.slice(0, -1)) * 1e3;
+    if (endChar === 'M')
+        return (+value.slice(0, -1)) * 1e6;
+    if (endChar === 'G')
+        return (+value.slice(0, -2)) * 1e9;
+    if (endChar === 'T')
+        return (+value.slice(0, -2)) * 1e12;
+    if (endChar === 'P')
+        return (+value.slice(0, -2)) * 1e15;
+    if ((endChar === 'D') && (value[value.length - 2] === 'M'))
+        return (+value.slice(0, -2)) * 10 ** 9;
+    return number;
+}
+function numberOutput(value, object, property) {
+    if (value === undefined)
+        return '';
+    const precision = (0, precision_1.precisionOf)(object, property);
+    return value.toLocaleString('fr-FR', {
+        minimumFractionDigits: precision.minimum,
+        maximumFractionDigits: precision.maximum
+    });
+}
+function numberRead(value) {
+    return (typeof value === 'string') ? +value : (value ?? undefined);
+}
 function initNumberHtmlTransformers() {
     (0, transformer_1.setPropertyTypeTransformers)(Number, [
         { format: transformer_2.HTML, direction: transformer_2.EDIT, transformer: numberEdit },
-        { format: transformer_2.HTML, direction: transformer_2.INPUT, transformer: (value) => (value === '') ? undefined : +value },
-        { format: transformer_2.HTML, direction: transformer_2.OUTPUT, transformer: (value) => (value === undefined) ? '' : ('' + value) },
-        { format: transformer_3.SQL, direction: transformer_3.READ, transformer: (value) => (value === null) ? undefined : value }
+        { format: transformer_2.HTML, direction: transformer_2.INPUT, transformer: numberInput },
+        { format: transformer_2.HTML, direction: transformer_2.OUTPUT, transformer: numberOutput },
+        { format: transformer_3.SQL, direction: transformer_3.READ, transformer: numberRead }
     ]);
 }
 // default

package/cjs/store.js

@@ -54,22 +54,20 @@ function storeEdit(value, object, property) {
 function storeInput(value, object, property, data) {
     const propertyId = property + 'Id';
     const fieldId = depends.fieldNameOf(propertyId);
-    if ((fieldId in data)
-        && ((propertyId in object)
-            ? (data[fieldId] !== object[propertyId] + '')
-            : (data[fieldId] !== value?.id + ''))) {
-        delete object[property];
-        const id = +data[fieldId];
-        if (id) {
-            Object.assign(object, { [propertyId]: id });
-        }
-        else if ((typeof value === 'object')) {
-            Object.assign(object, { [property]: value });
-        }
-        else if ((typeof value === 'string') && (value !== '')) {
-            const reflectProperty = new reflect_1.ReflectProperty(object, property);
-            Object.assign(object, { [property]: new reflectProperty.type.type(value) });
-        }
+    const id = +data[fieldId];
+    if (id === ((propertyId in object) ? object[propertyId] : value?.id)) {
+        return depends.ignoreTransformedValue;
+    }
+    delete object[property];
+    if (id) {
+        Object.assign(object, { [propertyId]: id });
+    }
+    else if ((typeof value === 'object')) {
+        Object.assign(object, { [property]: value });
+    }
+    else if ((typeof value === 'string') && (value !== '')) {
+        const reflectProperty = new reflect_1.ReflectProperty(object, property);
+        Object.assign(object, { [property]: new reflectProperty.type.type(value) });
     }
     return depends.ignoreTransformedValue;
 }

package/esm/collection-type.d.ts

@@ -10,5 +10,4 @@ export type Dependencies = {
     tr: (text: string) => string;
 };
 export declare function initCollectionHtmlTransformers(dependencies?: Partial<Dependencies>): void;
-export declare function initCollectionSqlTransformers(): void;
 export declare function initCollectionTransformers(dependencies?: Partial<Dependencies>): void;

package/esm/collection-type.js

@@ -7,7 +7,7 @@ import { toField } from '@itrocks/rename';
 import { ReflectClass } from '@itrocks/reflect';
 import { ReflectProperty } from '@itrocks/reflect';
 import { EDIT, HTML } from '@itrocks/transformer';
-import { INPUT, OUTPUT, SAVE, SQL } from '@itrocks/transformer';
+import { INPUT, OUTPUT } from '@itrocks/transformer';
 import { setPropertyTypeTransformer } from '@itrocks/transformer';
 const depends = {
     displayOf: (_object, property) => property,
@@ -18,7 +18,7 @@ const depends = {
     routeOf: type => '/' + baseType(type).name,
     tr: text => text
 };
-const areMayEntityEntries = (entries) => (typeof entries[0]?.[1])[0] === 'o';
+const areMayEntity = (entries) => (typeof entries[0])[0] === 'o';
 function collectionEdit(values, object, property) {
     const fieldId = depends.fieldIdOf(property);
     const fieldName = depends.fieldNameOf(property);
@@ -43,17 +43,15 @@ function collectionEdit(values, object, property) {
         + '</ul>';
 }
 function collectionInput(values, object, property, data) {
-    const entries = Object.entries(values);
-    if (areMayEntityEntries(entries)) {
-        Object.assign(object, { [property]: entries.map(([id, value]) => dataSource().connectObject(value, +id)) });
-    }
-    else {
-        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)
-        });
+    const entries = Object.values(values);
+    if (areMayEntity(entries)) {
+        return Object.values(values);
     }
+    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)
+    });
     return depends.ignoreTransformedValue;
 }
 function collectionOutput(values, object, property, askFor) {
@@ -78,40 +76,13 @@ function collectionOutput(values, object, property, askFor) {
     }
     return values.map(object => depends.representativeValueOf(object)).join(', ');
 }
-async function collectionSave(values, object, property) {
-    const dao = dataSource();
-    const newIdsPromise = object[property + 'Ids']
-        ?? values?.map(async (value) => (dao.isObjectConnected(value) ? value : await dao.save(value)).id).sort()
-        ?? [];
-    const previousIdsPromise = dao.isObjectConnected(object)
-        ? await dao.readCollectionIds(object, property)
-        : [];
-    return async (object) => {
-        const previousIds = await Promise.all(previousIdsPromise);
-        const newIds = await Promise.all(newIdsPromise);
-        for (const id of previousIds) {
-            if (newIds.includes(id))
-                continue;
-            dao.deleteRelatedId(object, property, id);
-        }
-        for (const id of newIds) {
-            if (previousIds.includes(id))
-                continue;
-            dao.insertRelatedId(object, property, id);
-        }
-    };
-}
 export function initCollectionHtmlTransformers(dependencies = {}) {
     Object.assign(depends, dependencies);
     setPropertyTypeTransformer(CollectionType, HTML, EDIT, collectionEdit);
     setPropertyTypeTransformer(CollectionType, HTML, INPUT, collectionInput);
     setPropertyTypeTransformer(CollectionType, HTML, OUTPUT, collectionOutput);
 }
-export function initCollectionSqlTransformers() {
-    setPropertyTypeTransformer(CollectionType, SQL, SAVE, collectionSave);
-}
 export function initCollectionTransformers(dependencies = {}) {
     initCollectionHtmlTransformers(dependencies);
-    initCollectionSqlTransformers();
 }
 //# sourceMappingURL=collection-type.js.map

package/esm/core-transformers.d.ts

@@ -2,7 +2,7 @@ import { Dependencies as CollectionTypeDependencies } from './collection-type';
 import { Dependencies as PrimitiveDependencies } from './primitive';
 import { Dependencies as StoreDependencies } from './store';
 type Dependencies = CollectionTypeDependencies & PrimitiveDependencies & StoreDependencies;
-export { initCollectionHtmlTransformers, initCollectionSqlTransformers, initCollectionTransformers } from './collection-type';
+export { initCollectionHtmlTransformers, initCollectionTransformers } from './collection-type';
 export { HtmlContainer, initContainerTransformers } from './container';
 export { initBigintHtmlTransformers, initBooleanHtmlTransformers, initBooleanSqlTransformers, initDateHtmlTransformers, initDefaultHtmlEditTransformers, initNumberHtmlTransformers, initPrimitiveTransformers, setCorePrimitiveDependencies, setPrimitiveDependencies } from './primitive';
 export { initStoreHtmlTransformers, initStoreSqlTransformers, initStoreTransformers, setStoreDependencies, setStoreSqlDependencies, setStoreHtmlDependencies } from './store';

package/esm/core-transformers.js

@@ -2,7 +2,7 @@ import { initCollectionTransformers } from './collection-type.js';
 import { initContainerTransformers } from './container.js';
 import { initPrimitiveTransformers } from './primitive.js';
 import { setStoreDependencies } from './store.js';
-export { initCollectionHtmlTransformers, initCollectionSqlTransformers, initCollectionTransformers } from './collection-type.js';
+export { initCollectionHtmlTransformers, initCollectionTransformers } from './collection-type.js';
 export { HtmlContainer, initContainerTransformers } from './container.js';
 export { initBigintHtmlTransformers, initBooleanHtmlTransformers, initBooleanSqlTransformers, initDateHtmlTransformers, initDefaultHtmlEditTransformers, initNumberHtmlTransformers, initPrimitiveTransformers, setCorePrimitiveDependencies, setPrimitiveDependencies } from './primitive.js';
 export { initStoreHtmlTransformers, initStoreSqlTransformers, initStoreTransformers, setStoreDependencies, setStoreSqlDependencies, setStoreHtmlDependencies } from './store.js';

package/esm/primitive.js

@@ -1,3 +1,4 @@
+import { precisionOf } from '@itrocks/precision';
 import { setPropertyTypeTransformers } from '@itrocks/transformer';
 import { EDIT, HTML, INPUT, OUTPUT } from '@itrocks/transformer';
 import { READ, SAVE, SQL } from '@itrocks/transformer';
@@ -62,20 +63,52 @@ export function initDateHtmlTransformers() {
 }
 // Number
 function numberEdit(value, type, property) {
+    const output = numberOutput(value, type, property);
     const fieldId = depends.fieldIdOf(property);
     const fieldName = depends.fieldNameOf(property);
     const label = `<label for="${fieldId}">${depends.tr(depends.displayOf(type, property))}</label>`;
     const name = `id="${fieldId}" name="${fieldName}"`;
-    const inputValue = (value !== undefined) ? ` value="${value}"` : '';
+    const inputValue = (output !== undefined) ? ` value="${output}"` : '';
     const input = `<input data-type="number" ${name}${inputValue}>`;
     return label + lfTab + input;
 }
+function numberInput(value) {
+    const number = (value === '') ? undefined : +(value.replace(/\s/g, '').replace(',', '.'));
+    if (!Number.isNaN(number))
+        return number;
+    const endChar = value[value.length - 1].toUpperCase();
+    if (endChar === 'K')
+        return (+value.slice(0, -1)) * 1e3;
+    if (endChar === 'M')
+        return (+value.slice(0, -1)) * 1e6;
+    if (endChar === 'G')
+        return (+value.slice(0, -2)) * 1e9;
+    if (endChar === 'T')
+        return (+value.slice(0, -2)) * 1e12;
+    if (endChar === 'P')
+        return (+value.slice(0, -2)) * 1e15;
+    if ((endChar === 'D') && (value[value.length - 2] === 'M'))
+        return (+value.slice(0, -2)) * 10 ** 9;
+    return number;
+}
+function numberOutput(value, object, property) {
+    if (value === undefined)
+        return '';
+    const precision = precisionOf(object, property);
+    return value.toLocaleString('fr-FR', {
+        minimumFractionDigits: precision.minimum,
+        maximumFractionDigits: precision.maximum
+    });
+}
+function numberRead(value) {
+    return (typeof value === 'string') ? +value : (value ?? undefined);
+}
 export function initNumberHtmlTransformers() {
     setPropertyTypeTransformers(Number, [
         { format: HTML, direction: EDIT, transformer: numberEdit },
-        { format: HTML, direction: INPUT, transformer: (value) => (value === '') ? undefined : +value },
-        { format: HTML, direction: OUTPUT, transformer: (value) => (value === undefined) ? '' : ('' + value) },
-        { format: SQL, direction: READ, transformer: (value) => (value === null) ? undefined : value }
+        { format: HTML, direction: INPUT, transformer: numberInput },
+        { format: HTML, direction: OUTPUT, transformer: numberOutput },
+        { format: SQL, direction: READ, transformer: numberRead }
     ]);
 }
 // default

package/esm/store.js

@@ -47,22 +47,20 @@ function storeEdit(value, object, property) {
 function storeInput(value, object, property, data) {
     const propertyId = property + 'Id';
     const fieldId = depends.fieldNameOf(propertyId);
-    if ((fieldId in data)
-        && ((propertyId in object)
-            ? (data[fieldId] !== object[propertyId] + '')
-            : (data[fieldId] !== value?.id + ''))) {
-        delete object[property];
-        const id = +data[fieldId];
-        if (id) {
-            Object.assign(object, { [propertyId]: id });
-        }
-        else if ((typeof value === 'object')) {
-            Object.assign(object, { [property]: value });
-        }
-        else if ((typeof value === 'string') && (value !== '')) {
-            const reflectProperty = new ReflectProperty(object, property);
-            Object.assign(object, { [property]: new reflectProperty.type.type(value) });
-        }
+    const id = +data[fieldId];
+    if (id === ((propertyId in object) ? object[propertyId] : value?.id)) {
+        return depends.ignoreTransformedValue;
+    }
+    delete object[property];
+    if (id) {
+        Object.assign(object, { [propertyId]: id });
+    }
+    else if ((typeof value === 'object')) {
+        Object.assign(object, { [property]: value });
+    }
+    else if ((typeof value === 'string') && (value !== '')) {
+        const reflectProperty = new ReflectProperty(object, property);
+        Object.assign(object, { [property]: new reflectProperty.type.type(value) });
     }
     return depends.ignoreTransformedValue;
 }

package/package.json

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