@socialgouv/modeles-social 4.104.2 → 4.105.0

package/CHANGELOG.md

@@ -3,6 +3,12 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [4.105.0](https://github.com/SocialGouv/code-du-travail-numerique/compare/v4.104.2...v4.105.0) (2023-07-17)
+
+### Features
+
+- **simulator:** ajout d'un singleton pour charger les modèles ([#5251](https://github.com/SocialGouv/code-du-travail-numerique/issues/5251)) ([40faea2](https://github.com/SocialGouv/code-du-travail-numerique/commit/40faea2edd819f40efac5a7391d779c6ef189255))
+
 ## [4.104.2](https://github.com/SocialGouv/code-du-travail-numerique/compare/v4.104.1...v4.104.2) (2023-07-06)
 
 **Note:** Version bump only for package @socialgouv/modeles-social

package/bin/publicodes/SingletonPublicodesHelper.d.ts

@@ -0,0 +1,13 @@
+import type { PublicodesInstance } from ".";
+import { PublicodesSimulator } from ".";
+declare class SingletonPublicodesHelper<T extends PublicodesSimulator> {
+    private static readonly instances;
+    private readonly publicodesInstances;
+    private readonly simulator;
+    private readonly idcc?;
+    private constructor();
+    static getInstance<T extends PublicodesSimulator>(simulator: PublicodesSimulator, idcc?: string): PublicodesInstance<T>;
+    private readonly createPublicodesInstance;
+    private readonly loadPublicodesRules;
+}
+export default SingletonPublicodesHelper;

package/bin/publicodes/SingletonPublicodesHelper.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var __1 = require("..");
+var _1 = require(".");
+var SingletonPublicodesHelper = /** @class */ (function () {
+    function SingletonPublicodesHelper(simulator, idcc) {
+        var _this = this;
+        this.createPublicodesInstance = function (simulator, idcc) {
+            var rules = _this.loadPublicodesRules(simulator);
+            switch (simulator) {
+                case _1.PublicodesSimulator.PREAVIS_RETRAITE:
+                    return new _1.PreavisRetraitePublicodes(__1.preavisRetraiteModeles);
+                case _1.PublicodesSimulator.INDEMNITE_LICENCIEMENT:
+                    return new _1.IndemniteLicenciementPublicodes(rules, idcc);
+                default:
+                    throw new Error("Simulator not supported");
+            }
+        };
+        this.loadPublicodesRules = function (simulator) {
+            switch (simulator) {
+                case _1.PublicodesSimulator.PREAVIS_RETRAITE:
+                    return __1.preavisRetraiteModeles;
+                case _1.PublicodesSimulator.INDEMNITE_LICENCIEMENT:
+                    return __1.indemniteLicenciementModeles;
+                default:
+                    throw new Error("Simulator not supported");
+            }
+        };
+        this.simulator = simulator;
+        this.idcc = idcc;
+        this.publicodesInstances = this.createPublicodesInstance(simulator, idcc);
+    }
+    SingletonPublicodesHelper.getInstance = function (simulator, idcc) {
+        var existingInstance = SingletonPublicodesHelper.instances.find(function (instance) { return instance.simulator === simulator && instance.idcc === idcc; });
+        if (existingInstance) {
+            return existingInstance.publicodesInstances;
+        }
+        var newInstance = new SingletonPublicodesHelper(simulator, idcc);
+        SingletonPublicodesHelper.instances.push(newInstance);
+        return newInstance.publicodesInstances;
+    };
+    SingletonPublicodesHelper.instances = [];
+    return SingletonPublicodesHelper;
+}());
+exports.default = SingletonPublicodesHelper;

package/bin/publicodes/__tests__/SingletonPublicodesHelper.test.d.ts

@@ -0,0 +1 @@
+export {};

package/bin/publicodes/__tests__/SingletonPublicodesHelper.test.js

@@ -0,0 +1,34 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var SingletonPublicodesHelper_1 = __importDefault(require("../SingletonPublicodesHelper"));
+var types_1 = require("../types");
+describe("SingletonPublicodesHelper", function () {
+    describe("getInstance", function () {
+        it("should return the same instance for the same simulator and idcc", function () {
+            var simulator = types_1.PublicodesSimulator.INDEMNITE_LICENCIEMENT;
+            var idcc = "1234";
+            var instance1 = SingletonPublicodesHelper_1.default.getInstance(simulator, idcc);
+            var instance2 = SingletonPublicodesHelper_1.default.getInstance(simulator, idcc);
+            expect(instance1).toBe(instance2);
+        });
+        it("should return different instances for different simulators", function () {
+            var instance1 = SingletonPublicodesHelper_1.default.getInstance(types_1.PublicodesSimulator.INDEMNITE_LICENCIEMENT);
+            var instance2 = SingletonPublicodesHelper_1.default.getInstance(types_1.PublicodesSimulator.PREAVIS_RETRAITE);
+            expect(instance1).not.toBe(instance2);
+        });
+        it("should return different instances for different idcc", function () {
+            var simulator = types_1.PublicodesSimulator.INDEMNITE_LICENCIEMENT;
+            var instance1 = SingletonPublicodesHelper_1.default.getInstance(simulator, "1234");
+            var instance2 = SingletonPublicodesHelper_1.default.getInstance(simulator, "5678");
+            expect(instance1).not.toBe(instance2);
+        });
+        it("should throw an error for unsupported simulators", function () {
+            expect(function () {
+                return SingletonPublicodesHelper_1.default.getInstance("unsupported");
+            }).toThrow("Simulator not supported");
+        });
+    });
+});

package/bin/publicodes/index.d.ts

@@ -1,4 +1,5 @@
 export { default as IndemniteLicenciementPublicodes } from "./IndemniteLicenciementPublicodes";
 export { default as PreavisRetraitePublicodes } from "./PreavisRetraitePublicodes";
 export * from "./Publicodes";
+export { default as SingletonPublicodesHelper } from "./SingletonPublicodesHelper";
 export * from "./types";

package/bin/publicodes/index.js

@@ -17,10 +17,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PreavisRetraitePublicodes = exports.IndemniteLicenciementPublicodes = void 0;
+exports.SingletonPublicodesHelper = exports.PreavisRetraitePublicodes = exports.IndemniteLicenciementPublicodes = void 0;
 var IndemniteLicenciementPublicodes_1 = require("./IndemniteLicenciementPublicodes");
 Object.defineProperty(exports, "IndemniteLicenciementPublicodes", { enumerable: true, get: function () { return __importDefault(IndemniteLicenciementPublicodes_1).default; } });
 var PreavisRetraitePublicodes_1 = require("./PreavisRetraitePublicodes");
 Object.defineProperty(exports, "PreavisRetraitePublicodes", { enumerable: true, get: function () { return __importDefault(PreavisRetraitePublicodes_1).default; } });
 __exportStar(require("./Publicodes"), exports);
+var SingletonPublicodesHelper_1 = require("./SingletonPublicodesHelper");
+Object.defineProperty(exports, "SingletonPublicodesHelper", { enumerable: true, get: function () { return __importDefault(SingletonPublicodesHelper_1).default; } });
 __exportStar(require("./types"), exports);

package/bin/publicodes/types.d.ts

@@ -2,6 +2,7 @@
 import type Engine from "publicodes";
 import type { Evaluation, Rule as PubliRule, RuleNode as PubliRuleNode, Unit } from "publicodes";
 import type { Notification, References } from "../modeles/common";
+import type { IndemniteLicenciementPublicodes, PreavisRetraitePublicodes } from ".";
 export type OldReference = {
     ref: string | null;
     refUrl: string | null;
@@ -95,3 +96,4 @@ export type PublicodesContextType = {
     situation: SituationElement[];
     setSituation: (values: Record<string, string>) => void;
 };
+export type PublicodesInstance<T extends PublicodesSimulator> = T extends PublicodesSimulator.PREAVIS_RETRAITE ? PreavisRetraitePublicodes : T extends PublicodesSimulator.INDEMNITE_LICENCIEMENT ? IndemniteLicenciementPublicodes : never;

package/lib/publicodes/SingletonPublicodesHelper.d.ts

@@ -0,0 +1,13 @@
+import type { PublicodesInstance } from ".";
+import { PublicodesSimulator } from ".";
+declare class SingletonPublicodesHelper<T extends PublicodesSimulator> {
+    private static readonly instances;
+    private readonly publicodesInstances;
+    private readonly simulator;
+    private readonly idcc?;
+    private constructor();
+    static getInstance<T extends PublicodesSimulator>(simulator: PublicodesSimulator, idcc?: string): PublicodesInstance<T>;
+    private readonly createPublicodesInstance;
+    private readonly loadPublicodesRules;
+}
+export default SingletonPublicodesHelper;

package/lib/publicodes/SingletonPublicodesHelper.js

@@ -0,0 +1,45 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+var __1 = require("..");
+var _1 = require(".");
+var SingletonPublicodesHelper = /** @class */ (function () {
+    function SingletonPublicodesHelper(simulator, idcc) {
+        var _this = this;
+        this.createPublicodesInstance = function (simulator, idcc) {
+            var rules = _this.loadPublicodesRules(simulator);
+            switch (simulator) {
+                case _1.PublicodesSimulator.PREAVIS_RETRAITE:
+                    return new _1.PreavisRetraitePublicodes(__1.preavisRetraiteModeles);
+                case _1.PublicodesSimulator.INDEMNITE_LICENCIEMENT:
+                    return new _1.IndemniteLicenciementPublicodes(rules, idcc);
+                default:
+                    throw new Error("Simulator not supported");
+            }
+        };
+        this.loadPublicodesRules = function (simulator) {
+            switch (simulator) {
+                case _1.PublicodesSimulator.PREAVIS_RETRAITE:
+                    return __1.preavisRetraiteModeles;
+                case _1.PublicodesSimulator.INDEMNITE_LICENCIEMENT:
+                    return __1.indemniteLicenciementModeles;
+                default:
+                    throw new Error("Simulator not supported");
+            }
+        };
+        this.simulator = simulator;
+        this.idcc = idcc;
+        this.publicodesInstances = this.createPublicodesInstance(simulator, idcc);
+    }
+    SingletonPublicodesHelper.getInstance = function (simulator, idcc) {
+        var existingInstance = SingletonPublicodesHelper.instances.find(function (instance) { return instance.simulator === simulator && instance.idcc === idcc; });
+        if (existingInstance) {
+            return existingInstance.publicodesInstances;
+        }
+        var newInstance = new SingletonPublicodesHelper(simulator, idcc);
+        SingletonPublicodesHelper.instances.push(newInstance);
+        return newInstance.publicodesInstances;
+    };
+    SingletonPublicodesHelper.instances = [];
+    return SingletonPublicodesHelper;
+}());
+exports.default = SingletonPublicodesHelper;

package/lib/publicodes/__tests__/SingletonPublicodesHelper.test.d.ts

@@ -0,0 +1 @@
+export {};

package/lib/publicodes/__tests__/SingletonPublicodesHelper.test.js

@@ -0,0 +1,34 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var SingletonPublicodesHelper_1 = __importDefault(require("../SingletonPublicodesHelper"));
+var types_1 = require("../types");
+describe("SingletonPublicodesHelper", function () {
+    describe("getInstance", function () {
+        it("should return the same instance for the same simulator and idcc", function () {
+            var simulator = types_1.PublicodesSimulator.INDEMNITE_LICENCIEMENT;
+            var idcc = "1234";
+            var instance1 = SingletonPublicodesHelper_1.default.getInstance(simulator, idcc);
+            var instance2 = SingletonPublicodesHelper_1.default.getInstance(simulator, idcc);
+            expect(instance1).toBe(instance2);
+        });
+        it("should return different instances for different simulators", function () {
+            var instance1 = SingletonPublicodesHelper_1.default.getInstance(types_1.PublicodesSimulator.INDEMNITE_LICENCIEMENT);
+            var instance2 = SingletonPublicodesHelper_1.default.getInstance(types_1.PublicodesSimulator.PREAVIS_RETRAITE);
+            expect(instance1).not.toBe(instance2);
+        });
+        it("should return different instances for different idcc", function () {
+            var simulator = types_1.PublicodesSimulator.INDEMNITE_LICENCIEMENT;
+            var instance1 = SingletonPublicodesHelper_1.default.getInstance(simulator, "1234");
+            var instance2 = SingletonPublicodesHelper_1.default.getInstance(simulator, "5678");
+            expect(instance1).not.toBe(instance2);
+        });
+        it("should throw an error for unsupported simulators", function () {
+            expect(function () {
+                return SingletonPublicodesHelper_1.default.getInstance("unsupported");
+            }).toThrow("Simulator not supported");
+        });
+    });
+});

package/lib/publicodes/index.d.ts

@@ -1,4 +1,5 @@
 export { default as IndemniteLicenciementPublicodes } from "./IndemniteLicenciementPublicodes";
 export { default as PreavisRetraitePublicodes } from "./PreavisRetraitePublicodes";
 export * from "./Publicodes";
+export { default as SingletonPublicodesHelper } from "./SingletonPublicodesHelper";
 export * from "./types";

package/lib/publicodes/index.js

@@ -17,10 +17,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PreavisRetraitePublicodes = exports.IndemniteLicenciementPublicodes = void 0;
+exports.SingletonPublicodesHelper = exports.PreavisRetraitePublicodes = exports.IndemniteLicenciementPublicodes = void 0;
 var IndemniteLicenciementPublicodes_1 = require("./IndemniteLicenciementPublicodes");
 Object.defineProperty(exports, "IndemniteLicenciementPublicodes", { enumerable: true, get: function () { return __importDefault(IndemniteLicenciementPublicodes_1).default; } });
 var PreavisRetraitePublicodes_1 = require("./PreavisRetraitePublicodes");
 Object.defineProperty(exports, "PreavisRetraitePublicodes", { enumerable: true, get: function () { return __importDefault(PreavisRetraitePublicodes_1).default; } });
 __exportStar(require("./Publicodes"), exports);
+var SingletonPublicodesHelper_1 = require("./SingletonPublicodesHelper");
+Object.defineProperty(exports, "SingletonPublicodesHelper", { enumerable: true, get: function () { return __importDefault(SingletonPublicodesHelper_1).default; } });
 __exportStar(require("./types"), exports);

package/lib/publicodes/types.d.ts

@@ -2,6 +2,7 @@
 import type Engine from "publicodes";
 import type { Evaluation, Rule as PubliRule, RuleNode as PubliRuleNode, Unit } from "publicodes";
 import type { Notification, References } from "../modeles/common";
+import type { IndemniteLicenciementPublicodes, PreavisRetraitePublicodes } from ".";
 export type OldReference = {
     ref: string | null;
     refUrl: string | null;
@@ -95,3 +96,4 @@ export type PublicodesContextType = {
     situation: SituationElement[];
     setSituation: (values: Record<string, string>) => void;
 };
+export type PublicodesInstance<T extends PublicodesSimulator> = T extends PublicodesSimulator.PREAVIS_RETRAITE ? PreavisRetraitePublicodes : T extends PublicodesSimulator.INDEMNITE_LICENCIEMENT ? IndemniteLicenciementPublicodes : never;

package/package.json

@@ -4,7 +4,7 @@
     "access": "public",
     "registry": "https://registry.npmjs.org/"
   },
-  "version": "4.104.2",
+  "version": "4.105.0",
   "description": "Les règles publicodes des simulateurs de code du travail numérique",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
@@ -50,5 +50,5 @@
       "yarn lint --fix --quiet"
     ]
   },
