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

package/src/AbstractSQLOptimiser.ts

@@ -1,3 +1,6 @@
+import _ from 'lodash';
+
+import type { Dictionary } from 'lodash';
 import type {
 	AbstractSqlQuery,
 	AbstractSqlType,
@@ -123,8 +126,6 @@ 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) => {
@@ -419,7 +420,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) {
@@ -706,20 +707,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'),
@@ -902,7 +903,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 [
@@ -955,7 +956,7 @@ const typeRules = {
 			checkMinArgs('And', args, 2);
 			// Collapse nested ANDs.
 			let maybeHelped = false;
-			const conditions = args.flatMap((arg) => {
+			const conditions = _.flatMap(args, (arg) => {
 				if (!isAbstractSqlQuery(arg)) {
 					throw new SyntaxError(
 						`Expected AbstractSqlQuery array but got ${typeof arg}`,
@@ -1058,7 +1059,7 @@ const typeRules = {
 					return [
 						'NotIn',
 						fieldBucket[0][1],
-						...fieldBucket.flatMap((field) => field.slice(2)),
+						..._.flatMap(fieldBucket, (field) => field.slice(2)),
 					];
 				}
 			});
@@ -1090,7 +1091,7 @@ const typeRules = {
 			checkMinArgs('Or', args, 2);
 			// Collapse nested ORs.
 			let maybeHelped = false;
-			const conditions = args.flatMap((arg) => {
+			const conditions = _.flatMap(args, (arg) => {
 				if (!isAbstractSqlQuery(arg)) {
 					throw new SyntaxError(
 						`Expected AbstractSqlQuery array but got ${typeof arg}`,
@@ -1193,7 +1194,7 @@ const typeRules = {
 					return [
 						'In',
 						fieldBucket[0][1],
-						...fieldBucket.flatMap((field) => field.slice(2)),
+						..._.flatMap(fieldBucket, (field) => field.slice(2)),
 					];
 				}
 			});
@@ -1231,21 +1232,24 @@ const typeRules = {
 	),
 	Text,
 	Value: Text,
-	Date: matchArgs('Date', identity),
+	Date: matchArgs('Date', _.identity),
 	Duration: (args): DurationNode => {
 		checkArgs('Duration', args, 1);
 
-		const duration = args[0] as DurationNode[1];
+		let duration = args[0] as DurationNode[1];
 		if (duration == null || typeof duration !== 'object') {
 			throw new SyntaxError(
 				`Duration must be an object, got ${typeof duration}`,
 			);
 		}
-		const { negative, day, hour, minute, second } = duration;
-		if (day == null && hour == null && minute == null && second == null) {
+		duration = _(duration)
+			.pick('negative', 'day', 'hour', 'minute', 'second')
+			.omitBy(_.isNil)
+			.value();
+		if (_(duration).omit('negative').isEmpty()) {
 			throw new SyntaxError('Invalid duration');
 		}
-		return ['Duration', { negative, day, hour, minute, second }];
+		return ['Duration', duration];
 	},
 	Exists: tryMatches<ExistsNode | BooleanNode>(
 		Helper<OptimisationMatchFn<BooleanNode>>((args) => {
@@ -1598,7 +1602,7 @@ const typeRules = {
 			],
 		),
 	),
-} satisfies Record<string, MatchFn<AnyTypeNodes>>;
+} satisfies Dictionary<MatchFn<AnyTypeNodes>>;
 
 export const AbstractSQLOptimiser = (
 	abstractSQL: AbstractSqlQuery,

package/src/AbstractSQLRules2SQL.ts

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

package/src/AbstractSQLSchemaOptimiser.ts

@@ -7,6 +7,7 @@ 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,
@@ -79,8 +80,7 @@ export const optimizeSchema = (
 				count === 1 &&
 				(ruleBody[0] === 'NotExists' ||
 					(ruleBody[0] === 'Equals' &&
-						ruleBody[2][0] === 'Number' &&
-						ruleBody[2][1] === 0)) &&
+						_.isEqual(ruleBody[2], ['Number', 0]))) &&
 				isSelectQueryNode(ruleBody[1])
 			) {
 				const selectQueryNodes = ruleBody[1].slice(1);
@@ -120,7 +120,8 @@ export const optimizeSchema = (
 						convertReferencedFieldsToFields(whereNode);
 
 						const tableName = fromNode[1];
-						const table = Object.values(abstractSqlModel.tables).find(
+						const table = _.find(
+							abstractSqlModel.tables,
 							(t) => t.name === tableName,
 						);
 						if (table) {

package/src/referenced-fields.ts

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