Skip to content

Commit ea55ea8

Browse files
authored
Merge pull request #1144 from objectstack-ai/claude/fix-ci-build-test-errors-yet-again
fix: resolve TypeScript compilation errors in ObjectQL engine datasource mapping
2 parents 9e6650e + 1d4c5d1 commit ea55ea8

File tree

2 files changed

+17
-12
lines changed

2 files changed

+17
-12
lines changed

packages/objectql/src/engine.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -618,13 +618,14 @@ export class ObjectQL implements IDataEngine {
618618
}
619619

620620
// 3. Check package's defaultDatasource
621-
if (object?.packageId) {
622-
const manifest = this.manifests.get(object.packageId);
621+
const owner = SchemaRegistry.getObjectOwner(objectName);
622+
if (owner?.packageId) {
623+
const manifest = this.manifests.get(owner.packageId);
623624
if (manifest?.defaultDatasource && manifest.defaultDatasource !== 'default') {
624625
if (this.drivers.has(manifest.defaultDatasource)) {
625626
this.logger.debug('Resolved datasource from package manifest', {
626627
object: objectName,
627-
package: object.packageId,
628+
package: owner.packageId,
628629
datasource: manifest.defaultDatasource
629630
});
630631
return this.drivers.get(manifest.defaultDatasource)!;

packages/plugins/plugin-auth/src/auth-manager.ts

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,11 @@ import type { Auth, BetterAuthOptions } from 'better-auth';
55
import { organization } from 'better-auth/plugins/organization';
66
import { twoFactor } from 'better-auth/plugins/two-factor';
77
import { magicLink } from 'better-auth/plugins/magic-link';
8-
import type { AuthConfig } from '@objectstack/spec/system';
8+
import type {
9+
AuthConfig,
10+
EmailAndPasswordConfig,
11+
AuthPluginConfig,
12+
} from '@objectstack/spec/system';
913
import type { IDataEngine } from '@objectstack/core';
1014
import { createObjectQLAdapterFactory } from './objectql-adapter.js';
1115
import {
@@ -374,20 +378,20 @@ export class AuthManager {
374378
}
375379

376380
// Extract email/password config (safe fields only)
377-
const emailPasswordConfig = this.config.emailAndPassword || {};
381+
const emailPasswordConfig: Partial<EmailAndPasswordConfig> = this.config.emailAndPassword ?? {};
378382
const emailPassword = {
379383
enabled: emailPasswordConfig.enabled !== false, // Default to true
380-
disableSignUp: emailPasswordConfig.disableSignUp,
381-
requireEmailVerification: emailPasswordConfig.requireEmailVerification,
384+
disableSignUp: emailPasswordConfig.disableSignUp ?? false,
385+
requireEmailVerification: emailPasswordConfig.requireEmailVerification ?? false,
382386
};
383387

384388
// Extract enabled features
385-
const pluginConfig = this.config.plugins || {};
389+
const pluginConfig: Partial<AuthPluginConfig> = this.config.plugins ?? {};
386390
const features = {
387-
twoFactor: pluginConfig.twoFactor || false,
388-
passkeys: pluginConfig.passkeys || false,
389-
magicLink: pluginConfig.magicLink || false,
390-
organization: pluginConfig.organization || false,
391+
twoFactor: pluginConfig.twoFactor ?? false,
392+
passkeys: pluginConfig.passkeys ?? false,
393+
magicLink: pluginConfig.magicLink ?? false,
394+
organization: pluginConfig.organization ?? false,
391395
};
392396

393397
return {

0 commit comments

Comments
 (0)