-  "gitHead": "c37d48ba01df43e072e195e345fc893dcf062a1f"
+  "gitHead": "3e0ee9d4a4f8b245b0c78da31b407e8381228580"
 }

package/src/publicodes/SingletonPublicodesHelper.ts

@@ -0,0 +1,75 @@
+import { indemniteLicenciementModeles, preavisRetraiteModeles } from "..";
+import type { PublicodesInstance } from ".";
+import {
+  IndemniteLicenciementPublicodes,
+  PreavisRetraitePublicodes,
+  PublicodesSimulator,
+} from ".";
+
+class SingletonPublicodesHelper<T extends PublicodesSimulator> {
+  private static readonly instances: SingletonPublicodesHelper<PublicodesSimulator>[] =
+    [];
+
+  private readonly publicodesInstances: PublicodesInstance<T>;
+
+  private readonly simulator: T;
+
+  private readonly idcc?: string;
+
+  private constructor(simulator: T, idcc?: string) {
+    this.simulator = simulator;
+    this.idcc = idcc;
+    this.publicodesInstances = this.createPublicodesInstance(
+      simulator,
+      idcc
+    ) as PublicodesInstance<T>;
+  }
+
+  public static getInstance<T extends PublicodesSimulator>(
+    simulator: PublicodesSimulator,
+    idcc?: string
+  ): PublicodesInstance<T> {
+    const existingInstance = SingletonPublicodesHelper.instances.find(
+      (instance) => instance.simulator === simulator && instance.idcc === idcc
+    );
+
+    if (existingInstance) {
+      return existingInstance.publicodesInstances as PublicodesInstance<T>;
+    }
+
+    const newInstance = new SingletonPublicodesHelper(simulator, idcc);
+    SingletonPublicodesHelper.instances.push(newInstance);
+
+    return newInstance.publicodesInstances as PublicodesInstance<T>;
+  }
+
+  private readonly createPublicodesInstance = (
+    simulator: PublicodesSimulator,
+    idcc?: string
+  ) => {
+    const rules = this.loadPublicodesRules(simulator);
+    switch (simulator) {
+      case PublicodesSimulator.PREAVIS_RETRAITE:
+        return new PreavisRetraitePublicodes(preavisRetraiteModeles);
+      case PublicodesSimulator.INDEMNITE_LICENCIEMENT:
+        return new IndemniteLicenciementPublicodes(rules, idcc);
+      default:
+        throw new Error("Simulator not supported");
+    }
+  };
+
+  private readonly loadPublicodesRules = (
+    simulator: PublicodesSimulator
+  ): any => {
+    switch (simulator) {
+      case PublicodesSimulator.PREAVIS_RETRAITE:
+        return preavisRetraiteModeles;
+      case PublicodesSimulator.INDEMNITE_LICENCIEMENT:
+        return indemniteLicenciementModeles;
+      default:
+        throw new Error("Simulator not supported");
+    }
+  };
+}
+
+export default SingletonPublicodesHelper;

