@rr0/cms 0.3.9 → 0.3.11

package/dist/RR0Build.js

@@ -76,7 +76,8 @@ export class RR0Build {
         const apiFactory = new APIFactory(eventFactory);
         const bookFactory = new TypedDataFactory(eventFactory, "book");
         const articleFactory = new TypedDataFactory(eventFactory, "article");
-        const dataService = this.dataService = new AllDataService([orgFactory, caseFactory, peopleFactory, bookFactory, articleFactory, sightingFactory, apiFactory]);
+        const factories = [orgFactory, caseFactory, peopleFactory, bookFactory, articleFactory, sightingFactory, apiFactory];
+        const dataService = this.dataService = new AllDataService(factories);
         dataService.getFromDir("", ["people", "case"]).then(data => {
             console.debug(data);
         });

package/dist/time/datasource/TimeContextFilter.js

@@ -7,7 +7,7 @@ export class TimeContextFilter extends ContextFilter {
         var _a, _b, _c;
         const sightingTime = c.time;
         const time = this.context.time;
-        if (time) {
+        if (time && sightingTime) {
             const day = time.getDayOfMonth();
             const month = time.getMonth();
             const year = time.getYear();

package/dist/time/datasource/TimeContextFilter.test.d.ts

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

package/dist/time/datasource/TimeContextFilter.test.js

@@ -0,0 +1,15 @@
+import { beforeEach, describe, expect, test } from "@javarome/testscript";
+import { TimeContextFilter } from "./TimeContextFilter";
+import { rr0TestUtil } from "../../test";
+describe("TimeContextFilter", () => {
+    let context;
+    beforeEach(() => {
+        context = rr0TestUtil.time.newHtmlContext("1/9/7/0/03/index.html");
+        context.time.setYear(1970);
+        context.time.setMonth(3);
+    });
+    test("test", async () => {
+        const filter = new TimeContextFilter(context);
+        expect(filter.filter({})).toBe(true);
+    });
+});

package/dist/time/datasource/rr0/RR0Datasource.js

@@ -8,7 +8,7 @@ export class RR0Datasource extends AbstractDatasource {
     }
     static id(dateTime, place) {
         var _a;
-        return `${(dateTime === null || dateTime === void 0 ? void 0 : dateTime.toString()) || ("rr0-" + this.idCount++)}$${((_a = place === null || place === void 0 ? void 0 : place.toString()) !== null && _a !== void 0 ? _a : "")}`;
+        return `${(dateTime === null || dateTime === void 0 ? void 0 : dateTime.toString()) || ("rr0-" + ++this.idCount)}$${((_a = place === null || place === void 0 ? void 0 : place.toString()) !== null && _a !== void 0 ? _a : "")}`;
     }
 }
 RR0Datasource.idCount = 0;

package/dist/time/datasource/rr0/RR0Datasource.test.js

@@ -88,5 +88,6 @@ describe("RR0CaseSource", () => {
     test("id", async () => {
         expect(RR0Datasource.id(EdtfDate.fromString("1972-08-12"), new NamedPlace("Chatillon"))).toBe("1972-08-12$Chatillon");
         expect(RR0Datasource.id(EdtfDate.fromString("1972-08-12"), undefined)).toBe("1972-08-12$");
+        expect(RR0Datasource.id(undefined, undefined)).toBe("rr0-1$");
     });
 });

package/package.json

@@ -2,7 +2,7 @@
   "name": "@rr0/cms",
   "type": "module",
   "author": "Jérôme Beau <rr0@rr0.org> (https://rr0.org)",
-  "version": "0.3.9",
+  "version": "0.3.11",
   "description": "RR0 Content Management System (CMS)",
   "exports": "./dist/index.js",
   "types": "./dist/index.d.ts",
@@ -30,7 +30,7 @@
   "dependencies": {
     "@javarome/fileutil": "^0.3.6",
     "@rr0/common": "^1.1.3",
-    "@rr0/data": "^0.3.8",
+    "@rr0/data": "^0.3.9",
     "@rr0/lang": "^0.1.12",
     "@rr0/place": "^0.5.2",
     "@rr0/time": "^0.10.0",