h1v3 0.7.2 → 0.7.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "h1v3",
-  "version": "0.7.2",
+  "version": "0.7.3",
   "description": "",
   "license": "MIT",
   "author": "",

package/src/client/node.js

@@ -1,4 +1,4 @@
-import { EVENT_STORE_META } from "../event-store/configuration.js";
+import { EVENT_STORE_META } from "../configuration/configure-eventStore.js";
 import { eventStore as eventStoreModular } from "../../dist/browser/client/event-store.js";
 
 function adaptDatabase(db) {

package/src/{event-store/configuration.js → configuration/configure-eventStore.js}

@@ -1,6 +1,7 @@
 import { EVENTS } from "../../dist/browser/client/event-store.js";
-import { updateProjections } from "./projections.js";
-import { refPathToTriggerPath } from "../paths.js";
+import { refPathToTriggerPath } from "./paths.js";
+import { updateProjections } from "../event-store/projections.js";
+
 
 export const EVENT_STORE_META = Symbol("Event store configuration metadata");
 
@@ -34,11 +35,4 @@ export function configureEventStore({ ref, projections, ...rest }, { onValueWrit
     );
 
 }
-
-configureEventStore.inject = ({ onValueWritten, observe, paths, region, instance }) =>
-
-    (eventStoreFactory, ...args) =>
-
-            configureEventStore(eventStoreFactory(paths, ...args), { onValueWritten, observe, region, instance });
-
-
+configureEventStore.inject = ({ onValueWritten, observe, paths, region, instance }) => (eventStoreFactory, ...args) => configureEventStore(eventStoreFactory(paths, ...args), { onValueWritten, observe, region, instance });

package/src/configuration/configure-metadata-endpoint.js

@@ -0,0 +1,48 @@
+import { loadConfigurationFromModule } from "./load-configuration.js";
+
+function buildConfigDigest(module, paths) {
+
+
+    const refConfigMap = loadConfigurationFromModule(module)
+        .flatMap(x => x.map(y => y[1]))
+        .reduce((index, config) => ({ ...index, [config.ref]: config }), {});
+
+    function patchForPath(map) {
+
+        const ret = {
+            ...map
+        };
+        const mappedConfig = refConfigMap[map.path];
+        for (const [x, y] of Object.entries(ret).filter(([_, v]) => typeof v === "object")) {
+
+            ret[x] = patchForPath(y);
+
+        }
+        if (mappedConfig && (mappedConfig.read || mappedConfig.write)) {
+
+            ret.projections = mappedConfig.projections;
+            ret.eventTypes = mappedConfig.eventTypes;
+
+        }
+        return ret;
+
+    }
+
+    return patchForPath(paths);
+
+}
+const publicFor1Day = "public, max-age=86400";
+
+export function configureMetadataEndpoint({ module, paths, onRequest, region, cacheControl = publicFor1Day }) {
+
+    const digest = buildConfigDigest(module, paths);
+    return onRequest(
+        { region },
+        async (_, res) => {
+
+            res.header("Cache-Control", cacheControl).send(digest);
+
+        }
+    );
+
+}

package/src/{configuration.js → configuration/configure-o11y-store.js}

@@ -1,72 +1,8 @@
-import { loadConfigurationFromModule } from "./load-configuration.js";
 import { refPathToTriggerPath } from "./paths.js";
-import { all, assertNewDataDoesNotHave, assertNewDataHasString, any, assertNewDataHasNumber, assertNewDataHasOneOf, assertNewDataHasLowercaseHexCharacters, assertNewDataFieldDoesNotMatch } from "./rules.js";
+import { all, assertNewDataHasString, assertNewDataHasOneOf, assertNewDataHasLowercaseHexCharacters, assertNewDataFieldDoesNotMatch, assertNewDataDoesNotHave, any, assertNewDataHasNumber } from "./rules.js";
 
-export const RAW_STORE_META = Symbol("Raw database metadata");
-
-export function configureConfigStore(paths, _onValueWritten, _observe) {
-
-    if (!paths?.config?.path) throw new Error("Missing: paths.config.path");
-    return {
-        [RAW_STORE_META]: {
-            raw: true,
-            ref: paths.config.path,
-            read: true,
-            write: false
-        }
-    };
-
-}
-
-function buildConfigDigest(module, paths) {
-
-
-    const refConfigMap =
-        loadConfigurationFromModule(module)
-        .flatMap(x => x.map(y => y[1]))
-        .reduce((index, config) => ({ ...index, [config.ref]: config }), {});
-
-    function patchForPath(map) {
-
-        const ret = {
-            ...map
-        };
-        const mappedConfig = refConfigMap[map.path];
-        for (const [x, y] of Object.entries(ret).filter(([_, v]) => typeof v === "object")) {
-
-            ret[x] = patchForPath(y);
-
-        }
-        if (mappedConfig && (mappedConfig.read || mappedConfig.write)) {
-
-            ret.projections = mappedConfig.projections;
-            ret.eventTypes = mappedConfig.eventTypes;
-
-        }
-        return ret;
-
-    }
-
-    return patchForPath(paths);
-
-}
-
-const publicFor1Day = "public, max-age=86400";
-
-export function configureMetadataEndpoint({ module, paths, onRequest, region, cacheControl = publicFor1Day }) {
-
-    const digest = buildConfigDigest(module, paths);
-    return onRequest(
-        { region },
-        async (_, res) => {
-
-            res.header("Cache-Control", cacheControl).send(digest);
-
-        }
-    );
-
-}
 
+export const RAW_STORE_META = Symbol("Raw database metadata");
 const googleLogLevels = ["DEBUG", "INFO", "NOTICE", "WARNING", "ERROR", "CRITICAL", "ALERT", "EMERGENCY"];
 
 function decideSeverity(newData) {
@@ -75,7 +11,6 @@ function decideSeverity(newData) {
     return googleLogLevels.includes(text) ? text : "INFO";
 
 }
-
 /*
 
     message, severity, // required
@@ -95,7 +30,7 @@ function handleO11yEventWritten(observe, e) {
         const timestamp = now.toISOString();
         const message = newData?.message || "Missing log message";
 
-        const { traceId, spanId, ...rest } = newData
+        const { traceId, spanId, ...rest } = newData;
         const logData = { ...rest, time_server_ms };
 
         observe({
@@ -107,7 +42,6 @@ function handleO11yEventWritten(observe, e) {
             timestamp,
 
             logData
-
         });
         after.ref.update({ time_server_ms });
 
@@ -115,7 +49,7 @@ function handleO11yEventWritten(observe, e) {
 
 }
 
-export function configureLoggingStore({ paths, onValueWritten, observe, region, instance }) {
+export function configureO11yStore({ paths, onValueWritten, observe, region, instance }) {
 
     if (!paths) throw new Error("Missing paths");
     if (!onValueWritten) throw new Error("Missing onValueWritten");
@@ -170,4 +104,3 @@ export function configureLoggingStore({ paths, onValueWritten, observe, region,
     );
 
 }
-

package/src/{load-configuration.js → configuration/load-configuration.js}

@@ -1,7 +1,7 @@
 import { resolve } from "path";
 import { pathToFileURL } from "url";
-import { EVENT_STORE_META } from "./event-store/configuration.js";
-import { RAW_STORE_META } from "./configuration.js";
+import { EVENT_STORE_META } from "./configure-eventStore.js";
+import { RAW_STORE_META } from "./configure-o11y-store.js";
 
 export async function loadConfiguration(argv) {
 

package/src/{rules.js → configuration/rules.js}

@@ -1,4 +1,4 @@
-import { PROJECTIONS } from "../dist/browser/client/event-store.js";
+import { PROJECTIONS } from "../../dist/browser/client/event-store.js";
 
 export const any = (...args) =>
 

package/src/exec-eventstore.js

@@ -1,4 +1,4 @@
-#!/usr/bin/env node
+#!/usr/bin/env node
 
 import { listEventStores } from "./commands/list-event-stores.js";
 import { generateRules } from "./commands/generate-rules.js";

package/src/index.js

@@ -1,8 +1,8 @@
 export { PROJECTIONS, EVENTS } from "../dist/browser/client/event-store.js";
 
-export * from "./event-store/configuration.js";
-
-export * from "./configuration.js";
+export * from "./configuration/configure-eventStore.js";
+export * from "./configuration/configure-metadata-endpoint.js";
+export * from "./configuration/configure-o11y-store.js";
 
 export const passThroughView = {
     "?": (view, e, key) => {
@@ -24,7 +24,7 @@ export * as userTeams from "./membership/user-teams/store.js";
 
 export * as userInvites from "./membership/userInvites/store.js";
 
-export * as rules from "./rules.js";
+export * as rules from "./configuration/rules.js";
 
 export function explodePathVars(expr) {
 
@@ -34,5 +34,3 @@ export function explodePathVars(expr) {
 }
 
 export * as o11y from "./observability/index.js";
-
-export { loadConfigurationFromModule } from "./load-configuration.js";

package/src/membership/team-details/store.js

@@ -1,4 +1,4 @@
-import { assertIsMyTeam } from "../../rules.js";
+import { assertIsMyTeam } from "../../configuration/rules.js";
 import { eventTypes } from "./events.js";
 import current from "./projections/current.js";
 import { verifyStorePaths } from "./verify-store-paths.js";

package/src/membership/team-membership/store.js

@@ -13,7 +13,7 @@ import {
     any,
     all,
     assertEventIsOfType
-} from "../../rules.js";
+} from "../../configuration/rules.js";
 import { verifyStorePaths } from "../team-details/verify-store-paths.js";
 
 export function store(paths) {

package/src/membership/user-profile/store.js

@@ -1,4 +1,4 @@
-import { assertUserIsMe } from "../../rules.js";
+import { assertUserIsMe } from "../../configuration/rules.js";
 import { verifyStorePaths } from "../team-details/verify-store-paths.js";
 import { eventTypes } from "./events.js";
 import current from "./projections/current.js";

package/src/membership/user-teams/store.js

@@ -1,4 +1,4 @@
-import { assertUserIsMe } from "../../rules.js";
+import { assertUserIsMe } from "../../configuration/rules.js";
 import { verifyStorePaths } from "../team-details/verify-store-paths.js";
 import { eventTypes } from "./events.js";
 import current from "./projections/current.js";

package/src/membership/userInvites/store.js

@@ -2,7 +2,7 @@ import { eventTypes, ACCEPTED_INVITATION, REJECTED_INVITATION } from "./events.j
 import pending from "./projections/pending.js";
 import { PROJECTIONS } from "../../index.js";
 import { verifyStorePaths } from "../team-details/verify-store-paths.js";
-import { all, any, assertEventIsOfType, assertDataFieldIsMyVerifiedEmail, assertMyVerifiedEmail, not, assertNewDataHas } from "../../rules.js";
+import { all, any, assertEventIsOfType, assertDataFieldIsMyVerifiedEmail, assertMyVerifiedEmail, not, assertNewDataHas } from "../../configuration/rules.js";
 
 const assertAcceptedOrRejectedEvent = assertEventIsOfType(
     ACCEPTED_INVITATION,