package/src/publicodes/__tests__/SingletonPublicodesHelper.test.ts

@@ -0,0 +1,51 @@
+import SingletonPublicodesHelper from "../SingletonPublicodesHelper";
+import { PublicodesSimulator } from "../types";
+
+describe("SingletonPublicodesHelper", () => {
+  describe("getInstance", () => {
+    it("should return the same instance for the same simulator and idcc", () => {
+      const simulator = PublicodesSimulator.INDEMNITE_LICENCIEMENT;
+      const idcc = "1234";
+      const instance1 = SingletonPublicodesHelper.getInstance<typeof simulator>(
+        simulator,
+        idcc
+      );
+      const instance2 = SingletonPublicodesHelper.getInstance<typeof simulator>(
+        simulator,
+        idcc
+      );
+      expect(instance1).toBe(instance2);
+    });
+
+    it("should return different instances for different simulators", () => {
+      const instance1 =
+        SingletonPublicodesHelper.getInstance<PublicodesSimulator.INDEMNITE_LICENCIEMENT>(
+          PublicodesSimulator.INDEMNITE_LICENCIEMENT
+        );
+      const instance2 =
+        SingletonPublicodesHelper.getInstance<PublicodesSimulator.PREAVIS_RETRAITE>(
+          PublicodesSimulator.PREAVIS_RETRAITE
+        );
+      expect(instance1).not.toBe(instance2);
+    });
+
+    it("should return different instances for different idcc", () => {
+      const simulator = PublicodesSimulator.INDEMNITE_LICENCIEMENT;
+      const instance1 = SingletonPublicodesHelper.getInstance<typeof simulator>(
+        simulator,
+        "1234"
+      );
+      const instance2 = SingletonPublicodesHelper.getInstance<typeof simulator>(
+        simulator,
+        "5678"
+      );
+      expect(instance1).not.toBe(instance2);
+    });
+
+    it("should throw an error for unsupported simulators", () => {
+      expect(() =>
+        SingletonPublicodesHelper.getInstance<any>("unsupported" as any)
+      ).toThrow("Simulator not supported");
+    });
+  });
+});

package/src/publicodes/index.ts

@@ -1,4 +1,5 @@
 export { default as IndemniteLicenciementPublicodes } from "./IndemniteLicenciementPublicodes";
 export { default as PreavisRetraitePublicodes } from "./PreavisRetraitePublicodes";
 export * from "./Publicodes";
+export { default as SingletonPublicodesHelper } from "./SingletonPublicodesHelper";
 export * from "./types";

package/src/publicodes/types.ts

@@ -7,6 +7,10 @@ import type {
 } from "publicodes";
 
 import type { Notification, References } from "../modeles/common";
+import type {
+  IndemniteLicenciementPublicodes,
+  PreavisRetraitePublicodes,
+} from ".";
 
 export type OldReference = {
   ref: string | null;
@@ -125,3 +129,10 @@ export type PublicodesContextType = {
   situation: SituationElement[];
   setSituation: (values: Record<string, string>) => void;
 };
+
+export type PublicodesInstance<T extends PublicodesSimulator> =
+  T extends PublicodesSimulator.PREAVIS_RETRAITE
+    ? PreavisRetraitePublicodes
+    : T extends PublicodesSimulator.INDEMNITE_LICENCIEMENT
+    ? IndemniteLicenciementPublicodes
+    : never;