sfobjects-basic-client 1.1.9 → 1.2.0

package/dist/index.d.ts

@@ -34,10 +34,10 @@ export type SfProjection<OO, O extends OO, S> = {
     } ? (NonNullable<O[K]> extends OO ? SfProjection<OO, NonNullable<O[K]>, S['select'][0]> : (NonNullable<O[K]> extends ChildTable<OO> ? Readonly<ChildTable<SfProjection<OO, NonNullable<O[K]>['records'][0], S['select'][0]>>> : never)) : never));
 };
 declare const SINGULAR_OP_KEYS: readonly ["eq", "equals", "=", "==", "ne", "!=", "<>", "lt", "<", "less than", "gt", ">", "greater than", "lte", "<=", "less than or equal", "gte", ">=", "greater than or equal", "like", "nlike", "not like"];
-declare const PLURAL_OP_KEYS: readonly ["in", "nin", "not in"];
+declare const PLURAL_OR_SJ_OP_KEYS: readonly ["in", "nin", "not in"];
 declare const LOGICAL_OP_KEYS: readonly ["__and", "__or", "__not"];
 type SfSingularOpKeys = typeof SINGULAR_OP_KEYS[number];
-type SfPluralOpKeys = typeof PLURAL_OP_KEYS[number];
+type SfPluralOpKeys = typeof PLURAL_OR_SJ_OP_KEYS[number];
 type SfLogicalOpKeys = typeof LOGICAL_OP_KEYS[number];
 type SfValueOpKeys = SfSingularOpKeys | SfPluralOpKeys;
 interface SfWhereOp<OP extends SfValueOpKeys, V> {
@@ -47,15 +47,26 @@ interface SfWhereOp<OP extends SfValueOpKeys, V> {
 type ParentOrPrimitiveProps<OO, O extends OO> = {
     [K in KeyOf<O>]: NonNullable<O[K]> extends SfPrimitiveType ? K : NonNullable<O[K]> extends OO ? K : never;
 }[KeyOf<O>];
-type SfWhere<OO, O extends OO> = {
+type SfWhere<OO, O extends OO, OI = never> = {
     [K in ParentOrPrimitiveProps<OO, O>]+?: (NonNullable<O[K]> extends SfPrimitiveType ? (O[K] | O[K][] | {
         [OPK in SfSingularOpKeys]: SfWhereOp<OPK, O[K]>;
     }[SfSingularOpKeys] | {
-        [OPK in SfPluralOpKeys]: SfWhereOp<OPK, O[K][]>;
+        [OPK in SfPluralOpKeys]: SfWhereOp<OPK, O[K][] | (OI extends never ? never : SfWhereSemiJoinOps<OI>)>;
     }[SfPluralOpKeys]) : (NonNullable<O[K]> extends OO ? SfWhere<OO, NonNullable<O[K]>> : never));
 } | {
     [K in SfLogicalOpKeys]+?: SfWhere<OO, O>;
 } | SfWhere<OO, O>[];
+type SfWhereSemiJoinOpSelect<O> = {
+    [K in KeyOf<O>]: NonNullable<O[K]> extends string ? K : never;
+}[KeyOf<O>];
+interface SfWhereSemiJoinOp<OI, N extends KeyOf<OI>> {
+    from: N;
+    select: SfWhereSemiJoinOpSelect<OI[N]>;
+    where?: SfWhere<GetObjectTypes<OI>, OI[N]>;
+}
+type SfWhereSemiJoinOps<OI> = {
+    [N in KeyOf<OI>]: SfWhereSemiJoinOp<OI, N>;
+}[KeyOf<OI>];
 type SfOrderType = 'asc' | 'desc';
 type SfOrderBy<OO, O extends OO> = {
     [K in ParentOrPrimitiveProps<OO, O>]+?: NonNullable<O[K]> extends SfPrimitiveType ? SfOrderType : (NonNullable<O[K]> extends OO ? SfOrderBy<OO, NonNullable<O[K]>> : never);
@@ -82,7 +93,7 @@ type UpdateableProps<O> = {
     }, K>) : never;
 }[KeyOf<O>];
 export type SfRootSelect<OI, N extends KeyOf<OI>> = SfSelect<GetObjectTypes<OI>, OI[N]>;
-export type SfRootWhere<OI, N extends KeyOf<OI>> = SfWhere<GetObjectTypes<OI>, OI[N]>;
+export type SfRootWhere<OI, N extends KeyOf<OI>> = SfWhere<GetObjectTypes<OI>, OI[N], OI>;
 export type SfRootOrderBy<OI, N extends KeyOf<OI>> = SfOrderBy<GetObjectTypes<OI>, OI[N]>;
 export type SfRootSelectProjection<OI, N extends KeyOf<OI>, S extends SfRootSelect<OI, N>> = SfProjection<GetObjectTypes<OI>, OI[N], S>;
 export type SfCreate<O> = {
@@ -172,7 +183,7 @@ export interface SfOrderByAction<OI, N extends KeyOf<OI>, S extends SfRootSelect
     orderBy: <R extends SfRootOrderBy<OI, N>>(orderBy: R) => (SfQueryActions<OI, N, S> & SfLimitAction<OI, N, S>);
 }
 export interface SfWhereActions<OI, N extends KeyOf<OI>, S extends SfRootSelect<OI, N>> {
-    where: <W extends SfRootWhere<OI, N>>(where: W) => (SfQueryActions<OI, N, S> & SfOrderByAction<OI, N, S>);
+    where: <W extends SfRootWhere<OI, N>>(where: W) => (SfQueryActions<OI, N, S> & SfOrderByAction<OI, N, S> & SfLimitAction<OI, N, S>);
 }
 export interface SfQueryAditionalActions<OI, N extends KeyOf<OI>, S extends SfRootSelect<OI, N>> {
     find: (id: string, options?: SfQueryOptions) => Promise<SfRootSelectProjection<OI, N, S> | undefined>;

package/dist/index.js

@@ -49,7 +49,7 @@ const SINGULAR_OP_KEYS = [
     ...OP_KEYS_LIKE,
     ...OP_KEYS_NLIKE
 ];
-const PLURAL_OP_KEYS = [
+const PLURAL_OR_SJ_OP_KEYS = [
     ...OP_KEYS_IN,
     ...OP_KEYS_NIN
 ];
@@ -65,10 +65,10 @@ const OP_RULES = [
     { ops: OP_KEYS_LTE, soqlOp: '<=' },
     { ops: OP_KEYS_GT, soqlOp: '>' },
     { ops: OP_KEYS_GTE, soqlOp: '>=' },
-    { ops: OP_KEYS_IN, soqlOp: 'in', isPlural: true },
-    { ops: OP_KEYS_NIN, soqlOp: 'in', isNot: true, isPlural: true },
+    { ops: OP_KEYS_IN, soqlOp: 'in', isPlural: true, isSemiJoin: true },
+    { ops: OP_KEYS_NIN, soqlOp: 'in', isNot: true, isPlural: true, isSemiJoin: true },
     { ops: OP_KEYS_LIKE, soqlOp: 'like' },
-    { ops: OP_KEYS_NLIKE, soqlOp: 'like', isNot: true },
+    { ops: OP_KEYS_NLIKE, soqlOp: 'like', isNot: true }
 ];
 class SfBasicClientSaveError extends Error {
     constructor(errors) {
@@ -177,6 +177,12 @@ function constructSoql(_cfg) {
             .filter(Boolean)
             .join(', ');
     }
+    function _constructSemiJoinStatement(sj) {
+        const { from, select, where } = sj;
+        if (typeof from === 'string' && typeof select === 'string' && from && select) {
+            return `(${_constructFullQuery(from, from, [select], where)})`;
+        }
+    }
     function _constructWhereStatement(objName, where, o) {
         if (typeof where === 'string') {
             return where;
@@ -199,13 +205,21 @@ function constructSoql(_cfg) {
                         if (op !== undefined && value !== undefined) {
                             const opRule = OP_RULES.find(r => r.ops.some(rop => (rop === op)));
                             if (opRule) {
-                                const { soqlOp, isNot, isPlural } = opRule;
-                                if ((isPlural !== null && isPlural !== void 0 ? isPlural : false) === Array.isArray(value)) {
+                                const { soqlOp, isNot, isPlural, isSemiJoin } = opRule;
+                                if (isSemiJoin && isPlainObject(value)) {
+                                    return [
+                                        keyWithPrefix,
+                                        `${isNot ? 'not ' : ''}${soqlOp}`,
+                                        _constructSemiJoinStatement(value)
+                                    ]
+                                        .join(' ');
+                                }
+                                else if ((isPlural !== null && isPlural !== void 0 ? isPlural : false) === Array.isArray(value)) {
                                     return [
                                         isNot ? 'not (' : '',
                                         keyWithPrefix,
                                         soqlOp,
-                                        Array.isArray(value) ? `( ${value.map(v => _escapeVal(objName, propName, v)).join(',')} )` : _escapeVal(objName, propName, value),
+                                        Array.isArray(value) ? `( ${value.map(v => _escapeVal(objName, propName, v)).join(', ')} )` : _escapeVal(objName, propName, value),
                                         isNot ? ')' : '',
                                     ]
                                         .filter(Boolean)

package/package.json

@@ -1,21 +1,21 @@
-{
-  "name": "sfobjects-basic-client",
-  "version": "1.1.9",
-  "description": "Basic Salesforce Client to use together with sfobjects-to-typescript lib",
-  "license": "ISC",
-  "author": "Murad Aliyev",  
-  "main": "dist/index.js",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/muradaliyev/sfobjects-basic-client"
-  },
-  "scripts": {
-    "build": "npm run clean && tsc",    
-    "clean": "rimraf dist"
-  },
-  "devDependencies": {
-    "@types/node": "^25.9.4",   
-    "rimraf": "^6.1.2",
-    "typescript": "^5.9.3"
-  }
-}
+{
+  "name": "sfobjects-basic-client",
+  "version": "1.2.0",
+  "description": "Basic Salesforce Client to use together with sfobjects-to-typescript lib",
+  "license": "ISC",
+  "author": "Murad Aliyev",  
+  "main": "dist/index.js",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/muradaliyev/sfobjects-basic-client"
+  },
+  "scripts": {
+    "build": "npm run clean && tsc",    
+    "clean": "rimraf dist"
+  },
+  "devDependencies": {
+    "@types/node": "^25.9.4",   
+    "rimraf": "^6.1.2",
+    "typescript": "^5.9.3"
+  }
+}

package/src/index.ts

@@ -67,7 +67,7 @@ const SINGULAR_OP_KEYS = [
     ...OP_KEYS_NLIKE
 ] as const;
 
-const PLURAL_OP_KEYS = [
+const PLURAL_OR_SJ_OP_KEYS = [
     ...OP_KEYS_IN,
     ...OP_KEYS_NIN
 ] as const;
@@ -78,15 +78,18 @@ const LOGICAL_OP_KEYS = [
     OP_KEY_NOT
 ] as const;
 
+
 type SfSingularOpKeys = typeof SINGULAR_OP_KEYS[number];
-type SfPluralOpKeys = typeof PLURAL_OP_KEYS[number];
+type SfPluralOpKeys = typeof PLURAL_OR_SJ_OP_KEYS[number];
 type SfLogicalOpKeys = typeof LOGICAL_OP_KEYS[number];
+
 type SfValueOpKeys = SfSingularOpKeys | SfPluralOpKeys;
 
 interface SfOpRule {
     ops: readonly SfValueOpKeys[];
     isNot?: boolean;
     isPlural?: boolean;
+    isSemiJoin?: boolean;
     soqlOp: string;
 }
 
@@ -97,20 +100,23 @@ const OP_RULES: SfOpRule[] = [
     { ops: OP_KEYS_LTE, soqlOp: '<=' },
     { ops: OP_KEYS_GT, soqlOp: '>' },
     { ops: OP_KEYS_GTE, soqlOp: '>=' },
-    { ops: OP_KEYS_IN, soqlOp: 'in', isPlural: true },
-    { ops: OP_KEYS_NIN, soqlOp: 'in', isNot: true, isPlural: true },
+    { ops: OP_KEYS_IN, soqlOp: 'in', isPlural: true, isSemiJoin: true },
+    { ops: OP_KEYS_NIN, soqlOp: 'in', isNot: true, isPlural: true, isSemiJoin: true },
     { ops: OP_KEYS_LIKE, soqlOp: 'like' },
-    { ops: OP_KEYS_NLIKE, soqlOp: 'like', isNot: true },
+    { ops: OP_KEYS_NLIKE, soqlOp: 'like', isNot: true }
 ]
 
 interface SfWhereOp<OP extends SfValueOpKeys, V> { op: OP; value: V; }
 
 type ParentOrPrimitiveProps<OO, O extends OO> = { [K in KeyOf<O>]: NonNullable<O[K]> extends SfPrimitiveType ? K : NonNullable<O[K]> extends OO ? K : never }[KeyOf<O>];
 
-type SfWhere<OO, O extends OO> = {
+type SfWhere<OO, O extends OO, OI = never> = {
     [K in ParentOrPrimitiveProps<OO, O>]+?: (
         NonNullable<O[K]> extends SfPrimitiveType ? (
-            O[K] | O[K][] | { [OPK in SfSingularOpKeys]: SfWhereOp<OPK, O[K]> }[SfSingularOpKeys] | { [OPK in SfPluralOpKeys]: SfWhereOp<OPK, O[K][]> }[SfPluralOpKeys]
+            O[K] |
+            O[K][] |
+            { [OPK in SfSingularOpKeys]: SfWhereOp<OPK, O[K]> }[SfSingularOpKeys] |
+            { [OPK in SfPluralOpKeys]: SfWhereOp<OPK, O[K][] | (OI extends never ? never : SfWhereSemiJoinOps<OI>)> }[SfPluralOpKeys]
         ) : (
             NonNullable<O[K]> extends OO ? SfWhere<OO, NonNullable<O[K]>> : never
         )
@@ -118,6 +124,15 @@ type SfWhere<OO, O extends OO> = {
 } | { [K in SfLogicalOpKeys]+?: SfWhere<OO, O> } | SfWhere<OO, O>[];
 
 
+type SfWhereSemiJoinOpSelect<O> = { [K in KeyOf<O>]: NonNullable<O[K]> extends string ? K : never }[KeyOf<O>]
+
+interface SfWhereSemiJoinOp<OI, N extends KeyOf<OI>> {
+    from: N;
+    select: SfWhereSemiJoinOpSelect<OI[N]>;
+    where?: SfWhere<GetObjectTypes<OI>, OI[N]>;
+}
+
+type SfWhereSemiJoinOps<OI> = { [N in KeyOf<OI>]: SfWhereSemiJoinOp<OI, N> }[KeyOf<OI>];
 
 // order by
 
@@ -164,7 +179,7 @@ type UpdateableProps<O> = {
 
 export type SfRootSelect<OI, N extends KeyOf<OI>> = SfSelect<GetObjectTypes<OI>, OI[N]>;
 
-export type SfRootWhere<OI, N extends KeyOf<OI>> = SfWhere<GetObjectTypes<OI>, OI[N]>;
+export type SfRootWhere<OI, N extends KeyOf<OI>> = SfWhere<GetObjectTypes<OI>, OI[N], OI>;// | SfWhereSemiJoin<OI, OI[N]>;
 
 export type SfRootOrderBy<OI, N extends KeyOf<OI>> = SfOrderBy<GetObjectTypes<OI>, OI[N]>;
 
@@ -274,7 +289,7 @@ export interface SfOrderByAction<OI, N extends KeyOf<OI>, S extends SfRootSelect
 }
 
 export interface SfWhereActions<OI, N extends KeyOf<OI>, S extends SfRootSelect<OI, N>> {
-    where: <W extends SfRootWhere<OI, N>>(where: W) => (SfQueryActions<OI, N, S> & SfOrderByAction<OI, N, S>);
+    where: <W extends SfRootWhere<OI, N>>(where: W) => (SfQueryActions<OI, N, S> & SfOrderByAction<OI, N, S> & SfLimitAction<OI, N, S>);
 }
 
 export interface SfQueryAditionalActions<OI, N extends KeyOf<OI>, S extends SfRootSelect<OI, N>> {
@@ -357,9 +372,9 @@ export function constructSoql<OI>(_cfg: SfObjCfgIndex<OI>) {
         }
 
         throw `Unupported value type for where statement`;
-
     }
 
+
     function _constructFullQuery(
         objName: string,
         from: string,
@@ -448,6 +463,16 @@ export function constructSoql<OI>(_cfg: SfObjCfgIndex<OI>) {
             .join(', ');
     }
 
+    function _constructSemiJoinStatement(sj: Record<string, any>) {
+
+        const { from, select, where } = sj;
+
+        if (typeof from === 'string' && typeof select === 'string' && from && select) {
+            return `(${_constructFullQuery(from, from, [select], where)})`;
+        }
+    }
+
+
     function _constructWhereStatement(
         objName: string,
         where: string | Record<string, any>,
@@ -490,15 +515,24 @@ export function constructSoql<OI>(_cfg: SfObjCfgIndex<OI>) {
 
                                 if (opRule) {
 
-                                    const { soqlOp, isNot, isPlural } = opRule;
+                                    const { soqlOp, isNot, isPlural, isSemiJoin } = opRule;
+
+                                    if (isSemiJoin && isPlainObject(value)) {
+                                        return [
+                                            keyWithPrefix,
+                                            `${isNot ? 'not ' : ''}${soqlOp}`,
+                                            _constructSemiJoinStatement(value)
+                                        ]
+                                            .join(' ');
+                                    }
 
-                                    if ((isPlural ?? false) === Array.isArray(value)) {
+                                    else if ((isPlural ?? false) === Array.isArray(value)) {
 
                                         return [
                                             isNot ? 'not (' : '',
                                             keyWithPrefix,
                                             soqlOp,
-                                            Array.isArray(value) ? `( ${value.map(v => _escapeVal(objName, propName, v)).join(',')} )` : _escapeVal(objName, propName, value),
+                                            Array.isArray(value) ? `( ${value.map(v => _escapeVal(objName, propName, v)).join(', ')} )` : _escapeVal(objName, propName, value),
                                             isNot ? ')' : '',
                                         ]
                                             .filter(Boolean)