@rentman/rm-core 59.2.6 → 59.3.1

package/dist/types/src/models/ItemResource.d.ts

@@ -11,10 +11,12 @@ export type ChildCollectionResources = {
         items: any[];
     };
 };
-export type ItemResourceComputedSignalFunction<ItemResourceType extends ItemResource<any, any, any>, ReturnValue = unknown> = ItemResourceType extends ItemResource<infer ItemTypeType, infer RequestColumns> ? (itemResource: {
+export type ItemResourceComputedSignalFunction<ItemTypeType extends ApiItemType, RequestColumns extends ApiRequestColumns<ItemTypeType>, ReturnValue = unknown> = (itemResource: {
+    transaction: TransactionCache;
+    entry: ItemEntry<ItemTypeType>;
     fieldSignals: Readonly<RequestColumnsSignalFieldMap<ItemTypeType, RequestColumns>>;
     getDerivedSignal: <GetDerivedSignalPath extends readonly string[] | string, DefaultValue = unknown>(pathInput: GetDerivedSignalPath, defaultValue?: DefaultValue) => Signal<MaybeDefaultValue<ResolveDerivedValue<ItemTypeType, GetDerivedSignalPath extends string ? DerivedStringToRequestColumnPath<GetDerivedSignalPath> : GetDerivedSignalPath>, DefaultValue>>;
-}) => ReturnValue : never;
+}) => ReturnValue;
 type MaybeDefaultValue<T, DefaultValue> = DefaultValue extends number | bigint | string | boolean | null | object ? DefaultValue | T : T;
 export declare class ItemResource<ItemTypeType extends ApiItemType = ApiItemType, RequestColumns extends ApiRequestColumns<ItemTypeType> = ItemTypeColumnIds<ItemTypeType>, Children extends ChildCollectionResources | undefined = undefined> {
     protected readonly factory: ItemResourceFactory;
@@ -35,7 +37,7 @@ export declare class ItemResource<ItemTypeType extends ApiItemType = ApiItemType
     private __computedFunctions;
     constructor(factory: ItemResourceFactory, entry: ItemEntry<ItemTypeType>, transaction: TransactionCache, _isNew: boolean, abortSignal?: AbortSignal | null);
     onConstruct(): void;
-    computedSignal<FunctionReference extends ItemResourceComputedSignalFunction<this>>(functionReference: FunctionReference): Signal<ReturnType<FunctionReference>>;
+    computedSignal<FunctionReference extends ItemResourceComputedSignalFunction<ItemTypeType, RequestColumns>>(functionReference: FunctionReference): Signal<ReturnType<FunctionReference>>;
     /**
      * We type this loosely to prevent TypeScript inferring a complex type when comparing item resources.
      * @internal

package/dist/types/src/services/rm-holidays.service.d.ts

@@ -1,6 +1,7 @@
 import moment from 'moment';
-import { RmCore } from '../internal';
+import { CollectionResource, RmCore } from '../internal';
 export declare const HOLIDAY_ICON = "beach_access";
+declare const holidayColumns: readonly ["id", "date", "name", "yearly"];
 export type HolidayFields = {
     uid: `hol-${number}` | `hol-${number}-${number}`;
     name: string;
@@ -17,12 +18,14 @@ export type HolidayFields = {
  * an exception otherwise.
  */
 export declare class RmHolidaysService {
-    private holidaysCachedQueryMap;
-    getFirstHolidayOnDate(date: Date, rmCoreInstance?: RmCore): string | null;
+    private holidayCollectionResourcesMap;
+    rangeContainsHoliday$(start: moment.Moment, end: moment.Moment, rmCoreInstance?: RmCore): boolean;
+    getHolidaysInDateRange$(start: moment.Moment, end: moment.Moment, rmCoreInstance?: RmCore): HolidayFields[];
     rangeContainsHoliday(start: moment.Moment, end: moment.Moment, rmCoreInstance?: RmCore): boolean;
     getHolidaysInDateRange(start: moment.Moment, end: moment.Moment, rmCoreInstance?: RmCore): HolidayFields[];
     initialize(rmCoreInstance: RmCore): Promise<void>;
-    clear(rmCoreInstance: RmCore): void;
-    getHolidaysInDateRangeIterator(start: moment.Moment, end: moment.Moment, rmCoreInstance?: RmCore): Generator<HolidayFields>;
-    private getHolidayItemEntries;
+    clear(rmCoreInstance: RmCore): boolean;
+    getHolidaysInDateRangeIterator$(start: moment.Moment, end: moment.Moment, rmCoreInstance?: RmCore): Generator<HolidayFields>;
+    getHolidaysCollection(rmCoreInstance?: RmCore): CollectionResource<'Holiday', typeof holidayColumns>;
 }
+export {};

package/package.json

@@ -1,56 +1,56 @@
-{
-  "name": "@rentman/rm-core",
-  "version": "59.2.6",
-  "description": "Rentman core functionalities",
-  "main": "./dist/rm-core.js",
-  "types": "./dist/types/src/index.d.ts",
-  "engines": {
-    "node": ">= 22.9.x <= 22.13.x",
-    "npm": ">= 10.8.x <= 10.9.x"
-  },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/rentmanpublic/frontend-core"
-  },
-  "devDependencies": {
-    "@angular/core": "^20",
-    "@eslint/js": "^9.8.0",
-    "@rentman/backend-types": "4.796.0-60-gf11b0b4e33",
-    "@stylistic/eslint-plugin-ts": "^2.7.2",
-    "@types/eslint__js": "^8.42.3",
-    "clean-webpack-plugin": "^0.1.19",
-    "eslint": "^9.8.0",
-    "jsdom": "^26.1.0",
-    "moment": "^2.30.1",
-    "rxjs": "^7",
-    "terser-webpack-plugin": "^4.2.3",
-    "ts-loader": "^9.3.1",
-    "typescript": "5.5.4",
-    "typescript-eslint": "^8.4.0",
-    "vitest": "^3.2.3",
-    "webpack": "^5.74.0",
-    "webpack-cli": "^5.1.4",
-    "webpack-merge": "^6.0.1"
-  },
-  "peerDependencies": {
-    "@angular/core": "^20",
-    "@rentman/backend-types": ">=4.786.0-47-g4a3c77a5db",
-    "moment": "^2.30.1",
-    "rxjs": "^7"
-  },
-  "files": [
-    "dist"
-  ],
-  "scripts": {
-    "prepublishOnly": "npm run bundle",
-    "bundle-dev": "webpack --config webpack.dev.js",
-    "bundle": "webpack --config webpack.prod.js",
-    "type-check": "tsc --noEmit -p ./tsconfig.json && tsc --noEmit -p ./tests/tsconfig.test.json",
-    "lint": "eslint src/**/*.ts tests/**/*.ts --quiet",
-    "test": "vitest --pool forks --poolOptions.forks.isolate",
-    "vitest-watch": "vitest --watch",
-    "coverage": "vitest --coverage"
-  },
-  "author": "Martijn Welker <martijn@rentman.nl>",
-  "license": "UNLICENSED"
-}
+{
+  "name": "@rentman/rm-core",
+  "version": "59.3.1",
+  "description": "Rentman core functionalities",
+  "main": "./dist/rm-core.js",
+  "types": "./dist/types/src/index.d.ts",
+  "engines": {
+    "node": ">= 22.9.x <= 22.13.x",
+    "npm": ">= 10.8.x <= 10.9.x"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/rentmanpublic/frontend-core"
+  },
+  "devDependencies": {
+    "@angular/core": "^20",
+    "@eslint/js": "^9.8.0",
+    "@rentman/backend-types": "4.796.0-60-gf11b0b4e33",
+    "@stylistic/eslint-plugin-ts": "^2.7.2",
+    "@types/eslint__js": "^8.42.3",
+    "clean-webpack-plugin": "^0.1.19",
+    "eslint": "^9.8.0",
+    "jsdom": "^26.1.0",
+    "moment": "^2.30.1",
+    "rxjs": "^7",
+    "terser-webpack-plugin": "^4.2.3",
+    "ts-loader": "^9.3.1",
+    "typescript": "5.5.4",
+    "typescript-eslint": "^8.4.0",
+    "vitest": "^3.2.3",
+    "webpack": "^5.74.0",
+    "webpack-cli": "^5.1.4",
+    "webpack-merge": "^6.0.1"
+  },
+  "peerDependencies": {
+    "@angular/core": "^20",
+    "@rentman/backend-types": ">=4.786.0-47-g4a3c77a5db",
+    "moment": "^2.30.1",
+    "rxjs": "^7"
+  },
+  "files": [
+    "dist"
+  ],
+  "scripts": {
+    "prepublishOnly": "npm run bundle",
+    "bundle-dev": "webpack --config webpack.dev.js",
+    "bundle": "webpack --config webpack.prod.js",
+    "type-check": "tsc --noEmit -p ./tsconfig.json && tsc --noEmit -p ./tests/tsconfig.test.json",
+    "lint": "eslint src/**/*.ts tests/**/*.ts --quiet",
+    "test": "vitest --pool forks --poolOptions.forks.isolate",
+    "vitest-watch": "vitest --watch",
+    "coverage": "vitest --coverage"
+  },
+  "author": "Martijn Welker <martijn@rentman.nl>",
+  "license": "UNLICENSED"
+}

