@balena/abstract-sql-compiler 10.2.7 → 10.2.8-build-lodash-08b051cf4150dfa99f3cfafeb3011244760e9d38-1

package/src/AbstractSQLOptimiser.ts

@@ -1,6 +1,3 @@
-import _ from 'lodash';
-
-import type { Dictionary } from 'lodash';
 import type {
 	AbstractSqlQuery,
 	AbstractSqlType,
@@ -107,6 +104,7 @@ import type {
 	StartsWithNode,
 	EscapeForLikeNode,
 	EqualsAnyNode,
+	NotInNode,
 } from './AbstractSQLCompiler';
 import { isFieldTypeNode } from './AbstractSQLCompiler';
 import * as AbstractSQLRules2SQL from './AbstractSQLRules2SQL';
@@ -125,6 +123,8 @@ type OptimisationMatchFn<T extends AnyTypeNodes> =
 type MetaMatchFn<T extends AnyTypeNodes> = (args: AbstractSqlQuery) => T;
 type MatchFn<T extends AnyTypeNodes> = (args: AbstractSqlType[]) => T;
 
+const identity = <T>(x: T): T => x;
+
 let helped = false;
 let noBinds = false;
 const Helper = <F extends (...args: any[]) => any>(fn: F) => {
@@ -328,9 +328,8 @@ const AnyNotNullValue = (args: any): boolean => {
 	return args != null && args !== 'Null' && args[0] !== 'Null';
 };
 
-const FieldOp =
-	(type: string): OptimisationMatchFn<AnyTypeNodes> =>
-	(args) => {
+const FieldOp = <T extends string>(type: T) =>
+	((args) => {
 		if (
 			AnyNotNullValue(args[0]) === false ||
 			AnyNotNullValue(args[1]) === false
@@ -344,7 +343,7 @@ const FieldOp =
 		} else {
 			return false;
 		}
-	};
+	}) satisfies OptimisationMatchFn<AnyTypeNodes>;
 const FieldEquals = FieldOp('Equals');
 const FieldNotEquals = FieldOp('NotEquals');
 
@@ -420,7 +419,7 @@ const ConcatenateWithSeparator: MatchFn<ConcatenateWithSeparatorNode> = (
 	];
 };
 
-const Text = matchArgs<TextNode>('Text', _.identity);
+const Text = matchArgs<TextNode>('Text', identity);
 
 const Value = (arg: string | AbstractSqlQuery): ValuesNodeTypes => {
 	switch (arg) {
@@ -707,20 +706,20 @@ const typeRules = {
 	},
 	Average: matchArgs('Average', NumericValue),
 	Sum: matchArgs('Sum', NumericValue),
-	Field: matchArgs<FieldNode>('Field', _.identity),
+	Field: matchArgs<FieldNode>('Field', identity),
 	ReferencedField: matchArgs<ReferencedFieldNode>(
 		'ReferencedField',
-		_.identity,
-		_.identity,
+		identity,
+		identity,
 	),
-	Cast: matchArgs<CastNode>('Cast', AnyValue, _.identity),
+	Cast: matchArgs<CastNode>('Cast', AnyValue, identity),
 	// eslint-disable-next-line id-denylist
 	Number: NumberMatch('Number'),
 	Real: NumberMatch('Real'),
 	Integer: NumberMatch('Integer'),
 	// eslint-disable-next-line id-denylist
-	Boolean: matchArgs<BooleanNode>('Boolean', _.identity),
-	EmbeddedText: matchArgs('EmbeddedText', _.identity),
+	Boolean: matchArgs<BooleanNode>('Boolean', identity),
+	EmbeddedText: matchArgs('EmbeddedText', identity),
 	Null: matchArgs<NullNode>('Null'),
 	CurrentTimestamp: matchArgs<CurrentTimestampNode>('CurrentTimestamp'),
 	CurrentDate: matchArgs<CurrentDateNode>('CurrentDate'),
@@ -903,7 +902,7 @@ const typeRules = {
 		return ['TextArray', ...args.map(TextValue)];
 	},
 	ToJSON: matchArgs<ToJSONNode>('ToJSON', AnyValue),
-	Any: matchArgs<AnyNode>('Any', AnyValue, _.identity),
+	Any: matchArgs<AnyNode>('Any', AnyValue, identity),
 	Coalesce: (args): CoalesceNode => {
 		checkMinArgs('Coalesce', args, 2);
 		return [
@@ -956,7 +955,7 @@ const typeRules = {
 			checkMinArgs('And', args, 2);
 			// Collapse nested ANDs.
 			let maybeHelped = false;
-			const conditions = _.flatMap(args, (arg) => {
+			const conditions = args.flatMap((arg) => {
 				if (!isAbstractSqlQuery(arg)) {
 					throw new SyntaxError(
 						`Expected AbstractSqlQuery array but got ${typeof arg}`,
@@ -1002,7 +1001,17 @@ const typeRules = {
 		Helper<OptimisationMatchFn<AndNode>>((args) => {
 			checkMinArgs('And', args, 2);
 			// Optimise id != 1 AND id != 2 AND id != 3 -> id NOT IN [1, 2, 3]
-			const fieldBuckets: Dictionary<AnyTypeNodes[]> = {};
+			const fieldBuckets: Record<
+				string,
+				Array<
+					[
+						'NotEquals' | 'NotIn',
+						FieldNode | ReferencedFieldNode,
+						AbstractSqlType,
+						...AbstractSqlType[],
+					]
+				>
+			> = {};
 			const others: AnyTypeNodes[] = [];
 			let maybeHelped = false;
 			args.map((arg) => {
@@ -1014,7 +1023,7 @@ const typeRules = {
 				if (arg[0] === 'NotEquals') {
 					const fieldBool = FieldNotEquals(arg.slice(1));
 					if (fieldBool !== false) {
-						const fieldRef = fieldBool[1] as string;
+						const fieldRef = `${fieldBool[1]}`;
 						if (fieldBuckets[fieldRef] == null) {
 							fieldBuckets[fieldRef] = [fieldBool];
 						} else {
@@ -1025,13 +1034,13 @@ const typeRules = {
 						return;
 					}
 				} else if (arg[0] === 'NotIn') {
-					const fieldRef = arg[1] as string;
+					const fieldRef = `${arg[1]}`;
 					if (fieldBuckets[fieldRef] == null) {
-						fieldBuckets[fieldRef] = [arg];
+						fieldBuckets[fieldRef] = [arg as NotInNode];
 					} else {
 						// We're adding a second match, so that means we can optimise
 						maybeHelped = true;
-						fieldBuckets[fieldRef].push(arg);
+						fieldBuckets[fieldRef].push(arg as NotInNode);
 					}
 					return;
 				}
@@ -1049,7 +1058,7 @@ const typeRules = {
 					return [
 						'NotIn',
 						fieldBucket[0][1],
-						..._.flatMap(fieldBucket, (field) => field.slice(2)),
+						...fieldBucket.flatMap((field) => field.slice(2)),
 					];
 				}
 			});
@@ -1081,7 +1090,7 @@ const typeRules = {
 			checkMinArgs('Or', args, 2);
 			// Collapse nested ORs.
 			let maybeHelped = false;
-			const conditions = _.flatMap(args, (arg) => {
+			const conditions = args.flatMap((arg) => {
 				if (!isAbstractSqlQuery(arg)) {
 					throw new SyntaxError(
 						`Expected AbstractSqlQuery array but got ${typeof arg}`,
@@ -1127,7 +1136,17 @@ const typeRules = {
 		Helper<OptimisationMatchFn<InNode | OrNode>>((args) => {
 			checkMinArgs('Or', args, 2);
 			// Optimise id = 1 OR id = 2 OR id = 3 -> id IN [1, 2, 3]
-			const fieldBuckets: Dictionary<AnyTypeNodes[]> = {};
+			const fieldBuckets: Record<
+				string,
+				Array<
+					[
+						'Equals' | 'In',
+						FieldNode | ReferencedFieldNode,
+						AbstractSqlType,
+						...AbstractSqlType[],
+					]
+				>
+			> = {};
 			const others: AnyTypeNodes[] = [];
 			let maybeHelped = false;
 			args.map((arg) => {
@@ -1139,7 +1158,7 @@ const typeRules = {
 				if (arg[0] === 'Equals') {
 					const fieldBool = FieldEquals(arg.slice(1));
 					if (fieldBool !== false) {
-						const fieldRef = fieldBool[1] as string;
+						const fieldRef = `${fieldBool[1]}`;
 						if (fieldBuckets[fieldRef] == null) {
 							fieldBuckets[fieldRef] = [fieldBool];
 						} else {
@@ -1150,13 +1169,13 @@ const typeRules = {
 						return;
 					}
 				} else if (arg[0] === 'In') {
-					const fieldRef = arg[1] as string;
+					const fieldRef = `${arg[1]}`;
 					if (fieldBuckets[fieldRef] == null) {
-						fieldBuckets[fieldRef] = [arg];
+						fieldBuckets[fieldRef] = [arg as InNode];
 					} else {
 						// We're adding a second match, so that means we can optimise
 						maybeHelped = true;
-						fieldBuckets[fieldRef].push(arg);
+						fieldBuckets[fieldRef].push(arg as InNode);
 					}
 					return;
 				}
@@ -1174,7 +1193,7 @@ const typeRules = {
 					return [
 						'In',
 						fieldBucket[0][1],
-						..._.flatMap(fieldBucket, (field) => field.slice(2)),
+						...fieldBucket.flatMap((field) => field.slice(2)),
 					];
 				}
 			});
@@ -1212,24 +1231,21 @@ const typeRules = {
 	),
 	Text,
 	Value: Text,
-	Date: matchArgs('Date', _.identity),
+	Date: matchArgs('Date', identity),
 	Duration: (args): DurationNode => {
 		checkArgs('Duration', args, 1);
 
-		let duration = args[0] as DurationNode[1];
+		const duration = args[0] as DurationNode[1];
 		if (duration == null || typeof duration !== 'object') {
 			throw new SyntaxError(
 				`Duration must be an object, got ${typeof duration}`,
 			);
 		}
-		duration = _(duration)
-			.pick('negative', 'day', 'hour', 'minute', 'second')
-			.omitBy(_.isNil)
-			.value();
-		if (_(duration).omit('negative').isEmpty()) {
+		const { negative, day, hour, minute, second } = duration;
+		if (day == null && hour == null && minute == null && second == null) {
 			throw new SyntaxError('Invalid duration');
 		}
-		return ['Duration', duration];
+		return ['Duration', { negative, day, hour, minute, second }];
 	},
 	Exists: tryMatches<ExistsNode | BooleanNode>(
 		Helper<OptimisationMatchFn<BooleanNode>>((args) => {
@@ -1582,7 +1598,7 @@ const typeRules = {
 			],
 		),
 	),
-} satisfies Dictionary<MatchFn<AnyTypeNodes>>;
+} satisfies Record<string, MatchFn<AnyTypeNodes>>;
 
 export const AbstractSQLOptimiser = (
 	abstractSQL: AbstractSqlQuery,

package/src/AbstractSQLRules2SQL.ts

@@ -1,8 +1,4 @@
-import _ from 'lodash';
-
 import sbvrTypes from '@balena/sbvr-types';
-
-import type { Dictionary } from 'lodash';
 import type {
 	AbstractSqlQuery,
 	AbstractSqlType,
@@ -36,7 +32,7 @@ type MetaMatchFn = (args: AbstractSqlQuery, indent: string) => string;
 type MatchFn = (args: AbstractSqlType[], indent: string) => string;
 
 let fieldOrderings: Binding[] = [];
-let fieldOrderingsLookup: Dictionary<number> = {};
+let fieldOrderingsLookup: Record<string, number> = {};
 let engine: Engines = Engines.postgres;
 let noBinds = false;
 
@@ -702,7 +698,7 @@ const AddBind = (bind: Binding): string => {
 	}
 };
 
-const typeRules: Dictionary<MatchFn> = {
+const typeRules: Record<string, MatchFn> = {
 	UnionQuery: (args, indent) => {
 		checkMinArgs('UnionQuery', args, 2);
 		return args
@@ -1340,31 +1336,28 @@ const typeRules: Dictionary<MatchFn> = {
 			throw new SyntaxError('Durations not supported on: ' + engine);
 		}
 		// TODO: The abstract sql type should accommodate this
-		let duration = args[0] as DurationNode[1];
+		const duration = args[0] as DurationNode[1];
 		if (duration == null || typeof duration !== 'object') {
 			throw new SyntaxError(
 				`Duration must be an object, got ${typeof duration}`,
 			);
 		}
-		duration = _(duration)
-			.pick('negative', 'day', 'hour', 'minute', 'second')
-			.omitBy(_.isNil)
-			.value() as Dictionary<string>;
-		if (_(duration).omit('negative').isEmpty()) {
+		const { negative, day, hour, minute, second } = duration;
+		if (day == null && hour == null && minute == null && second == null) {
 			throw new SyntaxError('Invalid duration');
 		}
 		return (
 			"INTERVAL '" +
-			(duration.negative ? '-' : '') +
-			(duration.day ?? '0') +
+			(negative ? '-' : '') +
+			(day ?? '0') +
 			' ' +
-			(duration.negative ? '-' : '') +
-			(duration.hour ?? '0') +
+			(negative ? '-' : '') +
+			(hour ?? '0') +
 			':' +
-			(duration.minute ?? '0') +
+			(minute ?? '0') +
 			':' +
 			// Force seconds to be at least 0.0 - required for mysql
-			Number(duration.second ?? 0).toLocaleString('en', {
+			Number(second ?? 0).toLocaleString('en', {
 				minimumFractionDigits: 1,
 			}) +
 			"'" +

package/src/AbstractSQLSchemaOptimiser.ts

@@ -7,7 +7,6 @@ export const enum Engines {
 import { AbstractSQLOptimiser } from './AbstractSQLOptimiser';
 export { Binding, SqlResult } from './AbstractSQLRules2SQL';
 import sbvrTypes from '@balena/sbvr-types';
-import _ from 'lodash';
 import type {
 	AbstractSqlModel,
 	AbstractSqlQuery,
@@ -80,7 +79,8 @@ export const optimizeSchema = (
 				count === 1 &&
 				(ruleBody[0] === 'NotExists' ||
 					(ruleBody[0] === 'Equals' &&
-						_.isEqual(ruleBody[2], ['Number', 0]))) &&
+						ruleBody[2][0] === 'Number' &&
+						ruleBody[2][1] === 0)) &&
 				isSelectQueryNode(ruleBody[1])
 			) {
 				const selectQueryNodes = ruleBody[1].slice(1);
@@ -120,8 +120,7 @@ export const optimizeSchema = (
 						convertReferencedFieldsToFields(whereNode);
 
 						const tableName = fromNode[1];
-						const table = _.find(
-							abstractSqlModel.tables,
+						const table = Object.values(abstractSqlModel.tables).find(
 							(t) => t.name === tableName,
 						);
 						if (table) {

package/src/referenced-fields.ts

@@ -1,4 +1,3 @@
-import _ from 'lodash';
 import type {
 	AbstractSqlQuery,
 	AbstractSqlType,
@@ -76,7 +75,11 @@ export const getReferencedFields: EngineInstance['getReferencedFields'] = (
 ) => {
 	const referencedFields = getRuleReferencedFields(ruleBody);
 
-	return _.mapValues(referencedFields, ({ update }) => _.uniq(update));
+	const result: { [key: string]: string[] } = {};
+	for (const key of Object.keys(referencedFields)) {
+		result[key] = [...new Set(referencedFields[key].update)];
+	}
+	return result;
 };
 
 export interface RuleReferencedFields {
@@ -267,7 +270,8 @@ export const getRuleReferencedFields: EngineInstance['getRuleReferencedFields']
 		const referencedFields: RuleReferencedFields = {};
 		if (
 			ruleBody[0] === 'Equals' &&
-			_.isEqual(ruleBody[2], ['Number', 0]) &&
+			ruleBody[2][0] === 'Number' &&
+			ruleBody[2][1] === 0 &&
 			isSelectQueryNode(ruleBody[1])
 		) {
 			const select = ruleBody[1].find(isSelectNode)!;
@@ -281,7 +285,7 @@ export const getRuleReferencedFields: EngineInstance['getRuleReferencedFields']
 			for (const method of Object.keys(tableRefs) as Array<
 				keyof typeof tableRefs
 			>) {
-				tableRefs[method] = _.uniq(tableRefs[method]);
+				tableRefs[method] = [...new Set(tableRefs[method])];
 			}
 		}
 
@@ -321,10 +325,9 @@ const checkQuery = (query: AbstractSqlQuery): ModifiedFields | undefined => {
 		return { table: tableName, action: 'delete' };
 	}
 
-	const fields = _<FieldsNode | AbstractSqlType>(query)
+	const fields = query
 		.filter((v): v is FieldsNode => v != null && v[0] === 'Fields')
-		.flatMap((v) => v[1])
-		.value();
+		.flatMap((v) => v[1]);
 	return { table: tableName, action: 'update', fields };
 };
 export const getModifiedFields: EngineInstance['getModifiedFields'] = (