@symbo.ls/sdk 3.1.2 → 3.2.3

package/dist/node/utils/jsonDiff.js

@@ -0,0 +1,74 @@
+function isPlainObject(o) {
+  return o && typeof o === "object" && !Array.isArray(o);
+}
+function deepEqual(a, b) {
+  try {
+    return JSON.stringify(a) === JSON.stringify(b);
+  } catch (err) {
+    console.warn("deepEqual error", err);
+    return false;
+  }
+}
+import * as Y from "yjs";
+function getRootMap(ydoc) {
+  return ydoc.getMap("root");
+}
+function diffJson(prev, next, prefix = []) {
+  const ops = [];
+  const _prefix = Array.isArray(prefix) ? prefix : [];
+  for (const key in prev) {
+    if (Object.hasOwn(prev, key) && !(key in next)) {
+      ops.push({ action: "del", path: [..._prefix, key] });
+    }
+  }
+  for (const key in next) {
+    if (Object.hasOwn(next, key)) {
+      const pVal = prev == null ? void 0 : prev[key];
+      const nVal = next[key];
+      if (isPlainObject(pVal) && isPlainObject(nVal)) {
+        ops.push(...diffJson(pVal, nVal, [..._prefix, key]));
+      } else if (!deepEqual(pVal, nVal)) {
+        ops.push({ action: "set", path: [..._prefix, key], value: nVal });
+      }
+    }
+  }
+  return ops;
+}
+function applyOpsToJson(ops, ydoc) {
+  if (!ydoc || !Array.isArray(ops) || !ops.length) {
+    return;
+  }
+  ydoc.transact(() => {
+    const root = getRootMap(ydoc);
+    ops.forEach((op) => {
+      const { action, path = [], value } = op || {};
+      if (!path.length) {
+        return;
+      }
+      let target = root;
+      for (let i = 0; i < path.length - 1; i++) {
+        const key = path[i];
+        let next = target.get(key);
+        if (!(next instanceof Y.Map)) {
+          const fresh = new Y.Map();
+          if (isPlainObject(next)) {
+            Object.entries(next).forEach(([k, v]) => fresh.set(k, v));
+          }
+          target.set(key, fresh);
+          next = fresh;
+        }
+        target = next;
+      }
+      const last = path[path.length - 1];
+      if (action === "set") {
+        target.set(last, value);
+      } else if (action === "del") {
+        target.delete(last);
+      }
+    });
+  }, "remote");
+}
+export {
+  applyOpsToJson,
+  diffJson
+};

package/dist/node/utils/services.js

