@axium/server 0.44.3 → 0.44.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/build.js +22 -10
- package/dist/cli/db.js +15 -34
- package/dist/cli/index.js +4 -10
- package/dist/db/data.d.ts +7 -7
- package/dist/db/data.js +1 -2
- package/dist/db/delta.d.ts +6 -6
- package/dist/db/delta.js +129 -65
- package/dist/db/index.d.ts +1 -1
- package/dist/db/index.js +25 -42
- package/dist/db/schema.d.ts +6 -5
- package/dist/db/schema.js +1 -0
- package/dist/io.js +10 -25
- package/dist/main.js +1 -0
- package/dist/serve.d.ts +0 -4
- package/dist/serve.js +0 -4
- package/package.json +2 -2
- package/schemas/db.json +8 -8
package/dist/build.js
CHANGED
|
@@ -2,11 +2,12 @@ import nodeAdapter from '@sveltejs/adapter-node';
|
|
|
2
2
|
import { svelte as viteSveltePlugin } from '@sveltejs/vite-plugin-svelte';
|
|
3
3
|
import { exit } from 'ioium/node';
|
|
4
4
|
import { findPackageJSON } from 'node:module';
|
|
5
|
+
import { devNull } from 'node:os';
|
|
5
6
|
import { join } from 'node:path';
|
|
6
7
|
import { fileURLToPath } from 'node:url';
|
|
8
|
+
import { pick } from 'utilium';
|
|
7
9
|
import { build as buildVite } from 'vite';
|
|
8
10
|
import config from './config.js';
|
|
9
|
-
import { pick } from 'utilium';
|
|
10
11
|
const sveltekitPackageJSON = findPackageJSON('@sveltejs/kit', import.meta.url);
|
|
11
12
|
if (!sveltekitPackageJSON)
|
|
12
13
|
exit('Could not resolve @sveltejs/kit package.', 6);
|
|
@@ -29,7 +30,7 @@ const svelteConfig = processSvelteConfig({
|
|
|
29
30
|
appTemplate: join(import.meta.dirname, '../template.html'),
|
|
30
31
|
routes: config.web.routes,
|
|
31
32
|
hooks: {
|
|
32
|
-
universal:
|
|
33
|
+
universal: devNull,
|
|
33
34
|
client: join(import.meta.dirname, '../.hooks.js'),
|
|
34
35
|
},
|
|
35
36
|
},
|
|
@@ -75,12 +76,23 @@ const __axiumNestedConfig = {
|
|
|
75
76
|
build: {},
|
|
76
77
|
};
|
|
77
78
|
Object.assign(globalThis, { __axiumNestedConfig });
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
79
|
+
const decoder = new TextDecoder();
|
|
80
|
+
function overrideWrite(originalWrite) {
|
|
81
|
+
return {
|
|
82
|
+
write(chunk, encoding, cb) {
|
|
83
|
+
const { stack } = new Error();
|
|
84
|
+
if (!stack?.includes('svelte') &&
|
|
85
|
+
!stack?.includes('vite') &&
|
|
86
|
+
!(typeof chunk == 'string' ? chunk : decoder.decode(chunk)).includes('No Svelte config file')) {
|
|
87
|
+
return originalWrite(chunk, encoding, cb);
|
|
88
|
+
}
|
|
89
|
+
if (typeof encoding === 'function')
|
|
90
|
+
cb = encoding;
|
|
91
|
+
if (cb)
|
|
92
|
+
cb();
|
|
93
|
+
return true;
|
|
94
|
+
},
|
|
95
|
+
};
|
|
84
96
|
}
|
|
85
97
|
export async function build(options = {}) {
|
|
86
98
|
const stdoutWrite = process.stdout.write.bind(process.stdout);
|
|
@@ -91,8 +103,8 @@ export async function build(options = {}) {
|
|
|
91
103
|
__axiumNestedConfig.logLevel = 'info';
|
|
92
104
|
}
|
|
93
105
|
else {
|
|
94
|
-
Object.assign(process.stdout,
|
|
95
|
-
Object.assign(process.stderr,
|
|
106
|
+
Object.assign(process.stdout, overrideWrite(stdoutWrite));
|
|
107
|
+
Object.assign(process.stderr, overrideWrite(stderrWrite));
|
|
96
108
|
}
|
|
97
109
|
viteConfig.build.minify = options.minify;
|
|
98
110
|
__axiumNestedConfig.build.minify = options.minify;
|
package/dist/cli/db.js
CHANGED
|
@@ -54,7 +54,7 @@ import { Option, program } from 'commander';
|
|
|
54
54
|
import * as io from 'ioium/node';
|
|
55
55
|
import { createWriteStream } from 'node:fs';
|
|
56
56
|
import { styleText } from 'node:util';
|
|
57
|
-
import { capitalize } from 'utilium';
|
|
57
|
+
import { _throw, capitalize } from 'utilium';
|
|
58
58
|
import * as z from 'zod';
|
|
59
59
|
import { sharedOptions as opts, rlConfirm } from './common.js';
|
|
60
60
|
import * as db from '../db/index.js';
|
|
@@ -126,15 +126,10 @@ axiumDB
|
|
|
126
126
|
await db._sql('REVOKE ALL PRIVILEGES ON SCHEMA public FROM axium', 'Revoking schema privileges');
|
|
127
127
|
await db._sql('DROP USER axium', 'Dropping user');
|
|
128
128
|
await db
|
|
129
|
-
.getHBA(
|
|
129
|
+
.getHBA()
|
|
130
130
|
.then(([content, writeBack]) => {
|
|
131
|
-
io.
|
|
132
|
-
|
|
133
|
-
throw 'missing.';
|
|
134
|
-
io.done();
|
|
135
|
-
io.start('Removing Axium HBA configuration');
|
|
136
|
-
const newContent = content.replace(db._pgHba, '');
|
|
137
|
-
io.done();
|
|
131
|
+
io.track('Checking for Axium HBA configuration', () => !content.includes(db._pgHba) && _throw('missing.'));
|
|
132
|
+
const newContent = io.track('Removing Axium HBA configuration', () => content.replace(db._pgHba, ''));
|
|
138
133
|
writeBack(newContent);
|
|
139
134
|
})
|
|
140
135
|
.catch(io.warn);
|
|
@@ -176,8 +171,8 @@ axiumDB
|
|
|
176
171
|
.action(async (opt) => {
|
|
177
172
|
const env_2 = { stack: [], error: void 0, hasError: false };
|
|
178
173
|
try {
|
|
179
|
-
await io.
|
|
180
|
-
await io.
|
|
174
|
+
await io.runShell('Checking for sudo', 'which sudo');
|
|
175
|
+
await io.runShell('Checking for psql', 'which psql');
|
|
181
176
|
const throwUnlessRows = (text) => {
|
|
182
177
|
if (text.includes('(0 rows)'))
|
|
183
178
|
throw 'missing.';
|
|
@@ -185,27 +180,15 @@ axiumDB
|
|
|
185
180
|
};
|
|
186
181
|
await db._sql(`SELECT 1 FROM pg_database WHERE datname = 'axium'`, 'Checking for database').then(throwUnlessRows);
|
|
187
182
|
await db._sql(`SELECT 1 FROM pg_roles WHERE rolname = 'axium'`, 'Checking for user').then(throwUnlessRows);
|
|
188
|
-
io.
|
|
189
|
-
const
|
|
190
|
-
io.done();
|
|
191
|
-
io.start('Getting schema metadata');
|
|
192
|
-
const schemas = await db.database.introspection.getSchemas();
|
|
193
|
-
io.done();
|
|
183
|
+
const _ = __addDisposableResource(env_2, io.track('Connecting to database', db.connect), true);
|
|
184
|
+
const schemas = await io.track('Getting schema metadata', db.database.introspection.getSchemas());
|
|
194
185
|
io.start('Checking for acl schema');
|
|
195
186
|
if (!schemas.find(s => s.name == 'acl'))
|
|
196
187
|
io.exit('missing.');
|
|
197
188
|
io.done();
|
|
198
|
-
io.
|
|
199
|
-
const tablePromises = await Promise.all([
|
|
200
|
-
db.database.introspection.getTables(),
|
|
201
|
-
db.database.withSchema('acl').introspection.getTables(),
|
|
202
|
-
]);
|
|
203
|
-
const tableMetadata = tablePromises.flat();
|
|
189
|
+
const tableMetadata = await io.track('Getting table metadata', Promise.all([db.database.introspection.getTables(), db.database.withSchema('acl').introspection.getTables()]).then(md => md.flat()));
|
|
204
190
|
const tables = Object.fromEntries(tableMetadata.map(t => [t.schema == 'public' ? t.name : `${t.schema}.${t.name}`, t]));
|
|
205
|
-
io.
|
|
206
|
-
io.start('Resolving database schemas');
|
|
207
|
-
const schema = db.schema.getFull();
|
|
208
|
-
io.done();
|
|
191
|
+
const schema = io.track('Resolving database schemas', () => db.schema.getFull());
|
|
209
192
|
for (const [name, table] of Object.entries(schema.tables)) {
|
|
210
193
|
await db.checkTableTypes(name, table, opt, tableMetadata);
|
|
211
194
|
delete tables[name];
|
|
@@ -216,8 +199,10 @@ axiumDB
|
|
|
216
199
|
io.done();
|
|
217
200
|
else if (opt.strict)
|
|
218
201
|
io.exit(unchecked);
|
|
219
|
-
else
|
|
202
|
+
else {
|
|
203
|
+
io.done(true);
|
|
220
204
|
io.warn(unchecked);
|
|
205
|
+
}
|
|
221
206
|
}
|
|
222
207
|
catch (e_2) {
|
|
223
208
|
env_2.error = e_2;
|
|
@@ -295,12 +280,8 @@ axiumDB
|
|
|
295
280
|
io.warn('--abort: Changes will be rolled back instead of being committed.');
|
|
296
281
|
}
|
|
297
282
|
await rlConfirm();
|
|
298
|
-
io.
|
|
299
|
-
|
|
300
|
-
io.done();
|
|
301
|
-
io.start('Validating delta');
|
|
302
|
-
db.delta.validate(delta);
|
|
303
|
-
io.done();
|
|
283
|
+
const delta = io.track('Computing delta', () => db.delta.collapse(deltas));
|
|
284
|
+
io.track('Validating delta', () => db.delta.validate(delta));
|
|
304
285
|
console.log('Applying delta.');
|
|
305
286
|
await db.delta.apply(delta, opt.abort);
|
|
306
287
|
info.upgrades.push({ timestamp: new Date(), from, to });
|
package/dist/cli/index.js
CHANGED
|
@@ -181,12 +181,8 @@ program
|
|
|
181
181
|
unlinkRoutes(linkOpts);
|
|
182
182
|
return;
|
|
183
183
|
}
|
|
184
|
-
io.
|
|
185
|
-
|
|
186
|
-
io.done();
|
|
187
|
-
io.start('Writing web client hooks for plugins');
|
|
188
|
-
writePluginHooks();
|
|
189
|
-
io.done();
|
|
184
|
+
io.track('Linking routes', () => linkRoutes(linkOpts));
|
|
185
|
+
io.track('Writing web client hooks for plugins', () => writePluginHooks());
|
|
190
186
|
});
|
|
191
187
|
program
|
|
192
188
|
.command('audit')
|
|
@@ -240,9 +236,7 @@ program
|
|
|
240
236
|
.option('-s, --diagnostics', 'Show build time and bundle size')
|
|
241
237
|
.option('-m, --no-minify', 'Whether to use minification')
|
|
242
238
|
.action(async (options) => {
|
|
243
|
-
io.
|
|
244
|
-
const { time, size } = await build(options);
|
|
245
|
-
io.done();
|
|
239
|
+
const { time, size } = await io.track('Building', build(options));
|
|
246
240
|
if (options.diagnostics) {
|
|
247
241
|
console.log('Took', styleText('blueBright', formatMs(time)), 'with a bundle size of', styleText('blueBright', formatBytes(size)));
|
|
248
242
|
}
|
|
@@ -264,7 +258,7 @@ program
|
|
|
264
258
|
server?.close();
|
|
265
259
|
process.stdout.clearLine(0);
|
|
266
260
|
process.stdout.cursorTo(0);
|
|
267
|
-
|
|
261
|
+
process.stdout.write('Building...');
|
|
268
262
|
const { time } = await build({ minify: false });
|
|
269
263
|
buildId++;
|
|
270
264
|
process.stdout.clearLine(0);
|
package/dist/db/data.d.ts
CHANGED
|
@@ -5,8 +5,8 @@
|
|
|
5
5
|
import { type ColumnDefinitionBuilder, type Generated } from 'kysely';
|
|
6
6
|
import type { Tuple } from 'utilium';
|
|
7
7
|
import * as z from 'zod';
|
|
8
|
-
declare const numberTypes: readonly ["integer", "int2", "int4", "
|
|
9
|
-
declare const bigintTypes: readonly ["bigint", "bigserial"];
|
|
8
|
+
declare const numberTypes: readonly ["integer", "int2", "int4", "smallint", "real", "double precision", "float4", "float8", "decimal", "numeric", "serial"];
|
|
9
|
+
declare const bigintTypes: readonly ["int8", "bigint", "bigserial"];
|
|
10
10
|
declare const booleanTypes: readonly ["boolean", "bool"];
|
|
11
11
|
declare const stringTypes: readonly ["varchar", "char", "text"];
|
|
12
12
|
declare const dateTypes: readonly ["date", "datetime", "time", "timetz", "timestamp", "timestamptz"];
|
|
@@ -14,12 +14,12 @@ declare const binaryTypes: readonly ["binary", "bytea", "varbinary", "blob"];
|
|
|
14
14
|
declare const numericRangeTypes: readonly ["int4range", "numrange"];
|
|
15
15
|
declare const stringRangeTypes: readonly ["tsrange", "tstzrange", "daterange"];
|
|
16
16
|
declare const multirangeTypes: readonly ["int4multirange", "int8multirange", "nummultirange", "tsmultirange", "tstzmultirange", "datemultirange"];
|
|
17
|
-
declare const _primitive: z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "
|
|
18
|
-
declare const _ColumnType: z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "
|
|
19
|
-
export declare const ColumnType: z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "
|
|
17
|
+
declare const _primitive: z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "smallint" | "real" | "double precision" | "float4" | "float8" | "decimal" | "numeric" | "serial" | "int8" | "bigserial" | "bool" | "varchar" | "char" | "text" | "datetime" | "time" | "timetz" | "timestamp" | "timestamptz" | "bytea" | "varbinary" | "blob" | "int4range" | "numrange" | "tsrange" | "tstzrange" | "daterange" | "int4multirange" | "int8multirange" | "nummultirange" | "tsmultirange" | "tstzmultirange" | "datemultirange" | "json" | "jsonb">;
|
|
18
|
+
declare const _ColumnType: z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "smallint" | "real" | "double precision" | "float4" | "float8" | "decimal" | "numeric" | "serial" | "int8" | "bigserial" | "bool" | "varchar" | "char" | "text" | "datetime" | "time" | "timetz" | "timestamp" | "timestamptz" | "bytea" | "varbinary" | "blob" | "int4range" | "numrange" | "tsrange" | "tstzrange" | "daterange" | "int4multirange" | "int8multirange" | "nummultirange" | "tsmultirange" | "tstzmultirange" | "datemultirange" | "json" | "jsonb">, z.ZodTemplateLiteral<`binary(${number})` | `varchar(${number})` | `char(${number})` | `datetime(${number})` | `time(${number})` | `timetz(${number})` | `timestamp(${number})` | `timestamptz(${number})` | `varbinary(${number})`>, z.ZodTemplateLiteral<`decimal(${number},${number})` | `decimal(${number}, ${number})` | `numeric(${number},${number})` | `numeric(${number}, ${number})`>]>;
|
|
19
|
+
export declare const ColumnType: z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "smallint" | "real" | "double precision" | "float4" | "float8" | "decimal" | "numeric" | "serial" | "int8" | "bigserial" | "bool" | "varchar" | "char" | "text" | "datetime" | "time" | "timetz" | "timestamp" | "timestamptz" | "bytea" | "varbinary" | "blob" | "int4range" | "numrange" | "tsrange" | "tstzrange" | "daterange" | "int4multirange" | "int8multirange" | "nummultirange" | "tsmultirange" | "tstzmultirange" | "datemultirange" | "json" | "jsonb">, z.ZodTemplateLiteral<`binary(${number})` | `varchar(${number})` | `char(${number})` | `datetime(${number})` | `time(${number})` | `timetz(${number})` | `timestamp(${number})` | `timestamptz(${number})` | `varbinary(${number})`>, z.ZodTemplateLiteral<`decimal(${number},${number})` | `decimal(${number}, ${number})` | `numeric(${number},${number})` | `numeric(${number}, ${number})`>]>, z.ZodTemplateLiteral<"bigint[]" | "boolean[]" | "uuid[]" | "date[]" | "binary[]" | "integer[]" | "int2[]" | "int4[]" | "smallint[]" | "real[]" | "double precision[]" | "float4[]" | "float8[]" | "decimal[]" | "numeric[]" | "serial[]" | "int8[]" | "bigserial[]" | "bool[]" | "varchar[]" | "char[]" | "text[]" | "datetime[]" | "time[]" | "timetz[]" | "timestamp[]" | "timestamptz[]" | "bytea[]" | "varbinary[]" | "blob[]" | "int4range[]" | "numrange[]" | "tsrange[]" | "tstzrange[]" | "daterange[]" | "int4multirange[]" | "int8multirange[]" | "nummultirange[]" | "tsmultirange[]" | "tstzmultirange[]" | "datemultirange[]" | "json[]" | "jsonb[]" | `binary(${number})[]` | `varchar(${number})[]` | `char(${number})[]` | `datetime(${number})[]` | `time(${number})[]` | `timetz(${number})[]` | `timestamp(${number})[]` | `timestamptz(${number})[]` | `varbinary(${number})[]` | `decimal(${number},${number})[]` | `decimal(${number}, ${number})[]` | `numeric(${number},${number})[]` | `numeric(${number}, ${number})[]` | `bigint[${number}]` | `boolean[${number}]` | `uuid[${number}]` | `date[${number}]` | `binary[${number}]` | `integer[${number}]` | `int2[${number}]` | `int4[${number}]` | `smallint[${number}]` | `real[${number}]` | `double precision[${number}]` | `float4[${number}]` | `float8[${number}]` | `decimal[${number}]` | `numeric[${number}]` | `serial[${number}]` | `int8[${number}]` | `bigserial[${number}]` | `bool[${number}]` | `varchar[${number}]` | `char[${number}]` | `text[${number}]` | `datetime[${number}]` | `time[${number}]` | `timetz[${number}]` | `timestamp[${number}]` | `timestamptz[${number}]` | `bytea[${number}]` | `varbinary[${number}]` | `blob[${number}]` | `int4range[${number}]` | `numrange[${number}]` | `tsrange[${number}]` | `tstzrange[${number}]` | `daterange[${number}]` | `int4multirange[${number}]` | `int8multirange[${number}]` | `nummultirange[${number}]` | `tsmultirange[${number}]` | `tstzmultirange[${number}]` | `datemultirange[${number}]` | `json[${number}]` | `jsonb[${number}]` | `binary(${number})[${number}]` | `varchar(${number})[${number}]` | `char(${number})[${number}]` | `datetime(${number})[${number}]` | `time(${number})[${number}]` | `timetz(${number})[${number}]` | `timestamp(${number})[${number}]` | `timestamptz(${number})[${number}]` | `varbinary(${number})[${number}]` | `decimal(${number},${number})[${number}]` | `decimal(${number}, ${number})[${number}]` | `numeric(${number},${number})[${number}]` | `numeric(${number}, ${number})[${number}]`>]>;
|
|
20
20
|
export type ColumnType = z.infer<typeof ColumnType>;
|
|
21
21
|
export declare const Column: z.ZodObject<{
|
|
22
|
-
type: z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "
|
|
22
|
+
type: z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "smallint" | "real" | "double precision" | "float4" | "float8" | "decimal" | "numeric" | "serial" | "int8" | "bigserial" | "bool" | "varchar" | "char" | "text" | "datetime" | "time" | "timetz" | "timestamp" | "timestamptz" | "bytea" | "varbinary" | "blob" | "int4range" | "numrange" | "tsrange" | "tstzrange" | "daterange" | "int4multirange" | "int8multirange" | "nummultirange" | "tsmultirange" | "tstzmultirange" | "datemultirange" | "json" | "jsonb">, z.ZodTemplateLiteral<`binary(${number})` | `varchar(${number})` | `char(${number})` | `datetime(${number})` | `time(${number})` | `timetz(${number})` | `timestamp(${number})` | `timestamptz(${number})` | `varbinary(${number})`>, z.ZodTemplateLiteral<`decimal(${number},${number})` | `decimal(${number}, ${number})` | `numeric(${number},${number})` | `numeric(${number}, ${number})`>]>, z.ZodTemplateLiteral<"bigint[]" | "boolean[]" | "uuid[]" | "date[]" | "binary[]" | "integer[]" | "int2[]" | "int4[]" | "smallint[]" | "real[]" | "double precision[]" | "float4[]" | "float8[]" | "decimal[]" | "numeric[]" | "serial[]" | "int8[]" | "bigserial[]" | "bool[]" | "varchar[]" | "char[]" | "text[]" | "datetime[]" | "time[]" | "timetz[]" | "timestamp[]" | "timestamptz[]" | "bytea[]" | "varbinary[]" | "blob[]" | "int4range[]" | "numrange[]" | "tsrange[]" | "tstzrange[]" | "daterange[]" | "int4multirange[]" | "int8multirange[]" | "nummultirange[]" | "tsmultirange[]" | "tstzmultirange[]" | "datemultirange[]" | "json[]" | "jsonb[]" | `binary(${number})[]` | `varchar(${number})[]` | `char(${number})[]` | `datetime(${number})[]` | `time(${number})[]` | `timetz(${number})[]` | `timestamp(${number})[]` | `timestamptz(${number})[]` | `varbinary(${number})[]` | `decimal(${number},${number})[]` | `decimal(${number}, ${number})[]` | `numeric(${number},${number})[]` | `numeric(${number}, ${number})[]` | `bigint[${number}]` | `boolean[${number}]` | `uuid[${number}]` | `date[${number}]` | `binary[${number}]` | `integer[${number}]` | `int2[${number}]` | `int4[${number}]` | `smallint[${number}]` | `real[${number}]` | `double precision[${number}]` | `float4[${number}]` | `float8[${number}]` | `decimal[${number}]` | `numeric[${number}]` | `serial[${number}]` | `int8[${number}]` | `bigserial[${number}]` | `bool[${number}]` | `varchar[${number}]` | `char[${number}]` | `text[${number}]` | `datetime[${number}]` | `time[${number}]` | `timetz[${number}]` | `timestamp[${number}]` | `timestamptz[${number}]` | `bytea[${number}]` | `varbinary[${number}]` | `blob[${number}]` | `int4range[${number}]` | `numrange[${number}]` | `tsrange[${number}]` | `tstzrange[${number}]` | `daterange[${number}]` | `int4multirange[${number}]` | `int8multirange[${number}]` | `nummultirange[${number}]` | `tsmultirange[${number}]` | `tstzmultirange[${number}]` | `datemultirange[${number}]` | `json[${number}]` | `jsonb[${number}]` | `binary(${number})[${number}]` | `varchar(${number})[${number}]` | `char(${number})[${number}]` | `datetime(${number})[${number}]` | `time(${number})[${number}]` | `timetz(${number})[${number}]` | `timestamp(${number})[${number}]` | `timestamptz(${number})[${number}]` | `varbinary(${number})[${number}]` | `decimal(${number},${number})[${number}]` | `decimal(${number}, ${number})[${number}]` | `numeric(${number},${number})[${number}]` | `numeric(${number}, ${number})[${number}]`>]>;
|
|
23
23
|
required: z.ZodDefault<z.ZodBoolean>;
|
|
24
24
|
unique: z.ZodDefault<z.ZodBoolean>;
|
|
25
25
|
primary: z.ZodDefault<z.ZodBoolean>;
|
|
@@ -55,7 +55,7 @@ export declare const Constraint: z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
|
55
55
|
export type Constraint = z.infer<typeof Constraint>;
|
|
56
56
|
export declare const Table: z.ZodObject<{
|
|
57
57
|
columns: z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
58
|
-
type: z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "
|
|
58
|
+
type: z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "smallint" | "real" | "double precision" | "float4" | "float8" | "decimal" | "numeric" | "serial" | "int8" | "bigserial" | "bool" | "varchar" | "char" | "text" | "datetime" | "time" | "timetz" | "timestamp" | "timestamptz" | "bytea" | "varbinary" | "blob" | "int4range" | "numrange" | "tsrange" | "tstzrange" | "daterange" | "int4multirange" | "int8multirange" | "nummultirange" | "tsmultirange" | "tstzmultirange" | "datemultirange" | "json" | "jsonb">, z.ZodTemplateLiteral<`binary(${number})` | `varchar(${number})` | `char(${number})` | `datetime(${number})` | `time(${number})` | `timetz(${number})` | `timestamp(${number})` | `timestamptz(${number})` | `varbinary(${number})`>, z.ZodTemplateLiteral<`decimal(${number},${number})` | `decimal(${number}, ${number})` | `numeric(${number},${number})` | `numeric(${number}, ${number})`>]>, z.ZodTemplateLiteral<"bigint[]" | "boolean[]" | "uuid[]" | "date[]" | "binary[]" | "integer[]" | "int2[]" | "int4[]" | "smallint[]" | "real[]" | "double precision[]" | "float4[]" | "float8[]" | "decimal[]" | "numeric[]" | "serial[]" | "int8[]" | "bigserial[]" | "bool[]" | "varchar[]" | "char[]" | "text[]" | "datetime[]" | "time[]" | "timetz[]" | "timestamp[]" | "timestamptz[]" | "bytea[]" | "varbinary[]" | "blob[]" | "int4range[]" | "numrange[]" | "tsrange[]" | "tstzrange[]" | "daterange[]" | "int4multirange[]" | "int8multirange[]" | "nummultirange[]" | "tsmultirange[]" | "tstzmultirange[]" | "datemultirange[]" | "json[]" | "jsonb[]" | `binary(${number})[]` | `varchar(${number})[]` | `char(${number})[]` | `datetime(${number})[]` | `time(${number})[]` | `timetz(${number})[]` | `timestamp(${number})[]` | `timestamptz(${number})[]` | `varbinary(${number})[]` | `decimal(${number},${number})[]` | `decimal(${number}, ${number})[]` | `numeric(${number},${number})[]` | `numeric(${number}, ${number})[]` | `bigint[${number}]` | `boolean[${number}]` | `uuid[${number}]` | `date[${number}]` | `binary[${number}]` | `integer[${number}]` | `int2[${number}]` | `int4[${number}]` | `smallint[${number}]` | `real[${number}]` | `double precision[${number}]` | `float4[${number}]` | `float8[${number}]` | `decimal[${number}]` | `numeric[${number}]` | `serial[${number}]` | `int8[${number}]` | `bigserial[${number}]` | `bool[${number}]` | `varchar[${number}]` | `char[${number}]` | `text[${number}]` | `datetime[${number}]` | `time[${number}]` | `timetz[${number}]` | `timestamp[${number}]` | `timestamptz[${number}]` | `bytea[${number}]` | `varbinary[${number}]` | `blob[${number}]` | `int4range[${number}]` | `numrange[${number}]` | `tsrange[${number}]` | `tstzrange[${number}]` | `daterange[${number}]` | `int4multirange[${number}]` | `int8multirange[${number}]` | `nummultirange[${number}]` | `tsmultirange[${number}]` | `tstzmultirange[${number}]` | `datemultirange[${number}]` | `json[${number}]` | `jsonb[${number}]` | `binary(${number})[${number}]` | `varchar(${number})[${number}]` | `char(${number})[${number}]` | `datetime(${number})[${number}]` | `time(${number})[${number}]` | `timetz(${number})[${number}]` | `timestamp(${number})[${number}]` | `timestamptz(${number})[${number}]` | `varbinary(${number})[${number}]` | `decimal(${number},${number})[${number}]` | `decimal(${number}, ${number})[${number}]` | `numeric(${number},${number})[${number}]` | `numeric(${number}, ${number})[${number}]`>]>;
|
|
59
59
|
required: z.ZodDefault<z.ZodBoolean>;
|
|
60
60
|
unique: z.ZodDefault<z.ZodBoolean>;
|
|
61
61
|
primary: z.ZodDefault<z.ZodBoolean>;
|
package/dist/db/data.js
CHANGED
|
@@ -8,7 +8,6 @@ const numberTypes = [
|
|
|
8
8
|
'integer',
|
|
9
9
|
'int2',
|
|
10
10
|
'int4',
|
|
11
|
-
'int8',
|
|
12
11
|
'smallint',
|
|
13
12
|
'real',
|
|
14
13
|
'double precision',
|
|
@@ -18,7 +17,7 @@ const numberTypes = [
|
|
|
18
17
|
'numeric',
|
|
19
18
|
'serial',
|
|
20
19
|
];
|
|
21
|
-
const bigintTypes = ['bigint', 'bigserial'];
|
|
20
|
+
const bigintTypes = ['int8', 'bigint', 'bigserial'];
|
|
22
21
|
const booleanTypes = ['boolean', 'bool'];
|
|
23
22
|
const stringTypes = ['varchar', 'char', 'text'];
|
|
24
23
|
const dateTypes = ['date', 'datetime', 'time', 'timetz', 'timestamp', 'timestamptz'];
|
package/dist/db/delta.d.ts
CHANGED
|
@@ -2,7 +2,7 @@ import * as z from 'zod';
|
|
|
2
2
|
import * as data from './data.js';
|
|
3
3
|
import type { SchemaDecl } from './schema.js';
|
|
4
4
|
export declare const Column: z.ZodObject<{
|
|
5
|
-
type: z.ZodOptional<z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "
|
|
5
|
+
type: z.ZodOptional<z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "smallint" | "real" | "double precision" | "float4" | "float8" | "decimal" | "numeric" | "serial" | "int8" | "bigserial" | "bool" | "varchar" | "char" | "text" | "datetime" | "time" | "timetz" | "timestamp" | "timestamptz" | "bytea" | "varbinary" | "blob" | "int4range" | "numrange" | "tsrange" | "tstzrange" | "daterange" | "int4multirange" | "int8multirange" | "nummultirange" | "tsmultirange" | "tstzmultirange" | "datemultirange" | "json" | "jsonb">, z.ZodTemplateLiteral<`binary(${number})` | `varchar(${number})` | `char(${number})` | `datetime(${number})` | `time(${number})` | `timetz(${number})` | `timestamp(${number})` | `timestamptz(${number})` | `varbinary(${number})`>, z.ZodTemplateLiteral<`decimal(${number},${number})` | `decimal(${number}, ${number})` | `numeric(${number},${number})` | `numeric(${number}, ${number})`>]>, z.ZodTemplateLiteral<"bigint[]" | "boolean[]" | "uuid[]" | "date[]" | "binary[]" | "integer[]" | "int2[]" | "int4[]" | "smallint[]" | "real[]" | "double precision[]" | "float4[]" | "float8[]" | "decimal[]" | "numeric[]" | "serial[]" | "int8[]" | "bigserial[]" | "bool[]" | "varchar[]" | "char[]" | "text[]" | "datetime[]" | "time[]" | "timetz[]" | "timestamp[]" | "timestamptz[]" | "bytea[]" | "varbinary[]" | "blob[]" | "int4range[]" | "numrange[]" | "tsrange[]" | "tstzrange[]" | "daterange[]" | "int4multirange[]" | "int8multirange[]" | "nummultirange[]" | "tsmultirange[]" | "tstzmultirange[]" | "datemultirange[]" | "json[]" | "jsonb[]" | `binary(${number})[]` | `varchar(${number})[]` | `char(${number})[]` | `datetime(${number})[]` | `time(${number})[]` | `timetz(${number})[]` | `timestamp(${number})[]` | `timestamptz(${number})[]` | `varbinary(${number})[]` | `decimal(${number},${number})[]` | `decimal(${number}, ${number})[]` | `numeric(${number},${number})[]` | `numeric(${number}, ${number})[]` | `bigint[${number}]` | `boolean[${number}]` | `uuid[${number}]` | `date[${number}]` | `binary[${number}]` | `integer[${number}]` | `int2[${number}]` | `int4[${number}]` | `smallint[${number}]` | `real[${number}]` | `double precision[${number}]` | `float4[${number}]` | `float8[${number}]` | `decimal[${number}]` | `numeric[${number}]` | `serial[${number}]` | `int8[${number}]` | `bigserial[${number}]` | `bool[${number}]` | `varchar[${number}]` | `char[${number}]` | `text[${number}]` | `datetime[${number}]` | `time[${number}]` | `timetz[${number}]` | `timestamp[${number}]` | `timestamptz[${number}]` | `bytea[${number}]` | `varbinary[${number}]` | `blob[${number}]` | `int4range[${number}]` | `numrange[${number}]` | `tsrange[${number}]` | `tstzrange[${number}]` | `daterange[${number}]` | `int4multirange[${number}]` | `int8multirange[${number}]` | `nummultirange[${number}]` | `tsmultirange[${number}]` | `tstzmultirange[${number}]` | `datemultirange[${number}]` | `json[${number}]` | `jsonb[${number}]` | `binary(${number})[${number}]` | `varchar(${number})[${number}]` | `char(${number})[${number}]` | `datetime(${number})[${number}]` | `time(${number})[${number}]` | `timetz(${number})[${number}]` | `timestamp(${number})[${number}]` | `timestamptz(${number})[${number}]` | `varbinary(${number})[${number}]` | `decimal(${number},${number})[${number}]` | `decimal(${number}, ${number})[${number}]` | `numeric(${number},${number})[${number}]` | `numeric(${number}, ${number})[${number}]`>]>>;
|
|
6
6
|
default: z.ZodOptional<z.ZodString>;
|
|
7
7
|
ops: z.ZodOptional<z.ZodArray<z.ZodLiteral<"drop_default" | "set_required" | "drop_required">>>;
|
|
8
8
|
}, z.core.$strict>;
|
|
@@ -11,7 +11,7 @@ export interface Column extends z.infer<typeof Column> {
|
|
|
11
11
|
export declare function applyToColumn(column: data.Column, delta: Column): void;
|
|
12
12
|
export declare const Table: z.ZodObject<{
|
|
13
13
|
add_columns: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
14
|
-
type: z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "
|
|
14
|
+
type: z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "smallint" | "real" | "double precision" | "float4" | "float8" | "decimal" | "numeric" | "serial" | "int8" | "bigserial" | "bool" | "varchar" | "char" | "text" | "datetime" | "time" | "timetz" | "timestamp" | "timestamptz" | "bytea" | "varbinary" | "blob" | "int4range" | "numrange" | "tsrange" | "tstzrange" | "daterange" | "int4multirange" | "int8multirange" | "nummultirange" | "tsmultirange" | "tstzmultirange" | "datemultirange" | "json" | "jsonb">, z.ZodTemplateLiteral<`binary(${number})` | `varchar(${number})` | `char(${number})` | `datetime(${number})` | `time(${number})` | `timetz(${number})` | `timestamp(${number})` | `timestamptz(${number})` | `varbinary(${number})`>, z.ZodTemplateLiteral<`decimal(${number},${number})` | `decimal(${number}, ${number})` | `numeric(${number},${number})` | `numeric(${number}, ${number})`>]>, z.ZodTemplateLiteral<"bigint[]" | "boolean[]" | "uuid[]" | "date[]" | "binary[]" | "integer[]" | "int2[]" | "int4[]" | "smallint[]" | "real[]" | "double precision[]" | "float4[]" | "float8[]" | "decimal[]" | "numeric[]" | "serial[]" | "int8[]" | "bigserial[]" | "bool[]" | "varchar[]" | "char[]" | "text[]" | "datetime[]" | "time[]" | "timetz[]" | "timestamp[]" | "timestamptz[]" | "bytea[]" | "varbinary[]" | "blob[]" | "int4range[]" | "numrange[]" | "tsrange[]" | "tstzrange[]" | "daterange[]" | "int4multirange[]" | "int8multirange[]" | "nummultirange[]" | "tsmultirange[]" | "tstzmultirange[]" | "datemultirange[]" | "json[]" | "jsonb[]" | `binary(${number})[]` | `varchar(${number})[]` | `char(${number})[]` | `datetime(${number})[]` | `time(${number})[]` | `timetz(${number})[]` | `timestamp(${number})[]` | `timestamptz(${number})[]` | `varbinary(${number})[]` | `decimal(${number},${number})[]` | `decimal(${number}, ${number})[]` | `numeric(${number},${number})[]` | `numeric(${number}, ${number})[]` | `bigint[${number}]` | `boolean[${number}]` | `uuid[${number}]` | `date[${number}]` | `binary[${number}]` | `integer[${number}]` | `int2[${number}]` | `int4[${number}]` | `smallint[${number}]` | `real[${number}]` | `double precision[${number}]` | `float4[${number}]` | `float8[${number}]` | `decimal[${number}]` | `numeric[${number}]` | `serial[${number}]` | `int8[${number}]` | `bigserial[${number}]` | `bool[${number}]` | `varchar[${number}]` | `char[${number}]` | `text[${number}]` | `datetime[${number}]` | `time[${number}]` | `timetz[${number}]` | `timestamp[${number}]` | `timestamptz[${number}]` | `bytea[${number}]` | `varbinary[${number}]` | `blob[${number}]` | `int4range[${number}]` | `numrange[${number}]` | `tsrange[${number}]` | `tstzrange[${number}]` | `daterange[${number}]` | `int4multirange[${number}]` | `int8multirange[${number}]` | `nummultirange[${number}]` | `tsmultirange[${number}]` | `tstzmultirange[${number}]` | `datemultirange[${number}]` | `json[${number}]` | `jsonb[${number}]` | `binary(${number})[${number}]` | `varchar(${number})[${number}]` | `char(${number})[${number}]` | `datetime(${number})[${number}]` | `time(${number})[${number}]` | `timetz(${number})[${number}]` | `timestamp(${number})[${number}]` | `timestamptz(${number})[${number}]` | `varbinary(${number})[${number}]` | `decimal(${number},${number})[${number}]` | `decimal(${number}, ${number})[${number}]` | `numeric(${number},${number})[${number}]` | `numeric(${number}, ${number})[${number}]`>]>;
|
|
15
15
|
required: z.ZodDefault<z.ZodBoolean>;
|
|
16
16
|
unique: z.ZodDefault<z.ZodBoolean>;
|
|
17
17
|
primary: z.ZodDefault<z.ZodBoolean>;
|
|
@@ -28,7 +28,7 @@ export declare const Table: z.ZodObject<{
|
|
|
28
28
|
}, z.core.$strict>>>>;
|
|
29
29
|
drop_columns: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString>>>;
|
|
30
30
|
alter_columns: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
31
|
-
type: z.ZodOptional<z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "
|
|
31
|
+
type: z.ZodOptional<z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "smallint" | "real" | "double precision" | "float4" | "float8" | "decimal" | "numeric" | "serial" | "int8" | "bigserial" | "bool" | "varchar" | "char" | "text" | "datetime" | "time" | "timetz" | "timestamp" | "timestamptz" | "bytea" | "varbinary" | "blob" | "int4range" | "numrange" | "tsrange" | "tstzrange" | "daterange" | "int4multirange" | "int8multirange" | "nummultirange" | "tsmultirange" | "tstzmultirange" | "datemultirange" | "json" | "jsonb">, z.ZodTemplateLiteral<`binary(${number})` | `varchar(${number})` | `char(${number})` | `datetime(${number})` | `time(${number})` | `timetz(${number})` | `timestamp(${number})` | `timestamptz(${number})` | `varbinary(${number})`>, z.ZodTemplateLiteral<`decimal(${number},${number})` | `decimal(${number}, ${number})` | `numeric(${number},${number})` | `numeric(${number}, ${number})`>]>, z.ZodTemplateLiteral<"bigint[]" | "boolean[]" | "uuid[]" | "date[]" | "binary[]" | "integer[]" | "int2[]" | "int4[]" | "smallint[]" | "real[]" | "double precision[]" | "float4[]" | "float8[]" | "decimal[]" | "numeric[]" | "serial[]" | "int8[]" | "bigserial[]" | "bool[]" | "varchar[]" | "char[]" | "text[]" | "datetime[]" | "time[]" | "timetz[]" | "timestamp[]" | "timestamptz[]" | "bytea[]" | "varbinary[]" | "blob[]" | "int4range[]" | "numrange[]" | "tsrange[]" | "tstzrange[]" | "daterange[]" | "int4multirange[]" | "int8multirange[]" | "nummultirange[]" | "tsmultirange[]" | "tstzmultirange[]" | "datemultirange[]" | "json[]" | "jsonb[]" | `binary(${number})[]` | `varchar(${number})[]` | `char(${number})[]` | `datetime(${number})[]` | `time(${number})[]` | `timetz(${number})[]` | `timestamp(${number})[]` | `timestamptz(${number})[]` | `varbinary(${number})[]` | `decimal(${number},${number})[]` | `decimal(${number}, ${number})[]` | `numeric(${number},${number})[]` | `numeric(${number}, ${number})[]` | `bigint[${number}]` | `boolean[${number}]` | `uuid[${number}]` | `date[${number}]` | `binary[${number}]` | `integer[${number}]` | `int2[${number}]` | `int4[${number}]` | `smallint[${number}]` | `real[${number}]` | `double precision[${number}]` | `float4[${number}]` | `float8[${number}]` | `decimal[${number}]` | `numeric[${number}]` | `serial[${number}]` | `int8[${number}]` | `bigserial[${number}]` | `bool[${number}]` | `varchar[${number}]` | `char[${number}]` | `text[${number}]` | `datetime[${number}]` | `time[${number}]` | `timetz[${number}]` | `timestamp[${number}]` | `timestamptz[${number}]` | `bytea[${number}]` | `varbinary[${number}]` | `blob[${number}]` | `int4range[${number}]` | `numrange[${number}]` | `tsrange[${number}]` | `tstzrange[${number}]` | `daterange[${number}]` | `int4multirange[${number}]` | `int8multirange[${number}]` | `nummultirange[${number}]` | `tsmultirange[${number}]` | `tstzmultirange[${number}]` | `datemultirange[${number}]` | `json[${number}]` | `jsonb[${number}]` | `binary(${number})[${number}]` | `varchar(${number})[${number}]` | `char(${number})[${number}]` | `datetime(${number})[${number}]` | `time(${number})[${number}]` | `timetz(${number})[${number}]` | `timestamp(${number})[${number}]` | `timestamptz(${number})[${number}]` | `varbinary(${number})[${number}]` | `decimal(${number},${number})[${number}]` | `decimal(${number}, ${number})[${number}]` | `numeric(${number},${number})[${number}]` | `numeric(${number}, ${number})[${number}]`>]>>;
|
|
32
32
|
default: z.ZodOptional<z.ZodString>;
|
|
33
33
|
ops: z.ZodOptional<z.ZodArray<z.ZodLiteral<"drop_default" | "set_required" | "drop_required">>>;
|
|
34
34
|
}, z.core.$strict>>>>;
|
|
@@ -57,7 +57,7 @@ export declare const Version: z.ZodObject<{
|
|
|
57
57
|
delta: z.ZodLiteral<true>;
|
|
58
58
|
add_tables: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
59
59
|
columns: z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
60
|
-
type: z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "
|
|
60
|
+
type: z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "smallint" | "real" | "double precision" | "float4" | "float8" | "decimal" | "numeric" | "serial" | "int8" | "bigserial" | "bool" | "varchar" | "char" | "text" | "datetime" | "time" | "timetz" | "timestamp" | "timestamptz" | "bytea" | "varbinary" | "blob" | "int4range" | "numrange" | "tsrange" | "tstzrange" | "daterange" | "int4multirange" | "int8multirange" | "nummultirange" | "tsmultirange" | "tstzmultirange" | "datemultirange" | "json" | "jsonb">, z.ZodTemplateLiteral<`binary(${number})` | `varchar(${number})` | `char(${number})` | `datetime(${number})` | `time(${number})` | `timetz(${number})` | `timestamp(${number})` | `timestamptz(${number})` | `varbinary(${number})`>, z.ZodTemplateLiteral<`decimal(${number},${number})` | `decimal(${number}, ${number})` | `numeric(${number},${number})` | `numeric(${number}, ${number})`>]>, z.ZodTemplateLiteral<"bigint[]" | "boolean[]" | "uuid[]" | "date[]" | "binary[]" | "integer[]" | "int2[]" | "int4[]" | "smallint[]" | "real[]" | "double precision[]" | "float4[]" | "float8[]" | "decimal[]" | "numeric[]" | "serial[]" | "int8[]" | "bigserial[]" | "bool[]" | "varchar[]" | "char[]" | "text[]" | "datetime[]" | "time[]" | "timetz[]" | "timestamp[]" | "timestamptz[]" | "bytea[]" | "varbinary[]" | "blob[]" | "int4range[]" | "numrange[]" | "tsrange[]" | "tstzrange[]" | "daterange[]" | "int4multirange[]" | "int8multirange[]" | "nummultirange[]" | "tsmultirange[]" | "tstzmultirange[]" | "datemultirange[]" | "json[]" | "jsonb[]" | `binary(${number})[]` | `varchar(${number})[]` | `char(${number})[]` | `datetime(${number})[]` | `time(${number})[]` | `timetz(${number})[]` | `timestamp(${number})[]` | `timestamptz(${number})[]` | `varbinary(${number})[]` | `decimal(${number},${number})[]` | `decimal(${number}, ${number})[]` | `numeric(${number},${number})[]` | `numeric(${number}, ${number})[]` | `bigint[${number}]` | `boolean[${number}]` | `uuid[${number}]` | `date[${number}]` | `binary[${number}]` | `integer[${number}]` | `int2[${number}]` | `int4[${number}]` | `smallint[${number}]` | `real[${number}]` | `double precision[${number}]` | `float4[${number}]` | `float8[${number}]` | `decimal[${number}]` | `numeric[${number}]` | `serial[${number}]` | `int8[${number}]` | `bigserial[${number}]` | `bool[${number}]` | `varchar[${number}]` | `char[${number}]` | `text[${number}]` | `datetime[${number}]` | `time[${number}]` | `timetz[${number}]` | `timestamp[${number}]` | `timestamptz[${number}]` | `bytea[${number}]` | `varbinary[${number}]` | `blob[${number}]` | `int4range[${number}]` | `numrange[${number}]` | `tsrange[${number}]` | `tstzrange[${number}]` | `daterange[${number}]` | `int4multirange[${number}]` | `int8multirange[${number}]` | `nummultirange[${number}]` | `tsmultirange[${number}]` | `tstzmultirange[${number}]` | `datemultirange[${number}]` | `json[${number}]` | `jsonb[${number}]` | `binary(${number})[${number}]` | `varchar(${number})[${number}]` | `char(${number})[${number}]` | `datetime(${number})[${number}]` | `time(${number})[${number}]` | `timetz(${number})[${number}]` | `timestamp(${number})[${number}]` | `timestamptz(${number})[${number}]` | `varbinary(${number})[${number}]` | `decimal(${number},${number})[${number}]` | `decimal(${number}, ${number})[${number}]` | `numeric(${number},${number})[${number}]` | `numeric(${number}, ${number})[${number}]`>]>;
|
|
61
61
|
required: z.ZodDefault<z.ZodBoolean>;
|
|
62
62
|
unique: z.ZodDefault<z.ZodBoolean>;
|
|
63
63
|
primary: z.ZodDefault<z.ZodBoolean>;
|
|
@@ -92,7 +92,7 @@ export declare const Version: z.ZodObject<{
|
|
|
92
92
|
drop_tables: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString>>>;
|
|
93
93
|
alter_tables: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
94
94
|
add_columns: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
95
|
-
type: z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "
|
|
95
|
+
type: z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "smallint" | "real" | "double precision" | "float4" | "float8" | "decimal" | "numeric" | "serial" | "int8" | "bigserial" | "bool" | "varchar" | "char" | "text" | "datetime" | "time" | "timetz" | "timestamp" | "timestamptz" | "bytea" | "varbinary" | "blob" | "int4range" | "numrange" | "tsrange" | "tstzrange" | "daterange" | "int4multirange" | "int8multirange" | "nummultirange" | "tsmultirange" | "tstzmultirange" | "datemultirange" | "json" | "jsonb">, z.ZodTemplateLiteral<`binary(${number})` | `varchar(${number})` | `char(${number})` | `datetime(${number})` | `time(${number})` | `timetz(${number})` | `timestamp(${number})` | `timestamptz(${number})` | `varbinary(${number})`>, z.ZodTemplateLiteral<`decimal(${number},${number})` | `decimal(${number}, ${number})` | `numeric(${number},${number})` | `numeric(${number}, ${number})`>]>, z.ZodTemplateLiteral<"bigint[]" | "boolean[]" | "uuid[]" | "date[]" | "binary[]" | "integer[]" | "int2[]" | "int4[]" | "smallint[]" | "real[]" | "double precision[]" | "float4[]" | "float8[]" | "decimal[]" | "numeric[]" | "serial[]" | "int8[]" | "bigserial[]" | "bool[]" | "varchar[]" | "char[]" | "text[]" | "datetime[]" | "time[]" | "timetz[]" | "timestamp[]" | "timestamptz[]" | "bytea[]" | "varbinary[]" | "blob[]" | "int4range[]" | "numrange[]" | "tsrange[]" | "tstzrange[]" | "daterange[]" | "int4multirange[]" | "int8multirange[]" | "nummultirange[]" | "tsmultirange[]" | "tstzmultirange[]" | "datemultirange[]" | "json[]" | "jsonb[]" | `binary(${number})[]` | `varchar(${number})[]` | `char(${number})[]` | `datetime(${number})[]` | `time(${number})[]` | `timetz(${number})[]` | `timestamp(${number})[]` | `timestamptz(${number})[]` | `varbinary(${number})[]` | `decimal(${number},${number})[]` | `decimal(${number}, ${number})[]` | `numeric(${number},${number})[]` | `numeric(${number}, ${number})[]` | `bigint[${number}]` | `boolean[${number}]` | `uuid[${number}]` | `date[${number}]` | `binary[${number}]` | `integer[${number}]` | `int2[${number}]` | `int4[${number}]` | `smallint[${number}]` | `real[${number}]` | `double precision[${number}]` | `float4[${number}]` | `float8[${number}]` | `decimal[${number}]` | `numeric[${number}]` | `serial[${number}]` | `int8[${number}]` | `bigserial[${number}]` | `bool[${number}]` | `varchar[${number}]` | `char[${number}]` | `text[${number}]` | `datetime[${number}]` | `time[${number}]` | `timetz[${number}]` | `timestamp[${number}]` | `timestamptz[${number}]` | `bytea[${number}]` | `varbinary[${number}]` | `blob[${number}]` | `int4range[${number}]` | `numrange[${number}]` | `tsrange[${number}]` | `tstzrange[${number}]` | `daterange[${number}]` | `int4multirange[${number}]` | `int8multirange[${number}]` | `nummultirange[${number}]` | `tsmultirange[${number}]` | `tstzmultirange[${number}]` | `datemultirange[${number}]` | `json[${number}]` | `jsonb[${number}]` | `binary(${number})[${number}]` | `varchar(${number})[${number}]` | `char(${number})[${number}]` | `datetime(${number})[${number}]` | `time(${number})[${number}]` | `timetz(${number})[${number}]` | `timestamp(${number})[${number}]` | `timestamptz(${number})[${number}]` | `varbinary(${number})[${number}]` | `decimal(${number},${number})[${number}]` | `decimal(${number}, ${number})[${number}]` | `numeric(${number},${number})[${number}]` | `numeric(${number}, ${number})[${number}]`>]>;
|
|
96
96
|
required: z.ZodDefault<z.ZodBoolean>;
|
|
97
97
|
unique: z.ZodDefault<z.ZodBoolean>;
|
|
98
98
|
primary: z.ZodDefault<z.ZodBoolean>;
|
|
@@ -109,7 +109,7 @@ export declare const Version: z.ZodObject<{
|
|
|
109
109
|
}, z.core.$strict>>>>;
|
|
110
110
|
drop_columns: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString>>>;
|
|
111
111
|
alter_columns: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
112
|
-
type: z.ZodOptional<z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "
|
|
112
|
+
type: z.ZodOptional<z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "smallint" | "real" | "double precision" | "float4" | "float8" | "decimal" | "numeric" | "serial" | "int8" | "bigserial" | "bool" | "varchar" | "char" | "text" | "datetime" | "time" | "timetz" | "timestamp" | "timestamptz" | "bytea" | "varbinary" | "blob" | "int4range" | "numrange" | "tsrange" | "tstzrange" | "daterange" | "int4multirange" | "int8multirange" | "nummultirange" | "tsmultirange" | "tstzmultirange" | "datemultirange" | "json" | "jsonb">, z.ZodTemplateLiteral<`binary(${number})` | `varchar(${number})` | `char(${number})` | `datetime(${number})` | `time(${number})` | `timetz(${number})` | `timestamp(${number})` | `timestamptz(${number})` | `varbinary(${number})`>, z.ZodTemplateLiteral<`decimal(${number},${number})` | `decimal(${number}, ${number})` | `numeric(${number},${number})` | `numeric(${number}, ${number})`>]>, z.ZodTemplateLiteral<"bigint[]" | "boolean[]" | "uuid[]" | "date[]" | "binary[]" | "integer[]" | "int2[]" | "int4[]" | "smallint[]" | "real[]" | "double precision[]" | "float4[]" | "float8[]" | "decimal[]" | "numeric[]" | "serial[]" | "int8[]" | "bigserial[]" | "bool[]" | "varchar[]" | "char[]" | "text[]" | "datetime[]" | "time[]" | "timetz[]" | "timestamp[]" | "timestamptz[]" | "bytea[]" | "varbinary[]" | "blob[]" | "int4range[]" | "numrange[]" | "tsrange[]" | "tstzrange[]" | "daterange[]" | "int4multirange[]" | "int8multirange[]" | "nummultirange[]" | "tsmultirange[]" | "tstzmultirange[]" | "datemultirange[]" | "json[]" | "jsonb[]" | `binary(${number})[]` | `varchar(${number})[]` | `char(${number})[]` | `datetime(${number})[]` | `time(${number})[]` | `timetz(${number})[]` | `timestamp(${number})[]` | `timestamptz(${number})[]` | `varbinary(${number})[]` | `decimal(${number},${number})[]` | `decimal(${number}, ${number})[]` | `numeric(${number},${number})[]` | `numeric(${number}, ${number})[]` | `bigint[${number}]` | `boolean[${number}]` | `uuid[${number}]` | `date[${number}]` | `binary[${number}]` | `integer[${number}]` | `int2[${number}]` | `int4[${number}]` | `smallint[${number}]` | `real[${number}]` | `double precision[${number}]` | `float4[${number}]` | `float8[${number}]` | `decimal[${number}]` | `numeric[${number}]` | `serial[${number}]` | `int8[${number}]` | `bigserial[${number}]` | `bool[${number}]` | `varchar[${number}]` | `char[${number}]` | `text[${number}]` | `datetime[${number}]` | `time[${number}]` | `timetz[${number}]` | `timestamp[${number}]` | `timestamptz[${number}]` | `bytea[${number}]` | `varbinary[${number}]` | `blob[${number}]` | `int4range[${number}]` | `numrange[${number}]` | `tsrange[${number}]` | `tstzrange[${number}]` | `daterange[${number}]` | `int4multirange[${number}]` | `int8multirange[${number}]` | `nummultirange[${number}]` | `tsmultirange[${number}]` | `tstzmultirange[${number}]` | `datemultirange[${number}]` | `json[${number}]` | `jsonb[${number}]` | `binary(${number})[${number}]` | `varchar(${number})[${number}]` | `char(${number})[${number}]` | `datetime(${number})[${number}]` | `time(${number})[${number}]` | `timetz(${number})[${number}]` | `timestamp(${number})[${number}]` | `timestamptz(${number})[${number}]` | `varbinary(${number})[${number}]` | `decimal(${number},${number})[${number}]` | `decimal(${number}, ${number})[${number}]` | `numeric(${number},${number})[${number}]` | `numeric(${number}, ${number})[${number}]`>]>>;
|
|
113
113
|
default: z.ZodOptional<z.ZodString>;
|
|
114
114
|
ops: z.ZodOptional<z.ZodArray<z.ZodLiteral<"drop_default" | "set_required" | "drop_required">>>;
|
|
115
115
|
}, z.core.$strict>>>>;
|
package/dist/db/delta.js
CHANGED
|
@@ -1,3 +1,55 @@
|
|
|
1
|
+
var __addDisposableResource = (this && this.__addDisposableResource) || function (env, value, async) {
|
|
2
|
+
if (value !== null && value !== void 0) {
|
|
3
|
+
if (typeof value !== "object" && typeof value !== "function") throw new TypeError("Object expected.");
|
|
4
|
+
var dispose, inner;
|
|
5
|
+
if (async) {
|
|
6
|
+
if (!Symbol.asyncDispose) throw new TypeError("Symbol.asyncDispose is not defined.");
|
|
7
|
+
dispose = value[Symbol.asyncDispose];
|
|
8
|
+
}
|
|
9
|
+
if (dispose === void 0) {
|
|
10
|
+
if (!Symbol.dispose) throw new TypeError("Symbol.dispose is not defined.");
|
|
11
|
+
dispose = value[Symbol.dispose];
|
|
12
|
+
if (async) inner = dispose;
|
|
13
|
+
}
|
|
14
|
+
if (typeof dispose !== "function") throw new TypeError("Object not disposable.");
|
|
15
|
+
if (inner) dispose = function() { try { inner.call(this); } catch (e) { return Promise.reject(e); } };
|
|
16
|
+
env.stack.push({ value: value, dispose: dispose, async: async });
|
|
17
|
+
}
|
|
18
|
+
else if (async) {
|
|
19
|
+
env.stack.push({ async: true });
|
|
20
|
+
}
|
|
21
|
+
return value;
|
|
22
|
+
};
|
|
23
|
+
var __disposeResources = (this && this.__disposeResources) || (function (SuppressedError) {
|
|
24
|
+
return function (env) {
|
|
25
|
+
function fail(e) {
|
|
26
|
+
env.error = env.hasError ? new SuppressedError(e, env.error, "An error was suppressed during disposal.") : e;
|
|
27
|
+
env.hasError = true;
|
|
28
|
+
}
|
|
29
|
+
var r, s = 0;
|
|
30
|
+
function next() {
|
|
31
|
+
while (r = env.stack.pop()) {
|
|
32
|
+
try {
|
|
33
|
+
if (!r.async && s === 1) return s = 0, env.stack.push(r), Promise.resolve().then(next);
|
|
34
|
+
if (r.dispose) {
|
|
35
|
+
var result = r.dispose.call(r.value);
|
|
36
|
+
if (r.async) return s |= 2, Promise.resolve(result).then(next, function(e) { fail(e); return next(); });
|
|
37
|
+
}
|
|
38
|
+
else s |= 1;
|
|
39
|
+
}
|
|
40
|
+
catch (e) {
|
|
41
|
+
fail(e);
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
if (s === 1) return env.hasError ? Promise.reject(env.error) : Promise.resolve();
|
|
45
|
+
if (env.hasError) throw env.error;
|
|
46
|
+
}
|
|
47
|
+
return next();
|
|
48
|
+
};
|
|
49
|
+
})(typeof SuppressedError === "function" ? SuppressedError : function (error, suppressed, message) {
|
|
50
|
+
var e = new Error(message);
|
|
51
|
+
return e.name = "SuppressedError", e.error = error, e.suppressed = suppressed, e;
|
|
52
|
+
});
|
|
1
53
|
import * as io from 'ioium/node';
|
|
2
54
|
import { sql } from 'kysely';
|
|
3
55
|
import { styleText } from 'node:util';
|
|
@@ -339,91 +391,103 @@ export async function apply(delta, forceAbort = false) {
|
|
|
339
391
|
const tx = await database.startTransaction().execute();
|
|
340
392
|
try {
|
|
341
393
|
for (const [tableName, table] of Object.entries(delta.add_tables)) {
|
|
342
|
-
|
|
343
|
-
|
|
344
|
-
|
|
345
|
-
|
|
346
|
-
|
|
347
|
-
|
|
348
|
-
|
|
394
|
+
const env_1 = { stack: [], error: void 0, hasError: false };
|
|
395
|
+
try {
|
|
396
|
+
const _ = __addDisposableResource(env_1, io.start('Adding table ' + tableName), false);
|
|
397
|
+
let query = tx.schema.createTable(tableName);
|
|
398
|
+
const columns = Object.entries(table.columns);
|
|
399
|
+
const pkColumns = columns.filter(([, column]) => column.primary).map(([name, column]) => ({ name, ...column }));
|
|
400
|
+
const needsSpecialConstraint = pkColumns.length > 1 || pkColumns.some(col => !col.required);
|
|
401
|
+
for (const [colName, column] of columns) {
|
|
402
|
+
query = query.addColumn(colName, sql.raw(column.type), data.buildColumn(column, !needsSpecialConstraint));
|
|
403
|
+
}
|
|
404
|
+
if (needsSpecialConstraint) {
|
|
405
|
+
query = query.addPrimaryKeyConstraint('PK_' + tableName.replaceAll('.', '_'), pkColumns.map(col => col.name));
|
|
406
|
+
}
|
|
407
|
+
await query.execute();
|
|
408
|
+
io.done();
|
|
409
|
+
}
|
|
410
|
+
catch (e_1) {
|
|
411
|
+
env_1.error = e_1;
|
|
412
|
+
env_1.hasError = true;
|
|
349
413
|
}
|
|
350
|
-
|
|
351
|
-
|
|
414
|
+
finally {
|
|
415
|
+
__disposeResources(env_1);
|
|
352
416
|
}
|
|
353
|
-
await query.execute();
|
|
354
|
-
io.done();
|
|
355
417
|
}
|
|
356
418
|
for (const tableName of delta.drop_tables) {
|
|
357
|
-
io.
|
|
358
|
-
await tx.schema.dropTable(tableName).execute();
|
|
359
|
-
io.done();
|
|
419
|
+
await io.track('Dropping table ' + tableName, tx.schema.dropTable(tableName).execute());
|
|
360
420
|
}
|
|
361
421
|
for (const [tableName, tableDelta] of Object.entries(delta.alter_tables)) {
|
|
362
|
-
|
|
363
|
-
|
|
364
|
-
|
|
365
|
-
|
|
366
|
-
|
|
367
|
-
|
|
368
|
-
|
|
369
|
-
|
|
370
|
-
|
|
371
|
-
|
|
372
|
-
|
|
373
|
-
|
|
374
|
-
|
|
375
|
-
|
|
376
|
-
|
|
377
|
-
|
|
378
|
-
|
|
379
|
-
|
|
380
|
-
|
|
381
|
-
|
|
382
|
-
|
|
383
|
-
|
|
422
|
+
const env_2 = { stack: [], error: void 0, hasError: false };
|
|
423
|
+
try {
|
|
424
|
+
const _ = __addDisposableResource(env_2, io.start(`Modifying table ${tableName}`), false);
|
|
425
|
+
const query = tx.schema.alterTable(tableName);
|
|
426
|
+
for (const constraint of tableDelta.drop_constraints) {
|
|
427
|
+
await query.dropConstraint(constraint).execute();
|
|
428
|
+
}
|
|
429
|
+
for (const colName of tableDelta.drop_columns) {
|
|
430
|
+
await query.dropColumn(colName).execute();
|
|
431
|
+
}
|
|
432
|
+
for (const [colName, column] of Object.entries(tableDelta.add_columns)) {
|
|
433
|
+
await query.addColumn(colName, sql.raw(column.type), data.buildColumn(column, false)).execute();
|
|
434
|
+
}
|
|
435
|
+
for (const [colName, column] of Object.entries(tableDelta.alter_columns)) {
|
|
436
|
+
if (column.default)
|
|
437
|
+
await query.alterColumn(colName, col => col.setDefault(sql.raw(String(column.default)))).execute();
|
|
438
|
+
if (column.type)
|
|
439
|
+
await query.alterColumn(colName, col => col.setDataType(sql.raw(column.type))).execute();
|
|
440
|
+
for (const op of column.ops ?? []) {
|
|
441
|
+
switch (op) {
|
|
442
|
+
case 'drop_default':
|
|
443
|
+
if (column.default)
|
|
444
|
+
throw 'Cannot set and drop default at the same time';
|
|
445
|
+
await query.alterColumn(colName, col => col.dropDefault()).execute();
|
|
446
|
+
break;
|
|
447
|
+
case 'set_required':
|
|
448
|
+
await query.alterColumn(colName, col => col.setNotNull()).execute();
|
|
449
|
+
break;
|
|
450
|
+
case 'drop_required':
|
|
451
|
+
await query.alterColumn(colName, col => col.dropNotNull()).execute();
|
|
452
|
+
break;
|
|
453
|
+
}
|
|
454
|
+
}
|
|
455
|
+
}
|
|
456
|
+
for (const [name, con] of Object.entries(tableDelta.add_constraints)) {
|
|
457
|
+
switch (con.type) {
|
|
458
|
+
case 'unique':
|
|
459
|
+
await query.addUniqueConstraint(name, con.on, b => (con.nulls_not_distinct ? b.nullsNotDistinct() : b)).execute();
|
|
384
460
|
break;
|
|
385
|
-
case '
|
|
386
|
-
await query.
|
|
461
|
+
case 'check':
|
|
462
|
+
await query.addCheckConstraint(name, sql.raw(con.check)).execute();
|
|
387
463
|
break;
|
|
388
|
-
case '
|
|
389
|
-
await query.
|
|
464
|
+
case 'foreign_key':
|
|
465
|
+
await query.addForeignKeyConstraint(name, con.on, con.target, con.references, b => b).execute();
|
|
466
|
+
break;
|
|
467
|
+
case 'primary_key':
|
|
468
|
+
await query.addPrimaryKeyConstraint(name, con.on).execute();
|
|
390
469
|
break;
|
|
391
470
|
}
|
|
392
471
|
}
|
|
472
|
+
io.done();
|
|
393
473
|
}
|
|
394
|
-
|
|
395
|
-
|
|
396
|
-
|
|
397
|
-
|
|
398
|
-
|
|
399
|
-
|
|
400
|
-
await query.addCheckConstraint(name, sql.raw(con.check)).execute();
|
|
401
|
-
break;
|
|
402
|
-
case 'foreign_key':
|
|
403
|
-
await query.addForeignKeyConstraint(name, con.on, con.target, con.references, b => b).execute();
|
|
404
|
-
break;
|
|
405
|
-
case 'primary_key':
|
|
406
|
-
await query.addPrimaryKeyConstraint(name, con.on).execute();
|
|
407
|
-
break;
|
|
408
|
-
}
|
|
474
|
+
catch (e_2) {
|
|
475
|
+
env_2.error = e_2;
|
|
476
|
+
env_2.hasError = true;
|
|
477
|
+
}
|
|
478
|
+
finally {
|
|
479
|
+
__disposeResources(env_2);
|
|
409
480
|
}
|
|
410
|
-
io.done();
|
|
411
481
|
}
|
|
412
482
|
for (const [indexName, index] of Object.entries(delta.add_indexes)) {
|
|
413
|
-
io.
|
|
414
|
-
await tx.schema.createIndex(indexName).on(index.on).columns(index.columns).execute();
|
|
415
|
-
io.done();
|
|
483
|
+
await io.track('Creating index ' + indexName, tx.schema.createIndex(indexName).on(index.on).columns(index.columns).execute());
|
|
416
484
|
}
|
|
417
485
|
for (const index of delta.drop_indexes) {
|
|
418
|
-
io.
|
|
419
|
-
await tx.schema.dropIndex(index).execute();
|
|
420
|
-
io.done();
|
|
486
|
+
await io.track('Dropping index ' + index, tx.schema.dropIndex(index).execute());
|
|
421
487
|
}
|
|
422
488
|
if (forceAbort)
|
|
423
489
|
throw 'Rolling back due to --abort';
|
|
424
|
-
io.
|
|
425
|
-
await tx.commit().execute();
|
|
426
|
-
io.done();
|
|
490
|
+
await io.track('Committing', tx.commit().execute());
|
|
427
491
|
}
|
|
428
492
|
catch (e) {
|
|
429
493
|
await tx.rollback().execute();
|
package/dist/db/index.d.ts
CHANGED
|
@@ -47,7 +47,7 @@ export interface InitOptions extends OpOptions {
|
|
|
47
47
|
check: boolean;
|
|
48
48
|
}
|
|
49
49
|
export declare function shouldRecreate(opt: InitOptions): boolean;
|
|
50
|
-
export declare function getHBA(
|
|
50
|
+
export declare function getHBA(): Promise<[content: string, writeBack: (newContent: string) => void]>;
|
|
51
51
|
/** @internal @hidden */
|
|
52
52
|
export declare const _pgHba = "\nlocal axium axium md5\nhost axium axium 127.0.0.1/32 md5\nhost axium axium ::1/128 md5\n";
|
|
53
53
|
/** @internal @hidden */
|
package/dist/db/index.js
CHANGED
|
@@ -136,23 +136,17 @@ export function shouldRecreate(opt) {
|
|
|
136
136
|
io.warn('already exists. Use --skip to skip or --force to re-create.');
|
|
137
137
|
throw 2;
|
|
138
138
|
}
|
|
139
|
-
export async function getHBA(
|
|
140
|
-
const hbaShowResult = await io.
|
|
141
|
-
io.
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
145
|
-
|
|
146
|
-
|
|
139
|
+
export async function getHBA() {
|
|
140
|
+
const hbaShowResult = await io.runShell('Finding pg_hba.conf', `sudo -u postgres psql -c "SHOW hba_file"`);
|
|
141
|
+
const hbaPath = io.track('Resolving pg_hba.conf path', () => {
|
|
142
|
+
const result = hbaShowResult.match(/^\s*(.+\.conf)\s*$/m)?.[1]?.trim();
|
|
143
|
+
if (!result)
|
|
144
|
+
throw 'failed. You will need to add password-based auth for the axium user manually.';
|
|
145
|
+
return result;
|
|
146
|
+
});
|
|
147
147
|
io.debug(`Found pg_hba.conf at ${hbaPath}`);
|
|
148
|
-
io.
|
|
149
|
-
const
|
|
150
|
-
io.done();
|
|
151
|
-
const writeBack = (newContent) => {
|
|
152
|
-
io.start('Writing HBA configuration');
|
|
153
|
-
writeFileSync(hbaPath, newContent);
|
|
154
|
-
io.done();
|
|
155
|
-
};
|
|
148
|
+
const content = io.track('Reading HBA configuration', () => readFileSync(hbaPath, 'utf-8'));
|
|
149
|
+
const writeBack = (newContent) => io.track('Writing HBA configuration', () => writeFileSync(hbaPath, newContent));
|
|
156
150
|
return [content, writeBack];
|
|
157
151
|
}
|
|
158
152
|
/** @internal @hidden */
|
|
@@ -162,7 +156,7 @@ host axium axium 127.0.0.1/32 md5
|
|
|
162
156
|
host axium axium ::1/128 md5
|
|
163
157
|
`;
|
|
164
158
|
/** @internal @hidden */
|
|
165
|
-
export const _sql = (command, message) => io.
|
|
159
|
+
export const _sql = (command, message) => io.runShell(message, `sudo -u postgres psql -c "${command}"`);
|
|
166
160
|
/** Shortcut to output a warning if an error is thrown because relation already exists */
|
|
167
161
|
export const warnExists = io.someWarnings([/\w+ "[\w.]+" already exists/, 'already exists.']);
|
|
168
162
|
export async function init(opt) {
|
|
@@ -172,8 +166,8 @@ export async function init(opt) {
|
|
|
172
166
|
config.save({ db: { password: randomBytes(32).toString('base64') } }, true);
|
|
173
167
|
io.debug('Generated password and wrote to global config');
|
|
174
168
|
}
|
|
175
|
-
await io.
|
|
176
|
-
await io.
|
|
169
|
+
await io.runShell('Checking for sudo', 'which sudo');
|
|
170
|
+
await io.runShell('Checking for psql', 'which psql');
|
|
177
171
|
await _sql('CREATE DATABASE axium', 'Creating database').catch(async (error) => {
|
|
178
172
|
if (error != 'database "axium" already exists')
|
|
179
173
|
throw error;
|
|
@@ -195,24 +189,19 @@ export async function init(opt) {
|
|
|
195
189
|
await _sql('GRANT ALL PRIVILEGES ON DATABASE axium TO axium', 'Granting database privileges');
|
|
196
190
|
await _sql('GRANT ALL PRIVILEGES ON SCHEMA public TO axium', 'Granting schema privileges');
|
|
197
191
|
await _sql('ALTER DATABASE axium OWNER TO axium', 'Setting database owner');
|
|
198
|
-
await getHBA(
|
|
192
|
+
await getHBA()
|
|
199
193
|
.then(([content, writeBack]) => {
|
|
200
|
-
io.
|
|
201
|
-
|
|
202
|
-
|
|
203
|
-
|
|
204
|
-
io.
|
|
205
|
-
const newContent = content.replace(/^local\s+all\s+all.*$/m, `$&\n${_pgHba}`);
|
|
206
|
-
io.done();
|
|
194
|
+
io.track('Checking for Axium HBA configuration', () => {
|
|
195
|
+
if (content.includes(_pgHba))
|
|
196
|
+
throw 'already exists.';
|
|
197
|
+
});
|
|
198
|
+
const newContent = io.track('Adding Axium HBA configuration', () => content.replace(/^local\s+all\s+all.*$/m, `$&\n${_pgHba}`));
|
|
207
199
|
writeBack(newContent);
|
|
208
200
|
})
|
|
209
201
|
.catch(io.warn);
|
|
210
202
|
await _sql('SELECT pg_reload_conf()', 'Reloading configuration');
|
|
211
|
-
io.
|
|
212
|
-
|
|
213
|
-
io.done();
|
|
214
|
-
io.start('Creating schema acl');
|
|
215
|
-
await database.schema.createSchema('acl').execute().then(io.done).catch(warnExists);
|
|
203
|
+
const _ = __addDisposableResource(env_1, io.track('Connecting to database', connect), true);
|
|
204
|
+
await io.track('Creating schema acl', database.schema.createSchema('acl').execute()).catch(warnExists);
|
|
216
205
|
}
|
|
217
206
|
catch (e_1) {
|
|
218
207
|
env_1.error = e_1;
|
|
@@ -286,10 +275,8 @@ export async function checkTableTypes(tableName, types, opt, tableMetadata) {
|
|
|
286
275
|
}
|
|
287
276
|
export async function clean(opt) {
|
|
288
277
|
const now = new Date();
|
|
289
|
-
io.
|
|
290
|
-
await database.deleteFrom('
|
|
291
|
-
io.start('Removing expired verifications');
|
|
292
|
-
await database.deleteFrom('verifications').where('verifications.expires', '<', now).execute().then(io.done);
|
|
278
|
+
await io.track('Removing expired sessions', database.deleteFrom('sessions').where('sessions.expires', '<', now).execute());
|
|
279
|
+
await io.track('Removing expired verifications', database.deleteFrom('verifications').where('verifications.expires', '<', now).execute());
|
|
293
280
|
for (const plugin of plugins.values()) {
|
|
294
281
|
if (!plugin._hooks?.clean)
|
|
295
282
|
continue;
|
|
@@ -298,11 +285,7 @@ export async function clean(opt) {
|
|
|
298
285
|
}
|
|
299
286
|
}
|
|
300
287
|
export async function rotatePassword() {
|
|
301
|
-
io.
|
|
302
|
-
|
|
303
|
-
io.done();
|
|
304
|
-
io.start('Updating global config');
|
|
305
|
-
config.save({ db: { password } }, true);
|
|
306
|
-
io.done();
|
|
288
|
+
const password = io.track('Generating new password', () => randomBytes(32).toString('base64'));
|
|
289
|
+
io.track('Updating global config', () => config.save({ db: { password } }, true));
|
|
307
290
|
await _sql(`ALTER USER axium WITH ENCRYPTED PASSWORD '${password}'`, 'Updating database user password');
|
|
308
291
|
}
|
package/dist/db/schema.d.ts
CHANGED
|
@@ -7,7 +7,7 @@ export * from './data.js';
|
|
|
7
7
|
export declare const SchemaDecl: z.ZodObject<{
|
|
8
8
|
tables: z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
9
9
|
columns: z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
10
|
-
type: z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "
|
|
10
|
+
type: z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "smallint" | "real" | "double precision" | "float4" | "float8" | "decimal" | "numeric" | "serial" | "int8" | "bigserial" | "bool" | "varchar" | "char" | "text" | "datetime" | "time" | "timetz" | "timestamp" | "timestamptz" | "bytea" | "varbinary" | "blob" | "int4range" | "numrange" | "tsrange" | "tstzrange" | "daterange" | "int4multirange" | "int8multirange" | "nummultirange" | "tsmultirange" | "tstzmultirange" | "datemultirange" | "json" | "jsonb">, z.ZodTemplateLiteral<`binary(${number})` | `varchar(${number})` | `char(${number})` | `datetime(${number})` | `time(${number})` | `timetz(${number})` | `timestamp(${number})` | `timestamptz(${number})` | `varbinary(${number})`>, z.ZodTemplateLiteral<`decimal(${number},${number})` | `decimal(${number}, ${number})` | `numeric(${number},${number})` | `numeric(${number}, ${number})`>]>, z.ZodTemplateLiteral<"bigint[]" | "boolean[]" | "uuid[]" | "date[]" | "binary[]" | "integer[]" | "int2[]" | "int4[]" | "smallint[]" | "real[]" | "double precision[]" | "float4[]" | "float8[]" | "decimal[]" | "numeric[]" | "serial[]" | "int8[]" | "bigserial[]" | "bool[]" | "varchar[]" | "char[]" | "text[]" | "datetime[]" | "time[]" | "timetz[]" | "timestamp[]" | "timestamptz[]" | "bytea[]" | "varbinary[]" | "blob[]" | "int4range[]" | "numrange[]" | "tsrange[]" | "tstzrange[]" | "daterange[]" | "int4multirange[]" | "int8multirange[]" | "nummultirange[]" | "tsmultirange[]" | "tstzmultirange[]" | "datemultirange[]" | "json[]" | "jsonb[]" | `binary(${number})[]` | `varchar(${number})[]` | `char(${number})[]` | `datetime(${number})[]` | `time(${number})[]` | `timetz(${number})[]` | `timestamp(${number})[]` | `timestamptz(${number})[]` | `varbinary(${number})[]` | `decimal(${number},${number})[]` | `decimal(${number}, ${number})[]` | `numeric(${number},${number})[]` | `numeric(${number}, ${number})[]` | `bigint[${number}]` | `boolean[${number}]` | `uuid[${number}]` | `date[${number}]` | `binary[${number}]` | `integer[${number}]` | `int2[${number}]` | `int4[${number}]` | `smallint[${number}]` | `real[${number}]` | `double precision[${number}]` | `float4[${number}]` | `float8[${number}]` | `decimal[${number}]` | `numeric[${number}]` | `serial[${number}]` | `int8[${number}]` | `bigserial[${number}]` | `bool[${number}]` | `varchar[${number}]` | `char[${number}]` | `text[${number}]` | `datetime[${number}]` | `time[${number}]` | `timetz[${number}]` | `timestamp[${number}]` | `timestamptz[${number}]` | `bytea[${number}]` | `varbinary[${number}]` | `blob[${number}]` | `int4range[${number}]` | `numrange[${number}]` | `tsrange[${number}]` | `tstzrange[${number}]` | `daterange[${number}]` | `int4multirange[${number}]` | `int8multirange[${number}]` | `nummultirange[${number}]` | `tsmultirange[${number}]` | `tstzmultirange[${number}]` | `datemultirange[${number}]` | `json[${number}]` | `jsonb[${number}]` | `binary(${number})[${number}]` | `varchar(${number})[${number}]` | `char(${number})[${number}]` | `datetime(${number})[${number}]` | `time(${number})[${number}]` | `timetz(${number})[${number}]` | `timestamp(${number})[${number}]` | `timestamptz(${number})[${number}]` | `varbinary(${number})[${number}]` | `decimal(${number},${number})[${number}]` | `decimal(${number}, ${number})[${number}]` | `numeric(${number},${number})[${number}]` | `numeric(${number}, ${number})[${number}]`>]>;
|
|
11
11
|
required: z.ZodDefault<z.ZodBoolean>;
|
|
12
12
|
unique: z.ZodDefault<z.ZodBoolean>;
|
|
13
13
|
primary: z.ZodDefault<z.ZodBoolean>;
|
|
@@ -51,7 +51,7 @@ export declare const SchemaFile: z.ZodObject<{
|
|
|
51
51
|
versions: z.ZodArray<z.ZodDiscriminatedUnion<[z.ZodObject<{
|
|
52
52
|
tables: z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
53
53
|
columns: z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
54
|
-
type: z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "
|
|
54
|
+
type: z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "smallint" | "real" | "double precision" | "float4" | "float8" | "decimal" | "numeric" | "serial" | "int8" | "bigserial" | "bool" | "varchar" | "char" | "text" | "datetime" | "time" | "timetz" | "timestamp" | "timestamptz" | "bytea" | "varbinary" | "blob" | "int4range" | "numrange" | "tsrange" | "tstzrange" | "daterange" | "int4multirange" | "int8multirange" | "nummultirange" | "tsmultirange" | "tstzmultirange" | "datemultirange" | "json" | "jsonb">, z.ZodTemplateLiteral<`binary(${number})` | `varchar(${number})` | `char(${number})` | `datetime(${number})` | `time(${number})` | `timetz(${number})` | `timestamp(${number})` | `timestamptz(${number})` | `varbinary(${number})`>, z.ZodTemplateLiteral<`decimal(${number},${number})` | `decimal(${number}, ${number})` | `numeric(${number},${number})` | `numeric(${number}, ${number})`>]>, z.ZodTemplateLiteral<"bigint[]" | "boolean[]" | "uuid[]" | "date[]" | "binary[]" | "integer[]" | "int2[]" | "int4[]" | "smallint[]" | "real[]" | "double precision[]" | "float4[]" | "float8[]" | "decimal[]" | "numeric[]" | "serial[]" | "int8[]" | "bigserial[]" | "bool[]" | "varchar[]" | "char[]" | "text[]" | "datetime[]" | "time[]" | "timetz[]" | "timestamp[]" | "timestamptz[]" | "bytea[]" | "varbinary[]" | "blob[]" | "int4range[]" | "numrange[]" | "tsrange[]" | "tstzrange[]" | "daterange[]" | "int4multirange[]" | "int8multirange[]" | "nummultirange[]" | "tsmultirange[]" | "tstzmultirange[]" | "datemultirange[]" | "json[]" | "jsonb[]" | `binary(${number})[]` | `varchar(${number})[]` | `char(${number})[]` | `datetime(${number})[]` | `time(${number})[]` | `timetz(${number})[]` | `timestamp(${number})[]` | `timestamptz(${number})[]` | `varbinary(${number})[]` | `decimal(${number},${number})[]` | `decimal(${number}, ${number})[]` | `numeric(${number},${number})[]` | `numeric(${number}, ${number})[]` | `bigint[${number}]` | `boolean[${number}]` | `uuid[${number}]` | `date[${number}]` | `binary[${number}]` | `integer[${number}]` | `int2[${number}]` | `int4[${number}]` | `smallint[${number}]` | `real[${number}]` | `double precision[${number}]` | `float4[${number}]` | `float8[${number}]` | `decimal[${number}]` | `numeric[${number}]` | `serial[${number}]` | `int8[${number}]` | `bigserial[${number}]` | `bool[${number}]` | `varchar[${number}]` | `char[${number}]` | `text[${number}]` | `datetime[${number}]` | `time[${number}]` | `timetz[${number}]` | `timestamp[${number}]` | `timestamptz[${number}]` | `bytea[${number}]` | `varbinary[${number}]` | `blob[${number}]` | `int4range[${number}]` | `numrange[${number}]` | `tsrange[${number}]` | `tstzrange[${number}]` | `daterange[${number}]` | `int4multirange[${number}]` | `int8multirange[${number}]` | `nummultirange[${number}]` | `tsmultirange[${number}]` | `tstzmultirange[${number}]` | `datemultirange[${number}]` | `json[${number}]` | `jsonb[${number}]` | `binary(${number})[${number}]` | `varchar(${number})[${number}]` | `char(${number})[${number}]` | `datetime(${number})[${number}]` | `time(${number})[${number}]` | `timetz(${number})[${number}]` | `timestamp(${number})[${number}]` | `timestamptz(${number})[${number}]` | `varbinary(${number})[${number}]` | `decimal(${number},${number})[${number}]` | `decimal(${number}, ${number})[${number}]` | `numeric(${number},${number})[${number}]` | `numeric(${number}, ${number})[${number}]`>]>;
|
|
55
55
|
required: z.ZodDefault<z.ZodBoolean>;
|
|
56
56
|
unique: z.ZodDefault<z.ZodBoolean>;
|
|
57
57
|
primary: z.ZodDefault<z.ZodBoolean>;
|
|
@@ -92,7 +92,7 @@ export declare const SchemaFile: z.ZodObject<{
|
|
|
92
92
|
delta: z.ZodLiteral<true>;
|
|
93
93
|
add_tables: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
94
94
|
columns: z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
95
|
-
type: z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "
|
|
95
|
+
type: z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "smallint" | "real" | "double precision" | "float4" | "float8" | "decimal" | "numeric" | "serial" | "int8" | "bigserial" | "bool" | "varchar" | "char" | "text" | "datetime" | "time" | "timetz" | "timestamp" | "timestamptz" | "bytea" | "varbinary" | "blob" | "int4range" | "numrange" | "tsrange" | "tstzrange" | "daterange" | "int4multirange" | "int8multirange" | "nummultirange" | "tsmultirange" | "tstzmultirange" | "datemultirange" | "json" | "jsonb">, z.ZodTemplateLiteral<`binary(${number})` | `varchar(${number})` | `char(${number})` | `datetime(${number})` | `time(${number})` | `timetz(${number})` | `timestamp(${number})` | `timestamptz(${number})` | `varbinary(${number})`>, z.ZodTemplateLiteral<`decimal(${number},${number})` | `decimal(${number}, ${number})` | `numeric(${number},${number})` | `numeric(${number}, ${number})`>]>, z.ZodTemplateLiteral<"bigint[]" | "boolean[]" | "uuid[]" | "date[]" | "binary[]" | "integer[]" | "int2[]" | "int4[]" | "smallint[]" | "real[]" | "double precision[]" | "float4[]" | "float8[]" | "decimal[]" | "numeric[]" | "serial[]" | "int8[]" | "bigserial[]" | "bool[]" | "varchar[]" | "char[]" | "text[]" | "datetime[]" | "time[]" | "timetz[]" | "timestamp[]" | "timestamptz[]" | "bytea[]" | "varbinary[]" | "blob[]" | "int4range[]" | "numrange[]" | "tsrange[]" | "tstzrange[]" | "daterange[]" | "int4multirange[]" | "int8multirange[]" | "nummultirange[]" | "tsmultirange[]" | "tstzmultirange[]" | "datemultirange[]" | "json[]" | "jsonb[]" | `binary(${number})[]` | `varchar(${number})[]` | `char(${number})[]` | `datetime(${number})[]` | `time(${number})[]` | `timetz(${number})[]` | `timestamp(${number})[]` | `timestamptz(${number})[]` | `varbinary(${number})[]` | `decimal(${number},${number})[]` | `decimal(${number}, ${number})[]` | `numeric(${number},${number})[]` | `numeric(${number}, ${number})[]` | `bigint[${number}]` | `boolean[${number}]` | `uuid[${number}]` | `date[${number}]` | `binary[${number}]` | `integer[${number}]` | `int2[${number}]` | `int4[${number}]` | `smallint[${number}]` | `real[${number}]` | `double precision[${number}]` | `float4[${number}]` | `float8[${number}]` | `decimal[${number}]` | `numeric[${number}]` | `serial[${number}]` | `int8[${number}]` | `bigserial[${number}]` | `bool[${number}]` | `varchar[${number}]` | `char[${number}]` | `text[${number}]` | `datetime[${number}]` | `time[${number}]` | `timetz[${number}]` | `timestamp[${number}]` | `timestamptz[${number}]` | `bytea[${number}]` | `varbinary[${number}]` | `blob[${number}]` | `int4range[${number}]` | `numrange[${number}]` | `tsrange[${number}]` | `tstzrange[${number}]` | `daterange[${number}]` | `int4multirange[${number}]` | `int8multirange[${number}]` | `nummultirange[${number}]` | `tsmultirange[${number}]` | `tstzmultirange[${number}]` | `datemultirange[${number}]` | `json[${number}]` | `jsonb[${number}]` | `binary(${number})[${number}]` | `varchar(${number})[${number}]` | `char(${number})[${number}]` | `datetime(${number})[${number}]` | `time(${number})[${number}]` | `timetz(${number})[${number}]` | `timestamp(${number})[${number}]` | `timestamptz(${number})[${number}]` | `varbinary(${number})[${number}]` | `decimal(${number},${number})[${number}]` | `decimal(${number}, ${number})[${number}]` | `numeric(${number},${number})[${number}]` | `numeric(${number}, ${number})[${number}]`>]>;
|
|
96
96
|
required: z.ZodDefault<z.ZodBoolean>;
|
|
97
97
|
unique: z.ZodDefault<z.ZodBoolean>;
|
|
98
98
|
primary: z.ZodDefault<z.ZodBoolean>;
|
|
@@ -127,7 +127,7 @@ export declare const SchemaFile: z.ZodObject<{
|
|
|
127
127
|
drop_tables: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString>>>;
|
|
128
128
|
alter_tables: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
129
129
|
add_columns: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
130
|
-
type: z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "
|
|
130
|
+
type: z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "smallint" | "real" | "double precision" | "float4" | "float8" | "decimal" | "numeric" | "serial" | "int8" | "bigserial" | "bool" | "varchar" | "char" | "text" | "datetime" | "time" | "timetz" | "timestamp" | "timestamptz" | "bytea" | "varbinary" | "blob" | "int4range" | "numrange" | "tsrange" | "tstzrange" | "daterange" | "int4multirange" | "int8multirange" | "nummultirange" | "tsmultirange" | "tstzmultirange" | "datemultirange" | "json" | "jsonb">, z.ZodTemplateLiteral<`binary(${number})` | `varchar(${number})` | `char(${number})` | `datetime(${number})` | `time(${number})` | `timetz(${number})` | `timestamp(${number})` | `timestamptz(${number})` | `varbinary(${number})`>, z.ZodTemplateLiteral<`decimal(${number},${number})` | `decimal(${number}, ${number})` | `numeric(${number},${number})` | `numeric(${number}, ${number})`>]>, z.ZodTemplateLiteral<"bigint[]" | "boolean[]" | "uuid[]" | "date[]" | "binary[]" | "integer[]" | "int2[]" | "int4[]" | "smallint[]" | "real[]" | "double precision[]" | "float4[]" | "float8[]" | "decimal[]" | "numeric[]" | "serial[]" | "int8[]" | "bigserial[]" | "bool[]" | "varchar[]" | "char[]" | "text[]" | "datetime[]" | "time[]" | "timetz[]" | "timestamp[]" | "timestamptz[]" | "bytea[]" | "varbinary[]" | "blob[]" | "int4range[]" | "numrange[]" | "tsrange[]" | "tstzrange[]" | "daterange[]" | "int4multirange[]" | "int8multirange[]" | "nummultirange[]" | "tsmultirange[]" | "tstzmultirange[]" | "datemultirange[]" | "json[]" | "jsonb[]" | `binary(${number})[]` | `varchar(${number})[]` | `char(${number})[]` | `datetime(${number})[]` | `time(${number})[]` | `timetz(${number})[]` | `timestamp(${number})[]` | `timestamptz(${number})[]` | `varbinary(${number})[]` | `decimal(${number},${number})[]` | `decimal(${number}, ${number})[]` | `numeric(${number},${number})[]` | `numeric(${number}, ${number})[]` | `bigint[${number}]` | `boolean[${number}]` | `uuid[${number}]` | `date[${number}]` | `binary[${number}]` | `integer[${number}]` | `int2[${number}]` | `int4[${number}]` | `smallint[${number}]` | `real[${number}]` | `double precision[${number}]` | `float4[${number}]` | `float8[${number}]` | `decimal[${number}]` | `numeric[${number}]` | `serial[${number}]` | `int8[${number}]` | `bigserial[${number}]` | `bool[${number}]` | `varchar[${number}]` | `char[${number}]` | `text[${number}]` | `datetime[${number}]` | `time[${number}]` | `timetz[${number}]` | `timestamp[${number}]` | `timestamptz[${number}]` | `bytea[${number}]` | `varbinary[${number}]` | `blob[${number}]` | `int4range[${number}]` | `numrange[${number}]` | `tsrange[${number}]` | `tstzrange[${number}]` | `daterange[${number}]` | `int4multirange[${number}]` | `int8multirange[${number}]` | `nummultirange[${number}]` | `tsmultirange[${number}]` | `tstzmultirange[${number}]` | `datemultirange[${number}]` | `json[${number}]` | `jsonb[${number}]` | `binary(${number})[${number}]` | `varchar(${number})[${number}]` | `char(${number})[${number}]` | `datetime(${number})[${number}]` | `time(${number})[${number}]` | `timetz(${number})[${number}]` | `timestamp(${number})[${number}]` | `timestamptz(${number})[${number}]` | `varbinary(${number})[${number}]` | `decimal(${number},${number})[${number}]` | `decimal(${number}, ${number})[${number}]` | `numeric(${number},${number})[${number}]` | `numeric(${number}, ${number})[${number}]`>]>;
|
|
131
131
|
required: z.ZodDefault<z.ZodBoolean>;
|
|
132
132
|
unique: z.ZodDefault<z.ZodBoolean>;
|
|
133
133
|
primary: z.ZodDefault<z.ZodBoolean>;
|
|
@@ -144,7 +144,7 @@ export declare const SchemaFile: z.ZodObject<{
|
|
|
144
144
|
}, z.core.$strict>>>>;
|
|
145
145
|
drop_columns: z.ZodDefault<z.ZodOptional<z.ZodArray<z.ZodString>>>;
|
|
146
146
|
alter_columns: z.ZodDefault<z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodObject<{
|
|
147
|
-
type: z.ZodOptional<z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "
|
|
147
|
+
type: z.ZodOptional<z.ZodUnion<readonly [z.ZodUnion<readonly [z.ZodLiteral<"bigint" | "boolean" | "uuid" | "date" | "binary" | "integer" | "int2" | "int4" | "smallint" | "real" | "double precision" | "float4" | "float8" | "decimal" | "numeric" | "serial" | "int8" | "bigserial" | "bool" | "varchar" | "char" | "text" | "datetime" | "time" | "timetz" | "timestamp" | "timestamptz" | "bytea" | "varbinary" | "blob" | "int4range" | "numrange" | "tsrange" | "tstzrange" | "daterange" | "int4multirange" | "int8multirange" | "nummultirange" | "tsmultirange" | "tstzmultirange" | "datemultirange" | "json" | "jsonb">, z.ZodTemplateLiteral<`binary(${number})` | `varchar(${number})` | `char(${number})` | `datetime(${number})` | `time(${number})` | `timetz(${number})` | `timestamp(${number})` | `timestamptz(${number})` | `varbinary(${number})`>, z.ZodTemplateLiteral<`decimal(${number},${number})` | `decimal(${number}, ${number})` | `numeric(${number},${number})` | `numeric(${number}, ${number})`>]>, z.ZodTemplateLiteral<"bigint[]" | "boolean[]" | "uuid[]" | "date[]" | "binary[]" | "integer[]" | "int2[]" | "int4[]" | "smallint[]" | "real[]" | "double precision[]" | "float4[]" | "float8[]" | "decimal[]" | "numeric[]" | "serial[]" | "int8[]" | "bigserial[]" | "bool[]" | "varchar[]" | "char[]" | "text[]" | "datetime[]" | "time[]" | "timetz[]" | "timestamp[]" | "timestamptz[]" | "bytea[]" | "varbinary[]" | "blob[]" | "int4range[]" | "numrange[]" | "tsrange[]" | "tstzrange[]" | "daterange[]" | "int4multirange[]" | "int8multirange[]" | "nummultirange[]" | "tsmultirange[]" | "tstzmultirange[]" | "datemultirange[]" | "json[]" | "jsonb[]" | `binary(${number})[]` | `varchar(${number})[]` | `char(${number})[]` | `datetime(${number})[]` | `time(${number})[]` | `timetz(${number})[]` | `timestamp(${number})[]` | `timestamptz(${number})[]` | `varbinary(${number})[]` | `decimal(${number},${number})[]` | `decimal(${number}, ${number})[]` | `numeric(${number},${number})[]` | `numeric(${number}, ${number})[]` | `bigint[${number}]` | `boolean[${number}]` | `uuid[${number}]` | `date[${number}]` | `binary[${number}]` | `integer[${number}]` | `int2[${number}]` | `int4[${number}]` | `smallint[${number}]` | `real[${number}]` | `double precision[${number}]` | `float4[${number}]` | `float8[${number}]` | `decimal[${number}]` | `numeric[${number}]` | `serial[${number}]` | `int8[${number}]` | `bigserial[${number}]` | `bool[${number}]` | `varchar[${number}]` | `char[${number}]` | `text[${number}]` | `datetime[${number}]` | `time[${number}]` | `timetz[${number}]` | `timestamp[${number}]` | `timestamptz[${number}]` | `bytea[${number}]` | `varbinary[${number}]` | `blob[${number}]` | `int4range[${number}]` | `numrange[${number}]` | `tsrange[${number}]` | `tstzrange[${number}]` | `daterange[${number}]` | `int4multirange[${number}]` | `int8multirange[${number}]` | `nummultirange[${number}]` | `tsmultirange[${number}]` | `tstzmultirange[${number}]` | `datemultirange[${number}]` | `json[${number}]` | `jsonb[${number}]` | `binary(${number})[${number}]` | `varchar(${number})[${number}]` | `char(${number})[${number}]` | `datetime(${number})[${number}]` | `time(${number})[${number}]` | `timetz(${number})[${number}]` | `timestamp(${number})[${number}]` | `timestamptz(${number})[${number}]` | `varbinary(${number})[${number}]` | `decimal(${number},${number})[${number}]` | `decimal(${number}, ${number})[${number}]` | `numeric(${number},${number})[${number}]` | `numeric(${number}, ${number})[${number}]`>]>>;
|
|
148
148
|
default: z.ZodOptional<z.ZodString>;
|
|
149
149
|
ops: z.ZodOptional<z.ZodArray<z.ZodLiteral<"drop_default" | "set_required" | "drop_required">>>;
|
|
150
150
|
}, z.core.$strict>>>>;
|
|
@@ -264,5 +264,6 @@ export declare function toGraph(schema: SchemaDecl): Generator<string>;
|
|
|
264
264
|
export declare const toIntrospected: {
|
|
265
265
|
boolean: string;
|
|
266
266
|
integer: string;
|
|
267
|
+
bigint: string;
|
|
267
268
|
'text[]': string;
|
|
268
269
|
};
|
package/dist/db/schema.js
CHANGED
package/dist/io.js
CHANGED
|
@@ -6,7 +6,7 @@ import { Logger } from 'logzen';
|
|
|
6
6
|
import * as fs from 'node:fs';
|
|
7
7
|
import { dirname, join, resolve } from 'node:path/posix';
|
|
8
8
|
import { _unique } from './state.js';
|
|
9
|
-
import { pick } from 'utilium';
|
|
9
|
+
import { _throw, pick } from 'utilium';
|
|
10
10
|
export const systemDir = '/etc/axium';
|
|
11
11
|
export const dirs = _unique('dirs', [systemDir]);
|
|
12
12
|
for (let dir = resolve(process.cwd()); dir !== '/'; dir = dirname(dir)) {
|
|
@@ -36,47 +36,32 @@ export const _portActions = ['enable', 'disable'];
|
|
|
36
36
|
* If the origin has a port, passkeys do not work correctly with some password managers.
|
|
37
37
|
*/
|
|
38
38
|
export async function restrictedPorts(opt) {
|
|
39
|
-
io.
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
io.done();
|
|
43
|
-
io.start('Checking ports method');
|
|
44
|
-
if (!_portMethods.includes(opt.method))
|
|
45
|
-
throw 'invalid';
|
|
46
|
-
io.done();
|
|
47
|
-
io.start('Checking ports action');
|
|
48
|
-
if (!_portActions.includes(opt.action))
|
|
49
|
-
throw 'invalid';
|
|
50
|
-
io.done();
|
|
39
|
+
io.track('Checking for root privileges', () => process.getuid?.() != 0 && _throw('root privileges are needed to change restricted ports.'));
|
|
40
|
+
io.track('Checking ports method', () => !_portMethods.includes(opt.method) && _throw('invalid'));
|
|
41
|
+
io.track('Checking ports action', () => !_portActions.includes(opt.action) && _throw('invalid'));
|
|
51
42
|
switch (opt.method) {
|
|
52
43
|
case 'node-cap': {
|
|
53
44
|
const setcap = await io
|
|
54
|
-
.
|
|
45
|
+
.runShell('Finding setcap', 'command -v setcap')
|
|
55
46
|
.then(e => e.trim())
|
|
56
47
|
.catch(() => {
|
|
57
48
|
io.warn('not in path.');
|
|
58
|
-
io.
|
|
59
|
-
fs.accessSync('/usr/sbin/setcap', fs.constants.X_OK);
|
|
60
|
-
io.done();
|
|
49
|
+
io.track('Checking for /usr/sbin/setcap', () => fs.accessSync('/usr/sbin/setcap', fs.constants.X_OK));
|
|
61
50
|
return '/usr/sbin/setcap';
|
|
62
51
|
});
|
|
63
52
|
io.debug('Using setcap at ' + setcap);
|
|
64
53
|
let { node } = opt;
|
|
65
54
|
node ||= await io
|
|
66
|
-
.
|
|
55
|
+
.runShell('Finding node', 'command -v node')
|
|
67
56
|
.then(e => e.trim())
|
|
68
57
|
.catch(() => {
|
|
69
58
|
io.warn('not in path.');
|
|
70
|
-
io.
|
|
71
|
-
fs.accessSync('/usr/bin/node', fs.constants.X_OK);
|
|
72
|
-
io.done();
|
|
59
|
+
io.track('Checking for /usr/bin/node', () => fs.accessSync('/usr/bin/node', fs.constants.X_OK));
|
|
73
60
|
return '/usr/bin/node';
|
|
74
61
|
});
|
|
75
|
-
io.
|
|
76
|
-
node = fs.realpathSync(node);
|
|
77
|
-
io.done();
|
|
62
|
+
node = io.track('Resolving real path for node', () => fs.realpathSync(node));
|
|
78
63
|
io.debug('Using node at ' + node);
|
|
79
|
-
await io.
|
|
64
|
+
await io.runShell('Setting ports capability', `${setcap} cap_net_bind_service=${opt.action == 'enable' ? '+' : '-'}ep ${node}`);
|
|
80
65
|
break;
|
|
81
66
|
}
|
|
82
67
|
}
|
package/dist/main.js
CHANGED
package/dist/serve.d.ts
CHANGED
|
@@ -12,7 +12,3 @@ export interface ServeOptions {
|
|
|
12
12
|
multiBuild: boolean;
|
|
13
13
|
}
|
|
14
14
|
export declare function serve(opt: Partial<ServeOptions>): Promise<Server>;
|
|
15
|
-
/**
|
|
16
|
-
* Perform initial setup for when the server is serving web pages.
|
|
17
|
-
*/
|
|
18
|
-
export declare function init(): Promise<void>;
|
package/dist/serve.js
CHANGED
|
@@ -168,7 +168,3 @@ export async function serve(opt) {
|
|
|
168
168
|
return createServer(handle);
|
|
169
169
|
return createSecureServer({ key: readFileSync(opt.ssl_key || config.web.ssl_key), cert: readFileSync(opt.ssl_cert || config.web.ssl_cert) }, handle);
|
|
170
170
|
}
|
|
171
|
-
/**
|
|
172
|
-
* Perform initial setup for when the server is serving web pages.
|
|
173
|
-
*/
|
|
174
|
-
export async function init() { }
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@axium/server",
|
|
3
|
-
"version": "0.44.
|
|
3
|
+
"version": "0.44.4",
|
|
4
4
|
"author": "James Prevett <axium@jamespre.dev>",
|
|
5
5
|
"funding": {
|
|
6
6
|
"type": "individual",
|
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
"@types/pg": "^8.11.11",
|
|
64
64
|
"commander": "^14.0.0",
|
|
65
65
|
"cookie_v1": "npm:cookie@^1.0.2",
|
|
66
|
-
"ioium": "^1.
|
|
66
|
+
"ioium": "^1.1.0",
|
|
67
67
|
"logzen": "^0.7.0",
|
|
68
68
|
"patch-package": "^8.0.1",
|
|
69
69
|
"pg": "^8.14.1",
|
package/schemas/db.json
CHANGED
|
@@ -39,7 +39,6 @@
|
|
|
39
39
|
"integer",
|
|
40
40
|
"int2",
|
|
41
41
|
"int4",
|
|
42
|
-
"int8",
|
|
43
42
|
"smallint",
|
|
44
43
|
"real",
|
|
45
44
|
"double precision",
|
|
@@ -48,6 +47,7 @@
|
|
|
48
47
|
"decimal",
|
|
49
48
|
"numeric",
|
|
50
49
|
"serial",
|
|
50
|
+
"int8",
|
|
51
51
|
"bigint",
|
|
52
52
|
"bigserial",
|
|
53
53
|
"boolean",
|
|
@@ -93,7 +93,7 @@
|
|
|
93
93
|
},
|
|
94
94
|
{
|
|
95
95
|
"type": "string",
|
|
96
|
-
"pattern": "^((integer|int2|int4|
|
|
96
|
+
"pattern": "^((integer|int2|int4|smallint|real|double precision|float4|float8|decimal|numeric|serial|int8|bigint|bigserial|boolean|bool|varchar|char|text|date|datetime|time|timetz|timestamp|timestamptz|binary|bytea|varbinary|blob|int4range|numrange|tsrange|tstzrange|daterange|int4multirange|int8multirange|nummultirange|tsmultirange|tstzmultirange|datemultirange|uuid|json|jsonb)|(char|varchar|binary|varbinary|datetime|time|timetz|timestamp|timestamptz)\\(-?\\d+\\)|(decimal|numeric)\\(-?\\d+(,|, )-?\\d+\\))\\[(-?\\d+)?\\]$"
|
|
97
97
|
}
|
|
98
98
|
]
|
|
99
99
|
},
|
|
@@ -313,7 +313,6 @@
|
|
|
313
313
|
"integer",
|
|
314
314
|
"int2",
|
|
315
315
|
"int4",
|
|
316
|
-
"int8",
|
|
317
316
|
"smallint",
|
|
318
317
|
"real",
|
|
319
318
|
"double precision",
|
|
@@ -322,6 +321,7 @@
|
|
|
322
321
|
"decimal",
|
|
323
322
|
"numeric",
|
|
324
323
|
"serial",
|
|
324
|
+
"int8",
|
|
325
325
|
"bigint",
|
|
326
326
|
"bigserial",
|
|
327
327
|
"boolean",
|
|
@@ -367,7 +367,7 @@
|
|
|
367
367
|
},
|
|
368
368
|
{
|
|
369
369
|
"type": "string",
|
|
370
|
-
"pattern": "^((integer|int2|int4|
|
|
370
|
+
"pattern": "^((integer|int2|int4|smallint|real|double precision|float4|float8|decimal|numeric|serial|int8|bigint|bigserial|boolean|bool|varchar|char|text|date|datetime|time|timetz|timestamp|timestamptz|binary|bytea|varbinary|blob|int4range|numrange|tsrange|tstzrange|daterange|int4multirange|int8multirange|nummultirange|tsmultirange|tstzmultirange|datemultirange|uuid|json|jsonb)|(char|varchar|binary|varbinary|datetime|time|timetz|timestamp|timestamptz)\\(-?\\d+\\)|(decimal|numeric)\\(-?\\d+(,|, )-?\\d+\\))\\[(-?\\d+)?\\]$"
|
|
371
371
|
}
|
|
372
372
|
]
|
|
373
373
|
},
|
|
@@ -551,7 +551,6 @@
|
|
|
551
551
|
"integer",
|
|
552
552
|
"int2",
|
|
553
553
|
"int4",
|
|
554
|
-
"int8",
|
|
555
554
|
"smallint",
|
|
556
555
|
"real",
|
|
557
556
|
"double precision",
|
|
@@ -560,6 +559,7 @@
|
|
|
560
559
|
"decimal",
|
|
561
560
|
"numeric",
|
|
562
561
|
"serial",
|
|
562
|
+
"int8",
|
|
563
563
|
"bigint",
|
|
564
564
|
"bigserial",
|
|
565
565
|
"boolean",
|
|
@@ -605,7 +605,7 @@
|
|
|
605
605
|
},
|
|
606
606
|
{
|
|
607
607
|
"type": "string",
|
|
608
|
-
"pattern": "^((integer|int2|int4|
|
|
608
|
+
"pattern": "^((integer|int2|int4|smallint|real|double precision|float4|float8|decimal|numeric|serial|int8|bigint|bigserial|boolean|bool|varchar|char|text|date|datetime|time|timetz|timestamp|timestamptz|binary|bytea|varbinary|blob|int4range|numrange|tsrange|tstzrange|daterange|int4multirange|int8multirange|nummultirange|tsmultirange|tstzmultirange|datemultirange|uuid|json|jsonb)|(char|varchar|binary|varbinary|datetime|time|timetz|timestamp|timestamptz)\\(-?\\d+\\)|(decimal|numeric)\\(-?\\d+(,|, )-?\\d+\\))\\[(-?\\d+)?\\]$"
|
|
609
609
|
}
|
|
610
610
|
]
|
|
611
611
|
},
|
|
@@ -671,7 +671,6 @@
|
|
|
671
671
|
"integer",
|
|
672
672
|
"int2",
|
|
673
673
|
"int4",
|
|
674
|
-
"int8",
|
|
675
674
|
"smallint",
|
|
676
675
|
"real",
|
|
677
676
|
"double precision",
|
|
@@ -680,6 +679,7 @@
|
|
|
680
679
|
"decimal",
|
|
681
680
|
"numeric",
|
|
682
681
|
"serial",
|
|
682
|
+
"int8",
|
|
683
683
|
"bigint",
|
|
684
684
|
"bigserial",
|
|
685
685
|
"boolean",
|
|
@@ -725,7 +725,7 @@
|
|
|
725
725
|
},
|
|
726
726
|
{
|
|
727
727
|
"type": "string",
|
|
728
|
-
"pattern": "^((integer|int2|int4|
|
|
728
|
+
"pattern": "^((integer|int2|int4|smallint|real|double precision|float4|float8|decimal|numeric|serial|int8|bigint|bigserial|boolean|bool|varchar|char|text|date|datetime|time|timetz|timestamp|timestamptz|binary|bytea|varbinary|blob|int4range|numrange|tsrange|tstzrange|daterange|int4multirange|int8multirange|nummultirange|tsmultirange|tstzmultirange|datemultirange|uuid|json|jsonb)|(char|varchar|binary|varbinary|datetime|time|timetz|timestamp|timestamptz)\\(-?\\d+\\)|(decimal|numeric)\\(-?\\d+(,|, )-?\\d+\\))\\[(-?\\d+)?\\]$"
|
|
729
729
|
}
|
|
730
730
|
]
|
|
731
731
|
},
|