package/readme.md

@@ -1,49 +1,49 @@
-# Running a local test version
-1. Make changes
-2. run `npm run bundle-dev`
-3. copy `dist` folder to 
-    - Frontend: `<project>/bower_components/rentman-rm-core/`
-    - App: `<project>/node_modules/@rentman/rm-core/`
-
-# Publishing your local version
-
-(You have to be logged in as rentman-user on npm, run `npm whoami` to see who you are logged in as)
-
-1. Make changes
-2. Report changes in changelog
-3. Commit your changes
-4. Update version in package.json and core.ts
-    - Note! For consistency consider using `npm version` with appropriate flags and options
-5. Push commits and tags
-6. run `npm publish`
-
-## How to use `npm version` command
-
-`npm version <options>` command automatically creates
-- commit
-- version tag
-- modifies both the `package.json` and `package-lock.json`
-
-> Note! You cannot have uncommited changes in your repo for this
-> otherwise you'll get `npm error Git working directory not clean` error.
-
-### Production versions
-
-According to the standard semantic versioning principles [↗️](https://semver.org/)
-
-- `major` – incompatible / breaking changes
-- `minor` – adding functionality in a backward compatible manner
-- `patch` – backward compatible changes / bug fixes
-
-> **To create a patch version**  
-> Run `npm version patch -m "Bump version to %s"`
-> where the %s will be replaced with the version number created
-
-### Testing / PoC versions
-
-`npm version prerelease --preid="<YOUR_ISSUE_NUMBER>"`
-
-> **Example**  
-> Running `npm version prerelease --preid="RM4-00000"` on version `43.2.0`
-> would create the tag and version `43.2.1-RM4-00000.0`
+# Running a local test version
+1. Make changes
+2. run `npm run bundle-dev`
+3. copy `dist` folder to 
+    - Frontend: `<project>/bower_components/rentman-rm-core/`
+    - App: `<project>/node_modules/@rentman/rm-core/`
+
+# Publishing your local version
+
+(You have to be logged in as rentman-user on npm, run `npm whoami` to see who you are logged in as)
+
+1. Make changes
+2. Report changes in changelog
+3. Commit your changes
+4. Update version in package.json and core.ts
+    - Note! For consistency consider using `npm version` with appropriate flags and options
+5. Push commits and tags
+6. run `npm publish`
+
+## How to use `npm version` command
+
+`npm version <options>` command automatically creates
+- commit
+- version tag
+- modifies both the `package.json` and `package-lock.json`
+
+> Note! You cannot have uncommited changes in your repo for this
+> otherwise you'll get `npm error Git working directory not clean` error.
+
+### Production versions
+
+According to the standard semantic versioning principles [↗️](https://semver.org/)
+
+- `major` – incompatible / breaking changes
+- `minor` – adding functionality in a backward compatible manner
+- `patch` – backward compatible changes / bug fixes
+
+> **To create a patch version**  
+> Run `npm version patch -m "Bump version to %s"`
+> where the %s will be replaced with the version number created
+
+### Testing / PoC versions
+
+`npm version prerelease --preid="<YOUR_ISSUE_NUMBER>"`
+
+> **Example**  
+> Running `npm version prerelease --preid="RM4-00000"` on version `43.2.0`
+> would create the tag and version `43.2.1-RM4-00000.0`
 >