@@ -19,94 +19,135 @@ const SERVICE_METHODS = {
   updateProjectTier: "auth",
   subscribeToAuthChanges: "auth",
   getStoredAuthState: "core",
-  // AI service methods
-  prompt: "ai",
-  // Based service methods
-  query: "based",
-  setProject: "based",
-  setUser: "based",
-  setUserForced: "based",
-  subscribe: "based",
-  call: "based",
-  getProject: "based",
-  getProjectByKey: "based",
-  createProject: "based",
-  fetchUser: "based",
-  fetchProject: "based",
-  setBucket: "based",
-  getUser: "based",
-  getUserByEmail: "based",
-  setProjectDomains: "based",
-  checkProjectKeyAvailability: "based",
-  removeProject: "based",
-  getAvailableLibraries: "based",
-  addProjectLibraries: "based",
-  removeProjectLibraries: "based",
-  getProjectLibraries: "based",
-  checkout: "based",
-  uploadFile: "based",
-  updateProjectIcon: "based",
-  updateProject: "based",
-  updateProjectSettings: "based",
-  updateProjectComponents: "based",
-  updateProjectName: "based",
-  updateProjectPackage: "based",
-  createDnsRecord: "based",
-  getDnsRecord: "based",
-  removeDnsRecord: "based",
-  createStorageBucket: "based",
-  getStorageBucket: "based",
-  removeStorageBucket: "based",
-  requestPasswordChange: "based",
-  confirmPasswordChange: "based",
-  updateUserProfile: "based",
-  duplicateProject: "based",
-  listPlans: "based",
-  subscribeToPlan: "based",
-  getSubscriptionDetails: "based",
-  checkSubscriptionStatus: "based",
-  upgradeSubscription: "based",
-  downgradeSubscription: "based",
-  cancelSubscription: "based",
-  reactivateSubscription: "based",
-  generateInvoice: "based",
-  getUsageReport: "based",
-  inviteAccountOwner: "based",
-  acceptOwnerInvitation: "based",
-  removeAccountOwner: "based",
-  checkResourceLimit: "based",
-  checkFeatureAccess: "based",
-  getUserFeatures: "based",
-  getAvailableFeatures: "based",
-  listFeatureFlags: "based",
-  updateFeatureFlag: "based",
-  removeFeatureFlag: "based",
-  batchUpdateFeatureFlags: "based",
-  updatePlanDetails: "based",
-  updatePlanStatus: "based",
-  // Symstory service methods
-  set: "symstory",
-  getData: "symstory",
-  updateData: "symstory",
-  getBranches: "symstory",
-  editBranch: "symstory",
-  restoreVersion: "symstory",
-  getItem: "symstory",
-  addItem: "symstory",
-  addMultipleItems: "symstory",
-  updateItem: "symstory",
-  deleteItem: "symstory",
-  switchVersion: "symstory",
-  switchBranch: "symstory",
-  undo: "symstory",
-  redo: "symstory",
-  publish: "symstory",
-  getChanges: "symstory",
-  // Socket service methods
-  send: "socket",
-  subscribeChannel: "socket",
-  connect: "socket",
-  reconnect: "socket"
+  // Collab service methods
+  connect: "collab",
+  disconnect: "collab",
+  isConnected: "collab",
+  updateData: "collab",
+  addItem: "collab",
+  addMultipleItems: "collab",
+  updateItem: "collab",
+  deleteItem: "collab",
+  undo: "collab",
+  redo: "collab",
+  checkpoint: "collab",
+  // Realtime collaboration helper methods
+  sendCursor: "collab",
+  sendPresence: "collab",
+  toggleLive: "collab",
+  // Core service methods (new - replaces most based/auth functionality)
+  // Auth methods
+  register: "core",
+  login: "core",
+  logout: "core",
+  refreshToken: "core",
+  googleAuth: "core",
+  googleAuthCallback: "core",
+  githubAuth: "core",
+  requestPasswordReset: "core",
+  confirmPasswordReset: "core",
+  confirmRegistration: "core",
+  requestPasswordChange: "core",
+  confirmPasswordChange: "core",
+  getMe: "core",
+  // User methods
+  getUserProfile: "core",
+  updateUserProfile: "core",
+  getUserProjects: "core",
+  getUser: "core",
+  getUserByEmail: "core",
+  // Project methods
+  createProject: "core",
+  getProjects: "core",
+  getProject: "core",
+  getProjectByKey: "core",
+  getPublicProject: "core",
+  listPublicProjects: "core",
+  listProjects: "core",
+  updateProject: "core",
+  updateProjectComponents: "core",
+  updateProjectSettings: "core",
+  updateProjectName: "core",
+  updateProjectPackage: "core",
+  duplicateProject: "core",
+  removeProject: "core",
+  checkProjectKeyAvailability: "core",
+  // Project member methods
+  getProjectMembers: "core",
+  inviteMember: "core",
+  acceptInvite: "core",
+  updateMemberRole: "core",
+  removeMember: "core",
+  // Project library methods
+  getAvailableLibraries: "core",
+  getProjectLibraries: "core",
+  addProjectLibraries: "core",
+  removeProjectLibraries: "core",
+  // File methods
+  uploadFile: "core",
+  updateProjectIcon: "core",
+  // Payment methods
+  checkout: "core",
+  getSubscriptionStatus: "core",
+  // DNS methods
+  createDnsRecord: "core",
+  getDnsRecord: "core",
+  removeDnsRecord: "core",
+  setProjectDomains: "core",
+  // Utility methods
+  getHealthStatus: "core",
+  getTokenDebugInfo: "core",
+  // Project Data methods (Symstory replacement)
+  applyProjectChanges: "core",
+  getProjectData: "core",
+  getProjectVersions: "core",
+  restoreProjectVersion: "core",
+  updateProjectItem: "core",
+  deleteProjectItem: "core",
+  setProjectValue: "core",
+  addProjectItems: "core",
+  getProjectItemByPath: "core",
+  // Pull Request methods
+  createPullRequest: "core",
+  listPullRequests: "core",
+  getPullRequest: "core",
+  reviewPullRequest: "core",
+  addPullRequestComment: "core",
+  mergePullRequest: "core",
+  getPullRequestDiff: "core",
+  createPullRequestWithValidation: "core",
+  approvePullRequest: "core",
+  requestPullRequestChanges: "core",
+  getOpenPullRequests: "core",
+  getClosedPullRequests: "core",
+  getMergedPullRequests: "core",
+  isPullRequestMergeable: "core",
+  getPullRequestStatusSummary: "core",
+  // Branch Management methods
+  listBranches: "core",
+  createBranch: "core",
+  deleteBranch: "core",
+  renameBranch: "core",
+  getBranchChanges: "core",
+  mergeBranch: "core",
+  resetBranch: "core",
+  publishVersion: "core",
+  createBranchWithValidation: "core",
+  branchExists: "core",
+  previewMerge: "core",
+  commitMerge: "core",
+  createFeatureBranch: "core",
+  createHotfixBranch: "core",
+  getBranchStatus: "core",
+  deleteBranchSafely: "core",
+  // Admin methods
+  getAdminUsers: "core",
+  assignProjectsToUser: "core",
+  searchAdminUsers: "core",
+  getAdminUsersByEmails: "core",
+  getAdminUsersByIds: "core",
+  assignSpecificProjectsToUser: "core",
+  assignAllProjectsToUser: "core"
 };
 export {
   SERVICE_METHODS

package/dist/node/utils/symstoryClient.js

@@ -1,6 +1,6 @@
 import config from "../config/environment.js";
 const DEFAULT_OPTIONS = {
-  baseUrl: config.baseUrl
+  apiUrl: config.apiUrl
 };
 class SymstoryClient {
   /**
@@ -27,7 +27,7 @@ class SymstoryClient {
    * @returns {Promise<any>} - The response data.
    */
   async request(path = "", options = {}) {
-    const url = `${this.options.baseUrl}/symstory/${this.appKey}${path}`;
+    const url = `${this.options.apiUrl}/symstory/${this.appKey}${path}`;
     const response = await fetch(url, {
       ...options,
       headers: { ...this.headers, ...options.headers }
@@ -181,7 +181,7 @@ class SymstoryClient {
    * @param {string} [options.branch='main'] - The branch name. (Only if version number is provided)
    * @returns {Promise<any>} - The response data.
    */
-  publishVersion(version, { branch = "main" } = {}) {
+  publishVersion(version) {
     return this.request("/publish", {
       method: "POST",
       body: JSON.stringify({ version })
@@ -197,11 +197,11 @@ class SymstoryClient {
    */
   getChanges({ versionId, versionValue, branch } = {}) {
     return this.request(
-      "/changes?" + new URLSearchParams({
+      `/changes?${new URLSearchParams({
         ...versionId ? { versionId } : {},
         ...versionValue ? { versionValue } : {},
         ...branch ? { branch } : {}
-      }).toString(),
+      }).toString()}`,
       {}
     );
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@symbo.ls/sdk",
-  "version": "3.1.2",
+  "version": "3.2.3",
   "type": "module",
   "main": "dist/esm/index.js",
   "module": "dist/esm/index.js",
@@ -38,13 +38,19 @@
     "@based/client": "^6.11.1",
     "@based/errors": "^1.4.0",
     "@based/functions": "^3.0.2",
-    "@domql/element": "^3.1.2",
-    "@symbo.ls/router": "^3.1.2",
-    "@symbo.ls/socket": "^3.1.2",
+    "@domql/element": "^3.2.3",
+    "@domql/utils": "^3.2.3",
+    "@symbo.ls/router": "^3.2.3",
+    "@symbo.ls/socket": "^3.2.3",
     "acorn": "^8.14.0",
     "acorn-walk": "^8.3.4",
+    "dexie": "^4.0.11",
     "dotenv": "^16.4.7",
-    "node-fetch": "^3.3.2"
+    "nanoid": "^5.1.5",
+    "node-fetch": "^3.3.2",
+    "socket.io-client": "^4.8.1",
+    "y-indexeddb": "^9.0.12",
+    "yjs": "^13.6.27"
   },
   "devDependencies": {
     "@faker-js/faker": "^9.5.1",
@@ -56,5 +62,5 @@
     "tap-spec": "^2.2.2",
     "tape": "5.9.0"
   },
-  "gitHead": "429b36616aa04c8587a26ce3c129815115e35897"
+  "gitHead": "9fc1b79b41cdc725ca6b24aec64920a599634681"
 }

package/src/config/environment.js

@@ -18,9 +18,7 @@ const CONFIG = {
 
   local: {
     // local
-    baseUrl: 'http://localhost:8080', // For symstory api
     socketUrl: 'http://localhost:8080', // For socket api
-    routerUrl: 'http://localhost:8080', // For router api
     apiUrl: 'http://localhost:8080', // For server api
     basedEnv: 'development', // For based api
     basedProject: 'platform-v2-sm', // For based api
@@ -32,29 +30,25 @@ const CONFIG = {
     }
   },
   development: {
-    baseUrl: 'https://dev.api.symbols.app',
     socketUrl: 'https://dev.api.symbols.app',
-    routerUrl: 'https://dev.api.symbols.app',
     apiUrl: 'https://dev.api.symbols.app',
-    basedEnv: 'development',
-    basedProject: 'platform-v2-sm',
-    basedOrg: 'symbols',
     githubClientId: 'Ov23liHxyWFBxS8f1gnF'
   },
   testing: {
-    baseUrl: 'https://test.api.symbols.app',
     socketUrl: 'https://test.api.symbols.app',
-    routerUrl: 'https://test.api.symbols.app',
     apiUrl: 'https://test.api.symbols.app',
     basedEnv: 'testing',
     basedProject: 'platform-v2-sm',
     basedOrg: 'symbols',
     githubClientId: 'Ov23liHxyWFBxS8f1gnF'
   },
+  upcoming: {
+    socketUrl: 'https://upcoming.api.symbols.app',
+    apiUrl: 'https://upcoming.api.symbols.app',
+    githubClientId: 'Ov23liWF7NvdZ056RV5J'
+  },
   staging: {
-    baseUrl: 'https://staging.api.symbols.app',
     socketUrl: 'https://staging.api.symbols.app',
-    routerUrl: 'https://staging.api.symbols.app',
     apiUrl: 'https://staging.api.symbols.app',
     basedEnv: 'staging',
     basedProject: 'platform-v2-sm',
@@ -62,9 +56,7 @@ const CONFIG = {
     githubClientId: 'Ov23ligwZDQVD0VfuWNa'
   },
   production: {
-    baseUrl: 'https://api.symbols.app',
     socketUrl: 'https://api.symbols.app',
-    routerUrl: 'https://api.symbols.app',
     apiUrl: 'https://api.symbols.app',
     basedEnv: 'production',
     basedProject: 'platform-v2-sm',
@@ -95,9 +87,7 @@ export const getConfig = () => {
     // Create the final config with environment variable overrides
     const finalConfig = {
       ...envConfig,
-      baseUrl: process.env.SYMBOLS_APP_BASE_URL || envConfig.baseUrl,
       socketUrl: process.env.SYMBOLS_APP_SOCKET_URL || envConfig.socketUrl,
-      routerUrl: process.env.SYMBOLS_APP_ROUTER_URL || envConfig.routerUrl,
       apiUrl: process.env.SYMBOLS_APP_API_URL || envConfig.apiUrl,
       basedEnv: process.env.SYMBOLS_APP_BASED_ENV || envConfig.basedEnv,
       basedProject:
@@ -114,12 +104,8 @@ export const getConfig = () => {
 
     // Validate critical configuration values
     const requiredFields = [
-      'baseUrl',
       'socketUrl',
       'apiUrl',
-      'basedEnv',
-      'basedProject',
-      'basedOrg',
       'githubClientId',
       'googleClientId'
     ]

package/src/index.js

@@ -1,13 +1,10 @@
 import {
-  createSymstoryService,
   createAuthService,
-  createAIService,
-  createSocketService,
-  createCoreService
+  createCoreService,
+  createCollabService
 } from './services/index.js'
 
 import { SERVICE_METHODS } from './utils/services.js'
-import { SymstoryService } from './services/SymstoryService.js'
 import environment from './config/environment.js'
 
 export class SDK {
@@ -38,29 +35,15 @@ export class SDK {
         })
       ),
       this._initService(
-        'socket',
-        createSocketService({
-          context: this._context,
-          options: this._options
-        })
-      ),
-      this._initService(
-        'symstory',
-        createSymstoryService({
-          context: this._context,
-          options: this._options
-        })
-      ),
-      this._initService(
-        'ai',
-        createAIService({
+        'core',
+        createCoreService({
           context: this._context,
           options: this._options
         })
       ),
       this._initService(
-        'core',
-        createCoreService({
+        'collab',
+        createCollabService({
           context: this._context,
           options: this._options
         })
@@ -90,7 +73,7 @@ export class SDK {
   _validateOptions (options) {
     const defaults = {
       useNewServices: true, // Use new service implementations by default
-      baseUrl: environment.baseUrl,
+      apiUrl: environment.apiUrl,
       socketUrl: environment.socketUrl,
       timeout: 30000,
       retryAttempts: 3,
@@ -118,9 +101,6 @@ export class SDK {
     // Update context for all services
     for (const service of this._services.values()) {
       service.updateContext(this._context)
-      if (service instanceof SymstoryService) {
-        service.init()
-      }
     }
   }
 
@@ -195,11 +175,9 @@ export default SDK
 
 // Export services for direct usage
 export {
-  createSymstoryService,
   createAuthService,
-  createAIService,
-  createSocketService,
-  createCoreService
+  createCoreService,
+  createCollabService
 } from './services/index.js'
 
 // Export environment configuration

package/src/services/AIService.js

@@ -6,7 +6,7 @@ export class AIService extends BaseService {
     this._client = null
     this._initialized = false
     this._defaultConfig = {
-      baseUrl: 'https://api.openai.com/v1/engines/text-curie/completions',
+      apiUrl: 'https://api.openai.com/v1/engines/text-curie/completions',
       temperature: 0.0,
       maxTokens: 2000,
       headers: {
@@ -57,7 +57,7 @@ export class AIService extends BaseService {
   }
 
   validateConfig (config = {}) {
-    const requiredFields = ['baseUrl', 'temperature', 'maxTokens']
+    const requiredFields = ['apiUrl', 'temperature', 'maxTokens']
     const missingFields = requiredFields.filter(field => !config[field])
 
     if (missingFields.length > 0) {
@@ -89,7 +89,7 @@ export class AIService extends BaseService {
         })
       }
 
-      const response = await this._request(config.baseUrl, options)
+      const response = await this._request(config.apiUrl, options)
       return response
     } catch (error) {
       throw new Error(`AI prompt failed: ${error.message}`)

package/src/services/BasedService.js

@@ -4,6 +4,7 @@ import Based from '@based/client'
 import { isFunction, isString } from '@domql/utils'
 import environment from '../config/environment.js'
 
+// DEPRECATED
 export class BasedService extends BaseService {
   constructor (config) {
     super(config)