Merge pull request #224 from objectstack-ai/copilot/upgrade-objectstack-to-latest-another-one

hotlong · web-flow · commit 3c9860e0015e · 2026-02-09T15:28:49.000+08:00
diff --git a/apps/web/package.json b/apps/web/package.json
@@ -12,7 +12,7 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@objectstack/client": "1.1.0",
+    "@objectstack/client": "2.0.0",
     "@radix-ui/react-dialog": "^1.1.15",
     "@radix-ui/react-dropdown-menu": "^2.1.16",
     "@radix-ui/react-select": "^2.2.6",
diff --git a/examples/crm/package.json b/examples/crm/package.json
@@ -17,10 +17,10 @@
     "test": "objectstack test"
   },
   "dependencies": {
-    "@objectstack/spec": "workspace:*"
+    "@objectstack/spec": "2.0.0"
   },
   "devDependencies": {
     "typescript": "^5.0.0",
-    "@objectstack/cli": "workspace:*"
+    "@objectstack/cli": "^2.0.0"
   }
 }
diff --git a/examples/crm/src/apps/crm.app.ts b/examples/crm/src/apps/crm.app.ts
@@ -6,7 +6,6 @@ export const CrmApp = App.create({
   icon: 'briefcase',
   branding: {
     primaryColor: '#4169E1',
-    secondaryColor: '#00AA00',
     logo: '/assets/crm-logo.png',
     favicon: '/assets/crm-favicon.ico',
   },
diff --git a/examples/crm/src/objects/account.hook.ts b/examples/crm/src/objects/account.hook.ts
@@ -5,7 +5,7 @@ const accountHook: Hook = {
     name: 'account_protection',
     object: 'account',
     events: ['beforeInsert', 'beforeUpdate', 'beforeDelete'],
-    handler: async (ctx: HookContext) => {
+    handler: (async (ctx: HookContext) => {
         const { input } = ctx;
 
         if (ctx.event === 'beforeInsert' || ctx.event === 'beforeUpdate') {
@@ -17,14 +17,11 @@ const accountHook: Hook = {
 
         if (ctx.event === 'beforeDelete') {
              // Prevent deletion of 'Strategic' accounts
-             // Note: ctx.previous is available in beforeDelete?
-             // Actually, usually in beforeDelete we might need to fetch it first if not provided.
-             // But let's assume the engine provides 'previous' (which is the record being deleted).
              if (ctx.previous && ctx.previous.type === 'Strategic') {
                  throw new Error('Cannot delete Strategic accounts');
              }
         }
-    }
+    }) as (...args: unknown[]) => unknown
 };
 
 export default accountHook;
diff --git a/examples/crm/src/objects/lead.hook.ts b/examples/crm/src/objects/lead.hook.ts
@@ -5,7 +5,7 @@ const leadHook: Hook = {
     name: 'lead_automation',
     object: 'lead',
     events: ['beforeInsert', 'afterUpdate'],
-    handler: async (ctx: HookContext) => {
+    handler: (async (ctx: HookContext) => {
         if (ctx.event === 'beforeInsert') {
             const { input } = ctx;
             // Auto-score logic (mock)
@@ -16,7 +16,7 @@ const leadHook: Hook = {
             if (input.phone) {
                 score += 20;
             }
-            input.score = score;
+            (input as Record<string, unknown>).score = score;
         }
 
         if (ctx.event === 'afterUpdate') {
@@ -26,7 +26,7 @@ const leadHook: Hook = {
                 console.log('Lead qualified! Ready for conversion.');
             }
         }
-    }
+    }) as (...args: unknown[]) => unknown
 };
 
 export default leadHook;
diff --git a/examples/todo/package.json b/examples/todo/package.json
@@ -17,14 +17,14 @@
     "test": "objectstack test"
   },
   "dependencies": {
-    "@objectstack/client": "workspace:*",
-    "@objectstack/driver-memory": "workspace:^",
-    "@objectstack/objectql": "workspace:^",
-    "@objectstack/runtime": "workspace:^",
-    "@objectstack/spec": "workspace:*"
+    "@objectstack/client": "2.0.0",
+    "@objectstack/driver-memory": "^2.0.0",
+    "@objectstack/objectql": "^2.0.0",
+    "@objectstack/runtime": "^2.0.0",
+    "@objectstack/spec": "2.0.0"
   },
   "devDependencies": {
-    "@objectstack/cli": "workspace:*",
+    "@objectstack/cli": "^2.0.0",
     "typescript": "^5.0.0"
   }
 }
diff --git a/examples/todo/src/apps/todo.app.ts b/examples/todo/src/apps/todo.app.ts
@@ -6,7 +6,6 @@ export const TodoApp = App.create({
   icon: 'check-square',
   branding: {
     primaryColor: '#10B981',
-    secondaryColor: '#3B82F6',
     logo: '/assets/todo-logo.png',
     favicon: '/assets/todo-favicon.ico',
   },
diff --git a/examples/todo/src/objects/task.hook.ts b/examples/todo/src/objects/task.hook.ts
@@ -4,9 +4,9 @@ const taskHook: Hook = {
   name: 'task_logic',
   object: 'task',
   events: ['beforeInsert', 'afterUpdate'],
-  handler: async (ctx: HookContext) => {
+  handler: (async (ctx: HookContext) => {
     if (ctx.event === 'beforeInsert') {
-      const { input } = ctx;
+      const input = ctx.input as Record<string, unknown>;
       // Default priority
       if (!input.priority) {
         input.priority = 'normal';
@@ -16,7 +16,7 @@ const taskHook: Hook = {
         input.status = 'not_started';
       }
       // Validation
-      if (input.subject && input.subject.includes('spam')) {
+      if (input.subject && typeof input.subject === 'string' && input.subject.includes('spam')) {
         throw new Error('Spam tasks are not allowed');
       }
     }
@@ -25,15 +25,14 @@ const taskHook: Hook = {
       // Check if completed
       if (ctx.input.status === 'completed' && ctx.previous && ctx.previous.status !== 'completed') {
         console.log(`Task ${ctx.id} completed by ${ctx.session?.userId || 'unknown'}`);
-        // Could trigger notifications or integrations here
       }
       
       // Check if task became overdue
       if (ctx.input.is_overdue && ctx.previous && !ctx.previous.is_overdue) {
         console.log(`Task ${ctx.id} is now overdue`);
       }
     }
-  }
+  }) as (...args: unknown[]) => unknown
 };
 
 export default taskHook;
diff --git a/package.json b/package.json
@@ -53,7 +53,7 @@
   },
   "devDependencies": {
     "@changesets/cli": "^2.29.8",
-    "@objectstack/cli": "^1.1.0",
+    "@objectstack/cli": "^2.0.0",
     "@types/jest": "^30.0.0",
     "@types/js-yaml": "^4.0.9",
     "@types/node": "^25.2.0",
@@ -87,11 +87,11 @@
     "@objectql/driver-mongo": "^4.2.0",
     "@objectql/driver-sql": "^4.2.0",
     "@objectql/platform-node": "^4.2.0",
-    "@objectstack/driver-memory": "1.1.0",
-    "@objectstack/objectql": "1.1.0",
-    "@objectstack/plugin-hono-server": "1.1.0",
-    "@objectstack/runtime": "1.1.0",
-    "@objectstack/spec": "1.1.0",
+    "@objectstack/driver-memory": "2.0.0",
+    "@objectstack/objectql": "2.0.0",
+    "@objectstack/plugin-hono-server": "2.0.0",
+    "@objectstack/runtime": "2.0.0",
+    "@objectstack/spec": "2.0.0",
     "build": "^0.1.4",
     "hono": "^4.11.0",
     "pino": "^10.3.0",
diff --git a/packages/audit/package.json b/packages/audit/package.json
@@ -11,8 +11,8 @@
     "test": "jest --passWithNoTests"
   },
   "dependencies": {
-    "@objectstack/runtime": "^1.1.0",
-    "@objectstack/spec": "1.1.0"
+    "@objectstack/runtime": "^2.0.0",
+    "@objectstack/spec": "2.0.0"
   },
   "devDependencies": {
     "@objectos/permissions": "workspace:^",
diff --git a/packages/auth/package.json b/packages/auth/package.json
@@ -12,8 +12,8 @@
     "test:integration": "vitest run"
   },
   "dependencies": {
-    "@objectstack/runtime": "^1.1.0",
-    "@objectstack/spec": "1.1.0",
+    "@objectstack/runtime": "^2.0.0",
+    "@objectstack/spec": "2.0.0",
     "better-auth": "^1.4.18",
     "better-sqlite3": "^12.6.0",
     "mongodb": "^7.0.0",
diff --git a/packages/automation/package.json b/packages/automation/package.json
@@ -11,8 +11,8 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@objectstack/runtime": "^1.1.0",
-    "@objectstack/spec": "1.1.0",
+    "@objectstack/runtime": "^2.0.0",
+    "@objectstack/spec": "2.0.0",
     "cron-parser": "^4.9.0"
   },
   "devDependencies": {
diff --git a/packages/browser/package.json b/packages/browser/package.json
@@ -12,8 +12,8 @@
     "test": "jest --passWithNoTests"
   },
   "dependencies": {
-    "@objectstack/runtime": "^1.1.0",
-    "@objectstack/spec": "1.1.0",
+    "@objectstack/runtime": "^2.0.0",
+    "@objectstack/spec": "2.0.0",
     "comlink": "^4.4.1",
     "idb": "^8.0.0",
     "sql.js": "^1.11.0"
diff --git a/packages/cache/package.json b/packages/cache/package.json
@@ -11,7 +11,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@objectstack/runtime": "^1.1.0"
+    "@objectstack/runtime": "^2.0.0"
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",
diff --git a/packages/i18n/package.json b/packages/i18n/package.json
@@ -11,7 +11,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@objectstack/runtime": "^1.1.0"
+    "@objectstack/runtime": "^2.0.0"
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",
diff --git a/packages/jobs/package.json b/packages/jobs/package.json
@@ -11,8 +11,8 @@
     "test": "jest --passWithNoTests"
   },
   "dependencies": {
-    "@objectstack/runtime": "^1.1.0",
-    "@objectstack/spec": "1.1.0",
+    "@objectstack/runtime": "^2.0.0",
+    "@objectstack/spec": "2.0.0",
     "cron-parser": "^4.9.0"
   },
   "devDependencies": {
diff --git a/packages/metrics/package.json b/packages/metrics/package.json
@@ -11,7 +11,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@objectstack/runtime": "^1.1.0"
+    "@objectstack/runtime": "^2.0.0"
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",
diff --git a/packages/notification/package.json b/packages/notification/package.json
@@ -11,7 +11,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@objectstack/runtime": "^1.1.0"
+    "@objectstack/runtime": "^2.0.0"
   },
   "optionalDependencies": {
     "axios": "^1.7.9",
diff --git a/packages/permissions/package.json b/packages/permissions/package.json
@@ -12,8 +12,8 @@
     "test:watch": "vitest"
   },
   "dependencies": {
-    "@objectstack/runtime": "^1.1.0",
-    "@objectstack/spec": "1.1.0",
+    "@objectstack/runtime": "^2.0.0",
+    "@objectstack/spec": "2.0.0",
     "js-yaml": "^4.1.1"
   },
   "devDependencies": {
diff --git a/packages/permissions/src/plugin.ts b/packages/permissions/src/plugin.ts
@@ -151,9 +151,10 @@ export class PermissionsPlugin implements Plugin {
                             return c.json({ success: false, error: 'Missing required fields' }, 400);
                         }
 
-                        const permissionContext = {
+                        const permissionContext: PermissionContext = {
                             userId,
                             profileName,
+                            profiles: body.profiles || (profileName ? [profileName] : []),
                             roleName,
                             permissionSetNames: body.permissionSetNames || [],
                         };
diff --git a/packages/permissions/src/storage.ts b/packages/permissions/src/storage.ts
@@ -54,7 +54,9 @@ export class InMemoryPermissionStorage implements PermissionStorage {
 
     async storePermissionSet(permissionSet: PermissionSet): Promise<void> {
         this.permissionSets.set(permissionSet.name, permissionSet);
-        this.objectIndex.set(permissionSet.objectName, permissionSet.name);
+        if (permissionSet.objectName) {
+            this.objectIndex.set(permissionSet.objectName, permissionSet.name);
+        }
     }
 
     async getPermissionSet(name: string): Promise<PermissionSet | null> {
@@ -74,7 +76,9 @@ export class InMemoryPermissionStorage implements PermissionStorage {
     async deletePermissionSet(name: string): Promise<void> {
         const permissionSet = this.permissionSets.get(name);
         if (permissionSet) {
-            this.objectIndex.delete(permissionSet.objectName);
+            if (permissionSet.objectName) {
+                this.objectIndex.delete(permissionSet.objectName);
+            }
             this.permissionSets.delete(name);
         }
     }
diff --git a/packages/permissions/src/types.ts b/packages/permissions/src/types.ts
@@ -111,12 +111,16 @@ export interface PermissionSet {
     label?: string;
     /** Description */
     description?: string;
+    /** Object this permission set applies to */
+    objectName?: string;
     /** System permission set — cannot be deleted */
     isSystem?: boolean;
     /** Active status */
     isActive?: boolean;
     /** Scoped to a specific profile (optional) */
     profileName?: string;
+    /** Profile-based object permissions keyed by profile name */
+    profiles?: Record<string, ObjectPermissions>;
     /** Object-level permissions keyed by object name */
     objectPermissions?: Record<string, ObjectPermission>;
     /** Field-level permissions keyed by "objectName.fieldName" */
@@ -173,6 +177,25 @@ export interface ObjectPermission {
     modifyAll?: boolean;
 }
 
+/**
+ * ObjectPermissions — Profile-level object permissions.
+ * Used within a PermissionSet to define what a profile can do on an object.
+ */
+export interface ObjectPermissions {
+    /** The API name of the object */
+    objectName?: string;
+    /** Allow read access */
+    allowRead?: boolean;
+    /** Allow create access */
+    allowCreate?: boolean;
+    /** Allow edit access */
+    allowEdit?: boolean;
+    /** Allow delete access */
+    allowDelete?: boolean;
+    /** Record-level view filters (template variables supported) */
+    viewFilters?: Record<string, any>;
+}
+
 // ─── Field Permission ──────────────────────────────────────────────────────────
 
 /**
@@ -192,6 +215,10 @@ export interface FieldPermission {
     read: boolean;
     /** Whether the field is editable (requires read=true) */
     update: boolean;
+    /** Profiles that can view this field */
+    visibleTo?: string[];
+    /** Profiles that can edit this field */
+    editableBy?: string[];
 }
 
 // ─── Organization-Wide Defaults ────────────────────────────────────────────────
@@ -318,7 +345,9 @@ export interface PermissionContext {
     /** User ID */
     userId: string;
     /** User's profile name */
-    profileName: string;
+    profileName?: string;
+    /** User's profiles (array of profile names) */
+    profiles: string[];
     /** User's role name */
     roleName?: string;
     /** Names of all assigned permission sets */
diff --git a/packages/realtime/package.json b/packages/realtime/package.json
@@ -11,7 +11,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@objectstack/runtime": "^1.1.0",
+    "@objectstack/runtime": "^2.0.0",
     "ws": "^8.16.0"
   },
   "devDependencies": {
diff --git a/packages/storage/package.json b/packages/storage/package.json
@@ -11,7 +11,7 @@
     "test": "jest"
   },
   "dependencies": {
-    "@objectstack/runtime": "^1.1.0"
+    "@objectstack/runtime": "^2.0.0"
   },
   "devDependencies": {
     "@types/better-sqlite3": "^7.6.12",
diff --git a/packages/workflow/package.json b/packages/workflow/package.json
diff --git a/packages/workflow/src/flow-converter.ts b/packages/workflow/src/flow-converter.ts
diff --git a/packages/workflow/test/flow-converter.test.ts b/packages/workflow/test/flow-converter.test.ts
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml

Original file line number	Diff line number	Diff line change
`@@ -17,10 +17,10 @@`
`17`	`17`	`"test": "objectstack test"`
`18`	`18`	`},`
`19`	`19`	`"dependencies": {`
`20`		`- "@objectstack/spec": "workspace:*"`
	`20`	`+ "@objectstack/spec": "2.0.0"`
`21`	`21`	`},`
`22`	`22`	`"devDependencies": {`
`23`	`23`	`"typescript": "^5.0.0",`
`24`		`- "@objectstack/cli": "workspace:*"`
	`24`	`+ "@objectstack/cli": "^2.0.0"`
`25`	`25`	`}`
`26`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@ const leadHook: Hook = {`
`5`	`5`	`name: 'lead_automation',`
`6`	`6`	`object: 'lead',`
`7`	`7`	`events: ['beforeInsert', 'afterUpdate'],`
`8`		`- handler: async (ctx: HookContext) => {`
	`8`	`+ handler: (async (ctx: HookContext) => {`
`9`	`9`	`if (ctx.event === 'beforeInsert') {`
`10`	`10`	`const { input } = ctx;`
`11`	`11`	`// Auto-score logic (mock)`
`@@ -16,7 +16,7 @@ const leadHook: Hook = {`
`16`	`16`	`if (input.phone) {`
`17`	`17`	`score += 20;`
`18`	`18`	`}`
`19`		`- input.score = score;`
	`19`	`+ (input as Record<string, unknown>).score = score;`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`if (ctx.event === 'afterUpdate') {`
`@@ -26,7 +26,7 @@ const leadHook: Hook = {`
`26`	`26`	`console.log('Lead qualified! Ready for conversion.');`
`27`	`27`	`}`
`28`	`28`	`}`
`29`		`- }`
	`29`	`+ }) as (...args: unknown[]) => unknown`
`30`	`30`	`};`
`31`	`31`
`32`	`32`	`export default leadHook;`
Original file line number	Diff line number	Diff line change
`@@ -4,9 +4,9 @@ const taskHook: Hook = {`
`4`	`4`	`name: 'task_logic',`
`5`	`5`	`object: 'task',`
`6`	`6`	`events: ['beforeInsert', 'afterUpdate'],`
`7`		`- handler: async (ctx: HookContext) => {`
	`7`	`+ handler: (async (ctx: HookContext) => {`
`8`	`8`	`if (ctx.event === 'beforeInsert') {`
`9`		`- const { input } = ctx;`
	`9`	`+ const input = ctx.input as Record<string, unknown>;`
`10`	`10`	`// Default priority`
`11`	`11`	`if (!input.priority) {`
`12`	`12`	`input.priority = 'normal';`
`@@ -16,7 +16,7 @@ const taskHook: Hook = {`
`16`	`16`	`input.status = 'not_started';`
`17`	`17`	`}`
`18`	`18`	`// Validation`
`19`		`- if (input.subject && input.subject.includes('spam')) {`
	`19`	`+ if (input.subject && typeof input.subject === 'string' && input.subject.includes('spam')) {`
`20`	`20`	`throw new Error('Spam tasks are not allowed');`
`21`	`21`	`}`
`22`	`22`	`}`
`@@ -25,15 +25,14 @@ const taskHook: Hook = {`
`25`	`25`	`// Check if completed`
`26`	`26`	`if (ctx.input.status === 'completed' && ctx.previous && ctx.previous.status !== 'completed') {`
`27`	`27`	console.log(`Task ${ctx.id} completed by ${ctx.session?.userId \|\| 'unknown'}`);
`28`		`- // Could trigger notifications or integrations here`
`29`	`28`	`}`
`30`	`29`
`31`	`30`	`// Check if task became overdue`
`32`	`31`	`if (ctx.input.is_overdue && ctx.previous && !ctx.previous.is_overdue) {`
`33`	`32`	console.log(`Task ${ctx.id} is now overdue`);
`34`	`33`	`}`
`35`	`34`	`}`
`36`		`- }`
	`35`	`+ }) as (...args: unknown[]) => unknown`
`37`	`36`	`};`
`38`	`37`
`39`	`38`	`export default taskHook;`