@powerhousedao/reactor-api 1.19.0 → 1.20.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@powerhousedao/reactor-api",
-  "version": "1.19.0",
+  "version": "1.20.0",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -13,7 +13,7 @@
   "author": "",
   "license": "AGPL-3.0-only",
   "devDependencies": {
-    "@powerhousedao/analytics-engine-graphql": "^0.2.1",
+    "@powerhousedao/analytics-engine-graphql": "^0.2.2",
     "@types/body-parser": "^1.19.5",
     "@types/cors": "^2.8.17",
     "@types/express": "^5.0.0",
@@ -23,15 +23,15 @@
     "@types/pg": "^8.11.10",
     "esbuild": "^0.24.0",
     "graphql-tag": "^2.12.6",
-    "@powerhousedao/scalars": "1.21.0",
-    "document-drive": "1.16.2",
-    "document-model": "2.18.0"
+    "@powerhousedao/scalars": "1.22.0",
+    "document-drive": "1.17.0",
+    "document-model": "2.19.0"
   },
   "dependencies": {
     "@apollo/server": "^4.11.0",
     "@apollo/subgraph": "^2.9.2",
     "@electric-sql/pglite": "^0.2.12",
-    "@powerhousedao/analytics-engine-core": "^0.3.0",
+    "@powerhousedao/analytics-engine-core": "^0.3.2",
     "@powerhousedao/analytics-engine-knex": "^0.4.0",
     "body-parser": "^1.20.3",
     "cors": "^2.8.5",
@@ -51,7 +51,7 @@
     "uuid": "^9.0.1",
     "wildcard-match": "^5.1.3",
     "zod": "^3.24.1",
-    "document-model-libs": "1.130.0"
+    "document-model-libs": "1.131.0"
   },
   "scripts": {
     "build": "tsup",

package/src/server.ts

@@ -7,12 +7,12 @@ import { IDocumentDriveServer } from "document-drive";
 import express, { Express } from "express";
 import fs from "node:fs";
 import https from "node:https";
+import path from "node:path";
 import { Pool } from "pg";
-import { ProcessorManager } from "./processors";
+import { IAnalyticsStore, ProcessorManager } from "./processors";
 import { SubgraphManager } from "./subgraphs/manager";
 import { API } from "./types";
 import { getDbClient } from "./utils/db";
-import path from "node:path";
 
 type Options = {
   express?: Express;
@@ -37,7 +37,7 @@ export async function startAPI(
   const analyticsStore = new KnexAnalyticsStore({
     executor: new KnexQueryExecutor(),
     knex: db,
-  });
+  }) as unknown as IAnalyticsStore; // TODO update @powerhousedao/analytics-engine-pg to use @powerhousedao/analytics-engine-core@0.3.2
   const subgraphManager = new SubgraphManager(
     "/",
     app,

package/src/subgraphs/auth/utils/helpers.ts

@@ -4,9 +4,9 @@ import jwt from "jsonwebtoken";
 import ms from "ms";
 import wildcard from "wildcard-match";
 import z from "zod";
-import { Session, SessionInput } from "../types";
-import { JWT_EXPIRATION_PERIOD, JWT_SECRET } from "../env";
 import { Db } from "../../../utils/db";
+import { JWT_EXPIRATION_PERIOD, JWT_SECRET } from "../env";
+import { Session, SessionInput } from "../types";
 const jwtSchema = z.object({
   sessionId: z.string(),
   exp: z.optional(z.number()),

package/src/subgraphs/drive/index.ts

@@ -13,28 +13,30 @@ import {
   ListenerFilter,
   TransmitterType,
 } from "document-model-libs/document-drive";
-import { Asset } from "./temp-hack-rwa-type-defs";
 import { BaseAction, Document, Operation } from "document-model/document";
 import {
   DocumentModelInput,
   DocumentModelState,
 } from "document-model/document-model";
 import { gql } from "graphql-tag";
-import { Context } from "../types";
 import { Subgraph } from "../base";
+import { Context } from "../types";
+import { Asset } from "./temp-hack-rwa-type-defs";
 
 export class DriveSubgraph extends Subgraph {
   name = "d/:drive";
   typeDefs = gql`
     type Query {
       system: System
-      drive: DocumentDriveState
+      drive: DocumentDrive_DocumentDriveState
       document(id: String!): IDocument
       documents: [String!]!
     }
 
     type Mutation {
-      registerPullResponderListener(filter: InputListenerFilter!): Listener
+      registerPullResponderListener(
+        filter: InputListenerFilter!
+      ): DocumentDrive_Listener
       pushUpdates(strands: [InputStrandUpdate!]): [ListenerRevision!]!
       acknowledge(
         listenerId: String!

package/src/subgraphs/system/index.ts

@@ -15,7 +15,9 @@ export class SystemSubgraph extends Subgraph {
     }
 
     type Mutation {
-      addDrive(global: DocumentDriveStateInput!): DocumentDriveState
+      addDrive(
+        global: DocumentDriveStateInput!
+      ): DocumentDrive_DocumentDriveState
       deleteDrive(id: ID!): Boolean
       setDriveIcon(id: String!, icon: String!): Boolean
       setDriveName(id: String!, name: String!): Boolean

package/src/utils/create-schema.ts

@@ -25,13 +25,11 @@ export const getDocumentModelTypeDefs = (
   const documentModels = documentDriveServer.getDocumentModels();
   let dmSchema = "";
   documentModels.forEach(({ documentModel }) => {
-    dmSchema += `
+    const dmSchemaName = documentModel.name.replaceAll(" ", "");
+    let tmpDmSchema = `
           ${documentModel.specifications
             .map((specification) =>
               specification.state.global.schema
-                .replaceAll(" Account ", ` ${documentModel.name}Account `)
-                .replaceAll(`: Account`, `: ${documentModel.name}Account`)
-                .replaceAll(`[Account!]!`, `[${documentModel.name}Account!]!`)
                 .replaceAll("scalar DateTime", "")
                 .replaceAll(/input (.*?) {[\s\S]*?}/g, ""),
             )
@@ -40,9 +38,6 @@ export const getDocumentModelTypeDefs = (
           ${documentModel.specifications
             .map((specification) =>
               specification.state.local.schema
-                .replaceAll(" Account ", ` ${documentModel.name}Account `)
-                .replaceAll(`: Account`, `: ${documentModel.name}Account`)
-                .replaceAll(`[Account!]!`, `[${documentModel.name}Account!]!`)
                 .replaceAll("scalar DateTime", "")
                 .replaceAll(/input (.*?) {[\s\S]*?}/g, "")
                 .replaceAll("type AccountSnapshotLocalState", "")
@@ -51,7 +46,53 @@ export const getDocumentModelTypeDefs = (
             )
             .join("\n")};
 
-    type ${documentModel.name} implements IDocument {
+    \n`;
+
+    const found = tmpDmSchema.match(/(type|enum|union)\s+(\w+)\s/g);
+    const trimmedFound = found?.map((f) =>
+      f
+        .replaceAll("type ", "")
+        .replaceAll("enum ", "")
+        .replaceAll("union ", "")
+        .trim(),
+    );
+    trimmedFound?.forEach((f) => {
+      // Create a regex that matches the type name with proper boundaries
+      const typeRegex = new RegExp(
+        // Match type references in various GraphQL contexts
+        `(?<![_A-Za-z0-9])(${f})(?![_A-Za-z0-9])|` + // Basic type references
+          `\\[(${f})\\]|` + // Array types without nullability
+          `\\[(${f})!\\]|` + // Array of non-null types
+          `\\[(${f})\\]!|` + // Non-null array of types
+          `\\[(${f})!\\]!`, // Non-null array of non-null types
+        "g",
+      );
+
+      tmpDmSchema = tmpDmSchema.replace(
+        typeRegex,
+        (
+          match: string,
+          p1: string,
+          p2: string,
+          p3: string,
+          p4: string,
+          p5: string,
+        ) => {
+          // If it's an array type, preserve the brackets and ! while replacing the type name
+          if (match.startsWith("[")) {
+            return match.replace(
+              p2 || p3 || p4 || p5,
+              `${dmSchemaName}_${p2 || p3 || p4 || p5}`,
+            );
+          }
+          // Basic type reference
+          return `${dmSchemaName}_${p1}`;
+        },
+      );
+    });
+    dmSchema += tmpDmSchema;
+    dmSchema += `
+    type ${dmSchemaName} implements IDocument {
               id: String!
               name: String!
               documentType: String!
@@ -59,8 +100,8 @@ export const getDocumentModelTypeDefs = (
               revision: Int!
               created: DateTime!
               lastModified: DateTime!
-              ${documentModel.name !== "DocumentModel" ? `initialState: ${documentModel.name}State!` : ""}
-              ${documentModel.name !== "DocumentModel" ? `state: ${documentModel.name}State!` : ""}
+              ${dmSchemaName !== "DocumentModel" ? `initialState: ${dmSchemaName}_${dmSchemaName}State!` : ""}
+              ${dmSchemaName !== "DocumentModel" ? `state: ${dmSchemaName}_${dmSchemaName}State!` : ""}
           }\n`;
   });