@balena/sbvr-types 7.1.2 → 7.1.3

package/.versionbot/CHANGELOG.yml

@@ -1,3 +1,14 @@
+- commits:
+    - subject: Add typings for all abstract sql fragments, fixing where necessary
+      hash: b84c335877236e3d389df064b3e7b2acd1a656ae
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+  version: 7.1.3
+  title: ""
+  date: 2024-06-12T12:44:16.479Z
 - commits:
     - subject: Explicitly type the `compare` function for `hashed`
       hash: 6ece56f531ba9507fb090003bd3216e90b2f583b
@@ -10,7 +21,7 @@
       author: Pagan Gazzard
   version: 7.1.2
   title: ""
-  date: 2024-06-12T12:14:00.325Z
+  date: 2024-06-12T12:19:17.354Z
 - commits:
     - subject: Accept `Date` for the write types of `Date Time`/`Date`/`Time`
       hash: eb03c8fb593fad76c74dad57a3d45625daf44d76

package/CHANGELOG.md

@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+# v7.1.3
+## (2024-06-12)
+
+* Add typings for all abstract sql fragments, fixing where necessary [Pagan Gazzard]
+
 # v7.1.2
 ## (2024-06-12)
 

package/out/type-utils.d.ts

@@ -1,3 +1,7 @@
+import type { AnyTypeNodes, EqualsNode, LessThanNode, LessThanOrEqualNode, ReferencedFieldNode } from '@balena/abstract-sql-compiler';
+export type NativeNames = Record<string, AnyTypeNodes>;
+export type NativeProperties = Record<string, Record<string, (from: ReferencedFieldNode) => AnyTypeNodes>>;
+export type NativeFactTypes = Record<string, Record<string, (from: ReferencedFieldNode, to: ReferencedFieldNode) => AnyTypeNodes>>;
 export interface DatabaseTypeFn {
     (necessity: string, index: string): string;
     castType: string;
@@ -28,12 +32,12 @@ export interface Validate<Write, DbWrite> {
 }
 export declare const nativeFactTypeTemplates: {
     equality: {
-        'is equal to': (from: string, to: string) => string[];
+        'is equal to': (from: ReferencedFieldNode, to: ReferencedFieldNode) => EqualsNode;
     };
     comparison: {
-        'is equal to': (from: string, to: string) => string[];
-        'is less than': (from: string, to: string) => string[];
-        'is less than or equal to': (from: string, to: string) => string[];
+        'is equal to': (from: ReferencedFieldNode, to: ReferencedFieldNode) => EqualsNode;
+        'is less than': (from: ReferencedFieldNode, to: ReferencedFieldNode) => LessThanNode;
+        'is less than or equal to': (from: ReferencedFieldNode, to: ReferencedFieldNode) => LessThanOrEqualNode;
     };
 };
 export declare const validate: {

package/out/type-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"type-utils.js","sourceRoot":"","sources":["../src/type-utils.ts"],"names":[],"mappings":";;;AA8BA,MAAM,aAAa,GAAG,CAAI,UAA0C,EAAE,EAAE;IAIvE,KAAK,UAAU,QAAQ,CACtB,KAAc,EACd,QAAiB;QAEjB,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YACnB,IAAI,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;YACnC,CAAC;YACD,OAAO,IAAI,CAAC;QACb,CAAC;QACD,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;IACD,OAAO,QAAQ,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG;IAChB,aAAa,EAAE,CAAC,IAAY,EAAE,EAAU,EAAE,EAAE,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC;CACjE,CAAC;AACW,QAAA,uBAAuB,GAAG;IACtC,QAAQ;IACR,UAAU,EAAE;QACX,cAAc,EAAE,CAAC,IAAY,EAAE,EAAU,EAAE,EAAE,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC;QACpE,0BAA0B,EAAE,CAAC,IAAY,EAAE,EAAU,EAAE,EAAE,CAAC;YACzD,iBAAiB;YACjB,IAAI;YACJ,EAAE;SACF;QACD,GAAG,QAAQ;KACX;CACD,CAAC;AAEW,QAAA,QAAQ,GAAG;IACvB,aAAa;IACb,OAAO,EAAE,aAAa,CAAC,CAAC,KAAK,EAAE,EAAE;QAChC,MAAM,cAAc,GAAG,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC3C,IAAI,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,KAAK,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,cAAc,CAAC;IACvB,CAAC,CAAC;IACF,IAAI,EAAE,CAAC,MAAe,EAAE,EAAE,CACzB,aAAa,CAAC,CAAC,KAAK,EAAE,EAAE;QACvB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,KAAK,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,MAAM,IAAI,IAAI,IAAI,KAAK,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC;YAC7C,MAAM,IAAI,KAAK,CACd,cAAc,GAAG,MAAM,GAAG,eAAe,GAAG,KAAK,CAAC,MAAM,GAAG,GAAG,CAC9D,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC,CAAC;IACH,IAAI,EAAE,aAAa,CAAC,CAAC,KAAK,EAAE,EAAE;QAC7B,IAAI,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QACnC,IAAI,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;YAClC,cAAc,GAAG,KAAK,CAAC;QACxB,CAAC;QACD,MAAM,aAAa,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC,CAAC;QAC/C,IAAI,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,uBAAuB,GAAG,KAAK,CAAC,CAAC;QAClD,CAAC;QACD,OAAO,aAAa,CAAC;IACtB,CAAC,CAAC;CACF,CAAC"}
+{"version":3,"file":"type-utils.js","sourceRoot":"","sources":["../src/type-utils.ts"],"names":[],"mappings":";;;AAmDA,MAAM,aAAa,GAAG,CAAI,UAA0C,EAAE,EAAE;IAIvE,KAAK,UAAU,QAAQ,CACtB,KAAc,EACd,QAAiB;QAEjB,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YACnB,IAAI,QAAQ,EAAE,CAAC;gBACd,MAAM,IAAI,KAAK,CAAC,gBAAgB,CAAC,CAAC;YACnC,CAAC;YACD,OAAO,IAAI,CAAC;QACb,CAAC;QACD,OAAO,UAAU,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;IACD,OAAO,QAAQ,CAAC;AACjB,CAAC,CAAC;AAEF,MAAM,QAAQ,GAAG;IAChB,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE,EAAc,EAAE,CAAC,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE,CAAC;CAC3B,CAAC;AACvB,QAAA,uBAAuB,GAAG;IACtC,QAAQ;IACR,UAAU,EAAE;QACX,cAAc,EAAE,CAAC,IAAI,EAAE,EAAE,EAAgB,EAAE,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC;QAClE,0BAA0B,EAAE,CAAC,IAAI,EAAE,EAAE,EAAuB,EAAE,CAAC;YAC9D,iBAAiB;YACjB,IAAI;YACJ,EAAE;SACF;QACD,GAAG,QAAQ;KACX;CACiD,CAAC;AAEvC,QAAA,QAAQ,GAAG;IACvB,aAAa;IACb,OAAO,EAAE,aAAa,CAAC,CAAC,KAAK,EAAE,EAAE;QAChC,MAAM,cAAc,GAAG,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;QAC3C,IAAI,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,KAAK,CAAC,CAAC;QAC9C,CAAC;QACD,OAAO,cAAc,CAAC;IACvB,CAAC,CAAC;IACF,IAAI,EAAE,CAAC,MAAe,EAAE,EAAE,CACzB,aAAa,CAAC,CAAC,KAAK,EAAE,EAAE;QACvB,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC/B,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,KAAK,CAAC,CAAC;QAC9C,CAAC;QACD,IAAI,MAAM,IAAI,IAAI,IAAI,KAAK,CAAC,MAAM,GAAG,MAAM,EAAE,CAAC;YAC7C,MAAM,IAAI,KAAK,CACd,cAAc,GAAG,MAAM,GAAG,eAAe,GAAG,KAAK,CAAC,MAAM,GAAG,GAAG,CAC9D,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACd,CAAC,CAAC;IACH,IAAI,EAAE,aAAa,CAAC,CAAC,KAAK,EAAE,EAAE;QAC7B,IAAI,cAAc,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;QACnC,IAAI,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;YAClC,cAAc,GAAG,KAAK,CAAC;QACxB,CAAC;QACD,MAAM,aAAa,GAAG,IAAI,IAAI,CAAC,cAAc,CAAC,CAAC;QAC/C,IAAI,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC;YAC3C,MAAM,IAAI,KAAK,CAAC,uBAAuB,GAAG,KAAK,CAAC,CAAC;QAClD,CAAC;QACD,OAAO,aAAa,CAAC;IACtB,CAAC,CAAC;CACF,CAAC"}

package/out/types/big-integer.d.ts

@@ -9,17 +9,6 @@ export declare const types: {
 };
 export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
-export declare const nativeFactTypes: {
-    Integer: {
-        'is equal to': (from: string, to: string) => string[];
-        'is less than': (from: string, to: string) => string[];
-        'is less than or equal to': (from: string, to: string) => string[];
-    };
-    Real: {
-        'is equal to': (from: string, to: string) => string[];
-        'is less than': (from: string, to: string) => string[];
-        'is less than or equal to': (from: string, to: string) => string[];
-    };
-};
+export declare const nativeFactTypes: TypeUtils.NativeFactTypes;
 export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

package/out/types/big-integer.js.map

@@ -1 +1 @@
-{"version":3,"file":"big-integer.js","sourceRoot":"","sources":["../../src/types/big-integer.ts"],"names":[],"mappings":";;;AAAA,2CAA2C;AAE9B,QAAA,KAAK,GAAG;IACpB,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE,QAAQ;IACf,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE;QACN,IAAI,EAAE,WAAW;KACjB;CACD,CAAC;AAKW,QAAA,eAAe,GAAG;IAC9B,OAAO,EAAE,SAAS,CAAC,uBAAuB,CAAC,UAAU;IACrD,IAAI,EAAE,SAAS,CAAC,uBAAuB,CAAC,UAAU;CAClD,CAAC;AAEW,QAAA,QAAQ,GACpB,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC"}
+{"version":3,"file":"big-integer.js","sourceRoot":"","sources":["../../src/types/big-integer.ts"],"names":[],"mappings":";;;AAAA,2CAA2C;AAE9B,QAAA,KAAK,GAAG;IACpB,QAAQ,EAAE,QAAQ;IAClB,KAAK,EAAE,QAAQ;IACf,MAAM,EAAE,QAAQ;IAChB,KAAK,EAAE;QACN,IAAI,EAAE,WAAW;KACjB;CACD,CAAC;AAKW,QAAA,eAAe,GAA8B;IACzD,OAAO,EAAE,SAAS,CAAC,uBAAuB,CAAC,UAAU;IACrD,IAAI,EAAE,SAAS,CAAC,uBAAuB,CAAC,UAAU;CAClD,CAAC;AAEW,QAAA,QAAQ,GACpB,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC"}

package/out/types/color.d.ts

@@ -16,14 +16,7 @@ type ColorObj = {
 };
 export type Types = TypeUtils.TsTypes<ColorObj, number | ColorObj>;
 type DbWriteType = number;
-export declare const nativeProperties: {
-    has: {
-        'Red Component': (from: string) => (string | number | (string | number)[])[];
-        'Green Component': (from: string) => (string | number | (string | number)[])[];
-        'Blue Component': (from: string) => (string | number)[];
-        'Alpha Component': (from: string) => (string | number | (string | number)[])[];
-    };
-};
+export declare const nativeProperties: TypeUtils.NativeProperties;
 export declare const fetchProcessing: TypeUtils.FetchProcessing<Types['Read']>;
 export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

package/out/types/color.js

@@ -21,19 +21,23 @@ exports.nativeProperties = {
     has: {
         'Red Component': (from) => [
             'BitwiseAnd',
-            ['BitwiseShiftRight', from, 16],
-            255,
+            ['BitwiseShiftRight', from, ['Number', 16]],
+            ['Number', 255],
         ],
         'Green Component': (from) => [
             'BitwiseAnd',
-            ['BitwiseShiftRight', from, 8],
-            255,
+            ['BitwiseShiftRight', from, ['Number', 8]],
+            ['Number', 255],
+        ],
+        'Blue Component': (from) => [
+            'BitwiseShiftRight',
+            from,
+            ['Number', 255],
         ],
-        'Blue Component': (from) => ['BitwiseShiftRight', from, 255],
         'Alpha Component': (from) => [
             'BitwiseAnd',
-            ['BitwiseShiftRight', from, 24],
-            255,
+            ['BitwiseShiftRight', from, ['Number', 24]],
+            ['Number', 255],
         ],
     },
 };

package/out/types/color.js.map

@@ -1 +1 @@
-{"version":3,"file":"color.js","sourceRoot":"","sources":["../../src/types/color.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"color.js","sourceRoot":"","sources":["../../src/types/color.ts"],"names":[],"mappings":"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"}

package/out/types/concept-type.d.ts

@@ -9,17 +9,6 @@ export declare const types: {
 };
 export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
-export declare const nativeFactTypes: {
-    Integer: {
-        'is equal to': (from: string, to: string) => string[];
-        'is less than': (from: string, to: string) => string[];
-        'is less than or equal to': (from: string, to: string) => string[];
-    };
-    Real: {
-        'is equal to': (from: string, to: string) => string[];
-        'is less than': (from: string, to: string) => string[];
-        'is less than or equal to': (from: string, to: string) => string[];
-    };
-};
+export declare const nativeFactTypes: TypeUtils.NativeFactTypes;
 export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

package/out/types/concept-type.js.map

@@ -1 +1 @@
-{"version":3,"file":"concept-type.js","sourceRoot":"","sources":["../../src/types/concept-type.ts"],"names":[],"mappings":";;;AAAA,2CAA2C;AAE9B,QAAA,KAAK,GAAG;IACpB,QAAQ,EAAE,SAAS;IACnB,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE,SAAS;IACjB,KAAK,EAAE;QACN,IAAI,EAAE,WAAW;KACjB;CACD,CAAC;AAKW,QAAA,eAAe,GAAG;IAC9B,OAAO,EAAE,SAAS,CAAC,uBAAuB,CAAC,UAAU;IACrD,IAAI,EAAE,SAAS,CAAC,uBAAuB,CAAC,UAAU;CAClD,CAAC;AAEW,QAAA,QAAQ,GACpB,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC"}
+{"version":3,"file":"concept-type.js","sourceRoot":"","sources":["../../src/types/concept-type.ts"],"names":[],"mappings":";;;AAAA,2CAA2C;AAE9B,QAAA,KAAK,GAAG;IACpB,QAAQ,EAAE,SAAS;IACnB,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE,SAAS;IACjB,KAAK,EAAE;QACN,IAAI,EAAE,WAAW;KACjB;CACD,CAAC;AAKW,QAAA,eAAe,GAA8B;IACzD,OAAO,EAAE,SAAS,CAAC,uBAAuB,CAAC,UAAU;IACrD,IAAI,EAAE,SAAS,CAAC,uBAAuB,CAAC,UAAU;CAClD,CAAC;AAEW,QAAA,QAAQ,GACpB,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC"}

package/out/types/date-time.d.ts

@@ -10,14 +10,7 @@ export declare const types: {
 export type Types = TypeUtils.TsTypes<string, string | number | Date>;
 type DbWriteType = Date;
 export declare const fetchProcessing: TypeUtils.FetchProcessing<Types['Read']>;
-export declare const nativeFactTypes: {
-    'Date Time': {
-        'is before': (from: string, to: string) => string[];
-        'is equal to': (from: string, to: string) => string[];
-    };
-};
-export declare const nativeNames: {
-    'Current Time': string[];
-};
+export declare const nativeFactTypes: TypeUtils.NativeFactTypes;
+export declare const nativeNames: TypeUtils.NativeNames;
 export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

package/out/types/date-time.js

@@ -34,7 +34,7 @@ exports.nativeFactTypes = {
     },
 };
 exports.nativeNames = {
-    'Current Time': ['Now'],
+    'Current Time': ['CurrentTimestamp'],
 };
 exports.validate = TypeUtils.validate.date;
 //# sourceMappingURL=date-time.js.map

package/out/types/date-time.js.map

@@ -1 +1 @@
-{"version":3,"file":"date-time.js","sourceRoot":"","sources":["../../src/types/date-time.ts"],"names":[],"mappings":";;;AAAA,2CAA2C;AAE9B,QAAA,KAAK,GAAG;IACpB,QAAQ,EAAE,WAAW;IACrB,KAAK,EAAE,WAAW;IAClB,MAAM,EAAE,SAAS;IACjB,KAAK,EAAE;QACN,IAAI,EAAE,cAAc;KACpB;CACD,CAAC;AAKK,MAAM,eAAe,GAA6C,CACxE,IAAI,EACH,EAAE;IACH,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IACb,CAAC;IACD,IAAI,IAAU,CAAC;IACf,IAAI,IAAI,YAAY,IAAI,EAAE,CAAC;QAC1B,IAAI,GAAG,IAAI,CAAC;IACb,CAAC;SAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QACjE,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;SAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,kCAAkC,GAAG,OAAO,IAAI,CAAC,CAAC;IACnE,CAAC;IACD,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;AAC3B,CAAC,CAAC;AAfW,QAAA,eAAe,mBAe1B;AAEW,QAAA,eAAe,GAAG;IAC9B,WAAW,EAAE;QACZ,GAAG,SAAS,CAAC,uBAAuB,CAAC,QAAQ;QAC7C,WAAW,EAAE,CAAC,IAAY,EAAE,EAAU,EAAE,EAAE,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC;KACjE;CACD,CAAC;AAEW,QAAA,WAAW,GAAG;IAC1B,cAAc,EAAE,CAAC,KAAK,CAAC;CACvB,CAAC;AAEW,QAAA,QAAQ,GACpB,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC"}
+{"version":3,"file":"date-time.js","sourceRoot":"","sources":["../../src/types/date-time.ts"],"names":[],"mappings":";;;AAIA,2CAA2C;AAE9B,QAAA,KAAK,GAAG;IACpB,QAAQ,EAAE,WAAW;IACrB,KAAK,EAAE,WAAW;IAClB,MAAM,EAAE,SAAS;IACjB,KAAK,EAAE;QACN,IAAI,EAAE,cAAc;KACpB;CACD,CAAC;AAKK,MAAM,eAAe,GAA6C,CACxE,IAAI,EACH,EAAE;IACH,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IACb,CAAC;IACD,IAAI,IAAU,CAAC;IACf,IAAI,IAAI,YAAY,IAAI,EAAE,CAAC;QAC1B,IAAI,GAAG,IAAI,CAAC;IACb,CAAC;SAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QACjE,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;SAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,kCAAkC,GAAG,OAAO,IAAI,CAAC,CAAC;IACnE,CAAC;IACD,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;AAC3B,CAAC,CAAC;AAfW,QAAA,eAAe,mBAe1B;AAEW,QAAA,eAAe,GAA8B;IACzD,WAAW,EAAE;QACZ,GAAG,SAAS,CAAC,uBAAuB,CAAC,QAAQ;QAC7C,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,EAAgB,EAAE,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC;KAC/D;CACD,CAAC;AAEW,QAAA,WAAW,GAA0B;IACjD,cAAc,EAAE,CAAC,kBAAkB,CAAgC;CACnE,CAAC;AAEW,QAAA,QAAQ,GACpB,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC"}

package/out/types/date.d.ts

@@ -10,11 +10,6 @@ export declare const types: {
 export type Types = TypeUtils.TsTypes<string, string | number | Date>;
 type DbWriteType = Date;
 export declare const fetchProcessing: TypeUtils.FetchProcessing<Types['Read']>;
-export declare const nativeFactTypes: {
-    Date: {
-        'is before': (from: string, to: string) => string[];
-        'is equal to': (from: string, to: string) => string[];
-    };
-};
+export declare const nativeFactTypes: TypeUtils.NativeFactTypes;
 export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

package/out/types/date.js.map

@@ -1 +1 @@
-{"version":3,"file":"date.js","sourceRoot":"","sources":["../../src/types/date.ts"],"names":[],"mappings":";;;AAAA,2CAA2C;AAE9B,QAAA,KAAK,GAAG;IACpB,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,MAAM;IACb,MAAM,EAAE,SAAS;IACjB,KAAK,EAAE;QACN,IAAI,EAAE,cAAc;KACpB;CACD,CAAC;AAKK,MAAM,eAAe,GAA6C,CACxE,IAAI,EACH,EAAE;IACH,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IACb,CAAC;IACD,IAAI,IAAU,CAAC;IACf,IAAI,IAAI,YAAY,IAAI,EAAE,CAAC;QAC1B,IAAI,GAAG,IAAI,CAAC;IACb,CAAC;SAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QACjE,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;SAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,6BAA6B,GAAG,OAAO,IAAI,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;AAC3B,CAAC,CAAC;AAfW,QAAA,eAAe,mBAe1B;AAEW,QAAA,eAAe,GAAG;IAC9B,IAAI,EAAE;QACL,GAAG,SAAS,CAAC,uBAAuB,CAAC,QAAQ;QAC7C,WAAW,EAAE,CAAC,IAAY,EAAE,EAAU,EAAE,EAAE,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC;KACjE;CACD,CAAC;AAEW,QAAA,QAAQ,GACpB,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC"}
+{"version":3,"file":"date.js","sourceRoot":"","sources":["../../src/types/date.ts"],"names":[],"mappings":";;;AACA,2CAA2C;AAE9B,QAAA,KAAK,GAAG;IACpB,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,MAAM;IACb,MAAM,EAAE,SAAS;IACjB,KAAK,EAAE;QACN,IAAI,EAAE,cAAc;KACpB;CACD,CAAC;AAKK,MAAM,eAAe,GAA6C,CACxE,IAAI,EACH,EAAE;IACH,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;QAClB,OAAO,IAAI,CAAC;IACb,CAAC;IACD,IAAI,IAAU,CAAC;IACf,IAAI,IAAI,YAAY,IAAI,EAAE,CAAC;QAC1B,IAAI,GAAG,IAAI,CAAC;IACb,CAAC;SAAM,IAAI,OAAO,IAAI,KAAK,QAAQ,IAAI,OAAO,IAAI,KAAK,QAAQ,EAAE,CAAC;QACjE,IAAI,GAAG,IAAI,IAAI,CAAC,IAAI,CAAC,CAAC;IACvB,CAAC;SAAM,CAAC;QACP,MAAM,IAAI,KAAK,CAAC,6BAA6B,GAAG,OAAO,IAAI,CAAC,CAAC;IAC9D,CAAC;IACD,OAAO,IAAI,CAAC,WAAW,EAAE,CAAC;AAC3B,CAAC,CAAC;AAfW,QAAA,eAAe,mBAe1B;AAEW,QAAA,eAAe,GAA8B;IACzD,IAAI,EAAE;QACL,GAAG,SAAS,CAAC,uBAAuB,CAAC,QAAQ;QAC7C,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,EAAgB,EAAE,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC;KAC/D;CACD,CAAC;AAEW,QAAA,QAAQ,GACpB,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC"}

package/out/types/foreign-key.d.ts

@@ -9,17 +9,6 @@ export declare const types: {
 };
 export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
-export declare const nativeFactTypes: {
-    Integer: {
-        'is equal to': (from: string, to: string) => string[];
-        'is less than': (from: string, to: string) => string[];
-        'is less than or equal to': (from: string, to: string) => string[];
-    };
-    Real: {
-        'is equal to': (from: string, to: string) => string[];
-        'is less than': (from: string, to: string) => string[];
-        'is less than or equal to': (from: string, to: string) => string[];
-    };
-};
+export declare const nativeFactTypes: TypeUtils.NativeFactTypes;
 export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

package/out/types/foreign-key.js.map

@@ -1 +1 @@
-{"version":3,"file":"foreign-key.js","sourceRoot":"","sources":["../../src/types/foreign-key.ts"],"names":[],"mappings":";;;AAAA,2CAA2C;AAE9B,QAAA,KAAK,GAAG;IACpB,QAAQ,EAAE,SAAS;IACnB,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE,SAAS;IACjB,KAAK,EAAE;QACN,IAAI,EAAE,WAAW;KACjB;CACD,CAAC;AAKW,QAAA,eAAe,GAAG;IAC9B,OAAO,EAAE,SAAS,CAAC,uBAAuB,CAAC,UAAU;IACrD,IAAI,EAAE,SAAS,CAAC,uBAAuB,CAAC,UAAU;CAClD,CAAC;AAEW,QAAA,QAAQ,GACpB,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC"}
+{"version":3,"file":"foreign-key.js","sourceRoot":"","sources":["../../src/types/foreign-key.ts"],"names":[],"mappings":";;;AAAA,2CAA2C;AAE9B,QAAA,KAAK,GAAG;IACpB,QAAQ,EAAE,SAAS;IACnB,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE,SAAS;IACjB,KAAK,EAAE;QACN,IAAI,EAAE,WAAW;KACjB;CACD,CAAC;AAKW,QAAA,eAAe,GAA8B;IACzD,OAAO,EAAE,SAAS,CAAC,uBAAuB,CAAC,UAAU;IACrD,IAAI,EAAE,SAAS,CAAC,uBAAuB,CAAC,UAAU;CAClD,CAAC;AAEW,QAAA,QAAQ,GACpB,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC"}

package/out/types/integer.d.ts

@@ -9,17 +9,6 @@ export declare const types: {
 };
 export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
-export declare const nativeFactTypes: {
-    Integer: {
-        'is equal to': (from: string, to: string) => string[];
-        'is less than': (from: string, to: string) => string[];
-        'is less than or equal to': (from: string, to: string) => string[];
-    };
-    Real: {
-        'is equal to': (from: string, to: string) => string[];
-        'is less than': (from: string, to: string) => string[];
-        'is less than or equal to': (from: string, to: string) => string[];
-    };
-};
+export declare const nativeFactTypes: TypeUtils.NativeFactTypes;
 export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

package/out/types/integer.js.map

@@ -1 +1 @@
-{"version":3,"file":"integer.js","sourceRoot":"","sources":["../../src/types/integer.ts"],"names":[],"mappings":";;;AAAA,2CAA2C;AAE9B,QAAA,KAAK,GAAG;IACpB,QAAQ,EAAE,SAAS;IACnB,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE,SAAS;IACjB,KAAK,EAAE;QACN,IAAI,EAAE,WAAW;KACjB;CACD,CAAC;AAKW,QAAA,eAAe,GAAG;IAC9B,OAAO,EAAE,SAAS,CAAC,uBAAuB,CAAC,UAAU;IACrD,IAAI,EAAE,SAAS,CAAC,uBAAuB,CAAC,UAAU;CAClD,CAAC;AAEW,QAAA,QAAQ,GACpB,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC"}
+{"version":3,"file":"integer.js","sourceRoot":"","sources":["../../src/types/integer.ts"],"names":[],"mappings":";;;AAAA,2CAA2C;AAE9B,QAAA,KAAK,GAAG;IACpB,QAAQ,EAAE,SAAS;IACnB,KAAK,EAAE,SAAS;IAChB,MAAM,EAAE,SAAS;IACjB,KAAK,EAAE;QACN,IAAI,EAAE,WAAW;KACjB;CACD,CAAC;AAKW,QAAA,eAAe,GAA8B;IACzD,OAAO,EAAE,SAAS,CAAC,uBAAuB,CAAC,UAAU;IACrD,IAAI,EAAE,SAAS,CAAC,uBAAuB,CAAC,UAAU;CAClD,CAAC;AAEW,QAAA,QAAQ,GACpB,SAAS,CAAC,QAAQ,CAAC,OAAO,CAAC"}

package/out/types/real.d.ts

@@ -9,17 +9,6 @@ export declare const types: {
 };
 export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
-export declare const nativeFactTypes: {
-    Integer: {
-        'is equal to': (from: string, to: string) => string[];
-        'is less than': (from: string, to: string) => string[];
-        'is less than or equal to': (from: string, to: string) => string[];
-    };
-    Real: {
-        'is equal to': (from: string, to: string) => string[];
-        'is less than': (from: string, to: string) => string[];
-        'is less than or equal to': (from: string, to: string) => string[];
-    };
-};
+export declare const nativeFactTypes: TypeUtils.NativeFactTypes;
 export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

package/out/types/real.js.map

@@ -1 +1 @@
-{"version":3,"file":"real.js","sourceRoot":"","sources":["../../src/types/real.ts"],"names":[],"mappings":";;;AAAA,2CAA2C;AAE9B,QAAA,KAAK,GAAG;IACpB,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,MAAM;IACb,MAAM,EAAE,MAAM;IACd,KAAK,EAAE;QACN,IAAI,EAAE,YAAY;KAClB;CACD,CAAC;AAKW,QAAA,eAAe,GAAG;IAC9B,OAAO,EAAE,SAAS,CAAC,uBAAuB,CAAC,UAAU;IACrD,IAAI,EAAE,SAAS,CAAC,uBAAuB,CAAC,UAAU;CAClD,CAAC;AAEW,QAAA,QAAQ,GACpB,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,EAAE;IAC1C,MAAM,cAAc,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;IACzC,IAAI,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,KAAK,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,cAAc,CAAC;AACvB,CAAC,CAAC,CAAC"}
+{"version":3,"file":"real.js","sourceRoot":"","sources":["../../src/types/real.ts"],"names":[],"mappings":";;;AAAA,2CAA2C;AAE9B,QAAA,KAAK,GAAG;IACpB,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,MAAM;IACb,MAAM,EAAE,MAAM;IACd,KAAK,EAAE;QACN,IAAI,EAAE,YAAY;KAClB;CACD,CAAC;AAKW,QAAA,eAAe,GAA8B;IACzD,OAAO,EAAE,SAAS,CAAC,uBAAuB,CAAC,UAAU;IACrD,IAAI,EAAE,SAAS,CAAC,uBAAuB,CAAC,UAAU;CAClD,CAAC;AAEW,QAAA,QAAQ,GACpB,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,EAAE;IAC1C,MAAM,cAAc,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;IACzC,IAAI,MAAM,CAAC,KAAK,CAAC,cAAc,CAAC,EAAE,CAAC;QAClC,MAAM,IAAI,KAAK,CAAC,mBAAmB,GAAG,KAAK,CAAC,CAAC;IAC9C,CAAC;IACD,OAAO,cAAc,CAAC;AACvB,CAAC,CAAC,CAAC"}

package/out/types/text.d.ts

@@ -9,18 +9,7 @@ export declare const types: {
 };
 export type Types = TypeUtils.TsTypes<string, string>;
 type DbWriteType = string;
-export declare const nativeProperties: {
-    has: {
-        Length: (from: string) => string[];
-    };
-};
-export declare const nativeFactTypes: {
-    Text: {
-        'starts with': (from: string, to: string) => string[];
-        'ends with': (from: string, to: string) => string[];
-        contains: (from: string, to: string) => string[];
-        'is equal to': (from: string, to: string) => string[];
-    };
-};
+export declare const nativeProperties: TypeUtils.NativeProperties;
+export declare const nativeFactTypes: TypeUtils.NativeFactTypes;
 export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

package/out/types/text.js

@@ -18,8 +18,8 @@ exports.nativeProperties = {
 exports.nativeFactTypes = {
     Text: {
         ...TypeUtils.nativeFactTypeTemplates.equality,
-        'starts with': (from, to) => ['Startswith', from, to],
-        'ends with': (from, to) => ['Endswith', from, to],
+        'starts with': (from, to) => ['StartsWith', from, to],
+        'ends with': (from, to) => ['EndsWith', from, to],
         contains: (from, to) => ['Contains', from, to],
     },
 };

package/out/types/text.js.map

@@ -1 +1 @@
-{"version":3,"file":"text.js","sourceRoot":"","sources":["../../src/types/text.ts"],"names":[],"mappings":";;;AAAA,2CAA2C;AAE9B,QAAA,KAAK,GAAG;IACpB,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,MAAM;IACb,MAAM,EAAE,MAAM;IACd,KAAK,EAAE;QACN,IAAI,EAAE,YAAY;KAClB;CACD,CAAC;AAKW,QAAA,gBAAgB,GAAG;IAC/B,GAAG,EAAE;QACJ,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE,CAAC,CAAC,iBAAiB,EAAE,IAAI,CAAC;KACnD;CACD,CAAC;AAEW,QAAA,eAAe,GAAG;IAC9B,IAAI,EAAE;QACL,GAAG,SAAS,CAAC,uBAAuB,CAAC,QAAQ;QAC7C,aAAa,EAAE,CAAC,IAAY,EAAE,EAAU,EAAE,EAAE,CAAC,CAAC,YAAY,EAAE,IAAI,EAAE,EAAE,CAAC;QACrE,WAAW,EAAE,CAAC,IAAY,EAAE,EAAU,EAAE,EAAE,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC;QACjE,QAAQ,EAAE,CAAC,IAAY,EAAE,EAAU,EAAE,EAAE,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC;KAC9D;CACD,CAAC;AAEW,QAAA,QAAQ,GACpB,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC"}
+{"version":3,"file":"text.js","sourceRoot":"","sources":["../../src/types/text.ts"],"names":[],"mappings":";;;AAMA,2CAA2C;AAE9B,QAAA,KAAK,GAAG;IACpB,QAAQ,EAAE,MAAM;IAChB,KAAK,EAAE,MAAM;IACb,MAAM,EAAE,MAAM;IACd,KAAK,EAAE;QACN,IAAI,EAAE,YAAY;KAClB;CACD,CAAC;AAKW,QAAA,gBAAgB,GAA+B;IAC3D,GAAG,EAAE;QACJ,MAAM,EAAE,CAAC,IAAI,EAAuB,EAAE,CAAC,CAAC,iBAAiB,EAAE,IAAI,CAAC;KAChE;CACD,CAAC;AAEW,QAAA,eAAe,GAA8B;IACzD,IAAI,EAAE;QACL,GAAG,SAAS,CAAC,uBAAuB,CAAC,QAAQ;QAC7C,aAAa,EAAE,CAAC,IAAI,EAAE,EAAE,EAAkB,EAAE,CAAC,CAAC,YAAY,EAAE,IAAI,EAAE,EAAE,CAAC;QACrE,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,EAAgB,EAAE,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC;QAC/D,QAAQ,EAAE,CAAC,IAAI,EAAE,EAAE,EAAgB,EAAE,CAAC,CAAC,UAAU,EAAE,IAAI,EAAE,EAAE,CAAC;KAC5D;CACD,CAAC;AAEW,QAAA,QAAQ,GACpB,SAAS,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC"}

package/out/types/web-resource.d.ts

@@ -1,5 +1,4 @@
 import * as TypeUtils from '../type-utils';
-import type { CastNode, ExtractJSONPathAsTextNode, ReferencedFieldNode } from '@balena/abstract-sql-compiler';
 export type WebResource = {
     filename: string;
     href: string;
@@ -19,16 +18,7 @@ export declare const types: {
 };
 export type Types = TypeUtils.TsTypes<WebResource, WebResource>;
 type DbWriteType = string;
-export declare const nativeProperties: {
-    has: {
-        Filename: (referencedField: ReferencedFieldNode) => ExtractJSONPathAsTextNode;
-        HRef: (referencedField: ReferencedFieldNode) => ExtractJSONPathAsTextNode;
-        'Content Type': (referencedField: ReferencedFieldNode) => ExtractJSONPathAsTextNode;
-        'Content Disposition': (referencedField: ReferencedFieldNode) => ExtractJSONPathAsTextNode;
-        Checksum: (referencedField: ReferencedFieldNode) => ExtractJSONPathAsTextNode;
-        Size: (referencedField: ReferencedFieldNode) => CastNode;
-    };
-};
+export declare const nativeProperties: TypeUtils.NativeProperties;
 export declare const fetchProcessing: TypeUtils.FetchProcessing<Types['Read']>;
 export declare const validate: TypeUtils.Validate<Types['Write'], DbWriteType>;
 export {};

package/out/types/web-resource.js.map

@@ -1 +1 @@
-{"version":3,"file":"web-resource.js","sourceRoot":"","sources":["../../src/types/web-resource.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"web-resource.js","sourceRoot":"","sources":["../../src/types/web-resource.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@balena/sbvr-types",
-  "version": "7.1.2",
+  "version": "7.1.3",
   "description": "SBVR type definitions.",
   "main": "out",
   "scripts": {
@@ -20,20 +20,20 @@
     "sha.js": "^2.4.11"
   },
   "devDependencies": {
-    "@balena/abstract-sql-compiler": "^9.0.5",
-    "@balena/lint": "^8.0.0",
+    "@balena/abstract-sql-compiler": "^9.2.0",
+    "@balena/lint": "^8.0.2",
     "@types/bcrypt": "^5.0.2",
-    "@types/chai": "^4.3.12",
+    "@types/chai": "^4.3.16",
     "@types/chai-datetime": "^0.0.39",
     "@types/mocha": "^10.0.6",
     "@types/sha.js": "^2.4.4",
     "chai": "^4.4.1",
     "chai-datetime": "^1.8.0",
-    "husky": "^9.0.0",
-    "lint-staged": "^15.2.2",
-    "mocha": "^10.3.0",
+    "husky": "^9.0.11",
+    "lint-staged": "^15.2.6",
+    "mocha": "^10.4.0",
     "ts-node": "^10.9.2",
-    "typescript": "^5.4.2"
+    "typescript": "^5.4.5"
   },
   "lint-staged": {
     "*.ts": [
@@ -51,6 +51,6 @@
     "npm": ">=8.1.0"
   },
   "versionist": {
-    "publishedAt": "2024-06-12T12:14:00.451Z"
+    "publishedAt": "2024-06-12T12:44:16.615Z"
   }
 }

package/src/type-utils.ts

@@ -1,3 +1,24 @@
+import type {
+	AnyTypeNodes,
+	EqualsNode,
+	LessThanNode,
+	LessThanOrEqualNode,
+	ReferencedFieldNode,
+} from '@balena/abstract-sql-compiler';
+
+export type NativeNames = Record<string, AnyTypeNodes>;
+export type NativeProperties = Record<
+	string,
+	Record<string, (from: ReferencedFieldNode) => AnyTypeNodes>
+>;
+export type NativeFactTypes = Record<
+	string,
+	Record<
+		string,
+		(from: ReferencedFieldNode, to: ReferencedFieldNode) => AnyTypeNodes
+	>
+>;
+
 export interface DatabaseTypeFn {
 	(necessity: string, index: string): string;
 	castType: string;
@@ -48,20 +69,20 @@ const checkRequired = <T>(validateFn: (value: any) => T | Promise<T>) => {
 };
 
 const equality = {
-	'is equal to': (from: string, to: string) => ['Equals', from, to],
-};
+	'is equal to': (from, to): EqualsNode => ['Equals', from, to],
+} satisfies NativeFactTypes[string];
 export const nativeFactTypeTemplates = {
 	equality,
 	comparison: {
-		'is less than': (from: string, to: string) => ['LessThan', from, to],
-		'is less than or equal to': (from: string, to: string) => [
+		'is less than': (from, to): LessThanNode => ['LessThan', from, to],
+		'is less than or equal to': (from, to): LessThanOrEqualNode => [
 			'LessThanOrEqual',
 			from,
 			to,
 		],
 		...equality,
 	},
-};
+} satisfies Record<string, NativeFactTypes[string]>;
 
 export const validate = {
 	checkRequired,

package/src/types/big-integer.ts

@@ -12,7 +12,7 @@ export const types = {
 export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
 
-export const nativeFactTypes = {
+export const nativeFactTypes: TypeUtils.NativeFactTypes = {
 	Integer: TypeUtils.nativeFactTypeTemplates.comparison,
 	Real: TypeUtils.nativeFactTypeTemplates.comparison,
 };

package/src/types/color.ts

@@ -1,3 +1,7 @@
+import type {
+	BitwiseAndNode,
+	BitwiseShiftRightNode,
+} from '@balena/abstract-sql-compiler';
 import * as TypeUtils from '../type-utils';
 
 export const types = {
@@ -25,23 +29,27 @@ type ColorObj = {
 export type Types = TypeUtils.TsTypes<ColorObj, number | ColorObj>;
 type DbWriteType = number;
 
-export const nativeProperties = {
+export const nativeProperties: TypeUtils.NativeProperties = {
 	has: {
-		'Red Component': (from: string) => [
+		'Red Component': (from): BitwiseAndNode => [
 			'BitwiseAnd',
-			['BitwiseShiftRight', from, 16],
-			255,
+			['BitwiseShiftRight', from, ['Number', 16]],
+			['Number', 255],
 		],
-		'Green Component': (from: string) => [
+		'Green Component': (from): BitwiseAndNode => [
 			'BitwiseAnd',
-			['BitwiseShiftRight', from, 8],
-			255,
+			['BitwiseShiftRight', from, ['Number', 8]],
+			['Number', 255],
 		],
-		'Blue Component': (from: string) => ['BitwiseShiftRight', from, 255],
-		'Alpha Component': (from: string) => [
+		'Blue Component': (from): BitwiseShiftRightNode => [
+			'BitwiseShiftRight',
+			from,
+			['Number', 255],
+		],
+		'Alpha Component': (from): BitwiseAndNode => [
 			'BitwiseAnd',
-			['BitwiseShiftRight', from, 24],
-			255,
+			['BitwiseShiftRight', from, ['Number', 24]],
+			['Number', 255],
 		],
 	},
 };

package/src/types/concept-type.ts

@@ -12,7 +12,7 @@ export const types = {
 export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
 
-export const nativeFactTypes = {
+export const nativeFactTypes: TypeUtils.NativeFactTypes = {
 	Integer: TypeUtils.nativeFactTypeTemplates.comparison,
 	Real: TypeUtils.nativeFactTypeTemplates.comparison,
 };

package/src/types/date-time.ts

@@ -1,3 +1,7 @@
+import type {
+	CurrentTimestampNode,
+	LessThanNode,
+} from '@balena/abstract-sql-compiler';
 import * as TypeUtils from '../type-utils';
 
 export const types = {
@@ -29,15 +33,15 @@ export const fetchProcessing: TypeUtils.FetchProcessing<Types['Read']> = (
 	return date.toISOString();
 };
 
-export const nativeFactTypes = {
+export const nativeFactTypes: TypeUtils.NativeFactTypes = {
 	'Date Time': {
 		...TypeUtils.nativeFactTypeTemplates.equality,
-		'is before': (from: string, to: string) => ['LessThan', from, to],
+		'is before': (from, to): LessThanNode => ['LessThan', from, to],
 	},
 };
 
-export const nativeNames = {
-	'Current Time': ['Now'],
+export const nativeNames: TypeUtils.NativeNames = {
+	'Current Time': ['CurrentTimestamp'] satisfies CurrentTimestampNode,
 };
 
 export const validate: TypeUtils.Validate<Types['Write'], DbWriteType> =

package/src/types/date.ts

@@ -1,3 +1,4 @@
+import type { LessThanNode } from '@balena/abstract-sql-compiler';
 import * as TypeUtils from '../type-utils';
 
 export const types = {
@@ -29,10 +30,10 @@ export const fetchProcessing: TypeUtils.FetchProcessing<Types['Read']> = (
 	return date.toISOString();
 };
 
-export const nativeFactTypes = {
+export const nativeFactTypes: TypeUtils.NativeFactTypes = {
 	Date: {
 		...TypeUtils.nativeFactTypeTemplates.equality,
-		'is before': (from: string, to: string) => ['LessThan', from, to],
+		'is before': (from, to): LessThanNode => ['LessThan', from, to],
 	},
 };
 

package/src/types/foreign-key.ts

@@ -12,7 +12,7 @@ export const types = {
 export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
 
-export const nativeFactTypes = {
+export const nativeFactTypes: TypeUtils.NativeFactTypes = {
 	Integer: TypeUtils.nativeFactTypeTemplates.comparison,
 	Real: TypeUtils.nativeFactTypeTemplates.comparison,
 };

package/src/types/integer.ts

@@ -12,7 +12,7 @@ export const types = {
 export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
 
-export const nativeFactTypes = {
+export const nativeFactTypes: TypeUtils.NativeFactTypes = {
 	Integer: TypeUtils.nativeFactTypeTemplates.comparison,
 	Real: TypeUtils.nativeFactTypeTemplates.comparison,
 };

package/src/types/real.ts

@@ -12,7 +12,7 @@ export const types = {
 export type Types = TypeUtils.TsTypes<number, number>;
 type DbWriteType = number;
 
-export const nativeFactTypes = {
+export const nativeFactTypes: TypeUtils.NativeFactTypes = {
 	Integer: TypeUtils.nativeFactTypeTemplates.comparison,
 	Real: TypeUtils.nativeFactTypeTemplates.comparison,
 };

package/src/types/text.ts

@@ -1,3 +1,9 @@
+import type {
+	CharacterLengthNode,
+	StartsWithNode,
+	EndsWithNode,
+	ContainsNode,
+} from '@balena/abstract-sql-compiler';
 import * as TypeUtils from '../type-utils';
 
 export const types = {
@@ -12,18 +18,18 @@ export const types = {
 export type Types = TypeUtils.TsTypes<string, string>;
 type DbWriteType = string;
 
-export const nativeProperties = {
+export const nativeProperties: TypeUtils.NativeProperties = {
 	has: {
-		Length: (from: string) => ['CharacterLength', from],
+		Length: (from): CharacterLengthNode => ['CharacterLength', from],
 	},
 };
 
-export const nativeFactTypes = {
+export const nativeFactTypes: TypeUtils.NativeFactTypes = {
 	Text: {
 		...TypeUtils.nativeFactTypeTemplates.equality,
-		'starts with': (from: string, to: string) => ['Startswith', from, to],
-		'ends with': (from: string, to: string) => ['Endswith', from, to],
-		contains: (from: string, to: string) => ['Contains', from, to],
+		'starts with': (from, to): StartsWithNode => ['StartsWith', from, to],
+		'ends with': (from, to): EndsWithNode => ['EndsWith', from, to],
+		contains: (from, to): ContainsNode => ['Contains', from, to],
 	},
 };
 

package/src/types/web-resource.ts

@@ -2,7 +2,6 @@ import * as TypeUtils from '../type-utils';
 import type {
 	CastNode,
 	ExtractJSONPathAsTextNode,
-	ReferencedFieldNode,
 } from '@balena/abstract-sql-compiler';
 
 export type WebResource = {
@@ -35,42 +34,34 @@ export const types = {
 export type Types = TypeUtils.TsTypes<WebResource, WebResource>;
 type DbWriteType = string;
 
-export const nativeProperties = {
+export const nativeProperties: TypeUtils.NativeProperties = {
 	has: {
-		Filename: (
-			referencedField: ReferencedFieldNode,
-		): ExtractJSONPathAsTextNode => [
+		Filename: (referencedField): ExtractJSONPathAsTextNode => [
 			'ExtractJSONPathAsText',
 			referencedField,
 			['TextArray', ['EmbeddedText', 'filename']],
 		],
-		HRef: (referencedField: ReferencedFieldNode): ExtractJSONPathAsTextNode => [
+		HRef: (referencedField): ExtractJSONPathAsTextNode => [
 			'ExtractJSONPathAsText',
 			referencedField,
 			['TextArray', ['EmbeddedText', 'href']],
 		],
-		'Content Type': (
-			referencedField: ReferencedFieldNode,
-		): ExtractJSONPathAsTextNode => [
+		'Content Type': (referencedField): ExtractJSONPathAsTextNode => [
 			'ExtractJSONPathAsText',
 			referencedField,
 			['TextArray', ['EmbeddedText', 'content_type']],
 		],
-		'Content Disposition': (
-			referencedField: ReferencedFieldNode,
-		): ExtractJSONPathAsTextNode => [
+		'Content Disposition': (referencedField): ExtractJSONPathAsTextNode => [
 			'ExtractJSONPathAsText',
 			referencedField,
 			['TextArray', ['EmbeddedText', 'content_disposition']],
 		],
-		Checksum: (
-			referencedField: ReferencedFieldNode,
-		): ExtractJSONPathAsTextNode => [
+		Checksum: (referencedField): ExtractJSONPathAsTextNode => [
 			'ExtractJSONPathAsText',
 			referencedField,
 			['TextArray', ['EmbeddedText', 'checksum']],
 		],
-		Size: (referencedField: ReferencedFieldNode): CastNode => [
+		Size: (referencedField): CastNode => [
 			'Cast',
 			[
 				'ExtractJSONPathAsText',