@balena/abstract-sql-compiler 11.0.0-build-11-x-db9cd30f6ec498e5293df9e060f5531cd960b1cc-1 → 11.0.0-build-11-x-1d6801364e84c467215b1a2bd54345172071bdc2-1

package/.versionbot/CHANGELOG.yml

@@ -1,6 +1,56 @@
 - commits:
+    - subject: Standardize filenames
+      hash: 11f63ab3efbb0fedfafe9eec933f4f4cc45cfbb9
+      body: ""
+      footer:
+        Change-type: major
+        change-type: major
+      author: Pagan Gazzard
+      nested: []
+    - subject: Improve typing of `AbstractSqlField['computed']`
+      hash: d52172c59a9424477d3f96cbee686e02e6796b94
+      body: ""
+      footer:
+        Change-type: major
+        change-type: major
+      author: Pagan Gazzard
+      nested: []
+    - subject: Improve typing of `AbstractSqlModel['rules']`
+      hash: d1a2c50d9d4b9c3bb89030186db0b466fbf4d83d
+      body: ""
+      footer:
+        Change-type: major
+        change-type: major
+      author: Pagan Gazzard
+      nested: []
+    - subject: Remove support for deprecated `['Bind', string, string]` bind node format
+      hash: 9f16483079cd561a9fdaa741cd830c2c5eb2065a
+      body: |
+        Use `['Bind', [string, string]]` instead
+      footer:
+        Change-type: major
+        change-type: major
+      author: Pagan Gazzard
+      nested: []
+    - subject: Remove deprecated `AliasableFromTypeNodes` type, use `FromTypeNodes`
+        instead
+      hash: 1d3108b17cdc662641904c72357157a40ae0cbcb
+      body: ""
+      footer:
+        Change-type: major
+        change-type: major
+      author: Pagan Gazzard
+      nested: []
+    - subject: Use an options object for `optimizeSchema` rather than flags
+      hash: b78df1afd0c566de81efff212629a53dd6bb4219
+      body: ""
+      footer:
+        Change-type: major
+        change-type: major
+      author: Pagan Gazzard
+      nested: []
     - subject: Convert to ESM
-      hash: db9cd30f6ec498e5293df9e060f5531cd960b1cc
+      hash: 195c2b8d5d4a39ba893113489620ccfa3f0a6afc
       body: ""
       footer:
         Change-type: major
@@ -8,7 +58,7 @@
       author: Pagan Gazzard
       nested: []
     - subject: Remove support for legacy `Now` nodes in favor of `CurrentTimestamp`
-      hash: 560cbd2a4c6ef6ff913f46dfd3443fce3344a7dc
+      hash: 56e66dd939a87649c5d68787366562934daf65fc
       body: ""
       footer:
         Change-type: major
@@ -16,7 +66,7 @@
       author: Pagan Gazzard
       nested: []
     - subject: Switch to a separate `viewDefinition` property for creating views
-      hash: 972bae897b593ea137f34a829d5562fd0ce39a11
+      hash: 0bf2e7ac0bcc3e733e3f712b51f71772666b0853
       body: |
         This removes the inference of whether to create a view from based on
         inspecting the definition and instead makes it a conscious choice to
@@ -28,9 +78,89 @@
         change-type: major
       author: Pagan Gazzard
       nested: []
+    - subject: "Tests: Update @balena/odata-to-abstract-sql to 8.0.1"
+      hash: 66ee93652310d4add5b0c8c09843dc052d796f5e
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+      nested: []
   version: 11.0.0
   title: ""
