h1v3 0.10.2 → 0.12.0

package/dist/browser/client/context.js

@@ -7,10 +7,10 @@ import { userInvites } from "./team/invites.js";
 import { team } from "./team/team.js";
 import { logger } from "./logger.js";
 
-function populateParameters(ps, x) {
+function populateParameters(ps, path) {
 
-    if (!x) return x;
-    return Object.entries(ps).reduce((x, [k, v]) => x.replaceAll(`$${k}`, v), x);
+    if (!path) return path;
+    return Object.entries(ps).reduce((p, [k, v]) => p.replaceAll(`$${k}`, v), path);
 
 }
 
@@ -29,11 +29,12 @@ export async function inject({ database, authentication, metaURL, meta, handleEr
     meta = meta || await import(metaURL, { with: { type: "json" } });
 
     const log = logger(database, authentication, meta.o11y.path);
-    const teamMembershipStoreFactory = ({ tid }) => eventStore(database, authentication, populateParameters({ tid }, meta.team.membership.path));
-    const teamDetailsStoreFactory = ({ tid }) => eventStore(database, authentication, populateParameters({ tid }, meta.team.details.path));
-    const userInvitesStoreFactory = ({ emailId }) => eventStore(database, authentication, populateParameters({ emailId }, meta.userInvites.path));
-    const userTeamsStoreFactory = ({ uid }) => eventStore(database, authentication, populateParameters({ uid }, meta.user.teams.path));
-    const userProfileStoreFactory = ({ uid }) => eventStore(database, authentication, populateParameters({ uid }, meta.user.profile.path));
+    const buildEventStore = (path, params) => eventStore(database, authentication, populateParameters(params, path));
+    const teamMembershipStoreFactory = ({ tid }) => buildEventStore(meta.team.membership.path, { tid });
+    const teamDetailsStoreFactory = ({ tid }) => buildEventStore(meta.team.details.path, { tid });
+    const userInvitesStoreFactory = ({ emailId }) => buildEventStore(meta.userInvites.path, { emailId });
+    const userTeamsStoreFactory = ({ uid }) => buildEventStore(meta.user.teams.path, { uid });
+    const userProfileStoreFactory = ({ uid }) => buildEventStore(meta.user.profile.path, { uid });
 
     return {
 
@@ -68,6 +69,12 @@ export async function inject({ database, authentication, metaURL, meta, handleEr
 
             return log.context(sharedAttributes);
 
+        },
+
+        eventStore(path, params) {
+
+            return buildEventStore(path, params);
+
         }
 
     };

package/package.json

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

package/src/commands/vendor.js

@@ -1,35 +1,23 @@
 import fs from "node:fs/promises";
 import { existsSync  } from "node:fs";
-import { dirname, join, resolve } from "node:path";
+import { dirname, join } from "node:path";
 import { fileURLToPath } from "node:url";
+import me from "../package.js";
 
-const __dirname = dirname(fileURLToPath(import.meta.url));
-
-async function readPackageJSON() {
-
-    return JSON.parse(await fs.readFile(`${__dirname}/../../package.json`));
+const packageName = `${me.name}@${me.version}`;
 
-}
+const __dirname = dirname(fileURLToPath(import.meta.url));
 
 async function vendor(subpath) {
 
     const src = join(__dirname, "..", "..", "dist", "browser", subpath);;
 
     // Destination: include semver
-    const versionedName = await versionedPackageName();
-    const dest =join(destVendorPath(), versionedName, subpath);
+    const dest =join(destVendorPath(), packageName, subpath);
 
     // Recursive copy
     await fs.cp(src, dest, { recursive: true });
-    console.log(`Vendored ${versionedName}/${subpath} -> ${dest}`);
-
-}
-
-async function versionedPackageName() {
-
-    const { version, name } = await readPackageJSON();
-    const versionedName = `${name}@${version}`;
-    return versionedName;
+    console.log(`Vendored ${packageName}/${subpath} -> ${dest}`);
 
 }
 
@@ -39,18 +27,6 @@ function destVendorPath() {
 
 }
 
-// export async function eventStore(_argv) {
-
-//     await vendor("event-store");
-
-// }
-
-// export async function webPlatform(_argv) {
-
-//     await vendor("web");
-
-// }
-
 export async function deps(_argv) {
 
     // lit
@@ -78,28 +54,6 @@ export async function client(_argv) {
 
 }
 
-// export async function webPlatformUI(_argv) {
-
-//     await webPlatform(_argv);
-//     await vendor("web-ui");
-//     const resp = await fetch("https://cdn.jsdelivr.net/gh/lit/dist@3.3.1/core/lit-core.min.js")
-//     const lit = await resp.text();
-//     const dest = join(".", "public", "vendor", "lit@3.3.1", "dist");
-//     await fs.mkdir(dest, { recursive: true });
-//     await fs.writeFile(
-//         join(".", "public", "vendor", "lit@3.3.1", "dist", "lit-core.min.js"),
-//         lit
-//     );
-
-// }
-
-// export async function membership(_argv) {
-
-//     await eventStore(_argv);
-//     await vendor("team");
-
-// }
-
 export async function symLinkLatest(_argv) {
 
     const vendorPath = destVendorPath();

package/src/configuration/rules.js

@@ -28,6 +28,10 @@ export const teamInviteToEmailMapping = ({ team: { membership: { path } } }) =>
 
     `root.child('${path}/${PROJECTIONS}/inviteToEmail')`;
 
+export const assertTeamDoesNotExist = ({ team: { membership: { path } } }) =>
+
+    `!root.child('${path}').exists()`;
+
 export const assertDoesNotAlreadyExist =
 
     "!data.exists()";

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/membership/team-membership/store.js

@@ -2,7 +2,7 @@ import details from "./projections/details.js";
 import members from "./projections/members.js";
 import inviteToEmail from "./projections/inviteToEmail.js";
 
-import { eventTypes, INVITE_ACCEPTED, INVITE_REJECTED } from "./events.js";
+import { BECAME_ADMIN, eventTypes, INVITE_ACCEPTED, INVITE_REJECTED } from "./events.js";
 import {
     newDataPayloadId,
     assertPayloadUidMyUserId,
@@ -12,10 +12,12 @@ import {
     teamInviteToEmailMapping,
     any,
     all,
-    assertEventIsOfType
+    assertEventIsOfType,
+    assertTeamDoesNotExist
 } from "../../configuration/rules.js";
 import { verifyStorePaths } from "../team-details/verify-store-paths.js";
 
+
 export function store(paths) {
 
     verifyStorePaths(paths, {
@@ -44,6 +46,12 @@ export function store(paths) {
 
                 )
 
+            ),
+            all(
+
+                assertTeamDoesNotExist(paths),
+                assertEventIsOfType(BECAME_ADMIN),
+                assertPayloadUidMyUserId
             )
 
         ),

package/src/package.js

@@ -0,0 +1,32 @@
+import { readFileSync } from "fs";
+import { dirname } from "path";
+import { fileURLToPath } from "url";
+
+const __dirname = dirname(fileURLToPath(import.meta.url));
+
+export default {
+
+    get version() {
+
+        return ensure().version;
+
+    },
+
+    get name() {
+
+        return ensure().name;
+
+    }
+
+}
+
+function ensure() {
+
+    if (!ensure.json) {
+
+        ensure.json = JSON.parse(readFileSync(`${__dirname}/../package.json`));
+
+    }
+    return ensure.json;
+
+}

package/src/system/main.js

@@ -1,5 +1,6 @@
 import minimist from "minimist";
 import { loadConfiguration } from "../configuration/load-configuration.js"
+import me from "../package.js";
 
 export async function main(commands) {
 
@@ -45,6 +46,7 @@ async function invoke(commands, verb, argv) {
 
 function displayHelp(commands) {
 
+    console.log("Version", me.version);
     console.log("Help:");
     console.log("");