@roomwise/calc-engine 0.1.0 → 0.3.0

package/README.md

@@ -136,7 +136,6 @@ const preview = previewRule({
       totalAreaSqm: 62,
       balconyAreaSqm: 4,
       balconyTiles: true,
-      gas: false,
       kitchenType: 'SEPARATE',
       finishLevel: 'PRE_FINISH',
       roomsCount: 1,
@@ -202,7 +201,7 @@ roomType == 'KITCHEN' ? ceil(floorArea / 2) : 0
 | product | `waste` | number, a fraction (5% is `0.05`): the product override, else the category value |
 | product | `unit` | `SQM`, `LINEAR_M`, `PIECE` |
 | object | `totalArea`, `balconyArea` | number |
-| object | `balconyTiles`, `gas` | boolean |
+| object | `balconyTiles` | boolean |
 | object | `kitchenType` | `SEPARATE`, `KITCHEN_LIVING` |
 | object | `finishLevel` | `ROUGH`, `PRE_FINISH` |
 | object | `roomsCount`, `bathroomsCount` | number (living rooms, bedrooms and kitchen-living rooms count as rooms) |

package/dist/index.cjs

@@ -118,7 +118,7 @@ function optionLine(configuration, option, selection) {
 		params: { optionId: option.id }
 	});
 	const selected = configuration.rooms.filter((room) => selection.roomClientIds?.includes(room.clientId));
-	const allowed = selected.filter((room) => option.roomTypeCodes.includes(room.roomTypeCode));
+	const allowed = option.roomTypeCodes.length === 0 ? selected : selected.filter((room) => option.roomTypeCodes.includes(room.roomTypeCode));
 	const rejected = selected.filter((room) => !allowed.includes(room));
 	const quantity = unitQuantity(option.unit, allowed, selection.quantity ?? option.minQuantity ?? 1);
 	return pricedLine({
@@ -208,7 +208,6 @@ function objectVariables(configuration) {
 		totalArea: configuration.totalAreaSqm,
 		balconyArea: configuration.balconyAreaSqm,
 		balconyTiles: configuration.balconyTiles,
-		gas: configuration.gas,
 		kitchenType: configuration.kitchenType,
 		finishLevel: configuration.finishLevel,
 		roomsCount: configuration.rooms.filter((room) => COUNTED_AS_ROOMS.includes(room.roomTypeCode)).length,
@@ -791,6 +790,7 @@ const OptionUnitSchema = zod.z.enum([
 	"PROJECT"
 ]);
 const OptionKindSchema = zod.z.enum(["ENGINEERING", "ADDITIONAL"]);
+const OptionCodeSchema = zod.z.enum(["HEATED_FLOOR"]);
 const RoomTypeCodeSchema = zod.z.enum([
 	"LIVING_ROOM",
 	"BEDROOM",
@@ -827,6 +827,7 @@ const RoomSelectionSchema = zod.z.object({
 });
 const RoomConfigurationSchema = zod.z.object({
 	clientId: zod.z.string(),
+	name: zod.z.string().trim().min(1).max(60).optional(),
 	roomTypeCode: RoomTypeCodeSchema,
 	lengthM: zod.z.number().positive(),
 	widthM: zod.z.number().positive(),
@@ -853,7 +854,6 @@ const ConfigurationSchema = zod.z.object({
 	totalAreaSqm: zod.z.number().positive(),
 	balconyAreaSqm: zod.z.number().min(0),
 	balconyTiles: zod.z.boolean(),
-	gas: zod.z.boolean(),
 	kitchenType: KitchenTypeSchema,
 	rooms: zod.z.array(RoomConfigurationSchema),
 	options: zod.z.array(OptionSelectionSchema),
@@ -944,6 +944,7 @@ const PricingPackageItemSchema = zod.z.object({
 });
 const PricingOptionSchema = zod.z.object({
 	id: zod.z.string(),
+	code: OptionCodeSchema.nullable(),
 	kind: OptionKindSchema,
 	priceCents: CentsSchema,
 	unit: OptionUnitSchema,
@@ -1028,7 +1029,6 @@ const RuleSampleSchema = zod.z.object({
 		totalAreaSqm: zod.z.number().positive(),
 		balconyAreaSqm: zod.z.number().min(0),
 		balconyTiles: zod.z.boolean(),
-		gas: zod.z.boolean(),
 		kitchenType: KitchenTypeSchema,
 		finishLevel: FinishLevelSchema,
 		roomsCount: zod.z.int().min(0),
@@ -1187,7 +1187,6 @@ function objectScope({ object }) {
 		totalArea: object.totalAreaSqm,
 		balconyArea: object.balconyAreaSqm,
 		balconyTiles: object.balconyTiles,
-		gas: object.gas,
 		kitchenType: object.kitchenType,
 		finishLevel: object.finishLevel,
 		roomsCount: object.roomsCount,
@@ -1316,7 +1315,6 @@ const FORMULA_SCOPE_VARIABLES = {
 		number("totalArea"),
 		number("balconyArea"),
 		boolean("balconyTiles"),
-		boolean("gas"),
 		enumeration("kitchenType", KitchenTypeSchema.options),
 		enumeration("finishLevel", FinishLevelSchema.options),
 		number("roomsCount"),
@@ -1570,6 +1568,7 @@ exports.FinishLevelSchema = FinishLevelSchema;
 exports.KitchenTypeSchema = KitchenTypeSchema;
 exports.LineStatusSchema = LineStatusSchema;
 exports.LocalizedTextSchema = LocalizedTextSchema;
+exports.OptionCodeSchema = OptionCodeSchema;
 exports.OptionKindSchema = OptionKindSchema;
 exports.OptionSelectionSchema = OptionSelectionSchema;
 exports.OptionUnitSchema = OptionUnitSchema;

package/dist/index.d.cts

@@ -46,6 +46,10 @@ export declare const OptionKindSchema: z.ZodEnum<{
   ADDITIONAL: "ADDITIONAL";
 }>;
 export type OptionKind = z.infer<typeof OptionKindSchema>;
+export declare const OptionCodeSchema: z.ZodEnum<{
+  HEATED_FLOOR: "HEATED_FLOOR";
+}>;
+export type OptionCode = z.infer<typeof OptionCodeSchema>;
 export declare const RoomTypeCodeSchema: z.ZodEnum<{
   LIVING_ROOM: "LIVING_ROOM";
   BEDROOM: "BEDROOM";
@@ -96,6 +100,7 @@ export declare const RoomSelectionSchema: z.ZodObject<{
 export type RoomSelection = z.infer<typeof RoomSelectionSchema>;
 export declare const RoomConfigurationSchema: z.ZodObject<{
   clientId: z.ZodString;
+  name: z.ZodOptional<z.ZodString>;
   roomTypeCode: z.ZodEnum<{
     LIVING_ROOM: "LIVING_ROOM";
     BEDROOM: "BEDROOM";
@@ -127,13 +132,13 @@ export declare const ConfigurationSchema: z.ZodObject<{
   totalAreaSqm: z.ZodNumber;
   balconyAreaSqm: z.ZodNumber;
   balconyTiles: z.ZodBoolean;
-  gas: z.ZodBoolean;
   kitchenType: z.ZodEnum<{
     KITCHEN_LIVING: "KITCHEN_LIVING";
     SEPARATE: "SEPARATE";
   }>;
   rooms: z.ZodArray<z.ZodObject<{
     clientId: z.ZodString;
+    name: z.ZodOptional<z.ZodString>;
     roomTypeCode: z.ZodEnum<{
       LIVING_ROOM: "LIVING_ROOM";
       BEDROOM: "BEDROOM";
@@ -332,7 +337,6 @@ export declare const RuleSampleSchema: z.ZodObject<{
     totalAreaSqm: z.ZodNumber;
     balconyAreaSqm: z.ZodNumber;
     balconyTiles: z.ZodBoolean;
-    gas: z.ZodBoolean;
     kitchenType: z.ZodEnum<{
       KITCHEN_LIVING: "KITCHEN_LIVING";
       SEPARATE: "SEPARATE";
@@ -465,6 +469,9 @@ export declare const PricingPackageItemSchema: z.ZodObject<{
 export type PricingPackageItem = z.infer<typeof PricingPackageItemSchema>;
 export declare const PricingOptionSchema: z.ZodObject<{
   id: z.ZodString;
+  code: z.ZodNullable<z.ZodEnum<{
+    HEATED_FLOOR: "HEATED_FLOOR";
+  }>>;
   kind: z.ZodEnum<{
     ENGINEERING: "ENGINEERING";
     ADDITIONAL: "ADDITIONAL";
@@ -582,6 +589,9 @@ export declare const PricingDataSchema: z.ZodObject<{
   }, z.core.$strip>>;
   options: z.ZodArray<z.ZodObject<{
     id: z.ZodString;
+    code: z.ZodNullable<z.ZodEnum<{
+      HEATED_FLOOR: "HEATED_FLOOR";
+    }>>;
     kind: z.ZodEnum<{
       ENGINEERING: "ENGINEERING";
       ADDITIONAL: "ADDITIONAL";
@@ -761,7 +771,6 @@ export interface ObjectVariables {
   readonly totalArea: number;
   readonly balconyArea: number;
   readonly balconyTiles: boolean;
-  readonly gas: boolean;
   readonly kitchenType: KitchenType;
   readonly finishLevel: FinishLevel;
   readonly roomsCount: number;

package/dist/index.d.ts

@@ -46,6 +46,10 @@ export declare const OptionKindSchema: z.ZodEnum<{
   ADDITIONAL: "ADDITIONAL";
 }>;
 export type OptionKind = z.infer<typeof OptionKindSchema>;
+export declare const OptionCodeSchema: z.ZodEnum<{
+  HEATED_FLOOR: "HEATED_FLOOR";
+}>;
+export type OptionCode = z.infer<typeof OptionCodeSchema>;
 export declare const RoomTypeCodeSchema: z.ZodEnum<{
   LIVING_ROOM: "LIVING_ROOM";
   BEDROOM: "BEDROOM";
@@ -96,6 +100,7 @@ export declare const RoomSelectionSchema: z.ZodObject<{
 export type RoomSelection = z.infer<typeof RoomSelectionSchema>;
 export declare const RoomConfigurationSchema: z.ZodObject<{
   clientId: z.ZodString;
+  name: z.ZodOptional<z.ZodString>;
   roomTypeCode: z.ZodEnum<{
     LIVING_ROOM: "LIVING_ROOM";
     BEDROOM: "BEDROOM";
@@ -127,13 +132,13 @@ export declare const ConfigurationSchema: z.ZodObject<{
   totalAreaSqm: z.ZodNumber;
   balconyAreaSqm: z.ZodNumber;
   balconyTiles: z.ZodBoolean;
-  gas: z.ZodBoolean;
   kitchenType: z.ZodEnum<{
     KITCHEN_LIVING: "KITCHEN_LIVING";
     SEPARATE: "SEPARATE";
   }>;
   rooms: z.ZodArray<z.ZodObject<{
     clientId: z.ZodString;
+    name: z.ZodOptional<z.ZodString>;
     roomTypeCode: z.ZodEnum<{
       LIVING_ROOM: "LIVING_ROOM";
       BEDROOM: "BEDROOM";
@@ -332,7 +337,6 @@ export declare const RuleSampleSchema: z.ZodObject<{
     totalAreaSqm: z.ZodNumber;
     balconyAreaSqm: z.ZodNumber;
     balconyTiles: z.ZodBoolean;
-    gas: z.ZodBoolean;
     kitchenType: z.ZodEnum<{
       KITCHEN_LIVING: "KITCHEN_LIVING";
       SEPARATE: "SEPARATE";
@@ -465,6 +469,9 @@ export declare const PricingPackageItemSchema: z.ZodObject<{
 export type PricingPackageItem = z.infer<typeof PricingPackageItemSchema>;
 export declare const PricingOptionSchema: z.ZodObject<{
   id: z.ZodString;
+  code: z.ZodNullable<z.ZodEnum<{
+    HEATED_FLOOR: "HEATED_FLOOR";
+  }>>;
   kind: z.ZodEnum<{
     ENGINEERING: "ENGINEERING";
     ADDITIONAL: "ADDITIONAL";
@@ -582,6 +589,9 @@ export declare const PricingDataSchema: z.ZodObject<{
   }, z.core.$strip>>;
   options: z.ZodArray<z.ZodObject<{
     id: z.ZodString;
+    code: z.ZodNullable<z.ZodEnum<{
+      HEATED_FLOOR: "HEATED_FLOOR";
+    }>>;
     kind: z.ZodEnum<{
       ENGINEERING: "ENGINEERING";
       ADDITIONAL: "ADDITIONAL";
@@ -761,7 +771,6 @@ export interface ObjectVariables {
   readonly totalArea: number;
   readonly balconyArea: number;
   readonly balconyTiles: boolean;
-  readonly gas: boolean;
   readonly kitchenType: KitchenType;
   readonly finishLevel: FinishLevel;
   readonly roomsCount: number;

package/dist/index.js

@@ -93,7 +93,7 @@ function optionLine(configuration, option, selection) {
 		params: { optionId: option.id }
 	});
 	const selected = configuration.rooms.filter((room) => selection.roomClientIds?.includes(room.clientId));
-	const allowed = selected.filter((room) => option.roomTypeCodes.includes(room.roomTypeCode));
+	const allowed = option.roomTypeCodes.length === 0 ? selected : selected.filter((room) => option.roomTypeCodes.includes(room.roomTypeCode));
 	const rejected = selected.filter((room) => !allowed.includes(room));
 	const quantity = unitQuantity(option.unit, allowed, selection.quantity ?? option.minQuantity ?? 1);
 	return pricedLine({
@@ -183,7 +183,6 @@ function objectVariables(configuration) {
 		totalArea: configuration.totalAreaSqm,
 		balconyArea: configuration.balconyAreaSqm,
 		balconyTiles: configuration.balconyTiles,
-		gas: configuration.gas,
 		kitchenType: configuration.kitchenType,
 		finishLevel: configuration.finishLevel,
 		roomsCount: configuration.rooms.filter((room) => COUNTED_AS_ROOMS.includes(room.roomTypeCode)).length,
@@ -766,6 +765,7 @@ const OptionUnitSchema = z.enum([
 	"PROJECT"
 ]);
 const OptionKindSchema = z.enum(["ENGINEERING", "ADDITIONAL"]);
+const OptionCodeSchema = z.enum(["HEATED_FLOOR"]);
 const RoomTypeCodeSchema = z.enum([
 	"LIVING_ROOM",
 	"BEDROOM",
@@ -802,6 +802,7 @@ const RoomSelectionSchema = z.object({
 });
 const RoomConfigurationSchema = z.object({
 	clientId: z.string(),
+	name: z.string().trim().min(1).max(60).optional(),
 	roomTypeCode: RoomTypeCodeSchema,
 	lengthM: z.number().positive(),
 	widthM: z.number().positive(),
@@ -828,7 +829,6 @@ const ConfigurationSchema = z.object({
 	totalAreaSqm: z.number().positive(),
 	balconyAreaSqm: z.number().min(0),
 	balconyTiles: z.boolean(),
-	gas: z.boolean(),
 	kitchenType: KitchenTypeSchema,
 	rooms: z.array(RoomConfigurationSchema),
 	options: z.array(OptionSelectionSchema),
@@ -919,6 +919,7 @@ const PricingPackageItemSchema = z.object({
 });
 const PricingOptionSchema = z.object({
 	id: z.string(),
+	code: OptionCodeSchema.nullable(),
 	kind: OptionKindSchema,
 	priceCents: CentsSchema,
 	unit: OptionUnitSchema,
@@ -1003,7 +1004,6 @@ const RuleSampleSchema = z.object({
 		totalAreaSqm: z.number().positive(),
 		balconyAreaSqm: z.number().min(0),
 		balconyTiles: z.boolean(),
-		gas: z.boolean(),
 		kitchenType: KitchenTypeSchema,
 		finishLevel: FinishLevelSchema,
 		roomsCount: z.int().min(0),
@@ -1162,7 +1162,6 @@ function objectScope({ object }) {
 		totalArea: object.totalAreaSqm,
 		balconyArea: object.balconyAreaSqm,
 		balconyTiles: object.balconyTiles,
-		gas: object.gas,
 		kitchenType: object.kitchenType,
 		finishLevel: object.finishLevel,
 		roomsCount: object.roomsCount,
@@ -1291,7 +1290,6 @@ const FORMULA_SCOPE_VARIABLES = {
 		number("totalArea"),
 		number("balconyArea"),
 		boolean("balconyTiles"),
-		boolean("gas"),
 		enumeration("kitchenType", KitchenTypeSchema.options),
 		enumeration("finishLevel", FinishLevelSchema.options),
 		number("roomsCount"),
@@ -1524,4 +1522,4 @@ function validateFormula(input) {
 	};
 }
 //#endregion
-export { BaseRateSchema, COEFFICIENT_NAMESPACE, CentsSchema, ConfigurationSchema, CurrencySchema, EstimateLineSchema, EstimateMessageSchema, EstimateSchema, EstimateTotalsSchema, EstimateWarningSchema, ExchangeRateSchema, FORMULA_FUNCTIONS, FORMULA_FUNCTION_TABLE, FORMULA_LIMITS, FORMULA_QUANTITY_VARIABLE, FORMULA_SCOPE_VARIABLES, FORMULA_VARIABLES, FinishLevelSchema, KitchenTypeSchema, LineStatusSchema, LocalizedTextSchema, OptionKindSchema, OptionSelectionSchema, OptionUnitSchema, PricingCategorySchema, PricingDataSchema, PricingLimitsSchema, PricingMaterialTypeSchema, PricingOptionSchema, PricingPackageItemSchema, PricingProductSchema, PricingRoomTypeSchema, PricingRuleSchema, ProductUnitSchema, RangeSchema, RateSourceSchema, RoomConfigurationSchema, RoomSelectionSchema, RoomTypeCodeSchema, RuleLevelSchema, RulePreviewSchema, RuleSampleSchema, SectionSchema, SectionTotalSchema, SurfaceKindSchema, checkLimits, convertCentsToKopecks, estimate, evaluate, levenshtein, objectVariables, parse, previewRule, productVariables, productVariablesOf, roomVariables, suggestNearest, toCents, validateFormula };
+export { BaseRateSchema, COEFFICIENT_NAMESPACE, CentsSchema, ConfigurationSchema, CurrencySchema, EstimateLineSchema, EstimateMessageSchema, EstimateSchema, EstimateTotalsSchema, EstimateWarningSchema, ExchangeRateSchema, FORMULA_FUNCTIONS, FORMULA_FUNCTION_TABLE, FORMULA_LIMITS, FORMULA_QUANTITY_VARIABLE, FORMULA_SCOPE_VARIABLES, FORMULA_VARIABLES, FinishLevelSchema, KitchenTypeSchema, LineStatusSchema, LocalizedTextSchema, OptionCodeSchema, OptionKindSchema, OptionSelectionSchema, OptionUnitSchema, PricingCategorySchema, PricingDataSchema, PricingLimitsSchema, PricingMaterialTypeSchema, PricingOptionSchema, PricingPackageItemSchema, PricingProductSchema, PricingRoomTypeSchema, PricingRuleSchema, ProductUnitSchema, RangeSchema, RateSourceSchema, RoomConfigurationSchema, RoomSelectionSchema, RoomTypeCodeSchema, RuleLevelSchema, RulePreviewSchema, RuleSampleSchema, SectionSchema, SectionTotalSchema, SurfaceKindSchema, checkLimits, convertCentsToKopecks, estimate, evaluate, levenshtein, objectVariables, parse, previewRule, productVariables, productVariablesOf, roomVariables, suggestNearest, toCents, validateFormula };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@roomwise/calc-engine",
-  "version": "0.1.0",
+  "version": "0.3.0",
   "type": "module",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -50,6 +50,6 @@
     "tsdown": "^0.23.0",
     "typescript": "^5.9.3",
     "vitest": "^4.1.11",
-    "zod": "4.6.5"
+    "zod": "4.6.6"
   }
 }