A local-first personal finance app
refactor: create index.js for aql directory (#68)
Tom French0fcfffea57ea
diff --git a/packages/loot-core/bin/profile-sql.js b/packages/loot-core/bin/profile-sql.jsindex 4842025875..a56f3f10a7 100755--- a/packages/loot-core/bin/profile-sql.js+++ b/packages/loot-core/bin/profile-sql.js@@ -4,7 +4,7 @@ import os from 'os';import * as sqlite from '../src/platform/server/sqlite';import * as db from '../src/server/db';import { batchMessages, setSyncingMode } from '../src/server/sync';-import { runQuery } from '../src/server/aql/schema/run-query';+import { runQuery } from '../src/server/aql';import asyncStorage from '../src/platform/server/asyncStorage';import { makeChild } from '../src/shared/transactions';import q from '../src/shared/query';diff --git a/packages/loot-core/bin/sql-regenerate-views b/packages/loot-core/bin/sql-regenerate-viewsindex dd71b5fefa..eaa49066dd 100755--- a/packages/loot-core/bin/sql-regenerate-views+++ b/packages/loot-core/bin/sql-regenerate-views@@ -1,5 +1,5 @@#!/usr/bin/env actual-cli-runner.js-const { schema } = require('../src/server/aql/schema');+const { schema } = require('../src/server/aql');const table = process.argv[3];if (table == null || table === 'transactions') {diff --git a/packages/loot-core/src/mocks/arbitrary-schema.js b/packages/loot-core/src/mocks/arbitrary-schema.jsindex 6b4d8d6e89..0f508f2e5b 100644--- a/packages/loot-core/src/mocks/arbitrary-schema.js+++ b/packages/loot-core/src/mocks/arbitrary-schema.js@@ -1,5 +1,5 @@import fc from 'fast-check';-import { schema } from '../server/aql/schema';+import { schema } from '../server/aql';import { addDays } from '../shared/months';function typeArbitrary(typeDesc, name) {diff --git a/packages/loot-core/src/mocks/budget.js b/packages/loot-core/src/mocks/budget.jsindex 5e03bf4e60..3143be3c2d 100644--- a/packages/loot-core/src/mocks/budget.js+++ b/packages/loot-core/src/mocks/budget.js@@ -4,7 +4,7 @@ import * as budget from '../server/budget/base';import * as db from '../server/db';import * as prefs from '../server/prefs';import * as budgetActions from '../server/budget/actions';-import { runQuery as aqlQuery } from '../server/aql/schema/run-query';+import { runQuery as aqlQuery } from '../server/aql';import { batchMessages, setSyncingMode } from '../server/sync';import { runHandler, runMutator } from '../server/mutators';import { addTransactions } from '../server/accounts/sync';diff --git a/packages/loot-core/src/server/accounts/export-to-csv.js b/packages/loot-core/src/server/accounts/export-to-csv.jsindex 64b9f6e9d8..f58e46883f 100644--- a/packages/loot-core/src/server/accounts/export-to-csv.js+++ b/packages/loot-core/src/server/accounts/export-to-csv.js@@ -1,5 +1,5 @@import csvStringify from 'csv-stringify/lib/sync';-import { runQuery as aqlQuery } from '../aql/schema/run-query';+import { runQuery as aqlQuery } from '../aql';import { integerToAmount } from '../../shared/util';export async function exportToCSV(diff --git a/packages/loot-core/src/server/accounts/transaction-rules.js b/packages/loot-core/src/server/accounts/transaction-rules.jsindex 794f428d8d..dab58d44c7 100644--- a/packages/loot-core/src/server/accounts/transaction-rules.js+++ b/packages/loot-core/src/server/accounts/transaction-rules.js@@ -21,7 +21,7 @@ import { requiredFields, toDateRepr } from '../models';import { currentDay } from '../../shared/months';import { partitionByField, fastSetMerge } from '../../shared/util';import { setSyncingMode, batchMessages } from '../sync';-import { schemaConfig } from '../aql/schema';+import { schemaConfig } from '../aql';// TODO: Detect if it looks like the user is creating a rename rule// and prompt to create it in the pre phase insteaddiff --git a/packages/loot-core/src/server/accounts/transaction-rules.test.js b/packages/loot-core/src/server/accounts/transaction-rules.test.jsindex d35653cab5..e6dc3d4134 100644--- a/packages/loot-core/src/server/accounts/transaction-rules.test.js+++ b/packages/loot-core/src/server/accounts/transaction-rules.test.js@@ -14,7 +14,7 @@ import {migrateOldRules} from './transaction-rules';import { loadMappings } from '../db/mappings';-import { runQuery } from '../aql/schema/run-query';+import { runQuery } from '../aql';import q from '../../shared/query';// TODO: write tests to make sure payee renaming is "pre" and categorydiff --git a/packages/loot-core/src/server/api.js b/packages/loot-core/src/server/api.jsindex 460fa5802c..2ca0b754f6 100644--- a/packages/loot-core/src/server/api.js+++ b/packages/loot-core/src/server/api.js@@ -20,7 +20,7 @@ import { setSyncingMode, batchMessages } from './sync';import { getClock } from './crdt';import { runMutator } from './mutators';import { integerToAmount } from '../shared/util';-import { runQuery as aqlQuery } from './aql/schema/run-query';+import { runQuery as aqlQuery } from './aql';import q from '../shared/query';const connection = require('../platform/server/connection');diff --git a/packages/loot-core/src/server/aql/index.js b/packages/loot-core/src/server/aql/index.jsnew file mode 100644index 0000000000..2337f2b06e--- /dev/null+++ b/packages/loot-core/src/server/aql/index.js@@ -0,0 +1,10 @@+export {+ convertForInsert,+ convertForUpdate,+ convertFromSelect,+ convertInputType,+} from './schema-helpers';+export { compileQuery } from "./compiler";+export { makeViews } from "./views";+export { schema, schemaConfig } from "./schema";+export { runQuery, runCompiledQuery } from "./schema/run-query";diff --git a/packages/loot-core/src/server/db/index.js b/packages/loot-core/src/server/db/index.jsindex 249ec845b0..8c9813e1ad 100644--- a/packages/loot-core/src/server/db/index.js+++ b/packages/loot-core/src/server/db/index.js@@ -2,7 +2,7 @@ import LRU from 'lru-cache';import * as sqlite from '../../platform/server/sqlite';import fs from '../../platform/server/fs';import { sendMessages, batchMessages } from '../sync';-import { schema, schemaConfig } from '../aql/schema';+import { schema, schemaConfig } from '../aql';import {accountModel,categoryModel,@@ -23,7 +23,7 @@ import {convertForInsert,convertForUpdate,convertFromSelect-} from '../aql/schema-helpers';+} from '../aql';import { shoveSortOrders, SORT_INCREMENT } from './sort';export { toDateRepr, fromDateRepr } from '../models';diff --git a/packages/loot-core/src/server/main.js b/packages/loot-core/src/server/main.jsindex ac80260f6f..6eca6a1cf4 100644--- a/packages/loot-core/src/server/main.js+++ b/packages/loot-core/src/server/main.js@@ -64,9 +64,8 @@ import * as tracking from './tracking/events';import { get, post } from './post';import { APIError, TransactionError, PostError, RuleError } from './errors';import { createTestBudget } from '../mocks/budget';-import { runQuery as aqlQuery } from './aql/schema/run-query';-import { Query } from '../shared/query';-import q from '../shared/query';+import { runQuery as aqlQuery } from './aql';+import q, { Query } from '../shared/query';import app from './main-app';// Appsdiff --git a/packages/loot-core/src/server/schedules/app.js b/packages/loot-core/src/server/schedules/app.jsindex 062490e71a..34f6994677 100644--- a/packages/loot-core/src/server/schedules/app.js+++ b/packages/loot-core/src/server/schedules/app.js@@ -4,7 +4,7 @@ import { createApp } from '../app';import * as db from '../db';import * as prefs from '../prefs';import { toDateRepr } from '../models';-import { runQuery as aqlQuery } from '../aql/schema/run-query';+import { runQuery as aqlQuery } from '../aql';import { dayFromDate, currentDay, parseDate } from '../../shared/months';import q from '../../shared/query';import {diff --git a/packages/loot-core/src/server/schedules/app.test.js b/packages/loot-core/src/server/schedules/app.test.jsindex 916244cb56..5ba23b2047 100644--- a/packages/loot-core/src/server/schedules/app.test.js+++ b/packages/loot-core/src/server/schedules/app.test.js@@ -1,4 +1,4 @@-import { runQuery as aqlQuery } from '../aql/schema/run-query';+import { runQuery as aqlQuery } from '../aql';import q from '../../shared/query';import { loadRules, updateRule } from '../accounts/transaction-rules';import { loadMappings } from '../db/mappings';diff --git a/packages/loot-core/src/server/schedules/find-schedules.js b/packages/loot-core/src/server/schedules/find-schedules.jsindex 6432f0b207..b40edad6df 100644--- a/packages/loot-core/src/server/schedules/find-schedules.js+++ b/packages/loot-core/src/server/schedules/find-schedules.js@@ -3,7 +3,7 @@ import * as db from '../db';import { Schedule as RSchedule } from '../util/rschedule';import { groupBy } from '../../shared/util';import { fromDateRepr } from '../models';-import { runQuery as aqlQuery } from '../aql/schema/run-query';+import { runQuery as aqlQuery } from '../aql';import q from '../../shared/query';import { getApproxNumberThreshold } from '../../shared/rules';import { recurConfigToRSchedule } from '../../shared/schedules';diff --git a/packages/loot-core/src/server/spreadsheet/spreadsheet.js b/packages/loot-core/src/server/spreadsheet/spreadsheet.jsindex 49de21d40c..c24ccd1ee0 100644--- a/packages/loot-core/src/server/spreadsheet/spreadsheet.js+++ b/packages/loot-core/src/server/spreadsheet/spreadsheet.js@@ -1,7 +1,5 @@import mitt from 'mitt';-import { schema, schemaConfig } from '../aql/schema';-import { compileQuery } from '../aql/compiler';-import { runCompiledQuery } from '../aql/schema/run-query';+import { compileQuery, runCompiledQuery, schema, schemaConfig } from '../aql';const Graph = require('./graph-data-structure');const { unresolveName, resolveName } = require('./util');diff --git a/packages/loot-core/src/server/sync/migrate.test.js b/packages/loot-core/src/server/sync/migrate.test.jsindex 5286c59540..9a335615ac 100644--- a/packages/loot-core/src/server/sync/migrate.test.js+++ b/packages/loot-core/src/server/sync/migrate.test.js@@ -3,9 +3,8 @@ import * as db from '../db';import { listen, unlisten } from './migrate';import { addSyncListener, sendMessages } from './index';import { execTracer } from '../../shared/test-helpers';-import { schema, schemaConfig } from '../aql/schema';+import { convertInputType, schema, schemaConfig } from '../aql';import arbs from '../../mocks/arbitrary-schema';-import { convertInputType } from '../aql/schema-helpers';beforeEach(() => {listen();diff --git a/packages/loot-core/src/server/update.js b/packages/loot-core/src/server/update.jsindex f108a1a1cb..f4e6459743 100644--- a/packages/loot-core/src/server/update.js+++ b/packages/loot-core/src/server/update.js@@ -1,8 +1,7 @@import md5 from 'md5';import * as migrations from './migrate/migrations';import * as db from './db';-import { schema, schemaConfig } from './aql/schema';-import { makeViews } from './aql/views';+import { schema, schemaConfig, makeViews } from './aql';// Managing the init/update process