@ecogood/e-calculator-schemas 2.0.0 → 2.2.0

package/LICENSE

@@ -1,21 +1,21 @@
-MIT License
-
-Copyright (c) 2021 Michael Rudolph
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+MIT License
+
+Copyright (c) 2021 Michael Rudolph
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.

package/README.md

@@ -1,26 +1,26 @@
-# E-Calculator Schemas
-
-This project contains the data transfer objects which are used by the [E-Calculator REST API](https://git.ecogood.org/services/balance-sheet-calculator)
-and the [E-Calculator Frontend](https://git.ecogood.org/services/e-calculator-frontend).
-
-## Install
-
-```bash
-npm install e-calculator-schemas
-```
-
-## Usage
-
-```typescript
-import { RegionResponseBodySchema } from 'e-calculator-schemas/dist/region.dto';
-const regionJson = {
-  countryCode: 'DEU',
-  countryName: 'Germany',
-};
-RegionResponseBodySchema.parse(regionJson);
-```
-
-## Publish
-```bash
-npm publish
-```
+# E-Calculator Schemas
+
+This project contains the data transfer objects which are used by the [E-Calculator REST API](https://git.ecogood.org/services/balance-sheet-calculator)
+and the [E-Calculator Frontend](https://git.ecogood.org/services/e-calculator-frontend).
+
+## Install
+
+```bash
+npm install e-calculator-schemas
+```
+
+## Usage
+
+```typescript
+import { RegionResponseBodySchema } from 'e-calculator-schemas/dist/region.dto';
+const regionJson = {
+  countryCode: 'DEU',
+  countryName: 'Germany',
+};
+RegionResponseBodySchema.parse(regionJson);
+```
+
+## Publish
+```bash
+npm publish
+```

package/dist/balance.sheet.dto.d.ts

@@ -733,15 +733,27 @@ export declare const BalanceSheetResponseBodySchema: z.ZodObject<{
 }>;
 export declare const BalanceSheetItemResponseSchema: z.ZodObject<{
     id: z.ZodNumber;
+    version: z.ZodNativeEnum<typeof BalanceSheetVersion>;
+    type: z.ZodNativeEnum<typeof BalanceSheetType>;
 }, "strip", z.ZodTypeAny, {
+    type: BalanceSheetType;
     id: number;
+    version: BalanceSheetVersion;
 }, {
+    type: BalanceSheetType;
     id: number;
+    version: BalanceSheetVersion;
 }>;
 export declare const BalanceSheetItemsResponseSchema: z.ZodArray<z.ZodObject<{
     id: z.ZodNumber;
+    version: z.ZodNativeEnum<typeof BalanceSheetVersion>;
+    type: z.ZodNativeEnum<typeof BalanceSheetType>;
 }, "strip", z.ZodTypeAny, {
+    type: BalanceSheetType;
     id: number;
+    version: BalanceSheetVersion;
 }, {
+    type: BalanceSheetType;
     id: number;
+    version: BalanceSheetVersion;
 }>, "many">;

package/dist/balance.sheet.dto.js

@@ -28,5 +28,7 @@ exports.BalanceSheetResponseBodySchema = zod_1.z.object({
 });
 exports.BalanceSheetItemResponseSchema = zod_1.z.object({
     id: zod_1.z.number(),
+    version: zod_1.z.nativeEnum(shared_schemas_1.BalanceSheetVersion),
+    type: zod_1.z.nativeEnum(shared_schemas_1.BalanceSheetType),
 });
 exports.BalanceSheetItemsResponseSchema = exports.BalanceSheetItemResponseSchema.array();

package/dist/shared.schemas.d.ts

@@ -16,4 +16,5 @@ export declare const isWeight: z.ZodEffects<z.ZodNumber, number, number>;
 export declare const isWeightOptional: z.ZodOptional<z.ZodEffects<z.ZodNumber, number, number>>;
 export declare const isNumberWithDefaultZero: z.ZodDefault<z.ZodNumber>;
 export declare const isPositiveNumber: z.ZodDefault<z.ZodNumber>;
+export declare const isPositiveNumberNotZero: z.ZodDefault<z.ZodNumber>;
 export declare const isPercentage: z.ZodNumber;

package/dist/shared.schemas.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isPercentage = exports.isPositiveNumber = exports.isNumberWithDefaultZero = exports.isWeightOptional = exports.isWeight = exports.WEIGHT_VALUES = exports.BalanceSheetVersion = exports.BalanceSheetType = exports.isIndustryCode = exports.isCountryCode = void 0;
+exports.isPercentage = exports.isPositiveNumberNotZero = exports.isPositiveNumber = exports.isNumberWithDefaultZero = exports.isWeightOptional = exports.isWeight = exports.WEIGHT_VALUES = exports.BalanceSheetVersion = exports.BalanceSheetType = exports.isIndustryCode = exports.isCountryCode = void 0;
 const zod_1 = require("zod");
 exports.isCountryCode = zod_1.z.string().min(3).max(3);
 exports.isIndustryCode = zod_1.z.string().min(1).max(4);
@@ -31,6 +31,9 @@ exports.isNumberWithDefaultZero = isNumberCustomError.default(0);
 exports.isPositiveNumber = isNumberCustomError
     .nonnegative('Number should be positive')
     .default(0);
+exports.isPositiveNumberNotZero = isNumberCustomError
+    .gt(0, 'Number should be positive and greater than zero')
+    .default(0);
 exports.isPercentage = zod_1.z
     .number({
     invalid_type_error: 'Percentage expected',

package/package.json

@@ -1,52 +1,52 @@
-{
-  "name": "@ecogood/e-calculator-schemas",
-  "version": "2.0.0",
-  "description": "A package providing the schemas for the e-calculator application.",
-  "main": "dist/e-calculator-schemas",
-  "types": "dist/e-calculator-schemas",
-  "scripts": {
-    "build": "tsc",
-    "test": "jest --watch --runInBand",
-    "test:ci": "jest --runInBand",
-    "format": "prettier --write .",
-    "lint": "eslint .",
-    "lint-fix": "eslint . --fix",
-    "update:to:latest": "ncu -u && yarn update && yarn install && yarn audit fix",
-    "prepare": "rm -r dist || true && yarn run build && yarn run test:ci && yarn run lint"
-  },
-  "publishConfig": {
-    "access": "public"
-  },
-  "files": [
-    "dist",
-    "LICENSE",
-    "README.md"
-  ],
-  "repository": {
-    "type": "git",
-    "url": "https://git.ecogood.org/services/e-calculator-schemas"
-  },
-  "keywords": [
-    "version",
-    "compare"
-  ],
-  "author": "Michael Rudolph",
-  "license": "MIT",
-  "bugs": {
-    "url": "https://git.ecogood.org/services/e-calculator-schemas/issues"
-  },
-  "devDependencies": {
-    "@eslint/js": "^9.4.0",
-    "@types/eslint__js": "^8.42.3",
-    "@types/jest": "^28.1.6",
-    "eslint": "^9.4.0",
-    "jest": "^29.5.0",
-    "prettier": "2.3.2",
-    "ts-jest": "^29.0.5",
-    "typescript": "^5.4.5",
-    "typescript-eslint": "^7.13.0"
-  },
-  "dependencies": {
-    "zod": "^3.23.8"
-  }
-}
+{
+  "name": "@ecogood/e-calculator-schemas",
+  "version": "2.2.0",
+  "description": "A package providing the schemas for the e-calculator application.",
+  "main": "dist/e-calculator-schemas",
+  "types": "dist/e-calculator-schemas",
+  "scripts": {
+    "build": "tsc",
+    "test": "jest --watch --runInBand",
+    "test:ci": "jest --runInBand",
+    "format": "prettier --write .",
+    "lint": "eslint .",
+    "lint-fix": "eslint . --fix",
+    "update:to:latest": "ncu -u && yarn update && yarn install && yarn audit fix",
+    "prepare": "rm -r dist || true && yarn run build && yarn run test:ci && yarn run lint"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "files": [
+    "dist",
+    "LICENSE",
+    "README.md"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "https://git.ecogood.org/services/e-calculator-schemas"
+  },
+  "keywords": [
+    "version",
+    "compare"
+  ],
+  "author": "Michael Rudolph",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://git.ecogood.org/services/e-calculator-schemas/issues"
+  },
+  "devDependencies": {
+    "@eslint/js": "^9.4.0",
+    "@types/eslint__js": "^8.42.3",
+    "@types/jest": "^28.1.6",
+    "eslint": "^9.4.0",
+    "jest": "^29.5.0",
+    "prettier": "2.3.2",
+    "ts-jest": "^29.0.5",
+    "typescript": "^5.4.5",
+    "typescript-eslint": "^7.13.0"
+  },
+  "dependencies": {
+    "zod": "^3.23.8"
+  }
+}