-  date: 2025-07-03T14:10:40.934Z
+  date: 2025-07-16T14:26:48.320Z
+- commits:
+    - subject: Include comments in generated output to preserve jsdoc info
+      hash: 7045c5bd5244459330a7899ad0fbb974a429ca14
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+      nested: []
+  version: 10.6.2
+  title: ""
+  date: 2025-07-16T12:44:51.636Z
+- commits:
+    - subject: Update dev dependencies
+      hash: 444f515b81454a512eaf3a28f49f7b25938b4b9c
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+      nested: []
+  version: 10.6.1
+  title: ""
+  date: 2025-07-16T11:37:51.776Z
+- commits:
+    - subject: Export `abstractSqlContainsNode` helper function
+      hash: 92e7d4dd97329fb93e2f1c27b275c9cc38ab74c5
+      body: ""
+      footer:
+        Change-type: minor
+        change-type: minor
+      author: Pagan Gazzard
+      nested: []
+  version: 10.6.0
+  title: ""
+  date: 2025-07-14T23:48:55.689Z
+- commits:
+    - subject: Allow sbvr-types v11
+      hash: 0b961faffe188162d82968df0e50522b7840eeae
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: joshbwlng
+      nested: []
+  version: 10.5.1
+  title: ""
+  date: 2025-07-08T14:05:27.340Z
+- commits:
+    - subject: Add optional time zone argument for DateTrunc
+      hash: 51521852f16d12fdcd22b51d24bf6a2cea3247e3
+      body: ""
+      footer:
+        Change-type: minor
+        change-type: minor
+      author: joshbwlng
+      nested: []
+  version: 10.5.0
+  title: ""
+  date: 2025-07-07T23:20:12.115Z
+- commits:
+    - subject: Correctly treat `EqualsAnyNode` as the boolean type we know it to be
+      hash: 862d36cf5ade46cc40be2909d6af6bafe16d5409
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Pagan Gazzard
+      nested: []
+  version: 10.4.1
+  title: ""
+  date: 2025-07-04T23:10:21.328Z
 - commits:
     - subject: Export an `optimizeSchema` variant that is database engine agnostic
       hash: 9b52888ca68ed9298b469fbda89eb2dbbb861668

package/CHANGELOG.md

@@ -4,11 +4,42 @@ 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/).
 
-## 11.0.0 - 2025-07-03
-
+## 11.0.0 - 2025-07-16
+
+* Standardize filenames [Pagan Gazzard]
+* Improve typing of `AbstractSqlField['computed']` [Pagan Gazzard]
+* Improve typing of `AbstractSqlModel['rules']` [Pagan Gazzard]
+* Remove support for deprecated `['Bind', string, string]` bind node format [Pagan Gazzard]
+* Remove deprecated `AliasableFromTypeNodes` type, use `FromTypeNodes` instead [Pagan Gazzard]
+* Use an options object for `optimizeSchema` rather than flags [Pagan Gazzard]
 * Convert to ESM [Pagan Gazzard]
 * Remove support for legacy `Now` nodes in favor of `CurrentTimestamp` [Pagan Gazzard]
 * Switch to a separate `viewDefinition` property for creating views [Pagan Gazzard]
+* Tests: Update @balena/odata-to-abstract-sql to 8.0.1 [Pagan Gazzard]
+
+## 10.6.2 - 2025-07-16
+
+* Include comments in generated output to preserve jsdoc info [Pagan Gazzard]
+
+## 10.6.1 - 2025-07-16
+
+* Update dev dependencies [Pagan Gazzard]
+
+## 10.6.0 - 2025-07-14
+
+* Export `abstractSqlContainsNode` helper function [Pagan Gazzard]
+
+## 10.5.1 - 2025-07-08
+
+* Allow sbvr-types v11 [joshbwlng]
+
+## 10.5.0 - 2025-07-07
+
+* Add optional time zone argument for DateTrunc [joshbwlng]
+
+## 10.4.1 - 2025-07-04
+
+* Correctly treat `EqualsAnyNode` as the boolean type we know it to be [Pagan Gazzard]
 
 ## 10.4.0 - 2025-06-20
 

package/out/{AbstractSQLCompiler.d.ts → abstract-sql-compiler.d.ts}

@@ -3,9 +3,9 @@ export declare const enum Engines {
     mysql = "mysql",
     websql = "websql"
 }
-import type { Binding, SqlResult } from './AbstractSQLRules2SQL.js';
-export { Binding, SqlResult } from './AbstractSQLRules2SQL.js';
-import { optimizeSchema } from './AbstractSQLSchemaOptimiser.js';
+import type { Binding, SqlResult } from './abstract-sql-rules-to-sql.js';
+export { Binding, SqlResult } from './abstract-sql-rules-to-sql.js';
+import { optimizeSchema } from './abstract-sql-schema-optimizer.js';
 import type { ReferencedFields, RuleReferencedFields, ModifiedFields } from './referenced-fields.js';
 export type { ReferencedFields, RuleReferencedFields, ModifiedFields };
 export type NullNode = ['Null'];
@@ -102,7 +102,7 @@ export type StrictNumberTypeNodes = NumberNode | IntegerNode | RealNode | AddNod
 export type NumberTypeNodes = StrictNumberTypeNodes | UnknownTypeNodes;
 export type FieldNode = ['Field', string];
 export type ReferencedFieldNode = ['ReferencedField', string, string];
-export type DateTruncNode = ['DateTrunc', TextTypeNodes, DateTypeNodes];
+export type DateTruncNode = ['DateTrunc', TextTypeNodes, DateTypeNodes] | ['DateTrunc', TextTypeNodes, DateTypeNodes, TextTypeNodes];
 export type ToDateNode = ['ToDate', DateTypeNodes];
 export type ToTimeNode = ['ToTime', DateTypeNodes];
 export type CurrentTimestampNode = ['CurrentTimestamp'];
@@ -138,8 +138,7 @@ export type AddDateDurationNode = [
 export type WhenNode = ['When', BooleanTypeNodes, AnyTypeNodes];
 export type ElseNode = ['Else', AnyTypeNodes];
 export type CaseNode = ['Case', ...WhenNode[]] | ['Case', ...WhenNode[], ElseNode];
-type BackCompatBindNode = ['Bind', string, string];
-export type BindNode = ['Bind', number | string] | ['Bind', [string, string]] | BackCompatBindNode;
+export type BindNode = ['Bind', number | string] | ['Bind', [string, string]];
 export type CastNode = ['Cast', AnyTypeNodes, string];
 export type CoalesceNode = [
     'Coalesce',
@@ -148,7 +147,7 @@ export type CoalesceNode = [
     ...AnyTypeNodes[]
 ];
 export type AnyNode = ['Any', AnyTypeNodes, string];
-export type UnknownTypeNodes = SelectQueryNode | UnionQueryNode | NullNode | FieldNode | ReferencedFieldNode | EqualsAnyNode | BindNode | CastNode | CaseNode | CoalesceNode | AnyNode;
+export type UnknownTypeNodes = SelectQueryNode | UnionQueryNode | NullNode | FieldNode | ReferencedFieldNode | BindNode | CastNode | CaseNode | CoalesceNode | AnyNode;
 export type ToJSONNode = ['ToJSON', AnyTypeNodes];
 export type AggregateJSONNode = [
     'AggregateJSON',
@@ -213,15 +212,25 @@ export type UpdateQueryNode = [
 ];
 export type DeleteQueryNode = ['DeleteQuery', ...Array<FromNode | WhereNode>];
 export type UpsertQueryNode = ['UpsertQuery', InsertQueryNode, UpdateQueryNode];
+/**
+ * This interface allows adding to the valid set of FromTypeNodes using interface merging, eg
+ * declare module '@balena/abstract-sql-compiler' {
+ * 	interface FromTypeNode {
+ * 		MyNode: MyNode;
+ * 	}
+ * }
+ */
 export interface FromTypeNode {
     SelectQueryNode: SelectQueryNode;
     UnionQueryNode: UnionQueryNode;
     TableNode: TableNode;
     ResourceNode: ResourceNode;
 }
+/**
+ * This is not currently understood by the abstract-sql-compiler but is a placeholder for future support
+ */
 export type ResourceNode = ['Resource', string];
 export type FromTypeNodes = FromTypeNode[keyof FromTypeNode] | AliasNode<FromTypeNode[keyof FromTypeNode]>;
-export type AliasableFromTypeNodes = FromTypeNodes;
 export type SelectNode = ['Select', AnyTypeNodes[]];
 export type FromNode = ['From', FromTypeNodes];
 export type InnerJoinNode = ['Join', FromTypeNodes, OnNode?];
@@ -262,7 +271,7 @@ export interface AbstractSqlField {
         type?: string;
     };
     defaultValue?: string;
-    computed?: AbstractSqlQuery;
+    computed?: AnyTypeNodes;
     checks?: BooleanTypeNodes[];
 }
 export interface Trigger {
@@ -275,6 +284,7 @@ export interface Index {
     type: string;
     fields: string[];
     name?: string;
+    /** For rules converted to partial unique indexes this holds the actual rule expression */
     description?: string;
     distinctNulls?: boolean;
     predicate?: BooleanTypeNodes;
@@ -312,6 +322,19 @@ export interface SqlRule {
     referencedFields?: ReferencedFields | undefined;
     ruleReferencedFields?: RuleReferencedFields | undefined;
 }
+/**
+ * The RelationshipMapping can either describe a relationship to another term, or
+ * a relationship to a local term (since simple terms are also defined and referenced).
+ * A local term basically describes the fields of the term that are available.
+ *
+ *   - RelationshipMapping[0] is the local field
+ *
+ * If this relationship points to a foreign term (a different table)
+ *
+ *   - RelationshipMapping[1] is the reference to the other resource, that joins this resource
+ *   - RelationshipMapping[1][0] is the name of the other resource (or the other table)
+ *   - RelationshipMapping[1][1] is the name of the field on the other resource
+ */
 export type RelationshipMapping = [string, [string, string]?];
 export interface RelationshipLeafNode {
     $: RelationshipMapping;
@@ -330,7 +353,11 @@ export interface AbstractSqlModel {
     tables: {
         [resourceName: string]: AbstractSqlTable;
     };
-    rules: AbstractSqlQuery[];
+    rules: Array<[
+        'Rule',
+        ['Body', AbstractSqlQuery],
+        ['StructuredEnglish', string]
+    ]>;
     functions?: Record<string, {
         type: 'trigger';
         body: string;
@@ -367,6 +394,9 @@ export interface EngineInstance {
     compileRule: (abstractSQL: AbstractSqlQuery) => SqlResult | [SqlResult, SqlResult];
     dataTypeValidate: (value: any, field: Pick<AbstractSqlField, 'dataType' | 'required'>) => Promise<any>;
     getReferencedFields: (ruleBody: AbstractSqlQuery) => ReferencedFields;
+    /**
+     * This gets referenced fields for a query that is expected to always return true and only return fields that could change it to false
+     */
     getRuleReferencedFields: (ruleBody: AbstractSqlQuery) => RuleReferencedFields;
     getModifiedFields: (abstractSqlQuery: AbstractSqlQuery) => undefined | ModifiedFields | Array<undefined | ModifiedFields>;
 }
@@ -378,6 +408,12 @@ export declare const isSelectQueryNode: (n: AbstractSqlType) => n is SelectQuery
 export declare const isSelectNode: (n: AbstractSqlType) => n is SelectNode;
 export declare const isWhereNode: (n: AbstractSqlType) => n is WhereNode;
 export declare const isFieldTypeNode: (n: AbstractSqlType) => n is FieldNode | ReferencedFieldNode;
+/**
+ *
+ * @param n The abstract sql to check
+ * @param checkNodeTypeFn A function that checks if a given node is the correct type
+ */
+export declare const abstractSqlContainsNode: (n: AnyTypeNodes, checkNodeTypeFn: (n: AnyTypeNodes) => boolean) => boolean;
 export declare function compileRule(abstractSQL: UpsertQueryNode, engine: Engines, noBinds: true): [string, string];
 export declare function compileRule(abstractSQL: AbstractSqlQuery, engine: Engines, noBinds: true): string;
 export declare function compileRule(abstractSQL: UpsertQueryNode, engine: Engines, noBinds?: false): [SqlResult, SqlResult];
@@ -386,7 +422,9 @@ export declare function compileRule(abstractSQL: AbstractSqlQuery, engine: Engin
 export declare function compileRule(abstractSQL: AbstractSqlQuery, engine: Engines, noBinds?: boolean): SqlResult | [SqlResult, SqlResult] | string;
 export { optimizeSchema };
 export declare const postgres: {
-    optimizeSchema: (abstractSqlModel: AbstractSqlModel, createCheckConstraints?: boolean) => AbstractSqlModel;
+    optimizeSchema: (abstractSqlModel: AbstractSqlModel, { createCheckConstraints }?: {
+        createCheckConstraints?: boolean | undefined;
+    }) => AbstractSqlModel;
     generateRuleSlug: (tableName: string, ruleBody: AbstractSqlType) => string;
     compileSchema: (abstractSqlModel: AbstractSqlModel) => SqlModel;
     compileRule: (abstractSQL: AbstractSqlQuery) => SqlResult | [SqlResult, SqlResult];
@@ -396,7 +434,9 @@ export declare const postgres: {
     getModifiedFields: (abstractSqlQuery: AbstractSqlQuery) => undefined | ModifiedFields | Array<undefined | ModifiedFields>;
 };
 export declare const mysql: {
-    optimizeSchema: (abstractSqlModel: AbstractSqlModel, createCheckConstraints?: boolean) => AbstractSqlModel;
+    optimizeSchema: (abstractSqlModel: AbstractSqlModel, { createCheckConstraints }?: {
+        createCheckConstraints?: boolean | undefined;
+    }) => AbstractSqlModel;
     generateRuleSlug: (tableName: string, ruleBody: AbstractSqlType) => string;
     compileSchema: (abstractSqlModel: AbstractSqlModel) => SqlModel;
     compileRule: (abstractSQL: AbstractSqlQuery) => SqlResult | [SqlResult, SqlResult];
@@ -406,7 +446,9 @@ export declare const mysql: {
     getModifiedFields: (abstractSqlQuery: AbstractSqlQuery) => undefined | ModifiedFields | Array<undefined | ModifiedFields>;
 };
 export declare const websql: {
-    optimizeSchema: (abstractSqlModel: AbstractSqlModel, createCheckConstraints?: boolean) => AbstractSqlModel;
+    optimizeSchema: (abstractSqlModel: AbstractSqlModel, { createCheckConstraints }?: {
+        createCheckConstraints?: boolean | undefined;
+    }) => AbstractSqlModel;
     generateRuleSlug: (tableName: string, ruleBody: AbstractSqlType) => string;
     compileSchema: (abstractSqlModel: AbstractSqlModel) => SqlModel;
     compileRule: (abstractSQL: AbstractSqlQuery) => SqlResult | [SqlResult, SqlResult];

package/out/{AbstractSQLCompiler.js → abstract-sql-compiler.js}

@@ -1,14 +1,16 @@
 export var Engines;
 (function (Engines) {
+    /* eslint-disable @typescript-eslint/no-shadow -- this is fine since we only assign plain string values to the enum items */
     Engines["postgres"] = "postgres";
     Engines["mysql"] = "mysql";
     Engines["websql"] = "websql";
+    /* eslint-enable @typescript-eslint/no-shadow */
 })(Engines || (Engines = {}));
-import { AbstractSQLOptimiser } from './AbstractSQLOptimiser.js';
-import { AbstractSQLRules2SQL } from './AbstractSQLRules2SQL.js';
+import { AbstractSQLOptimizer } from './abstract-sql-optimizer.js';
+import { AbstractSQLRules2SQL } from './abstract-sql-rules-to-sql.js';
 import $sbvrTypes from '@balena/sbvr-types';
 const { default: sbvrTypes } = $sbvrTypes;
-import { optimizeSchema, generateRuleSlug, } from './AbstractSQLSchemaOptimiser.js';
+import { optimizeSchema, generateRuleSlug, } from './abstract-sql-schema-optimizer.js';
 import { getReferencedFields, getRuleReferencedFields, getModifiedFields, insertAffectedIdsBinds, } from './referenced-fields.js';
 const validateTypes = (() => {
     const result = {};
@@ -18,7 +20,10 @@ const validateTypes = (() => {
     return result;
 })();
 const dataTypeValidate = async (value, field) => {
+    // In case one of the validation types throws an error.
     const { dataType, required = false } = field;
+    // Without the `: SbvrType['validate']` widening TS complains that
+    // "none of those signatures are compatible with each other".
     const validateFn = validateTypes[dataType];
     if (validateFn != null) {
         return validateFn(value, required);
@@ -74,23 +79,31 @@ export const isSelectQueryNode = (n) => n[0] === 'SelectQuery';
 export const isSelectNode = (n) => n[0] === 'Select';
 export const isWhereNode = (n) => n[0] === 'Where';
 export const isFieldTypeNode = (n) => n[0] === 'ReferencedField' || n[0] === 'Field';
-const containsNode = (n, checkNodeTypeFn) => {
+/**
+ *
+ * @param n The abstract sql to check
+ * @param checkNodeTypeFn A function that checks if a given node is the correct type
+ */
+export const abstractSqlContainsNode = (n, checkNodeTypeFn) => {
     if (checkNodeTypeFn(n)) {
         return true;
     }
     for (const p of n) {
-        if (Array.isArray(p) && containsNode(p, checkNodeTypeFn)) {
+        if (Array.isArray(p) &&
+            abstractSqlContainsNode(p, checkNodeTypeFn)) {
             return true;
         }
     }
     return false;
 };
 export function compileRule(abstractSQL, engine, noBinds = false) {
-    abstractSQL = AbstractSQLOptimiser(abstractSQL, noBinds);
+    abstractSQL = AbstractSQLOptimizer(abstractSQL, noBinds);
     return AbstractSQLRules2SQL(abstractSQL, engine, noBinds);
 }
 const compileSchema = (abstractSqlModel, engine, ifNotExists) => {
-    abstractSqlModel = optimizeSchema(abstractSqlModel, false);
+    abstractSqlModel = optimizeSchema(abstractSqlModel, {
+        createCheckConstraints: false,
+    });
     let ifNotExistsStr = '';
     let orReplaceStr = '';
     if (ifNotExists) {
@@ -104,7 +117,7 @@ const compileSchema = (abstractSqlModel, engine, ifNotExists) => {
     if (abstractSqlModel.functions) {
         for (const fnName of Object.keys(abstractSqlModel.functions)) {
             const fnDefinition = abstractSqlModel.functions[fnName];
-            if (engine !== "postgres") {
+            if (engine !== "postgres" /* Engines.postgres */) {
                 throw new Error('Functions are only supported on postgres currently');
             }
             if (fnDefinition.language !== 'plpgsql') {
@@ -148,10 +161,12 @@ $$;`);
         }
         if (viewDefinition != null) {
             let definitionAbstractSql = viewDefinition.abstractSql;
-            if (containsNode(definitionAbstractSql, isResourceNode)) {
-                return;
+            // If there are any resource nodes then it's a dynamic definition and cannot become a view
+            if (abstractSqlContainsNode(definitionAbstractSql, isResourceNode)) {
+                throw new Error(`Cannot create a view from a dynamic viewDefinition, found for table resourceName: '${table.resourceName}', name: '${table.name}'`);
             }
             if (isTableNode(definitionAbstractSql)) {
+                // If the definition is a table node we need to wrap it in a select query for the view creation
                 definitionAbstractSql = [
                     'SelectQuery',
                     ['Select', [['Field', '*']]],
@@ -186,9 +201,10 @@ ${compileRule(definitionAbstractSql, engine, true).replace(/^/gm, '	')}
                     const fkDefinition = `FOREIGN KEY ("${fieldName}") REFERENCES "${referencedTable.name}" ("${references.fieldName}")`;
                     const schemaInfo = schemaDependencyMap[references.resourceName];
                     if (schemaInfo?.depends.includes(table.resourceName)) {
-                        if (engine !== "postgres") {
+                        if (engine !== "postgres" /* Engines.postgres */) {
                             throw new Error('Circular dependencies are only supported on postgres currently');
                         }
+                        // It's a simple circular dependency so we switch it to an ALTER TABLE
                         alterSchemaStatements.push(`\
 DO $$
 BEGIN
@@ -231,6 +247,7 @@ $$;`);
                         ? ` NULLS NOT DISTINCT`
                         : ` NULLS DISTINCT`;
             }
+            // Non-partial indexes are added directly to the CREATE TABLE statement
             if (index.predicate == null) {
                 createSqlElements.push(index.type + nullsSql + '("' + index.fields.join('", "') + '")');
                 continue;
@@ -266,6 +283,7 @@ ${comment}${constraintName}CHECK (${sql})`);
                 if (!fns[trigger.fnName]) {
                     throw new Error(`No such function '${trigger.fnName}' declared`);
                 }
+                // Trim the trigger name to a max of 63 characters
                 const triggerName = `${table.name}_${trigger.fnName}`.slice(0, 63);
                 createTriggers.push(`\
 DO
@@ -310,6 +328,7 @@ CREATE TABLE ${ifNotExistsStr}"${table.name}" (
             const schemaInfo = schemaDependencyMap[resourceName];
             let unsolvedDependency = false;
             for (const dependency of schemaInfo.depends) {
+                // Self-dependencies are ok.
                 if (dependency !== resourceName &&
                     Object.prototype.hasOwnProperty.call(schemaDependencyMap, dependency)) {
                     unsolvedDependency = true;
@@ -336,16 +355,15 @@ CREATE TABLE ${ifNotExistsStr}"${table.name}" (
     createSchemaStatements.push(...alterSchemaStatements);
     dropSchemaStatements = dropSchemaStatements.reverse();
     const ruleStatements = abstractSqlModel.rules.map((rule) => {
-        const ruleBodyNode = rule.find((r) => r[0] === 'Body');
-        if (ruleBodyNode == null || typeof ruleBodyNode === 'string') {
+        const [, ruleBodyNode, ruleSENode] = rule;
+        if (ruleBodyNode == null || ruleBodyNode[0] !== 'Body') {
             throw new Error('Invalid rule');
         }
         const ruleBody = ruleBodyNode[1];
         if (typeof ruleBody === 'string') {
             throw new Error('Invalid rule');
         }
-        const ruleSENode = rule.find((r) => r[0] === 'StructuredEnglish');
-        if (ruleSENode == null) {
+        if (ruleSENode == null || ruleSENode[0] !== 'StructuredEnglish') {
             throw new Error('Invalid structured English');
         }
         const ruleSE = ruleSENode[1];
@@ -398,7 +416,7 @@ const generateExport = (engine, ifNotExists) => {
     };
 };
 export { optimizeSchema };
-export const postgres = generateExport("postgres", true);
-export const mysql = generateExport("mysql", true);
-export const websql = generateExport("websql", false);
-//# sourceMappingURL=AbstractSQLCompiler.js.map
+export const postgres = generateExport("postgres" /* Engines.postgres */, true);
+export const mysql = generateExport("mysql" /* Engines.mysql */, true);
+export const websql = generateExport("websql" /* Engines.websql */, false);
+//# sourceMappingURL=abstract-sql-compiler.js.map

package/out/abstract-sql-compiler.js.map

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

package/out/abstract-sql-optimizer.d.ts

@@ -0,0 +1,2 @@
+import type { AbstractSqlQuery } from './abstract-sql-compiler.js';
+export declare const AbstractSQLOptimizer: (abstractSQL: AbstractSqlQuery, $noBinds?: boolean) => AbstractSqlQuery;